$SCRIPT_DIR/revision.json
+{
+ "url": "$installation_script_url",
+ "version": "$version",
+ "sha256": "$sha256"
+}
+EOT
diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
index f24951624c5894248446816d634e1dd6e0ba4863..c20fa4ed9d9b0b0a29af3f243b83e7a446afd1d0 100644
--- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix
+++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, dmenu }:
stdenv.mkDerivation rec {
- name = "j4-dmenu-desktop-${version}";
- version = "2.16";
+ pname = "j4-dmenu-desktop";
+ version = "2.17";
src = fetchFromGitHub {
- owner = "enkore";
- repo = "j4-dmenu-desktop";
- rev = "r${version}";
- sha256 = "0714cri8bwpimmiirhzrkbri4xi24k0za6i1aw94d3fnblk2dg9f";
+ owner = "enkore";
+ repo = pname;
+ rev = "r${version}";
+ sha256 = "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc";
};
postPatch = ''
@@ -18,13 +18,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
# tests are fetching an external git repository
- cmakeFlags = [ "-DNO_TESTS:BOOL=ON" ];
+ cmakeFlags = [
+ "-DWITH_TESTS=OFF"
+ "-DWITH_GIT_CATCH=OFF"
+ ];
meta = with stdenv.lib; {
description = "A wrapper for dmenu that recognize .desktop files";
- homepage = "https://github.com/enkore/j4-dmenu-desktop";
- license = licenses.gpl3;
+ homepage = "https://github.com/enkore/j4-dmenu-desktop";
+ license = licenses.gpl3;
maintainers = with maintainers; [ ericsagnes ];
- platforms = with platforms; unix;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index 72a24026a89d72eaa121104cb498582db4f8dfa6..5939d7789b4e82a61acd3ae9ddc89aba75860df0 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
jarfile = "$out/share/java/${pname}/JBidwatcher.jar";
- unpackPhase = "true";
+ dontUnpack = true;
dontBuild = true;
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index f4c1aceb4f00a398923f8a971da83f0016acf6d4..7954b6dc03ed5bb8c1a68b8e24fb0c47f89424ae 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -14,16 +14,16 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
- ffi (1.10.0)
+ ffi (1.11.1)
forwardable-extended (2.6.0)
- gemoji (3.0.0)
+ gemoji (3.0.1)
html-pipeline (2.11.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
- jekyll (3.8.5)
+ jekyll (3.8.6)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -43,8 +43,8 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
- jekyll-seo-tag (2.6.0)
- jekyll (~> 3.3)
+ jekyll-seo-tag (2.6.1)
+ jekyll (>= 3.3, < 5.0)
jekyll-sitemap (1.3.1)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
@@ -66,11 +66,11 @@ GEM
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (3.0.3)
+ public_suffix (3.1.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
- rouge (3.3.0)
+ rouge (3.5.1)
ruby_dep (1.5.0)
safe_yaml (1.0.5)
sass (3.7.4)
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index 0c71fbe653dd6dbf917b336d338bbf932b07fb2b..741b5e2a0691457f9ea4a61e9b61e4316f72abea 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+ sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.1";
};
forwardable-extended = {
groups = ["default"];
@@ -87,10 +87,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d";
+ sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0";
type = "gem";
};
- version = "3.0.0";
+ version = "3.0.1";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
@@ -130,10 +130,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3";
+ sha256 = "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz";
type = "gem";
};
- version = "3.8.5";
+ version = "3.8.6";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -174,10 +174,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "104v01vh7frgyra3s32wap1ag9fxcm8pgb8v957khzskqy2jh7am";
+ sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m";
type = "gem";
};
- version = "2.6.0";
+ version = "2.6.1";
};
jekyll-sitemap = {
dependencies = ["jekyll"];
@@ -300,10 +300,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
type = "gem";
};
- version = "3.0.3";
+ version = "3.1.1";
};
rb-fsevent = {
groups = ["default"];
@@ -331,10 +331,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
+ sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
type = "gem";
};
- version = "3.3.0";
+ version = "3.5.1";
};
ruby_dep = {
groups = ["default"];
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 34cf0e21db7b724c708f0b37968b2ece39527692..9ae9ab254e80ab72487a844a4d461cd08c0b8d32 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -1,8 +1,27 @@
{ lib, bundlerApp, ruby
+, writeShellScriptBin, makeWrapper
, withOptionalDependencies ? false
}:
-bundlerApp rec {
+let
+ rubyWrapper = writeShellScriptBin "ruby" ''
+ if [[ "$#" -eq 2 ]]; then
+ if [[ "''${1##*/}" == "bundle" && "$2" == "install" ]]; then
+ # See https://github.com/NixOS/nixpkgs/issues/58126 for more details.
+ echo 'Skipping "bundle install" as it fails due to the Nix wrapper.'
+ echo 'Please enter the new directory and run the following commands to serve the page:'
+ echo 'nix-shell -p bundler --run "bundle install --gemfile=Gemfile --path vendor/cache"'
+ echo 'nix-shell -p bundler --run "bundle exec jekyll serve"'
+ exit 0
+ # The following nearly works:
+ unset BUNDLE_FROZEN
+ exec ${ruby}/bin/ruby "$@" --gemfile=Gemfile --path=vendor/cache
+ fi
+ fi
+ # Else: Don't modify the arguments:
+ exec ${ruby}/bin/ruby "$@"
+ '';
+in bundlerApp rec {
pname = "jekyll";
exes = [ "jekyll" ];
@@ -11,6 +30,12 @@ bundlerApp rec {
then ./full
else ./basic;
+ buildInputs = [ makeWrapper ];
+
+ postBuild = ''
+ wrapProgram $out/bin/jekyll --prefix PATH : ${rubyWrapper}/bin
+ '';
+
meta = with lib; {
description = "A blog-aware, static site generator, written in Ruby";
longDescription = ''
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index f61e985cbf76a0674896c38b48b6a1c87a2cf960..7baf6a45fc543bbe7376e0c04f11a925303b2ec1 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.5.2)
+ addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
classifier-reborn (2.2.0)
fast-stemmer (~> 1.0)
@@ -25,16 +25,16 @@ GEM
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
fast-stemmer (1.0.2)
- ffi (1.10.0)
+ ffi (1.11.1)
forwardable-extended (2.6.0)
- gemoji (3.0.0)
+ gemoji (3.0.1)
html-pipeline (2.11.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
- jekyll (3.8.5)
+ jekyll (3.8.6)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -64,8 +64,8 @@ GEM
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
- jekyll-seo-tag (2.6.0)
- jekyll (~> 3.3)
+ jekyll-seo-tag (2.6.1)
+ jekyll (>= 3.3, < 5.0)
jekyll-sitemap (1.3.1)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
@@ -89,14 +89,14 @@ GEM
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.13.1)
- multipart-post (2.0.0)
+ multipart-post (2.1.1)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (3.0.3)
+ public_suffix (3.1.1)
pygments.rb (1.2.1)
multi_json (>= 1.0.0)
rb-fsevent (0.10.3)
@@ -105,7 +105,7 @@ GEM
rdiscount (2.2.0.1)
rdoc (6.1.1)
redcarpet (3.4.0)
- rouge (3.3.0)
+ rouge (3.5.1)
ruby_dep (1.5.0)
safe_yaml (1.0.5)
sass (3.7.4)
@@ -113,9 +113,9 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
- sawyer (0.8.1)
- addressable (>= 2.3.5, < 2.6)
- faraday (~> 0.8, < 1.0)
+ sawyer (0.8.2)
+ addressable (>= 2.3.5)
+ faraday (> 0.8, < 2.0)
thread_safe (0.3.6)
tomlrb (1.2.8)
tzinfo (1.2.5)
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index de3de298fd3480d583eefa10da75acb93ac999ad..63209d4ff45aec87a89f035aac9a9efc8d37d139 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+ sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
type = "gem";
};
- version = "2.5.2";
+ version = "2.6.0";
};
classifier-reborn = {
dependencies = ["fast-stemmer"];
@@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+ sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.1";
};
forwardable-extended = {
groups = ["default"];
@@ -184,10 +184,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d";
+ sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0";
type = "gem";
};
- version = "3.0.0";
+ version = "3.0.1";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
@@ -227,10 +227,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3";
+ sha256 = "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz";
type = "gem";
};
- version = "3.8.5";
+ version = "3.8.6";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -325,10 +325,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "104v01vh7frgyra3s32wap1ag9fxcm8pgb8v957khzskqy2jh7am";
+ sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m";
type = "gem";
};
- version = "2.6.0";
+ version = "2.6.1";
};
jekyll-sitemap = {
dependencies = ["jekyll"];
@@ -507,10 +507,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+ sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.1";
};
nokogiri = {
dependencies = ["mini_portile2"];
@@ -550,10 +550,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
type = "gem";
};
- version = "3.0.3";
+ version = "3.1.1";
};
"pygments.rb" = {
dependencies = ["multi_json"];
@@ -658,10 +658,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
+ sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
type = "gem";
};
- version = "3.3.0";
+ version = "3.5.1";
};
ruby_dep = {
groups = ["default"];
@@ -711,10 +711,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
+ sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
type = "gem";
};
- version = "0.8.1";
+ version = "0.8.2";
};
thread_safe = {
groups = ["default"];
diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index b868808ec3dce99c2b08f9a8a71419a7955b450c..64c693092b03a0b0f35fa728bcc9390ad0317214 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg }:
+{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg, makeWrapper }:
stdenv.mkDerivation rec {
- name = "jgmenu-${version}";
- version = "1.1";
+ pname = "jgmenu";
+ version = "3.1";
src = fetchFromGitHub {
owner = "johanmalm";
- repo = "jgmenu";
+ repo = pname;
rev = "v${version}";
- sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz";
+ sha256 = "03lk89d6wvqv234qciksd4zm0z4lkvrxfh6r9ff0d8yzg67m7rd0";
};
nativeBuildInputs = [
pkgconfig
+ makeWrapper
python3Packages.wrapPython
];
@@ -22,12 +23,17 @@ stdenv.mkDerivation rec {
libxml2
menu-cache
xorg.libXinerama
+ xorg.libXrandr
+ python3Packages.python
];
- makeFlags = [ "prefix=$(out)" ];
+ makeFlags = [ "prefix=${placeholder "out"}" ];
postFixup = ''
wrapPythonProgramsIn "$out/lib/jgmenu"
+ for f in $out/bin/jgmenu{,_run}; do
+ wrapProgram $f --prefix PATH : $out/bin
+ done
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix
index 57f564fdc667d1988b6a1d67cadfbc0fe869f1d2..410b04d5dcbdece1854ff3acfb7db431b55e7e8d 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "joplin-desktop";
- version = "1.0.143";
+ version = "1.0.158";
in appimageTools.wrapType2 rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage";
- sha256 = "1waglwxpr18a07m7ix9al6ac4hrdqzzqmy1qgp45b922nbkw9g10";
+ sha256 = "1xaamwcasihja3agwb0nnfnzc1wmmr0d2ng73qmfil9nhf9v3j6q";
};
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 22a1a4ba2adb6bf2baacbfc5adb27feb07d6791d..4f7acb7731ab9c7167ba230b2d22d83a807ece75 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
- version = "14945";
+ version = "15155";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0kdfdn0i7gjfkkllb93598ywf0qlllzsia5q14szc5b5assl8qpb";
+ sha256 = "0qws5bgv7mm1iynsdrn7cdi16rd8k4139iia3bnjpm04xn69i5im";
};
buildInputs = [ jdk11 makeWrapper ];
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 0049e9aca755092db405c69fc43f7b01ee81cc9b..7c5845b354197d67551c7450a79b02c10c00a48c 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig
-, zlib, libpng, openjpeg
+, zlib, libpng
, enableGSL ? true, gsl
, enableGhostScript ? true, ghostscript
, enableMuPDF ? true, mupdf
@@ -57,7 +57,28 @@ stdenv.mkDerivation rec {
prePatch = ''
cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/
'';
- patches = [];
+ patches = [
+ # stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2
+ ./leptonica-CVE-2018-3836.patch
+ (fetchpatch {
+ # CVE-2018-7186
+ url = "https://github.com/DanBloomberg/leptonica/commit/"
+ + "ee301cb2029db8a6289c5295daa42bba7715e99a.patch";
+ sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d";
+ })
+ (fetchpatch {
+ # CVE-2018-7247
+ url = "https://github.com/DanBloomberg/leptonica/commit/"
+ + "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch";
+ sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf";
+ })
+ (fetchpatch {
+ # CVE-2018-7440
+ url = "https://github.com/DanBloomberg/leptonica/commit/"
+ + "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch";
+ sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy";
+ })
+ ];
});
tesseract_modded = tesseract4.override {
tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: {
diff --git a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f1b4170fbaae9368fe26fb45f2f80a1c2e2b0c84
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
@@ -0,0 +1,95 @@
+--- a/src/allheaders.h
++++ b/src/allheaders.h
+@@ -2600,6 +2600,7 @@
+ LEPT_DLL extern char * stringReverse ( const char *src );
+ LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr );
+ LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail );
++LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound );
+ LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars );
+ LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc );
+ LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc );
+--- a/src/gplot.c
++++ b/src/gplot.c
+@@ -141,9 +141,10 @@
+ const char *xlabel,
+ const char *ylabel)
+ {
+-char *newroot;
+-char buf[L_BUF_SIZE];
+-GPLOT *gplot;
++char *newroot;
++char buf[L_BUF_SIZE];
++l_int32 badchar;
++GPLOT *gplot;
+
+ PROCNAME("gplotCreate");
+
+@@ -152,6 +153,9 @@
+ if (outformat != GPLOT_PNG && outformat != GPLOT_PS &&
+ outformat != GPLOT_EPS && outformat != GPLOT_LATEX)
+ return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL);
++ stringCheckForChars(rootname, "`;&|><\"?*", &badchar);
++ if (badchar) /* danger of command injection */
++ return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL);
+
+ if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL)
+ return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL);
+--- a/src/utils2.c
++++ b/src/utils2.c
+@@ -42,6 +42,7 @@
+ * l_int32 stringSplitOnToken()
+ *
+ * Find and replace string and array procs
++ * l_int32 stringCheckForChars()
+ * char *stringRemoveChars()
+ * l_int32 stringFindSubstr()
+ * char *stringReplaceSubstr()
+@@ -701,6 +702,48 @@
+ /*--------------------------------------------------------------------*
+ * Find and replace procs *
+ *--------------------------------------------------------------------*/
++/*!
++ * \brief stringCheckForChars()
++ *
++ * \param[in] src input string; can be of zero length
++ * \param[in] chars string of chars to be searched for in %src
++ * \param[out] pfound 1 if any characters are found; 0 otherwise
++ * \return 0 if OK, 1 on error
++ *
++ *
++ * Notes:
++ * (1) This can be used to sanitize an operation by checking for
++ * special characters that don't belong in a string.
++ *
++ */
++l_int32
++stringCheckForChars(const char *src,
++ const char *chars,
++ l_int32 *pfound)
++{
++char ch;
++l_int32 i, n;
++
++ PROCNAME("stringCheckForChars");
++
++ if (!pfound)
++ return ERROR_INT("&found not defined", procName, 1);
++ *pfound = FALSE;
++ if (!src || !chars)
++ return ERROR_INT("src and chars not both defined", procName, 1);
++
++ n = strlen(src);
++ for (i = 0; i < n; i++) {
++ ch = src[i];
++ if (strchr(chars, ch)) {
++ *pfound = TRUE;
++ break;
++ }
++ }
++ return 0;
++}
++
++
+ /*!
+ * \brief stringRemoveChars()
+ *
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index ee99e21f6ec249f11a01cae80926d4717bf545f8..b52cff784e5fcecdcc0c86dc94e04421d8a6b999 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation rec {
patches = [
./darwin.patch
- ./quazip5.patch
];
cmakeFlags = [
diff --git a/pkgs/applications/misc/keepassx/quazip5.patch b/pkgs/applications/misc/keepassx/quazip5.patch
deleted file mode 100644
index ccea841cac7d03d974bca564d07c4fb419514285..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/keepassx/quazip5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake
-index 8d309181..92aa892c 100644
---- a/cmake/FindQuaZip.cmake
-+++ b/cmake/FindQuaZip.cmake
-@@ -9,7 +9,6 @@ IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
- SET(QUAZIP_FOUND TRUE)
- ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
- IF(Qt5Core_FOUND)
-- set(QUAZIP_LIB_VERSION_SUFFIX 5)
- ENDIF()
- IF(WIN32)
- FIND_PATH(QUAZIP_LIBRARY_DIR
-diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp
-index 33f5ed1f..5fcd9202 100644
---- a/src/keeshare/ShareObserver.cpp
-+++ b/src/keeshare/ShareObserver.cpp
-@@ -46,8 +46,8 @@
- #include
-
- #if defined(WITH_XC_KEESHARE_SECURE)
--#include
--#include
-+#include
-+#include
- #endif
-
- namespace
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 61eb959a1ddab4a29d0d4deb7596d489465f8db5..4fb2227ee2023f8e59ffdb932b6d63f883588202 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -17,13 +17,13 @@ let
};
in with python.pkgs; buildPythonApplication rec {
- version = "0.13.0";
+ version = "0.14.0";
name = "khard-${version}";
namePrefix = "";
src = fetchurl {
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
- sha256 = "06b9xcdg1na6mxa2pnlh0wfsk02k2h6hlki089aaikbg8k8ykj8f";
+ sha256 = "0m1pc67jz663yfc0xzfpknymn8jj2bpfxaph3pl0mjd3h1zjfyaq";
};
# setup.py reads the UTF-8 encoded readme.
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 3edb48cc489bcf93be4b751d65bc4ae44a70f1a4..9b77bdcd2a54cf9ebbdcd86bc3a22646889782af 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.13.3";
+ version = "0.14.2";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "1y0vd75j8g61jdj8miml79w5ri3pqli5rv9iq6zdrxvzfa4b2rmb";
+ sha256 = "15iv3k7iryf10n8n67d37x24pzcarq97a3dr42lbld00k1lx19az";
};
buildInputs = [
@@ -67,7 +67,6 @@ buildPythonApplication rec {
libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so";
})
] ++ stdenv.lib.optionals stdenv.isDarwin [
- ./macos-10.11.patch
./no-lto.patch
./no-werror.patch
./png2icns.patch
@@ -84,7 +83,7 @@ buildPythonApplication rec {
mkdir -p $out
${if stdenv.isDarwin then ''
mkdir "$out/bin"
- ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty"
+ ln -s ../Applications/kitty.app/Contents/MacOS/kitty-deref-symlink "$out/bin/kitty"
mkdir "$out/Applications"
cp -r kitty.app "$out/Applications/kitty.app"
'' else ''
diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/pkgs/applications/misc/kitty/fix-paths.patch
index d6e52adc445295d6d8243fcf799a702af120addc..70460581307176c2319649e096d539393e6b1808 100644
--- a/pkgs/applications/misc/kitty/fix-paths.patch
+++ b/pkgs/applications/misc/kitty/fix-paths.patch
@@ -12,15 +12,15 @@
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@
-# Patching is needed here for the following reasons:
-# * `sphinx-build` in nixpkgs is not a Python file but a wrapper shell script
+# Patching is needed here for the following reason:
# * importing the `constants` package from Kitty has a side effect that it
# creates the user configuration directory. This package gets imported
# while sphinx scans the code for documentation strings.
#
+
# You can set these variables from the command line.
- SPHINXOPTS = -T $(FAIL_WARN)
--SPHINXBUILD = python3 .. +launch :sphinx-build
+ SPHINXOPTS = -j auto -T $(FAIL_WARN)
+-SPHINXBUILD = sphinx-build
+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build
SPHINXPROJ = kitty
SOURCEDIR = .
diff --git a/pkgs/applications/misc/kitty/macos-10.11.patch b/pkgs/applications/misc/kitty/macos-10.11.patch
deleted file mode 100644
index c8bf46839e8a178f0f0075e6e4b2ef7852d36d0c..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/kitty/macos-10.11.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-commit 749772b8b8179eb3b71e542fd9ed5621feb578f5
-Author: Matthew Glazar
-Date: Thu Feb 28 22:01:32 2019 -0800
-
- Support macOS 10.11
-
- Allow Kitty to run on macOS 10.11 El Capitan.
-
-diff --git a/glfw/cocoa_init.m b/glfw/cocoa_init.m
-index 1e719d2e..05a680e4 100644
---- a/glfw/cocoa_init.m
-+++ b/glfw/cocoa_init.m
-@@ -30,6 +30,10 @@
- #define NSEventMaskKeyUp NSKeyUpMask
- #define NSEventMaskKeyDown NSKeyDownMask
- #define NSEventModifierFlagCommand NSCommandKeyMask
-+ #define NSEventModifierFlagControl NSControlKeyMask
-+ #define NSEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask
-+ #define NSEventModifierFlagShift NSShiftKeyMask
-+ #define NSEventTypeApplicationDefined NSApplicationDefined
- #endif
-
- // Change to our application bundle's resources directory, if present
-diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m
-index 1ce79b56..fd2255fc 100644
---- a/glfw/cocoa_window.m
-+++ b/glfw/cocoa_window.m
-@@ -41,6 +41,7 @@
- #define NSWindowStyleMaskTitled NSTitledWindowMask
- #define NSEventModifierFlagCommand NSCommandKeyMask
- #define NSEventModifierFlagControl NSControlKeyMask
-+ #define NSEventModifierFlagNumericPad NSNumericPadKeyMask
- #define NSEventModifierFlagOption NSAlternateKeyMask
- #define NSEventModifierFlagShift NSShiftKeyMask
- #define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask
-diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m
-index 5e9252ba..99eb3352 100644
---- a/kitty/cocoa_window.m
-+++ b/kitty/cocoa_window.m
-@@ -15,6 +15,9 @@
- #include
-
- #if (MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
-+typedef NSUInteger NSWindowStyleMask;
-+#define NSWindowStyleMaskBorderless NSBorderlessWindowMask
-+#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask
- #define NSWindowStyleMaskResizable NSResizableWindowMask
- #define NSEventModifierFlagOption NSAlternateKeyMask
- #define NSEventModifierFlagCommand NSCommandKeyMask
-diff --git a/kitty/logging.c b/kitty/logging.c
-index 45c88174..1ec9f1b0 100644
---- a/kitty/logging.c
-+++ b/kitty/logging.c
-@@ -5,12 +5,21 @@
- * Distributed under terms of the GPL3 license.
- */
-
-+#ifdef __APPLE__
-+#include
-+#endif
-+#if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12
-+#define USE_APPLE_OS_LOG 1
-+#else
-+#define USE_APPLE_OS_LOG 0
-+#endif
-+
- #include "data-types.h"
- #include
- #include
- #include
- #include
--#ifdef __APPLE__
-+#if USE_APPLE_OS_LOG
- #include
- #endif
-
-@@ -21,7 +30,7 @@ void
- log_error(const char *fmt, ...) {
- va_list ar;
- struct timeval tv;
--#ifdef __APPLE__
-+#if USE_APPLE_OS_LOG
- // Apple does not provide a varargs style os_logv
- char logbuf[16 * 1024] = {0};
- #else
-@@ -44,7 +53,7 @@ log_error(const char *fmt, ...) {
- if (use_os_log) { bufprint(vsnprintf, fmt, ar); }
- else vfprintf(stderr, fmt, ar);
- va_end(ar);
--#ifdef __APPLE__
-+#if USE_APPLE_OS_LOG
- if (use_os_log) os_log(OS_LOG_DEFAULT, "%{public}s", logbuf);
- #endif
- if (!use_os_log) fprintf(stderr, "\n");
-@@ -66,7 +75,7 @@ static PyMethodDef module_methods[] = {
- bool
- init_logging(PyObject *module) {
- if (PyModule_AddFunctions(module, module_methods) != 0) return false;
--#ifdef __APPLE__
-+#if USE_APPLE_OS_LOG
- if (getenv("KITTY_LAUNCHED_BY_LAUNCH_SERVICES") != NULL) use_os_log = true;
- #endif
- return true;
-diff --git a/setup.py b/setup.py
-index f8643fce..55a96e73 100755
---- a/setup.py
-+++ b/setup.py
-@@ -711,7 +711,7 @@ Categories=System;TerminalEmulator;
- CFBundlePackageType='APPL',
- CFBundleSignature='????',
- CFBundleExecutable=appname,
-- LSMinimumSystemVersion='10.12.0',
-+ LSMinimumSystemVersion='10.11.0',
- LSRequiresNativeExecution=True,
- NSAppleScriptEnabled=False,
- # Needed for dark mode in Mojave when linking against older SDKs
diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch
index c5fdeb7ddc0349da9430ac525ce6017a11e6c299..44d231cb07f9430fe5202ff645c9d37f6f70dcc1 100644
--- a/pkgs/applications/misc/kitty/no-lto.patch
+++ b/pkgs/applications/misc/kitty/no-lto.patch
@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
-@@ -223,9 +223,6 @@ def init_env(
+@@ -233,9 +233,6 @@ def init_env(
cppflags += shlex.split(os.environ.get('CPPFLAGS', ''))
cflags += shlex.split(os.environ.get('CFLAGS', ''))
ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch
index c9b6dcd6b6944a7cf0b6d284e2fd57c6bd26a691..8217b5ef51a602d1e198cb40643727aa457bb9a6 100644
--- a/pkgs/applications/misc/kitty/no-werror.patch
+++ b/pkgs/applications/misc/kitty/no-werror.patch
@@ -1,9 +1,9 @@
--- a/setup.py
+++ b/setup.py
-@@ -202,7 +202,7 @@ def init_env(
+@@ -212,7 +212,7 @@
cflags = os.environ.get(
'OVERRIDE_CFLAGS', (
- '-Wextra -Wno-missing-field-initializers -Wall -std=c11'
+ '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
+ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
).format(
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
index 33a2cf932095287afe232abace43a3541cf31aee..81cba3f56378da1e9d63c8ca011eaa73111c5a3a 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -14,7 +14,7 @@
with python3Packages;
buildPythonApplication rec {
- name = "kupfer-${version}";
+ pname = "kupfer";
version = "319";
src = fetchurl {
@@ -30,6 +30,10 @@ buildPythonApplication rec {
buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
+ # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk'
+ # see https://github.com/NixOS/nixpkgs/issues/56943 for details
+ strictDeps = false;
+
postInstall = let
pythonPath = (stdenv.lib.concatMapStringsSep ":"
(m: "${m}/lib/${python.libPrefix}/site-packages")
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index e560fa3029403ab6914e139134b3ae686b99f817..bdbdef45fe7be60ce77abb29fa4ca784241b98f1 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -3,12 +3,12 @@
mkDerivation rec {
pname = "latte-dock";
- version = "0.8.8";
+ version = "0.8.9";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
- sha256 = "137s7rx35a5qrfww3q8bllj4zyjfa7l709snvdfj34y7jbq7p6cd";
+ sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj";
name = "${name}.tar.xz";
};
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 4b3654f9a97b293519a7c1a0dc834d8b35bb0a0e..c9583961de41db315f0e0abed7f9b91ff5bec683 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "libosmocore-${version}";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "libosmocore";
rev = version;
- sha256 = "08xbj2calh1zkp79kxbq01vnh0y7nkgd4cgsivrzlyqahilbzvd9";
+ sha256 = "1ayxpq03mv547sirdy3j9vnsjd1q07adhwwnl3wffz3c39wlax68";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/applications/misc/lifelines/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7207dea9d522ee147026f70ec1e12120274ab0e7
--- /dev/null
+++ b/pkgs/applications/misc/lifelines/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+ pname = "lifelines";
+ version = "unstable-2019-05-07";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "43f29285ed46fba322b6a14322771626e6b02c59";
+ sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y";
+ };
+
+ buildInputs = [
+ gettext
+ libiconv
+ ncurses
+ perl
+ ];
+ nativeBuildInputs = [ autoreconfHook bison ];
+
+ meta = with stdenv.lib; {
+ description = "Genealogy tool with ncurses interface";
+ homepage = "https://lifelines.github.io/lifelines/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ disassembler ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5a74bd931c0b3b59f659b7f38fa57250e0081896
--- /dev/null
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -0,0 +1,178 @@
+{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub
+, wrapGAppsHook, python3Packages }:
+
+let
+ qt5Deps = with pkgs; with qt5; [ qtbase qtmultimedia ];
+ gnome3Deps = with pkgs; with gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
+
+ python3Deps = with pkgs; with python3Packages; [
+ evdev pyyaml pyxdg pygobject3 pyqt5 dbus-python requests pillow
+ ];
+
+ xorgDeps = with pkgs; with xorg; [
+ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
+ libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
+ xrandr xdg_utils
+ ];
+
+ gstDeps = with pkgs; with gst_all_1; [
+ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
+ gst-libav
+ ];
+
+ deps = with pkgs; [
+ # Common
+ stdenv.cc.cc libGL libGLU_combined libsndfile libtheora libogg libvorbis
+ libopus libGLU libpcap libpulseaudio libao libusb libevdev libudev libgcrypt
+ libxml2 libusb libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio
+ libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2
+ libxslt libtxc_dxtn libsndfile giflib zlib glib alsaLib zziplib bash dbus
+ keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl
+ graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader
+
+ # Lutris
+ gobject-introspection gdk_pixbuf hicolor-icon-theme pango openssl sqlite xterm libnotify procps
+
+ # Adventure Game Studio
+ allegro dumb
+
+ # Desmume
+ lua agg soundtouch openal desktop-file-utils pangox_compat atk
+
+ # DGen // TODO: libarchive is broken
+
+ # Dolphin
+ bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
+ wavpack gnutls-kdh orc nettle gmp pcre vulkan-loader
+
+ # DOSBox
+ SDL_net SDL_sound
+
+ # GOG
+ glib-networking
+
+ # Higan // TODO: "higan is not available for the x86_64 architecture"
+
+ # Libretro
+ fluidsynth hidapi mesa libdrm
+
+ # MAME
+ qt48 fontconfig SDL2_ttf
+
+ # Mednafen
+ freeglut mesa_glu
+
+ # MESS
+ expat
+
+ # Minecraft
+ nss
+
+ # Mupen64Plus
+ boost dash
+
+ # Osmose
+ qt4
+
+ # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
+
+ # PPSSPP
+ glew snappy
+
+ # Redream // "redream is not available for the x86_64 architecture"
+
+ # ResidualVM
+ flac
+
+ # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..."
+ llvm_4
+
+ # ScummVM
+ nasm sndio
+
+ # Snes9x
+ epoxy minizip
+
+ # Steam
+ steam
+
+ # Vice
+ bison flex
+
+ # WINE
+ perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC
+ samba4 sane-backends openldap opencl-headers ocl-icd utillinux
+
+ wineWowPackages.staging
+
+ # ZDOOM
+ soundfont-fluid bzip2 game-music-emu
+ ] ++ qt5Deps
+ ++ gnome3Deps
+ ++ python3Deps
+ ++ xorgDeps
+ ++ gstDeps;
+
+ lutris = python3Packages.buildPythonApplication rec {
+ name = "lutris-original-${version}";
+ version = "0.5.2.1";
+
+ src = fetchFromGitHub {
+ owner = "lutris";
+ repo = "lutris";
+ rev = "v${version}";
+ sha256 = "023yqnzmnkfpq21r6ky6jzwbjxjcw1a5zqrrdl6fwwlr78fdhgpv";
+ };
+
+ enableParallelBuilding = true;
+ nativeBuildInputs = [ wrapGAppsHook ];
+ propagatedBuildInputs = deps;
+ fullPath = stdenv.lib.makeLibraryPath deps;
+ preConfigure = "export HOME=$PWD";
+
+ makeWrapperArgs = [
+ "--prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib"
+ "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"
+ "--prefix XDG_DATA_DIRS : $out/share"
+ "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ ];
+
+ postInstall = ''
+ mkdir -p $out/lib
+ ln -sf ${pkgs.gsm}/lib/libgsm.so $out/lib/libgsm.so.1
+ mv $out/bin/lutris $out/bin/lutris-${version}
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://lutris.net";
+ description = "Open Source gaming platform for GNU/Linux";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ chiiruno ];
+ platforms = platforms.linux;
+ };
+ };
+
+ desktopItem = makeDesktopItem {
+ name = "Lutris";
+ exec = "lutris";
+ icon = "lutris";
+ comment = lutris.meta.description;
+ desktopName = "Lutris";
+ genericName = "Gaming Platform";
+ categories = "Network;Game;Emulator;";
+ startupNotify = "false";
+ };
+
+in buildFHSUserEnv rec {
+ name = "lutris";
+
+ runScript = "lutris-${lutris.version}";
+ targetPkgs = pkgs: [ lutris pkgs.glxinfo pkgs.pciutils ];
+ passthru.lutris = lutris;
+
+ extraInstallCommands = ''
+ mkdir -p $out/share
+ cp -r ${desktopItem}/share/applications $out/share
+ ln -sf ${lutris}/share/icons $out/share
+ '';
+}
diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix
index f076a2838eb46b6112425fce70fbbbf03e4deb02..32aa15b09e4951e10f9d96a00ee3bb0a1fbc2ad3 100644
--- a/pkgs/applications/misc/mako/default.nix
+++ b/pkgs/applications/misc/mako/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc
, systemd, pango, cairo, gdk_pixbuf
-, wayland, wayland-protocols }:
+, wayland, wayland-protocols
+, fetchpatch }:
stdenv.mkDerivation rec {
pname = "mako";
@@ -13,6 +14,14 @@ stdenv.mkDerivation rec {
sha256 = "17azdc37xsbmx13fkfp23vg9lznrv9fh6nhagn64wdq3nhsxm3b6";
};
+ # to be removed with next release
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/emersion/mako/commit/ca8e763f06756136c534b1bbd2e5b536be6b1995.patch";
+ sha256 = "09mi7nn2vwc69igxxc6y2m36n3snhsz0ady99yabhrzl17k4ryds";
+ })
+ ];
+
nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ];
buildInputs = [ systemd pango cairo gdk_pixbuf wayland ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index a3320a16ee91b191854951a304c5f561686c3c40..8bbb179d9d517ca7d420cdd1aac1434ba5efbad3 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "18.12";
+ version = "19.04";
name = "mediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d";
+ sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b3e739864171801d5e6cfa382c403a990320ee60
--- /dev/null
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -0,0 +1,125 @@
+{ stdenv
+, autoconf
+, automake
+, c-ares
+, cryptopp
+, curl
+, doxygen
+, fetchFromGitHub
+, ffmpeg
+, hicolor-icon-theme
+, libmediainfo
+, libraw
+, libsodium
+, libtool
+, libuv
+, libzen
+, lsb-release
+, pkgconfig
+, qt5
+, sqlite
+, swig
+, unzip
+, wget
+}:
+
+stdenv.mkDerivation rec {
+ name = "megasync-${version}";
+ version = "4.1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "meganz";
+ repo = "MEGAsync";
+ rev = "v${version}_Linux";
+ sha256 = "0lc228q3s9xp78dxjn22g6anqlsy1hi7a6yfs4q3l6gyfc3qcxl2";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ autoconf
+ automake
+ doxygen
+ lsb-release
+ pkgconfig
+ qt5.qmake
+ qt5.qttools
+ swig
+ ];
+ buildInputs = [
+ c-ares
+ cryptopp
+ curl
+ ffmpeg
+ hicolor-icon-theme
+ libmediainfo
+ libraw
+ libsodium
+ libtool
+ libuv
+ libzen
+ qt5.qtbase
+ qt5.qtsvg
+ sqlite
+ unzip
+ wget
+ ];
+
+ patches = [
+ # Distro and version targets attempt to use lsb_release which is broken
+ # (see issue: https://github.com/NixOS/nixpkgs/issues/22729)
+ ./noinstall-distro-version.patch
+ # megasync target is not part of the install rule thanks to a commented block
+ ./install-megasync.patch
+ ];
+
+ postPatch = ''
+ for file in $(find src/ -type f \( -iname configure -o -iname \*.sh \) ); do
+ substituteInPlace "$file" --replace "/bin/bash" "${stdenv.shell}"
+ done
+ '';
+
+ dontUseQmakeConfigure = true;
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ cd src/MEGASync/mega
+ ./autogen.sh
+ '';
+
+ configureFlags = [
+ "--disable-examples"
+ "--disable-java"
+ "--disable-php"
+ "--enable-chat"
+ "--with-cares"
+ "--with-cryptopp"
+ "--with-curl"
+ "--with-ffmpeg"
+ "--without-freeimage" # unreferenced even when found
+ "--without-readline"
+ "--without-termcap"
+ "--with-sodium"
+ "--with-sqlite"
+ "--with-zlib"
+ ];
+
+ postConfigure = ''
+ cd ../..
+ '';
+
+ preBuild = ''
+ qmake CONFIG+="release" MEGA.pro
+ pushd MEGASync
+ lrelease MEGASync.pro
+ DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+=release
+ popd
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Easy automated syncing between your computers and your MEGA Cloud Drive";
+ homepage = https://mega.nz/;
+ license = licenses.unfree;
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ maintainers = [ maintainers.michojel ];
+ };
+}
diff --git a/pkgs/applications/misc/megasync/install-megasync.patch b/pkgs/applications/misc/megasync/install-megasync.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7d8748528e7fa8ee405a9ffe302224156e602be7
--- /dev/null
+++ b/pkgs/applications/misc/megasync/install-megasync.patch
@@ -0,0 +1,21 @@
+Index: source/src/MEGASync/MEGASync.pro
+===================================================================
+--- source.orig/src/MEGASync/MEGASync.pro
++++ source/src/MEGASync/MEGASync.pro
+@@ -28,11 +28,11 @@ unix:!macx {
+ TARGET = megasync
+
+ # Uncomment the following if "make install" doesn't copy megasync in /usr/bin directory
+-# isEmpty(PREFIX) {
+-# PREFIX = /usr
+-# }
+-# target.path = $$PREFIX/bin
+-# INSTALLS += target
++ isEmpty(PREFIX) {
++ PREFIX = /usr
++ }
++ target.path = $$PREFIX/bin
++ INSTALLS += target
+ }
+ else {
+ TARGET = MEGAsync
diff --git a/pkgs/applications/misc/megasync/noinstall-distro-version.patch b/pkgs/applications/misc/megasync/noinstall-distro-version.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bbf100737bc454b7cd5d84bf762048e1c2ec0109
--- /dev/null
+++ b/pkgs/applications/misc/megasync/noinstall-distro-version.patch
@@ -0,0 +1,13 @@
+Index: source/src/MEGASync/platform/platform.pri
+===================================================================
+--- source.orig/src/MEGASync/platform/platform.pri
++++ source/src/MEGASync/platform/platform.pri
+@@ -37,7 +37,7 @@ unix:!macx {
+ system(command -v lsb_release): version.commands = lsb_release -rs > $$version.target
+ version.files = $$version.target
+
+- INSTALLS += distro version
++ # INSTALLS += distro version
+
+ QT += dbus
+ SOURCES += $$PWD/linux/LinuxPlatform.cpp \
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
index c112cf0c928f0f910ca873ae305a0cff2eafaa5a..0b802bedf8d7b7369f06845e3f2c969fd2678d31 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/pkgs/applications/misc/memo/default.nix
@@ -9,13 +9,13 @@ stdenv.mkDerivation rec {
name = "memo-${version}";
- version = "0.6";
+ version = "0.8";
src = fetchFromGitHub {
owner = "mrVanDalo";
repo = "memo";
rev = "${version}";
- sha256 = "1cvjs36f6vxzfz5d63yhyw8j7gdw5hn6cfzccf7ag08lamjhfhbr";
+ sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp";
};
installPhase = let
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 70a6efb90ddc21eaeea9f2d345e774c634bf8b28..dec55e9c1e5c861a8595aaf292df30aa7480b52b 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj
+{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj
, qtbase, qtsvg, qtwebkit }:
stdenv.mkDerivation rec {
@@ -12,12 +12,19 @@ stdenv.mkDerivation rec {
sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88";
};
- nativeBuildInputs = [ qmake pkgconfig ];
+ nativeBuildInputs = [ makeWrapper qmake pkgconfig ];
buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ];
enableParallelBuilding = true;
+ NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
+
+ postInstall = ''
+ wrapProgram $out/bin/merkaartor \
+ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms
+ '';
+
meta = with stdenv.lib; {
description = "OpenStreetMap editor";
homepage = http://merkaartor.be/;
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 76c2ba69d35b481b7b0a267a31f5b6a0a462a157..920c1c3f095bfdf51778d5a052e21933d98acf5c 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, cmake, perl
, alsaLib, libevdev, libopus, udev, SDL2
, ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
-, curl, expat, avahi, enet, libuuid
+, curl, expat, avahi, enet, libuuid, libva
}:
stdenv.mkDerivation rec {
name = "moonlight-embedded-${version}";
- version = "2.4.7";
+ version = "2.4.10";
src = fetchFromGitHub {
owner = "irtimmer";
repo = "moonlight-embedded";
rev = "v${version}";
- sha256 = "0ihgb0kh4rhbgn55s25rfbs8063zqvcyqn137jn3nsc0is1595a9";
+ sha256 = "0m5i3q3hbjl51cndjpz5hxi3br6fvpn1fzdv0f6lxjxgw9z32413";
fetchSubmodules = true;
};
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsaLib libevdev libopus udev SDL2
ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec
- xorg.libpthreadstubs curl expat avahi enet libuuid
+ xorg.libpthreadstubs curl expat avahi enet libuuid libva
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..45b83b7274850f7e72a397876a3db64e110556b2
--- /dev/null
+++ b/pkgs/applications/misc/mystem/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "mystem-${version}";
+ version = "3.1";
+
+ src = fetchurl {
+ url = "http://download.cdn.yandex.net/mystem/${name}-linux-64bit.tar.gz";
+ sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10";
+ };
+
+ buildCommand = ''
+ tar -xaf "$src"
+ mkdir -p $out/bin
+ install -Dm755 mystem $out/bin/mystem
+ patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/mystem
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Morphological analysis of Russian text";
+ homepage = https://yandex.ru/dev/mystem/;
+ license = licenses.unfreeRedistributable;
+ maintainers = with maintainers; [ abbradar ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 5367ef53302122d1c8054d9ea5610f8e38e6b7ab..c38a27d55e63050c3ba1f6934a8ba3b5bc8d05a2 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -3,14 +3,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "nnn-${version}";
- version = "2.4";
+ pname = "nnn";
+ version = "2.5";
src = fetchFromGitHub {
owner = "jarun";
- repo = "nnn";
+ repo = pname;
rev = "v${version}";
- sha256 = "0y55h5pxd20qw2ajhz8fsk45aynx0xzgr9kfr545hyhmfkg2nc49";
+ sha256 = "0hvb0q6jg2nmvb40q43jj7v45afkjgcq6q9ldmmrh5558d0n65cw";
};
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 76a0a5748081984b66c43fde7441bb2736fb7626..c0bacc2c50d2dc8676091b8c9e3ab00102fe6fd1 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -15,13 +15,21 @@ let
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([
(mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc")
(mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3")
- (mkOverride "jinja2" "2.8.1" "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m")
- (mkOverride "pylru" "1.0.9" "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi")
- (mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar")
(mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d")
- # https://github.com/NixOS/nixpkgs/pull/58179#issuecomment-478605134
- (mkOverride "werkzeug" "0.14.1" "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c")
+ # Octoprint holds back jinja2 to 2.8.1 due to breaking changes.
+ # This old version does not have updated test config for pytest 4,
+ # and pypi tarball doesn't contain tests dir anyways.
+ (pself: psuper: {
+ jinja2 = psuper.jinja2.overridePythonAttrs (oldAttrs: rec {
+ version = "2.8.1";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
+ };
+ doCheck = false;
+ });
+ })
]);
};
@@ -30,16 +38,15 @@ let
"Flask-Assets"
"Flask-Babel"
"Flask-Principal"
- "PyYAML"
"emoji"
"flask"
"future"
"futures"
"monotonic"
+ "markdown"
"pkginfo"
"psutil"
"pyserial"
- "python-dateutil"
"requests"
"rsa"
"sarge"
@@ -47,19 +54,19 @@ let
"semantic_version"
"watchdog"
"websocket-client"
- "werkzeug"
"wrapt"
+ "sentry-sdk"
];
in py.pkgs.buildPythonApplication rec {
pname = "OctoPrint";
- version = "1.3.10";
+ version = "1.3.11";
src = fetchFromGitHub {
owner = "foosel";
repo = "OctoPrint";
rev = version;
- sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7";
+ sha256 = "1102ki1819wsmkfg4riz4i0hjlr3w6nsvk8wrzqq0lc0s5ycf4jx";
};
propagatedBuildInputs = with py.pkgs; [
@@ -67,9 +74,9 @@ in py.pkgs.buildPythonApplication rec {
semantic-version flask_principal werkzeug flaskbabel tornado
psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces click websocket_client
- scandir chainmap future dateutil futures wrapt monotonic emoji
- frozendict
- ];
+ scandir chainmap future futures wrapt monotonic emoji
+ frozendict cachelib sentry-sdk typing
+ ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ];
checkInputs = with py.pkgs; [ nose mock ddt ];
@@ -82,7 +89,7 @@ in py.pkgs.buildPythonApplication rec {
'';
checkPhase = ''
- HOME=$(mktemp -d) nosetests
+ HOME=$(mktemp -d) nosetests ${lib.optionalString stdenv.isDarwin "--exclude=test_set_external_modification"}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 327a59618c2bc4e3b470f2e4414955f5dea3366e..d8179e1b402a3d3d45f612944e9057097ff38bc8 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, octoprint, python2Packages }:
+{ stdenv, fetchFromGitHub, octoprint, python2Packages, marlin-calc }:
let
buildPlugin = args: python2Packages.buildPythonPackage (args // {
@@ -104,6 +104,93 @@ let
};
};
+ curaenginelegacy = buildPlugin rec {
+ pname = "CuraEngineLegacy";
+ version = "1.0.2";
+
+ src = fetchFromGitHub {
+ owner = "OctoPrint";
+ repo = "OctoPrint-${pname}";
+ rev = version;
+ sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Plugin for slicing via Cura Legacy from within OctoPrint";
+ homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ gebner ];
+ };
+ };
+
+ touchui = buildPlugin rec {
+ pname = "TouchUI";
+ version = "0.3.13";
+
+ src = fetchFromGitHub {
+ owner = "BillyBlaze";
+ repo = "OctoPrint-${pname}";
+ rev = version;
+ sha256 = "0qk12ysabdzy6cna3l4f8v3qcnppppwxxsjx2i0xn1nd0cv6yzwh";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Touch friendly interface for a small TFT module or phone for OctoPrint";
+ homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ gebner ];
+ };
+ };
+
+ psucontrol = buildPlugin rec {
+ pname = "PSUControl";
+ version = "0.1.8";
+
+ src = fetchFromGitHub {
+ owner = "kantlivelong";
+ repo = "OctoPrint-${pname}";
+ rev = version;
+ sha256 = "0aj38d7b7d5pzmzq841pip18cpg18wy2vrxq2nd13875597y54b8";
+ };
+
+ preConfigure = ''
+ # optional; RPi.GPIO is broken on vanilla kernels
+ sed /RPi.GPIO/d -i requirements.txt
+ '';
+
+ meta = with stdenv.lib; {
+ description = "OctoPrint plugin to control ATX/AUX power supply";
+ homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ gebner ];
+ };
+ };
+
+ printtimegenius = buildPlugin rec {
+ pname = "PrintTimeGenius";
+ version = "1.3.1";
+
+ src = fetchFromGitHub {
+ owner = "eyal0";
+ repo = "OctoPrint-${pname}";
+ rev = version;
+ sha256 = "0ijv1nxmikv06a00hqqkqri6wnydqh6lwcx07pmvw6jy706jhy28";
+ };
+
+ preConfigure = ''
+ # PrintTimeGenius ships with marlin-calc binaries for multiple architectures
+ rm */analyzers/marlin-calc*
+ sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Better print time estimation for OctoPrint";
+ homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ gebner ];
+ };
+ };
+
};
in self
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix
index 5787adef2a3e8d5d50c17a313f9cb01a7c740ef6..9d0fb3fdeb7c7eb9cd059685424c908be51e9a5a 100644
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
"INSTALL_SHAREDIR=$(out)/share/"
];
+ NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
+
installFlags = [ "DESTDIR=$(out)" ];
buildInputs = [ libroxml proj libyamlcpp boost ];
diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix
index c1255b6152ea68e15dca474fbb5640fdc9e5a290..918924df0b978fc1094fe327359b5b20fd405267 100644
--- a/pkgs/applications/misc/overmind/default.nix
+++ b/pkgs/applications/misc/overmind/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, tmux, which, makeWrapper }:
+{ lib, buildGoPackage, fetchFromGitHub, tmux, which, makeWrapper }:
buildGoPackage rec {
- name = "overmind-${version}";
- version = "2.0.1";
+ pname = "overmind";
+ version = "2.0.2";
goPackagePath = "github.com/DarthSim/overmind";
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
- wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux which ]}"
+ wrapProgram "$bin/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}"
'';
src = fetchFromGitHub {
owner = "DarthSim";
- repo = "overmind";
+ repo = pname;
rev = "v${version}";
- sha256 = "1j3cpcfgacn5ic19sgrs1djn5jr4d7j7lxaz0vbaf414lrl76qz8";
+ sha256 = "0cns19gqkfxsiiyfxhb05cjp1iv2fb40x47gp8djrwwzcd1r6zxh";
};
- meta = with stdenv.lib; {
- homepage = https://github.com/DarthSim/overmind;
+ meta = with lib; {
+ homepage = "https://github.com/DarthSim/overmind";
description = "Process manager for Procfile-based applications and tmux";
license = with licenses; [ mit ];
maintainers = [ maintainers.adisbladis ];
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index 45d83b5872fa3e1923635b71472cd433f31aac5a..90107be64c728959583c12de5d7dc4c001b982c4 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "pdfmod-${version}";
+ pname = "pdfmod";
version = "0.9.1";
src = fetchurl {
- url = "mirror://gnome/sources/pdfmod/0.9/pdfmod-${version}.tar.bz2";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9";
};
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/PdfMod;
+ homepage = "https://wiki.gnome.org/Attic/PdfMod";
description = "A simple application for modifying PDF documents";
platforms = platforms.all;
maintainers = with maintainers; [ obadz ];
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 0e424a97d8ddba8a0620a59f71f261d0739a04d8..c0dca056476858c5753066c9ab594b29717e18c1 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
- version = "4.3.2";
+ version = "4.3.4";
src = fetchFromGitHub {
repo = product;
owner = product;
rev = "v${version}";
- sha256 = "15y6g92fp6x6dwwhrhkfny5z20w7pq9c8w19fh2vzff9aa6m2h9z";
+ sha256 = "07aafsm4jzdgpahz83p0ajv40hry7gviyadqi13ahr8xdhhwy2sd";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
index 6c23d160f47c17b8875ac97fa2304b3d92837f2c..b44169adea8dd1984184d819bc893099a1321bf2 100644
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
+++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "plasma-applet-volumewin7mixer-${version}";
- version = "23";
+ version = "24";
src = fetchFromGitHub {
owner = "Zren";
repo = "plasma-applet-volumewin7mixer";
rev = "v${version}";
- sha256 = "1j2bq343lnhwqz26qfsvg7vjxv84ibzbc4y86rjkh07nqjwb3xsc";
+ sha256 = "1pms71229y7fv3zs38a0l9mdcg5qkcdv9yrcvdm6xqpdyk21jbz2";
};
patches = [ ./cmake.patch ];
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index da09c123dcde1a9cb42e26c8f33037e9ee12ea96..e5c096fd2ae5a6d80f39a317d7df37fe37a0568f 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -4,7 +4,7 @@
, cabextract
, gettext
, glxinfo
-, gnupg1compat
+, gnupg
, icoutils
, imagemagick
, netcat-gnu
@@ -32,7 +32,7 @@ let
python2Packages.python
gettext
glxinfo
- gnupg1compat
+ gnupg
icoutils
imagemagick
netcat-gnu
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cc6f63c0960ba2d86b9f0dcce5e74fd83c3c8048
--- /dev/null
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig
+, boost, curl, expat, glew, libpng, tbb, wxGTK30
+, gtest, nlopt, xorg, makeDesktopItem
+}:
+let
+ nloptVersion = if lib.hasAttr "version" nlopt
+ then lib.getAttr "version" nlopt
+ else "2.4";
+in
+stdenv.mkDerivation rec {
+ name = "prusa-slicer-${version}";
+ version = "2.0.0";
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [
+ cmake
+ makeWrapper
+ pkgconfig
+ ];
+
+ # We could add Eigen, but it doesn't currently compile with the version in
+ # nixpkgs.
+ buildInputs = [
+ boost
+ curl
+ expat
+ glew
+ libpng
+ tbb
+ wxGTK30
+ xorg.libX11
+ ] ++ checkInputs;
+
+ checkInputs = [ gtest ];
+
+ # The build system uses custom logic - defined in
+ # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source -
+ # for finding the nlopt library, which doesn't pick up the package in the nix store.
+ # We need to set the path via the NLOPT environment variable instead.
+ NLOPT = "${nlopt}";
+
+ prePatch = ''
+ # In nix ioctls.h isn't available from the standard kernel-headers package
+ # on other distributions. As the copy in glibc seems to be identical to the
+ # one in the kernel, we use that one instead.
+ sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' src/libslic3r/GCodeSender.cpp
+ '' + lib.optionalString (lib.versionOlder "2.5" nloptVersion) ''
+ # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
+ # now seems to be integrated into the main lib.
+ sed -i 's|nlopt_cxx|nlopt|g' src/libnest2d/cmake_modules/FindNLopt.cmake
+ '';
+
+ src = fetchFromGitHub {
+ owner = "prusa3d";
+ repo = "PrusaSlicer";
+ sha256 = "135wn2sza2f2kvbja1haxil5kx1b74lc1i7dsa35i1y3phabykhz";
+ rev = "version_${version}";
+ };
+
+ cmakeFlags = [
+ "-DSLIC3R_FHS=1"
+ "-DSLIC3R_WX_STABLE=1" # necessary when compiling against wxGTK 3.0
+ ];
+
+ postInstall = ''
+ mkdir -p "$out/share/pixmaps/"
+ ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png"
+ mkdir -p "$out/share/applications"
+ cp "$desktopItem"/share/applications/* "$out/share/applications/"
+ '';
+
+ desktopItem = makeDesktopItem {
+ name = "PrusaSlicer";
+ exec = "prusa-slicer";
+ icon = "PrusaSlicer";
+ comment = "G-code generator for 3D printers";
+ desktopName = "PrusaSlicer";
+ genericName = "3D printer tool";
+ categories = "Application;Development;";
+ };
+
+ meta = with stdenv.lib; {
+ description = "G-code generator for 3D printer";
+ homepage = https://github.com/prusa3d/PrusaSlicer;
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ tweber ];
+ };
+}
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index 3cd52af6d32185363302cc4ddf796a0f12fe22df..7aaa8a8c38d20b6f7074e92d867eaac87a0c9694 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -1,25 +1,38 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "pstree-2.39";
+ pname = "pstree";
+ version = "2.39";
src = fetchurl {
urls = [
- "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"
- "https://distfiles.macports.org/pstree/${name}.tar.gz"
+ "https://distfiles.macports.org/${pname}/${pname}-${version}.tar.gz"
+ "https://fossies.org/linux/misc/${pname}-${version}.tar.gz"
+ "ftp://ftp.thp.uni-duisburg.de/pub/source/${pname}-${version}.tar.gz"
];
sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw";
};
- unpackPhase = "unpackFile \$src; sourceRoot=.";
+ sourceRoot = ".";
+ buildPhase = ''
+ runHook preBuild
+ $CC $NIX_CFLAGS -o pstree pstree.c
+ runHook postBuild
+ '';
- buildPhase = "pwd; $CC -o pstree pstree.c";
- installPhase = "mkdir -p \$out/bin; cp pstree \$out/bin";
+ installPhase = ''
+ runHook preInstall
+ install -Dm0555 ${pname} -t $out/bin
+ install -Dm0444 ${pname}.1 -t $out/share/man/man1
+ runHook postInstall
+ '';
- meta = {
+ meta = with stdenv.lib; {
description = "Show the set of running processes as a tree";
- license = "GPL";
- maintainers = [ ];
- platforms = stdenv.lib.platforms.unix;
+ homepage = "http://www.thp.uni-duisburg.de/pstree/";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.c0bw3b ];
+ platforms = platforms.unix;
+ priority = 5; # Lower than psmisc also providing pstree on Linux platforms
};
}
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 82b8f2cf8471885e040e9a7455ade3e7414b89fe..1ed54b05ec8c08be212c17ecab95c06a19658c7e 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -6,17 +6,17 @@
stdenv.mkDerivation rec {
pname = "pwsafe";
- version = "1.07";
+ version = "1.08.1";
src = fetchFromGitHub {
- owner = "${pname}";
- repo = "${pname}";
+ owner = pname;
+ repo = pname;
rev = "${version}BETA";
- sha256 = "0syxmliybgvm9j6d426l7j12ryrl42azy80m66jc56fv9nkqwaya";
+ sha256 = "0x89pn056h8b4yvxbd6l3qwrghslxc7vlxnblmcmsx7xx4i041ng";
};
nativeBuildInputs = [
- cmake gettext perl pkgconfig zip
+ cmake gettext perl pkgconfig zip
];
buildInputs = [
libXext libXi libXt libXtst wxGTK31
@@ -49,11 +49,10 @@ stdenv.mkDerivation rec {
done
'';
- installFlags = [ "PREFIX=$(out)" ];
+ installFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; {
description = "A password database utility";
-
longDescription = ''
Password Safe is a password database utility. Like many other
such products, commercial and otherwise, it stores your
@@ -61,8 +60,7 @@ stdenv.mkDerivation rec {
one password (the "safe combination"), instead of all the
username/password combinations that you use.
'';
-
- homepage = https://pwsafe.org/;
+ homepage = "https://pwsafe.org/";
maintainers = with maintainers; [ c0bw3b pjones ];
platforms = platforms.linux;
license = licenses.artistic2;
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index f4983ad9442837c02e39233ac713963d21768e0b..b38369babe8cdf12427b472fe7d85a1ac659c525 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
+{ stdenv, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
stdenv.mkDerivation rec {
name = "qmapshack-${version}";
- version = "1.12.3";
+ version = "1.13.0";
src = fetchurl {
url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
- sha256 = "1yp5gw4q4gwiwr9w4dz19am0bhsla9n2l3bdlk98a7f46kxgnkrx";
+ sha256 = "1cv1f718r8vqyk2l6w3alz2aqjvb4msz8705pm9yr5ndi28qyrba";
};
nativeBuildInputs = [ cmake ];
@@ -15,12 +15,23 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DROUTINO_XML_PATH=${routino}/share/routino"
- "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip"
+ "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5"
"-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
];
enableParallelBuilding = true;
+ patches = [
+ (fetchpatch {
+ url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindPROJ4.patch";
+ sha256 = "1nx4ax233bnnj478cmjpm5c1qqmyn1navlihf10q6hhbanay9n99";
+ })
+ (fetchpatch {
+ url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindQuaZip5.patch";
+ sha256 = "0z1b2dz2zlz685mxgn8bmh1fyhxpf6dzd6jvkkjyk2kvnrdxv3b9";
+ })
+ ];
+
meta = with stdenv.lib; {
homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
description = "Plan your next outdoor trip";
diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..47b4641234f3ceb918e74489d8d4f5dad1861cf6
--- /dev/null
+++ b/pkgs/applications/misc/qt-box-editor/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, fetchFromGitHub
+, qtbase
+, qtsvg
+, qmake
+, leptonica
+, tesseract
+}:
+
+stdenv.mkDerivation rec {
+ pname = "qt-box-editor";
+ version = "unstable-2019-07-12";
+
+ src = fetchFromGitHub {
+ owner = "zdenop";
+ repo = "qt-box-editor";
+ rev = "75a68b466868ba41ba2886caa796057403fe1901";
+ sha256 = "0zwsyy7cnbhy5aazwlkhd9y8bnzlgy1gffqa46abajn4809b95k3";
+ };
+
+ buildInputs = [ qtbase qtsvg leptonica tesseract ];
+
+ nativeBuildInputs = [ qmake ];
+
+ # remove with next release
+ # https://github.com/zdenop/qt-box-editor/pull/78
+ postPatch = ''
+ printf "INSTALLS += target\ntarget.path = $out/bin" >> qt-box-editor.pro
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Editor of tesseract-ocr box files";
+ homepage = https://github.com/zdenop/qt-box-editor;
+ license = licenses.asl20;
+ maintainers = [ maintainers.costrouc ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix
index 9b1b0157769708314f0e7d14996be82a2a5c5af9..2255089ab7e2568a53ca1ca21c0167ca4829f37d 100644
--- a/pkgs/applications/misc/rofi-menugen/default.nix
+++ b/pkgs/applications/misc/rofi-menugen/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Generates menu based applications using rofi";
homepage = https://github.com/octotep/menugen;
- maintainers = with maintainers; [ garbas ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index a8e82998c3061ea0af11dd3785c1a93401764a4f..94381d4f6f962d0851b0242bd89c48493594a0b7 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
+{ stdenv, lib, fetchurl
+, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
, bison, flex, librsvg, check
}:
stdenv.mkDerivation rec {
- version = "1.5.2";
- name = "rofi-unwrapped-${version}";
+ pname = "rofi-unwrapped";
+ version = "1.5.4";
src = fetchurl {
- url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz";
- sha256 = "1rczxz6l32vnclarzga1sm1d5iq9rfscb9j7f8ih185n59hf0517";
+ url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz";
+ sha256 = "1g1170zmh5v7slnm1sm2d08jgz6icikf8rm17apm1bjzzyw1lhk7";
};
preConfigure = ''
@@ -22,13 +23,14 @@ stdenv.mkDerivation rec {
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
];
+
doCheck = false;
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Window switcher, run dialog and dmenu replacement";
- homepage = https://github.com/davatorium/rofi;
+ homepage = "https://github.com/davatorium/rofi";
license = licenses.mit;
- maintainers = with maintainers; [ mbakke garbas ma27 ];
+ maintainers = with maintainers; [ mbakke ma27 ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index c2384f56faa1a775636f915bd99dc9da85de4f18..8c24d27f07529e8bf06022663f7433bef0caa8cd 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -2,7 +2,9 @@
if theme == null then rofi-unwrapped else
stdenv.mkDerivation {
- name = "rofi-${rofi-unwrapped.version}";
+ pname = "rofi";
+ version = rofi-unwrapped.version;
+
buildInputs = [ makeWrapper ];
preferLocalBuild = true;
passthru.unwrapped = rofi-unwrapped;
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index d3f2d5a74e56f9e3770dcc6c8f657b6270cdc534..20211ecb53b18619f49ec97129efc855e99408f6 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -2,14 +2,14 @@
with python3Packages;
buildPythonApplication rec {
- version = "1.26.0";
+ version = "1.27.0";
pname = "rtv";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
- sha256 = "0smwlhc4sj92365pl7yy6a821xddmh9px43nbd0kdd2z9xrndyx1";
+ sha256 = "1hw7xy2kjxq7y3wcibcz4l7zj8icvigialqr17l362xry0y17y5j";
};
# Tests try to access network
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index 68be8b738de6dd81feff9ddf0004737e3545258e..e8e5c524a35c20c5be6204b44b66064330a1d1fe 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub, perl }:
-stdenv.mkDerivation {
- name = "urxvt-tabbedex-2016-08-17";
+stdenv.mkDerivation rec {
+ name = "urxvt-tabbedex-${version}";
+ version = "19.21";
src = fetchFromGitHub {
owner = "mina86";
repo = "urxvt-tabbedex";
- rev = "089d0cb724eeb62fa8a5dfcb00ced7761e794149";
- sha256 = "0a5jrb7ryafj55fgi8fhpy3gmb1xh5j7pbn8p5j5k6s2fnh0g0hq";
+ rev = "v${version}";
+ sha256 = "06msd156h6r8ss7qg66sjz5jz8613qfq2yvp0pc24i6mxzj8vl77";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
index f4a41a89e1c46fef40782e4221909550939b1f59..ba8ec3a6e72ab4bc20539f30035cc4045d6faadd 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
description = "urxvt plugin that allows to switch color themes during runtime";
homepage = https://github.com/felixr/urxvt-theme-switch;
license = "CCBYNC";
- maintainers = with maintainers; [ garbas ];
+ maintainers = with maintainers; [ ];
platforms = with platforms; unix;
};
}
diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
deleted file mode 100644
index 1f0a3a71be8bd9aebe1548661742257477b012fb..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
- boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU,
- glew, eigen, curl, gtest, nlopt, pcre, xorg, makeDesktopItem }:
-let
- AlienWxWidgets = perlPackages.buildPerlPackage rec {
- name = "Alien-wxWidgets-0.69";
- src = fetchurl {
- url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz";
- sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr";
- };
- propagatedBuildInputs = [
- pkgconfig perlPackages.ModulePluggable perlPackages.ModuleBuild
- gtk2 gtk3 wxGTK30
- ];
- };
-
- Wx = perlPackages.Wx.overrideAttrs (oldAttrs: {
- propagatedBuildInputs = [
- perlPackages.ExtUtilsXSpp
- AlienWxWidgets
- ];
- });
-
- WxGLCanvas = perlPackages.buildPerlPackage rec {
- name = "Wx-GLCanvas-0.09";
- src = fetchurl {
- url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz";
- sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka";
- };
- propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ];
- doCheck = false;
- };
-in
-stdenv.mkDerivation rec {
- name = "slic3r-prusa-edition-${version}";
- version = "1.41.3";
-
- enableParallelBuilding = true;
-
- nativeBuildInputs = [
- cmake
- makeWrapper
- ];
-
- buildInputs = [
- curl
- eigen
- glew
- pcre
- perl
- tbb
- which
- Wx
- WxGLCanvas
- xorg.libXdmcp
- xorg.libpthreadstubs
- ] ++ checkInputs ++ (with perlPackages; [
- boost
- ClassXSAccessor
- EncodeLocale
- ExtUtilsMakeMaker
- ExtUtilsTypemapsDefault
- ExtUtilsXSpp
- GrowlGNTP
- ImportInto
- IOStringy
- locallib
- LWP
- MathClipper
- MathConvexHullMonotoneChain
- MathGeometryVoronoi
- MathPlanePath
- ModuleBuildWithXSpp
- Moo
- NetDBus
- OpenGL
- XMLSAX
- ]);
-
- checkInputs = [ gtest ];
-
- # The build system uses custom logic - defined in
- # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source -
- # for finding the nlopt library, which doesn't pick up the package in the nix store.
- # We need to set the path via the NLOPT environment variable instead.
- NLOPT = "${nlopt}";
-
- prePatch = ''
- # In nix ioctls.h isn't available from the standard kernel-headers package
- # on other distributions. As the copy in glibc seems to be identical to the
- # one in the kernel, we use that one instead.
- sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp
-
- # PERL_VENDORARCH and PERL_VENDORLIB aren't set correctly by the build
- # system, so we have to override them. Setting them as environment variables
- # doesn't work though, so substituting the paths directly in CMakeLists.txt
- # seems to be the easiest way.
- sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
- sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
- '' + lib.optionalString (lib.versionOlder "2.5" nlopt.version) ''
- # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
- # now seems to be integrated into the main lib.
- sed -i 's|nlopt_cxx|nlopt|g' xs/src/libnest2d/cmake_modules/FindNLopt.cmake
- '';
-
- postInstall = ''
- echo 'postInstall'
- wrapProgram "$out/bin/slic3r-prusa3d" \
- --prefix PERL5LIB : "$out/lib/slic3r-prusa3d:$PERL5LIB"
-
- # it seems we need to copy the icons...
- mkdir -p $out/bin/var
- cp -r ../resources/icons/* $out/bin/var/
- cp -r ../resources $out/bin/
-
-
- mkdir -p "$out/share/pixmaps/"
- ln -s "$out/bin/var/Slic3r.png" "$out/share/pixmaps/slic3r-prusa.png"
- mkdir -p "$out/share/applications"
- cp "$desktopItem"/share/applications/* "$out/share/applications/"
- '';
-
- src = fetchFromGitHub {
- owner = "prusa3d";
- repo = "Slic3r";
- sha256 = "145dfsv610c5p0sngab9z7lzbk5383pq9l26mrrpf1wxdlxgljpl";
- rev = "version_${version}";
- };
-
- desktopItem = makeDesktopItem {
- name = "slic3r-Prusa-Edition";
- exec = "slic3r-prusa3d";
- icon = "slic3r-prusa";
- comment = "G-code generator for 3D printers";
- desktopName = "Slic3r Prusa Edition";
- genericName = "3D printer tool";
- categories = "Application;Development;";
- };
-
- meta = with stdenv.lib; {
- description = "G-code generator for 3D printer";
- homepage = https://github.com/prusa3d/Slic3r;
- license = licenses.agpl3;
- maintainers = with maintainers; [ tweber ];
- broken = stdenv.hostPlatform.isAarch64;
- };
-}
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index f9779beec0f4a83c01496061b839737481742742..d545447cb130660cf012db1214576a791cb4cbb0 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl";
};
- server = "${caddy.bin}/bin/caddy";
+ server = "${caddy}/bin/caddy";
linkcheck = "${linkchecker}/bin/linkchecker";
nativeBuildInputs = [ asciidoctor ];
diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix
index 6cb78e6d6bd7e6ccd212e5392047c5f4842002f6..1a1ea3102afd5f88ec715753c82f2044e37d473e 100644
--- a/pkgs/applications/misc/taskell/default.nix
+++ b/pkgs/applications/misc/taskell/default.nix
@@ -1,8 +1,8 @@
-{ haskell, lib, haskellPackages, fetchFromGitHub }:
+{ lib, haskellPackages, fetchFromGitHub }:
let
- version = "1.3.2";
- sha256 = "0cyysvkl8m1ldlprmw9mpvch3r244nl25yv74dwcykga3g5mw4aa";
+ version = "1.4.3";
+ sha256 = "0i12x7qzfmmdvi09k96x53zzzrva2w3zbl2f6dkxb8kk5scqqa4v";
in (haskellPackages.mkDerivation {
pname = "taskell";
@@ -35,10 +35,12 @@ in (haskellPackages.mkDerivation {
# containers
# directory
file-embed
+ fold-debounce
http-conduit
http-client
http-types
lens
+ raw-strings-qq
# mtl
# template-haskell
# text
@@ -55,5 +57,9 @@ in (haskellPackages.mkDerivation {
tasty-hunit
];
- license = lib.licenses.bsd3;
+ description = "Command-line Kanban board/task manager with support for Trello boards and GitHub projects";
+ homepage = "https://taskell.app";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ matthiasbeyer ];
+ platforms = with lib.platforms; unix ++ darwin;
})
diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix
index 65963f9aa34f6cfb2a937b455f07cbc03cc01e16..dc23443489ffb924c657fe131197ea0847a2798f 100644
--- a/pkgs/applications/misc/termdown/default.nix
+++ b/pkgs/applications/misc/termdown/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
buildPythonApplication rec {
name = "termdown-${version}";
- version = "1.14.1";
+ version = "1.15.0";
src = fetchFromGitHub {
rev = version;
- sha256 = "0jgjzglna0gwp0j31l48pny69szslczl13aahwjfjypkv9lx8w2a";
+ sha256 = "08l03yk5jc1g0gps789q1s2knnaqzlidy4s5q5nhwg9g25la19nr";
repo = "termdown";
owner = "trehn";
};
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 22f669f03294a73337eb9b35213501ab720f95c6..d4191a875bdded7d70c62fc9d3fbb83134ac4e3b 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,20 +1,26 @@
-{ stdenv, fetchFromGitHub, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "termite-${version}";
- version = "14";
+ version = "15";
src = fetchFromGitHub {
owner = "thestinger";
repo = "termite";
rev = "v${version}";
- sha256 = "0dmz9rpc2fdvcwhcmjnhb48ixn403gxpq03g334d1hgjw2hsyx7x";
+ sha256 = "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k";
fetchSubmodules = true;
};
# https://github.com/thestinger/termite/pull/516
patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch
- ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch;
+ # Fix off-by-one in select_text() on libvte >= 0.55.0
+ # Expected to be included in next release (16).
+ (fetchpatch {
+ url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch";
+ sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j";
+ })
+ ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch;
makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
@@ -36,7 +42,7 @@ stdenv.mkDerivation rec {
description = "A simple VTE-based terminal";
license = licenses.lgpl2Plus;
homepage = https://github.com/thestinger/termite/;
- maintainers = with maintainers; [ koral garbas ];
+ maintainers = with maintainers; [ koral ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/termite/wrapper.nix b/pkgs/applications/misc/termite/wrapper.nix
index 0b12a905360c9ab1156423d3278afee9e737fc6f..379223d9076d0c00a101030af0f7e2c2defb164b 100644
--- a/pkgs/applications/misc/termite/wrapper.nix
+++ b/pkgs/applications/misc/termite/wrapper.nix
@@ -1,4 +1,4 @@
-{ makeWrapper, wrapGAppsHook, symlinkJoin, configFile ? null, termite }:
+{ makeWrapper, symlinkJoin, configFile ? null, termite }:
if configFile == null then termite else symlinkJoin {
name = "termite-with-config-${termite.version}";
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index ed9ae5ade9ffb2fcf8640d818f287e4964fd674f..342eca0a6fdc64d33e2c0d4243c3f1c781486dbc 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tilix";
- version = "1.9.0";
+ version = "1.9.3";
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
rev = version;
- sha256 = "1k8hqpq6bzmn06b4s8c257n37ghgp3fl7l9g6fy0giwk1x0ix735";
+ sha256 = "0mg9y4xd2pnv0smibg7dyy733jarvx6qpdqap3sj7fpyni0jvpph";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/applications/misc/tmatrix/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3ef0eac2417a4a2092eb15ddca91492b204527a8
--- /dev/null
+++ b/pkgs/applications/misc/tmatrix/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub, cmake, ncurses }:
+
+stdenv.mkDerivation rec {
+ pname = "tmatrix";
+ version = "1.0";
+
+ src = fetchFromGitHub {
+ owner = "M4444";
+ repo = "TMatrix";
+ rev = "v${version}";
+ sha256 = "1g0gn4p02vjc6l8lc78wlx4xkd74ha7ybx9fvvdr6mizk0cyjili";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ ncurses ];
+
+ postInstall = ''
+ mkdir -p $out/share/man/man6
+ install -m 0644 ../tmatrix.6 $out/share/man/man6
+ '';
+
+ meta = with lib; {
+ description = "Terminal based replica of the digital rain from The Matrix";
+ longDescription = ''
+ TMatrix is a program that simulates the digital rain form The Matrix.
+ It's focused on being the most accurate replica of the digital rain effect
+ achievable on a typical terminal, while also being customizable and
+ performant.
+ '';
+ homepage = "https://github.com/M4444/TMatrix";
+ license = licenses.gpl2;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ infinisil ];
+ };
+}
diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index 148d6b042f7b7f3a7e00cc358d8056c76cca9d51..5bb2b5b94616914a72362ad5d9867cf73ab1b62f 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm";
};
- cargoSha256 = "1r7l9zbw6kq8yb5cv6h0qgl2gp71bkn9xv7b2n49a5r7by98jjqr";
+ cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id";
checkPhase = "cargo test --features=integration_tests";
diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix
index 66bfcbcf4d9aa06f42e9c3e93cd599cbd66c0ed0..dbac56abaa1d3c365d908653e9a3efc7e6ffc4f3 100644
--- a/pkgs/applications/misc/tthsum/default.nix
+++ b/pkgs/applications/misc/tthsum/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
cp obj-unix/tthsum $out/bin
'';
+ doCheck = !stdenv.isDarwin;
+
meta = with stdenv.lib; {
description = "An md5sum-alike program that works with Tiger/THEX hashes";
longDescription = ''
diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix
index a5d2f206f3a52ce15657be70030009e8362c44d6..c887876634f52fb3d65f4dc0e581ac0c7a945e3c 100644
--- a/pkgs/applications/misc/tzupdate/default.nix
+++ b/pkgs/applications/misc/tzupdate/default.nix
@@ -5,11 +5,11 @@ let
in
buildPythonApplication rec {
pname = "tzupdate";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "085kp4v9ijhkfvr0r5rzn4z7nrkb2qig05j0bajb0gkgynwf8wnz";
+ sha256 = "1sc3z2bx2nhnxg82x0jy19pr8lw56chbr90c2lr11w495csqwhz7";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..12cf96580f742b0f0e48c4c3ba694a972d7359fa
--- /dev/null
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -0,0 +1,105 @@
+{ stdenv
+, fetchurl
+, python27Packages
+, gnome3
+, gobject-introspection
+, wrapGAppsHook
+, webkitgtk
+, libnotify
+, keybinder3
+, libappindicator
+, intltool
+, wmctrl
+, hicolor-icon-theme
+, xvfb_run
+}:
+
+python27Packages.buildPythonApplication rec {
+ pname = "ulauncher";
+ version = "4.4.0.r1";
+
+ # Python 3 support is currently in development
+ # on the dev branch and 5.x.x releases
+ disabled = ! python27Packages.isPy27;
+
+ src = fetchurl {
+ url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
+ sha256 = "12v7qpjhf0842ivsfflsl2zlvhiaw25f9ffv7vhnkvrhrmksim9f";
+ };
+
+ nativeBuildInputs = with python27Packages; [
+ distutils_extra
+ intltool
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gnome3.adwaita-icon-theme
+ gobject-introspection
+ hicolor-icon-theme
+ keybinder3
+ libappindicator
+ libnotify
+ webkitgtk
+ wmctrl
+ ];
+
+ propagatedBuildInputs = with python27Packages; [
+ dbus-python
+ notify
+ pygobject3
+ pyinotify
+ pysqlite
+ python-Levenshtein
+ pyxdg
+ websocket_client
+ ];
+
+ checkInputs = with python27Packages; [
+ mock
+ pytest_3
+ pytest-mock
+ pytestpep8
+ xvfb_run
+ ];
+
+ patches = [
+ ./fix-path.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py --subst-var out
+ '';
+
+ # https://github.com/Ulauncher/Ulauncher/issues/390
+ doCheck = false;
+
+ preCheck = ''
+ export PYTHONPATH=$PYTHONPATH:$out/${python27Packages.python.sitePackages}
+ '';
+
+ # Simple translation of
+ # - https://github.com/Ulauncher/Ulauncher/blob/f5a601bdca75198a6a31b9d84433496b63530e74/test
+ checkPhase = ''
+ runHook preCheck
+
+ # skip tests in invocation that handle paths that
+ # aren't nix friendly (i think)
+ xvfb-run -s '-screen 0 1024x768x16' \
+ pytest -k 'not TestPath and not test_handle_key_press_event' --pep8 tests
+
+ runHook postCheck
+ '';
+
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ wmctrl ]}")
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A fast application launcher for Linux, written in Python, using GTK";
+ homepage = https://ulauncher.io/;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ aaronjanse worldofpeace ];
+ };
+}
diff --git a/pkgs/applications/misc/ulauncher/fix-path.patch b/pkgs/applications/misc/ulauncher/fix-path.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2936df65194eff9f67ac300cd020025383f0ef50
--- /dev/null
+++ b/pkgs/applications/misc/ulauncher/fix-path.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 3616104..e9bbfda 100755
+--- a/setup.py
++++ b/setup.py
+@@ -112,7 +112,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
+ DistUtilsExtra.auto.install_auto.run(self)
+
+ target_data = '/' + os.path.relpath(self.install_data, self.root) + '/'
+- target_pkgdata = target_data + 'share/ulauncher/'
++ target_pkgdata = '@out@/share/ulauncher/'
+ target_scripts = '/' + os.path.relpath(self.install_scripts,
+ self.root) + '/'
+
diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 43861d9f60a6f932d4e0a1c24c1198bbc5cabba6..87800cf90d6de3f67fec57bd18fdddc04709b630 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "urlscan";
- version = "0.9.2";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = "firecat53";
repo = pname;
rev = version;
- sha256 = "16cc1vvvhylrl9208d253k11rqzi95mg7hrf7xbd0bqxvd6rmxar";
+ sha256 = "0z24k8sk2zfp2pwysyp844vmhr5vbkj74frwy4i0v5pj60i9jl0v";
};
propagatedBuildInputs = [ python3Packages.urwid ];
diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
index 7649785524f1b5e8653d84288f584dd284c399a8..5cd8de43729bc4189b9bf2f8c3cff08254fcf18d 100644
--- a/pkgs/applications/misc/vcal/default.nix
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl ]; # for pod2man
- unpackPhase = ":";
+ dontUnpack = true;
dontBuild = true;
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index b61864e026a602424a804196187d6d79fe4616aa..9696ebac98bcbe44cc8bd561e090de068f25abef 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A vi-like file manager";
- maintainers = with maintainers; [ raskin garbas ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;
license = licenses.gpl2;
downloadPage = "https://vifm.info/downloads.shtml";
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index b7d0b330e85b0d8f869cfa8eff4e853f152b8fa3..50f2012d34ab35f50bb75cc9ca688b85efbe5049 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,19 +1,21 @@
{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
-, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme }:
+, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme
+, geoclue2, liboauth }:
stdenv.mkDerivation rec {
name = "viking-${version}";
- version = "1.6.2";
+ version = "1.7";
src = fetchurl {
url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
- sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz";
+ sha256 = "092q2dv0rcz12nh2js1z1ralib1553dmzy9pdrvz9nv2vf61wybw";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme
+ geoclue2 liboauth
];
configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];
diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
index 776ba8f081e3c93686deed56d9eafa4fa1e40bed..6fbe75aadfc99a424d94aa481777e47dc5f5154a 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja
-, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt
+, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, spdlog
, traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? false, libpulseaudio
, nlSupport ? true, libnl
@@ -8,14 +8,14 @@
, mpdSupport ? true, mpd_clientlib
}:
stdenv.mkDerivation rec {
- name = "waybar-${version}";
- version = "0.6.1";
+ pname = "waybar";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
- sha256 = "1hzwqg22sjiirx6743512271p3jlakrw0155av1phrv5b7p3ws8a";
+ sha256 = "0jj6sjsphyvdl4xy5wl64cl4p5y1vzr721cgapbd89g4y0cslsfy";
};
nativeBuildInputs = [
@@ -23,7 +23,7 @@
];
buildInputs = with stdenv.lib;
- [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt ]
+ [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog ]
++ optional traySupport libdbusmenu-gtk3
++ optional pulseSupport libpulseaudio
++ optional nlSupport libnl
@@ -31,19 +31,23 @@
++ optional swaySupport sway
++ optional mpdSupport mpd_clientlib;
- mesonFlags = [
- "-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }"
- "-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }"
- "-Dlibnl=${ if nlSupport then "enabled" else "disabled" }"
- "-Dlibudev=${ if udevSupport then "enabled" else "disabled" }"
- "-Dmpd=${ if mpdSupport then "enabled" else "disabled" }"
+ mesonFlags = (stdenv.lib.mapAttrsToList
+ (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
+ {
+ dbusmenu-gtk = traySupport;
+ pulseaudio = pulseSupport;
+ libnl = nlSupport;
+ libudev = udevSupport;
+ mpd = mpdSupport;
+ }
+ ) ++ [
"-Dout=${placeholder "out"}"
];
meta = with stdenv.lib; {
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
license = licenses.mit;
- maintainers = with maintainers; [ FlorianFranzen minijackson ];
+ maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 9657dd99e2117496e96be8b9b064d79a6f5628aa..69421e288d3483727f9c502a305fc82415573503 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "worker-${version}";
- version = "3.15.4";
+ version = "4.0.0";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
- sha256 = "03zixi4yqcl05blyn09mlgk102yjbir8bp0yi4czd1sng0rhfc9x";
+ sha256 = "0cs1sq7zpp787r1irhqk5pmxa26rjz55mbgda4823z9zkzwfxy19";
};
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index a01cef9227bf3c451b83f56d0dbf445cbcb7dd3b..13e4ed81a592071110a0e790c9b05ae91dd8e50c 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -1,21 +1,21 @@
-{ buildGoPackage
+{ buildGoModule
, fetchFromGitHub
, lib
}:
-buildGoPackage rec {
- name = "wtf-${version}";
- version = "0.4.0";
-
- goPackagePath = "github.com/senorprogrammer/wtf";
+buildGoModule rec {
+ pname = "wtf";
+ version = "0.11.0";
src = fetchFromGitHub {
- owner = "senorprogrammer";
- repo = "wtf";
- rev = "${version}";
- sha256 = "1vgjqmw27baiq9brmnafic3w3hw11p5qc6ahbdxi5n5n4bx7j6vn";
+ owner = "wtfutil";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1b671jhf3xaaisgpiad5apmvwkp40qr2hm4n21m0ya7k5ckps09z";
};
+ modSha256 = "0as736nnx7ci4w9gdp27g55g6dny9bh1fryz3g89gxm2sa2nlb9l";
+
buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
meta = with lib; {
diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix
index 969661ea7b4e9117408b7301b578035cdbf91f53..987b676034f605d49bc24b1d9a75a5d30dea14c6 100644
--- a/pkgs/applications/misc/xastir/default.nix
+++ b/pkgs/applications/misc/xastir/default.nix
@@ -1,23 +1,23 @@
{ stdenv, fetchFromGitHub, autoreconfHook
-, curl, db, gdal, libgeotiff
+, curl, db, libgeotiff
, libXpm, libXt, motif, pcre
, perl, proj, rastermagick, shapelib
}:
stdenv.mkDerivation rec {
pname = "xastir";
- version = "2.1.0";
+ version = "2.1.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "Release-${version}";
- sha256 = "16zsgy3589snawr8f1fa22ymvpnjy6njvxmsck7q8p2xmmz2ry7r";
+ sha256 = "1xfzd2m4l0zbb96ak2pniffxdrs9lax0amkxfgdsnyg8x5j0xcxm";
};
buildInputs = [
autoreconfHook
- curl db gdal libgeotiff
+ curl db libgeotiff
libXpm libXt motif pcre
perl proj rastermagick shapelib
];
diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix
index 945072ce026e4c1ccc0efc4bed4f53daeb9353b5..8875c95fe578e2c42d2902a394ca3dd0f8e2a8c4 100644
--- a/pkgs/applications/misc/xcruiser/default.nix
+++ b/pkgs/applications/misc/xcruiser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gccmakedep, xorg, imake, libXt, libXaw, libXpm, libXext }:
+{ stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }:
stdenv.mkDerivation {
name = "xcruiser-0.30";
diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix
index a12f3dc304ba4c64ef28f7736c4a4944200845e4..fc5abf1098947d8d1ca2f619d714265f31210c1b 100644
--- a/pkgs/applications/misc/xmind/default.nix
+++ b/pkgs/applications/misc/xmind/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, lib, dpkg, fetchurl, gtk2, jre, libXtst, makeWrapper }:
+{ stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }:
stdenv.mkDerivation rec {
name = "xmind-${version}";
- version = "7.5-update1";
+ version = "8-update8";
- src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
- url = "http://dl2.xmind.net/xmind-downloads/${name}-linux_i386.deb";
- sha256 = "04kr6pw0kwy715bp9wcnqnw1k5wl65xa87lhljrskm291p402jy1";
- } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
- url = "http://dl2.xmind.net/xmind-downloads/${name}-linux_amd64.deb";
- sha256 = "1j2ynhk7p3m3vd6c4mjwpnlzqgfj5c4q3zydab3nfwncwx6gaqj9";
- } else throw "platform ${stdenv.hostPlatform.system} not supported!";
+ src = fetchzip {
+ url = "https://xmind.net/xmind/downloads/${name}-linux.zip";
+ stripRoot = false;
+ sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn";
+ };
+
+ srcIcon = fetchurl {
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/xmind.png?h=xmind";
+ sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f";
+ };
- nativeBuildInputs = [ dpkg makeWrapper ];
+ patches = [ ./java-env-config-fixes.patch ];
- unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root";
+ nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
dontPatchELF = true;
@@ -22,12 +25,27 @@ stdenv.mkDerivation rec {
libPath = lib.makeLibraryPath [ gtk2 libXtst ];
- installPhase = ''
- mkdir -p $out
- cp -r usr/lib/xmind $out/libexec
- cp -r usr/bin usr/share $out
- rm $out/libexec/XMind.ini
- mv etc/XMind.ini $out/libexec
+ desktopItem = makeDesktopItem {
+ name = "XMind";
+ exec = "XMind";
+ icon = "xmind";
+ desktopName = "XMind";
+ comment = meta.description;
+ categories = "Office;";
+ mimeType = "application/xmind;xscheme-handler/xmind";
+ };
+
+ installPhase = let
+ targetDir = if stdenv.hostPlatform.system == "i686-linux"
+ then "XMind_i386"
+ else "XMind_amd64";
+ in ''
+ mkdir -p $out/{bin,libexec/configuration/,share/{applications/,fonts/,icons/hicolor/scalable/apps/}}
+ cp -r ${targetDir}/{configuration,p2,XMind{,.ini}} $out/libexec
+ cp -r {plugins,features} $out/libexec/
+ cp -r fonts $out/share/fonts/
+ cp "${desktopItem}/share/applications/XMind.desktop" $out/share/applications/XMind.desktop
+ cp ${srcIcon} $out/share/icons/hicolor/scalable/apps/xmind.png
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
$out/libexec/XMind
@@ -35,8 +53,17 @@ stdenv.mkDerivation rec {
wrapProgram $out/libexec/XMind \
--prefix LD_LIBRARY_PATH : "${libPath}"
- substituteInPlace "$out/bin/XMind" \
- --replace '/usr/lib/xmind' "$out/libexec"
+ # Inspired by https://aur.archlinux.org/cgit/aur.git/tree/?h=xmind
+ cat >$out/bin/XMind <=67.0
++ extraNativeBuildInputs;
preConfigure = ''
diff --git a/pkgs/applications/networking/browsers/firefox/fix-debug.patch b/pkgs/applications/networking/browsers/firefox/fix-debug.patch
deleted file mode 100644
index ba92bbc47403fab8c8c070b61f24cd01931dc04d..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/browsers/firefox/fix-debug.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-
-# HG changeset patch
-# User Michelangelo De Simone
-# Date 1479198095 28800
-# Node ID fde6e9ccfc72fbc0fcd93af7a40436b216e7ea1a
-# Parent 687eac6845a77d2cac5505da9c8912885c2a9e57
-Bug 1013882 - TestInterfaceJS should be packaged only if it's available. r=glandium, a=jcristau
-
-MozReview-Commit-ID: IEHesdoU4Sz
-
-diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
---- a/b2g/installer/package-manifest.in
-+++ b/b2g/installer/package-manifest.in
-@@ -570,17 +570,17 @@
- @RESPATH@/components/InputMethod.manifest
- #ifdef MOZ_B2G
- @RESPATH@/components/inputmethod.xpt
- #endif
-
- @RESPATH@/components/SystemUpdate.manifest
- @RESPATH@/components/SystemUpdateManager.js
-
--#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @RESPATH@/components/TestInterfaceJS.js
- @RESPATH@/components/TestInterfaceJS.manifest
- @RESPATH@/components/TestInterfaceJSMaplike.js
- #endif
-
- ; Modules
- @RESPATH@/modules/*
-
-diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
---- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -554,17 +554,17 @@
- @RESPATH@/components/PresentationControlService.js
- @RESPATH@/components/PresentationDataChannelSessionTransport.js
- @RESPATH@/components/PresentationDataChannelSessionTransport.manifest
-
- ; InputMethod API
- @RESPATH@/components/MozKeyboard.js
- @RESPATH@/components/InputMethod.manifest
-
--#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @RESPATH@/components/TestInterfaceJS.js
- @RESPATH@/components/TestInterfaceJS.manifest
- @RESPATH@/components/TestInterfaceJSMaplike.js
- #endif
-
- ; [Extensions]
- @RESPATH@/components/extensions-toolkit.manifest
- @RESPATH@/browser/components/extensions-browser.manifest
-diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
---- a/mobile/android/installer/package-manifest.in
-+++ b/mobile/android/installer/package-manifest.in
-@@ -381,17 +381,17 @@
-
- @BINPATH@/components/CaptivePortalDetectComponents.manifest
- @BINPATH@/components/captivedetect.js
-
- #ifdef MOZ_WEBSPEECH
- @BINPATH@/components/dom_webspeechsynth.xpt
- #endif
-
--#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @BINPATH@/components/TestInterfaceJS.js
- @BINPATH@/components/TestInterfaceJS.manifest
- @BINPATH@/components/TestInterfaceJSMaplike.js
- #endif
-
- @BINPATH@/components/nsAsyncShutdown.manifest
- @BINPATH@/components/nsAsyncShutdown.js
-
-
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index f4125374583ad870512fc6bd0dc4f2e2866dbab6..93449288075b8973ba9289a587342a705cffc7c7 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3, overrideCC, gccStdenv, gcc6 }:
+{ lib, callPackage, fetchurl, fetchFromGitHub, python3, overrideCC, gccStdenv, gcc6 }:
let
@@ -17,10 +17,10 @@ rec {
firefox = common rec {
pname = "firefox";
- ffversion = "66.0.3";
+ ffversion = "67.0.4";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "31pfzgys4dv4fskaasz47fviksjj9xp60r875q0i7z1n6kx25fzkpsg18a98fkqm3g8qmljccy93w68ysywnh1zzrv8djsaza7l0mz8";
+ sha512 = "3krwkc90m320a74vjyzlrxs4jc63cykbmpgisac9kv8m9n0bis5i1yf0dl9n14d9p4p541wvzhqygx7byj6mnvkhbk5b2l0nlvwias2";
};
patches = [
@@ -72,10 +72,10 @@ rec {
firefox-esr-60 = common rec {
pname = "firefox-esr";
- ffversion = "60.6.1esr";
+ ffversion = "60.7.2esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "3nl3cisn1sw3y6dxnv0bm143dpp091h1s9j7g73qfx5s6sfxl832lan177ikm00ay7fsly251vi1xz17wwicch1himsmhjisnd3ws51";
+ sha512 = "0mw5dgrxd5vj6cngd9v3dy6hzdsg82s0cs9fabhrzrl1dy3pqdkccqqnj9r0hxwmcrdgca3s35i5lwwmlljagq6nyb5q6qv4fzv0n0j";
};
patches = [
@@ -244,17 +244,17 @@ in rec {
gtk3Support = false;
};
- tor-browser-8-0 = tbcommon rec {
- ffversion = "60.6.1esr";
- tbversion = "8.0.8";
+ tor-browser-8-5 = tbcommon rec {
+ ffversion = "60.8.0esr";
+ tbversion = "8.5.4";
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
- # branch "tor-browser-60.6.1esr-8.0-1-slnos"
- rev = "dda14213c550afc522ef0bb0bb1643289c298736";
- sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz";
+ # branch "tor-browser-60.8.0esr-8.5-1-slnos"
+ rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d";
+ sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9";
};
patches = [
@@ -262,6 +262,6 @@ in rec {
];
};
- tor-browser = tor-browser-8-0;
+ tor-browser = tor-browser-8-5;
})
diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
index 0ead6de123aae890a3fd3b2622709324f234a016..e12b552535d2dad92db4d44ba377635507265405 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -1,5 +1,4 @@
{ writeScript
-, stdenv
, lib
, xidel
, common-updater-scripts
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 90df5c40395a56906d70812ba9c032694b4cf2dd..bc1678335947bef5a51d78ced2e22b7bcb457635 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -2,12 +2,13 @@
## various stuff that can be plugged in
, flashplayer, hal-flash
-, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2
+, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
, jrePlugin, icedtea_web
, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, esteidfirefoxplugin
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
+, tridactyl-native
, udev
, kerberos
}:
@@ -27,12 +28,12 @@ let
, extraPlugins ? []
, extraNativeMessagingHosts ? []
, gdkWayland ? false
+ , cfg ? config.${browserName} or {}
}:
assert gdkWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used
let
- cfg = config.${browserName} or {};
enableAdobeFlash = cfg.enableAdobeFlash or false;
ffmpegSupport = browser.ffmpegSupport or false;
gssSupport = browser.gssSupport or false;
@@ -67,6 +68,7 @@ let
([ ]
++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
++ lib.optional (cfg.enableBukubrow or false) bukubrow
+ ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
@@ -75,6 +77,7 @@ let
libs = lib.optional stdenv.isLinux udev
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos
+ ++ lib.optional gdkWayland libglvnd
++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
@@ -127,6 +130,7 @@ let
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
+ --set SNAP_NAME "firefox" \
${lib.optionalString gdkWayland ''
--set GDK_BACKEND "wayland" \
''}${lib.optionalString (browser ? gtk3)
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
index 60e9c603e29eca1322a82c90b2e26cb1a0847317..69beeb167590ed6ca48432c76355fa1d2f753ce2 100644
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/pkgs/applications/networking/browsers/luakit/default.nix
@@ -1,17 +1,9 @@
{ stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook
-, help2man, lua5, luafilesystem, luajit, sqlite
+, help2man, luafilesystem, luajit, sqlite
, webkitgtk, gtk3, gst_all_1, glib-networking
}:
-let
- lualibs = [luafilesystem];
- getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
- getLuaPath = lib : getPath lib "lua";
- getLuaCPath = lib : getPath lib "so";
- luaPath = stdenv.lib.concatStringsSep ";" (map getLuaPath lualibs);
- luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs);
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "luakit";
version = "2.1";
@@ -27,7 +19,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
- webkitgtk lua5 luafilesystem luajit sqlite gtk3
+ webkitgtk luafilesystem luajit sqlite gtk3
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav
@@ -36,8 +28,11 @@ in stdenv.mkDerivation rec {
preBuild = ''
# build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found
- # TODO: why is not this the default?
- LUA_PATH=?.lua
+ # TODO: why is not this the default? The test runner adds
+ # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils
+ # scripts don't add an equivalent
+ export LUA_PATH="$NIX_LUA_PATH;./?.lua;./?/init.lua"
+ export LUA_CPATH="$NIX_LUA_CPATH"
'';
makeFlags = [
@@ -54,8 +49,8 @@ in stdenv.mkDerivation rec {
in ''
gappsWrapperArgs+=(
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
- --set LUA_PATH '${luaKitPath};${luaPath};'
- --set LUA_CPATH '${luaCPath};'
+ --prefix LUA_PATH ';' "${luaKitPath};$NIX_LUA_PATH"
+ --prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
)
'';
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index cb44e79839b0ce34480eb95352d3cd5e21b3c89f..d6b775107d06d400a553a013aadd6411cf1be8e6 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
hardeningEnable = [ "pie" ];
configureFlags = [
+ "--enable-default-colors"
"--enable-widec"
"--enable-ipv6"
] ++ stdenv.lib.optional sslSupport "--with-ssl";
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 131209033836e09af429ee7911ebfe7066f18e87..fd21d9222d3d31a407e32e5764390913f46b9cfd 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
-, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3
+, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking
}:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 417bdf60b128d488445343a19213d28e525fff20..b4d0b91deac6e98f5067607abb2e23f4174fcb25 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "32.0.0.171";
+ version = "32.0.0.223";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "0dl2kxsn4wh3243qkwyq13ikbmz6ljg95a1v02cylz36kpfl51iv"
+ "165zsh4dzzsy38kc8yxp0jdygk4qid5xd642gchlky7z6fwza223"
else
- "1v9imcyml55qlvp0cibi5r5kl0rcivzvmnqgw8ph3xjm1yrxw3fr"
+ "1by2zqw9xgvpf1jnbf5qjl3kcjn5wxznl44f47f8h2gkgcnrf749"
else
if arch == "x86_64" then
- "1f3nl4qkws16q2yw940vvb0zmmwxks1blm4ida65hlda6f9zfq3h"
+ "07hbg98pgpp81v2sr4vw8siava7wkg1r6hg8i6rg00w9mhvn9vcz"
else
- "0df9nbxyn4wl4ap333mgnnmy994xj7i5hz07sw83pszlz3pjkc0m";
+ "1z2nmznmwvg3crdj3gbz2bxvi8dq2jk5yiwk79y90h199nsan1n2";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index cfee25bf3f80efe0ccaabbb5fd4757af6c61b320..585c0be26d1d69470f536c6602a2659ffb760743 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "32.0.0.171";
+ version = "32.0.0.223";
src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "0z4fkqbq1s63lpzfkyxllwx2wpizbabr4zim1dn7n59ld75vjxq8"
+ "1f3098vfznnx8d7rimgbalr2728jhzwca9val7pdi9b8yf9labwk"
else
- "0nvgcdmgvgbj6axrh0yzkk437bxwsaxl0mvfkcyyz1hxnq51dvvg";
+ "005iyajgp55ww25rcyxg5g0kbzddp6izfly9p4agahmzlzv18y4h";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 599a0a20d7d708663616af4fb4f78ef226b135da..732e020604a88da73e6f7adec97e6fff8b5e1c76 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -13,6 +13,7 @@
, glib
, gnome2
, gtk3
+, lib
, libX11
, libxcb
, libXScrnSaver
@@ -34,14 +35,14 @@
, stdenv
, systemd
, at-spi2-atk
+, at-spi2-core
}:
let
- mirror = https://get.geo.opera.com/pub/opera/desktop;
- version = "56.0.3051.99";
+ mirror = "https://get.geo.opera.com/pub/opera/desktop";
- rpath = stdenv.lib.makeLibraryPath [
+ rpath = lib.makeLibraryPath [
# These provide shared libraries loaded when starting. If one is missing,
# an error is shown in stderr.
@@ -86,15 +87,17 @@ let
libpulseaudio.out
at-spi2-atk
+ at-spi2-core
];
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
- name = "opera-${version}";
+ pname = "opera";
+ version = "62.0.3331.43";
src = fetchurl {
- url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
- sha256 = "1mf4lpb66w63kafjni5caq9k3lmsqd85161q29z5lr1s2cx9qqm8";
+ url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
+ sha256 = "0zylg32zn6blkgy4bwmjzc26i712lwakahvrd24ncpfa8805f7x7";
};
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
@@ -116,10 +119,10 @@ in stdenv.mkDerivation {
done
'';
- meta = {
- homepage = https://www.opera.com;
+ meta = with lib; {
+ homepage = "https://www.opera.com";
description = "Web browser";
platforms = [ "x86_64-linux" ];
- license = stdenv.lib.licenses.unfree;
+ license = licenses.unfree;
};
}
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index b6ccfdd921db0f8c81e8c46a0d28d30ae053c076..03a5aa7bfe21ce1e745c23edfc31396c84a590ed 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -21,12 +21,12 @@ let
in python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "1.6.1";
+ version = "1.6.3";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "1sckfp9l2jgg29p2p4vmd0g7yzbldimqy0a0jvf488yp47qj310p";
+ sha256 = "0z9an14vlv0r48x7fk0mk7465gnhh19dx1w63lyhsgnfqy5pzlhy";
};
# Needs tox
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index f37677b05213bcab80941971f2736adc74ca08ae..4eeb65826721362641d758cc2c106dac7a645859 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -89,7 +89,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "8.0.8";
+ version = "8.5.4";
lang = "en-US";
@@ -99,7 +99,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
- sha256 = "14ckbhfiyv01cxnd98iihfz7xvrgcd5k4j7pn9ag4a6xb2l80sxi";
+ sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z";
};
"i686-linux" = fetchurl {
@@ -107,7 +107,7 @@ let
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
- sha256 = "0g9sd104b6xnbl2j3gbq1ga6j2h0x3jccays0gpbd235bxpjs39a";
+ sha256 = "1b34skl3hwvpy0r4l5ykgnnwhbz7cvly2gi9ib4h7lijjfafiys1";
};
};
in
@@ -389,7 +389,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Tor Browser Bundle built by torproject.org";
longDescription = tor-browser-bundle.meta.longDescription;
- homepage = https://www.torproject.org/;
+ homepage = "https://www.torproject.org/";
platforms = attrNames srcs;
maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
hydraPlatforms = [];
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index 834be5cd3020551442907a0345cf1aef4ddfd033..dbe4ddca10f450358a2d8ceb54bc78daf6548320 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -21,8 +21,6 @@
, mediaSupport ? false
, ffmpeg
-, gmp
-
# Extensions, common
, zip
@@ -79,7 +77,7 @@ stdenv.mkDerivation rec {
buildInputs = [ tor-browser-unwrapped tor ];
- unpackPhase = ":";
+ dontUnpack = true;
buildPhase = ":";
@@ -280,7 +278,7 @@ stdenv.mkDerivation rec {
TZ=":" \
\
DISPLAY="\$DISPLAY" \
- XAUTHORITY="\$XAUTHORITY" \
+ XAUTHORITY="\''${XAUTHORITY:-}" \
DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \
\
HOME="\$HOME" \
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
index 86c2f53b9adde7e3cb2698b0725a157ac1665c48..bddac77d1d693d108833a507209fc81a3265ab2e 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
@@ -56,7 +56,7 @@
sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42";
};
- unpackPhase = ":";
+ dontUnpack = true;
installPhase = ''
install -m 444 -D $src "$out/$extid.xpi"
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index e5e162ff333fb4791ce5ec4b318f5454eceb2d33..ee477af8d4929acd721b7d1bee52c2594e06617d 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -9,6 +9,7 @@
, patchelf, makeWrapper
, isSnapshot ? false
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
+, enableWidevine ? false, vivaldi-widevine ? null
}:
let
@@ -16,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "2.4.1488.40-1";
+ version = "2.6.1566.44-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "0w084mamy72v1kkfgg8nn2q3hmfj7v216kkvqb52f1nyycqqzb37";
+ sha256 = "0bqx78bikcgrpg7qg10jylxa582fcxiwah7g2151hadvy8xl15ab";
};
unpackPhase = ''
@@ -50,8 +51,8 @@ in stdenv.mkDerivation rec {
--set-rpath "${libPath}" \
opt/${vivaldiName}/vivaldi-bin
'' + stdenv.lib.optionalString proprietaryCodecs ''
- sed -i '/^VIVALDI_FFMPEG_FOUND/ a \
- checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/${vivaldiName}/vivaldi
+ sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \
+ VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/${vivaldiName}
'' + ''
echo "Finished patching Vivaldi binaries"
'';
@@ -76,7 +77,11 @@ in stdenv.mkDerivation rec {
"$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
done
wrapProgram "$out/bin/vivaldi" \
- --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
+ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
+ ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
+ '' + stdenv.lib.optionalString enableWidevine ''
+ rm $out/opt/${vivaldiName}/libwidevinecdm.so
+ ln -s ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index ec2646440b31ad6285e7cd754f4a6c39b6b8ce44..3207409a6ba5a694e1de156d61cc5a9d00cbd2cf 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -1,53 +1,32 @@
{ stdenv, fetchurl
-, dbus-glib, gtk3, libexif, libXScrnSaver, ninja, nss
-, pciutils, pkgconfig, python2, xdg_utils, gn, at-spi2-core
+, dpkg
}:
stdenv.mkDerivation rec {
- name = "${product}-${version}";
- product = "vivaldi-ffmpeg-codecs";
- version = "72.0.3626.122";
+ name = "chromium-codecs-ffmpeg";
+ version = "74.0.3729.169";
src = fetchurl {
- url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
- sha512 = "1477g5dgi4m0zbiqwm9w6jqkmjfmgjlbl3qs9ljldx8bif8my1jbz4hzws954aqxyxdbf5rjpvmrrqqppk5347prvsyl37rbsndaaqf";
+ url = "https://launchpadlibrarian.net/424938057/${name}-extra_${version}-0ubuntu0.16.04.1_amd64.deb";
+ sha256 = "1ls2fshfk08hqsfvbd7p6rp2gv3n0xdy86rdh00wiz5qgl3skfzc";
};
- buildInputs = [ ];
+ buildInputs = [ dpkg ];
- nativeBuildInputs = [
- gtk3 libexif libXScrnSaver ninja nss pciutils python2 xdg_utils gn
- pkgconfig dbus-glib at-spi2-core.dev
- ];
-
- patches = [
- ];
-
- configurePhase = ''
- runHook preConfigure
-
- local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=false clang_use_chrome_plugins=false is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false"
- gn gen out/Release -v --args="$args"
-
- runHook postConfigure
+ unpackPhase = ''
+ dpkg-deb -x $src .
+ find .
'';
- buildPhase = ''
- ninja -C out/Release -v libffmpeg.so
- '';
-
- dontStrip = true;
-
installPhase = ''
- mkdir -p "$out/lib"
- cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so"
+ install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so
'';
meta = with stdenv.lib; {
description = "Additional support for proprietary codecs for Vivaldi";
homepage = "https://ffmpeg.org/";
license = licenses.lgpl21;
- maintainers = with maintainers; [ lluchs ];
+ maintainers = with maintainers; [ betaboon lluchs ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh
index fc04137a9b02e16cfd1ec9d3421f13eea34d1c70..2e6c2853eb1428ad22713978872d96b5e3c9abe1 100755
--- a/pkgs/applications/networking/browsers/vivaldi/update.sh
+++ b/pkgs/applications/networking/browsers/vivaldi/update.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p libarchive curl common-updater-scripts
-set -xeu -o pipefail
+set -eu -o pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
root=../../../../..
diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a21de1acad28761e7a104a7249e1e032db567dd2
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl
+, unzip
+}:
+
+stdenv.mkDerivation rec {
+ name = "widevine";
+ version = "4.10.1196.0";
+
+ src = fetchurl {
+ url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";
+ sha256 = "01c7nr7d2xs718jymicbk4ipzfx6q253109qv3lk4lryrrhvw14y";
+ };
+
+ buildInputs = [ unzip ];
+
+ unpackPhase = ''
+ unzip $src libwidevinecdm.so
+ find .
+ '';
+
+ installPhase = ''
+ install -vD libwidevinecdm.so $out/lib/libwidevinecdm.so
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Widevine support for Vivaldi";
+ homepage = "https://www.widevine.com";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ betaboon ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/w3m/no-x11.patch b/pkgs/applications/networking/browsers/w3m/no-x11.patch
index 83b3e96821f559b8c735dc9c0b9a1112d38f31a7..0816c022926d77b3586cd022f6dec766f6a243ed 100644
--- a/pkgs/applications/networking/browsers/w3m/no-x11.patch
+++ b/pkgs/applications/networking/browsers/w3m/no-x11.patch
@@ -1,14 +1,13 @@
Forget about X11 in fb module.
This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb.
diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c
-index ea36637..d3d7bc3 100644
+index 1a5151c..d3d7bc3 100644
--- a/w3mimg/fb/fb_imlib2.c
+++ b/w3mimg/fb/fb_imlib2.c
-@@ -3,7 +3,7 @@
+@@ -3,6 +3,7 @@
fb_imlib2.c 0.3 Copyright (C) 2002, hito
**************************************************************************/
--#include
+#define X_DISPLAY_MISSING
#include
#include "fb.h"
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index e8d732cf6178409bc4f1e1a81ed0268ae9f2d13d..3946bf88625067577c5d1b9b57d8823006c496a2 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -20,8 +20,7 @@ let
startupNotify = "true";
};
- attrs' = builtins.removeAttrs attrs ["version" "sha256"];
- in stdenv.mkDerivation rec {
+ in stdenv.mkDerivation rec {
name = "charles-${version}";
inherit version;
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index fd047147e01aa8bcbb0f72a3e1a9f60116be6945..1bc7cea54ebae476aeeb1521e724f51f1b6655bb 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,24 +2,26 @@
buildGoPackage rec {
name = "cloudflared-${version}";
- version = "2018.10.3";
+ version = "2019.7.0";
goPackagePath = "github.com/cloudflare/cloudflared";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
- rev = "41916365b689bf2cc1446ea5717e4d26cc8aed43"; # untagged
- sha256 = "109bhnmvlvj3ag9vw090fy202z8aaqr1rakhn8v550wwy30h9zkf";
+ rev = version;
+ sha256 = "19229p7c9m7v0xpmzi5rfwjzm845ikq8pndkry2si9azks18x77q";
};
goDeps = ./deps.nix;
+ buildFlagsArray = "-ldflags=-X main.Version=${version}";
+
meta = with stdenv.lib; {
description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)";
homepage = https://www.cloudflare.com/products/argo-tunnel;
license = licenses.unfree;
platforms = platforms.unix;
- maintainers = [ maintainers.thoughtpolice ];
+ maintainers = [ maintainers.thoughtpolice maintainers.enorris ];
};
}
diff --git a/pkgs/applications/networking/cloudflared/deps.nix b/pkgs/applications/networking/cloudflared/deps.nix
index da7f509378ddd1ca68fae77e1c526c132804a0e7..e5ca7be00705b4684664923825edf1a04113ba36 100644
--- a/pkgs/applications/networking/cloudflared/deps.nix
+++ b/pkgs/applications/networking/cloudflared/deps.nix
@@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
- rev = "b26d9c308763d68093482582cea63d69be07a0f0";
- sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry";
+ rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
@@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
- rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
- sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+ rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46";
+ sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
};
}
{
@@ -36,13 +36,22 @@
sha256 = "10112y4k8qing552n0df9w33cgminrzm6g3x7ng0vgin4sv59785";
};
}
+ {
+ goPackagePath = "github.com/cloudflare/golibs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cloudflare/golibs";
+ rev = "333127dbecfcc23a8db7d9a4f52785d23aff44a1";
+ sha256 = "170hbv9wyfmb5da9a6wjz2mphp0pylv23h8qp8h5kwa2i9frdqqi";
+ };
+ }
{
goPackagePath = "github.com/coredns/coredns";
fetch = {
type = "git";
url = "https://github.com/coredns/coredns";
- rev = "992e7928c7c258628d2b13b769acc86781b9faea";
- sha256 = "0mvlkca11ikwzii0p7g5a2z3gn1xrp7qmmjwklp4i52lbnsawzv0";
+ rev = "2e322f6e8a54f18c6aef9c25a7c432c291a3d9f7";
+ sha256 = "0s9x5yww1qd9pzh2w846g9qw0n86ygymjiqjn15ws6ha3nj5p75p";
};
}
{
@@ -59,8 +68,8 @@
fetch = {
type = "git";
url = "https://github.com/coreos/go-systemd";
- rev = "39ca1b05acc7ad1220e09f133283b8859a8b71ab";
- sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
+ rev = "95778dfbb74eb7e4dbaf43bf7d71809650ef8076";
+ sha256 = "1s3bg9p78wkixn2bqb2p23wbsqfg949ml6crw2b498s71mwh8rcf";
};
}
{
@@ -77,8 +86,8 @@
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
- rev = "346938d642f2ec3594ed81d874461961cd0faa76";
- sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+ rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
@@ -95,8 +104,8 @@
fetch = {
type = "git";
url = "https://github.com/equinox-io/equinox";
- rev = "f24972fa72facf59d05c91c848b65eac38815915";
- sha256 = "1d3620g1kxyzn8b3py2471qp8ssyzm1qnpbap9gxrmg8912wiww1";
+ rev = "5205c98a6c11dc72747ce12fff6cd620a99fde05";
+ sha256 = "19gya2zhs3xqfjh8y6s63yw9q8h1x710rl1drf4a1fmgdhaf2lrv";
};
}
{
@@ -140,8 +149,8 @@
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
- sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+ rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30";
+ sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
};
}
{
@@ -149,17 +158,8 @@
fetch = {
type = "git";
url = "https://github.com/google/uuid";
- rev = "064e2069ce9c359c118179501254f67d7d37ba24";
- sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
- };
- }
- {
- goPackagePath = "github.com/gorilla/context";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/context";
- rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
- sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+ rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4";
+ sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
};
}
{
@@ -167,8 +167,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/mux";
- rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
- sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
+ rev = "c5c6c98bc25355028a63748a498942a6398ccd22";
+ sha256 = "0im4da3hqxb6zr8g3m640qz234f5gs0a8hqhcz35mkvfqlv48f62";
};
}
{
@@ -198,13 +198,22 @@
sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
};
}
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e";
+ sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
+ };
+ }
{
goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
- rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8";
- sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r";
+ rev = "51e2106eed1cea199c802d2a49e91e2491b02056";
+ sha256 = "00kp0k7sd7xrv92crd2xja68z096b2fw0mlz58mdjlri9w72hqbf";
};
}
{
@@ -212,8 +221,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
- rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
- sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ rev = "3a70a971f94a22f2fa562ffcc7a0eb45f5daf045";
+ sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p";
};
}
{
@@ -221,8 +230,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
- rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
- sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+ rev = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7";
+ sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd";
};
}
{
@@ -248,8 +257,8 @@
fetch = {
type = "git";
url = "https://github.com/miekg/dns";
- rev = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1";
- sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx";
+ rev = "73601d4aed9d844322611759d7f3619110b7c88e";
+ sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm";
};
}
{
@@ -257,8 +266,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
- rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66";
- sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0";
+ rev = "af06845cf3004701891bf4fdb884bfe4920b3727";
+ sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
};
}
{
@@ -266,8 +275,8 @@
fetch = {
type = "git";
url = "https://github.com/opentracing/opentracing-go";
- rev = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38";
- sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
+ rev = "659c90643e714681897ec2521c60567dd21da733";
+ sha256 = "0aj9cbm21zsg1i5l25hz8gn0yf99yxyxcp1gqh3yd5g4knj2cgzf";
};
}
{
@@ -302,8 +311,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
- rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
- sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+ rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8";
+ sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
};
}
{
@@ -311,8 +320,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/common";
- rev = "7600349dcfe1abd18d72d3a1770870d9800a7801";
- sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
+ rev = "a82f4c12f983cc2649298185f296632953e50d3e";
+ sha256 = "0pcgnxrv2i31jljqzhkv5hpdz92f6zrkh2p1i7i59acfz1fxhq0s";
};
}
{
@@ -320,8 +329,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
- rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a";
- sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f";
+ rev = "8368d24ba045f26503eb745b624d930cbe214c79";
+ sha256 = "0cfrgsy82c964hcmzzyk6ccghpr9dkfvdlxa0cj9cfc0w94cqvrl";
};
}
{
@@ -329,8 +338,8 @@
fetch = {
type = "git";
url = "https://github.com/rifflock/lfshook";
- rev = "bf539943797a1f34c1f502d07de419b5238ae6c6";
- sha256 = "0hns4zidw8g3s5l9dyl894fnyjr0a5xgdvx26rnal9jrn4n6z835";
+ rev = "b9218ef580f59a2e72dad1aa33d660150445d05a";
+ sha256 = "0wxqjcjfg8c0klmdgmbw3ckagby3wg9rkga9ihd4fsf05x5scxrc";
};
}
{
@@ -338,8 +347,8 @@
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
- rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc";
- sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
+ rev = "839c75faf7f98a33d445d181f3018b5c3409a45e";
+ sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
};
}
{
@@ -347,8 +356,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
- sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+ rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71";
+ sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
};
}
{
@@ -356,8 +365,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602";
- sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
+ rev = "f416ebab96af27ca70b6e5c23d6a0747530da626";
+ sha256 = "1cmddgh6x1c3lij50r8245jhqgi4j00add4wjpqpc2dmcg5928m3";
};
}
{
@@ -365,8 +374,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "32a936f46389aa10549d60bd7833e54b01685d09";
- sha256 = "0f24khgx6s7idpnmwgkml4qyrqwkvdjd18aapn5rmybyhmrb57j7";
+ rev = "1da14a5a36f220ea3f03470682b737b1dfd5de22";
+ sha256 = "1ivqwn3r44vlldlj53669jvsd6klwsg7hmla7f0vz03ny8xz4lpz";
};
}
{
@@ -383,8 +392,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "ce36f3865eeb42541ce3f87f32f8462c5687befa";
- sha256 = "0dkmxn48l9g7w1247c473qlacfkfp8wyan54k9cbi79icdp65jja";
+ rev = "12500544f89f9420afe9529ba8940bf72d294972";
+ sha256 = "1y37dlbbsp1dkfqaf563fwlf3xl74ymswmy52faqyv0wpcbwixgy";
};
}
{
@@ -401,8 +410,8 @@
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
- rev = "ff3583edef7de132f219f0efc00e097cabcc0ec0";
- sha256 = "0bpzxk85fgvznmdf9356nzh8riqhwzcil9r2a955rbfn27lh4lmy";
+ rev = "d1146b9035b912113a38af3b138eb2af567b2c67";
+ sha256 = "1ry1vbbnfh7i3zrv3vmbsbmq2w8jmz88ykd6cxviijnxvms3zab8";
};
}
{
@@ -410,8 +419,8 @@
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
- rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8";
- sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3";
+ rev = "236199dd5f8031d698fb64091194aecd1c3895b2";
+ sha256 = "0rzpcmp5fscg3smn0aiaahgimv74smylg701na5px3pn5iymh94a";
};
}
{
@@ -428,8 +437,8 @@
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
{
@@ -441,4 +450,4 @@
sha256 = "0nzw3g8xpxyzwqqv3ja0iznd0j18l1rwagwhf9sinwdjjgmh51sy";
};
}
-]
+]
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix
index 2c7a026b277e61911ec3139efa9e8b0d06f2c937..cb7c41d0c8a13ead63836807f1c09145fe7ed2d5 100644
--- a/pkgs/applications/networking/cluster/click/default.nix
+++ b/pkgs/applications/networking/cluster/click/default.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
sha256 = "0sbj41kypn637z1w115w2h5v6bxz3y6w5ikgpx3ihsh89lkc19d2";
};
- cargoSha256 = "05asqp5312a1g26pvf5hgqhc4kj3iw2hdvml2ycvga33sxb7zm7r";
+ cargoSha256 = "1179a17lfr3001vp1a2adbkhdm9677n56af2c0zvkr18jas6b2w7";
patches = [ ./fix_cargo_lock_version.patch ];
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index 3f342ea04a03133e75c91052a517b794c4ab739a..88dbd177da048447f12f297781b34fd7b0dd812f 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -1,28 +1,17 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "cni-${version}";
- version = "0.6.0";
+ pname = "cni";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "containernetworking";
- repo = "cni";
+ repo = pname;
rev = "v${version}";
- sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
+ sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8";
};
goPackagePath = "github.com/containernetworking/cni";
-
- buildPhase = ''
- cd "go/src/${goPackagePath}"
- patchShebangs build.sh
- ./build.sh
- '';
-
- installPhase = ''
- install -Dm555 bin/cnitool $bin/bin/cnitool
- '';
-
meta = with stdenv.lib; {
description = "Container Network Interface - networking for Linux containers";
license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index fdefa48adbaff3217a4a8530fb9006a73d22d7bf..fb36d3729c05b5f0bdf8074ae430a3108d43e91a 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -1,22 +1,22 @@
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }:
stdenv.mkDerivation rec {
- name = "cni-plugins-${version}";
- version = "0.7.5";
+ pname = "cni-plugins";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
- sha256 = "1kfi0iz2hs4rq3cdkw12j8d47ac4f5vrpzcwcrs2yzmh2j4n5sz5";
+ sha256 = "07d8knnabfjipzvcqbq7h8gd940lln934xp57nf5x31d3hpmvzws";
};
buildInputs = [ removeReferencesTo go ];
buildPhase = ''
- patchShebangs build.sh
+ patchShebangs build_linux.sh
export "GOCACHE=$TMPDIR/go-cache"
- ./build.sh
+ ./build_linux.sh
'';
installPhase = ''
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index 41465766489e44c351c60c7e77fad793c6722624..d8fa1a04507a98c3bff7e27c7cedd1fc0dd18ed8 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, minikube }:
+{ stdenv, buildGoPackage, libvirt, pkgconfig, minikube }:
buildGoPackage rec {
pname = "docker-machine-kvm2";
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index dfe6513bf0c1062022497f1d35f382eeabf5077f..42c043d0007fe53d99c91aa6fa9878fe530f54c0 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -19,7 +19,7 @@ let
# perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files)
fetched-maven-deps = stdenv.mkDerivation {
name = "hadoop-${version}-maven-deps";
- inherit src postUnpack nativeBuildInputs buildInputs configurePhase;
+ inherit src postUnpack nativeBuildInputs buildInputs;
buildPhase = ''
while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
echo "timeout, restart maven to continue downloading"
@@ -51,7 +51,7 @@ let
fi
done
'';
- configurePhase = "true"; # do not trigger cmake hook
+ dontConfigure = true; # do not trigger cmake hook
mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e";
buildPhase = ''
# 'maven.repo.local' must be writable
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 73ec998ed8e81e92bab64e5a0e7acbe85bc01682..1faa0988a66d74023a136ca38579e417ce89cea3 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,19 +1,22 @@
-{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
-let version = "0.40.1"; in
+let version = "0.79.3"; in
-buildGoPackage {
- name = "helmfile-${version}";
+buildGoModule {
+ pname = "helmfile";
+ inherit version;
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
- sha256 = "02ir10070rpayv9s53anldwjy5ggl268shgf085d188wl6vshaiv";
+ sha256 = "0wgfpidpqyvh41dnw351v91z4szi1s6lqak9li2pmddz1rdkx66v";
};
goPackagePath = "github.com/roboll/helmfile";
+ modSha256 = "1ksz1c4j7mhsbq6ifqab04588d48c9glyhr4d3d4jyvi19qhwx1d";
+
nativeBuildInputs = [ makeWrapper ];
buildFlagsArray = ''
@@ -22,16 +25,15 @@ buildGoPackage {
'';
postInstall = ''
- wrapProgram $bin/bin/helmfile \
+ wrapProgram $out/bin/helmfile \
--prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
'';
-
meta = {
description = "Deploy Kubernetes Helm charts";
homepage = https://github.com/roboll/helmfile;
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ pneumaticat ];
+ maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index a521f394ebfb034ebd947f225e6b4c313aef919b..96f3354023cf9615b455373be30074cb4216da89 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "kops-${version}";
- version = "1.11.1";
+ version = "1.12.1";
goPackagePath = "k8s.io/kops";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = version;
owner = "kubernetes";
repo = "kops";
- sha256 = "0jia8dhawh786grnbpn64hvsdm6wz5p7hqir01q5xxpd1psnzygj";
+ sha256 = "09rmgazdrmnh1lqaayzfbn0ld7mbj9whihs9ijv5gf6si9p0ml9y";
};
buildInputs = [go-bindata];
diff --git a/pkgs/applications/networking/cluster/ksonnet/default.nix b/pkgs/applications/networking/cluster/ksonnet/default.nix
deleted file mode 100644
index b8bce931523763fb8a64576311531ddb6d63cd54..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/cluster/ksonnet/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub, ... }:
-
-buildGoPackage rec {
- version = "0.11.0";
- name = "ksonnet-${version}";
-
- src = fetchFromGitHub {
- owner = "ksonnet";
- repo = "ksonnet";
- rev = "v${version}";
- sha256 = "0z7gkgcsiclm72bznmzv5jcgx5rblndcsiqc0r2mwhxhmv19bs04";
- };
-
- goPackagePath = "github.com/ksonnet/ksonnet";
-
- meta = {
- description = "A CLI-supported framework that streamlines writing and deployment of Kubernetes configurations to multiple clusters";
- homepage = https://github.com/ksonnet/ksonnet;
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ flokli ];
- platforms = lib.platforms.unix;
- };
-}
diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix
index 2a43c23e73aa82c98fa0edb3a1330265e313ad9e..a3cb55ce329cb0712242a20832a14146ed412421 100644
--- a/pkgs/applications/networking/cluster/kube-router/default.nix
+++ b/pkgs/applications/networking/cluster/kube-router/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "kube-router-${version}";
- version = "0.2.5";
- rev = "v${version}";
+ pname = "kube-router";
+ version = "0.3.1";
goPackagePath = "github.com/cloudnativelabs/kube-router";
src = fetchFromGitHub {
- inherit rev;
owner = "cloudnativelabs";
- repo = "kube-router";
- sha256 = "1j6q6kg4qj75v2mdy9ivvwq8mx9fpdf0w08959l8imrp5byd56wv";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "06azrghcxp6n4bvrqxpwhmg60qk4jqcrkl1lh1rardlzhl71lk1h";
};
buildFlagsArray = ''
@@ -22,7 +21,7 @@ buildGoPackage rec {
${goPackagePath}/pkg/cmd.buildDate=Nix
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://www.kube-router.io/";
description = "All-in-one router, firewall and service proxy for Kubernetes";
license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bc01055244c890e801c840dbdad6cb5e908dd790
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ pname = "kube3d";
+ version = "1.1.0";
+
+ goPackagePath = "github.com/rancher/k3d";
+
+ src = fetchFromGitHub {
+ owner = "rancher";
+ repo = "k3d";
+ rev = "v${version}";
+ sha256 = "180q7a95znpkhfqcaw3asqrq22r6ppw98qsggp2wfm746mllg5pc";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/rancher/k3d";
+ description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ kuznero ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kube3d/deps.nix b/pkgs/applications/networking/cluster/kube3d/deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4fb2936a40b05a898896c2715a0d6296c8e897e7
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kube3d/deps.nix
@@ -0,0 +1,174 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+ {
+ goPackagePath = "github.com/Microsoft/go-winio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Microsoft/go-winio";
+ rev = "v0.4.12";
+ sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.0";
+ sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/distribution";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/distribution";
+ rev = "v2.7.1";
+ sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/docker";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/docker";
+ rev = "v1.13.1";
+ sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/go-connections";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/go-connections";
+ rev = "v0.4.0";
+ sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/go-units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/go-units";
+ rev = "v0.3.3";
+ sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "v0.0.4";
+ sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "v1.1.0";
+ sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/olekukonko/tablewriter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/olekukonko/tablewriter";
+ rev = "v0.0.1";
+ sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj";
+ };
+ }
+ {
+ goPackagePath = "github.com/opencontainers/go-digest";
+ fetch = {
+ type = "git";
+ url = "https://github.com/opencontainers/go-digest";
+ rev = "v1.0.0-rc1";
+ sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "v0.8.1";
+ sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.0";
+ sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+ };
+ }
+ {
+ goPackagePath = "github.com/urfave/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/cli";
+ rev = "v1.20.0";
+ sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "c2843e01d9a2";
+ sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "b630fd6fe46b";
+ sha256 = "0m84kwckmmc0z05kjb4dd43g1g61al32a4z593flpcbaqx8di5sd";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "d0b11bdaac8a";
+ sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+]
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index 1e16cf1afca1dd053c430c1313d49d4f1c9d5ef7..cf0116ba8569d6873e2b88b7318fbe3fecffc2d8 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -1,22 +1,22 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
-let version = "0.9.1"; in
+let version = "0.12.0"; in
buildGoPackage {
name = "kubecfg-${version}";
src = fetchFromGitHub {
- owner = "ksonnet";
+ owner = "bitnami";
repo = "kubecfg";
rev = "v${version}";
- sha256 = "010k33arxa4spaq923iazsisxgsaj8c7w4z250y9yrch8xxd74bi";
+ sha256 = "118p1fy6cihswwz03vp62cz8395hgfqd82nmfkw88fx7av23rfhb";
};
- goPackagePath = "github.com/ksonnet/kubecfg";
+ goPackagePath = "github.com/bitnami/kubecfg";
meta = {
description = "A tool for managing Kubernetes resources as code";
- homepage = https://github.com/ksonnet/kubecfg;
+ homepage = https://github.com/bitnami/kubecfg;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ benley ];
platforms = lib.platforms.unix;
diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix
index 4dbd3d38d31dd336f4b703010b4efd8ac95256a9..40d42408679eb7486a3cd7b05f9808838a6b3b29 100644
--- a/pkgs/applications/networking/cluster/kubectl/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, kubernetes }:
+{ stdenv, kubernetes }:
stdenv.mkDerivation {
name = "kubectl-${kubernetes.version}";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 3967883af55ec351ebceaf3f6a1d5fdde89e3bcd..190711e3096bd7c07614e8198180d9fa8541f1df 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.14.1";
+ version = "1.14.3";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "1cyln9nwry290fpffx6xxy0ll7ybib5ifja7nnq93f3f2p0sj421";
+ sha256 = "1r31ssf8bdbz8fdsprhkc34jqhz5rcs3ixlf0mbjcbq0xr7y651z";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 4263abf0771d92d9ba2805b3145dbaac7a460f2a..5b5d6a98e889a5337d29c64fbfccb2b94c47d9e8 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata, libvirt, qemu
-, gpgme, makeWrapper, vmnet, python
+, gpgme, makeWrapper, vmnet
, docker-machine-kvm, docker-machine-kvm2
, extraDrivers ? []
}:
@@ -14,9 +14,9 @@ let
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
- version = "1.0.0";
+ version = "1.0.1";
- kubernetesVersion = "1.14.0";
+ kubernetesVersion = "1.14.1";
goPackagePath = "k8s.io/minikube";
@@ -24,7 +24,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "170iy0h27gkz2hg485rnawdw069gxwgkwsjmfj5yag2kkgl7gxa3";
+ sha256 = "1fgyaq8789wc3h6xmn4iw6if2jxdv5my35yn6ipx3q6i4hagxl4b";
};
buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index a8161ed30771d8c37fac0a371eb598bfd175a705..5551f635bc36a2ccd0c44509a7d1f5bdbbb610b7 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -4,7 +4,7 @@
}:
let
- version = "1.33.0";
+ version = "1.34.0";
# Update these on version bumps according to Makefile
centOsIsoVersion = "v1.15.0";
@@ -18,7 +18,7 @@ in buildGoPackage rec {
owner = "minishift";
repo = "minishift";
rev = "v${version}";
- sha256 = "0n3pj410bgjblv27p55piln0vi618mnyzzswcyfc2v73bfnzrydf";
+ sha256 = "0nc1g4lmz5ww6rjyyanp9vq4sj6fvi9zf9qjc4lpsmapddhjkdy7";
};
nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index 9e55c2f8a0f3d73839e9d563236f7d94e4512c8e..63a127def7f5f905f8f28905ef0c9a01a1c98e2a 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "nomad-${version}";
- version = "0.8.7";
+ version = "0.9.3";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/nomad";
@@ -12,9 +12,13 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "nomad";
inherit rev;
- sha256 = "0nkqiqkrccfmn7qkbhd48m9m56ix4xb0a3ar0z0pl4sbm25rlj0b";
+ sha256 = "0hn9rr5v2y2pw0pmn27gz8dx5n964dsaf48sh0jhwc95b5q1rjwr";
};
+ # We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
+ # Ref: https://github.com/hashicorp/nomad/issues/5535
+ buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia";
+
meta = with stdenv.lib; {
homepage = https://www.nomadproject.io/;
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 6401194eac20332f0a97e16f9b1f6cbd2cb8483b..3572bfe7f5ba01ead52b5193ff03f14f4116622a 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -7,7 +7,7 @@
let
sha256 = {
"1.6.3" = "142hw73wf20d846l83ydx0yg7qj5qxywm4h7qrhwnd7lsy2sbnjf";
- "2.2.1" = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c";
+ "2.4.3" = "1dvvr1q3dz961bl7qigxngrp4ssrbll3g1s6nkra6gyr83pis96c";
}.${version};
in
diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
index bb0f3229ea5e0b5f958378dfce227808d9c0c89f..3218e6a25b39351dd02bb9a8f9e9a0e4202ac938 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -4,7 +4,7 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in
buildGoPackage rec {
name = "stern-${version}";
- version = "1.10.0";
+ version = "1.11.0";
goPackagePath = "github.com/wercker/stern";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "wercker";
repo = "stern";
rev = "${version}";
- sha256 = "05wsif0pwh2v4rw4as36f1d9r149zzp2nyc0z4jwnj9nx58nfpll";
+ sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/applications/networking/cluster/terraform-landscape/default.nix
index aa52350685057d4e1cf575346da0026e7bc8e9f8..1380005a1c150f532e16ff07504469828dd131d4 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-landscape/default.nix
@@ -1,7 +1,6 @@
{ lib, bundlerApp, ruby }:
-let
- version = (import ./gemset.nix).terraform_landscape.version;
-in bundlerApp {
+
+bundlerApp {
pname = "terraform_landscape";
inherit ruby;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 76178c0cd8b6813ce9f6bdc11b20c0b0c91b5566..b0a1d91ce6e0aec284a4050cf012ebb3b3cfb8df 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -4,22 +4,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-acme";
- version = "1.1.1";
- sha256 = "0fva2kw82s94r4s4dpk38kcmssmcr71ia9jyg1rqmc00ifilfrzj";
+ version = "1.3.4";
+ sha256 = "1kam9mwgqh31f1m8kn86bkdi4ccfj5h38f80g3frrla4p2zw9l55";
};
alicloud =
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
- version = "1.39.0";
- sha256 = "0m5fvqrvnb7v5iii67l743j3hq32rljrvnkgc7fcd46zrf38yl2h";
+ version = "1.47.0";
+ sha256 = "0w2shy850lp63y036xzhznr94dpyf5b369cddz7laycapknyzd39";
};
archive =
{
owner = "terraform-providers";
repo = "terraform-provider-archive";
- version = "1.2.1";
- sha256 = "1avx3m0dkld0kmsi8ifqcla8254p1izh5wrziffr7r05s152r8qf";
+ version = "1.2.2";
+ sha256 = "1saprj2r74b63z03n80m3mfj3vhgvlm4gp2hzqzjbdgibxsz4jaw";
};
arukas =
{
@@ -39,36 +39,36 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- version = "2.6.0";
- sha256 = "0hpnyid5w33n8ypwcz3a43gazbvk6m60b57qll2qgx6bm1q75b19";
+ version = "2.15.0";
+ sha256 = "0ms4x6ri4zi25jnp47f5vg6xj9xmz7jya0y0gbc4kdmy0nwdw8f9";
};
azuread =
{
owner = "terraform-providers";
repo = "terraform-provider-azuread";
- version = "0.2.0";
- sha256 = "01aiynw905gbn6dv23971yhwv0kfcbckcqp4f65sypn1l8szqyjg";
+ version = "0.4.0";
+ sha256 = "01s2qrabmydgnilkwis76ccx1sv8bkna3nbxn6ra75jvgh3q7d5d";
};
azurerm =
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- version = "1.25.0";
- sha256 = "1fhcljxz6cb5q1kd7aprxv1bga53x6fg65q5wkp985aaqnl42b8k";
+ version = "1.30.1";
+ sha256 = "0zxvj6k1xs151dik8yhjl31r563dsc7iykv32g10w5szyigvxqfd";
};
azurestack =
{
owner = "terraform-providers";
repo = "terraform-provider-azurestack";
- version = "0.5.0";
- sha256 = "0pi8hjl6350ibkiz5pi86p58gkj8jf0a27ar04npsrn2wcz90k8z";
+ version = "0.7.0";
+ sha256 = "0vlppfnwl0r4xf2fl405d93s0kxanh52h1chz04a95x2dcclvx69";
};
bigip =
{
owner = "terraform-providers";
repo = "terraform-provider-bigip";
- version = "0.12.0";
- sha256 = "0fmmlx757hph45ffm19zafjfkldg41qkw83vz0jjmvxicza1afbd";
+ version = "0.12.3";
+ sha256 = "1zlwk7jp5r45b3rwkxsq9mqf4nym3ifx56vhcvyc9a3w25s0ss8p";
};
bitbucket =
{
@@ -81,8 +81,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-brightbox";
- version = "1.1.1";
- sha256 = "03fh287fmbg9jxsiniwj3sn6nsjdm46qv82b5aaqny3qmhjddjvq";
+ version = "1.1.2";
+ sha256 = "0k9qs7kpjznascads5llajzx2xkm4hdil2n4wl0fqy43s6dkvbbf";
};
chef =
{
@@ -109,8 +109,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cloudflare";
- version = "1.13.0";
- sha256 = "01fgcycn5g53cx32xcgrpcpvjxwb8w11hs0f7s2bhg6cq0v9higj";
+ version = "1.15.0";
+ sha256 = "0mb771dw5fw2s6jd63sybwza49axyj9967fl454m3sznhpl96y8z";
};
cloudscale =
{
@@ -123,36 +123,36 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cloudstack";
- version = "0.2.0";
- sha256 = "1v46da55a8a0hnw319swz3pkd62afy7hdwzybxmp48hxh1i6af74";
+ version = "0.3.0";
+ sha256 = "0zmyww6z3j839ydlmv254hr8gcsixng4lcvmiwkhxb3hj1nw8hcw";
};
cobbler =
{
owner = "terraform-providers";
repo = "terraform-provider-cobbler";
- version = "1.0.1";
- sha256 = "1z0iijfrbbdrgszvc7jlcr4105zragbc0iq8x48vi24yipqgf5a8";
+ version = "1.1.0";
+ sha256 = "08ljqibfi6alpvv8f7pzvjl2k4w6br6g6ac755x4xw4ycrr24xw9";
};
consul =
{
owner = "terraform-providers";
repo = "terraform-provider-consul";
- version = "2.3.0";
- sha256 = "06b6yjmaq7sq26kfsqxlxmz5mnr1xsn1vywndh14grqwg6zmsrl6";
+ version = "2.5.0";
+ sha256 = "1nmldxn4y87fyb308dajjzcyvxrr6ka5nicyw84a8s7pixzbqh6q";
};
datadog =
{
owner = "terraform-providers";
repo = "terraform-provider-datadog";
- version = "1.8.0";
- sha256 = "1pmz4gxhfynj7mjcl07n2ggz00vccw4bv6cmp7na3ssbpnjiy1wx";
+ version = "1.9.0";
+ sha256 = "0c5s9ywd6p4qjd964y33rcqcgfqz225x5rp0jlsqxbv9i2r91fb0";
};
digitalocean =
{
owner = "terraform-providers";
repo = "terraform-provider-digitalocean";
- version = "1.1.0";
- sha256 = "1w5xslm8939rz13bsiv9hfcl8cyvi03gr0h24c0ybwj8alxmxhb4";
+ version = "1.4.0";
+ sha256 = "0a01768ncgmk1vrh2ir86s9iab1s5x8ciaz3fysgcgp9snh8yz4w";
};
dme =
{
@@ -165,8 +165,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-dns";
- version = "2.0.0";
- sha256 = "1km0pq1wp0bdccb612z9n0kj9w7hn1yvhk7xszwp2mzs8qmd7flv";
+ version = "2.1.1";
+ sha256 = "1iyfsx1fbpvp3zjrkq8c46nr6d80z40mzkfc4axfpqyrp9xqiy8j";
};
dnsimple =
{
@@ -179,8 +179,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-docker";
- version = "1.1.1";
- sha256 = "0bqwdx8hb7bym4hh01a0n1zrgb1081rvn0qawck712wz0jkzv1r3";
+ version = "1.2.0";
+ sha256 = "1w69kjlrgy4397c9nz3llqsqcjzchwqw1ksw4wg34xnnq20pd4ql";
};
dyn =
{
@@ -193,99 +193,99 @@
{
owner = "terraform-providers";
repo = "terraform-provider-external";
- version = "1.1.1";
- sha256 = "110kqp4gsag3l8h9hwjdq98s9rz9f5w31mrs50rygdc0yd43hq8z";
+ version = "1.1.2";
+ sha256 = "12wdzm3y0fd840bdf0dczvvmdmfwpfwfwnf0j4g6n9asdcvjaqlh";
};
fastly =
{
owner = "terraform-providers";
repo = "terraform-provider-fastly";
- version = "0.6.0";
- sha256 = "1z9qrqcib2rxy8s4glb4ggdkqcq7rwphiclsr1zncyly2n6887yj";
+ version = "0.6.1";
+ sha256 = "1p4j1n2x2y0n1kslfx62fx60v8b1acqv78gns1a5i0vgnnmmqcaj";
};
flexibleengine =
{
owner = "terraform-providers";
repo = "terraform-provider-flexibleengine";
- version = "1.4.0";
- sha256 = "1gj3y9xw9zzh2fs2i6q0afw591lhy1lvcn80xac4da08r5l3si6g";
+ version = "1.6.0";
+ sha256 = "0vz68nhpy93zsdssxzr41flrwhjqh7wcjrc4nklg6kmr99n6jcc6";
};
github =
{
owner = "terraform-providers";
repo = "terraform-provider-github";
- version = "1.3.0";
- sha256 = "1k7816dbpsjjbm3pa6l0qlrxw5hh8z5iwdr8mp1mp5liidhl6bqs";
+ version = "2.1.0";
+ sha256 = "05ca0vw6s7q40zcs50mr6k2swwx3a3njd4dxdz00qki58hgb87y6";
};
gitlab =
{
owner = "terraform-providers";
repo = "terraform-provider-gitlab";
- version = "1.2.0";
- sha256 = "11j84kyw2lsqsn6ya070hx0k6igb3hhjl8zlnr4q3gpmv51y23qc";
+ version = "2.2.0";
+ sha256 = "0iz5ggjkcip86cz2zmsryad34hly542grwzlm5rvpcmfw5csjadw";
};
google =
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- version = "2.4.0";
- sha256 = "153pr01m7clvdq9c09xhvlivagn12nlxhykh1x9yya9ixkg0zrrv";
+ version = "2.8.0";
+ sha256 = "1r4x7l20w8wb6a356vx71lra466p7hfww1jyv0bg7z1f015qs91l";
};
google-beta =
{
owner = "terraform-providers";
repo = "terraform-provider-google-beta";
- version = "2.4.0";
- sha256 = "08vbj9m6x0byf7x77a5b5isg0kmlxvc9gswgilzi6djgwg0j6wwd";
+ version = "2.8.0";
+ sha256 = "16ml6sd3g4wzcgm5qaphfyq3lcy33p8nmcahxrhrcvwnwl0kw5bs";
};
grafana =
{
owner = "terraform-providers";
repo = "terraform-provider-grafana";
- version = "1.3.0";
- sha256 = "1gyma31iv05nfy9jrd8zlkls35fbrxx4nrh56gdgwchv054rxzff";
+ version = "1.4.0";
+ sha256 = "1y41yhp82phgw83frkgrjzpymsys2abvdwa1n905rz7i15ybasqc";
};
hcloud =
{
owner = "terraform-providers";
repo = "terraform-provider-hcloud";
- version = "1.9.0";
- sha256 = "08ag1xwn6vj4w8kz37z8hsi8lkvfwkw5n8wjb5c03g9yva1j85yx";
+ version = "1.10.0";
+ sha256 = "18m2smpwcjp49wnylplrnlhfjrmim1qpvn1z70lwvb49liv8ldwf";
};
hedvig =
{
owner = "terraform-providers";
repo = "terraform-provider-hedvig";
- version = "1.0.3";
- sha256 = "0kqnbd78m4r97b5w7skkpcnhc0bqh2cky7q0inhdhsb7gvivz1b1";
+ version = "1.0.4";
+ sha256 = "0y6brzznxp8khdfbnpmnbjqf140411z0pvnp88p8mj2kmbk7kkjd";
};
helm =
{
owner = "terraform-providers";
repo = "terraform-provider-helm";
- version = "0.9.0";
- sha256 = "1psqabifb1kabg268ca1x4l79z1xga1pr2sf8x9lrd7z856v18l9";
+ version = "0.10.0";
+ sha256 = "09qxpgdljkfbyn1ihki2pp2m9wxmrxvp91d1myinml466jylxjar";
};
heroku =
{
owner = "terraform-providers";
repo = "terraform-provider-heroku";
- version = "1.9.0";
- sha256 = "1qabhf2qm7ba5jw6hclkcp2pw8c39ggrqkhhqg0bh03h220rl22x";
+ version = "2.0.0";
+ sha256 = "161pc6s4ifzi58cx32sdk9nan4kz6gn3mch1pnmp03f6390s2pcm";
};
http =
{
owner = "terraform-providers";
repo = "terraform-provider-http";
- version = "1.0.1";
- sha256 = "1bnqrx4xya3lm5wp4byy6npazll6w1g6bv4rawgncswsgx08zqng";
+ version = "1.1.1";
+ sha256 = "0ah4wi9gm5m7z0wyy6vn3baz2iw2sq7ah7q0lb9srwr887aai3x0";
};
huaweicloud =
{
owner = "terraform-providers";
repo = "terraform-provider-huaweicloud";
- version = "1.4.0";
- sha256 = "018b57cndl72vjlijwvjx64rxjgimcqq1f6dxdny3wj1j4i0h4fi";
+ version = "1.6.0";
+ sha256 = "03f92mq4ydfwnxh0v4sm6brllxw6m7kh8j19md9aq0wxcwr5wp6q";
};
icinga2 =
{
@@ -298,22 +298,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ignition";
- version = "1.0.1";
- sha256 = "1j9rgwrb4bnm8a44rg3d9fry46wlpfkwxxpkpw9y6l24php0qxh8";
+ version = "1.1.0";
+ sha256 = "0vpjbb70wnlrvw7z2zc92fbisgjk49ivdmv10ahyqlgvc23js5va";
};
influxdb =
{
owner = "terraform-providers";
repo = "terraform-provider-influxdb";
- version = "1.1.0";
- sha256 = "1mxvc3pwzgj7r79a5vz8n489xny12wa75zpppgh7948fy8m8b23f";
+ version = "1.2.0";
+ sha256 = "1nldywbwg5lgzhlq8hmisv63riipd0aaa4p5ya6qvx5cnj5yhsx8";
};
kubernetes =
{
owner = "terraform-providers";
repo = "terraform-provider-kubernetes";
- version = "1.5.2";
- sha256 = "0g1f5cbmzrd46abwd0rdyrf8wj8w9bx1251gf4s9z41adrxjy2lp";
+ version = "1.7.0";
+ sha256 = "0chr6v47398a3cvff9lwx4ffahcwv7fmzs6kjjqaidb1cv60d039";
};
librato =
{
@@ -333,8 +333,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-local";
- version = "1.2.1";
- sha256 = "1hi2bxa79fbdf2n6z59xdfs7bx8cg7q2l84hrxdh3cqbnb8jvsbr";
+ version = "1.2.2";
+ sha256 = "0azrw62clki002nlv7ws3kzfsbqkadm713534i4xgvix2m08d1cx";
};
logentries =
{
@@ -361,15 +361,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-mysql";
- version = "1.5.1";
- sha256 = "0i5s62z3cdg3mhahf09nyw8l2hcx6d7jp3hr3n8rcjwj3ajj8qis";
+ version = "1.6.0";
+ sha256 = "1kgldnrdz0mr99arxf85n8xbbxm96b5mg732c6zs38dgcq63mypx";
};
netlify =
{
owner = "terraform-providers";
repo = "terraform-provider-netlify";
- version = "0.1.0";
- sha256 = "1lf66nzqcgzjwvh1lv2jp8gcj6apdanlinci5pri8mgv5r1pv40l";
+ version = "0.3.0";
+ sha256 = "0mmbli6d3fbpyvvdfsg32f1w83g8ga3x21b36rgmx3mn156r7yij";
};
newrelic =
{
@@ -382,15 +382,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-nomad";
- version = "1.3.0";
- sha256 = "06kq0qkrgnj7z13xrgb9shid356m55mz0hkdbm4vfz3fx863mvl3";
+ version = "1.4.0";
+ sha256 = "04dh7gas6viny6bkx89fkwmxrw101b8bmw14m2mzfkxn70cl2na4";
};
ns1 =
{
owner = "terraform-providers";
repo = "terraform-provider-ns1";
- version = "1.3.0";
- sha256 = "1h21a4z7js2iwg0gj217lq4d7wccxhjmi5k37asfj18ch0x37c7v";
+ version = "1.4.0";
+ sha256 = "1zkmc6flmy48qawaf0l5r72xfwp46c842gd7kg35r06cihc9gavy";
};
nsxt =
{
@@ -403,22 +403,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-null";
- version = "2.1.1";
- sha256 = "0sw7j2cz9d5207l1v32ahqahmsk1dzzsf83zqivaa5jk3w4bfnjz";
+ version = "2.1.2";
+ sha256 = "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2";
};
nutanix =
{
owner = "terraform-providers";
repo = "terraform-provider-nutanix";
- version = "1.0.0";
- sha256 = "16nky5ryyjvv7vny18ymxvy20ivwmqw7lagnz48pq8mnwwrp5541";
+ version = "1.0.1";
+ sha256 = "1g7p6qg32g75x8fgspgxcdsa086mz3yabdgv1k68rykhw3zbri5d";
};
oci =
{
owner = "terraform-providers";
repo = "terraform-provider-oci";
- version = "3.23.0-rc1";
- sha256 = "11h8na7czj4iqm9z3pd8im06qqp3mng62h8ha5afvz2phv1g096h";
+ version = "3.29.0-rc1";
+ sha256 = "1rz61qndrrgknkd7bjbgvy28znllipr1v92cn1im43rzsmnz64y3";
};
oneandone =
{
@@ -431,22 +431,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-opc";
- version = "1.3.3";
- sha256 = "1hwbwyhjrs16cy66przs44znni0x3nwfsx18glxbikb2zx1ph93n";
+ version = "1.3.6";
+ sha256 = "1b11837j0d8s59pjkankbm3p5l87aw1s17mn2q7nvy65kgzalsra";
};
openstack =
{
owner = "terraform-providers";
repo = "terraform-provider-openstack";
- version = "1.17.0";
- sha256 = "1a3asmkf3w1ndy5rpyn09msp5l1sm2cdm3ca7cx5v00pjvww9f52";
+ version = "1.19.0";
+ sha256 = "1y9b9h523zflq4z9cwjgfa0l92j4ac5pc1r6vja1aw3gg2ln80x9";
};
opentelekomcloud =
{
owner = "terraform-providers";
repo = "terraform-provider-opentelekomcloud";
- version = "1.7.0";
- sha256 = "15p5xvl6ryj5silpd2yrmjjh0d4qf89v8x6zbq8x7j351a1fljak";
+ version = "1.9.0";
+ sha256 = "1nq6h6ds2fvxrmyf2v7w8prprl7pp6va8568jf0f775sag51wpl8";
};
opsgenie =
{
@@ -459,43 +459,43 @@
{
owner = "terraform-providers";
repo = "terraform-provider-oraclepaas";
- version = "1.5.1";
- sha256 = "0xyyhr2n1aw1qn90535llv72cdgdqpni9l4gn8sj0ligpjhba7qz";
+ version = "1.5.2";
+ sha256 = "0m886wfg5ski8s1zr7g1h1m6q5ai08jk35ymipxpb6ipx781qvvk";
};
ovh =
{
owner = "terraform-providers";
repo = "terraform-provider-ovh";
- version = "0.3.0";
- sha256 = "05bzkwa50alh8mpslh64dddp815m8df240w1mmphdmp9rsi6hqp8";
+ version = "0.5.0";
+ sha256 = "07n8ismxbv0gngh4kibqhr4ndqkrg6gxbpj3zl764rrwp54gwgbw";
};
packet =
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
- version = "1.7.2";
- sha256 = "103r0k626ham8wh7rwlx1hald4rik17mv2mcfjz9za65v7z139vr";
+ version = "2.2.1";
+ sha256 = "05zhrpynn2yrimlg553f0567b284x51g5yafz29g647vvsqd1rpn";
};
pagerduty =
{
owner = "terraform-providers";
repo = "terraform-provider-pagerduty";
- version = "1.2.1";
- sha256 = "1b0fbzqalcxngnxk51afxkhs82bj68sjakvb28p0im0x1lblxj0n";
+ version = "1.3.0";
+ sha256 = "1l3rk7c31qafadpg2b0mzvfx7lwwk82vcn489fr35rvmv99zfkh8";
};
panos =
{
owner = "terraform-providers";
repo = "terraform-provider-panos";
- version = "1.5.1";
- sha256 = "17w4zkc445bpfq6pqx575y5njsak18yca1y2by4chg9d05inphqd";
+ version = "1.5.2";
+ sha256 = "0sycgr4k4dlhxj5klmgg2xcw3xha06332ij8cfzz4xvgdq0xky3j";
};
postgresql =
{
owner = "terraform-providers";
repo = "terraform-provider-postgresql";
- version = "0.3.0";
- sha256 = "0z1xdzl5mn6dxgkgmysq06g3fg9cdlwa59ng42r6kffcbl0mwgfh";
+ version = "0.4.0";
+ sha256 = "0fywq1vzm8fcd0jcvzx1n3jilrk0r6ylqz9r4dwsyc64iqvmrpps";
};
powerdns =
{
@@ -522,15 +522,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rancher";
- version = "1.2.1";
- sha256 = "1z0gqchb268w5mw0519fbx4126nkxb9kvvay8vjj287yxdpi5grj";
+ version = "1.3.0";
+ sha256 = "0b62hhb87xqmc1izl5lyk2kvkrkgrjil5z1xwprfdl6yz4fnin0w";
};
random =
{
owner = "terraform-providers";
repo = "terraform-provider-random";
- version = "2.1.1";
- sha256 = "0ivmxacb9pzz7av2rr6jal5vwdv24689a2806nqvvzdy2s8mlzd3";
+ version = "2.1.2";
+ sha256 = "102bgd8s9yhm2ny2akv04mhwf5mphqhsxx9vxjbg7ygqnz9ka5nw";
};
rightscale =
{
@@ -543,8 +543,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rundeck";
- version = "0.1.0";
- sha256 = "0rp8cgnp8in52g7zkl2lj42hns0g27m8f7l42lhfnv6n2vv5qxcg";
+ version = "0.3.0";
+ sha256 = "10xhj3xxdhbdxq14linqabn8cm0gnnswfwr0r20s1yp7pn36lgkj";
};
runscope =
{
@@ -557,22 +557,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-scaleway";
- version = "1.9.2";
- sha256 = "0wjkjf4sc3rfxiz3lfw6cfhdn8a7pzmyfw1f2dsp3a6fpa2srbph";
+ version = "1.10.0";
+ sha256 = "0sbcvcd413f53b25piymmh4rfmlmqsxdscpar8gf2dx6mrsacgf0";
};
selectel =
{
owner = "terraform-providers";
repo = "terraform-provider-selectel";
- version = "2.1.0";
- sha256 = "078pyml9nwv7347yni1h7mjdp8sd4zyccv80mgjn8xh2q208fqpg";
+ version = "2.2.0";
+ sha256 = "1vw49ckcavzq8igc3091mzsqv9garzh1npwdwsyqb9367z5ib39m";
};
skytap =
{
owner = "terraform-providers";
repo = "terraform-provider-skytap";
- version = "0.9.0";
- sha256 = "15p2rfaqw5iab8fkxcxigp7nxvs4gmgr2v8ysfyjz01mgwidd0rq";
+ version = "0.10.0";
+ sha256 = "1rfyaf8zhcr74mhcjdsm659rzlncyaxvqqqrc1630a3bk4h8p3i1";
};
softlayer =
{
@@ -585,8 +585,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-spotinst";
- version = "1.11.0";
- sha256 = "10q1w66gbx6863797n6n15xx4llflmavrz2qk23pb8qd5pbni9bk";
+ version = "1.13.3";
+ sha256 = "0s75xlw8y3rz1ik11dnh3dzkk1jfklvq3wsf2fam0789z2j1zr1m";
};
statuscake =
{
@@ -606,15 +606,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-template";
- version = "2.1.1";
- sha256 = "182kdkbmnihpawvgfpxavg8vbczizw5mlkwp828ap0baqs09ai8i";
+ version = "2.1.2";
+ sha256 = "18w1mmma81m9j7yf6q500w8v9ss28w6sw2ynssl99pyw2gwmd04q";
};
tencentcloud =
{
owner = "terraform-providers";
repo = "terraform-provider-tencentcloud";
- version = "1.4.0";
- sha256 = "1gqxvd5ss2cg49856nj3srirny1298l3fla506r7v8xf9ybkzpb4";
+ version = "1.9.0";
+ sha256 = "0zgn3ndbcs6dgmz2y8qcns08rbwbfq633rbk6zgfck8pzqw2d2lr";
};
terraform =
{
@@ -627,15 +627,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tfe";
- version = "0.8.2";
- sha256 = "0apxf197g4mrxybbx1vrk2i3fnw4cf23aq1wjhks5fkvm4wshgl7";
+ version = "0.9.1";
+ sha256 = "0ww3fm8mgpqmv0ra0zbv560avcla76dkj2qxz9bdwzg7iz8vsj4s";
};
tls =
{
owner = "terraform-providers";
repo = "terraform-provider-tls";
- version = "1.2.0";
- sha256 = "0hvj00j8a820j18yi90xzhd635pkffivp1116d84wyqxya5acd4p";
+ version = "2.0.1";
+ sha256 = "08fh4k5fvkijl2ds8mxdc5fxlwhs11y5s48vvxdskklvkjhygzc7";
};
triton =
{
@@ -648,8 +648,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ucloud";
- version = "1.6.0";
- sha256 = "0ijksfjqc91gxf45w9h2r024zgyqpr4s7z6snyzxcdbnf8ahs9q0";
+ version = "1.10.1";
+ sha256 = "1c5w2816rf55khs534z780j0r8i6n8gqhkda21i32n9rj8y5clv1";
};
ultradns =
{
@@ -662,8 +662,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vault";
- version = "1.7.0";
- sha256 = "133ximk510kchr34zicpnp4da27nxvzab2nd8dqpf4sqg2z83i0y";
+ version = "1.8.0";
+ sha256 = "1g9cw14mzslb445yhj04dzs0s4cbhi4cxycd50vc3f9yyg6sz1rr";
};
vcd =
{
@@ -683,8 +683,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-yandex";
- version = "0.4.1";
- sha256 = "0lvj7xlzqc6wfv1xpc4qc1gnk3wvcvnifbf4mqgjglz35cf697bb";
+ version = "0.5.2";
+ sha256 = "1fa1jicirww0zxg5kw4343ndzq86x0m7gkfj8yx7l6lb6gcrkbic";
};
matchbox =
{
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 0922bd7b8a9fd81ca71c9234a97cd6659ce11ac8..c542de912f3466c173c8dae1fef625192a274c55 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -24,6 +24,7 @@ let
};
in
{
+ elasticsearch = callPackage ./elasticsearch {};
gandi = callPackage ./gandi {};
ibm = callPackage ./ibm {};
libvirt = callPackage ./libvirt {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ae456185a80ddb760ff6ff65ca5ebc9c7da0e3cb
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, buildGoModule }:
+buildGoModule rec {
+ name = "terraform-provider-elasticsearch-${version}";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "phillbaker";
+ repo = "terraform-provider-elasticsearch";
+ rev = "v${version}";
+ sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v";
+ };
+
+ modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p";
+
+ subPackages = [ "." ];
+
+ # Terraform allow checking the provider versions, but this breaks
+ # if the versions are not provided via file paths.
+ postInstall = "mv $out/bin/terraform-provider-elasticsearch{,_v${version}}";
+
+ meta = with stdenv.lib; {
+ description = "Terraform provider for elasticsearch";
+ homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ basvandijk ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index fad4a1d065210c9684ed70217437b3dda9193b38..f416daf4f881aa4d478380acd3beca2a0e591644 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -88,8 +88,8 @@ let
plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"];
in rec {
terraform_0_11 = pluggable (generic {
- version = "0.11.13";
- sha256 = "014d2ibmbp5yc1802ckdcpwqbm5v70xmjdyh5nadn02dfynaylna";
+ version = "0.11.14";
+ sha256 = "1bzz5wy13gh8j47mxxp6ij6yh20xmxd9n5lidaln3mf1bil19dmc";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
@@ -97,8 +97,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic {
- version = "0.12.0-beta1";
- sha256 = "0djakf2agbhpfqis4x0lf2i8s1ahvrdyfkcgr6lzp0nsks652rcm";
+ version = "0.12.4";
+ sha256 = "0hbrdnryfla6d3mjn2sf6qbi79slhd92s2xgcqk3bgvr1n6k0k7n";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index a8adf3deb5b5b4841e27e0493efca6a93da40039..86496d18e2e62f72b84b4bcdf4d02d76421670f7 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "tilt";
@@ -6,20 +6,20 @@ buildGoPackage rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.8.1";
- rev = "9ce987dd0eeb66df993f8d232b57ff3e4d380dda";
+ version = "0.8.8";
+ rev = "344dc1dc61ffe2c29606b105cea0df79fb5897f5";
src = fetchFromGitHub {
owner = "windmilleng";
repo = "tilt";
rev = "${rev}";
- sha256 = "0ybzj2csmjc7zlkprcyy5cnh9dxgngcx3wd6n43kawi5db0lvjn4";
+ sha256 = "13yda6m2d92mmc9w4k8ngdxmpqcqf86bkrvcpmpaby848ls1yx8g";
};
goPackagePath = "github.com/windmilleng/tilt";
subPackages = [ "cmd/tilt" ];
- buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-04-29");
+ buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-06-03");
meta = with stdenv.lib; {
description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index 48f85c80e0ebb85db498884bb736143ce85bf2ac..5d9a658972c36164a08906455d217a09cc65f166 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -1,14 +1,16 @@
-{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }:
+{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb
+, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli
+}:
stdenv.mkDerivation rec {
- name = "compactor-${version}";
- version = "0.11.1";
+ pname = "compactor";
+ version = "0.12.2";
src = fetchFromGitHub {
owner = "dns-stats";
- repo = "compactor";
- rev = "${version}";
- sha256 = "0bd82956nkpdmfj8f05z37hy7f33cd2nfdxr7s9fgz1xi5flnzjc";
+ repo = pname;
+ rev = version;
+ sha256 = "17p9wsslsh6ifnadvyygr0cgir4q4iirxfz9zpkpbhh76cx2qnay";
};
# cbor-diag, cddl and wireshark-cli are only used for tests.
@@ -19,14 +21,16 @@ stdenv.mkDerivation rec {
openssl
libtins
lzma
+ libctemplate
+ libmaxminddb
];
- patchPhase = ''
+ prePatch = ''
patchShebangs test-scripts/
'';
preConfigure = ''
- sh autogen.sh
+ ${stdenv.shell} autogen.sh
substituteInPlace configure \
--replace "/usr/bin/file" "${file}/bin/file"
'';
@@ -35,16 +39,19 @@ stdenv.mkDerivation rec {
"--with-boost-libdir=${boost.out}/lib"
"--with-boost=${boost.dev}"
];
+ enableParallelBuilding = true;
doCheck = true;
preCheck = ''
substituteInPlace test-scripts/check-live-pcap.sh \
--replace "/usr/sbin/tcpdump" "${tcpdump}/bin/tcpdump"
- '';
+ rm test-scripts/same-tshark-output.sh
+ ''; # TODO: https://github.com/dns-stats/compactor/issues/49 (failing test)
meta = with stdenv.lib; {
description = "Tools to capture DNS traffic and record it in C-DNS files";
- homepage = http://dns-stats.org/;
+ homepage = "http://dns-stats.org/";
+ changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt";
license = [ licenses.boost licenses.mpl20 licenses.openssl ];
maintainers = with maintainers; [ fdns ];
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index ce3141f0ef3aaeca391ea0717e9f2eb6e1c5d686..d820d40f7a34abc9ce4cdd9a13d23e525f353822 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms;
# Dropbox client to bootstrap installation.
# The client is self-updating, so the actual version may be newer.
let
- version = "63.4.107";
+ version = "73.4.118";
arch = {
"x86_64-linux" = "x86_64";
@@ -36,7 +36,7 @@ buildFHSUserEnv {
libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
libXxf86vm libxcb xkeyboardconfig
curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
- procps zlib mesa libxshmfence libpthreadstubs
+ procps zlib mesa libxshmfence libpthreadstubs libappindicator
];
extraInstallCommands = ''
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index d1eeaa48bb7b15c0dcf8d2989f275b89ff90c22f..a5b4c577b4cb102edd8b8663f10d271a0f9c637e 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -12,7 +12,7 @@ buildRustPackage rec {
sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b";
};
- cargoSha256 = "0k9d6pxsb4gvkqs00g71c1nnz773iccg4vajgn33qdym6m6qsjwy";
+ cargoSha256 = "1d7jpffkw2m2v37bfdqsl9sqwsl19cgglpa00lwy4ih09kzbc2n9";
buildInputs = [ makeWrapper openssl ];
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 87e0584c931efe4d093399814ca5fdd310c68da3..708d3c1ed800d1ff35042934394daa33518ec401 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
+{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
stdenv.mkDerivation rec {
- name = "esniper-2.35.0";
+ name = "esniper-2.35.0-15-g91d2665";
- src = fetchurl {
- url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz";
- sha256 = "04iwjb42lw90c03125bjdpnm0fp78dmwf2j35r7mah0nwcrlagd9";
- };
+ src = fetchgit {
+ url = "https://git.code.sf.net/p/esniper/git";
+ rev = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7";
+ sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0";
+ };
buildInputs = [ openssl curl ];
diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
index 22b2e2f43c45de46f1334894953a5f320da5971a..55932c5c1984436d3f69a37227529c015a76dea5 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala, gettext, python3
-, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
+, appstream-glib, desktop-file-utils, wrapGAppsHook
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}:
stdenv.mkDerivation rec {
pname = "feedreader";
- version = "2.8.2";
+ version = "2.9.2";
src = fetchFromGitHub {
owner = "jangernert";
repo = pname;
rev = "v${version}";
- sha256 = "1qm7scrz8xm68zizcfn13ll4ksdd004fahki7gbwqagsr1fg62y8";
+ sha256 = "1468kl1gip7h2k5l9x3shp3vxdnx08mr1n4845zinaqz4dpa70jv";
};
nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
]);
postPatch = ''
- patchShebangs meson_post_install.py
+ patchShebangs build-aux/meson_post_install.py
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 8b5f1ce3425c45d63a84987f201fd859b790355f..2795ac4e46e4055a6b0af3e1807217464f603cde 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, rustPlatform, fetchurl, fetchpatch, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
+{ stdenv, rustPlatform, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }:
rustPlatform.buildRustPackage rec {
name = "newsboat-${version}";
- version = "2.15";
+ version = "2.16.1";
src = fetchurl {
url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
- sha256 = "1dqdcp34jmphqf3d8ik0xdhg0s66nd5rky0y8y591nidq29wws6s";
+ sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0";
};
- cargoSha256 = "05pf020jp20ffmvin6d1g8zbwf1zk03bm1cb99b7iqkk4r54g6dn";
+ cargoSha256 = "0ck2dgfk4fay4cjl66wqkbnq4rqrd717jl63l1mvqmvad9i19igm";
postPatch = ''
substituteInPlace Makefile --replace "|| true" ""
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
'';
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ]
- ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ];
buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]
++ stdenv.lib.optional stdenv.isDarwin Security;
@@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec {
make
'';
- NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" ]
+ ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error=format-security";
doCheck = true;
@@ -48,7 +49,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
homepage = https://newsboat.org/;
- description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console.";
+ description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console";
maintainers = with maintainers; [ dotlambda nicknovitski ];
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index a43d52d73597d7c9872eb4631492acd41084d23b..c1a9fddb3c21c3df4d511e662835f42862efdc35 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "rssguard";
- version = "3.5.7";
+ version = "3.5.9";
src = fetchFromGitHub {
owner = "martinrotter";
repo = pname;
rev = version;
- sha256 = "1v0m2p6y7szdqbd2gl3972ah6cp6prfv2gp2a55ac1l8ba2dma4v";
+ sha256 = "0dvjcazvrgxfxg1gvznxj8kx569v4ivns0brq00cn2yxyd4wx43s";
};
buildInputs = [ qtwebengine qttools ];
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 704b7bb157901d31eb90707806373a0e85e1cba5..1833e641a07555f68fad04cc9dad84bc45183ce6 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -24,16 +24,20 @@ with python'.pkgs;
buildPythonApplication rec {
pname = "FlexGet";
- version = "2.20.22";
+ version = "2.21.8";
src = fetchPypi {
inherit pname version;
- sha256 = "1bk1ab7ivb6fikqw4v1f9df6brplgg4ybbn8d3vzgjabm5ic21nd";
+ sha256 = "0a3dz013xxlwxz94i243bahw15k5y45mgk0z1zgkp1xrbiwglwvc";
};
postPatch = ''
# remove dependency constraints
sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt
+
+ # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in
+ # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110
+ substituteInPlace requirements.txt --replace "zxcvbn-python" "zxcvbn"
'';
# ~400 failures
@@ -50,7 +54,7 @@ buildPythonApplication rec {
cherrypy flask flask-restful
flask-restplus flask-compress
flask_login flask-cors
- pyparsing zxcvbn-python future
+ pyparsing zxcvbn future
progressbar
# Optional requirements
deluge-client
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 49ac1d26dda601009a52d3a032a7f95a4c8c5ae8..530671e6173f0e548bb5c9277bf1b1c0d9180adb 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,34 +1,63 @@
-{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
-, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
+{ stdenv
+, fetchurl
-let version = "3.31.0"; in
-stdenv.mkDerivation {
- name = "filezilla-${version}";
+, dbus
+, gettext
+, gnutls
+, gtk2
+, libfilezilla
+, libidn
+, nettle
+, pkgconfig
+, pugixml
+, sqlite
+, tinyxml
+, wxGTK30
+, xdg_utils
+}:
+
+stdenv.mkDerivation rec {
+ pname = "filezilla";
+ version = "3.43.0";
src = fetchurl {
- url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
- sha256 = "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l";
+ url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
+ sha256 = "13i505y34b6lg7knzznf8812d9nwpnbf3hidpq58cbv8c31m5rkg";
};
configureFlags = [
"--disable-manualupdatecheck"
+ "--disable-autoupdatecheck"
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite
- pugixml libfilezilla nettle ];
+ dbus
+ gettext
+ gnutls
+ gtk2
+ libfilezilla
+ libidn
+ nettle
+ pugixml
+ sqlite
+ tinyxml
+ wxGTK30
+ xdg_utils
+ ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = https://filezilla-project.org/;
+ homepage = "https://filezilla-project.org/";
description = "Graphical FTP, FTPS and SFTP client";
- license = licenses.gpl2;
longDescription = ''
FileZilla Client is a free, open source FTP client. It supports
FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available
under many platforms, binaries for Windows, Linux and macOS are
provided.
'';
+ license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
};
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index cda455d9e56e85a5716c0f9b8495a2cdefc55f25..ef4009b0e96c8043725e6ee4be881526b872a2fa 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,16 +1,16 @@
-{ callPackage, stdenv }:
+{ callPackage }:
let
- stableVersion = "2.1.16";
- previewVersion = "2.2.0a5";
+ stableVersion = "2.1.21";
+ previewVersion = "2.2.0b4";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
- guiSrcHash = "03d7yjdnks568njkrgyh7g6c3vf6v7wkifshz2bcvry79pp2h4nl";
- serverSrcHash = "0p331aaqxw16kk5l2074qn9a7ih6fkivm05n8da3fwydzp9hjmcp";
+ guiSrcHash = "1ydmib302r1cpm2z9pzsfp4ygxrbmskwszsip397n92qx3l9a9v3";
+ serverSrcHash = "1ahn1xq1f0wx46i0c8idz96dxfbakk37pqi6amy91594mdlp8yr4";
in {
guiStable = mkGui {
stable = true;
@@ -18,7 +18,7 @@ in {
};
guiPreview = mkGui {
stable = false;
- sha256Hash = "0p4g5hszys68ijzsi2rb89j1rpg04wlqlzzrl92npvqqf2i0jdf8";
+ sha256Hash = "03jlg4ncs69gv1dn1zsdm0ipvlg6r0lwf8myxric6vv4ks7qqd3w";
};
serverStable = mkServer {
@@ -27,6 +27,6 @@ in {
};
serverPreview = mkServer {
stable = false;
- sha256Hash = "1yvdfczi8ah9m7b49l7larfs678hh7c424i1f73kivfds6211bj5";
+ sha256Hash = "0mzn62649hmmqq8z2vphqvi0w38jwq8ps4zzbl1dqygbf4gadnqa";
};
}
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 556d341231f6f2593ca60171498d2948951ef743..f681f3fa63b67e591333b813f7ac508eba6ea86d 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -1,6 +1,6 @@
{ stable, branch, version, sha256Hash }:
-{ stdenv, python3, fetchFromGitHub, fetchpatch }:
+{ stdenv, python3, fetchFromGitHub }:
let
python = if stable then python3.override {
@@ -22,10 +22,10 @@ let
doCheck = false;
});
aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec {
- version = "0.5.3";
+ version = "0.6.0";
src = oldAttrs.src.override {
inherit version;
- sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
+ sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4";
};
propagatedBuildInputs = with self; [ aiohttp ]
++ stdenv.lib.optional (pythonOlder "3.5") typing;
@@ -45,8 +45,8 @@ in python.pkgs.buildPythonPackage {
};
postPatch = ''
- # "typing" is only required for Python 3.4 and breaks Python 3.7:
- sed -iE "s/.*typing.*//" requirements.txt
+ # Only 2.x is problematic:
+ sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt
'';
propagatedBuildInputs = with python.pkgs; [
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 8d9df407cdd385ef1e41f76db976baa74d433565..75e1791644b8162f8cebfedd0563efaa9802185f 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -3,11 +3,11 @@
, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
}:
stdenv.mkDerivation rec {
- version = "0.6.2";
+ version = "0.6.3";
name = "baresip-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
- sha256 = "1qi8im5sc3jbpic1sn46mmd98y0pckpnngf4n8dqdp76m4gf3yp1";
+ sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [zlib openssl libre librem cairo mpg123
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
index bed5b17a5ce52fb61c06c9a6f1b71704c8cd47a0..e1e851b13bbd14d281aa12e0deb6f4257b1ab80e 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
+ export BITLBEE_DATADIR=$out/share/bitlbee
./autogen.sh
'';
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/sm00th/bitlbee-discord;
license = licenses.gpl2Plus;
- maintainers = [ maintainers.lassulus ];
+ maintainers = with maintainers; [ lassulus jb55 ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..becf828a85679154a3efe1b2baaa32d61b0ed8b4
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:
+
+stdenv.mkDerivation rec {
+ pname = "chatterino2";
+ version = "unstable-2019-05-11";
+ src = fetchFromGitHub {
+ owner = "fourtf";
+ repo = pname;
+ rev = "8c46cbf571dc8fd77287bf3186445ff52b1d1aaf";
+ sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk";
+ fetchSubmodules = true;
+ };
+ nativeBuildInputs = [ qmake pkgconfig ];
+ buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
+ meta = with stdenv.lib; {
+ description = "A chat client for Twitch chat";
+ longDescription = ''
+ Chatterino is a chat client for Twitch chat. It aims to be an
+ improved/extended version of the Twitch web chat. Chatterino 2 is
+ the second installment of the Twitch chat client series
+ "Chatterino".
+ '';
+ homepage = "https://github.com/fourtf/chatterino2";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ rexim ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix
new file mode 100644
index 0000000000000000000000000000000000000000..63149d3d54b981305a565124a9272d8df658b055
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/discord/base.nix
@@ -0,0 +1,61 @@
+{ pname, version, src, binaryName, desktopName
+, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
+, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
+, gdk_pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
+, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
+, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
+
+let
+ inherit binaryName;
+in stdenv.mkDerivation rec {
+ inherit pname version src;
+
+ nativeBuildInputs = [ wrapGAppsHook ];
+
+ dontWrapGApps = true;
+
+ libPath = stdenv.lib.makeLibraryPath [
+ libcxx systemd libpulseaudio
+ stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
+ gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
+ libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
+ libXtst nspr nss libxcb pango systemd libXScrnSaver
+ ];
+
+ installPhase = ''
+ mkdir -p $out/{bin,opt/${binaryName},share/pixmaps}
+ mv * $out/opt/${binaryName}
+
+ chmod +x $out/opt/${binaryName}/${binaryName}
+ patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
+ $out/opt/${binaryName}/${binaryName}
+
+ wrapProgram $out/opt/${binaryName}/${binaryName} \
+ "''${gappsWrapperArgs[@]}" \
+ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+ --prefix LD_LIBRARY_PATH : ${libPath}
+
+ ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
+ ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${binaryName}.png
+
+ ln -s "${desktopItem}/share/applications" $out/share/
+ '';
+
+ desktopItem = makeDesktopItem {
+ name = pname;
+ exec = binaryName;
+ icon = pname;
+ inherit desktopName;
+ genericName = meta.description;
+ categories = "Network;InstantMessaging;";
+ };
+
+ meta = with stdenv.lib; {
+ description = "All-in-one cross-platform voice and text chat for gamers";
+ homepage = "https://discordapp.com/";
+ downloadPage = "https://discordapp.com/download";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ ldesgoui MP2E tadeokondrak ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 1eba34423426ff6fdf08abb02ef0c99c3422d9ab..c9dfc79d26727b88c87046bf3e99ff8aef3ed6a3 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,65 +1,36 @@
-{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
-, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
-, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
-, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
-, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
-
-stdenv.mkDerivation rec {
+{ branch ? "stable", pkgs }:
+let
+ inherit (pkgs) callPackage fetchurl;
+in {
+ stable = callPackage ./base.nix {
pname = "discord";
+ binaryName = "Discord";
+ desktopName = "Discord";
version = "0.0.9";
-
src = fetchurl {
- url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz";
- sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf";
+ url = "https://dl.discordapp.net/apps/linux/0.0.9/discord-0.0.9.tar.gz";
+ sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf";
};
-
- nativeBuildInputs = [ wrapGAppsHook ];
-
- dontWrapGApps = true;
-
- libPath = stdenv.lib.makeLibraryPath [
- libcxx systemd libpulseaudio
- stdenv.cc.cc alsaLib atk at-spi2-atk cairo cups dbus expat fontconfig freetype
- gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
- libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
- libXtst nspr nss libxcb pango systemd libXScrnSaver
- ];
-
- installPhase = ''
- mkdir -p $out/{bin,opt/discord,share/pixmaps}
- mv * $out/opt/discord
-
- chmod +x $out/opt/discord/Discord
- patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
- $out/opt/discord/Discord
-
- wrapProgram $out/opt/discord/Discord \
- "''${gappsWrapperArgs[@]}" \
- --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
- --prefix LD_LIBRARY_PATH : ${libPath}
-
- ln -s $out/opt/discord/Discord $out/bin/
- ln -s $out/opt/discord/discord.png $out/share/pixmaps
-
- ln -s "${desktopItem}/share/applications" $out/share/
- '';
-
- desktopItem = makeDesktopItem {
- name = pname;
- exec = "Discord";
- icon = pname;
- desktopName = "Discord";
- genericName = meta.description;
- categories = "Network;InstantMessaging;";
+ };
+ ptb = callPackage ./base.nix {
+ pname = "discord-ptb";
+ binaryName = "DiscordPTB";
+ desktopName = "Discord PTB";
+ version = "0.0.15";
+ src = fetchurl {
+ url = "https://dl-ptb.discordapp.net/apps/linux/0.0.15/discord-ptb-0.0.15.tar.gz";
+ sha256 = "0znqb0a3yglgx7a9ypkb81jcm8kqgc6559zi7vfqn02zh15gqv6a";
};
-
- meta = with stdenv.lib; {
- description = "All-in-one cross-platform voice and text chat for gamers";
- homepage = https://discordapp.com/;
- downloadPage = "https://github.com/crmarsh/discord-linux-bugs";
- license = licenses.unfree;
- maintainers = [ maintainers.ldesgoui maintainers.MP2E ];
- platforms = [ "x86_64-linux" ];
+ };
+ canary = callPackage ./base.nix {
+ pname = "discord-canary";
+ binaryName = "DiscordCanary";
+ desktopName = "Discord Canary";
+ version = "0.0.85";
+ src = fetchurl {
+ url = "https://dl-canary.discordapp.net/apps/linux/0.0.85/discord-canary-0.0.85.tar.gz";
+ sha256 = "0kr2mxpghqbj856l09fgw3cmlbdv9h2cd5gxwaymnnywif7czp4j";
};
-}
+ };
+}.${branch}
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 7129e0a1e831dcd2be6bd7163195148e994c55a7..9886c2fa2ed9ef643966f45cfc232ff6aaec394e 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -5,10 +5,11 @@
, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
stdenv.mkDerivation rec {
- name = "ekiga-4.0.1";
+ pname = "ekiga";
+ version = "4.0.1";
src = fetchurl {
- url = "mirror://gnome/sources/ekiga/4.0/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b";
};
@@ -52,17 +53,21 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
+ passthru = {
+ updateInfo = {
+ downloadPage = "mirror://gnome/sources/ekiga";
+ };
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "VOIP/Videoconferencing app with full SIP and H.323 support";
+ homepage = "https://www.ekiga.org/";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
-
- passthru = {
- updateInfo = {
- downloadPage = "mirror://gnome/sources/ekiga";
- };
- };
}
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 45137aafcaeb7d6492a99f5e2519544b963cf244..bb8b721a8ac03020194bd7387bd1870fd5d35fb1 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gtksourceview
-, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
+{ stdenv, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gtksourceview
+, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook, fetchpatch }:
rustPlatform.buildRustPackage rec {
version = "4.0.0";
@@ -21,6 +21,14 @@ rustPlatform.buildRustPackage rec {
gtksourceview hicolor-icon-theme libsecret
];
+ patches = [
+ # Fixes build with >= gstreamer 1.15.1
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/fractal/commit/e78f36c25c095ea09c9c421187593706ad7c4065.patch";
+ sha256 = "1qv7ayhkhgrrldag2lzs9ql17nbc1d72j375ljhhf6cms89r19ir";
+ })
+ ];
+
postPatch = ''
patchShebangs scripts/meson_post_install.py
'';
@@ -31,7 +39,7 @@ rustPlatform.buildRustPackage rec {
checkPhase = null;
installPhase = null;
- cargoSha256 = "0hlvdcdzkggc2adggmlxz0yxigwp3320wfav77gddlvfip1f90sw";
+ cargoSha256 = "1ax5dv200v8mfx0418bx8sbwpbp6zj469xg75hp78kqfiv83pn1g";
meta = with stdenv.lib; {
description = "Matrix group messaging app";
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index d33761ba772e950a60a4f617e043a4778385e7d6..63624146aeb8d5d177625a40b449db55ad386b1a 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, dpkg
+{ stdenv, fetchurl, makeWrapper, wrapGAppsHook, autoPatchelfHook, dpkg
, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let
- version = "5.0.0-beta.19";
+ version = "5.1.0";
in stdenv.mkDerivation rec {
name = "franz-${version}";
src = fetchurl {
url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
- sha256 = "1b9b8y19iqx8bnax7hbh9rkjfxk8a9gqb1akrcxwwfi46l816gyy";
+ sha256 = "a474d2e9c6fb99abfc4c7e9290a0e52eef62233fa25c962afdde75fe151277d0";
};
# don't remove runtime deps
dontPatchELF = true;
- nativeBuildInputs = [ autoPatchelfHook makeWrapper dpkg ];
+ nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ];
buildInputs = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver
@@ -37,8 +37,12 @@ in stdenv.mkDerivation rec {
--replace Exec=\"/opt/Franz/franz\" Exec=franz
'';
+ dontWrapGApps = true;
+
postFixup = ''
- wrapProgram $out/opt/Franz/franz --prefix PATH : ${xdg_utils}/bin
+ wrapProgram $out/opt/Franz/franz \
+ --prefix PATH : ${xdg_utils}/bin \
+ "''${gappsWrapperArgs[@]}"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 8c1af783602afaa68dfc19af0c0e96947cb63206..6da7320e9536c079971e086c3b7eba9765431d83 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -7,7 +7,7 @@
, xvfb_run, dbus
# Optional dependencies
-, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
+, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly, libnice
, enableE2E ? true
, enableSecrets ? true, libsecret
, enableRST ? true, docutils
@@ -20,11 +20,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
majorVersion = "1.1";
- version = "${majorVersion}.2";
+ version = "${majorVersion}.3";
src = fetchurl {
url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
- sha256 = "1lx03cgi58z54xb7mhs6bc715lc00w5mpysf9n3q8zgn759fm0rj";
+ sha256 = "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716";
};
postPatch = ''
@@ -33,14 +33,14 @@ python3.pkgs.buildPythonApplication rec {
'';
buildInputs = [
- gobject-introspection gtk3 gnome3.adwaita-icon-theme
- ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
+ gobject-introspection gtk3 gnome3.adwaita-icon-theme wrapGAppsHook
+ ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly libnice ]
++ lib.optional enableSecrets libsecret
++ lib.optional enableSpelling gspell
++ lib.optional enableUPnP gupnp-igd;
nativeBuildInputs = [
- gettext wrapGAppsHook
+ gettext
];
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix
index be911f70f915421d3d082e568f0a340a42d0353f..5b664415c1f8f0f804c2a5e3160ad23ec7df7613 100644
--- a/pkgs/applications/networking/instant-messengers/gitter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix
@@ -3,7 +3,7 @@
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss
-, nwjs, pango, systemd }:
+, pango, systemd }:
let gitterDirectorySuffix = "opt/gitter";
doELFPatch = target: ''
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 8e85be831a01fc50ee2b67541bc822acb0f65698..5e6e2f9b8d8dfa543dd10cf14c1be836ea5b3889 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, buildGo110Package, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGo110Package rec {
- name = "gomuks-${version}";
- version = "2018-07-10";
+buildGoModule rec {
+ pname = "gomuks";
+ version = "2019-06-28";
goPackagePath = "maunium.net/go/gomuks";
src = fetchFromGitHub {
owner = "tulir";
- repo = "gomuks";
- rev = "68db26bcace31297471641fe95f8882e301f5699";
- sha256 = "0dagdvsvn8nwqsvjbqk1c6gg2q1m40869nayrkwm3ndg2xkfdpm6";
+ repo = pname;
+ rev = "37df8eb454088e61db7a14f382851205bc1806ad";
+ sha256 = "1hr15d9sbq6mddaxv3pwz86qp1hhzssgrvakfpc49xl4h04dq33g";
};
+ modSha256 = "1qrqgzzsxqvmy4m9shypa94bzw34mc941jhmyccip9grk9fzsxws";
+
meta = with stdenv.lib; {
- homepage = https://maunium.net/go/gomuks/;
+ homepage = "https://maunium.net/go/gomuks/";
description = "A terminal based Matrix client written in Go";
license = licenses.gpl3;
maintainers = with maintainers; [ tilpner ];
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 4a669f127e54c96d9e77e031434037322188b2b1..9b1939f00516092a575dd034fede0f1eedd8b381 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -1,8 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl
+{ lib, stdenv, fetchFromGitHub
, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient
-, boost, spdlog, olm, pkgconfig
+, boost, spdlog, olm, pkgconfig, nlohmann_json
}:
+# These hashes and revisions are based on those from here:
+# https://github.com/Nheko-Reborn/nheko/blob/v0.6.4/deps/CMakeLists.txt#L52
let
tweeny = fetchFromGitHub {
owner = "mobius3";
@@ -20,13 +22,13 @@ let
in
stdenv.mkDerivation rec {
name = "nheko-${version}";
- version = "0.6.3";
+ version = "0.6.4";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "nheko";
rev = "v${version}";
- sha256 = "1h95lixciiq904dnfpwxhyf545yfsrphhwqyvs4yrzdfr9k0cf98";
+ sha256 = "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm";
};
# If, on Darwin, you encounter the error
@@ -54,6 +56,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DTWEENY_INCLUDE_DIR=.deps/include"
"-DLMDBXX_INCLUDE_DIR=${lmdbxx}"
+ "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json"
];
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 2d3a10cec5e401a77264d7d6c130e0d873e39d90..5b3e09440a63d8cbb6b8ed0277ad835a5cf2874c 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
+{ stdenv, fetchurl, pidgin, intltool, libxml2, gmime, nss }:
-let version = "1.23.3"; in
-
-stdenv.mkDerivation {
- name = "pidgin-sipe-${version}";
+stdenv.mkDerivation rec {
+ pname = "pidgin-sipe";
+ version = "1.24.0";
src = fetchurl {
- url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
- sha256 = "0aaiblnagncb0lhdwb8qbps6hxxmyfjg7sdi15lrkl98i3fahg4n";
+ url = "mirror://sourceforge/sipe/${pname}-${version}.tar.gz";
+ sha256 = "04cxprz6dbcsc4n2jg72mr1r9630nhrywn0zim9kwvbgps3wdd9c";
};
+ nativeBuildInputs = [ intltool ];
+ buildInputs = [ pidgin gmime libxml2 nss ];
+ enableParallelBuilding = true;
+
+ postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
+
meta = with stdenv.lib; {
description = "SIPE plugin for Pidgin IM";
- homepage = http://sipe.sourceforge.net/;
+ homepage = "http://sipe.sourceforge.net/";
license = licenses.gpl2;
platforms = platforms.linux;
};
-
- postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
-
- buildInputs = [ pidgin intltool libxml2 nss nspr ];
-
}
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 9271dc6ba4db4949f5ff22b9ed8332cdae73cede..1c58ae353bb32ed83253ebcc241ef0dd7e3a889f 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake
, qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools
-, libqmatrixclient_0_4, libqmatrixclient_0_5 }:
+, libqmatrixclient_0_5 }:
let
generic = version: sha256: prefix: library: stdenv.mkDerivation rec {
@@ -37,6 +37,7 @@ let
};
in rec {
- quaternion = generic "0.0.9.4" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5;
+ quaternion = generic "0.0.9.4c" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5;
+
quaternion-git = quaternion;
}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 9b9b479d257b2c258593cb75cebd423f732ea9ba..a9ee4dd6aea2875514c09e282279cee8268db7e6 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "rambox-bare-${version}";
- version = "0.6.6";
+ version = "0.6.9";
src = fetchFromGitHub {
owner = "ramboxapp";
repo = "community-edition";
rev = version;
- sha256 = "15cy8krzl66b6sfazhff41adq4kf2857sj4h0qvzmadv85dy301v";
+ sha256 = "1h44srl2gzkhjaazpwz1pwy4dp5x776fc685kahlvjlsfls0fvy9";
};
nativeBuildInputs = [ nodejs-8_x ruby sencha ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit src;
nodejs = nodejs-8_x;
- sha256 = "0ifk0fzw4zhi4195jlmiq5k57bdmf912372r4bwa4z500wipikq3";
+ sha256 = "0qsgr8cq81yismal5sqr02skakqpynwwzk5s98dr5bg91y361fgy";
};
patches = [ ./isDev.patch ];
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 84ea02f7cb38f2077dc79f467cbdae1ee88ea8ed..eeab5e32c0f27bc4b4eebf663bcdac582c948928 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,6 +1,5 @@
{ stdenv, newScope, makeWrapper
-, wrapGAppsHook, gnome3, glib
-, electron_3, xdg_utils, makeDesktopItem
+, electron, xdg_utils, makeDesktopItem
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
, auth0Domain ? "nixpkgs.auth0.com" }:
@@ -28,10 +27,9 @@ with self;
stdenv.mkDerivation {
name = "rambox-${rambox-bare.version}";
- nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+ nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ glib gnome3.gsettings_desktop_schemas ];
- unpackPhase = ":";
+ dontUnpack = true;
dontWrapGApps = true; # we only want $gappsWrapperArgs here
@@ -43,9 +41,8 @@ stdenv.mkDerivation {
'';
postFixup = ''
- makeWrapper ${electron_3}/bin/electron $out/bin/rambox \
+ makeWrapper ${electron}/bin/electron $out/bin/rambox \
--add-flags "${rambox-bare} --without-update" \
- "''${gappsWrapperArgs[@]}" \
--prefix PATH : ${xdg_utils}/bin
'';
diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
index 2054f4cea19617bfffbd6c69ecf0858c66f38878..1106aa86a0a8f7b42fbb4dee90833d449b0553fe 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
- makeWrapper ${electron}/lib/electron/.electron-wrapped $out/bin/ramboxpro \
+ makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \
--add-flags "$out/opt/RamboxPro/resources/app.asar.unpacked --without-update" \
--prefix PATH : ${xdg_utils}/bin
'';
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
index 1ca04a9e1686a1080bfdff4f6e619cab8bb69003..4be8edaf9b855493d9a8ffb14044e0dd55332a18 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
- unpackPhase = ":";
+ dontUnpack = true;
installPhase = ''
makeWrapper ${sencha-bare}/sencha $out/bin/sencha
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index f195a0cb9553484fd7e7e6606613a3148bedaf21..7c348b88c8a01079bccfed5279d46d34abfc9621 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "1.0.8",
+ "version": "1.2.2",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 6209dc4b0bfa73ad3e666c57a8795cfa51a81adb..d6dcd0ee2ef8513017250387d141ff563c47e3be 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; });
let
executableName = "riot-desktop";
- version = "1.0.8";
+ version = "1.2.2";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
- sha256 = "1krp608wxff1siih8zknc425n0qb6qjzf854fnp7qyjp1cnfc9sb";
+ sha256 = "0ak1icl3apqn1b210jqj9ysnn40808lzrdwibdmv47c30hhq10fb";
};
in mkYarnPackage rec {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index d46c886a1566b448c5428bbf015571b2860d7ae2..2d6c0df412a10f5da42ab3d71277b33bf2bf0666 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,20 +3,23 @@
# Note for maintainers:
# Versions of `riot-web` and `riot-desktop` should be kept in sync.
-let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
- version = "1.0.8";
+ version = "1.2.2";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "010m8b4lfnfi70d4v205wk3i4xhnsz7zkrdqrvw3si14xqy6192r";
+ sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x";
};
- installPhase = ''
+ installPhase = let
+ configFile = if (conf != null)
+ then writeText "riot-config.json" conf
+ else "$out/config.sample.json";
+ in ''
mkdir -p $out/
cp -R . $out/
- ${lib.optionalString (conf != null) "ln -s ${configFile} $out/config.json"}
+ ln -s ${configFile} $out/config.json
'';
meta = {
diff --git a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix b/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
index d243d9356bd4d6e6e08ddbc7dddaac6fb51b147b..5dd79fdf1d8697b27760a935ccf4b94fbfcebeb7 100644
--- a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
@@ -60,7 +60,6 @@ in rec {
mkYarnModules = {
name,
pname,
- version,
packageJSON,
yarnLock,
yarnNix ? mkYarnNix yarnLock,
@@ -207,7 +206,7 @@ in rec {
name = "${safeName}-modules-${version}";
preBuild = yarnPreBuild;
workspaceDependencies = workspaceDependenciesTransitive;
- inherit packageJSON pname version yarnLock yarnNix yarnFlags pkgConfig;
+ inherit packageJSON pname yarnLock yarnNix yarnFlags pkgConfig;
};
publishBinsFor_ = unlessNull publishBinsFor [pname];
linkDirFunction = ''
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index eb5094bb26e8a0a769ba61f9ea6221837a840e40..e0cb977d5c2b014cd3621f52a4833fd650cd38a0 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -57,11 +57,11 @@ let
in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
- version = "1.24.1";
+ version = "1.25.3";
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "195rwx4xhgij5nrda1y6bhf5jyvcgb70g6ykangywhcagglqqair";
+ sha256 = "0f7pip4d97xixwf667xpi50r0r65givvmry862zhp2cq24bs0693";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix
index a90acc8eae3b47f82c9ab332cd8d0df9983b97cc..cf6031aa05b564402ab2ed47e65bfdbc75d0ae40 100644
--- a/pkgs/applications/networking/instant-messengers/sky/default.nix
+++ b/pkgs/applications/networking/instant-messengers/sky/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, file, lib, libX11, libXScrnSaver
+{ stdenv, fetchurl, file, libX11, libXScrnSaver
, libGL, qt5, SDL, libpulseaudio
, libXrandr, libXext, libXcursor, libXinerama, libXi
, curl, sqlite, openssl
, libuuid, openh264, libv4l, libxkbfile, libXv, zlib, libXmu
-, libXtst, libXdamage, pam, patchelfUnstable, libXfixes, libXrender, libjpeg_original
+, libXtst, libXdamage, pam, libXfixes, libXrender, libjpeg_original
, ffmpeg
}:
let
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 71deacecea0e9a2f819fcd65b9c38648025aa3a9..7ef42f8ddfdfa085de6676660274aa7043878e7b 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
- version = "8.44.0.40";
+ version = "8.47.0.59";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -58,7 +58,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
- sha256 = "08b5nfx1c8czx5nga3zlg60rxnyg2iy627vnaq8cf9dv620vbrw8";
+ sha256 = "0haiccmimbj1nyyyj556b0a181walmxwbbr0m18m2w67wi5z783r";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
@@ -77,7 +77,7 @@ in stdenv.mkDerivation {
buildInputs = [ dpkg ];
- unpackPhase = "true";
+ dontUnpack = true;
installPhase = ''
mkdir -p $out
dpkg -x $src $out
diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
new file mode 100644
index 0000000000000000000000000000000000000000..76987d08ff4b04314f90298a03e0847c5377fc8e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+let
+ rev = "56d2007b5ba9f1628a44af6edf5dbdf74cf92278";
+ sha256 = "1v264mpf9ddiz8zb7fcyjwy1a2yr5f4xs520gf63kl9378v721da";
+ version = "2019-03-15";
+in stdenv.mkDerivation {
+ inherit version;
+
+ name = "slack-theme-black";
+ src = fetchurl {
+ url = "https://raw.githubusercontent.com/laCour/slack-night-mode/${rev}/css/raw/black.css";
+ inherit sha256;
+ };
+
+ dontUnpack = true;
+
+ buildCommand = ''
+ mkdir $out
+ cp $src $out/theme.css
+ '';
+}
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index ed49dc6f612ec79a70d11d1d274e6902772b0b9e..6ce33d4f0471733f812c6aaaeccc94472e4a638b 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,11 +1,12 @@
-{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper
-, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
-, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
-, systemd, xorg, at-spi2-atk }:
+{ theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
+cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf,
+libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg,
+at-spi2-atk, libuuid
+}:
let
- version = "3.4.0";
+ version = "3.4.2";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -25,10 +26,12 @@ let
pango
libnotify
libxcb
+ libappindicator-gtk3
nspr
nss
stdenv.cc.cc
systemd
+ libuuid
xorg.libxkbfile
xorg.libX11
@@ -48,7 +51,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "0ld53gg0dbfpi79lz2sx5br29mlhwkfcypzf3iya4cm75a33hyw5";
+ sha256 = "0qbj41ymckz8w1p2pazyxg7pimgn9gmpvxz4ygcm0nyivfmw2crq";
}
else
throw "Slack is not supported on ${stdenv.hostPlatform.system}";
@@ -65,7 +68,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
- unpackPhase = "true";
+ dontUnpack = true;
buildCommand = ''
mkdir -p $out
dpkg -x $src $out
@@ -89,12 +92,12 @@ in stdenv.mkDerivation {
substituteInPlace $out/share/applications/slack.desktop \
--replace /usr/bin/ $out/bin/ \
--replace /usr/share/ $out/share/
- '' + stdenv.lib.optionalString darkMode ''
+ '' + stdenv.lib.optionalString (theme != null) ''
cat <> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js
document.addEventListener('DOMContentLoaded', function() {
let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}"
$.ajax({
- url: 'https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css',
+ url: '${theme}/theme.css',
success: function(css) {
\$("").appendTo('head').html(css + tt__customCss);
\$("").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}');
diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix
index aff3cf82dc9bd317abb0edbdc26847ce6b0024ee..72069ec81c1af1f0f680ba08bd95c59149d4ccd7 100644
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@@ -5,6 +5,7 @@
# Not mentioned but seems needed
, qtgraphicaleffects
, qtdeclarative
+, qtmacextras
}:
let
@@ -37,7 +38,8 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]
- ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio;
+ ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio
+ ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
meta = with stdenv.lib; {
description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++";
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index d7c8db81d63a350d6af2c86ceac90078f136e962..fe1903af5880e17102e00ee652f848673c93e66c 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper }:
let
- version = "3.7.1";
+ version = "3.8.0";
arch = if stdenv.is64bit then "amd64" else "x86";
libDir = if stdenv.is64bit then "lib64" else "lib";
in
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
"http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"
];
sha256 = if stdenv.is64bit
- then "1w60241zsvr8d1qlkca6a1sfxa1jz4w1z9kjd0wd2wkgzp4x91v7"
+ then "1bzmqqqpwn6q2pvkrkkxq0ggs8crxbkwaxlggcdxjlyg95cyq8k1"
else "0s835dnaw662sb2v5ahqiwry0qjcpl7ff9krnhbw2iblsbqis3fj";
};
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 350ac7e13cdb37645a9917d0adfec20985771ab2..3e5294815084be266d45638a1051310408a55adf 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,11 +4,11 @@ let
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
stableVersion = {
stable = true;
- version = "1.6.7";
- sha256Hash = "1537div6pky7wz3lansz67vsx2h6b653cx91xg9sswnxfsf8nrql";
+ version = "1.7.14";
+ sha256Hash = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
- archPatchesRevision = "429149";
- archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli";
+ archPatchesRevision = "487779";
+ archPatchesHash = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq";
};
in {
stable = mkTelegram stableVersion;
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index c32e6b186b7a29d63e793c525e61b272cf8b1f28..df06dc49eef469dcb2d66cf4d3fc34843f333ed8 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -1,7 +1,7 @@
{ stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
{ mkDerivation, lib, fetchFromGitHub, fetchsvn
-, pkgconfig, pythonPackages, cmake, wrapGAppsHook
+, pkgconfig, pythonPackages, cmake, wrapGAppsHook, gcc8
, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
}:
@@ -28,17 +28,22 @@ mkDerivation rec {
sha256 = archPatchesHash;
};
- # TODO: libtgvoip.patch no-gtk2.patch
- patches = [ "${archPatches}/tdesktop.patch" ];
+ patches = [
+ "${archPatches}/tdesktop.patch"
+ "${archPatches}/no-gtk2.patch"
+ # "${archPatches}/Use-system-wide-font.patch"
+ "${archPatches}/tdesktop_lottie_animation_qtdebug.patch"
+ "${archPatches}/issue6219.patch"
+ ];
postPatch = ''
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
- --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
+ --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \
--replace '"notify"' '"${libnotify}/lib/libnotify.so"'
'';
- nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook ];
+ nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook gcc8 ];
# We want to run wrapProgram manually (with additional parameters)
dontWrapGApps = true;
@@ -74,10 +79,15 @@ mkDerivation rec {
CPPFLAGS = NIX_CFLAGS_COMPILE;
preConfigure = ''
+ patch -R -Np1 -i "${archPatches}/demibold.patch"
+
pushd "Telegram/ThirdParty/libtgvoip"
patch -Np1 -i "${archPatches}/libtgvoip.patch"
popd
+ # disable static-qt for rlottie
+ sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp"
+
sed -i Telegram/gyp/telegram_linux.gypi \
-e 's,/usr,/does-not-exist,g' \
-e 's,appindicator-0.1,appindicator3-0.1,g' \
@@ -114,6 +124,8 @@ mkDerivation rec {
export ASM=$(type -p gcc)
'';
+ cmakeFlags = [ "-UTDESKTOP_OFFICIAL_TARGET" ];
+
installPhase = ''
install -Dm755 Telegram $out/bin/telegram-desktop
@@ -143,6 +155,6 @@ mkDerivation rec {
license = licenses.gpl3;
platforms = platforms.linux;
homepage = https://desktop.telegram.org/;
- maintainers = with maintainers; [ primeos abbradar garbas ];
+ maintainers = with maintainers; [ primeos abbradar ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
index 2b744c61ccb5da3616dc31b48bf303e9c54c4ef1..c0b1de893c73acdc104c6ef81ea43bf0a3dd5df9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, bash, libconfig, libevent, openssl
+{ stdenv, fetchgit, libconfig, libevent, openssl
, readline, zlib, lua5_2, python, pkgconfig, jansson
, runtimeShell
}:
diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix
index 24529d83e04c79fc03a95687b94f90ebd1057a78..a3f32bc829569f7c04b0d92cf9a42d2394f84ca6 100644
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
homepage = https://github.com/louipc/turses;
description = "A Twitter client for the console";
license = licenses.gpl3;
- maintainers = with maintainers; [ garbas ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 6fafe26aa30e6fedda66b9cf007d1bcacb717382..349a1363259ca24b5dcbd08358c6b5912cb798f5 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, check, cmake, pkgconfig
, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
, libXrender, fontconfig, libXext, libXft, libsodium, libopus }:
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index d7c70232b0adc8789ef162b43381d6d7d617e5b1..a4bf26a0b1afbd4536571c8f84595a6404fae672 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ dpkg makeWrapper ];
- unpackPhase = "true";
+ dontUnpack = true;
libPath = stdenv.lib.makeLibraryPath [
alsaLib
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 45d0dadbe902f135250a9bb4b608df6031acc15b..44b740c6f363fe8e1e130582f03e07618a71683f 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -4,7 +4,7 @@
, qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg
, qttools, qtwayland, qtwebchannel, qtwebengine
# Runtime
-, coreutils, libjpeg_turbo, pciutils, procps, utillinux
+, coreutils, libjpeg_turbo, pciutils, procps, utillinux, libv4l
, pulseaudioSupport ? true, libpulseaudio ? null
}:
@@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
- version = "2.8.183302.0415";
+ version = "2.8.264592.0714";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "07afq614fy09mjymmv3cf8vwa8ps78s2s4909g1a2rwvgkj8bw2x";
+ sha256 = "0ndrsyyawls487v7vlga0yn574xvhmfc14vdjxg23nvn0jxh2dvw";
};
};
@@ -72,6 +72,7 @@ in stdenv.mkDerivation {
makeWrapper $packagePath/zoom $out/bin/zoom-us \
--prefix PATH : "${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}" \
+ --prefix LD_PRELOAD : "${libv4l}/lib/libv4l/v4l2convert.so" \
--run "cd $packagePath"
runHook postInstall
diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 9c1aa8f86f693ecf2c93d47863fecf0b77bfa658..3719a69138c60c36de46ef542bfc1a37ee7d191b 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "insync-${version}";
- version = "1.5.5.37367";
+ version = "1.5.7.37371";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
- sha256 = "1yz8l8xjr0pm30hvv4w59wzs569xzkpn8lv12pyl82r1l16h5zp3";
+ sha256 = "1cm3q6y2crw6pcsvh21sbkmh1hin7xl4fyslc96nbyql8rxsky5n";
}
else
throw "${name} is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 7b4d40a5a63387dee0c806494576d66a7d352188..54943533b85fc3762dadf3d1ac7a6c5cc43b7057 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
- name = "ipfs-${version}";
- version = "0.4.20";
+buildGoModule rec {
+ pname = "ipfs";
+ version = "0.4.21";
rev = "v${version}";
goPackagePath = "github.com/ipfs/go-ipfs";
- goDeps = ./deps.nix;
-
src = fetchFromGitHub {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
- sha256 = "1xnjn4pcgknywfndrp2zwln3v1msaffhhfiym5mdz543rsxav0yp";
+ sha256 = "0jlj89vjy4nw3x3j45r16y8bph5ss5lp907pjgqvad0naxbf99b0";
};
+ modSha256 = "0d9rq0hig9jwv9jfajfyj2111arikqzdnyhf5aqkwahcblpx54iy";
+
meta = with stdenv.lib; {
description = "A global, versioned, peer-to-peer filesystem";
homepage = https://ipfs.io/;
diff --git a/pkgs/applications/networking/ipfs/deps.nix b/pkgs/applications/networking/ipfs/deps.nix
deleted file mode 100644
index 181b55d28d944daee2837339d66557a0c1e7f68f..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/ipfs/deps.nix
+++ /dev/null
@@ -1,2190 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
- {
- goPackagePath = "github.com/dgraph-io/badger";
- fetch = {
- type = "git";
- url = "https://github.com/dgraph-io/badger";
- rev = "1fcc96ec";
- sha256 = "09sdr64ay8wbw4m8a7dppha357wx2395vpni554353v7b22gyk59";
- };
- }
- {
- goPackagePath = "bazil.org/fuse";
- fetch = {
- type = "git";
- url = "https://github.com/bazil/fuse";
- rev = "65cc252bf669";
- sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk";
- };
- }
- {
- goPackagePath = "github.com/AndreasBriese/bbloom";
- fetch = {
- type = "git";
- url = "https://github.com/AndreasBriese/bbloom";
- rev = "343706a395b7";
- sha256 = "0pz4wph915gm2b0admq4bc5d2ir218s954z27gmc86l0rik13a5d";
- };
- }
- {
- goPackagePath = "github.com/Kubuxu/go-os-helper";
- fetch = {
- type = "git";
- url = "https://github.com/Kubuxu/go-os-helper";
- rev = "v0.0.1";
- sha256 = "08v88ylhvv65hdqr2pp94qf2ncppzib5sx66fv432vhgkz00ddyr";
- };
- }
- {
- goPackagePath = "github.com/Kubuxu/gocovmerge";
- fetch = {
- type = "git";
- url = "https://github.com/Kubuxu/gocovmerge";
- rev = "7ecaa51963cd";
- sha256 = "0xbx83h44hsiidmr69sn4k0zn7bmbwcna76fn0akjb5il1r4bjyr";
- };
- }
- {
- goPackagePath = "github.com/Stebalien/go-bitfield";
- fetch = {
- type = "git";
- url = "https://github.com/Stebalien/go-bitfield";
- rev = "076a62f9ce6e";
- sha256 = "17iqkx2dyh6ykgapgvbyrm8c15qw24pspjhi3ww2sx4y0qhkycf4";
- };
- }
- {
- goPackagePath = "github.com/aead/siphash";
- fetch = {
- type = "git";
- url = "https://github.com/aead/siphash";
- rev = "v1.0.1";
- sha256 = "01kd1z82sc4nh3nj9c25aryyp396s7jrqc2kz9d7qq1vy2hdbznc";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "3a771d992973";
- sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
- };
- }
- {
- goPackagePath = "github.com/blang/semver";
- fetch = {
- type = "git";
- url = "https://github.com/blang/semver";
- rev = "v3.5.1";
- sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
- };
- }
- {
- goPackagePath = "github.com/bren2010/proquint";
- fetch = {
- type = "git";
- url = "https://github.com/bren2010/proquint";
- rev = "38337c27106d";
- sha256 = "1ws3hb27n4c4mfp2pfj9nc59ch6dv93333a83n7qazf74lhf8ixl";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/btcd";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/btcd";
- rev = "306aecffea32";
- sha256 = "130np0bfic9q7ga8a9y5gd3amy6mgfb7igd3lgicikjclfhiqwf4";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/btclog";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/btclog";
- rev = "84c8d2346e9f";
- sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/btcutil";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/btcutil";
- rev = "4c204d697803";
- sha256 = "16s27k8xnvhlpv0ibs60sqgnyn3zhnvprv1647svmzs3rwcsqgvp";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/go-socks";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/go-socks";
- rev = "4720035b7bfd";
- sha256 = "18cv2icj059lq4s99p6yh91hlas5f2gi3f1p4c10sjgwrs933d7b";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/goleveldb";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/goleveldb";
- rev = "7834afc9e8cd";
- sha256 = "0gy156sn2cy2maii3p058f7q60gjdbmba34i9qvk8msxlg7hlfjv";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/snappy-go";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/snappy-go";
- rev = "0bdef8d06723";
- sha256 = "00i5fsb1wf2dwal1jfwbpk9a7cbzjyg7rnz2xib3qfz9h82kd4jw";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/websocket";
- rev = "31079b680792";
- sha256 = "0xpkf257ml6fpfdgv7hxxc41n0d5yxxm3njm50qpzp7j71l9cjwa";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/winsvc";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/winsvc";
- rev = "v1.0.0";
- sha256 = "0nsw8y86a5hzr2a3j6ch9myrpccj5bnsgaxpgajhzfk5d31xlw1z";
- };
- }
- {
- goPackagePath = "github.com/cenkalti/backoff";
- fetch = {
- type = "git";
- url = "https://github.com/cenkalti/backoff";
- rev = "v2.1.1";
- sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8";
- };
- }
- {
- goPackagePath = "github.com/cheekybits/genny";
- fetch = {
- type = "git";
- url = "https://github.com/cheekybits/genny";
- rev = "v1.0.0";
- sha256 = "1pcir5ic86713aqa51581rfb67rgc3m0c72ddjfcp3yakv9vyq87";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-semver";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-semver";
- rev = "v0.2.0";
- sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
- };
- }
- {
- goPackagePath = "github.com/cskr/pubsub";
- fetch = {
- type = "git";
- url = "https://github.com/cskr/pubsub";
- rev = "v1.0.2";
- sha256 = "0wr8cg5axrlz9xg33r9dqvkp5ix9q8h8c7qw78mj22qprwh3zj9f";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "v1.1.1";
- sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
- };
- }
- {
- goPackagePath = "github.com/davidlazar/go-crypto";
- fetch = {
- type = "git";
- url = "https://github.com/davidlazar/go-crypto";
- rev = "dcfb0a7ac018";
- sha256 = "1lir8slwykn0h5bg5lj22qsdg4kw09kcqlks974g1428d42rqlcp";
- };
- }
- {
- goPackagePath = "github.com/dgryski/go-farm";
- fetch = {
- type = "git";
- url = "https://github.com/dgryski/go-farm";
- rev = "3adb47b1fb0f";
- sha256 = "04bkvr6xvfh83cn83gqzyxx45wbk3j1bdpgrck0b424x48z2x4jh";
- };
- }
- {
- goPackagePath = "github.com/dustin/go-humanize";
- fetch = {
- type = "git";
- url = "https://github.com/dustin/go-humanize";
- rev = "v1.0.0";
- sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
- };
- }
- {
- goPackagePath = "github.com/elgris/jsondiff";
- fetch = {
- type = "git";
- url = "https://github.com/elgris/jsondiff";
- rev = "765b5c24c302";
- sha256 = "0jm1q0s531hmkqdx8jqphfpmzysn44aphkpwlzqwp3hkz89g4d4q";
- };
- }
- {
- goPackagePath = "github.com/facebookgo/atomicfile";
- fetch = {
- type = "git";
- url = "https://github.com/facebookgo/atomicfile";
- rev = "2de1f203e7d5";
- sha256 = "1vsx6r6y601jxvjqc8msbpr5v1037dfxxdd8h1q3s8wm6xhvj2v6";
- };
- }
- {
- goPackagePath = "github.com/fatih/color";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/color";
- rev = "v1.7.0";
- sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "github.com/go-check/check";
- fetch = {
- type = "git";
- url = "https://github.com/go-check/check";
- rev = "788fd7840127";
- sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "v1.2.1";
- sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m";
- };
- }
- {
- goPackagePath = "github.com/golang/mock";
- fetch = {
- type = "git";
- url = "https://github.com/golang/mock";
- rev = "v1.2.0";
- sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "v1.3.0";
- sha256 = "0dm1ip7742qz2k1cr6ywy0av6mpcxd2kc4ayfqi8cxz3ai7zhbdr";
- };
- }
- {
- goPackagePath = "github.com/golang/snappy";
- fetch = {
- type = "git";
- url = "https://github.com/golang/snappy";
- rev = "2e65f85255db";
- sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
- };
- }
- {
- goPackagePath = "github.com/google/go-cmp";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-cmp";
- rev = "v0.2.0";
- sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
- };
- }
- {
- goPackagePath = "github.com/google/uuid";
- fetch = {
- type = "git";
- url = "https://github.com/google/uuid";
- rev = "v1.1.1";
- sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
- };
- }
- {
- goPackagePath = "github.com/gopherjs/gopherjs";
- fetch = {
- type = "git";
- url = "https://github.com/gopherjs/gopherjs";
- rev = "0766667cb4d1";
- sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "v1.4.0";
- sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
- };
- }
- {
- goPackagePath = "github.com/gxed/go-shellwords";
- fetch = {
- type = "git";
- url = "https://github.com/gxed/go-shellwords";
- rev = "v1.0.3";
- sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
- };
- }
- {
- goPackagePath = "github.com/gxed/hashland";
- fetch = {
- type = "git";
- url = "https://github.com/gxed/hashland";
- rev = "v0.0.1";
- sha256 = "1b921dh9i6zw7y8jfzwvrmdbhnwid12a5z1zjawslfq2vvsajwmm";
- };
- }
- {
- goPackagePath = "github.com/gxed/pubsub";
- fetch = {
- type = "git";
- url = "https://github.com/gxed/pubsub";
- rev = "26ebdf44f824";
- sha256 = "0q0r6bvimjxwi3yd0w2wjkx1x8m0d9pwi25b7n4s4g10h36rabjp";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/errwrap";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/errwrap";
- rev = "v1.0.0";
- sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/go-multierror";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/go-multierror";
- rev = "v1.0.0";
- sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/golang-lru";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/golang-lru";
- rev = "v0.5.1";
- sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
- };
- }
- {
- goPackagePath = "github.com/hpcloud/tail";
- fetch = {
- type = "git";
- url = "https://github.com/hpcloud/tail";
- rev = "v1.0.0";
- sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
- };
- }
- {
- goPackagePath = "github.com/hsanjuan/go-libp2p-gostream";
- fetch = {
- type = "git";
- url = "https://github.com/hsanjuan/go-libp2p-gostream";
- rev = "v0.0.31";
- sha256 = "0q4k1ahns9j061iajp8525330mwgbdv5mnyzldpg64r5c2igp9qf";
- };
- }
- {
- goPackagePath = "github.com/hsanjuan/go-libp2p-http";
- fetch = {
- type = "git";
- url = "https://github.com/hsanjuan/go-libp2p-http";
- rev = "v0.0.2";
- sha256 = "0pq80qvhm2f53gx438ws5nnj1r2ara48radzxc5br57scp2bjlgk";
- };
- }
- {
- goPackagePath = "github.com/huin/goupnp";
- fetch = {
- type = "git";
- url = "https://github.com/huin/goupnp";
- rev = "v1.0.0";
- sha256 = "12f7rigf1f4xh1an1qis61xkj5s1r8ygk48zahf3n4gaqxmgm7i6";
- };
- }
- {
- goPackagePath = "github.com/huin/goutil";
- fetch = {
- type = "git";
- url = "https://github.com/huin/goutil";
- rev = "1ca381bf3150";
- sha256 = "0alhyacsfqic2wxyqn4gvk9wzjl4pkmy8rhvqjk84xsghgx5xf12";
- };
- }
- {
- goPackagePath = "github.com/ipfs/bbloom";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/bbloom";
- rev = "v0.0.1";
- sha256 = "0ji1dgxvg338wx2agh0ld9x6wwr6zc8zwjxs5mwdb99p56dc34nz";
- };
- }
- {
- goPackagePath = "github.com/ipfs/dir-index-html";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/dir-index-html";
- rev = "v1.0.3";
- sha256 = "1asd58w53i97jxk2r1asy8h5lgq0086lnjq3gi7fs20xvgv20bfy";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-bitswap";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-bitswap";
- rev = "v0.0.4";
- sha256 = "0998qyxzp5frmkf5kjqxrhdwl4c0i7a2kh24rldix934afbmfz3r";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-block-format";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-block-format";
- rev = "v0.0.2";
- sha256 = "1j73r946z0gs98a2r1z7q3vkpk8v7wqwc68x8c3ngiff9sijq1kf";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-blockservice";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-blockservice";
- rev = "v0.0.3";
- sha256 = "1c2fnrqlvg16xf7jla1x38qi56yw61w1ms70kghhafmw008bgkvn";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-cid";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-cid";
- rev = "v0.0.1";
- sha256 = "11hdrac0wf82m69fkpwby1mg2k7swmw884rv3250i0kymwi93lak";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-cidutil";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-cidutil";
- rev = "v0.0.1";
- sha256 = "00bdn7cg7rg8amh8zaqakf6phd14sn2z9kw73cscfhpyg9di1p9h";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-datastore";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-datastore";
- rev = "v0.0.3";
- sha256 = "147nnmgb2b4iiky4hsn5wn4hk0kp39xs1yj3blm2gxxxkmjqsdk4";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-detect-race";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-detect-race";
- rev = "v0.0.1";
- sha256 = "0rqb0q66d7z852j5mhlr025dz698c44w014g4mx587amr1rvwqna";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ds-badger";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ds-badger";
- rev = "v0.0.3";
- sha256 = "0bl7zh8gmas54577v501n17z1254f1yaggkgslz9qjz4rihq4wq1";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ds-flatfs";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ds-flatfs";
- rev = "v0.0.2";
- sha256 = "1z6z717pkv2yqb0wdhw73vir253305wkqcg5pln8km8kl2fjwwyi";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ds-leveldb";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ds-leveldb";
- rev = "v0.0.2";
- sha256 = "0x70z31g0l04lm6nsv1p0wnhdwqvck2pzy59ygfxk707n0x5vqpc";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ds-measure";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ds-measure";
- rev = "v0.0.1";
- sha256 = "1ndb10x5g95g8kapfr116qa3cav2xcwwm4dppp99bi15kq1yk742";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-fs-lock";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-fs-lock";
- rev = "v0.0.1";
- sha256 = "02mr83xkflf0sjrii11pd9k4a4545jggqgq6pdpsmkx2r3b01j2q";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-addr";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-addr";
- rev = "v0.0.1";
- sha256 = "02f7vhf6kra7h58ny71zfb0k5q9mz6yplypnk36i6gv4fn5v9c5i";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-blockstore";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-blockstore";
- rev = "v0.0.1";
- sha256 = "0vw6i4n9xss21yri5wkj9pvzapm9yqgxh5l6vq2858n50xz72r31";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-blocksutil";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-blocksutil";
- rev = "v0.0.1";
- sha256 = "06bip9adk70i0g0hkf4aczvhkhd3s31x19668ls26dl62rq9h7di";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-chunker";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-chunker";
- rev = "v0.0.1";
- sha256 = "19p8a4xfi62fj5nw7ad81yppn0slq3pddk0gb0c3zydaxcjkhzw6";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-cmdkit";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-cmdkit";
- rev = "v0.0.1";
- sha256 = "1aqdpszvibkm1h7p852ajzb9gjgsz5jlk4j2s9j8q1wbmz3vslms";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-cmds";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-cmds";
- rev = "v0.0.5";
- sha256 = "1b302hvah5scykcjn5al9a6jf7sygqi6snd664a6sxf2xgpwk0s8";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-config";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-config";
- rev = "v0.0.1";
- sha256 = "055igsi5bv312p2590dvpr9d290c4c0cwbzvwv52l7j60v79vlkc";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-delay";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-delay";
- rev = "v0.0.1";
- sha256 = "0a5acj622sk1hibnh893mya4h86nsy1dan0wlh9q444c04iqpviw";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-ds-help";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-ds-help";
- rev = "v0.0.1";
- sha256 = "173kmvyk2f5f1p30avb8nzvkcmq9xkdfpydavqw3bxg0yq0714ic";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-exchange-interface";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-exchange-interface";
- rev = "v0.0.1";
- sha256 = "12h4pj5g9d1j5gmd8gf774fqwkx0x5cm3pg7c81hi0f43x5lrmwn";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-exchange-offline";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-exchange-offline";
- rev = "v0.0.1";
- sha256 = "0nlb5llmj9kjas2p5jqg2x3krk5jm40xd36k0g5l87c992dy7f0i";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-files";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-files";
- rev = "v0.0.2";
- sha256 = "12554whcmg60rgnzyd7673hgxnrs1j176lw8839wf260pjq6rs39";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-flags";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-flags";
- rev = "v0.0.1";
- sha256 = "0pf9nq0n6nlfxbfhn9v46a2s7kkkwmvl04si8ihz08nahanb13r6";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-posinfo";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-posinfo";
- rev = "v0.0.1";
- sha256 = "0hh88i9sk5h53z2xx2nwxrpcx0r0jhlb5sq54x5qyhp5mjfqbyi2";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-pq";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-pq";
- rev = "v0.0.1";
- sha256 = "05q7b7g49ni59c6593v51kkkd6ppc2ipkfsx05qbfg8md9r7a93x";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-routing";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-routing";
- rev = "v0.0.1";
- sha256 = "15vvvc0z5sbyhmwl3nfrpziiy3gsivb02xcalsz6mxvam68xy4x5";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-util";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-util";
- rev = "v0.0.1";
- sha256 = "1j87wqxh8ap5qqvnhnhz3zg6fn50axnnd69wqg287hh36xcpy6ss";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipld-cbor";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipld-cbor";
- rev = "v0.0.1";
- sha256 = "0zppzca1ar8pqrzi68ysx4ih1mnhlyrg046xwj7sggr4aki1fh5j";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipld-format";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipld-format";
- rev = "v0.0.1";
- sha256 = "0lb4wp30jlamk604bagzf28zf2hm2b4lxnayqvq7rh0jxhbdb61d";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipld-git";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipld-git";
- rev = "v0.0.1";
- sha256 = "0d5kl3kvam1hv589cg9cg1dkjyanzp727zrnzyjnrysv3fk8yv66";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipns";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipns";
- rev = "v0.0.1";
- sha256 = "1r9531v35336sf36s8pzi3jiyqd22ld9p7xpaznzmp57ygwfxlwj";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-log";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-log";
- rev = "v0.0.1";
- sha256 = "0r3pk46g9vjjb9ljaxda18w488xa9vyj30g23y9vprknkd9dqfgw";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-merkledag";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-merkledag";
- rev = "v0.0.3";
- sha256 = "0j7dgca9vyhj6ra074cddblcjkxh1c1k51krch09lqxxjwasgg60";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-metrics-interface";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-metrics-interface";
- rev = "v0.0.1";
- sha256 = "09xc71175sfnqlizkbw066jagnbag9ihvs240z6g6dm2yx3w5xgy";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-metrics-prometheus";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-metrics-prometheus";
- rev = "v0.0.2";
- sha256 = "1z1zwjj0a3gyzs4r25b9kl7z3kmsqp3jskvy7x02a3v1dlr3nkfp";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-mfs";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-mfs";
- rev = "v0.0.4";
- sha256 = "13jjxbfjl6wd89nxqibvp8q3hd2vzh0vpfhp3vrbapghkzp08rbb";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-path";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-path";
- rev = "v0.0.3";
- sha256 = "019zpy92k2rilkhn928jf91d8y3x8cxcw04mc2pxv5ja29nkyc91";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-todocounter";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-todocounter";
- rev = "v0.0.1";
- sha256 = "1nsf56hh6n2y3m14b1ismcpsyi65ffxa5i6ks6il9qppm21mm5nx";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-unixfs";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-unixfs";
- rev = "v0.0.4";
- sha256 = "0fbqqi9h2xalnyc58ppaiyac3qd6hb4ycn46wwnr7idp0z7wxl5j";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-verifcid";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-verifcid";
- rev = "v0.0.1";
- sha256 = "06ii8934s52d9n1lvzx29didh667pm2i7qdag443vqn0ilmkjvh9";
- };
- }
- {
- goPackagePath = "github.com/ipfs/hang-fds";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/hang-fds";
- rev = "v0.0.1";
- sha256 = "0axgmx1vcqsvys4vhqfrixfss2vk3qly1cqlm0aqrlhscggflkn4";
- };
- }
- {
- goPackagePath = "github.com/ipfs/interface-go-ipfs-core";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/interface-go-ipfs-core";
- rev = "v0.0.6";
- sha256 = "13sr18vzsfsik1nnkdcmi7afagbcnzh95mxzlbss366x802g8d8q";
- };
- }
- {
- goPackagePath = "github.com/ipfs/iptb";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/iptb";
- rev = "v1.4.0";
- sha256 = "0nfiqf1k114ydp6c37yq4qn6j3bmw94wvc096vfljq8493jr8jvv";
- };
- }
- {
- goPackagePath = "github.com/ipfs/iptb-plugins";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/iptb-plugins";
- rev = "v0.0.2";
- sha256 = "10kyvjhmlvza3xlmfvwhndscjm6807pmk9nld7d2660mvh18w626";
- };
- }
- {
- goPackagePath = "github.com/jackpal/gateway";
- fetch = {
- type = "git";
- url = "https://github.com/jackpal/gateway";
- rev = "v1.0.5";
- sha256 = "1ird5xmizj632l3dq24s2xgb8w1dn6v8xznlqz252gvngyr2gjl1";
- };
- }
- {
- goPackagePath = "github.com/jackpal/go-nat-pmp";
- fetch = {
- type = "git";
- url = "https://github.com/jackpal/go-nat-pmp";
- rev = "v1.0.1";
- sha256 = "0sr23mcxbv9f65is4p1amb5yn026p7cfamlwpb2f8q218idwy3zk";
- };
- }
- {
- goPackagePath = "github.com/jbenet/go-cienv";
- fetch = {
- type = "git";
- url = "https://github.com/jbenet/go-cienv";
- rev = "1bb1476777ec";
- sha256 = "0mk04dk572gdd0y63vark0362y42w7kbwdlmmw9bg78qmmiikjb3";
- };
- }
- {
- goPackagePath = "github.com/jbenet/go-context";
- fetch = {
- type = "git";
- url = "https://github.com/jbenet/go-context";
- rev = "d14ea06fba99";
- sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl";
- };
- }
- {
- goPackagePath = "github.com/jbenet/go-is-domain";
- fetch = {
- type = "git";
- url = "https://github.com/jbenet/go-is-domain";
- rev = "v1.0.2";
- sha256 = "1cf4qmlg54975z5j7njyqsq0vr8gsxzg85c5iys08nr3cizr7551";
- };
- }
- {
- goPackagePath = "github.com/jbenet/go-random";
- fetch = {
- type = "git";
- url = "https://github.com/jbenet/go-random";
- rev = "123a90aedc0c";
- sha256 = "0kgx19m8p76rmin8s8y6j1padciv1dx37qzy7jkh9bw49ai3haw3";
- };
- }
- {
- goPackagePath = "github.com/jbenet/go-random-files";
- fetch = {
- type = "git";
- url = "https://github.com/jbenet/go-random-files";
- rev = "31b3f20ebded";
- sha256 = "0d52wwzgxxh2a1bwmixfa6nfhhqdq6l9g4s6kmsdnc6kqf38c818";
- };
- }
- {
- goPackagePath = "github.com/jbenet/go-temp-err-catcher";
- fetch = {
- type = "git";
- url = "https://github.com/jbenet/go-temp-err-catcher";
- rev = "aac704a3f4f2";
- sha256 = "1fyqkcggnrzwxa8iii15g60w2jikdm26sr7l36km7y0nc2kvf7jc";
- };
- }
- {
- goPackagePath = "github.com/jbenet/goprocess";
- fetch = {
- type = "git";
- url = "https://github.com/jbenet/goprocess";
- rev = "b497e2f366b8";
- sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s";
- };
- }
- {
- goPackagePath = "github.com/jessevdk/go-flags";
- fetch = {
- type = "git";
- url = "https://github.com/jessevdk/go-flags";
- rev = "1679536dcc89";
- sha256 = "15jgsymwg0wjslxrw391sw7qzwwjcnjxiiksq84z7ng9sqy96c1c";
- };
- }
- {
- goPackagePath = "github.com/jonboulle/clockwork";
- fetch = {
- type = "git";
- url = "https://github.com/jonboulle/clockwork";
- rev = "v0.1.0";
- sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
- };
- }
- {
- goPackagePath = "github.com/jrick/logrotate";
- fetch = {
- type = "git";
- url = "https://github.com/jrick/logrotate";
- rev = "v1.0.0";
- sha256 = "0srl6figwjqpi3nbp7br8sxpmvh4v8lzbny1b4lar4ny0156p5nl";
- };
- }
- {
- goPackagePath = "github.com/jtolds/gls";
- fetch = {
- type = "git";
- url = "https://github.com/jtolds/gls";
- rev = "v4.2.1";
- sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h";
- };
- }
- {
- goPackagePath = "github.com/kisielk/errcheck";
- fetch = {
- type = "git";
- url = "https://github.com/kisielk/errcheck";
- rev = "v1.1.0";
- sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y";
- };
- }
- {
- goPackagePath = "github.com/kisielk/gotool";
- fetch = {
- type = "git";
- url = "https://github.com/kisielk/gotool";
- rev = "v1.0.0";
- sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
- };
- }
- {
- goPackagePath = "github.com/kkdai/bstream";
- fetch = {
- type = "git";
- url = "https://github.com/kkdai/bstream";
- rev = "f391b8402d23";
- sha256 = "1hd9caz0yf3r8kciw2pqwrsr8z4w0rhbqv1z7iq08d0542s05j3z";
- };
- }
- {
- goPackagePath = "github.com/koron/go-ssdp";
- fetch = {
- type = "git";
- url = "https://github.com/koron/go-ssdp";
- rev = "4a0ed625a78b";
- sha256 = "11d1xf07xs4j7qbxpndxbrfk2zk48k9fa3cxnhfb5lh24bd4sa0f";
- };
- }
- {
- goPackagePath = "github.com/kr/pretty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pretty";
- rev = "v0.1.0";
- sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
- };
- }
- {
- goPackagePath = "github.com/kr/pty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pty";
- rev = "v1.1.1";
- sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
- };
- }
- {
- goPackagePath = "github.com/kr/text";
- fetch = {
- type = "git";
- url = "https://github.com/kr/text";
- rev = "v0.1.0";
- sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-addr-util";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-addr-util";
- rev = "v0.0.1";
- sha256 = "1kjdk5214l8gna7f4hvb0iwmmlzsfccjankkxjmil80ibhcvjw60";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-buffer-pool";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-buffer-pool";
- rev = "v0.0.1";
- sha256 = "1239hkhckgx1fzd43k56q3c0283p1mjl8w7i2j4xymvs6f6q6ygi";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-conn-security";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-conn-security";
- rev = "v0.0.1";
- sha256 = "0z1zw0aq5jcks0vcdm5zxjyz9z6c6jklm0s74gc2m7jfs2jj2r5r";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-conn-security-multistream";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-conn-security-multistream";
- rev = "v0.0.1";
- sha256 = "19slvlmapzs952gfn4aym4dg0l49x0vpn5v696vf80v2k00ipa32";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-flow-metrics";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-flow-metrics";
- rev = "v0.0.1";
- sha256 = "04zrwl579qkhiw3b655cw7lnlp2yvq1xl3f1rkxnhx8llwsy3x49";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p";
- rev = "v0.0.12";
- sha256 = "04hm36fi45jpq5zjl1a7jlyq82adwwrgvvgnkllppq2zg85mlvvi";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-autonat";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-autonat";
- rev = "v0.0.4";
- sha256 = "03523s4kdwswgfnwly5ynld2lny142j8xl6mr88vni4xn7pijn1l";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-autonat-svc";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-autonat-svc";
- rev = "v0.0.5";
- sha256 = "0plph1nnh0ig9d54hizpiyhfrlrwhb1ylx6pry5jcppgpxngi79c";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-blankhost";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-blankhost";
- rev = "v0.0.1";
- sha256 = "1q29b880l95811ara95187y9pmqq542bxh50cg0ykwzfj94xgla4";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-circuit";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-circuit";
- rev = "v0.0.4";
- sha256 = "1bnwjf3p5r8ng360l2fjx0szdiwm2yfiifjkwflin00hx0gzyq7d";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-connmgr";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-connmgr";
- rev = "v0.0.1";
- sha256 = "07kvnhavr4k1birgqp9c4y0yl1ii3pl1cc8pn4dzci87krachz2z";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-crypto";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-crypto";
- rev = "v0.0.1";
- sha256 = "0wgq0ayg1656gvmi4d1nwgq7dbnyyb30xp3z571q495mmq483fbk";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-daemon";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-daemon";
- rev = "v0.0.6";
- sha256 = "0pq6557ykbi3a8pasvm9zlhdysrq6h1fj48z4imv2gq30nmy3l6l";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-discovery";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-discovery";
- rev = "v0.0.1";
- sha256 = "06h621llfx7bmkcnrkkxb3j85221albf18ig8mbh9c8wrpmsi438";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-host";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-host";
- rev = "v0.0.1";
- sha256 = "102qyl7qkmq8p1gpxbfi5z2lrd8mysji28fx25ma4h312ci96rqz";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-interface-connmgr";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-interface-connmgr";
- rev = "v0.0.1";
- sha256 = "107khappq5w48p17s22cp7djd5ii1bbg968wsa9bq9znzxdkzm43";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-interface-pnet";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-interface-pnet";
- rev = "v0.0.1";
- sha256 = "1kqxm4rpcss2ajfnc3gzww4ng5pjj5qc0szr5x2vz15vvx2kp9bi";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-kad-dht";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-kad-dht";
- rev = "v0.0.7";
- sha256 = "1nbq4240vnd3sfmiy8ry6pwnnf2k7hnwn1ln32mgqq32dywx664r";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-kbucket";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-kbucket";
- rev = "v0.1.1";
- sha256 = "0pgy89mp9r23axs8gapnkzks89q7539l2g46r6ffyd4a675qampg";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-loggables";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-loggables";
- rev = "v0.0.1";
- sha256 = "15whxhipm06fnd8ky7gxf59bvbw2wxl44g0v2dbnbr2j9a2n5ivv";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-metrics";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-metrics";
- rev = "v0.0.1";
- sha256 = "14wvnmcwr40iwbpvfwdcbb6cff7rcrhqf42z32aqjhisp32irn1x";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-nat";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-nat";
- rev = "v0.0.4";
- sha256 = "179d5jj4sznjns9p17gmrd86pf7ba7k4qq5kiv17ra4b666kd88f";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-net";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-net";
- rev = "v0.0.2";
- sha256 = "0cfi57hvkz6yhi2nw63p2p7fnaw91zrcphxmchk2a4xn5rnwgjak";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-netutil";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-netutil";
- rev = "v0.0.1";
- sha256 = "1zzkfddfmja6dsk8nxybi5cccd2v38sahp8xx676a38g3ydvqvs6";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-peer";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-peer";
- rev = "v0.0.1";
- sha256 = "0hixdbj47njyzj885fzm9dlylw21g406yqxfidag2qrn06b2qicl";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-peerstore";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-peerstore";
- rev = "v0.0.2";
- sha256 = "1asfl9sp3mi5pg9gpy45wvsc8hpdf48i7ml37sh5sjmn30aj4f6i";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-pnet";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-pnet";
- rev = "v0.0.1";
- sha256 = "1gh2hw0dbywwp7vr4n9xws8nxraa00rigzxa86g8nf50n9cdq2cr";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-protocol";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-protocol";
- rev = "v0.0.1";
- sha256 = "18fhmhfsdzw7dd618y4344qka08zq4b5jzpdgxbglar9dkkralg7";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-pubsub";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-pubsub";
- rev = "v0.0.1";
- sha256 = "1n67ajql9527mzrc06jk4rb3xb63vmlnzx6i4aywcfn66pjg9kmh";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-pubsub-router";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-pubsub-router";
- rev = "v0.0.3";
- sha256 = "1cjscq213ky11vzdalcfnkqkj2s53npymzjvv6ahn34c6bidan4s";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-quic-transport";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-quic-transport";
- rev = "v0.0.3";
- sha256 = "0kiisb35fvblg4xaz188by4rn90chynzm94f83prqq7h9y9b3s5s";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-record";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-record";
- rev = "v0.0.1";
- sha256 = "131zjkplylwam3gnw8f9lfvjgzi8xbjhb2qf57fys4c89pz868mg";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-routing";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-routing";
- rev = "v0.0.1";
- sha256 = "09mm12abdzy6k1dw3ix8v2c8w3warc52jazvwwwvwhlq924jzdp0";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-routing-helpers";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-routing-helpers";
- rev = "v0.0.2";
- sha256 = "0lxpf1vzhapj2q18wv5g7kkqhnwz1b08lyxjp57qa33z5j4jclgw";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-secio";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-secio";
- rev = "v0.0.1";
- sha256 = "1v51whaww3bv14kl7gpapq6ld6m6v7w9cipkflh8czpgrs096yyq";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-swarm";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-swarm";
- rev = "v0.0.2";
- sha256 = "0v75wb96rddjxd8faqri076xba5ffqg4bpddw16k4bw8kk2b46w0";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-transport";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-transport";
- rev = "v0.0.4";
- sha256 = "0pgyxzb489xzcm9q11br6sgsz166cw65xhfcksy3yy5n0c1c6mvb";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-transport-upgrader";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-transport-upgrader";
- rev = "v0.0.1";
- sha256 = "0czy16zvbz2k9jn8w7iddf7xph3bn054abxybjxm4dhp7g83mf65";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-maddr-filter";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-maddr-filter";
- rev = "v0.0.1";
- sha256 = "039qj86k4dam6kch52kcdk5dsg36gfrfwambqjg1nv2xaq8j1hx8";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-mplex";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-mplex";
- rev = "v0.0.1";
- sha256 = "1f0h2hmh4c0xvv1fsjciyc8v7sn0ymanr9my2smr6z1nar7nziqn";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-msgio";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-msgio";
- rev = "v0.0.1";
- sha256 = "1my8w8k7c3mz2aazsg45q7nlr4ywmix6jspri2sv7fqrs1kjxrjm";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-nat";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-nat";
- rev = "v0.0.3";
- sha256 = "19ihybcpmz2wpi6mk3rhgjbv4cgiiang92d9ym3xw7y3iv8mlzc0";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-reuseport";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-reuseport";
- rev = "v0.0.1";
- sha256 = "1qbxhycckjv7mazg06llbx9708f1z4453yaxxp4641gwcrbns7zk";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-reuseport-transport";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-reuseport-transport";
- rev = "v0.0.2";
- sha256 = "14lqhdkx5nmrvislim7qlvnx78dnfngxvcrll9d851r04p703qrn";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-stream-muxer";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-stream-muxer";
- rev = "v0.0.1";
- sha256 = "1swqw77jn00a7cl3lb7x5wyybhv4mkqk36z407ihid44gds7djqh";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-tcp-transport";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-tcp-transport";
- rev = "v0.0.2";
- sha256 = "0qrl4mgs16wnc0dnwg3x2k3mlv9grzl8maclbkq22vqk34c5in4y";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-testutil";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-testutil";
- rev = "v0.0.1";
- sha256 = "1jmqk6cyp52fgmayx0dwas27rswrvn9lpsiv6bnabhz1gvb91ahp";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-ws-transport";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-ws-transport";
- rev = "v0.0.2";
- sha256 = "1j321z8m82a43v70jmglh2v0hv1wmgsizr5zrlgwqsx3wsih9phx";
- };
- }
- {
- goPackagePath = "github.com/lucas-clemente/quic-go";
- fetch = {
- type = "git";
- url = "https://github.com/lucas-clemente/quic-go";
- rev = "v0.11.1";
- sha256 = "1vhswcbiyaq94rwc6vd8vl13x3lfwilpfw7kqx7bflxj7zvvd18y";
- };
- }
- {
- goPackagePath = "github.com/marten-seemann/qtls";
- fetch = {
- type = "git";
- url = "https://github.com/marten-seemann/qtls";
- rev = "v0.2.3";
- sha256 = "0b9p7bwkm9hfg1mb565q4nw5k7xyks0z2xagz5fp95azy2psbnfg";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "v0.1.1";
- sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "v0.0.5";
- sha256 = "114d5xm8rfxplzd7nxz97gfngb4bhqy102szl084d1afcxsvm4aa";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "v0.0.4";
- sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "v1.0.1";
- sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
- };
- }
- {
- goPackagePath = "github.com/mgutz/ansi";
- fetch = {
- type = "git";
- url = "https://github.com/mgutz/ansi";
- rev = "9520e82c474b";
- sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j";
- };
- }
- {
- goPackagePath = "github.com/miekg/dns";
- fetch = {
- type = "git";
- url = "https://github.com/miekg/dns";
- rev = "v1.1.4";
- sha256 = "17apnm7q5v7bhmpvrk3rbi0gjqk8z3cwkm90q1dfzrfvbvp71z5d";
- };
- }
- {
- goPackagePath = "github.com/minio/blake2b-simd";
- fetch = {
- type = "git";
- url = "https://github.com/minio/blake2b-simd";
- rev = "3f5f724cb5b1";
- sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd";
- };
- }
- {
- goPackagePath = "github.com/minio/sha256-simd";
- fetch = {
- type = "git";
- url = "https://github.com/minio/sha256-simd";
- rev = "2d45a736cd16";
- sha256 = "1hfhpy8fczd0mnwvxkp2nk3dydv1nzqx59ig8ajqjraq6kli66p5";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/go-homedir";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/go-homedir";
- rev = "v1.1.0";
- sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
- };
- }
- {
- goPackagePath = "github.com/mr-tron/base58";
- fetch = {
- type = "git";
- url = "https://github.com/mr-tron/base58";
- rev = "v1.1.0";
- sha256 = "00w28mhinf8dvzrh71dijryfhrggi7j9wqiiyddpk41ixx3rmfy4";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-base32";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-base32";
- rev = "v0.0.3";
- sha256 = "1f4pjnqw4687p8l7vr1qaq6g6i9pcr80fc4pk2kpgrcwzpd1lprg";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multiaddr";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multiaddr";
- rev = "v0.0.1";
- sha256 = "1r1w4036bpi97xb70833bpdpdhqm5gl6m8fllfdxqbg10ab1a938";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multiaddr-dns";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multiaddr-dns";
- rev = "v0.0.2";
- sha256 = "1fnv7lbd7q1kssaxp2fgrvj9dhn5aiqspd4090iqwys5hjr1xvmf";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multiaddr-net";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multiaddr-net";
- rev = "v0.0.1";
- sha256 = "1075xs6gbiblfbwgf84yvg1nrywmvvrrxzqa8wp9j75zyakab81p";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multibase";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multibase";
- rev = "v0.0.1";
- sha256 = "083adnq79pyxhngv91saygh076196qin1nw1vppz7nk04zw4aymg";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multicodec";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multicodec";
- rev = "v0.1.6";
- sha256 = "08wnxhb4rd7rln2mzxnhv3csy19l9qgf5dx3437x4zsgkaqabb96";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multihash";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multihash";
- rev = "v0.0.1";
- sha256 = "1aw4ra22g3l98bk7c3h1n968vi5a3gk528g4byj3xig76r0r731n";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multistream";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multistream";
- rev = "v0.0.1";
- sha256 = "1k79w7zd92cs9sjvsr31vi6n3j30xqz83mb3a3pqva11wl1gbnlz";
- };
- }
- {
- goPackagePath = "github.com/onsi/ginkgo";
- fetch = {
- type = "git";
- url = "https://github.com/onsi/ginkgo";
- rev = "v1.7.0";
- sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
- };
- }
- {
- goPackagePath = "github.com/onsi/gomega";
- fetch = {
- type = "git";
- url = "https://github.com/onsi/gomega";
- rev = "v1.4.3";
- sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
- };
- }
- {
- goPackagePath = "github.com/opentracing/opentracing-go";
- fetch = {
- type = "git";
- url = "https://github.com/opentracing/opentracing-go";
- rev = "v1.0.2";
- sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "v0.8.1";
- sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "v1.0.0";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/polydawn/refmt";
- fetch = {
- type = "git";
- url = "https://github.com/polydawn/refmt";
- rev = "df39d6c2d992";
- sha256 = "07hj5wimwgwj8xzzbvk0y7d6fmqf44d7fjicp1digh4kvjsbg3dz";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "v0.9.2";
- sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "5c3871d89910";
- sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
- };
- }
- {
- goPackagePath = "github.com/prometheus/common";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/common";
- rev = "4724e9255275";
- sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "1dc9a6cbc91a";
- sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab";
- };
- }
- {
- goPackagePath = "github.com/rs/cors";
- fetch = {
- type = "git";
- url = "https://github.com/rs/cors";
- rev = "v1.6.0";
- sha256 = "12j838rj6xl9y1xqs1mnh9zkc3dkpn94iqkp6jkdkxw631aa94dr";
- };
- }
- {
- goPackagePath = "github.com/sirupsen/logrus";
- fetch = {
- type = "git";
- url = "https://github.com/sirupsen/logrus";
- rev = "v1.0.5";
- sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
- };
- }
- {
- goPackagePath = "github.com/smartystreets/assertions";
- fetch = {
- type = "git";
- url = "https://github.com/smartystreets/assertions";
- rev = "b2de0cb4f26d";
- sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
- };
- }
- {
- goPackagePath = "github.com/smartystreets/goconvey";
- fetch = {
- type = "git";
- url = "https://github.com/smartystreets/goconvey";
- rev = "a17d461953aa";
- sha256 = "1942lhpv7c16dq27wjj2cjxsgra5lpsnxn52a9zvj8d0nip8nhq6";
- };
- }
- {
- goPackagePath = "github.com/spaolacci/murmur3";
- fetch = {
- type = "git";
- url = "https://github.com/spaolacci/murmur3";
- rev = "f09979ecbc72";
- sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "v1.0.1";
- sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
- };
- }
- {
- goPackagePath = "github.com/stretchr/objx";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/objx";
- rev = "v0.1.0";
- sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "v1.3.0";
- sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
- };
- }
- {
- goPackagePath = "github.com/syndtr/goleveldb";
- fetch = {
- type = "git";
- url = "https://github.com/syndtr/goleveldb";
- rev = "v1.0.0";
- sha256 = "042k0gbzs5waqpxmd7nv5h93mlva861s66c3s9gfg1fym5dx4vmd";
- };
- }
- {
- goPackagePath = "github.com/texttheater/golang-levenshtein";
- fetch = {
- type = "git";
- url = "https://github.com/texttheater/golang-levenshtein";
- rev = "d188e65d659e";
- sha256 = "0dmaxmwz2vx2v51hybjpcwz260apaq3v8gm84ran38fcs8xl529c";
- };
- }
- {
- goPackagePath = "github.com/urfave/cli";
- fetch = {
- type = "git";
- url = "https://github.com/urfave/cli";
- rev = "v1.20.0";
- sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
- };
- }
- {
- goPackagePath = "github.com/warpfork/go-wish";
- fetch = {
- type = "git";
- url = "https://github.com/warpfork/go-wish";
- rev = "5ad1f5abf436";
- sha256 = "1jns04jdb07f695ipf0pfal2k7ss47jxgdi2ahqmskzglb26zm62";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/base32";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/base32";
- rev = "c30ac30633cc";
- sha256 = "060jj8j9rnm3m47vv7jfz9ddybch3ryvn1p9vhc63bqn73knalhf";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/cbor";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/cbor";
- rev = "63513f603b11";
- sha256 = "0v3kgzk8grz17my2vhv12qi9dgpx3z86hy9ff1c4qw83mg8hm67s";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/chunker";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/chunker";
- rev = "fe64bd25879f";
- sha256 = "13q4flp9iwwyi0izqar786h42713rf3m22qlvg0masbmdi69qjr2";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/go-ctrlnet";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/go-ctrlnet";
- rev = "f564fbbdaa95";
- sha256 = "1ni4fb9bbaiicy8yd9w8i442v94k59czlmpvjqg0y5am67x73gxk";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/go-keyspace";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/go-keyspace";
- rev = "5b898ac5add1";
- sha256 = "0fkk7i7qxwbz1g621mm6a6inb69lr57cyc9ayyfiwhnjwfz78rbb";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/go-logging";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/go-logging";
- rev = "0457bb6b88fc";
- sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/go-notifier";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/go-notifier";
- rev = "097c5d47330f";
- sha256 = "081h4a33603n0mlh53by1mg21rr42xjvxk7r10x8l4v671bq0kha";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/go-smux-multiplex";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/go-smux-multiplex";
- rev = "v3.0.16";
- sha256 = "0y696zqrbdyvz9gkxd9armhxa82z2fg0wpm8yqp7swyxdsg15f8k";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/go-smux-multistream";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/go-smux-multistream";
- rev = "v2.0.2";
- sha256 = "0sbxmn56fx1py6nijk9prkm4rqswynsw68frvlm11w5m57szi5pj";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/go-smux-yamux";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/go-smux-yamux";
- rev = "v2.0.9";
- sha256 = "046nx0d9974shd6y3ic2dznij0yzaijp6z6g46kpa4iwf2w41jwk";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/go-sysinfo";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/go-sysinfo";
- rev = "4a357d4b90b1";
- sha256 = "0s6yjp9incc579wbbga33vq0hcanv8j2xh9l90ya0r4fihz39jiq";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/mafmt";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/mafmt";
- rev = "v1.2.8";
- sha256 = "0sr602pbxid3ncfd8v0dgjd1a79qg3k4bzniq811jjdq9zm9jccv";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/mdns";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/mdns";
- rev = "ef14215e6b30";
- sha256 = "17hid8s9asqyqgbw20wp4ip5sy03b5sayzld2i09w9l42217502q";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/multiaddr-filter";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/multiaddr-filter";
- rev = "e903e4adabd7";
- sha256 = "0ksd8vnp207dvphmhrazwldj8if900fnyc1pqa9pfvj04qp92640";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/tar-utils";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/tar-utils";
- rev = "8c6c8ba81d5c";
- sha256 = "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/timecache";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/timecache";
- rev = "cfcb2f1abfee";
- sha256 = "0nnra7ivq7cj34rj2ib8hgfdpik3smr1hy7x18svhfin8z1xsj2s";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/yamux";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/yamux";
- rev = "v1.1.5";
- sha256 = "08a4v0akdxg16g6mi32ixsldjbg3pp3j4x0xicaxc4fd6cfmi1wv";
- };
- }
- {
- goPackagePath = "go4.org";
- fetch = {
- type = "git";
- url = "https://github.com/go4org/go4";
- rev = "ce4c26f7be8e";
- sha256 = "0lzvmspdqqf251lrgawnss2wn3bnd3pj89xjxlvpgg6q0853580j";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "8dd112bcdc25";
- sha256 = "0gbcz7gxmgg88s28vb90dsp1vdq0har7zvg2adsqbp8bm05x9q6b";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "c95aed5357e7";
- sha256 = "0b1vjnzd67sp9lggs0yn9qfgp6f5djqgx40lyncd7j720q04kk2h";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "42b317875d0f";
- sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "b6889370fb10";
- sha256 = "01c1ag1qr95iksp38rypfbrlk6sdqjhk7jgj3qf342ndhvqb08sa";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "v0.3.0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/tools";
- rev = "90fa682c2a6e";
- sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
- };
- }
- {
- goPackagePath = "golang.org/x/xerrors";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/xerrors";
- rev = "a5947ffaace3";
- sha256 = "1bgn7j704mf891qcwcbqzr5sq9ar7z2a81887k8pp0b1g2giwgfz";
- };
- }
- {
- goPackagePath = "google.golang.org/genproto";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-genproto";
- rev = "11092d34479b";
- sha256 = "12qcrjq658zga5fj4n0wgm11pzpr3gafwg25cinl5qcq4p9cnl0r";
- };
- }
- {
- goPackagePath = "gopkg.in/airbrake/gobrake.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/airbrake/gobrake.v2";
- rev = "v2.0.9";
- sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw";
- };
- }
- {
- goPackagePath = "gopkg.in/check.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/check.v1";
- rev = "788fd7840127";
- sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
- };
- }
- {
- goPackagePath = "gopkg.in/cheggaaa/pb.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/cheggaaa/pb.v1";
- rev = "v1.0.28";
- sha256 = "13a66cqbpdif804qj12z9ad8r24va9q41gfk71qbc4zg1wsxs3rh";
- };
- }
- {
- goPackagePath = "gopkg.in/fsnotify.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/fsnotify.v1";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2";
- rev = "v2.1.2";
- sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5";
- };
- }
- {
- goPackagePath = "gopkg.in/tomb.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/tomb.v1";
- rev = "dd632973f1e7";
- sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.1";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
- {
- goPackagePath = "gotest.tools";
- fetch = {
- type = "git";
- url = "https://github.com/gotestyourself/gotest.tools";
- rev = "v2.1.0";
- sha256 = "11k6hmfhaf0qxpddp3i5kfpacdx51q6pv4n1kn3jnf1hjs0yny2k";
- };
- }
- {
- goPackagePath = "gotest.tools/gotestsum";
- fetch = {
- type = "git";
- url = "https://github.com/gotestyourself/gotestsum";
- rev = "v0.3.3";
- sha256 = "0wkh49yixvh5y1z96sanjfyvd7c63pvryz605lz0hzdbvcwciy7i";
- };
- }
-]
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index f03e4c4e9e34028ec9ff7238c908e55a444c25ea..34c4fcf0c88c038f2f47a93a238c6e5cfc1e8017 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2
, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy
-, libsexy, enchant, libnotify, openssl, intltool
+, libsexy, enchant1, libnotify, openssl, intltool
, desktop-file-utils, hicolor-icon-theme
, autoconf, automake, autoconf-archive
}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
#hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path
patchPhase = ''
- sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
+ sed -i "s,libenchant.so.1,${enchant1}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
'';
preConfigure = ''
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 8aa599c09c40272d56355849f072b80abcd52cce..347b7b28ca93bdb9ef2f4a5ac50e2e10ee122121 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }:
stdenv.mkDerivation rec {
- version = "1.2.0";
+ version = "1.2.1";
name = "irssi-${version}";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
- sha256 = "1sp3fc5fkdx0mmllvag94xaifnqbj1k09nl235pix26vv1gzq39m";
+ sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index ccee78a64da684f80ed4e1bb54c1112631f1d8bb..27297b01dce1f9097021d66719dcccc7ed4d938f 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,7 +1,6 @@
{ mkDerivation
, lib
, fetchurl
-, fetchpatch
, extra-cmake-modules
, kdoctools
, kbookmarks
diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bd38855109a19190966522b6080fdf7abee672d9
--- /dev/null
+++ b/pkgs/applications/networking/irc/kvirc/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub
+, qtbase, qtmultimedia, qtsvg, qtx11extras
+, pkgconfig, cmake, gettext
+}:
+
+stdenv.mkDerivation rec {
+ pname = "kvirc";
+ version = "5.0.0";
+
+ src = fetchFromGitHub {
+ owner = "kvirc";
+ repo = "KVIrc";
+ rev = version;
+ sha256 = "1dq7v6djw0gz56rvghs4r5gfhzx4sfg60rnv6b9zprw0vlvcxbn4";
+ };
+
+ buildInputs = [
+ qtbase qtmultimedia qtsvg qtx11extras
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig cmake gettext
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Advanced IRC Client";
+ homepage = "http://www.kvirc.net/";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.suhr ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 6bdade7198abb547e992b8696401ca67ccbc24db..5ae96d03f7c653b7dead4f34e589d130203febf8 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -5,12 +5,11 @@
, asciidoctor # manpages
, guileSupport ? true, guile
, luaSupport ? true, lua5
-, perlSupport ? true, perl, perlPackages
+, perlSupport ? true, perl
, pythonSupport ? true, pythonPackages
, rubySupport ? true, ruby
, tclSupport ? true, tcl
, extraBuildInputs ? []
-, fetchpatch
}:
let
@@ -28,22 +27,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "2.4";
+ version = "2.5";
name = "weechat-${version}";
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "1z80y5fbrb56wdcx9njrf203r8282wnn3piw3yffk5lvhklsz9k1";
+ sha256 = "14giv8j1phmpg3i9whx45nmskan501lwcq352ps9z52rkja2qxsc";
};
- patches = [
- (fetchpatch {
- url = https://github.com/weechat/weechat/commit/6a9937f08ad2c14aeb0a847ffb99e652d47d8251.patch;
- sha256 = "1blhgxwqs65dvpw3ppxszxrsg02rx7qck1w71h61ljinyjzri3bp";
- excludes = [ "ChangeLog.adoc" ];
- })
- ];
-
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
enableParallelBuilding = true;
@@ -85,7 +76,7 @@ let
on https://nixos.org/nixpkgs/manual/#sec-weechat .
'';
license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ma27 ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 the-kenny lheckemann ma27 ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index 280e447cd0a10619874b742f3856953870f6d452..de7974d4cbe38c41a2d5a00dd07393b8d281b6bc 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "wee-slack-${version}";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchFromGitHub {
repo = "wee-slack";
owner = "wee-slack";
rev = "v${version}";
- sha256 = "1iy70q630cgs7fvk2151fq9519dwxrlqq862sbrwypzr6na6yqpg";
+ sha256 = "0544j6vqbvb2xshq7ma2a3apx2vvpgfg3jh5prg265wnh4991nsw";
};
patches = [
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch
index 8887e075f13c38d750befac859ec31e9ff1f553f..af2dd36b41c51ff6fd33f60513df288adda2a683 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch
@@ -1,13 +1,13 @@
diff --git a/wee_slack.py b/wee_slack.py
-index c5c7bc6..23fef2f 100644
+index dbe6446..d1b7546 100644
--- a/wee_slack.py
+++ b/wee_slack.py
-@@ -25,6 +25,8 @@ try:
- except:
- from StringIO import StringIO
+@@ -25,6 +25,8 @@ import random
+ import socket
+ import string
+sys.path.append('@env@')
+
- from websocket import create_connection, WebSocketConnectionClosedException
+ from websocket import ABNF, create_connection, WebSocketConnectionClosedException
- # hack to make tests possible.. better way?
+ try:
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 137a32f9364f2c90bfa4cd993540e113914d8797..233fe418df3a0ba4ae343490c93ec57d6174ff92 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -42,5 +42,9 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ ma27 ];
license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53
platforms = platforms.unix;
+
+ # As of 2019-06-30, all of the dependencies are available on macOS but the
+ # package itself does not build.
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
index 81073222c2b4e9bc732759f196873f531e33818c..6dcd9a31e5e0af57ee0d1cd11e14fa553990d751 100644
--- a/pkgs/applications/networking/irc/weechat/wrapper.nix
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, runCommand, writeScriptBin, buildEnv
+{ lib, runCommand, writeScriptBin, buildEnv
, pythonPackages, perlPackages, runtimeShell
}:
@@ -6,7 +6,8 @@ weechat:
let
wrapper = {
- configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
+ installManPages ? true
+ , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
}:
let
@@ -65,14 +66,22 @@ let
${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
'') // {
- inherit (weechat) name;
+ inherit (weechat) name man;
unwrapped = weechat;
+ outputs = [ "out" "man" ];
};
in buildEnv {
name = "weechat-bin-env-${weechat.version}";
+ extraOutputsToInstall = lib.optionals installManPages [ "man" ];
paths = [
(mkWeechat "weechat")
(mkWeechat "weechat-headless")
+ (runCommand "weechat-out-except-bin" { } ''
+ mkdir $out
+ ln -sf ${weechat}/include $out/include
+ ln -sf ${weechat}/lib $out/lib
+ ln -sf ${weechat}/share $out/share
+ '')
];
meta = builtins.removeAttrs weechat.meta [ "outputsToInstall" ];
};
diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index 374e4c7d4c86927956dbd34a7359d22ef5b33eb8..34f332b003cfdd0a6e50ad822d071e4d60827962 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
Applications but has since expanded to other test functions.
'';
license = licenses.asl20;
- maintainers = [ maintainers.garbas ];
+ maintainers = [ ];
priority = 1;
platforms = platforms.unix;
};
diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix
index af94db23c0acc7c74d343045a7f241c7837e7d31..8967a5d824aa356bcac9fe8b5a60314fae0b64d0 100644
--- a/pkgs/applications/networking/jnetmap/default.nix
+++ b/pkgs/applications/networking/jnetmap/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "jnetmap-${version}";
version = "0.5.4";
-
+
src = fetchurl {
url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}.jar";
sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ jre makeWrapper ];
- unpackPhase = ":";
+ dontUnpack = true;
installPhase = ''
mkdir -p "$out/bin"
diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d3a3dd6e29af7eb55955ab8fa9ddf87f63a4f059
--- /dev/null
+++ b/pkgs/applications/networking/libcoap/default.nix
@@ -0,0 +1,31 @@
+{ fetchFromGitHub, automake, autoconf, which, pkgconfig, libtool, stdenv }:
+stdenv.mkDerivation rec {
+ pname = "libcoap";
+ version = "4.2.0";
+ src = fetchFromGitHub {
+ repo = "libcoap";
+ owner = "obgm";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = "0mmvkq72i4rda6b7g93qrwg2nwh2rvkq4xw70yppj51hsdrnpfl7";
+ };
+ nativeBuildInputs = [
+ automake
+ autoconf
+ which
+ libtool
+ pkgconfig
+ ];
+ preConfigure = "./autogen.sh";
+ configureFlags = [
+ "--disable-documentation"
+ "--disable-shared"
+ ];
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/obgm/libcoap";
+ description = "A CoAP (RFC 7252) implementation in C";
+ platforms = platforms.linux;
+ license = licenses.bsd2;
+ maintainers = [ maintainers.kmein ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e5d8c728a196e32ed1bed2436c4ac1d5cfd4a80c
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, buildGoModule, fetchurl
+, go, scdoc
+, python3, perl, w3m, dante
+}:
+
+buildGoModule rec {
+ pname = "aerc";
+ version = "0.1.1";
+
+ src = fetchurl {
+ url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz";
+ sha256 = "0rpwjjnaq8mj619ajzyl3kad7sysbz87qz2ds0jyy7kvyzv6r7zb";
+ };
+
+ nativeBuildInputs = [
+ go
+ scdoc
+ python3.pkgs.wrapPython
+ ];
+
+ pythonPath = [
+ python3.pkgs.colorama
+ ];
+
+ buildInputs = [ python3 perl ];
+
+ buildPhase = "
+ runHook preBuild
+ # we use make instead of go build
+ runHook postBuild
+ ";
+
+ installPhase = ''
+ runHook preInstall
+ make PREFIX=$out install
+ wrapPythonProgramsIn $out/share/aerc/filters "$out $pythonPath"
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ wrapProgram $out/bin/aerc --prefix PATH ":" "$out/share/aerc/filters"
+ wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \
+ ${stdenv.lib.makeBinPath [ w3m dante ]}
+ '';
+
+ modSha256 = "0p8lp6xwg6jacrnxzw3q73mqxy9wzj5vs0k1saa48ardqd2f7b00";
+
+ meta = with stdenv.lib; {
+ description = "aerc is an email client for your terminal";
+ homepage = https://aerc-mail.org/;
+ maintainers = with maintainers; [ tadeokondrak ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix
index bdf39de0651c4080ff26306e8f0611c8e9b8609c..cd512e776130bb653050f549dcacc54d5f5dfd7e 100644
--- a/pkgs/applications/networking/mailreaders/afew/default.nix
+++ b/pkgs/applications/networking/mailreaders/afew/default.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "afew";
- version = "1.3.0";
+ version = "2.0.0";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz";
+ sha256 = "0j60501nm242idf2ig0h7p6wrg58n5v2p6zfym56v9pbvnbmns0s";
};
nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ];
@@ -15,24 +15,27 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.notmuch chardet dkimpy
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
+ makeWrapperArgs = [
+ ''--prefix PATH ':' "${notmuch}/bin"''
+ ];
+
+ outputs = [ "out" "doc" ];
+
postBuild = ''
- make -C docs man
+ python setup.py build_sphinx -b html,man
'';
postInstall = ''
- mandir="$out/share/man/man1"
- mkdir -p "$mandir"
- cp docs/build/man/* "$mandir"
+ install -D -v -t $out/share/man/man1 build/sphinx/man/*
+ mkdir -p $out/share/doc/afew
+ cp -R build/sphinx/html/* $out/share/doc/afew
'';
- makeWrapperArgs = [
- ''--prefix PATH ':' "${notmuch}/bin"''
- ];
meta = with stdenv.lib; {
homepage = https://github.com/afewmail/afew;
description = "An initial tagging script for notmuch mail";
license = licenses.isc;
- maintainers = with maintainers; [ garbas andir flokli ];
+ maintainers = with maintainers; [ andir flokli ];
};
}
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 41f3a271a699606949b9008731c273a51d5f7701..58797800deb05449b4149cee109eaa11d2bbdf96 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
, gtkmm3, libpeas, gsettings-desktop-schemas
-, makeWrapper, python3, python3Packages
+, python3, python3Packages
, vim ? vim_configurable.override {
features = "normal";
gui = "auto";
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index f7f34a67183760603600593db5caa6567281741a..db3cd7782e8f61d0a5041068726b425bc46c7656 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "balsa-${version}";
- version = "2.5.6";
+ version = "2.5.7";
src = fetchurl {
url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2";
- sha256 = "17k6wcsl8gki7cskr3hhmfj6n54rha8ca3b6fzd8blsl5shsankx";
+ sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
index 79deab46912bcfe70a50181b4e86d29e68bec4eb..bc0918737dd5205a363791fb06df02825c652b57 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -10,7 +10,7 @@ let
alternativeConfig = builtins.toFile "lumail2.lua"
(builtins.readFile alternativeGlobalConfigFilePath);
- globalConfig = if isNull alternativeGlobalConfigFilePath then ''
+ globalConfig = if alternativeGlobalConfigFilePath == null then ''
mkdir -p $out/etc/lumail2
cp global.config.lua $out/etc/lumail2.lua
for n in ./lib/*.lua; do
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 4e7be2be47328006f50a70a7a8a50ac99d026731..f259fdebf2280411b1b66bc4848e3f2a3d720a92 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
- version = "1.11.4";
+ version = "1.12.1";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "0098pr4anmq2a0id8wfi2vci3cgcfwf9k4q411w22xn8lrz3aldn";
+ sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81";
};
patches = optional smimeSupport (fetchpatch {
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 0da451ed51e2279f84c5f5aa3dc89be5ed140321..f4b0846b98f02a425c6c0b6a9c8bf45ebce06f83 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -3,19 +3,7 @@
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell
}:
-let
- muttWrapper = writeScript "mutt" ''
- #!${runtimeShell} -eu
-
- echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.'
- echo ""
- echo 'This wrapper is provided for compatibility purposes only. You should start calling `neomutt` instead.'
- echo ""
- read -p 'Press any key to launch NeoMutt...' -n1 -s
- exec neomutt "$@"
- '';
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
version = "20180716";
name = "neomutt-${version}";
@@ -80,7 +68,6 @@ in stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lidn";
postInstall = ''
- cp ${muttWrapper} $out/bin/mutt
wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt"
'';
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index c2cce227576a5a5ee24e5c04bdfb880a35bdd9e0..126e2854574e2839dd5fa459b5a1e5b7729de50e 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Address lookup tool for Notmuch in C";
homepage = https://github.com/aperezdc/notmuch-addrlookup-c;
- maintainers = with maintainers; [ mog garbas ];
+ maintainers = with maintainers; [ mog ];
platforms = platforms.unix;
license = licenses.mit;
};
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 305535029c28e360921071a403cc00a2b434cdf2..9ddedac09747fdc8cc1e01dd14c0e17e690b92f7 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "0.28.3";
+ version = "0.28.4"; # not really, git
name = "notmuch-${version}";
passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://notmuchmail.org/releases/${name}.tar.gz";
- sha256 = "1v0ff6qqwj42p3n6qw30czzqi52nvgf3dn05vd7a03g39a5js8af";
+ sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds";
};
nativeBuildInputs = [ pkgconfig ];
@@ -52,13 +52,13 @@ stdenv.mkDerivation rec {
--replace '-install_name $(libdir)' "-install_name $out/lib"
'';
- configureFlags = [ "--zshcompletiondir=$(out)/share/zsh/site-functions" ];
+ configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ];
# Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
# friends
setOutputFlags = false;
enableParallelBuilding = true;
- makeFlags = "V=1";
+ makeFlags = [ "V=1" ];
preCheck = let
test-database = fetchurl {
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
gdb man
];
- installTargets = "install install-man";
+ installTargets = [ "install" "install-man" ];
dontGzipMan = true; # already compressed
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
description = "Mail indexer";
homepage = https://notmuchmail.org/;
license = licenses.gpl3;
- maintainers = with maintainers; [ flokli garbas the-kenny ];
+ maintainers = with maintainers; [ flokli the-kenny ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index cfc471a57f0528ff35594d3d3bd023c113ba1804..f7b7d6e8c3d8186fe1b42b9630ae17fd9149cb61 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -1,4 +1,4 @@
-{ lib, bundlerApp, rake, which }:
+{ lib, bundlerApp }:
# Updated with:
# rm gemset.nix Gemfile.lock
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 7f32e45f5d31e4099d373c51c182fd23a57dfe37..088233644791002108ff5067523622ebafb5fc24 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation {
'';
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
- inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;
+ inherit name writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;
baseName = "thunderbird";
channel = "release";
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index b34fde7b7c1b5bff4ab4ca391390b85d50ab9caa..8e1f2a0f65f8e7f01398cec00f9c4822eb9b51c5 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,585 +1,585 @@
{
- version = "60.6.0";
+ version = "60.8.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ar/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ar/thunderbird-60.8.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "ba14ed80e0b18cc3b40a1bf1810eb67a246f6e995d527e625432eb24dce46bde85dd0dbcac5590d74b8bbb7be900f266b72055349f9b0ea6839fb8d5779aa54d";
+ sha512 = "a10386c0c55e52571c5b922a1531a891a98caa9a1b118ffa6e5e0655b838c207ba2638988d6fdeeb62135bbd19b071f9c2dfd2c52379e4f8ca2012c17aa5a065";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ast/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ast/thunderbird-60.8.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "b6ab87d344c3e806a2316022a6c8632dcd9548c745766e136ca9aa70f54fe744587849372fc7426173a91996ff4709aee85f8e5de2565add3bbac58d370e7a96";
+ sha512 = "fecf4367234a794e22ccc6665622bf083bbaf8ecb1f8e03bf64c2bfa91028ff6a02497ae5ebdf474b4073fff121b23a55d8373ce16e282b9630bf6bd6223b555";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/be/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/be/thunderbird-60.8.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "2d5f88efb2f6e3be552cb503bfe184a3ad6b395da3139c6c97585f490d9a02c5ce391c0f6b3b1be0505b63f0b8af70da9eca8820b5baefc3dc043a60abb47d5a";
+ sha512 = "3ffc3ab21f3a070d8f465591db242b5cc0485cb2655373fc697298825f46a5f2f93301684ff69510ea2d74743a8e00e23e7f56e2a29638484bed40089714b7ad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/bg/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/bg/thunderbird-60.8.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "16b7b8d54e200b9156a346a0e4b80cb5c91a0297222a3f4a227770344d6453fea679d7c8a512eb9d879abe262ce34c2dab654cbe60aab13d0cc7919757dcae8d";
+ sha512 = "e789ca25f887bc9b228fd29796b38cb061ba931ebb0e2d2b15b290771b2312d4051d248dd467c64acc5cbdc1d5c1ae23e0d5b5dba4a35983ffa44062c7632bbe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/br/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/br/thunderbird-60.8.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "d20854f75f09f95489a1d647bbdeed9062a553dcede68f48672d0a0a82001e283a7d24162a6110ce3efa1a1bdd846ca7fe036c37a20f63bf8dcd54d80a767084";
+ sha512 = "5088057f31b2ff77f89b25e9c1638b2080981a489a392d928f259cce38916b9b7da89132d931363fc652c1711250e1e77fc56b0427674f0648229688ba3285dd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ca/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ca/thunderbird-60.8.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "8477742f367c2e4206ba61afcef372d39163aeba5e781ea9a089b0d3cf9ef44be8ce6bd3417490616a51aff3152a52eb3599b2acf66e0186e696c9df29b9732b";
+ sha512 = "3eb939b9a811254487eca4920ae84d33773d0963c77dfd84df7cf02a98b975d13d9088a70c2e8863f3290c6c7bfe6c7a240eda8e3bfdf3de28883c5d1e842e5f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/cs/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cs/thunderbird-60.8.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "b434e8763a93df511dcc9c032d11c0a26c7583f7ce01980be63ea453f8d503e703cddca5e5a67db619cb1b9690d0256c91eec8166fff30733186e429d3c513a8";
+ sha512 = "867706fc4e459d0e7723e9ef0e86176822623ca85f446f1ab9935f7f7a95292da637d57ab6046a8ef4d8a40bd5fc37451a32cad71a2d45bf4e4cf7adccd44775";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/cy/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cy/thunderbird-60.8.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "71a6a2642dfce4505ed3b6b551ffdd5c469f1261191b73d3bd09bdf98788297536b3b94dd52327d263d4b1256080ff0317d8e10e09b53871ab805b426892e9a0";
+ sha512 = "56d6485c397984b3394831169efe8bc2d7078d958358a37f1c9775b17bef0a4a347429838f122291f10e3dbc289865aaa475d3d3f4e7deaa2d22205690110c05";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/da/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/da/thunderbird-60.8.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "e24c19e5caafd4b4c5081acf700fb175e07c1702da0af111122cf793e4791d38c49902e1b9574ab9606482c539677e6caad2b9f8f655ac0fb24f1b0c8454c456";
+ sha512 = "6d35e77a03b0a44e8629baa80eb1889892a0dcd7a1a7ef5f016a6133fd8c5555474fa3bae79e3c5c25b0618832e680ea505cdf82de268bb4cecad7187830ff4a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/de/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/de/thunderbird-60.8.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "e9ec916a00bfd50745c95ed42976eeb0b9cc314165b6401e24e1433a68fa5591c3020397a0c35566072784e423b42132d4e55dc307a47d34c693d5fe9e3e6380";
+ sha512 = "7b6f65c2146eccd91db9f2a050722c28ff3c9ed8a9e7a822fc1558c6b56761ba68ee5fdbbf1324c35dc98b0b33e8e54709664b972ad2318dcdf4472251ef1d1f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/dsb/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/dsb/thunderbird-60.8.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "4fd72e0ba6982c0aeba4911a626aa7dea2d6678502aec9523efb5e89b613b20b471d50a2667df000541279ff961fc3323ebaa16d3482c2bebcaa33ec849a05d3";
+ sha512 = "fef020d88b4560b8eae5b81d9d36179719389c742a462682ca0afff942474158b1cdedeca6f348598ca89268bae3d953ac63debd972f7349ed8a7cb56e96cdd7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/el/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/el/thunderbird-60.8.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "bd86c6855ce42bf52ca6822e6fd3cfd7e09c9fd2577407c666b46d84afcf43655f30dc0e3546ae41b84eb5ca7e681072fae90a08de9dd017c3594dea4e5b9bb8";
+ sha512 = "fae21025f07a7d0be663d6dda4cb43cdc2b4b488a76e4ab0bae304284b17598689ed32554066e1d00097479e1ca4f163473cee854b853acedc46887256a45d02";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/en-GB/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-GB/thunderbird-60.8.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "47009db4f18cad43a9d4ba20a4edbfbb07cc5222cb65121dfe45eb3c9120fd18277d5601309f9f3f21eebe10fd70201a9d15815fd35ef6f9d3f95360d939a0ec";
+ sha512 = "cfb8f7770d1fa2ad12ac19a2f069840a37f13c352d4271c4dc479cf4cc1d3ac381053ef9046b4b0fe891b67097f5db674ed6281853b2ebab1fe9744bd113bb08";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/en-US/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-US/thunderbird-60.8.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "86bfb05041e347430c424652f8fcb102aa44c0bb68bf1b7a55ce888fcefa2ac08f55bb4bcbe7a558aaf3214ae694b97a6805f14de2ce575968fa2a1988e281ba";
+ sha512 = "c0eeec28c235be86760dca83941a202475846153a1b186ad948eb673e0c6b1e870cb1c485f5a1dd9ed885eaac52f36cdde4417ba86dca388c43c03299b0adcea";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/es-AR/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-AR/thunderbird-60.8.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "87a5caeb7d8f8846c52b9a7344260e480efce156239559a890bf5e167939cd35e2223ef4ad2429b196a87ca164b02eb7df3dd03ed1f52f95bf30d75afec40fd8";
+ sha512 = "151e9ecb12ee13dc9cf87040c5f90d9dfeb528e25889fb48d7bd5a9a47f7a6166402c1c4ebf96c9a4184d27e89cc13ff31079151f7ca2860ac91100d2dc7f6a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/es-ES/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-ES/thunderbird-60.8.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "ec6a17263d696b2fa4195349fd3badaf7ac7dbdf93ee7247a77d27aa13daf5de06db8c2df3449b06e6d28fc032e9c4eeb897be8b1a798e9fb7b68f3c8509d6d8";
+ sha512 = "0209584bf7d1396d3d3f754e4f6cf3a6cfee2f7aeea9869edb60bdc832e87b9437f4962fe59a19df78ecd53681981e68bb6efc98e05f7ef50883a59983ddbb66";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/et/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/et/thunderbird-60.8.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "d4591fdc97c5c1654f59116670e8516c12b53311e6f76f13711c04c86cfbf4cbd893a2f5f657b27fc44ad9919e3c0b5192ae98b26281ef4df6863fc522d50a7b";
+ sha512 = "766656029454d89be4fa8ac8ebfc61f25d86c6f8974abe1426cd96dd5b7492bbdf4f8568ac18a69fa4ac3acf4a28486f1184c0852d4ee29416d6dbf3ddee097f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/eu/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/eu/thunderbird-60.8.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "316b4d9d515b23476d29c0136c9981d281f7a3628aacd18f912640a2b6e1d5b53d66d42e9300af6b2cb78e4ada7458d0002c3d4a5ac7f5129db3dd66f4358341";
+ sha512 = "db312b24b48677e47fa9ade4f04e219ec6a1aefb03239b60ba63c46659e86eadbec32513c494d48c90e303a87bcdd7280d7c4ae5be4df1a2c30159516bca5abd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fi/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fi/thunderbird-60.8.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "944742e4331c7ccbc27d887d9d5702ced9807d743d57e8a14b18f4dd6b2148ed24b295eb498c09d1d54f2f1110abfd9e2acbad83a882189d0d7e5403dbe650b4";
+ sha512 = "003a0ca468ed7a7ab19065ef4a45504c9e95724112c6bb277c6e1964f8f642d5d1a7a4b135e412c81db5896eb00a831b089104563a9237c0594c2ad5c31c4814";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fr/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fr/thunderbird-60.8.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "1dfeaeb5e6985ebd820188721377589ebf4b993337a4231f6d036ae05173e8fb33c17bae76a3982e34a98da934d584d0efec4e01d6045b24345ea66299ecfe19";
+ sha512 = "5097831b1d77046583bd86dd124c48f2389a676a902cbdd4e408508452400f9d981c14475e43276ba31efa70bd3fe1bce5193bc9624de40e34a57319d6ede80f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fy-NL/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fy-NL/thunderbird-60.8.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "6e61fc74b45e75170157806c8f358b5236e5de79e1d07db4f7834bebf2b9822d90377334ec1f2cf44a838c52c7135711b5a7036a0336813fe79c7dc3aa43e25e";
+ sha512 = "bb1170342797ccb3cada48fe654cbba2c02391f30666f3c14891d813692c21400c24f0f1e02d6cf975b88b8e92943feff8da5daf05b9535ae4730272b104d43e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ga-IE/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ga-IE/thunderbird-60.8.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "7de19973a7e9770cfdd9ff944e9bea8e6755a81e2fd41ce27ff0d16bfe948534294c18f2f7ca05092aa574bea6fadd5a90bb08ca6472c27e7b0cdc6c15d25341";
+ sha512 = "a65089b76bb09f78bdd7c8c63e0fe4e68468a210a18069621d4b9fb3ef7cd54abe849fae983dd3e8f05bc5f7dfc3a03a64051587a9e65439fc5cb2c15836f13b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/gd/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gd/thunderbird-60.8.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "1d5309b6eb47b16b49142ba18de96b285fc0f91a7eb3be5cac576683da37143c1e91318dff4f039119668679acf3c2643bdde9a26788f0bb240cebaa5f907389";
+ sha512 = "bca1e964554eccf2c69968380954dedd9e76fe2952becd06b0cd56ddf0e3936d6c40f7cfa5d9c8719cdb4b5181d47048d10a47e6c549e74b2ab72a0d7b89d1ad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/gl/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gl/thunderbird-60.8.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "ecb09d7d8e6b5705d4c71d306a1556a74f78617520e59f041e3b63a0116f0472717c5f3bb055fda3c5c9fd72b198d997704292f64bc60349ec29efe057c46d52";
+ sha512 = "d8ec696e056b44059ce713dfb86980da72441d9c53e17f30d0ce43408a16d3e4b2c8700e595639f7bbe3b59082fbdca49a1ecc47bdfa7704ba189198efeb1909";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/he/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/he/thunderbird-60.8.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "7ced9d95c40376ee1334e5c5cb2bb9fd6e5cefcc26dc134fb5ef71bc20b6476b263ee742d3e0634517ca399c61c776bd7347b58c2c9bd0c395949756d1d0f5af";
+ sha512 = "bf9d9db17930dae863bc8803d7f8e39fad79c74712d16d3912968b8605372521cd1ec23f2cb4c8d05e67341176749c97e85072cef40a899570811b594a5d994c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hr/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hr/thunderbird-60.8.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "c9cb6cd5b3d7f1091f55b74af73825d2d0e8b763ffc102a1d49e58b2ac9e6fe2fdd81c1bcf7effd53d86c1ba8f662e3ae0b413ef80bafcb6e2ae64d34c7f3311";
+ sha512 = "62c626a6dbc65e69443e0e33bbcca131f2b0c3ab521ad74c9de355328fef0e26689e99f7e41111cee688400ffeb2f749f1fc73cf35dff8908f3661218e5df29c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hsb/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hsb/thunderbird-60.8.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "e4f8092eb72e8311459a9232dc55342c2ff61b232d0b3a1be04acde78d7c06f14108f68378de200cadbe58125cddf46fddd421f76ac0d046e1a796fc5277278e";
+ sha512 = "72a7c2356748b59103457fdb22ebe471b68bbdb4c8e61b53c83e14a64f25bfc781070242f2bb04dccbacb52387ee3b7a2b5a66c2bb01d653b4d78ee5a4d3aa86";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hu/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hu/thunderbird-60.8.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "ba1ca73de9b3b0137e38c10bbf29cd28310a7e2e58804de75247da098401f4b609d414e55a25b9646c16dae353db9d6fd193e437e42b7659d66f0ec9117e8629";
+ sha512 = "b6e9b086b065555b2fdf3c243e72a37c1f7d1708b130ca060fc72cc4715514aed5a40ac19b497fdfc7b6d067d8a065ad16e077e8f1b6aa4f2f7204b47699c2a8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hy-AM/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hy-AM/thunderbird-60.8.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "d5fbb20b9a75be427f1fb2a3c3674397b04793469dc3f493ec9bbf631e83a52573700540832cfe7faf71c16908ee0bc7bcd84b3cbd6e10fde950d477b27bc6dc";
+ sha512 = "7b4690527883906a6a6e2d2b6347b8d2bc1b6a16576b6970c2b7dd0a04b6f046337e191aeaae4b07e37b29a9e24db3848a2683c6f0d10923c1c7ccf4bc8a38f6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/id/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/id/thunderbird-60.8.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "35b1d1db2dc6c38b8d2fce2652857d9251e287acad125ab19c5e20487ac5ee6d4ad01d8f6d6cfc1ed9618cb8a47666d9c64e725b2d1f11894741e8cf99a887f8";
+ sha512 = "d6446e829d5126386535463e4b44551529108c22c1f5ea054cbced5d6ecae56c31d8a6af99620edfad62acf54844a3a0484b8892ee85fe7cf8676aa2010bc0f1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/is/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/is/thunderbird-60.8.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "548170e5b1c2d7c09d4792f012064e5bbb201236768ba92fa318821b83101a395f3a4cd06560db89c23561eda20078921902aaa9b7ecbb201c356149af3d55cc";
+ sha512 = "8527f8adbce559195b3487ac11b9ff7a716d4efbe4139289093b49e07b0767b99d90560695773433ccd838affe2e34f488e1051059213d79ef2c604aa5c239e5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/it/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/it/thunderbird-60.8.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "026fc8d2b61eaff1f34ce7726923697ba5c7563b65fbb9bbd700e88998d198eee595348cc47135c5dc8589201fcf0d75141acd5d1e49980ccc5c544b545bb424";
+ sha512 = "3d376e4f8efeffae16c2a39fba40cf29433af35ffbcfc5d0a7491355a211ca25fd5157f64a4d9f4611ac0cfc7659cb7118f0e4db15f594767d0e8a7fca9bfa03";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ja/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ja/thunderbird-60.8.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "deb6e23d8c3c700d7de3f433862040ae5db610012cfd4a8faaf239a6429662d625d8a40c583f22797e34afbeec7dd6888a1558155e0878f4a84ea71694cc97ef";
+ sha512 = "b9623d6902ad5f5d77b67b490d8df6f312c895257965580cf1108a4d9c3da78f3d021551f9e48ab56b92eb691c3c4007a7584b4681683b261bab7b6b7139ead3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/kab/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kab/thunderbird-60.8.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "e6c1dba878c8bfcd4031123f0578512b0cfad675ddfd89859d5ea25b2c112195f788cb1d3e0deec12ca1f052c2c0bfdeda2527402cf0d51f54e781029a6e3b47";
+ sha512 = "33417e6604f706ff3bfab521c5bd890fcffd0f524e11d29fedafaf89ad5a7f6284598ef994059c00aed70ef921a08dfa763f57694976b365d3317aeab8209c6e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/kk/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kk/thunderbird-60.8.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "70dd97b4d5db05463deff785fbd9dbdb649c00ec79d8f1cf009ab54961efafc45f12da654367b0df58211a8fe57597cba7743b7557dc121bbf1d838aa692809a";
+ sha512 = "05910b83e3c65b2be6c6382bb27f819f9d02e3a1f89c00afa22eb1e68ff04d6f39edf31468be245be1756f20e09cf9982ff0175017e91ff1fe08b62b2edea4f0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ko/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ko/thunderbird-60.8.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "8faf4d44bb882107805c663462170e96593f10e7218fa3a1e244937ee3965901d712c89edf9cbc4fefba85c91662c1a7e2811cf1bc3390377cd8ea3f3c8e29e0";
+ sha512 = "f12a92b58c02dba4cb2fc8e8a9f90025d23c3849590bb149a50416aac3e3c15e0c2817e7a4bc518f24e796ea851bb5746b7611e2faeea2767e0f63dc67f2cb37";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/lt/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/lt/thunderbird-60.8.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "604b8283cce3cddd90ae65be0d32ce7051bbe360fb772e47be60fa3312330d38b46d240b9e61eed3134fadef90aca9ac930ae6512dfdc1343104edff928be54c";
+ sha512 = "06d12d4dffaaf863d77ab1fcc59517bec26732db4b81f6114602b9ad06a77d86d52a0b21066d93854459fc3087dce8d8087df635151f672194edf55d7903bacd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ms/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ms/thunderbird-60.8.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "b4af3085260ece6e30b482e9e8335a75298335b0b551a8219bbc04521d41d0088d483134df8801a529934320ab5d51b99b388177b9432b7fdcbd7391ac11b22d";
+ sha512 = "021f1843a788cd6285e4d56559b7042e161f0279b9b64234bb7cc39847f7f2011265e86a738b5926413f2e98e293fbb478d36322c9071b0f7346dbd07eb05a7b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nb-NO/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nb-NO/thunderbird-60.8.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "75022e5524379f4683d6e85bfc057480dcc003d421ec256ade11ba9f4eb60b74c65a7131f07987cecd5a13d8e61dbf2c71446e4c2cbfd9efa65a1c86939e82aa";
+ sha512 = "9913898a8b6ae8745f76aae51f82aa1fc9f71e410f458c3deaef5879521bbf1e25067709999a4c7722b42ae152eeed7016e5aa0437b8b3fc81d246b297f92f22";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nl/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nl/thunderbird-60.8.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "301dfe0a9ce8743703c1f4968bb9bd7b9881a7b70ce1760c12e9a9b2ffe386e8c85406a2b3121981676e4ba2f9ae5a32782857a168965f1fd93530cb22dc3ddd";
+ sha512 = "006e2332079d8a837c42b44df7b7af01bf9363109a47158357438140a068a9a17b2eb1ecba351b49b3300dae5a8e3abb0938fa1222012a886e6a123f7612dfa7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nn-NO/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nn-NO/thunderbird-60.8.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "67704f6dc56fb2d396cd5154d32648464cbf331890dfbe30c6870f63d8f26d8f46322c2b2c40cec86fdbd7b93eeacae2551b0e699428749c89acb715bf8d00b2";
+ sha512 = "022fb45fd0305cad23853277f2b18d22879a4d0523cbbb73a65209ac3d2a87782667e71c6903a6b944aa824ebe8d30421d511f346df7a511ae1f7c325d53de41";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pl/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pl/thunderbird-60.8.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "6477cf8274f38d3922edf51e0a419936d2ac494906c06fcf78c99ae95847c2fd4530e03d1574f7ba4b5d1221e98a71bb1a7e3810a1ebcd72c4e412f0e85c3c31";
+ sha512 = "ecbad62e54f5b49fa89d0f8d00ccc3315cae71e0a46b25e3bb72b117ef4a8271d9374d82352a7ed75bb93fed9504ac883165911cb6423c5c993d75ee620e27c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pt-BR/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-BR/thunderbird-60.8.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "775ccbd6e8adda7318a5ff9d364d6d8b3d8af39208a349f61123550a149c728f7d6248c27b3b4561c8445c1c7c53300579f073b47ba31a52b68a8570515e6329";
+ sha512 = "e9f2180eef290f0d0fb3b91eafafa7ea0a8cbbb7acc01758fafb56d6c56caa0ac5455b728013ac88d50757830a7f65a3e77423417abd3ee77238657c94461381";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pt-PT/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-PT/thunderbird-60.8.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "057a2b690dfd529be26ddc225f6f760190315721ef69ab0d9974788b7c00617704af82ec56cbb502a3854945b624896ceb800ba1a31080fe9984fe12af4d301f";
+ sha512 = "20e448cdc26b9a27b2c42b7baa09d299ea9ea834bb3bfba284d5f907bdfe0170ba7ef611e0e7ddc1ccdf296781401fe32b80f5e909b68c12a23652c06b3c93c1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/rm/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/rm/thunderbird-60.8.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "10c4edf026d5b924d5105201179f8f5f6ecf5917e99efb60c663325ef98e5ba63f965954c93e3962af454111656687abd2be65e0c552617f8fc7eb6ee3b339bf";
+ sha512 = "62d71bc39dc895514eb2cb957205ad7379ce95bacf6d75e193e0d9eca34df300dbbbb9df3e4cf200a5c1266b1747949df54a969edae62b720b10d0d756ff4c08";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ro/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ro/thunderbird-60.8.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "d6a4fe46346b6699d570e316c7e97b530100923771d4ab76878dbea959dcd1c34e694c3a968eb786d19be96e0b7757952d47a87bc52f99d078eefc9a2483dd7f";
+ sha512 = "2a506e9c7d1f752452201ff78c0a2d678115404294200ad07317672220674eb32227dd7b1f8af65ee91ffb4051beadbdbf2da2dbc243d14d22ecb81dd004549e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ru/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ru/thunderbird-60.8.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "14b79c2751306b7e66cc3049c0338c16042c60fd707275f25775692b09c28fbd30b46886fdb2c8205de342e29cc0519887f8f92efd369e92a0a94ab33a5cba3a";
+ sha512 = "c76e85ae89f1d6f878f5ff745f76860a18d053d13c4deb6774de9e653e841273c09fd7297ade76ea390a30ab0d2af280a0e6b2d929a50ada2ea37c32c2d68d7d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/si/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/si/thunderbird-60.8.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "a8781bfe6bf9ceac67bab6e2f2957d61bb5d27292a15ea24776bdd8dda4b7828a350ec8caaae40a894db85b9d9fe4d457172f8dcedd681fa58912eef74ade60a";
+ sha512 = "92617456dd89e933130992a15247bffc9c8ebabbec41b061320ae6be8d86ef1af38c1469e633ef9dd312da8f8bcac99545077fb23665add9c82c0a38f538e56d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sk/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sk/thunderbird-60.8.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "b22ef7083b344f8dec27b09631468c1263cb436479cfffc82b95ec78fc05ef66ec9b133d612dd097f9c24096b9c4e538efde6a88150816268a3a5a2d81a8e1fb";
+ sha512 = "8ab573b0cf04ae24f0ce5f1b8e79024fac5e33da2e80ef28837b7bb941512d01396759b34ba4fe87bef74a9385d5b7fb8d656429c110a38e0ec30ba21c01dd48";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sl/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sl/thunderbird-60.8.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "b3a295b4f1a27a75634bae5dbf033973849659bf9dc9fdecf33b90618aa919bf644e2211c789ceefa495cc72e6586ed1db1683658ca88f0fe4cb3ed7a909a208";
+ sha512 = "4ca6019ec3420487ac141bed30efe310d4c01aa2d7adf16fd97ad543cc90d14611d270074c5ab1c52b90c6ac9cfde5f5957c323189965ea60c2f1110abf4bca8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sq/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sq/thunderbird-60.8.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "5f990f0f257d7b096f4310de22a0ea26f27b18e5f7566f3eed45bed66ff89e384f55b7932fd5ce65039077ff902631db3feffce69d2e6a8e13893586759d14b3";
+ sha512 = "1a47ea68a8435099883a502e65e31aa0e7c14564f86e6b4e4937362fbad3b9771efc74df4ef92994c1ac77130fef228a1c131d0eb4508a5c655e2a4b3800d1ec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sr/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sr/thunderbird-60.8.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "71623636dca3b89af58feeb1b998b9bf16c8f8c7ff7c8f273aafc0500ce4b5d4bfae3e997d8669e3075c6586b631df0a613ba062fc4d74cf281f686aa7b18109";
+ sha512 = "dbcf13d0333d1ea714b85e542f5bdcbc83bdb2b3f8c3dca829d4b224a0741fee36ac9d2df9bd12cd5505fc972454b990ccf830d71926f65a4f460be2fb7ca937";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sv-SE/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sv-SE/thunderbird-60.8.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "2e0f6115a0e1b538288594ff47b92b1eb688a26e5f67bb7b83b5c01fe781efe414fc8a9e2c289fd7312026fa1b9bc56588a0c0b25172c35d1e224269a779e40b";
+ sha512 = "7602c9dab1202e84822d537c0aec36d1705c259e3d5f34ce6212363450e1e0dda508ed36ea999467be2f39b991cd21a6f8a153b0aca87aa70ba62f01f078bbb8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/tr/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/tr/thunderbird-60.8.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "fa3aa0c732a4e2feda079d283f6d0f98eb721a88e98a7df70681acb50d525e48af273deb19e6d2e5f41d20fc5daddf0c89c3e6d9ced74ccc34bd75fc12ebf26b";
+ sha512 = "0fbec00596ccd59e54aaf23058e96abc6ae672ab55d2a7ebd0bb20c37c03f47daa70acfb981d9edf48c45a75d0b0a02328025e100dc4b344c03e3540089b1cbb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/uk/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/uk/thunderbird-60.8.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "535fff2ee782b9818f3953314b084f5d63af4457310e8236b5dbe0fb7d0db5ef3c1aa0efbb992ef32ad89cd1df3ad50acae26fc116eae474b6b6970cb1172772";
+ sha512 = "4f1b0608f55f945552bfb3ff28fb93b52ba8a180426e6a101c7c849a48a65c13c78cdd707c8bcd6bc02f55942750c3d34151a4f674bbf53d5e1aeb4fa5d8b974";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/vi/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/vi/thunderbird-60.8.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "54bfad80adc5f4a97e5dbb098e4330a7248b650178e9a9f49b2252fe1a15afb7e247f9af29253f59c7ff43e8af67a96f1cf069f3919ecd53ce0ff953e6cb42de";
+ sha512 = "e3fbe83460505e135427c773650151e8d7d4d14df5a432392625871c561f6cb0c4eacbeb73d1078f4e3b195014373735a1383a472f6a85d9adf76d4b98929689";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/zh-CN/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-CN/thunderbird-60.8.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "7452bdee386e1e85967d7b88c6f935cb89ba7dece1f39d3b20f24cdd04a99793d3a11c333b76d107fe88d8c4c3eb69947be11792af7f8657515c48eda655d237";
+ sha512 = "050cf6cddd3a4f7f56af9f271114d6aa10e032644a958e62f3957d0df61e6f6d92e2a21fcd203a1f45dab7127a652a0dc192993477570ed82726fc9765372dce";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/zh-TW/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-TW/thunderbird-60.8.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "0c1a7048f250bb0f3248ed92ad2e45d3bb01b308eaa6115cde9050253d960b6538467ea6c5754c6f5458035fe31bd2fc529ab423f6ca9da179dfb7f51ef1f612";
+ sha512 = "566a7288a7819ac3bf72ae97fc10470530656c2c4bd75f9b06b4e4c1c07e0e80534fd3dc14081c828a7aff3319d83ca482e4d8d15aa6e3dd02201ce0038a1de2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ar/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ar/thunderbird-60.8.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "c04863a1693b2e0567eda646f6364b58cbf959c61045ba1948aebe9f30f63351888cca4a70de4a1655b48ee0407e0c665691c6ffcc2638c18b70046eb04cb02c";
+ sha512 = "fa10e2e513050f8c62a0e53530a3ce99cc74aecb0b93090207531556a394d41308c599c469380b39daf178e775c61cf5c279b8fb26429652368ab0468dee4ad8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ast/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ast/thunderbird-60.8.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "ed4c86716aa7ca675577f577f62bf11f025ba96a061e0c89952a99ad5e3ba3e3edb01dd8d428cd0884fdc78127453dcfde0e81ecb4ba3e11e650022f6df07102";
+ sha512 = "a88c415580fe8b5a1f83468afdcc55714abc13eb53c6b4a8b6b4779837b0668934c58ce40928b8a215a099fa06cce957754ac714a941172ded5087f09b8b2abc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/be/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/be/thunderbird-60.8.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "fff19d979335f90004f35646edf2c4ca7f1243a013d79c246db6a0139f787573bd2db2636adf503366a94d44cf8b932d2141ff1df2faced750ac6c604116d6da";
+ sha512 = "d0c7edde8c6d2b2daa4d2389781962ebbb8b11e2b6ff4f0c79a15052cb65e869711cc18c5ed86310800dd5fdacb4d594347663a440ad7caf874599bf9aa696d1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/bg/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/bg/thunderbird-60.8.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "afcbb510382a811af5afadf306ce66915f472a3cac62ec2e2ab5930c795fd443600c02743be29db3bbbccf3c9d8507bf54ad0452bd580de4f9db52d5438aa596";
+ sha512 = "f5fa777606c529b5d5d85af9ea1bc9d7bae55571d11cb02fd46903643bd2fb9bde0dba0eb9e3b8a0276b004e40a12bcfc8b35f0a5d0445b1d6989caaffca2ed4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/br/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/br/thunderbird-60.8.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "3ca375f94f1f5795b2676d1e8774fc17e3eb0824ceeef6b4598b99f35265806a017e0dfbf2b07f275eae92b68fa975b05cf2d66c6adfd1147399ee7be3df94eb";
+ sha512 = "673478f9995d4b43c3a67abfe876004e71871a45b9b13fa89b5266fca48d1edd69b601d34ce4d007080346f99d8a6ad61a47bc891b61364b239b24a1066da75e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ca/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ca/thunderbird-60.8.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "75d31ded8c44d8429c58f8c6bc1b5104a4b62a3d0899ac81ba9deb277204290d7ae079e6baf4b243188db7e1050b4a0b9046dd26ca8fa546083fdfbbf724bd01";
+ sha512 = "336e500bad4e173a675f24ea05a2507c8729a30c9bbea2659135808bc04fa31b0306ade3073c70de22c76827f0494d517d9ad95fbe03a5526d14bf3e492001ac";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/cs/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cs/thunderbird-60.8.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "0ead8f9276a6dcfaf39c1d400c892f95d431cee960c94857cd3e95e6f148571ed946325e6518bcea5821aaeb0e8f8f5dbbdd3970aad9cda549dbfc07eb2392ff";
+ sha512 = "abb309d772ba27eaea1cbf79436d21cb18eca0733f2ecbaab18778daa7ad55ead8471e76c46ef0e86cc0c95d4877fed61553a8d195c8ab835be24cd55af0e923";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/cy/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cy/thunderbird-60.8.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "fb9d58efc4b0a72a1bbe09624d38b83227c94a2584b4a852b95753d83481b64194e6d14578fe24210581feaf5b8ccf55c530cb3bae606ea6acd39a456a91dcc4";
+ sha512 = "cd1ad0258585f14ee8c5243f18841f80b1cfab41934efdc92871ad4c3d71708f1397836bc2f3843f769f2232c05ea9e8f3cc25c1b76f86b7658934e4a331a6e4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/da/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/da/thunderbird-60.8.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "1bf483526e7e52626b6298c93c6586d1973cdd9c3aec660b31550b4658690e8454622276d2bac3b096acceb8e9b41fbf7db735ed8a2c185ee968e489a62ae329";
+ sha512 = "7d9fb57f9681934f8e564c92d80acf3ffc8df1341346adfb5c4fc13738a5068aba7cdf6ecaea2937bff076b66a6103cff95fea27e2a6a7b4b545b78b2c423a4e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/de/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/de/thunderbird-60.8.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "1bdaf4b2a5ce2b1824250b4fd35695ce9c3be306b8c21d9002995e142f6a655166df15d3f68f80dc0f5963f31e87d01b00ee8c4463c6002df0eb536fc3eb2bfb";
+ sha512 = "f5c1c01677f4605f9e4731681d1e9e1395d2fee6fc32f88ae8f207750859887e0a49b2d95bc27e4311b05c6af2a390866662f79094e9c3a55e4f2bcbb92f60cc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/dsb/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/dsb/thunderbird-60.8.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "0b6f71ec6d02f06dde3509fd1fb771a341b12a7a44681d05244aa7ea61726f8f8792ff12a72b0700196162047b23b7a9741a3522519935813b075d617c79490c";
+ sha512 = "92171f0c8140b360953c6b5310f260503d17d1da71e795c91a4ec80fc4cc15ac43405db8f345c0675233dde4d89f57a1db3177c3699f241fc2d4d6f43cde71eb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/el/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/el/thunderbird-60.8.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "bec935b6e469400f7d88fee26dab49c8159dd8a74bd34827122d23276e6b5e837dbedb8281b0a2c1b87e90d2897e2dc15a475ac53bf911f15887280630ef82fa";
+ sha512 = "1062d28a437aa854dc213e632afc0e41edbe00d4398601db671d14e39fa2ee832c1fe6d263e7fab3d8347b4b2cacd541cb9f4b1fd640aa4bf97c3bd1fe23a2ff";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/en-GB/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-GB/thunderbird-60.8.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "4e28d8bbc384c98767825e16111d24a96ad2291f40b1eb7b295ab2b7103482a9aa11c00ae5e455ea7e5a7e5d077a4d7c45e6f8890c69e7c7c237909c332bad75";
+ sha512 = "61dd1c410b5c87ca41eaf303f85a5c90b5c65fcba5a75d93654b3a5ff898991fd59b89ae772876c707dd7d5a2767fa607b3ea0c2f2c57ccb73a7a75720157f43";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/en-US/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-US/thunderbird-60.8.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "6b5619c5a03a4d585b030682fc41069c3ebe3c783578853c3c36c9055fe03c78c782f2621c12a454b4968e5416e01312639ef48047b407558dd6ad85fd81befd";
+ sha512 = "5f989316cfe29ff75adae5feb34e6914f25e6e7980c17fe902d70deede44ebe54052d2540cfbe3d4629e927d9f2129edf19f659bb2cae9f09ab984be7d47aaaa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/es-AR/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-AR/thunderbird-60.8.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "9b6828c7c646f0483b758902d2cfd7897649acfc1622d1a338320d0f9a9f52b38dc8734ace3816fd4a116883ff7c9ffdfbae6b93e5070697a108a7df207de1d1";
+ sha512 = "45e0eb7e51110bc892cab458286e5c37f0aca4bfc88b01801c184521eb3bde33bdfc78758a67e7337be157b7507891874def8e7456fde8483054fd9671f068b5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/es-ES/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-ES/thunderbird-60.8.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "e0a8d2e68602cb5a9c0bca574ff8ed797c0e71a2bd86519e7d7de1ca8fc54316bead8ccc35e7f8dbc26cb11ab76e59076c09e69edb8175947c7c0dfab5758e3f";
+ sha512 = "a8dca85c7ecc2678cf48de000fa4e46432a28a02ec200447789da0213d01841f142de45c0c93b52c8952248eed7e0afb12c1f84026dcbaa0b47ce8b907bee779";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/et/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/et/thunderbird-60.8.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "c597b215fb574f948ed3cd169f7fd814a9f23e5c797da8457d9c810097f71b26751b386280cbba2fbf0224d07665c2fa33c3cb19c0fc54bbb0146fa271b25442";
+ sha512 = "d212bf0d4881094835f156c277015e37f1de4d1927d2f89bc993071f50eaeb604913022c3db948baabb1d76b17a982bfd1911050c46bab54fd3ffd4f374ce378";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/eu/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/eu/thunderbird-60.8.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "9c1dfdeb74e6882689c036995d20ea7d0cbe9f3b406ec15b7a71d1f890cd209d3e7b03f6ce35d778adfcad2dfcfeb20ad55b9888dd222ffdb429166c8ad3a905";
+ sha512 = "14602ea4b22210049756484646fe538cece02d7a23e6079e7020ff30d08868d353f9d59fc831e1b600c061faf18f5af93a67ac95cc2f2f64a137c430d6ea6bd0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fi/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fi/thunderbird-60.8.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "fa24033927751c7b1cffbd3e165507d8cc0ef7ac7755f08afe102b9b9a339d0a31b8f738d1bb71bc0a8876f51a1411b4840b033a3716306e5e8a17eb4d7f0382";
+ sha512 = "aaf723df2d042c7fca5457b0646998c7ed799d0d24021fb6de3b66d35519a7c189844bbd4a2840b884915995be4ec191455bbdbda7f5711831fc7702232a5d12";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fr/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fr/thunderbird-60.8.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "37daee1b1c0f1757a0098806d41bcd71c0dfd700bce2f7da58ec670c58d2b5fefcef2fde102bed7fa6daa62b59404716c26547de54a00eaed6201616c681b5ac";
+ sha512 = "9dd7e8c61049f4de1d03c73e1b7a1b38e244ad67be84dc6e4a53b94dc810d98b35e49b199662672f0954cf87cba7e3df75ba11fada1b74e8096d866131b08550";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fy-NL/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fy-NL/thunderbird-60.8.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "85b2a6fa843d5364eaaacbc3399ad4a05169a7c988640f3a120fabe994bca31b0c22019a8537d598a14d33dc75f2037cda5504cb7d72149fec1ff040e1f962bd";
+ sha512 = "aba1031a349f835577a06cbb8452760c4ab65fb1c8a7183e92556b6d140814f16e794f4a5305e789aba3b0c10703006641546751460fa5fe2a822835881d8e6c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ga-IE/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ga-IE/thunderbird-60.8.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "475b766786a50d461ec6896b72c4eef83231f903672d275513c632eb8f4e7e1dd24bc635c18c066fdada4616b99116b3757d59d2718bc8bf21bfa495abea9a5f";
+ sha512 = "9172d99e57d02a676f9bfe3373fef7448a2d6f70f3de8139205c55a37c73c5b70133373763daf8c58adf2acf4916cfb34aee60a431d55aa94cbe95e8e58430f3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/gd/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gd/thunderbird-60.8.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "d5ee56fd14c4abbf9d3335cd75e284d6c00ed28db74ffd2a726a19dbed21a74e2d97e9dcb63d63bca31f3637380a29f3bdd1280c670e446850ba8d4e98971395";
+ sha512 = "f8449e20680cf02220e009f19b2cb66d1354941c0deda60086ae80f1d3bdf2159a8b5bb45a45c480528437e78d8c71c00a8ee42827b3254e37c83cb8af1d3de1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/gl/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gl/thunderbird-60.8.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "262b36a73483dc3a379d416862f6f5c6d685a366f25a2599ba527d28fe0a17da9f3d377c38559a0688cfc5e5927001d3db7db0693fdbae44ba5596ac92c1a72f";
+ sha512 = "04d8babded176785625add5bc9c457a0ff380c293579a18146924e57fb3782017c12d5569d10d2a3f1fa872fa8eaa87bbe5f1ac5f44f05cf5d5f3936fb12706e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/he/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/he/thunderbird-60.8.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "404838f4defcb0da984532ba32740c9919ebf57c9e68137e43b1e40263a4f553a573028bc96c9f056141e405b4528e060ead4e30dcdc365e87069393b0056a5f";
+ sha512 = "2b77c7c4044c73257f24f1961d431ae50cc9dd0b0f2a58464a745ed3888e957467e6f35dba904a47c3d8d84aba81827184070ac6c12ecccf02760202b831b578";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hr/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hr/thunderbird-60.8.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "9793e03d4b01c90af721a0197e20ea61c30e09e602321e214674a85ba5366a4eb4a394d0a2347af2a3f8c7f40da2eff50bb25c935db7b59cf573b8e6033469e1";
+ sha512 = "17d68b938531b89eb8972fa315fb6951821a1a55478a801b5697afe5b84450841ac66c8aef49a43c4aa6acec4f81652a1de32a3acbbb41ee6cf0a4ed9f03acd1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hsb/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hsb/thunderbird-60.8.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "bd5be5e781edef1d410ed85552d72449e94b13c28a9943cc64ea4bf8092ed477ad61a39eb956b3ed008168a62206a0684ae8b38f370ac88a3c67df78ed57720d";
+ sha512 = "556b441cbd6e9a34e101385484fc292e3a2edefd39dc8286b5880c66ad558beecc9206084ed0ee35aced87ba0325fe737f6595cf3ddbe4d3842b10bfb535ed36";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hu/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hu/thunderbird-60.8.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "a5f7e309efb45715dd67b4fb5ee1a88ac4c6ae54d5755c2476cff246d93abca6725116817173c72e701cfd570329f1d84f7732e3eaf3e7fd96e238512298c595";
+ sha512 = "7a355c9ab063d6b6d8c17d1df4e30a3c2511c4f9d78be578a1a0b73e4728bb08d917190249baff08e30fe76eda16bc889d64ddba673f51067dc3b1957f8ebba3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hy-AM/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hy-AM/thunderbird-60.8.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "145e562fdf0ea143d0c1e9f4581f2b2fc58bf085aa227e4486e780f7da54e7e0b1cce53cfe9dad1ac47aca50beee5e554f3494c7df2e2c240a3a9b350d5f46b8";
+ sha512 = "b5a94db363d6a16507e71fa0d6d8928b4c8d14b7b6a35e287232fca511caaf9f7852db37502ed9ac0fcba65cfc9d3185db8f08d7dd3941df660e083f0bc6c6a6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/id/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/id/thunderbird-60.8.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "6f865a97783fe0269547981367717de6577780b24eeab33e26a19fc716cd4733cca28b7fab8cb8156b6a04b09e09b75cfca8b43c07aa99088cfe98a96a716361";
+ sha512 = "6a94778d20665c901005150fab16c4fbcf86bba10b7a1833b7d89d3e76a7b90a0c1e755617ade294fb3c86611a0f2bb0e812d1b282e66d2a63e11a2f25b9da1a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/is/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/is/thunderbird-60.8.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "756301497644e2656a383f0c76a7723b1ce9ab49f760e08cc6f0159c898634664dcf5f92952310c408ecf8818939a25b3b181fd50836d32d017dc4c45b67dc25";
+ sha512 = "c6f89a98f956ab17bddc6250af88b1422a347733c15d12a720a8d84ffbd00142afd09b80bbac39dd14907558dc97f33890a091203c1f907dbe0df5f5f12a87f6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/it/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/it/thunderbird-60.8.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "4ebfd6d2dd79e238594286412516729b66fa26d99ed3d6a399428bca87f63bd3f329877f70702d1d43229755268b0e9c951c753ce110250e805cdcdf576e0eb1";
+ sha512 = "38bcd03bf02276feef2321503bedbd7b8e8c609f48a038e660e522af5cad603ac642622f8b08b7aa870c1bf50b136d09034995941d14fa574ff9ca4f11d3cc66";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ja/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ja/thunderbird-60.8.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "0cbdd253afec94716c0a4ce4131e8260cf7e42d9a7df48210875524ca33d42fc7c011b3b9724b29054844b159896cf9a03fd817af4cfbae9b718777d4f4b278d";
+ sha512 = "e91f0e3ee53575d9e3fd02be22c46a8aebfe2e12998db77f3bf73c4756d4d615341c20fed031ee0b146aa1e9200bae3bb92c02da18bbca6e99574c46e2049f01";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/kab/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kab/thunderbird-60.8.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "cf363a3e2177d2ac629713674bd22da270887882f21dccefbd6ca30c71f535c5b69fe1c05554fbed95920d4ebc4acc1649a05be1594b1cad5f4b17a7652f3e74";
+ sha512 = "a858c81c5fc9110757328df3705cfd8ca1bc61ca173448f411a849bc3799b586e7119e6c4ecafd12d0522ba37463092271b76744bc0a7fe603702627f598ad36";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/kk/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kk/thunderbird-60.8.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "77555e556b3d04ebc07390633e4ba3a3fda8c7ca9c8e7a61f522633a20378c857522598a3ad1b3b55e03bff181df615186183947c7770a3afc3df6c18d58446c";
+ sha512 = "1bf45fa38562308f4285c5bea746bafee65f498e5b4f4d1971e7ff68cbc5b8d3e6c7a32a4318100f1fa6bb203a12e3dde14df25a70aa1aad5d6279766b398c2b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ko/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ko/thunderbird-60.8.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "634c0ba3322494670df3c7d14b8866d55f185588d1fe6dde706da86a66481f98deefed6739561f3c0c73ca005e1581d541da773c5d3d7caddd5b49510d9f138e";
+ sha512 = "56e59aeb1286ec53ee558ab029476b72ed4094504123bb93abb3e3425f60065d66c9de83190d6f00528045f934d4775dfa555243f13fcdd540ca522e9f825740";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/lt/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/lt/thunderbird-60.8.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "9646f54ebabca5e8503d44b099871bfb6345cd4a3fe04ab0211aa8f019800b48faae93eb5565428818c4cf25b8b1e536614f23e4fcac76791c06482aa9fd7396";
+ sha512 = "4572fe9803b28c6f94ac4e1fc5283d2569723698c4295279099bd33358a33cf50c1a49bec70c001dad65d19d30bcb215d50f2084b458143d338b8ecbcea1ebe5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ms/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ms/thunderbird-60.8.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "ecec0bac0770bd3cad75881266aea00a9ae3c8506a64e000ffb118cc18cb28a3968b9ece10e11bbc4628612065345ab1f58df0df130a2e497809a244049c1774";
+ sha512 = "fd1a58ebb66a39fc00ba20eaf555cfaa6124cc2e2fa7b44e1d4d7f1e914d86a0617f1be8d461f952196fa6dd8d29ae622769e5e6f8e4c0eb30b757da62d3864d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nb-NO/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nb-NO/thunderbird-60.8.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "271be3b2bf2424bb149e7f1a1c11564e9b9d849e043a95489a8215a3ce757d032cfce2ff5df1b666fec5cad00b7a540b437d6d0ef33ccec485a0b5b96f61e8bd";
+ sha512 = "bf4663ffe717d07b37e4f6741c9d6a804420f0104ac9adf152f73900d89818dddd67b1d047bf3f095d1a6ca7ac9da8e2132567e11caf486588f262e84e87905b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nl/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nl/thunderbird-60.8.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "a80e354c855d51fc278fc46e83ad41de079f1aff1fb7d0329eba377c07ecf67621f9c11e2c51760b23aeea4547eacc7916f3092e61009b162283a8f4458b5573";
+ sha512 = "b7f7a989fe70860eec8349cbf85a943c0a5e7e4c9f7ae2010309adf96778797b036847e6860c0d89213c51c3c01ee1e9e4dfc6ba4a45d31c6ec4b6e9cc7e76bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nn-NO/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nn-NO/thunderbird-60.8.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "312414bf118a808ad663807dfab5f69bca61a8f20087cfeac78883a869cd43eb03d5c7dd511a32350c0f59b0e28de7bc1992ce3ba48d8e1b5fe3c2abc09441af";
+ sha512 = "b2a8a72ce49d15c0629e038deaa8fef4b93893da9198e712daaddaadd2169c4781fe6c2544f33954d28e4be30048716a80c20063a13ea78f0ff3c466ee814cce";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pl/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pl/thunderbird-60.8.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "4abf25e59400c038e9719200459903e3e113302592bf65d024c1dd05852d51e2969f3f53a33dd55f9d131bcd1405571f713a6dc3165d8af1147616574f4aa5c4";
+ sha512 = "e6d0f12754182f5bcfaead0bce7183a7f6527983f8a4ece9b9f7968d87d9c55b06257c20e1dd4bcd82be56961a08f6e20d7140cd8239531e2f346bd4c6aaba1c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pt-BR/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-BR/thunderbird-60.8.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "ca38fec5178dfc2f841dea0d30490df8be3e4424a2d94bda1a3cf1cbb1908df90c29adafe3f844ec13f2bf87606fcf20066d3789b29440b55762a9c83ff5bfb9";
+ sha512 = "bf1fa8c66264ef98b4d192e794cb789ea0f062f342bc3aa664fd8e228acae045dbff4673e31b5b65754eb80e6af2581b3b540b3fbd3e1042439caad9177f7499";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pt-PT/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-PT/thunderbird-60.8.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "f8c25a0d9d6a4ca582c7d3593c8a74c1931fdd4a85ca9ac2af0b37efb877ac0232e9188af5cb5985f1a865aabb252b58197cace1f6cff3ce4551b5f4678eea56";
+ sha512 = "2b503e6b87230e4939c09774d9e7b70130e42ef4bdc0e3500563fc0848f138b7b569d37ba09eb676efa6e0d9b245d49acca8c740ec44abbe25b57a8546095871";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/rm/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/rm/thunderbird-60.8.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "ab74f4fa6729d6f7c2f0fb1f99c457ccd65a81be9bb5d7519beef4ec1ddf58c9f51370e7e3fbf71f2a8781f2669b50d20e65e687794b7dfeccb7da99865bd614";
+ sha512 = "fbb4192fa466549313d874d5b48258d3d133040449f96c55270a5ad25798067b921d0336e577081985e1e0cff28aa17d8b1890e77aa3cdc9c369e5e416ac20dc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ro/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ro/thunderbird-60.8.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "cb086a6ce3446ee8437c762040b03ee58a3cebd1a0cf473197e7da19d81704bd1ae7cda5d3329e17e76d1f7e682674a12bda3e964fa934fd271d80cfcb5da907";
+ sha512 = "5e6ca640f36f44b8d6594aa13847acf16b7f5d96d21761fc43b38b16d39deebf6dd30cc2eae778ec1f8f37408451acb19485f52ae3e701833103e59b6e0615e4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ru/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ru/thunderbird-60.8.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "2334973a52a5e954b082be0bc9921a6034532edf558a2ffc2b1ffaad7d1d8777832cfe21e005290c65f4ed906816243dc3c1a35a5e078f005ebe84f3769cbad0";
+ sha512 = "4bdaf5e71f18d75554a4d954a802390ca6689d07b3ba16de8654b6557c874622ad2b2d587d8306edecfad47c1bf89550378d478377fe49b0e87b5d4417d05840";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/si/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/si/thunderbird-60.8.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "aa7a52b410a507571551430d538fe4b84efbc57bad8eb89631c2c79f8bd23399a60e8ba8018e9b086d6562ef4e0e96b5f6b912952838ef38507a6eb41e776fe6";
+ sha512 = "096ca4b2efe21c92d041b5fbcb5ac19351d39b339b0686fbefd1b127f7fe1da8b31dcd9135149006a71b664eb9f98d729a48da4f138af250330b60f80ea07f11";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sk/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sk/thunderbird-60.8.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "4cef3b0059d27313ff35610fc273b7c02faaeb21996a5b62be6cefd0c4b76162fd8a54bae3e2f6527135bfc97ed8133cde34e51505d8abb25d90a03716427370";
+ sha512 = "101363485e58e8a733523f103994c0abaa520ffe758a0ca39db9d5cebea273bde9a93be489d49db67a37130191a3e54ab9454e74cc392c5e0a163020a740149a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sl/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sl/thunderbird-60.8.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "6e4e2771a18bf7af347fff15eb5b5c312b7373d2fa86474317154ed8ae48e996028cda78ad9ac5ad09839af9844039334a25349df2c45c30095606f684b849b4";
+ sha512 = "7060e6918d9818be407fe568caedf7e65738ce6335e287ca9ecee9d7f7be9d00599364b8d7b1033c7943d3a417fef32cd2e6912e832ce0e5eefe6e04db3a7dcf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sq/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sq/thunderbird-60.8.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "eb1d190808ad33b2eecfd8979c3ae669f44c3426bc247781b11698818f1804ba1b28851b7c7f507b676c87d86d89b7f537d378a130997dc21cd8870e070dedcf";
+ sha512 = "56c297aa61bb50517a5cf126e506cd7fbedda6250434a21423581b2a2cd79352f21c51265f7e3fa9b60636c8e3bd6dfedbf81c058daa8545f5da0f02837e0719";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sr/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sr/thunderbird-60.8.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "bd46e690c9969d65563075996581c9ff13576143425985764a1fef4d2d6d4bf55cecd1e52b3e7a237b187a9144c928578879737f16c4b59be29120b67b18526d";
+ sha512 = "95f8bb13b4ecc9774452b799a8ec06dc6abbb585471f5f2f9ce38e4af733fcc99132b66df73df96159872ca6e6285a62c86e61e4d389c2c96da547f875cb9841";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sv-SE/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sv-SE/thunderbird-60.8.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "19e859d0f94de0b4cd82fb35a63a32cc9dfe09c74429380c90f749748e17123f161398a465b53aa333c50863a256be99df4029f45d08f80a7695b45883c94799";
+ sha512 = "fc48493a7873299d4c284c806fe2ba856ff197e5f50bb57d3fdbc95eda062b035f98318c0f5bb4d1bec63dedae486b9872e3f1718b922a1ec8da311796794121";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/tr/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/tr/thunderbird-60.8.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "964a16f7836a1dcfda273db6c65ea22d516722e410ceb961ee8212540837911ba3b156d5c365a7c1a79c7d2239b0df03dc1176a266d09b075c1e5b870a833352";
+ sha512 = "649527a4c603798b0f726eec995d721156c36279b1aa5afb956fe64ef40298956e1abf6eee2d15eb3f5e4c9c5d48ed804eb425483456adf068084114b6d5cae5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/uk/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/uk/thunderbird-60.8.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "aee1e5a933bcb5238263ebc6ea57e9d3fe851c19c5c017e1e15bbb9e5cf1e9f39edf75b1b908caa4da688e14e41e4318a7fca0c41d045355cdc91b9ef48ba957";
+ sha512 = "2b4ae669b99ac9a7b20eef71b7dd6d5ad2b20ddb516ba1b3fce7dfbc783f0aa945e8f319b71e8912b2d72b78025fbdcb355ff96be43ffe828d2ba1ac4fa00d41";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/vi/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/vi/thunderbird-60.8.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "dd667bf5db90586bb29c97c8dd3bd0d50c5f4c5f5cbebdfc908dda4a54e72575edcf5d5b8bed97b1b6aa7350ea79c767115137aa6500b263bd5ae80d61efdbc1";
+ sha512 = "5808e5e2a75cf63366b190dc67177c8f1b2998b2001972412a760eac3c6a370aaf7e60d3fc7978783469163c55f69756637b4436593530d518dab27dddb6c295";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/zh-CN/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-CN/thunderbird-60.8.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "f791ad02b1a67ac2906602a3c90238e5e8062fedea5851a790196eb1da0e19174543a7dc00e53460d40a0c39089c109125875fbec458fd65a650ab7d438cafdf";
+ sha512 = "95cf6871aacf5d36ca04673fe23277dcc4674dd5b2d215c1f453fb6e5f82d64774efee4a0538e7c451b8807bf930912a31eaada65248416c24e8e1382923d09f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/zh-TW/thunderbird-60.6.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-TW/thunderbird-60.8.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "83cec9f663cd4e02d921f2f96a7dab791cdb015756f63148833491a263abb297bed5ee64101b4ae86ea4a3ed09b75d668bcf36a12563885f3eb164655b3348bd";
+ sha512 = "8429305258abecd306e01417bff356a536ad7f6982705a51b4c35b26a83c18f661ae743029597d69466e3618f99ed71070071743c5821264143f78cad2b7aeed";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 2531e414cc136dc94bce3d92394aa4982c4e9cfd..6921279b27f2bc8cb2da7053468fca0a025958af 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, fetchpatch
+{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip
, libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU_combined, sqlite, unzip
@@ -24,11 +24,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
- version = "60.6.0";
+ version = "60.8.0";
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "2s8h6z3rkylrclng1cpmj5dvsbhqymrdwvjy3g2s8rq66xca13wkyswdhgh8671d0dw9bmminikk53d2xqg7lqvvd1rdsminwscln4z";
+ sha512 = "1cd1ps4r70bnxn9kydljsp776dazfzfsghc5zwp1xz6p3cwb9g0gybj677sac7y3ma2wsq1xbqk20q35n7gjz3k1zzhmpxyii558rdl";
};
# from firefox, but without sound libraries
@@ -201,6 +201,6 @@ in stdenv.mkDerivation rec {
passthru.updateScript = import ./../../browsers/firefox/update.nix {
attrPath = "thunderbird";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
- inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell;
+ inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell;
};
}
diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix
index ca8a4d0fb0cb92fbf6aa6d358d021f681b516059..d31f98ef4ba6a479eeaa885e2a416085f5c6054d 100644
--- a/pkgs/applications/networking/modem-manager-gui/default.nix
+++ b/pkgs/applications/networking/modem-manager-gui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }:
+{ stdenv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }:
stdenv.mkDerivation rec {
name = "modem-manager-gui-${version}";
diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix
index c4dd8e402ecaef31e4b93b56b1d171b088ad43df..7d311d4bc707ef6ec271010729b3c60f4e90946d 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
+{ stdenv, fetchurl, pkgconfig, gnutls, gsasl, libidn, Security }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mpop";
- version = "1.4.4";
+ version = "1.4.5";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
- sha256 = "0j21cp8bw12vgfymxi3i4av3j97lrcyb5y9xa3mb59wr17izz73x";
+ sha256 = "1m6743j8g777lijvxqw2wz6pv2g5a9wlh6zq7awk0hvd44xp4sav";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 940e2d74be499b077ca2d5eb8be82fcdd15b465c..1e1f0b4941fb27266d4345e9979583fa3653b6fc 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
homepage = https://marlam.de/msmtp/;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ garbas peterhoeg ];
+ maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2d5f47ee982695a810745d62dd90d0c21e1a4431
--- /dev/null
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -0,0 +1,93 @@
+{ stdenv, makeWrapper, fetchurl, dpkg
+, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
+, gdk_pixbuf, glib, gnome2, pango, nspr, nss, gtk3
+, xorg, autoPatchelfHook, systemd, libnotify
+}:
+
+let deps = [
+ alsaLib
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ gnome2.GConf
+ pango
+ gtk3
+ libnotify
+ xorg.libX11
+ xorg.libXScrnSaver
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXtst
+ xorg.libxcb
+ nspr
+ nss
+ systemd
+ ];
+
+in
+
+stdenv.mkDerivation rec {
+ pname = "mullvad-vpn";
+ version = "2019.5";
+
+ src = fetchurl {
+ url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
+ sha256 = "542a93521906cd5e97075c9f3e9088c19562b127556a3de151e25bc66b11fe0b";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ dpkg
+ ];
+
+ buildInputs = deps;
+
+ dontBuild = true;
+ dontConfigure = true;
+
+ unpackPhase = "dpkg-deb -x $src .";
+
+ runtimeDependencies = [ systemd.lib libnotify ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/mullvad $out/bin
+
+ mv usr/share/* $out/share
+ mv usr/bin/* $out/bin
+ mv opt/Mullvad\ VPN/* $out/share/mullvad
+
+ sed -i 's|\/opt\/Mullvad.*VPN|'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop
+ sed -i 's|\/opt\/Mullvad.*VPN/resources|'$out'/bin|g' $out/share/mullvad/resources/mullvad-daemon.service
+
+ ln -s $out/share/mullvad/mullvad-vpn $out/bin/mullvad-vpn
+ ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
+
+ mkdir -p $out/etc/systemd/system
+ ln -s $out/share/mullvad/resources/mullvad-daemon.service $out/etc/systemd/system/mullvad-daemon.service
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/mullvad/mullvadvpn-app";
+ description = "Client for Mullvad VPN";
+ changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
+ license = licenses.gpl3;
+ platforms = [ "x86_64-linux" ];
+ };
+
+}
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 321493682302a59007a72df505e2e35e8760f57a..a5c8162701bf74f8409c169f52e10e3ee8ab981e 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -139,15 +139,15 @@ let
};
gitSource = rec {
- version = "2018-07-01";
+ version = "2019-07-10";
qtVersion = 5;
# Needs submodules
src = fetchFromGitHub {
owner = "mumble-voip";
repo = "mumble";
- rev = "c19ac8c0b0f934d2ff206858d7cb66352d6eb418";
- sha256 = "1mzp1bgn49ycs16d6r8icqq35wq25198fs084vyq6j5f78ni7pvz";
+ rev = "41b265584654c7ac216fd3ccb9c141734d3f839b";
+ sha256 = "00irlzz5q4drmsfbwrkyy7p7w8a5fc1ip5vyicq3g3cy58dprpqr";
fetchSubmodules = true;
};
};
diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix
index 6e6315ced7df4c14f0cc715689384868976af0d7..44355c2c181d0fc70945142bffc73ea2e9c9e4da 100644
--- a/pkgs/applications/networking/ndppd/default.nix
+++ b/pkgs/applications/networking/ndppd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, gzip }:
+{ stdenv, fetchFromGitHub, gzip }:
stdenv.mkDerivation rec {
name = "ndppd-${version}";
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 308c857644eb46406a89ac8cee1b2c6752ae5d44..e88936dc072bd1dc6559b89955c8f392ff069969 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,6 +1,6 @@
{ spellChecking ? true
, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
-, perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
+, gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls
, makeWrapper, gnupg
, gnomeSupport ? true, libsecret, gcr
}:
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 0bf2cfce6e4b7e72992e7e8d066b147dec69368f..7aa7d88149fec647ff1ea599ad39939dfafbb372 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
-, inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret, fetchpatch
+, inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret
, libcloudproviders
}:
diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 40ff91e792b455b035dedac3cd61496cdfa6b34e..0449540eaff155b4a2fa54689e181dd803cdee2d 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -85,7 +85,7 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
- homepage = http://www.frostwire.com/;
+ homepage = https://www.frostwire.com/;
description = "BitTorrent Client and Cloud File Downloader";
license = licenses.gpl2;
maintainers = with maintainers; [ gavin ];
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index a3d55d7dff721e045d2cc22a24de69c7febf029b..7f229be1b543ee531d1a6931ff9fe9cf96cf1137 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ncdc-${version}";
- version = "1.21";
+ version = "1.22.1";
src = fetchurl {
url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
- sha256 = "10hrk7pcvfl9cj6d0kr4qf3l068ikqhccbg7lf25pr2kln9lz412";
+ sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 81c493fedcf1722c52182bd6641af140fb3d13d2..9696c55bd865c0ed55a28f03863c446e5ab5b8ac 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
- version = "4.1.5";
+ version = "4.1.6";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qbittorrent";
rev = "release-${version}";
- sha256 = "09zcygaxfv9g6av0vsvlyzv4v65wvj766xyfx31yz5ig3xan6ak1";
+ sha256 = "1y9kv84sy5fg64wbl4xpm8qh0hjba7ibk045cazp0m736rjmxk8c";
};
# NOTE: 2018-05-31: CMake is working but it is not officially supported
diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix
index 554fe9f8ea0e9b214118598dd563fa4170478140..f3c7f8ccf18a4b4235981778679f8c6f11b520af 100644
--- a/pkgs/applications/networking/p2p/synapse-bt/default.nix
+++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }:
rustPlatform.buildRustPackage rec {
- name = "synapse-bt-unstable-${version}";
- version = "2018-10-17";
+ pname = "synapse-bt";
+ version = "1.0";
src = fetchFromGitHub {
owner = "Luminarys";
repo = "synapse";
- rev = "76d5e9a23ad00c25cfd0469b1adb479b9ded113a";
- sha256 = "1lsfvcsmbsg51v8c2hkpwkx0zg25sdjc3q7x72b5bwwnw9l0iglz";
+ rev = version;
+ sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a";
};
- cargoSha256 = "1sc8c0w2dbvcdv16idw02y35x0jx5ff6ddzij09pmqjx55zgsjf7";
+ cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
+ buildInputs = [ openssl ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
cargoBuildFlags = [ "--all" ];
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index d58c4214d0e0cd9763e54d839ea3db3a2f9e94c4..7a5f389af24878ce97b50ba59370f93f743b9da3 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "tixati-${version}";
- version = "2.59";
+ version = "2.61";
src = fetchurl {
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
- sha256 = "0vf5y9kj2g7psgdzv2r46jdh5krdps838ca4wwwxi0dd1mwa65my";
+ sha256 = "05f8lcsac2mr90bhk999qkj8wwd6igdl07389bqrd1ydjasacl2k";
};
installPhase = ''
diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix
index f047b630ec409ee7a11a45898d960a570a5a94f0..d4823988526e947f1557cffb67bb0c384817c7ba 100644
--- a/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/pkgs/applications/networking/p2p/transgui/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchsvn, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
+{ stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:
stdenv.mkDerivation rec {
- name = "transgui-5.0.1-svn-r${revision}";
- revision = "988";
+ pname = "transgui";
+ version = "5.17.0";
- src = fetchsvn {
- url = "https://svn.code.sf.net/p/transgui/code/trunk/";
- rev = revision;
- sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf";
+ src = fetchFromGitHub {
+ owner = "transmission-remote-gui";
+ repo = "transgui";
+ rev = "v${version}";
+ sha256 = "0p76vavny5asi5naa4jn67raxlarsmrkbchfn96y6gh5p2vzwpl7";
};
nativeBuildInputs = [ pkgconfig ];
@@ -27,9 +28,9 @@ stdenv.mkDerivation rec {
substituteInPlace restranslator.pas --replace /usr/ $out/
'';
- patches = [
- ./r988-compile-fix.patch
- ];
+ preBuild = ''
+ lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus
+ '';
makeFlags = [
"FPC=fpc"
diff --git a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch
deleted file mode 100644
index 4b070d0cbe8a348404a20196b27dceac02888900..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/utils.pas b/utils.pas
-index eb8b828..1ff2440 100644
---- a/utils.pas
-+++ b/utils.pas
-@@ -100,7 +100,7 @@ uses
- {$ifdef CALLSTACK}
- lineinfo2,
- {$endif CALLSTACK}
-- LazFileUtils, LazUtf8, StdCtrls, Graphics;
-+ LazFileUtils, LazUtf8, StdCtrls, Graphics, FileUtil;
-
- {$ifdef windows}
- function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle;
-@@ -235,7 +235,7 @@ end;
-
- function ParamStrUTF8(Param: Integer): utf8string;
- begin
-- Result:=FileUtil.ParamStrUTF8(Param);
-+ Result:=LazUtf8.ParamStrUTF8(Param);
- end;
-
- function ParamCount: integer;
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 1e067b3c33562b88cbebccda20c500b4d7d70258..8a66c039b5a770e66e74aaf6384f203f165f1eee 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -2,13 +2,15 @@
stdenv.mkDerivation rec {
name = "pjsip-${version}";
- version = "2.8";
+ version = "2.9";
src = fetchurl {
url = "https://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
- sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah";
+ sha256 = "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi";
};
+ patches = [ ./fix-aarch64.patch ];
+
buildInputs = [ openssl libsamplerate alsaLib ];
preConfigure = ''
diff --git a/pkgs/applications/networking/pjsip/fix-aarch64.patch b/pkgs/applications/networking/pjsip/fix-aarch64.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f4aabf7a9bb49598b66143e6a646d8063265c778
--- /dev/null
+++ b/pkgs/applications/networking/pjsip/fix-aarch64.patch
@@ -0,0 +1,13 @@
+--- a/aconfigure
++++ b/aconfigure
+@@ -8945,6 +8945,10 @@
+ ac_webrtc_instset=neon
+ ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
+ ;;
++ arm64*|aarch64*)
++ ac_webrtc_instset=neon
++ ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64"
++ ;;
+ *)
+ ac_webrtc_instset=sse2
+ ;;
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index 2e04ce856a8c1ea19936e3172e324c561b043cf4..2870f3158fb6424d9551335f9d00bedf96e37fd2 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -2,7 +2,7 @@
libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }:
let
- version = "1.1.4-1";
+ version = "1.1.5-1";
description = ''
An application that runs on your computer in the background and seamlessly encrypts
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
- sha256 = "16w3l81j10syl2pis08sl752yapbgjy531qs0n1ghmsx2d12n7kl";
+ sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75";
};
nativeBuildInputs = [ makeWrapper ];
@@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://www.protonmail.com/bridge;
+ homepage = "https://www.protonmail.com/bridge";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ lightdiscord ];
diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..13a16a6e2245cc71c11256bbc8f335579de32a2c
--- /dev/null
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -0,0 +1,214 @@
+{ stdenv
+, lib
+, fetchurl
+, requireFile
+, makeWrapper
+, libredirect
+, busybox
+, file
+, makeDesktopItem
+, tzdata
+, cacert
+, glib
+, gtk2
+, atk
+, gdk_pixbuf
+, cairo
+, pango
+, gnome3
+, xorg
+, libpng12
+, freetype
+, fontconfig
+, gtk_engines
+, alsaLib
+, libidn
+, zlib
+, version ? "19.3.0"
+}:
+
+let
+ # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12.
+ # Citrix looks for the former so we build version 1.34 to please the binary
+ libidn_134 = libidn.overrideDerivation (_: rec {
+ name = "libidn-1.34";
+ src = fetchurl {
+ url = "mirror://gnu/libidn/${name}.tar.gz";
+ sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
+ };
+ });
+
+ versionInfo = let
+ supportedVersions = {
+ "19.3.0" = {
+ major = "19";
+ minor = "3";
+ patch = "0";
+ x64hash = "0mhpp29ca3dw9hx72i0qawdq35wcc7qzgxwzlx4aicwnm1gbil5c";
+ x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w";
+ x64suffix = "5";
+ x86suffix = "5";
+ homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html;
+ };
+ };
+
+ # Copied this file largely from the citrix-receiver package
+ # Leaving this here even though there are no deprecations yet
+ # for ease of future maintenance
+ deprecatedVersions = let
+ versions = [ ];
+ in
+ lib.listToAttrs
+ (lib.flip map versions
+ (v: lib.nameValuePair v (throw "Unsupported citrix_workspace version: ${v}")));
+ in
+ deprecatedVersions // supportedVersions;
+
+ citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }:
+ stdenv.mkDerivation rec {
+ name = "citrix-workspace-${version}";
+ version = "${major}.${minor}.${patch}";
+ inherit homepage;
+
+ prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
+
+ src = requireFile rec {
+ name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz";
+ sha256 = if stdenv.is64bit then x64hash else x86hash;
+ message = ''
+ In order to use Citrix Workspace, you need to comply with the Citrix EULA and download
+ the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
+
+ ${homepage}
+
+ (if you do not find version ${version} there, try at
+ https://www.citrix.com/downloads/workspace-app/
+
+ Once you have downloaded the file, please use the following command and re-run the
+ installation:
+
+ nix-prefetch-url file://\$PWD/${name}
+ '';
+ };
+
+ dontBuild = true;
+
+ sourceRoot = ".";
+
+ buildInputs = [
+ makeWrapper
+ busybox
+ file
+ gtk2
+ gdk_pixbuf
+ ];
+
+ libPath = stdenv.lib.makeLibraryPath [
+ glib
+ gtk2
+ atk
+ gdk_pixbuf
+ cairo
+ pango
+ gnome3.dconf
+ xorg.libX11
+ xorg.libXext
+ xorg.libXrender
+ xorg.libXinerama
+ xorg.libXfixes
+ libpng12
+ libidn_134
+ zlib
+ gtk_engines
+ freetype
+ fontconfig
+ alsaLib
+ stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null)
+ ];
+
+ desktopItem = makeDesktopItem {
+ name = "wfica";
+ desktopName = "Citrix Workspace";
+ genericName = "Citrix Workspace";
+ exec = "wfica";
+ icon = "wfica";
+ comment = "Connect to remote Citrix server";
+ categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
+ mimeType = "application/x-ica";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ export ICAInstDir="$out/opt/citrix-icaclient"
+
+ sed -i \
+ -e 's,^main_install_menu$,install_ICA_client,g' \
+ -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \
+ -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \
+ -e 's,/bin/true,true,g' \
+ ./${prefixWithBitness}/hinst
+
+ # Run the installer...
+ bash ./${prefixWithBitness}/hinst CDROM "`pwd`"
+
+ echo "Deleting broken links..."
+ for link in `find $ICAInstDir -type l `
+ do
+ [ -f "$link" ] || rm -v "$link"
+ done
+
+ echo "Expanding certificates..."
+ # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates
+ pushd "$ICAInstDir/keystore/cacerts"
+ awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt
+ popd
+
+ echo "Patching executables..."
+ find $ICAInstDir -type f -exec file {} \; |
+ grep 'ELF.*executable' |
+ cut -f 1 -d : |
+ grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729
+ while read f
+ do
+ echo "Patching ELF intrepreter and rpath for $f"
+ chmod u+w "$f"
+ patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ --set-rpath "$ICAInstDir:$libPath" "$f"
+ done
+
+ echo "Wrapping wfica..."
+ mkdir "$out/bin"
+
+ makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
+ --add-flags "-icaroot $ICAInstDir" \
+ --set ICAROOT "$ICAInstDir" \
+ --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+ --set LD_LIBRARY_PATH "$libPath" \
+ --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
+
+ echo "We arbitrarily set the timezone to UTC. No known consequences at this point."
+ echo UTC > "$ICAInstDir/timezone"
+
+ echo "Installing desktop item..."
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/* $out/share/applications
+
+ # We introduce a dependency on the source file so that it need not be redownloaded everytime
+ echo $src >> "$out/share/workspace_dependencies.pin"
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ license = stdenv.lib.licenses.unfree;
+ inherit homepage;
+ description = "Citrix Workspace";
+ platforms = platforms.linux;
+ };
+ };
+
+in citrixWorkspaceForVersion (lib.getAttr version versionInfo)
diff --git a/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix b/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ea475ae6dbc94e2fb2a8e53037b776f0c10dc997
--- /dev/null
+++ b/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix
@@ -0,0 +1,19 @@
+{ citrix_workspace, extraCerts ? [], symlinkJoin }:
+
+let
+
+ mkCertCopy = certPath:
+ "cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/";
+
+in
+
+if builtins.length extraCerts == 0 then citrix_workspace else symlinkJoin {
+ name = "citrix-with-extra-certs-${citrix_workspace.version}";
+ paths = [ citrix_workspace ];
+
+ postBuild = ''
+ ${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)}
+
+ sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica
+ '';
+}
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 2110b76934d6e34129041f74a4f2f082f8ba83ba..0653686c650d3fd43fc505687da6fd863ee89a6d 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -9,6 +9,7 @@
, pcsclite ? null
, systemd ? null
, buildServer ? true
+, nocaps ? false
}:
stdenv.mkDerivation rec {
@@ -31,6 +32,9 @@ stdenv.mkDerivation rec {
'' + lib.optionalString (pcsclite != null) ''
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
--replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so"
+ '' + lib.optionalString nocaps ''
+ substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
+ --replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
'';
buildInputs = with lib; [
diff --git a/pkgs/applications/networking/remote/freerdp/legacy.nix b/pkgs/applications/networking/remote/freerdp/legacy.nix
deleted file mode 100644
index 9830b84652597e4501da2546ec623dadf7961758..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/remote/freerdp/legacy.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ stdenv
-, fetchurl
-, cmake
-, openssl
-, glib, pcre
-, printerSupport ? true, cups
-, pkgconfig
-, zlib
-, libX11
-, libXcursor
-, libXdamage
-, libXext
-, alsaLib
-, ffmpeg
-, libxkbfile
-#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
-, libXinerama
-, libXv
-, pulseaudioSupport ? true
-}:
-
-assert printerSupport -> cups != null;
-
-stdenv.mkDerivation rec {
- name = "freerdp-${version}";
- version = "1.2.0-beta1+android9";
-
- src = fetchurl {
- url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz";
- sha256 = "181w4lkrk5h5kh2zjlx6h2cl1mfw2aaami3laq3q32pfj06q3rxl";
- };
-
- buildInputs = [
- cmake
- openssl
- glib pcre
- pkgconfig
- zlib
- libX11
- libXcursor
- libXdamage
- libXext
- alsaLib
- ffmpeg
- libxkbfile
-# xmlto docbook_xml_dtd_412 docbook_xml_xslt
- libXinerama
- libXv
- ] ++ stdenv.lib.optional printerSupport cups;
-
- preConfigure = ''
- export HOME=$TMP
- '';
-
- configureFlags = [
- "--with-x" "-DWITH_MANPAGES=OFF"
- ] ++ stdenv.lib.optional printerSupport "--with-printer=cups"
- ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON";
-
- meta = with stdenv.lib; {
- description = "A Remote Desktop Protocol Client";
-
- longDescription = ''
- FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
- following the Microsoft Open Specifications.
- '';
-
- homepage = http://www.freerdp.com/;
- license = licenses.free;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 4caa9ae63f759de989b9b1704042b5f96d4d4716..5f737cacb4654d9e82aba0819a699b0c5d98949b 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -1,28 +1,33 @@
-{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig} :
+{stdenv, fetchFromGitHub, openssl, libX11, libgssglue, pkgconfig, autoreconfHook
+, enableCredssp ? (!stdenv.isDarwin)
+} :
stdenv.mkDerivation (rec {
pname = "rdesktop";
- version = "1.8.3";
+ version = "1.8.6";
name = "${pname}-${version}";
- src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.gz";
- sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "02sbhnqbasa54c75c86qw9w9h9sxxbnldj7bjv2gvn18lmq5rm20";
};
- nativeBuildInputs = [pkgconfig];
- buildInputs = [openssl libX11 libgssglue];
+ nativeBuildInputs = [pkgconfig autoreconfHook];
+ buildInputs = [openssl libX11]
+ ++ stdenv.lib.optional enableCredssp libgssglue;
configureFlags = [
"--with-ipv6"
"--with-openssl=${openssl.dev}"
"--disable-smartcard"
- ];
+ ] ++ stdenv.lib.optional (!enableCredssp) "--disable-credssp";
meta = {
description = "Open source client for Windows Terminal Services";
homepage = http://www.rdesktop.org/;
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
license = stdenv.lib.licenses.gpl2;
};
})
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 951b136dd4e4b0ae0adf34185c98fee117b9bafc..fb577f09120bc84f9b84dc710c9e03fed6af1101 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook
, glib, gtk3, gettext, libxkbfile, libX11
-, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
+, freerdp, libssh, libgcrypt, gnutls
, pcre, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index b624f02c42aba10bf969f6706bdffa050628a8d4..d97f376b9a2ae152adbeaeffa689824600766340 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "teamviewer-${version}";
- version = "14.2.8352";
+ version = "14.3.4730";
src = fetchurl {
url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb";
- sha256 = "132fh3lg6g4b0yfkhvbm9zg8s3lcljmbk6gfaavi4b1h8ndq92ay";
+ sha256 = "1k3vrkgkdh5wvws7xajgjvsqnmig64gnmf75sy7qq6lrpgp5l3nf";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix
index 55d473bc104b383d09c8ab72b3483bd1af89c657..69ae40b7618071fd5adf61b878a20abf6757c7a4 100644
--- a/pkgs/applications/networking/sieve-connect/default.nix
+++ b/pkgs/applications/networking/sieve-connect/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "sieve-connect-${version}";
- version = "0.89";
+ version = "0.90";
src = fetchFromGitHub {
owner = "philpennock";
repo = "sieve-connect";
rev = "v${version}";
- sha256 = "0g7cv29wd5673inl4c87xb802k86bj6gcwh131xrbbg0a0g1c8fp";
+ sha256 = "1ghvfa5ifa68b6imh85bkmy00r93c5f9hs6d039axb73gmma580p";
};
buildInputs = [ perlPackages.perl ];
diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5c536b8aec2324db9bfba22985c7ebe65cd7e736
--- /dev/null
+++ b/pkgs/applications/networking/sniffers/sngrep/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, autoconf, automake, fetchFromGitHub, libpcap, ncurses, openssl, pcre }:
+
+stdenv.mkDerivation rec {
+ pname = "sngrep";
+ version = "1.4.6";
+
+ src = fetchFromGitHub {
+ owner = "irontec";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0fj13pim5bfm3a2nr05apspraf29klpmcnhmycklfmrlncq5xqdf";
+ };
+
+ buildInputs = [
+ libpcap ncurses pcre openssl ncurses
+ ];
+
+ nativeBuildInputs = [
+ autoconf automake
+ ];
+
+ configureFlags = [
+ "--with-pcre"
+ "--enable-unicode"
+ "--enable-ipv6"
+ "--enable-eep"
+ ];
+
+ preConfigure = "./bootstrap.sh";
+
+ meta = with stdenv.lib; {
+ description = "A tool for displaying SIP calls message flows from terminal";
+ homepage = "https://github.com/irontec/sngrep";
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ jorise ];
+ };
+}
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 46869ecb24f2b043f4e5d99b88f9e417eb83df67..401e496480132ab8054e6be3d3acc071b036e881 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
-, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
+, libssh, nghttp2, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
, withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
}:
@@ -10,21 +10,21 @@ assert withQt -> qt5 != null;
with stdenv.lib;
let
- version = "3.0.1";
+ version = "3.0.2";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
- name = "wireshark-${variant}-${version}";
+ pname = "wireshark-${variant}";
+ inherit version;
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6";
+ sha256 = "0fz5lbyiw4a27fqc4ndi1w20bpcb6wi9k7vjv29l9fhd99kca7ky";
};
cmakeFlags = [
"-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
- "-DENABLE_QT5=${if withQt then "ON" else "OFF"}"
"-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
];
@@ -33,7 +33,7 @@ in stdenv.mkDerivation {
];
buildInputs = [
- gettext pcre perl libpcap lua5 libssh openssl libgcrypt
+ gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
++ optionals stdenv.isLinux [ libcap libnl ]
@@ -95,6 +95,8 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
+ dontFixCmake = true;
+
shellHook = ''
# to be able to run the resulting binary
export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1
diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..40026275a1e33e5b0cf7b6ac6d636c9e1c81dc82
--- /dev/null
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -0,0 +1,53 @@
+{ appimageTools, symlinkJoin, lib, fetchurl, makeDesktopItem }:
+
+let
+ pname = "patchwork";
+ version = "3.14.1";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/ssbc/patchwork/releases/download/v${version}/ssb-${pname}-${version}-x86_64.AppImage";
+ sha256 = "01vsldabv9nmbx8kzlgw275zykm72s1dxglnaq4jz5vbysbyn0qd";
+ };
+
+ binary = appimageTools.wrapType2 {
+ name = "${pname}";
+ inherit src;
+ };
+ # we only use this to extract the icon
+ appimage-contents = appimageTools.extractType2 {
+ inherit name src;
+ };
+
+ desktopItem = makeDesktopItem {
+ name = "patchwork";
+ exec = "${binary}/bin/patchwork";
+ icon = "ssb-patchwork.png";
+ comment = "Decentralized messaging and sharing app";
+ desktopName = "Patchwork";
+ genericName = "Patchwork";
+ categories = "Network;";
+ };
+
+in
+ symlinkJoin {
+ inherit name;
+ paths = [ binary ];
+
+ postBuild = ''
+ mkdir -p $out/share/pixmaps/ $out/share/applications
+ cp ${appimage-contents}/ssb-patchwork.png $out/share/pixmaps
+ cp ${desktopItem}/share/applications/* $out/share/applications/
+ '';
+
+ meta = with lib; {
+ description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)";
+ longDescription = ''
+ sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship.
+ '';
+ homepage = https://www.scuttlebutt.nz/;
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ thedavidmeister ninjatrappeur flokli ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index fcfa1a552239a2e473594460b20e1e9b4e234be5..13d55bcf476d1d5a5b5d4a3113b40e4ff434408c 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "rclone";
- version = "1.47.0";
+ version = "1.48.0";
src = fetchFromGitHub {
owner = "ncw";
repo = pname;
rev = "v${version}";
- sha256 = "1nxwjr9jly6wh1ixr6a7zhlg4b3298v940040fsm0n3lcljd37zx";
+ sha256 = "0wxsn3ynkwh2np12sxdmy435nclg2ry7cw26brz11xc0ri4x9azg";
};
- modSha256 = "02p5dd450bbfyq80nd0w8f9kpv25k1855mf0gcv0cy9zq3f3r7q7";
+ modSha256 = "0bbpny7xcwsvhmdypgbbr0gqc5pa40m71qhbps6k0v09rsgqhpn3";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index e5c04798aab8c4776829faef4d6d05c77f318dcb..12f992d44a5a634595ed265ba11ab589782809ab 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, perl, rsync }:
+{ stdenv, fetchurl, perl, rsync }:
let
base = import ./base.nix { inherit stdenv fetchurl; };
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# Skip configure and build phases.
# We just want something from the support directory
- configurePhase = "true";
+ dontConfigure = true;
dontBuild = true;
postPatch = ''
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index 7862cc1e6e4f840fee41c911e901b33a912af160..ad5a35eb251f76e62a05941da49feb34f9e87f6a 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -20,8 +20,10 @@ stdenv.mkDerivation (rec {
echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
'';
- makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "")
- + (if ! ocaml.nativeCompilers then " NATIVE=false" else "");
+ makeFlags = [
+ "INSTALLDIR=$(out)/bin/"
+ "UISTYLE=${if enableX11 then "gtk2" else "text"}"
+ ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false";
preInstall = "mkdir -p $out/bin";
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 4f4eaf30245573e2021cbea1fdf45bdf3245ed5a..c8610d80ca78e52227142830cd9ddf417b682ca0 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchurl, python3Packages }:
+{ lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }:
-python3Packages.buildPythonApplication rec {
+buildPythonApplication rec {
name = "syncplay-${version}";
version = "1.6.3";
format = "other";
- src = fetchurl {
- url = https://github.com/Syncplay/syncplay/archive/v1.6.3.tar.gz;
- sha256 = "151p1njlp3dp3pfr3l3m6ia5829zvjyjh4p45j6rgnicbh8sqrgs";
+ src = fetchFromGitHub {
+ owner = "Syncplay";
+ repo = "syncplay";
+ rev = "v${version}";
+ sha256 = "03xw44lxdk1h9kbvfviqzpmxxld6zvp07i0hvdm1chchyp0a109h";
};
- propagatedBuildInputs = with python3Packages; [ pyside twisted ];
+ propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls;
makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://syncplay.pl/;
description = "Free software that synchronises media players";
license = licenses.asl20;
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 7cdc7341953878a509a9f3b91313963799fc426a..cc916e069a0059c7f9ea374c66b67f415437c22a 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,16 +1,16 @@
-{ buildGoPackage, fetchpatch, stdenv, lib, procps, fetchFromGitHub }:
+{ buildGoPackage, stdenv, lib, procps, fetchFromGitHub }:
let
common = { stname, target, postInstall ? "" }:
buildGoPackage rec {
- version = "1.1.1";
+ version = "1.1.4";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "1nkc4ivc8mg9c1njqlkhb9i5f4c1via1rdqfbhwgkj86s6cnxrg7";
+ sha256 = "0a19l1kp4cwyzcd53v9yzv3ms69gn78gajkyfawafr7ls0i8x82f";
};
goPackagePath = "github.com/syncthing/syncthing";
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index b384efc5fe89823484c5986388f0b3b73c2a968e..7b3e62779e95b34cc3c460d8c4e3e0b35995b030 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, fetchurl, gd, ncurses, sqlite }:
+{ stdenv, fetchurl, pkgconfig, gd, ncurses, sqlite, check }:
stdenv.mkDerivation rec {
- name = "vnstat-${version}";
+ pname = "vnstat";
version = "2.2";
src = fetchurl {
sha256 = "0b7020rlc568pz6vkiy28kl8493z88wzrn18wv9b0iq2bv1pn2n6";
- url = "https://humdi.net/vnstat/${name}.tar.gz";
+ url = "https://humdi.net/${pname}/${pname}-${version}.tar.gz";
};
- buildInputs = [ gd ncurses sqlite ];
-
postPatch = ''
substituteInPlace src/cfg.c --replace /usr/local $out
'';
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gd ncurses sqlite ];
+
+ checkInputs = [ check ];
+
+ doCheck = true;
+
meta = with stdenv.lib; {
description = "Console-based network statistics utility for Linux";
longDescription = ''
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix
index 74a1b57140697a9fea93afc1367691ba674b1875..88d33a9a9f3c8477458a19b01e74ff1bdf407542 100644
--- a/pkgs/applications/networking/weather/meteo/default.nix
+++ b/pkgs/applications/networking/weather/meteo/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
-, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib
-, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook
+, json-glib, libsoup, webkitgtk, geocode-glib
+, libappindicator, desktop-file-utils, appstream, wrapGAppsHook
, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "meteo";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchFromGitLab {
owner = "bitseater";
repo = pname;
rev = version;
- sha256 = "1786s5637hc3dnnkf5vr2ngfiq73dyvx8187gx7qkh7cr8xrl50w";
+ sha256 = "014x3mg2dc58h1qwy2nrz3a5mzdnbzish8zgn3x6lj6szfz5c72n";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix
index 050358e4dcaad5c1318b67a56019746f3d6e1ff3..4160e70b9c4449fddb190cc617bfbd618f293090 100644
--- a/pkgs/applications/networking/websocketd/default.nix
+++ b/pkgs/applications/networking/websocketd/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
- name = "websocketd-${version}";
- version = "0.3.0";
- rev = "729c67f052f8f16a0a0aa032816a57649c0ebed3";
+buildGoModule rec {
+ pname = "websocketd";
+ version = "0.3.1";
- goPackagePath = "github.com/joewalnes/websocketd";
-
- src = fetchgit {
- inherit rev;
- url = "https://github.com/joewalnes/websocketd";
- sha256 = "1n4fag75lpfxg1pm1pr5v0p44dijrxj59s6dn4aqxirhxkq91lzb";
+ src = fetchFromGitHub {
+ owner = "joewalnes";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q";
};
- goDeps = ./deps.nix;
+ modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
homepage = "http://websocketd.com/";
maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/applications/networking/websocketd/deps.nix b/pkgs/applications/networking/websocketd/deps.nix
deleted file mode 100644
index 1e610691f52aa213414ff683a28eb0fa343b6944..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/websocketd/deps.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
- sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
- };
- }
-]
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index deb768e6feb684c36da6321e0b2d3719e2c51975..08fa53a6e3885e4f5b9648bebf1793f67d1f3d4b 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "znc-${version}";
- version = "1.7.3";
+ version = "1.7.4";
src = fetchurl {
url = "https://znc.in/releases/archive/${name}.tar.gz";
- sha256 = "0g8i5hsl4kinpz1wp0a2zniidv3w2sd6awq8676fds516wcc6k0y";
+ sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 42d2093ee3a077cea960b830b4ea0d06cb6b42ae..fce885a259411ffead90edf4824361d2db802101 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -57,6 +57,26 @@ in rec {
};
};
+ clientaway = zncDerivation rec {
+ name = "znc-clientaway-${version}";
+ version = "git-2017-04-28";
+ module_name = "clientaway";
+
+ src = fetchFromGitHub {
+ owner = "kylef";
+ repo = "znc-contrib";
+ rev = "f6724a4a3b16b050088adde0cbeed74f189e5044";
+ sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8";
+ };
+
+ meta = with stdenv.lib; {
+ description = "ZNC clientaway module";
+ homepage = https://github.com/kylef/znc-contrib;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ kiwi ];
+ };
+ };
+
fish = zncDerivation rec {
name = "znc-fish-${version}";
version = "git-2014-10-10";
@@ -77,6 +97,46 @@ in rec {
};
};
+ ignore = zncDerivation rec {
+ name = "znc-ignore-${version}";
+ version = "git-2017-04-28";
+ module_name = "ignore";
+
+ src = fetchFromGitHub {
+ owner = "kylef";
+ repo = "znc-contrib";
+ rev = "f6724a4a3b16b050088adde0cbeed74f189e5044";
+ sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8";
+ };
+
+ meta = with stdenv.lib; {
+ description = "ZNC ignore module";
+ homepage = https://github.com/kylef/znc-contrib;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ kiwi ];
+ };
+ };
+
+ palaver = zncDerivation rec {
+ name = "znc-palaver-${version}";
+ version = "2018-09-18";
+ module_name = "palaver";
+
+ src = fetchFromGitHub {
+ owner = "cocodelabs";
+ repo = "znc-palaver";
+ rev = "c70e8112686f917d39197d582db36c3ea37a4cb6";
+ sha256 = "1gjr8yqgpkpcc18rf0zfgil3rcd1ihqk0q9f8rwbfvs5381h3c58";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Palaver ZNC module";
+ homepage = "https://github.com/cocodelabs/znc-palaver";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kiwi ];
+ };
+ };
+
playback = zncDerivation rec {
name = "znc-playback-${version}";
version = "git-2015-08-04";
diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
index 42831b7a83900f9afa7b97fd03f198fe8ab73f1d..470eabdf6e4777413514c2680dd63cf8fc49d70d 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/pkgs/applications/office/aesop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, python3, gtk3
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, gtk3
, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook }:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index 462e6fbb7a0496a46cd9a72e3c2a070c982ddde4..91b12d8a33c3dc27ae9686220a7897c1e5e16f52 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atlassian-cli-${version}";
- version = "8.2.0";
+ version = "8.5.0";
src = fetchzip {
url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
- sha256 = "0lcyyay2fyywcn096y33d77r6fpvwggv5qdkky5qy16lh6rfx1lm";
+ sha256 = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz";
extraPostFetch = "chmod go-w $out";
};
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index 63199945f2b1f55f2799c49f1bde4e7168600663..fe81340a7fb40bc63249a07c64b7a42ade581b84 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pantheon, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk
+{ stdenv, fetchFromGitHub, pantheon, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk
, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0d2341113b4878d916c5c22d530c43c66bb7948d
--- /dev/null
+++ b/pkgs/applications/office/docear/default.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, runtimeShell, makeWrapper
+, oraclejre
+, antialiasFont ? true
+}:
+
+stdenv.mkDerivation rec {
+ pname = "docear";
+ version = "1.2";
+
+ src = fetchurl {
+ url = "http://docear.org/downloads/docear_linux.tar.gz";
+ sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4";
+ };
+
+ buildInputs = [ oraclejre makeWrapper ];
+
+ buildPhase = "";
+ installPhase = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share
+ cp -R * $out/share
+ chmod 0755 $out/share/ -R
+
+ # The wrapper ensures oraclejre is used
+ makeWrapper ${runtimeShell} $out/bin/docear \
+ --set _JAVA_OPTIONS "${stdenv.lib.optionalString antialiasFont ''-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on''}" \
+ --set JAVA_HOME ${oraclejre.home} \
+ --add-flags "$out/share/docear.sh"
+
+ chmod 0755 $out/bin/docear
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A unique solution to academic literature management";
+ homepage = "http://www.docear.org/";
+ # Licenses at: http://www.docear.org/software/download/
+ license = with licenses; [
+ gpl2 # for the main software and some dependencies
+ bsd3 # for one of its dependencies
+ ];
+ maintainers = with maintainers; [ unode ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index a9578e6525d47d39378351941b989ed44fd24fb8..e4a89b513e9c473569301fbb5930f73eb9e34ab4 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -25,11 +25,11 @@ in
stdenv.mkDerivation rec {
name = "gnucash-${version}";
- version = "3.5";
+ version = "3.6";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
- sha256 = "0ibp7g6aknvnkwkin97kv04ipksy3l18dsz9qysjb7h2nr8hnvbp";
+ sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi";
};
nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 87aaf85d950c0c6e4b4dfc798e4f2199ab00db46..70d1e3d79ba5997872bcd60c04db9eed6e7eaa94 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -1,22 +1,31 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
-, itstool
+, itstool, autoreconfHook
}:
let
inherit (pythonPackages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
- version = "1.12.44";
+ version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0147962c6ybdsj57rz95nla0rls7g545wc2n7pz59zmzyd5pksk0";
+ sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h";
};
+ patches = stdenv.lib.optional stdenv.isDarwin
+ # https://gitlab.gnome.org/GNOME/gnumeric/issues/402
+ (fetchurl {
+ name = "math-gamma.patch";
+ url = "https://gitlab.gnome.org/GNOME/gnumeric/uploads/cf8d162bc719de92e97d01cb0ba5b637/ppp";
+ sha256 = "17wiigs06qc86a1nghwcg3pcnpa28123jblgsxpy3j7drardgnlp";
+ });
+
configureFlags = [ "--disable-component" ];
- nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];
+ nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]
+ ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
# ToDo: optional libgda, introspection?
buildInputs = [
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 95f8ebea07871ddd3714794f1a93acd591c54baf..9f45a70e8b8d99f6d9d95d30bd84ddaefcb40bab 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
, hicolor-icon-theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "homebank-5.2.4";
+ name = "homebank-5.2.6";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
- sha256 = "1lhj4pnszw4a1r8ls8lwqyakg5bmldziaxgydbx76nbah6w9ma3r";
+ sha256 = "10cqii1bsc7dmg8nzj6xhmk44r390vca49vbsw4g504h0bvwn54s";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index 5dfd03570121fb9013c7e79ab00addbbbc0f29d5..ebd5a14ad047b94cfd20995da35bed3e24d35c6a 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ];
- unpackPhase = "#";
+ dontUnpack = true;
installPhase = ''
mkdir -p $out/bin $out/share/java $out/share/icons
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index 784126ba3d8788663592b7585fca2d202744fcee..e28a2d0852b674a927a2d7f6e77e947d8ab0e621 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools,
+ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools,
boost, qttools, qtwebkit,
breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 4a91840077ce5599b23fc33fd1796667fcbc1068..30045b83242c41e59658971add3aa48470641f39 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -1,10 +1,11 @@
{ stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools
-, fetchpatch
, akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive
, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement
, kitemmodels, libical, libofx, qgpgme
+, sqlcipher
+
# Needed for running tests:
, qtbase, xvfb_run
@@ -14,20 +15,13 @@
stdenv.mkDerivation rec {
name = "kmymoney-${version}";
- version = "5.0.1";
+ version = "5.0.5";
src = fetchurl {
url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
- sha256 = "1c9apnvc07y17pzy4vygry1dai5ass2z7j354lrcppa85b18yvnx";
+ sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977";
};
- # Fix build with Qt 5.11.
- patches = lib.singleton (fetchpatch {
- url = "https://cgit.kde.org/kmymoney.git/patch/?id="
- + "e5198a902996b27bf9abde0ad24af82d55ab5dc1";
- sha256 = "1h2f1xznf7343s26fh94x8n2ci0pijk5j86f24lvghawsw848316";
- });
-
# Hidden dependency that wasn't included in CMakeLists.txt:
NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5";
@@ -41,6 +35,7 @@ stdenv.mkDerivation rec {
akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils
kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels
libical libofx qgpgme
+ sqlcipher
# Put it into buildInputs so that CMake can find it, even though we patch
# it into the interface later.
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 9c14ffdbbfddbc91e38b91136f59fe3754d28076..fbf6047af60597446fb6496db7374f6b9f11e896 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,7 +3,7 @@
rec {
major = "6";
minor = "2";
- patch = "2";
+ patch = "4";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "0s8zwc2bp1zs7hvyhjz0hpb8w97jm0cdb179p56z7svvmald6fmq";
+ sha256 = "1drq59lc6p4s8mil2syz93l97phsbk9dcrd5gikqi2dwlzkli0gz";
};
}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index a7f24fdf1f38b377ba1e9d225ec9bd3079351cb7..a82999366627e02935bd26c2af940b508c35491a 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -4,7 +4,7 @@
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mariadb
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -48,14 +48,14 @@ let
translations = fetchSrc {
name = "translations";
- sha256 = "0i8pmgdm0i6klb06s3nwad9xz4whbvb5mjjqjqvl6fh0flk6zs1p";
+ sha256 = "0ahyrkg1sa4a0igvvd98spjlm5k34cddpwpxl7qhir8ldgighk2c";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "14hd6rnq9316p78zharqznps80mxxwz3n80zm15cpj3xg3dr57v1";
+ sha256 = "0zrfm8kw6m60wz6mn4y5jhlng90ya045nxyh46sib9nl4nd4d98s";
};
};
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
- NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
+ NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma";
patches = [
./xdg-open-brief.patch
@@ -258,7 +258,7 @@ in stdenv.mkDerivation rec {
mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
- for a in sbase scalc sdraw smath swriter simpress soffice; do
+ for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
done
@@ -345,24 +345,25 @@ in stdenv.mkDerivation rec {
make slowcheck
'';
+ nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ];
+
buildInputs = with xorg;
- [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
+ [ ant ArchiveZip boost cairo clucene_core
IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
freetype GConf getopt gnome_vfs gperf gtk3 gtk2
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
- gst_all_1.gst-plugins-base glib mariadb
+ gst_all_1.gst-plugins-base glib mysql.connector-c
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
- mdds bluez5 libcmis libwps libabw libzmf libtool
+ mdds bluez5 libcmis libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy
libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
]
++ lib.optional kdeIntegration kdelibs4;
- nativeBuildInputs = [ wrapGAppsHook gdb fontforge ];
passthru = {
inherit srcs jdk;
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index fda975a9031a9d719ce09b821ec3582acd42ae77..bfb74d1bb5078b322edf280f1be777692b876a02 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -119,11 +119,11 @@
md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz";
}
{
- name = "libepoxy-1.5.2.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.2.tar.xz";
- sha256 = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8";
+ name = "libepoxy-1.5.3.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz";
+ sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d";
md5 = "";
- md5name = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8-libepoxy-1.5.2.tar.xz";
+ md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz";
}
{
name = "epm-3.7.tar.gz";
@@ -462,11 +462,11 @@
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
}
{
- name = "language-subtag-registry-2018-04-23.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2";
- sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878";
+ name = "language-subtag-registry-2019-04-03.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2";
+ sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d";
md5 = "";
- md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2";
+ md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@@ -700,18 +700,18 @@
md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
}
{
- name = "libpng-1.6.34.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz";
- sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6";
+ name = "libpng-1.6.37.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz";
+ sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca";
md5 = "";
- md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz";
+ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
}
{
- name = "poppler-0.73.0.tar.xz";
- url = "http://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz";
- sha256 = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03";
+ name = "poppler-0.74.0.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz";
+ sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f";
md5 = "";
- md5name = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03-poppler-0.73.0.tar.xz";
+ md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz";
}
{
name = "postgresql-9.2.24.tar.bz2";
@@ -721,11 +721,11 @@
md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
}
{
- name = "Python-3.5.6.tar.xz";
- url = "http://dev-www.libreoffice.org/src/Python-3.5.6.tar.xz";
- sha256 = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f";
+ name = "Python-3.5.7.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz";
+ sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc";
md5 = "";
- md5name = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f-Python-3.5.6.tar.xz";
+ md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 1b7d2b0987f8523f5b293747718d41fd4c2462c5..efcc4407842b7c3a3596eb81ecf13a007952a26f 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
- NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
+ NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma";
patches = [
./xdg-open-brief.patch
@@ -183,7 +183,7 @@ in stdenv.mkDerivation rec {
mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
- for a in sbase scalc sdraw smath swriter simpress soffice; do
+ for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
done
diff --git a/pkgs/applications/office/libreoffice/xdg-open.patch b/pkgs/applications/office/libreoffice/xdg-open.patch
deleted file mode 100644
index 3ff7e5d80f7a886f820a6b57e8ed6d227a680f62..0000000000000000000000000000000000000000
--- a/pkgs/applications/office/libreoffice/xdg-open.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
---- a/shell/source/unix/exec/shellexec.cxx
-+++ b/shell/source/unix/exec/shellexec.cxx
-@@ -150,7 +150,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
- if (std::getenv("LIBO_FLATPAK") != nullptr) {
- aBuffer.append("/app/bin/xdg-open");
- } else {
-- aBuffer.append("/usr/bin/xdg-open");
-+ aBuffer.append("xdg-open");
- }
- #endif
- aBuffer.append(" ");
-diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh
-index 4519e01f26e2..8985711a2c01 100755
---- a/shell/source/unix/misc/senddoc.sh
-+++ b/shell/source/unix/misc/senddoc.sh
-@@ -393,6 +393,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
- MAILER=/usr/bin/kde-open
- elif [ -x /usr/bin/xdg-open ] ; then
- MAILER=/usr/bin/xdg-open
-+ elif type -p xdg-open >/dev/null 2>&1 ; then
-+ MAILER="$(type -p xdg-open)"
- else
- echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`"
- exit 2
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index c992724b815ec33956049557b36cc6ed0b2ae1f1..3c4434f0098c7be593f33a8544f2447a50ba798e 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -42,14 +42,14 @@ let
then "i386"
else "amd64";
- shortVersion = "1.19.1-stable";
+ shortVersion = "1.19.5-stable";
version = "${shortVersion}_${arch}";
url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
sha256 = if stdenv.hostPlatform.system == arch32
- then "0fcyl5i8xdgb5j0x1643qc0j74d8p11jczvqmgqkqh0wgid1y1ad"
- else "1dzwa2cnn9xakrhhq159fhh71gw5wlbf017rrikdlia694m8akq6";
+ then "01x83a44qlxi937b128y8y0px0q4w37g72z652lc42kv50dhyy3f"
+ else "1cagqq0xziznaj97z30bqfhrwjv3a4h83ckhwigq35nhk1ggq1ry";
deps = [
qtbase
@@ -103,7 +103,7 @@ stdenv.mkDerivation {
propagatedUserEnvPkgs = [ gconf ];
- unpackPhase = "true";
+ dontUnpack = true;
installPhase = ''
dpkg-deb -x $src $out
@@ -131,7 +131,7 @@ stdenv.mkDerivation {
dontStrip = true;
dontPatchElf = true;
- updateScript = import ./update.nix { inherit stdenv writeScript runtimeShell; };
+ updateScript = import ./update.nix { inherit writeScript runtimeShell; };
meta = with stdenv.lib; {
homepage = https://www.mendeley.com;
diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix
index c174e7dc668d4e6b425e6046c488c27dd18fdd02..56becea9959ad3aeb07d927d855b9fb083b6cb55 100644
--- a/pkgs/applications/office/mendeley/update.nix
+++ b/pkgs/applications/office/mendeley/update.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeScript, runtimeShell }:
+{ writeScript, runtimeShell }:
writeScript "update-mendeley" ''
#!${runtimeShell}
diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix
index b27b77e6e6d7d0d7993eeb81cb5dad08ef56b67a..f8729583ddce81c5b0c9810f25a865cef7523332 100644
--- a/pkgs/applications/office/notes-up/default.nix
+++ b/pkgs/applications/office/notes-up/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "notes-up";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "Philip-Scott";
repo = "Notes-up";
rev = version;
- sha256 = "14vnnr18v374daz8ag5gc2sqr3jxbwrj11mmfz8l57xi2mwhn53z";
+ sha256 = "0bklgp8qrrj9y5m77xqbpy1ld2d9ya3rlxklgzx3alffq5312i4s";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f1dd10e9420f083340910785ee762e0c7b4765fd
--- /dev/null
+++ b/pkgs/applications/office/paperless/default.nix
@@ -0,0 +1,168 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, makeWrapper
+, callPackage
+
+, python3
+, imagemagick7
+, ghostscript
+, optipng
+, tesseract
+, unpaper
+}:
+
+## Usage
+
+# ${paperless}/bin/paperless wraps manage.py
+
+# ${paperless}/share/paperless/setup-env.sh can be sourced from a
+# shell script to setup a Paperless environment
+
+# paperless.withConfig is a convenience function to setup a
+# configured Paperless instance. (See ./withConfig.nix)
+
+# For WSGI with gunicorn, use a shell script like this:
+# let
+# pythonEnv = paperless.python.withPackages (ps: paperless.runtimePackages ++ [ ps.gunicorn ]);
+# in
+# writers.writeBash "run-gunicorn" ''
+# source ${paperless}/share/paperless/setup-env.sh
+# PYTHONPATH=$paperlessSrc ${pythonEnv}/bin/gunicorn paperless.wsgi
+# ''
+
+let
+ paperless = stdenv.mkDerivation rec {
+ name = "paperless-${version}";
+ version = "2.7.0";
+
+ src = fetchFromGitHub {
+ owner = "the-paperless-project";
+ repo = "paperless";
+ rev = version;
+ sha256 = "0pkmyky1crjnsg7r0gfk0fadisfsgzlsq6afpz16wx4hp6yvkkf7";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ doCheck = true;
+ dontInstall = true;
+
+ pythonEnv = python.withPackages (_: runtimePackages);
+ pythonCheckEnv = python.withPackages (_: (runtimePackages ++ checkPackages));
+
+ unpackPhase = ''
+ srcDir=$out/share/paperless
+ mkdir -p $srcDir
+ cp -r --no-preserve=mode $src/src/* $src/LICENSE $srcDir
+ '';
+
+ buildPhase = let
+ # Paperless has explicit runtime checks that expect these binaries to be in PATH
+ extraBin = lib.makeBinPath [ imagemagick7 ghostscript optipng tesseract unpaper ];
+ in ''
+ ${python.interpreter} -m compileall $srcDir
+
+ makeWrapper $pythonEnv/bin/python $out/bin/paperless \
+ --set PATH ${extraBin} --add-flags $out/share/paperless/manage.py
+
+ # A shell snippet that can be sourced to setup a paperless env
+ cat > $out/share/paperless/setup-env.sh < {}).paperless.withConfig {
+# dataDir = /tmp/paperless-data;
+# config = {
+# PAPERLESS_DISABLE_LOGIN = "true";
+# };
+# }'
+#
+# Setup DB
+# ./paperless migrate
+#
+# Consume documents in ${dataDir}/consume
+# ./paperless document_consumer --oneshot
+#
+# Start web interface
+# ./paperless runserver --noreload localhost:8000
+
+{ config ? {}, dataDir ? null, ocrLanguages ? null
+, paperlessPkg ? paperless, extraCmds ? "" }:
+with lib;
+let
+ paperless = if ocrLanguages == null then
+ paperlessPkg
+ else
+ (paperlessPkg.override {
+ tesseract = paperlessPkg.tesseract.override {
+ enableLanguages = ocrLanguages;
+ };
+ }).overrideDerivation (_: {
+ # `ocrLanguages` might be missing some languages required by the tests.
+ doCheck = false;
+ });
+
+ envVars = (optionalAttrs (dataDir != null) {
+ PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume";
+ PAPERLESS_MEDIADIR = "${dataDir}/media";
+ PAPERLESS_STATICDIR = "${dataDir}/static";
+ PAPERLESS_DBDIR = "${dataDir}";
+ }) // config;
+
+ envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars;
+ setupEnvVars = builtins.concatStringsSep "\n" envVarDefs;
+
+ setupEnv = ''
+ source ${paperless}/share/paperless/setup-env.sh
+ ${setupEnvVars}
+ ${optionalString (dataDir != null) ''
+ mkdir -p "$PAPERLESS_CONSUMPTION_DIR" \
+ "$PAPERLESS_MEDIADIR" \
+ "$PAPERLESS_STATICDIR" \
+ "$PAPERLESS_DBDIR"
+ ''}
+ '';
+
+ runPaperless = writers.writeBash "paperless" ''
+ set -e
+ ${setupEnv}
+ ${extraCmds}
+ exec python $paperlessSrc/manage.py "$@"
+ '';
+in
+ runPaperless // {
+ inherit paperless setupEnv;
+ }
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index 401d3be3128b2d1623e909f32f5866a49286e26b..adbd4c30a393cfdbb8b0fe7751cd3d3e0735c111 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, fetchFromGitLab, gtk3, cairo
+{ lib, python3Packages, gtk3, cairo
, aspellDicts, buildEnv
, gnome3, hicolor-icon-theme, librsvg
, xvfb_run, dbus, libnotify
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index 859cab7235ae2463ea69c729ec830b1f13d57ad0..69fb5462ded39c0e28830a28af08acf1f6257c2c 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qttranslations, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets }:
+{ stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets }:
stdenv.mkDerivation rec {
pname = "qownnotes";
- version = "19.4.5";
+ version = "19.6.1";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
- sha256 = "13yafcdqkl46awq2mxr1c5skydi44iwgcmfkx3wrhq85ird25cpy";
+ sha256 = "0m56klcs1bq5xhbn2kmlzv8nalscxw6wimrmqjmharif97cyddc6";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index eee6c7de4e5f6301bf5e075422e5326975e3cc30..ecd38627ac5fff5b697a417d9b238c1aff89fcc4 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -7,11 +7,11 @@
mkDerivation rec {
name = "skrooge-${version}";
- version = "2.19.1";
+ version = "2.20.0";
src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
- sha256 = "04pajy540vwff1y84ndrnscvlggiwfkr6w65g4hpa75cg7m169ya";
+ sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix
index c0ee9bc81b76be3ff40496e8a9294af9cb0d0d0c..a99ac7e44b7880fc9a40d8e4a24e3e7021fa7f28 100644
--- a/pkgs/applications/office/spice-up/default.nix
+++ b/pkgs/applications/office/spice-up/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "spice-up";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "Philip-Scott";
repo = "Spice-up";
rev = version;
- sha256 = "0vgs2z6yr0d5vwb04wd2s22144pdrjhqik9xs69q4dxjxa84iw0h";
+ sha256 = "1pix911l4ddn50026a5sbpqfzba6fmw40m1yzbknmkgd2ny28f0m";
};
USER = "pbuilder";
diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bbf252d28923bf4b2800f0ca053b3fd232abfed2
--- /dev/null
+++ b/pkgs/applications/office/timetable/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, fetchFromGitHub
+, glib
+, gtk3
+, hicolor-icon-theme
+, json-glib
+, libgee
+, meson
+, ninja
+, pkgconfig
+, pantheon
+, python3
+, wrapGAppsHook
+}:
+
+
+stdenv.mkDerivation rec {
+ pname = "timetable";
+ version = "1.0.6";
+
+ src = fetchFromGitHub {
+ owner = "lainsce";
+ repo = pname;
+ rev = version;
+ sha256 = "080xgp917v6j40qxy0y1iycz01yylbcr8pahx6zd6mpi022ccfv0";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ pantheon.vala
+ python3
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gtk3
+ hicolor-icon-theme
+ json-glib
+ libgee
+ pantheon.granite
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Plot out your own timetable for the week and organize it";
+ homepage = "https://github.com/lainsce/timetable";
+ maintainers = [ maintainers.kjuvi ] ++ pantheon.maintainers;
+ license = licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock
index f71f4eaa4085961ccdfc02db84602abffad8b8ae..9f2ea82cee0520d5efdb3bb1230629d7cf25e934 100644
--- a/pkgs/applications/office/timetrap/Gemfile.lock
+++ b/pkgs/applications/office/timetrap/Gemfile.lock
@@ -16,4 +16,4 @@ DEPENDENCIES
timetrap
BUNDLED WITH
- 1.10.6
+ 1.17.2
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix
index 20dd27fa28737c60307ca6477fe86aba31758265..efeb23b3e83d80e135962e610bec8a734b5ec8aa 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/pkgs/applications/office/timetrap/default.nix
@@ -1,17 +1,15 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerApp }:
-bundlerEnv rec {
- name = "timetrap-${version}";
-
- version = (import gemset).timetrap.version;
- inherit ruby;
+bundlerApp {
+ pname = "timetrap";
gemdir = ./.;
- gemset = ./gemset.nix;
+ exes = [ "t" "timetrap" ];
meta = with lib; {
description = "A simple command line time tracker written in ruby";
- homepage = https://github.com/samg/timetrap;
- license = licenses.mit;
- maintainers = [ maintainers.jerith666 ];
+ homepage = https://github.com/samg/timetrap;
+ license = licenses.mit;
+ maintainers = with maintainers; [ jerith666 manveru ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix
index 5764016573fcc51394d59e03efd7b74a910c10bc..1ea489b92c3fac5e1572483ca2f5745f8e9ccdf8 100644
--- a/pkgs/applications/office/timetrap/gemset.nix
+++ b/pkgs/applications/office/timetrap/gemset.nix
@@ -1,5 +1,7 @@
{
chronic = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
@@ -8,6 +10,8 @@
version = "0.10.2";
};
sequel = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0";
@@ -16,6 +20,8 @@
version = "4.43.0";
};
sqlite3 = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
@@ -25,6 +31,8 @@
};
timetrap = {
dependencies = ["chronic" "sequel" "sqlite3"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd";
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index 3f4953fc12a7733ff41738fec640208411ea7325..a69fb7a1c6c73ec4b984c99ef62c9b0cc0920fd7 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, glibcLocales, fetchpatch }:
+{ stdenv, python3, glibcLocales }:
let
inherit (python3.pkgs) buildPythonApplication fetchPypi;
diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index d0a4953c426bf178482b97419f89eca43aa433c0..951b61e43ef4b84be437fd43b38dc89b8c01123b 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "treesheets-${version}";
- version = "2018-08-18";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
- rev = "3af41d99c8f9f32603a36ab64af3560b6d61dd73";
- sha256 = "147y8ggh3clwjgsi15z8i4jnzlkh8p17mmlg532jym53zzbcva65";
+ rev = "v${version}";
+ sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4";
};
buildInputs = [ wxGTK makeWrapper ];
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index ba69b7894d68d75480d3e8145cf3abb2be4a1f82..c1e2fdcc7dfa888b353c155d56f273574ac7345a 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -13,11 +13,11 @@ let
in stdenv.mkDerivation rec {
name = "trilium-${version}";
- version = "0.30.8";
+ version = "0.33.6";
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- sha256 = "1mw8m9qm5jqfbwzj721gyfa656bp3hs8mrqx5d354rbx5f12pgjr";
+ sha256 = "1sg6iqhpgyr8zr6w6dgs0ha0indb9vyp8vh2clj2fds5ahhlvf91";
};
# Fetch from source repo, no longer included in release.
diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b02bf5058740829716bf83b1ffb966a06e0c5cd5
--- /dev/null
+++ b/pkgs/applications/office/vnote/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, qmake, qtbase, qtwebengine, hicolor-icon-theme, makeDesktopItem }:
+
+let
+ description = "A note-taking application that knows programmers and Markdown better";
+in stdenv.mkDerivation rec {
+ version = "2.6";
+ pname = "vnote";
+
+ src = fetchFromGitHub {
+ owner = "tamlok";
+ repo = "vnote";
+ fetchSubmodules = true;
+ rev = "v${version}";
+ sha256 = "10lnzzwz7fjj55kbn3j6gdl9yi6a85mdjis586p3zcc4830mlv91";
+ };
+
+ nativeBuildInputs = [ qmake ];
+ buildInputs = [ qtbase qtwebengine hicolor-icon-theme ];
+
+ meta = with stdenv.lib; {
+ inherit description;
+ homepage = "https://tamlok.github.io/vnote";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.kuznero ];
+ };
+}
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index e0f0c58b45063ef707ff00c9489bbc595d015227..16df0b294c163fb0c364f966d9e99cbf128edfb5 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -3,27 +3,19 @@
with pythonPackages;
buildPythonApplication rec {
- pname = "td-watson";
- version = "1.5.2";
+ pname = "watson";
+ version = "1.7.0";
src = fetchPypi {
- inherit version pname;
- sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8";
+ inherit version;
+ pname = "td-watson";
+ sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d";
};
- # uses tox, test invocation fails
- doCheck = true;
checkPhase = ''
- py.test -vs tests
+ pytest -vs tests
'';
- patches = [
- (fetchpatch {
- url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch;
- sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g";
- })
- ];
-
checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
propagatedBuildInputs = [ requests click arrow ];
@@ -31,6 +23,6 @@ buildPythonApplication rec {
homepage = https://tailordev.github.io/Watson/;
description = "A wonderful CLI to track your time!";
license = licenses.mit;
- maintainers = with maintainers; [ mguentner ] ;
+ maintainers = with maintainers; [ mguentner nathyong ] ;
};
}
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index c31284c2747fd949fdab771b28d2ab07a7fcb0cb..a41064666d5887903e5e39982671ddf2d500f1c6 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,11 +9,11 @@
python3Packages.buildPythonApplication rec {
name = "zim-${version}";
- version = "0.71.0";
+ version = "0.71.1";
src = fetchurl {
url = "http://zim-wiki.org/downloads/${name}.tar.gz";
- sha256 = "0mr3911ls5zp3z776ysrdm3sg89zg29r3ip23msydcdbl8wymw30";
+ sha256 = "0d7whwpbklkhamlvysa0yyix1hchkpdynimf3gp1xbibg8mqzbxc";
};
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ];
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 025b772d73b6cd87d2aa16e4030f9462006401b4..3540fce9173a1a5f98e4491bdb056dcc9eea5247 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -29,18 +29,16 @@
, nspr
, nss
, pango
-, coreutils
-, gnused
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
name = "zotero-${version}";
- version = "5.0.66";
+ version = "5.0.67";
src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
- sha256 = "1dpcwpag95a4r46z03a3gqklis0q7nzqgjg34qfxxxb2lr7s1lsm";
+ sha256 = "1b06875qr8dy2lhf4h9z7gcc5pcqdyq92c11b3brsbgbq2n48g40";
};
buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix
index 72adb38c62eb3697f7e4623f6c3b20eb510e24e0..1c6d0478f76c80dbf75bf5df30901bdde1d97f11 100644
--- a/pkgs/applications/radio/chirp/default.nix
+++ b/pkgs/applications/radio/chirp/default.nix
@@ -3,16 +3,16 @@
stdenv.mkDerivation rec {
pname = "chirp-daily";
- version = "20190304";
+ version = "20190511";
src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
- sha256 = "1m18f7j0bdimp0fvs5ms02amd5pzis581hqn38y8qffny4y9f6ij";
+ sha256 = "1k5smkzkvbr4d8gbl1yczf2i5xrdkgk6i8pmwnlfghzcgy8n4jzj";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
- pyserial pygtk libxml2Python libxslt pyserial
+ pyserial pygtk libxml2Python libxslt
];
installPhase = ''
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index 8472e7f5c53a8f4fca5653863b821f4cda979353..fd8c542fb42e861556cadf7d2c20860041fd2f0b 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -2,12 +2,12 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
- version = "4.1.03";
+ version = "4.1.04";
pname = "fldigi";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "1d3m4xj237z89y691kmzh8ghwcznwjnp7av9ndzlkl1as1641n9p";
+ sha256 = "0idv6yr5l5z1icziv1shpjqxhjlxmb6qkpwlmcxws15gkqs9rhc9";
};
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix
index 23f1153296693cf306679a6bfe90c667e55f8ff6..2b4a679accab3042ae7ed3f6ad1aa89bd283f9b6 100644
--- a/pkgs/applications/radio/flrig/default.nix
+++ b/pkgs/applications/radio/flrig/default.nix
@@ -6,12 +6,12 @@
}:
stdenv.mkDerivation rec {
- version = "1.3.43";
+ version = "1.3.45";
pname = "flrig";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
- sha256 = "1ir47svjbz7dhgzxvb3xqnkcsnjqb935vhqfddx7yhaawiqrzhk1";
+ sha256 = "14rnyqwlk35j2027l7hxfig6v7j7302w4vsvx0l33b782i8phs2v";
};
buildInputs = [
diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix
index dfb8415219c7123b43c28ff3f0a53676fdd091f8..7c6db61b52918c7353a28b62a95fde4a23a36366 100644
--- a/pkgs/applications/radio/gnuradio/ais.nix
+++ b/pkgs/applications/radio/gnuradio/ais.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio
-, makeWrapper, cppunit, gnuradio-osmosdr
+, makeWrapper, cppunit, gr-osmosdr
, pythonSupport ? true, python, swig
}:
assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
- name = "gnuradio-ais-${version}";
+ name = "gr-ais-${version}";
version = "2015-12-20";
src = fetchFromGitHub {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr
+ cmake boost gnuradio makeWrapper cppunit gr-osmosdr
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix
index dcb50df705204fd376b6e63825bb3bb904673250..119b7f7600f9a2e699c1bf5dde22c3754a2073fa 100644
--- a/pkgs/applications/radio/gnuradio/gsm.nix
+++ b/pkgs/applications/radio/gnuradio/gsm.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio
-, makeWrapper, cppunit, libosmocore, gnuradio-osmosdr
+, makeWrapper, cppunit, libosmocore, gr-osmosdr
, pythonSupport ? true, python, swig
}:
assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
- name = "gnuradio-gsm-${version}";
+ name = "gr-gsm-${version}";
version = "2016-08-25";
src = fetchFromGitHub {
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr
+ cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
for prog in "$out"/bin/*; do
- wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gnuradio-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out")
+ wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gr-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out")
done
'';
diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix
index 839cac32dd6d08e39e3a903754f2d67f4e618cca..af3cabac9ef72e61d28e2b27f37f6ceae635f0ca 100644
--- a/pkgs/applications/radio/gnuradio/limesdr.nix
+++ b/pkgs/applications/radio/gnuradio/limesdr.nix
@@ -8,7 +8,7 @@ let
version = "2.0.0";
in stdenv.mkDerivation rec {
- name = "gnuradio-limesdr-${version}";
+ name = "gr-limesdr-${version}";
src = fetchFromGitHub {
owner = "myriadrf";
diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix
index 2f4b0e4e3eb691e6e99e90e42a0408c66427fdd0..c3c8721be25826bdebc0183a3d686ecad897ee39 100644
--- a/pkgs/applications/radio/gnuradio/nacl.nix
+++ b/pkgs/applications/radio/gnuradio/nacl.nix
@@ -6,7 +6,7 @@
assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
- name = "gnuradio-nacl-${version}";
+ name = "gr-nacl-${version}";
version = "2017-04-10";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix
index 846afe0e95d4bbebc6aa2714c63e65215f450ce3..df2a88033c46f24bd9efde8682a1925fcad445d2 100644
--- a/pkgs/applications/radio/gnuradio/osmosdr.nix
+++ b/pkgs/applications/radio/gnuradio/osmosdr.nix
@@ -13,7 +13,7 @@
assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
- name = "gnuradio-osmosdr-${version}";
+ name = "gr-osmosdr-${version}";
version = "2018-08-15";
src = fetchgit {
diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix
index 2e5443227fdaef6ed61aa66fa5f4995f813758ba..b56e0d226871908f27f31dbd46e3c0a5298942f0 100644
--- a/pkgs/applications/radio/gnuradio/rds.nix
+++ b/pkgs/applications/radio/gnuradio/rds.nix
@@ -5,7 +5,7 @@
assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
- name = "gnuradio-rds-${version}";
+ name = "gr-rds-${version}";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index f7c7ca5472e063fdf1a32dbe1d260aea6ff711c5..1258dd32b9f509bc6894b0a26e992c6383d3a24c 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gnuradio-osmosdr
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr
# drivers (optional):
, rtl-sdr, hackrf
, pulseaudioSupport ? true, libpulseaudio
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
- qtbase qtsvg gnuradio boost gnuradio-osmosdr rtl-sdr hackrf
+ qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf
] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index ef9b28b36f82a1657fcc595e1f2af0c287aa3beb..3ff73c4ef2ab181caa56bd7a40e3b472fcced5e4 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -4,7 +4,7 @@
} :
let
- version = "19.01.0";
+ version = "19.04.0";
in stdenv.mkDerivation {
name = "limesuite-${version}";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
owner = "myriadrf";
repo = "LimeSuite";
rev = "v${version}";
- sha256 = "1r03kc1pvlhkvp19qbw7f5qzxx48z2v638f0xpawf6d1nwfky1n3";
+ sha256 = "1lrjrli0ny25qwg8bw1bvbdb18hf7ffqj4ziibkgzscv3w5v0s45";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix
index b58872975aeaff560d4a85b8d2ba34ab2d8b0e7e..13755b88c6580486af5079eb162a85d4bdd6a7a9 100644
--- a/pkgs/applications/radio/multimon-ng/default.nix
+++ b/pkgs/applications/radio/multimon-ng/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }:
let
- version = "1.1.7";
+ version = "1.1.8";
in
stdenv.mkDerivation {
name = "multimon-ng-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
owner = "EliasOenal";
repo = "multimon-ng";
rev = "${version}";
- sha256 = "11wfk8jw86z44y0ji4jr4s8ig3zwxp6g9h3sl81pvk6l3ipqqbgi";
+ sha256 = "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8";
};
buildInputs = [ qt4 libpulseaudio ];
diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index 63906d996ba688edbfbac0847dfc57130567661b..40a168675f67f6d7931abeccf0206a7d4cbea3f0 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, alsaLib, boost
, qt4, libpulseaudio, codec2, libconfig
-, gnuradio, gnuradio-osmosdr, gsm
+, gnuradio, gr-osmosdr, gsm
, libopus, libjpeg, protobuf, qwt, speex
} :
@@ -39,7 +39,7 @@ in stdenv.mkDerivation {
libconfig
gsm
gnuradio
- gnuradio-osmosdr
+ gr-osmosdr
libopus
libjpeg
protobuf
diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix
index aedc847ee69f5c6d498cf6480cd98aa42e9cce28..a4d5b2cad1e9e750a5083e2636b31bbd1195f36e 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/pkgs/applications/radio/rtl-sdr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchpatch, fetchgit, cmake, pkgconfig, libusb1 }:
+{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }:
stdenv.mkDerivation rec {
name = "rtl-sdr-${version}";
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 5d012437e6ee0712d5b3121180e2d20d3a95fc9a..88dc64471ec728e189942b929bb5c5cfe8e8f69c 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, libusb1, rtl-sdr, soapysdr-with-plugins
+}:
+
stdenv.mkDerivation rec {
version = "18.12";
@@ -13,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ libusb1 rtl-sdr ];
+ buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ];
meta = with stdenv.lib; {
description = "Decode traffic from devices that broadcast on 433.9 MHz";
diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix
index f7c0f27160d284dd8c304574b049c38adcc42911..6ed88e0431e37eb5fee0dc65c74cfe65173e6793 100644
--- a/pkgs/applications/radio/soapyuhd/default.nix
+++ b/pkgs/applications/radio/soapyuhd/default.nix
@@ -3,7 +3,7 @@
} :
let
- version = "0.3.5";
+ version = "0.3.6";
in stdenv.mkDerivation {
name = "soapyuhd-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
owner = "pothosware";
repo = "SoapyUHD";
rev = "soapy-uhd-${version}";
- sha256 = "07cr4zk42d0l5g03wm7dzl5lmqr104hmzp1fdjqa1z7xq4v9c9b1";
+ sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix
index 484e8787d50ace3f55905f127f036e4a81363c87..fd0bd8d5d75f8cfbd728ed407abe67ac61ef7f68 100644
--- a/pkgs/applications/radio/uhd/default.nix
+++ b/pkgs/applications/radio/uhd/default.nix
@@ -12,12 +12,12 @@ let
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf... style keeps changing
- version = "3.13.0.1";
+ version = "3.14.0.0";
# Firmware images are downloaded (pre-built) from the respective release on Github
uhdImagesSrc = fetchurl {
url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz";
- sha256 = "0y9i93z188ch0hdlkvv0k9m0k7vns7rbxaqsnk35xnlqlxxgqdvj";
+ sha256 = "1fp37wgqkbr14cxg9l7ghfd4r92y2bxwgb7cfjzs96hbpd9s6al0";
};
in stdenv.mkDerivation {
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
owner = "EttusResearch";
repo = "uhd";
rev = "${uhdVer}";
- sha256 = "0si49qk96zhpanmcrzlr3igc5s1y30x4p0z973q60dx9fhqsbb6k";
+ sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index ced3bccd7b672be38209fc1bfeaf4a4e86bc4a15..58a0b8048b567af371c5b0386c5b55a078c5d215 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -2,14 +2,14 @@
, hackrf, rtl-sdr, airspy, limesuite }:
python3Packages.buildPythonApplication rec {
- name = "urh-${version}";
- version = "2.5.7";
+ pname = "urh";
+ version = "2.7.2";
src = fetchFromGitHub {
owner = "jopohl";
- repo = "urh";
+ repo = pname;
rev = "v${version}";
- sha256 = "110fwlj2fw8jgrsgqfkha7lx8f06w0ymh51mgpckx8a0wycznhcy";
+ sha256 = "14027dcq0ag2qjpxcmsb9n1c64ypmi4rycwxzm2hajj7hk2736hv";
};
buildInputs = [ hackrf rtl-sdr airspy limesuite ];
@@ -20,9 +20,9 @@ python3Packages.buildPythonApplication rec {
doCheck = false;
meta = with stdenv.lib; {
- inherit (src.meta) homepage;
+ homepage = "https://github.com/jopohl/urh";
description = "Universal Radio Hacker: investigate wireless protocols like a boss";
- license = licenses.asl20;
+ license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz ];
};
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 3fe48ab26a276c34e2ab6ec10dd0d4a91f255a12..9f65c63f7a6fa837bbf1b845c55d170575d5c3ea 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,8 +7,8 @@ let
in
stdenv.mkDerivation rec {
- srcVersion = "apr19a";
- version = "20190401_a";
+ srcVersion = "jul19a";
+ version = "20190701_a";
name = "gildas-${version}";
src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
- sha256 = "0yb8dv41qsr5w2yci62phk6mrxbjlfxl4nnj7zndlyym2i5ni89c";
+ sha256 = "97eaa0d0a0f53f0616462642a9bfaddb0305a8a0948e60531d8a524a13a370b6";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix
index ee3a71cf18138dc692e544a9fc596fe602aca80f..dc7c7c920a176c6aafd9dc0e0a37186fce006961 100644
--- a/pkgs/applications/science/astronomy/openspace/default.nix
+++ b/pkgs/applications/science/astronomy/openspace/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "0.11.1";
name = "openspace-${version}";
-
+
src = fetchFromGitHub {
owner = "OpenSpace";
repo = "OpenSpace";
@@ -13,37 +13,37 @@ stdenv.mkDerivation rec {
sha256 = "0msqixf30r0d41xmfmzkdfw6w9jkx2ph5clq8xiwrg1jc3z9q7nv";
fetchSubmodules = true;
};
-
+
buildInputs = [
makeWrapper cmake
curl boost gdal glew soil
libX11 libXi libXxf86vm libXcursor libXrandr libXinerama
];
-
+
glmPlatformH = fetchurl {
url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h";
sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw";
};
-
+
# See
prePatch = ''
cp ${glmPlatformH} ext/sgct/include/glm/simd/platform.h
cp ${glmPlatformH} ext/ghoul/ext/glm/glm/simd/platform.h
'';
-
+
patches = [
# See
./vrpn.patch
-
+
./constexpr.patch
./config.patch
# WARNING: This patch disables some slow torrents in a very dirty way.
- ./assets.patch
+ ./assets.patch
];
-
+
bundle = "$out/usr/share/openspace";
-
+
preConfigure = ''
cmakeFlagsArray=(
$cmakeFlagsArray
@@ -51,28 +51,28 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_PREFIX=${bundle}"
)
'';
-
+
preInstall = ''
mkdir -p $out/bin
mkdir -p ${bundle}
'';
-
+
postInstall = ''
cp ext/spice/libSpice.so ${bundle}/lib
cp ext/ghoul/ext/lua/libLua.so ${bundle}/lib
'';
-
+
postFixup = ''
for bin in ${bundle}/bin/*
do
rpath=$(patchelf --print-rpath $bin)
patchelf --set-rpath $rpath:${bundle}/lib $bin
-
+
name=$(basename $bin)
makeWrapper $bin $out/bin/$name --run "cd ${bundle}"
done
'';
-
+
meta = {
description = "Open-source astrovisualization project";
longDescription = ''
@@ -85,5 +85,6 @@ stdenv.mkDerivation rec {
homepage = https://www.openspaceproject.com/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
+ broken = true; # fails to build
};
}
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index fb7963416167d1e031662f1eb4a4fe321c178dde..2480b80316eb45a32cde58d025c4e4c1e0462bbf 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
name = "stellarium-${version}";
- version = "0.19.0";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
- sha256 = "1x9s9v9ann93nyqd8n8adwhx66xgq5vp0liyzl1h1ji6qk8jla3c";
+ sha256 = "0hf1wv2bb5j7ny2xh29mj9m4hjblhn02zylay8gl85w7xlqs7s5r";
};
nativeBuildInputs = [ cmake perl ];
diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix
index 7abd83b6dc124f90dbb07857d95578a940b18a0e..5f02dc27a224b0bd0d2245d63e49d8a7832ddc27 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/pkgs/applications/science/astronomy/xplanet/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
./gcc6.patch
];
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
+
meta = {
description = "Renders an image of the earth or other planets into the X root window";
homepage = http://xplanet.sourceforge.net;
diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/pkgs/applications/science/biology/cd-hit/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1a41a28a19aae3114d9e0c0190fa870c42cc29da
--- /dev/null
+++ b/pkgs/applications/science/biology/cd-hit/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, makeWrapper, zlib, perl, perlPackages }:
+
+stdenv.mkDerivation rec {
+ version = "4.8.1";
+ pname = "cd-hit";
+
+ src = fetchFromGitHub {
+ owner = "weizhongli";
+ repo = "cdhit";
+ rev = "V${version}";
+ sha256 = "032nva6iiwmw59gjipm1mv0xlcckhxsf45mc2qbnv19lbis0q22i";
+ };
+
+ propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick perlPackages.Storable ];
+
+ nativeBuildInputs = [ zlib makeWrapper ];
+
+ makeFlags = [ "PREFIX=$(out)/bin" ];
+
+ preInstall = "mkdir -p $out/bin";
+
+ postFixup = ''
+ wrapProgram $out/bin/FET.pl --prefix PERL5LIB : $PERL5LIB
+ wrapProgram $out/bin/plot_2d.pl --prefix PERL5LIB : $PERL5LIB
+ wrapProgram $out/bin/clstr_list_sort.pl --prefix PERL5LIB : $PERL5LIB
+ '';
+ meta = with stdenv.lib; {
+ description = "Clustering and comparing protein or nucleotide sequences";
+ homepage = http://weizhongli-lab.org/cd-hit/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.bzizou ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3464e134ee85375e73fb35e998d7840f437b2afe
--- /dev/null
+++ b/pkgs/applications/science/biology/clustal-omega/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, argtable }:
+
+stdenv.mkDerivation rec {
+ version = "1.2.4";
+ name = "clustal-omega-${version}";
+
+ src = fetchurl {
+ url = "http://www.clustal.org/omega/${name}.tar.gz";
+ sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6";
+ };
+
+ buildInputs = [ argtable ];
+
+ preConfigure = ''
+ for f in configure \
+ src/clustal-omega-config.h \
+ src/clustal-omega-config.h \
+ src/config.h.in \
+ src/mymain.c
+ do
+ sed -i -re 's/argtable2/argtable3/g' $f
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "General purpose multiple sequence alignment program for protein and DNA/RNA";
+ homepage = http://www.clustal.org/omega/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.bzizou ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix
index ed661db23e0a1feab24374110ecf62fb1c7e9e8d..56de61da1c5ac8fe5b531ecd42515c7aeee6a8b8 100644
--- a/pkgs/applications/science/biology/cmtk/default.nix
+++ b/pkgs/applications/science/biology/cmtk/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [cmake];
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
+
meta = with stdenv.lib; {
description = "Computational Morphometry Toolkit ";
longDescription = ''A software toolkit for computational morphometry of
diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix
index 781ceb3df59e68a83570a031d9c78f38deaf121c..0e2b5d8b25fecc53af783e8210335e1aadf85a85 100644
--- a/pkgs/applications/science/biology/dcm2niix/default.nix
+++ b/pkgs/applications/science/biology/dcm2niix/default.nix
@@ -2,21 +2,22 @@
, fetchFromGitHub
, cmake
, libyamlcpp
+, git
}:
stdenv.mkDerivation rec {
- version = "1.0.20170130";
+ version = "1.0.20190410";
name = "dcm2niix-${version}";
src = fetchFromGitHub {
owner = "rordenlab";
repo = "dcm2niix";
rev = "v${version}";
- sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532";
+ sha256 = "1prwpvbi76xlpkhc4kadjhyyx0s71cs30hi6anknhfm6hdyd26ms";
};
enableParallelBuilding = true;
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake git ];
buildInputs = [ libyamlcpp ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix
index a15425ec2137bfdb66b9a61e25a4655bf68ab6a3..c9a9b55c31e6baf12e77d693b8e25c41cb05a1ec 100644
--- a/pkgs/applications/science/biology/eggnog-mapper/default.nix
+++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix
@@ -12,8 +12,8 @@ python27Packages.buildPythonApplication rec {
};
patches = (fetchpatch {
- url = https://github.com/eggnogdb/eggnog-mapper/pull/125/commits/b7828e4c8c1c453e391aef050f06ff3f84ff9faf.patch;
- sha256 = "0nz1a7ybm4j5c7vdm3annnxz9036iam2044hia341a0am9wydmzk";
+ url = "https://github.com/eggnogdb/eggnog-mapper/commit/6972f601ade85b65090efca747d2302acb58507f.patch";
+ sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf";
});
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix
index 9ccf54a81133d61a5687c5ba0a9edf5679389c96..9d41fed069112d49b1d0df4c1fb74aa71a1b570c 100644
--- a/pkgs/applications/science/biology/hisat2/default.nix
+++ b/pkgs/applications/science/biology/hisat2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, which, python}:
+{stdenv, fetchurl, unzip, which, python, perl}:
stdenv.mkDerivation rec {
name = "hisat2-${version}";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "10g73sdf6vqqfhhd92hliw7bbpkb8v4pp5012r5l21zws7p7d8l9";
};
- buildInputs = [ unzip which python ];
+ nativeBuildInputs = [ unzip which ];
+ buildInputs = [ python perl ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix
index 804e71c1bfa7db5efb507807e9f8227639980815..0c8c7313bf2a3a95b9ed69ddb6fff32d3f015f98 100644
--- a/pkgs/applications/science/biology/itsx/default.nix
+++ b/pkgs/applications/science/biology/itsx/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Improved software detection and extraction of ITS1 and ITS2 from ribosomal ITS sequences of fungi and other eukaryotes for use in environmental sequencing";
- homepage = http://microbiology.se/software/itsx/;
+ homepage = https://microbiology.se/software/itsx/;
license = licenses.gpl3;
maintainers = [ maintainers.bzizou ];
platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix
index f204d9bbca9618ab4b216a7aff605b3c3561d351..37abcf396211a702f13b3e6bd7ab3e680266666b 100644
--- a/pkgs/applications/science/biology/iv/default.nix
+++ b/pkgs/applications/science/biology/iv/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec
break
fi
done
+ '' + stdenv.lib.optionalString stdenv.isLinux ''
patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so
'';
meta = with stdenv.lib;
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
index 85c2b99b3a78d93f3de91051098e4a6fa5fcaaed..84c65feb09373171eac514de241306be3c6312bd 100644
--- a/pkgs/applications/science/biology/minimap2/default.nix
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "minimap2";
- version = "2.16";
+ version = "2.17";
src = fetchFromGitHub {
repo = pname;
owner = "lh3";
rev = "v${version}";
- sha256 = "1ggm5psv3gwsz627ik9kl6ry9gzgmfsvya6ni0gv6ahwlrhdim73";
+ sha256 = "0qdwlkib3aa6112372hdgvnvk86hsjjkhjar0p53pq4ajrr2cdlb";
};
buildInputs = [ zlib ];
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 3cd83a5cdd2723118e9fc612aa6e3eae8cd98394..1bdb31616e4dd5d364a95bbfffcda5e05b5e8dac 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -4,26 +4,26 @@ let
hts-nim = fetchFromGitHub {
owner = "brentp";
repo = "hts-nim";
- rev = "v0.2.5";
- sha256 = "1fma99rjqxgg9dihkd10hm1jjp5amsk5wsxnvq1lk4mcsjix5xqb";
+ rev = "v0.2.14";
+ sha256 = "0d1z4b6mrppmz3hgkxd4wcy79w68icvhi7q7n3m2k17n8f3xbdx3";
};
docopt = fetchFromGitHub {
owner = "docopt";
repo = "docopt.nim";
- rev = "v0.6.5";
- sha256 = "0yx79m4jkdcazwlky55nwf39zj5kdhymrrdrjq29mahiwx83x5zr";
+ rev = "v0.6.7";
+ sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37";
};
in stdenv.mkDerivation rec {
name = "mosdepth-${version}";
- version = "0.2.3";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "brentp";
repo = "mosdepth";
rev = "v${version}";
- sha256 = "1b9frrwhcvay3alhn0d02jccc2qlbij1732hzq9nhwnr4kvsvxx7";
+ sha256 = "0i9pl9lsli3y84ygxanrr525gfg8fs9h481944cbzsmqmbldwvgk";
};
buildInputs = [ nim ];
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 35710fd1fe1fc1970522f76da67d02c45ca34405..875e98499f5377330646c304af09d7aa6aa70a3d 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -33,6 +33,12 @@ stdenv.mkDerivation rec {
--replace 'float abs(float arg);' "" \
--replace 'short abs(short arg);' "" \
--replace 'long abs(long arg);' ""
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ # we are darwin, but we don't have all the quirks the source wants to compensate for
+ substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"'
+ for f in src/nrnpython/*.[ch] ; do
+ substituteInPlace $f --replace "" ""
+ done
'';
enableParallelBuilding = true;
@@ -74,7 +80,8 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
homepage = http://www.neuron.yale.edu/neuron;
maintainers = [ maintainers.adev ];
- platforms = platforms.all;
+ # source claims it's only tested for x86 and powerpc
+ platforms = platforms.x86_64 ++ platforms.i686;
};
}
diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix
index 9f24046b3bf6cfacfb112b1518bf24bc2cfac9db..9f1cb8db43d5260225282e13dd4ee9ee459008ca 100644
--- a/pkgs/applications/science/biology/niftyreg/default.nix
+++ b/pkgs/applications/science/biology/niftyreg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, zlib }:
+{ stdenv, fetchurl, cmake, zlib }:
stdenv.mkDerivation rec {
pname = "niftyreg";
diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix
index 671ee4b95c6501172dd84a910a1f29141b714134..e7221855503c27edc98fc02e1c07880af038435a 100644
--- a/pkgs/applications/science/biology/niftyseg/default.nix
+++ b/pkgs/applications/science/biology/niftyseg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, eigen, zlib }:
+{ stdenv, fetchurl, cmake, eigen, zlib }:
stdenv.mkDerivation rec {
pname = "niftyseg";
diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0a2074a06e970ede544999289ea72f0d015acb57
--- /dev/null
+++ b/pkgs/applications/science/biology/octopus/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}:
+
+stdenv.mkDerivation rec {
+ pname = "octopus";
+ version = "0.6.3-beta";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "luntergroup";
+ repo = "octopus";
+ rev = "v${version}";
+ sha256 = "042fycg8ppld7iajpzq2d8h8wr0nw43zbl57y125sfihryvr373n";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ boost gmp htslib zlib lzma ];
+
+ postInstall = ''
+ mkdir $out/bin
+ mv $out/octopus $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Bayesian haplotype-based mutation calling";
+ license = licenses.mit;
+ homepage = "https://github.com/luntergroup/octopus";
+ maintainers = with maintainers; [ jbedo ];
+ platforms = platforms.x86_64;
+ };
+}
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 91468eaf819b8cb6ab9fd6bb926d74e2eecde913..5fc222bb2993a859c6f241a6c1fc78de044cda36 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "picard-tools-${version}";
- version = "2.19.2";
+ version = "2.20.2";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "0dfap1whga03r0fh3adi684dyp9agfdi96hb2aqskgr9jp0z69rb";
+ sha256 = "0qpc6pi3fmzv8rs5cmk3dd4clrkzbrngsl384b5g0y7471lhavbi";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix
index 01b1c0ba81bfb7e9cabecc61f82897e728dcaa4e..d188ca02b1833ba0e1042bc4e9d7f133c2d3b90b 100644
--- a/pkgs/applications/science/biology/stacks/default.nix
+++ b/pkgs/applications/science/biology/stacks/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "stacks";
- version = "2.3e";
+ version = "2.4";
src = fetchurl {
url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz";
- sha256 = "046gmq8nzqy5v70ydqrhib2aiyrlja3cljvd37w4qbd4ryj3jr0w";
+ sha256 = "1ha1avkh6rqqvsy4k42336a2gj14y1jq19a2x8cjmiidi9l3s29h";
};
buildInputs = [ zlib ];
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
index 2f21da02fb00860630d17a3457b5e56c197214be..f32dca86bdf5d07ca18e2d094e51ae9cb53c9604 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -1,32 +1,37 @@
{ stdenv, fetchFromGitHub, zlib }:
stdenv.mkDerivation rec {
- name = "star-${version}";
- version = "2.7.0f";
+ pname = "star";
+ version = "2.7.1a";
src = fetchFromGitHub {
repo = "STAR";
owner = "alexdobin";
rev = version;
- sha256 = "0ndqlyimf7xf00nghn8awg12pw985ixghiypg98r2gdm7pscgd0i";
+ sha256 = "0n6g4s4hgw7qygs1z97j7a2dgz8gfaa4cv5pjvvvmarvk0x07hyg";
};
sourceRoot = "source/source";
-
- postPatch = "sed 's:/bin/rm:rm:g' -i Makefile";
-
+
+ postPatch = ''
+ substituteInPlace Makefile --replace "/bin/rm" "rm"
+ '';
+
buildInputs = [ zlib ];
-
- buildPhase = "make STAR STARlong";
+
+ buildFlags = [ "STAR" "STARlong" ];
+
+ enableParallelBuilding = true;
installPhase = ''
- mkdir -p $out/bin
- cp STAR STARlong $out/bin
+ runHook preInstall
+ install -D STAR STARlong -t $out/bin
+ runHook postInstall
'';
-
+
meta = with stdenv.lib; {
description = "Spliced Transcripts Alignment to a Reference";
- homepage = https://github.com/alexdobin/STAR;
+ homepage = "https://github.com/alexdobin/STAR";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.arcadio ];
diff --git a/pkgs/applications/science/biology/sumatools/default.nix b/pkgs/applications/science/biology/sumatools/default.nix
index 6f7227d7a3e983f2ef9dbd527c49024d66bec10c..f9042f300113dbe93b82958d97e4c574fbed8143 100644
--- a/pkgs/applications/science/biology/sumatools/default.nix
+++ b/pkgs/applications/science/biology/sumatools/default.nix
@@ -23,6 +23,7 @@ in rec {
sha256 = "0hwkrxzfz7m5wdjvmrhkjg8kis378iaqr5n4nhdhkwwhn8x1jn5a";
};
makeFlags = "PREFIX=$(out)";
+ inherit meta;
};
# Sumatra
@@ -42,6 +43,7 @@ in rec {
"LIBSUMAPATH=-L${sumalibs}"
"PREFIX=$(out)"
];
+ inherit meta;
};
# Sumaclust
@@ -61,5 +63,6 @@ in rec {
"LIBSUMAPATH=-L${sumalibs}"
"PREFIX=$(out)"
];
+ inherit meta;
};
}
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index a15ac2a466c63581f493b52be8ad8827c41da80e..84c01cbfd673630cabf1ceed0af49f2289abdbc0 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
- version = "14.29.40";
+ version = "14.29.46";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- sha256 = "17skd67i6l7k96g2ddq0s0xkji8wmfr2z31j345ws9kdr0faw01x";
+ sha256 = "00ig1f1fz5qbkam0h06vs1gsb95hdqa0iyhsp4qbyjjfxir7m59l";
};
patchPhase = ''
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index 35d21848e2b3f435db747a400b69ef3709450414..274afd5fc3d82f603d84f89d1bc014796e01ac5d 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, which, gfortran, libGLU, xorg } :
stdenv.mkDerivation rec {
- version = "5.9.5";
+ version = "6.1";
name = "molden-${version}";
src = fetchurl {
url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
- sha256 = "0va5g03kvnzydx0b77y1p536iy7swzvnx6yknp87qgpw1bgrzdj9";
+ sha256 = "0swbjnqlkwhy8lvjkbx8yklqj4zfphwdg6s3haawxi3dd65ij539";
};
nativeBuildInputs = [ which ];
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index 5fc71c9fc6baf1c67f1d59d0d40599db6f6972ef..4b580a6cf52e5aad59936917ce8f237f12ccd4b1 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "8.4";
+ version = "9.0";
fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
- sha256 = "1fx5ssnf65b9ld7xs9rvvg8i80pblxpyhqkir0a7xshkk1g60z55";
+ sha256 = "0p1gjykjnzm4m93mgjsmnxd0n2j381jk5kn3a7gkzxanixp60ilm";
};
nativeBuildInputs = [ perl procps fftw.dev ];
diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index 70e79023c0ffc640a99e1ca24d7368281b0ba4f0..bc6301e1fd421eac56c477f9d25b67bca2aca6ef 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchFromGitLab, cmake, gfortran, perl
+{ stdenv, fetchFromGitLab, cmake, gfortran, perl
, openblas, hdf5-cpp, python3, texlive
, armadillo, openmpi, globalarrays, openssh
, makeWrapper
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 777b3499bedc3fcaaad3c8925b95884c9e0a9000..5e1c77e24751d449ec83f9ca8ae5b9a717e90df0 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- version = "6.4";
+ version = "6.4.1";
name = "quantum-espresso-${version}";
src = fetchurl {
url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
- sha256 = "1zjblzf0xzwmhmpjm56xvv8wsv5jmp5a204irzyicmd77p86c4vq";
+ sha256 = "027skhp2zzx0f4mh6azqjljdimchak5cdn13v4x7aj5q2zvfkmxh";
};
passthru = {
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
index be32f33a3653f84af20267a02c92b142e168ce99..ecbbeff108d200c1b585f24062276652a883a013 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, autoreconfHook,
-glib, libzip, boost, fftw, qtbase,
+{ stdenv, fetchFromGitHub, pkgconfig, cmake,
+libzip, boost, fftw, qtbase,
libusb, makeWrapper, libsigrok4dsl, libsigrokdecode4dsl
}:
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index 286dbc07f3dab85647c76ab6c5bab35cbf579058..90b7db4b545cbb9f6b573a81e3cae7fbb3cf1968 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeDesktopItem, patchelf
+{ stdenv, fetchurl, makeDesktopItem
, libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb
-, cups , libGL, glib, nss, nspr, expat, alsaLib
+ , libGL, glib, nss, nspr, expat, alsaLib
, qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine
}:
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
name = "eagle-${version}";
- version = "9.3.2";
+ version = "9.4.1";
src = fetchurl {
url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
- sha256 = "0xrrd2d86gxrkbqvssbg8zki40hk05h48w73b0hv7wnc7wg1msir";
+ sha256 = "0p3kxryvk853rx24phcadvmqn6f37rnnql8sf6cqn9cqhrrkbvlq";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index e4c743ccdef59e4138bd45cfbcbee254b33053bd..4830e2a032a990c0fd7e899c4cbc6997da9ea232 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gtkwave-${version}";
- version = "3.3.100";
+ version = "3.3.101";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
- sha256 = "1z60i5nh8dz8j9ii63fwaw7k0p3x0scp91478cxmdv4xhp4njlxa";
+ sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix
index 4e86d1d917f884b3a1c20473074dfbbdaa9b52b7..c91443bf64a523c859e4b93e4ae2031af6ac25bd 100644
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/pkgs/applications/science/electronics/pulseview/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "pulseview-0.4.0";
+ name = "pulseview-0.4.1";
src = fetchurl {
url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz";
- sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q";
+ sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index e3c51906435e89f1441a4ff73703ceb6c0746efe..b531563c5c1cb6e7c16c1228d333b777797a6ed8 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "verilator-${version}";
- version = "4.012";
+ version = "4.016";
src = fetchurl {
url = "https://www.veripool.org/ftp/${name}.tgz";
- sha256 = "0xzndazp1g5qxzfirgiv219zmx7qyxfn7wsqbfq93cp1m6rp4pai";
+ sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix
index e27173651913ee6b386a91a56f81ce10743c480f..4cef49788c0444e8299ec9b95e346c50f2785441 100644
--- a/pkgs/applications/science/logic/cedille/default.nix
+++ b/pkgs/applications/science/logic/cedille/default.nix
@@ -1,8 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
-, fetchpatch
-, texinfo
, alex
, happy
, Agda
@@ -19,11 +17,11 @@ stdenv.mkDerivation rec {
owner = "cedille";
repo = "cedille";
rev = "v${version}";
- sha256 = "17j7an5bharc8q1pj06615zmflipjdd0clf67cnfdhsmqwzf6l9r";
+ sha256 = "16pc72wz6kclq9yv2r8hx85mkp0s125h12snrhcjxkbl41xx2ynb";
fetchSubmodules = true;
};
- nativeBuildInputs = [ texinfo alex happy ];
+ nativeBuildInputs = [ alex happy ];
buildInputs = [ Agda (ghcWithPackages (ps: [ps.ieee])) ];
LANG = "en_US.UTF-8";
@@ -31,26 +29,10 @@ stdenv.mkDerivation rec {
lib.optionalString (buildPlatform.libc == "glibc")
"${buildPackages.glibcLocales}/lib/locale/locale-archive";
- patches = [
- # texinfo direntry fix. See: https://github.com/cedille/cedille/pull/86
- (fetchpatch {
- url = "https://github.com/cedille/cedille/commit/c058f42179a635c7b6179772c30f0eba4ac53724.patch";
- sha256 = "02qd86k5bdrygjzh2k0j0q5qk4nk2vwnsz7nvlssvysbvsmiba7x";
- })
- ];
-
postPatch = ''
patchShebangs create-libraries.sh
- patchShebangs docs/src/compile-docs.sh
- '';
-
- # We regenerate the info file in order to fix the direntry
- preBuild = ''
- rm -f docs/info/cedille-info-main.info
'';
- buildFlags = [ "all" "cedille-docs" ];
-
installPhase = ''
install -Dm755 -t $out/bin/ cedille
install -Dm755 -t $out/bin/ core/cedille-core
diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix
index b6ebce6819373ae7f0215053ccf4dd6de07c070a..ae57724e4f88d7f740e55ddac80de5bddd53f7e8 100644
--- a/pkgs/applications/science/logic/clprover/clprover.nix
+++ b/pkgs/applications/science/logic/clprover/clprover.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchzip }:
+{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "clprover-${version}";
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 0a4e1dddcae3ee61516f3dc3ed06a342fdbb49f2..10fe722d7e9a17eee132e720b22aa489563315b9 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -8,6 +8,7 @@
{ stdenv, fetchFromGitHub, writeText, pkgconfig
, ocamlPackages, ncurses
, buildIde ? true
+, glib, gnome3, wrapGAppsHook
, csdp ? null
, version
}:
@@ -26,9 +27,13 @@ let
"8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk";
"8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
"8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh";
+ "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
+ "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal";
}."${version}";
- coq-version = builtins.substring 0 3 version;
- ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+ coq-version = stdenv.lib.versions.majorMinor version;
+ versionAtLeast = stdenv.lib.versionAtLeast coq-version;
+ ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10")
+ "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt";
csdpPatch = if csdp != null then ''
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
@@ -96,7 +101,10 @@ self = stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ])
- ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk;
+ ++ stdenv.lib.optionals buildIde
+ (if versionAtLeast "8.10"
+ then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
+ else [ ocamlPackages.lablgtk ]);
postPatch = ''
UNAME=$(type -tp uname)
@@ -117,7 +125,9 @@ self = stdenv.mkDerivation {
addEnvHooks "$targetOffset" addCoqPath
'';
- preConfigure = ''
+ preConfigure = if versionAtLeast "8.10" then ''
+ patchShebangs dev/tools/
+ '' else ''
configureFlagsArray=(
${ideFlags}
)
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index c6b7b918eac826054fc6cb52177fa83abd5b5e21..c9516a135c0672491d9a2767924f4799127b87a0 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, python3, xxd, boost }:
+{ stdenv, fetchFromGitHub, cmake, python3, xxd, boost }:
stdenv.mkDerivation rec {
name = "cryptominisat-${version}";
diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix
index 1b7b54e2ccb1df7449823ca7ff1edba279c7e563..cd8a3747bea17b4411e9fff0c6c4fa755fc0377b 100644
--- a/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/pkgs/applications/science/logic/cryptoverif/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cryptoverif-${version}";
- version = "2.00";
+ version = "2.01";
src = fetchurl {
url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz";
- sha256 = "0g8pkj58b48zk4c0sgpln0qhbj82v75mz3w6cl3w5bvmxsbkwvy1";
+ sha256 = "122pryci8rsdzv9qszw11g3izh78r2lvd1raahv2j7qmvgi76nab";
};
buildInputs = [ ocaml ];
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index eddc4b9b208055d6e205746725e81977b635cf9b..bc4f526bb3a4aaf21cee2d9f96908050ade0b673 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -4,7 +4,7 @@ rustPlatform.buildRustPackage rec {
name = "elan-${version}";
version = "0.7.5";
- cargoSha256 = "0vv7kr7rc3lvas7ngp5dp99ajjd5v8k5937ish7zqz1k4970q2f1";
+ cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd";
src = fetchFromGitHub {
owner = "kha";
diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..21ce6be3e6c141309c0b6be874062af63ebdf806
--- /dev/null
+++ b/pkgs/applications/science/logic/fast-downward/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }:
+
+stdenv.mkDerivation rec {
+ name = "fast-downward-2019-05-13";
+
+ src = fetchhg {
+ url = "http://hg.fast-downward.org/";
+ rev = "090f5df5d84a";
+ sha256 = "14pcjz0jfzx5269axg66iq8js7lm2w3cnqrrhhwmz833prjp945g";
+ };
+
+ nativeBuildInputs = [ cmake which ];
+ buildInputs = [ python3 python3.pkgs.wrapPython osi ];
+
+ cmakeFlags =
+ lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ];
+
+ enableParallelBuilding = true;
+
+ postPatch = ''
+ cd src
+ # Needed because the package tries to be too smart.
+ export CC="$(which $CC)"
+ export CXX="$(which $CXX)"
+ '';
+
+ installPhase = ''
+ install -Dm755 bin/downward $out/libexec/fast-downward/downward
+ cp -r ../translate $out/libexec/fast-downward/
+ install -Dm755 ../../fast-downward.py $out/bin/fast-downward
+ mkdir -p $out/${python3.sitePackages}
+ cp -r ../../driver $out/${python3.sitePackages}
+
+ wrapPythonProgramsIn $out/bin "$out $pythonPath"
+ wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $pythonPath"
+ # Because fast-downward calls `python translate.py` we need to return wrapped scripts back.
+ for i in $out/libexec/fast-downward/translate/.*-wrapped; do
+ name="$(basename "$i")"
+ name1="''${name#.}"
+ name2="''${name1%-wrapped}"
+ dir="$(dirname "$i")"
+ dest="$dir/$name2"
+ echo "Moving $i to $dest"
+ mv "$i" "$dest"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A domain-independent planning system";
+ homepage = "http://www.fast-downward.org/";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ abbradar ];
+ };
+}
diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix
index 71114d2f9e127fc2f697157644c05838ffe63e2b..7522eb4790ed0145e97b18a9bdccfadf286126d1 100644
--- a/pkgs/applications/science/logic/gappa/default.nix
+++ b/pkgs/applications/science/logic/gappa/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gmp, mpfr, boost }:
stdenv.mkDerivation {
- name = "gappa-1.2";
+ name = "gappa-1.3.5";
src = fetchurl {
- url = https://gforge.inria.fr/frs/download.php/file/34787/gappa-1.2.0.tar.gz;
- sha256 = "03hfzmaf5jm54sjpbks20q7qixpmagrfbnyyc276vgmiyslk4dkh";
+ url = https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz;
+ sha256 = "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w";
};
buildInputs = [ gmp mpfr boost.dev ];
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix
index f96532b7038bd875772c14f417ca150e6218d05c..a4538e1070a3a6df55f67009fd1cfdfbac2c3c81 100644
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = http://www.cs.unm.edu/~mccune/mace4/;
+ homepage = https://www.cs.unm.edu/~mccune/mace4/;
license = "GPL";
description = "Automated theorem prover for first-order and equational logic";
longDescription = ''
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index f58c820d22b6c189a5a8e60f933640c0cbb08778..8ba77159693e5600af1e3fb47212bfe9475cdd59 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, yosys, python3 }:
+{ stdenv, fetchFromGitHub, yosys, bash, python3 }:
stdenv.mkDerivation rec {
name = "symbiyosys-${version}";
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/sby \
--replace "##yosys-sys-path##" \
"sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
+ substituteInPlace $out/share/yosys/python3/sby_core.py \
+ --replace "/bin/bash" \
+ "${bash}/bin/bash"
'';
meta = {
description = "Tooling for Yosys-based verification flows";
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 24971b500d3fbe0f5cc7199e29cfa5187eed8210..7f68a8e647e941d1b731e1bdfaec5091a050dee5 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
- "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
- "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}.tgz"
+ "http://tptp.cs.miami.edu/TPTP/Distribution/TPTP-v${version}.tgz"
+ "http://tptp.cs.miami.edu/TPTP/Archive/TPTP-v${version}.tgz"
];
sha256 = "0yq8452b6mym4yscy46pshg0z2my8xi74b5bp2qlxd5bjwcrg6rl";
};
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index 8ad70531d543610ea21671c782f8f0233fa80dc3..08ab243fb96aa9adf5808fe3cdd74f9e7abe736c 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
owner = "vprover";
repo = "vampire";
rev = version;
- sha256 = "0d1klprlgqrcn8r5ywgvsahr4qz96ayl67ry5jks946v0k94m1k1";
- fetchSubmodules = true;
- leaveDotGit = true;
+ sha256 = "03dqjxr3cwz4h6sn9074kc6b6wjz12kpsvsi0mq2w0j5l9f8d80y";
+ #fetchSubmodules = true;
+ #leaveDotGit = true;
};
nativeBuildInputs = [ git ];
diff --git a/pkgs/applications/science/logic/z3/0001-fix-2131.patch b/pkgs/applications/science/logic/z3/0001-fix-2131.patch
deleted file mode 100644
index 0b21b8fffd40fda24606be70ff13b3ccccca83da..0000000000000000000000000000000000000000
--- a/pkgs/applications/science/logic/z3/0001-fix-2131.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From c5df6ce96e068eceb77019e48634721c6a5bb607 Mon Sep 17 00:00:00 2001
-From: Nikolaj Bjorner
-Date: Sun, 10 Feb 2019 10:07:24 -0800
-Subject: [PATCH 1/1] fix #2131
-
-Signed-off-by: Nikolaj Bjorner
----
- src/api/python/README.txt | 10 +++-------
- src/api/python/setup.py | 2 +-
- src/ast/recfun_decl_plugin.h | 2 +-
- 3 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/src/api/python/README.txt b/src/api/python/README.txt
-index 9312b1119..561b8dedc 100644
---- a/src/api/python/README.txt
-+++ b/src/api/python/README.txt
-@@ -1,8 +1,4 @@
--You can learn more about Z3Py at:
--http://rise4fun.com/Z3Py/tutorial/guide
--
--On Windows, you must build Z3 before using Z3Py.
--To build Z3, you should executed the following command
-+On Windows, to build Z3, you should executed the following command
- in the Z3 root directory at the Visual Studio Command Prompt
-
- msbuild /p:configuration=external
-@@ -12,8 +8,8 @@ If you are using a 64-bit Python interpreter, you should use
- msbuild /p:configuration=external /p:platform=x64
-
-
--On Linux and macOS, you must install Z3Py, before trying example.py.
--To install Z3Py on Linux and macOS, you should execute the following
-+On Linux and macOS, you must install python bindings, before trying example.py.
-+To install python on Linux and macOS, you should execute the following
- command in the Z3 root directory
-
- sudo make install-z3py
-diff --git a/src/api/python/setup.py b/src/api/python/setup.py
-index 2a750fee6..063680e2b 100644
---- a/src/api/python/setup.py
-+++ b/src/api/python/setup.py
-@@ -178,7 +178,7 @@ setup(
- name='z3-solver',
- version=_z3_version(),
- description='an efficient SMT solver library',
-- long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compiliation, or installation, please submit issues to https://github.com/angr/angr-z3',
-+ long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compilation, or installation, please submit issues to https://github.com/angr/angr-z3',
- author="The Z3 Theorem Prover Project",
- maintainer="Audrey Dutcher",
- maintainer_email="audrey@rhelmot.io",
-diff --git a/src/ast/recfun_decl_plugin.h b/src/ast/recfun_decl_plugin.h
-index 0247335e8..b294cdfce 100644
---- a/src/ast/recfun_decl_plugin.h
-+++ b/src/ast/recfun_decl_plugin.h
-@@ -56,7 +56,7 @@ namespace recfun {
- friend class def;
- func_decl_ref m_pred; // after 2.10.0
description = "A mixed integer programming solver";
};
}
diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix
index 81fa6166680e82b73bf983ffaf30e131dfb35d2a..0beee1eb29150bf97e10144d00e5c543cf30db02 100644
--- a/pkgs/applications/science/math/clp/default.nix
+++ b/pkgs/applications/science/math/clp/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- version = "1.17.1";
+ version = "1.17.2";
name = "clp-${version}";
src = fetchurl {
url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz";
- sha256 = "1wdg820g3iikf9344ijwsc8sy6c0m6im42bzzizm6rlmkvnmxhk9";
+ sha256 = "1fkmgpn0zaraymi6s3isrrscgjxggcs2yjrx7jfy4hb1jacx71zz";
};
propagatedBuildInputs = [ zlib ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
license = licenses.epl10;
- homepage = https://projects.coin-or.org/Clp;
+ homepage = "https://github.com/coin-or/Clp";
description = "An open-source linear programming solver written in C++";
platforms = platforms.darwin ++ [ "x86_64-linux" ];
maintainers = [ maintainers.vbgl ];
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index 4bf922c4e1691dc42d1d8b06f8dc0728b8b42962..465c7318c0e3f1c25da57ebf5794f3d113c271d1 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -18,17 +18,15 @@ let
in stdenv.mkDerivation rec {
name = "CNTK-${version}";
- version = "2.4";
+ version = "2.7";
# Submodules
src = fetchgit {
url = "https://github.com/Microsoft/CNTK";
rev = "v${version}";
- sha256 = "0m28wb0ljixcpi14g3gcfiraimh487yxqhd9yrglgyvjb69x597y";
+ sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns";
};
- patches = [ ./fix_std_bind.patch ];
-
nativeBuildInputs = [ cmake ];
buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ]
@@ -87,6 +85,7 @@ in stdenv.mkDerivation rec {
homepage = https://github.com/Microsoft/CNTK;
description = "An open source deep-learning toolkit";
license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit;
+ platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/applications/science/math/cntk/fix_std_bind.patch b/pkgs/applications/science/math/cntk/fix_std_bind.patch
deleted file mode 100644
index df97a0c6666955f9bb722658461ecd3d478f60fd..0000000000000000000000000000000000000000
--- a/pkgs/applications/science/math/cntk/fix_std_bind.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru3 CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h
---- CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 1970-01-01 03:00:01.000000000 +0300
-+++ CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 2018-02-25 18:16:16.330269647 +0300
-@@ -9,6 +9,7 @@
- #include
- #include
- #include
-+#include
-
- #include "CNTKLibrary.h"
- #include "CNTKLibraryC.h"
diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix
index dae5e1b76d35b24c8f4ac3dd21a27ee0b915cf80..a14839d3eccc76db3357b86294672fcdb479e406 100644
--- a/pkgs/applications/science/math/cplex/default.nix
+++ b/pkgs/applications/science/math/cplex/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
version = "128";
src =
- if builtins.isNull releasePath then
+ if releasePath == null then
throw ''
This nix expression requires that the cplex installer is already
downloaded to your machine. Get it from IBM:
@@ -71,6 +71,11 @@ stdenv.mkDerivation rec {
fi
done
'';
+
+ passthru = {
+ libArch = "x86-64_linux";
+ libSuffix = "${version}0";
+ };
meta = with stdenv.lib; {
description = "Optimization solver for mathematical programming";
diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix
index 6beb87e9f028d909e39ce3c12e4b34073e1b312b..7eb10d1f952506895c4aceeb5de8b952b2570168 100644
--- a/pkgs/applications/science/math/gap/default.nix
+++ b/pkgs/applications/science/math/gap/default.nix
@@ -45,7 +45,6 @@ let
"sophus-*"
"tomlib-*"
];
- standardPackages = requiredPackages ++ autoloadedPackages;
keepAll = keepAllPackages || (packageSet == "full");
packagesToKeep = requiredPackages ++ lib.optionals (packageSet == "standard") autoloadedPackages;
@@ -62,11 +61,11 @@ in
stdenv.mkDerivation rec {
pname = "gap";
# https://www.gap-system.org/Releases/
- version = "4.10.1";
+ version = "4.10.2";
src = fetchurl {
url = "https://www.gap-system.org/pub/gap/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2";
- sha256 = "136s0zvhcw41fshj5zgsrjcy2kd58cdh2m3ddp5rdizi4rx54f10";
+ sha256 = "0cp6ddk0469zzv1m1vair6gm27ic6c5m77ri8rn0znq3gaps6x94";
};
# remove all non-essential packages (which take up a lot of space)
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 503c98f559136c4fb3b13ec91528c31c3d39a6e8..1a3ba8096e29148f9f6a1973530b5d525601966b 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
, zlib, libGLU_combined, libGLU, xorg }:
-let version = "4.2.3"; in
+let version = "4.4.0"; in
stdenv.mkDerivation {
name = "gmsh-${version}";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "0n18wmj8i4m1pzri3r0676lx1427zf8qmsrgnn07drv6if1cia2q";
+ sha256 = "0b0h15cmi6zy31cii7r9jmfm9xksljff255dn6l9frhdjymkmx7l";
};
- buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
+ buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined
libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
];
- nativeBuildInputs = [ gfortran ];
+ nativeBuildInputs = [ cmake gfortran ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix
index be14d1411285fb0d37edaa6a27561ee16c426183..ee9bdcc6f1b0d4e1d2e02d80acf61ac4b554283c 100644
--- a/pkgs/applications/science/math/gurobi/default.nix
+++ b/pkgs/applications/science/math/gurobi/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, autoPatchelfHook, python }:
+{ stdenv, lib, fetchurl, autoPatchelfHook, python }:
-stdenv.mkDerivation rec {
+let
+ majorVersion = "8.1";
+in stdenv.mkDerivation rec {
name = "gurobi-${version}";
- version = "8.1.0";
+ version = "${majorVersion}.0";
src = with stdenv.lib; fetchurl {
url = "http://packages.gurobi.com/${versions.majorMinor version}/gurobi${version}_linux64.tar.gz";
@@ -44,6 +46,8 @@ stdenv.mkDerivation rec {
ln -s $out/lib/gurobi-javadoc.jar $out/share/java/
'';
+ passthru.libSuffix = lib.replaceStrings ["."] [""] majorVersion;
+
meta = with stdenv.lib; {
description = "Optimization solver for mathematical programming";
homepage = https://www.gurobi.com;
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index 9c1a2e2028237d01ccaa714a58b53b38d19baac6..e2e4ba63b07e05297fc44f024225fd1c8982fc0f 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -1,5 +1,5 @@
{ config, stdenv, lib, fetchurl, bash, cmake
-, opencv, gtest, openblas, liblapack, perl
+, opencv3, gtest, openblas, liblapack, perl
, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
, cudnnSupport ? cudaSupport, cudnn
}:
@@ -8,24 +8,22 @@ assert cudnnSupport -> cudaSupport;
stdenv.mkDerivation rec {
name = "mxnet-${version}";
- version = "1.2.1";
+ version = "1.4.1";
- # Fetching from git does not work at the time (1.2.1) due to an
- # incorrect hash in one of the submodules. The provided tarballs
- # contain all necessary sources.
src = fetchurl {
url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz";
- sha256 = "053zbdgs4j8l79ipdz461zc7wyfbfcflmi5bw7lj2q08zm1glnb2";
+ sha256 = "1d0lhlpdaxycjzpwwrpgjd3v2q2ka89v5rr13ddxayy7ld2hxiaj";
};
nativeBuildInputs = [ cmake perl ];
- buildInputs = [ opencv gtest openblas liblapack ]
+ buildInputs = [ opencv3 gtest openblas liblapack ]
++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
++ lib.optional cudnnSupport cudnn;
cmakeFlags =
- (if cudaSupport then [
+ [ "-DUSE_MKL_IF_AVAILABLE=OFF" ]
+ ++ (if cudaSupport then [
"-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743
"-DCUDA_ARCH_NAME=All"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index beed2de9759c3c3ac0d682dd5fadb375c34012f1..c2f8ba1d55ec802eeb0d2ca2a429a131e4b22644 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "nasc";
- version = "0.5.2";
+ version = "0.5.4";
src = fetchFromGitHub {
owner = "parnold-x";
repo = pname;
rev = version;
- sha256 = "009xmlsgl7r6wp6sczbdp8sjqqd6k2mychx5b4zn7wnrl7435y5y";
+ sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 7351de53cfce373f6266833e8eb67bffdc079e37..226e13c004d731f2530e031b1317fcb7187d7a25 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchurl
-, optimize ? false # impure
}:
stdenv.mkDerivation rec {
name = "nauty-${version}";
@@ -11,13 +10,15 @@ stdenv.mkDerivation rec {
sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y";
};
outputs = [ "out" "dev" ];
- configureFlags = lib.optionals (!optimize) [
+ configureFlags = {
# Prevent nauty from sniffing some cpu features. While those are very
# widely available, it can lead to nasty bugs when they are not available:
# https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA
- "--disable-popcnt"
- "--disable-clz"
- ];
+ "default" = [ "--disable-clz" "--disable-popcnt" ];
+ "westmere" = [ "--disable-clz" ];
+ "sandybridge" = [ "--disable-clz" ];
+ "ivybridge" = [ "--disable-clz" ];
+ }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or [];
buildInputs = [];
installPhase = ''
mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 4915e42025b5c9737da190f95e616b8a04cf9cd5..86bd2e8436783a04d697d3c605b95fc02e0a8ea9 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gp2c-${version}";
- version = "0.0.11pl1";
+ version = "0.0.11pl2";
src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
- sha256 = "1c6f6vmncw032kfzrfyr8bynw6yd3faxpy2285r009fmr0zxfs5s";
+ sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g";
};
buildInputs = [ pari perl ];
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index f05700b1bd81c74d7647aa829fe8ba17c79b1a7b..75a46bb182aef2fd13cd9dfdd35dc3e09a7b3b30 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -9,14 +9,14 @@
}:
stdenv.mkDerivation rec {
- version = "0.7.24";
+ version = "0.7.25";
pname = "pynac";
src = fetchFromGitHub {
owner = "pynac";
repo = "pynac";
rev = "pynac-${version}";
- sha256 = "0i3qxww28576jim0abgkqy9mi2k0lfllgyx8xpfqsqb75ai970ik";
+ sha256 = "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3";
};
buildInputs = [
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 0e0df9d72fe56c95244bc873bb2d11dac6d02e9e..4da3a3f3d7bc1aa010eea398bc28f39320b69d7f 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
- sha256 = "1ayhzsxf2qgs4j1j0xl942ysfy3zl2z1fp7l2s5nh5awr41mhnqc";
+ sha256 = "1yhhfqcxi1b7dfrl8qh16l9iwgzvw1p0hhl7nnjpxhdwxz880sv0";
};
patchPhase = ''
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 92ec32d5cc525d5eee8047f360b22de4f617792f..caf51c3da25175e27c6f1b8d1e6ed01b95c47565 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -7,7 +7,7 @@
# is always preferred, see `sage-src.nix` for that.
let
- inherit (pkgs) fetchurl symlinkJoin callPackage nodePackages;
+ inherit (pkgs) symlinkJoin callPackage nodePackages;
# https://trac.sagemath.org/ticket/15980 for tracking of python3 support
python = pkgs.python2.override {
@@ -33,7 +33,7 @@ let
# `sagelib`, i.e. all of sage except some wrappers and runtime dependencies
sagelib = self.callPackage ./sagelib.nix {
inherit flint ecl arb;
- inherit sage-src pynac singular;
+ inherit sage-src env-locations pynac singular;
linbox = pkgs.linbox.override { withSage = true; };
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
@@ -130,7 +130,7 @@ let
singular = pkgs.singular.override { inherit flint; };
# https://trac.sagemath.org/ticket/26625
- maxima-ecl = pkgs.maxima-ecl-5_41;
+ maxima-ecl = pkgs.maxima-ecl;
# *not* to confuse with the python package "pynac"
pynac = pkgs.pynac.override { inherit singular flint; };
diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch b/pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch
deleted file mode 100644
index 9e3f0f5ae88039804c99b17879b5a4da3a1423db..0000000000000000000000000000000000000000
--- a/pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py
-index 3bca15d53b..7cf04ff8d1 100644
---- a/src/sage/misc/package.py
-+++ b/src/sage/misc/package.py
-@@ -478,16 +478,16 @@ def package_manifest(package):
-
- EXAMPLES::
-
-- sage: from sage.misc.package import package_manifest
-- sage: sagetex_manifest = package_manifest('sagetex')
-- sage: sagetex_manifest['package_name'] == 'sagetex'
-+ sage: from sage.misc.package import package_manifest # optional - buildsystem
-+ sage: sagetex_manifest = package_manifest('sagetex') # optional - buildsystem
-+ sage: sagetex_manifest['package_name'] == 'sagetex' # optional - buildsystem
- True
-- sage: 'files' in sagetex_manifest
-+ sage: 'files' in sagetex_manifest # optional - buildsystem
- True
-
- Test a nonexistent package::
-
-- sage: package_manifest('dummy-package')
-+ sage: package_manifest('dummy-package') # optional - buildsystem
- Traceback (most recent call last):
- ...
- KeyError: 'dummy-package'
diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
new file mode 100644
index 0000000000000000000000000000000000000000..933344aa559102fe0868d1e620ee8da0af98369e
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
@@ -0,0 +1,57 @@
+diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py
+index 0f2700168a..60f71357d2 100644
+--- a/src/sage_setup/docbuild/__init__.py
++++ b/src/sage_setup/docbuild/__init__.py
+@@ -86,26 +86,6 @@ def builder_helper(type):
+ """
+ Returns a function which builds the documentation for
+ output type ``type``.
+-
+- TESTS:
+-
+- Check that :trac:`25161` has been resolved::
+-
+- sage: from sage_setup.docbuild import DocBuilder, setup_parser
+- sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set
+-
+- sage: import sage_setup.docbuild.sphinxbuild
+- sage: def raiseBaseException():
+- ....: raise BaseException("abort pool operation")
+- sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException
+-
+- sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc
+- sage: helper = builder_helper("html")
+- sage: try:
+- ....: build_many(build_ref_doc, [("docname", "en", "html", {})])
+- ....: except Exception as E:
+- ....: "Non-exception during docbuild: abort pool operation" in str(E)
+- True
+ """
+ def f(self, *args, **kwds):
+ output_dir = self._output_dir(type)
+@@ -127,10 +107,9 @@ def builder_helper(type):
+ logger.debug(build_command)
+
+ # Run Sphinx with Sage's special logger
+- sys.argv = ["sphinx-build"] + build_command.split()
+- from .sphinxbuild import runsphinx
++ args = "python -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split()
+ try:
+- runsphinx()
++ subprocess.check_call(args)
+ except Exception:
+ if ABORT_ON_ERROR:
+ raise
+diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py
+index 9a2fba79bc..77c8ed3592 100644
+--- a/src/sage_setup/docbuild/sphinxbuild.py
++++ b/src/sage_setup/docbuild/sphinxbuild.py
+@@ -318,3 +318,8 @@ def runsphinx():
+ sys.stderr = saved_stderr
+ sys.stdout.flush()
+ sys.stderr.flush()
++
++if __name__ == '__main__':
++ import sys
++ sys.argv[0] = "sphinx-build"
++ runsphinx()
diff --git a/pkgs/applications/science/math/sage/patches/threejs-offline.patch b/pkgs/applications/science/math/sage/patches/threejs-offline.patch
new file mode 100644
index 0000000000000000000000000000000000000000..62b2f114bd62c7ff5a89c671d4f7f3cdf4a9e88a
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/threejs-offline.patch
@@ -0,0 +1,64 @@
+diff --git a/build/pkgs/threejs/spkg-src b/build/pkgs/threejs/spkg-src
+index 91780d813c..254b850a24 100755
+--- a/build/pkgs/threejs/spkg-src
++++ b/build/pkgs/threejs/spkg-src
+@@ -20,9 +20,17 @@ URL3="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/LICENSE"
+ echo "Downloading $URL3"
+ curl -OL "$URL3"
+
++# Set up directory structure
++
++mkdir build
++mv three.min.js build
++
++mkdir -p examples/js/controls
++mv OrbitControls.js examples/js/controls
++
+ # Package
+-tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" 'three.min.js' 'OrbitControls.js' 'LICENSE'
+-rm -rf 'three.min.js' 'OrbitControls.js' 'LICENSE'
++tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" build examples 'LICENSE'
++rm -rf 'build' 'examples' 'LICENSE'
+
+ # Update package info
+ echo "${GIT_VERSION}" > 'package-version.txt'
+diff --git a/src/sage/repl/rich_output/backend_ipython.py b/src/sage/repl/rich_output/backend_ipython.py
+index 7c27d48a21..8bf4861a35 100644
+--- a/src/sage/repl/rich_output/backend_ipython.py
++++ b/src/sage/repl/rich_output/backend_ipython.py
+@@ -411,10 +411,15 @@ class BackendIPythonCommandline(BackendIPython):
+ sage: backend.threejs_offline_scripts()
+ '...
+-
++
++
+
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index cea2586179e3353c90bc277c3459e97a4eb7c3d4..51460154c5de16d6e7b438c0429d69570d01d47e 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
# all get the same sources with the same patches applied.
stdenv.mkDerivation rec {
- version = "8.7";
+ version = "8.8";
pname = "sage-src";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage";
rev = version;
- sha256 = "05vvrd6syh0hlmrk6kzjrwd0hpmvxp8vr8p3mkjb0jh5p2kjdd27";
+ sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x";
};
# Patches needed because of particularities of nix or the way this is packaged.
@@ -45,43 +45,23 @@ stdenv.mkDerivation rec {
# Fixes a potential race condition which can lead to transient doctest failures.
./patches/fix-ecl-race.patch
- # Parallelize docubuild using subprocesses, fixing an isolation issue. See
- # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
- (fetchpatch {
- name = "sphinx-docbuild-subprocesses.patch";
- url = "https://salsa.debian.org/science-team/sagemath/raw/8a215b17e6f791ddfae6df8ce6d01dfb89acb434/debian/patches/df-subprocess-sphinx.patch";
- sha256 = "07p9i0fwjgapmfvmi436yn6v60p8pvmxqjc93wsssqgh5kd8qw3n";
- stripLen = 1;
- })
-
- # Part of the build system. Should become unnecessary with sage 8.8.
- # Upstream discussion here: https://trac.sagemath.org/ticket/27124#comment:33
- ./patches/do-not-test-package-manifests.patch
-
# Not necessary since library location is set explicitly
# https://trac.sagemath.org/ticket/27660#ticket
./patches/do-not-test-find-library.patch
- # https://trac.sagemath.org/ticket/27697#ticket
- (fetchpatch {
- name = "pplpy-doc-location-configurable.patch";
- url = "https://git.sagemath.org/sage.git/patch/?h=c4d966e7cb0c7b87c55d52dc6f46518433a2a0a2";
- sha256 = "0pqbbsx8mriwny422s9mp3z5d095cnam32sm62q4mxk8g8jb9vm9";
- })
+
+ # https://trac.sagemath.org/ticket/28007
+ ./patches/threejs-offline.patch
+
+ # Parallelize docubuild using subprocesses, fixing an isolation issue. See
+ # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
+ ./patches/sphinx-docbuild-subprocesses.patch
];
# Since sage unfortunately does not release bugfix releases, packagers must
# fix those bugs themselves. This is for critical bugfixes, where "critical"
# == "causes (transient) doctest failures / somebody complained".
- bugfixPatches = [
- # Transient doctest failure in src/sage/modular/abvar/torsion_subgroup.py
- # https://trac.sagemath.org/ticket/27477
- (fetchpatch {
- name = "sig_on_in_matrix_sparce.patch";
- url = "https://git.sagemath.org/sage.git/patch?id2=10407524b18659e14e184114b61c043fb816f3c2&id=c9b0cc9d0b8748ab85e568f8f57f316c5e8cbe54";
- sha256 = "0wgp7yvn9sm1ynlhcr4l0hzmvr2n28llg4xc01p6k1zz4im64c17";
- })
- ];
+ bugfixPatches = [ ];
# Patches needed because of package updates. We could just pin the versions of
# dependencies, but that would lead to rebuilds, confusion and the burdons of
@@ -113,33 +93,12 @@ stdenv.mkDerivation rec {
stripLen = 1;
})
- # https://trac.sagemath.org/ticket/26451
+ # https://trac.sagemath.org/ticket/26932
(fetchSageDiff {
- name = "sphinx-1.8.patch";
- base = "8.7";
- rev = "737afd8f314bd1e16feaec562bb4b5efa2effa8b";
- sha256 = "0n56ss88ds662bp49j23z5c2i6hsn3jynxw13wv76hyl0h7l1hjh";
- })
-
- # https://trac.sagemath.org/ticket/27653
- (fetchpatch {
- name = "sympy-1.4.patch";
- url = "https://git.sagemath.org/sage.git/patch/?h=3277ba76d0ba7174608a31a0c6623e9210c63e3d";
- sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir";
- })
-
- # https://trac.sagemath.org/ticket/27094
- (fetchpatch {
- name = "gap-4.10.1.patch";
- url = "https://git.sagemath.org/sage.git/patch?id=d3483110474591ea6cc8e3210cd884f3e0018b3e";
- sha256 = "028i6h8l8npwzx5z0ax0rcywl85gc83qw1jf93zf523msdfcsk0n";
- })
-
- # https://trac.sagemath.org/ticket/27738
- (fetchpatch {
- name = "R-3.6.0.patch";
- url = "https://git.sagemath.org/sage.git/patch/?h=8b7dbd0805d02d0e8674a272e161ceb24a637966";
- sha256 = "1c81f13z1w62s06yvp43gz6vkp8mxcs289n6l4gj9xj10slimzff";
+ name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch";
+ base = "8.8.beta4";
+ rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";
+ sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";
})
];
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix
index 12433e12fe90697a8fcc0ba5900f4e17e9c0ada4..591fa192d563cd67c1f2de352ee15d6135222cae 100644
--- a/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/pkgs/applications/science/math/sage/sage-tests.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
sage-with-env
];
- unpackPhase = "#do nothing";
+ dontUnpack = true;
configurePhase = "#do nothing";
buildPhase = "#do nothing";
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index 18060f342a92a84c31aba5051f5d6c1e56aa3f49..e4b1aeae016a6e9bf3581193fa59ceb78ab48141 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -59,7 +59,7 @@ let
# return the names of all dependencies in the transitive closure
transitiveClosure = dep:
- if isNull dep then
+ if dep == null then
# propagatedBuildInputs might contain null
# (although that might be considered a programming error in the derivation)
[]
@@ -99,6 +99,13 @@ stdenv.mkDerivation rec {
for pkg in ${lib.concatStringsSep " " input_names}; do
touch "installed/$pkg"
done
+
+ # threejs version is in format 0..minor, but sage currently still
+ # relies on installed_packages for the online version of threejs to work
+ # and expects the format r. This is a hotfix for now.
+ # upstream: https://trac.sagemath.org/ticket/26434
+ rm "installed/threejs"*
+ touch "installed/threejs-r${lib.versions.minor three.version}"
'';
installPhase = ''
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index 541b9cb36dc224d5ba8fc7ce1589f00550e91304..f6dc21d00184432c2081f5d7cb17ba6ea2e5057e 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -11,7 +11,7 @@
# A wrapper that makes sure sage finds its docs (if they were build) and the
# jupyter kernel spec.
-let
+let
# generate kernel spec + default kernels
kernel-specs = jupyter-kernel.create {
definitions = jupyter-kernel.default // {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
sage-tests
];
- unpackPhase = "#do nothing";
+ dontUnpack = true;
configurePhase = "#do nothing";
buildPhase = "#do nothing";
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index d745532d5d701fff63aa33d8395386b1c4de91c2..1040d6d4ba15a79e0f13bdcacef0508b84473c20 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -1,4 +1,5 @@
{ sage-src
+, env-locations
, perl
, buildPythonPackage
, arb
@@ -125,8 +126,11 @@ buildPythonPackage rec {
export SAGE_ROOT="$PWD"
export SAGE_LOCAL="$SAGE_ROOT"
export SAGE_SHARE="$SAGE_LOCAL/share"
- export JUPYTER_PATH="$SAGE_LOCAL/jupyter"
+ # set locations of dependencies (needed for nbextensions like threejs)
+ . ${env-locations}/sage-env-locations
+
+ export JUPYTER_PATH="$SAGE_LOCAL/jupyter"
export PATH="$SAGE_ROOT/build/bin:$SAGE_ROOT/src/bin:$PATH"
export SAGE_NUM_THREADS="$NIX_BUILD_CORES"
diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix
index 32335b452020361f79ed18b37ea8b515329cee26..03b5b7a3bbf92237d711631c3086f30251008589 100644
--- a/pkgs/applications/science/math/sage/sagenb.nix
+++ b/pkgs/applications/science/math/sage/sagenb.nix
@@ -1,5 +1,4 @@
{ stdenv
-, fetchpatch
, python
, buildPythonPackage
, fetchFromGitHub
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index c3a74d14bc0a294ccdcb75676f26fdfcb33ac60e..262ee7d0d5da198bbe4b9dfd70508b5d4156e754 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -5,8 +5,6 @@ let
ver = "6.0.1";
- majorVer = builtins.elemAt (lib.splitString "." ver) 0;
-
badArch = throw "${name} requires i686-linux or x86_64-linux";
architecture =
diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix
index ff25bc97490073235d3ccd156168026ee9abe2b5..2633f4c8db1baf94609c1546b4dd1336e7a1af1b 100644
--- a/pkgs/applications/science/medicine/aliza/default.nix
+++ b/pkgs/applications/science/medicine/aliza/default.nix
@@ -2,11 +2,12 @@
with stdenv.lib;
stdenv.mkDerivation {
- name = "aliza";
+ pname = "aliza";
+ version = "1.48.10";
src = fetchurl {
- # Hosted on muoniurn's google drive
- url = "https://drive.google.com/uc?export=download&id=1zMYfSUqMaYuvuF41zAFUC5ndR55wD7Ip";
- sha256 = "0prlmzz8qbqqkr0plk781afq25dvy4pv89vlgccpim79psqlchl3";
+ # See https://www.aliza-dicom-viewer.com/download
+ url = "https://drive.google.com/uc?export=download&id=16WEScARaSrzJpJkyGuOUxDF95eUwGyET";
+ sha256 = "1ls16cwd0fmb5axxmy9lgf8cqrf7g7swm26f0gr2vqp4z9bw6qn3";
name = "aliza.rpm";
};
@@ -48,5 +49,6 @@ stdenv.mkDerivation {
homepage = http://www.aliza-dicom-viewer.com;
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ mounium ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index 0ccb096b8dab19a2e958b28598c83faff5a72571..daa8b4943227d6c97aad1f13e83c9d61422ac428 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
};
cargoPatches = [ ./cargo-lock.patch ];
- cargoSha256 = "0xmmxm7zwmq7w0pspx17glg4mjgh9l61w0h2k7n97x6p35i198d1";
+ cargoSha256 = "1ijfvfhgjgzlpi1hjhy435m7vq568grh84bmkdlj3m83jxjcz874";
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ openssl gmp ncurses ];
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 0b663b2fb63b7a714e23aec220b829e884838b96..d6e3f05e0e13dde4aa16d7137ee4f1eacd827d6d 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind
+{ stdenv, fetchFromGitLab, cmake, perl, python3, boost, valgrind
# Optional requirements
# Lua 5.3 needed and not available now
#, luaSupport ? false, lua5
@@ -17,14 +17,15 @@ let
in
stdenv.mkDerivation rec {
- name = "simgrid-${version}";
- version = "3.21";
-
- src = fetchFromGitHub {
- owner = "simgrid";
- repo = "simgrid";
- rev = "v${replaceChars ["."] ["_"] version}";
- sha256 = "1v0dwlww2wl56ms8lvg5zwffzbmz3sjzpkqc73f714mrc9g02bxs";
+ pname = "simgrid";
+ version = "3.23";
+
+ src = fetchFromGitLab {
+ domain = "framagit.org";
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "068xg5ps4j4v2sqqyl4vf83nfazp54gsy84gvlw52h94c4mj4xmp";
};
nativeBuildInputs = [ cmake perl python3 boost valgrind ]
@@ -52,7 +53,7 @@ stdenv.mkDerivation rec {
# - lua53: for enable_lua
#
# For more information see:
- # http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list
+ # https://simgrid.org/doc/3.22/Installing_SimGrid.html#simgrid-compilation-options)
cmakeFlags= ''
-Denable_documentation=${optionOnOff buildDocumentation}
-Denable_java=${optionOnOff buildJavaBindings}
@@ -84,12 +85,11 @@ stdenv.mkDerivation rec {
doCheck = true;
- checkPhase = ''
- runHook preCheck
-
- ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple
-
- runHook postCheck
+ # Prevent the execution of tests known to fail.
+ preCheck = ''
+ cat <CTestCustom.cmake
+ SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple)
+ EOW
'';
enableParallelBuilding = true;
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://simgrid.org/;
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ mickours ];
+ maintainers = with maintainers; [ mickours mpoquet ];
platforms = ["x86_64-linux"];
};
}
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 7583f8c00104c4ad726ffb57c2e1d84ce5fcf0c0..d00b59307c522897a8d1482087d373899862ebba 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation {
- name = "gromacs-2019.2";
+ name = "gromacs-2019.3";
src = fetchurl {
- url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.2.tar.gz";
- sha256 = "0zlzzg27yzfbmmgy2wqmgq82nslqy02gprjvm9xwcswjf705rgxw";
+ url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.3.tar.gz";
+ sha256 = "0wvm6lj4hbasl2qkjcpicqjh7abxji4196dd2hmwlyivpycaa4a2";
};
buildInputs = [cmake fftw]
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index 761766ffdf0df218667df4a6bb39fa777927f480..69f355c7b84321072dc09c57b4a2c62da4d12f0d 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "apmplanner2-${version}";
- # TODO revert Qt59 to Qt5 in pkgs/top-level/all-packages.nix on next release
- version = "2.0.26";
+ # TODO revert Qt511 to Qt5 in pkgs/top-level/all-packages.nix on next release
+ version = "2.0.27-rc1";
src = fetchFromGitHub {
owner = "ArduPilot";
repo = "apm_planner";
rev = "${version}";
- sha256 = "0bnyi1r8k8ij5sq2zqv7mfbrxm0xdw97qrx3sk4rinqv2g6h6di4";
+ sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd";
};
qtInputs = [
diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6449e966959b8dcc93ca906423a7117173c7524c
--- /dev/null
+++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
@@ -0,0 +1,50 @@
+{stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
+
+let
+ strippedName = "betaflight-configurator";
+ desktopItem = makeDesktopItem {
+ name = strippedName;
+ exec = strippedName;
+ icon = "${strippedName}-icon.png";
+ comment = "Betaflight configuration tool";
+ desktopName = "Betaflight Configurator";
+ genericName = "Flight controller configuration tool";
+ };
+in
+stdenv.mkDerivation rec {
+ name = "${strippedName}-${version}";
+ version = "10.5.1";
+ src = fetchurl {
+ url = "https://github.com/betaflight/betaflight-configurator/releases/download/${version}/${strippedName}_${version}_linux64.zip";
+ sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc";
+ };
+
+ nativeBuildInputs = [ wrapGAppsHook ];
+
+ buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];
+
+ installPhase = ''
+ mkdir -p $out/bin \
+ $out/opt/${strippedName} \
+ $out/share/icons
+
+ cp -r . $out/opt/${strippedName}/
+ cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png
+ cp -r ${desktopItem}/share/applications $out/share/
+
+ makeWrapper ${nwjs}/bin/nw $out/bin/${strippedName} --add-flags $out/opt/${strippedName}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The Betaflight flight control system configuration tool";
+ longDescription = ''
+ A crossplatform configuration tool for the Betaflight flight control system.
+ Various types of aircraft are supported by the tool and by Betaflight, e.g.
+ quadcopters, hexacopters, octocopters and fixed-wing aircraft.
+ '';
+ homepage = https://github.com/betaflight/betaflight/wiki;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ wucke13 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/0001-fix-gcc-cmath-namespace-issues.patch b/pkgs/applications/science/robotics/qgroundcontrol/0001-fix-gcc-cmath-namespace-issues.patch
deleted file mode 100644
index e6c9ca38a989a924a168cad98d107bd654522d0c..0000000000000000000000000000000000000000
--- a/pkgs/applications/science/robotics/qgroundcontrol/0001-fix-gcc-cmath-namespace-issues.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From fffc383c10c7c194e427d78c83802c3b910fa1c2 Mon Sep 17 00:00:00 2001
-From: Patrick Callahan
-Date: Thu, 24 Mar 2016 18:17:57 -0700
-Subject: [PATCH] fix gcc cmath namespace issues
-
----
- src/Vehicle/Vehicle.cc | 6 +++---
- src/comm/QGCFlightGearLink.cc | 4 ++--
- src/comm/QGCJSBSimLink.cc | 4 ++--
- src/uas/UAS.cc | 8 ++++----
- src/ui/QGCDataPlot2D.cc | 4 ++--
- 5 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
-index a0d3605..205b1de 100644
---- a/src/Vehicle/Vehicle.cc
-+++ b/src/Vehicle/Vehicle.cc
-@@ -638,17 +638,17 @@ void Vehicle::setLongitude(double longitude){
-
- void Vehicle::_updateAttitude(UASInterface*, double roll, double pitch, double yaw, quint64)
- {
-- if (isinf(roll)) {
-+ if (std::isinf(roll)) {
- _rollFact.setRawValue(0);
- } else {
- _rollFact.setRawValue(roll * (180.0 / M_PI));
- }
-- if (isinf(pitch)) {
-+ if (std::isinf(pitch)) {
- _pitchFact.setRawValue(0);
- } else {
- _pitchFact.setRawValue(pitch * (180.0 / M_PI));
- }
-- if (isinf(yaw)) {
-+ if (std::isinf(yaw)) {
- _headingFact.setRawValue(0);
- } else {
- yaw = yaw * (180.0 / M_PI);
-diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc
-index 2a520fb..886aecf 100644
---- a/src/comm/QGCFlightGearLink.cc
-+++ b/src/comm/QGCFlightGearLink.cc
-@@ -230,7 +230,7 @@ void QGCFlightGearLink::updateControls(quint64 time, float rollAilerons, float p
- Q_UNUSED(systemMode);
- Q_UNUSED(navMode);
-
-- if(!isnan(rollAilerons) && !isnan(pitchElevator) && !isnan(yawRudder) && !isnan(throttle))
-+ if(!std::isnan(rollAilerons) && !std::isnan(pitchElevator) && !std::isnan(yawRudder) && !std::isnan(throttle))
- {
- QString state("%1\t%2\t%3\t%4\t%5\n");
- state = state.arg(rollAilerons).arg(pitchElevator).arg(yawRudder).arg(true).arg(throttle);
-@@ -240,7 +240,7 @@ void QGCFlightGearLink::updateControls(quint64 time, float rollAilerons, float p
- }
- else
- {
-- qDebug() << "HIL: Got NaN values from the hardware: isnan output: roll: " << isnan(rollAilerons) << ", pitch: " << isnan(pitchElevator) << ", yaw: " << isnan(yawRudder) << ", throttle: " << isnan(throttle);
-+ qDebug() << "HIL: Got NaN values from the hardware: std::isnan output: roll: " << std::isnan(rollAilerons) << ", pitch: " << std::isnan(pitchElevator) << ", yaw: " << std::isnan(yawRudder) << ", throttle: " << std::isnan(throttle);
- }
- }
-
-diff --git a/src/comm/QGCJSBSimLink.cc b/src/comm/QGCJSBSimLink.cc
-index 1210621..89db371 100644
---- a/src/comm/QGCJSBSimLink.cc
-+++ b/src/comm/QGCJSBSimLink.cc
-@@ -242,7 +242,7 @@ void QGCJSBSimLink::updateControls(quint64 time, float rollAilerons, float pitch
- Q_UNUSED(systemMode);
- Q_UNUSED(navMode);
-
-- if(!isnan(rollAilerons) && !isnan(pitchElevator) && !isnan(yawRudder) && !isnan(throttle))
-+ if(!std::isnan(rollAilerons) && !std::isnan(pitchElevator) && !std::isnan(yawRudder) && !std::isnan(throttle))
- {
- QString state("%1\t%2\t%3\t%4\t%5\n");
- state = state.arg(rollAilerons).arg(pitchElevator).arg(yawRudder).arg(true).arg(throttle);
-@@ -250,7 +250,7 @@ void QGCJSBSimLink::updateControls(quint64 time, float rollAilerons, float pitch
- }
- else
- {
-- qDebug() << "HIL: Got NaN values from the hardware: isnan output: roll: " << isnan(rollAilerons) << ", pitch: " << isnan(pitchElevator) << ", yaw: " << isnan(yawRudder) << ", throttle: " << isnan(throttle);
-+ qDebug() << "HIL: Got NaN values from the hardware: isnan output: roll: " << std::isnan(rollAilerons) << ", pitch: " << std::isnan(pitchElevator) << ", yaw: " << std::isnan(yawRudder) << ", throttle: " << std::isnan(throttle);
- }
- //qDebug() << "Updated controls" << state;
- }
-diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
-index 4d5c1c2..ac88852 100644
---- a/src/uas/UAS.cc
-+++ b/src/uas/UAS.cc
-@@ -558,7 +558,7 @@ void UAS::receiveMessage(mavlink_message_t message)
-
- setAltitudeAMSL(hud.alt);
- setGroundSpeed(hud.groundspeed);
-- if (!isnan(hud.airspeed))
-+ if (!std::isnan(hud.airspeed))
- setAirSpeed(hud.airspeed);
- speedZ = -hud.climb;
- emit altitudeChanged(this, altitudeAMSL, altitudeRelative, -speedZ, time);
-@@ -654,7 +654,7 @@ void UAS::receiveMessage(mavlink_message_t message)
-
- float vel = pos.vel/100.0f;
- // Smaller than threshold and not NaN
-- if ((vel < 1000000) && !isnan(vel) && !isinf(vel)) {
-+ if ((vel < 1000000) && !std::isnan(vel) && !std::isinf(vel)) {
- setGroundSpeed(vel);
- emit speedChanged(this, groundSpeed, airSpeed, time);
- } else {
-@@ -1439,8 +1439,8 @@ void UAS::setExternalControlSetpoint(float roll, float pitch, float yaw, float t
- if (countSinceLastTransmission++ >= 5) {
- sendCommand = true;
- countSinceLastTransmission = 0;
-- } else if ((!isnan(roll) && roll != manualRollAngle) || (!isnan(pitch) && pitch != manualPitchAngle) ||
-- (!isnan(yaw) && yaw != manualYawAngle) || (!isnan(thrust) && thrust != manualThrust) ||
-+ } else if ((!std::isnan(roll) && roll != manualRollAngle) || (!std::isnan(pitch) && pitch != manualPitchAngle) ||
-+ (!std::isnan(yaw) && yaw != manualYawAngle) || (!std::isnan(thrust) && thrust != manualThrust) ||
- buttons != manualButtons) {
- sendCommand = true;
-
-diff --git a/src/ui/QGCDataPlot2D.cc b/src/ui/QGCDataPlot2D.cc
-index 2e530b2..9d5a774 100644
---- a/src/ui/QGCDataPlot2D.cc
-+++ b/src/ui/QGCDataPlot2D.cc
-@@ -535,7 +535,7 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
- {
- bool okx = true;
- x = text.toDouble(&okx);
-- if (okx && !isnan(x) && !isinf(x))
-+ if (okx && !std::isnan(x) && !std::isinf(x))
- {
- headerfound = true;
- }
-@@ -561,7 +561,7 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
- y = text.toDouble(&oky);
- // Only INF is really an issue for the plot
- // NaN is fine
-- if (oky && !isnan(y) && !isinf(y) && text.length() > 0 && text != " " && text != "\n" && text != "\r" && text != "\t")
-+ if (oky && !std::isnan(y) && !std::isinf(y) && text.length() > 0 && text != " " && text != "\n" && text != "\r" && text != "\t")
- {
- // Only append definitely valid values
- xValues.value(curveName)->append(x);
---
-2.7.4
-
diff --git a/pkgs/applications/search/recoll/nodeblayout.patch b/pkgs/applications/search/recoll/nodeblayout.patch
deleted file mode 100644
index 39988423ae1f13325ee0dfa30e82e3748eb80ed4..0000000000000000000000000000000000000000
--- a/pkgs/applications/search/recoll/nodeblayout.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru recoll-1.21.3-orig/recollinstall.in recoll-1.21.3/recollinstall.in
---- recoll-1.21.3-orig/recollinstall.in 2015-09-28 08:08:42.000000000 +0100
-+++ recoll-1.21.3/recollinstall.in 2015-12-13 22:48:30.361776374 +0000
-@@ -45,9 +45,6 @@
- mandir=$DESTDIR/$mandir
- ROOTFORPYTHON="--root=${DESTDIR}"
- fi
--if test -f /etc/debian_version ; then
-- OPTSFORPYTHON=--install-layout=deb
--fi
-
- echo "Installing to $PREFIX"
diff --git a/pkgs/applications/search/recoll/versionawk.patch b/pkgs/applications/search/recoll/versionawk.patch
deleted file mode 100644
index a03ffbc16df14eb27d3e1f39bf551b4dec36e29e..0000000000000000000000000000000000000000
--- a/pkgs/applications/search/recoll/versionawk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru recoll-1.21.3-orig/filters/rclpdf recoll-1.21.3/filters/rclpdf
---- recoll-1.21.3-orig/filters/rclpdf 2015-09-28 08:08:15.000000000 +0100
-+++ recoll-1.21.3/filters/rclpdf 2015-12-14 21:37:01.984945925 +0000
-@@ -129,7 +129,7 @@
- {
- # Test poppler version: at some point before 0.24, poppler began
- # to properly escape text inside the header (but not the body).
-- XYZ=`pdftotext -v 2>&1 | awk '/pdftotext/{print $3}'`
-+ XYZ=`pdftotext -v 2>&1 | awk '/version/{print $3}'`
- MAJOR=`echo $XYZ | cut -d. -f 1`
- MINOR=`echo $XYZ | cut -d. -f 2`
- escapeheader=1
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index d0f79600e8ce975d472fb91fce2e867253732d6d..d4b60a4f5386ca939ac383559b650d4700e01c97 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
name = "fossil-${version}";
- version = "2.8";
+ version = "2.9";
src = fetchurl {
urls =
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${name}.tar.gz";
- sha256 = "0pbinf8d2kj1j7niblhzjd2l2khg6r2pn2xvig6gavz27p3vwcka";
+ sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw";
};
buildInputs = [ zlib openssl readline sqlite which ed ]
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 5bfd74344e8c1238440904d06b3aaedcc1600379..6b25ef8518c9a99ca3ca3935fb88f700f1b434cc 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
+{ stdenv, fetchurl, fetchpatch, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xsl, pkgconfig, luajit
-, groff, gzip, bzip2, xz
+, coreutils, gnused, groff, docutils
+, gzip, bzip2, xz
, python, wrapPython, pygments, markdown
}:
@@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
};
+ patches = [
+ (fetchpatch {
+ name = "prevent-dos-limit-path-length.patch";
+ url = "https://git.zx2c4.com/cgit/patch/?id=54c407a74a35d4ee9ffae94cc5bc9096c9f7f54a";
+ sha256 = "1qlbpqsc293lmc9hzwf1j4jr5qlv8cm1r249v3yij5s4wki1595j";
+ })
+ ];
+
nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
buildInputs = [
openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
@@ -35,6 +44,9 @@ stdenv.mkDerivation rec {
substituteInPlace filters/html-converters/man2html \
--replace 'groff' '${groff}/bin/groff'
+
+ substituteInPlace filters/html-converters/rst2html \
+ --replace 'rst2html.py' '${docutils}/bin/rst2html.py'
'';
# Give cgit a git source tree and pass configuration parameters (as make
@@ -57,6 +69,10 @@ stdenv.mkDerivation rec {
cp cgitrc.5 "$out/share/man/man5"
wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
+
+ for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do
+ wrapProgram $script --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gnused ]}'
+ done
'';
meta = {
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 4f46fd5560122c056e262960e08871565fe06e2d..5068647e8798cd6fa120df6ddd2c1f1d8fd8d717 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -89,6 +89,10 @@ let
git-extras = callPackage ./git-extras { };
+ git-gone = callPackage ./git-gone {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
git-hub = callPackage ./git-hub { };
git-ignore = callPackage ./git-ignore { };
@@ -113,6 +117,8 @@ let
git-secrets = callPackage ./git-secrets { };
+ git-standup = callPackage ./git-standup { };
+
git-stree = callPackage ./git-stree { };
git-sync = callPackage ./git-sync { };
@@ -127,6 +133,8 @@ let
gitflow = callPackage ./gitflow { };
+ gitstatus = callPackage ./gitstatus { };
+
grv = callPackage ./grv { };
hub = callPackage ./hub {
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 90b83348ef14398b2a9c417da509520bfdbb3ad7..1af2170e1699d1e2aa222960e5098f87077227c6 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "diff-so-fancy-${version}";
- version = "1.2.5";
+ version = "1.2.6";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
- sha256 = "1jqq7zd75aypxchrq0vjcw5gyn3wyjqy6w79mq2lzky8m6mqn8vr";
+ sha256 = "1w8x2d83zdhrnydiqq1qjf3j1y4cawdg8p1isj8zqwblnc47ygjm";
};
# Perl is needed here for patchShebangs
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index fd50febb4699154406c4b4fdb43df893a6369d06..c9fd33312d7216273a185b9bcab3493462ce7761 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -1,41 +1,42 @@
-{stdenv, fetchgit, mercurial, makeWrapper, subversion}:
+{stdenv, fetchgit, mercurial, makeWrapper}:
-with stdenv.lib;
-stdenv.mkDerivation {
- name = "fast-export";
+stdenv.mkDerivation rec {
+ pname = "fast-export";
+ version = "190107";
src = fetchgit {
url = git://repo.or.cz/fast-export.git;
- rev = "d202200fd9daa75cdb37d4cf067d4ca00e269535";
- sha256 = "0m4llsg9rx4sza1kf39kxsdvhi6y87a18wm5k19c5r2h3vpylwcc";
+ rev = "v${version}";
+ sha256 = "14azfps9jd5anivcvfwflgsvqdyy6gm9jy284kzx2ng9f7871d14";
};
- buildInputs = [mercurial.python mercurial makeWrapper subversion];
+ buildInputs = [mercurial.python mercurial makeWrapper];
- dontBuild = true; # skip svn for now
-
- # TODO also support svn stuff
- # moving .py files into lib directory so that you can't pick the wrong file from PATH.
- # This requires redefining ROOT
installPhase = ''
- sed -i "s@/usr/bin/env.*@$(type -p python)@" *.py
- l=$out/libexec/git-fast-export
- mkdir -p $out/{bin,doc/git-fast-export} $l
- sed -i "s@ROOT=.*@ROOT=$l@" *.sh
- mv *.sh $out/bin
- mv *.py $l
- for p in $out/bin/*.sh; do
- wrapProgram $p \
- --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" \
- --prefix PATH : "$(dirname $(type -p python))":$l
+ binPath=$out/bin
+ libexecPath=$out/libexec/${pname}
+ sitepackagesPath=$out/${mercurial.python.sitePackages}
+ mkdir -p $binPath $libexecPath $sitepackagesPath
+
+ # Patch shell scripts so they can execute the Python scripts
+ sed -i "s|ROOT=.*|ROOT=$libexecPath|" *.sh
+
+ mv hg-fast-export.sh hg-reset.sh $binPath
+ mv hg-fast-export.py hg-reset.py $libexecPath
+ mv hg2git.py pluginloader plugins $sitepackagesPath
+
+ for script in $out/bin/*.sh; do
+ wrapProgram $script \
+ --prefix PATH : "${mercurial.python}/bin":$libexec \
+ --prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath
done
'';
- meta = {
- description = "Import svn, mercurial into git";
+ meta = with stdenv.lib; {
+ description = "Import mercurial into git";
homepage = https://repo.or.cz/w/fast-export.git;
license = licenses.gpl2;
maintainers = [ maintainers.koral ];
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
index 17e2bfee40b55bcd5d31cc081de7969e69ed18b3..509fc73a3f35dfd20853926c76dc3fe91076d8f8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
rustPlatform.buildRustPackage rec {
- name = "git-absorb-${version}";
- version = "0.3.0";
+ pname = "git-absorb";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "tummychow";
- repo = "git-absorb";
+ repo = pname;
rev = "refs/tags/${version}";
- sha256 = "1dm442lyk7f44bshm2ajync5pzdwvdc5xfpw2lkvjzxflmh5572z";
+ sha256 = "1clmd1b90vppbzng1kq0vzfh7964m3fk64q6h1vfcd1cfqj63r5v";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
- cargoSha256 = "0fvxs09b9x38vp0psvlvbj09myxrhabp95pp3nz7nxsgr7fxflrr";
+ cargoSha256 = "0q40qcki49dw23n3brgdz5plvigmsf61jm0kfy48j89mijih8zy7";
meta = with stdenv.lib; {
- inherit (src.meta) homepage;
+ homepage = "https://github.com/tummychow/git-absorb";
description = "git commit --fixup, but automatic";
license = [ licenses.bsd3 ];
maintainers = [ maintainers.marsam ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
index 206a4af91212d4dfc575f673c60ee1995c68e4ab..fbbb2d9524222c15bbb5d8f4a060099928536826 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
};
- cargoSha256 = "0rdmv9s86xba1zkl2j5rgix6k7pkkxqmpar03sak2fjrd7mh8iz0";
+ cargoSha256 = "1k5gxbjv4a8l5y9rm0n4vwzlwp4hk1rb59v0wvcirmj0p7hpw9x9";
meta = with lib; {
homepage = "https://github.com/softprops/git-codeowners";
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 3020e7d64aa84293a48dfe0e1e6b64c97eca3d21..060de50f9b792f40a6fe1b2e98166164f74f4d15 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -5,13 +5,13 @@ let
in buildPythonApplication rec {
name = "git-cola-${version}";
- version = "3.3";
+ version = "3.4";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
- sha256 = "0gfbzcmaqg6hdy2cfpshgcwh8zgj1ia1vd95i5xdrsvksgb8fq2j";
+ sha256 = "0754d56dprhb1nhb8fwp4my5pyqcgarwzba1l6zx7il87d7vyi5m";
};
buildInputs = [ git gettext ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index 2163855d00e1d4481bfaf14912ceab5c37c91903..6a39f1fe3d1f218cec2e1735b59b8529ba9027f7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, git, gnupg1compat, makeWrapper, openssl, stdenv }:
+{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv }:
stdenv.mkDerivation rec {
name = "git-crypt-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = ''
make install PREFIX=$out
- wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg1compat}/bin
+ wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 473f0b1c450d4d322a4aef21f7ab6e28894e0811..7385905cc9d9934c9949f3a29226a6794fe1d045 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -26,7 +26,7 @@ buildRustPackage rec {
sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2";
};
- cargoSha256 = "08zbvjwjdpv2sbj6mh73py82inhs18jvmh8m9k4l94fcz6ykgqwr";
+ cargoSha256 = "10852131aizfw9j1yl4gz180h4gd8y5ymx3wmf5v9cmqiqxy8bgy";
nativeBuildInputs = [
cmake
diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d445e0181f434b275572c99382504e35a4031737
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, curl, libiconv, Security }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "git-gone";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "lunaryorn";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0vgkx227wpg9l2zza6446wzshjhnrhba3qhabibn4gg8wwcqmmxf";
+ };
+
+ cargoSha256 = "11h2whlgjhg3j98a9w9k29njj89wx93w0dcyf981985flin709sx";
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ openssl ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ];
+
+ meta = with stdenv.lib; {
+ description = "Cleanup stale Git branches of pull requests";
+ homepage = "https://github.com/lunaryorn/git-gone";
+ license = licenses.asl20;
+ maintainers = [ maintainers.marsam ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
index df1f007faa75d6250107c1a7aa6052b19e87d033..99be85e09b1e5a4306a27413670644632ff59e5d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c";
};
- cargoSha256 = "0r6whz8vghhjyc5vrr0n172nghmi61zj96lk26qm0bgxqyzll1kj";
+ cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index c52a78ff0076cb051263f4a9c0f094b360481c44..628c7dbac7f398bc03a7fd7b3d9eaf292e85fe30 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- name = "git-recent-${version}";
- version = "1.1.0";
+ pname = "git-recent";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "paulirish";
repo = "git-recent";
rev = "v${version}";
- sha256 = "06r1jzmzdv3d4vxdh5qyf5g5rgavxfmh2rpbs7a7byg3k7d77hpn";
+ sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index 5a5b666b7cdf0430e2834faa631f29dea39c1dd8..d1dce04697930a1e7aab4258de7fa3bca040ae61 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, docutils, makeWrapper
-, gnupg1compat, curl, rsync, coreutils
+, gnupg, curl, rsync, coreutils
, gawk, gnused, gnugrep
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
installPhase = ''
prefix="$out" ./install.sh
wrapProgram "$out/bin/git-remote-gcrypt" \
- --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync coreutils
+ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg curl rsync coreutils
gawk gnused gnugrep ]}"
'';
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index a93682f0c2e8028fcbc79b0b38373cb80f356319..7d6b620e2239779dfaf5184736a6c76c0b5172c2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/mnauw/git-remote-hg;
description = "Semi-official Mercurial bridge from Git project";
license = licenses.gpl2;
- maintainers = [ maintainers.garbas ];
+ maintainers = [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
index 1ade31fd6835e3a662ce80b98235bfc44005d230..62fbab02292dddbff8c7c882dda4b52211479f56 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }:
let
- version = "0.2.5";
+ version = "0.2.6";
repo = "git-secret";
in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
inherit repo;
owner = "sobolevn";
rev = "v${version}";
- sha256 = "1caxdx1ps662vfa79f7l1bwgwgwf974ahzii0hzaqfnkxy45i520";
+ sha256 = "09p4h8mdmk0nzcd1jh1i6n29klz38n5vqqwdyzjkygmr2xqka55b";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c7488e84d5d0be01799986de456ab0f13e3322ce
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, makeWrapper, git }:
+
+stdenv.mkDerivation rec {
+ pname = "git-standup";
+ version = "2.3.1";
+
+ src = fetchFromGitHub {
+ owner = "kamranahmedse";
+ repo = pname;
+ rev = version;
+ sha256 = "0wx9ypyxhpjbrasl6264jmj9fjrpg3gn93dg00cakabz3r7yxxq3";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ install -Dm755 -t $out/bin git-standup
+
+ wrapProgram $out/bin/git-standup \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Recall what you did on the last working day";
+ homepage = "https://github.com/kamranahmedse/git-standup";
+ license = licenses.mit;
+ maintainers = [ maintainers.marsam ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index c76b82ffe6d453cdfd6e4b14cb4e3e6c2c436453..3acfd4bc4001efed3dea661084a08cf288b1b004 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.21.0";
+ version = "2.22.0";
svn = subversionClient.override { perlBindings = perlSupport; };
in
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc";
+ sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm";
};
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
@@ -96,7 +96,9 @@ stdenv.mkDerivation {
postBuild = ''
make -C contrib/subtree
- '' + (stdenv.lib.optionalString stdenv.isDarwin ''
+ '' + (stdenv.lib.optionalString perlSupport ''
+ make -C contrib/diff-highlight
+ '') + (stdenv.lib.optionalString stdenv.isDarwin ''
make -C contrib/credential/osxkeychain
'') + (stdenv.lib.optionalString withLibsecret ''
make -C contrib/credential/libsecret
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1de631e8b6ad63c7464ee32e4a14d1c81684f7d3
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -0,0 +1,30 @@
+{callPackage, stdenv, fetchFromGitHub, ...}:
+
+stdenv.mkDerivation rec {
+ pname = "gitstatus";
+ version = "unstable-2019-05-06";
+
+ src = fetchFromGitHub {
+ owner = "romkatv";
+ repo = "gitstatus";
+ rev = "9c791f93c23c04dadfab8b4309a863b62a6ee424";
+ sha256 = "0jbdrgl62x6j920h72n2q6304fb6gdgnmllpv4aa76m13b9qhgq6";
+ };
+
+ buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
+ patchPhase = ''
+ sed -i "s|local daemon.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh
+ '';
+ installPhase = ''
+ install -Dm755 gitstatusd $out/bin/gitstatusd
+ install -Dm444 gitstatus.plugin.zsh $out
+ '';
+
+ meta = with stdenv.lib; {
+ description = "10x faster implementation of `git status` command";
+ homepage = https://github.com/romkatv/gitstatus;
+ license = [ licenses.gpl3 ];
+
+ maintainers = [ maintainers.mmlb ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
new file mode 100644
index 0000000000000000000000000000000000000000..22f35e22fb540cb006a567adc8223baa82fd4aea
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
@@ -0,0 +1,19 @@
+{fetchFromGitHub, libgit2, ...}:
+
+libgit2.overrideAttrs (oldAttrs: rec {
+ cmakeFlags = oldAttrs.cmakeFlags ++ [
+ "-DUSE_BUNDLED_ZLIB=ON"
+ "-DUSE_ICONV=OFF"
+ "-DBUILD_CLAR=OFF"
+ "-DUSE_SSH=OFF"
+ "-DUSE_HTTPS=OFF"
+ "-DBUILD_SHARED_LIBS=OFF"
+ "-DUSE_EXT_HTTP_PARSER=OFF"
+ ];
+ src = fetchFromGitHub {
+ owner = "romkatv";
+ repo = "libgit2";
+ rev = "aab6c56e6766fa752bef00c745067d875925fc89";
+ sha256 = "1yqqhpi5xi6s86411sixw4yq5c6n2v8pdh447c8b7q5lfc089lvl";
+ };
+})
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index 32c163c45c417a8a3d3aea2dd3919e9599a9638d..b7828418db07e5d6d02ed5009e0a697dfc3bd937 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
+{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }:
let
version = "0.3.1";
in
buildGoPackage {
name = "grv-${version}";
- buildInputs = [ ncurses readline curl libgit2_0_27 ];
+ buildInputs = [ ncurses readline curl libgit2 ];
nativeBuildInputs = [ pkgconfig ];
goPackagePath = "github.com/rgburke/grv";
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 24679085a6558435f213c9f1e8877b544cf49cd0..82d98b95966bc65e2e65ea4f0b15b000243947d4 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "hub";
- version = "2.11.2";
+ version = "2.12.2";
goPackagePath = "github.com/github/hub";
@@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "github";
repo = pname;
rev = "v${version}";
- sha256 = "11ipc2vpy52r1ql9r4iyam1sjchb7f01ffc39fvz6d5hhjaz3i9b";
+ sha256 = "0sxfmjg26s86m5xa9nbj8287kg12kygxw6gggahal6v7zjhwcvaz";
};
nativeBuildInputs = [ groff utillinux ];
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index 347d4469f063b5d497a659edbb3220db0e13e88b..a1ef489b0073e1c8c1e8704b5119288d0527d8a1 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lab";
- version = "0.15.3";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
- sha256 = "00c0ljyvcqrzzcsdb3r37lxd4z2wvwp80ggs8jvp7y32p1b61bsg";
+ sha256 = "0f1gi4mlcxjvz2sgh0hzzsqxg5gfvq2ay7xjd0y1kz3pp8kxja7i";
};
subPackages = [ "." ];
@@ -16,15 +16,16 @@ buildGoModule rec {
modSha256 = "0bw47dd1b46ywsian2b957a4ipm77ncidipzri9ra39paqlv7abb";
postInstall = ''
- mkdir -p $out/share/zsh/site-functions
- LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c \
+ mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions"
+ export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c
+ $out/bin/lab completion bash > $out/share/bash-completion/completions/lab
$out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab
'';
meta = with stdenv.lib; {
description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
homepage = https://zaquestion.github.io/lab;
- license = licenses.unlicense;
+ license = licenses.cc0;
maintainers = with maintainers; [ marsam dtzWill ];
platforms = platforms.all;
};
diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
index 8c4c4ea87735d981de94c4b055da0b259dce4b2c..ed44043eb9a9e342de6ef909de516026ec5c50e9 100644
--- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
@@ -1,12 +1,12 @@
{ stdenv, python3Packages }:
with python3Packages; buildPythonApplication rec {
pname = "pre-commit";
- version = "1.15.2";
+ version = "1.17.0";
src = fetchPypi {
inherit version;
pname = "pre_commit";
- sha256 = "1if44rfzmrw9m2k47kiplccby1lfdrlq82jlz4p91wwqc1vs4xi5";
+ sha256 = "1qswk30w2cq8xvj16mhszsi3npp0z08s8lki1w67nif23c2kkk6c";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 0ee188cc19d08c46f7f658113f95d19b2c9e228f..34c367b20a438bf599f45d64edd3a5cb19b4e7f0 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }:
let
- version = "1.0.13";
+ version = "1.0.16";
in
stdenv.mkDerivation {
name = "svn-all-fast-export-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
owner = "svn-all-fast-export";
repo = "svn2git";
rev = version;
- sha256 = "0f1qj0c4cdq46mz54wcy17g7rq1fy2q0bq3sswhr7r5a2s433x4f";
+ sha256 = "1xs3gngjkna458liaqjsc8ryld03mdmvycnkzwsgyzfxsgjx1i3l";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index a407f6e7ab127d03f464c297798cdd9ff546914d..e9862cb4897540962589b0a1f20afba1fdc16ffb 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://jonas.github.io/tig/;
description = "Text-mode interface for git";
- maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ];
+ maintainers = with maintainers; [ bjornfor domenkozar qknight ];
license = licenses.gpl2;
platforms = platforms.unix;
};
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index 35e9c17438f7b1d07a795eb1da731d01a22c0c33..cea588f76ca29a894d249d8149bee0d2180764da 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, makeWrapper, openssl }:
+{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }:
stdenv.mkDerivation rec {
name = "transcrypt-${version}";
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";
};
- buildInputs = [ git makeWrapper openssl ];
+ buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ];
+
+ patches = [ ./helper-scripts_depspathprefix.patch ];
installPhase = ''
install -m 755 -D transcrypt $out/bin/transcrypt
@@ -20,7 +22,13 @@ stdenv.mkDerivation rec {
install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt
wrapProgram $out/bin/transcrypt \
- --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl ]}"
+ --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}"
+
+ cat > $out/bin/transcrypt-depspathprefix << EOF
+ #!${stdenv.shell}
+ echo "${stdenv.lib.makeBinPath [ git openssl coreutils gawk ]}:"
+ EOF
+ chmod +x $out/bin/transcrypt-depspathprefix
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..925aadab3dd598bfb80b71f1990f5f454334a5eb
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch
@@ -0,0 +1,37 @@
+diff --git a/transcrypt b/transcrypt
+index a0b562d..7888f5d 100755
+--- a/transcrypt
++++ b/transcrypt
+@@ -278,6 +278,7 @@ save_helper_scripts() {
+
+ cat <<-'EOF' > "${GIT_DIR}/crypt/clean"
+ #!/usr/bin/env bash
++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
+ filename=$1
+ # ignore empty files
+ if [[ -s $filename ]]; then
+@@ -300,6 +301,7 @@ save_helper_scripts() {
+
+ cat <<-'EOF' > "${GIT_DIR}/crypt/smudge"
+ #!/usr/bin/env bash
++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
+ tempfile=$(mktemp 2> /dev/null || mktemp -t tmp)
+ trap 'rm -f "$tempfile"' EXIT
+ cipher=$(git config --get --local transcrypt.cipher)
+@@ -309,6 +311,7 @@ save_helper_scripts() {
+
+ cat <<-'EOF' > "${GIT_DIR}/crypt/textconv"
+ #!/usr/bin/env bash
++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
+ filename=$1
+ # ignore empty files
+ if [[ -s $filename ]]; then
+@@ -351,7 +354,7 @@ save_configuration() {
+ git config merge.renormalize 'true'
+
+ # add a git alias for listing encrypted files
+- git config alias.ls-crypt "!git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
++ git config alias.ls-crypt "!PATH=\"\$(transcrypt-depspathprefix 2>/dev/null)\$PATH\"; git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
+ }
+
+ # display the current configuration settings
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 67c07072d41f8ba65a296f32d8e145a8e12543d8..92ba57382501c03024309b1181004074b8ebaa3b 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "git-lfs-${version}";
- version = "2.5.2";
+ version = "2.7.2";
goPackagePath = "github.com/git-lfs/git-lfs";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "git-lfs";
repo = "git-lfs";
- sha256 = "1y9l35j59d422v9hsbi117anm5d0177nspiy9r2zbjz3ygd9a4ck";
+ sha256 = "1nf40rbdz901vsahg5cm09pznpina6wimmxl0lmh8pn0mi51yzvc";
};
preBuild = ''
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index b629c8fe9109b480e32726bf237f586d6e066369..04ae45f75b397ba028c4fadcc26bad39d4dcd9e2 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "git-repo-${version}";
- version = "1.13.2";
+ version = "1.13.3";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
- sha256 = "0ll1yzwgpayps7c05j8kf1m4zvww7crmlyy7xa0w5g2krbjvjzvi";
+ sha256 = "0wyr6fyc9kzzw6y2cxvri35ib1sh156n6lnv119j5r1rzvc2lg6r";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 25d839e13616f1c1fe6d97ae0d62447950233dfd..748e473be3dd62fcfdf44bb9117760214aa5e5f4 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.8.0";
+ version = "1.8.3";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "1x5r732rh1g23smgvvk10nlqbv14m7cf3y6zgwwl2bwkvax4z49b";
+ sha256 = "1q3wslf9s4dg7h1f41rh9rb7qlbsqz8k3xffmlzdbbgfdrm7sym1";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
@@ -64,6 +64,6 @@ buildGoPackage rec {
description = "Git with a cup of tea";
homepage = https://gitea.io;
license = licenses.mit;
- maintainers = [ maintainers.disassembler ];
+ maintainers = with maintainers; [ disassembler kolaente ];
};
}
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 8b807d11e34a5f7519587873fe9ffa767a1be8f5..12d22e2cc3caaa6fb8ba1ae325b4164c0c0727a5 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -2,7 +2,7 @@
, libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
-, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme
+, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid
}:
with stdenv.lib;
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "gitkraken-${version}";
- version = "5.0.4";
+ version = "6.0.0";
src = fetchurl {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
- sha256 = "1fq0w8djkcx5jr2pw6izlq5rkwbq3r3f15xr3dmmbz6gjvi3nra0";
+ sha256 = "1ykjdnzl34pqr6dhfnswix44i412c7gcba1pk95a8670wmc29a1f";
};
libPath = makeLibraryPath [
@@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
gnome2.GConf
libgnome-keyring
openssl
+ at-spi2-atk
+ libuuid
];
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 376e00a3da876a53fb81bd4289bc5719e328eca1..5afb8c8ee5d205528d51c2ddba31032a57f30d6f 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,32 +1,32 @@
{
"ce": {
- "version": "11.9.11",
- "repo_hash": "08f824y6zla4076axdjwcn59hnybps2zvqjhrznfwnhwmak7zqr6",
- "deb_hash": "17cp3vr8pq0l7pgrcmwrmlsygk7ggdvjhh71vjcdlmngaffmv5hm",
- "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.11-ce.0_amd64.deb/download.deb",
+ "version": "11.10.8",
+ "repo_hash": "1ygwkajkwhr2vzkzljfj6l1ypvmmzj9ps8ijha5m9qglkzjz0gsn",
+ "deb_hash": "1b66yw0i795pahainx3rpqaliffmn5py0ws8is8f5hr7cghchln0",
+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.8-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ce",
- "rev": "v11.9.11",
+ "rev": "v11.10.8",
"passthru": {
- "GITALY_SERVER_VERSION": "1.27.2",
+ "GITALY_SERVER_VERSION": "1.34.3",
"GITLAB_PAGES_VERSION": "1.5.0",
- "GITLAB_SHELL_VERSION": "8.7.1",
- "GITLAB_WORKHORSE_VERSION": "8.3.3"
+ "GITLAB_SHELL_VERSION": "9.0.0",
+ "GITLAB_WORKHORSE_VERSION": "8.5.2"
}
},
"ee": {
- "version": "11.9.11",
- "repo_hash": "0nsp3lxxh8gmkafa5a5jxi78n9w8v7gij4l4lka2d1wzfkhgzjph",
- "deb_hash": "1qr8zbwlj99gqxj0cziy5z9hnaxb5lilgf46k4przkd2lhg5s0c0",
- "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.11-ee.0_amd64.deb/download.deb",
+ "version": "11.10.8",
+ "repo_hash": "1vw0d99w5bvagbl9xia5ik3754s7jgkh01b3wm77snfkcg31psb6",
+ "deb_hash": "05fsjxlr56zv4wc90r6ns81n5h1ykafjsi8vq6h22gzxjjvaay7m",
+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.8-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ee",
- "rev": "v11.9.11-ee",
+ "rev": "v11.10.8-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "1.27.2",
+ "GITALY_SERVER_VERSION": "1.34.3",
"GITLAB_PAGES_VERSION": "1.5.0",
- "GITLAB_SHELL_VERSION": "8.7.1",
- "GITLAB_WORKHORSE_VERSION": "8.3.3"
+ "GITLAB_SHELL_VERSION": "9.0.0",
+ "GITLAB_WORKHORSE_VERSION": "8.5.2"
}
}
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 2ffe1141b5a0437169745a0f529f5abfba99889d..6ac1a9d68616e9ae4b59a161ea10e34f414bddaa 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
-, ruby, tzdata, git, procps, nettools
+, ruby, tzdata, git, nettools, nixosTests
, gitlabEnterprise ? false
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
src = sources.gitlab;
buildInputs = [
- rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools
+ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools
];
patches = [ ./remove-hardcoded-locations.patch ];
@@ -49,9 +49,6 @@ stdenv.mkDerivation rec {
rm config/initializers/gitlab_shell_secret_token.rb
- substituteInPlace app/controllers/admin/background_jobs_controller.rb \
- --replace "ps -U" "${procps}/bin/ps -U"
-
sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb
'';
@@ -95,6 +92,9 @@ stdenv.mkDerivation rec {
GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION;
GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION;
GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION;
+ tests = {
+ nixos-test-passes = nixosTests.gitlab;
+ };
};
meta = with lib; {
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 8a8ce5771cf4ae260d693a45e442b87a404f7ba7..c111744a1a18e13e28c8ccdcaa979d52dde679db 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -5,14 +5,14 @@ gem 'bundler', '>= 1.16.5'
gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 6.1', require: 'linguist'
-gem 'gitlab-markup', '~> 1.6.5'
-gem 'gitaly-proto', '~> 1.13.0'
+gem 'gitlab-markup', '~> 1.7.0'
+gem 'gitaly-proto', '~> 1.22.0'
gem 'activesupport', '~> 5.0.2'
gem 'rdoc', '~> 4.2'
-gem 'gitlab-gollum-lib', '~> 4.2', require: false
-gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
+gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
+gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
gem 'grpc', '~> 1.15.0'
-gem 'sentry-raven', '~> 2.7.2', require: false
+gem 'sentry-raven', '~> 2.9.0', require: false
gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index 4deb64c4cd5bd7a845ea67e01f1511e8e8bf0e95..fec103a23a40f09152f1d7c12707e1c1375d88fc 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
- activesupport (5.0.7)
+ activesupport (5.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -36,15 +36,15 @@ GEM
ffi (1.10.0)
gemojione (3.3.0)
json
- gitaly-proto (1.13.0)
+ gitaly-proto (1.22.0)
grpc (~> 1.0)
- github-linguist (6.2.0)
+ github-linguist (6.4.1)
charlock_holmes (~> 0.7.6)
escape_utils (~> 1.2.0)
mime-types (>= 1.19)
rugged (>= 0.25.1)
github-markup (1.7.0)
- gitlab-gollum-lib (4.2.7.5)
+ gitlab-gollum-lib (4.2.7.7)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
@@ -52,7 +52,7 @@ GEM
rouge (~> 3.1)
sanitize (~> 4.6.4)
stringex (~> 2.6)
- gitlab-gollum-rugged_adapter (0.4.4.1)
+ gitlab-gollum-rugged_adapter (0.4.4.2)
mime-types (>= 1.15)
rugged (~> 0.25)
gitlab-grit (2.8.2)
@@ -60,20 +60,20 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
- gitlab-markup (1.6.5)
+ gitlab-markup (1.7.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
- google-protobuf (3.6.1)
- googleapis-common-protos-types (1.0.3)
+ google-protobuf (3.7.1)
+ googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
grpc (1.15.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
hashdiff (0.3.8)
- i18n (1.1.1)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
- json (2.1.0)
+ json (2.2.0)
licensee (8.9.2)
rugged (~> 0.24)
listen (0.5.3)
@@ -88,7 +88,7 @@ GEM
msgpack (1.2.6)
multi_json (1.13.1)
multipart-post (2.0.0)
- nokogiri (1.10.1)
+ nokogiri (1.10.2)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
@@ -141,20 +141,20 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
- rugged (0.28.0)
+ rugged (0.28.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
- sentry-raven (2.7.4)
+ sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
simplecov (0.9.2)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
- stringex (2.8.4)
+ stringex (2.8.5)
thread_safe (0.3.6)
timecop (0.9.1)
tzinfo (1.2.5)
@@ -182,11 +182,11 @@ DEPENDENCIES
bundler (>= 1.16.5)
factory_bot
faraday (~> 0.12)
- gitaly-proto (~> 1.13.0)
+ gitaly-proto (~> 1.22.0)
github-linguist (~> 6.1)
- gitlab-gollum-lib (~> 4.2)
- gitlab-gollum-rugged_adapter (~> 0.4.4)
- gitlab-markup (~> 1.6.5)
+ gitlab-gollum-lib (~> 4.2.7.7)
+ gitlab-gollum-rugged_adapter (~> 0.4.4.2)
+ gitlab-markup (~> 1.7.0)
google-protobuf (~> 3.6)
grpc (~> 1.15.0)
licensee (~> 8.9.0)
@@ -198,7 +198,7 @@ DEPENDENCIES
rspec-parameterized
rubocop (~> 0.50)
rugged (~> 0.28)
- sentry-raven (~> 2.7.2)
+ sentry-raven (~> 2.9.0)
simplecov (~> 0.9.0)
timecop
vcr (~> 4.0.0)
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 8bb365f3d141bb207d1bb76fbce6e2cf76acde39..fc10c59df94fa46a96ea3f708a222d9d695543db 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
- version = "1.27.2";
+ version = "1.34.3";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "03v8c9ask1f2bk4z51scpm6zh815hcxi5crly5zn7932i2nfvva0";
+ sha256 = "0lv3czkxcan2zv9asd79nn8z1bihyxszi1d5hazmb299v23cppzm";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -27,12 +27,12 @@ in buildGoPackage rec {
postInstall = ''
mkdir -p $ruby
- cp -rv $src/ruby/{bin,lib,git-hooks,vendor} $ruby
+ cp -rv $src/ruby/{bin,lib,git-hooks,gitlab-shell} $ruby
# gitlab-shell will try to read its config relative to the source
# code by default which doesn't work in nixos because it's a
# read-only filesystem
- substituteInPlace $ruby/vendor/gitlab-shell/lib/gitlab_config.rb --replace \
+ substituteInPlace $ruby/gitlab-shell/lib/gitlab_config.rb --replace \
"File.join(ROOT_PATH, 'config.yml')" \
"'/run/gitlab/shell-config.yml'"
'';
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index 61abc97ed548a55a8f280129605ae0784d9ceff1..9b0f37e36bcedf08635a757445f8fa761d61e7db 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -9,12 +9,14 @@
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5";
+ sha256 = "1bcbr490ryw6295p0ja7xigcw0ivkdys90x3qbsbs8c4n1zwcp7p";
type = "gem";
};
- version = "5.0.7";
+ version = "5.0.7.2";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@@ -178,21 +180,25 @@
};
gitaly-proto = {
dependencies = ["grpc"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
+ sha256 = "114q2qnd6196xvzmv3jia4n4j4wm3rizqbvxjd9156g0hc20q6yf";
type = "gem";
};
- version = "1.13.0";
+ version = "1.22.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fs0i5xxsl91hnfa17ipk8cwxrg84kjg9mzxvxkd4ykldfdp353y";
+ sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf";
type = "gem";
};
- version = "6.2.0";
+ version = "6.4.1";
};
github-markup = {
source = {
@@ -204,21 +210,25 @@
};
gitlab-gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
+ sha256 = "13m26b32iznp0lbq984dijx7n4ckg99zckwp80gv1knq8n0bpfbf";
type = "gem";
};
- version = "4.2.7.5";
+ version = "4.2.7.7";
};
gitlab-gollum-rugged_adapter = {
dependencies = ["mime-types" "rugged"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
+ sha256 = "1d32d3yfadzwrarv0biwbfbkz2bqcc0dc3q0imnk962jaay19gc4";
type = "gem";
};
- version = "0.4.4.1";
+ version = "0.4.4.2";
};
gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
@@ -230,12 +240,14 @@
version = "2.8.2";
};
gitlab-markup = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy";
+ sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
type = "gem";
};
- version = "1.6.5";
+ version = "1.7.0";
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
@@ -247,21 +259,25 @@
version = "1.0.1";
};
google-protobuf = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
+ sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
type = "gem";
};
- version = "3.6.1";
+ version = "3.7.1";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
+ sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
type = "gem";
};
- version = "1.0.3";
+ version = "1.0.4";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@@ -282,12 +298,14 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "1.1.1";
+ version = "1.6.0";
};
ice_nine = {
source = {
@@ -298,12 +316,14 @@
version = "0.11.2";
};
json = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+ sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
licensee = {
dependencies = ["rugged"];
@@ -398,12 +418,14 @@
};
nokogiri = {
dependencies = ["mini_portile2"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
+ sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
type = "gem";
};
- version = "1.10.1";
+ version = "1.10.2";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -593,12 +615,14 @@
version = "1.10.0";
};
rugged = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
+ sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
type = "gem";
};
- version = "0.28.0";
+ version = "0.28.1";
};
safe_yaml = {
source = {
@@ -619,12 +643,14 @@
};
sentry-raven = {
dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
+ sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
type = "gem";
};
- version = "2.7.4";
+ version = "2.9.0";
};
simplecov = {
dependencies = ["docile" "multi_json" "simplecov-html"];
@@ -644,12 +670,14 @@
version = "0.9.0";
};
stringex = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
+ sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys";
type = "gem";
};
- version = "2.8.4";
+ version = "2.8.5";
};
thread_safe = {
source = {
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index c3199142da3f948791887cb168f56e2edb7e7969..be0cf838f90895df7a4ebab69ae8500fb36a9d6d 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
- version = "8.7.1";
+ version = "9.0.0";
name = "gitlab-shell-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia";
+ sha256 = "0437pigcgd5qi9ars8br1l058h2mijyv02axlr8wdb1vjsss857g";
};
buildInputs = [ ruby bundler go ];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 6c1bffed51a9de339f7272d4a53440a28af30fae..a98c41699c75e13e4903bc90b91536e602c96a2b 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "gitlab-workhorse-${version}";
- version = "8.3.3";
+ version = "8.5.2";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "08v5ga9qbrs1xciw4cjhsjpqcp6cxzymc2y39la2a4lgb2cgyi10";
+ sha256 = "0c1wpp81wr4x00pmc2z41xh4vy7yk97fkcg0cdy7gbz2hc5cm296";
};
buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index 1fd519d8be41e7fb56dfc52ba29f5785b5cbb159..00f90bdf7e3ab592bd3f7399a59f86cae42e20b0 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
@@ -42,11 +42,11 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'rack-oauth2', '~> 1.2.1'
+gem 'rack-oauth2', '~> 1.9.3'
gem 'jwt', '~> 2.1.0'
# Spam and anti-bot protection
-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
+gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0'
# Two-factor authentication
@@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.7'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.2.0'
-gem 'gitlab-markup', '~> 1.6.5'
+gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2'
@@ -128,7 +128,7 @@ gem 'asciidoctor', '~> 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 2.7.0'
+gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.1'
gem 'escape_utils', '~> 1.1'
@@ -139,10 +139,7 @@ gem 'icalendar'
gem 'diffy', '~> 3.1.0'
# Application server
-# The 2.0.6 version of rack requires monkeypatch to be present in
-# `config.ru`. This can be removed once a new update for Rack
-# is available that contains https://github.com/rack/rack/pull/1201.
-gem 'rack', '2.0.6'
+gem 'rack', '~> 2.0.7'
group :unicorn do
gem 'unicorn', '~> 5.4.1'
@@ -158,7 +155,7 @@ end
gem 'state_machines-activerecord', '~> 0.5.1'
# Issue tags
-gem 'acts-as-taggable-on', '~> 5.0'
+gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
gem 'sidekiq', '~> 5.2.1'
@@ -170,7 +167,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
gem 'fugit', '~> 1.1'
# HTTP requests
-gem 'httparty', '~> 0.13.3'
+gem 'httparty', '~> 0.16.4'
# Colored output to console
gem 'rainbow', '~> 3.0'
@@ -268,9 +265,7 @@ gem 'addressable', '~> 2.5.2'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
-gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'request_store', '~> 1.3'
-gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0'
@@ -424,7 +419,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.22.1', require: 'gitaly'
gem 'grpc', '~> 1.15.0'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index 27a2821cedb27361a32389b6de10e2e4301cede5..d498172b02d338fc00f64faf27a76f1809bc8d38 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -43,8 +43,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- acts-as-taggable-on (5.0.0)
- activerecord (>= 4.2.8)
+ acts-as-taggable-on (6.0.0)
+ activerecord (~> 5.0)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
@@ -65,7 +65,7 @@ GEM
atomic (1.1.99)
attr_encrypted (3.1.0)
encryptor (~> 3.0.0)
- attr_required (1.0.0)
+ attr_required (1.0.1)
awesome_print (1.8.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
@@ -87,7 +87,9 @@ GEM
debug_inspector (>= 0.0.1)
bootsnap (1.4.1)
msgpack (~> 1.0)
- bootstrap_form (2.7.0)
+ bootstrap_form (4.2.0)
+ actionpack (>= 5.0)
+ activemodel (>= 5.0)
brakeman (4.2.1)
browser (2.5.3)
builder (3.2.3)
@@ -260,7 +262,7 @@ GEM
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
- fugit (1.1.7)
+ fugit (1.1.9)
et-orbi (~> 1.1, >= 1.1.7)
raabro (~> 1.1)
fuubar (2.2.0)
@@ -279,12 +281,12 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (1.13.0)
+ gitaly-proto (1.22.1)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
activerecord (>= 3.2.0, < 6.0)
- gitlab-markup (1.6.5)
+ gitlab-markup (1.7.0)
gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5)
gitlab-styles (2.5.1)
@@ -382,8 +384,8 @@ GEM
domain_name (~> 0.5)
http-form_data (2.1.1)
http_parser.rb (0.6.0)
- httparty (0.13.7)
- json (~> 1.8)
+ httparty (0.16.4)
+ mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.6.0)
@@ -401,7 +403,6 @@ GEM
activesupport
multipart-post
oauth (~> 0.5, >= 0.5.0)
- jquery-atwho-rails (1.3.2)
js_regex (3.1.1)
character_set (~> 1.1)
regexp_parser (~> 1.1)
@@ -587,7 +588,7 @@ GEM
atomic (>= 1.0.0)
peek
redis
- pg (1.1.3)
+ pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
powerpack (0.1.1)
@@ -619,18 +620,18 @@ GEM
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6)
- rack (2.0.6)
+ rack (2.0.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
rack
rack-cors (1.0.2)
- rack-oauth2 (1.2.3)
- activesupport (>= 2.3)
- attr_required (>= 0.0.5)
- httpclient (>= 2.4)
- multi_json (>= 1.3.6)
- rack (>= 1.1)
+ rack-oauth2 (1.9.3)
+ activesupport
+ attr_required
+ httpclient
+ json-jwt (>= 1.9.0)
+ rack
rack-protection (2.0.5)
rack
rack-proxy (0.6.0)
@@ -683,7 +684,7 @@ GEM
optimist (>= 3.0.0)
rdoc (6.0.4)
re2 (1.1.1)
- recaptcha (3.0.0)
+ recaptcha (4.13.1)
json
recursive-open-struct (1.1.0)
redis (3.3.5)
@@ -788,7 +789,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
- rugged (0.28.0)
+ rugged (0.28.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@@ -814,12 +815,10 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
- select2-rails (3.5.9.3)
- thor (~> 0.14)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
- sentry-raven (2.7.4)
+ sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
sexp_processor (4.11.0)
@@ -954,7 +953,7 @@ DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
activerecord_sane_schema_dumper (= 1.0)
- acts-as-taggable-on (~> 5.0)
+ acts-as-taggable-on (~> 6.0)
addressable (~> 2.5.2)
akismet (~> 2.0)
asana (~> 0.8.1)
@@ -970,7 +969,7 @@ DEPENDENCIES
better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0)
bootsnap (~> 1.4)
- bootstrap_form (~> 2.7.0)
+ bootstrap_form (~> 4.2.0)
brakeman (~> 4.2)
browser (~> 2.5)
bullet (~> 5.5.0)
@@ -1021,10 +1020,10 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 1.13.0)
+ gitaly-proto (~> 1.22.1)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
- gitlab-markup (~> 1.6.5)
+ gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.1.1)
@@ -1047,12 +1046,11 @@ DEPENDENCIES
hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html2text
- httparty (~> 0.13.3)
+ httparty (~> 0.16.4)
icalendar
influxdb (~> 0.2)
jaeger-client (~> 0.10.0)
jira-ruby (~> 1.4)
- jquery-atwho-rails (~> 1.3.2)
js_regex (~> 3.1)
json-schema (~> 2.8.0)
jwt (~> 2.1.0)
@@ -1106,10 +1104,10 @@ DEPENDENCIES
pry-rails (~> 0.3.4)
puma (~> 3.12)
puma_worker_killer
- rack (= 2.0.6)
+ rack (~> 2.0.7)
rack-attack (~> 4.4.1)
rack-cors (~> 1.0.0)
- rack-oauth2 (~> 1.2.1)
+ rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0)
rails (= 5.0.7.2)
rails-controller-testing
@@ -1121,7 +1119,7 @@ DEPENDENCIES
rbtrace (~> 0.4)
rdoc (~> 6.0)
re2 (~> 1.1.1)
- recaptcha (~> 3.0)
+ recaptcha (~> 4.11)
redis (~> 3.2)
redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2)
@@ -1148,7 +1146,6 @@ DEPENDENCIES
sass-rails (~> 5.0.6)
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
- select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.12)
sentry-raven (~> 2.7)
settingslogic (~> 2.0.9)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index 123fa70678e33cde75261f235e3a206dc5b922af..c24dc185be7aa6181d5b0d3867daae9fd1c1b5a6 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -114,12 +114,14 @@
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i";
+ sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
type = "gem";
};
- version = "5.0.0";
+ version = "6.0.0";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@@ -215,12 +217,14 @@
version = "3.1.0";
};
attr_required = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
+ sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.1";
};
awesome_print = {
source = {
@@ -331,12 +335,15 @@
version = "1.4.1";
};
bootstrap_form = {
+ dependencies = ["actionpack" "activemodel"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw";
+ sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m";
type = "gem";
};
- version = "2.7.0";
+ version = "4.2.0";
};
brakeman = {
source = {
@@ -1054,12 +1061,14 @@
};
fugit = {
dependencies = ["et-orbi" "raabro"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf";
+ sha256 = "1m9fijppafxrb74v4jgbgni82bykyzpfnrlksfa7bw6sbm7ks4bd";
type = "gem";
};
- version = "1.1.7";
+ version = "1.1.9";
};
fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"];
@@ -1116,12 +1125,14 @@
};
gitaly-proto = {
dependencies = ["grpc"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
+ sha256 = "03h59n89nngna6rxs81rigf1bzhhqbvmpzb0fqaks7sskqp70f2s";
type = "gem";
};
- version = "1.13.0";
+ version = "1.22.1";
};
github-markup = {
source = {
@@ -1141,12 +1152,14 @@
version = "3.1.1";
};
gitlab-markup = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy";
+ sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
type = "gem";
};
- version = "1.6.5";
+ version = "1.7.0";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
@@ -1444,13 +1457,15 @@
version = "0.6.0";
};
httparty = {
- dependencies = ["json" "multi_xml"];
+ dependencies = ["mime-types" "multi_xml"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
+ sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32";
type = "gem";
};
- version = "0.13.7";
+ version = "0.16.4";
};
httpclient = {
source = {
@@ -1522,14 +1537,6 @@
};
version = "1.4.1";
};
- jquery-atwho-rails = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
- type = "gem";
- };
- version = "1.3.2";
- };
js_regex = {
dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
source = {
@@ -2236,12 +2243,14 @@
version = "1.2.0";
};
pg = {
+ groups = ["development" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb";
+ sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
type = "gem";
};
- version = "1.1.3";
+ version = "1.1.4";
};
po_to_json = {
dependencies = ["json"];
@@ -2372,12 +2381,14 @@
version = "1.1.6";
};
rack = {
+ groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
+ sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
type = "gem";
};
- version = "2.0.6";
+ version = "2.0.7";
};
rack-accept = {
dependencies = ["rack"];
@@ -2406,13 +2417,15 @@
version = "1.0.2";
};
rack-oauth2 = {
- dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
+ dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf";
+ sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
type = "gem";
};
- version = "1.2.3";
+ version = "1.9.3";
};
rack-protection = {
dependencies = ["rack"];
@@ -2585,12 +2598,14 @@
};
recaptcha = {
dependencies = ["json"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n";
+ sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
type = "gem";
};
- version = "3.0.0";
+ version = "4.13.1";
};
recursive-open-struct = {
source = {
@@ -2972,12 +2987,14 @@
version = "1.2.2";
};
rugged = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
+ sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
type = "gem";
};
- version = "0.28.0";
+ version = "0.28.1";
};
safe_yaml = {
source = {
@@ -3050,15 +3067,6 @@
};
version = "2.3.7";
};
- select2-rails = {
- dependencies = ["thor"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
- type = "gem";
- };
- version = "3.5.9.3";
- };
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
source = {
@@ -3070,12 +3078,14 @@
};
sentry-raven = {
dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
+ sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
type = "gem";
};
- version = "2.7.4";
+ version = "2.9.0";
};
settingslogic = {
source = {
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index 894832dac17136734f6440ce1fe84ebf06e065e2..52e802ef524d8514bc4c4ae7647089eab4551732 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -42,14 +42,14 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'rack-oauth2', '~> 1.2.1'
+gem 'rack-oauth2', '~> 1.9.3'
gem 'jwt', '~> 2.1.0'
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
# Spam and anti-bot protection
-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
+gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0'
# Two-factor authentication
@@ -126,7 +126,7 @@ gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.2.0'
-gem 'gitlab-markup', '~> 1.6.5'
+gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2'
@@ -138,7 +138,7 @@ gem 'asciidoctor', '~> 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 2.7.0'
+gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.1'
gem 'escape_utils', '~> 1.1'
@@ -149,10 +149,7 @@ gem 'icalendar'
gem 'diffy', '~> 3.1.0'
# Application server
-# The 2.0.6 version of rack requires monkeypatch to be present in
-# `config.ru`. This can be removed once a new update for Rack
-# is available that contains https://github.com/rack/rack/pull/1201.
-gem 'rack', '2.0.6'
+gem 'rack', '~> 2.0.7'
group :unicorn do
gem 'unicorn', '~> 5.4.1'
@@ -168,7 +165,7 @@ end
gem 'state_machines-activerecord', '~> 0.5.1'
# Issue tags
-gem 'acts-as-taggable-on', '~> 5.0'
+gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
gem 'sidekiq', '~> 5.2.1'
@@ -180,7 +177,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
gem 'fugit', '~> 1.1'
# HTTP requests
-gem 'httparty', '~> 0.13.3'
+gem 'httparty', '~> 0.16.4'
# Colored output to console
gem 'rainbow', '~> 3.0'
@@ -278,9 +275,7 @@ gem 'addressable', '~> 2.5.2'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
-gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'request_store', '~> 1.3'
-gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0'
@@ -308,6 +303,9 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0'
+# Snowplow events tracking
+gem 'snowplow-tracker', '~> 0.6.1'
+
# Metrics
group :metrics do
gem 'method_source', '~> 0.8', require: false
@@ -439,7 +437,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.22.1', require: 'gitaly'
gem 'grpc', '~> 1.15.0'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index 16be6ab2d663fb6db1074141098b988ed3ae078a..72bc2c4734053db27c022dccd23a4c9b48eb6e1e 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -43,8 +43,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- acts-as-taggable-on (5.0.0)
- activerecord (>= 4.2.8)
+ acts-as-taggable-on (6.0.0)
+ activerecord (~> 5.0)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
@@ -65,7 +65,7 @@ GEM
atomic (1.1.99)
attr_encrypted (3.1.0)
encryptor (~> 3.0.0)
- attr_required (1.0.0)
+ attr_required (1.0.1)
awesome_print (1.8.0)
aws-sdk (2.9.32)
aws-sdk-resources (= 2.9.32)
@@ -95,7 +95,9 @@ GEM
debug_inspector (>= 0.0.1)
bootsnap (1.4.1)
msgpack (~> 1.0)
- bootstrap_form (2.7.0)
+ bootstrap_form (4.2.0)
+ actionpack (>= 5.0)
+ activemodel (>= 5.0)
brakeman (4.2.1)
browser (2.5.3)
builder (3.2.3)
@@ -142,6 +144,7 @@ GEM
concurrent-ruby-ext (1.1.3)
concurrent-ruby (= 1.1.3)
connection_pool (2.2.2)
+ contracts (0.11.0)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
@@ -284,7 +287,7 @@ GEM
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
- fugit (1.1.7)
+ fugit (1.1.9)
et-orbi (~> 1.1, >= 1.1.7)
raabro (~> 1.1)
fuubar (2.2.0)
@@ -303,13 +306,13 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (1.13.0)
+ gitaly-proto (1.22.1)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
activerecord (>= 3.2.0, < 6.0)
gitlab-license (1.0.0)
- gitlab-markup (1.6.5)
+ gitlab-markup (1.7.0)
gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5)
gitlab-styles (2.5.1)
@@ -409,8 +412,8 @@ GEM
domain_name (~> 0.5)
http-form_data (2.1.1)
http_parser.rb (0.6.0)
- httparty (0.13.7)
- json (~> 1.8)
+ httparty (0.16.4)
+ mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.6.0)
@@ -429,7 +432,6 @@ GEM
multipart-post
oauth (~> 0.5, >= 0.5.0)
jmespath (1.3.1)
- jquery-atwho-rails (1.3.2)
js_regex (3.1.1)
character_set (~> 1.1)
regexp_parser (~> 1.1)
@@ -617,7 +619,7 @@ GEM
atomic (>= 1.0.0)
peek
redis
- pg (1.1.3)
+ pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
powerpack (0.1.1)
@@ -649,18 +651,18 @@ GEM
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6)
- rack (2.0.6)
+ rack (2.0.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
rack
rack-cors (1.0.2)
- rack-oauth2 (1.2.3)
- activesupport (>= 2.3)
- attr_required (>= 0.0.5)
- httpclient (>= 2.4)
- multi_json (>= 1.3.6)
- rack (>= 1.1)
+ rack-oauth2 (1.9.3)
+ activesupport
+ attr_required
+ httpclient
+ json-jwt (>= 1.9.0)
+ rack
rack-protection (2.0.5)
rack
rack-proxy (0.6.0)
@@ -713,7 +715,7 @@ GEM
optimist (>= 3.0.0)
rdoc (6.0.4)
re2 (1.1.1)
- recaptcha (3.0.0)
+ recaptcha (4.13.1)
json
recursive-open-struct (1.1.0)
redis (3.3.5)
@@ -818,7 +820,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
- rugged (0.28.0)
+ rugged (0.28.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@@ -844,12 +846,10 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
- select2-rails (3.5.9.3)
- thor (~> 0.14)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
- sentry-raven (2.7.4)
+ sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
sexp_processor (4.11.0)
@@ -877,6 +877,8 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slack-notifier (1.5.1)
+ snowplow-tracker (0.6.1)
+ contracts (~> 0.7, <= 0.11)
spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
@@ -984,7 +986,7 @@ DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
activerecord_sane_schema_dumper (= 1.0)
- acts-as-taggable-on (~> 5.0)
+ acts-as-taggable-on (~> 6.0)
addressable (~> 2.5.2)
akismet (~> 2.0)
asana (~> 0.8.1)
@@ -1001,7 +1003,7 @@ DEPENDENCIES
better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0)
bootsnap (~> 1.4)
- bootstrap_form (~> 2.7.0)
+ bootstrap_form (~> 4.2.0)
brakeman (~> 4.2)
browser (~> 2.5)
bullet (~> 5.5.0)
@@ -1056,11 +1058,11 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 1.13.0)
+ gitaly-proto (~> 1.22.1)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-license (~> 1.0)
- gitlab-markup (~> 1.6.5)
+ gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.1.1)
@@ -1084,12 +1086,11 @@ DEPENDENCIES
hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html2text
- httparty (~> 0.13.3)
+ httparty (~> 0.16.4)
icalendar
influxdb (~> 0.2)
jaeger-client (~> 0.10.0)
jira-ruby (~> 1.4)
- jquery-atwho-rails (~> 1.3.2)
js_regex (~> 3.1)
json-schema (~> 2.8.0)
jwt (~> 2.1.0)
@@ -1145,10 +1146,10 @@ DEPENDENCIES
pry-rails (~> 0.3.4)
puma (~> 3.12)
puma_worker_killer
- rack (= 2.0.6)
+ rack (~> 2.0.7)
rack-attack (~> 4.4.1)
rack-cors (~> 1.0.0)
- rack-oauth2 (~> 1.2.1)
+ rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0)
rails (= 5.0.7.2)
rails-controller-testing
@@ -1160,7 +1161,7 @@ DEPENDENCIES
rbtrace (~> 0.4)
rdoc (~> 6.0)
re2 (~> 1.1.1)
- recaptcha (~> 3.0)
+ recaptcha (~> 4.11)
redis (~> 3.2)
redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2)
@@ -1187,7 +1188,6 @@ DEPENDENCIES
sass-rails (~> 5.0.6)
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
- select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.12)
sentry-raven (~> 2.7)
settingslogic (~> 2.0.9)
@@ -1198,6 +1198,7 @@ DEPENDENCIES
simple_po_parser (~> 1.1.2)
simplecov (~> 0.14.0)
slack-notifier (~> 1.5.1)
+ snowplow-tracker (~> 0.6.1)
spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index 0116da7ca9432a7ed6b291040bbab40265d1adb0..bbf769314a3f0685385013f52112e08086f6edd9 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -114,12 +114,14 @@
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i";
+ sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
type = "gem";
};
- version = "5.0.0";
+ version = "6.0.0";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@@ -215,12 +217,14 @@
version = "3.1.0";
};
attr_required = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
+ sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.1";
};
awesome_print = {
source = {
@@ -366,12 +370,15 @@
version = "1.4.1";
};
bootstrap_form = {
+ dependencies = ["actionpack" "activemodel"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw";
+ sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m";
type = "gem";
};
- version = "2.7.0";
+ version = "4.2.0";
};
brakeman = {
source = {
@@ -576,6 +583,16 @@
};
version = "2.2.2";
};
+ contracts = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz";
+ type = "gem";
+ };
+ version = "0.11.0";
+ };
crack = {
dependencies = ["safe_yaml"];
source = {
@@ -1142,12 +1159,14 @@
};
fugit = {
dependencies = ["et-orbi" "raabro"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf";
+ sha256 = "1m9fijppafxrb74v4jgbgni82bykyzpfnrlksfa7bw6sbm7ks4bd";
type = "gem";
};
- version = "1.1.7";
+ version = "1.1.9";
};
fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"];
@@ -1204,12 +1223,14 @@
};
gitaly-proto = {
dependencies = ["grpc"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
+ sha256 = "03h59n89nngna6rxs81rigf1bzhhqbvmpzb0fqaks7sskqp70f2s";
type = "gem";
};
- version = "1.13.0";
+ version = "1.22.1";
};
github-markup = {
source = {
@@ -1237,12 +1258,14 @@
version = "1.0.0";
};
gitlab-markup = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy";
+ sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
type = "gem";
};
- version = "1.6.5";
+ version = "1.7.0";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
@@ -1549,13 +1572,15 @@
version = "0.6.0";
};
httparty = {
- dependencies = ["json" "multi_xml"];
+ dependencies = ["mime-types" "multi_xml"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
+ sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32";
type = "gem";
};
- version = "0.13.7";
+ version = "0.16.4";
};
httpclient = {
source = {
@@ -1635,14 +1660,6 @@
};
version = "1.3.1";
};
- jquery-atwho-rails = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
- type = "gem";
- };
- version = "1.3.2";
- };
js_regex = {
dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
source = {
@@ -2365,12 +2382,14 @@
version = "1.2.0";
};
pg = {
+ groups = ["development" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb";
+ sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
type = "gem";
};
- version = "1.1.3";
+ version = "1.1.4";
};
po_to_json = {
dependencies = ["json"];
@@ -2501,12 +2520,14 @@
version = "1.1.6";
};
rack = {
+ groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
+ sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
type = "gem";
};
- version = "2.0.6";
+ version = "2.0.7";
};
rack-accept = {
dependencies = ["rack"];
@@ -2535,13 +2556,15 @@
version = "1.0.2";
};
rack-oauth2 = {
- dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
+ dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf";
+ sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
type = "gem";
};
- version = "1.2.3";
+ version = "1.9.3";
};
rack-protection = {
dependencies = ["rack"];
@@ -2714,12 +2737,14 @@
};
recaptcha = {
dependencies = ["json"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n";
+ sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
type = "gem";
};
- version = "3.0.0";
+ version = "4.13.1";
};
recursive-open-struct = {
source = {
@@ -3101,12 +3126,14 @@
version = "1.2.2";
};
rugged = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
+ sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
type = "gem";
};
- version = "0.28.0";
+ version = "0.28.1";
};
safe_yaml = {
source = {
@@ -3179,15 +3206,6 @@
};
version = "2.3.7";
};
- select2-rails = {
- dependencies = ["thor"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
- type = "gem";
- };
- version = "3.5.9.3";
- };
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
source = {
@@ -3199,12 +3217,14 @@
};
sentry-raven = {
dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
+ sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
type = "gem";
};
- version = "2.7.4";
+ version = "2.9.0";
};
settingslogic = {
source = {
@@ -3300,6 +3320,17 @@
};
version = "1.5.1";
};
+ snowplow-tracker = {
+ dependencies = ["contracts"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w";
+ type = "gem";
+ };
+ version = "0.6.1";
+ };
spring = {
dependencies = ["activesupport"];
source = {
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index 26dc3d39eb1bc5a9f03da949424a36e8d8c3ddc2..0ec743cb67d77f50845fe0ca5eb362bac91739eb 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -9,6 +9,7 @@ import logging
import subprocess
import json
import pathlib
+from distutils.version import LooseVersion
from typing import Iterable
import requests
@@ -18,6 +19,7 @@ logger = logging.getLogger(__name__)
class GitLabRepo:
+ version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?")
def __init__(self, owner: str, repo: str):
self.owner = owner
self.repo = repo
@@ -31,8 +33,13 @@ class GitLabRepo:
r = requests.get(self.url + "/tags?format=atom", stream=True)
tree = ElementTree.fromstring(r.content)
- return sorted((e.text for e in tree.findall(
- '{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')), reverse=True)
+ versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')]
+ # filter out versions not matching version_regex
+ versions = filter(self.version_regex.match, versions)
+
+ # sort, but ignore v and -ee for sorting comparisons
+ versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True)
+ return versions
def get_git_hash(self, rev: str):
out = subprocess.check_output(['nix-prefetch-git', self.url, rev])
@@ -202,7 +209,6 @@ def update_gitaly():
click.echo(f"Please update gitaly/default.nix to version {gitaly_server_version} and hash {gitaly_hash}")
-
@cli.command('update-gitlab-shell')
def update_gitlab_shell():
"""Update gitlab-shell"""
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 78dd9dd49dfd9d6fe7b311faa051fe1f1f01ec3f..42c0910078845d916120a41c3d70fa3656651909 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Finely-grained git repository hosting";
- homepage = http://gitolite.com/gitolite/index.html;
+ homepage = https://gitolite.com/gitolite/index.html;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ];
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index b97123926eb51c464a7c05ee485137ebb02f5780..180664d33863646a1aa03469acf649be7f9c56f4 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, pkgconfig }:
+{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }:
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
name = "pijul-${version}";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchurl {
url = "https://pijul.org/releases/${name}.tar.gz";
- sha256 = "e60793ab124e9054c1d5509698acbae507ebb2fab5364d964067bc9ae8b6b5e5";
+ sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig clang ];
postInstall = ''
mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d}
@@ -20,12 +18,14 @@ buildRustPackage rec {
$out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish
'';
- buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin
- (with darwin.apple_sdk.frameworks; [ Security ]);
+ LIBCLANG_PATH = libclang + "/lib";
+
+ buildInputs = [ openssl libsodium nettle libclang ] ++ stdenv.lib.optionals stdenv.isDarwin
+ (with darwin.apple_sdk.frameworks; [ CoreServices Security ]);
doCheck = false;
- cargoSha256 = "1r76azmka1d76ff0ddfhzr24b0ry496qrp13945i3vs0fgzk2sdz";
+ cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k";
meta = with stdenv.lib; {
description = "A distributed version control system";
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index df1739aea572fc060c1c4a0b715d7666f0de35b5..862b9eacd62854a183bee97ef69801a8d9c7fcd4 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ed }:
+{ stdenv, fetchurl, fetchpatch, ed }:
stdenv.mkDerivation rec {
name = "rcs-5.9.4";
@@ -10,10 +10,51 @@ stdenv.mkDerivation rec {
buildInputs = [ ed ];
+ patches = stdenv.lib.optionals stdenv.isDarwin [
+ # This failure appears unrelated to the subject of the test. This
+ # test seems to rely on a bash bug where `test $x -nt $y` ignores
+ # subsecond values in timetamps. This bug has been fixed in Bash
+ # 5, and seemingly doesn't affect Darwin.
+ ./disable-t810.patch
+
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch";
+ extraPrefix = "";
+ sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3";
+ })
+
+ # Expected to appear in the next release
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch";
+ sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx";
+ })
+ ];
+
doCheck = true;
+ checkFlags = [ "VERBOSE=1" ];
+
+ checkPhase = ''
+ # If neither LOGNAME or USER are set, rcs will default to
+ # getlogin(), which is unreliable on macOS. It will often return
+ # things like `_spotlight`, or `_mbsetupuser`. macOS sets both
+ # environment variables in user sessions, so this is unlikely to
+ # affect regular usage.
+
+ export LOGNAME=$(id -un)
+
+ print_logs_and_fail() {
+ grep -nH -e . -r tests/*.d/{out,err}
+ return 1
+ }
+
+ make $checkFlags check || print_logs_and_fail
+ '';
+
NIX_CFLAGS_COMPILE = [ "-std=c99" ];
+ hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format";
+
meta = {
homepage = https://www.gnu.org/software/rcs/;
description = "Revision control system";
@@ -27,6 +68,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ eelco ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/rcs/disable-t810.patch b/pkgs/applications/version-management/rcs/disable-t810.patch
new file mode 100644
index 0000000000000000000000000000000000000000..745f1868a369537a3d5a8a89b4064664e58e1082
--- /dev/null
+++ b/pkgs/applications/version-management/rcs/disable-t810.patch
@@ -0,0 +1,10 @@
+--- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900
++++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900
+@@ -1372,7 +1372,6 @@
+ t803 \
+ t804 \
+ t805 \
+- t810 \
+ t900 \
+ t999
+
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile
index 952dd8bda4d5ec2f4afdf11d2bde56d43b5c40d1..343c7b3a5470c73852aa7df2a8475b2750b92a93 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile
+++ b/pkgs/applications/version-management/redmine/4.x/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0"
-gem "rails", "5.2.2.1"
+gem "rails", "5.2.3"
gem "rouge", "~> 3.3.0"
gem "request_store", "1.0.5"
gem "mini_mime", "~> 1.0.1"
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
index 215704e5b38e7e306aeab0089a3cf76c94491f11..671d2bb4ac1f7b882afd0a32b8363c56ce53d09d 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
@@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (5.2.2.1)
- actionpack (= 5.2.2.1)
+ actioncable (5.2.3)
+ actionpack (= 5.2.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailer (5.2.2.1)
- actionpack (= 5.2.2.1)
- actionview (= 5.2.2.1)
- activejob (= 5.2.2.1)
+ actionmailer (5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.2.2.1)
- actionview (= 5.2.2.1)
- activesupport (= 5.2.2.1)
+ actionpack (5.2.3)
+ actionview (= 5.2.3)
+ activesupport (= 5.2.3)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
@@ -21,26 +21,26 @@ GEM
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
- actionview (5.2.2.1)
- activesupport (= 5.2.2.1)
+ actionview (5.2.3)
+ activesupport (= 5.2.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.2.2.1)
- activesupport (= 5.2.2.1)
+ activejob (5.2.3)
+ activesupport (= 5.2.3)
globalid (>= 0.3.6)
- activemodel (5.2.2.1)
- activesupport (= 5.2.2.1)
- activerecord (5.2.2.1)
- activemodel (= 5.2.2.1)
- activesupport (= 5.2.2.1)
+ activemodel (5.2.3)
+ activesupport (= 5.2.3)
+ activerecord (5.2.3)
+ activemodel (= 5.2.3)
+ activesupport (= 5.2.3)
arel (>= 9.0)
- activestorage (5.2.2.1)
- actionpack (= 5.2.2.1)
- activerecord (= 5.2.2.1)
+ activestorage (5.2.3)
+ actionpack (= 5.2.3)
+ activerecord (= 5.2.3)
marcel (~> 0.3.1)
- activesupport (5.2.2.1)
+ activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -56,16 +56,15 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
- childprocess (0.9.0)
- ffi (~> 1.0, >= 1.0.11)
+ childprocess (1.0.1)
+ rake (< 13.0)
concurrent-ruby (1.1.5)
crass (1.0.4)
css_parser (1.7.0)
addressable
- csv (3.0.6)
+ csv (3.0.9)
docile (1.1.5)
erubi (1.8.0)
- ffi (1.10.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
htmlentities (4.3.4)
@@ -89,10 +88,10 @@ GEM
mysql2 (0.5.2)
net-ldap (0.16.1)
nio4r (2.3.1)
- nokogiri (1.10.2)
+ nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
pg (1.1.4)
- public_suffix (3.0.3)
+ public_suffix (3.1.0)
puma (3.12.1)
rack (2.0.7)
rack-openid (1.4.2)
@@ -100,27 +99,27 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
- rails (5.2.2.1)
- actioncable (= 5.2.2.1)
- actionmailer (= 5.2.2.1)
- actionpack (= 5.2.2.1)
- actionview (= 5.2.2.1)
- activejob (= 5.2.2.1)
- activemodel (= 5.2.2.1)
- activerecord (= 5.2.2.1)
- activestorage (= 5.2.2.1)
- activesupport (= 5.2.2.1)
+ rails (5.2.3)
+ actioncable (= 5.2.3)
+ actionmailer (= 5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
+ activemodel (= 5.2.3)
+ activerecord (= 5.2.3)
+ activestorage (= 5.2.3)
+ activesupport (= 5.2.3)
bundler (>= 1.3.0)
- railties (= 5.2.2.1)
+ railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
- railties (5.2.2.1)
- actionpack (= 5.2.2.1)
- activesupport (= 5.2.2.1)
+ railties (5.2.3)
+ actionpack (= 5.2.3)
+ activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@@ -132,17 +131,17 @@ GEM
redcarpet (3.4.0)
request_store (1.0.5)
rmagick (2.16.0)
- roadie (3.4.0)
+ roadie (3.5.0)
css_parser (~> 1.4)
- nokogiri (~> 1.5)
+ nokogiri (~> 1.8)
roadie-rails (1.3.0)
railties (>= 3.0, < 5.3)
roadie (~> 3.1)
rouge (3.3.0)
ruby-openid (2.3.0)
- rubyzip (1.2.2)
- selenium-webdriver (3.141.0)
- childprocess (~> 0.5)
+ rubyzip (1.2.3)
+ selenium-webdriver (3.142.3)
+ childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
simplecov (0.14.1)
docile (~> 1.1.0)
@@ -160,9 +159,9 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- websocket-driver (0.7.0)
+ websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.3)
+ websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.19)
@@ -186,7 +185,7 @@ DEPENDENCIES
pg (~> 1.1.4)
puma (~> 3.7)
rack-openid
- rails (= 5.2.2.1)
+ rails (= 5.2.3)
rails-dom-testing
rbpdf (~> 1.19.6)
redcarpet (~> 3.4.0)
diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix
index 82a994478cd21d339c2e7ff243e95f13b2920de4..1fbc22f8776189530480dad2f8cc1801676182d3 100644
--- a/pkgs/applications/version-management/redmine/4.x/default.nix
+++ b/pkgs/applications/version-management/redmine/4.x/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
- version = "4.0.3";
+ version = "4.0.4";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -15,7 +15,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${name}.tar.gz";
- sha256 = "1wyfl08sq71n4c2hc0fv1dfblykq5i3mbqyjdswk26md8dcmw8ac";
+ sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
@@ -37,7 +37,7 @@ in
meta = with stdenv.lib; {
homepage = http://www.redmine.org/;
platforms = platforms.linux;
- maintainers = [ maintainers.garbas maintainers.aanderse ];
+ maintainers = [ maintainers.aanderse ];
license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix
index 53c2d73b6e9329a52cb520a2d5609c7a78369bbd..34e459111f8aa09ae9ef53ebbb1521dea16ec47b 100644
--- a/pkgs/applications/version-management/redmine/4.x/gemset.nix
+++ b/pkgs/applications/version-management/redmine/4.x/gemset.nix
@@ -3,28 +3,28 @@
dependencies = ["actionpack" "nio4r" "websocket-driver"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x5fxhsr2mxq5r6258s48xsn7ld081d3qaavppvj7yp7w9vqn871";
+ sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10n2v2al68rsq5ghrdp7cpycsc1q0m19fcd8cd5i528n30nl23iw";
+ sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lxqzxa728dqg42yw0q4hqkaawqagiw1k0392an2ghjfgb16pafx";
+ sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
actionpack-xml_parser = {
dependencies = ["actionpack" "railties"];
@@ -39,55 +39,55 @@
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0832vlx37rly8ryfgi01b20mld8b3bv9cg62n5wax4zpzgn6jdxb";
+ sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zma452lc3qp4a7r10zbdmsci0kv9a3gnk4da2apbdrc8fib5mr3";
+ sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
activemodel = {
dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1idmvqvpgri34k31s44pjb88rc3jad3yxra7fd1kpidpnv5f3v65";
+ sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c5cz9v7ggpqjxf0fqs1xhy1pb9m34cp31pxarhs9aqb71qjl98v";
+ sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
activestorage = {
dependencies = ["actionpack" "activerecord" "marcel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "155xpbzrz0kr0argx0vsh5prvadd2h1g1m61kdiabvfy2iygc02n";
+ sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "161bp4p01v1a1lvszrhd1a02zf9x1p1l1yhw79a3rix1kvzkkdqb";
+ sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
addressable = {
dependencies = ["public_suffix"];
@@ -124,13 +124,13 @@
version = "2.18.0";
};
childprocess = {
- dependencies = ["ffi"];
+ dependencies = ["rake"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
+ sha256 = "1d2gasf988jh2k3fjb7i54c68rq6ni6jf9w0gnsfhrq94a6mprkz";
type = "gem";
};
- version = "0.9.0";
+ version = "1.0.1";
};
concurrent-ruby = {
source = {
@@ -160,10 +160,10 @@
csv = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zvchwfkdkljnslqakagbnw76vs01xwpjrynrawfanzn376c6bcd";
+ sha256 = "097rl10ivzlya5640530ayls2f1vid2mfgjy9ngd789qmp0j6x4b";
type = "gem";
};
- version = "3.0.6";
+ version = "3.0.9";
};
docile = {
source = {
@@ -181,14 +181,6 @@
};
version = "1.8.0";
};
- ffi = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
- type = "gem";
- };
- version = "1.10.0";
- };
globalid = {
dependencies = ["activesupport"];
source = {
@@ -334,10 +326,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
+ sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
type = "gem";
};
- version = "1.10.2";
+ version = "1.10.3";
};
pg = {
source = {
@@ -350,10 +342,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
type = "gem";
};
- version = "3.0.3";
+ version = "3.1.0";
};
puma = {
source = {
@@ -393,10 +385,10 @@
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jxmwrykwgbn116hhmi7h75hcsdifhj89wk12m7ch2f3mn1lrmp9";
+ sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -420,10 +412,10 @@
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0al6mvh2jvr3n7cxkx0yvhgiiarby6gxc93vl5xg1yxkvx27qzd6";
+ sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4";
type = "gem";
};
- version = "5.2.2.1";
+ version = "5.2.3";
};
rake = {
source = {
@@ -478,10 +470,10 @@
dependencies = ["css_parser" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l3s80394yijvz0fsvfkw0azsi9yxsdkxd8lpas0bd7wlndjvmxx";
+ sha256 = "0b2qgr725hnscz3ldb607gwgjkr47ncs1jjnk6zh0h70p5dxrk2d";
type = "gem";
};
- version = "3.4.0";
+ version = "3.5.0";
};
roadie-rails = {
dependencies = ["railties" "roadie"];
@@ -511,19 +503,19 @@
rubyzip = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+ sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
type = "gem";
};
- version = "1.2.2";
+ version = "1.2.3";
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs";
+ sha256 = "0i0jr4qrcvg5isc11ivjw7f9gywbimnz613k82bfcrnlzdf90mxy";
type = "gem";
};
- version = "3.141.0";
+ version = "3.142.3";
};
simplecov = {
dependencies = ["docile" "json" "simplecov-html"];
@@ -589,18 +581,18 @@
dependencies = ["websocket-extensions"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn";
+ sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
type = "gem";
};
- version = "0.7.0";
+ version = "0.7.1";
};
websocket-extensions = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270";
+ sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
type = "gem";
};
- version = "0.1.3";
+ version = "0.1.4";
};
xpath = {
dependencies = ["nokogiri"];
diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index 888175335a7a1ab6c19f35d547d220d6feafe23c..21296d343b44f16d00c595b67d660a35d12f11f6 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -57,7 +57,7 @@ GEM
addressable
docile (1.1.5)
erubis (2.7.0)
- ffi (1.10.0)
+ ffi (1.11.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
htmlentities (4.3.4)
@@ -88,7 +88,7 @@ GEM
pg (0.18.4)
protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
- public_suffix (3.0.3)
+ public_suffix (3.1.0)
rack (1.6.11)
rack-openid (1.4.2)
rack (>= 1.1.0)
@@ -135,7 +135,7 @@ GEM
railties (>= 3.0, < 5.1)
roadie (~> 3.1)
ruby-openid (2.3.0)
- rubyzip (1.2.2)
+ rubyzip (1.2.3)
selenium-webdriver (2.53.4)
childprocess (~> 0.5)
rubyzip (~> 1.0)
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index 12f3d18a32c5df44c7cfd304b9d4c2cb714671c9..ba1980c3d142d76547b3e0cd1b6e0838a46bbee0 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
- version = "3.4.10";
+ version = "3.4.11";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -15,7 +15,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${name}.tar.gz";
- sha256 = "08clfg7wgp4wnajawdn7qgrv7r8lk8d8haqkl7iz77ygdi3mpyrh";
+ sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
@@ -37,7 +37,7 @@ in
meta = with stdenv.lib; {
homepage = http://www.redmine.org/;
platforms = platforms.linux;
- maintainers = [ maintainers.garbas maintainers.aanderse ];
+ maintainers = [ maintainers.aanderse ];
license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix
index 87b0b0b4f7adcdd61eada5dd94bf82d42a716677..4ef4bd404270774762cb8a2fcee3c3e859e7c7c2 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/pkgs/applications/version-management/redmine/gemset.nix
@@ -166,10 +166,10 @@
ffi = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+ sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.1";
};
globalid = {
dependencies = ["activesupport"];
@@ -342,10 +342,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
type = "gem";
};
- version = "3.0.3";
+ version = "3.1.0";
};
rack = {
source = {
@@ -504,10 +504,10 @@
rubyzip = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+ sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
type = "gem";
};
- version = "1.2.2";
+ version = "1.2.3";
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip" "websocket"];
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 75368bd884632379516667d0bb9cb9e812256fd2..7d655bfc5d3be0b992599c3a899c4f6fd28db79e 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -4,13 +4,13 @@
rustPlatform.buildRustPackage rec {
name = "sit-${version}";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "sit-fyi";
repo = "sit";
rev = "v${version}";
- sha256 = "10ycs6vc7mfzxnxrki09xn974pcwh196h1pfnsds98x6r87hxkpn";
+ sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf";
};
buildInputs = [ cmake libzip gnupg ] ++
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
export HOME=$(mktemp -d)
'';
- cargoSha256 = "023anmnprxbsvqww1b1bdyfhbhjh1ah2kc67cdihvdvi4lqdmbia";
+ cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528";
meta = with stdenv.lib; {
description = "Serverless Information Tracker";
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 20d3922138b68712e7d7a7e902c38add766e7b55..049f2756a5516b1510c0b2b670058ad8522e6747 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -2,20 +2,21 @@
stdenv.mkDerivation rec {
name = "src-${version}";
- version = "1.24";
+ version = "1.26";
src = fetchurl {
url = "http://www.catb.org/~esr/src/${name}.tar.gz";
- sha256 = "0n9j2mywbm8c7mc5b3m7dvn6gff88wwwaygk4y1jivpg1f6s3k3l";
+ sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23";
};
- buildInputs = [ python rcs git makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ python rcs git ];
preConfigure = ''
patchShebangs .
'';
- makeFlags = [ "prefix=$(out)" ];
+ makeFlags = [ "prefix=${placeholder "out"}" ];
postInstall = ''
wrapProgram $out/bin/src \
@@ -32,8 +33,9 @@ stdenv.mkDerivation rec {
will seem familiar to Subversion/Git/hg users, and no binary blobs
anywhere.
'';
- homepage = http://www.catb.org/esr/src/;
- license = licenses.bsd3;
+ homepage = "http://www.catb.org/esr/src/";
+ changelog = "https://gitlab.com/esr/src/raw/${version}/NEWS";
+ license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ calvertvl AndersonTorres ];
};
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix
index a232b78aacfd6875022c76b86deb13ca98936c4b..f69fdbefe1847d0fb1d9917ea8543fdfe5aed4e3 100644
--- a/pkgs/applications/version-management/sublime-merge/common.nix
+++ b/pkgs/applications/version-management/sublime-merge/common.nix
@@ -1,12 +1,10 @@
{ buildVersion, sha256, dev ? false }:
-{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
-, pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu
+{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
+, pkexecPath ? "/run/wrappers/bin/pkexec"
, writeScript, common-updater-scripts, curl, gnugrep
}:
-assert gksuSupport -> gksu != null;
-
let
pname = "sublime-merge";
packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}";
@@ -14,31 +12,27 @@ let
primaryBinary = "sublime_merge";
primaryBinaryAliases = [ "smerge" ];
downloadUrl = "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz";
- downloadArchiveType = "tar.xz";
versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}";
- versionFile = "pkgs/applications/version-management/sublime-merge/default.nix";
- usesGtk2 = false;
+ versionFile = builtins.toString ./default.nix;
archSha256 = sha256;
arch = "x64";
- libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ];
- redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
- ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
+ libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
+ redirects = [ "/usr/bin/pkexec=${pkexecPath}" ];
in let
binaryPackage = stdenv.mkDerivation {
pname = "${pname}-bin";
version = buildVersion;
src = fetchurl {
- name = "${pname}-bin-${buildVersion}.${downloadArchiveType}";
url = downloadUrl;
sha256 = archSha256;
};
dontStrip = true;
dontPatchELF = true;
- buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
- nativeBuildInputs = [ makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook;
+ buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
buildPhase = ''
runHook preBuild
@@ -50,7 +44,7 @@ in let
$binary
done
- # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary.
+ # Rewrite pkexec argument. Note that we cannot delete bytes in binary.
sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary}
runHook postBuild
@@ -72,7 +66,7 @@ in let
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
--set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
- ${stdenv.lib.optionalString (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''}
+ "''${gappsWrapperArgs[@]}"
'';
};
in stdenv.mkDerivation (rec {
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index e5940c939561818358bab910d573e6e76fd8e27b..81949f9510695b9e357752651560b8be8df172f8 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -38,9 +38,10 @@ let
patches = [ ./apr-1.patch ];
- # SVN build seems broken on gcc5:
- # https://gcc.gnu.org/gcc-5/porting_to.html
- CPPFLAGS = "-P";
+ # We are hitting the following issue even with APR 1.6.x
+ # -> https://issues.apache.org/jira/browse/SVN-4813
+ # "-P" CPPFLAG is needed to build Python bindings and subversionClient
+ CPPFLAGS = [ "-P" ];
configureFlags = [
(stdenv.lib.withFeature bdbSupport "berkeley-db")
@@ -110,14 +111,9 @@ let
});
in {
- subversion18 = common {
- version = "1.8.19";
- sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n";
- };
-
subversion19 = common {
- version = "1.9.9";
- sha256 = "1ll13ychbkp367c7zsrrpda5nygkryma5k18qfr8wbaq7dbvxzcd";
+ version = "1.9.10";
+ sha256 = "1mwwbjs8nqr8qyc0xzy7chnylh4q3saycvly8rzq32swadbcca5f";
};
subversion_1_10 = common {
@@ -126,9 +122,9 @@ in {
extraBuildInputs = [ lz4 utf8proc ];
};
- subversion_1_11 = common {
- version = "1.11.1";
- sha256 = "1fv0psjxx5nxb4zmddyrma2bnv1bfff4p8ii6j8fqwjdr982gzcy";
+ subversion = common {
+ version = "1.12.0";
+ sha256 = "1prfbrd1jnndb5fcsvwnzvdi7c0bpirb6pmfq03w21x0v1rprbkz";
extraBuildInputs = [ lz4 utf8proc ];
};
}
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
index a90eb531fe59bd14feaec6b03ab54b70b3f67a2b..4089e68d85dcec612f2e7969dc70ef3cafaafdf6 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Version Control System for $HOME";
homepage = https://github.com/RichiH/vcsh;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ garbas ttuegel ];
+ maintainers = with maintainers; [ ttuegel ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index a613ad1c5842941df4fbd87c33325b18c39ce996..3df616824801719e55639a8d640770ce8afc642b 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "bindnow" "relro" ];
+ # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
+ CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
+
# this is fixed upstream though not yet in an officially released version,
# should be fine remove on next release (if one ever happens)
NIX_LDFLAGS = [
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix
index aaa1737f99a11450a698f93f54478fd440d9028a..4b97db56e978ed4f088850e91a84257aa8e3ef0c 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, gtkmm2, scons,
+{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons,
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
enca, pkgconfig, fetchpatch }:
diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..34c80e1050b4480c13c63e5e712df42c9c061bcb
--- /dev/null
+++ b/pkgs/applications/video/clickshare-csc1/default.nix
@@ -0,0 +1,124 @@
+{ lib
+, stdenv
+, fetchurl
+, alsaLib
+, autoPatchelfHook
+, binutils-unwrapped
+, gnutar
+, libav_0_8
+, libnotify
+, libresample
+, libusb1
+, qt4
+, rpmextract
+, unzip
+, xorg
+, usersGroup ? "clickshare" # for udev access rules
+}:
+
+
+# This fetches the latest firmware version that
+# contains a linux-compatible client binary.
+# Barco no longer supports linux, so updates are unlikely:
+# https://www.barco.com/de/support/clickshare-csc-1/knowledge-base/KB1191
+
+
+stdenv.mkDerivation rec {
+ name = "clickshare-csc1-${version}";
+ version = "01.07.00.033";
+ src = fetchurl {
+ name = "clickshare-csc1-${version}.zip";
+ url = https://www.barco.com/services/website/de/TdeFiles/Download?FileNumber=R33050020&TdeType=3&MajorVersion=01&MinorVersion=07&PatchVersion=00&BuildVersion=033;
+ sha256 = "0h4jqidqvk4xkaky5bizi7ilz4qzl2mh68401j21y3djnzx09br3";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ binutils-unwrapped
+ gnutar
+ rpmextract
+ unzip
+ ];
+ buildInputs = [
+ alsaLib
+ libav_0_8
+ libnotify
+ libresample
+ libusb1
+ qt4
+ xorg.libX11
+ xorg.libXdamage
+ xorg.libXfixes
+ xorg.libXinerama
+ xorg.libXtst
+ ];
+ sourceRoot = ".";
+
+ # The source consists of nested archives.
+ # We extract them archive by archive.
+ # If the filename contains version numbers,
+ # we use a wildcard and check that there
+ # is actually only one file matching.
+ postUnpack =
+ let
+ rpmArch =
+ if stdenv.hostPlatform.isx86_32 then "i386" else
+ if stdenv.hostPlatform.isx86_64 then "x86_64" else
+ throw "unsupported system: ${stdenv.hostPlatform.system}";
+ in
+ ''
+ ls clickshare_baseunit_*.*_all.signed_release.ipk | wc --lines | xargs test 1 =
+ tar --verbose --extract --one-top-level=dir1 < clickshare_baseunit_*.*_all.signed_release.ipk
+ mkdir dir2
+ ( cd dir2 ; ar xv ../dir1/firmware.ipk )
+ tar --verbose --gzip --extract --one-top-level=dir3 --exclude='dev/*' < dir2/data.tar.gz
+ ls dir3/clickshare/clickshare-*-*.${rpmArch}.rpm | wc --lines | xargs test 1 =
+ mkdir dir4
+ cd dir4
+ rpmextract ../dir3/clickshare/clickshare-*-*.${rpmArch}.rpm
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir --verbose --parents $out
+ mv --verbose --target-directory=. usr/*
+ rmdir --verbose usr
+ cp --verbose --recursive --target-directory=$out *
+ runHook postInstall
+ '';
+
+ # Default udev rule restricts access to the
+ # clickshare USB dongle to the `wheel` group.
+ # We replace it with the group
+ # stated in the package arguments.
+ # Also, we patch executable and icon paths in .desktop files.
+ preFixup = ''
+ substituteInPlace \
+ $out/lib/udev/rules.d/99-clickshare.rules \
+ --replace wheel ${usersGroup}
+ substituteInPlace \
+ $out/share/applications/clickshare.desktop \
+ --replace Exec= Exec=$out/bin/ \
+ --replace =/usr =$out
+ substituteInPlace \
+ $out/etc/xdg/autostart/clickshare-launcher.desktop \
+ --replace =/usr =$out
+ '';
+
+ meta = {
+ homepage = https://www.barco.com/de/support/clickshare-csc-1/drivers;
+ downloadPage = https://www.barco.com/de/Support/software/R33050020;
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ license = lib.licenses.unfree;
+ maintainers = [ lib.maintainers.yarny ];
+ description = "Linux driver/client for Barco ClickShare CSC-1";
+ longDescription = ''
+ Barco ClickShare is a wireless presentation system
+ where a USB dongle transmits to a base station
+ that is connected with a beamer.
+ The USB dongle requires proprietary software that
+ captures the screen and sends it to the dongle.
+ This package provides the necessary software for Linux.
+ '';
+ };
+}
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index a94bb7ade33eb32791d63758b3b2c5d61bbfcbbf..9b29e18d0bc46b8c26a36c6c37c98e47ae8871e2 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,10 +5,10 @@
stdenv.mkDerivation rec {
name = "clipgrab-${version}";
- version = "3.8.2";
+ version = "3.8.3";
src = fetchurl {
- sha256 = "0dhiv1mldp5f555im6mkjxdh6iivn1hnx2xdaqa6wxzsrwrvv5dd";
+ sha256 = "1v8vvlqgjqy3gyzwaz9iq0m4fwlkimy5gzg6z3bqwp61p9zzw0zf";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${name}.tar.gz";
};
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 48c5032f2da2c7ca0daf0b1fae8b1090c3a2a39f..4802d259fb23ec459c4f33d46f3bc91932026aa1 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
-, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }:
+, gtk3, gettext, wrapGAppsHook, gdk_pixbuf, gobject-introspection }:
let
inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
@@ -15,8 +15,18 @@ in buildPythonApplication rec {
sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q";
};
+ # Temporary fix
+ # See https://github.com/NixOS/nixpkgs/issues/61578
+ # and https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
nativeBuildInputs = [
gettext wrapGAppsHook
+
+ # Temporary fix
+ # See https://github.com/NixOS/nixpkgs/issues/61578
+ # and https://github.com/NixOS/nixpkgs/issues/56943
+ gobject-introspection
];
buildInputs = [
diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix
index 6281c78840158c28a94395e9584836052cb3637c..a032ef654aa3d1f7721151085ec7f8c9a42a9eda 100644
--- a/pkgs/applications/video/dvb-apps/default.nix
+++ b/pkgs/applications/video/dvb-apps/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
buildInputs = [ perl ];
- configurePhase = "true"; # skip configure
+ dontConfigure = true; # skip configure
installPhase = "make prefix=$out install";
diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix
index 75a299d46c7d3f08e265854d9e302abb64254853..a04eebfcc40745d6468717e1d32320860c667cb4 100644
--- a/pkgs/applications/video/gnome-mpv/default.nix
+++ b/pkgs/applications/video/gnome-mpv/default.nix
@@ -1,24 +1,30 @@
-{ stdenv, fetchFromGitHub, meson, ninja, python3
+{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, python3
, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook
, appstream-glib, epoxy, glib, gtk3, mpv
}:
stdenv.mkDerivation rec {
- name = "gnome-mpv-${version}";
- version = "0.13";
+ pname = "gnome-mpv";
+ version = "0.16";
src = fetchFromGitHub {
- owner = "gnome-mpv";
- repo = "gnome-mpv";
- rev = "0d73b33d60050fd32bf8fae77d831548970a0b69"; # upstream forgot to update appdata
- # rev = "v${version}";
- sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4";
+ owner = "celluloid-player";
+ repo = "celluloid";
+ rev = "v${version}";
+ sha256 = "1fj5mr1dwd07jpnigk7z85xdm6yaf7spbvf60aj3mz12m05b1b2w";
};
nativeBuildInputs = [ meson ninja python3 appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ];
buildInputs = [ epoxy glib gtk3 mpv ];
- enableParallelBuilding = true;
+ patches = [
+ # fix appstream validation in sandbox
+ # https://github.com/celluloid-player/celluloid/pull/437
+ (fetchpatch {
+ url = https://github.com/celluloid-player/celluloid/commit/5a0b2e892bb715278d309c859a7e521d64433d85.patch;
+ sha256 = "0naci8lr6128yilal39h46yvq9x3la7g7fhvr5xlwyh30iqrbm3i";
+ })
+ ];
postPatch = ''
patchShebangs meson_post_install.py
@@ -35,7 +41,7 @@ stdenv.mkDerivation rec {
allowing access to mpv's powerful playback capabilities through an
easy-to-use user interface.
'';
- homepage = https://github.com/gnome-mpv/gnome-mpv;
+ homepage = "https://github.com/celluloid-player/celluloid";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index 7a8b66d2d28e1a1cdaa8e8cc49ff1bde6a4949c6..1c625de0dbc08983ba5a697f1634061b766ca463 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pkgconfig, zlib }:
stdenv.mkDerivation rec {
- version = "0.7.1";
+ version = "0.8.0";
name = "gpac-${version}";
src = fetchFromGitHub {
owner = "gpac";
repo = "gpac";
rev = "v${version}";
- sha256 = "197c5968p5bzvk0ga347fwgkqh4j1v3z65wlx65c5m9gwfxz2k2q";
+ sha256 = "1w1dyrn6900yi8ngchfzy5hvxr6yc60blvdq8y8mczimmmq8khb5";
};
# this is the bare minimum configuration, as I'm only interested in MP4Box
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 91fd7eab1268d77dbf9aaa91af9795c2c9933c09..1cb510780691415687d271cac646f73993e58a3c 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
+{ stdenv, callPackage, fetchFromGitHub
, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
, python2Packages, expat, glib, nspr, nss, openssl
@@ -59,7 +59,7 @@ let self = rec {
extraRuntimeDependencies = [ ];
installPhase = ''
- ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
+ ${if sourceDir == null then "" else "cd $src/$sourceDir"}
d=$out${pluginDir}/${namespace}
mkdir -p $d
sauce="."
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 2b21a25434d576cc1c6d2f9cc18a6ba7423bb7b7..6d74c64343d88824ab9535d26a0345f2c96f27da 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
-, gnome3, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
+, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
, nvidia_cg_toolkit, zlib, openssl, portaudio
}:
let
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index a2ba36640ad5a30f2c5c4a96f512a56a995130df..f9b5c4c019656ffcffc45d4557d4aa3a1bcad1ea 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "makemkv-${ver}";
- ver = "1.14.3";
+ ver = "1.14.4";
builder = ./builder.sh;
# Using two URLs as the first one will break as soon as a new version is released
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
"http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${ver}.tar.gz"
];
- sha256 = "1d1b7rppbxx2b9p1smf0nlgp47j8b1z8d7q0v82kwr4qxaa0xcg0";
+ sha256 = "0vmmvldmwmq9g202abblj6l15kb8z3b0c6mcc03f30s2yci6ij33";
};
src_oss = fetchurl {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${ver}.tar.gz"
];
- sha256 = "1jgyp6qs8r0z26258mvyg9dx7qqqdqrdsziw6m24ka77zpfg4b12";
+ sha256 = "0n1nlq17dxcbgk9xqf7nv6zykvh91yhsjqdhq55947wc11fxjqa0";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index f9d4d4698fafe336173021d4c3d5c8c0646de977..70dc156d68022bf2252fa405976a161f07100780 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "mjpg-streamer-${version}";
- version = "2016-03-08";
+ version = "unstable-2019-05-24";
src = fetchFromGitHub {
owner = "jacksonliam";
repo = "mjpg-streamer";
- rev = "4060cb64e3557037fd404d10e1c1d076b672e9e8";
- sha256 = "0g7y832jsz4ylmq9qp2l4fq6bm8l6dhsbi60fr5jfqpx4l0pia8m";
+ rev = "501f6362c5afddcfb41055f97ae484252c85c912";
+ sha256 = "1cl159svfs1zzzrd3zgn4x7qy6751bvlnxfwf5hn5fmg4iszajw7";
};
prePatch = ''
@@ -23,9 +23,10 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://sourceforge.net/projects/mjpg-streamer/;
+ homepage = "https://github.com/jacksonliam/mjpg-streamer";
description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software";
platforms = platforms.linux;
license = licenses.gpl2;
+ maintainers = with maintainers; [ gebner ];
};
}
diff --git a/pkgs/applications/video/mkclean/default.nix b/pkgs/applications/video/mkclean/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4a3cbc81b35ee28e9933f7c7e82de873ec29f5a5
--- /dev/null
+++ b/pkgs/applications/video/mkclean/default.nix
@@ -0,0 +1,37 @@
+{ dos2unix, fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "mkclean";
+ version = "0.8.10";
+
+ hardeningDisable = [ "format" ];
+ nativeBuildInputs = [ dos2unix ];
+
+ src = fetchurl {
+ url = "mirror://sourceforge/matroska/${pname}-${version}.tar.bz2";
+ sha256 = "0zbpi4sm68zb20d53kbss93fv4aafhcmz7dsd0zdf01vj1r3wxwn";
+ };
+
+ configurePhase = ''
+ dos2unix ./mkclean/configure.compiled
+ ./mkclean/configure.compiled
+ '';
+
+ buildPhase = ''
+ make -C mkclean
+ '';
+
+ installPhase = ''
+ mkdir -p $out/{bin,lib}
+ mv release/gcc_linux_*/*.* $out/lib
+ mv release/gcc_linux_*/* $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed.";
+ homepage = "https://www.matroska.org";
+ license = licenses.bsdOriginal;
+ maintainers = with maintainers; [ chrisaw ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index b1ff151633750619118444c948277bc9ba9c8278..c13bf3480d257b73153df969966f713149d4ccde 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
- version = "33.1.0";
+ version = "35.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "130hh6m7cv2x9jv51qclnfg3dldxhfzhzhf6sqibfhynaj65m09i";
+ sha256 = "163msz6l1d5vwirr1c6cm820kwxcjinwh91svf8ddg5181nwhmrx";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 332495adfce20dc52118d511e58d123170edb12f..dcfeae52aae4d69225d48c078337bdcdc2d5b7aa 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
ffmpeg_4 freetype libass libpthreadstubs
- luaEnv libuchardet mujs nv-codec-headers
+ luaEnv libuchardet mujs
] ++ optional alsaSupport alsaLib
++ optional archiveSupport libarchive
++ optional bluraySupport libbluray
@@ -166,6 +166,7 @@ in stdenv.mkDerivation rec {
++ optional xvSupport libXv
++ optional youtubeSupport youtube-dl
++ optional stdenv.isDarwin libiconv
+ ++ optional stdenv.isLinux nv-codec-headers
++ optionals cddaSupport [ libcdio libcdio-paranoia ]
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 1be4fc252fd0123690fe099f511008179eee37a7..74167a67bd2b70e9c142986aba709bd34c324a2d 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -2,7 +2,7 @@
, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype
, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2
-, linuxHeaders
+, linuxHeaders, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x";
};
+ patches = [
+ # Fixes build with exiv2 0.27.1.
+ (fetchpatch {
+ name = "004-exiv2.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946";
+ sha256 = "0mh542f53qgky0w3s2bv0gmcxzvmb10834z3cfff40fby2ffr6k8";
+ })
+ ];
+
setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
buildInputs = [
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 932436bd8d3be555b2d36b29c393cfc4df2a2a99..0990062bf02246ddef7dd30523e99001c2928cb6 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -1,6 +1,5 @@
{ config, stdenv
, fetchFromGitHub
-, fetchpatch
, cmake
, fdk_aac
, ffmpeg
@@ -37,13 +36,13 @@ let
optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "obs-studio-${version}";
- version = "23.1.0";
+ version = "23.2.1";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = "${version}";
- sha256 = "1iavrkjp7vgg0blm4lmj4mc4hrfx8yjaiwx55wmc5ynw80v37ybc";
+ sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz";
};
nativeBuildInputs = [ cmake
diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..15db28b05e467d8e1382461ab50efd020360cc74
--- /dev/null
+++ b/pkgs/applications/video/olive-editor/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, pkgconfig, which, qmake,
+ qtbase, qtmultimedia, frei0r, opencolorio, hicolor-icon-theme, ffmpeg-full,
+ CoreFoundation }:
+
+stdenv.mkDerivation rec {
+ pname = "olive-editor";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "olive-editor";
+ repo = "olive";
+ rev = version;
+ sha256 = "191nk4c35gys4iypykcidn6h27c3sbjfy117q7h9h1qilz2wm94z";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ which
+ qmake
+ ];
+
+ buildInputs = [
+ ffmpeg-full
+ frei0r
+ opencolorio
+ qtbase
+ qtmultimedia
+ qtmultimedia.dev
+ hicolor-icon-theme
+ ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation;
+
+ meta = with stdenv.lib; {
+ description = "Professional open-source NLE video editor";
+ homepage = "https://www.olivevideoeditor.org/";
+ downloadPage = "https://www.olivevideoeditor.org/download.php";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.balsoft ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index 20684354d095cfc65ae179722e3b2c59df0045e8..9f5401fc69c398c45c1f05863aa8726c00532b3e 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -9,41 +9,41 @@ let
# plex-media-player is updated, the versions for these files are changed,
# so the build IDs (and SHAs) below will need to be updated!
depSrcs = rec {
- webClientBuildId = "85-88b3ac67015f76";
- webClientDesktopBuildId = "3.77.2-7015f76";
- webClientTvBuildId = "3.78.0-88b3ac6";
+ webClientBuildId = "129-669a5eed7ae231";
+ webClientDesktopBuildId = "3.100.1-d7ae231";
+ webClientTvBuildId = "3.105.0-669a5ee";
webClient = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
- sha256 = "0j7i4yr95ljw9cwyaygld41j7yvndj3dza3cbydv4x8mh2hn05v1";
+ sha256 = "0gd7x0rf7sf696zd24y6pji9iam851vjjqbpm4xkqwpadwrwzhwk";
};
webClientDesktopHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
- sha256 = "106kx9ahz7jgskpjraff2g235n1whwvf18yw0nmp5dwr9ys9h8jp";
+ sha256 = "136hk7p6gxxmhq1d09jfjljkv76b5h2p16s5jwf28xixkp0ab2jg";
};
webClientDesktop = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
- sha256 = "0h23h3fd3w43glvnhrg9qiajs0ql490kb00g3i4cpi29hy1ky45r";
+ sha256 = "0yvjqar72jq58jllsp51b8ybiv6kad8w51bfzss87m1cv3qdbzpa";
};
webClientTvHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
- sha256 = "05zk2zpmcdf276ys5zyirsmvhvyvz99fa6hlgymma8ql6w67133r";
+ sha256 = "0kkw9dd0kr5n4ip1pwfs2dkfjwrph88i0dlw64dca9i885gyjvhd";
};
webClientTv = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
- sha256 = "1cflpgaf4kyj6ccqa11j28rkp8s7zlbnid7s00m5n2c907dihmw2";
+ sha256 = "0yssii01nx6ixg3mikqjn8hz34dalma0rfr8spj115xwr7aq8ixk";
};
};
in stdenv.mkDerivation rec {
name = "plex-media-player-${version}";
- version = "2.23.0.920";
- vsnHash = "5bc1a2e5";
+ version = "2.36.0.988";
+ vsnHash = "0150ae52";
src = fetchFromGitHub {
owner = "plexinc";
repo = "plex-media-player";
rev = "v${version}-${vsnHash}";
- sha256 = "1jzlyj32gr3ar89qnk8slazrbchqkjfx9dchzkzfvpi6742v9igm";
+ sha256 = "104arb0afv3jz0bvj8ij5s7av289ms9n91b4y4077la2wd6r1bq0";
};
nativeBuildInputs = [ pkgconfig cmake python3 ];
diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix
index aba3b81fde85dffef5360b3278f05ac245832da0..f0c3776a43361ed333ca8582ca762662be7ece37 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/applications/video/qarte/default.nix
@@ -3,11 +3,11 @@
let
pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]);
in stdenv.mkDerivation {
- name = "qarte-3.10.0+188";
+ name = "qarte-4.6.0";
src = fetchbzr {
- url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3;
- rev = "188";
- sha256 = "06xpkjgm5ci5gfkza9f44m8l4jj32gfmr65cqs4x0j2ihrc6b4r9";
+ url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4;
+ rev = "22";
+ sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn";
};
buildInputs = [ makeWrapper pythonEnv ];
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index 812004bd119f16545aa02fd19cd76b9265c0332b..f2b23fbdea0371a9ec4a13be5934928f115c6454 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
+{ stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre
, qwt, extra-cmake-modules }:
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 00c0d7b6dc22744a34faf950b92af7602ffea9f4..00a0942ccf6fc27d97a0139b6c8681dc900e9a34 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, qmake, qtscript }:
stdenv.mkDerivation rec {
- name = "smplayer-19.1.0";
+ name = "smplayer-19.5.0";
src = fetchurl {
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
- sha256 = "0q23nsmmdhj4kb90axaqrzv5pyj7szbwy8l3skl53yi8r4j3sj3s";
+ sha256 = "1xda9pbrc3dfbs71n5l8yszlcywz9456mwkv52vmn8lszhvjpjxm";
};
buildInputs = [ qtscript ];
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index c5dcec3872369bcb5d79e58177a54fa77cd71436..41f82a8bdd5c431e801a7f8c63082cfbaa6721ae 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, qmake, qtscript, qtwebkit }:
stdenv.mkDerivation rec {
- version = "18.11.0";
+ version = "19.6.0";
name = "smtube-${version}";
src = fetchurl {
url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
- sha256 = "0rda7mdsr0awhra9yrmsdzp2c4s6xx5nax107d1fydnk084pygqp";
+ sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm";
};
makeFlags = [
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index 135dabd68981412f408364499752e32d1b832030..ea51471d9aa41d10dd605c151473ac4be7f3dd72 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
- desktop-file-utils, enchant, gnome3, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme,
+ desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme,
libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
}:
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
index 21c2404f4ee7dbd67157d1fe6d569119a290c1c9..e81002193589f257b8f3d26c6036c188f4fdc3dd 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/pkgs/applications/video/vdr/default.nix
@@ -4,12 +4,12 @@
, enableBidi ? true
}: stdenv.mkDerivation rec {
- name = "vdr-${version}";
- version = "2.4.0";
+ pname = "vdr";
+ version = "2.4.1";
src = fetchurl {
- url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2";
- sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk";
+ url = "ftp://ftp.tvdr.de/vdr/${pname}-${version}.tar.bz2";
+ sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 4fc3783ba510b484819bebfe5c461319ce0993b3..022f4382a4925a3c89734333036c53133a582e4f 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, fetchgit, vdr, ffmpeg_2, alsaLib, fetchFromGitHub
+{ stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg
-, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses }:
-let
+, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses
+, callPackage
+}: let
mkPlugin = name: stdenv.mkDerivation {
name = "vdr-${vdr.version}-${name}";
inherit (vdr) src;
@@ -11,6 +12,8 @@ let
};
in {
+ xineliboutput = callPackage ./xineliboutput {};
+
skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: {
buildInputs = oldAttr.buildInputs ++ [ ncurses ];
});
diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix
index 2272d1605fd0e1e73d8f198d73ebca13c22ee9e9..497ad7c77a08b032e6ba72d2c6ad5d9de6218583 100644
--- a/pkgs/applications/video/vdr/wrapper.nix
+++ b/pkgs/applications/video/vdr/wrapper.nix
@@ -1,5 +1,12 @@
-{ symlinkJoin, lib, makeWrapper, vdr, plugins ? [] }:
-symlinkJoin {
+{ symlinkJoin, lib, makeWrapper, vdr
+, plugins ? []
+}: let
+
+ makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l);
+
+ requiredXinePlugins = lib.flatten (map (p: p.passthru.requiredXinePlugins or []) plugins);
+
+in symlinkJoin {
name = "vdr-with-plugins-${(builtins.parseDrvName vdr.name).version}";
@@ -8,7 +15,9 @@ symlinkJoin {
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
- wrapProgram $out/bin/vdr --add-flags "-L $out/lib/vdr --localedir=$out/share/locale"
+ wrapProgram $out/bin/vdr \
+ --add-flags "-L $out/lib/vdr --localedir=$out/share/locale" \
+ --prefix XINE_PLUGIN_PATH ":" ${makeXinePluginPath requiredXinePlugins}
'';
meta = with vdr.meta; {
diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/pkgs/applications/video/vdr/xineliboutput/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..98fcd2b5d40827ae23284704a36047a5811b1b06
--- /dev/null
+++ b/pkgs/applications/video/vdr/xineliboutput/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, lib, vdr
+, libav, libcap, libvdpau
+, xineLib, libjpeg, libextractor, mesa, libGLU
+, libX11, libXext, libXrender, libXrandr
+, makeWrapper
+}: let
+ name = "vdr-xineliboutput-2.1.0";
+
+ makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l);
+
+ self = stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${name}/${name}.tgz";
+ sha256 = "1phrxpaz8li7z0qy241spawalhcmwkv5hh3gdijbv4h7mm899yba";
+ };
+
+ # configure don't accept argument --prefix
+ dontAddPrefix = true;
+
+ postConfigure = ''
+ sed -i config.mak \
+ -e 's,XINEPLUGINDIR=/[^/]*/[^/]*/[^/]*/,XINEPLUGINDIR=/,'
+ '';
+
+ makeFlags = [ "DESTDIR=$(out)" ];
+
+ postFixup = ''
+ for f in $out/bin/*; do
+ wrapProgram $f \
+ --prefix XINE_PLUGIN_PATH ":" "${makeXinePluginPath [ "$out" xineLib ]}"
+ done
+ '';
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildInputs = [
+ libav
+ libcap
+ libextractor
+ libjpeg
+ libGLU
+ libvdpau
+ libXext
+ libXrandr
+ libXrender
+ libX11
+ mesa
+ vdr
+ xineLib
+ ];
+
+ passthru.requiredXinePlugins = [ xineLib self ];
+
+ meta = with lib;{
+ homepage = "https://sourceforge.net/projects/xineliboutput/";
+ description = "Xine-lib based software output device for VDR";
+ maintainers = [ maintainers.ck3d ];
+ license = licenses.gpl2;
+ inherit (vdr.meta) platforms;
+ };
+ };
+in self
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 7f1233a4e04e9cba3732f4f02e2f4b684333e2a4..e9fc0b4feda32f763524abfa549e23f68acff080 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -11,7 +11,6 @@
, onlyLibVLC ? false
, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
, jackSupport ? false
-, fetchpatch
, removeReferencesTo
, chromecastSupport ? true, protobuf, libmicrodns
}:
@@ -26,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
stdenv.mkDerivation rec {
name = "vlc-${version}";
- version = "3.0.6";
+ version = "3.0.7.1";
src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
- sha256 = "1lvyyahv6g9zv7m5g5qinyrwmw47zdsd5ysimb862j7kw15nvh8q";
+ sha256 = "1xb4c8n0hkwijzfdlbwadhxnx9z8rlhmrdq4c7q74rq9f51q0m86";
};
# VLC uses a *ton* of libraries for various pieces of functionality, many of
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index 67905033ba1062ac6e7f5327237ba623f84ba2cb..e609c1cd339536584102518e7bd300816346ff47 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchgit
-, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr
+{ stdenv, fetchFromGitHub
+, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
, ffmpeg
}:
-stdenv.mkDerivation {
- name = "vokoscreen-2.5.0";
- src = fetchgit {
- url = "https://github.com/vkohaupt/vokoscreen.git";
- rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f";
- sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z";
+stdenv.mkDerivation rec {
+
+ pname = "vokoscreen";
+ version = "2.5.8-beta";
+
+ src = fetchFromGitHub {
+ owner = "vkohaupt";
+ repo = "vokoscreen";
+ rev = version;
+ sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan";
};
nativeBuildInputs = [ pkgconfig qmake ];
@@ -16,6 +20,7 @@ stdenv.mkDerivation {
alsaLib
libv4l
qtbase
+ qtmultimedia
qttools
qtx11extras
libXrandr
@@ -35,14 +40,14 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Simple GUI screencast recorder, using ffmpeg";
- homepage = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html;
+ homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html";
longDescription = ''
vokoscreen is an easy to use screencast creator to record
educational videos, live recordings of browser, installation,
videoconferences, etc.
'';
license = licenses.gpl2Plus;
- maintainers = [maintainers.league];
+ maintainers = [ maintainers.league ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
index 8f696f2630130834ddd0902aa6dafc9eaa0a5e2f..afcee3f9715f99af11a4dde7ef4479c61cc12d76 100644
--- a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
+++ b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
@@ -1,20 +1,20 @@
diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp
-index bbf2abf..187efad 100644
+index 3008e62..07485bd 100644
--- a/settings/QvkSettings.cpp
+++ b/settings/QvkSettings.cpp
-@@ -56,17 +56,8 @@ void QvkSettings::readAll()
- GIFPlayer = settings.value( "GIFplayer" ).toString();
+@@ -66,17 +66,8 @@ void QvkSettings::readAll()
Minimized = settings.value( "Minimized", 0 ).toUInt();
+ MinimizedByStart = settings.value( "MinimizedByStart", 0 ).toUInt();
Countdown = settings.value( "Countdown", 0 ).toUInt();
- QFile file;
- if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true )
- {
-- vokoscreenWithLibs = true;
+- vokoscreenWithLibs = true;
- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" );
- }
- else
- {
-- vokoscreenWithLibs = false;
+- vokoscreenWithLibs = false;
- Recorder = settings.value( "Recorder", "ffmpeg" ).toString();
- }
+ vokoscreenWithLibs = true;
@@ -22,10 +22,3 @@ index bbf2abf..187efad 100644
settings.endGroup();
settings.beginGroup( "Videooptions" );
-@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime()
- int QvkSettings::getShowKeyOnOff()
- {
- return showKeyOnOff;
--}
-\ No newline at end of file
-+}
diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix
index 6a15132fd2457eb50c155c85e09f2decb29f8b2f..d52a4a6ab9b9e574a1a40bbe46200fb177985496 100644
--- a/pkgs/applications/video/wf-recorder/default.nix
+++ b/pkgs/applications/video/wf-recorder/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols
+, ffmpeg, x264, libpulseaudio
+}:
stdenv.mkDerivation rec {
pname = "wf-recorder";
- version = "unstable-2019-04-21";
+ version = "0.1";
src = fetchFromGitHub {
owner = "ammen99";
repo = pname;
- rev = "ddb96690556371007e316577ed1b14f0cb62e13c";
- sha256 = "04amfd1kyklcj6nmmmf21dz333ykglvhxb3cbzak06v2fxlrp2w3";
+ rev = "v${version}";
+ sha256 = "1rl75r87ijja9mfyrwrsz8r4zvjnhm0103qmgyhq2phlrdpkks5d";
};
nativeBuildInputs = [ meson ninja pkgconfig ];
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index 79dbddfab5501ade53d73f473c2014ad5bea15c9..23084c6286a4fd70ab8a8fa0f2a0922acac50f0a 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg";
};
- cargoSha256 = "0gainr5gfy0bbhr6078zvgx0kzp53slxjp37d3da091ikgzgfn51";
+ cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx";
meta = with stdenv.lib; {
description = "A container debugging tool based on FUSE";
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..eb143412bd40be413d6dadad7f74e84cff84ef68
--- /dev/null
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, glib
+, glibc
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+ project = "conmon";
+ name = "${project}-${version}";
+ version = "0.3.0";
+
+ src = fetchFromGitHub {
+ owner = "containers";
+ repo = project;
+ rev = "v${version}";
+ sha256 = "0s23gm0cq4mylv882dr1n8bqql42674vny3z58yy77lwzmifc6id";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib systemd ] ++
+ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
+
+ installPhase = "install -Dm755 bin/${project} $out/bin/${project}";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/containers/conmon;
+ description = "An OCI container runtime monitor";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ vdemeester saschagrunert ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index fe23bcac58557809b4e7c2a21a98ba721fbec441..d21bc8cc32b52e3fe2338f4726b52ba952816750 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }:
+{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }:
with lib;
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..8070e1423fe86ca001629d66e0da208011eff8bc
--- /dev/null
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -0,0 +1,69 @@
+{ flavor ? ""
+, ldflags ? ""
+, stdenv
+, btrfs-progs
+, buildGoPackage
+, fetchFromGitHub
+, glibc
+, gpgme
+, libapparmor
+, libassuan
+, libgpgerror
+, libseccomp
+, libselinux
+, lvm2
+, pkgconfig
+}:
+
+buildGoPackage rec {
+ project = "cri-o";
+ version = "1.15.0";
+ name = "${project}-${version}${flavor}";
+
+ goPackagePath = "github.com/${project}/${project}";
+
+ src = fetchFromGitHub {
+ owner = "cri-o";
+ repo = "cri-o";
+ rev = "v${version}";
+ sha256 = "08m84rlar25w6dwv76rab4vdlavacn7kb5ravzqnb8ngx68csbp3";
+ };
+
+ outputs = [ "bin" "out" ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror
+ libseccomp libselinux lvm2 ]
+ ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ];
+
+ makeFlags = ''BUILDTAGS="apparmor seccomp selinux
+ containers_image_ostree_stub"'';
+
+ buildPhase = ''
+ pushd go/src/${goPackagePath}
+
+ # Build pause
+ go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \
+ -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config
+
+ make -C pause
+
+ # Build the crio binary
+ go build -tags ${makeFlags} -o bin/crio -buildmode=pie \
+ -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio
+ '';
+ installPhase = ''
+ install -Dm755 bin/crio $bin/bin/crio${flavor}
+
+ mkdir -p $bin/libexec/crio
+ install -Dm755 bin/pause $bin/libexec/crio/pause${flavor}
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://cri-o.io;
+ description = ''Open Container Initiative-based implementation of the
+ Kubernetes Container Runtime Interface'';
+ license = licenses.asl20;
+ maintainers = with maintainers; [ saschagrunert ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index 7ab11ee6a5c78948bfdca30e9f0ab843e961284c..2d983d009f1df8afbad43d16c09d14e640cfdb88 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -3,15 +3,15 @@
, pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests
, six, texttable, websocket_client, cached-property
-, enum34, functools32,
+, enum34, functools32, paramiko
}:
buildPythonApplication rec {
- version = "1.23.2";
+ version = "1.24.1";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
- sha256 = "1x2jlh7z2znvyz2pqcpn0gigfiqnx8s59pc7xlvy9ryd76g9w1zz";
+ sha256 = "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5";
};
# lots of networking and other fails
@@ -20,7 +20,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [
pyyaml backports_ssl_match_hostname colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client
- docopt cached-property
+ docopt cached-property paramiko
] ++
stdenv.lib.optional (pythonOlder "3.4") enum34 ++
stdenv.lib.optional (pythonOlder "3.2") functools32;
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 719626fe40a8dc29e3b2c8561e04a6208e88f055..384ab8f30473bd92fda5611c22b84f0d66d1e7e9 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -201,13 +201,13 @@ rec {
# https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
docker_18_09 = makeOverridable dockerGen {
- version = "18.09.5";
- rev = "e8ff056dbcfadaeca12a5f508b0cec281126c01d";
- sha256 = "16nd9vg2286m6v47fjq2zicmfvi8vwiwn24yylxia8b9mk417kdb";
- runcRev = "2b18fe1d885ee5083ef9f0838fee39b62d653e30";
- runcSha256 = "0g0d9mh5fcvsjgddiyw98ph5zpz5ivlwy89m45jxwbzkxb21gy7w";
- containerdRev = "bb71b10fd8f58240ca47fbb579b9d1028eea7c84";
- containerdSha256 = "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0";
+ version = "18.09.7";
+ rev = "2d0083d657f82c47044c8d3948ba434b622fe2fd";
+ sha256 = "1f7q99pay7mmy925ap95p935y9xslxpmgha397db7x2w008rfl9k";
+ runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f";
+ runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf";
+ containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb";
+ containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
};
diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
index 8b7021f7dbb8ae656d3e5f6ae921a70d18f5084e..3b2e1f45ae645c2a0b416856858af41b7cc358d6 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, docker }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "docker-proxy-${rev}";
diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix
index 9419939d1c74083b066cfb2b729486eae86d3210..cce5a674f7cdcc43f6b8855532b6ca9bc25e4cbc 100644
--- a/pkgs/applications/virtualization/dynamips/default.nix
+++ b/pkgs/applications/virtualization/dynamips/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dynamips";
- version = "0.2.20";
+ version = "0.2.21";
src = fetchFromGitHub {
owner = "GNS3";
repo = pname;
rev = "v${version}";
- sha256 = "1841h0m0k0p3c3ify4imafjk7jigcj2zlr8rn3iyp7jnafkxqik7";
+ sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index d870e24661673ab55be05673e32c2eef63d69fe2..318929eb2253c26a58f98a8bc3f064269374b941 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive }:
+{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
+, buildPackages }:
stdenv.mkDerivation rec {
- name = "lkl-2018-08-22";
- rev = "5221c547af3d29582703f01049617a6bf9f6232a";
+ pname = "lkl";
+ version = "2019-06-20";
+ rev = "0a4ebeadad12b94db665b8daf30e44e949a02d90";
outputs = [ "dev" "lib" "out" ];
@@ -14,7 +16,7 @@ stdenv.mkDerivation rec {
inherit rev;
owner = "lkl";
repo = "linux";
- sha256 = "1k2plyx40xaphm8zsk2dd1lyv6dhsp7kj6hfmdgiamvl80bjajqy";
+ sha256 = "09y9ci3j0lp3z74h577ng2s9a4n4glqpqndyc9iy6wdqaj764gm6";
};
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
@@ -40,7 +42,12 @@ stdenv.mkDerivation rec {
# crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c."
hardeningDisable = [ "format" "fortify" ];
- makeFlags = "-C tools/lkl";
+ makeFlags = [
+ "-C tools/lkl"
+ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
+ "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
+ "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+ ];
enableParallelBuilding = true;
@@ -52,7 +59,7 @@ stdenv.mkDerivation rec {
overhead
'';
homepage = https://github.com/lkl/linux/;
- platforms = [ "x86_64-linux" "aarch64-linux" ]; # Darwin probably works too but I haven't tested it
+ platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; # Darwin probably works too but I haven't tested it
license = licenses.gpl2;
maintainers = with maintainers; [ copumpkin ];
};
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix
index 3e79ff84882fb32a6faf30d082d37d23c0976ae0..197b3045cf2736c791fa7ebfbd21d6afc5460768 100644
--- a/pkgs/applications/virtualization/nvidia-docker/default.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper
-, buildGoPackage, runc, libelf, libcap, libseccomp, glibc }:
+, buildGoPackage, runc, glibc }:
with lib; let
diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix
deleted file mode 100644
index 7ddfc2ebab06d72f2f5940a16c47eeebd2f1d985..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/podman/conmon.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, glib }:
-
-with lib;
-
-stdenv.mkDerivation rec {
- name = "conmon-${version}";
- version = "unstable-2019-03-19";
- rev = "84c860029893e2e2dd71d62231f009c9dcd3c0b4";
-
- src = fetchFromGitHub {
- owner = "containers";
- repo = "conmon";
- sha256 = "1ydidl3s7s5rfwk9gx0k80nxcixlilxw61g7x0vqsdy3mkylysv5";
- inherit rev;
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- glib
- ];
-
- installPhase = ''
- install -D -m 555 bin/conmon $out/bin/conmon
- '';
-
- meta = {
- homepage = https://github.com/containers/conmon;
- description = "An OCI container runtime monitor";
- license = licenses.asl20;
- maintainers = with maintainers; [ vdemeester ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 6321be0f07097c85d433d21b8058b8147d951ea5..b07365a5ca117385304f5a2a16d9edf1152c18ec 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, pkgconfig
-, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp
+, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp, systemd
, go-md2man
}:
buildGoPackage rec {
name = "podman-${version}";
- version = "1.2.0";
+ version = "1.3.2";
src = fetchFromGitHub {
- owner = "containers";
- repo = "libpod";
- rev = "v${version}";
- sha256 = "1nlll4q62w3i897wraj18pdi5cc91b8gmp360pzyqzzjdm9ag7v6";
+ owner = "containers";
+ repo = "libpod";
+ rev = "v${version}";
+ sha256 = "1j5n08273igj6wm9rrwks9nnklv91060bn1yv3ak78csxc05whs3";
};
goPackagePath = "github.com/containers/libpod";
@@ -22,9 +22,7 @@ buildGoPackage rec {
hardeningDisable = [ "fortify" ];
nativeBuildInputs = [ pkgconfig go-md2man ];
- buildInputs = [
- btrfs-progs libseccomp gpgme lvm2
- ];
+ buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ];
buildPhase = ''
pushd $NIX_BUILD_TOP/go/src/${goPackagePath}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 04fead5209c0f55380f0165c5e76562e0df77366..d64baca2cc7ef51831951a098cbb2793a1ba0527 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib
+{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib
, ncurses, perl, pixman, vde2, alsaLib, texinfo, flex
, bison, lzo, snappy, libaio, gnutls, nettle, curl
, makeWrapper
@@ -15,7 +15,7 @@
, usbredirSupport ? spiceSupport, usbredir
, xenSupport ? false, xen
, cephSupport ? false, ceph
-, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm
+, openGLSupport ? sdlSupport, mesa, epoxy, libdrm
, virglSupport ? openGLSupport, virglrenderer
, smbdSupport ? false, samba
, hostCpuOnly ? false
@@ -35,7 +35,7 @@ let
in
stdenv.mkDerivation rec {
- version = "3.1.0";
+ version = "4.0.0";
name = "qemu-"
+ stdenv.lib.optionalString xenSupport "xen-"
+ stdenv.lib.optionalString hostCpuOnly "host-cpu-only-"
@@ -44,10 +44,10 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";
- sha256 = "08frr1fdjx8qcfh3fafn10kibdwbvkqqvfl7hpqbm7i9dg4f1zlq";
+ sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd";
};
- nativeBuildInputs = [ python2 pkgconfig flex bison ];
+ nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ];
buildInputs =
[ zlib glib ncurses perl pixman
vde2 texinfo makeWrapper lzo snappy
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ]
++ optionals cephSupport [ ceph ]
- ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]
+ ++ optionals openGLSupport [ mesa epoxy libdrm ]
++ optionals virglSupport [ virglrenderer ]
++ optionals smbdSupport [ samba ];
@@ -79,12 +79,11 @@ stdenv.mkDerivation rec {
./fix-qemu-ga.patch
./9p-ignore-noatime.patch
(fetchpatch {
- name = "CVE-2019-3812.patch";
- url = "https://git.qemu.org/?p=qemu.git;a=patch;h=b05b267840515730dbf6753495d5b7bd8b04ad1c";
- sha256 = "03a5vc5wvirbyi5r8kb2r4m2w6f1zmh9bqsr2psh4pblwar0nf55";
+ url = "https://git.qemu.org/?p=qemu.git;a=patch;h=d52680fc932efb8a2f334cc6993e705ed1e31e99";
+ name = "CVE-2019-12155.patch";
+ sha256 = "0h2q71mcz3gvlrbfkqcgla74jdg73hvzcrwr4max2ckpxx8x9207";
})
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
- ++ optional pulseSupport ./fix-hda-recording.patch
++ optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch;
@@ -113,6 +112,7 @@ stdenv.mkDerivation rec {
[ "--audio-drv-list=${audio}"
"--sysconfdir=/etc"
"--localstatedir=/var"
+ "--enable-docs"
]
# disable sysctl check on darwin.
++ optional stdenv.isDarwin "--cpu=x86_64"
diff --git a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch b/pkgs/applications/virtualization/qemu/fix-hda-recording.patch
deleted file mode 100644
index b4e21f4f34777601fe43f96e5ff7df1a7acfd5bb..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/audio/paaudio.c b/audio/paaudio.c
-index fea6071..c1169d4 100644
---- a/audio/paaudio.c
-+++ b/audio/paaudio.c
-@@ -608,6 +608,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
- {
- int error;
- pa_sample_spec ss;
-+ pa_buffer_attr ba;
- struct audsettings obt_as = *as;
- PAVoiceIn *pa = (PAVoiceIn *) hw;
- paaudio *g = pa->g = drv_opaque;
-@@ -616,6 +617,12 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
- ss.channels = as->nchannels;
- ss.rate = as->freq;
-
-+ ba.fragsize = pa_frame_size (&ss) * g->conf.samples;
-+ ba.maxlength = 5 * ba.fragsize;
-+ ba.tlength = -1;
-+ ba.prebuf = -1;
-+ ba.minreq = -1;
-+
- obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness);
-
- pa->stream = qpa_simple_new (
-@@ -625,7 +632,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
- g->conf.source,
- &ss,
- NULL, /* channel map */
-- NULL, /* buffering attributes */
-+ &ba, /* buffering attributes */
- &error
- );
- if (!pa->stream) {
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
index 47b4b3176dc89d020b4d9596803415903d6c2f75..37c12ddbfeb7b3330e94f609cd796e1fc4723f89 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch
@@ -1,10 +1,25 @@
+From 98b3e5993bbdb0013b6cc1814e0ad9555290c3af Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 23 Apr 2019 21:31:45 -0500
+Subject: [PATCH] no install localstatedir
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 04a0d45050..5dc82d0eb7 100644
--- a/Makefile
+++ b/Makefile
-@@ -597,7 +597,7 @@
+@@ -786,7 +786,7 @@ endif
+ ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir
ifneq ($(TOOLS),)
- $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
+ $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
endif
+--
+2.21.GIT
+
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
index 517a8e39a1e9221b66e243bca5052a1a28e9c099..0a139448cb3abe877d6813bc3bcefde34108265f 100644
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ b/pkgs/applications/virtualization/railcar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, rustPlatform, libseccomp }:
+{ lib, fetchFromGitHub, rustPlatform, libseccomp }:
rustPlatform.buildRustPackage rec {
name = "railcar-${version}";
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9";
};
- cargoSha256 = "16f3ys0zzha8l5jdklmrqivl8hmrb9qgqgzcm3jn06v45hls9lan";
+ cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a";
buildInputs = [ libseccomp ];
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 42aad06d0c05d5bf387ff3ce18f64ef681c66e9e..0f53ede188ce68d85aae729666996c402da9c7e3 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools,
+{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg, trousers, squashfsTools,
cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }:
let
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
glibc.out glibc.static
- autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd
+ autoreconfHook go file git wget gnupg trousers squashfsTools cpio acl systemd
makeWrapper
];
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 1801dd9eddb6fe0525401a6bcdd804d7a3d48b4c..10c7d17209c32d4dc2cba3bcb460ea5955283358 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, go-md2man
+{ lib, fetchFromGitHub, buildGoPackage, go-md2man
, pkgconfig, libapparmor, apparmor-parser, libseccomp, which }:
with lib;
buildGoPackage rec {
name = "runc-${version}";
- version = "1.0.0-rc7";
+ version = "1.0.0-rc8";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
- sha256 = "1baryjpka8wmzc6c66bir12i390ix3641a06j33shpsb683ws3fj";
+ sha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf";
};
goPackagePath = "github.com/opencontainers/runc";
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index ab9416fd3d684eeb931c574e8aececf5552f8a3d..8ec9ec6c8b499f6b70ecc2807bae8e6d453651a0 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,12 +1,10 @@
{stdenv
, removeReferencesTo
, lib
-, fetchgit
, fetchFromGitHub
, utillinux
, openssl
, coreutils
-, gawk
, go
, which
, makeWrapper
@@ -17,13 +15,13 @@ with lib;
buildGoPackage rec {
name = "singularity-${version}";
- version = "3.0.1";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "sylabs";
repo = "singularity";
rev = "v${version}";
- sha256 = "1wpsd0il2ipa2n5cnbj8dzs095jycdryq2rx62kikbq7ahzz4fsi";
+ sha256 = "14lhxwy21s7q081x7kbnvkjsbxgsg2f181qlzmlxcn6n7gfav3kj";
};
goPackagePath = "github.com/sylabs/singularity";
@@ -34,22 +32,16 @@ buildGoPackage rec {
propagatedBuildInputs = [ coreutils squashfsTools ];
postConfigure = ''
- find . -name vendor -type d -print0 | xargs -0 rm -rf
-
cd go/src/github.com/sylabs/singularity
patchShebangs .
- sed -i 's|defaultEnv := "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"|defaultEnv := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' src/cmd/singularity/cli/singularity.go
+ sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go
./mconfig -V ${version} -p $bin --localstatedir=/var
- touch builddir/.dep-done
- touch builddir/vendors-done
# Don't install SUID binaries
sed -i 's/-m 4755/-m 755/g' builddir/Makefile
- # Point to base gopath
- sed -i "s|^cni_vendor_GOPATH :=.*\$|cni_vendor_GOPATH := $NIX_BUILD_TOP/go/src/github.com/containernetworking/plugins/plugins|" builddir/Makefile
'';
buildPhase = ''
@@ -59,6 +51,7 @@ buildGoPackage rec {
installPhase = ''
make -C builddir install LOCALSTATEDIR=$bin/var
chmod 755 $bin/libexec/singularity/bin/starter-suid
+ wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs}
'';
postFixup = ''
diff --git a/pkgs/applications/virtualization/singularity/deps.nix b/pkgs/applications/virtualization/singularity/deps.nix
index 526202e75ae529edb9f3e9b6e98604be58eef4f0..fe51488c7066f6687ef680d6bfaa4f7768ef205c 100644
--- a/pkgs/applications/virtualization/singularity/deps.nix
+++ b/pkgs/applications/virtualization/singularity/deps.nix
@@ -1,669 +1 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "github.com/Microsoft/go-winio";
- fetch = {
- type = "git";
- url = "https://github.com/Microsoft/go-winio";
- rev = "7da180ee92d8bd8bb8c37fc560e673e6557c392f";
- sha256 = "19gjjhmzswhm11wzj38r5alxypmflmy0z42flhc3czhmmwv7b1av";
- };
- }
- {
- goPackagePath = "github.com/alexflint/go-filemutex";
- fetch = {
- type = "git";
- url = "https://github.com/alexflint/go-filemutex";
- rev = "d358565f3c3f5334209f1e80693e4f621650c489";
- sha256 = "19fzbm0x8821awsmqj9ig49dxxkd72p1yfqbijmdwwszvw2r0ggz";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
- sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
- };
- }
- {
- goPackagePath = "github.com/blang/semver";
- fetch = {
- type = "git";
- url = "https://github.com/blang/semver";
- rev = "2ee87856327ba09384cabd113bc6b5d174e9ec0f";
- sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
- };
- }
- {
- goPackagePath = "github.com/containerd/cgroups";
- fetch = {
- type = "git";
- url = "https://github.com/containerd/cgroups";
- rev = "5017d4e9a9cf2d4381db99eacd9baf84b95bfb14";
- sha256 = "02pvcmj91j3maa9j1v91m2z9kpa6p822h06r007b3pl7h0paiqnj";
- };
- }
- {
- goPackagePath = "github.com/containerd/continuity";
- fetch = {
- type = "git";
- url = "https://github.com/containerd/continuity";
- rev = "246e49050efdf45e8f17fbbcf1547ee376f9939e";
- sha256 = "1zc1f0yixf32lprp5r77z2j9xq7fk0hijq8xzl08j4zrk0fcy8aq";
- };
- }
- {
- goPackagePath = "github.com/containernetworking/cni";
- fetch = {
- type = "git";
- url = "https://github.com/containernetworking/cni";
- rev = "a7885cb6f8ab03fba07852ded351e4f5e7a112bf";
- sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
- };
- }
- {
- goPackagePath = "github.com/containernetworking/plugins";
- fetch = {
- type = "git";
- url = "https://github.com/containernetworking/plugins";
- rev = "2b8b1ac0af4568e928d96ccc5f47b075416eeabd";
- sha256 = "1yl9m8pwjmqxj3hf0w9s6rykszhcww54z07yjgxzabmqf2dhchxv";
- };
- }
- {
- goPackagePath = "github.com/containers/image";
- fetch = {
- type = "git";
- url = "https://github.com/containers/image";
- rev = "2e4f799f5eba49a2498d2793cfb2a4bc823ca3f6";
- sha256 = "0b9symgbkd2vgvp7mfpz1l03i2zivwbc5ycccwv78b1ikk9m6b75";
- };
- }
- {
- goPackagePath = "github.com/containers/storage";
- fetch = {
- type = "git";
- url = "https://github.com/containers/storage";
- rev = "88d80428f9b146f8f9fe7e2e8cc8688a5aae1a4e";
- sha256 = "13fagjisbg55dhgjd72h0hiy6jfg8ggkcnjl5haqj13c2gkf6sam";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-iptables";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-iptables";
- rev = "b5b1876b170881a8259f036445ee89c8669db386";
- sha256 = "1s1c04x47pk3168606x4vkg4avs8a7m407hpha8py1xni08cgb6m";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-systemd";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-systemd";
- rev = "39ca1b05acc7ad1220e09f133283b8859a8b71ab";
- sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
- };
- }
- {
- goPackagePath = "github.com/cpuguy83/go-md2man";
- fetch = {
- type = "git";
- url = "https://github.com/cpuguy83/go-md2man";
- rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1";
- sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
- };
- }
- {
- goPackagePath = "github.com/d2g/dhcp4";
- fetch = {
- type = "git";
- url = "https://github.com/d2g/dhcp4";
- rev = "a1d1b6c41b1ce8a71a5121a9cee31809c4707d9c";
- sha256 = "191hzw6yqzkm042h6miyycq3g0zrhqjhhpl27f8vhwzp4wanasiz";
- };
- }
- {
- goPackagePath = "github.com/d2g/dhcp4client";
- fetch = {
- type = "git";
- url = "https://github.com/d2g/dhcp4client";
- rev = "e612998962035b93ba16cfd1ad2f3221985c1b8c";
- sha256 = "1612wh99fblc9ashmm6mjc9110fhal95z0mn9qn7av3px13yd9fs";
- };
- }
- {
- goPackagePath = "github.com/docker/distribution";
- fetch = {
- type = "git";
- url = "https://github.com/docker/distribution";
- rev = "749f6afb4572201e3c37325d0ffedb6f32be8950";
- sha256 = "05jn2wvikyw0pbmi74w5axr0zgxn5y3ynn9rhsq87rmwqj7raxhd";
- };
- }
- {
- goPackagePath = "github.com/docker/docker";
- fetch = {
- type = "git";
- url = "https://github.com/docker/docker";
- rev = "da99009bbb1165d1ac5688b5c81d2f589d418341";
- sha256 = "02hhx7s8vm45rcl2mx9xamkncl2pb6qhsmz35mffbg4n6l5rn5x5";
- };
- }
- {
- goPackagePath = "github.com/docker/docker-credential-helpers";
- fetch = {
- type = "git";
- url = "https://github.com/docker/docker-credential-helpers";
- rev = "d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1";
- sha256 = "1ff829h5p1j6qiivjvnwyiybrff3dddv1ij71nz5whmgavdqgd49";
- };
- }
- {
- goPackagePath = "github.com/docker/go-connections";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-connections";
- rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d";
- sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
- };
- }
- {
- goPackagePath = "github.com/docker/go-metrics";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-metrics";
- rev = "399ea8c73916000c64c2c76e8da00ca82f8387ab";
- sha256 = "0najfy92fq05b330cnjk5b326yi7dnnmvzfk6g5lsa1fci78yzw4";
- };
- }
- {
- goPackagePath = "github.com/docker/go-units";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-units";
- rev = "47565b4f722fb6ceae66b95f853feed578a4a51c";
- sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
- };
- }
- {
- goPackagePath = "github.com/docker/libtrust";
- fetch = {
- type = "git";
- url = "https://github.com/docker/libtrust";
- rev = "aabc10ec26b754e797f9028f4589c5b7bd90dc20";
- sha256 = "1lwslbggzc2b0c4wxl5pn6i2nfgz5jz8f7s7vnid9mrlsk59h7s1";
- };
- }
- {
- goPackagePath = "github.com/ghodss/yaml";
- fetch = {
- type = "git";
- url = "https://github.com/ghodss/yaml";
- rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
- sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
- };
- }
- {
- goPackagePath = "github.com/globalsign/mgo";
- fetch = {
- type = "git";
- url = "https://github.com/globalsign/mgo";
- rev = "113d3961e7311526535a1ef7042196563d442761";
- sha256 = "0m05ay993vv2jkc46bbdnq371s5jc0an2cycsj7p3b6lmv84jk9f";
- };
- }
- {
- goPackagePath = "github.com/godbus/dbus";
- fetch = {
- type = "git";
- url = "https://github.com/godbus/dbus";
- rev = "a389bdde4dd695d414e47b755e95e72b7826432c";
- sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "1adfc126b41513cc696b209667c8656ea7aac67c";
- sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
- sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
- };
- }
- {
- goPackagePath = "github.com/gorilla/context";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/context";
- rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
- sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
- };
- }
- {
- goPackagePath = "github.com/gorilla/mux";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/mux";
- rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
- sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
- sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/errwrap";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/errwrap";
- rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
- sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/go-multierror";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/go-multierror";
- rev = "b7773ae218740a7be65057fc60b366a49b538a44";
- sha256 = "09904bk7ac6qs9dgiv23rziq9h3makb9qg4jvxr71rlydsd7psfd";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
- };
- }
- {
- goPackagePath = "github.com/j-keck/arping";
- fetch = {
- type = "git";
- url = "https://github.com/j-keck/arping";
- rev = "2cf9dc699c5640a7e2c81403a44127bf28033600";
- sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c";
- };
- }
- {
- goPackagePath = "github.com/kubernetes-sigs/cri-o";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes-sigs/cri-o";
- rev = "8afc34092907d146906fcc31af112b2b46e7b5cd";
- sha256 = "0ghcjvk7grdcwb1936mnj56a7rla804glfknid9kmr3kgny3yi43";
- };
- }
- {
- goPackagePath = "github.com/magiconair/properties";
- fetch = {
- type = "git";
- url = "https://github.com/magiconair/properties";
- rev = "c2353362d570a7bfa228149c62842019201cfb71";
- sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
- sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-shellwords";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-shellwords";
- rev = "02e3cf038dcea8290e44424da473dd12be796a8a";
- sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
- sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
- };
- }
- {
- goPackagePath = "github.com/mtrmac/gpgme";
- fetch = {
- type = "git";
- url = "https://github.com/mtrmac/gpgme";
- rev = "b2432428689ca58c2b8e8dea9449d3295cf96fc9";
- sha256 = "0hs9gfwf3cmnvmmxb485icwlv8h8xnny3p52bj7qwv251pvwsnaf";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/go-digest";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/go-digest";
- rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf";
- sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/image-spec";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/image-spec";
- rev = "e562b04403929d582d449ae5386ff79dd7961a11";
- sha256 = "0j24nk975di8hcv6ycn2p2hhw1xdiy4bpxamr6wn12k21kadlp7s";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/image-tools";
- fetch = {
- type = "git";
- url = "https://github.com/sylabs/image-tools";
- rev = "2814f498056809a9d5baaf76d1d82312180a5888";
- sha256 = "0q3ljb51df5hc58rhp5xni2gsy3gkxn47d9dwyfcffnq8kpf9d8a";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/runc";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/runc";
- rev = "baf6536d6259209c3edfa2b22237af82942d3dfa";
- sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/runtime-spec";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/runtime-spec";
- rev = "5806c35637336642129d03657419829569abc5aa";
- sha256 = "13vw1b3j9sx7d5fr3w3jdg137nnqcr50fqchq8z8nf6s18lkhj93";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/runtime-tools";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/runtime-tools";
- rev = "1c243a8a8eb44d491790798afc9b634c6f6a6380";
- sha256 = "1ll5wrbn84yb2l7k6hpwwj06wywib7ar4z1bhh1rc5h9xajng7jq";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/selinux";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/selinux";
- rev = "ba1aefe8057f1d0cfb8e88d0ec1dc85925ef987d";
- sha256 = "1n283j7rsim7gysm91x99c41d7vnsjsgfm4dy11fnzpkpzfiksq5";
- };
- }
- {
- goPackagePath = "github.com/pelletier/go-toml";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-toml";
- rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194";
- sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
- sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
- };
- }
- {
- goPackagePath = "github.com/pquerna/ffjson";
- fetch = {
- type = "git";
- url = "https://github.com/pquerna/ffjson";
- rev = "d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac";
- sha256 = "069w276lch2hhkvz26wdla8d4s0cg842bhqmih4sa33dsinlgs8g";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "faf4ec335fe01ae5a6a0eaa34a5a9333bfbd1a30";
- sha256 = "08xgqgx7vc27zc30chgi09lwrnvxr338dn624xnw4ysfm9r6lxrz";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
- sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
- };
- }
- {
- goPackagePath = "github.com/prometheus/common";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/common";
- rev = "7600349dcfe1abd18d72d3a1770870d9800a7801";
- sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "7d6f385de8bea29190f15ba9931442a0eaef9af7";
- sha256 = "18cish8yas5r6xhgp8p8n7lg4wh3d4szzirszxra8m7rwy3swxxq";
- };
- }
- {
- goPackagePath = "github.com/russross/blackfriday";
- fetch = {
- type = "git";
- url = "https://github.com/russross/blackfriday";
- rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
- sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
- };
- }
- {
- goPackagePath = "github.com/safchain/ethtool";
- fetch = {
- type = "git";
- url = "https://github.com/safchain/ethtool";
- rev = "6e3f4faa84e1d8d48afec75ed064cf3611d3f8bf";
- sha256 = "15xjvny8bfhhjvvv654pimxxw5cd02q8skp1siwbfvrlw598j4lm";
- };
- }
- {
- goPackagePath = "github.com/satori/go.uuid";
- fetch = {
- type = "git";
- url = "https://github.com/satori/go.uuid";
- rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
- sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
- };
- }
- {
- goPackagePath = "github.com/seccomp/libseccomp-golang";
- fetch = {
- type = "git";
- url = "https://github.com/seccomp/libseccomp-golang";
- rev = "e3496e3a417d1dc9ecdceca5af2513271fed37a0";
- sha256 = "0z8v90nk22h8r5licav1a8cbn6k7bs47l0j1crw7bjl9hv1bmr71";
- };
- }
- {
- goPackagePath = "github.com/sirupsen/logrus";
- fetch = {
- type = "git";
- url = "https://github.com/sirupsen/logrus";
- rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc";
- sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "1e58aa3361fd650121dceeedc399e7189c05674a";
- sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
- sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
- };
- }
- {
- goPackagePath = "github.com/sylabs/sif";
- fetch = {
- type = "git";
- url = "https://github.com/sylabs/sif";
- rev = "177b9338f1ab9123be5b6217740be1f0ce924206";
- sha256 = "1dwpml36n06hglp2km1wsfzdiw1yva6a0h00f1y2933m3i8r3k2w";
- };
- }
- {
- goPackagePath = "github.com/syndtr/gocapability";
- fetch = {
- type = "git";
- url = "https://github.com/syndtr/gocapability";
- rev = "33e07d32887e1e06b7c025f27ce52f62c7990bc0";
- sha256 = "1x88c0b320b13w7samicf19dqx9rr4dnrh3yglk3cba21nwsp57i";
- };
- }
- {
- goPackagePath = "github.com/vishvananda/netlink";
- fetch = {
- type = "git";
- url = "https://github.com/vishvananda/netlink";
- rev = "a2ad57a690f3caf3015351d2d6e1c0b95c349752";
- sha256 = "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0";
- };
- }
- {
- goPackagePath = "github.com/vishvananda/netns";
- fetch = {
- type = "git";
- url = "https://github.com/vishvananda/netns";
- rev = "be1fbeda19366dea804f00efff2dd73a1642fdcc";
- sha256 = "0j0xin37zp34ajmhsgfbxr8l7vrljf1lc6z3j3miidlmfwcl2s0m";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonpointer";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonpointer";
- rev = "4e3ac2762d5f479393488629ee9370b50873b3a6";
- sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonreference";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonreference";
- rev = "bd5ef7bd5415a7ac448318e64f11a24cd21e594b";
- sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonschema";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonschema";
- rev = "1d523034197ff1f222f6429836dd36a2457a1874";
- sha256 = "1z8c6x8sfh6d1ib2lm2jps7r139qip6h3zik3fxhy1yr1380qbzp";
- };
- }
- {
- goPackagePath = "go4.org";
- fetch = {
- type = "git";
- url = "https://github.com/go4org/go4";
- rev = "9599cf28b011184741f249bd9f9330756b506cbc";
- sha256 = "0hssb6jmpjxvdx2k1zx0l2dbwpx52zxcq5n2bhqivr670r4wdrkq";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://github.com/sylabs/golang-x-crypto";
- rev = "4bce89e8e9a9f84a4cf02b9842c3eaff2af0a856";
- sha256 = "11wi2zd055ym9m36ba007rdg4ghrwaiqxc77qyqc37ln7l7accr9";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196";
- sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "6c888cc515d3ed83fc103cf1d84468aad274b0a7";
- sha256 = "18anqrdajp4p015v3f5y641k3lmgp2jr0lfyx0pb3ia0qvn93mrp";
- };
- }
- {
- goPackagePath = "gopkg.in/cheggaaa/pb.v1";
- fetch = {
- type = "git";
- url = "https://github.com/cheggaaa/pb";
- rev = "2af8bbdea9e99e83b3ac400d8f6b6d1b8cbbf338";
- sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://github.com/go-yaml/yaml";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
-]
\ No newline at end of file
+[]
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index bb16660db87e564fd8fed516c388962a64a26634..2a76cf487b03666011cc970cd71b3c561257ffa7 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,31 +1,37 @@
{ stdenv, fetchurl, python3Packages, intltool, file
, wrapGAppsHook, gtk-vnc, vte, avahi, dconf
, gobject-introspection, libvirt-glib, system-libvirt
-, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
+, gsettings-desktop-schemas, glib, libosinfo, gnome3
+, gtksourceview4
, spiceSupport ? true, spice-gtk ? null
, cpio, e2fsprogs, findutils, gzip
}:
with stdenv.lib;
+# TODO: remove after there's support for setupPyDistFlags
+let
+ setuppy = ../../../development/interpreters/python/run_setup.py;
+in
python3Packages.buildPythonApplication rec {
name = "virt-manager-${version}";
- version = "2.1.0";
+ version = "2.2.0";
namePrefix = "";
src = fetchurl {
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
- sha256 = "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil";
+ sha256 = "0186c2fjqm3wdr3wik4fcyl5l3gv5j6sxn18d0vclw83w4yrhjz9";
};
nativeBuildInputs = [
- wrapGAppsHook intltool file
+ intltool file
gobject-introspection # for setup hook populating GI_TYPELIB_PATH
];
buildInputs = [
+ wrapGAppsHook
libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi
- gsettings-desktop-schemas libosinfo gtk3
+ gsettings-desktop-schemas libosinfo gtksourceview4
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
] ++ optional spiceSupport spice-gtk;
@@ -43,8 +49,12 @@ python3Packages.buildPythonApplication rec {
${python3Packages.python.interpreter} setup.py configure --prefix=$out
'';
- postInstall = ''
- ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
+ # TODO: remove after there's support for setupPyDistFlags
+ buildPhase = ''
+ runHook preBuild
+ cp ${setuppy} nix_run_setup
+ ${python3Packages.python.pythonForBuild.interpreter} nix_run_setup --no-update-icon-cache build_ext bdist_wheel
+ runHook postBuild
'';
preFixup = ''
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 7c90f9b3483f80e591dbe7a8cbb95d1f52e8a54c..9c307d8e9ba4b8cbfd76c07598babbbc8645c012 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
xen
] ++ optionals spiceSupport [
spice-gtk spice-protocol libcap gdbm
- gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
# Required for USB redirection PolicyKit rules file
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index fd572a9f2ebeb479a51c64fe629c0aa898c499cf..b36d918a803ff158d19365325417776913a8b765 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,11 +1,11 @@
-{ config, stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
-, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
+{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2
+, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus
, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
, alsaLib, curl, libvpx, nettools, dbus
, makeself, perl
-, javaBindings ? false, jdk ? null
-, pythonBindings ? false, python2 ? null
+, javaBindings ? true, jdk ? null # Almost doesn't affect closure size
+, pythonBindings ? false, python3 ? null
, extensionPack ? null, fakeroot ? null
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, enableHardening ? false
@@ -17,12 +17,12 @@
with stdenv.lib;
let
- python = python2;
+ python = python3;
buildType = "release";
# Remember to change the extpackRev and version in extpack.nix and
# guest-additions/default.nix as well.
- main = "0jmrbyhs92lyarpvylxqn2ajxdg9b290w5nd4g0i4h83d28bwbw0";
- version = "5.2.28";
+ main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv";
+ version = "6.0.8";
in stdenv.mkDerivation {
name = "virtualbox-${version}";
@@ -42,7 +42,7 @@ in stdenv.mkDerivation {
++ optional javaBindings jdk
++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
- ++ optionals (headless) [ libXrandr ]
+ ++ optionals (headless) [ libXrandr libGL ]
++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
@@ -76,11 +76,6 @@ in stdenv.mkDerivation {
optional enableHardening ./hardened.patch
++ [
./qtx11extras.patch
- (fetchpatch {
- name = "010-qt-5.11.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/010-qt-5.11.patch?h=packages/virtualbox";
- sha256 = "0hjx99pg40wqyggnrpylrp5zngva4xrnk7r90i0ynrqc7n84g9pn";
- })
];
postPatch = ''
@@ -192,6 +187,6 @@ in stdenv.mkDerivation {
license = licenses.gpl2;
homepage = https://www.virtualbox.org/;
maintainers = with maintainers; [ flokli sander ];
- platforms = [ "x86_64-linux" "i686-linux" ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 0e8a6eb25da500e451c2be8c36cad21c4da0ccdb..78c2538bbb0efed8c80611d05ebde266c7e0a69d 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, lib}:
+{fetchurl, lib}:
with lib;
-let version = "5.2.28";
+let version = "6.0.8";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -10,7 +10,7 @@ fetchurl rec {
sha256 =
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
- let value = "376e07cbf2ff2844c95c800346c8e4697d7bc671ae0e21e46153b2e7b4ccc1d6";
+ let value = "6d89127c7f043fa96592da96ca87ac5ee9a7afd347d788380f91b695b67d7954";
in assert (builtins.stringLength value) == 64; value;
meta = {
@@ -18,6 +18,6 @@ fetchurl rec {
license = licenses.virtualbox-puel;
homepage = https://www.virtualbox.org/;
maintainers = with maintainers; [ flokli sander cdepillabout ];
- platforms = [ "x86_64-linux" "i686-linux" ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index ecefc9bc07e9e0821901314fc297d720c2aaf5f8..5ff8a1650babf4d751aa47ac9fb94ea0907c416b 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
-, xorg, dbus, virtualbox }:
+, zlib, xorg, dbus, virtualbox }:
let
version = virtualbox.version;
@@ -19,32 +19,23 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "0cwdmdgcd1jysyw7c9b3cdk1ngk5nq7slh1zkhxkvvq142cnm1v9";
+ sha256 = "1njgxb18r8a1m8fk2b32mmnbwciip3wcxwyhza5k73bx4q2sifac";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include";
- patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ];
-
- patches = [
- ./fix_kerndir.patch
- ./fix_kernincl.patch
- ];
+ # If you add a patch you probably need this.
+ #patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ];
hardeningDisable = [ "pic" ];
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
nativeBuildInputs = [ patchelf makeWrapper ];
- buildInputs = [ cdrkit dbus ] ++ kernel.moduleBuildDependencies;
+ buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies;
- installPhase = ''
- mkdir -p $out
- cp -r install/* $out
- '';
-
- buildCommand = with xorg; ''
+ unpackPhase = ''
${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
chmod 755 ./VBoxLinuxAdditions.run
@@ -63,39 +54,30 @@ stdenv.mkDerivation {
''
else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions")
}
+ '';
- cd ../
- patchPhase
- cd install/src
-
- # Build kernel modules
- export INSTALL_MOD_PATH=$out
+ doConfigure = false;
+ buildPhase = ''
+ # Build kernel modules.
+ cd src
find . -type f | xargs sed 's/depmod -a/true/' -i
-
cd vboxguest-${version}
-
+ # Run just make first. If we only did make install, we get symbol warnings during build.
make
-
cd ../..
# Change the interpreter for various binaries
- for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} other/mount.vboxsf
- do
- ${if stdenv.hostPlatform.system == "i686-linux" then ''
- patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $i
- ''
- else if stdenv.hostPlatform.system == "x86_64-linux" then ''
- patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $i
- ''
- else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions")
- }
- patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc dbus libX11 libXt libXext libXmu libXfixes libXrandr libXcursor ]} $i
+ for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} other/mount.vboxsf; do
+ patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} $i
+ patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc zlib
+ xorg.libX11 xorg.libXt xorg.libXext xorg.libXmu xorg.libXfixes xorg.libXrandr xorg.libXcursor ]} $i
done
for i in lib/VBoxOGL*.so
do
- patchelf --set-rpath ${lib.makeLibraryPath [ "$out" dbus libXcomposite libXdamage libXext libXfixes ]} $i
+ patchelf --set-rpath ${lib.makeLibraryPath [ "$out"
+ xorg.libXcomposite xorg.libXdamage xorg.libXext xorg.libXfixes ]} $i
done
# FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions
@@ -105,6 +87,13 @@ stdenv.mkDerivation {
# Remove references to /usr from various scripts and files
sed -i -e "s|/usr/bin|$out/bin|" other/vboxclient.desktop
sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all
+ '';
+
+ installPhase = ''
+ # Install kernel modules.
+ cd src/vboxguest-${version}
+ make install INSTALL_MOD_PATH=$out
+ cd ../..
# Install binaries
install -D -m 755 other/mount.vboxsf $out/bin/mount.vboxsf
@@ -118,11 +107,17 @@ stdenv.mkDerivation {
wrapProgram $out/bin/VBoxClient-all \
--prefix PATH : "${which}/bin"
- # Install OpenGL libraries
- mkdir -p $out/lib
- cp -v lib/VBoxOGL*.so $out/lib
- mkdir -p $out/lib/dri
- ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so
+ # Don't install VBoxOGL for now
+ # It seems to be broken upstream too, and fixing it is far down the priority list:
+ # https://www.virtualbox.org/pipermail/vbox-dev/2017-June/014561.html
+ # Additionally, 3d support seems to rely on VBoxOGL.so being symlinked from
+ # libGL.so (which we can't), and Oracle doesn't plan on supporting libglvnd
+ # either. (#18457)
+ ## Install OpenGL libraries
+ #mkdir -p $out/lib
+ #cp -v lib/VBoxOGL*.so $out/lib
+ #mkdir -p $out/lib/dri
+ #ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so
# Install desktop file
mkdir -p $out/share/autostart
@@ -131,21 +126,18 @@ stdenv.mkDerivation {
# Install Xorg drivers
mkdir -p $out/lib/xorg/modules/{drivers,input}
install -m 644 other/vboxvideo_drv_${xserverABI}.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
+ '';
- # Install kernel modules
- cd src
+ # Stripping breaks these binaries for some reason.
+ dontStrip = true;
- for i in *
- do
- cd $i
- kernelVersion=$(cd ${kernel.dev}/lib/modules; ls)
- export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
- find . -type f | xargs sed -i -e "s|-o root||g" \
- -e "s|-g root||g"
- make install
- cd ..
+ # Some code dlopen() libdbus, patch RUNPATH in fixupPhase so it isn't stripped.
+ postFixup = ''
+ for i in $(grep -F libdbus-1.so -l -r $out/{lib,bin}); do
+ origRpath=$(patchelf --print-rpath "$i")
+ patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ dbus ]}" "$i"
done
- ''; # */
+ '';
meta = {
description = "Guest additions for VirtualBox";
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch
deleted file mode 100644
index 0be949f63c92d2e1f028f21fed3dc18b903ddee6..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/vboxsf/Makefile.include.header b/vboxsf/Makefile.include.header
-index 8df1eb4d25..5a3e5604e7 100644
---- a/vboxsf/Makefile.include.header
-+++ b/vboxsf/Makefile.include.header
-@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
- endif # neq($(KERNELRELEASE),)
-
- # Kernel build folder
--KERN_DIR := /lib/modules/$(KERN_VER)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- $(error Error: unable to find the headers of the Linux kernel to build against. \
- Specify KERN_VER= and run Make again)
-
-diff --git a/vboxguest/Makefile.include.header b/vboxguest/Makefile.include.header
-index 8df1eb4d25..5a3e5604e7 100644
---- a/vboxguest/Makefile.include.header
-+++ b/vboxguest/Makefile.include.header
-@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
- endif # neq($(KERNELRELEASE),)
-
- # Kernel build folder
--KERN_DIR := /lib/modules/$(KERN_VER)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- $(error Error: unable to find the headers of the Linux kernel to build against. \
- Specify KERN_VER= and run Make again)
-
-diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header
-index 8df1eb4d25..5a3e5604e7 100644
---- a/vboxvideo/Makefile.include.header
-+++ b/vboxvideo/Makefile.include.header
-@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
- endif # neq($(KERNELRELEASE),)
-
- # Kernel build folder
--KERN_DIR := /lib/modules/$(KERN_VER)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- $(error Error: unable to find the headers of the Linux kernel to build against. \
- Specify KERN_VER= and run Make again)
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch
deleted file mode 100644
index e59e2e98c1b3b1f49563602833ef1599e9646dfd..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header
-index 8df1eb4d25..5a3e5604e7 100644
---- a/vboxvideo/Makefile.include.header
-+++ b/vboxvideo/Makefile.include.header
-@@ -122,7 +122,6 @@ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- Specify KERN_VER= and run Make again)
- endif
- # Kernel include folder
--KERN_INCL := $(KERN_DIR)/include
- # module install folder
- INSTALL_MOD_DIR ?= misc
- MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/$(INSTALL_MOD_DIR)
diff --git a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
index 6ed74e3e23ed16830e5ecf06c7d20cc9510bb498..a3aa98b081d16e6f941f1f473909b8f800c213d8 100644
--- a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
+++ b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch
@@ -2,30 +2,15 @@ diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk
index 71b96a3..73391f0 100644
--- a/kBuild/units/qt5.kmk
+++ b/kBuild/units/qt5.kmk
-@@ -1019,9 +1019,10 @@ else
+@@ -1054,9 +1054,9 @@ else
$(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )
endif
else
- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
-+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \
-+ $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL))
++ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(if $(filter X11Extras,$(module)),$(PATH_QT5_X11_EXTRAS_LIB),$(PATH_SDK_QT5_LIB))/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
endif
- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) )
+ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras )
endif
$(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
-diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
-index 3295bfefe7..796370623c 100644
---- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
-+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
-@@ -916,9 +916,6 @@ endif
- # The Qt modules we're using.
- # (The include directory and lib/framework for each module will be added by the Qt unit.)
- VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport
--VirtualBox_QT_MODULES.linux += X11Extras
--VirtualBox_QT_MODULES.solaris += X11Extras
--VirtualBox_QT_MODULES.freebsd += X11Extras
- VirtualBox_QT_MODULES.darwin += MacExtras
- VirtualBox_QT_MODULES.win += WinExtras
- if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index fa86257a1a9591b4d1e0e07a4a479efe5ba30868..25438c8160554fe3f7eefd518003d21b5d0a98a8 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -5,8 +5,13 @@
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
, libxkbcommon, xcbutilxrm, hicolor-icon-theme
, asciidoctor
+, fontsConf
+, gtk3Support ? false, gtk3 ? null
}:
+# needed for beautiful.gtk to work
+assert gtk3Support -> gtk3 != null;
+
with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}";
version = "4.3";
@@ -27,8 +32,13 @@ with luaPackages; stdenv.mkDerivation rec {
xmlto docbook_xml_dtd_45
docbook_xsl findXMLCatalogs
asciidoctor
+ ldoc
];
+ outputs = [ "out" "doc" ];
+
+ FONTCONFIG_FILE = toString fontsConf;
+
propagatedUserEnvPkgs = [ hicolor-icon-theme ];
buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection
git lgi libpthreadstubs libstartup_notification
@@ -36,7 +46,8 @@ with luaPackages; stdenv.mkDerivation rec {
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
- xcbutilxrm ];
+ xcbutilxrm ]
+ ++ stdenv.lib.optional gtk3Support gtk3;
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
cmakeFlags = "-DOVERRIDE_VERSION=${version}";
@@ -48,7 +59,10 @@ with luaPackages; stdenv.mkDerivation rec {
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";
postInstall = ''
- wrapProgram $out/bin/awesome \
+ # Don't use wrapProgram or the wrapper will duplicate the --search
+ # arguments every restart
+ mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
+ makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
--add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index 2c388c941e6ceb03ad67715b165d0c414812ad2d..e729f786a56630ae3f3ffe2d3661cc7adabad727 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -1,112 +1,69 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45
, docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja
, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev
-, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage
-, libXinerama, libXrandr, libXrender, libXext, xwininfo, libxdg_basedir }:
-
-let
- common = source: stdenv.mkDerivation (source // rec {
- name = "${source.pname}-${source.version}";
-
- nativeBuildInputs = (source.nativeBuildInputs or []) ++ [
- pkgconfig
- asciidoc
- docbook_xml_dtd_45
- docbook_xsl
- makeWrapper
- ];
-
- installFlags = [ "PREFIX=$(out)" ];
-
- postInstall = ''
- wrapProgram $out/bin/compton-trans \
- --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
- '';
-
- meta = with lib; {
- description = "A fork of XCompMgr, a sample compositing manager for X servers";
- longDescription = ''
- A fork of XCompMgr, which is a sample compositing manager for X
- servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
- extensions. It enables basic eye-candy effects. This fork adds
- additional features, such as additional effects, and a fork at a
- well-defined and proper place.
- '';
- license = licenses.mit;
- maintainers = with maintainers; [ ertes enzime twey ];
- platforms = platforms.linux;
- };
- });
-
- stableSource = rec {
- pname = "compton";
- version = "0.1_beta2.5";
-
- COMPTON_VERSION = version;
-
- buildInputs = [
- dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext
- libXinerama libdrm pcre libxml2 libxslt libconfig libGL
- ];
-
- src = fetchFromGitHub {
- owner = "chjj";
- repo = "compton";
- rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8";
- sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18";
- };
-
- meta = {
- homepage = https://github.com/chjj/compton/;
- };
+, dbus, libconfig, libdrm, libGL, pcre, libX11
+, libXinerama, libXext, xwininfo, libxdg_basedir }:
+stdenv.mkDerivation rec {
+ pname = "compton";
+ version = "6.2";
+
+ COMPTON_VERSION = "v${version}";
+
+ src = fetchFromGitHub {
+ owner = "yshui";
+ repo = "compton";
+ rev = COMPTON_VERSION;
+ sha256 = "03fi9q8zw2qrwpkmy1bnavgfh91ci9in5fdi17g4s5s0n2l7yil7";
};
- gitSource = rec {
- pname = "compton-git";
- version = "5.1-rc2";
-
- COMPTON_VERSION = "v${version}";
-
- nativeBuildInputs = [ meson ninja ];
-
- src = fetchFromGitHub {
- owner = "yshui";
- repo = "compton";
- rev = COMPTON_VERSION;
- sha256 = "1qpy76kkhz8gfby842ry7lanvxkjxh4ckclkcjk4xi2wsmbhyp08";
- };
-
- buildInputs = [
- dbus libX11 libXext
- xorgproto
- libXinerama libdrm pcre libxml2 libxslt libconfig libGL
- # Removed:
- # libXcomposite libXdamage libXrender libXrandr
-
- # New:
- libxcb xcbutilrenderutil xcbutilimage
- pixman libev
- libxdg_basedir
- ];
-
- preBuild = ''
- git() { echo "v${version}"; }
- export -f git
+ nativeBuildInputs = [
+ meson ninja
+ pkgconfig
+ asciidoc
+ docbook_xml_dtd_45
+ docbook_xsl
+ makeWrapper
+ ];
+
+ buildInputs = [
+ dbus libX11 libXext
+ xorgproto
+ libXinerama libdrm pcre libxml2 libxslt libconfig libGL
+ libxcb xcbutilrenderutil xcbutilimage
+ pixman libev
+ libxdg_basedir
+ ];
+
+ NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
+
+ mesonFlags = [
+ "-Dbuild_docs=true"
+ ];
+
+ preBuild = ''
+ git() { echo "v${version}"; }
+ export -f git
+ '';
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ postInstall = ''
+ wrapProgram $out/bin/compton-trans \
+ --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
+ '';
+
+ meta = with lib; {
+ description = "A fork of XCompMgr, a sample compositing manager for X servers";
+ longDescription = ''
+ A fork of XCompMgr, which is a sample compositing manager for X
+ servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
+ extensions. It enables basic eye-candy effects. This fork adds
+ additional features, such as additional effects, and a fork at a
+ well-defined and proper place.
'';
-
- NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
-
- mesonFlags = [
- "-Dvsync_drm=true"
- "-Dnew_backends=true"
- "-Dbuild_docs=true"
- ];
-
- meta = {
- homepage = https://github.com/yshui/compton/;
- };
+ license = licenses.mit;
+ homepage = "https://github.com/yshui/compton";
+ maintainers = with maintainers; [ ertes enzime twey ];
+ platforms = platforms.linux;
};
-in {
- compton = common stableSource;
- compton-git = common gitSource;
}
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 2a8f1d67f6e0704ca2eb9c202446755766187abb..734d70598fb00bc22b329f3acda2bb3fa658bb34 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
- cargoSha256 = "1khknf1bjs80cc2n4jnpilf8cc15crykhhyvvff6q4ay40353gr6";
+ cargoSha256 = "1r2wczfkdpvjc7iylwajkminraaz1ix6n724in0dvv5klfcdxlxb";
postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index d49c893ca145a13bc69b7000a42fb2d58af7647e..ca64786475f7496f8385a80093790f44fca15a79 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }:
stdenv.mkDerivation rec {
- name = "herbstluftwm-0.7.1";
+ name = "herbstluftwm-0.7.2";
src = fetchurl {
url = "https://herbstluftwm.org/tarballs/${name}.tar.gz";
- sha256 = "0d47lbjxxqd8d96hby47bdhyn9mlih7h28712j1vckiz05ig63nw";
+ sha256 = "1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz";
};
patchPhase = ''
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 755d1cbf2df8adf30539053f2c92d2935e9ed96c..bef38e7a72ab3aabc19c29fb4421077acbff89b7 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A tiling window manager";
homepage = "https://i3wm.org";
- maintainers = with maintainers; [ garbas modulistic fpletz ];
+ maintainers = with maintainers; [ modulistic fpletz ];
license = licenses.bsd3;
platforms = platforms.all;
diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix
new file mode 100644
index 0000000000000000000000000000000000000000..afa14b48451a6b6e0ed2ffc93355e45826bc8dbb
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/layout-manager.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, vim, makeWrapper, jq, rofi, xrandr, xdotool, i3, gawk, libnotify }:
+
+let
+ path = stdenv.lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ];
+in
+
+stdenv.mkDerivation rec {
+ pname = "i3-layout-manager";
+ version = "unstable-2019-06-19";
+
+ src = fetchFromGitHub {
+ owner = "klaxalk";
+ repo = pname;
+ rev = "80ade872bfd70d9c6039024097ceb8c852a2816a";
+ sha256 = "02xhyd737qwni628mjzr9i5v2kga5cq4k8m77bxm1p6kkj84nlmg";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -D layout_manager.sh $out/bin/layout_manager
+ wrapProgram $out/bin/layout_manager \
+ --prefix PATH : "${path}"
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/klaxalk/i3-layout-manager;
+ description = "Saving, loading and managing layouts for i3wm.";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 8c775833c28a5f0a9a500446d7d23a0cb919c34f..fa88a7e26befa93c6c0b8d344382e6334ef08f67 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
- keyboard-layout
'';
homepage = https://github.com/PandorasFox/i3lock-color;
- maintainers = with maintainers; [ garbas malyn ];
+ maintainers = with maintainers; [ malyn ];
license = licenses.bsd3;
# Needs the SSE2 instruction set. See upstream issue
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index a0e46c108b7dc512c7031bd9b7c9d71a22510177..f6d797c98e1e1639912db5d13681dd82689571a1 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text.";
homepage = https://github.com/meskarune/i3lock-fancy;
- maintainers = with maintainers; [ garbas ];
+ maintainers = with maintainers; [ ];
license = licenses.mit;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index d4bb3cdc1c2e23e4842e4bae6adba648b0794a6d..27d568ae9ede8d8893be784f134a4d6e389ee104 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
for every keystroke. After entering your password, the screen is unlocked again.
'';
homepage = https://i3wm.org/i3lock/;
- maintainers = with maintainers; [ garbas malyn domenkozar ];
+ maintainers = with maintainers; [ malyn domenkozar ];
license = licenses.bsd3;
platforms = platforms.all;
};
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
index b44aa73bc5ae42b9bd20016ed68e15cacd1dcfc3..20ea0dd03cc343201e3edca6b85229b298b280d7 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -3,19 +3,18 @@
python3Packages.buildPythonApplication rec {
# i3pystatus moved to rolling release:
# https://github.com/enkore/i3pystatus/issues/584
- version = "unstable-2019-02-10";
+ version = "unstable-2019-06-10";
pname = "i3pystatus";
- disabled = !python3Packages.isPy3k;
src = fetchFromGitHub
{
owner = "enkore";
repo = "i3pystatus";
- rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e";
- sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720";
+ rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2";
+ sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg";
};
- propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
+ propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++
[ libpulseaudio ] ++ extraLibs;
libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index d9095d3911b66a1971a0793765e4153ff3aa9cf0..2fd78cbb0e12e2126304b3223d526afa71b08a25 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -1,17 +1,17 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }:
rustPlatform.buildRustPackage rec {
- name = "i3status-rust-${version}";
- version = "0.9.0.2019-03-21";
+ pname = "i3status-rust";
+ version = "0.9.0.2019-04-27";
src = fetchFromGitHub {
owner = "greshake";
- repo = "i3status-rust";
- rev = "18300e6b9259053b80c37aef56c958fe5f50062b";
- sha256 = "1g1ra0i7jlkdslmfycdyb2wh2s4gfawd0k2pjqx3ayml9kgq33yh";
+ repo = pname;
+ rev = "d04d08cbd4d13c64b1e3b7a8d21c46acee3bc281";
+ sha256 = "0x23qv7kwsqy1yx25fn1z56fx8w865qarr5xdx8s22x42ym4zyha";
};
- cargoSha256 = "06izzv86nkn1izapldysyryz9zvjxvq23c742z284bnxjfq5my6i";
+ cargoSha256 = "0vl2zn9n7ijmjxi2lyglnghvaw4qi2bah5i6km15schlsm8c641g";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 65180846c649aa71c9b08e694b0478a441afff22..17b147da1b2f25241f71c207b0e0fb84459cdac1 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A tiling window manager";
homepage = https://i3wm.org;
- maintainers = [ stdenv.lib.maintainers.garbas ];
+ maintainers = [ ];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix
index 39bd62cd5aa92bf09c912893541eccb2b4bd09c7..5b1cdbe05f5d8dcf668b2da1cd0a71a8eb281bd4 100644
--- a/pkgs/applications/window-managers/i3/wk-switch.nix
+++ b/pkgs/applications/window-managers/i3/wk-switch.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "i3-wk-switch";
- version = "2017-08-21";
+ version = "2019-05-10";
- # https://github.com/tmfink/i3-wk-switch/commit/484f840bc4c28ddc60fa3be81e2098f7689e78fb
src = fetchFromGitHub {
owner = "tmfink";
repo = pname;
- rev = "484f840";
- sha256 = "0nrc13ld5bx07wrgnpzgpbaixb4rpi93xiapvyb8srd49fj9pcmb";
+ rev = "05a2d5d35e9841d2a26630f1866fc0a0e8e708eb";
+ sha256 = "0ln192abdqrrs7rdazp9acbji2y6pf68z2d1by4nf2q529dh24dc";
};
- propagatedBuildInputs = with python2Packages; [ i3-py ];
+ propagatedBuildInputs = with python3Packages; [ i3ipc ];
dontBuild = true;
doCheck = false;
@@ -23,7 +22,7 @@ python2Packages.buildPythonApplication rec {
'';
meta = with stdenv.lib; {
- description = "XMonad-like workspace switching for i3";
+ description = "XMonad-like workspace switching for i3 and sway";
maintainers = with maintainers; [ synthetica ];
platforms = platforms.linux;
license = licenses.mit;
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
index c249929b21607e1f092b6b0e1357c567033aa8f0..b0012c587f6a36815500c485b41da9bf4e684a7f 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs";
};
- cargoSha256 = "01ifrk6whvckys1kbj65cdwh976yn7dy9vpf4jybnlqripknab43";
+ cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf";
nativeBuildInputs = [ python3 pkgconfig ];
buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
diff --git a/pkgs/applications/window-managers/leftwm/cargo-lock.patch b/pkgs/applications/window-managers/leftwm/cargo-lock.patch
new file mode 100644
index 0000000000000000000000000000000000000000..92588eb2fdb9e5b91a3b43d6fbf3184b556ac39a
--- /dev/null
+++ b/pkgs/applications/window-managers/leftwm/cargo-lock.patch
@@ -0,0 +1,1483 @@
+--- /dev/null 2019-05-17 17:44:26.875442706 +0200
++++ b/Cargo.lock 2019-05-17 18:30:29.490608288 +0200
+@@ -0,0 +1,1480 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "aho-corasick"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "anymap"
++version = "0.12.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "argon2rs"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "arrayvec"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "atty"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "autocfg"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "backtrace"
++version = "0.3.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "backtrace-sys"
++version = "0.1.28"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "blake2-rfc"
++version = "0.2.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "block-buffer"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "block-padding"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "byte-tools"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "byteorder"
++version = "1.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "bytes"
++version = "0.4.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "chrono"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "clap"
++version = "2.33.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cloudabi"
++version = "0.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "constant_time_eq"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "crossbeam-deque"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "crossbeam-epoch"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "crossbeam-queue"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "deunicode"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "digest"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "dirs"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "either"
++version = "1.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "env_logger"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "failure"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "failure_derive"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
++ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fake-simd"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "fnv"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "fuchsia-cprng"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "fuchsia-zircon"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fuchsia-zircon-sys"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "futures"
++version = "0.1.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "generic-array"
++version = "0.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "humantime"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "idna"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "iovec"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "itertools"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "kernel32-sys"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "leftwm"
++version = "0.1.9"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "libc"
++version = "0.2.55"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "liquid"
++version = "0.18.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-compiler 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "liquid-compiler"
++version = "0.18.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "liquid-error"
++version = "0.18.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "liquid-interpreter"
++version = "0.18.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "liquid-value"
++version = "0.18.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "maplit"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "memchr"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "memoffset"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "mio"
++version = "0.6.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "mio-uds"
++version = "0.6.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "miow"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "net2"
++version = "0.2.33"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "nodrop"
++version = "0.1.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "num-integer"
++version = "0.1.39"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "num_cpus"
++version = "1.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "numtoa"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "opaque-debug"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "owning_ref"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pest"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pest_derive"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pest_generator"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pest_meta"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pkg-config"
++version = "0.3.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "proc-macro2"
++version = "0.4.30"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quick-error"
++version = "1.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "quote"
++version = "0.6.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rand_hc"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_isaac"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_jitter"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_os"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_pcg"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_xorshift"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rdrand"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.54"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "redox_termios"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_users"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex"
++version = "1.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ryu"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "scoped_threadpool"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "scopeguard"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde"
++version = "1.0.91"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.91"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.39"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "sha-1"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "slab"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "smallvec"
++version = "0.6.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "stable_deref_trait"
++version = "1.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "syn"
++version = "0.15.34"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "synstructure"
++version = "0.10.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "termcolor"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "termion"
++version = "1.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "time"
++version = "0.1.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio"
++version = "0.1.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-codec"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-current-thread"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-executor"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-fs"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-io"
++version = "0.1.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-reactor"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-sync"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-tcp"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-threadpool"
++version = "0.1.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-timer"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-trace-core"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-udp"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tokio-uds"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "toml"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "typenum"
++version = "1.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ucd-trie"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ucd-util"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-segmentation"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-width"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "url"
++version = "1.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "utf8-ranges"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "uuid"
++version = "0.7.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.3.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-build"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "wincolor"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ws2_32-sys"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "x11-dl"
++version = "2.18.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "xdg"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[metadata]
++"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++"checksum anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
++"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
++"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
++"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
++"checksum backtrace 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "f92d5d536fa03dc3d93711d97bac1fae2eb59aba467ca4c6600c0119da614f51"
++"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
++"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
++"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
++"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
++"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09"
++"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
++"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
++"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
++"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
++"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
++"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
++"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
++"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
++"checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"
++"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c"
++"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
++"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"
++"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
++"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
++"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
++"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
++"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
++"checksum futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "a2037ec1c6c1c4f79557762eab1f7eae1f64f6cb418ace90fae88f0942b60139"
++"checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592"
++"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
++"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
++"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
++"checksum libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "42914d39aad277d9e176efbdad68acb1d5443ab65afe0e0e4f0d49352a950880"
++"checksum liquid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e1d91078b50038dba2539ec474656192a0c83b4802e999e5ee334bf198a8120c"
++"checksum liquid-compiler 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6b581cfb0437adeb4628cceafed44441d0a4a5c858ab169ec932ba4b4fda815"
++"checksum liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76119f2171687b188d7b953627ae924ca0556499b0bd20099ee5f2dea8e8969b"
++"checksum liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cc07e0e8d8b87a34579e42644ac63e290989d4e0539b79993979163bb43ea7b"
++"checksum liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21caa8903eae7cd9f5918d85d99a06e2a21528fcf6e3da33a7b319d03b81d87c"
++"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
++"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
++"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
++"checksum mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "049ba5ca2b63e837adeee724aa9e36b408ed593529dcc802aa96ca14bd329bdf"
++"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
++"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
++"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
++"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
++"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
++"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409"
++"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
++"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
++"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
++"checksum pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c"
++"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
++"checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646"
++"checksum pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d"
++"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
++"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
++"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252"
++"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
++"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828"
++"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58"
++"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
++"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288"
++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
++"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
++"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++"checksum serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "a72e9b96fa45ce22a4bc23da3858dfccfd60acd28a25bcd328a98fdd6bea43fd"
++"checksum serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "101b495b109a3e3ca8c4cbe44cf62391527cdfb6ba15821c5ce80bcd5ea23f9f"
++"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
++"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
++"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
++"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
++"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe"
++"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
++"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
++"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea"
++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
++"checksum tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "94a1f9396aec29d31bb16c24d155cfa144d1af91c40740125db3131bdaf76da8"
++"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
++"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
++"checksum tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e"
++"checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af"
++"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
++"checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce"
++"checksum tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2f843ffdf8d6e1f90bddd48da43f99ab071660cd92b7ec560ef3cdfd7a409a"
++"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
++"checksum tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2"
++"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e"
++"checksum tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3"
++"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
++"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
++"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
++"checksum ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77"
++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
++"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
++"checksum x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)" = "940586acb859ea05c53971ac231685799a7ec1dee66ac0bccc0e6ad96e06b4e3"
++"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..574e42cc848148bd8e85662ff65c9ad358ae490b
--- /dev/null
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }:
+
+let
+ rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ];
+in
+
+rustPlatform.buildRustPackage rec {
+ pname = "leftwm";
+ version = "0.1.9";
+
+ src = fetchFromGitHub {
+ owner = "leftwm";
+ repo = "leftwm";
+ rev = "${version}";
+ sha256 = "0ji7m2npkdg27gm33b19rxr50km0gm1h9czi1f425vxq65mlkl4y";
+ };
+
+ buildInputs = [ makeWrapper libX11 libXinerama ];
+
+ postInstall = ''
+ wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"
+ wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}"
+ wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}"
+ '';
+
+ cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6";
+
+ # https://github.com/leftwm/leftwm/pull/37
+ cargoPatches = [ ./cargo-lock.patch ];
+
+ meta = {
+ description = "Leftwm - A tiling window manager for the adventurer";
+ homepage = https://github.com/leftwm/leftwm;
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ mschneider ];
+ };
+}
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index 635265b04abc9134e34fed47792dc482d8bee3f9..9abbd891e3107ab732787e7e5500ce31e74bb2ff 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libmatchbox, pkgconfig}:
+{ stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }:
stdenv.mkDerivation rec {
name = "matchbox-${version}";
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libmatchbox ];
+ NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib";
src = fetchurl {
url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "X window manager for non-desktop embedded systems";
- homepage = http://matchbox-project.org/;
+ homepage = "https://www.yoctoproject.org/software-item/matchbox/";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..722566ea2e9eead75a405c87d77a5a49cf57224c
--- /dev/null
+++ b/pkgs/applications/window-managers/neocomp/default.nix
@@ -0,0 +1,85 @@
+{ stdenv
+, fetchFromGitHub
+, asciidoc
+, docbook_xml_dtd_45
+, docbook_xsl
+, freetype
+, judy
+, libGL
+, libconfig
+, libdrm
+, libxml2
+, libxslt
+, libXcomposite
+, libXdamage
+, libXext
+, libXinerama
+, libXrandr
+, libXrender
+, pcre
+, pkgconfig
+}:
+let
+ rev = "v0.6-17-g271e784";
+in
+stdenv.mkDerivation rec {
+ name = "neocomp-unstable-${version}";
+ version = "2019-03-12";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "DelusionalLogic";
+ repo = "NeoComp";
+ sha256 = "1mp338vz1jm5pwf7pi5azx4hzykmvpkwzx1kw6a9anj272f32zpg";
+ };
+
+ buildInputs = [
+ asciidoc
+ docbook_xml_dtd_45
+ docbook_xsl
+ freetype
+ judy
+ libGL
+ libconfig
+ libdrm
+ libxml2
+ libxslt
+ libXcomposite
+ libXdamage
+ libXext
+ libXinerama
+ libXrandr
+ libXrender
+ pcre
+ pkgconfig
+ ];
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ "CFGDIR=${placeholder "out"}/etc/xdg/neocomp"
+ "ASTDIR=${placeholder "out"}/share/neocomp/assets"
+ "COMPTON_VERSION=git-${rev}-${version}"
+ ];
+
+ postPatch = ''
+ substituteInPlace src/compton.c --replace \
+ "assets_add_path(\"./assets/\");" \
+ "assets_add_path(\"$out/share/neocomp/assets/\");"
+ substituteInPlace src/assets/assets.c --replace \
+ "#define MAX_PATH_LENGTH 64" \
+ "#define MAX_PATH_LENGTH 128"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/DelusionalLogic/NeoComp;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ twey ];
+ platforms = platforms.linux;
+ description = "A fork of Compton, a compositor for X11";
+ longDescription = ''
+ NeoComp is a (hopefully) fast and (hopefully) simple compositor
+ for X11, focused on delivering frames from the window to the
+ framebuffer as quickly as possible.
+ '';
+ };
+}
diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix
index bccb49ff4d5584372d6487ad9194866e46e573ba..56d2515ed7b212ab94baf1bb7327cd57c511fd67 100644
--- a/pkgs/applications/window-managers/stumpish/default.nix
+++ b/pkgs/applications/window-managers/stumpish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchurl, fetchFromGitHub, bash, gnused, ncurses, xorg, rlwrap }:
+{ stdenv, substituteAll, fetchFromGitHub, gnused, ncurses, xorg, rlwrap }:
stdenv.mkDerivation rec {
pname = "stumpish";
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 3299811c49789ffe65d14fd8ed3c2aa5c7c6cbc2..7d5c4c05131d6f8041b869952981470053261498 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,35 +1,28 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub, makeWrapper
, meson, ninja
, pkgconfig, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
, pango, cairo, libinput, libcap, pam, gdk_pixbuf
-, wlroots, wayland-protocols
+, wlroots, wayland-protocols, swaybg
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "sway";
- version = "1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
- sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx";
+ sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776";
};
patches = [
- # Fix for a compiler warning that causes a build failure
- # (see https://github.com/swaywm/sway/issues/3862):
- (fetchpatch {
- url = "https://github.com/swaywm/sway/commit/bcde298a719f60b9913133dbd2a169dedbc8dd7d.patch";
- sha256 = "0r583nmqvq43ib93yv6flw8pj833v32lbs0q0xld56s3rnzvvdcp";
- })
./sway-config-no-nix-store-references.patch
./load-configuration-from-etc.patch
];
- nativeBuildInputs = [ pkgconfig meson ninja scdoc ];
+ nativeBuildInputs = [ pkgconfig meson ninja scdoc makeWrapper ];
buildInputs = [
wayland libxkbcommon pcre json_c dbus libevdev
@@ -44,6 +37,14 @@ stdenv.mkDerivation rec {
"-Dtray=enabled" "-Dman-pages=enabled"
];
+ postInstall = ''
+ wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
+ '';
+
+ postPatch = ''
+ sed -i "s/version: '1.0'/version: '${version}'/" meson.build
+ '';
+
meta = with stdenv.lib; {
description = "i3-compatible tiling Wayland compositor";
homepage = https://swaywm.org;
diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix
index 0b8ad55d574e4fb6a34df55259eefc08e482e6a8..c9daed461c55c6c501b28c198c0ec15b6e81e43e 100644
--- a/pkgs/applications/window-managers/sway/idle.nix
+++ b/pkgs/applications/window-managers/sway/idle.nix
@@ -5,19 +5,15 @@
stdenv.mkDerivation rec {
name = "swayidle-${version}";
- version = "1.3";
+ version = "1.5";
src = fetchFromGitHub {
owner = "swaywm";
repo = "swayidle";
rev = version;
- sha256 = "04agcbhc473jkk7npb40i94ny8naykxzpjcw2lvl05kxv65y5d9v";
+ sha256 = "05qi96j58xqxjiighay1d39rfanxcpn6vlynj23mb5dymxvlaq9n";
};
- postPatch = ''
- sed -iE "s/version: '1\.2',/version: '${version}',/" meson.build
- '';
-
nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
buildInputs = [ wayland wayland-protocols systemd ];
diff --git a/pkgs/applications/window-managers/tabbed/xft.patch b/pkgs/applications/window-managers/tabbed/xft.patch
deleted file mode 100644
index f4f1e82e70528be364b1bce721782f7b1ff49377..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/tabbed/xft.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index b3da7f0..ce43686 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -1,7 +1,7 @@
- /* See LICENSE file for copyright and license details. */
-
- /* appearance */
--static const char font[] = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
-+static const char font[] = "monospace-9";
- static const char* normbgcolor = "#222222";
- static const char* normfgcolor = "#cccccc";
- static const char* selbgcolor = "#555555";
-diff --git a/config.mk b/config.mk
-index dd741e4..ed3a2e9 100644
---- a/config.mk
-+++ b/config.mk
-@@ -9,7 +9,7 @@ MANPREFIX = ${PREFIX}/share/man
-
- # includes and libs
- INCS = -I. -I/usr/include
--LIBS = -L/usr/lib -lc -lX11
-+LIBS = -L/usr/lib -lc -lXft -lX11
-
- # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
-diff --git a/tabbed.c b/tabbed.c
-index b15f9cb..6e50c41 100644
---- a/tabbed.c
-+++ b/tabbed.c
-@@ -15,6 +15,7 @@
- #include
- #include
- #include
-+#include
-
- #include "arg.h"
-
-@@ -64,17 +65,16 @@ typedef struct {
-
- typedef struct {
- int x, y, w, h;
-- unsigned long norm[ColLast];
-- unsigned long sel[ColLast];
-- unsigned long urg[ColLast];
-+ XftColor norm[ColLast];
-+ XftColor sel[ColLast];
-+ XftColor urg[ColLast];
- Drawable drawable;
- GC gc;
- struct {
- int ascent;
- int descent;
- int height;
-- XFontSet set;
-- XFontStruct *xfont;
-+ XftFont *xfont;
- } font;
- } DC; /* draw context */
-
-@@ -97,7 +97,7 @@ static void unmapnotify(const XEvent *e);
- static void destroynotify(const XEvent *e);
- static void die(const char *errstr, ...);
- static void drawbar(void);
--static void drawtext(const char *text, unsigned long col[ColLast]);
-+static void drawtext(const char *text, XftColor col[ColLast]);
- static void *ecalloc(size_t n, size_t size);
- static void *erealloc(void *o, size_t size);
- static void expose(const XEvent *e);
-@@ -107,7 +107,7 @@ static void focusonce(const Arg *arg);
- static void fullscreen(const Arg *arg);
- static char* getatom(int a);
- static int getclient(Window w);
--static unsigned long getcolor(const char *colstr);
-+static XftColor getcolor(const char *colstr);
- static int getfirsttab(void);
- static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
- static void initfont(const char *fontstr);
-@@ -220,12 +220,6 @@ cleanup(void) {
- free(clients);
- clients = NULL;
-
-- if(dc.font.set) {
-- XFreeFontSet(dpy, dc.font.set);
-- } else {
-- XFreeFont(dpy, dc.font.xfont);
-- }
--
- XFreePixmap(dpy, dc.drawable);
- XFreeGC(dpy, dc.gc);
- XDestroyWindow(dpy, win);
-@@ -315,7 +309,7 @@ die(const char *errstr, ...) {
-
- void
- drawbar(void) {
-- unsigned long *col;
-+ XftColor *col;
- int c, cc, fc, width;
- char *name = NULL;
-
-@@ -368,12 +362,13 @@ drawbar(void) {
- }
-
- void
--drawtext(const char *text, unsigned long col[ColLast]) {
-+drawtext(const char *text, XftColor col[ColLast]) {
- int i, x, y, h, len, olen;
- char buf[256];
-+ XftDraw *d;
- XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-- XSetForeground(dpy, dc.gc, col[ColBG]);
-+ XSetForeground(dpy, dc.gc, col[ColBG].pixel);
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- if(!text)
- return;
-@@ -394,13 +389,12 @@ drawtext(const char *text, unsigned long col[ColLast]) {
- for(i = len; i && i > len - 3; buf[--i] = '.');
- }
-
-- XSetForeground(dpy, dc.gc, col[ColFG]);
-- if(dc.font.set) {
-- XmbDrawString(dpy, dc.drawable, dc.font.set,
-- dc.gc, x, y, buf, len);
-- } else {
-- XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-- }
-+ XSetForeground(dpy, dc.gc, col[ColFG].pixel);
-+
-+ d = XftDrawCreate(dpy, dc.drawable, DefaultVisual(dpy, screen), DefaultColormap(dpy,screen));
-+
-+ XftDrawStringUtf8(d, &col[ColFG], dc.font.xfont, x, y, (XftChar8 *) buf, len);
-+ XftDrawDestroy(d);
- }
-
- void *
-@@ -537,15 +531,14 @@ getclient(Window w) {
- return -1;
- }
-
--unsigned long
-+XftColor
- getcolor(const char *colstr) {
-- Colormap cmap = DefaultColormap(dpy, screen);
-- XColor color;
-+ XftColor color;
-
-- if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-+ if(!XftColorAllocName(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), colstr, &color))
- die("tabbed: cannot allocate color '%s'\n", colstr);
-
-- return color.pixel;
-+ return color;
- }
-
- int
-@@ -594,41 +587,11 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
-
- void
- initfont(const char *fontstr) {
-- char *def, **missing, **font_names;
-- int i, n;
-- XFontStruct **xfonts;
--
-- missing = NULL;
-- if(dc.font.set)
-- XFreeFontSet(dpy, dc.font.set);
--
-- dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-- if(missing) {
-- while(n--)
-- fprintf(stderr, "tabbed: missing fontset: %s\n", missing[n]);
-- XFreeStringList(missing);
-- }
--
-- if(dc.font.set) {
-- dc.font.ascent = dc.font.descent = 0;
-- n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-- for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-- dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
-- dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
-- xfonts++;
-- }
-- } else {
-- if(dc.font.xfont)
-- XFreeFont(dpy, dc.font.xfont);
-- dc.font.xfont = NULL;
-- if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-- && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) {
-- die("tabbed: cannot load font: '%s'\n", fontstr);
-- }
-+ if(!(dc.font.xfont = XftFontOpenName(dpy,screen,fontstr)) && !(dc.font.xfont = XftFontOpenName(dpy,screen,"fixed")))
-+ die("error, cannot load font: '%s'\n", fontstr);
-
-- dc.font.ascent = dc.font.xfont->ascent;
-- dc.font.descent = dc.font.xfont->descent;
-- }
-+ dc.font.ascent = dc.font.xfont->ascent;
-+ dc.font.descent = dc.font.xfont->descent;
- dc.font.height = dc.font.ascent + dc.font.descent;
- }
-
-@@ -1000,11 +963,9 @@ setup(void) {
- dc.drawable = XCreatePixmap(dpy, root, ww, wh,
- DefaultDepth(dpy, screen));
- dc.gc = XCreateGC(dpy, root, 0, 0);
-- if(!dc.font.set)
-- XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-
- win = XCreateSimpleWindow(dpy, root, wx, wy, ww, wh, 0,
-- dc.norm[ColFG], dc.norm[ColBG]);
-+ dc.norm[ColFG].pixel, dc.norm[ColBG].pixel);
- XMapRaised(dpy, win);
- XSelectInput(dpy, win, SubstructureNotifyMask|FocusChangeMask|
- ButtonPressMask|ExposureMask|KeyPressMask|PropertyChangeMask|
-@@ -1070,15 +1031,9 @@ spawn(const Arg *arg) {
-
- int
- textnw(const char *text, unsigned int len) {
-- XRectangle r;
--
-- if(dc.font.set) {
-- XmbTextExtents(dc.font.set, text, len, NULL, &r);
--
-- return r.width;
-- }
--
-- return XTextWidth(dc.font.xfont, text, len);
-+ XGlyphInfo ext;
-+ XftTextExtentsUtf8(dpy, dc.font.xfont, (XftChar8 *) text, len, &ext);
-+ return ext.xOff;
- }
-
- void
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
index 8f35cb620cae193d1f32f75a5b59d99e3c616988..24320ff0073b92ab41712b601a2f699881d4f8c4 100644
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -105,7 +105,7 @@ in symlinkJoin rec {
homepage = http://way-cooler.org/;
license = with licenses; [ mit ];
maintainers = [ maintainers.miltador ];
- broken = stdenv.hostPlatform.isAarch64; # fails to build wc-bg (on aarch64)
platforms = platforms.all;
+ broken = true;
};
}
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index b9d16db579260e7785f5b2f9ba8fc53fbd194f7e..a88281369e8f32ac8735cf44a37518d4d283f5d5 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,47 +1,52 @@
-{ stdenv, fetchurl, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb
-, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
+{ stdenv, fetchurl, meson, ninja, pkgconfig
+, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
+, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
+, colord, lcms2
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null, wayland-protocols
# beware of null defaults, as the parameters *are* supplied by callPackage by default
}:
+with stdenv.lib;
stdenv.mkDerivation rec {
name = "weston-${version}";
- version = "5.0.0";
+ version = "6.0.1";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm";
+ sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [
- wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
- mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva
+ wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
+ mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
libwebp wayland-protocols
+ colord lcms2
];
- configureFlags = [
- "--enable-x11-compositor"
- "--enable-drm-compositor"
- "--enable-wayland-compositor"
- "--enable-headless-compositor"
- "--enable-fbdev-compositor"
- "--enable-screen-sharing"
- "--enable-clients"
- "--enable-weston-launch"
- "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
- ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor"
- ++ stdenv.lib.optional (vaapi != null) "--enable-vaapi-recorder"
- ++ stdenv.lib.optionals (xwayland != null) [
- "--enable-xwayland"
- "--with-xserver-path=${xwayland.out}/bin/Xwayland"
- ];
+ mesonFlags= [
+ "-Dbackend-drm-screencast-vaapi=${boolToString (vaapi != null)}"
+ "-Dbackend-rdp=${boolToString (freerdp != null)}"
+ "-Dxwayland=${boolToString (xwayland != null)}" # Default is true!
+ "-Dremoting=false" # TODO
+ "-Dimage-webp=${boolToString (libwebp != null)}"
+ "-Dsimple-dmabuf-drm=" # Disables all drivers
+ "-Ddemo-clients=false"
+ "-Dsimple-clients="
+ "-Dtest-junit-xml=false"
+ # TODO:
+ #"--enable-clients"
+ #"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
+ ] ++ optionals (xwayland != null) [
+ "-Dxwayland-path=${xwayland.out}/bin/Xwayland"
+ ];
- meta = with stdenv.lib; {
+ meta = {
description = "Reference implementation of a Wayland compositor";
homepage = https://wayland.freedesktop.org/;
license = licenses.mit;
platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ];
};
}
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index 8a680e1f763342fd9579e3d79ef084f36208dcc9..60d3e61fdf969c9df5b5bcbb822387db470c4b11 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl";
};
- cargoSha256 = "0z92ml84b5652zgwzn08a8vvxksaa54jql66sfpdz1mvjwhgdmvn";
+ cargoSha256 = "18lb24k71sndklbwwhbv8jglj2d4y9mdk07l60wsvn5m2jbnpckk";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libXinerama libX11 ];
diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix
index bc7a5174e26b6b74a5e315468ad46df760b31548..f5c9f12a23f6d7483dcbf2d9023c539e3970ac7c 100644
--- a/pkgs/applications/window-managers/xmonad/wrapper.nix
+++ b/pkgs/applications/window-managers/xmonad/wrapper.nix
@@ -8,8 +8,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
- mkdir -p $out/bin $out/share
- ln -s ${xmonadEnv}/share/man $out/share/man
+ install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \
--set NIX_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"
diff --git a/pkgs/build-support/add-opengl-runpath/default.nix b/pkgs/build-support/add-opengl-runpath/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5cab0937e07472a94c084d2f22a1e88e85dd29f0
--- /dev/null
+++ b/pkgs/build-support/add-opengl-runpath/default.nix
@@ -0,0 +1,12 @@
+{ lib, stdenv }:
+
+stdenv.mkDerivation {
+ name = "add-opengl-runpath";
+
+ driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
+
+ buildCommand = ''
+ mkdir -p $out/nix-support
+ substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
+ '';
+}
diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/pkgs/build-support/add-opengl-runpath/setup-hook.sh
new file mode 100644
index 0000000000000000000000000000000000000000..e556e7ead2a78db1076c0b4d4c7d799d85e7f8c5
--- /dev/null
+++ b/pkgs/build-support/add-opengl-runpath/setup-hook.sh
@@ -0,0 +1,29 @@
+# Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
+# This is needed to not rely on LD_LIBRARY_PATH which does not work with setuid
+# executables. Fixes https://github.com/NixOS/nixpkgs/issues/22760. It must be run
+# in postFixup because RUNPATH stripping in fixup would undo it. Note that patchelf
+# actually sets RUNPATH not RPATH, which applies only to dependencies of the binary
+# it set on (including for dlopen), so the RUNPATH must indeed be set on these
+# libraries and would not work if set only on executables.
+addOpenGLRunpath() {
+ local forceRpath=
+
+ while [ $# -gt 0 ]; do
+ case "$1" in
+ --) shift; break;;
+ --force-rpath) shift; forceRpath=1;;
+ --*)
+ echo "addOpenGLRunpath: ERROR: Invalid command line" \
+ "argument: $1" >&2
+ return 1;;
+ *) break;;
+ esac
+ done
+
+ for file in "$@"; do
+ if ! isELF "$file"; then continue; fi
+ local origRpath="$(patchelf --print-rpath "$file")"
+ patchelf --set-rpath "@driverLink@/lib:$origRpath" ${forceRpath:+--force-rpath} "$file"
+ done
+}
+
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index c17274295c9606191f296212a475a9a1339c0191..990f1ce2e3e3e91b2f43932ee390f5433a63d905 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }:
+{ stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }:
rec {
# Both extraction functions could be unified, but then
@@ -133,6 +133,11 @@ rec {
xorg.libXt
xorg.libXmu
xorg.libxcb
+ xorg.xcbutil
+ xorg.xcbutilwm
+ xorg.xcbutilimage
+ xorg.xcbutilkeysyms
+ xorg.xcbutilrenderutil
libGLU
libuuid
libogg
@@ -144,7 +149,7 @@ rec {
libidn
tbb
wayland
- mesa_noglu
+ mesa
libxkbcommon
flac
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index b0840192ececa38064244e3d20a836f6ca62048b..7c9fc83e0f1b9aeedae2dbdb05e33a125c75d3fc 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -34,8 +34,10 @@ in stdenv.mkDerivation (fBuildAttrs // {
# https://github.com/bazelbuild/bazel/blob/9323c57607d37f9c949b60e293b573584906da46/src/main/cpp/startup_options.cc#L123-L124
#
# On macOS Bazel will use the system installed Xcode or CLT toolchain instead of the one in the PATH unless we pass BAZEL_USE_CPP_ONLY_TOOLCHAIN
- #
- BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget
+
+ # We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads:
+ # https://github.com/bazelbuild/bazel/issues/6502
+ BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch --loading_phase_threads=1 $bazelFlags $bazelTarget
runHook postBuild
'';
@@ -49,8 +51,10 @@ in stdenv.mkDerivation (fBuildAttrs // {
rm -rf $bazelOut/external/{local_*,\@local_*}
# Patching markers to make them deterministic
- sed -i 's, -\?[0-9][0-9]*$, 1,' $bazelOut/external/\@*.marker
- sed -i '/^ENV:TMP.*/d' $bazelOut/external/\@*.marker
+ find $bazelOut/external -name '@*\.marker' -exec sed -i \
+ -e 's, -\?[0-9][0-9]*$, 1,' \
+ -e '/^ENV:TMP.*/d' \
+ '{}' \;
# Remove all vcs files
rm -rf $(find $bazelOut/external -type d -name .git)
@@ -59,7 +63,9 @@ in stdenv.mkDerivation (fBuildAttrs // {
# Patching symlinks to remove build directory reference
find $bazelOut/external -type l | while read symlink; do
- ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink"
+ new_target="$(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,")"
+ rm "$symlink"
+ ln -sf "$new_target" "$symlink"
done
cp -r $bazelOut/external $out
@@ -82,8 +88,8 @@ in stdenv.mkDerivation (fBuildAttrs // {
'';
preConfigure = ''
- mkdir -p $bazelOut/external
- cp -r $deps/* $bazelOut/external
+ mkdir -p "$bazelOut"
+ cp -r $deps $bazelOut/external
chmod -R +w $bazelOut
find $bazelOut -type l | while read symlink; do
ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
index 0e9e36bc301439d211c2c5b14b097dfbc80bfb60..dcb2e97aa932244d2ed5f9d8102d59f2c274c314 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
@@ -7,28 +7,43 @@
#include
#include
+#include
+#include
+#include
+#include
+#include
+
#define fail(s, err) g_error("%s: %s: %s", __func__, s, g_strerror(err))
#define fail_if(expr) \
if (expr) \
fail(#expr, errno);
-#include
+const gchar *bind_blacklist[] = {"bin", "etc", "host", "real-host", "usr", "lib", "lib64", "lib32", "sbin", NULL};
-#include
-#include
-#include
-#include
+int pivot_root(const char *new_root, const char *put_old) {
+ return syscall(SYS_pivot_root, new_root, put_old);
+}
-const gchar *bind_blacklist[] = {"bin", "etc", "host", "usr", "lib", "lib64", "lib32", "sbin", NULL};
+void mount_tmpfs(const gchar *target) {
+ fail_if(mount("none", target, "tmpfs", 0, NULL));
+}
void bind_mount(const gchar *source, const gchar *target) {
fail_if(g_mkdir(target, 0755));
- fail_if(mount(source, target, "bind", MS_BIND | MS_REC, NULL));
+ fail_if(mount(source, target, NULL, MS_BIND | MS_REC, NULL));
}
-void bind_mount_host(const gchar *host, const gchar *guest) {
+const gchar *create_tmpdir() {
+ gchar *prefix =
+ g_build_filename(g_get_tmp_dir(), "chrootenvXXXXXX", NULL);
+ fail_if(!g_mkdtemp_full(prefix, 0755));
+ return prefix;
+}
+
+void pivot_host(const gchar *guest) {
g_autofree gchar *point = g_build_filename(guest, "host", NULL);
- bind_mount(host, point);
+ fail_if(g_mkdir(point, 0755));
+ fail_if(pivot_root(guest, point));
}
void bind_mount_item(const gchar *host, const gchar *guest, const gchar *name) {
@@ -40,19 +55,22 @@ void bind_mount_item(const gchar *host, const gchar *guest, const gchar *name) {
}
void bind(const gchar *host, const gchar *guest) {
+ mount_tmpfs(guest);
+ pivot_host(guest);
+
+ g_autofree gchar *host_dir = g_build_filename("/host", host, NULL);
+
g_autoptr(GError) err = NULL;
- g_autoptr(GDir) dir = g_dir_open(host, 0, &err);
+ g_autoptr(GDir) dir = g_dir_open(host_dir, 0, &err);
if (err != NULL)
fail("g_dir_open", errno);
const gchar *item;
- while (item = g_dir_read_name(dir))
+ while ((item = g_dir_read_name(dir)))
if (!g_strv_contains(bind_blacklist, item))
- bind_mount_item(host, guest, item);
-
- bind_mount_host(host, guest);
+ bind_mount_item(host_dir, "/", item);
}
void spit(const char *path, char *fmt, ...) {
@@ -68,11 +86,6 @@ void spit(const char *path, char *fmt, ...) {
fclose(f);
}
-int nftw_remove(const char *path, const struct stat *sb, int type,
- struct FTW *ftw) {
- return remove(path);
-}
-
int main(gint argc, gchar **argv) {
const gchar *self = *argv++;
@@ -81,15 +94,7 @@ int main(gint argc, gchar **argv) {
return 1;
}
- if (g_getenv("NIX_CHROOTENV"))
- g_warning("chrootenv doesn't stack!");
- else
- g_setenv("NIX_CHROOTENV", "", TRUE);
-
- g_autofree gchar *prefix =
- g_build_filename(g_get_tmp_dir(), "chrootenvXXXXXX", NULL);
-
- fail_if(!g_mkdtemp_full(prefix, 0755));
+ g_autofree const gchar *prefix = create_tmpdir();
pid_t cpid = fork();
@@ -115,9 +120,24 @@ int main(gint argc, gchar **argv) {
spit("/proc/self/uid_map", "%d %d 1", uid, uid);
spit("/proc/self/gid_map", "%d %d 1", gid, gid);
- bind("/", prefix);
+ // If there is a /host directory, assume this is nested chrootenv and use it as host instead.
+ gboolean nested_host = g_file_test("/host", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR);
+ g_autofree const gchar *host = nested_host ? "/host" : "/";
+
+ bind(host, prefix);
+
+ // Replace /host by an actual (inner) /host.
+ if (nested_host) {
+ fail_if(g_mkdir("/real-host", 0755));
+ fail_if(mount("/host/host", "/real-host", NULL, MS_BIND | MS_REC, NULL));
+ // For some reason umount("/host") returns EBUSY even immediately after
+ // pivot_root. We detach it at least to keep `/proc/mounts` from blowing
+ // up in nested cases.
+ fail_if(umount2("/host", MNT_DETACH));
+ fail_if(mount("/real-host", "/host", NULL, MS_MOVE, NULL));
+ fail_if(rmdir("/real-host"));
+ }
- fail_if(chroot(prefix));
fail_if(chdir("/"));
fail_if(execvp(*argv, argv));
}
@@ -126,8 +146,7 @@ int main(gint argc, gchar **argv) {
int status;
fail_if(waitpid(cpid, &status, 0) != cpid);
- fail_if(nftw(prefix, nftw_remove, getdtablesize(),
- FTW_DEPTH | FTW_MOUNT | FTW_PHYS));
+ fail_if(rmdir(prefix));
if (WIFEXITED(status))
return WEXITSTATUS(status);
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index be83c9da210878b3912445718de598422587a3e2..295b17eec67c81dc06aba0a77f51b494a9b0747d 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -52,8 +52,8 @@ let
etcProfile = writeText "profile" ''
export PS1='${name}-chrootenv:\u@\h:\w\$ '
export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
- export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
- export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin'
+ export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32:$LD_LIBRARY_PATH"
+ export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH"
export TZDIR='/etc/zoneinfo'
# Force compilers and other tools to look in default search paths
diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix
index d08f8822d751e77c739eb1e9d755ba1cde861271..a1030e3b34fae9630c3f53dc75e0f6fa2ed2b525 100644
--- a/pkgs/build-support/build-pecl.nix
+++ b/pkgs/build-support/build-pecl.nix
@@ -1,4 +1,4 @@
-{ stdenv, php, autoreconfHook, fetchurl }:
+{ stdenv, php, autoreconfHook, fetchurl, re2c }:
{ pname
, version
@@ -17,7 +17,7 @@ stdenv.mkDerivation (args // {
inherit src;
- nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs;
+ nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs;
buildInputs = [ php ] ++ buildInputs;
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix
index 24795a724ec84bbeb2a6d33c870e5c92fdcee342..6b3ff6fd62b05492735f452310f2c5cae245f3fa 100644
--- a/pkgs/build-support/closure-info.nix
+++ b/pkgs/build-support/closure-info.nix
@@ -4,7 +4,7 @@
# "nix-store --load-db" and "nix-store --register-validity
# --hash-given".
-{ stdenv, coreutils, jq, buildPackages }:
+{ stdenv, buildPackages }:
{ rootPaths }:
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 11945e7b6f723118285c78b22389c240b884df17..72d0a61887e64caa49ec348307bb35fed508800f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -14,7 +14,6 @@
runCommand,
rsync,
shadow,
- stdenv,
storeDir ? builtins.storeDir,
utillinux,
vmTools,
@@ -75,7 +74,7 @@ rec {
# We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
# And we cannot untar it, because then we cannot preserve permissions ecc.
tarsum = runCommand "tarsum" {
- buildInputs = [ go ];
+ nativeBuildInputs = [ go ];
} ''
mkdir tarsum
cd tarsum
@@ -165,7 +164,7 @@ rec {
};
inherit fromImage fromImageName fromImageTag;
- buildInputs = [ utillinux e2fsprogs jshon rsync jq ];
+ nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ];
} ''
rm -rf $out
@@ -216,7 +215,7 @@ rec {
find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
# Get the next lower directory and continue the loop.
- lowerdir=$lowerdir''${lowerdir:+:}image/$extractionID/layer
+ lowerdir=image/$extractionID/layer''${lowerdir:+:}$lowerdir
done
mkdir work
@@ -297,7 +296,7 @@ rec {
runCommand "${name}-granular-docker-layers" {
inherit maxLayers;
paths = referencesByPopularity closure;
- buildInputs = [ jshon rsync tarsum ];
+ nativeBuildInputs = [ jshon rsync tarsum ];
enableParallelBuilding = true;
}
''
@@ -335,7 +334,7 @@ rec {
uid ? 0, gid ? 0,
}:
runCommand "${name}-customisation-layer" {
- buildInputs = [ jshon rsync tarsum ];
+ nativeBuildInputs = [ jshon rsync tarsum ];
inherit extraCommands;
}
''
@@ -380,7 +379,7 @@ rec {
}:
runCommand "docker-layer-${name}" {
inherit baseJson contents extraCommands;
- buildInputs = [ jshon rsync tarsum ];
+ nativeBuildInputs = [ jshon rsync tarsum ];
}
''
mkdir layer
@@ -535,7 +534,7 @@ rec {
os = "linux";
});
impure = runCommand "${baseName}-standard-dynamic-date.json"
- { buildInputs = [ jq ]; }
+ { nativeBuildInputs = [ jq ]; }
''
jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
'';
@@ -556,7 +555,7 @@ rec {
inherit uid gid extraCommands;
};
result = runCommand "docker-image-${baseName}.tar.gz" {
- buildInputs = [ jshon pigz coreutils findutils jq ];
+ nativeBuildInputs = [ jshon pigz coreutils findutils jq ];
# Image name and tag must be lowercase
imageName = lib.toLower name;
baseJson = configJson;
@@ -585,9 +584,9 @@ rec {
layerID=$(sha256sum "$layer/json" | cut -d ' ' -f 1)
ln -s "$layer" "./image/$layerID"
- manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerID/layer.tar\"] + .")
- imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${configJson})\"}] + .")
- imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
+ manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerID/layer.tar\"]")
+ imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${configJson})\"}]")
+ imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]")
done
imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
echo "$imageJson" > "image/$imageJsonChecksum.json"
@@ -653,7 +652,7 @@ rec {
os = "linux";
});
impure = runCommand "${baseName}-config.json"
- { buildInputs = [ jq ]; }
+ { nativeBuildInputs = [ jq ]; }
''
jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
'';
@@ -671,7 +670,7 @@ rec {
extraCommands;
};
result = runCommand "docker-image-${baseName}.tar.gz" {
- buildInputs = [ jshon pigz coreutils findutils jq ];
+ nativeBuildInputs = [ jshon pigz coreutils findutils jq ];
# Image name and tag must be lowercase
imageName = lib.toLower name;
imageTag = if tag == null then "" else lib.toLower tag;
@@ -779,23 +778,24 @@ rec {
# Use the temp folder we've been working on to create a new image.
mv temp image/$layerID
- # Add the new layer ID to the beginning of the layer list
+ # Add the new layer ID to the end of the layer list
(
+ cat layer-list
# originally this used `sed -i "1i$layerID" layer-list`, but
# would fail if layer-list was completely empty.
echo "$layerID/layer.tar"
- cat layer-list
) | ${pkgs.moreutils}/bin/sponge layer-list
# Create image json and image manifest
imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
- for layerTar in $(tac ./layer-list); do
+ for layerTar in $(cat ./layer-list); do
layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1)
- imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
- imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
- manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerTar\"] + .")
+ imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${baseJson})\"}]")
+ # diff_ids order is from the bottom-most to top-most layer
+ imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]")
+ manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerTar\"]")
done
imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 557a4dbf54b7e1d9e103e172547bec037ec89220..29eea33a7e185defb9d3638e45966ab214d1979e 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -187,4 +187,51 @@ rec {
runAsRoot = "touch /example-file";
fromImage = bash;
};
+
+ # 13. example of 3 layers images This image is used to verify the
+ # order of layers is correct.
+ # It allows to validate
+ # - the layer of parent are below
+ # - the order of parent layer is preserved at image build time
+ # (this is why there are 3 images)
+ layersOrder = let
+ l1 = pkgs.dockerTools.buildImage {
+ name = "l1";
+ tag = "latest";
+ extraCommands = ''
+ mkdir -p tmp
+ echo layer1 > tmp/layer1
+ echo layer1 > tmp/layer2
+ echo layer1 > tmp/layer3
+ '';
+ };
+ l2 = pkgs.dockerTools.buildImage {
+ name = "l2";
+ fromImage = l1;
+ tag = "latest";
+ extraCommands = ''
+ mkdir -p tmp
+ echo layer2 > tmp/layer2
+ echo layer2 > tmp/layer3
+ '';
+ };
+ in pkgs.dockerTools.buildImage {
+ name = "l3";
+ fromImage = l2;
+ tag = "latest";
+ contents = [ pkgs.coreutils ];
+ extraCommands = ''
+ mkdir -p tmp
+ echo layer3 > tmp/layer3
+ '';
+ };
+
+ # 14. Create another layered image, for comparing layers with image 10.
+ another-layered-image = pkgs.dockerTools.buildLayeredImage {
+ name = "another-layered-image";
+ tag = "latest";
+ config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+ contents = [ pkgs.hello ];
+ };
+
}
diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix
index 03a936e08e0caa86c24d78fd9fd3884f3d16874a..c1d86adc6d8126b3661997f72b8d4f04f23d533b 100644
--- a/pkgs/build-support/docker/nix-prefetch-docker.nix
+++ b/pkgs/build-support/docker/nix-prefetch-docker.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
- unpackPhase = ":";
+ dontUnpack = true;
installPhase = ''
install -vD ${./nix-prefetch-docker} $out/bin/$name;
diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh
index 98c5b8cc21295bb06cb9effdce2251e303607718..bcad9e83e06fbb7377d7144b4770687a6c2da74c 100755
--- a/pkgs/build-support/docker/store-path-to-layer.sh
+++ b/pkgs/build-support/docker/store-path-to-layer.sh
@@ -9,7 +9,9 @@ layerPath="./layers/$layerNumber"
echo "Creating layer #$layerNumber for $@"
mkdir -p "$layerPath"
-tar --no-recursion -rf "$layerPath/layer.tar" /nix /nix/store
+tar --no-recursion -rf "$layerPath/layer.tar" \
+ --mtime="@$SOURCE_DATE_EPOCH" \
+ --owner=0 --group=0 /nix /nix/store
tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \
--mtime="@$SOURCE_DATE_EPOCH" \
--owner=0 --group=0 "$@"
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index 96e61bbf90e5c6483dce9edb6dfb47b6237c97e2..e2ec84c75e66b053eea89b8e17a2dfe5efd03733 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -31,7 +31,7 @@ in
import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
ename =
- if isNull(ename)
+ if ename == null
then pname
else ename;
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index c681be8e4c35a7b48fd630052def93e6180f0876..b447911ab8d37287b5103c1cb880e84ee294dbcf 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -270,7 +270,7 @@ make_deterministic_repo(){
}
-_clone_user_rev() {
+clone_user_rev() {
local dir="$1"
local url="$2"
local rev="${3:-HEAD}"
@@ -307,19 +307,29 @@ _clone_user_rev() {
fi
}
-clone_user_rev() {
- if ! test -n "$QUIET"; then
- _clone_user_rev "$@"
- else
- errfile="$(mktemp "${TMPDIR:-/tmp}/git-checkout-err-XXXXXXXX")"
- # shellcheck disable=SC2064
- trap "rm -rf \"$errfile\"" EXIT
- _clone_user_rev "$@" 2> "$errfile" || (
- status="$?"
- cat "$errfile" >&2
- exit "$status"
- )
+exit_handlers=()
+
+run_exit_handlers() {
+ exit_status=$?
+ for handler in "${exit_handlers[@]}"; do
+ eval "$handler $exit_status"
+ done
+}
+
+trap run_exit_handlers EXIT
+
+quiet_exit_handler() {
+ exec 2>&3 3>&-
+ if [ $1 -ne 0 ]; then
+ cat "$errfile" >&2
fi
+ rm -f "$errfile"
+}
+
+quiet_mode() {
+ errfile="$(mktemp "${TMPDIR:-/tmp}/git-checkout-err-XXXXXXXX")"
+ exit_handlers+=(quiet_exit_handler)
+ exec 3>&2 2>"$errfile"
}
json_escape() {
@@ -362,6 +372,14 @@ EOF
fi
}
+remove_tmpPath() {
+ rm -rf "$tmpPath"
+}
+
+if test -n "$QUIET"; then
+ quiet_mode
+fi
+
if test -z "$branchName"; then
branchName=fetchgit
fi
@@ -390,8 +408,7 @@ else
if test -z "$finalPath"; then
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
- # shellcheck disable=SC2064
- trap "rm -rf \"$tmpPath\"" EXIT
+ exit_handlers+=(remove_tmpPath)
tmpFile="$tmpPath/$(url_to_name "$url" "$rev")"
mkdir -p "$tmpFile"
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 89d72f512f7f96c63d38e3770a2843daa39fdcf8..2fb32b2324f203831ba3a2a20e40ba1bd514f11c 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -5,6 +5,10 @@
# stripLen acts as the -p parameter when applying a patch.
{ lib, fetchurl, buildPackages }:
+let
+ # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154
+ patchutils = buildPackages.patchutils_0_3_3;
+in
{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args:
fetchurl ({
@@ -14,10 +18,10 @@ fetchurl ({
echo "error: Fetched patch file '$out' is empty!" 1>&2
exit 1
fi
- "${buildPackages.patchutils}/bin/lsdiff" "$out" \
+ "${patchutils}/bin/lsdiff" "$out" \
| sort -u | sed -e 's/[*?]/\\&/g' \
| xargs -I{} \
- "${buildPackages.patchutils}/bin/filterdiff" \
+ "${patchutils}/bin/filterdiff" \
--include={} \
--strip=${toString stripLen} \
${lib.optionalString (extraPrefix != null) ''
@@ -32,7 +36,7 @@ fetchurl ({
cat "$out" 1>&2
exit 1
fi
- ${buildPackages.patchutils}/bin/filterdiff \
+ ${patchutils}/bin/filterdiff \
-p1 \
${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
@@ -46,7 +50,7 @@ fetchurl ({
exit 1
fi
'' + lib.optionalString revert ''
- ${buildPackages.patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile"
+ ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile"
mv "$tmpfile" "$out"
'' + (args.postFetch or "");
meta.broken = excludes != [] && includes != [];
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 3ce90cbeab3a6a5a615e0a322fc1ac53fe80ed76..6300587a7d158ebcbdef8da28863203402416e18 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -49,8 +49,11 @@ in
# first element of `urls').
name ? ""
- # Different ways of specifying the hash.
-, outputHash ? ""
+, # SRI hash.
+ hash ? ""
+
+, # Legacy ways of specifying the hash.
+ outputHash ? ""
, outputHashAlgo ? ""
, md5 ? ""
, sha1 ? ""
@@ -103,7 +106,8 @@ let
else throw "fetchurl requires either `url` or `urls` to be set";
hash_ =
- if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512"
+ if hash != "" then { outputHashAlgo = null; outputHash = hash; }
+ else if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512"
else if (outputHash != "" && outputHashAlgo != "") then { inherit outputHashAlgo outputHash; }
else if sha512 != "" then { outputHashAlgo = "sha512"; outputHash = sha512; }
else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; }
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 404cea7532bf486b88a05482e6e274883d7b30cf..f2336db8852b368c98c967d6201e0ffd099f2b57 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -19,8 +19,11 @@ rec {
https://kent.dl.sourceforge.net/sourceforge/
];
- # SourceForge.jp.
- sourceforgejp = [
+ # OSDN (formerly SourceForge.jp).
+ osdn = [
+ https://osdn.dl.osdn.jp/
+ https://osdn.mirror.constant.com/
+ https://mirrors.gigenet.com/OSDN/
https://osdn.dl.sourceforge.jp/
https://jaist.dl.sourceforge.jp/
];
@@ -406,9 +409,10 @@ rec {
# Alsa Project
alsa = [
- ftp://ftp.alsa-project.org/pub/
- http://alsa.cybermirror.org/
- http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/
- http://alsa.mirror.fr/
+ https://www.alsa-project.org/files/pub/
+ ftp://ftp.alsa-project.org/pub/
+ http://alsa.cybermirror.org/
+ http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/
+ http://alsa.mirror.fr/
];
}
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index f1b9b9290d4c3868f51287590d5e3bb1e8af02f3..c61df8ceb0015367a7eb4785e2d038d03c5e5c1a 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -5,7 +5,7 @@
# (e.g. due to minor changes in the compression algorithm, or changes
# in timestamps).
-{ lib, fetchurl, unzip }:
+{ fetchurl, unzip }:
{ # Optionally move the contents of the unpacked tree up one level.
stripRoot ? true
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 7ad1affb65a37448e9dab24ac8a323b0e9c919b6..7a5642e565de1355bb6be62dc561560dae928327 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -16,10 +16,16 @@
, name ? "initrd"
, compressor ? "gzip -9n"
, prepend ? []
+, lib
}:
+let
+ # !!! Move this into a public lib function, it is probably useful for others
+ toValidStoreName = x: with builtins;
+ lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x));
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
inherit name;
+
builder = ./make-initrd.sh;
makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage";
@@ -36,8 +42,12 @@ stdenv.mkDerivation rec {
# Note: we don't use closureInfo yet, as that won't build with nix-1.x.
# See #36268.
exportReferencesGraph =
- map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
+ lib.zipListsWith
+ (x: i: [("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") x.object])
+ contents
+ (lib.range 0 (lib.length contents - 1));
pathsFromGraph = ./paths-from-graph.pl;
inherit compressor prepend;
}
+
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index dcf3a2016bc25a19b4e961c1e599e9b04043839b..8e8da00b02a2162f44068605942c0663f150c336 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -160,16 +160,22 @@ int posix_spawn(pid_t * pid, const char * path,
return posix_spawn_real(pid, rewrite(path, buf), file_actions, attrp, argv, envp);
}
-int execv(const char *path, char *const argv[])
+int posix_spawnp(pid_t * pid, const char * file,
+ const posix_spawn_file_actions_t * file_actions,
+ const posix_spawnattr_t * attrp,
+ char * const argv[], char * const envp[])
{
- int (*execv_real) (const char *path, char *const argv[]) = dlsym(RTLD_NEXT, "execv");
+ int (*posix_spawnp_real) (pid_t *, const char *,
+ const posix_spawn_file_actions_t *,
+ const posix_spawnattr_t *,
+ char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "posix_spawnp");
char buf[PATH_MAX];
- return execv_real(rewrite(path, buf), argv);
+ return posix_spawnp_real(pid, rewrite(file, buf), file_actions, attrp, argv, envp);
}
-void *dlopen(const char *filename, int flag)
+int execv(const char *path, char *const argv[])
{
- void * (*__dlopen_real) (const char *, int) = dlsym(RTLD_NEXT, "dlopen");
+ int (*execv_real) (const char *path, char *const argv[]) = dlsym(RTLD_NEXT, "execv");
char buf[PATH_MAX];
- return __dlopen_real(rewrite(filename, buf), flag);
+ return execv_real(rewrite(path, buf), argv);
}
diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix
index a98b4affacba2425a67e5032f4152666e8b4e389..a70dc0390cb5c5d2d6a9b3e73cd830bad15adc92 100644
--- a/pkgs/build-support/mkshell/default.nix
+++ b/pkgs/build-support/mkshell/default.nix
@@ -11,13 +11,8 @@
...
}@attrs:
let
- mergeInputs = name:
- let
- op = item: sum: sum ++ item."${name}" or [];
- nul = [];
- list = [attrs] ++ inputsFrom;
- in
- lib.foldr op nul list;
+ mergeInputs = name: lib.concatLists (lib.catAttrs name
+ ([attrs] ++ inputsFrom));
rest = builtins.removeAttrs attrs [
"inputsFrom"
@@ -25,6 +20,7 @@ let
"nativeBuildInputs"
"propagatedBuildInputs"
"propagatedNativeBuildInputs"
+ "shellHook"
];
in
@@ -37,6 +33,9 @@ stdenv.mkDerivation ({
propagatedBuildInputs = mergeInputs "propagatedBuildInputs";
propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs";
+ shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook"
+ (lib.reverseList inputsFrom ++ [attrs]));
+
nobuildPhase = ''
echo
echo "This derivation is not meant to be built, aborting";
diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix
index acc95eaf993f09bfa2d92cbc75a559df5bef9415..3c5cbe2b4928607289f63fba0ae73ffcd4c31127 100644
--- a/pkgs/build-support/nix-prefetch-github/default.nix
+++ b/pkgs/build-support/nix-prefetch-github/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-prefetch-github";
- version = "2.2";
+ version = "2.3";
src = fetchFromGitHub {
owner = "seppeljordan";
repo = "nix-prefetch-github";
rev = "v${version}";
- sha256 = "1m1d1fzacvwprfvhxih1hzr1m0y1jjxiznf8p8b3bi5a41yzvrrl";
+ sha256 = "0b2hgfyxhlqq6lyi5cr98dz6if5kl6b3kq67f2lzfkalydywl1dh";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -19,7 +19,6 @@ python3.pkgs.buildPythonApplication rec {
click
effect
jinja2
- requests
];
meta = with stdenv.lib; {
description = "Prefetch sources from github";
diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh
index 02eac664d43714ef7041a6165433395cbe79236d..7da322032185d07311b10ae0e11406b7c574387d 100644
--- a/pkgs/build-support/nuke-references/builder.sh
+++ b/pkgs/build-support/nuke-references/builder.sh
@@ -7,7 +7,7 @@ cat > $out/bin/nuke-refs < "\$i.tmp"
+ cat "\$i" | $perl/bin/perl -pe "s|\Q$NIX_STORE\E/\$excludes[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > "\$i.tmp"
if test -x "\$i"; then chmod +x "\$i.tmp"; fi
mv "\$i.tmp" "\$i"
fi
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix
index 4d6ed76aca019e75530d5da6bec8b3d1724ae5c2..a0aac1447969ce1460df6f218882d4d57bbfc303 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/pkgs/build-support/ocaml/dune.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, dune, opaline }:
+{ stdenv, ocaml, findlib, dune, opaline }:
{ pname, version, buildInputs ? [], ... }@args:
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 08f7238c1fda9035dd1cc193761ac56ee0f1132d..f3f9ef377c8c906a28c2a9833639220a9fa7cab9 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage }:
+{ lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage }:
let
mkCrate = args: let
p = {
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 2579c97b99e8e102a10a7b70d5f5cfd431884c21..762a61b8a57915616c1e4aab01b2a0941b0a86f2 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3, buildPackages }:
+{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages }:
{ name ? "${args.pname}-${args.version}"
, cargoSha256 ? "unset"
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index e8465ba61624a42dcd43b4ad016609b4546da10f..4e6058383d48ab20295bb83ae6eca18f2bbf5a80 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -3,7 +3,7 @@ let cargo-vendor-normalise = stdenv.mkDerivation {
name = "cargo-vendor-normalise";
src = ./cargo-vendor-normalise.py;
nativeBuildInputs = [ python3.pkgs.wrapPython ];
- unpackPhase = ":";
+ dontUnpack = true;
installPhase = "install -D $src $out/bin/cargo-vendor-normalise";
pythonPath = [ python3.pkgs.toml ];
postFixup = "wrapPythonPrograms";
diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index d26bf735d30af655f0e4ce581931691982bef66c..3e900d0704cf557ff5f3b0a06dc3135014ada1c9 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -4,12 +4,35 @@
# /usr/bin/env gets special treatment so that ".../bin/env python" is
# rewritten to /nix/store//bin/python. Interpreters that are
# already in the store are left untouched.
+# A script file must be marked as executable, otherwise it will not be
+# considered.
-fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
+fixupOutputHooks+=(patchShebangsAuto)
+
+# Run patch shebangs on a directory or file.
+# Can take multiple paths as arguments.
+# patchShebangs [--build | --host] PATH...
+
+# Flags:
+# --build : Lookup commands available at build-time
+# --host : Lookup commands available at runtime
+
+# Example use cases,
+# $ patchShebangs --host /nix/store/...-hello-1.0/bin
+# $ patchShebangs --build configure
patchShebangs() {
- local dir="$1"
- header "patching script interpreter paths in $dir"
+ local pathName
+
+ if [ "$1" = "--host" ]; then
+ pathName=HOST_PATH
+ shift
+ elif [ "$1" = "--build" ]; then
+ pathName=PATH
+ shift
+ fi
+
+ echo "patching script interpreter paths in $@"
local f
local oldPath
local newPath
@@ -18,7 +41,10 @@ patchShebangs() {
local oldInterpreterLine
local newInterpreterLine
- [ -e "$dir" ] || return 0
+ if [ $# -eq 0 ]; then
+ echo "No arguments supplied to patchShebangs" >0
+ return 0
+ fi
local f
while IFS= read -r -d $'\0' f; do
@@ -27,22 +53,33 @@ patchShebangs() {
oldInterpreterLine=$(head -1 "$f" | tail -c+3)
read -r oldPath arg0 args <<< "$oldInterpreterLine"
+ if [ -z "$pathName" ]; then
+ if [ -n "$strictDeps" ] && [[ "$f" = "$NIX_STORE"* ]]; then
+ pathName=HOST_PATH
+ else
+ pathName=PATH
+ fi
+ fi
+
if $(echo "$oldPath" | grep -q "/bin/env$"); then
# Check for unsupported 'env' functionality:
# - options: something starting with a '-'
# - environment variables: foo=bar
if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
- echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
+ echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >0
exit 1
fi
- newPath="$(command -v "$arg0" || true)"
+
+ newPath="$(PATH="${!pathName}" command -v "$arg0" || true)"
else
if [ "$oldPath" = "" ]; then
# If no interpreter is specified linux will use /bin/sh. Set
# oldpath="/bin/sh" so that we get /nix/store/.../sh.
oldPath="/bin/sh"
fi
- newPath="$(command -v "$(basename "$oldPath")" || true)"
+
+ newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)"
+
args="$arg0 $args"
fi
@@ -55,13 +92,28 @@ patchShebangs() {
# escape the escape chars so that sed doesn't interpret them
escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g')
# Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281
- touch -r "$f" "$f.timestamp"
+ timestamp=$(mktemp)
+ touch -r "$f" "$timestamp"
sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"
- touch -r "$f.timestamp" "$f"
- rm "$f.timestamp"
+ touch -r "$timestamp" "$f"
+ rm "$timestamp"
fi
fi
- done < <(find "$dir" -type f -perm -0100 -print0)
+ done < <(find "$@" -type f -perm -0100 -print0)
stopNest
}
+
+patchShebangsAuto () {
+ if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
+
+ # Dev output will end up being run on the build platform. An
+ # example case of this is sdl2-config. Otherwise, we can just
+ # use the runtime path (--host).
+ if [ "$output" != out ] && [ "$output" = "$outputDev" ]; then
+ patchShebangs --build "$prefix"
+ else
+ patchShebangs --host "$prefix"
+ fi
+ fi
+}
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 3fc10c8b0b4b1ee022981f83846b5bf90f2eba40..c110d327d3afe13efa2541d769b6ab29338fceb7 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -37,8 +37,7 @@ rec {
contents ? [],
diskSize ? 1024,
runScript ? "#!${stdenv.shell}\nexec /bin/sh",
- runAsRoot ? null,
- extraSpace ? 0
+ runAsRoot ? null
}:
let layer = mkLayer {
inherit name;
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index e4712a5ef22c4f4103af8afce61b20cd8837376d..ce32279710e2bb548dd9aeb21f42db9863017d94 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, cleanPackaging, fetchurl, writeScript, file }:
+{ stdenv, cleanPackaging, fetchurl }:
let lib = stdenv.lib;
in {
# : string
diff --git a/pkgs/build-support/snap/default.nix b/pkgs/build-support/snap/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ba5271868911f6a07ca960cbdb00477ef8a9dbfa
--- /dev/null
+++ b/pkgs/build-support/snap/default.nix
@@ -0,0 +1,4 @@
+{ callPackage, hello }:
+{
+ makeSnap = callPackage ./make-snap.nix { };
+}
diff --git a/pkgs/build-support/snap/make-snap.nix b/pkgs/build-support/snap/make-snap.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cef7500bcbaf18de7d6f4d8b2726c76b14695d2b
--- /dev/null
+++ b/pkgs/build-support/snap/make-snap.nix
@@ -0,0 +1,84 @@
+{
+ runCommand, squashfsTools, closureInfo, lib, jq, writeText
+}:
+
+{
+ # The meta parameter is the contents of the `snap.yaml`, NOT the
+ # `snapcraft.yaml`.
+ #
+ # - `snap.yaml` is what is inside of the final Snap,
+ # - `snapcraft.yaml` is used by `snapcraft` to build snaps
+ #
+ # Since we skip the `snapcraft` tool, we skip the `snapcraft.yaml`
+ # file. For more information:
+ #
+ # https://docs.snapcraft.io/snap-format
+ #
+ # Note: unsquashfs'ing an existing snap from the store can be helpful
+ # for determining what you you're missing.
+ #
+ meta
+}: let
+ snap_yaml = let
+ # Validate the snap's meta contains a name.
+ # Also: automatically set the `base` parameter and the layout for
+ # the `/nix` bind.
+ validate = { name, ... } @ args:
+ args // {
+ # Combine the provided arguments with the required options.
+
+ # base: built from https://github.com/NixOS/snapd-nix-base
+ # and published as The NixOS Foundation on the Snapcraft store.
+ base = "nix-base";
+ layout = (args.layout or {}) // {
+ # Bind mount the Snap's root nix directory to `/nix` in the
+ # execution environment's filesystem namespace.
+ "/nix".bind = "$SNAP/nix";
+ };
+ };
+ in writeText "snap.yaml"
+ (builtins.toJSON (validate meta));
+
+ # These are specifically required by snapd, so don't change them
+ # unless you've verified snapcraft / snapd can handle them. Best bet
+ # is to just mirror this list against how snapcraft creates images.
+ # from: https://github.com/snapcore/snapcraft/blob/b88e378148134383ffecf3658e3a940b67c9bcc9/snapcraft/internal/lifecycle/_packer.py#L96-L98
+ mksquashfs_args = [
+ "-noappend" "-comp" "xz" "-no-xattrs" "-no-fragments"
+
+ # Note: We want -all-root every time, since all the files are
+ # owned by root anyway. This is true for Nix, but not true for
+ # other builds.
+ # from: https://github.com/snapcore/snapcraft/blob/b88e378148134383ffecf3658e3a940b67c9bcc9/snapcraft/internal/lifecycle/_packer.py#L100
+ "-all-root"
+ ];
+
+in runCommand "squashfs.img" {
+ nativeBuildInputs = [ squashfsTools jq ];
+
+ closureInfo = closureInfo {
+ rootPaths = [ snap_yaml ];
+ };
+} ''
+ root=$PWD/root
+ mkdir $root
+
+ (
+ # Put the snap.yaml in to `/meta/snap.yaml`, setting the version
+ # to the hash part of the store path
+ mkdir $root/meta
+ version=$(echo $out | cut -d/ -f4 | cut -d- -f1)
+ cat ${snap_yaml} | jq ". + { version: \"$version\" }" \
+ > $root/meta/snap.yaml
+ )
+
+ (
+ # Copy the store closure in to the root
+ mkdir -p $root/nix/store
+ cat $closureInfo/store-paths | xargs -I{} cp -r {} $root/nix/store/
+ )
+
+ # Generate the squashfs image.
+ mksquashfs $root $out \
+ ${lib.concatStringsSep " " mksquashfs_args}
+''
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index e498417adf01f44c2bcb2f8e366e68850527d8d2..5706a98f60089805984a694c3074dd9ec229b237 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -79,7 +79,6 @@ rec {
(test -n "$executable" && chmod +x "$n") || true
'';
-
/*
* Writes a text file to nix store with no optional parameters available.
*
@@ -92,6 +91,7 @@ rec {
*
*/
writeText = name: text: writeTextFile {inherit name text;};
+
/*
* Writes a text file to nix store in a specific directory with no
* optional parameters available. Name passed is the destination.
@@ -105,11 +105,17 @@ rec {
*
*/
writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
+
/*
- * Writes a text file to /nix/store/ and marks the file as executable.
+ * Writes a text file to /nix/store/ and marks the file as
+ * executable.
+ *
+ * If passed as a build input, will be used as a setup hook. This makes setup
+ * hooks more efficient to create: you don't need a derivation that copies
+ * them to $out/nix-support/setup-hook, instead you can use the file as is.
*
* Example:
- * # Writes my-file to /nix/store//bin/my-file and makes executable
+ * # Writes my-file to /nix/store/ and makes executable
* writeScript "my-file"
* ''
* Contents of File
@@ -117,13 +123,14 @@ rec {
*
*/
writeScript = name: text: writeTextFile {inherit name text; executable = true;};
+
/*
* Writes a text file to /nix/store//bin/ and
* marks the file as executable.
*
* Example:
* # Writes my-file to /nix/store//bin/my-file and makes executable.
- * writeScript "my-file"
+ * writeScriptBin "my-file"
* ''
* Contents of File
* '';
@@ -132,12 +139,38 @@ rec {
writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
/*
- * Writes a Shell script and check its syntax. Automatically includes interpreter
- * above the contents passed.
+ * Similar to writeScript. Writes a Shell script and checks its syntax.
+ * Automatically includes interpreter above the contents passed.
+ *
+ * Example:
+ * # Writes my-file to /nix/store/ and makes executable.
+ * writeShellScript "my-file"
+ * ''
+ * Contents of File
+ * '';
+ *
+ */
+ writeShellScript = name: text:
+ writeTextFile {
+ inherit name;
+ executable = true;
+ text = ''
+ #!${runtimeShell}
+ ${text}
+ '';
+ checkPhase = ''
+ ${stdenv.shell} -n $out
+ '';
+ };
+
+ /*
+ * Similar to writeShellScript and writeScriptBin.
+ * Writes an executable Shell script to /nix/store//bin/ and checks its syntax.
+ * Automatically includes interpreter above the contents passed.
*
* Example:
* # Writes my-file to /nix/store//bin/my-file and makes executable.
- * writeScript "my-file"
+ * writeShellScriptBin "my-file"
* ''
* Contents of File
* '';
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index de6a5e3b62f99c45e0b40c6708ffcfdd9e9e7df7..5d04302591ee30a8fd11405c6c398068982fa0db 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1021,22 +1021,22 @@ rec {
};
debian9i386 = {
- name = "debian-9.4-stretch-i386";
- fullName = "Debian 9.4 Stretch (i386)";
+ name = "debian-9.8-stretch-i386";
+ fullName = "Debian 9.8 Stretch (i386)";
packagesList = fetchurl {
- url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-i386/Packages.xz;
- sha256 = "0flvn8zn7vk04p10ndf3aq0mdr8k2ic01g51aq4lsllkv8lmwzyh";
+ url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-i386/Packages.xz;
+ sha256 = "1dr3skl35iyj85qlc33lq4whippbqf327vnbcyfqqrv6h86k68mw";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian9x86_64 = {
- name = "debian-9.4-stretch-amd64";
- fullName = "Debian 9.4 Stretch (amd64)";
+ name = "debian-9.8-stretch-amd64";
+ fullName = "Debian 9.8 Stretch (amd64)";
packagesList = fetchurl {
- url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-amd64/Packages.xz;
- sha256 = "11vnn9bba2jabixvabfbw9zparl326c88xn99di7pbr5xsnl15jm";
+ url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-amd64/Packages.xz;
+ sha256 = "01q00nl47p12n7wx0xclx59wf3zlkzrgj3zxpshyvb91xdnw5sh6";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash
index 12b596a83e6f0407d5c5b4d45273c8b6383c2e0f..4fd57162072e4db4df22b1efff712ce8ff5ab045 100644
--- a/pkgs/build-support/wrapper-common/utils.bash
+++ b/pkgs/build-support/wrapper-common/utils.bash
@@ -86,9 +86,6 @@ expandResponseParams() {
#shellcheck disable=SC2034
readarray -d '' params < <("@expandResponseParams@" "$@")
return 0
- else
- echo "Response files aren't supported during bootstrapping" >&2
- return 1
fi
fi
done
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 29a4bbad703ea095ac2d9b7100068545d9ffc933..ae7b42449fb347c9e8238cb10dfa1e785e7d8e67 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -24,6 +24,9 @@ rec {
}) ''
echo "#! $interpreter" > $out
cat "$contentPath" >> $out
+ ${optionalString (check != "") ''
+ ${check} $out
+ ''}
chmod +x $out
${optionalString (types.path.check nameOrPath) ''
mv $out tmp
diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix
index 8a122b74b23c6cb5e343404ecb8afbc1da8da981..1bec4a73996f8e8b17217ac3ddf570b65fce3389 100644
--- a/pkgs/common-updater/scripts.nix
+++ b/pkgs/common-updater/scripts.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
buildInputs = [ makeWrapper ];
- unpackPhase = "true";
+ dontUnpack = true;
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 2d0c16aa2f4597f7640642c3599fa745f5a4e644..591ffa6ca5baa4b6bd39022c7181e1ab9f678c81 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -86,14 +86,10 @@ if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then
die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!"
fi
-oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt $attr.src.drvAttrs.urls 0" | tr -d '"')
+oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"')
if [ -z "$oldUrl" ]; then
- oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.url" | tr -d '"')
-
- if [ -z "$oldUrl" ]; then
- die "Couldn't evaluate source url from '$attr.src'!"
- fi
+ die "Couldn't evaluate source url from '$attr.src'!"
fi
drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"')
@@ -109,13 +105,13 @@ if [ "$oldVersion" = "$newVersion" ]; then
fi
# Escape regex metacharacter that are allowed in store path names
-oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
-oldUrl=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g')
+oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
+oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g')
-if [ $(grep -c -E "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then
- pattern="/\b$versionKey\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|"
-elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersion\"" "$nixFile") = 1 ]; then
- pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|"
+if [ $(grep -c -E "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersionEscaped\"" "$nixFile") = 1 ]; then
+ pattern="/\b$versionKey\b\s*=/ s|\"$oldVersionEscaped\"|\"$newVersion\"|"
+elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersionEscaped\"" "$nixFile") = 1 ]; then
+ pattern="/\bname\b\s*=/ s|-$oldVersionEscaped\"|-$newVersion\"|"
else
die "Couldn't figure out where out where to patch in new version in '$attr'!"
fi
@@ -128,7 +124,7 @@ fi
# Replace new URL
if [ -n "$newUrl" ]; then
- sed -i "$nixFile" -re "s|\"$oldUrl\"|\"$newUrl\"|"
+ sed -i "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|"
if cmp -s "$nixFile" "$nixFile.bak"; then
die "Failed to replace source URL '$oldUrl' to '$newUrl' in '$attr'!"
@@ -161,7 +157,7 @@ if [ -z "$newHash" ]; then
die "Couldn't figure out new hash of '$attr.src'!"
fi
-if [ -z "${ignoreSameHash}"] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then
+if [ -z "${ignoreSameHash}" ] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then
mv "$nixFile.bak" "$nixFile"
die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!"
fi
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
index 9e6639c0a0adb577251b31f718ee8a3576b8b38d..4bdfa70c63ffcaeb3fab2195e24f357c0fc28dca 100644
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/pkgs/data/documentation/gnome-user-docs/default.nix
@@ -1,12 +1,27 @@
-{ stdenv, fetchurl, itstool, libxml2, gettext }:
+{ stdenv, fetchurl, itstool, libxml2, gettext, gnome3 }:
-stdenv.mkDerivation {
- name = "gnome-user-docs-3.2.2";
+stdenv.mkDerivation rec {
+ pname = "gnome-user-docs";
+ version = "3.2.2";
src = fetchurl {
- url = mirror://gnome/sources/gnome-user-docs/3.2/gnome-user-docs-3.2.2.tar.xz;
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj";
};
nativeBuildInputs = [ itstool libxml2 gettext ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.gnome-user-docs";
+ };
+ };
+
+ meta = {
+ homepage = "https://gitlab.gnome.org/GNOME/gnome-user-docs";
+ description = "GNOME User Documentation";
+ license = stdenv.lib.licenses.cc-by-30;
+ maintainers = gnome3.maintainers;
+ };
}
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 280202c2200da40887352f44ad2e4eb57552b18e..04130f25f30a30813842eaf7f2f6f938c19163f0 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "man-pages-${version}";
- version = "5.00";
+ version = "5.01";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
- sha256 = "006rcqhs4ay9q8wip2kbgk3065gwvfbzrqgv2dsydwvcnwv50bss";
+ sha256 = "09xn8d8xxwgms6h1bvjlgn3mxz51vxf3ra0ry9f5dqi29qry3z3x";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix
index 3459713550018b0ae51c9630263288b2ba2eccd3..d90fa99dd7026362c415670cd0443eca3eb3df54 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/pkgs/data/documentation/std-man-pages/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
name = "std-man-pages-4.4.0";
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
cp -R * $out/share/man
'';
- meta = {
- description = "C++ STD manual pages";
- homepage = https://gcc.gnu.org/;
- license = "GPL/LGPL";
- platforms = stdenv.lib.platforms.unix;
+ meta = with lib; {
+ description = "GCC C++ STD manual pages";
+ homepage = "https://gcc.gnu.org/";
+ license = with licenses; [ fdl12Plus ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix
index eb18f620a2ad227405ff1ea0f026407b74daee5e..e9f4fbd48678da054cb2072ee40c62d72a9d1a0d 100644
--- a/pkgs/data/fonts/agave/default.nix
+++ b/pkgs/data/fonts/agave/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchurl }:
+{ lib, fetchurl }:
-stdenv.mkDerivation rec {
+let
pname = "agave";
- version = "009";
+ version = "10";
+in fetchurl {
+ name = "${pname}-${version}";
+ url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf";
- src = fetchurl {
- url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf";
- sha256 = "05766gp2glm1p2vknk1nncxigq28hg8s58kjwsbn8zpwy8ivywpk";
- };
-
- sourceRoot = ".";
-
- unpackPhase = ":";
- dontBuild = true;
- installPhase = ''
- mkdir -p $out/share/fonts/truetype
- cp $src $out/share/fonts/truetype/
+ downloadToTemp = true;
+ recursiveHash = true;
+ postFetch = ''
+ install -D $downloadedFile $out/share/fonts/truetype/agave-r.ttf
'';
- meta = with stdenv.lib; {
+ sha256 = "1mfj6a9sp00mjz7420yyrbbs5bqks3fz2slwgcppklxnz0890r9f";
+
+ meta = with lib; {
description = "truetype monospaced typeface designed for X environments";
homepage = https://b.agaric.net/page/agave;
license = licenses.mit;
diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix
index 52a96f16db0c253dcf488192d9e196d9e052d997..ee85ee5988273160b086ede5b28d9681c6c02aa9 100644
--- a/pkgs/data/fonts/aileron/default.nix
+++ b/pkgs/data/fonts/aileron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "A helvetica font in nine weights";
platforms = platforms.all;
diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..36d8ed3c674739a8e12931f7f0ca2ae2cc278c85
--- /dev/null
+++ b/pkgs/data/fonts/amiri/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchzip }:
+
+let
+ version = "0.111";
+
+in fetchzip rec {
+ name = "Amiri-${version}";
+
+ url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip";
+
+ sha256 = "1w3a5na4mazspwy8j2hvpjha10sgd287kamm51p49jcr90cvwbdr";
+
+ postFetch = ''
+ unzip $downloadedFile
+ install -m444 -Dt $out/share/fonts/truetype ${name}/*.ttf
+ install -m444 -Dt $out/share/doc/${name} ${name}/{*.txt,*.pdf}
+ '';
+
+ meta = with lib; {
+ description = "A classical Arabic typeface in Naskh style";
+ homepage = "https://www.amirifont.org/";
+ license = licenses.ofl;
+ maintainers = [ maintainers.vbgl ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix
index ba0bab61eec5e4b46cc0cef268957842694eb9e5..0f20b9c46cf533a952056eac8a3baa9ac82f2b35 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "1.0.2";
@@ -17,7 +17,7 @@ in fetchzip {
# There are multiple claims that the font is GPL, so I include the
# package; but I cannot find the original source, so use it on your
# own risk Debian claims it is GPL - good enough for me.
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://www.i18nguy.com/unicode/unicode-font.html;
description = "Unicode Plane 1 Osmanya script font";
maintainers = with maintainers; [ raskin rycee ];
diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix
index 4b6965563a3aaf39ff5d3f58cf34cc3c51cc7a14..e03a800b3ad5a6104f7190a2248e24b149284bfd 100644
--- a/pkgs/data/fonts/andika/default.nix
+++ b/pkgs/data/fonts/andika/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "5.000";
@@ -16,7 +16,7 @@ in
sha256 = "1jy9vpcprpd1k48p20wh6jhyn909ibia8lr5i747p41l0s8a7lqy";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://software.sil.org/andika;
description = "A family designed especially for literacy use taking into account the needs of beginning readers";
longDescription = ''
diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix
index 08a46628e65e2902aae5f4405769e77fb2b47044..53f4d94b38fea27039019b8b6a92c92aa254bb6c 100644
--- a/pkgs/data/fonts/ankacoder/condensed.nix
+++ b/pkgs/data/fonts/ankacoder/condensed.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let version = "1.100"; in
fetchzip rec {
@@ -13,7 +13,7 @@ fetchzip rec {
sha256 = "0i80zpr2y9368rg2i6x8jv0g7d03kdyr5h7w9yz7pjd7i9xd8439";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Anka/Coder Condensed font";
homepage = https://code.google.com/archive/p/anka-coder-fonts;
license = licenses.ofl;
diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix
index 170c8cde51409fb7f859901e45d526a64932c5c2..52e2d4a42330dd1af4c417af0d2e074cc0f4e7dd 100644
--- a/pkgs/data/fonts/ankacoder/default.nix
+++ b/pkgs/data/fonts/ankacoder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let version = "1.100"; in
fetchzip rec {
@@ -13,7 +13,7 @@ fetchzip rec {
sha256 = "1jqx9micfmiarqh9xp330gl96v3vxbwzz9cmg2vi845n9md4im85";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Anka/Coder fonts";
homepage = https://code.google.com/archive/p/anka-coder-fonts;
license = licenses.ofl;
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index 3ac2c9432997f4dd504c8e1f17d3f131e96aebac..4aeda64377edb2695eaba49125f73b8990f2699f 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "1.002";
@@ -13,7 +13,7 @@ in fetchzip rec {
'';
sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://www.marksimonson.com/fonts/view/anonymous-pro;
description = "TrueType font set intended for source code";
longDescription = ''
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index 909985d945bca47dbab6072423143ccca0d3261e..827d7b0a5a449875339ea47c0e69a71085b61e08 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ fetchurl }:
let
version = "2.04";
@@ -21,6 +21,5 @@ in fetchurl {
meta = {
description = "Font, metrically identical to Arial and Times New Roman";
- platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix
index 37d9a19956746b45534a8709ca98533e989fc934..1e52ea301afa45545c9e04bcbc6b37b42cd04009 100644
--- a/pkgs/data/fonts/arphic/default.nix
+++ b/pkgs/data/fonts/arphic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, mkfontscale, mkfontdir }:
+{ lib, fetchzip, mkfontscale, mkfontdir }:
let
version = "0.2.20080216.2";
@@ -18,7 +18,7 @@ in {
sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "CJK Unicode font Kai style";
homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
@@ -43,7 +43,7 @@ in {
sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "CJK Unicode font Ming style";
homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix
index 1a83ce17646ed36508477a6fa2dd92f3dd6a337f..a87be94acd09a91852f89bcef93158e65efc4d32 100644
--- a/pkgs/data/fonts/aurulent-sans/default.nix
+++ b/pkgs/data/fonts/aurulent-sans/default.nix
@@ -1,12 +1,13 @@
-{stdenv, fetchzip}:
+{ lib, fetchFromGitHub }:
-fetchzip rec {
+fetchFromGitHub rec {
name = "aurulent-sans-0.1";
-
- url = "https://github.com/deepfire/hartke-aurulent-sans/archive/${name}.zip";
+ owner = "deepfire";
+ repo = "hartke-aurulent-sans";
+ rev = name;
postFetch = ''
mkdir -p $out/share/fonts
- unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+ tar xf $downloadedFile -C $out/share/fonts --strip=1
'';
sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li";
@@ -14,8 +15,8 @@ fetchzip rec {
description = "Aurulent Sans";
longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font.";
homepage = http://delubrum.org/;
- maintainers = with stdenv.lib.maintainers; [ deepfire ];
- license = stdenv.lib.licenses.ofl;
- platforms = stdenv.lib.platforms.all;
+ maintainers = with lib.maintainers; [ deepfire ];
+ license = lib.licenses.ofl;
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix
index 2f583e2fc4b2a9528b36dcaff905b465f97c435e..1c2d7f53bad8041fa91f2a59a75069a1d51837e2 100644
--- a/pkgs/data/fonts/b612/default.nix
+++ b/pkgs/data/fonts/b612/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchzip, lib }:
+{ lib, fetchFromGitHub }:
let
version = "1.008";
pname = "b612";
-in
-
-fetchzip rec {
+in fetchFromGitHub {
name = "${pname}-font-${version}";
- url = "https://github.com/polarsys/b612/archive/${version}.zip";
- sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq";
+ owner = "polarsys";
+ repo = "b612";
+ rev = version;
postFetch = ''
+ tar xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/truetype/${pname}
- unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}
+ cp fonts/ttf/*.ttf $out/share/fonts/truetype/${pname}
'';
+ sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://b612-font.com/;
description = "Highly legible font family for use on aircraft cockpit screens";
longDescription = ''
diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
index 67080e73c46dab1918084818ee5217aee5cdc200..5408e7b1b1d11c00240b76d16371b47588b7c015 100644
--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
- version = "11.0.3";
+ version = "12.1.4";
in fetchzip {
name = "babelstone-han-${version}";
@@ -10,9 +10,9 @@ in fetchzip {
mkdir -p $out/share/fonts/truetype
unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
'';
- sha256 = "0c8s21kllyilwivrb8gywq818y67w3zpann34hz36vy0wyiswn1c";
+ sha256 = "1fypwk2i87jfrckvxg9wz4x84z7c6ifgzrjb8fylhac50lzi6kni";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Unicode CJK font with over 36000 Han characters";
homepage = http://www.babelstone.co.uk/Fonts/Han.html;
diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix
index 555bba63354cd0ae6815bb641d3d81a7994bb9f0..583a7457e2dc16508bec0acfaefbac49d2a5f551 100644
--- a/pkgs/data/fonts/baekmuk-ttf/default.nix
+++ b/pkgs/data/fonts/baekmuk-ttf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ fetchzip }:
fetchzip rec {
name = "baekmuk-ttf-2.2";
@@ -6,9 +6,8 @@ fetchzip rec {
url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
- mkdir -p $out/share/fonts $out/share/doc/${name}
- cp ttf/*.ttf $out/share/fonts
- cp COPYRIGHT* $out/share/doc/${name}
+ install -m444 -Dt $out/share/fonts ttf/*.ttf
+ install -m444 -Dt $out/share/doc/${name} COPYRIGHT*
'';
sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g";
@@ -16,7 +15,6 @@ fetchzip rec {
description = "Korean font";
homepage = http://kldp.net/projects/baekmuk/;
license = "BSD-like";
- platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix
index 8d87154c1df0b8d24babb69fa7fb7cb66fabd974..70074a58d96425f9e30dae742ef51a4e836f82e2 100644
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ fetchzip }:
fetchzip {
name = "bakoma-ttf";
@@ -16,6 +16,5 @@ fetchzip {
meta = {
description = "TrueType versions of the Computer Modern and AMS TeX Fonts";
homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/;
- platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix
index 54ddc95bf6ccd6bb01e7e280e1b5fdb693062fd1..8b4228ec423507f8870d5891cae4e1ee1ad0e730 100644
--- a/pkgs/data/fonts/behdad-fonts/default.nix
+++ b/pkgs/data/fonts/behdad-fonts/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "behdad-fonts";
version = "0.0.3";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
+ owner = "font-store";
+ repo = "BehdadFont";
+ rev = "v${version}";
- src = fetchFromGitHub {
- owner = "font-store";
- repo = "BehdadFont";
- rev = "v${version}";
- sha256 = "0rlmyv82qmyy90zvkjnlva44ia7dyhiyk7axbq526v7zip3g79w0";
- };
-
- installPhase = ''
- mkdir -p $out/share/fonts/behdad-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/behdad-fonts
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/behrad-fonts {} \;
'';
+ sha256 = "0c57232462cv1jrfn0m2bl7jzcfkacirrdd2qimrc8iqhkz0ajfz";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/font-store/BehdadFont;
description = "A Persian/Arabic Open Source Font";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix
index 5bf4d454b06298c07fc98dd84d39194607b69fc2..0a8168cdf9e20c40820e30c33429a9543c39d579 100644
--- a/pkgs/data/fonts/cabin/default.nix
+++ b/pkgs/data/fonts/cabin/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchzip }:
+{ lib, fetchFromGitHub }:
-fetchzip rec {
+fetchFromGitHub rec {
name = "cabin-1.005";
- url = https://github.com/impallari/Cabin/archive/982839c790e9dc57c343972aa34c51ed3b3677fd.zip;
+ owner = "impallari";
+ repo = "Cabin";
+ rev = "982839c790e9dc57c343972aa34c51ed3b3677fd";
postFetch = ''
- mkdir -p $out/share/{doc,fonts}
- unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
- unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/opentype fonts/OTF/*.otf
+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
'';
- sha256 = "1ax5c2iab48qsk9zn3gjvqaib2lnlm25f1wr0aysf5ngw0y0jkrd";
+ sha256 = "1bl7h217m695jn4rbniialfk573aa44fslp2rjxnhkicakpcm44h";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A humanist sans with 4 weights and true italics";
longDescription = ''
The Cabin font family is a humanist sans with 4 weights and true italics,
diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix
index 56d8273f78ab63774635dd476899a11914a2a6f7..29bd001f80893c3e403777afce632a1d87b0406d 100644
--- a/pkgs/data/fonts/caladea/default.nix
+++ b/pkgs/data/fonts/caladea/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "20130214";
@@ -15,7 +15,7 @@ in fetchzip rec {
'';
sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z";
- meta = with stdenv.lib; {
+ meta = with lib; {
# This font doesn't appear to have any official web site but this
# one provides some good information and samples.
homepage = http://openfontlibrary.org/en/font/caladea;
diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix
index dfdf367337c37198dea0452c17ab3172dc1a7f1d..98175373ebd52566f4e37704656ed4df7ff7e648 100644
--- a/pkgs/data/fonts/camingo-code/default.nix
+++ b/pkgs/data/fonts/camingo-code/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "1.0";
@@ -8,14 +8,12 @@ in fetchzip rec {
url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip;
postFetch = ''
unzip $downloadedFile
- mkdir -p $out/share/fonts/truetype
- mkdir -p $out/share/doc/${name}
- cp -v fonts/camingo-code/*.ttf $out/share/fonts/truetype/
- cp -v fonts/camingo-code/*.txt $out/share/doc/${name}/
+ install -m444 -Dt $out/share/fonts/truetype fonts/camingo-code/*.ttf
+ install -m444 -Dt $out/share/doc/${name} fonts/camingo-code/*.txt
'';
- sha256 = "035z2k6lwwy2bysw27pirn3vjxnj2h23nyx8jr213rb2bl0m21x1";
+ sha256 = "16iqjwwa7pnswvcc4w8nglkd0m0fz50qsz96i1kcpqip3nwwvw7y";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/;
description = "A monospaced typeface designed for source-code editors";
platforms = platforms.all;
diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix
index 2243435bc5dbba0a3075a619835e48aacc560562..3c0e314579defb98ba619c61055dc7c5ff3c41b3 100644
--- a/pkgs/data/fonts/carlito/default.nix
+++ b/pkgs/data/fonts/carlito/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "20130920";
@@ -17,7 +17,7 @@ in fetchzip rec {
sha256 = "0d72zy6kdmxgpi63r3yvi3jh1hb7lvlgv8hgd4ag0x10dz18mbzv";
- meta = with stdenv.lib; {
+ meta = with lib; {
# This font doesn't appear to have any official web site but this
# one provides some good information and samples.
homepage = http://openfontlibrary.org/en/font/carlito;
diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix
index 995e03372fb432e553973078551b659d98eeac49..e28a718fad14ff3a3f3f687c67bc1ab1dcd2f3fb 100644
--- a/pkgs/data/fonts/charis-sil/default.nix
+++ b/pkgs/data/fonts/charis-sil/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "5.000";
@@ -16,7 +16,7 @@ in
sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://software.sil.org/charis;
description = "A family of highly readable fonts for broad multilingual use";
longDescription = ''
diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix
index 5dc8e53282ab6fa60dfec2d5bbd7463f2f8beac5..0df3ba4f659cd035e1ceb4a8f1c976433cfb0f34 100644
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@@ -7,18 +7,17 @@ stdenv.mkDerivation {
url = https://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz;
sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
};
-
+
nativeBuildInputs = [ mkfontdir mkfontscale ];
- installPhase =
- ''
- mkdir -p $out/share/fonts
- cp *.bdf $out/share/fonts
- cd $out/share/fonts
- mkfontdir
- mkfontscale
- '';
-
+ installPhase = ''
+ mkdir -p $out/share/fonts
+ cp *.bdf $out/share/fonts
+ cd $out/share/fonts
+ mkfontdir
+ mkfontscale
+ '';
+
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "127zrg65s90ksj99kr9hxny40rbxvpai62mf5nqk853hcd1bzpr6";
@@ -26,6 +25,5 @@ stdenv.mkDerivation {
meta = {
description = "A Unicode font";
maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix
index d17021feb81e86312619921ec09680e0e71b4514..c058f07ed51caa98c761ad32636d9323c18956b4 100644
--- a/pkgs/data/fonts/cm-unicode/default.nix
+++ b/pkgs/data/fonts/cm-unicode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "0.7.0";
@@ -9,15 +9,13 @@ in fetchzip rec {
postFetch = ''
tar -xJvf $downloadedFile --strip-components=1
- mkdir -p $out/share/fonts/opentype
- mkdir -p $out/share/doc/${name}
- cp -v *.otf $out/share/fonts/opentype/
- cp -v README FontLog.txt $out/share/doc/${name}
+ install -m444 -Dt $out/share/fonts/opentype *.otf
+ install -m444 -Dt $out/share/doc/${name} README FontLog.txt
'';
sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/;
description = "Computer Modern Unicode fonts";
maintainers = with maintainers; [ raskin rycee ];
diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/data/fonts/cnstrokeorder/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..965bf119f6e70aa91aa6305c4aba4cdfb9cf1c08
--- /dev/null
+++ b/pkgs/data/fonts/cnstrokeorder/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchurl }:
+
+let
+ version = "0.0.4.7";
+in fetchurl {
+ name = "cnstrokeorder-${version}";
+
+ url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf";
+
+ recursiveHash = true;
+ downloadToTemp = true;
+
+ postFetch = ''
+ install -D $downloadedFile $out/share/fonts/truetype/CNstrokeorder-${version}.ttf
+ '';
+
+ sha256 = "0cizgfdgbq9av5c8234mysr2q54iw9pkxrmq5ga8gv32hxhl5bx4";
+
+ meta = with lib; {
+ description = "Chinese font that shows stroke order for HSK 1-4";
+ homepage = "http://rtega.be/chmn/index.php?subpage=68";
+ license = [ licenses.arphicpl ];
+ maintainers = with maintainers; [ johnazoidberg ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix
index f7ec6e8b8c87576c62eb81e859b7f03ffb64b88c..6e4c0bb08e7ab149b2c6850c7c966a7edac323f3 100644
--- a/pkgs/data/fonts/comfortaa/default.nix
+++ b/pkgs/data/fonts/comfortaa/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "3.001";
@@ -8,13 +8,12 @@ in fetchzip rec {
url = "https://orig00.deviantart.net/40a3/f/2017/093/d/4/comfortaa___font_by_aajohan-d1qr019.zip";
postFetch = ''
mkdir -p $out/share/fonts $out/share/doc
- unzip -l $downloadedFile
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name}
'';
sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949;
description = "A clean and modern font suitable for headings and logos";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix
index 07fc172ca513085525ffc54d0baf234481b3bf50..2615d0260f0dc1060a4ab1d5de74a30a7b51c61b 100644
--- a/pkgs/data/fonts/comic-neue/default.nix
+++ b/pkgs/data/fonts/comic-neue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "2.2";
@@ -19,7 +19,7 @@ in fetchzip rec {
sha256 = "1yypq5aqqzv3q1c6vx5130mi2iwihzzvrawhwqpwsfjl0p25sq9q";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://comicneue.com/;
description = "A casual type face: Make your lemonade stand look like a fortune 500 company";
longDescription = ''
diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix
index 2a1273214bd66c9abf67951d470d68fb361a6ea1..d51c915b844e22fe7897c7324850fc16b736292b 100644
--- a/pkgs/data/fonts/comic-relief/default.nix
+++ b/pkgs/data/fonts/comic-relief/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "1.1";
@@ -18,7 +18,7 @@ in fetchzip rec {
sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://loudifier.com/comic-relief/;
description = "A font metric-compatible with Microsoft Comic Sans";
longDescription = ''
diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/data/fonts/cooper-hewitt/default.nix
index 1fa5cff760483c478001234f82b65803f7a27f31..e1635c560d667fb4f565a33e5cff096aecd5e688 100644
--- a/pkgs/data/fonts/cooper-hewitt/default.nix
+++ b/pkgs/data/fonts/cooper-hewitt/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "cooper-hewitt-2014-06-09";
url = https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip;
@@ -12,7 +12,7 @@ fetchzip rec {
sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/;
description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix
index 8c45c8139534323c6cc172446fcc9ad0a5876190..5e06a34b6f0b43bbb3971305b92ab65eb4e0a00a 100644
--- a/pkgs/data/fonts/corefonts/default.nix
+++ b/pkgs/data/fonts/corefonts/default.nix
@@ -41,12 +41,10 @@ stdenv.mkDerivation {
cabextract --lowercase viewer1.cab
- fontDir=$out/share/fonts/truetype
- mkdir -p $fontDir
- cp *.ttf $fontDir
+ install -m444 -Dt $out/share/fonts/truetype *.ttf
# Also put the EULA there to be on the safe side.
- cp ${eula} $fontDir/eula.html
+ cp ${eula} $out/share/fonts/truetype/eula.html
# Set up no-op font configs to override any aliases set up by
# other packages.
diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix
index e96c13b7822b19a384be2785011bbd9e0db78bd3..a3f24985fd9d3c1bbb6a276ad7587df94ceeddff 100644
--- a/pkgs/data/fonts/crimson/default.nix
+++ b/pkgs/data/fonts/crimson/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "2014.10";
@@ -9,16 +9,13 @@ in fetchzip rec {
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
-
- mkdir -p $out/share/fonts/opentype
- mkdir -p $out/share/doc/${name}
- cp -v "Desktop Fonts/OTF/"*.otf $out/share/fonts/opentype
- cp -v README.md $out/share/doc/${name}
+ install -m444 -Dt $out/share/fonts/opentype "Desktop Fonts/OTF/"*.otf
+ install -m444 -Dt $out/share/doc/${name} README.md
'';
sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://aldusleaf.org/crimson.html;
description = "A font family inspired by beautiful oldstyle typefaces";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix
index 4ef5a4445583c227562802875457e5d7c71a43b1..5aad7ff236f1a0dcae34c3b4f3b86f49eb3fa0a3 100644
--- a/pkgs/data/fonts/culmus/default.nix
+++ b/pkgs/data/fonts/culmus/default.nix
@@ -1,16 +1,12 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "0.133";
-in stdenv.mkDerivation {
+in fetchzip {
name = "culmus-${version}";
-
- src = fetchzip {
- url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
- sha256 = "0q80j3vixn364sc23hcy6098rkgy0kb4p91lky6224am1dwn2qmr";
- };
-
- installPhase = ''
+ url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/{truetype,type1}
cp -v *.pfa $out/share/fonts/type1/
cp -v *.afm $out/share/fonts/type1/
@@ -19,12 +15,13 @@ in stdenv.mkDerivation {
cp -v *.otf $out/share/fonts/truetype/
cp -v fonts.scale-ttf $out/share/fonts/truetype/fonts.scale
'';
+ sha256 = "0zqqjcrqmbd4389hqz2dwymkkcxjrq9ylyriiv3gbmzl6l1ffk3g";
meta = {
description = "Culmus Hebrew fonts";
longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows.";
- platforms = stdenv.lib.platforms.all;
- license = stdenv.lib.licenses.gpl2;
+ platforms = lib.platforms.all;
+ license = lib.licenses.gpl2;
homepage = http://culmus.sourceforge.net/;
downloadPage = http://culmus.sourceforge.net/download.html;
};
diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix
index abc0dba8165401eaa1c03b1b3e97a4a9af239ff6..b73da9a504b3e27464a859f7dc34d111dd9e0cb2 100644
--- a/pkgs/data/fonts/d2coding/default.nix
+++ b/pkgs/data/fonts/d2coding/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchzip, unzip }:
+{ lib, fetchzip }:
let
version = "1.3.2";
pname = "d2codingfont";
-in fetchzip rec {
+in fetchzip {
name = "${pname}-${version}";
url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip";
@@ -15,7 +15,7 @@ in fetchzip rec {
sha256 = "1812r82530wzfki7k9cm35fy6k2lvis7j6w0w8svc784949m1wwj";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Monospace font with support for Korean and latin characters";
longDescription = ''
D2Coding is a monospace font developed by a Korean IT Company called Naver.
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index fa877ea6ed5343a4e731f0df14ea1f4fb9299627..e563d201ff3df5d5649875ade1e138c0241bb2d4 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -38,38 +38,25 @@ let
preBuild = "patchShebangs scripts";
- installPhase = ''
- mkdir -p $out/share/fonts/truetype
- cp build/*.ttf $out/share/fonts/truetype/
- '';
+ installPhase = "install -m444 -Dt $out/share/fonts/truetype build/*.ttf";
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "1cxprzsr826d888ha4zxx28i9jfj1k74q9kfv3v2rf603460iha9";
inherit meta;
};
minimal = stdenv.mkDerivation {
name = "dejavu-fonts-minimal-${version}";
buildCommand = ''
- install -D ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf $out/share/fonts/truetype/DejaVuSans.ttf
+ install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "0ybsynp9904vmd3qv5b438swhx43m5q6gfih3i32iw33rks8nkpj";
inherit meta;
};
in stdenv.mkDerivation {
name = "dejavu-fonts-${version}";
buildCommand = ''
- mkdir -p $out/share/fonts/truetype
- cp ${full-ttf}/share/fonts/truetype/*.ttf $out/share/fonts/truetype/
+ install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/*.ttf
ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "15l93xm9mg2ziaxv4nqy2a4jaz54d05xf0hfz1h84bclzb882llh";
inherit meta;
- passthru.minimal = minimal;
+ passthru = { inherit minimal full-ttf; };
}
diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix
index 975bbc1749a723a891e54f6a142a5d7c4d19bae8..27306a0ef05ced3dae19cf6702d2d905fd1daf2f 100644
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ b/pkgs/data/fonts/dina-pcf/default.nix
@@ -60,6 +60,5 @@ stdenv.mkDerivation rec {
downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/;
license = licenses.free;
maintainers = [ maintainers.prikhi ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index 66feaf0ff5440b1eab594e4ae7e7ef84d92795a0..8638ec74f77a6b52721e8bc1c7bcee7d1917bca3 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -5,11 +5,13 @@ let
in fetchzip rec {
name = "dina-font-${version}";
- url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
+ # `meta.homepage` has no direct download link
+ url = "https://github.com/ProgrammingFonts/ProgrammingFonts/archive/b15ef365146be7eef4a46979cfe157c5aeefb7c0.zip";
postFetch = ''
mkdir -p $out/share/fonts
- unzip -j $downloadedFile \*.bdf -d $out/share/fonts
+ unzip -j $downloadedFile '*/Dina/*.bdf' -d $out/share/fonts
+ chmod u-x $out/share/fonts/*
'';
sha256 = "02a6hqbq18sw69npylfskriqhvj1nsk65hjjyd05nl913ycc6jl7";
@@ -25,6 +27,5 @@ in fetchzip rec {
downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/;
license = licenses.free;
maintainers = [ maintainers.prikhi ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix
index f564507c777ccad8c2765e0cc1a59e0764d8b777..4837425d19a7e40aca2a89322a86bf68aeefd5b8 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -31,6 +31,5 @@ stdenv.mkDerivation rec {
meta = {
description = "Various fonts from the DOSEmu project";
- platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix
index 01157e8b7e4c1b67b60d91791c3cf178ad209830..48b170e2e1b640a96ae5a146c01982494a9ece5b 100644
--- a/pkgs/data/fonts/dosis/default.nix
+++ b/pkgs/data/fonts/dosis/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchzip}:
+{ lib, fetchFromGitHub }:
-fetchzip rec {
+fetchFromGitHub rec {
name = "dosis-1.007";
- url = https://github.com/impallari/Dosis/archive/12df1e13e58768f20e0d48ff15651b703f9dd9dc.zip;
+ owner = "impallari";
+ repo = "Dosis";
+ rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc";
postFetch = ''
- mkdir -p $out/share/{doc,fonts}
- unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
- unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
+ tar xf $downloadedFile --strip=1
+ find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \;
+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
'';
- sha256 = "11a8jmgaly14l7rm3jxkwwv3ngr8fdlkp70nicjk2rg0nny2cvfq";
+ sha256 = "0vz25w45i8flfvppymr5h83pa2n1r37da20v7691p44018fdsdny";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A very simple, rounded, sans serif family";
longDescription = ''
Dosis is a very simple, rounded, sans serif family.
diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix
index 324f6f63e5569cbea1900252374e47ac4f60db21..59371593f79bd3d6aa802e78330d5a431a530f29 100644
--- a/pkgs/data/fonts/doulos-sil/default.nix
+++ b/pkgs/data/fonts/doulos-sil/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "5.000";
@@ -16,7 +16,7 @@ in
sha256 = "04a9cr7jbw7d8llcj8xsqp9rp8w6gcgbd9sdwvi02kz7jhqa0vad";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://software.sil.org/doulos;
description = "A font that provides complete support for the International Phonetic Alphabet";
longDescription = ''
diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix
index 53a5d9f73cc1609f660f2cfad422c969cfc5c4d6..1423326899162e9e0d27c3036d3c2e420b69c89a 100644
--- a/pkgs/data/fonts/eb-garamond/default.nix
+++ b/pkgs/data/fonts/eb-garamond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "0.016";
@@ -15,7 +15,7 @@ in fetchzip rec {
sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://www.georgduffner.at/ebgaramond/;
description = "Digitization of the Garamond shown on the Egenolff-Berner specimen";
maintainers = with maintainers; [ relrod rycee ];
diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
index d2b376f5bba02f00f59427ddb0ecd44b4a68a6aa..e7981f63baf30be7318b39e7e48492ee476ae48d 100644
--- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
+++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "3.2.0";
@@ -14,7 +14,7 @@ in fetchzip {
sha256 = "0ps8q9nkx67ivgn8na4s012360v36jwr0951rsg7j6dyyw9g41jq";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Icon fonts for emacs all-the-icons";
longDescription = ''
The emacs package all-the-icons provides icons to improve
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index f466a5b230d0bf2c461a8f3e62f6f4768a4d5304..3e71352f8025cfff8a8e3059e6f2137bbc3a4084 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
description = "Open source emoji set";
homepage = http://emojione.com/;
license = licenses.cc-by-40;
- platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix
index 96d64e1389350f37e49bcae5e128ce0d4dc33261..787a83f95611af8555eb857507b7a8116d1dd2e6 100644
--- a/pkgs/data/fonts/encode-sans/default.nix
+++ b/pkgs/data/fonts/encode-sans/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip rec {
name = "encode-sans-1.002";
@@ -13,7 +13,7 @@ fetchzip rec {
sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A versatile sans serif font family";
longDescription = ''
The Encode Sans family is a versatile workhorse. Featuring a huge range of
diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix
index 56fa718f8670a309fff42bfa5c42c97485cecddd..55250156fcd0961497de7a9e8623b4e64e4d60d6 100644
--- a/pkgs/data/fonts/eunomia/default.nix
+++ b/pkgs/data/fonts/eunomia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://dotcolon.net/font/eunomia/;
description = "A futuristic decorative font.";
platforms = platforms.all;
diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix
index 25cab717cee9f7148ded7c3264fdfaa647a1844c..28969f02364a5db7b47d81aa67fdfac77d52568c 100644
--- a/pkgs/data/fonts/f5_6/default.nix
+++ b/pkgs/data/fonts/f5_6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "A weighted decorative font.";
platforms = platforms.all;
diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix
index 7d05482ef5ffb124422d5045564db8c636e10c7c..5b982dcaa3e69caa0a0f70ceba17bbedf37cc8e9 100644
--- a/pkgs/data/fonts/fantasque-sans-mono/default.nix
+++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix
@@ -1,9 +1,7 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
-
version = "1.7.2";
-
in
fetchzip rec {
@@ -19,7 +17,7 @@ fetchzip rec {
sha256 = "1fwvbqfrgb539xybwdawvwa8cg4f215kw905rgl9a6p0iwa1nxqk";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/belluzj/fantasque-sans;
description = "A font family with a great monospaced variant for programmers";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix
index bbe185bd8486d10c299e3fe043e40abaaa5f3f83..ec3f3218ea5603c82ff4bef199b09095c6513ee0 100644
--- a/pkgs/data/fonts/ferrum/default.nix
+++ b/pkgs/data/fonts/ferrum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "A decorative font.";
platforms = platforms.all;
diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
index ce6e011d8a657472cb9c1900a458c83ecc719a87..fe27ac2cd5db15f4a21d46a161846b7618db23e7 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/pkgs/data/fonts/fira/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchzip }:
+{ lib, fetchFromGitHub }:
-fetchzip rec {
- name = "fira-4.106";
+let
+ version = "4.106";
+in fetchFromGitHub {
+ name = "fira-${version}";
- url = https://github.com/mozilla/Fira/archive/4.106.zip;
+ owner = "mozilla";
+ repo = "Fira";
+ rev = version;
postFetch = ''
- mkdir -p $out/share/fonts
- unzip -j $downloadedFile Fira-4.106/otf/FiraSans\*.otf -d $out/share/fonts/opentype
+ tar xf $downloadedFile --strip=1
+ mkdir -p $out/share/fonts/opentype
+ cp otf/*.otf $out/share/fonts/opentype
'';
sha256 = "0c97nmihcq0ki7ywj8zn048a2bgrszc61lb9p0djfi65ar52jab4";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://mozilla.github.io/Fira/;
description = "Sans-serif font for Firefox OS";
longDescription = ''
diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix
index b0c481dfcb5ccfb7f5530adc889db62874ebf3fb..14232edee0cbc6d2639e06751af4eb0efa98a17b 100644
--- a/pkgs/data/fonts/fixedsys-excelsior/default.nix
+++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix
@@ -1,33 +1,25 @@
{ stdenv, fetchurl } :
-let
+let
major = "3";
minor = "00";
version = "${major}.${minor}";
-
-in
-
-stdenv.mkDerivation rec {
+in fetchurl rec {
name = "fixedsys-excelsior-${version}";
- src = fetchurl {
- url = http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf;
- sha256 = "6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d";
- };
-
- phases = [ "installPhase" ];
-
- installPhase = ''
- mkdir -p $out/share/fonts/truetype/
- cp $src $out/share/fonts/truetype/${name}.ttf
+ urls = [
+ http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf
+ https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf
+ http://tarballs.nixos.org/sha256/6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d
+ ];
+ downloadToTemp = true;
+ recursiveHash = true;
+ postFetch = ''
+ install -m444 -D $downloadedFile $out/share/fonts/truetype/${name}.ttf
'';
- outputHashMode = "recursive";
-
- outputHashAlgo = "sha256";
+ sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37";
- outputHash = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37";
-
meta = {
description = "Pan-unicode version of Fixedsys, a classic DOS font.";
homepage = http://www.fixedsysexcelsior.com/;
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
index 51f1d668cd24d7656e2e55cc934951d7124bb697..ee1365d261184f18c8751565190f7e22b4e2dff5 100644
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ b/pkgs/data/fonts/font-awesome-5/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, fetchzip }:
+{ lib, fetchFromGitHub }:
let
- version = "5.8.1";
-in fetchzip rec {
+ version = "5.9.0";
+in fetchFromGitHub rec {
name = "font-awesome-${version}";
- url = "https://github.com/FortAwesome/Font-Awesome/archive/${version}.zip";
+ owner = "FortAwesome";
+ repo = "Font-Awesome";
+ rev = version;
postFetch = ''
- mkdir -p $out/share/fonts
- unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/opentype otfs/*.otf
'';
- sha256 = "1fc177sgf4qd231dmpr7cwr1j03wzb927ylpng2gn94iksln924d";
+ sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Font Awesome - OTF font";
longDescription = ''
Font Awesome gives you scalable vector icons that can instantly be customized.
diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
index e1be0da428a8d08c40960df4d68ac665c96820b4..601146d99a9d648d7b135c3104c2ae7f4adcc0be 100644
--- a/pkgs/data/fonts/fontconfig-penultimate/default.nix
+++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip
+{ lib, fetchzip
, version ? "0.3.5"
, sha256 ? "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk"
}:
@@ -14,7 +14,7 @@ fetchzip {
unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/ttuegel/fontconfig-penultimate;
description = "Sensible defaults for Fontconfig";
license = licenses.asl20;
diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix
index 39118716f6f9aa8f2d3c0243772f4375ee6b8668..c5e19edea262661bd40e93964f3be1714cb8cb08 100644
--- a/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/pkgs/data/fonts/freefont-ttf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
fetchzip rec {
name = "freefont-ttf-20120503";
@@ -20,8 +20,8 @@ fetchzip rec {
10646/Unicode UCS (Universal Character Set).
'';
homepage = https://www.gnu.org/software/freefont/;
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.all;
+ license = lib.licenses.gpl3Plus;
+ platforms = lib.platforms.all;
maintainers = [];
};
}
diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/data/fonts/gandom-fonts/default.nix
index 938ff272cbd915195d24ec868f440b431f294929..4d925b269cd3256c7b7414dcc3273f79495c4627 100644
--- a/pkgs/data/fonts/gandom-fonts/default.nix
+++ b/pkgs/data/fonts/gandom-fonts/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "gandom-fonts";
version = "0.6";
+in fetchFromGitHub {
+ name = "${pname}-${version}";
+ owner = "rastikerdar";
+ repo = "gandom-font";
+ rev = "v${version}";
- src = fetchFromGitHub {
- owner = "rastikerdar";
- repo = "gandom-font";
- rev = "v${version}";
- sha256 = "1pdbqhvcsz6aq3qgarhfd05ip0wmh7bxqkmxrwa0kgxsly6zxz9x";
- };
-
- installPhase = ''
- mkdir -p $out/share/fonts/gandom-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/gandom-fonts
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/gandom-fonts {} \;
'';
+ sha256 = "0zsq6s9ziyb5jz0v8aj00dlxd1aly0ibxgszd05dfvykmgz051lc";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/rastikerdar/gandom-font;
description = "A Persian (Farsi) Font - Ùونت (قلم) Ùارسی گندم";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix
index 359074099ba1d5bebf4da81a7917227cfa2e0dd9..71c92a72e593e57963244cd5e20ec4b44444dc98 100644
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/pkgs/data/fonts/gdouros/default.nix
@@ -1,29 +1,16 @@
-{stdenv, fetchzip, lib}:
+{ fetchzip, lib }:
let
fonts = {
- symbola = { version = "9.17"; file = "Symbola.zip"; sha256 = "13z18lxx0py54nns61ihgxacpf1lg9s7g2sbpbnxpllqw7j73iq2";
- description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
- aegyptus = { version = "6.17"; file = "Aegyptus.zip"; sha256 = "19rkf89msqb076qjdfa75pqrx35c3slj64vxw08zqdvyavq7jc79";
- description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
- akkadian = { version = "7.17"; file = "AkkadianAssyrian.zip"; sha256 = "1xw2flrwb5r89sk7jd195v3svsb21brf1li2i3pdjcfqxfp5m0g7";
- description = "Sumero-Akkadian Cuneiform"; };
- anatolian = { version = "5.17"; file = "Anatolian.zip"; sha256 = "0dqcyjakc4fy076pjplm6psl8drpwxiwyq97xrf6a3qa098gc0qc";
- description = "Anatolian Hieroglyphs"; };
- maya = { version = "4.17"; file = "Maya.zip"; sha256 = "17s5c23wpqrcq5h6pgssbmzxiv4jvhdh2ssr99j9q6j32a51h9gh";
- description = "Maya Hieroglyphs"; };
- unidings = { version = "9.17"; file = "Unidings.zip"; sha256 = "0nzw8mrhk0hbjnl2cgi31b00vmi785win86kiz9d2yzdfz1is6sk";
- description = "Glyphs and Icons for blocks of The Unicode Standard"; };
- musica = { version = "3.17"; file = "Musica.zip"; sha256 = "0mnv61dxzs2npvxgs5l9q81q19xzzi1sn53x5qwpiirkmi6bg5y6";
- description = "Musical Notation"; };
- analecta = { version = "5.17"; file = "Analecta.zip"; sha256 = "13npnfscd9mz6vf89qxxbj383njf53a1smqjh0c1w2lvijgak3aj";
- description = "Coptic, Gothic, Deseret"; };
- textfonts = { version = "7.17"; file = "TextfontsFonts.zip"; sha256 = "1ggflqnslp81v8pzmzx6iwi2sa38l9bpivjjci7nvx3y5xynm6wl";
- description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; };
- aegan = { version = "9.17"; file = "AegeanFonts.zip"; sha256 = "0dm2ck3p11bc9izrh7xz3blqfqg1mgsvy4jsgmz9rcs4m74xrhsf";
- description = "Aegean"; };
- abydos = { version = "1.23"; file = "AbydosFont.zip"; sha256 = "04r7ysnjjq0nrr3m8lbz8ssyx6xaikqybjqxzl3ziywl9h6nxdj8";
- description = "AbydosFont"; };
+ aegan = { version = "10.00"; file = "Aegean.zip"; sha256 = "0k47nhzw4vx771ch3xx8mf6xx5vx0hg0cif5jdlmdaz4h2c3rawz"; description = "Aegean"; };
+ aegyptus = { version = "8.00"; file = "Aegyptus.zip"; sha256 = "13h2pi641k9vxgqi9l11mjya10ym9ln54wrkwxx6gxq63zy7y5mj"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
+ akkadian = { version = "7.18"; file = "Akkadian.zip"; sha256 = "1bplcvszbdrk85kqipn9lzhr62647wjibz1p8crzjvsw6f9ymxy3"; description = "Sumero-Akkadian Cuneiform"; };
+ assyrian = { version = "2.00"; file = "AssyrianFont.zip"; sha256 = "0vdvb24vsnmwzd6bw14akqg0hbvsk8avgnbwk9fkybn1f801475k"; description = "Neo-Assyrian in Unicode with OpenType"; };
+ eemusic = { version = "2.00"; file = "EEMusic.zip"; sha256 = "1y9jf105a2b689m7hdjmhhr7z5j0qd2w6dmb3iic9bwaczlrjy7j"; description = "Byzantine Musical Notation in Unicode with OpenType"; };
+ maya = { version = "4.18"; file = "Maya.zip"; sha256 = "08z2ch0z2c43fjfg5m4yp3l1dp0cbk7lv5i7wzsr3cr9kr59wpi9"; description = "Maya Hieroglyphs"; };
+ symbola = { version = "12.00"; file = "Symbola.zip"; sha256 = "1i3xra33xkj32vxs55xs2afrqyc822nk25669x78px5g5qd8gypm"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
+ textfonts = { version = "9.00"; file = "Textfonts.zip"; sha256 = "0wzxz4j4fgk81b88d58715n1wvq2mqmpjpk4g5hi3vk77y2zxc4d"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; };
+ unidings = { version = "9.19"; file = "Unidings.zip"; sha256 = "1bybzgdqhmq75hb12n3pjrsdcpw1a6sgryx464s68jlq4zi44g78"; description = "Glyphs and Icons for blocks of The Unicode Standard"; };
};
mkpkg = name_: {version, file, sha256, description}: fetchzip rec {
@@ -42,9 +29,8 @@ let
# In lieu of a license:
# Fonts in this site are offered free for any use;
# they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
- license = stdenv.lib.licenses.free;
+ license = lib.licenses.free;
homepage = http://users.teilar.gr/~g1951d/;
- platforms = stdenv.lib.platforms.unix;
};
};
in
diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix
index 9b626291c2cb82d9a55340d2657ed1d3338dc072..505b273c2d24c82b5408faf0340a2c330c092abd 100644
--- a/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
major = "1";
@@ -11,14 +11,13 @@ in fetchzip rec {
postFetch = ''
mkdir -p $out/share/{doc,fonts}
- unzip -l $downloadedFile
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name}
'';
sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://software.sil.org/gentium/;
description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
maintainers = with maintainers; [ ];
diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix
index 829eca8c06fc19eda60d7a8f4ff4be63496c3059..a60a39f4f01eb3d49656f18080fc8e2f7c0cb571 100644
--- a/pkgs/data/fonts/gentium/default.nix
+++ b/pkgs/data/fonts/gentium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "5.000";
@@ -17,7 +17,7 @@ in fetchzip rec {
sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://software.sil.org/gentium/;
description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
longDescription = ''
diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix
index a0af38cfd2408b2f08889f4149616736ab2d3a49..bb28d3be67fa2401e393cce0e9a8f1ae72bc8452 100644
--- a/pkgs/data/fonts/go-font/default.nix
+++ b/pkgs/data/fonts/go-font/default.nix
@@ -1,26 +1,22 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
- name = "go-font-${version}";
+let
version = "2017-03-30";
+in (fetchgit {
+ name = "go-font-${version}";
+ url = "https://go.googlesource.com/image";
+ rev = "f03a046406d4d7fbfd4ed29f554da8f6114049fc";
- src = fetchgit {
- url = "https://go.googlesource.com/image";
- rev = "f03a046406d4d7fbfd4ed29f554da8f6114049fc";
- sha256 = "1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d";
- };
-
- installPhase = ''
+ postFetch = ''
+ mv $out/* .
mkdir -p $out/share/fonts/truetype
mkdir -p $out/share/doc/go-font
cp font/gofont/ttfs/* $out/share/fonts/truetype
mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "10hfm2cpxlx1ng7r2mbvykjhmy131qlgzpdzj7ibg9kr293bcjc0";
-
+ sha256 = "1488426ya2nzmwjas947fx9h5wzxrp9wasn8nkjqf0y0mpd4f1xz";
+}) // {
meta = with stdenv.lib; {
homepage = https://blog.golang.org/go-fonts;
description = "The Go font family";
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index b394cb47157ce8a211d9e53ce0652e633d6d9ac7..59ac4ec850b1ad14047c9236cdc0204cb387ee1c 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -67,6 +67,5 @@ stdenv.mkDerivation rec {
homepage = http://font.gohu.org/;
license = licenses.wtfpl;
maintainers = with maintainers; [ epitrochoid rnhmjoj ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix
index 492d89a674ceba5f7700b5f8f5319bb94115693c..91a8aaf3c3011329b0c7a8a8b93aac0b7392a4cd 100644
--- a/pkgs/data/fonts/gyre/default.nix
+++ b/pkgs/data/fonts/gyre/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
baseName = "gyre-fonts";
@@ -25,8 +25,8 @@ in fetchzip {
covering all modern European languages and then some
'';
homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings";
- license = stdenv.lib.licenses.lppl13c;
- platforms = stdenv.lib.platforms.all;
- maintainers = with stdenv.lib.maintainers; [ bergey ];
+ license = lib.licenses.lppl13c;
+ platforms = lib.platforms.all;
+ maintainers = with lib.maintainers; [ bergey ];
};
}
diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
index e77fcc3c3a3ed85ed1def79bcdf6c121e085aac7..ef0df1ba67f6002ebf637135452abc381bf6344c 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/pkgs/data/fonts/hack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "3.003";
@@ -14,7 +14,7 @@ in fetchzip rec {
sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A typeface designed for source code";
longDescription = ''
Hack is hand groomed and optically balanced to be a workhorse face for
diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix
index 27459b2d1f3f95682c6e856ef804c52588ea932a..29c982ed8aeafedf9e709edb2512cd42431e1040 100644
--- a/pkgs/data/fonts/hanazono/default.nix
+++ b/pkgs/data/fonts/hanazono/default.nix
@@ -1,23 +1,30 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
- version = "20141012";
+ version = "20170904";
in fetchzip {
name = "hanazono-${version}";
- url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-${version}.zip";
+ url = "mirror://osdn/hanazono-font/68253/hanazono-${version}.zip";
postFetch = ''
- mkdir -p $out/share/fonts/hanazono $out/share/doc/hanazono
- unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hanazono
+ mkdir -p $out/share/{doc,fonts}
+ unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono
'';
- sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2";
+ sha256 = "0qiyd1vk3w8kqmwc6xi5d390wdr4ln8xhfbx3n8r1hhad9iz14p6";
- meta = with stdenv.lib; {
- description = "Free kanji font containing 96,327 characters";
- homepage = http://fonts.jp/hanazono/;
+ meta = with lib; {
+ description = "Japanese Mincho-typeface TrueType font";
+ homepage = "https://fonts.jp/hanazono/";
+ longDescription = ''
+ Hanazono Mincho typeface is a Japanese TrueType font that developed with a
+ support of Grant-in-Aid for Publication of Scientific Research Results
+ from Japan Society for the Promotion of Science and the International
+ Research Institute for Zen Buddhism (IRIZ), Hanazono University. also with
+ volunteers who work together on glyphwiki.org.
+ '';
# Dual-licensed under OFL and the following:
# This font is a free software.
diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix
index de7dd5834e4ba31130392ad5642a646d66b2f75e..6286cf8a1df807e63e7178bf7866d56089a5a99c 100644
--- a/pkgs/data/fonts/hasklig/default.nix
+++ b/pkgs/data/fonts/hasklig/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "1.1";
@@ -9,13 +9,12 @@ in fetchzip {
postFetch = ''
unzip $downloadedFile
- mkdir -p $out/share/fonts/opentype
- cp *.otf $out/share/fonts/opentype
+ install -m444 -Dt $out/share/fonts/opentype *.otf
'';
sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/i-tu/Hasklig;
description = "A font with ligatures for Haskell code based off Source Code Pro";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
index a614017b8095e8354015b51d71fb4751cdc1c200..759d2c2db1d27b87f3dc71be9c81d41f455f0698 100644
--- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
+++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "2013.06.07"; # date of most recent file in distribution
@@ -28,8 +28,8 @@ in fetchzip rec {
font. The numbers are well spaced and defined with high accuracy. The
punctuation marks are heavily detailed as well.
'';
- license = stdenv.lib.licenses.unfree;
- maintainers = [ stdenv.lib.maintainers.romildo ];
- platforms = stdenv.lib.platforms.all;
+ license = lib.licenses.unfree;
+ maintainers = [ lib.maintainers.romildo ];
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix
index c247ad155438321ccb2b452f92ff59ff0f9effd2..f641b36a1b05587f6e97ef37b08ad859374450b6 100644
--- a/pkgs/data/fonts/hermit/default.nix
+++ b/pkgs/data/fonts/hermit/default.nix
@@ -1,23 +1,20 @@
-{ stdenv, fetchurl }:
+{ lib, fetchzip }:
-stdenv.mkDerivation rec {
+let
pname = "hermit";
version = "2.0";
+in fetchzip rec {
+ name = "${pname}-${version}";
- src = fetchurl {
- url = "https://pcaro.es/d/otf-${pname}-${version}.tar.gz";
- sha256 = "09rmy3sbf1j1hr8zidighjgqc8kp0wsra115y27vrnlf10ml6jy0";
- };
-
- sourceRoot = ".";
+ url = "https://pcaro.es/d/otf-${name}.tar.gz";
- dontBuild = true;
- installPhase = ''
- mkdir -p $out/share/fonts/opentype
- cp *.otf $out/share/fonts/opentype/
+ postFetch = ''
+ tar xf $downloadedFile
+ install -m444 -Dt $out/share/fonts/opentype *.otf
'';
+ sha256 = "127hnpxicqya7v1wmzxxqafq3aj1n33i4j5ncflbw6gj5g3bizwl";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "monospace font designed to be clear, pragmatic and very readable";
homepage = https://pcaro.es/p/hermit;
license = licenses.ofl;
diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix
index 80516eb0293c3ae5dbbd73b5752cbf94b41fe38e..362781c05bb5f36e353e24aac7a298657b831cb1 100644
--- a/pkgs/data/fonts/hyperscrypt/default.nix
+++ b/pkgs/data/fonts/hyperscrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, lib }:
+{ fetchzip, lib }:
let
version = "1.1";
@@ -15,7 +15,7 @@ fetchzip rec {
unzip -j $downloadedFile \*${pname}.otf -d $out/share/fonts/opentype/${pname}.otf
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://velvetyne.fr/fonts/hyper-scrypt/;
description = "A modern stencil typeface inspired by stained glass technique";
longDescription = ''
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index b767c670650857b3c2ef2fa152e52d4830df2a87..7e1014da2102625eaca912ab0cd9a45f1405c2b7 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "1.4.1";
+ version = "2.0.0";
in fetchzip rec {
name = "ibm-plex-${version}";
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
@@ -9,7 +9,7 @@ in fetchzip rec {
mkdir -p $out/share/fonts
unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
'';
- sha256 = "1y2p0gf8znryfcidg26dn9xi81wl9vq5m56ylvg5jp0sn971r4xq";
+ sha256 = "0m4paww4349d37s7j20a00hp514p1jq54xrnz45wyrafb8pkah4g";
meta = with lib; {
description = "IBM Plex Typeface";
diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix
index 8563e0e112ac63cda78373999d8c2ecb82682e18..8b557008175754584e4bcbb8e4d7975728b04f67 100644
--- a/pkgs/data/fonts/inconsolata/lgc.nix
+++ b/pkgs/data/fonts/inconsolata/lgc.nix
@@ -14,20 +14,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ fontforge ];
installPhase = ''
- mkdir -p $out/share/fonts/truetype
- cp -v $(find . -name '*.ttf') $out/share/fonts/truetype
-
- mkdir -p $out/share/fonts/opentype
- cp -v $(find . -name '*.otf') $out/share/fonts/opentype
-
- mkdir -p "$out/doc/${name}"
- cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
+ find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \;
+ install -m444 -Dt $out/share/doc/${name} LICENSE README
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "18brmw0h4hjq1m2l0abwc3zmib4rnfalpywdk68djm711zldxr76";
-
meta = with stdenv.lib; {
description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek";
longDescription = ''
@@ -57,6 +48,5 @@ stdenv.mkDerivation rec {
license = licenses.ofl;
homepage = https://github.com/MihailJP/Inconsolata-LGC;
maintainers = with maintainers; [ avnik rht ];
- platforms = platforms.linux;
};
}
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix
index 94c580c30df063cde2ae138df66b13bd1b3d1a20..4910ef21f9ab62d279d14d7adb307d9c19028af6 100644
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/pkgs/data/fonts/input-fonts/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = requireFile {
name = "Input-Font.zip";
- url = "http://input.fontbureau.com/download/";
+ url = "https://input.fontbureau.com/download/";
sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq";
};
diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix
index a2192385abc2b4a63329044ea5098b7ae0c1bf80..52c28db639ef9a7b4cc757c714e96d238b1108a9 100644
--- a/pkgs/data/fonts/inriafonts/default.nix
+++ b/pkgs/data/fonts/inriafonts/default.nix
@@ -1,26 +1,22 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
+{ lib, fetchFromGitHub }:
+let
pname = "inriafonts";
version = "1.200";
+in fetchFromGitHub rec {
name = "${pname}-${version}";
-
-src = fetchFromGitHub {
owner = "BlackFoundry";
repo = "InriaFonts";
rev = "v${version}";
- sha256 = "06775y99lyh6hj5hzvrx56iybdck8a8xfqkipqd5c4cldg0a9hh8";
-};
-installPhase = ''
- mkdir -p $out/share/fonts/truetype
- cp fonts/*/TTF/*.ttf $out/share/fonts/truetype
- mkdir -p $out/share/fonts/opentype
- cp fonts/*/OTF/*.otf $out/share/fonts/opentype
-'';
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/truetype fonts/*/TTF/*.ttf
+ install -m444 -Dt $out/share/fonts/opentype fonts/*/OTF/*.otf
+ '';
+ sha256 = "0wrwcyycyzvgvgnlmwi1ncdvwb8f6bbclynd1105rsyxgrz5dd70";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://black-foundry.com/work/inria;
description = "Inria Sans and Inria Serif";
longDescription = ''
@@ -32,7 +28,7 @@ installPhase = ''
typeface with a unapologetically contemporary design as the
Sans-serif part and a more rational axis and drawing for the
serif. Both members comes in 3 weights with matching italics.
- '';
+ '';
license = licenses.ofl;
maintainers = with maintainers; [ leenaars ];
platforms = platforms.all;
diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix
index 15032ebb3e33b2e6091f517aa979388556efbff4..d9ef6684faa6abb1ab25820d3d896941f4e78a68 100644
--- a/pkgs/data/fonts/inter-ui/default.nix
+++ b/pkgs/data/fonts/inter-ui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
# XXX: IMPORTANT:
# For compat, keep this at the last version that used the name "Inter UI"
@@ -18,7 +18,7 @@ in fetchzip {
sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://rsms.me/inter/;
description = "A typeface specially designed for user interfaces";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix
index 8973eae1464a3ebfca67170b20111e92048afdd4..589acbcee5ccbed0f4b5d537f05b0feb05afb592 100644
--- a/pkgs/data/fonts/inter/default.nix
+++ b/pkgs/data/fonts/inter/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
- version = "3.5";
+ version = "3.7";
in fetchzip {
name = "inter-${version}";
@@ -12,14 +12,14 @@ in fetchzip {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
- sha256 = "0zqixzzbb3n1j4jvpjm0hlxc32j53hgq4j078gihjkhgvjhsklf2";
+ sha256 = "1ja1v3605vp09azpabgmk710kic85zxwi4kksmqj9z805fmxddp6";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://rsms.me/inter/;
description = "A typeface specially designed for user interfaces";
license = licenses.ofl;
platforms = platforms.all;
- maintainers = with maintainers; [ demize ];
+ maintainers = with maintainers; [ demize dtzWill ];
};
}
diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix
index dfeab5124c846f6c71d72489eccc723ee24619c5..4d7e2fa380e0681c653282a13f759fad2692fb28 100644
--- a/pkgs/data/fonts/ipaexfont/default.nix
+++ b/pkgs/data/fonts/ipaexfont/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "ipaexfont-003.01";
- url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
+ url = "http://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
postFetch = ''
mkdir -p $out/share/fonts
@@ -12,7 +12,7 @@ fetchzip rec {
sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Japanese font package with Mincho and Gothic fonts";
longDescription = ''
IPAex font is a Japanese font developed by the Information-technology
@@ -24,6 +24,5 @@ fetchzip rec {
homepage = http://ipafont.ipa.go.jp/;
license = licenses.ipa;
maintainers = with maintainers; [ gebner ];
- platforms = with platforms; unix;
};
}
diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix
index c056f14f46fda166f4b3177cecdbee03f3c7a12f..d1cb0070883867601c39561757b2a5bd7f1c4043 100644
--- a/pkgs/data/fonts/ipafont/default.nix
+++ b/pkgs/data/fonts/ipafont/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip {
name = "ipafont-003.03";
@@ -20,8 +20,7 @@ fetchzip {
suitable for both display and printing.
'';
homepage = http://ipafont.ipa.go.jp/ipafont/;
- license = stdenv.lib.licenses.ipa;
- maintainers = [ stdenv.lib.maintainers.auntie ];
- platforms = stdenv.lib.platforms.unix;
+ license = lib.licenses.ipa;
+ maintainers = [ lib.maintainers.auntie ];
};
}
diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix
index af1392e9d5e232bf5c5d4feb524ee03d9f63fbbb..1501e0fb7fa278ef090cd39a6d5c0b6e8382f266 100644
--- a/pkgs/data/fonts/ir-standard-fonts/default.nix
+++ b/pkgs/data/fonts/ir-standard-fonts/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "ir-standard-fonts";
- version= "unstable-2017-01-21";
+ version = "unstable-2017-01-21";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
+ owner = "morealaz";
+ repo = pname;
+ rev = "d36727d6c38c23c01b3074565667a2fe231fe18f";
- src = fetchFromGitHub {
- owner = "morealaz";
- repo = pname;
- rev = "d36727d6c38c23c01b3074565667a2fe231fe18f";
- sha256 = "1ks9q1r1gk2517yfr1fbgrdbgw0w97i4am6jqn5ywpgm2xd03yg1";
- };
-
- installPhase = ''
- mkdir -p $out/share/fonts/ir-standard-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/ir-standard-fonts
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/ir-standard-fonts {} \;
'';
+ sha256 = "0i2vzhwk77pm6fx5z5gxl026z9f35rhh3cvl003mry2lcg1x5rhp";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/morealaz/ir-standard-fonts;
description = "Iran Supreme Council of Information and Communication Technology (SCICT) standard Persian fonts series";
# License information is unavailable.
diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix
index 3649aad99f4366a69c8d4d8cd8834caeb2864e90..afa59b737a5c703dae114e6ce597cddf53ac8326 100644
--- a/pkgs/data/fonts/iwona/default.nix
+++ b/pkgs/data/fonts/iwona/default.nix
@@ -1,23 +1,18 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
-stdenv.mkDerivation rec {
- name = "iwona-${version}";
+let
version = "0_995";
+in fetchzip {
+ name = "iwona-${version}";
+ url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip";
- src = fetchzip {
- url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip";
- sha256 = "1wj5bxbxpz5a8p3rhw708cyjc0lgqji8g0iv6brmmbrrkpb3jq2s";
- };
-
- installPhase = ''
- install -m 444 -D -t $out/share/fonts/opentype/ *.otf
+ postFetch = ''
+ mkdir -p $out/share/fonts/opentype
+ unzip -j $downloadedFile *.otf -d $out/share/fonts/opentype
'';
+ sha256 = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa";
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa";
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
homepage = http://jmn.pl/en/kurier-i-iwona/;
# "[...] GUST Font License (GFL), which is a free license, legally
diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ecada2eda7b73b2220ece517a2e40377e9972f50
--- /dev/null
+++ b/pkgs/data/fonts/jost/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchzip}:
+
+let
+ version = "3.3";
+in fetchzip {
+ name = "jost-${version}";
+ url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip";
+
+ postFetch = ''
+ mkdir -p $out/share/fonts
+ unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+ '';
+
+ sha256="00nrhs3aif2hc4yhjhbn9ywmydl2w0g0hv5m5is8gv7wx8yi2j9z";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/indestructible-type/Jost;
+ description = "A sans serif font by Indestructible Type";
+ license = licenses.ofl;
+ maintainers = [ maintainers.ar1a ];
+ };
+}
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index 824d9044d76fca1a766e66e77c3de384feb206c8..1cfe1d5d4b00129564cd654d3c015f1244c9df44 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip {
name = "junicode-0.7.8";
@@ -15,7 +15,6 @@ fetchzip {
meta = {
homepage = http://junicode.sourceforge.net/;
description = "A Unicode font for medievalists";
- platforms = stdenv.lib.platforms.unix;
- license = stdenv.lib.licenses.gpl2Plus;
+ license = lib.licenses.gpl2Plus;
};
}
diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/data/fonts/kanji-stroke-order-font/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1c1609b03f19300f04a5f53a7c6625bacd0152f0
--- /dev/null
+++ b/pkgs/data/fonts/kanji-stroke-order-font/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchzip }:
+
+let
+ version = "4.002";
+in fetchzip {
+ name = "kanji-stroke-order-font-${version}";
+
+ url = "https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${version}.zip?attredirects=0";
+
+ postFetch = ''
+ mkdir -p $out/share/fonts/kanji-stroke-order $out/share/doc/kanji-stroke-order
+ unzip -j $downloadedFile \*.ttf -d $out/share/fonts/kanji-stroke-order
+ unzip -j $downloadedFile \*.txt -d $out/share/doc/kanji-stroke-order
+ '';
+
+ sha256 = "194ylkx5p7r1461wnnd3hisv5dz1xl07fyxmg8gv47zcwvdmwkc0";
+
+ meta = with stdenv.lib; {
+ description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters";
+ homepage = "https://sites.google.com/site/nihilistorguk/";
+
+ license = [ licenses.bsd3 ];
+ maintainers = with maintainers; [ ptrhlm ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix
index 852fdec82f82ea50c5f826a2fcfe5859b97640ad..c1de2806ef187c44962cc887f519c071f5f0304b 100644
--- a/pkgs/data/fonts/kawkab-mono/default.nix
+++ b/pkgs/data/fonts/kawkab-mono/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
fetchzip rec {
name = "kawkab-mono-20151015";
@@ -15,8 +15,7 @@ fetchzip rec {
meta = {
description = "An arab fixed-width font";
homepage = https://makkuk.com/kawkab-mono/;
- license = stdenv.lib.licenses.ofl;
- platforms = stdenv.lib.platforms.unix;
+ license = lib.licenses.ofl;
};
}
diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix
index c24e68981296713769a948eba910e8287b7fd409..1b63223f0bf6c2d94924e9e6226e77ff9a031311 100644
--- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix
+++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let version = "20030809";
in
fetchzip {
name = "kochi-substitute-naga10-${version}";
- url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2";
+ url = "mirror://osdn/efont/5411/kochi-substitute-${version}.tar.bz2";
postFetch = ''
tar -xjf $downloadedFile --strip-components=1
@@ -25,8 +25,8 @@ fetchzip {
this font may not be sold commercially. See kochi-substitute for the free
Debian version.
'';
- homepage = http://sourceforge.jp/projects/efont/;
- license = stdenv.lib.licenses.unfreeRedistributable;
- maintainers = [ stdenv.lib.maintainers.auntie ];
+ homepage = "https://osdn.net/projects/efont/";
+ license = lib.licenses.unfreeRedistributable;
+ maintainers = [ lib.maintainers.auntie ];
};
}
diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix
index 5815b84f21a4af65edf1fc111a1e9b68b2c9b9cb..6ed540121a2c57aff1a2f833b7ef833b10b13fe6 100644
--- a/pkgs/data/fonts/kochi-substitute/default.nix
+++ b/pkgs/data/fonts/kochi-substitute/default.nix
@@ -40,9 +40,8 @@ stdenv.mkDerivation {
versions of the fonts, which remove some non-free glyphs that were added
from the naga10 font.
'';
- homepage = http://sourceforge.jp/projects/efont/;
+ homepage = "https://osdn.net/projects/efont/";
license = stdenv.lib.licenses.wadalab;
maintainers = [ stdenv.lib.maintainers.auntie ];
- platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/data/fonts/lalezar-fonts/default.nix
index c9915d7a3e635c1486fb98f174a76e4a1e3435ac..2cd33e9fe1b3ea55d1113c4995d569363ca4ef30 100644
--- a/pkgs/data/fonts/lalezar-fonts/default.nix
+++ b/pkgs/data/fonts/lalezar-fonts/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "lalezar-fonts";
version = "unstable-2017-02-28";
+in fetchFromGitHub {
+ name = "${pname}-${version}";
+ owner = "BornaIz";
+ repo = "Lalezar";
+ rev = "238701c4241f207e92515f845a199be9131c1109";
- src = fetchFromGitHub {
- owner = "BornaIz";
- repo = "Lalezar";
- rev = "238701c4241f207e92515f845a199be9131c1109";
- sha256 = "1j3zg9qw4ahw52i0i2c69gv5gjc1f4zsdla58kd9visk03qgk77p";
- };
-
- installPhase = ''
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/lalezar-fonts
cp -v $( find . -name '*.ttf') $out/share/fonts/lalezar-fonts
'';
+ sha256 = "0jmwhr2dqgj3vn0v26jh6c0id6n3wd6as3bq39xa870zlk7v307b";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/BornaIz/Lalezar;
description = "A multi-script display typeface for popular culture";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix
index 91d85ce9a0dd05737665aa724f20c1e6248c337e..ea9d1837ef5b5ac85f14075205a5e7f2c4b31277 100644
--- a/pkgs/data/fonts/lato/default.nix
+++ b/pkgs/data/fonts/lato/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip {
name = "lato-2.0";
@@ -12,7 +12,7 @@ fetchzip {
sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://www.latofonts.com/;
description = ''
diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix
index 2e1f89ed1e726554671ebe65efc7ed8b773864ca..1bc3b9b20927fedfda6ab911c75d7a2c09638f54 100644
--- a/pkgs/data/fonts/liberastika/default.nix
+++ b/pkgs/data/fonts/liberastika/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "1.1.5";
@@ -15,7 +15,7 @@ in fetchzip rec {
sha256 = "1a9dvl1pzch2vh8sqyyn1d1wz4n624ffazl6hzlc3s5k5lzrb6jp";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Liberation Sans fork with improved cyrillic support";
homepage = https://sourceforge.net/projects/lib-ka/;
diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix
index 97a1ff70f4911a49237d499a1025c4562c617c3d..4a14e095cf05c3ddd9623b861b19356c007e5f79 100644
--- a/pkgs/data/fonts/liberation-sans-narrow/default.nix
+++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix
@@ -14,11 +14,8 @@ stdenv.mkDerivation rec {
buildInputs = [ fontforge pythonPackages.fonttools python ];
installPhase = ''
- mkdir -p $out/share/fonts/truetype
- cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype
-
- mkdir -p "$out/doc/${pname}-${version}"
- cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${pname}-${version}" || true
+ find . -name '*Narrow*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
+ install -m444 -Dt $out/doc/${pname}-${version} AUTHORS ChangeLog COPYING License.txt README.rst
'';
meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index 748c0268a80f93dde1f66c19127066dc9dc25294..2152b960cdc2dd33747bafb46da2a3013f7300f9 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -31,23 +31,16 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- mkdir -p $out/share/fonts/{opentype,truetype,type1}/public
- mkdir -p $out/share/texmf/fonts/{enc,map}
- cp *.otf $out/share/fonts/opentype/public
- cp *.ttf $out/share/fonts/truetype/public
- cp *.pfb $out/share/fonts/type1/public
- cp *.enc $out/share/texmf/fonts/enc
- cp *.map $out/share/texmf/fonts/map
+ install -m444 -Dt $out/share/fonts/opentype/public *.otf
+ install -m444 -Dt $out/share/fonts/truetype/public *.ttf
+ install -m444 -Dt $out/share/fonts/type1/public *.pfb
+ install -m444 -Dt $out/share/texmf/fonts/enc *.enc
+ install -m444 -Dt $out/share/texmf/fonts/map *.map
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "1mj0j0hkp8pn7jcs4pvcan6whba60bfd671g3vhx3s9kxwf7xjvr";
-
meta = with stdenv.lib; {
description = "Linux Libertine Fonts";
homepage = http://linuxlibertine.sf.net;
- platforms = platforms.linux;
maintainers = [ maintainers.volth ];
license = licenses.ofl;
};
diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix
index 2ee1e83691ccfce2e2f57d889b9111bc63cb7823..62aad87c902bf50dbfec554e69c360913591662a 100644
--- a/pkgs/data/fonts/libertinus/default.nix
+++ b/pkgs/data/fonts/libertinus/default.nix
@@ -1,35 +1,29 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
+ version = "6.9";
+in fetchFromGitHub rec {
name = "libertinus-${version}";
- version = "6.6";
- src = fetchFromGitHub {
- rev = "v${version}";
- owner = "khaledhosny";
- repo = "libertinus";
- sha256 = "0syagjmwy6q1ysncchl9bgyfrm7f6fghj1aipbr6md7l6gafz7ji";
- };
+ owner = "alif-type";
+ repo = "libertinus";
+ rev = "v${version}";
- installPhase = ''
- mkdir -p $out/share/fonts/opentype/
- mkdir -p $out/share/doc/${name}/
- cp *.otf $out/share/fonts/opentype/
- cp *.txt $out/share/doc/${name}/
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/opentype *.otf
+ install -m444 -Dt $out/share/doc/${name} *.txt
'';
+ sha256 = "0765a7w0askkhrjmjk638gcm9h6fcm1jpaza8iw9afr3sz1s0xlq";
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "11pxb2zwvjlk06zbqrfv2pgwsl4awf68fak1ks4881i8xbl1910m";
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A fork of the Linux Libertine and Linux Biolinum fonts";
longDescription = ''
Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts
that started as an OpenType math companion of the Libertine font family,
but grown as a full fork to address some of the bugs in the fonts.
'';
- homepage = https://github.com/khaledhosny/libertinus;
+ homepage = https://github.com/alif-type/libertinus;
license = licenses.ofl;
maintainers = with maintainers; [ siddharthist ];
platforms = platforms.all;
diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix
index 18f236068a2f39ea4be15ed3c563d49301e40235..f5e6083f94466454d3d61f5d2212c595766ec6d9 100644
--- a/pkgs/data/fonts/libre-baskerville/default.nix
+++ b/pkgs/data/fonts/libre-baskerville/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchzip }:
+{ lib, fetchFromGitHub }:
-fetchzip rec {
+fetchFromGitHub rec {
name = "libre-baskerville-1.000";
- url = https://github.com/impallari/Libre-Baskerville/archive/2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f.zip;
+ owner = "impallari";
+ repo = "Libre-Baskerville";
+ rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f";
postFetch = ''
- mkdir -p $out/share/{doc,fonts}
- unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
- unzip -n -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/truetype *.ttf
+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
'';
- sha256 = "0arlq89b3vmpw3n4wbllsdvqblhz6p09dm19z1cndicmcgk26w2a";
+ sha256 = "1kpji85d1mgwq8b4fh1isznrhsrv32la3wf058rwjmhx5a3l7yaj";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A webfont family optimized for body text";
longDescription = ''
Libre Baskerville is a webfont family optimized for body text. It's Based
diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix
index 96f366973f0ed9269aa8491d8bed6596798fca52..e55d50307415facf69fcddebcc5dc43d15a9f6a1 100644
--- a/pkgs/data/fonts/libre-bodoni/default.nix
+++ b/pkgs/data/fonts/libre-bodoni/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchzip }:
+{ lib, fetchFromGitHub }:
-fetchzip rec {
+fetchFromGitHub rec {
name = "libre-bodoni-2.000";
- url = https://github.com/impallari/Libre-Bodoni/archive/995a40e8d6b95411d660cbc5bb3f726ffd080c7d.zip;
+ owner = "impallari";
+ repo = "Libre-Bodoni";
+ rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d";
postFetch = ''
- mkdir -p $out/share/{doc,fonts}
- unzip -j $downloadedFile \*/v2000\ -\ initial\ glyphs\ migration/OTF/\*.otf -d $out/share/fonts/opentype
- unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/opentype */v2000\ -\ initial\ glyphs\ migration/OTF/*.otf
+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
'';
- sha256 = "0pnb1xydpvcl9mkz095f566kz7yj061wbf40rwrbwmk706f6bsiw";
+ sha256 = "0my0i5a7f0d27m6dcdirjmlcnswqqfp8gl3ccxa5f2wkn3qlzkvz";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Bodoni fonts adapted for today's web requirements";
longDescription = ''
The Libre Bodoni fonts are based on the 19th century Morris Fuller
diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix
index 9ca37e3564093e50cd75fceef5f74034a90684d1..97832ab56517f04ff9448233804620c32f61931b 100644
--- a/pkgs/data/fonts/libre-franklin/default.nix
+++ b/pkgs/data/fonts/libre-franklin/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchzip }:
+{ lib, fetchFromGitHub }:
-fetchzip rec {
+fetchFromGitHub rec {
name = "libre-franklin-1.014";
- url = https://github.com/impallari/Libre-Franklin/archive/006293f34c47bd752fdcf91807510bc3f91a0bd3.zip;
+ owner = "impallari";
+ repo = "Libre-Franklin";
+ rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3";
postFetch = ''
- mkdir -p $out/share/{doc,fonts}
- unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
- unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/opentype */OTF/*.otf
+ install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt
'';
- sha256 = "1rkjp8x62cn4alw3lp7m45q34bih81j2hg15kg5c1nciyqq1qz0z";
+ sha256 = "0aq280m01pbirkzga432340aknf2m5ggalw0yddf40sqz7falykf";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic.";
homepage = https://github.com/impallari/Libre-Franklin;
license = licenses.ofl;
diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lm-math/default.nix
index 348373b89276d819b0d209bc57823e4ad9afbec3..8df851cb9dfb05a266215916a99e66f655940463 100644
--- a/pkgs/data/fonts/lm-math/default.nix
+++ b/pkgs/data/fonts/lm-math/default.nix
@@ -1,26 +1,20 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
-stdenv.mkDerivation rec {
- name = "latinmodern-math-${version}";
+let
version = "1.959";
+in fetchzip rec {
+ name = "latinmodern-math-${version}";
- src = fetchzip {
- url = "www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
- sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
- };
-
- installPhase = ''
+ url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
+ postFetch = ''
mkdir -p $out/share/fonts/opentype/
mkdir -p $out/share/doc/${name}/
- cp otf/*.otf $out/share/fonts/opentype/
- cp doc/*.txt $out/share/doc/${name}/
+ unzip -f $downloadedFile otf/*.otf -d $out/share/fonts/opentype/
+ unzip -f $downloadedFile doc/*.txt -d $out/share/doc/${name}/
'';
+ sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth.";
homepage = http://www.gust.org.pl/projects/e-foundry/lm-math;
# "The Latin Modern Math font is licensed under the GUST Font License (GFL),
diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix
index c408aae9c0efede61a8103f99da49e0652bfd7ea..1b277a0691ce24dc01e1b59bebb845642f59a224 100644
--- a/pkgs/data/fonts/lmodern/default.nix
+++ b/pkgs/data/fonts/lmodern/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ fetchzip }:
fetchzip {
name = "lmodern-2.004.5";
@@ -21,7 +21,6 @@ fetchzip {
meta = {
description = "Latin Modern font";
- platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix
index c6e0788eed381ada49bcf5f0c7dcd799c917c687..679f5200213914f73079bc1811a6588b80fc7bb8 100644
--- a/pkgs/data/fonts/lmodern/lmmath.nix
+++ b/pkgs/data/fonts/lmodern/lmmath.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ fetchzip }:
fetchzip {
name = "lmmath-0.903";
@@ -21,7 +21,6 @@ fetchzip {
meta = {
description = "Latin Modern font";
- platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix
index 850fd1a1f94c01b699c190fc0a18ab451b11fffb..d9e7ec66ee67deeba405807e36a0c331b42fc34d 100644
--- a/pkgs/data/fonts/lobster-two/default.nix
+++ b/pkgs/data/fonts/lobster-two/default.nix
@@ -70,10 +70,11 @@ in
outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym";
meta = with stdenv.lib; {
- homepage = http://www.impallari.com/lobstertwo;
+ homepage = https://github.com/librefonts/lobstertwo;
description = "Script font with many ligatures";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
+ broken = true; # googlecode.com RIP; can be built from sources
};
}
diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix
index c847b4cdd270c00ac678ae8aa9adb07ef3185a4c..0e8b1f8fe4dbe59a8bcd728c6e7e6d0789747922 100644
--- a/pkgs/data/fonts/lohit-fonts/default.nix
+++ b/pkgs/data/fonts/lohit-fonts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, lib }:
+{ fetchzip, lib }:
let
fonts = {
assamese = { label = "Assamese"; version = "2.91.5"; sha256 = "06cw416kgw0m6883n5ixmpniinsd747rdmacf06z83w1hqwj2js6"; };
@@ -51,7 +51,6 @@ let
# Set a non-zero priority to allow easy overriding of the
# fontconfig configuration files.
priority = 5;
- platforms = stdenv.lib.platforms.unix;
};
};
diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix
index 1fdf88b79abed354174996ec15859212e565f6f3..9dce73a28aae6f7cf407b2600134571f79817f34 100644
--- a/pkgs/data/fonts/manrope/default.nix
+++ b/pkgs/data/fonts/manrope/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "manrope";
version = "3";
- src = fetchFromGitHub {
- owner = "sharanda";
- repo = pname;
- rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9";
- sha256 = "1k6nmczbl97b9j2a8vx6a1r3q4gd1c2qydv0y9gn8xyl7x8fcvhs";
- };
- dontBuild = true;
- installPhase = ''
+in fetchFromGitHub {
+ name = "${pname}-${version}";
+ owner = "sharanda";
+ repo = pname;
+ rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9";
+ sha256 = "1h4chkfbp75hrrqqarf28ld4yb7hfrr7q4w5yz96ivg94lbwlnld";
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
install -Dm644 -t $out/share/fonts/opentype "desktop font"/*
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Open-source modern sans-serif font family";
homepage = https://github.com/sharanda/manrope;
license = licenses.ofl;
diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix
index 48b2f4c516b67f3e2248cbbfd43832b1c710a1d1..60c77dddc8dd3d85996ce06c3c10688390d27a7b 100644
--- a/pkgs/data/fonts/marathi-cursive/default.nix
+++ b/pkgs/data/fonts/marathi-cursive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, p7zip }:
+{ lib, fetchzip, p7zip }:
let
version = "1.2";
@@ -11,15 +11,13 @@ in fetchzip rec {
${p7zip}/bin/7z x $downloadedFile
cd MarathiCursive
- mkdir -p $out/share/fonts/marathi-cursive
- cp -v *.otf *.ttf $out/share/fonts/marathi-cursive
- mkdir -p $out/share/doc/${name}
- cp -v README *.txt $out/share/doc/${name}
+ install -m444 -Dt $out/share/fonts/marathi-cursive *.otf *.ttf
+ install -m444 -Dt $out/share/doc/${name} README *.txt
'';
- sha256 = "0fhz2ixrkm523qlx5pnwyzxgb1cfiiwrhls98xg8a5l3sypn1g8v";
+ sha256 = "0wq4w79x8r5w6ikm9amcmapf0jcdgifs9zf1pbnw3fk4ncz5s551";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/MihailJP/MarathiCursive;
description = "Modi script font with Graphite and OpenType support";
maintainers = with maintainers; [ mathnerd314 ];
diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix
index 432bbaa78db72e4f18e677ed0c51298de50ce254..1c36d0f57fe4d46b66de1533f0f9ad2450b156ec 100644
--- a/pkgs/data/fonts/material-design-icons/default.nix
+++ b/pkgs/data/fonts/material-design-icons/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "material-design-icons-${version}";
+let
version = "3.3.92";
+in fetchFromGitHub {
+ name = "material-design-icons-${version}";
+ owner = "Templarian";
+ repo = "MaterialDesign-Webfont";
+ rev = "v${version}";
- src = fetchFromGitHub {
- owner = "Templarian";
- repo = "MaterialDesign-Webfont";
- rev = "v${version}";
- sha256 = "0k8pv2nsp3al4i4awx5mv7cscpm8akjn567jl9dwzangcsai0l53";
- };
-
- installPhase = ''
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/{eot,svg,truetype,woff,woff2}
cp fonts/*.eot $out/share/fonts/eot/
cp fonts/*.svg $out/share/fonts/svg/
@@ -19,8 +17,9 @@ stdenv.mkDerivation rec {
cp fonts/*.woff $out/share/fonts/woff/
cp fonts/*.woff2 $out/share/fonts/woff2/
'';
+ sha256 = "0dbm4qfd0b91yrw3cv4i377pnm98fgj936nk1m5wlx8mx8jahz48";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "3200+ Material Design Icons from the Community";
longDescription = ''
Material Design Icons' growing icon collection allows designers and
diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix
index ea44c9c79b1e28c7615b0bc3ec8b9a216f7940d8..0126fbac225e09ff0a5bbd01d0769a90d685fb19 100644
--- a/pkgs/data/fonts/material-icons/default.nix
+++ b/pkgs/data/fonts/material-icons/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "material-icons-${version}";
+let
version = "3.0.1";
+in fetchFromGitHub {
+ name = "material-icons-${version}";
- src = fetchFromGitHub {
- owner = "google";
- repo = "material-design-icons";
- rev = "${version}";
- sha256 = "17q5brcqyyc8gbjdgpv38p89s60cwxjlwy2ljnrvas5cj0s62np0";
- };
+ owner = "google";
+ repo = "material-design-icons";
+ rev = version;
- buildCommand = ''
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/truetype
- cp $src/iconfont/*.ttf $out/share/fonts/truetype
+ cp iconfont/*.ttf $out/share/fonts/truetype
'';
+ sha256 = "1syy6v941lb8nqxhdf7mfx28v05lwrfnq53r3c1ym13x05l9kchp";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "System status icons by Google, featuring material design";
homepage = https://material.io/icons;
license = licenses.asl20;
diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix
index aa805b6f0825aec8c132acfdd02d47b799677349..024e6049a38692fa6b365a511d4bc62ec5fd72be 100644
--- a/pkgs/data/fonts/medio/default.nix
+++ b/pkgs/data/fonts/medio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "Serif font designed by Sora Sagano";
longDescription = ''
diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix
index 14b08e140ea876e2ab575feffde21b4ff9a48e35..228952aaa56dd337be3a2894852aa75589a35d2d 100644
--- a/pkgs/data/fonts/migmix/default.nix
+++ b/pkgs/data/fonts/migmix/default.nix
@@ -6,28 +6,27 @@ stdenv.mkDerivation rec {
srcs = [
(fetchzip {
- url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1p-${version}.zip";
+ url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1p-${version}.zip";
sha256 = "0wp44axcalaak04nj3dgpx0vk13nqa3ihx2vjv4acsgv83x8ciph";
})
(fetchzip {
- url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2p-${version}.zip";
+ url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2p-${version}.zip";
sha256 = "0y7s3rbxrp5bv56qgihk8b847lqgibfhn2wlkzx7z655fbzdgxw9";
})
(fetchzip {
- url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1m-${version}.zip";
+ url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1m-${version}.zip";
sha256 = "1sfym0chy8ilyd9sr3mjc0bf63vc33p05ynpdc11miivxn4qsshx";
})
(fetchzip {
- url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2m-${version}.zip";
+ url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2m-${version}.zip";
sha256 = "0hg04rvm39fh4my4akmv4rhfc14s3ipz2aw718h505k9hppkhkch";
})
];
- unpackPhase = ":";
+ dontUnpack = true;
installPhase = ''
- mkdir -p $out/share/fonts/truetype/migmix
- find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migmix
+ find $srcs -name '*.ttf' -exec install -m644 -Dt $out/share/fonts/truetype/migmix {} \;
'';
outputHashAlgo = "sha256";
@@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
description = "A high-quality Japanese font based on M+ fonts and IPA fonts";
homepage = http://mix-mplus-ipa.osdn.jp/migmix;
license = licenses.ipa;
- platforms = platforms.unix;
maintainers = [ maintainers.mikoim ];
};
}
diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix
index aefaefb337fa9abf5de7fbdfe35a0ff2773dde26..193e98d01a4bde2c633afcae36c9239b47835c2a 100644
--- a/pkgs/data/fonts/migu/default.nix
+++ b/pkgs/data/fonts/migu/default.nix
@@ -6,24 +6,24 @@ stdenv.mkDerivation rec {
srcs = [
(fetchzip {
- url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1p-${version}.zip";
+ url = "mirror://osdn/mix-mplus-ipa/63545/migu-1p-${version}.zip";
sha256 = "04wpbk5xbbcv2rzac8yzj4ww7sk2hy2rg8zs96yxc5vzj9q7svf6";
})
(fetchzip {
- url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1c-${version}.zip";
+ url = "mirror://osdn/mix-mplus-ipa/63545/migu-1c-${version}.zip";
sha256 = "1k7ymix14ac5fb44bjvbaaf24784zzpyc1jj2280c0zdnpxksyk6";
})
(fetchzip {
- url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1m-${version}.zip";
+ url = "mirror://osdn/mix-mplus-ipa/63545/migu-1m-${version}.zip";
sha256 = "07r8id83v92hym21vrqmfsfxb646v8258001pkjhgfnfg1yvw8lm";
})
(fetchzip {
- url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-2m-${version}.zip";
+ url = "mirror://osdn/mix-mplus-ipa/63545/migu-2m-${version}.zip";
sha256 = "1pvzbrawh43589j8rfxk86y1acjbgzzdy5wllvdkpm1qnx28zwc2";
})
];
- unpackPhase = ":";
+ dontUnpack = true;
installPhase = ''
find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migu -D
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
description = "A high-quality Japanese font based on modified M+ fonts and IPA fonts";
homepage = http://mix-mplus-ipa.osdn.jp/migu/;
license = licenses.ipa;
- platforms = platforms.unix;
maintainers = [ maintainers.mikoim ];
};
}
diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2a700be113a46d28496c14e4cf87f04c81f361e1
--- /dev/null
+++ b/pkgs/data/fonts/mno16/default.nix
@@ -0,0 +1,21 @@
+{ lib, fetchzip }:
+
+let
+ pname = "mno16";
+ version = "1.0";
+in fetchzip rec {
+ name = "${pname}-${version}";
+ url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${name}.zip";
+ sha256 = "1x06nl281fcjk6g1p4cgrgxakmwcci6vvasskaygsqlzxd8ig87w";
+
+ postFetch = ''
+ mkdir -p $out/share/fonts/truetype
+ unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/
+ '';
+
+ meta = with lib; {
+ description = "minimalist monospaced font";
+ homepage = https://sev.dev/fonts/mno16;
+ license = licenses.cc0;
+ };
+}
diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix
index 77c311ce364c2c6abd4a06edde1460e55931ae9e..2bc5a82fa94f1e5c265063b18133442c44fd8028 100644
--- a/pkgs/data/fonts/monoid/default.nix
+++ b/pkgs/data/fonts/monoid/default.nix
@@ -24,15 +24,10 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- mkdir -p $out/share/{doc,fonts/truetype}
- cp -va _release/* $out/share/fonts/truetype
- cp -va Readme.md $out/share/doc
+ install -m444 -Dt $out/share/fonts/truetype _release/*
+ install -m444 -Dt $out/share/doc Readme.md
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "0lbipgygiva3gg1pqw07phpnnf0s6ka9vqdk1pw7bkybjw3f7wzm";
-
meta = with stdenv.lib; {
homepage = http://larsenwork.com/monoid;
description = "Customisable coding font with alternates, ligatures and contextual positioning";
diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix
index cc481a136ba7a58c143f15c094788b28ab36bdb4..658c3bdf20a79326cc2cb642b3128b00df8d561f 100644
--- a/pkgs/data/fonts/mononoki/default.nix
+++ b/pkgs/data/fonts/mononoki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "1.2";
@@ -14,7 +14,7 @@ in fetchzip {
sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/madmalik/mononoki;
description = "A font for programming and code review";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix
index 37afa063c3e1d4df10d09a69129539299ef1f0ac..de8ea80b01754aa80702cd14ce69baaeae4b179d 100644
--- a/pkgs/data/fonts/montserrat/default.nix
+++ b/pkgs/data/fonts/montserrat/default.nix
@@ -2,7 +2,7 @@
#
# https://aur.archlinux.org/packages/ttf-montserrat/
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "1.0";
@@ -19,7 +19,7 @@ in fetchzip {
sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)";
homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix
index 692ad63574f42acbdb1a5acf6196a769b5fcfc9a..4230e63360b542963caebdea68821c9938604710 100644
--- a/pkgs/data/fonts/mph-2b-damase/default.nix
+++ b/pkgs/data/fonts/mph-2b-damase/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ fetchzip }:
fetchzip {
name = "MPH-2B-Damase-2";
@@ -13,6 +13,5 @@ fetchzip {
sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql";
meta = {
- platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix
index 0fd724149d8f1fefbe7e72729cf7b37df487611c..03bc8a0db4dabe9278d50a58c7e21ebdf6cdb463 100644
--- a/pkgs/data/fonts/mplus-outline-fonts/default.nix
+++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
- version = "063";
+ version = "063a";
in fetchzip rec {
name = "mplus-${version}";
- url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
+ url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
postFetch = ''
tar -xJf $downloadedFile --strip-components=1
@@ -13,11 +13,11 @@ in fetchzip rec {
cp *.ttf $out/share/fonts/truetype
'';
- sha256 = "0d485l2ihxfk039rrrnfviamlbj13cwky0c752m4ikwvgiqiq94y";
+ sha256 = "1khbkch2r96ppifc93bmy1v047pgciyhfmcjb98ggncp5ix885xz";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "M+ Outline Fonts";
- homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html;
+ homepage = "https://mplus-fonts.osdn.jp/about-en.html";
license = licenses.mit;
maintainers = with maintainers; [ henrytill ];
platforms = platforms.all;
diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix
index 8986a9adb7a82551be34268d01ca4c1623741417..bb5a1ed8a9f1e2e7bb9414a836879990f42db575 100644
--- a/pkgs/data/fonts/mro-unicode/default.nix
+++ b/pkgs/data/fonts/mro-unicode/default.nix
@@ -3,7 +3,7 @@
fetchzip {
name = "mro-unicode-2013-05-25";
- url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf";
+ url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf";
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf";
diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/data/fonts/nahid-fonts/default.nix
index 31c0f5590bd5d2b1fc7b9f8d8f3e1d4acb5cdcba..b9d9025b2c08c52890e40339260fe4bcca4cd391 100644
--- a/pkgs/data/fonts/nahid-fonts/default.nix
+++ b/pkgs/data/fonts/nahid-fonts/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "nahid-fonts";
version = "0.3.0";
+in fetchFromGitHub {
+ name = "${pname}-${version}";
+ owner = "rastikerdar";
+ repo = "nahid-font";
+ rev = "v${version}";
- src = fetchFromGitHub {
- owner = "rastikerdar";
- repo = "nahid-font";
- rev = "v${version}";
- sha256 = "0n42sywi41zin9dilr8vabmcqvmx2f1a8b4yyybs6ms9zb9xdkxg";
- };
-
- installPhase = ''
- mkdir -p $out/share/fonts/nahid-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/nahid-fonts
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nahid-fonts {} \;
'';
+ sha256 = "0df169sibq14j2mj727sq86c00jm1nz8565v85hkvh4zgz2plb7c";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/rastikerdar/nahid-font;
description = "A Persian (Farsi) Font - قلم (Ùونت) Ùارسی ناهید";
license = licenses.free;
diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix
index c0b4670a659bbda088f12f78245cee4b68954cc3..f6b8210290e784baa40bf35e8eb80660b4ac8543 100644
--- a/pkgs/data/fonts/nanum-gothic-coding/default.nix
+++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, unzip}:
+{ lib, fetchzip }:
let
version = "VER2.5";
@@ -15,7 +15,7 @@ in fetchzip rec {
sha256 = "0b3pkhd6xn6393zi0dhj3ah08w1y1ji9fl6584bi0c8lanamf2pc";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A contemporary monospaced sans-serif typeface with a warm touch";
homepage = https://github.com/naver/nanumfont;
license = licenses.ofl;
diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..bc8fc8041a81cc5ea9f314fba10ba203a4f26aa4
--- /dev/null
+++ b/pkgs/data/fonts/national-park/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchzip }:
+
+let
+ pname = "national-park-typeface";
+ version = "206464";
+in fetchzip {
+ name = "${pname}-${version}";
+ url = "https://files.cargocollective.com/c${version}/NationalPark.zip";
+
+ postFetch = ''
+ mkdir -p $out/share/fonts
+ unzip -j $downloadedFile National\*.otf -d $out/share/fonts/opentype/
+ '';
+
+ sha256 = "044gh4xcasp8i9ny6z4nmns1am2pk5krc4ann2afq35v9bnl2q5d";
+
+ meta = with lib; {
+ description = ''Typeface designed to mimic the national park service
+ signs that are carved using a router bit'';
+ homepage = https://nationalparktypeface.com/;
+ license = licenses.ofl;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index 528055a5e80e472c286139f5136cbe465eb9ca06..c08630335d4a1771daa5f14b183168bcac5cebfe 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/ryanoasis/nerd-fonts;
license = licenses.mit;
- maintainers = with maintainers; [ garbas ];
- platforms = with platforms; unix;
+ maintainers = with maintainers; [ ];
hydraPlatforms = []; # 'Output limit exceeded' on Hydra
};
}
diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix
index f40ee8da75024995fa3ec85af83c11d539f6e131..c6bdbd40248a41df658a49cb0e1ba88b6cfdec1a 100644
--- a/pkgs/data/fonts/nika-fonts/default.nix
+++ b/pkgs/data/fonts/nika-fonts/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "nika-fonts";
version = "1.0.0";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
+ owner = "font-store";
+ repo = "NikaFont";
+ rev = "v${version}";
- src = fetchFromGitHub {
- owner = "font-store";
- repo = "NikaFont";
- rev = "v${version}";
- sha256 = "16dhk87vmjnywl5wqsl9dzp12ddpfk57w08f7811m3ijqadscdwc";
- };
-
- installPhase = ''
- mkdir -p $out/share/fonts/nika-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/nika-fonts
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nika-fonts {} \;
'';
+ sha256 = "1x34b2dqn1dymi1vmj5vrjcy2z8s0f3rr6cniyrz85plvid6x40i";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/font-store/NikaFont/;
description = "Persian/Arabic Open Source Font";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix
index 35d69aa7f0781f2346e899936a75862801ca2f49..0de5aa8fdf3e5c8141da3536187d38169bf814cd 100644
--- a/pkgs/data/fonts/norwester/default.nix
+++ b/pkgs/data/fonts/norwester/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "1.2";
@@ -15,7 +15,7 @@ in fetchzip rec {
sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://jamiewilson.io/norwester;
description = "A condensed geometric sans serif by Jamie Wilson";
maintainers = with maintainers; [ leenaars ];
diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix
index b5fc13daefa0a0523f7825c85d2abc23f3f4e7cd..a9d45128c5b4186135cb3dc53bf05ab034d1219c 100644
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/pkgs/data/fonts/noto-fonts/tools.nix
@@ -27,6 +27,5 @@ pythonPackages.buildPythonPackage rec {
description = "Noto fonts support tools and scripts plus web site generation";
license = lib.licenses.asl20;
homepage = https://github.com/googlei18n/nototools;
- platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/data/fonts/office-code-pro/default.nix
index 564b950784be3de7b7dfc97e51c99cdd77a03d6e..4354725c90cee93c10429cfb16f0174b1cce306a 100644
--- a/pkgs/data/fonts/office-code-pro/default.nix
+++ b/pkgs/data/fonts/office-code-pro/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "office-code-pro";
version = "1.004";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "nathco";
- repo = "Office-Code-Pro";
- rev = version;
- sha256 = "0znmjjyn5q83chiafy252bhsmw49r2nx2ls2cmhjp4ihidfr6cmb";
- };
+ owner = "nathco";
+ repo = "Office-Code-Pro";
+ rev = version;
- installPhase = ''
- fontDir=$out/share/fonts/opentype
- docDir=$out/share/doc/${pname}-${version}
- mkdir -p $fontDir $docDir
- install -Dm644 README.md $docDir
- install -t $fontDir -m644 'Fonts/Office Code Pro/OTF/'*.otf
- install -t $fontDir -m644 'Fonts/Office Code Pro D/OTF/'*.otf
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ install -m644 -Dt $out/share/doc/${name} README.md
+ install -m444 -Dt $out/share/fonts/opentype 'Fonts/Office Code Pro/OTF/'*.otf 'Fonts/Office Code Pro D/OTF/'*.otf
'';
+ sha256 = "1bagwcaicn6q8qkqazz6wb3x30y4apmkga0mkv8fh6890hfhywr9";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A customized version of Source Code Pro";
longDescription = ''
Office Code Pro is a customized version of Source Code Pro, the monospaced
@@ -31,6 +28,5 @@ stdenv.mkDerivation rec {
homepage = https://github.com/nathco/Office-Code-Pro;
license = licenses.ofl;
maintainers = [ maintainers.AndersonTorres ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix
index 4e55b5098c80c120710849ea15d3de61fe19823d..c2ea6a7180b32a1ecb8815dbf2231ea41502c50d 100644
--- a/pkgs/data/fonts/oldsindhi/default.nix
+++ b/pkgs/data/fonts/oldsindhi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, p7zip }:
+{ lib, fetchzip, p7zip }:
let
version = "0.1";
@@ -10,15 +10,13 @@ in fetchzip rec {
postFetch = ''
${p7zip}/bin/7z x $downloadedFile
- mkdir -p $out/share/fonts/truetype
- mkdir -p $out/share/doc/${name}
- cp -v OldSindhi/*.ttf $out/share/fonts/truetype/
- cp -v OldSindhi/README OldSindhi/*.txt $out/share/doc/${name}
+ install -m444 -Dt $out/share/fonts/truetype OldSindhi/*.ttf
+ install -m444 -Dt $out/share/doc/${name} OldSindhi/README OldSindhi/*.txt
'';
- sha256 = "1na3lxyz008fji5ln3fqzyr562k6kch1y824byhfs4y0rwwz3f3q";
+ sha256 = "0d4l9cg2vmh2pvnqsla8mgcwvc7wjxzcabhlli6633h3ifj2yp7b";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/MihailJP/oldsindhi;
description = "Free Sindhi Khudabadi font";
maintainers = with maintainers; [ mathnerd314 ];
diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix
index 95f8f3be7d65898fe014edafb36aa92d8d6f9b1b..cd0d0063efb2fca21e3ce4584577bac19cac9bce 100644
--- a/pkgs/data/fonts/oldstandard/default.nix
+++ b/pkgs/data/fonts/oldstandard/default.nix
@@ -1,29 +1,21 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
-stdenv.mkDerivation rec {
- name = "oldstandard-${version}";
+let
version = "2.2";
+in fetchzip rec {
+ name = "oldstandard-${version}";
- src = fetchzip {
- stripRoot = false;
- url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip";
- sha256 = "1hl78jw5szdjq9dhbcv2ln75wpp2lzcxrnfc36z35v5wk4l7jc3h";
- };
-
- phases = [ "unpackPhase" "installPhase" ];
+ url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip";
- installPhase = ''
- mkdir -p $out/share/fonts/opentype
- mkdir -p $out/share/doc/${name}
- cp -v *.otf $out/share/fonts/opentype/
- cp -v FONTLOG.txt $out/share/doc/${name}
+ postFetch = ''
+ unzip $downloadedFile
+ install -m444 -Dt $out/share/fonts/opentype *.otf
+ install -m444 -Dt $out/share/doc/${name} FONTLOG.txt
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n";
+ sha256 = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/akryukov/oldstand;
description = "An attempt to revive a specific type of Modern style of serif typefaces";
maintainers = with maintainers; [ raskin rycee ];
diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix
index 7fa57463ece33843bf1969a17af961a2d8b2531f..8519c34689136b2dfc7fe6ed675c701668bc16d2 100644
--- a/pkgs/data/fonts/open-dyslexic/default.nix
+++ b/pkgs/data/fonts/open-dyslexic/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "2016-06-23";
@@ -15,7 +15,7 @@ in fetchzip {
sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://opendyslexic.org/;
description = "Font created to increase readability for readers with dyslexia";
license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)";
diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix
index d8918a6567bbfe639712e739447e36f773e1caf2..dfe1426d697a005f5bdb40d6924090bec9e49960 100644
--- a/pkgs/data/fonts/open-sans/default.nix
+++ b/pkgs/data/fonts/open-sans/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, fetchFromGitLab }:
+{ lib, fetchFromGitLab }:
-stdenv.mkDerivation rec {
+let
pname = "open-sans";
version = "1.11";
+in fetchFromGitLab rec {
+ name = "${pname}-${version}";
- src = fetchFromGitLab {
- domain = "salsa.debian.org";
- owner = "fonts-team";
- repo = "fonts-open-sans";
- rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag
- sha256 = "077hkvpmk3ghbqyb901w43b2m2a27lh8ddasyx1x7pdwyr2bjjl2";
- };
-
- dontBuild = true;
-
- installPhase = ''
+ domain = "salsa.debian.org";
+ owner = "fonts-team";
+ repo = "fonts-open-sans";
+ rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
'';
+ sha256 = "146ginwx18z624z582lrnhil8jvi9bjg6843265bgxxrfmf75vhp";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Open Sans fonts";
longDescription = ''
Open Sans is a humanist sans serif typeface designed by Steve Matteson,
diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix
index e0ef1ecda813e7a8eded93265433b5d7b505cb50..699345f753eb3207d0a42571d03c0838bfa757e3 100644
--- a/pkgs/data/fonts/orbitron/default.nix
+++ b/pkgs/data/fonts/orbitron/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchzip }:
+{ lib, fetchFromGitHub }:
let
version = "20110526";
-in fetchzip {
+in fetchFromGitHub {
name = "orbitron-${version}";
- url = https://github.com/theleagueof/orbitron/archive/13e6a52.zip;
+ owner = "theleagueof";
+ repo = "orbitron";
+ rev = "13e6a52";
postFetch = ''
- otfdir=$out/share/fonts/opentype/orbitron
- ttfdir=$out/share/fonts/ttf/orbitron
- mkdir -p $otfdir $ttfdir
- unzip -j $downloadedFile \*/Orbitron\*.otf -d $otfdir
- unzip -j $downloadedFile \*/Orbitron\*.ttf -d $ttfdir
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/opentype/orbitron *.otf
+ install -m444 -Dt $out/share/fonts/ttf/orbitron *.ttf
'';
sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://www.theleagueofmoveabletype.com/orbitron;
downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download";
description = ''
diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix
index c39bb945f48d9bd5892c1715165248a6296a6d4e..4730a67e290cf648c828eee96d5ba1953928f2bc 100644
--- a/pkgs/data/fonts/overpass/default.nix
+++ b/pkgs/data/fonts/overpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "3.0.3";
@@ -14,7 +14,7 @@ in fetchzip rec {
sha256 = "1m6p7rrlyqikjvypp4698sn0lp3a4z0z5al4swblfhg8qaxzv5pg";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://overpassfont.org/;
description = "Font heavily inspired by Highway Gothic";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix
index 109b3c3a0b3ae2b0b7cb54af25c5aa5f3958d9ee..e34e49d9814756df9ebaa183f11a8a32e314eea8 100644
--- a/pkgs/data/fonts/oxygenfonts/default.nix
+++ b/pkgs/data/fonts/oxygenfonts/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchzip }:
+{ lib, fetchFromGitHub }:
-fetchzip rec {
+fetchFromGitHub {
name = "oxygenfonts-20160824";
- url = https://github.com/vernnobile/oxygenFont/archive/62db0ebe3488c936406685485071a54e3d18473b.zip;
+ owner = "vernnobile";
+ repo = "oxygenFont";
+ rev = "62db0ebe3488c936406685485071a54e3d18473b";
postFetch = ''
- mkdir -p $out/share/fonts
- unzip -j $downloadedFile '*/Oxygen-Sans.ttf' '*/Oxygen-Sans-Bold.ttf' '*/OxygenMono-Regular.ttf' -d $out/share/fonts/truetype
+ tar xf $downloadedFile --strip=1
+ mkdir -p $out/share/fonts/truetype
+ cp */Oxygen-Sans.ttf */Oxygen-Sans-Bold.ttf */OxygenMono-Regular.ttf $out/share/fonts/truetype
'';
sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Desktop/gui font for integrated use with the KDE desktop";
longDescription = ''
Oxygen Font is a font family originally aimed as a desktop/gui
diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix
index 00f03b53078ea1d68b7fb7db2febca7b9f5f8531..d02925e3a37572a27e0fb94c023875eb316d620c 100644
--- a/pkgs/data/fonts/parastoo-fonts/default.nix
+++ b/pkgs/data/fonts/parastoo-fonts/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "parastoo-fonts";
version = "1.0.0-alpha5";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "rastikerdar";
- repo = "parastoo-font";
- rev = "v${version}";
- sha256 = "1nya9cbbs6sgv2w3zyah3lb1kqylf922q3fazh4l7bi6zgm8q680";
- };
+ owner = "rastikerdar";
+ repo = "parastoo-font";
+ rev = "v${version}";
- installPhase = ''
- mkdir -p $out/share/fonts/parastoo-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/parastoo-fonts
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \;
'';
+ sha256 = "10jbii6rskcy4akjl5yfcqv4mfwk3nqnx36l6sbxks43va9l04f4";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/rastikerdar/parastoo-font;
description = "A Persian (Farsi) Font - Ùونت ( قلم ) Ùارسی پرستو";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix
index 6124d0c79b6667a9b51fbc1f2e5b755a73b00b32..e6f0776daea0b8eb45c634547d366ce9dec889e5 100644
--- a/pkgs/data/fonts/paratype-pt/mono.nix
+++ b/pkgs/data/fonts/paratype-pt/mono.nix
@@ -3,7 +3,10 @@
fetchzip rec {
name = "paratype-pt-mono";
- url = "http://www.paratype.ru/uni/public/PTMono.zip";
+ url = [
+ https://company.paratype.com/system/attachments/631/original/ptmono.zip
+ http://rus.paratype.ru/system/attachments/631/original/ptmono.zip
+ ];
postFetch = ''
mkdir -p $out/share/{doc,fonts}
@@ -14,7 +17,7 @@ fetchzip rec {
sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm";
meta = with stdenv.lib; {
- homepage = http://www.paratype.ru/public/;
+ homepage = http://www.paratype.ru/public/;
description = "An open Paratype font";
license = "Open Paratype license";
diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix
index 499871a4228d45cdcd82bc47c2e3c7e15fb7b1d5..1e6610e8e44d8c0f7d679aeb66e23118ad1e304b 100644
--- a/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/pkgs/data/fonts/paratype-pt/sans.nix
@@ -3,7 +3,10 @@
fetchzip rec {
name = "paratype-pt-sans";
- url = "http://www.paratype.ru/uni/public/PTSans.zip";
+ url = [
+ https://company.paratype.com/system/attachments/629/original/ptsans.zip
+ http://rus.paratype.ru/system/attachments/629/original/ptsans.zip
+ ];
postFetch = ''
mkdir -p $out/share/{doc,fonts}
@@ -14,7 +17,7 @@ fetchzip rec {
sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0";
meta = with stdenv.lib; {
- homepage = http://www.paratype.ru/public/;
+ homepage = http://www.paratype.ru/public/;
description = "An open Paratype font";
license = "Open Paratype license";
diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix
index 409aaf526f81849a415ac406d3fec3348e44ef48..f4da6508f083cdafc0cc027289e31b3f478141c4 100644
--- a/pkgs/data/fonts/paratype-pt/serif.nix
+++ b/pkgs/data/fonts/paratype-pt/serif.nix
@@ -3,7 +3,10 @@
fetchzip rec {
name = "paratype-pt-serif";
- url = "http://www.paratype.ru/uni/public/PTSerif.zip";
+ url = [
+ https://company.paratype.com/system/attachments/634/original/ptserif.zip
+ http://rus.paratype.ru/system/attachments/634/original/ptserif.zip
+ ];
postFetch = ''
mkdir -p $out/share/{doc,fonts}
@@ -14,7 +17,7 @@ fetchzip rec {
sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d";
meta = with stdenv.lib; {
- homepage = http://www.paratype.ru/public/;
+ homepage = http://www.paratype.ru/public/;
description = "An open Paratype font";
license = "Open Paratype license";
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index a90ff42a8e2aad5f483398b83ec0ab6abc673aef..144ec3bab8505039a11aed33d64ca20d23a0a5f7 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -1,9 +1,7 @@
-{ stdenv, fetchurl }:
+{ lib, fetchurl }:
let
-
version = "5.4";
-
in
fetchurl rec {
@@ -21,7 +19,7 @@ fetchurl rec {
recursiveHash = true;
sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://pecita.eu/police-en.php;
description = "Handwritten font with connected glyphs";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix
index b1244c47bf1bf70e419f9073ce6f7a37b93d8df2..57395c507fe041bea2b8e7434abc25849b8cd0b1 100644
--- a/pkgs/data/fonts/penna/default.nix
+++ b/pkgs/data/fonts/penna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "Geometric sans serif designed by Sora Sagano";
longDescription = ''
diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix
index 81fc7b799259fbd680b9d86bbbb33cd578e70e86..24155f2ea5465e7d764f7367dcc5af273d79230a 100644
--- a/pkgs/data/fonts/poly/default.nix
+++ b/pkgs/data/fonts/poly/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
- unpackPhase = "true";
+ dontUnpack = true;
installPhase = ''
mkdir -p $out/share/fonts/opentype
@@ -46,6 +46,5 @@ stdenv.mkDerivation rec {
homepage = http://www.fontsquirrel.com/fonts/poly;
license = stdenv.lib.licenses.ofl;
maintainers = with stdenv.lib.maintainers; [ relrod ];
- platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index c932c7f06c03645261b559aeb9be06032a3b8cda..c8044905a088779c0d1d5da730a6943e42d3ddbd 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -1,30 +1,24 @@
-{ stdenv, fetchzip}:
+{ lib, fetchFromGitHub }:
-fetchzip {
+fetchFromGitHub {
name = "powerline-fonts-2018-11-11";
- url = https://github.com/powerline/fonts/archive/e80e3eba9091dac0655a0a77472e10f53e754bb0.zip;
+ owner = "powerline";
+ repo = "fonts";
+ rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0";
postFetch = ''
- mkdir -p $out/share/fonts/opentype
- unzip -j $downloadedFile '*.otf' -d $out/share/fonts/opentype
-
- mkdir -p $out/share/fonts/truetype
- unzip -j $downloadedFile '*.ttf' -d $out/share/fonts/truetype
-
- mkdir -p $out/share/fonts/bdf
- unzip -j $downloadedFile '*/BDF/*.bdf' -d $out/share/fonts/bdf
-
- mkdir -p $out/share/fonts/pcf
- unzip -j $downloadedFile '*/PCF/*.pcf.gz' -d $out/share/fonts/pcf
-
- mkdir -p $out/share/fonts/psf
- unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf
+ tar xf $downloadedFile --strip=1
+ find . -name '*.otf' -exec install -Dt $out/share/fonts/opentype {} \;
+ find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \;
+ find . -name '*.bdf' -exec install -Dt $out/share/fonts/bdf {} \;
+ find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf {} \;
+ find . -name '*.psf.gz' -exec install -Dt $out/share/fonts/psf {} \;
'';
sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/powerline/fonts;
description = "Patched fonts for Powerline users";
longDescription = ''
diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix
index 0c6eede969f1dfac9a6f2978345161b0a2c6c424..c28c9283a9bcd097b6269599438ff9c28f6409b2 100644
--- a/pkgs/data/fonts/profont/default.nix
+++ b/pkgs/data/fonts/profont/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip rec {
name = "profont";
- url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
+ url = "http://web.archive.org/web/20160707013914/http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
postFetch = ''
unzip -j $downloadedFile
@@ -19,10 +19,10 @@ fetchzip rec {
sha256 = "1calqmvrfv068w61f614la8mg8szas6m5i9s0lsmwjhb4qwjyxbw";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://tobiasjung.name;
description = "A monospaced font created to be a most readable font for programming";
- maintainers = with stdenv.lib.maintainers; [ myrl ];
+ maintainers = with lib.maintainers; [ myrl ];
license = licenses.mit;
platforms = platforms.all;
};
diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..14c66fb39b227fb8feaf371e0e8e17dab33699cc
--- /dev/null
+++ b/pkgs/data/fonts/public-sans/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchzip }:
+
+let
+ version = "1.005";
+in fetchzip rec {
+ name = "public-sans-${version}";
+
+ url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip";
+
+ postFetch = ''
+ mkdir -p $out/share
+ unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/
+ '';
+
+ sha256 = "0s0zgszpi12wanl031gi3j24ci9pkbkhvsxc30skx8s1mj99cd7i";
+
+ meta = with lib; {
+ description = "A strong, neutral, principles-driven, open source typeface for text or display";
+ homepage = https://public-sans.digital.gov/;
+ license = licenses.ofl;
+ maintainers = with maintainers; [ dtzWill ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix
index 34c8a74a76260f444c7047d68a47f1253b7ebe3b..429cd80c2fc7d3d78474725d9492e2950ae7d882 100644
--- a/pkgs/data/fonts/quattrocento-sans/default.nix
+++ b/pkgs/data/fonts/quattrocento-sans/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "2.0";
in fetchzip rec {
name = "quattrocento-sans-${version}";
- url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
+ url = "http://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
postFetch = ''
mkdir -p $out/share/{fonts,doc}
@@ -15,7 +15,7 @@ in fetchzip rec {
sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://www.impallari.com/quattrocentosans/;
description = "A classic, elegant and sober sans-serif typeface";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix
index a78001bb4ae6cf8776847074aacc7a5c03f7b8ac..7e268182eef4ac8170b85f9ef2c51e3aa9f78348 100644
--- a/pkgs/data/fonts/quattrocento/default.nix
+++ b/pkgs/data/fonts/quattrocento/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "1.1";
in fetchzip rec {
name = "quattrocento-${version}";
- url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
+ url = "http://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
postFetch = ''
mkdir -p $out/share/{fonts,doc}
@@ -15,7 +15,7 @@ in fetchzip rec {
sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://www.impallari.com/quattrocento/;
description = "A classic, elegant, sober and strong serif typeface";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix
index 009295c5869139712124f80ea3da016ac8b53b5f..7fd6b80b714e03a7b062a37479bb05db8ae9d555 100644
--- a/pkgs/data/fonts/raleway/default.nix
+++ b/pkgs/data/fonts/raleway/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchzip }:
+{ lib, fetchFromGitHub }:
let
version = "2016-08-30";
-in fetchzip {
+in fetchFromGitHub {
name = "raleway-${version}";
- url = https://github.com/impallari/Raleway/archive/fa27f47b087fc093c6ae11cfdeb3999ac602929a.zip;
+ owner = "impallari";
+ repo = "Raleway";
+ rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a";
postFetch = ''
- mkdir -p $out/share/fonts
- unzip -j $downloadedFile \*-Original.otf -d $out/share/fonts/opentype
- unzip -j $downloadedFile \*.txt \*.md -d $out
+ tar xf $downloadedFile --strip=1
+ find . -name "*-Original.otf" -exec install -Dt $out/share/fonts/opentype {} \;
+ cp *.txt *.md -d $out
'';
sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60";
@@ -33,8 +35,8 @@ in fetchzip {
'';
homepage = https://github.com/impallari/Raleway;
- license = stdenv.lib.licenses.ofl;
+ license = lib.licenses.ofl;
- maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
+ maintainers = with lib.maintainers; [ Profpatsch ];
};
}
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index 0ee2a0c308c5c5f36f7e685c19156aae6b883ea3..61206ca5d14bbed299f6fb18feb75a1cc6acfacc 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -4,7 +4,7 @@ let
inherit (python3.pkgs) fonttools;
common =
- { version, repo, sha256, nativeBuildInputs, postPatch ? null, outputHash }:
+ { version, repo, sha256, nativeBuildInputs, postPatch ? null }:
stdenv.mkDerivation rec {
pname = "liberation-fonts";
inherit version;
@@ -18,17 +18,15 @@ let
inherit nativeBuildInputs postPatch;
installPhase = ''
- mkdir -p $out/share/fonts/truetype
- cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
- mkdir -p "$out/share/doc/${pname}-${version}"
- cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${pname}-${version}" || true
+ install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true
+ install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true
+ install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true
+ install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true
+ install -m444 -Dt $out/share/doc/${pname}-${version} README || true
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- inherit outputHash;
-
meta = with stdenv.lib; {
description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
longDescription = ''
@@ -48,7 +46,6 @@ let
maintainers = [
maintainers.raskin
];
- platforms = platforms.unix;
};
};
@@ -58,7 +55,6 @@ in {
version = "1.07.5";
nativeBuildInputs = [ fontforge ];
sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
- outputHash = "16jn17p22z2vip58aza2dfg1ri31ki6z3hsnmidfqfi7v8k83vq4";
};
liberation_ttf_v2 = common rec {
repo = "liberation-fonts";
@@ -70,6 +66,5 @@ in {
'font = ttLib.TTFont(fontfile, recalcTimestamp=False)'
'';
sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa";
- outputHash = "14c0c5n4vzd5y0hf9jkh48h12kkd8hlg94npbmv41j449g6wv6vn";
};
}
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c05b9c69aef5633faaf9bdc13a04bb9d1a8c4f4a
--- /dev/null
+++ b/pkgs/data/fonts/redhat-official/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchzip }:
+
+let version = "2.2.0"; in
+fetchzip rec {
+ name = "redhat-official-${version}";
+ url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip";
+
+ postFetch = ''
+ mkdir -p $out/share/fonts/opentype
+ unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+ '';
+
+ sha256 = "0yb6shgq6jrv3kq9faky66qpdbv4g580c3jl942844grwyngymyj";
+
+ meta = with lib; {
+ homepage = https://github.com/RedHatOfficial/RedHatFont;
+ description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix
index d26adfc0f9fdcbbb5b034a0d0b124caa1f96c4f7..2667562b1b0202daed824797f5efb5ca2ce0d1a0 100644
--- a/pkgs/data/fonts/ricty/default.nix
+++ b/pkgs/data/fonts/ricty/default.nix
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
description = "A high-quality Japanese font based on Inconsolata and Migu 1M";
homepage = https://www.rs.tus.ac.jp/yyusa/ricty.html;
license = licenses.unfree;
- platforms = platforms.unix;
maintainers = [ maintainers.mikoim ];
};
}
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index 10d4678de059652b4eafd2c99292210f67740502..2bdb96228d9c9915504df48fe7de86b833d4083b 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- mkdir -p $out/share/fonts/rictydiminished-with-firacode
- cp *.ttf $out/share/fonts/rictydiminished-with-firacode
+ install -m444 -Dt $out/share/fonts/rictydiminished-with-firacode *.ttf
'';
nativeBuildInputs = [
@@ -35,10 +34,6 @@ stdenv.mkDerivation rec {
]))
];
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "09ldviapljn4bb1mcxap2pkz7cq3wr2k2qialbnav5y7ii82acd4";
-
meta = with stdenv.lib; {
homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode;
description = "The best Japanese programming font meets the awesone ligatures of Firacode";
diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix
index 26697c523273cc8e97252875ccdb743abc0adc09..707d31ac531a6059b5b350726472c262030d4085 100644
--- a/pkgs/data/fonts/roboto/default.nix
+++ b/pkgs/data/fonts/roboto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "2.138";
@@ -22,8 +22,8 @@ in fetchzip rec {
Chrome OS, and the recommended font for Google’s visual language,
Material Design.
'';
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.romildo ];
+ license = lib.licenses.asl20;
+ platforms = lib.platforms.all;
+ maintainers = [ lib.maintainers.romildo ];
};
}
diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/data/fonts/rounded-mgenplus/default.nix
index c6cb61b7bd1a3069c920492ed46ef8416a33c261..431987024926434b1b66f7331e309b7f53bd412b 100644
--- a/pkgs/data/fonts/rounded-mgenplus/default.nix
+++ b/pkgs/data/fonts/rounded-mgenplus/default.nix
@@ -1,33 +1,19 @@
-{ stdenv, fetchurl, p7zip }:
+{ lib, fetchzip, p7zip }:
let
pname = "rounded-mgenplus";
version = "20150602";
-
-in
-
-stdenv.mkDerivation rec {
+in fetchzip rec {
name = "${pname}-${version}";
- inherit version;
-
- src = fetchurl {
- url = "https://osdn.jp/downloads/users/8/8598/${name}.7z";
- sha256 = "1k15xvzd3s5ppp151wv31wrfq2ri8v96xh7i71i974rxjxj6gspc";
- };
-
- nativeBuildInputs = [ p7zip ];
-
- phases = [ "unpackPhase" "installPhase" ];
-
- unpackPhase = ''
- 7z x $src
- '';
- installPhase = ''
+ url = "https://osdn.jp/downloads/users/8/8598/${name}.7z";
+ postFetch = ''
+ ${p7zip}/bin/7z x $downloadedFile
install -m 444 -D -t $out/share/fonts/${pname} ${pname}-*.ttf
'';
+ sha256 = "0vwdknagdrl5dqwpb1x5lxkbfgvbx8dpg7cb6yamgz71831l05v1";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A Japanese font based on Rounded M+ and Noto Sans Japanese";
homepage = http://jikasei.me/font/rounded-mgenplus/;
license = licenses.ofl;
diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix
index 892078a1151bac96ef8cb31e3b4285ee5b94ee64..1b8d4e60653ca46aec7a328715d102b5ad232af7 100644
--- a/pkgs/data/fonts/route159/default.nix
+++ b/pkgs/data/fonts/route159/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
majorVersion = "1";
@@ -17,7 +17,7 @@ fetchzip rec {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "A weighted sans serif font";
platforms = platforms.all;
diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix
index 20545be3dcadba6e7967f5acdd7193aaab3270a7..0b90a43ca3e29edc86e265b4647136d00f6eda8e 100644
--- a/pkgs/data/fonts/sahel-fonts/default.nix
+++ b/pkgs/data/fonts/sahel-fonts/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "sahel-fonts";
version = "1.0.0-alpha22";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "rastikerdar";
- repo = "sahel-font";
- rev = "v${version}";
- sha256 = "1kx7byzb5zxspq0i4cvgf4q7sm6xnhdnfyw9zrb1wfmdv3jzaz7p";
- };
+ owner = "rastikerdar";
+ repo = "sahel-font";
+ rev = "v${version}";
- installPhase = ''
- mkdir -p $out/share/fonts/sahel-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/sahel-fonts
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \;
'';
+ sha256 = "0vj8ydv50rjanb0favd7rh4r9rv5fl39vqwvzkpgfdcdawn0xjm7";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/rastikerdar/sahel-font;
description = "A Persian (farsi) Font - Ùونت (قلم) Ùارسی ساØÙ„";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix
index 620e2fdcfb9c33c51665eefbbd1663104745431c..dd4a01c782eed5d02065780fcb5f7b7b926a413b 100644
--- a/pkgs/data/fonts/samim-fonts/default.nix
+++ b/pkgs/data/fonts/samim-fonts/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "samim-fonts";
version = "3.1.0";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "rastikerdar";
- repo = "samim-font";
- rev = "v${version}";
- sha256 = "1mp0pgbn9r098ilajwzag7c21shwb13mq61ly9av0mfbpnhkkjqk";
- };
+ owner = "rastikerdar";
+ repo = "samim-font";
+ rev = "v${version}";
- installPhase = ''
- mkdir -p $out/share/fonts/samim-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/samim-fonts
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \;
'';
+ sha256 = "0mmhncqg48dp0d7l725dv909zswbkk22dlqzcdfh6k6cgk2gn08q";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/rastikerdar/samim-font;
description = "A Persian (Farsi) Font - Ùونت (قلم) Ùارسی صمیم";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix
index 17ee7cc2a9eac1ff9db15a5c55c3963a81df55b0..f46fda0dd3103e1c805c4fbbfaaeb619e5916660 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchurl, p7zip }:
+{ lib, fetchurl, p7zip }:
let
version = "0.8.0";
- sha256 = "0zafvzrh4180hmz351f1rvs29n8mfxf0qv6mdl7psf1f066dizs6";
in fetchurl rec {
- inherit sha256;
-
name = "sarasa-gothic-${version}";
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
+ sha256 = "0zafvzrh4180hmz351f1rvs29n8mfxf0qv6mdl7psf1f066dizs6";
recursiveHash = true;
downloadToTemp = true;
postFetch = ''
- ${p7zip}/bin/7z x $downloadedFile
- mkdir -p $out/share/fonts
- install -m644 *.ttc $out/share/fonts/
+ ${p7zip}/bin/7z x $downloadedFile -o$out/share/fonts
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "SARASA GOTHIC is a Chinese & Japanese programming font based on Iosevka and Source Han Sans";
homepage = https://github.com/be5invis/Sarasa-Gothic;
license = licenses.ofl;
diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix
index b35f537c06b9c390817bc7e03372384563d0b598..062b29c90397da9b6affcea7b3e2cbb99a6890e7 100644
--- a/pkgs/data/fonts/scheherazade/default.nix
+++ b/pkgs/data/fonts/scheherazade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "2.100";
@@ -17,7 +17,7 @@ in fetchzip rec {
sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://software.sil.org/scheherazade/;
description = "A font designed in a similar style to traditional Naskh typefaces";
longDescription = ''
diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix
index 6b22716f1ebb2aa56a887f021c8db75c7e047b22..af3c5dd25ee0a17343eca198dd80c99330195f76 100644
--- a/pkgs/data/fonts/seshat/default.nix
+++ b/pkgs/data/fonts/seshat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "Roman body font designed for main text by Sora Sagano";
longDescription = ''
diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix
index cf4bd372229998a95caf63b38b2d1606b7e4f7f3..89bca56a53ef1e37645d83930b52a6f033e9d48b 100644
--- a/pkgs/data/fonts/shabnam-fonts/default.nix
+++ b/pkgs/data/fonts/shabnam-fonts/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "shabnam-fonts";
+let
+ pname = "shabnam-fonts";
version = "4.0.0";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "rastikerdar";
- repo = "shabnam-font";
- rev = "v${version}";
- sha256 = "1y4w16if2y12028b9vyc5l5c5bvcglhxacv380ixb8fcc4hfakmb";
- };
+ owner = "rastikerdar";
+ repo = "shabnam-font";
+ rev = "v${version}";
- installPhase = ''
- mkdir -p $out/share/fonts/shabnam-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/shabnam-fonts
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \;
'';
+ sha256 = "0wfyaaj2pq2knz12l7rsc4wc703cbz0r8gkcya5x69p0aixch8ba";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/rastikerdar/shabnam-font;
description = "A Persian (Farsi) Font - Ùونت (قلم) Ùارسی شبنم";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix
index 034c36a63cec5dad0c7404ff86a7844faa1b5558..a00036510f50c396f4e2b5f6e99c4d75960c8567 100644
--- a/pkgs/data/fonts/shrikhand/default.nix
+++ b/pkgs/data/fonts/shrikhand/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "2016-03-03";
@@ -11,7 +11,7 @@ in fetchzip {
sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://jonpinhorn.github.io/shrikhand/;
description = "A vibrant and playful typeface for both Latin and Gujarati writing systems";
maintainers = with maintainers; [ sternenseemann ];
diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix
index a5a4be73c275193c1d26981882066c6bff7bfbb0..a0acf78d855d1b650c7e30f75c1368ae5d4630bd 100644
--- a/pkgs/data/fonts/siji/default.nix
+++ b/pkgs/data/fonts/siji/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
date = "2016-05-13";
@@ -19,8 +19,8 @@ in fetchzip {
meta = {
homepage = https://github.com/stark/siji;
description = "An iconic bitmap font based on Stlarch with additional glyphs";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.asymmetric ];
+ license = lib.licenses.gpl2;
+ platforms = lib.platforms.all;
+ maintainers = [ lib.maintainers.asymmetric ];
};
}
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index 6c3b90353065291fd665cc11b0bdcfec84f1353b..be4d045815c776d6b268c63dcc0c251cda587ab3 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "2.030";
@@ -16,9 +16,9 @@ in fetchzip {
meta = {
description = "A set of monospaced OpenType fonts designed for coding environments";
- maintainers = with stdenv.lib.maintainers; [ relrod ];
- platforms = with stdenv.lib.platforms; all;
+ maintainers = with lib.maintainers; [ relrod ];
+ platforms = with lib.platforms; all;
homepage = https://adobe-fonts.github.io/source-code-pro/;
- license = stdenv.lib.licenses.ofl;
+ license = lib.licenses.ofl;
};
}
diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix
index fc016a457c22d29bd13efcfc9965cbef5bcefdbe..85f5cddd2eabd0ab6409c0c7fab7a2f27975766f 100644
--- a/pkgs/data/fonts/source-han-code-jp/default.nix
+++ b/pkgs/data/fonts/source-han-code-jp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
pname = "source-han-code-jp";
@@ -17,9 +17,9 @@ in fetchzip {
meta = {
description = "A monospaced Latin font suitable for coding";
- maintainers = with stdenv.lib.maintainers; [ mt-caret ];
- platforms = with stdenv.lib.platforms; all;
+ maintainers = with lib.maintainers; [ mt-caret ];
+ platforms = with lib.platforms; all;
homepage = https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html;
- license = stdenv.lib.licenses.ofl;
+ license = lib.licenses.ofl;
};
}
diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix
index dc0d317585149ad045564b884cd5ce69827228c3..87e24c0e23c3ee1b3e97e047ea0b6a37bee32cdf 100644
--- a/pkgs/data/fonts/source-han-sans/default.nix
+++ b/pkgs/data/fonts/source-han-sans/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
makePackage = {variant, language, region, sha256}: let
@@ -19,9 +19,8 @@ let
meta = {
description = "${language} subset of an open source Pan-CJK sans-serif typeface";
homepage = https://github.com/adobe-fonts/source-han-sans;
- license = stdenv.lib.licenses.ofl;
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ taku0 ];
+ license = lib.licenses.ofl;
+ maintainers = with lib.maintainers; [ taku0 ];
};
};
in
diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix
index ac85d31d331617612652034ae2ca4f3ab8227506..bb5a67c8306847e95111189299dcd2b8231c5bc7 100644
--- a/pkgs/data/fonts/source-han-serif/default.nix
+++ b/pkgs/data/fonts/source-han-serif/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
makePackage = {variant, language, region, sha256}: let
@@ -19,9 +19,8 @@ let
meta = {
description = "${language} subset of an open source Pan-CJK serif typeface";
homepage = https://github.com/adobe-fonts/source-han-sans;
- license = stdenv.lib.licenses.ofl;
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ taku0 ];
+ license = lib.licenses.ofl;
+ maintainers = with lib.maintainers; [ taku0 ];
};
};
in
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index 84360dec5d4235c4c8db35f838457bd60f822b89..bea5fea0f9d31d94d9b2893a7c1340d18ac52dc6 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip {
name = "source-sans-pro-2.045";
@@ -14,7 +14,7 @@ fetchzip {
sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://adobe-fonts.github.io/source-sans-pro/;
description = "A set of OpenType fonts designed by Adobe for UIs";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix
index cdfe1e3f18724db079a6ff3969cdd94b98fefbb8..87484a99b1109d8ed3b93afb17cf26bf9e26b36b 100644
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ b/pkgs/data/fonts/source-serif-pro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "2.010";
@@ -16,7 +16,7 @@ in fetchzip {
sha256 = "1a3lmqk7hyxpfkb30s9z73lhs823dmq6xr5llp9w23g6bh332x2h";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://adobe-fonts.github.io/source-serif-pro/;
description = "A set of OpenType fonts to complement Source Sans Pro";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index a474c3db779d7705b320b36ddebfa7642293b98a..873528b8bde159c0e9fa97dda9e2f8eb520c822f 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+{ lib, fetchurl }:
-stdenv.mkDerivation rec {
+let
pname = "spleen";
- version = "1.0.4";
+ version = "1.0.5";
+in fetchurl rec {
+ name = "${pname}-${version}";
+ url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
- src = fetchurl {
- url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
- sha256 = "1x62a5ygn3rpgzbaacz64rp8mn7saymdnxci4l3xasvsjjp60s3g";
- };
-
- buildPhase = "gzip -n9 *.pcf";
- installPhase = ''
+ downloadToTemp = true;
+ recursiveHash = true;
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
d="$out/share/fonts/X11/misc/spleen"
+ gzip -n9 *.pcf
install -Dm644 *.pcf.gz -t $d
install -Dm644 *.bdf -t $d
install -m644 fonts.alias-spleen $d/fonts.alias
'';
+ sha256 = "0144a0lkkl5qx0a8sapymcayj5lp5cs9nfgpbmg3427n41pkqfbb";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Monospaced bitmap fonts";
homepage = https://www.cambus.net/spleen-monospaced-bitmap-fonts;
license = licenses.bsd2;
diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix
index 1ae85da3f7f30057cbb0d026871f40f49307d90e..f5d15439079d5bbd3842dc98fd704aa7c5ed96f1 100644
--- a/pkgs/data/fonts/stix-otf/default.nix
+++ b/pkgs/data/fonts/stix-otf/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
let
version = "1.1.1";
in fetchzip rec {
name = "stix-otf-${version}";
- url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip";
+ url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip";
postFetch = ''
mkdir -p $out/share/fonts
@@ -14,7 +14,7 @@ in fetchzip rec {
sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://www.stixfonts.org/;
description = "Fonts for Scientific and Technical Information eXchange";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix
index f535c0d7e7b5d905fd7a96176edc1967d3381d8c..1d5ed37767c3db00a6aee665a42fd62d1929436c 100644
--- a/pkgs/data/fonts/stix-two/default.nix
+++ b/pkgs/data/fonts/stix-two/default.nix
@@ -5,11 +5,11 @@ let
in fetchzip {
name = "stix-two-${version}";
- url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip";
+ url = "https://github.com/stipub/stixfonts/archive/${version}.zip";
postFetch = ''
mkdir -p $out/share/fonts
- unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+ unzip -j $downloadedFile '*/OTF/*.otf' -d $out/share/fonts/opentype
'';
sha256 = "19i30d2xjk52bjj7xva1hnlyh58yd5phas1njcc8ldcz87a1lhql";
diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index 7652f593db4965d450c72fac4fa578ccecdf821b..bfc66a77207f1d792c90b9ba58cf9ed001e0f30a 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "0.37";
@@ -11,7 +11,7 @@ in fetchzip rec {
mkdir -p $out/share/fonts/truetype/
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Font for programmers and command line users";
homepage = https://www.kutilek.de/sudo-font/;
license = licenses.ofl;
diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix
index 91198408d8df95e9289e343b1de51d143329b69e..380024e7e1a3c96b203d2ca261275ab0b5f6a138 100644
--- a/pkgs/data/fonts/tamsyn/default.nix
+++ b/pkgs/data/fonts/tamsyn/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
let
- version = "1.11";
+ version = "1.11";
in stdenv.mkDerivation {
pname = "tamsyn-font";
inherit version;
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
fontDir="$out/share/fonts/tamsyn"
mkdir -p "$fontDir"
mv *.pcf "$fontDir"
- mv *.psf.gz "$fontDir"
+ mv *.psf.gz "$fontDir"
cd "$fontDir"
mkfontdir
@@ -38,13 +38,12 @@ in stdenv.mkDerivation {
longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at
programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn
font was further inspired by Gohufont, Terminus, Dina, Proggy, Fixedsys, and
- Consolas.
+ Consolas.
'';
homepage = http://www.fial.com/~scott/tamsyn-font/;
downloadPage = http://www.fial.com/~scott/tamsyn-font/download;
license = licenses.free;
maintainers = [ maintainers.rps ];
- platforms = platforms.linux;
};
}
diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix
index 1cab3da200e64ed7e6da933ee37d0b28659c2630..f06a5bfee27a6d990152e13e240f51538f84a203 100644
--- a/pkgs/data/fonts/tempora-lgc/default.nix
+++ b/pkgs/data/fonts/tempora-lgc/default.nix
@@ -38,6 +38,5 @@ stdenv.mkDerivation {
description = ''Tempora font'';
license = stdenv.lib.licenses.gpl2 ;
maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix
index 29682cc12990908bf26dba40799114fb17d5990f..958af414ff092c608cb7a772389bc8ca60b18433 100644
--- a/pkgs/data/fonts/tenderness/default.nix
+++ b/pkgs/data/fonts/tenderness/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
majorVersion = "0";
@@ -17,7 +17,7 @@ fetchzip rec {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "Serif font designed by Sora Sagano with old-style figures";
platforms = platforms.all;
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix
index 27abb72e124f998221732dc0c1f3657f7c71abbc..211cc73cc9de40a42324abf6b31d6d88c9aef70a 100644
--- a/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/pkgs/data/fonts/terminus-font-ttf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "4.47.0";
@@ -20,7 +20,7 @@ in fetchzip rec {
sha256 = "1mnx3vlnl0r15yzsa4zb9qqab4hpi603gdwhlbw960wg03i3xn8z";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A clean fixed width TTF font";
longDescription = ''
Monospaced bitmap font designed for long work with computers
@@ -29,6 +29,5 @@ in fetchzip rec {
homepage = http://files.ax86.net/terminus-ttf;
license = licenses.ofl;
maintainers = with maintainers; [ okasu ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 2221f6bc6f5f1a7b54ca15c29b7797ad48c8f8ad..4198fe2cbe6673dbf37fb3fc7f32e08ebcb2b6e1 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -37,6 +37,5 @@ stdenv.mkDerivation rec {
homepage = http://terminus-font.sourceforge.net/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ astsmtl ];
- platforms = platforms.linux;
};
}
diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix
index 32d859bf53bd4e145c4f2b25c791aa4444ddf85c..fbc29cdf5fb1d95e3af8c1fc02ac2d08657fb424 100644
--- a/pkgs/data/fonts/tewi/default.nix
+++ b/pkgs/data/fonts/tewi/default.nix
@@ -46,6 +46,5 @@ stdenv.mkDerivation rec {
url = "https://www.gnu.org/licenses/gpl-faq.html#FontException";
};
maintainers = [ maintainers.fro_ozen ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix
index 3f9726ee094fa2456d1c95dc3363f86196696c02..8e1d27431748f8aa33db499fb2b9b2fdc48c3425 100644
--- a/pkgs/data/fonts/tex-gyre-math/default.nix
+++ b/pkgs/data/fonts/tex-gyre-math/default.nix
@@ -28,32 +28,30 @@ let
};
};
- mkVariant = variant: current:
- let dotless_version = builtins.replaceStrings ["."] [""] current.version; in
+ mkVariant = variant: {displayName, version, sha256, outputHash}:
+ let dotless_version = builtins.replaceStrings ["."] [""] version; in
stdenv.mkDerivation rec {
- name = "tex-gyre-${variant}-math-${current.version}";
- version = "${current.version}";
+ name = "tex-gyre-${variant}-math-${version}";
+ inherit version;
src = fetchzip {
- url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip";
- sha256 = current.sha256;
+ url = "http://www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip";
+ inherit sha256;
};
installPhase = ''
- mkdir -p $out/share/fonts/opentype/
- mkdir -p $out/share/doc/${name}/
- cp -v opentype/*.otf $out/share/fonts/opentype/
- cp -v doc/*.txt $out/share/doc/${name}/
+ install -m444 -Dt $out/share/fonts/opentype opentype/*.otf
+ install -m444 -Dt $out/share/doc/${name} doc/*.txt
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = current.outputHash;
+ inherit outputHash;
meta = with stdenv.lib; {
longDescription = ''
- TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre
- ${current.displayName} family of fonts (see
+ TeX Gyre ${displayName} Math is a math companion for the TeX Gyre
+ ${displayName} family of fonts (see
http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format.
'';
homepage = http://www.gust.org.pl/projects/e-foundry/tg-math;
diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix
index 3229e58506d9ac2db77c7bb2096e0066250c2039..7e55a70c71a9f406f87b5cf5002747b8735401f5 100644
--- a/pkgs/data/fonts/tex-gyre/default.nix
+++ b/pkgs/data/fonts/tex-gyre/default.nix
@@ -20,7 +20,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = outputHash;
+ inherit outputHash;
meta = with stdenv.lib; {
homepage = http://www.gust.org.pl/projects/e-foundry/tex-gyre;
diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix
index 2dbe7e720d2f4d2af02e9bb1432f1f193986a933..82563205454cfcacff2d0e492afcd289ffc24b2b 100644
--- a/pkgs/data/fonts/theano/default.nix
+++ b/pkgs/data/fonts/theano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "2.0";
@@ -16,7 +16,7 @@ in fetchzip rec {
sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/akryukov/theano;
description = "An old-style font designed from historic samples";
maintainers = with maintainers; [ raskin rycee ];
diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix
index 1a4954e6ce408eb1093a0f885bf8c0ffb572d8a7..6cebe2120fecb2e0a4acd522a37acb52802bcab2 100644
--- a/pkgs/data/fonts/tipa/default.nix
+++ b/pkgs/data/fonts/tipa/default.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation {
meta = {
description = "Phonetic font for TeX";
- platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix
index 90f1b1da908aa1537e89d698b7588b6ca87dcb9c..494f48fd36e00d546a7b9eaaecfef68ea1c48f14 100644
--- a/pkgs/data/fonts/tlwg/default.nix
+++ b/pkgs/data/fonts/tlwg/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
description = "A collection of Thai scalable fonts available under free licenses";
homepage = https://linux.thai.net/projects/fonts-tlwg;
license = with licenses; [ gpl2 publicDomain lppl13c free ];
- platforms = platforms.unix;
maintainers = [ maintainers.yrashk ];
};
}
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index a4d479ea33c5e985b2a6b4f8d486e19b56cfce6d..f485f43b60c676d9ceb05ac5824b7a90ca686683 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
@@ -1,20 +1,20 @@
-{stdenv, fetchzip}:
+{ stdenv, fetchzip }:
+let
+ pname = "ttf-bitstream-vera";
+ version = "1.10";
+in
+fetchzip rec {
+ name = "${pname}-${version}";
-fetchzip {
- name = "ttf-bitstream-vera-1.10";
-
- url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
postFetch = ''
tar -xjf $downloadedFile --strip-components=1
- fontDir=$out/share/fonts/truetype
- mkdir -p $fontDir
- cp *.ttf $fontDir
+ install -m444 -Dt $out/share/fonts/truetype *.ttf
'';
sha256 = "179hal4yi3367jg8rsvqx6h2w4s0kn9zzrv8c47sslyg28g39s4m";
meta = {
- platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix
index 2c58f197f188ec54866d9838b1bbb9205f271fb0..024e1acd434553e2990e7122a927dc1bde9b4b9e 100644
--- a/pkgs/data/fonts/ttf-envy-code-r/default.nix
+++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
pname = "ttf-envy-code-r";
@@ -16,11 +16,10 @@ in fetchzip {
sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://damieng.com/blog/tag/envy-code-r;
description = "Free scalable coding font by DamienG";
license = licenses.unfree;
- platforms = platforms.unix;
maintainers = [ maintainers.lyt ];
};
}
diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix
index 52d11bfd62267fdc1e3273eac3a195080d567a9e..a9bf3720c071db34c3fdd40bb87d8229d0562931 100644
--- a/pkgs/data/fonts/twemoji-color-font/default.nix
+++ b/pkgs/data/fonts/twemoji-color-font/default.nix
@@ -38,6 +38,5 @@ stdenv.mkDerivation rec {
downloadPage = "https://github.com/eosrei/twemoji-color-font/releases";
license = with licenses; [ cc-by-40 mit ];
maintainers = [ maintainers.fgaz ];
- platforms = platforms.linux;
};
}
diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix
index e78f86fede442db7e3ccf7f5dc4bf74d6b3cf4ac..5f072f90f0555713c7e34a56842842a418de894b 100644
--- a/pkgs/data/fonts/ubuntu-font-family/default.nix
+++ b/pkgs/data/fonts/ubuntu-font-family/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip rec {
name = "ubuntu-font-family-0.83";
- url = "http://font.ubuntu.com/download/${name}.zip";
+ url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip";
postFetch = ''
mkdir -p $out/share/fonts
@@ -19,8 +19,8 @@ fetchzip rec {
contemporary style and contains characteristics unique to
the Ubuntu brand that convey a precise, reliable and free attitude.";
homepage = http://font.ubuntu.com/;
- license = stdenv.lib.licenses.free;
- platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.antono ];
+ license = lib.licenses.free;
+ platforms = lib.platforms.all;
+ maintainers = [ lib.maintainers.antono ];
};
}
diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
index f8df39c95652ea8a4e64b38f64e689e87c8686fd..35551e929e64cca5eef629a7cf349a9f5e17e3b4 100644
--- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
+++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "1.0";
@@ -13,10 +13,9 @@ fetchzip rec {
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The Ultimate Oldschool PC Font Pack (TTF Fonts)";
homepage = "http://int10h.org/oldschool-pc-fonts/";
- platforms = platforms.unix;
license = licenses.cc-by-sa-40;
maintainers = [ maintainers.endgame ];
};
diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix
index e61e582d742a2ec860b8a97a77352a4598420bb5..c98936b8096dd5e9766a3f3f7338fbfa5dd99270 100644
--- a/pkgs/data/fonts/undefined-medium/default.nix
+++ b/pkgs/data/fonts/undefined-medium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip rec {
name = "undefined-medium-1.0";
@@ -10,9 +10,9 @@ fetchzip rec {
unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype
'';
- sha256 = "0v3p1g9f1c0d6b9lhrvm1grzivm7ddk7dvn96zl5hdzr2y60y1rw";
+ sha256 = "1wa04jzbffshwcxm705yb5wja8wakn8j7fvim1mlih2z1sqw0njk";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://undefined-medium.com/;
description = "A pixel grid-based monospace typeface";
longDescription = ''
diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix
index 2a13824b36f7de03c3eb56c83098a19fabcdeb29..cd719a62d99fcac7491b66e3b46849dd4f791364 100644
--- a/pkgs/data/fonts/uni-vga/default.nix
+++ b/pkgs/data/fonts/uni-vga/default.nix
@@ -20,13 +20,12 @@ stdenv.mkDerivation {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- sha256 = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7";
+ outputHash = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7";
meta = {
description = "Unicode VGA font";
maintainers = [stdenv.lib.maintainers.ftrvxmtrx];
homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/;
license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index b167a7802d1561f1fc604d844fbd29d2b73c39fa..d495efc79eca2a4507742b04eb154e1a1ba364b4 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "unifont-${version}";
- version = "12.0.01";
+ version = "12.1.01";
ttf = fetchurl {
url = "mirror://gnu/unifont/${name}/${name}.ttf";
- sha256 = "191vgddv5fksg7g01q692nfcb02ks2y28fi9fv8aghvs36q4iana";
+ sha256 = "05knv3vlnk8ahaybwz6r95d3a1h7h7q9ll6ij2jl7zgjhcx4zy5d";
};
pcf = fetchurl {
url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
- sha256 = "14xbrsdrnllly8h2afan3b4v486vd4y8iff8zqmcfliw0cipm8v4";
+ sha256 = "0q7dlnfzk49m4pgf2s7jv05jysa6sfxx3w0y17yis9j7g18lyw1b";
};
nativeBuildInputs = [ mkfontscale mkfontdir ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "1jccbz7wyyk7rpyapgsppcgakgpm1l9fqqxs7fg9naav7i0nzzpg";
+ outputHash = "0sgdr9dma4hkda3siydfvjrnzrpri8r7iqs2zqf77z9n4zn90qp5";
meta = with stdenv.lib; {
description = "Unicode font for Base Multilingual Plane";
diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix
index d94a2cc02420559dcfe008fc213de1e6a75ffa2f..ee2c2406bc6f998cd05e769f9b1d22ec446ee8cf 100644
--- a/pkgs/data/fonts/unifont_upper/default.nix
+++ b/pkgs/data/fonts/unifont_upper/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
- version = "12.0.01";
+ version = "12.1.02";
in fetchzip rec {
name = "unifont_upper-${version}";
@@ -9,9 +9,9 @@ in fetchzip rec {
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
- sha256 = "1mmbndyi91fcdj7ykk5y7rypmm5jf2zf5pp5ab8hq3aa9y7invw3";
+ sha256 = "1bpzsgn64762sjkx4hssbm4qw0c1szwli38pch7r8z8hk4mgcv92";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
homepage = http://unifoundry.com/unifont.html;
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
index c4969d046d48faaa1bec6c4327028efe71458cd9..6d169e940cf9535fde5b96e434a897ec0ba9fab4 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -8,25 +8,19 @@ stdenv.mkDerivation rec {
url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
};
- nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
+ nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
SDL SDL_image];
preConfigure = ''
patchShebangs .
'';
installPhase = ''
- mkdir -p "$out/share/fonts"/{truetype,opentype,web,svg}
- cp *.hex "$out/share/fonts/"
- cp *.pcf "$out/share/fonts/"
- cp *.ttf "$out/share/fonts/truetype"
- cp *.otf "$out/share/fonts/opentype"
- cp *.svg "$out/share/fonts/svg"
- cp *.woff "$out/share/fonts/web"
+ install -m444 -Dt $out/share/fonts *.hex *.pcf
+ install -m444 -Dt $out/share/fonts/truetype *.ttf
+ install -m444 -Dt $out/share/fonts/opentype *.otf
+ install -m444 -Dt $out/share/fonts/svg *.svg
+ install -m444 -Dt $out/share/fonts/web *.woff
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "03zvczdka665zcyf9fjrnx434mwpr5q8396j34kjmc67w7nhc49r";
-
meta = {
inherit version;
description = ''Bitmapped character-art-friendly Unicode fonts'';
@@ -34,7 +28,6 @@ stdenv.mkDerivation rec {
# version. The reduced version is public domain.
license = http://unifoundry.com/LICENSE.txt;
maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
homepage = http://pelulamu.net/unscii/;
};
}
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix
index 408bd9a92644a48d9c19126ee3d109dfb98e7190..d004e75571b72bfac385e21b74d0ccb3c57fa279 100755
--- a/pkgs/data/fonts/vazir-fonts/default.nix
+++ b/pkgs/data/fonts/vazir-fonts/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "vazir-fonts";
+let
+ pname = "vazir-fonts";
version = "19.2.0";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "rastikerdar";
- repo = "vazir-font";
- rev = "v${version}";
- sha256 = "0p96y4q20nhpv7hxca6rncfcb14iqy2vacv0xl55wkwqkm4wvzgr";
- };
-
- installPhase = ''
- mkdir -p $out/share/fonts/vazir-fonts
- cp -v $( find . -name '*.ttf') $out/share/fonts/vazir-fonts
+ owner = "rastikerdar";
+ repo = "vazir-font";
+ rev = "v${version}";
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/vazir-fonts {} \;
'';
+ sha256 = "008h095rjrcjhz9h02v6cf3gv64khj21lii4zffgpdlmvfs29f8l";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/rastikerdar/vazir-font;
description = "A Persian (Farsi) Font - قلم (Ùونت) Ùارسی وزیر";
license = licenses.ofl;
diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix
index d3373a64c490c4b4eb372117233de71ba13d5960..01a4072099ad1c7a9da358487c200fcd7da281af 100644
--- a/pkgs/data/fonts/vdrsymbols/default.nix
+++ b/pkgs/data/fonts/vdrsymbols/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip rec {
name = "vdrsymbols-20100612";
@@ -12,7 +12,7 @@ fetchzip rec {
install -Dm444 -t "$out/share/fonts/truetype" */*.ttf
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "DejaVu fonts with additional symbols used by VDR";
homepage = http://andreas.vdr-developer.org/fonts/;
platforms = platforms.all;
diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix
index 4bf28782a8a59fe9ac953fb3463c10e473e5d2fd..a269f17bf0e62a1643f93bdef9393c8134ceda56 100644
--- a/pkgs/data/fonts/vegur/default.nix
+++ b/pkgs/data/fonts/vegur/default.nix
@@ -1,29 +1,22 @@
-{ stdenv, rpmextract, fetchurl, unzip }:
+{ lib, buildPackages, fetchzip }:
-stdenv.mkDerivation rec {
+let
version = "0.701";
+in fetchzip {
name = "vegur-font-${version}";
# Upstream doesn't version their URLs.
# http://dotcolon.net/font/vegur/ → http://dotcolon.net/DL/font/vegur.zip
- src = fetchurl {
- url = "http://download.opensuse.org/repositories/M17N:/fonts/SLE_12_SP3/src/dotcolon-vegur-fonts-0.701-1.4.src.rpm";
- sha256 = "0ra3fds3b352rpzn0015km539c3l2ik2lqd5x6fr65ss9fg2xn34";
- };
-
- nativeBuildInputs = [ rpmextract unzip ];
+ url = "http://download.opensuse.org/repositories/M17N:/fonts/SLE_12_SP3/src/dotcolon-vegur-fonts-0.701-1.4.src.rpm";
- unpackPhase = ''
- rpmextract $src
+ postFetch = ''
+ ${buildPackages.rpmextract}/bin/rpmextract $downloadedFile
unzip vegur.zip
+ install -m444 -Dt $out/share/fonts/Vegur *.otf
'';
+ sha256 = "0iisi2scq72lyj7pc1f36fhfjnm676n5byl4zaavhbxpdrbc6d1v";
- installPhase = ''
- mkdir -p $out/share/fonts/Vegur
- cp *.otf $out/share/fonts/Vegur
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://dotcolon.net/font/vegur/;
description = "A humanist sans serif font.";
platforms = platforms.all;
diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d83e412267ac0ffc9fa405488fa4ffbb924bb476
--- /dev/null
+++ b/pkgs/data/fonts/victor-mono/default.nix
@@ -0,0 +1,29 @@
+{ lib, fetchFromGitHub }:
+
+let
+ pname = "victor-mono";
+ version = "1.2.1";
+in fetchFromGitHub {
+ name = "${pname}-${version}";
+
+ owner = "rubjo";
+ repo = pname;
+ rev = "v${version}";
+
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ unzip public/VictorMonoAll.zip TTF/\*
+ mkdir -p $out/share/fonts/truetype/${pname}
+ cp TTF/*.ttf $out/share/fonts/truetype/${pname}
+ '';
+
+ sha256 = "0gisjcywmn3kjgwfmzcv8ibxqd126s93id2w0zjly0c7m3ckamh8";
+
+ meta = with lib; {
+ homepage = https://rubjo.github.io/victor-mono;
+ description = "A free programming font with cursive italics and ligatures";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ jpotier ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/pkgs/data/fonts/vista-fonts-chs/default.nix
index e9a3282e71506a2d003ebd7b25376df32ef1b044..6a7cc71133aee860c6c9b2198b1c9d86af0c89a5 100644
--- a/pkgs/data/fonts/vista-fonts-chs/default.nix
+++ b/pkgs/data/fonts/vista-fonts-chs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip, cabextract}:
+{ lib, fetchzip, buildPackages }:
# Modified from vista-fonts
@@ -8,7 +8,7 @@ fetchzip {
url = http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE;
postFetch = ''
- ${cabextract}/bin/cabextract --lowercase --filter '*.TTF' $downloadedFile
+ ${buildPackages.cabextract}/bin/cabextract --lowercase --filter '*.TTF' $downloadedFile
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
@@ -25,12 +25,12 @@ fetchzip {
meta = {
description = "TrueType fonts from Microsoft Windows Vista For Simplified Chinese (Microsoft YaHei)";
homepage = https://www.microsoft.com/typography/fonts/family.aspx?FID=350;
- license = stdenv.lib.licenses.unfree;
- maintainers = [ stdenv.lib.maintainers.ChengCat ];
+ license = lib.licenses.unfree;
+ maintainers = [ lib.maintainers.ChengCat ];
# Set a non-zero priority to allow easy overriding of the
# fontconfig configuration files.
priority = 5;
- platforms = stdenv.lib.platforms.all;
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index 65fa3fb81ab5540483b109e09b476788db0e7452..e8784d90e7fd67c21a7b468a5522346845749d93 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -31,6 +31,6 @@ fetchzip {
# Set a non-zero priority to allow easy overriding of the
# fontconfig configuration files.
priority = 5;
- platforms = stdenv.lib.platforms.unix;
+ broken = true; # source url is 404
};
}
diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/data/fonts/weather-icons/default.nix
index 8d818d219239daad762d4ddd706b904b02545fea..172273671207fd751c149f1d0f2cc3c969108765 100644
--- a/pkgs/data/fonts/weather-icons/default.nix
+++ b/pkgs/data/fonts/weather-icons/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "2.0.10";
-in fetchzip rec {
+in fetchzip {
name = "weather-icons-${version}";
url = "https://github.com/erikflowers/weather-icons/archive/${version}.zip";
@@ -14,7 +14,7 @@ in fetchzip rec {
sha256 = "10zny9987wybq55sm803hrjkp33dq1lgmnxc15kssr8yb81g6qrl";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Weather Icons";
longDescription = ''
Weather Icons is the only icon font and CSS with 222 weather themed icons,
diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix
index 038f03169402d9c2908707d12332c920201bfe1d..dc87e6b634f7b62fe08fd0d79ab2cc049ef11f21 100644
--- a/pkgs/data/fonts/wqy-microhei/default.nix
+++ b/pkgs/data/fonts/wqy-microhei/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
fetchzip rec {
name = "wqy-microhei-0.2.0-beta";
@@ -15,9 +15,9 @@ fetchzip rec {
meta = {
description = "A (mainly) Chinese Unicode font";
homepage = http://wenq.org;
- license = stdenv.lib.licenses.asl20;
- maintainers = [ stdenv.lib.maintainers.pkmx ];
- platforms = stdenv.lib.platforms.all;
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.pkmx ];
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index 9718763d004a29d6ce96a1661eb94e43b8627b35..7df1e5aeb2a81044138424b8681f9b793982c83d 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "0.9.45";
@@ -18,8 +18,8 @@ in fetchzip rec {
meta = {
description = "A (mainly) Chinese Unicode font";
homepage = http://wenq.org;
- license = stdenv.lib.licenses.gpl2; # with font embedding exceptions
- maintainers = [ stdenv.lib.maintainers.pkmx ];
- platforms = stdenv.lib.platforms.all;
+ license = lib.licenses.gpl2; # with font embedding exceptions
+ maintainers = [ lib.maintainers.pkmx ];
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix
index 25431c7f9d7020c6236a6cb3624886d889efa99b..553c1dbde221fe802551e40e15d710c5a769fd27 100644
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@@ -2,34 +2,25 @@
stdenv.mkDerivation rec {
name = "xits-math-${version}";
- version = "1.108";
+ version = "1.200";
src = fetchFromGitHub {
- owner = "khaledhosny";
- repo = "xits-math";
+ owner = "alif-type";
+ repo = "xits";
rev = "v${version}";
- sha256 = "08nn676c41a7gmmhrzi8mm0g74z8aiaafjk48pqcwxvjj9av7xjg";
+ sha256 = "0s1qqqg3zv9k4wqn1vkx0z895fjccg96n58syc1d5f2wba9kyfcm";
};
nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]);
postPatch = ''
rm *.otf
-
- substituteInPlace tools/postprocess.py --replace \
- 'font = ttLib.TTFont(sys.argv[1])' \
- 'font = ttLib.TTFont(sys.argv[1], recalcTimestamp=False)'
'';
installPhase = ''
- mkdir -p $out/share/fonts/opentype
- cp *.otf $out/share/fonts/opentype
+ install -m444 -Dt $out/share/fonts/opentype *.otf
'';
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "00xycmb9ka67j5s66nkng53y8q6362igisxz04zb58r2717jk50m";
-
meta = with stdenv.lib; {
homepage = https://github.com/khaledhosny/xits-math;
description = "OpenType implementation of STIX fonts with math support";
diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix
index 9aa664fd2896cb48bca303689f8e0ab65a8637a0..0e996da2fc7c90d14da3cabf5ad9d83d468e1d03 100644
--- a/pkgs/data/fonts/xkcd-font/default.nix
+++ b/pkgs/data/fonts/xkcd-font/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+let
pname = "xkcd-font";
version = "unstable-2017-08-24";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "ipython";
- repo = pname;
- rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
- sha256 = "01wpfc1yp93b37r472mx2b459il5gywnv5sl7pp9afpycb3i4f6l";
- };
-
- phases = [ "unpackPhase" "installPhase" ];
+ owner = "ipython";
+ repo = pname;
+ rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
- installPhase = ''
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
'';
+ sha256 = "0xhwa53aiz20763jb9nvbr2zq9k6jl69p07dc4b0apwrrwz0jfr1";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The xkcd font";
homepage = https://github.com/ipython/xkcd-font;
license = licenses.cc-by-nc-30;
diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/data/fonts/yanone-kaffeesatz/default.nix
index 026bb2d224438bb34027d30c9458d73d9a5e77c0..e713f4d64a3753c385fd52ccc7f03fc23097280c 100644
--- a/pkgs/data/fonts/yanone-kaffeesatz/default.nix
+++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip}:
+{ lib, fetchzip }:
fetchzip {
name = "yanone-kaffeesatz-2004";
@@ -14,9 +14,9 @@ fetchzip {
meta = {
description = "The free font classic";
- maintainers = with stdenv.lib.maintainers; [ mt-caret ];
- platforms = with stdenv.lib.platforms; all;
+ maintainers = with lib.maintainers; [ mt-caret ];
+ platforms = with lib.platforms; all;
homepage = https://yanone.de/fonts/kaffeesatz/;
- license = stdenv.lib.licenses.ofl;
+ license = lib.licenses.ofl;
};
}
diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/data/fonts/zilla-slab/default.nix
index d77d6d8b30110d00ba46ff8bd8ba7e9474385ccb..369fb53e6abcc9200d9de986e7e13cc6a3b4e22a 100644
--- a/pkgs/data/fonts/zilla-slab/default.nix
+++ b/pkgs/data/fonts/zilla-slab/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
let
version = "1.002";
- hash = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f";
in fetchzip {
name = "zilla-slab-${version}";
@@ -12,9 +11,9 @@ in fetchzip {
mkdir -p $out/share/fonts/truetype
cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/
'';
- sha256 = hash;
+ sha256 = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/mozilla/zilla-slab;
description = "Zilla Slab fonts";
longDescription = ''
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index b13dcf9b422ea432b3d3ab9eac05bcecb7e60f98..fb659e1c22e56dad88448d53ccf4acf70537790a 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gtk3 }:
stdenv.mkDerivation rec {
- name = "papirus-icon-theme-${version}";
- version = "20190501";
+ pname = "papirus-icon-theme";
+ version = "20190615";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
- repo = "papirus-icon-theme";
+ repo = pname;
rev = version;
- sha256 = "1sdzbvlzzg42vqahjqcsj6v87y1xhchw7bgiv8jgwd2n4l3gg2zy";
+ sha256 = "1999q6jw4ib8xrw3ydmprnq0mbmzqj8l92rx4rrh22lw9kdvig8w";
};
nativeBuildInputs = [ gtk3 ];
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
description = "Papirus icon theme";
homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme;
license = licenses.lgpl3;
- platforms = platforms.all;
+ # darwin gives hash mismatch in source, probably because of file names differing only in case
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix
index 41f704e750c5e34aaf25a9767d44bcc3f1090a4f..1c35d3deef910db093dbfbf6391470ed59751360 100644
--- a/pkgs/data/misc/adapta-backgrounds/default.nix
+++ b/pkgs/data/misc/adapta-backgrounds/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }:
stdenv.mkDerivation rec {
- name = "adapta-backgrounds-${version}";
- version = "0.5.2.3";
+ pname = "adapta-backgrounds";
+ version = "0.5.3.1";
src = fetchFromGitHub {
owner = "adapta-project";
repo = "adapta-backgrounds";
rev = version;
- sha256 = "0n0ggcxinja81lasmpviqq3l4jiwb05bs8r5aah1im2zvls1g007";
+ sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ meson ninja pkgconfig glib ];
meta = with stdenv.lib; {
description = "Wallpaper collection for adapta-project";
- homepage = https://github.com/adapta-project/adapta-backgrounds;
+ homepage = "https://github.com/adapta-project/adapta-backgrounds";
license = with licenses; [ gpl2 cc-by-sa-40 ];
platforms = platforms.all;
- maintainers = [ maintainers.romildo ];
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh
index b704a6a919e0946ec68742e8f664434178263774..e969596752f3185be1c01edd9cfa862050fba15f 100644
--- a/pkgs/data/misc/cacert/setup-hook.sh
+++ b/pkgs/data/misc/cacert/setup-hook.sh
@@ -1,4 +1,6 @@
cacertHook() {
+ export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
+ # left for compatibility
export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
}
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 11be8acc259b4c0069dbbc8f5544b3060381263c..0eb3dbefe41bdd3250ec337d9798962f1bb6878e 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f0c3944190bf34286e4e80620fede11dd688f68.tar.gz";
- sha256 = "1i4k4wjm6w8hgwia1axwdr3ij0ckxh3ikc1f0nlk8sb0j3yrmxa6";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/bee48f46f4c9e9c1195bf81efb61fa5fb0aec0dc.tar.gz";
+ sha256 = "0wxj0iakqy1cyncga8s1qlb8c06vj3ilh5z8lpann7xr8yh6sm4b";
}
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index 59773e34ccec4008e665461bbbeb1f556a94d11d..163f230e077a5b2875ec842f73684aa1210f2cc8 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchzip }:
let
- version = "20181219";
+ version = "20190504";
in fetchzip {
name = "iana-etc-${version}";
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
- sha256 = "0i3f7shvf1g6dp984w8xfix6id3q5c10b292wz2qw3v5n7h6wkm3";
+ sha256 = "1h61qnb3ybyfivyq8qjnisj4arbnhn8hcwad1bp4iqidjk6rjfv3";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix
index 50f874baa4aec51dd41102948848399d5b277f5a..3983869a452893ee8e8a0c91dba5896af8a73b6f 100644
--- a/pkgs/data/misc/nixos-artwork/wallpapers.nix
+++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix
@@ -6,7 +6,7 @@ let
stdenv.mkDerivation {
inherit name src;
- unpackPhase = "true";
+ dontUnpack = true;
installPhase = ''
mkdir -p $out/share/artwork/gnome
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 4e6a5bde55d8ec88898ab06575fbfce3967019d4..19872bef7fe37cff9df897b7316cca5892dbf4f7 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
- version = "20190301";
+ version = "20190611";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
- sha256 = "1rjqizsglgdcjxi7kpbwm26krdkrlxacinjp9684sfzhqwdqi4as";
+ sha256 = "00gkdkycicl4rlr8by61sfsgpjsiswr8b148fl2arinr4vz3n46h";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b5414ab18b4d5f7cdb78e7c7491ff782ec610cb3
--- /dev/null
+++ b/pkgs/data/misc/publicsuffix-list/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub }:
+
+let
+ pname = "publicsuffix-list";
+ version = "2019-05-24";
+in fetchFromGitHub rec {
+ name = "${pname}-${version}";
+ owner = "publicsuffix";
+ repo = "list";
+ rev = "a1db0e898956e126de65be1a5e977fbbbbeebe33";
+ sha256 = "092153w2jr7nx28p9wc9k6b5azi9c39ghnqfnfiwfzv1j8jm3znq";
+
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ install -Dm0444 public_suffix_list.dat tests/test_psl.txt -t $out/share/publicsuffix
+ '';
+
+ meta = with lib; {
+ homepage = "https://publicsuffix.org/";
+ description = "Cross-vendor public domain suffix database";
+ platforms = platforms.all;
+ license = licenses.mpl20;
+ maintainers = [ maintainers.c0bw3b ];
+ };
+}
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index e44526cbe66ec2668938c0eb5bc46f16a9c5992f..43847b4b3b68d866d99da94e82ebbd6309c16b52 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wireless-regdb";
- version = "2019.03.01";
+ version = "2019.06.03";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0pwipig8bik1gca440hfv0xa23bi49jfiqc69xvcb6sr0rq6ykis";
+ sha256 = "1gslvh0aqdkv48jyr2ddq153mw28i7qz2ybrjj9qvkk3dgc7x4fd";
};
dontBuild = true;
diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
index cc71e00263246db82d9d9718c4e2fc57f6ee2279..9728b2f96c482a15f4718502e0b1d876e5cca3b6 100644
--- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
+++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
@@ -17,7 +17,7 @@ in
stdenv.mkDerivation {
name = "docbook-sgml-3.1";
- unpackPhase = "true";
+ dontUnpack = true;
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix
index dc7ebf5959da2c23e403f0796994726f37183647..78b99081504dcbaff3cd1a2766cc84033e9788df 100644
--- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix
+++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix
@@ -17,7 +17,7 @@ in
stdenv.mkDerivation {
name = "docbook-sgml-4.1";
- unpackPhase = "true";
+ dontUnpack = true;
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/catalog-legacy-uris.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/catalog-legacy-uris.patch
new file mode 100644
index 0000000000000000000000000000000000000000..72922eee96c4b7330b485f49d67014278fc50ecc
--- /dev/null
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/catalog-legacy-uris.patch
@@ -0,0 +1,10 @@
+--- a/catalog.xml
++++ b/catalog.xml
+@@ -5,4 +5,7 @@
+
+
+
++
++
++
+
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index ef7b1f93d74e4265f70a4fe97a2cf19453090993..5297d5dbd5dceea6166061ce04b9fc74745184f3 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,66 +1,77 @@
-{ lib, stdenv, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }:
+{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }:
let
- common = { pname, sha256, patches ? [] }: let self = stdenv.mkDerivation rec {
- name = "${pname}-1.79.1";
-
- src = fetchurl {
- url = "mirror://sourceforge/docbook/${name}.tar.bz2";
- inherit sha256;
- };
-
- inherit patches;
-
- propagatedBuildInputs = [ findXMLCatalogs ];
-
- dontBuild = true;
-
- installPhase = ''
- dst=$out/share/xml/${pname}
- mkdir -p $dst
- rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
- mv * $dst/
-
- # Backwards compatibility. Will remove eventually.
- mkdir -p $out/xml/xsl
- ln -s $dst $out/xml/xsl/docbook
- '';
-
- passthru.dbtoepub = writeScriptBin "dbtoepub"
- ''
- #!${bash}/bin/bash
- exec -a dbtoepub ${ruby}/bin/ruby ${self}/share/xml/${pname}/epub/bin/dbtoepub "$@"
+ common = { pname, sha256, suffix ? "" }: let
+ legacySuffix = if suffix == "-nons" then "" else "-ns";
+ self = stdenv.mkDerivation rec {
+ inherit pname;
+ version = "1.79.2";
+
+ src = fetchurl {
+ url = "https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F${version}/docbook-xsl${suffix}-${version}.tar.bz2";
+ inherit sha256;
+ };
+
+ patches = [
+ # Prevent a potential stack overflow
+ # https://github.com/docbook/xslt10-stylesheets/pull/37
+ (fetchpatch {
+ url = https://src.fedoraproject.org/rpms/docbook-style-xsl/raw/e3ae7a97ed1d185594dd35954e1a02196afb205a/f/docbook-style-xsl-non-recursive-string-subst.patch;
+ sha256 = "0lrjjg5kpwwmbhkxzz6i5zmimb6lsvrrdhzc2qgjmb3r6jnsmii3";
+ stripLen = "1";
+ })
+
+ # Add legacy sourceforge.net URIs to the catalog
+ (substituteAll {
+ src = ./catalog-legacy-uris.patch;
+ inherit legacySuffix suffix version;
+ })
+ ];
+
+ propagatedBuildInputs = [ findXMLCatalogs ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ dst=$out/share/xml/${pname}
+ mkdir -p $dst
+ rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh tools Makefile tests extensions webhelp
+ mv * $dst/
+
+ # Backwards compatibility. Will remove eventually.
+ mkdir -p $out/xml/xsl
+ ln -s $dst $out/xml/xsl/docbook
+
+ # More backwards compatibility
+ ln -s $dst $out/share/xml/docbook-xsl${legacySuffix}
'';
- meta = {
- homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
- description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
- maintainers = [ lib.maintainers.eelco ];
- platforms = lib.platforms.all;
+ passthru.dbtoepub = writeScriptBin "dbtoepub"
+ ''
+ #!${bash}/bin/bash
+ exec -a dbtoepub ${ruby}/bin/ruby ${self}/share/xml/${pname}/epub/bin/dbtoepub "$@"
+ '';
+
+ meta = {
+ homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
+ description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
+ maintainers = [ lib.maintainers.eelco ];
+ platforms = lib.platforms.all;
+ };
};
- }; in self;
+ in self;
in {
- docbook_xsl = common {
- pname = "docbook-xsl";
- sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj";
-
- patches = [(fetchpatch {
- name = "potential-infinite-template-recursion.patch";
- url = "https://src.fedoraproject.org/cgit/rpms/docbook-style-xsl.git/"
- + "plain/docbook-style-xsl-non-recursive-string-subst.patch?id=bf9e5d16fd";
- sha256 = "1pfb468bsj3j879ip0950waih0r1s6rzfbm2p70glbz0g3903p7h";
- stripLen = "1";
- })];
-
+ docbook-xsl-nons = common {
+ pname = "docbook-xsl-nons";
+ suffix = "-nons";
+ sha256 = "00i1hdyxim8jymv2dz68ix3wbs5w6isxm8ijb03qk3vs1g59x2zf";
};
- docbook_xsl_ns = common {
+ docbook-xsl-ns = common {
pname = "docbook-xsl-ns";
- sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin";
-
- patches = [ ./docbook-xsl-ns-infinite.patch ];
+ sha256 = "0wd33z41kdsybyx3ay21w6bdlmgpd9kyn3mr5y520lsf8km28r9i";
};
}
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch
deleted file mode 100644
index 5729f9b43c80bb2c0a2a8f4e978d116285020da3..0000000000000000000000000000000000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Remove infinite recursion
-Attribute: docbook5_xsl
-Version: 1.79.1
-URL: https://github.com/NixOS/nixpkgs/issues/39090
-diff -ru a/lib/lib.xsl b/lib/lib.xsl
---- a/lib/lib.xsl 2015-12-26 15:15:37.000000000 -0800
-+++ b/lib/lib.xsl 2018-03-22 11:52:45.311949264 -0700
-@@ -11,8 +11,10 @@
-
- ******************************************************************** -->
-
-+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-+ xmlns:d="http://docbook.org/ns/docbook"
-+ xmlns:str="http://exslt.org/strings"
-+ version="1.0">
-
-
-
-@@ -58,6 +61,9 @@
-
-
-
-+
-+
-+
-
-
-
diff --git a/pkgs/data/themes/tetra/default.nix b/pkgs/data/themes/adementary/default.nix
similarity index 79%
rename from pkgs/data/themes/tetra/default.nix
rename to pkgs/data/themes/adementary/default.nix
index 2a7b6e595c45a82b87409be927dd3434c9f6c485..40190d65d5edb184960af7712e943403c3b2f8a8 100644
--- a/pkgs/data/themes/tetra/default.nix
+++ b/pkgs/data/themes/adementary/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gtk3, sassc }:
stdenv.mkDerivation rec {
- pname = "tetra-gtk-theme";
- version = "201905";
+ pname = "adementary-theme";
+ version = "201905r1";
src = fetchFromGitHub {
owner = "hrdwrrsk";
repo = pname;
rev = version;
- sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi";
+ sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk";
};
preBuild = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme";
- homepage = https://github.com/hrdwrrsk/tetra-gtk-theme;
+ homepage = https://github.com/hrdwrrsk/adementary-theme;
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
platforms = platforms.linux;
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index edb1113a6960c63d4899a57770d80ef7eaf52927..5a43511d532c08c8bde5e48ba2c51f0d64475b93 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "matcha-${version}";
- version = "2018-12-24";
+ version = "2019-06-22";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "matcha";
- rev = version;
- sha256 = "178y5s5jfprkw8y6clqb8ss4kvfswivfrh6cn67fk4z7wg72i3yc";
+ rev = "f42df7a3219d7fbacb7be1b2e0e416d74339865e";
+ sha256 = "1x954rmxv14xndn4ybhbr4pmzccnwqp462bpvzd2hak5wsqs4wxc";
};
buildInputs = [ gdk_pixbuf librsvg ];
diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index 7c3c852e6afda98353a75d4b51949bfb51aaa729..1fc82e8aca2b66bbd4eca58ed34209bec57a87cd 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mojave-gtk-theme";
- version = "2019-01-02";
+ version = "2019-05-21";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
- rev = version;
- sha256 = "053bfc5pslwpqhn05dzznh236g1z4cnn2dzwvb914f6m855fbxfg";
+ rev = "f6167740b308715b38567ec660aa5241d964af1b";
+ sha256 = "1k57f5vimdrciskjgxqz7k0xybc7b8pwcsii0p6kc8klmyrjrr9c";
};
buildInputs = [ gtk_engines ];
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index b43a6e35ab253327f3aedf78eca3f5a1ab1e723a..df0201af3b86f31db03da03a569da8870dd731ba 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -3,12 +3,12 @@
, cinnamonSupport ? true
, gnomeFlashbackSupport ? true
, gnomeShellSupport ? true
-, mateSupport ? true
, openboxSupport ? true
, xfceSupport ? true
, gtkNextSupport ? false
, plankSupport ? false
-, telegramSupport ? false
+, steamSupport ? false
+, telegramSupport ? false, zip ? null
, tweetdeckSupport ? false
, selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500)
, accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300)
@@ -16,15 +16,17 @@
, destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500)
}:
+assert telegramSupport -> zip != null;
+
stdenv.mkDerivation rec {
- name = "plata-theme-${version}";
- version = "0.7.6";
+ pname = "plata-theme";
+ version = "0.8.3";
src = fetchFromGitLab {
owner = "tista500";
repo = "plata-theme";
rev = version;
- sha256 = "1jllsl2h3zdvlp3k2dy3h4jyccrzzymwbqz43jhnm6mxxabxzijg";
+ sha256 = "0ibgymdrw91lnng76lb0x55zg6nm9f2vap19wk7qsq3bcw6ny2zi";
};
preferLocalBuild = true;
@@ -37,7 +39,8 @@ stdenv.mkDerivation rec {
inkscape
libxml2
gnome2.glib.dev
- ];
+ ]
+ ++ stdenv.lib.optional telegramSupport zip;
buildInputs = [
gdk_pixbuf
@@ -57,11 +60,11 @@ stdenv.mkDerivation rec {
(enableFeature cinnamonSupport "cinnamon")
(enableFeature gnomeFlashbackSupport "flashback")
(enableFeature gnomeShellSupport "gnome")
- (enableFeature mateSupport "mate")
(enableFeature openboxSupport "openbox")
(enableFeature xfceSupport "xfce")
(enableFeature gtkNextSupport "gtk_next")
(enableFeature plankSupport "plank")
+ (enableFeature steamSupport "airforsteam")
(enableFeature telegramSupport "telegram")
(enableFeature tweetdeckSupport "tweetdeck")
]
@@ -70,6 +73,13 @@ stdenv.mkDerivation rec {
++ (withOptional suggestionColor "suggestion_color")
++ (withOptional destructionColor "destruction_color");
+ postInstall = ''
+ for dest in $out/share/gtksourceview-{3.0,4}/styles; do
+ mkdir -p $dest
+ cp $out/share/themes/Plata-{Noir,Lumine}/gtksourceview/*.xml $dest
+ done
+ '';
+
meta = with stdenv.lib; {
description = "A Gtk+ theme based on Material Design Refresh";
homepage = https://gitlab.com/tista500/plata-theme;
diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix
index 78948a1813a28a9b07e628546917c01fab9a9405..fb94fa00b75f5880e65f7895a40276f5ed717490 100644
--- a/pkgs/data/themes/shades-of-gray/default.nix
+++ b/pkgs/data/themes/shades-of-gray/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "shades-of-gray-theme";
- version = "1.1.6";
+ version = "1.1.8";
src = fetchFromGitHub {
owner = "WernerFP";
repo = pname;
rev = version;
- sha256 = "0jp4p0wdmac5dkz1hqhzqmn59zgxqd77gn0napy3wbqr5yc60pp1";
+ sha256 = "08i2pkq7ygf9fs9cdrw4khrb8m1w2hvgmz064g36fh35r02sms3w";
};
buildInputs = [ gtk_engines ];
diff --git a/pkgs/misc/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix
similarity index 81%
rename from pkgs/misc/themes/sierra/default.nix
rename to pkgs/data/themes/sierra/default.nix
index d5082821bee1d80a04ba88a403e8c3cd165f0fda..b845522a28a18698973ac26f5e78a8b6db9d6221 100644
--- a/pkgs/misc/themes/sierra/default.nix
+++ b/pkgs/data/themes/sierra/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
stdenv.mkDerivation rec {
- name = "sierra-gtk-theme-${version}";
- version = "2018-10-12";
+ pname = "sierra-gtk-theme";
+ version = "2019-05-07";
src = fetchFromGitHub {
owner = "vinceliuice";
- repo = "sierra-gtk-theme";
+ repo = pname;
rev = version;
- sha256 = "0l8mhdy7x8nh5aqsvkk0maqg1cnfds7824g439f6cmifdiyksbgg";
+ sha256 = "0rm9lcwp89ljxqrya9bi882qcs339pc1l945cr1xq2rganqyk9cq";
};
nativeBuildInputs = [ libxml2 ];
diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..48f29ad3111301ca91b741bba1d72becd1d26c55
--- /dev/null
+++ b/pkgs/data/themes/stilo/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+ pname = "stilo-themes";
+ version = "3.32-3";
+
+ src = fetchFromGitHub {
+ owner = "lassekongo83";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0xcndr5mfa91f0ln0az3m79pidjy882v65w5fi5w05kykrmvv81z";
+ };
+
+ nativeBuildInputs = [ meson ninja sassc ];
+
+ buildInputs = [ gdk_pixbuf librsvg gtk_engines ];
+
+ propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+ meta = with stdenv.lib; {
+ description = "Minimalistic GTK themes";
+ homepage = https://github.com/lassekongo83/stilo-themes;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix
index 2e74e2819e38ec253489bb6e49e60fd7f01df1e1..f55ed31c1cefa7494c2fea664ee3f9eafcc85ce5 100644
--- a/pkgs/data/themes/zuki/default.nix
+++ b/pkgs/data/themes/zuki/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
stdenv.mkDerivation rec {
pname = "zuki-themes";
- version = "3.32-1";
+ version = "3.32-4";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = pname;
rev = "v${version}";
- sha256 = "0x6ghc7n5y7p0agm2yp7rygz9154f58s891zxzhd07wc2c4mzp0s";
+ sha256 = "0kqhk9qy5hwsd6g0bmq2dg6yj9gbv7l514ripsfiqyllmf4h818h";
};
- buildInputs = [ gdk_pixbuf librsvg ];
+ nativeBuildInputs = [ meson ninja sassc ];
- propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+ buildInputs = [ gdk_pixbuf librsvg gtk_engines ];
- installPhase = ''
- install -dm 755 $out/share/themes
- cp -a Zuki* $out/share/themes/
- '';
+ propagatedUserEnvPkgs = [ gtk-engine-murrine ];
meta = with stdenv.lib; {
description = "Themes for GTK3, gnome-shell and more";
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index 8db376e01fd7dd5b6401bc79c102dac0bb854bc5..608096951b60a14b77c351e7299f59c7be567bc6 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -7,7 +7,6 @@
deepin,
deepin-gettext-tools,
fontconfig,
- glib,
go,
go-dbus-factory,
go-gir-generator,
@@ -26,7 +25,7 @@
buildGoPackage rec {
name = "${pname}-${version}";
pname = "dde-api";
- version = "3.18.1";
+ version = "3.18.4.1";
goPackagePath = "pkg.deepin.io/dde/api";
@@ -34,7 +33,7 @@ buildGoPackage rec {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0y8v18f6l3ycysdn4qi7c93z805q7alji8wix4j4qh9x9r35d728";
+ sha256 = "0bcjp5ijwa4wmx6p43lik6vjlb7d5rk7nf8xl495i3yk9x70wyfa";
};
goDeps = ./deps.nix;
@@ -68,15 +67,10 @@ buildGoPackage rec {
rfkill # run
xcur2png # run
#locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?)
- ];
+ ];
postPatch = ''
- searchHardCodedPaths # debugging
-
- sed -i -e "s|/var|$out/var|" Makefile
-
- # TODO: confirm where to install grub themes
- sed -i -e "s|/boot/grub|$out/boot/grub|" Makefile
+ searchHardCodedPaths # debugging
fixPath $out /usr/lib/deepin-api \
lunar-calendar/main.go \
@@ -90,6 +84,19 @@ buildGoPackage rec {
misc/systemd/system/deepin-shutdown-sound.service \
theme_thumb/gtk/gtk.go \
thumbnails/gtk/gtk.go
+ fixPath $out /boot/grub Makefile # TODO: confirm where to install grub themes
+ fixPath $out /var Makefile
+
+ # This package wants to install polkit local authority files into
+ # /var/lib. Nix does not allow a package to install files into /var/lib
+ # because it is outside of the Nix store and should contain applications
+ # state information (persistent data modified by programs as they
+ # run). Polkit looks for them in both /etc/polkit-1 and
+ # /var/lib/polkit-1 (with /etc having priority over /var/lib). An
+ # work around is to install them to $out/etc and simlnk them to
+ # /etc in the deepin module.
+
+ sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile
'';
buildPhase = ''
@@ -103,6 +110,10 @@ buildGoPackage rec {
remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/*
'';
+ postFixup = ''
+ searchHardCodedPaths $out # debugging
+ '';
+
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix
index 03758f0d43e12198b5cd4d55abf85d496a66f852..a3b5e20effc76aaa34a3aa0a0478102939a29e0a 100644
--- a/pkgs/desktops/deepin/dde-api/deps.nix
+++ b/pkgs/desktops/deepin/dde-api/deps.nix
@@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/disintegration/imaging";
- rev = "061e8a750a4db9667cdf9e2af7f4029ba506cb3b";
- sha256 = "13fkknwz2iby5rdzv9sgam6p27zdgxis3sxgyls9sdir5lbhjhm7";
+ rev = "465faf0892b5c7b3325643b0e47282e1331672e7";
+ sha256 = "1z9rkphmqgyphznl53pp1gmf0dfrfrmr95bx46p422ldml26c5a0";
};
}
{
@@ -41,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/fogleman/gg";
- rev = "0403632d5b905943a1c2a5b2763aaecd568467ec";
- sha256 = "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n";
+ rev = "f194ddec6f45226fc9e1b4a61b7237f186edd543";
+ sha256 = "095g5hpqvpy5w9l4kb65cif013snsvlbw6sgln0kwdix0z099j3i";
};
}
{
@@ -59,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-x11-client";
- rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561";
- sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl";
+ rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a";
+ sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs";
};
}
{
@@ -77,8 +77,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
- rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65";
- sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3";
+ rev = "7e034cad644213bc79b336b52fce73624259aeca";
+ sha256 = "04n4yi0p2yjv8sr9dmnzwc2k6hvzzvl6jdq2xd043kvjwzk583va";
};
}
{
@@ -86,8 +86,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f";
- sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s";
+ rev = "3b0461eec859c4b73bb64fdc8285971fd33e3938";
+ sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
};
}
{
diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
index 0ef0da5c70b7d45ffbf37db925e5fb24f53dabd1..16c8002b8e48833f26de572d1436a8554b49291c 100644
--- a/pkgs/desktops/deepin/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools,
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, qttools,
deepin-gettext-tools, dtkcore, dtkwidget, deepin
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-calendar";
- version = "1.2.6";
+ version = "1.2.10";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0k973rv0prvr7cg1xwg7kr14fkx13aslhiqc3q7vpakfk53qsw4n";
+ sha256 = "00aqx24jccf88vvkpb9svyjz8knrqyjgd0152psf9dxc9q13f61h";
};
nativeBuildInputs = [
+ cmake
pkgconfig
- qmake
qttools
deepin-gettext-tools
deepin.setupHook
diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..906812cf98b47e0c85926448cdd158eb06052807
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-control-center/default.nix
@@ -0,0 +1,112 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative,
+ networkmanager, qtsvg, qtx11extras, dtkcore, dtkwidget, geoip, gsettings-qt,
+ dde-network-utils, networkmanager-qt, xorg, mtdev, fontconfig, freetype, dde-api,
+ dde-daemon, qt5integration, deepin-desktop-base, deepin-desktop-schemas, dbus,
+ systemd, dde-qt-dbus-factory, qtmultimedia, qtbase, glib, gnome3, which,
+ substituteAll, wrapGAppsHook, tzdata
+}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "dde-control-center";
+ version = "4.10.11";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1ip8wjwf0n9q8xnqymzh8lz0j5gcnns976n291np6k5kdh2wqhr5";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ deepin.setupHook
+ pkgconfig
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ dde-api
+ dde-daemon
+ dde-network-utils
+ dde-qt-dbus-factory
+ deepin-desktop-base
+ deepin-desktop-schemas
+ dtkcore
+ dtkwidget
+ fontconfig
+ freetype
+ geoip
+ glib
+ gnome3.networkmanager-l2tp
+ gnome3.networkmanager-openconnect
+ gnome3.networkmanager-openvpn
+ gnome3.networkmanager-vpnc
+ gsettings-qt
+ mtdev
+ networkmanager-qt
+ qt5integration
+ qtbase
+ qtdeclarative
+ qtmultimedia
+ qtsvg
+ qttools
+ qtx11extras
+ xorg.libX11
+ xorg.libXext
+ xorg.libXrandr
+ xorg.libxcb
+ ];
+
+ cmakeFlags = [
+ "-DDISABLE_SYS_UPDATE=YES"
+ "-DDCC_DISABLE_GRUB=YES"
+ ];
+
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ nmcli = "${networkmanager}/bin/nmcli";
+ which = "${which}/bin/which";
+ # not packaged
+ # dman = "${deepin-manual}/bin/dman";
+ inherit tzdata;
+ # exclusive to deepin linux?
+ # allows to synchronize configuration files to cloud networks
+ # deepin_sync = "${deepin-sync}";
+ })
+ ];
+
+ postPatch = ''
+ searchHardCodedPaths
+
+ patchShebangs translate_ts2desktop.sh
+ patchShebangs translate_generation.sh
+ patchShebangs translate_desktop2ts.sh
+
+ fixPath $out /usr dde-control-center-autostart.desktop \
+ com.deepin.dde.ControlCenter.service \
+ src/frame/widgets/utils.h
+
+ substituteInPlace dde-control-center.desktop \
+ --replace "dbus-send" "${dbus}/bin/dbus-send"
+ substituteInPlace com.deepin.controlcenter.addomain.policy \
+ --replace "/bin/systemctl" "${systemd}/bin/systemctl"
+ '';
+
+ postFixup = ''
+ # debuging
+ searchForUnresolvedDLL $out
+ searchHardCodedPaths $out
+ '';
+
+ passthru.updateScript = deepin.updateScript { inherit name; };
+
+ meta = with stdenv.lib; {
+ description = "Control panel of Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/dde-control-center;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo worldofpeace ];
+ };
+}
diff --git a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch b/pkgs/desktops/deepin/dde-control-center/fix-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2c6e204d34379ca73a8d2e3a82418ab0b83cd8cd
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-control-center/fix-paths.patch
@@ -0,0 +1,65 @@
+diff --git a/src/frame/frame.cpp b/src/frame/frame.cpp
+index 90d06f8..7cdad04 100644
+--- a/src/frame/frame.cpp
++++ b/src/frame/frame.cpp
+@@ -375,7 +375,7 @@ void Frame::keyPressEvent(QKeyEvent *e)
+ #ifdef QT_DEBUG
+ case Qt::Key_Escape: qApp->quit(); break;
+ #endif
+- case Qt::Key_F1: QProcess::startDetached("dman", QStringList("dde")); break;
++ case Qt::Key_F1: QProcess::startDetached("@dman@", QStringList("dde")); break;
+ default:;
+ }
+ }
+diff --git a/src/frame/modules/datetime/timezone_dialog/timezone.cpp b/src/frame/modules/datetime/timezone_dialog/timezone.cpp
+index 3dd4aad..5f1b363 100644
+--- a/src/frame/modules/datetime/timezone_dialog/timezone.cpp
++++ b/src/frame/modules/datetime/timezone_dialog/timezone.cpp
+@@ -46,7 +46,7 @@ namespace installer {
+ namespace {
+
+ // Absolute path to zone.tab file.
+-const char kZoneTabFile[] = "/usr/share/zoneinfo/zone.tab";
++const char kZoneTabFile[] = "@tzdata@/share/zoneinfo/zone.tab";
+
+ // Absolute path to backward timezone file.
+ const char kTimezoneAliasFile[] = "/timezone_alias";
+diff --git a/src/frame/modules/network/connectionvpneditpage.cpp b/src/frame/modules/network/connectionvpneditpage.cpp
+index e292865..95c5a2b 100644
+--- a/src/frame/modules/network/connectionvpneditpage.cpp
++++ b/src/frame/modules/network/connectionvpneditpage.cpp
+@@ -215,7 +215,7 @@ void ConnectionVpnEditPage::exportConnConfig()
+ qDebug() << Q_FUNC_INFO << args;
+
+ QProcess p;
+- p.start("nmcli", args);
++ p.start("@nmcli@", args);
+ p.waitForFinished();
+ qDebug() << p.readAllStandardOutput();
+ qDebug() << p.readAllStandardError();
+diff --git a/src/frame/modules/network/vpnpage.cpp b/src/frame/modules/network/vpnpage.cpp
+index 521a603..450d1a6 100644
+--- a/src/frame/modules/network/vpnpage.cpp
++++ b/src/frame/modules/network/vpnpage.cpp
+@@ -224,7 +224,7 @@ void VpnPage::importVPN()
+ qDebug() << args;
+
+ QProcess p;
+- p.start("nmcli", args);
++ p.start("@nmcli@", args);
+ p.waitForFinished();
+ const auto stat = p.exitCode();
+ const QString output = p.readAllStandardOutput();
+diff --git a/src/frame/modules/sync/syncworker.cpp b/src/frame/modules/sync/syncworker.cpp
+index 3f929bf..6f240d9 100644
+--- a/src/frame/modules/sync/syncworker.cpp
++++ b/src/frame/modules/sync/syncworker.cpp
+@@ -24,7 +24,7 @@ SyncWorker::SyncWorker(SyncModel *model, QObject *parent)
+
+ m_model->setSyncIsValid(
+ QProcess::execute(
+- "which", QStringList() << "/usr/lib/deepin-sync-daemon/deepin-sync-daemon") ==
++ "@which@", QStringList() << "@deepin_sync@/lib/deepin-sync-daemon/deepin-sync-daemon") ==
+ 0 &&
+ valueByQSettings(DCC_CONFIG_FILES, "CloudSync", "AllowCloudSync", false));
+ }
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index 954d0971c250dfbf66b4501b5ecefa1ff6460902..4fb0272a3cefdb8094b1ea34ea87e1a09b01dd43 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -3,13 +3,13 @@
deepin-gettext-tools, dde-api, deepin-desktop-schemas,
deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3,
libgudev, libinput, libnl, librsvg, linux-pam, networkmanager,
- pulseaudio, xorg, python3, hicolor-icon-theme, glibc, tzdata, go,
- deepin, makeWrapper, wrapGAppsHook }:
+ pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go,
+ deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }:
buildGoPackage rec {
name = "${pname}-${version}";
pname = "dde-daemon";
- version = "3.24.1";
+ version = "3.27.2.6";
goPackagePath = "pkg.deepin.io/dde/daemon";
@@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y";
+ sha256 = "14g138h23f1lh1y98pdrfhnph1m7pw8lq8ypiwv9qf3fmdyn35d4";
};
patches = [
@@ -63,30 +63,45 @@ buildGoPackage rec {
librsvg
pulseaudio
tzdata
+ xkeyboard_config
];
postPatch = ''
- searchHardCodedPaths
+ searchHardCodedPaths # debugging
patchShebangs network/nm_generator/gen_nm_consts.py
fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go
+ fixPath $out /usr/share/dde-daemon launcher/manager.go gesture/config.go
fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile
fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go
fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go
fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go
fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go
fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go
+ fixPath ${xkeyboard_config} /usr/share/X11/xkb inputdevices/layout_list.go
+
+ # TODO: deepin-system-monitor comes from dde-extra
sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
- sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile
+ sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} +
- searchHardCodedPaths
+ # This package wants to install polkit local authority files into
+ # /var/lib. Nix does not allow a package to install files into /var/lib
+ # because it is outside of the Nix store and should contain applications
+ # state information (persistent data modified by programs as they
+ # run). Polkit looks for them in both /etc/polkit-1 and
+ # /var/lib/polkit-1 (with /etc having priority over /var/lib). An
+ # work around is to install them to $out/etc and simlnk them to
+ # /etc in the deepin module.
+
+ sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile
'';
buildPhase = ''
+ export PAM_MODULE_DIR="$out/lib/security"
# compilation of the nm module is failing
#make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code
make -C go/src/${goPackagePath}
@@ -103,6 +118,8 @@ buildGoPackage rec {
for binary in $out/lib/deepin-daemon/*; do
wrapProgram $binary "''${gappsWrapperArgs[@]}"
done
+
+ searchHardCodedPaths $out # debugging
'';
passthru.updateScript = deepin.updateScript { inherit name; };
diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix
index fab2f9f93b20bd76fe7c04e02c82319b3ef9389f..c9a15ad88d4a2801d1b982fe245c8edcf49f12b4 100644
--- a/pkgs/desktops/deepin/dde-daemon/deps.nix
+++ b/pkgs/desktops/deepin/dde-daemon/deps.nix
@@ -36,13 +36,22 @@
sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6";
};
}
+ {
+ goPackagePath = "github.com/gosexy/gettext";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gosexy/gettext";
+ rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b";
+ sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi";
+ };
+ }
{
goPackagePath = "github.com/linuxdeepin/go-x11-client";
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-x11-client";
- rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561";
- sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl";
+ rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a";
+ sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs";
};
}
{
@@ -68,8 +77,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
- rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65";
- sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3";
+ rev = "7e034cad644213bc79b336b52fce73624259aeca";
+ sha256 = "04n4yi0p2yjv8sr9dmnzwc2k6hvzzvl6jdq2xd043kvjwzk583va";
};
}
{
@@ -77,8 +86,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f";
- sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s";
+ rev = "3b0461eec859c4b73bb64fdc8285971fd33e3938";
+ sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
};
}
{
@@ -86,8 +95,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "e3703dcdd614d2d7488fff034c75c551ea25da95";
- sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv";
+ rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475";
+ sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
};
}
{
@@ -99,13 +108,4 @@
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
};
}
- {
- goPackagePath = "pkg.deepin.io/lib";
- fetch = {
- type = "git";
- url = "https://github.com/linuxdeepin/go-lib.git";
- rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83";
- sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc";
- };
- }
]
diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix
index 30ec61f73c3a4de612f903b77ad462a42909d63d..e143f783a5a415c1132bd3419151eb74a6f1b32e 100644
--- a/pkgs/desktops/deepin/dde-dock/default.nix
+++ b/pkgs/desktops/deepin/dde-dock/default.nix
@@ -8,13 +8,13 @@ let
unwrapped = stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-dock";
- version = "4.9.9";
+ version = "4.10.3";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0vscm808q63bbl84q9l3vhhd8mw86wfjdh55rvyj42qpa5q4mvlz";
+ sha256 = "17iy78r0frpv42g521igfdcgdklbifzig1wzxq2nl14fq0bgxg4v";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..253a67b04ec7b10798b6333574871ab7ccc3ac8c
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch
@@ -0,0 +1,323 @@
+From 29f4ad88e2294ae70b10180e7361d135c4e5c896 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?=
+Date: Mon, 13 May 2019 00:09:42 -0300
+Subject: [PATCH 2/2] Use XDG to look for mime cache
+
+---
+ .../shutil/mimesappsmanager.cpp | 230 ++++++++++--------
+ .../shutil/mimesappsmanager.h | 6 +-
+ 2 files changed, 125 insertions(+), 111 deletions(-)
+
+diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp
+index c9e53630..7a21df51 100644
+--- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp
++++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp
+@@ -552,14 +552,20 @@ QString MimesAppsManager::getMimeAppsCacheFile()
+ return QString("%1/%2").arg(DFMStandardPaths::location(DFMStandardPaths::CachePath), "MimeApps.json");
+ }
+
+-QString MimesAppsManager::getMimeInfoCacheFilePath()
++QStringList MimesAppsManager::getMimeInfoCacheFilePath()
+ {
+- return "/usr/share/applications/mimeinfo.cache";
++ QStringList paths;
++ for (const QString dir : getMimeInfoCacheFileRootPath() )
++ paths.append(dir + QDir::separator() + "mimeinfo.cache");
++ qDebug() << "getMimeInfoCacheFilePath: " << paths;
++ return paths;
+ }
+
+-QString MimesAppsManager::getMimeInfoCacheFileRootPath()
++QStringList MimesAppsManager::getMimeInfoCacheFileRootPath()
+ {
+- return "/usr/share/applications";
++ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
++ qDebug() << "getMimeInfoCacheFileRootPath: " << paths;
++ return paths;
+ }
+
+ QString MimesAppsManager::getDesktopFilesCacheFile()
+@@ -574,23 +580,27 @@ QString MimesAppsManager::getDesktopIconsCacheFile()
+
+ QStringList MimesAppsManager::getDesktopFiles()
+ {
+- QStringList desktopFiles;
++ QStringList desktopFiles;
+
+- foreach (QString desktopFolder, getApplicationsFolders()) {
+- QDirIterator it(desktopFolder, QStringList("*.desktop"),
+- QDir::Files | QDir::NoDotAndDotDot,
+- QDirIterator::Subdirectories);
+- while (it.hasNext()) {
+- it.next();
+- desktopFiles.append(it.filePath());
+- }
+- }
+- return desktopFiles;
++ foreach (QString desktopFolder, getApplicationsFolders()) {
++ QDirIterator it(desktopFolder, QStringList("*.desktop"),
++ QDir::Files | QDir::NoDotAndDotDot,
++ QDirIterator::Subdirectories);
++ while (it.hasNext()) {
++ it.next();
++ desktopFiles.append(it.filePath());
++ }
++ }
++ return desktopFiles;
+ }
+
+-QString MimesAppsManager::getDDEMimeTypeFile()
++QStringList MimesAppsManager::getDDEMimeTypeFile()
+ {
+- return QString("%1/%2/%3").arg(getMimeInfoCacheFileRootPath(), "deepin", "dde-mimetype.list");
++ QStringList paths;
++ for (const QString path : getMimeInfoCacheFileRootPath())
++ paths.append(QString("%1/%2/%3").arg(path, "deepin", "dde-mimetype.list"));
++ qDebug() << "getDDEMimeTypeFile: " << paths;
++ return paths;
+ }
+
+ QMap MimesAppsManager::getDesktopObjs()
+@@ -663,124 +673,128 @@ void MimesAppsManager::initMimeTypeApps()
+ MimeApps.insert(key, orderApps);
+ }
+
+- //check mime apps from cache
+- QFile f(getMimeInfoCacheFilePath());
+- if(!f.open(QIODevice::ReadOnly)){
+- qDebug () << "failed to read mime info cache file:" << f.errorString();
+- return;
+- }
+-
+ QStringList audioDesktopList;
+ QStringList imageDeksopList;
+ QStringList textDekstopList;
+ QStringList videoDesktopList;
+
+- while (!f.atEnd()) {
+- QString data = f.readLine();
+- QString _desktops = data.split("=").last();
+- QString mimeType = data.split("=").first();
+- QStringList desktops = _desktops.split(";");
+-
+- foreach (const QString desktop, desktops) {
+- if(desktop.isEmpty() || audioDesktopList.contains(desktop))
+- continue;
++ //check mime apps from cache
++ for (const QString path : getMimeInfoCacheFilePath()) {
++ QFile f(path);
++ if(!f.open(QIODevice::ReadOnly)){
++ qDebug () << "failed to read mime info cache file:" << f.errorString();
++ return;
++ }
+
+- if(mimeType.startsWith("audio")){
+- if(!audioDesktopList.contains(desktop))
+- audioDesktopList << desktop;
+- } else if(mimeType.startsWith("image")){
+- if(!imageDeksopList.contains(desktop))
+- imageDeksopList << desktop;
+- } else if(mimeType.startsWith("text")){
+- if(!textDekstopList.contains(desktop))
+- textDekstopList << desktop;
+- } else if(mimeType.startsWith("video")){
+- if(!videoDesktopList.contains(desktop))
+- videoDesktopList << desktop;
++ while (!f.atEnd()) {
++ QString data = f.readLine();
++ QString _desktops = data.split("=").last();
++ QString mimeType = data.split("=").first();
++ QStringList desktops = _desktops.split(";");
++
++ foreach (const QString desktop, desktops) {
++ if(desktop.isEmpty() || audioDesktopList.contains(desktop))
++ continue;
++
++ if(mimeType.startsWith("audio")){
++ if(!audioDesktopList.contains(desktop))
++ audioDesktopList << desktop;
++ } else if(mimeType.startsWith("image")){
++ if(!imageDeksopList.contains(desktop))
++ imageDeksopList << desktop;
++ } else if(mimeType.startsWith("text")){
++ if(!textDekstopList.contains(desktop))
++ textDekstopList << desktop;
++ } else if(mimeType.startsWith("video")){
++ if(!videoDesktopList.contains(desktop))
++ videoDesktopList << desktop;
++ }
+ }
+ }
++ f.close();
+ }
+- f.close();
+
+- const QString mimeInfoCacheRootPath = getMimeInfoCacheFileRootPath();
+- foreach (QString desktop, audioDesktopList) {
+- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
+- if(!QFile::exists(path))
+- continue;
+- DesktopFile df(path);
+- AudioMimeApps.insert(path, df);
+- }
++ for (const QString mimeInfoCacheRootPath : getMimeInfoCacheFileRootPath()) {
++ foreach (QString desktop, audioDesktopList) {
++ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
++ if(!QFile::exists(path))
++ continue;
++ DesktopFile df(path);
++ AudioMimeApps.insert(path, df);
++ }
+
+- foreach (QString desktop, imageDeksopList) {
+- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
+- if(!QFile::exists(path))
+- continue;
+- DesktopFile df(path);
+- ImageMimeApps.insert(path, df);
+- }
++ foreach (QString desktop, imageDeksopList) {
++ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
++ if(!QFile::exists(path))
++ continue;
++ DesktopFile df(path);
++ ImageMimeApps.insert(path, df);
++ }
+
+- foreach (QString desktop, textDekstopList) {
+- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
+- if(!QFile::exists(path))
+- continue;
+- DesktopFile df(path);
+- TextMimeApps.insert(path, df);
+- }
++ foreach (QString desktop, textDekstopList) {
++ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
++ if(!QFile::exists(path))
++ continue;
++ DesktopFile df(path);
++ TextMimeApps.insert(path, df);
++ }
+
+- foreach (QString desktop, videoDesktopList) {
+- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
+- if(!QFile::exists(path))
+- continue;
+- DesktopFile df(path);
+- VideoMimeApps.insert(path, df);
++ foreach (QString desktop, videoDesktopList) {
++ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
++ if(!QFile::exists(path))
++ continue;
++ DesktopFile df(path);
++ VideoMimeApps.insert(path, df);
++ }
+ }
+-
+ return;
+ }
+
+ void MimesAppsManager::loadDDEMimeTypes()
+ {
+- QSettings settings(getDDEMimeTypeFile(), QSettings::IniFormat);
+- qDebug() << settings.childGroups();
++ for (const QString path : getDDEMimeTypeFile()) {
++ QSettings settings(path, QSettings::IniFormat);
++ qDebug() << settings.childGroups();
+
+- QFile file(getDDEMimeTypeFile());
+- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+- return;
+- }
++ QFile file(path);
++ if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
++ continue;
++ }
++
++ // Read propeties
++ QTextStream in(&file);
++ QString desktopKey;
++ while (!in.atEnd()) {
+
+- // Read propeties
+- QTextStream in(&file);
+- QString desktopKey;
+- while (!in.atEnd()) {
++ // Read new line
++ QString line = in.readLine();
+
+- // Read new line
+- QString line = in.readLine();
++ // Skip empty line or line with invalid format
++ if (line.trimmed().isEmpty()) {
++ continue;
++ }
+
+- // Skip empty line or line with invalid format
+- if (line.trimmed().isEmpty()) {
+- continue;
+- }
++ // Read group
++ // NOTE: symbols '[' and ']' can be found not only in group names, but
++ // only group can start with '['
+
+- // Read group
+- // NOTE: symbols '[' and ']' can be found not only in group names, but
+- // only group can start with '['
++ if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) {
++ QString tmp = line.trimmed().replace("[", "").replace("]", "");
++ desktopKey = tmp;
++ continue;
++ }
+
+- if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) {
+- QString tmp = line.trimmed().replace("[", "").replace("]", "");
+- desktopKey = tmp;
+- continue;
+- }
+-
+- // If we are in correct group and line contains assignment then read data
+- int first_equal = line.indexOf('=');
+- if (!desktopKey.isEmpty() && first_equal >= 0) {
+- QString value = line.mid(first_equal + 1);
+- QStringList mimetypes = value.split(";");
+- DDE_MimeTypes.insert(desktopKey, mimetypes);
+- desktopKey.clear();
++ // If we are in correct group and line contains assignment then read data
++ int first_equal = line.indexOf('=');
++ if (!desktopKey.isEmpty() && first_equal >= 0) {
++ QString value = line.mid(first_equal + 1);
++ QStringList mimetypes = value.split(";");
++ DDE_MimeTypes.insert(desktopKey, mimetypes);
++ desktopKey.clear();
++ }
+ }
++ file.close();
+ }
+- file.close();
+ }
+
+ bool MimesAppsManager::lessByDateTime(const QFileInfo &f1, const QFileInfo &f2)
+diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.h b/dde-file-manager-lib/shutil/mimesappsmanager.h
+index 223c80aa..00a61302 100644
+--- a/dde-file-manager-lib/shutil/mimesappsmanager.h
++++ b/dde-file-manager-lib/shutil/mimesappsmanager.h
+@@ -101,12 +101,12 @@ public:
+
+ static QStringList getApplicationsFolders();
+ static QString getMimeAppsCacheFile();
+- static QString getMimeInfoCacheFilePath();
+- static QString getMimeInfoCacheFileRootPath();
++ static QStringList getMimeInfoCacheFilePath();
++ static QStringList getMimeInfoCacheFileRootPath();
+ static QString getDesktopFilesCacheFile();
+ static QString getDesktopIconsCacheFile();
+ static QStringList getDesktopFiles();
+- static QString getDDEMimeTypeFile();
++ static QStringList getDDEMimeTypeFile();
+ static QMap getDesktopObjs();
+ static void initMimeTypeApps();
+ static void loadDDEMimeTypes();
+--
+2.21.0
+
diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3ced15e7e5a4447497b0789094c2f9009c2c008d
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch
@@ -0,0 +1,89 @@
+From e68d983a6befd223087916cb3fe31baee77decc4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?=
+Date: Sun, 12 May 2019 08:50:07 -0300
+Subject: [PATCH 1/2] Use qt library to determine where to look for application
+ files
+
+---
+ dde-file-manager-lib/shutil/fileutils.cpp | 34 ++++++++++++-------
+ .../shutil/mimesappsmanager.cpp | 11 ++----
+ 2 files changed, 25 insertions(+), 20 deletions(-)
+
+diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp
+index ae8120d3..d6a0573a 100644
+--- a/dde-file-manager-lib/shutil/fileutils.cpp
++++ b/dde-file-manager-lib/shutil/fileutils.cpp
+@@ -242,13 +242,19 @@ bool FileUtils::isArchive(const QString &path)
+ */
+ QStringList FileUtils::getApplicationNames() {
+ QStringList appNames;
+- QDirIterator it("/usr/share/applications", QStringList("*.desktop"),
+- QDir::Files | QDir::NoDotAndDotDot,
+- QDirIterator::Subdirectories);
+- while (it.hasNext()) {
+- it.next();
+- appNames.append(it.fileName());
++
++ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
++ qDebug() << "dde-file-manager getApplicationNames desktopDirs:" << desktopDirs;
++ for (const QString &dir : desktopDirs) {
++ QDirIterator it(dir, QStringList("*.desktop"),
++ QDir::Files | QDir::NoDotAndDotDot,
++ QDirIterator::Subdirectories);
++ while (it.hasNext()) {
++ it.next();
++ appNames.append(it.fileName());
++ }
+ }
++
+ return appNames;
+ }
+ //---------------------------------------------------------------------------
+@@ -259,12 +265,16 @@ QStringList FileUtils::getApplicationNames() {
+ */
+ QList FileUtils::getApplications() {
+ QList apps;
+- QDirIterator it("/usr/share/applications", QStringList("*.desktop"),
+- QDir::Files | QDir::NoDotAndDotDot,
+- QDirIterator::Subdirectories);
+- while (it.hasNext()) {
+- it.next();
+- apps.append(DesktopFile(it.filePath()));
++ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
++ qDebug() << "dde-file-manager getApplications desktopDirs:" << desktopDirs;
++ for (const QString &dir : desktopDirs) {
++ QDirIterator it(dir, QStringList("*.desktop"),
++ QDir::Files | QDir::NoDotAndDotDot,
++ QDirIterator::Subdirectories);
++ while (it.hasNext()) {
++ it.next();
++ apps.append(DesktopFile(it.filePath()));
++ }
+ }
+ return apps;
+ }
+diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp
+index c6149702..c9e53630 100644
+--- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp
++++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp
+@@ -542,14 +542,9 @@ QStringList MimesAppsManager::getrecommendedAppsFromMimeWhiteList(const DUrl &ur
+
+ QStringList MimesAppsManager::getApplicationsFolders()
+ {
+- QStringList desktopFolders;
+- desktopFolders << QString("/usr/share/applications/")
+- << QString("/usr/local/share/applications/")
+- << QString("/usr/share/gnome/applications/")
+- << QString("/var/lib/flatpak/exports/share/applications")
+- << QDir::homePath() + QString("/.local/share/flatpak/exports/share/applications")
+- << QDir::homePath() + QString( "/.local/share/applications" );
+- return desktopFolders;
++ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
++ qDebug() << "dde-file-manager getApplicationsFolders:" << paths;
++ return paths;
+ }
+
+ QString MimesAppsManager::getMimeAppsCacheFile()
+--
+2.21.0
+
diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..582760e6db2af8a2f34b598c275c7e5b09732b35
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch
@@ -0,0 +1,38 @@
+From 084c3cfcf4995c109ca2e96f042fe341f925b0b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?=
+Date: Thu, 16 May 2019 19:00:52 -0300
+Subject: [PATCH 4/4] Use xdg to look for pixmap icons
+
+---
+ dde-file-manager-lib/shutil/fileutils.cpp | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp
+index d6a0573a..e912e7c2 100644
+--- a/dde-file-manager-lib/shutil/fileutils.cpp
++++ b/dde-file-manager-lib/shutil/fileutils.cpp
+@@ -362,11 +362,16 @@ QIcon FileUtils::searchAppIcon(const DesktopFile &app,
+ }
+
+ // Last chance
+- QDir appIcons("/usr/share/pixmaps","", 0, QDir::Files | QDir::NoDotAndDotDot);
+- QStringList iconFiles = appIcons.entryList();
+- QStringList searchIcons = iconFiles.filter(name);
+- if (searchIcons.count() > 0) {
+- return QIcon("/usr/share/pixmaps/" + searchIcons.at(0));
++ const QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
++ qDebug() << "searchAppIcon: last chance: look for pixmaps at: " << dirs;
++ for (const QString &dir : dirs) {
++ const QString path = dir + QDir::separator() + "pixmaps";
++ QDir appIcons(path,"", 0, QDir::Files | QDir::NoDotAndDotDot);
++ QStringList iconFiles = appIcons.entryList();
++ QStringList searchIcons = iconFiles.filter(name);
++ if (searchIcons.count() > 0) {
++ return QIcon(path + QDir::separator() + searchIcons.at(0));
++ }
+ }
+
+ // Default icon
+--
+2.21.0
+
diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c203ccae6fba8edb293966f4b6a518a61c76d90c
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-file-manager/default.nix
@@ -0,0 +1,251 @@
+{ stdenv, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock,
+ dde-polkit-agent, dde-qt-dbus-factory, deepin, deepin-anything,
+ deepin-desktop-schemas, deepin-gettext-tools, deepin-movie-reborn,
+ deepin-shortcut-viewer, deepin-terminal, dtkcore, dtkwidget,
+ ffmpegthumbnailer, file, glib, gnugrep, gsettings-qt, gvfs,
+ jemalloc, kcodecs, libX11, libsecret, polkit, polkit-qt, poppler,
+ procps, qmake, qt5integration, qtmultimedia, qtsvg, qttools,
+ qtx11extras, runtimeShell, samba, shadow, taglib, udisks2-qt5,
+ xdg-user-dirs, xorg, zlib, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "dde-file-manager";
+ version = "4.8.6.4";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1m0ykw5a91rm5xcah8bzk21xsambqvncj8104ihdhf9h0z9kdmm2";
+ };
+
+ nativeBuildInputs = [
+ deepin.setupHook
+ qmake
+ qttools
+ pkgconfig
+ deepin-gettext-tools
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ avfs
+ dde-daemon
+ dde-dock
+ dde-polkit-agent
+ dde-qt-dbus-factory
+ deepin-anything
+ deepin-desktop-schemas
+ deepin-movie-reborn.dev
+ deepin-shortcut-viewer
+ deepin-terminal
+ dtkcore
+ dtkwidget
+ ffmpegthumbnailer
+ file
+ glib.bin
+ glib.dev
+ gnugrep
+ gsettings-qt
+ gvfs
+ jemalloc
+ kcodecs
+ libsecret
+ polkit
+ polkit-qt
+ poppler
+ procps
+ qt5integration
+ qtmultimedia
+ qtsvg
+ qtx11extras
+ samba
+ taglib
+ udisks2-qt5
+ xdg-user-dirs
+ xorg.libX11
+ xorg.libxcb
+ xorg.xcbutil
+ xorg.xcbutilwm
+ xorg.xorgproto
+ zlib
+ ];
+
+ patches = [
+ ./dde-file-manager.fix-paths.patch
+ ./dde-file-manager.fix-mime-cache-paths.patch
+ ./dde-file-manager.pixmaps-paths.patch
+ ];
+
+ postPatch = ''
+ searchHardCodedPaths
+
+ patchShebangs dde-desktop/translate_generation.sh
+ patchShebangs dde-desktop/translate_ts2desktop.sh
+ patchShebangs dde-file-manager-lib/generate_translations.sh
+ patchShebangs dde-file-manager/generate_translations.sh
+ patchShebangs dde-file-manager/translate_ts2desktop.sh
+ patchShebangs usb-device-formatter/generate_translations.sh
+ patchShebangs usb-device-formatter/translate_ts2desktop.sh
+
+ # x-terminal-emulator is a virtual package in Debian systems. The
+ # terminal emulator is configured by Debian's alternative system.
+ # It is not available on NixOS. Use deepin-terminal instead
+ sed -i -e "s,x-terminal-emulator,deepin-terminal," \
+ dde-file-manager-lib/shutil/fileutils.cpp
+
+ sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
+ dde-file-manager-lib/dde-file-manager-lib.pro \
+ dde-file-thumbnail-tool/common.pri \
+ common/common.pri
+
+ sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \
+ dde-file-manager-lib/dde-file-manager-lib.pro
+
+ fixPath ${dde-dock} /usr/include/dde-dock \
+ dde-dock-plugins/disk-mount/disk-mount.pro
+
+ # treefrog is not available in NixOS, and I am not sure if it is really needed
+ #fixPath $ {treefrog-framework} /usr/include/treefrog \
+ # dde-sharefiles/appbase.pri
+
+ fixPath ${deepin-anything} /usr/share/dbus-1/interfaces \
+ dde-file-manager-lib/dbusinterface/dbusinterface.pri
+
+ sed -i -e "s,\$\$system(\$\$PKG_CONFIG --variable libdir deepin-anything-server-lib),$out/lib," \
+ deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro
+
+ fixPath ${dde-daemon} /usr/lib/deepin-daemon/desktop-toggle \
+ dde-zone/mainwindow.h
+
+ fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert \
+ dde-desktop/translate_desktop2ts.sh \
+ dde-desktop/translate_ts2desktop.sh \
+ dde-file-manager/translate_desktop2ts.sh \
+ dde-file-manager/translate_ts2desktop.sh \
+ usb-device-formatter/translate_desktop2ts.sh \
+ usb-device-formatter/translate_ts2desktop.sh
+
+ fixPath ${avfs} /usr/bin/mountavfs dde-file-manager-lib/shutil/fileutils.cpp
+ fixPath ${avfs} /usr/bin/umountavfs dde-file-manager-lib/shutil/fileutils.cpp
+
+ fixPath ${deepin-terminal} /usr/bin/deepin-terminal \
+ dde-file-manager-lib/shutil/fileutils.cpp
+
+ fixPath $out /usr/share/dde-file-manager \
+ dde-sharefiles/appbase.pri \
+ dde-sharefiles/dde-sharefiles.pro
+
+ fixPath $out /usr/share/usb-device-formatter \
+ usb-device-formatter/main.cpp
+
+ fixPath $out /usr/share/applications \
+ dde-file-manager/mips/dde-file-manager-autostart.desktop \
+ dde-desktop/development.pri
+
+ fixPath $out /usr/bin \
+ dbusservices/com.deepin.dde.desktop.service \
+ dde-desktop/data/com.deepin.dde.desktop.service \
+ dde-desktop/dbus/filedialog/com.deepin.filemanager.filedialog.service \
+ dde-desktop/dbus/filemanager1/org.freedesktop.FileManager.service \
+ dde-file-manager-daemon/dbusservice/com.deepin.filemanager.daemon.service \
+ dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service \
+ dde-file-manager-daemon/dde-file-manager-daemon.pro \
+ dde-file-manager-lib/dde-file-manager-lib.pro \
+ dde-file-manager-lib/pkexec/com.deepin.pkexec.dde-file-manager.policy \
+ dde-file-manager/dde-file-manager-xdg-autostart.desktop \
+ dde-file-manager/dde-file-manager.desktop \
+ dde-file-manager/dde-file-manager.pro \
+ dde-file-manager/mips/dde-file-manager-autostart.desktop \
+ dde-file-manager/mips/dde-file-manager.desktop \
+ dde-file-manager/pkexec/com.deepin.pkexec.dde-file-manager.policy \
+ usb-device-formatter/pkexec/com.deepin.pkexec.usb-device-formatter.policy \
+ usb-device-formatter/usb-device-formatter.desktop \
+ usb-device-formatter/usb-device-formatter.pro
+ fixPath $out /etc \
+ dde-file-manager/dde-file-manager.pro \
+ dde-file-manager-daemon/dde-file-manager-daemon.pro
+
+ fixPath $out /usr \
+ common/common.pri \
+ dde-desktop/dbus/filedialog/filedialog.pri \
+ dde-desktop/dbus/filemanager1/filemanager1.pri \
+ dde-desktop/development.pri \
+ dde-dock-plugins/disk-mount/disk-mount.pro \
+ dde-file-manager-daemon/dde-file-manager-daemon.pro \
+ usb-device-formatter/usb-device-formatter.pro
+
+ sed -i -e "s,xdg-user-dir,${xdg-user-dirs}/bin/xdg-user-dir," \
+ dde-file-manager/dde-xdg-user-dirs-update
+
+ sed -i -e "s,Exec=dde-file-manager,Exec=$out/bin/dde-file-manager," \
+ dde-file-manager/dde-file-manager.desktop
+
+ sed -i -e "s,Exec=gio,Exec=${glib.bin}/bin/gio," \
+ dde-desktop/data/applications/dde-trash.desktop \
+ dde-desktop/data/applications/dde-computer.desktop
+
+ sed -i -e "s,/usr/lib/gvfs/gvfsd,${gvfs}/libexec/gvfsd," \
+ dde-file-manager-lib/gvfs/networkmanager.cpp
+
+ sed -i -e "s,/usr/sbin/smbd,${samba}/bin/smbd," \
+ -e "s,/usr/sbin/groupadd,${shadow}/bin/groupadd," \
+ -e "s,/usr/sbin/adduser,${shadow}/bin/adduser," \
+ dde-file-manager-daemon/usershare/usersharemanager.cpp
+
+ sed -i -e 's,startDetached("deepin-shortcut-viewer",startDetached("${deepin-shortcut-viewer}/bin/deepin-shortcut-viewer",' \
+ dde-file-manager-lib/controllers/appcontroller.cpp
+
+ sed -i -e 's,/bin/bash,${runtimeShell},' \
+ -e 's,\,${procps}/bin/ps,' \
+ -e 's,\,${gnugrep}/bin/grep,' \
+ utils/utils.cpp \
+ dde-file-manager-lib/controllers/fileeventprocessor.cpp
+
+ # The hard coded path in `QString("/etc/xdg/%1/%2")` in
+ # dde-file-manager-lib/interfaces/dfmsettings.cpp
+ # does not needed a fix because all the standard locations
+ # are tried before faling back to /etc/xdg.
+
+ # I do not know yet how to deal with:
+ # dde-file-manager-lib/sw_label/llsdeepinlabellibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libllsdeeplabel.so";
+ # dde-file-manager-lib/sw_label/filemanagerlibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libfilemanager.so";
+ # dde-file-manager-lib/sw_label/libinstall.sh:mkdir /usr/lib/sw_64-linux-gnu/dde-file-manager
+ # dde-file-manager-lib/sw_label/libinstall.sh:cp libfilemanager.so libllsdeeplabel.so /usr/lib/sw_64-linux-gnu/dde-file-manager
+ # They are not present on my installations of Deepin Linux, Arch Linux and Ubuntu. Can they be ignored?
+
+ # Notes:
+ # - As file-roller is looked in the path using QStandardPaths::findExecutable, it is not been added as a dependency.
+ # - deepin-qt5config is a dependency exclusive to the Deepin Linux distribution. No other distribution has it, according to repology.
+ '';
+
+ qmakeFlags = [
+ "QMAKE_CFLAGS_ISYSTEM="
+
+ # Disable ffmpeg
+ "CONFIG+=DISABLE_FFMPEG"
+ ];
+
+ preBuild = ''
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${zlib}/lib";
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11}/lib";
+ '';
+
+ postFixup = ''
+ # debuging
+ unset LD_LIBRARY_PATH
+ searchForUnresolvedDLL $out
+ searchHardCodedPaths $out
+ '';
+
+ passthru.updateScript = deepin.updateScript { inherit name; };
+
+ meta = with stdenv.lib; {
+ description = "File manager and desktop module for Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/dde-file-manager;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2710393a257cd203eaa222d58906f7aac7cf96e2
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-launcher/default.nix
@@ -0,0 +1,76 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory,
+ dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers,
+ dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras,
+ which, xdg_utils, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "dde-launcher";
+ version = "4.6.13";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1lwwn2qjbd4i7wx18mi8n7hzdh832i3kdadrivr10sbafdank7ky";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ qttools
+ wrapGAppsHook
+ deepin.setupHook
+ ];
+
+ buildInputs = [
+ dde-qt-dbus-factory
+ dde-session-ui
+ deepin-desktop-schemas
+ deepin-wallpapers
+ dtkcore
+ dtkwidget
+ gsettings-qt
+ qtsvg
+ qtx11extras
+ which
+ xdg_utils
+ ];
+
+ postPatch = ''
+ # debugging
+ searchHardCodedPaths
+
+ substituteInPlace CMakeLists.txt --replace "/usr/share" "$out/share"
+
+ substituteInPlace src/dbusservices/com.deepin.dde.Launcher.service --replace "/usr" "$out"
+
+ substituteInPlace src/historywidget.cpp --replace "xdg-open" "${xdg_utils}/bin/xdg-open"
+ substituteInPlace src/widgets/miniframebottombar.cpp --replace "dde-shutdown" "${dde-session-ui}/bin/dde-shutdown"
+ substituteInPlace src/widgets/miniframerightbar.cpp --replace "which" "${which}/bin/which"
+
+ # Uncomment (and remove space after $) after packaging deepin-manual
+ #substituteInPlace src/sharedeventfilter.cpp --replace "dman" "$ {deepin-manual}/bin/dman"
+
+ for f in src/boxframe/*.cpp; do
+ substituteInPlace $f --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg"
+ done
+
+ # note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0
+ '';
+
+ postFixup = ''
+ # debugging
+ searchHardCodedPaths $out
+ '';
+
+ passthru.updateScript = deepin.updateScript { inherit name; };
+
+ meta = with stdenv.lib; {
+ description = "Deepin Desktop Environment launcher module";
+ homepage = https://github.com/linuxdeepin/dde-launcher;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix
index f183d0e15f823bcc2783358885e992da0545c092..84c7c9207eca3b5cdc8832f366dc31b495667a32 100644
--- a/pkgs/desktops/deepin/dde-network-utils/default.nix
+++ b/pkgs/desktops/deepin/dde-network-utils/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-network-utils";
- version = "0.1.2";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1m6njld06yphppyyhygz8mv4gvq2zw0676pbls9m3fs7b3dl56sv";
+ sha256 = "0nj9lf455lf2hyqv6xwhm4vrr825ldbl83azzrrzqs6p781x65i1";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch b/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a6941e975eb41312f0cad7e5732b821cab3feaf6
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch
@@ -0,0 +1,42 @@
+From 4f457d38e9e75bc97ee7dba633bf0cdd61b8cd5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?=
+Date: Fri, 19 Apr 2019 22:01:16 -0300
+Subject: [PATCH] Use an environment variable to find plugins
+
+---
+ pluginmanager.cpp | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/pluginmanager.cpp b/pluginmanager.cpp
+index 0c03237..79bdf86 100644
+--- a/pluginmanager.cpp
++++ b/pluginmanager.cpp
+@@ -34,13 +34,19 @@ QList PluginManager::reduceGetOptions(const QString &actionID)
+ void PluginManager::load()
+ {
+
+- QDir dir("/usr/lib/polkit-1-dde/plugins/");
+- QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so")));
++ QStringList pluginsDirs = QProcessEnvironment::systemEnvironment().value("DDE_POLKIT_PLUGINS_DIRS").split(QDir::listSeparator(), QString::SkipEmptyParts);
++ pluginsDirs.append("/usr/lib/polkit-1-dde/plugins/");
+
+- for (const QFileInfo &pluginFile : pluginFiles) {
+- AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath());
+- if (plugin)
+- m_plugins << plugin;
++ for (const QString &dirName : pluginsDirs) {
++ QDir dir(dirName);
++
++ QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so")));
++
++ for (const QFileInfo &pluginFile : pluginFiles) {
++ AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath());
++ if (plugin)
++ m_plugins << plugin;
++ }
+ }
+ }
+
+--
+2.21.0
+
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
index 17b88738c36fccb5fdc74cde1170bf2cbcbaaf80..8e58ae2f684c47eaabc91b77af183d19a57df158 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-polkit-agent";
- version = "0.2.4";
+ version = "0.2.10";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1x7mv63g8412w1bq7fijsdzi8832qjb6gnr1nykcv7imzlycq9m6";
+ sha256 = "0syg121slpd6d9xpifgcf85lg9ca0k96cl1g3rjvsmczs2d2ffgf";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
index 1d9c13c17bbc1484bf5afd75c862d683f27578cb..0d063cbd8485c1ceec8dc3e50c8c289a16867b3d 100644
--- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, python3, deepin }:
+{ stdenv, fetchFromGitHub, qmake, python3, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-qt-dbus-factory";
- version = "1.1.1";
+ version = "1.1.5";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1b2i5m6fzkga72hbl85v2rng3qq53di39p7jj2f119wmlfbyp2vg";
+ sha256 = "1jzfblsmnfpgym95mmbd8mjkk8wqqfb0kz6n6fy742hmqlzrpsj7";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix
index a61a0fdbb84eb9685415e550e516e46a570a00e1..0c00627cd4fb585a52b0d342987408457027d8c7 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/dde-session-ui/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools,
- qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt,
- dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget,
- deepin-desktop-schemas, deepin, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon,
+ dde-qt-dbus-factory, deepin, deepin-desktop-schemas,
+ deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore,
+ dtkwidget, gnugrep, gsettings-qt, hicolor-icon-theme, lightdm_qt,
+ onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which,
+ xkeyboard_config, xorg, xrandr, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-session-ui";
- version = "4.9.0";
+ version = "4.9.12";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1bh7wbkzikcnka94nzqzl87cs2m6bslrv9r2hdsvqqr3aaad5za3";
+ sha256 = "00i45xv87wx9cww1d445lg6zjbhda5kki8nhsaav8gf2d4cmwzf4";
};
nativeBuildInputs = [
@@ -25,34 +27,92 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ dbus
+ dde-daemon
dde-qt-dbus-factory
+ deepin-desktop-schemas
+ deepin-icon-theme
+ deepin-wallpapers
dtkcore
dtkwidget
+ gnugrep
gsettings-qt
+ hicolor-icon-theme
lightdm_qt
+ onboard
qtsvg
qtx11extras
+ setxkbmap
+ utillinux
+ which
+ xkeyboard_config
xorg.libXcursor
xorg.libXrandr
xorg.libXtst
- xkeyboard_config
- hicolor-icon-theme
- deepin-desktop-schemas
+ xrandr
];
postPatch = ''
- searchHardCodedPaths
- patchShebangs translate_generation.sh
- patchShebangs translate_desktop.sh
- sed -i translate_desktop.sh -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
+ searchHardCodedPaths # debugging
+
+ patchShebangs translate_generation.sh translate_desktop.sh
+
+ substituteInPlace translate_desktop.sh --replace "/usr/bin/deepin-desktop-ts-convert" "deepin-desktop-ts-convert"
+
find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} +
find -type f -exec sed -i -e "s,path = /usr,path = $out," {} +
- find -type f -exec sed -i -e "s,Exec=/usr,Exec=$out," {} +
find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} +
- sed -i global_util/xkbparser.h -e "s,/usr/share/X11/xkb/rules/base.xml,${xkeyboard_config}/share/X11/xkb/rules/base.xml,"
- sed -i lightdm-deepin-greeter/scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter,"
+
+ substituteInPlace dde-osd/dde-osd_autostart.desktop --replace "Exec=/usr/lib/deepin-daemon/dde-osd" "Exec=$out/lib/deepin-daemon/dde-osd"
+ substituteInPlace dde-osd/com.deepin.dde.osd.service --replace "Exec=/usr/lib/deepin-daemon/dde-osd" "Exec=$out/lib/deepin-daemon/dde-osd"
+ substituteInPlace dde-lock/com.deepin.dde.lockFront.service --replace "Exec=/usr/bin/dde-lock" "Exec=$out/bin/dde-lock"
+ substituteInPlace dmemory-warning-dialog/com.deepin.dde.MemoryWarningDialog.service --replace "Exec=/usr/bin/dmemory-warning-dialog" "Exec=$out/bin/dmemory-warning-dialog"
+ substituteInPlace dde-warning-dialog/com.deepin.dde.WarningDialog.service --replace "Exec=/usr/lib/deepin-daemon/dde-warning-dialog" "Exec=$out/lib/deepin-daemon/dde-warning-dialog"
+ substituteInPlace dde-shutdown/com.deepin.dde.shutdownFront.service --replace "Exec=/usr/bin/dde-shutdown" "Exec=$out/bin/dde-shutdown"
+ substituteInPlace dde-welcome/com.deepin.dde.welcome.service --replace "Exec=/usr/lib/deepin-daemon/dde-welcome" "Exec=$out/lib/deepin-daemon/dde-welcome"
+ substituteInPlace session-ui-guardien/session-ui-guardien.desktop --replace "Exec=/usr/bin/session-ui-guardien" "Exec=$out/bin/session-ui-guardien"
+ substituteInPlace lightdm-deepin-greeter/lightdm-deepin-greeter.desktop --replace "Exec=/usr/bin/deepin-greeter" "Exec=$out/bin/deepin-greeter"
+ substituteInPlace misc/applications/deepin-toggle-desktop.desktop.in --replace "Exec=/usr/lib/deepin-daemon/desktop-toggle" "Exec=${dde-daemon}/lib/deepin-daemon/desktop-toggle"
+
+ # Uncomment (and remove space after $) after packaging deepin-system-monitor
+ #substituteInPlace dde-shutdown/view/contentwidget.cpp --replace "/usr/bin/deepin-system-monitor" "$ {deepin-system-monitor}/bin/deepin-system-monitor"
+
+ substituteInPlace dde-offline-upgrader/main.cpp --replace "dbus-send" "${dbus}/bin/dbus-send"
+ substituteInPlace dde-osd/kblayoutindicator.cpp --replace "dbus-send" "${dbus}/bin/dbus-send"
+ substituteInPlace dde-shutdown/view/contentwidget.cpp --replace "/usr/share/backgrounds/deepin" "${deepin-wallpapers}/share/backgrounds/deepin"
+ substituteInPlace dde-welcome/mainwidget.cpp --replace "dbus-send" "${dbus}/bin/dbus-send"
+ substituteInPlace dmemory-warning-dialog/src/buttondelegate.cpp --replace "dbus-send" "${dbus}/bin/dbus-send"
+ substituteInPlace dmemory-warning-dialog/src/buttondelegate.cpp --replace "kill" "${utillinux}/bin/dbus-send"
+ substituteInPlace global_util/xkbparser.h --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml"
+ substituteInPlace lightdm-deepin-greeter/deepin-greeter --replace "/etc/deepin/greeters.d" "$out/etc/deepin/greeters.d"
+ substituteInPlace lightdm-deepin-greeter/main.cpp --replace "/usr/share/icons/deepin" "${deepin-icon-theme}/share/icons/deepin"
+ substituteInPlace lightdm-deepin-greeter/scripts/00-xrandr --replace "egrep" "${gnugrep}/bin/egrep"
+ substituteInPlace lightdm-deepin-greeter/scripts/00-xrandr --replace "xrandr" "${xrandr}/bin/xrandr"
+ substituteInPlace lightdm-deepin-greeter/scripts/lightdm-deepin-greeter --replace "/usr/bin/lightdm-deepin-greeter" "$out/bin/lightdm-deepin-greeter"
+ substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-lock" "$out/bin/dde-lock"
+ substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-shutdown" "$out/bin/dde-shutdown"
+ substituteInPlace session-widgets/lockworker.cpp --replace "dde-switchtogreeter" "$out/bin/dde-switchtogreeter"
+ substituteInPlace session-widgets/lockworker.cpp --replace "which" "${which}/bin/which"
+ substituteInPlace session-widgets/userinfo.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin"
+ substituteInPlace widgets/fullscreenbackground.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin"
+ substituteInPlace widgets/kblayoutwidget.cpp --replace "setxkbmap" "${setxkbmap}/bin/setxkbmap"
+ substituteInPlace widgets/virtualkbinstance.cpp --replace "onboard" "${onboard}/bin/onboard"
+
# fix default background url
- sed -i widgets/*.cpp boxframe/*.cpp -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,'
+ substituteInPlace widgets/fullscreenbackground.cpp --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg"
+
+ # NOTES
+ # - on deepin linux /usr/share/icons/default/index.theme is controlled by alternatives, without an equivalent mechanism in NixOS
+ # - do not wrap dde-dman-portal related files: it appears it has been removed: https://github.com/linuxdeepin/dde-session-ui/commit/3bd028cf135ad22c784c0146e447ef34a69af768
+ '';
+
+ postFixup = ''
+ # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
+ for binary in $out/lib/deepin-daemon/*; do
+ wrapProgram $binary "''${gappsWrapperArgs[@]}"
+ done
+
+ searchHardCodedPaths $out # debugging
'';
passthru.updateScript = deepin.updateScript { inherit name; };
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a8cce9ba392357b9bb7587562bd2391668739f5d
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-anything/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux,
+ dtkcore, deepin }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "deepin-anything";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1kvyffrii4b012f6ld1ih14qrn7gg5cxbdpbkac0wxb22hnz0azm";
+ };
+
+ outputs = [ "out" "modsrc" ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ deepin.setupHook
+ ];
+
+ buildInputs = [
+ dtkcore
+ qtbase
+ udisks2-qt5
+ utillinux
+ ];
+
+ enableParallelBuilding = true;
+
+ makeFlags = [
+ "DEB_HOST_MULTIARCH="
+ "PREFIX=${placeholder ''out''}"
+ ];
+
+ postPatch = ''
+ searchHardCodedPaths # for debugging
+ fixPath $modsrc /usr/src Makefile
+ fixPath $out /usr Makefile
+ fixPath $out /usr server/tool/tool.pro
+ fixPath $out /etc server/tool/tool.pro
+ fixPath $out /usr/bin \
+ server/tool/deepin-anything-tool.service \
+ server/tool/com.deepin.anything.service \
+ server/monitor/deepin-anything-monitor.service
+ sed -e 's,/lib/systemd,$$PREFIX/lib/systemd,' -i server/monitor/src/src.pro server/tool/tool.pro
+ '';
+
+ postFixup = ''
+ searchHardCodedPaths $out # for debugging
+ searchHardCodedPaths $modsrc # for debugging
+ '';
+
+ passthru.updateScript = deepin.updateScript { inherit name; };
+
+ meta = with stdenv.lib; {
+ description = "Deepin file search tool";
+ homepage = https://github.com/linuxdeepin/deepin-anything;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5b7ca756607512f4ccde167e56f54015b6dea4de
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-calculator/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore,
+ dtkwidget, deepin }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "deepin-calculator";
+ version = "1.0.11";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "10bfq0h8v0a8i46gcbsy79l194g8sc0ysg289ndrra209fhwlidq";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ pkgconfig
+ qttools
+ deepin.setupHook
+ ];
+
+ buildInputs = [
+ dtkcore
+ dtkwidget
+ qtsvg
+ ];
+
+ postPatch = ''
+ searchHardCodedPaths # debugging
+ patchShebangs translate_generation.sh
+ fixPath $out /usr deepin-calculator.pro
+ substituteInPlace deepin-calculator.desktop --replace "Exec=deepin-calculator" "Exec=$out/bin/deepin-calculator"
+ '';
+
+ postFixup = ''
+ searchHardCodedPaths $out # debugging
+ '';
+
+ passthru.updateScript = deepin.updateScript { inherit name; };
+
+ meta = with stdenv.lib; {
+ description = "Easy to use calculator for Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/deepin-calculator;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
index b5e75c217b1e7b3a19052f8e268f6fd6cf754816..f43909f37dc18292d7f4368d89cb1522e87dbdba 100644
--- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-desktop-base";
- version = "2019.03.29";
+ version = "2019.06.19";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1d016h95nsn5yay9f4c13hixfxj0q01hpxwj2x84i6qpx63dxdwq";
+ sha256 = "1r158x4z4qalv4q1ni3aln05krdzblvr7y6wyciwl7cr5ag1i1jy";
};
nativeBuildInputs = [ deepin.setupHook ];
diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
index f0a3d711a1d7ba5cb161559169a9c6629faed04c..5849bc78ac0bd07a7d54ec826bd96ea9fe2ea153 100644
--- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-desktop-schemas";
- version = "3.13.0";
+ version = "3.13.6";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0bamjcpmsl8xhw3ksgl11wv5xwcdhrkl1namikfzc4an03sk1rdq";
+ sha256 = "03jqb47kjyb9b43m2yincfjn2i43ma1pn1hddyicrrpg937caa81";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index e0657752d102557909ecc15d096b4512701be32f..469a43efe329f61b8ad2f68d3f46e7012ca10fdf 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-gtk-theme";
- version = "17.10.10";
+ version = "17.10.11";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-gtk-theme";
rev = version;
- sha256 = "0vwly24cvjwhvda7g3l595vpf99d2z7b2zr0q5kna4df4iql7vn4";
+ sha256 = "0zs6mq70yd1k3d9zm3q6zxnw1md56r4imad5imdxwx58yxdx47fw";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
index 3b6b61c1ae76f4133da28ac2ac211d7108d4fc94..c5cf9e9ad3a8ef4ce75c824d054248d06008eb2f 100644
--- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-icon-theme";
- version = "15.12.68";
+ version = "15.12.71";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "12jgz81s5qggmnkfg9m5f799r10p43qmh4zqxl1kjvlrqgvsc9rf";
+ sha256 = "12rzzjp906np95ckbxrd4mb345lm198wz69kxy48f8q1zg78q8iw";
};
nativeBuildInputs = [ gtk3 xcursorgen ];
diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
index 7e2840f0f3f2db5daa38c51d22b673d1d81e1d41..5957478aa480447d91cea85826bba1c42ee3200a 100644
--- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-image-viewer";
- version = "1.3.10";
+ version = "1.3.17";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0paanw9sd67ic9yrbzqhrwi4bf4lpvsk16jynx99n76j3jgyijkk";
+ sha256 = "0hz4f1kqcycyvggwfzpkblhhha87rqd427hq0mf31jfh5x17ymnh";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
index 5de292805b653533f564bea4f948c5cffe06bdc6..43a124c071963a443c797dc81168a0fe63bce6df 100644
--- a/pkgs/desktops/deepin/deepin-menu/default.nix
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-menu";
- version = "3.4.1";
+ version = "3.4.8";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0aga4d4qwd7av6aa4cynhk0sidns7m7y6x0rq1swnkpr9ksr80gi";
+ sha256 = "09i0ybllymlj7s46pxma5py6x8nknfja4gxn5gj9kpf2c37qsqjc";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index 8a675ca1169ea67457b423f6b44db04e1bae95a1..cdf3019e5fe1b5c30f1dbfc16f4e08d2cc81336b 100644
--- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
+++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
@@ -5,15 +5,17 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-movie-reborn";
- version = "3.2.21";
+ version = "3.2.24";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "09a4sirbdxnrwj9ww2v7b1s9ylsincqzpqm2zisny9zxy22fm8s9";
+ sha256 = "16mxym7dm6qk90q2w7xqm62047rq0lirrjmnnpaxshzaww9gngkh";
};
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [
cmake
pkgconfig
diff --git a/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch b/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4a57b501e01e26d56f8d2c13048875a429b3c5d6
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch
@@ -0,0 +1,41 @@
+From 8eeb4febcae517080d6638f8953e02335df79f01 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?=
+Date: Sat, 20 Apr 2019 00:28:47 -0300
+Subject: [PATCH] Get plugins dir from environment variable
+
+---
+ src/compositor/meta-plugin-manager.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c
+index ac5716db..d000100b 100644
+--- a/src/compositor/meta-plugin-manager.c
++++ b/src/compositor/meta-plugin-manager.c
+@@ -56,14 +56,22 @@ meta_plugin_manager_set_plugin_type (GType gtype)
+ void
+ meta_plugin_manager_load (const gchar *plugin_name)
+ {
+- const gchar *dpath = MUTTER_PLUGIN_DIR "/";
++ const gchar *env_var;
++ const gchar *dpath;
+ gchar *path;
+ MetaModule *module;
+
++ env_var = g_getenv ("DEEPIN_MUTTER_PLUGINS_DIR");
++ g_debug ("$DEEPIN_MUTTER_PLUGINS_DIR: %s\n", env_var);
++
++ dpath = env_var == NULL || strlen (env_var) == 0 ? MUTTER_PLUGIN_DIR : env_var;
++ g_debug ("dpath: %s\n", dpath);
++
+ if (g_path_is_absolute (plugin_name))
+ path = g_strdup (plugin_name);
+ else
+- path = g_strconcat (dpath, plugin_name, ".so", NULL);
++ path = g_strconcat (dpath, "/", plugin_name, ".so", NULL);
++ g_debug ("path: %s\n", path);
+
+ module = g_object_new (META_TYPE_MODULE, "path", path, NULL);
+ if (!module || !g_type_module_use (G_TYPE_MODULE (module)))
+--
+2.21.0
+
diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix
index fc26440a3ef17f7cc5841914298dc899fa33f796..83afe1ee24f729b9cd1356dddea7f572029c3ffb 100644
--- a/pkgs/desktops/deepin/deepin-mutter/default.nix
+++ b/pkgs/desktops/deepin/deepin-mutter/default.nix
@@ -44,8 +44,13 @@ stdenv.mkDerivation rec {
xorg.libxkbfile
];
+ patches = [
+ ./deepin-mutter.plugins-dir.patch
+ ];
+
postPatch = ''
- searchHardCodedPaths
+ searchHardCodedPaths # debugging
+ sed -i -e "s,Exec=deepin-mutter,Exec=$out/bin/deepin-mutter," data/mutter.desktop.in
'';
configureFlags = [
@@ -57,6 +62,10 @@ stdenv.mkDerivation rec {
NOCONFIGURE=1 ./autogen.sh
'';
+ postFixup = ''
+ searchHardCodedPaths $out # debugging
+ '';
+
enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix
index 6585bc78c5887be609c2bee5704fc4f21d79d57f..4096df661909a584817860d710a2d581e45896d8 100644
--- a/pkgs/desktops/deepin/deepin-screenshot/default.nix
+++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-screenshot";
- version = "4.1.8";
+ version = "4.2.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1zhjchflgws2q74b9fgdjy2wzifjhimnrrq1sxlv395793xv8lrr";
+ sha256 = "16wy1ywp4lm7fg488laqxgxpir745rbpj9z410r6x7krpgjds189";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 74337974accad87955213a9581fa8266d0756d32..937c1f0d2184f6d6131dd9bce3dfee8fde919564 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux,
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-terminal";
- version = "3.2.1.2";
+ version = "3.2.6";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-terminal";
rev = version;
- sha256 = "0dj386csbiw0yqz9nj6ij0s4d0ak9lpq2bmsfs17bjkgdp0ayp90";
+ sha256 = "09s5gvzfxfb353kb61x1b6z3h2aqgln3s3mah3f3zkf5y8hrp2pj";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix
index 6a343f816b94a3e879e03c828afd32db467e2f3b..d5702a55d903d37386639fbe915b88dcc8ada27a 100644
--- a/pkgs/desktops/deepin/deepin-turbo/default.nix
+++ b/pkgs/desktops/deepin/deepin-turbo/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-turbo";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "13vbj18pclv7c25pb1y5x6dd7wmcgisa40mb13qyixnzpq2ssjg5";
+ sha256 = "15l0pgszmbirlaxj04ishj43kyvigsl1yaf58kxlbdb3lkmcp5f3";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix
index d1ae0557aaa76dcf9acae8629c903e92f2be3144..986bee2f0dd26df9248ea500d0d980e66dffd5db 100644
--- a/pkgs/desktops/deepin/deepin-wm/default.nix
+++ b/pkgs/desktops/deepin/deepin-wm/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3,
- bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, libwnck3,
- deepin-menu, deepin-mutter, deepin-wallpapers,
+ dbus, bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3,
+ libwnck3, deepin-menu, deepin-mutter, deepin-wallpapers,
deepin-desktop-schemas, wrapGAppsHook, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-wm";
- version = "1.9.37";
+ version = "1.9.38";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1xd2x0kyav2cxnk0bybl7lrmak1r2468slxz5a6anrdriw9l10gi";
+ sha256 = "1qhdnv4x78f0gkr94q0j8x029fk9ji4m9jdipgrdm83pnahib80g";
};
nativeBuildInputs = [
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
clutter-gtk
+ dbus
deepin-desktop-schemas
deepin-menu
deepin-mutter
@@ -40,10 +41,15 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- searchHardCodedPaths
- fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala
+ searchHardCodedPaths # debugging
+
# fix background path
+ fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala
sed -i 's|default_background.jpg|deepin/desktop.jpg|' src/Background/BackgroundSource.vala
+
+ # fix executable paths in desktop files
+ sed -i -e "s,Exec=dbus-send,Exec=${dbus}/bin/dbus-send," data/gala-multitaskingview.desktop.in
+ sed -i -e "s,Exec=deepin-wm,Exec=$out/bin/deepin-wm," data/gala.desktop
'';
NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE";
@@ -52,6 +58,10 @@ stdenv.mkDerivation rec {
NOCONFIGURE=1 ./autogen.sh
'';
+ postFixup = ''
+ searchHardCodedPaths $out # debugging
+ '';
+
enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 6a1fb5d97b7b4af0a88e8df894b768fb77896169..5d68396a49804375fc3de5acb15f6581e0d05b12 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -9,12 +9,17 @@ let
dbus-factory = callPackage ./dbus-factory { };
dde-api = callPackage ./dde-api { };
dde-calendar = callPackage ./dde-calendar { };
+ dde-control-center = callPackage ./dde-control-center { };
dde-daemon = callPackage ./dde-daemon { };
dde-dock = callPackage ./dde-dock { };
+ dde-file-manager = callPackage ./dde-file-manager { };
+ dde-launcher = callPackage ./dde-launcher { };
dde-network-utils = callPackage ./dde-network-utils { };
dde-polkit-agent = callPackage ./dde-polkit-agent { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
+ deepin-anything = callPackage ./deepin-anything { };
+ deepin-calculator = callPackage ./deepin-calculator { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };
deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix
index 4081a40a96e268ad521a984fab16a1196260a9c2..a0ed5c04e1852a13d4e5544fff49d6b643069980 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/dtkcore/default.nix
@@ -3,19 +3,20 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dtkcore";
- version = "2.0.10";
+ version = "2.0.14";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0dwpq6c38gaa95mgjnwj3vjz57n0cz6jfk950xi6s9ww2f4g6kq7";
+ sha256 = "0yc6zx8rhzg9mj2brggcsr1jy1pzfvgqy1h305y2dwnx5haazd04";
};
nativeBuildInputs = [
pkgconfig
qmake
pythonPackages.wrapPython
+ deepin.setupHook
];
buildInputs = [
@@ -23,21 +24,21 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- # Only define QT_HOST_DATA if it is empty
- sed '/QT_HOST_DATA=/a }' -i src/dtk_module.prf
- sed '/QT_HOST_DATA=/i isEmpty(QT_HOST_DATA) {' -i src/dtk_module.prf
+ searchHardCodedPaths # debugging
# Fix shebang
sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env,"
'';
- preConfigure = ''
- qmakeFlags="$qmakeFlags QT_HOST_DATA=$out"
- '';
+ qmakeFlags = [
+ "DTK_VERSION=${version}"
+ "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs"
+ ];
postFixup = ''
chmod +x $out/lib/dtk2/*.py
wrapPythonProgramsIn "$out/lib/dtk2" "$out $pythonPath"
+ searchHardCodedPaths $out # debugging
'';
enableParallelBuilding = true;
diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix
index b55a5fbc9fe9c9b936b4079ad8231f9c146ea3d8..4992519f832603d9546bdfb67c65f7434aaeff14 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dtkwidget";
- version = "2.0.10";
+ version = "2.0.14";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "11a7yirfkcj3rq7va9av4m1pr22mq1yx1j9k18xrqv36n0rlbrr6";
+ sha256 = "11ws0rl7rhlgwbqd4nqpqxhngf4lcyfrrdq33wzxwdlk33d69i1h";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
index 7154ae3da6a9f4f4eb93e1a47b756455c7ef29ba..c0834ace8f8c96f5f8364629c223377f5877cf16 100644
--- a/pkgs/desktops/deepin/dtkwm/default.nix
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dtkwm";
- version = "2.0.9";
+ version = "2.0.11";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0vkx6vlz83pgawhdwqkwpq3dy8whxmjdzfpgrvm2m6jmspfk9bab";
+ sha256 = "10l89i84vsh5knq9wg2php7vfg5rj5c9hrrl9rjlcidn1rz8yx6f";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
index ad2926fa403fd72dc272e2ebd4c6eaaa38dc7236..044d5e2a2eafb521910b3037573e0d59302fd85f 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-dbus-factory";
- version = "0.4.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1i1ymi2qpcbf4d6rnfzrbq5n2vwnn8dvbq9xlw7jls3jpr3d5r00";
+ sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f";
};
makeFlags = [ "PREFIX=${placeholder ''out''}" ];
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index 03c906585e3d7cc19c0373916857f40de49861bb..4b79969970a82e4be63d449911d02f5e1c818424 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, pkgconfig, go, gobject-introspection,
- libgudev, deepin, fetchurl }:
+ libgudev, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-gir-generator";
- version = "2.0.0";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0d93qzp3dlia5d1yxw0rwca76qk3jyamj9xzmk13vzig8zw0jx16";
+ sha256 = "1ydzll8zlk897iqcihvv6p046p0rzr4qqz2drmz2nx95njp8n03a";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index 41315c4409011574042d14a546542f5165aba225..a6282b979f76b42c9cfb3a122264bbdc057b6531 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-lib";
- version = "1.10.0";
+ version = "1.10.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "090l33y79gdj2xy1bhk2ksl6hvmsfhmx0bhygm4y4d0iqckf2x2m";
+ sha256 = "05z7ayl23cm8mbn4vkn3isy5kgwxljc26ifmzrhmnqm5yibd6lsf";
};
buildInputs = [
diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix
index 18d64c5645ca84558682e870031143cf90ff9de8..8e75917907ac106db30df3015cf6f4acdfa1d0e7 100644
--- a/pkgs/desktops/deepin/qcef/default.nix
+++ b/pkgs/desktops/deepin/qcef/default.nix
@@ -1,9 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools,
- qtwebchannel, qtx11extras, dtkcore, dtkwidget, qt5integration,
- libXScrnSaver, gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus,
- expat, fontconfig, gdk_pixbuf, glib, gtk2, libX11, libXcomposite,
- libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr,
- libXrender, libXtst, libxcb, pango, pulseaudio, xorg, deepin }:
+ qtwebchannel, qtx11extras,
+ gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus,
+ expat, fontconfig, gdk_pixbuf, glib, gtk2,
+ libxcb, pango, pulseaudio, xorg, deepin }:
let
rpahtLibraries = [
@@ -42,14 +41,14 @@ in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qcef";
- version = "1.1.4.6";
+ version = "1.1.6";
srcs = [
(fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "06909sd0gf7n4hw6p4j96apjym219zabflgpwjafm7v00bgnwxxs";
+ sha256 = "1x0vb4nkfa1lq0nh6iqpxfvsqmb6qfn305pbc92bsqpgiqd7jvb1";
name = pname;
})
(fetchFromGitHub {
@@ -99,6 +98,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/linuxdeepin/qcef;
license = licenses.lgpl3;
platforms = platforms.linux;
+ badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available
maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index 7d2c89165087afa24f67ca59a2eccac39b323a6d..2e6ddfcdb2ddc5af59a6404cf5d9f9b2b45bb42e 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qt5dxcb-plugin";
- version = "1.1.25";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1nadmj1hdpw4n3kpk3dlx22bmxdli66abhjl73hwrbvszmmcm9vp";
+ sha256 = "1zvab6qxdr49pmk6mbk7s0md7bx585p32lca0xbg8mrkajz7g8rq";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix
index 634bac5cf97dd04f885a3618082b1e2d14d3f588..7df1fdf3165aa69fe0a1e39eddda68069ea5887c 100644
--- a/pkgs/desktops/deepin/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/qt5integration/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt ,
- lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype ,
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev ,
+ lxqt, qtx11extras, qtmultimedia, qtsvg ,
qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qt5integration";
- version = "0.3.8";
+ version = "0.3.12";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "12d6iv2x0q2n73rscma30q31nh7h26gmhlf665gkgl2j825hlx5n";
+ sha256 = "140wb3vcm2ji8jhqdxv8f4shiknia1zk8fssqlp09kzc1cmb4ncy";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/setup-hook.sh b/pkgs/desktops/deepin/setup-hook.sh
index 63a43bb58407ebe4e27cdec8b3b2568b9067b591..ce1d7330a22213a8e125642b0a3291c4b1a32ba3 100755
--- a/pkgs/desktops/deepin/setup-hook.sh
+++ b/pkgs/desktops/deepin/setup-hook.sh
@@ -1,17 +1,28 @@
# Helper functions for deepin packaging
searchHardCodedPaths() {
- # looks for ocurrences of hard coded paths in given (current)
- # directory and command invocations for the purpose of debugging a
- # derivation
+ # Usage:
+ #
+ # searchHardCodedPaths [-a] []
+ #
+ # Looks for ocurrences of FHS hard coded paths and command
+ # invocations in the given path (default: current directory) for
+ # the purpose of debugging a derivation. The option -a enables
+ # processing binary files as if they were text.
+
+ local binary
+ if [ "$1" = "-a" ]; then
+ binary="-a"
+ shift
+ fi
- local dir=$1
+ local path=$1
- echo ----------- looking for command invocations
- grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true
+ echo ----------- looking for command invocations in $path
+ grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $path || true
- echo ----------- looking for hard coded paths
- grep --color=always -a -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true
+ echo ----------- looking for hard coded paths in $path
+ grep --color=always $binary -r -E '/(usr|bin|sbin|etc|var|opt)\>' $path || true
echo ----------- done
}
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix
index f4dae7790618f6eefbe071a1c5a5d966d682a71c..b0f5aaee97c0ec71adacd050cdf9a9a8c29ed6e2 100644
--- a/pkgs/desktops/deepin/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, deepin }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix
index 60e63dc68ed99d40cdc18efefe4a80ed71b51702..8e73682065d3878849a14eeb4299126e32a780f5 100644
--- a/pkgs/desktops/enlightenment/econnman.nix
+++ b/pkgs/desktops/enlightenment/econnman.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A user interface for the connman network connection manager";
- homepage = http://enlightenment.org/;
+ homepage = https://enlightenment.org/;
maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 0ab50bd53f05c136b418fe196e8791041ccd524e..a7f5eaf63392a336edf2f0e4eff796f354d42538 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -3,21 +3,21 @@
, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit
, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
, dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
-, curl, libinput, systemd, mesa_noglu, writeText, gtk3
+, curl, libinput, systemd, mesa, writeText, gtk3
}:
stdenv.mkDerivation rec {
name = "efl-${version}";
- version = "1.22.1";
+ version = "1.22.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
- sha256 = "04mfjvaxi36b7r6kn4n0nq2gj97cbldk9iqnr5pf8jnm8plyblr0";
+ sha256 = "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n";
};
nativeBuildInputs = [ pkgconfig gtk3 ];
- buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu
+ buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa
giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.xorgproto
xorg.libX11 udev systemd ];
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Enlightenment foundation libraries";
- homepage = http://enlightenment.org/;
+ homepage = https://enlightenment.org/;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
diff --git a/pkgs/desktops/enlightenment/elementary.patch b/pkgs/desktops/enlightenment/elementary.patch
deleted file mode 100644
index 32080c81cb38d97b5de2d1f25175b36d2db5412b..0000000000000000000000000000000000000000
--- a/pkgs/desktops/enlightenment/elementary.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/elementary.pc.in 2015-05-16 21:08:14.321148417 +0200
-+++ b/elementary.pc.in 2015-05-16 21:08:30.643412725 +0200
-@@ -14,4 +14,4 @@
- Requires.private: @requirement_elm_pc@
- Version: @VERSION@
- Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@
--Cflags: -I${includedir}/elementary-@VMAJ@
-+Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_PC_CFLAGS@
---- a/Makefile.am 2015-05-16 21:08:14.322148433 +0200
-+++ b/Makefile.am 2015-05-16 21:08:30.643412725 +0200
-@@ -84,6 +84,7 @@
- -e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \
- -e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \
- -e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \
-+-e 's,@ELEMENTARY_PC_CFLAGS\@,$(ELEMENTARY_PC_CFLAGS),g' \
- < $< > $@ || rm $@
-
- pc_verbose = $(pc_verbose_@AM_V@)
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 8edf702a24c69a6070c305cb69a92483ddd61a87..07aac3d611b7d057bda1b4eb8abd8463706f5eaa 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
- luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_noglu,
+ luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa,
xkeyboard_config, pcre
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
libpthreadstubs
gdbm
pcre
- mesa_noglu
+ mesa
xkeyboard_config
] ++
stdenv.lib.optionals stdenv.isLinux [ libcap ];
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
# installer to try to do this, the file $out/e-wrappers.nix is created,
# containing the needed configuration for wrapping those programs. It
# can be used in the enlightenment module. The idea is:
- #
+ #
# 1) rename the original binary adding the extension .orig
# 2) wrap the renamed binary at /run/wrappers/bin/
# 3) create a new symbolic link using the original binary name (in the
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index ad4620d4f450e7f73f7f7683e3623325c1205e51..409b3f7bb8dd2aa605e8ee12f0091a3b59776436 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }:
stdenv.mkDerivation rec {
name = "ephoto-${version}";
version = "1.5";
-
+
src = fetchurl {
url = "http://www.smhouston.us/stuff/${name}.tar.gz";
sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
(pkgconfig.override { vanilla = true; })
- mesa_noglu.dev # otherwise pkg-config does not find gbm
+ mesa.dev # otherwise pkg-config does not find gbm
makeWrapper
];
diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix
index e7dfb5ca39895519bd9d98ff541f584837d500bd..a1de3f9513125934e40d6dab2089c248a6abd77d 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa_noglu, wrapGAppsHook }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "rage-${version}";
version = "0.3.0";
-
+
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz";
sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meson
ninja
(pkgconfig.override { vanilla = true; })
- mesa_noglu.dev
+ mesa.dev
wrapGAppsHook
];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Video + Audio player along the lines of mplayer";
- homepage = http://enlightenment.org/;
+ homepage = https://enlightenment.org/;
maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;
diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 5c8aba4d882f65fcbc99860b07cedb0c6b3ee846..92d36c0e772ffa9cc6cb7207fcb6cff30bcab302 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa, makeWrapper }:
stdenv.mkDerivation rec {
- name = "terminology-${version}";
- version = "1.4.0";
+ pname = "terminology";
+ version = "1.4.1";
src = fetchurl {
- url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
- sha256 = "0q1y7fadj42n23aspx9y8hm4w4xlc316wc3415wnf75ibsx08ngd";
+ url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0mm9v5a94369is3kaarnr3a28wy42wslzi1mcisaidlcldgv7f6p";
};
nativeBuildInputs = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
efl
pcre
- mesa_noglu
+ mesa
];
meta = {
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index b1a2d6ae7faf9e380bcfbc8d6898bcb5450211f4..95e6d0f12b03f5e28f21377cca4b50b71b422a46 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -47,9 +47,9 @@ lib.makeScope pkgs.newScope (self: with self; {
libbonoboui = callPackage ./platform/libbonoboui { };
- gtkhtml = callPackage ./platform/gtkhtml { };
+ gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; };
- gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { };
+ gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant1; };
gtkglext = callPackage ./platform/gtkglext { };
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
index 493f88290f3a1f5334dddd17841cebaa8c188c1b..3ea04048accce9f8ac0f7741a39a65b0760db983 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, intltool,
-GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }:
+{ stdenv, fetchurl, pkgconfig, gtk3, intltool
+, GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
version = "4.10.0";
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index efff8f846b946be415556dc14d7095dbea083bfb..9a70319952cfc675ce25f40ab9b3752aa44f8f1d 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -1,27 +1,59 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection
-, itstool, libxml2, python3Packages, at-spi2-core
-, dbus, gettext, libwnck3 }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, gnome3
+, gtk3
+, wrapGAppsHook
+, gobject-introspection
+, itstool
+, libxml2
+, python3
+, at-spi2-core
+, dbus
+, gettext
+, libwnck3
+, adwaita-icon-theme
+}:
-stdenv.mkDerivation rec {
+ python3.pkgs.buildPythonApplication rec {
name = "accerciser-${version}";
- version = "3.32.1";
+ version = "3.32.3";
+
+ format = "other";
src = fetchurl {
url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0afzhbig5yw87zyfmid61368jj8l6i7k8gs29x0hv65fz4yiv4h4";
+ sha256 = "0ark4qkfvdggz2mbksq12iq55izdsjnkjqkvfnnkf4k5vfpa95y5";
};
nativeBuildInputs = [
- pkgconfig wrapGAppsHook itstool gettext
+ gettext
gobject-introspection # For setup hook
+ itstool
+ libxml2
+ pkgconfig
+ dbus
+ wrapGAppsHook
];
+
buildInputs = [
- gtk3 libxml2 python3Packages.python python3Packages.pyatspi
- python3Packages.pygobject3 python3Packages.ipython
- at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme
+ adwaita-icon-theme
+ at-spi2-core
+ gtk3
+ libwnck3
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ ipython
+ pyatspi
+ pycairo
+ pygobject3
+ xlib
];
- wrapPrefixVariables = [ "PYTHONPATH" ];
+ # Strict deps breaks accerciser
+ # and https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index a423dd85887c9466225758d3e6bd8d660c28fefe..b82c1b2dfe58f385f56559db87e6823c35cca88e 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -1,41 +1,111 @@
-{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server
-, adwaita-icon-theme, gnome-desktop, libgdata
-, libgweather, glib-networking, gsettings-desktop-schemas
-, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite
-, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
-, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
-
-let
- version = "3.32.1";
-in stdenv.mkDerivation rec {
- name = "evolution-${version}";
+{ stdenv
+, cmake
+, ninja
+, intltool
+, fetchurl
+, libxml2
+, webkitgtk
+, highlight
+, pkgconfig
+, gtk3
+, glib
+, libnotify
+, gtkspell3
+, evolution-data-server
+, adwaita-icon-theme
+, gnome-desktop
+, libgdata
+, libgweather
+, glib-networking
+, gsettings-desktop-schemas
+, wrapGAppsHook
+, itstool
+, shared-mime-info
+, libical
+, db
+, gcr
+, sqlite
+, gnome3
+, librsvg
+, gdk_pixbuf
+, libsecret
+, nss
+, nspr
+, icu
+, libcanberra-gtk3
+, bogofilter
+, gst_all_1
+, procps
+, p11-kit
+, openldap
+}:
+
+stdenv.mkDerivation rec {
+ pname = "evolution";
+ version = "3.32.3";
src = fetchurl {
- url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0ns76w6vwv5k1nxpaqrizp1pnm89xzfgs60i6cwwfs35zqlmb7iq";
+ url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0ghwi4mmx6l28dkjx7ayiqcrvmfakqfiyvdg6946v5dcimgsclxn";
};
- propagatedUserEnvPkgs = [ evolution-data-server ];
+ nativeBuildInputs = [
+ cmake
+ intltool
+ itstool
+ libxml2
+ ninja
+ pkgconfig
+ wrapGAppsHook
+ ];
buildInputs = [
- gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu
- evolution-data-server libsecret libical gcr
- webkitgtk shared-mime-info gnome-desktop gtkspell3
- libcanberra-gtk3 bogofilter libgdata sqlite
- gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
- nss nspr libnotify procps highlight libgweather
+ adwaita-icon-theme
+ bogofilter
+ db
+ evolution-data-server
+ gcr
+ gdk_pixbuf
+ glib
+ glib-networking
+ gnome-desktop
gsettings-desktop-schemas
- glib-networking openldap
+ gst_all_1.gst-plugins-base
+ gst_all_1.gstreamer
+ gtk3
+ gtkspell3
+ highlight
+ icu
+ libcanberra-gtk3
+ libgdata
+ libgweather
+ libical
+ libnotify
+ librsvg
+ libsecret
+ nspr
+ nss
+ openldap
+ p11-kit
+ procps
+ shared-mime-info
+ sqlite
+ webkitgtk
];
- nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];
+ propagatedUserEnvPkgs = [
+ evolution-data-server
+ ];
cmakeFlags = [
"-DENABLE_AUTOAR=OFF"
"-DENABLE_LIBCRYPTUI=OFF"
- "-DENABLE_YTNEF=OFF"
"-DENABLE_PST_IMPORT=OFF"
+ "-DENABLE_YTNEF=OFF"
+ ];
+
+ requiredSystemFeatures = [
+ "big-parallel"
];
doCheck = true;
@@ -49,8 +119,6 @@ in stdenv.mkDerivation rec {
PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules";
- requiredSystemFeatures = [ "big-parallel" ];
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Evolution;
description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index f767e309a65a32c45ea878ebc1936b19fd06c43d..2dcd265e2e481fd2a23312b165424b12cce96524 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "gedit-${version}";
- version = "3.32.0";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1lray9vvbcrnhjv5cr5fc4bqfd68km2x79cj50byyqn9cnlf5qn9";
+ sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl";
};
nativeBuildInputs = [
@@ -32,10 +32,6 @@ stdenv.mkDerivation rec {
patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl
'';
- mesonFlags = [
- "--buildtype=plain" # don't require git
- ];
-
# Reliably fails to generate gedit-file-browser-enum-types.h in time
enableParallelBuilding = false;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
index b9fb2dc05a06ea4fd612c3660dd8f8baf49abf24..6edf86ec552b87f78c1bf06ad1617262de9311b6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
@@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4";
};
- mesonFlags = [
- "--buildtype=plain"
- ];
-
nativeBuildInputs = [
meson ninja pkgconfig gettext libxslt desktop-file-utils
docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index a983c59d192e77400e9419e293fab629403b3922..2a308a2da450a6b81fbd3d4f8f83f8eecea16da3 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -2,20 +2,20 @@
, glib, gobject-introspection, libxml2, gtk3, gtk-vnc, freerdp, libvirt, spice-gtk, python3
, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
-, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
+, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, libsecret
, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
}:
# TODO: ovirt (optional)
let
- version = "3.32.0.2";
+ version = "3.32.1";
in stdenv.mkDerivation rec {
name = "gnome-boxes-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1239x1bbkn0gxxq82zpvjjr7srla2d5ghi5rqwxnhsab0c2ypswk";
+ sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4";
};
doCheck = true;
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
];
preFixup = ''
- gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}")
+ gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}")
'';
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 3244fa639c2fc853fca0337d479551696dd0efa3..03619f38c9ba8babd0bb2a7c209f4ea30bde26cb 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -4,13 +4,13 @@
let
pname = "gnome-calendar";
- version = "3.32.1";
+ version = "3.32.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1wip968nvp1yj34hbpc3wjbrmrgjm1f82ag5ngv90z38953vi9vl";
+ sha256 = "07p73cvzj8idr80npja5yiv9pjfyi6qqfhaz5jwcgqspqbnhnl7k";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 4491d60a5adece1e882f8b594b6f62231acbc7c7..e0f28bc3446d72f577617e83c6845f7e5f5085cf 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, meson, ninja, gettext, fetchurl, fetchpatch, evince, gjs
+{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs
, pkgconfig, gtk3, glib, tracker, tracker-miners
, itstool, libxslt, webkitgtk, libgdata
, gnome-desktop, libzapojit, libgepub
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgetting-started=true"
- "--buildtype=plain"
];
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index b3b9fb0dddd6a6dcd74cabc595e172c095dd91ed..25faf2676b827d3a17658b52261239668a80a10c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,13 +5,13 @@
let
pname = "gnome-maps";
- version = "3.32.1";
+ version = "3.32.2.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1q15qsp0ca67y4l0x31518cfakrj85x9g0cbcm0wysnbddi1aik0";
+ sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 4e601849a35f9a5dd40d45b237dcc9b70e828be5..1f1bfafb5950f3af2494510a321325dad4c0861b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
- version = "3.32.1";
+ version = "3.32.2";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "11fdij1jznjsph1q5rkkvdhikzdh2lls921lv2m2di9x7i2xn3h4";
+ sha256 = "0cn7l1d3ayima1w3bxpshijabd7ibhnvqxv2mpvffzizk04ln6hk";
};
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
index 9bc71bb43389627602fbaae09c9e91322e9e9fdd..37401af3ce6027a5880bb0862c39c82c39b22a4e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
@@ -2,10 +2,11 @@
, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
stdenv.mkDerivation rec {
- name = "gnome-nettool-3.8.1";
+ pname = "gnome-nettool";
+ version = "3.8.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
};
@@ -17,8 +18,16 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ nmap inetutils ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ versionPolicy = "none";
+ };
+ };
+
meta = with stdenv.lib; {
- homepage = http://projects.gnome.org/gnome-network;
+ homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool";
description = "A collection of networking tools";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 0a33a3bff55966879d8c40b3a6f74dbedabde9d4..9d08cc24aadb20e3e5af489b11914956b263152e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -34,10 +34,6 @@ in stdenv.mkDerivation rec {
dbus
];
- mesonFlags = [
- "--buildtype=plain" # don't do any git commands
- ];
-
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
index c9e6356aac6cfc1eac373fce21d798872e6c1b4f..fbf80fc32e84a41376785f7a99ee2bc15d45aade 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3
+{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3
, meson, ninja, python3, hicolor-icon-theme, desktop-file-utils }:
stdenv.mkDerivation rec {
pname = "gnome-sound-recorder";
- version = "3.32.0";
+ version = "3.32.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0rchzap5mg9ach3jcf4sci5v2h5pgpdjafjfllfd09w9yg3brspp";
+ sha256 = "0q83b6dabckmwj8mcw0wvhbxaszwdzzcf8ajx5bldll3lyl5yh2b";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
index 4ae3b629af9cbd229b6cde8692c71b7cc84775eb..dbbbb43659ba3924ab9be7edbb6c16288320190a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
@@ -13,7 +13,6 @@
, libpeas
, gnome-online-accounts
, gsettings-desktop-schemas
-, adwaita-icon-theme
, evolution-data-server
, libxml2
, libsoup
@@ -38,6 +37,10 @@ stdenv.mkDerivation rec {
sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy";
})
];
+ postPatch = ''
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+ '';
nativeBuildInputs = [
meson
@@ -64,10 +67,9 @@ stdenv.mkDerivation rec {
json-glib
];
- postPatch = ''
- chmod +x meson_post_install.py
- patchShebangs meson_post_install.py
- '';
+ # Fix parallel building: missing dependency from src/gtd-application.c
+ # Probably remove for 3.30+ https://gitlab.gnome.org/GNOME/gnome-todo/issues/170
+ preBuild = "ninja src/gtd-vcs-identifier.h";
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index cf056ca784132c654862e0044297a09d79a69c14..73b8016d97b489c33bff68aba4ff822f3686163d 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -5,13 +5,13 @@
let
pname = "polari";
- version = "3.32.1";
+ version = "3.32.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0z2dxj1hd798jn79y9a7lkb77lm8l7y5fsqh9g6lbr7pnmg559yk";
+ sha256 = "0h0w9j3y067l911gpj446b3a2w1i2vzr1w2a7cz7i5rhn6qkf2sp";
};
propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index b3feb230d0f4032c15dd9cb6383b5c4514300941..a1bcb406eb3a00cf64ca16b312802256d1702d8a 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "seahorse";
- version = "3.32.1";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1nh2gahiixj661a3l008yhidx952q50fqgdckg8l0d237wnwp7f6";
+ sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index e20804d9e6213899296b5f425ea1790400d42d6b..43f8dd08dbffeb5f02c384b7bbfe7c0a7f0916ba 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
"-Dgtk_doc=true"
];
- doCheck = !stdenv.isAarch64;
+ doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin;
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 7fd092c1efa44fac687bf4eae85e3e74764518a1..5c896ec01fc0be2137398d39bb5fdaa3ab75cac4 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -4,13 +4,13 @@
let
pname = "eog";
- version = "3.32.1";
+ version = "3.32.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "165axw63c2l5qk5k2xs7g9d97xnxf5a4br0hdb8s3bpv7lf5nw8q";
+ sha256 = "1bcxpqgzlk2cy4wfb3b5h66mhpj2fhrk1rrb5qqcv5xrr62ik5xy";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 641cfa5236fd14930098780c121488c3d86daa07..f4e87b50906baef34d82f890b808e3c365c26dfa 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "epiphany-${version}";
- version = "3.32.2";
+ version = "3.32.3";
src = fetchurl {
url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1yhc8hpylj7i2i15nrbjldhi38xpz7pdwjdj7b358dxsxaghvrwa";
+ sha256 = "0gx386k1p78ppjhvdanv99hfiwana0ccn9d499qrp0rvlicnijrw";
};
# Tests need an X display
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 4b0ae91d78f50a105dc2b27fc82db34c10e78a29..68beb0e47e356ad86a2485625d0127b3b8b9eef4 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -1,5 +1,6 @@
{ fetchFromGitLab
, stdenv
+, fetchpatch
, meson
, ninja
, pkgconfig
@@ -50,6 +51,15 @@ stdenv.mkDerivation rec {
sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r";
};
+
+ patches = [
+ (fetchpatch {
+ name = "CVE-2019-11459.patch";
+ url = "https://gitlab.gnome.org/GNOME/evince/commit/3e38d5ad724a042eebadcba8c2d57b0f48b7a8c7.patch";
+ sha256 = "1ds6iwr2r9i86nwrly8cx7p1kbvf1gljjplcffa67znxqmwx4n74";
+ })
+ ];
+
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
@@ -94,7 +104,6 @@ stdenv.mkDerivation rec {
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]);
mesonFlags = [
- "-Dauto_features=enabled"
"-Dnautilus=false"
"-Dps=enabled"
"-Dgtk_doc=false"
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index da99fb68b85879e8185bc6861c33cdd60b1dcef2..8075d5d480594678eb3fd94f82aceb1352cc1e24 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "evolution-data-server-${version}";
- version = "3.32.1";
+ version = "3.32.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0jb8d2a4kzz7an7d3db8mfpvhb6r1wrp8dk11vpa3jby60cxbbyd";
+ sha256 = "1sx2ywvvwbmphrlqq62srd235ihsj8864d9g8kcbcxwrvn2z70b4";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 8313438117379e1796819cf0ef1cb84786faa7c1..420a0d3e6b11c881140afe89f353b0c7d54e8b3c 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
, accountsservice, libX11, gnome3, systemd, autoreconfHook
, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
-, librsvg, coreutils, xwayland, fetchpatch }:
+, librsvg, coreutils, xwayland }:
stdenv.mkDerivation rec {
name = "gdm-${version}";
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 25c3cef3f6a42a4986d658db0be37e5e8a5f9b00..ef4de3699151433967ba1a8145f1f2c5e082ca42 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gjs-${version}";
- version = "1.56.1";
+ version = "1.56.2";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0wylq6r0c0gf558hridlyly84vb03qzdrfph21z8dbqy8l7g2937";
+ sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 5d980c3c347a37a3e35047c27e6123940cbea6c3..9214aa0a9a79bd9f372a20eb5c5c2b5cf354cca8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-calculator-${version}";
- version = "3.32.1";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "121fyhrzdf7zf3iis0rlpag7hfg8jsan2zy83x5l00rq7abdpn8d";
+ sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index a405ca0f80829ba67ff381bb176d9d16fa21fb34..57cb90c7c4581d7df6b714fbeee7f8c81cf9860e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, gettext, fetchurl, evolution-data-server
+{ stdenv, gettext, fetchurl, evolution-data-server, fetchpatch
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
@@ -31,6 +31,18 @@ in stdenv.mkDerivation rec {
"-Dtelepathy=true"
];
+ patches = [
+ # Fixes build with libhandy >= 0.0.10
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/c5eee38cd2556403a640a0a4c11d36cbf9a5a798.patch";
+ sha256 = "0s2cl7z6b0x3ky4y28yyxc9x5zp4r3vqmvbhz5m2fm6830fyjg13";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/1f1500ca01098ffda6392f5ec9ce3a29a48a84b1.patch";
+ sha256 = "082zaaj2l5cgr2qy145x8yknja87r0vpigrhidal40041kd5nldg";
+ })
+ ];
+
postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index cfd20044c6c6e784600d25910934dad4d62be20b..c7a9b4ccfbd1731dc8a6af8866d4598340d1edc4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
- version = "3.32.1";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l";
+ sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs";
};
nativeBuildInputs = [
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
networkmanager modemmanager gnome-bluetooth tracker
udisks2 gsound libhandy
+ mutter # schemas for the keybindings
];
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 6f49afe82bf26580c91d820f4157f2cf188e9ba5..4beeb190f0252fdc49789deef5f5fec8a254dd12 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -1,27 +1,25 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
-, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch
-, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
+, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland
+, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "gnome-desktop-${version}";
- version = "3.32.1";
+ version = "3.32.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "040s8ia26xyq25zcd9xji9f5jhsddqd7a23jassy429bir34sxkg";
+ sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9";
};
- enableParallelBuilding = true;
-
nativeBuildInputs = [
pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection
gtk-doc docbook_xsl
];
buildInputs = [
libX11 bubblewrap xkeyboard_config isocodes wayland
- gtk3 glib libseccomp
+ gtk3 glib libseccomp systemd
];
propagatedBuildInputs = [ gsettings-desktop-schemas ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 466e1669e18c968d106739f77c254356643d8b7b..6929f821e379a1189620489daf1dc9234025a2af 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -39,11 +39,11 @@
stdenv.mkDerivation rec {
pname = "gnome-settings-daemon";
- version = "3.32.0";
+ version = "3.32.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63";
+ sha256 = "02d0s0g2mmqfib44r3sf0499r08p61s8l2ndsjssbam1bi7x2dks";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 33095a0f1b984ba167ddb9855f45196b1adf29a5..d9001d9b1b94050c5aced6e065fbbe2d9c909149 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -14,11 +14,11 @@ let
in stdenv.mkDerivation rec {
name = "gnome-shell-${version}";
- version = "3.32.1";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1pb00af3w4wivdhcvdy59z2xlxasg90bcm5a9ck0p5lf97adwx08";
+ sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5";
};
LANG = "en_US.UTF-8";
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index f71df437d1130add1f56f4e1285fea30ee06f7a6..4a5366a72e702c0b6aebd3152f192cb57fcb5fa0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gnome-software-${version}";
- version = "3.32.1";
+ version = "3.32.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0xxhvyqfwlcyvlqc36rpcili00dpwy8b5c5klaqccn5qrc87rl38";
+ sha256 = "1r24q2c0i5xwp7dahw4wzycrhijix0nl7bxq1x0za57qm62ysfl9";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 9b25ae9218d426f2ddebba2722e667f2b2f777ea..c9f5229f870100c70261b4fe9d229a0c4a099c63 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
-, desktop-file-utils, itstool, wrapGAppsHook }:
+, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "gnome-terminal-${version}";
- version = "3.32.1";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0i613844gf5dmzpvwiy68lg8walhj4zr88scacp2qwpqs870si8x";
+ sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km";
};
buildInputs = [
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkgconfig intltool itstool which libxml2
vala desktop-file-utils wrapGAppsHook
+ hicolor-icon-theme # for setup-hook
];
# Silly ./configure, it looks for dbus file from gnome-shell in the
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 02bcb52b3875fd770dbf612cb63dbd697637730e..d9f9386214332bd493f7fc1bb45c4eec1e9982af 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnome-user-docs-${version}";
- version = "3.32.1";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "09g6fi9b1xpk0fnp6wgh350v1x318mrf20j4bfarww25vrj6irrw";
+ sha256 = "1ny7cwkyskrykzsrabjnlc9jsdl4kdk73smwxas6ddmca02hpm7c";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 3d32a1c243685de89a9615ba76da8246706a7081..6c291c1874f89a7c589790513fc1785685508c08 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, adwaita-icon-theme
+{ stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, adwaita-icon-theme
, glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool
, wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools
, docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 9be383220e6eaa521bb3546dd1f5ccacbb29aaa5..4f436b54ce48e6ef8bb1a90f36f4a819cc77291c 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -1,19 +1,19 @@
{ fetchFromGitLab, stdenv, substituteAll, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3, fetchpatch
, gsettings-desktop-schemas, gnome-desktop, wrapGAppsHook
-, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
+, libtool, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, geocode-glib, libgudev, libwacom, xwayland, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "mutter";
- version = "3.28.3";
+ version = "3.28.4";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
- rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28
- sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v";
+ rev = version;
+ sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 2c305f002fd5dcbbc0d28dda7df4564b7d7f7b19..61219ca4488e6e30a45f04d01b2a883b42e73827 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -11,15 +11,18 @@
stdenv.mkDerivation rec {
pname = "mutter";
- version = "3.32.1";
+ version = "3.32.2";
+
+ outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1q74lrb08vy0ynxbssqyxvbzf9252xgf9l6jxr9g4q0gmvpq402j";
+ sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva";
};
mesonFlags = [
"-Dxwayland-path=${xwayland}/bin/Xwayland"
+ "-Dinstalled_tests=false" # TODO: enable these
];
propagatedBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 688e8cc93657c438a38bf972d899ca731cda7fe3..2eeb77db0c651566dcb0638a985ab5014611ffa6 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -7,13 +7,13 @@
let
pname = "nautilus";
- version = "3.32.0";
+ version = "3.32.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1pnh32fal7dkwadga5savg1nv0zqnbakhk0hxr5726087i6y6ii2";
+ sha256 = "0vmrvimv4183l3ij4kv0ir2c9rfzk7gh3xc2pa4wkqq9kn7h6m7s";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix
index 5e701e488f2661ea40b72d685c9d2c24e3750c68..c38e677a4217a823d9de8fc087440391d227edeb 100644
--- a/pkgs/desktops/gnome-3/core/rygel/default.nix
+++ b/pkgs/desktops/gnome-3/core/rygel/default.nix
@@ -28,14 +28,14 @@
stdenv.mkDerivation rec {
pname = "rygel";
- version = "0.38.0";
+ version = "0.38.1";
# TODO: split out lib
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "03ky18hwcz362lbhqm1zm0ax2a075r69xms5cznchn9p9w8z5axc";
+ sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index ad2ac5d6e690bb6348650bd62cfcf739c05d55dc..047e79e14e5cff7e8932dde2e08d7b41f544eb8b 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "simple-scan-${version}";
- version = "3.32.2";
+ version = "3.32.2.1";
src = fetchurl {
url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "12r5hacwpf0gzca3p73xpmx3dksa1kx50nlj6w4nw8jfqzjlkq1k";
+ sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp";
};
buildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 478aac8c1731d0cc2f2b2f8d53d0b815a43f8dc8..c0d5d2be26d465eee98c72f18485f8b2001e8b8a 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "sushi-${version}";
- version = "3.32.0";
+ version = "3.32.1";
src = fetchurl {
url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0f1i8qp39gq749h90f7nwgrj4q6y55jnyh62n1v8hxvlk0b2wqnx";
+ sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj";
};
nativeBuildInputs = [
@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
- enableParallelBuilding = true;
-
passthru = {
updateScript = gnome3.updateScript {
packageName = "sushi";
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index 3f8f5cf8c8882be144c041511537b8d3109505d2..eaa3ab3c089be8bea0a7fd08e142ceb5a011d347 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -1,18 +1,55 @@
-{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, gexiv2, tracker
-, meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server
-, exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif
-, libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
-, libvorbis, libxml2, poppler, taglib, upower, totem-pl-parser }:
+{ stdenv
+, fetchurl
+, substituteAll
+, intltool
+, itstool
+, libxslt
+, gexiv2
+, tracker
+, meson
+, ninja
+, pkgconfig
+, vala
+, wrapGAppsHook
+, bzip2
+, dbus
+, evolution-data-server
+, exempi
+, flac
+, giflib
+, glib
+, gnome3
+, gst_all_1
+, icu
+, json-glib
+, libcue
+, libexif
+, libgrss
+, libgsf
+, libgxps
+, libiptcdata
+, libjpeg
+, libosinfo
+, libpng
+, libseccomp
+, libsoup
+, libtiff
+, libuuid
+, libvorbis
+, libxml2
+, poppler
+, taglib
+, upower
+, totem-pl-parser
+}:
-let
+stdenv.mkDerivation rec {
pname = "tracker-miners";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1xbjbd994jxhdan7227kzdnmiblfy0f1vnsws5l809ydgk58f0qr";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw";
};
nativeBuildInputs = [
@@ -46,8 +83,10 @@ in stdenv.mkDerivation rec {
libexif
libgrss
libgsf
+ libgxps
libiptcdata
libjpeg
+ libosinfo
libpng
libseccomp
libsoup
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index 36199c3818c486a2899fda6a4c64ff91f99fb197..397184f798a8fa1f9233c77d4fea8cca9315c370 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python3
+{ stdenv, fetchurl, intltool, meson, ninja, pkgconfig, gobject-introspection, python3
, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
, gnome3, icu, libuuid, networkmanager, libsoup, json-glib
@@ -6,7 +6,7 @@
let
pname = "tracker";
- version = "2.2.1";
+ version = "2.2.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1zx2mlnsv6clgh0j50f0b94b7cf1al1j7bkcz8cr31a0fkkgkkhc";
+ sha256 = "1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index 41120a74b08486d2a8cb6ff40e5ca45285705996..aac2162625847ea05699f6c400dac76a78d973d0 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yelp-tools-${version}";
- version = "3.32.0";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "037fd6xpy3zab7j5p7c0vfc6c3nk6qs0prvz1hbilzc31p8l1pdz";
+ sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index ecbb7b277ff3eafca7ef714ff5db777eb123bfd0..24a49413960caa7bc46ceacd648a9a8e3bbb6894 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "yelp-${version}";
- version = "3.32.1";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "159ayfyswn9yh7g5hjs6lphh510n6qkyd1cj47hnc3ynnab9hn4r";
+ sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f";
};
nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 8680e3ed81daa79e29a708ec1f96ff88af0d760c..742babf721ac1c1fd0476516a51d17c0ea0572cb 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -24,10 +24,10 @@ lib.makeScope pkgs.newScope (self: with self; {
corePackages = with gnome3; [
pkgs.desktop-file-utils
pkgs.shared-mime-info # for update-mime-database
- glib # for gsettings
- gtk3.out # for gtk-update-icon-cache
+ pkgs.glib # for gsettings
+ pkgs.gtk3.out # for gtk-update-icon-cache
glib-networking gvfs dconf gnome-backgrounds gnome-control-center
- gnome-menus gnome-settings-daemon gnome-shell
+ pkgs.gnome-menus gnome-settings-daemon gnome-shell
gnome-themes-extra adwaita-icon-theme gnome-shell-extensions
pkgs.hicolor-icon-theme
];
@@ -41,7 +41,7 @@ lib.makeScope pkgs.newScope (self: with self; {
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
gnome-getting-started-docs gnome-packagekit gnome-software
- gnome-power-manager gnome-todo gnome-usage
+ gnome-power-manager gnome-todo pkgs.gnome-usage
];
gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -347,7 +347,7 @@ lib.makeScope pkgs.newScope (self: with self; {
pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };
- gtkhtml = callPackage ./misc/gtkhtml { };
+ gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; };
pomodoro = callPackage ./misc/pomodoro { };
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index d8180096d2f05f946cbdafb2296a73d7dee21656..568a6cace7204478c795d1b24d864c859fe4615e 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "gnome-shell-extension-appindicator-${version}";
- version = "28";
+ version = "29";
src = fetchFromGitHub {
owner = "Ubuntu";
repo = "gnome-shell-extension-appindicator";
rev = "v${version}";
- sha256 = "03sgb2xkb4lzp8pbb7g56q29y1r764qzpc0j4d4m1gi0sb39sxrl";
+ sha256 = "02cr6rhi3dfk49jcjm6vh7yx117bv5wqyvd34cyv1kzwzsla8v2i";
};
# This package has a Makefile, but it's used for building a zip for
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 9ceb65f830833543be4a3c837bfc9d9837949434..b2c8e99e82393f621694fe312bb5d1cfe4a1d1d4 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gnome-mines-${version}";
- version = "3.32.0";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "13ia8a7bmdnp1281lwp8nvdqqkclvg1n3pw4bbr2dgsrsswfkscj";
+ sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g";
};
# gobject-introspection for finding vapi files
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 8ef4b2f307517b2042230bfad1272f5f2925435e..540e379210ee1e71f7ea33254c774ccca2d913b8 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, intltool, itstool, libcanberra-gtk3, libxml2
+, itstool, libcanberra-gtk3, libxml2
, meson, ninja, python3, vala, desktop-file-utils
}:
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index c43daf2ebb2ff9dc1dc8caca0998b786f96d2c7e..54d45eedc3d9a82811fa14b6ae0d6511f9ee990d 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -2,7 +2,7 @@
, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
-, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking }:
+, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking }:
stdenv.mkDerivation rec {
pname = "geary";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
libgee libnotify libsecret sqlite webkitgtk glib-networking
- libunwind folks
+ libunwind libunity folks
];
checkInputs = [ xvfb_run dbus ];
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index cb4c5c05cb0b4a91329ead46d49a5da3b812ea11..94703f375b2180c281737aa1d9d8fd126d8d277a 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -1,8 +1,8 @@
{ stdenv
, fetchurl
, fetchpatch
-, vala_0_42
-, intltool
+, vala
+, gettext
, pkgconfig
, gtk3
, glib
@@ -24,34 +24,35 @@
, meson
, ninja
, python3
+, hicolor-icon-theme
+, libdazzle
}:
stdenv.mkDerivation rec {
pname = "gitg";
- version = "3.30.1";
+ version = "3.32.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss";
+ sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81";
};
patches = [
- # Fix build with latest libgit2-glib
+ # https://gitlab.gnome.org/GNOME/gitg/issues/213
(fetchpatch {
- url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch;
- sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw";
+ url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch";
+ sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z";
})
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
- sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash"
'';
- doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed
+ doCheck = true;
enableParallelBuilding = true;
@@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
gtksourceview
gtkspell3
json-glib
+ libdazzle
libgee
libgit2-glib
libpeas
@@ -72,12 +74,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gobject-introspection
- intltool
+ hicolor-icon-theme
+ gettext
meson
ninja
pkgconfig
python3
- vala_0_42 # fails build with 0.44, drop in >3.30.1
+ vala
wrapGAppsHook
];
diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index de0d70ae42f4394c4b8368659c966ef123e18a65..7bb162b7b8b4cf29726a3b065f1417b1c38e561b 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -26,13 +26,13 @@
let
pname = "gnome-applets";
- version = "3.30.0";
+ version = "3.32.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1cvl32486kqw301wy40l1a1sdhanra7bx4smq0a3lmnl3x01zg43";
+ sha256 = "10kd19ymxl2z65121g90mx96m6vcn2a8a50g6a56prrdjsgbgia1";
};
nativeBuildInputs = [
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
doCheck = true;
configureFlags = [
- "--with-libpanel-applet-dir=$(out)/share/gnome-panel/applets"
+ "--with-libpanel-applet-dir=${placeholder ''out''}/share/gnome-panel/applets"
];
passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index f9387c11b819cdba681587bc6fa18b9ca9bdcf42..3cade7ccdf8b7bdb74556596c226258ca2302dde 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -1,7 +1,6 @@
{ stdenv
, autoreconfHook
, fetchurl
-, fetchpatch
, gettext
, glib
, gnome-bluetooth
@@ -12,14 +11,12 @@
, gsettings-desktop-schemas
, gtk3
, ibus
-, intltool
, libcanberra-gtk3
, libpulseaudio
, libxkbfile
, libxml2
, pkgconfig
, polkit
-, substituteAll
, upower
, wrapGAppsHook
, writeTextFile
@@ -29,25 +26,16 @@
let
pname = "gnome-flashback";
- version = "3.30.0";
+ version = "3.32.0";
requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback-init;gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;";
gnome-flashback = stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "18rwql2pi78155l9zp1i50xfi5z8xz2l08m9d81x6qqbfr1nyy57";
+ sha256 = "0jfzr7vdmnxpxqqa38ni1p3c508xhlnxqpmmqshk3rvrf0afqn62";
};
- patches =[
- # overrides do not respect gsettingsschemasdir
- # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/9
- (fetchpatch {
- url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/a55530f58ccd600414a5420b287868ab7d219705.patch;
- sha256 = "1la94lhhb9zlw7bnbpl6hl26zv3kxbsvgx996mhph720wxg426mh";
- })
- ];
-
# make .desktop Execs absolute
postPatch = ''
patch -p0 </dev/null)
-+ ifeq ($(GNUSTEP_MAKEFILES),)
-+ $(warning )
-+ $(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!)
-+ $(warning Perhaps gnustep-make is not properly installed,)
-+ $(warning so gnustep-config is not in your PATH.)
-+ $(warning )
-+ $(warning Your PATH is currently $(PATH))
-+ $(warning )
-+ endif
-+endif
-+
-+ifeq ($(GNUSTEP_MAKEFILES),)
-+ $(error You need to set GNUSTEP_MAKEFILES before compiling!)
-+endif
-+
- PACKAGE_NAME = gorm
- export PACKAGE_NAME
- include $(GNUSTEP_MAKEFILES)/common.make
diff --git a/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch b/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch
deleted file mode 100644
index 30c6f56c032c274c0b94492e4f7008e868e73de4..0000000000000000000000000000000000000000
--- a/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- gnustep-gui-0.24.0/GNUmakefile.postamble 2010-05-17 22:38:59.000000000 +0600
-+++ gnustep-gui-0.24.0.patched/GNUmakefile.postamble 2014-12-01 13:44:05.000000000 +0600
-@@ -40,20 +40,20 @@
- # The following rule is important mainly for packaging, because in that case
- # you install into a fake system tree, and the directory is not there.
- #
--$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional:
-- $(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
-+$(DESTDIR_GNUSTEP_MAKEFILES)/Additional:
-+ $(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
-
- # Things to do before installing
--before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
-+before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
- $(INSTALL_DATA) gui.make \
-- $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make
-+ $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make
-
- # Things to do after installing
- # after-install::
-
- # Things to do before uninstalling
- before-uninstall::
-- rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make
-+ rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make
-
- # Things to do after uninstalling
- # after-uninstall::
diff --git a/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch b/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch
deleted file mode 100644
index 23ec2db0fbd37a1c763ee93a633215e611f01cef..0000000000000000000000000000000000000000
--- a/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble 2008-06-10 10:01:49.000000000 +0600
-+++ gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble 2014-12-01 13:02:11.000000000 +0600
-@@ -49,7 +49,7 @@
- ADDITIONAL_INCLUDE_DIRS +=-I../../Headers/Additions -I../../Headers
-
- # Additional LDFLAGS to pass to the linker
--#ADDITIONAL_LDFLAGS +=
-+ADDITIONAL_LDFLAGS += -lgnustep-gui
-
- # Additional library directories the linker should search
- ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
diff --git a/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch b/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch
deleted file mode 100644
index e57ddec75ad2d7c90a2f40cb0d277d9bffbd35a7..0000000000000000000000000000000000000000
--- a/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnustep-gui-0.24.0/Tools/GNUmakefile.preamble 2006-02-22 12:43:48.000000000 +0600
-+++ gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble 2014-12-01 12:52:41.000000000 +0600
-@@ -32,9 +32,11 @@
- ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L../Model/$(GNUSTEP_OBJ_DIR)
-
- # Additional libraries when linking tools
-+make_services_TOOL_LIBS += -lgnustep-base
- gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
- set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
- gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
-+gclose_TOOL_LIBS += -lgnustep-base
- gcloseall_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
- GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS)
-
diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix
index b238623eb09a3c281d8f206c3dc1e13a2b2ad085..b058bd87989dee13070e0dff40b2716007f7d859 100644
--- a/pkgs/desktops/gnustep/libobjc2/default.nix
+++ b/pkgs/desktops/gnustep/libobjc2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libobjc2";
- version = "1.9";
+ version = "2.0";
src = fetchFromGitHub {
owner = "gnustep";
repo = "libobjc2";
rev = "v${version}";
- sha256 = "00pscl3ly3rv6alf9vk70kxnnxq2rfgpc1ylcv6cgjs9jxdnrqmn";
+ sha256 = "1b4h0a4pqr8j6300qr2wmi33r7ysvp705gs0ypx69hbmifln0mlf";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch b/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch
deleted file mode 100644
index 98e22f37ee7d00ab32136e508c4dfbd6f533cc8c..0000000000000000000000000000000000000000
--- a/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -ru gnustep-make-2.6.6/common.make gnustep-make-2.6.6.patched/common.make
---- gnustep-make-2.6.6/common.make 2013-03-04 17:21:55.000000000 +0600
-+++ gnustep-make-2.6.6.patched/common.make 2014-12-09 21:29:10.000000000 +0600
-@@ -135,7 +135,9 @@
- endif
- # Then include makefiles with flags/config options installed by the
- # libraries themselves
---include $(GNUSTEP_MAKEFILES)/Additional/*.make
-+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
-+-include $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)
-+endif
-
- #
- # Determine target specific settings
-diff -ru gnustep-make-2.6.6/GNUmakefile.in gnustep-make-2.6.6.patched/GNUmakefile.in
---- gnustep-make-2.6.6/GNUmakefile.in 2013-09-20 12:13:15.000000000 +0600
-+++ gnustep-make-2.6.6.patched/GNUmakefile.in 2014-12-07 20:35:27.000000000 +0600
-@@ -173,7 +173,6 @@
- "$(makedir)/$(GNUSTEP_TARGET_CPU)" \
- "$(makedir)/$(GNUSTEP_TARGET_DIR)" \
- "$(makedir)/$(GNUSTEP_TARGET_LDIR)" \
-- "$(makedir)/Additional" \
- "$(makedir)/Auxiliary" \
- "$(makedir)/Master" \
- "$(makedir)/Instance" \
-@@ -314,7 +313,6 @@
- -rmdir "$(makedir)/Instance"
- -rmdir "$(makedir)/Master"
- -rmdir "$(makedir)/Auxiliary"
-- -rmdir "$(makedir)/Additional"
- -rmdir "$(makedir)/$(GNUSTEP_TARGET_LDIR)"
- -rmdir "$(makedir)/$(GNUSTEP_TARGET_DIR)"
- -rmdir "$(makedir)/$(GNUSTEP_TARGET_CPU)"
-diff -ru gnustep-make-2.6.6/gnustep-config.in gnustep-make-2.6.6.patched/gnustep-config.in
---- gnustep-make-2.6.6/gnustep-config.in 2013-07-02 16:06:24.000000000 +0600
-+++ gnustep-make-2.6.6.patched/gnustep-config.in 2014-12-09 21:29:49.000000000 +0600
-@@ -66,6 +66,7 @@
- echo " --variable=OBJCXX"
- echo " --variable=GNUMAKE"
- echo " --variable=GNUSTEP_MAKEFILES"
-+ echo " --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
- echo " --variable=GNUSTEP_USER_DEFAULTS_DIR"
- echo " --variable=GNUSTEP_HOST"
- echo " --variable=GNUSTEP_HOST_CPU"
-@@ -153,6 +154,8 @@
-
- export GNUSTEP_MAKEFILES
-
-+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL
-+
- #
- # If all they want to know if GNUSTEP_MAKEFILES or anything that
- # we can compute only using GNUSTEP_MAKEFILES, we can print it out
-@@ -168,6 +171,8 @@
- exit 0;;
- --variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES"
- exit 0;;
-+ --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL) echo "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
-+ exit 0;;
- --variable=GNUMAKE) echo "@GNUMAKE@"
- exit 0;;
- --debug-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes debug=yes 2>/dev/null
-diff -ru gnustep-make-2.6.6/GNUstep.csh.in gnustep-make-2.6.6.patched/GNUstep.csh.in
---- gnustep-make-2.6.6/GNUstep.csh.in 2011-05-03 13:40:10.000000000 +0600
-+++ gnustep-make-2.6.6.patched/GNUstep.csh.in 2014-12-09 20:14:05.000000000 +0600
-@@ -130,6 +130,10 @@
- setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@"
- endif
-
-+if ( ! ${?NIX_GNUSTEP_MAKEFILES_ADDITIONAL} ) then
-+ setenv NIX_GNUSTEP_MAKEFILES_ADDITIONAL "@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@"
-+endif
-+
- if ( "${GNUSTEP_MAKE_STRICT_V2_MODE}" == "yes" ) then
- unsetenv GNUSTEP_USER_DIR
- unsetenv GNUSTEP_USER_ROOT
-diff -ru gnustep-make-2.6.6/GNUstep.sh.in gnustep-make-2.6.6.patched/GNUstep.sh.in
---- gnustep-make-2.6.6/GNUstep.sh.in 2012-02-21 20:21:38.000000000 +0600
-+++ gnustep-make-2.6.6.patched/GNUstep.sh.in 2014-12-09 20:14:19.000000000 +0600
-@@ -173,6 +173,10 @@
- fi
- export GNUSTEP_MAKEFILES
-
-+if [ -z "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" ]; then
-+ NIX_GNUSTEP_MAKEFILES_ADDITIONAL=@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@
-+fi
-+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL
-
- if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then
- # Make sure this is never set in gnustep-make v2 strict mode; it
-diff -ru gnustep-make-2.6.6/GNUstep-strict-v2.conf.in gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in
---- gnustep-make-2.6.6/GNUstep-strict-v2.conf.in 2008-01-15 20:35:36.000000000 +0600
-+++ gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in 2014-12-07 22:04:56.000000000 +0600
-@@ -47,7 +47,6 @@
- # Traditionally, this is /usr/GNUstep/System/Library/Makefiles
- GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
-
--
- # This is where the user home directories are. Only used to provide
- # NSUserDirectory in gnustep-base. Never used anywhere else.
- GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@
-diff -ru gnustep-make-2.6.6/library-combo.make gnustep-make-2.6.6.patched/library-combo.make
---- gnustep-make-2.6.6/library-combo.make 2012-02-21 19:53:02.000000000 +0600
-+++ gnustep-make-2.6.6.patched/library-combo.make 2014-12-09 20:15:05.000000000 +0600
-@@ -142,7 +142,7 @@
- #
- # Third-party foundations not using make package
- # Our own foundation will install a base.make file into
--# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags
-+# $NIX_GNUSTEP_MAKEFILES_ADDITIONAL to set the needed flags
- #
- ifeq ($(FOUNDATION_LIB), nx)
- # -framework Foundation is used both to find headers, and to link
-@@ -166,7 +166,7 @@
-
- #
- # FIXME - Ask Helge to move this inside his libFoundation, and have
--# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make
-+# it installed as a $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/libFoundation.make
- #
- ifeq ($(FOUNDATION_LIB),fd)
- -include $(GNUSTEP_MAKEFILES)/libFoundation.make
-@@ -193,7 +193,7 @@
- GUI_LIBS =
- #
- # Third-party GUI libraries - our own sets its flags into
--# $(GNUSTEP_MAKEFILES)/Additional/gui.make
-+# $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/gui.make
- #
- ifeq ($(GUI_LIB), nx)
- GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
-diff -ru gnustep-make-2.6.6/rules.make gnustep-make-2.6.6.patched/rules.make
---- gnustep-make-2.6.6/rules.make 2013-07-04 16:05:44.000000000 +0600
-+++ gnustep-make-2.6.6.patched/rules.make 2014-12-09 21:31:04.000000000 +0600
-@@ -667,7 +667,9 @@
- exit 1$(END_ECHO)
- endif
-
--$(GNUSTEP_MAKEFILES)/Additional/*.make: ;
-+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
-+$(NIX_GNUSTEP_MAKEFILES_ADDITIONAL): ;
-+endif
-
- $(GNUSTEP_MAKEFILES)/Master/*.make: ;
-
diff --git a/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch b/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch
deleted file mode 100644
index 3fe19a6a58b93f9682b3b2b6d57676cc5f05c6ce..0000000000000000000000000000000000000000
--- a/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -c ProjectCenter-0.6.2/GNUmakefile.preamble ProjectCenter-0.6.2.patched/GNUmakefile.preamble
---- ProjectCenter-0.6.2/GNUmakefile.preamble 2010-08-08 03:56:04.000000000 +0600
-+++ artyom/ProjectCenter-0.6.2.patched/GNUmakefile.preamble 2014-12-01 20:08:31.000000000 +0600
-@@ -39,7 +39,7 @@
- ADDITIONAL_INCLUDE_DIRS += -I./ -I./Headers
-
- # Additional LDFLAGS to pass to the linker
--ADDITIONAL_LDFLAGS +=
-+ADDITIONAL_LDFLAGS += -lgnustep-base -lgnustep-gui
-
- # Additional library directories the linker should search
- ADDITIONAL_LIB_DIRS += -L./Framework/ProjectCenter.framework/$(GNUSTEP_TARGET_LDIR)
-
-Diff finished. Mon Dec 1 20:08:50 2014
diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix
index 00ebfd8a7253ec5f1493e5139f3d56654dd25f0d..10e75eea38f0271626378c8014b61387b6468399 100644
--- a/pkgs/desktops/lumina/default.nix
+++ b/pkgs/desktops/lumina/default.nix
@@ -1,84 +1,26 @@
-{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils,
- numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake,
- qttools, poppler, wrapGAppsHook
-}:
+{ pkgs, libsForQt5 }:
-stdenv.mkDerivation rec {
- name = "lumina-${version}";
- version = "1.4.0-p1";
+let
+ packages = self: with self; {
- src = fetchFromGitHub {
- owner = "trueos";
- repo = "lumina";
- rev = "v${version}";
- sha256 = "0jin0a2s6pjbpw7w1bz67dgqp0xlpw1a7nh8zv0qwdf954zczanp";
- };
-
- nativeBuildInputs = [
- qmake
- qttools
- wrapGAppsHook
- ];
-
- buildInputs = [
- xorg.libxcb
- xorg.libXdamage
- xorg.xcbutilwm
- xorg.xcbutilimage
- qtbase
- qtsvg
- qtmultimedia
- qtx11extras
- poppler
- fluxbox
- xscreensaver
- desktop-file-utils
- numlockx
- ];
-
- patches = [
- ./avoid-absolute-path-on-sessdir.patch
- ./LuminaOS-NixOS.cpp.patch
- ];
-
- prePatch = ''
- # Copy Gentoo setup as NixOS setup and then patch it
- # TODO: write a complete NixOS setup?
- cp -a src-qt5/core/libLumina/LuminaOS-Gentoo.cpp src-qt5/core/libLumina/LuminaOS-NixOS.cpp
- '';
+ lumina = callPackage ./lumina { };
+ lumina-calculator = callPackage ./lumina-calculator { };
+ lumina-pdf = callPackage ./lumina-pdf { };
- postPatch = ''
- # Fix location of poppler-qt5.h
- substituteInPlace src-qt5/desktop-utils/lumina-pdf/mainUI.h \
- --replace '#include ' '#include '
+ preRequisitePackages = [
+ pkgs.fluxbox
+ pkgs.libsForQt5.kwindowsystem
+ pkgs.numlockx
+ pkgs.qt5.qtsvg
+ pkgs.xscreensaver
+ ];
- # Fix plugin dir
- substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \
- --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
+ corePackages = [
+ lumina
+ lumina-calculator
+ lumina-pdf
+ ];
- # Fix location of fluxbox styles
- substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \
- --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox"
- '';
-
- qmakeFlags = [
- "LINUX_DISTRO=NixOS"
- "CONFIG+=WITH_I18N"
- "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
- ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "A lightweight, portable desktop environment";
- longDescription = ''
- The Lumina Desktop Environment is a lightweight system interface
- that is designed for use on any Unix-like operating system. It
- is based on QT5.
- '';
- homepage = https://lumina-desktop.org;
- license = licenses.bsd3;
- platforms = platforms.unix;
- maintainers = [ maintainers.romildo ];
};
-}
+
+in pkgs.lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..70e0f2e3511c09a22078a78eefaa9e7c1f28763f
--- /dev/null
+++ b/pkgs/desktops/lumina/lumina-calculator/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }:
+
+stdenv.mkDerivation rec {
+ pname = "lumina-calculator";
+ version = "2019-04-27";
+
+ src = fetchFromGitHub {
+ owner = "lumina-desktop";
+ repo = pname;
+ rev = "ccb792fc713aa7163fffd37fc20c83ffe9ca7523";
+ sha256 = "0cdyz94znycsc3qxg5bmg51bwms7586d4ja1bsmj8cb9pd3lv980";
+ };
+
+ sourceRoot = "source/src-qt5";
+
+ nativeBuildInputs = [ qmake qttools ];
+
+ buildInputs = [ qtbase ];
+
+ qmakeFlags = [
+ "CONFIG+=WITH_I18N"
+ "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Scientific calculator for the Lumina Desktop";
+ homepage = https://github.com/lumina-desktop/lumina-calculator;
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..62d59d18cc551fbb363ea2d6def31fb0cef74617
--- /dev/null
+++ b/pkgs/desktops/lumina/lumina-pdf/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, poppler }:
+
+stdenv.mkDerivation rec {
+ pname = "lumina-pdf";
+ version = "2019-04-27";
+
+ src = fetchFromGitHub {
+ owner = "lumina-desktop";
+ repo = pname;
+ rev = "645ed591ef91c3607d3ab87dd86f7acfd08b05c9";
+ sha256 = "0gl943jb9c9rcgb5wksx3946hwlifghfd27r97skm9is8ih6k0vn";
+ };
+
+ sourceRoot = "source/src-qt5";
+
+ nativeBuildInputs = [ qmake qttools ];
+
+ buildInputs = [ qtbase poppler ];
+
+ postPatch = ''
+ sed -i '1i\#include \' Renderer-poppler.cpp
+ '';
+
+ qmakeFlags = [
+ "CONFIG+=WITH_I18N"
+ "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
+ ];
+
+ enableParallelBuilding = false;
+
+ meta = with stdenv.lib; {
+ description = "PDF viewer for the Lumina Desktop";
+ homepage = https://github.com/lumina-desktop/lumina-pdf;
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch b/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch
similarity index 100%
rename from pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch
rename to pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch
diff --git a/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch b/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch
similarity index 100%
rename from pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch
rename to pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c758fc38a1b958e77310d3f23d9ca20594f0958c
--- /dev/null
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -0,0 +1,89 @@
+{ stdenv,
+ fetchFromGitHub,
+ desktop-file-utils,
+ fluxbox,
+ numlockx,
+ qmake,
+ qtbase,
+ qtmultimedia,
+ qtsvg,
+ qttools,
+ qtx11extras,
+ xorg,
+ xscreensaver,
+ wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "lumina";
+ version = "1.5.0";
+
+ src = fetchFromGitHub {
+ owner = "lumina-desktop";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0rj2gzifr98db7i82cg3hg7l5yfik810pjpawg6n54qbzq987z25";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ qttools
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ xorg.libxcb
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.xcbutilwm
+ xorg.xcbutilimage
+ qtbase
+ qtsvg
+ qtmultimedia
+ qtx11extras
+ fluxbox
+ xscreensaver
+ desktop-file-utils
+ numlockx
+ ];
+
+ patches = [
+ ./avoid-absolute-path-on-sessdir.patch
+ ./LuminaOS-NixOS.cpp.patch
+ ];
+
+ prePatch = ''
+ # Copy Gentoo setup as NixOS setup and then patch it
+ # TODO: write a complete NixOS setup?
+ cp -a src-qt5/core/libLumina/LuminaOS-Gentoo.cpp src-qt5/core/libLumina/LuminaOS-NixOS.cpp
+ '';
+
+ postPatch = ''
+ # Fix plugin dir
+ substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \
+ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
+
+ # Fix location of fluxbox styles
+ substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \
+ --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox"
+ '';
+
+ qmakeFlags = [
+ "LINUX_DISTRO=NixOS"
+ "CONFIG+=WITH_I18N"
+ "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A lightweight, portable desktop environment";
+ longDescription = ''
+ The Lumina Desktop Environment is a lightweight system interface
+ that is designed for use on any Unix-like operating system. It
+ is based on QT5.
+ '';
+ homepage = https://lumina-desktop.org;
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix
index 411308c488c76523057a540874dbe0b4644e11cd..f5b71eba141a9636de5b735a3e9891991362811e 100644
--- a/pkgs/desktops/mate/caja-dropbox/default.nix
+++ b/pkgs/desktops/mate/caja-dropbox/default.nix
@@ -1,31 +1,49 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, mate, python3Packages }:
+{ stdenv, fetchurl, substituteAll
+, pkgconfig, gobject-introspection, gdk_pixbuf
+, gtk3, mate, python3, dropbox }:
+let
+ dropboxd = "${dropbox}/bin/dropbox";
+in
stdenv.mkDerivation rec {
- name = "caja-dropbox-${version}";
+ pname = "caja-dropbox";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5";
};
+ patches = [
+ (substituteAll {
+ src = ./fix-cli-paths.patch;
+ inherit dropboxd;
+ })
+ ];
+
+ strictDeps = true;
+
nativeBuildInputs = [
pkgconfig
+ gobject-introspection
+ gdk_pixbuf
+ (python3.withPackages (ps: with ps; [
+ docutils
+ pygobject3
+ ]))
];
buildInputs = [
gtk3
mate.caja
- python3Packages.python
- python3Packages.pygtk
- python3Packages.docutils
+ python3
];
configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ];
meta = with stdenv.lib; {
description = "Dropbox extension for Caja file manager";
- homepage = https://github.com/mate-desktop/caja-dropbox;
+ homepage = "https://github.com/mate-desktop/caja-dropbox";
license = with licenses; [ gpl3 cc-by-nd-30 ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
diff --git a/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch b/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..de591f493f6f4b8606c4c89a76a78e4ef4093728
--- /dev/null
+++ b/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch
@@ -0,0 +1,11 @@
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -70,7 +70,7 @@ DOWNLOADING = "Downloading Dropbox... %d%%"
+ UNPACKING = "Unpacking Dropbox... %d%%"
+
+ PARENT_DIR = os.path.expanduser("~")
+-DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
++DROPBOXD_PATH = "@dropboxd@"
+ DESKTOP_FILE = "@DESKTOP_FILE_DIR@/caja-dropbox.desktop"
+
+ enc = locale.getpreferredencoding()
diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..35e3cd198f6bf9daf77eef3cf59ede4d0c481a69
--- /dev/null
+++ b/pkgs/desktops/mate/caja-with-extensions/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ] }:
+
+stdenv.mkDerivation {
+ pname = "${caja.pname}-with-extensions";
+ version = caja.version;
+
+ phases = [ "installPhase" ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ inherit caja;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ makeWrapper $caja/bin/caja $out/bin/caja \
+ --set CAJA_EXTENSION_DIRS ${lib.concatMapStringsSep ":" (x: "${x.outPath}/lib/caja/extensions-2.0") extensions}
+ '';
+
+ inherit (caja.meta);
+}
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index fcb903f703e7977a07cb8d35a2fa6a83b070e277..667a73eb6307f30ca33db71b2730e307788f8ff8 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "caja-${version}";
+ pname = "caja";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "10b7yjimblymp1fpsrl4jb2k7kbhla2izsj3njfmg2n6fv9fy9iv";
};
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 3cab936b92b1e5ee2f575bc944577e9e3d3e7752..3970b2b2921cffd4d8f8970a382e7006fb601343 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,14 +1,15 @@
-{ pkgs, newScope }:
+{ newScope }:
let
callPackage = newScope self;
self = rec {
-
+
atril = callPackage ./atril { };
caja = callPackage ./caja { };
caja-dropbox = callPackage ./caja-dropbox { };
caja-extensions = callPackage ./caja-extensions { };
+ caja-with-extensions = callPackage ./caja-with-extensions { };
engrampa = callPackage ./engrampa { };
eom = callPackage ./eom { };
libmatekbd = callPackage ./libmatekbd { };
@@ -86,7 +87,7 @@ let
mozo
pluma
];
-
+
};
in self
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 9e41969a56816c3b553a620da296eac1ef8bf357..8fad6cac8799ca809edcf53e3632676b2939e0be 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "engrampa-${version}";
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 793ca66583b4833564dfb23c57edaca45b69efbe..72e509d59afdc23c71bc069890c091ee5f3b8aa0 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "eom-${version}";
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index 553fadc568a78cfb5c609e33bea2f55f4badfeae..bd6488d2c2ce8538538f6385398d54d44c7491c4 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk3, libxklavier }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }:
stdenv.mkDerivation rec {
name = "libmatekbd-${version}";
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 3719225fe8f736e2a02b0f6d2860bd31508053b7..4f77b3035015844a212810e4406ffe7cad648a5a 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marco-${version}";
- version = "1.22.1";
+ version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1j7pvq8ndyl2x8jmh95sj69cnf0q9qsjn7lkr3jz6hk103mga82f";
+ sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 8c4f69f3fb5974cf88dc06418af98fd1f2dac011..85631f03e1d42ed4103555d05fea2fd3f4845cde 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mate-calc-${version}";
- version = "1.22.0";
+ version = "1.22.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1njk6v7z3969ikvcrabr1lw5f5572vb14w064zm3mydj8cc5inlr";
+ sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 59b93a890eb10c8e8487e6c8db9da481b1906fa5..7185181d7476c6a9a4c5e1878ccadf2c62063723 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, gtk3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-media-${version}";
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 63996f4256b60c6e8f8d85092a54634413f24ceb..45d483503aa7df7e3f2592f420d1dc12949b6c7b 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libcanberra-gtk3,
- libnotify, libwnck3, gnome3, gtk3, wrapGAppsHook }:
+ libnotify, libwnck3, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-notification-daemon-${version}";
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index a5ed677a98d3f8e09a80ce330cdee41cbafc89d8..3c7b16a6831239f68de6df8e9c177f8872d69a54 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "mate-themes-${version}";
- version = "3.22.19";
+ version = "3.22.20";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1ycb8b8r0s8d1h1477135mynr53s5781gdb2ap8xlvj2g58492wq";
+ sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx";
};
nativeBuildInputs = [ pkgconfig intltool gtk3 ];
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index 4d624479bbf6e8bb30806cf326d3b7b930521bb2..eae425b18920d99f65083f8e80ace662cea9a59b 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mate-user-guide-${version}";
- version = "1.22.1";
+ version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "02zlfdhrvamd299pbf5s19pr90y8yah84g12shwihlxff7d3hxvs";
+ sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h";
};
nativeBuildInputs = [ itstool intltool libxml2 ];
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index dffdde42ad1c9dc7ca948ccb31acd9dc60355c2c..f152515d60e9a5145b008f8df250d8e81a7cc7bd 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -1,26 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-user-share-${version}";
- version = "1.22.0";
+ version = "1.22.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "14bhr6fv6gj3ka3sf13q64ck4svx8f4x8kzbppxv0jygpjp48w7h";
+ sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k";
};
nativeBuildInputs = [
pkgconfig
intltool
itstool
+ libxml2
wrapGAppsHook
];
buildInputs = [
gtk3
+ dbus-glib
libnotify
libcanberra-gtk3
- libxml2
mate.caja
hicolor-icon-theme
# Should mod_dnssd and apacheHttpd be runtime dependencies?
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 9aed8ffcc2722ea5c5f8ec150ebeac6211533d24..4a4850a0824e5c3f73f3659c89d7864c5cf15923 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig
, meson, ninja, vala, desktop-file-utils, libxml2
-, gtk3, python3, granite, libgee, gobject-introspection
-, elementary-icon-theme, appstream, wrapGAppsHook }:
+, gtk3, python3, granite, libgee, elementary-icon-theme
+, appstream, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "calculator";
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
appstream
desktop-file-utils
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index c165df26f60b70b274ad5b6db73634e08464e983..9f684c22767d550f3f64f6e569ec641e9f46f6ff 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -2,7 +2,7 @@
, ninja, vala, desktop-file-utils, gtk3, granite, libgee
, geoclue2, libchamplain, clutter, folks, geocode-glib, python3
, libnotify, libical, evolution-data-server, appstream-glib
-, elementary-icon-theme, gobject-introspection, wrapGAppsHook }:
+, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "calendar";
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
appstream-glib
desktop-file-utils
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 438144613c4303fa4240fa2f668b04b2ea72909b..a869ff24e920d4d9edeca27028d58c5e9b71a678 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, substituteAll
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
, python3, desktop-file-utils, gtk3, granite, libgee, elementary-icon-theme
, appstream, libpeas, editorconfig-core-c, gtksourceview3, gtkspell3, libsoup
, vte, webkitgtk, zeitgeist, ctags, libgit2-glib, wrapGAppsHook }:
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index fc9d8b5236dd2b849430b7229eb0c6f59c36e3bb..99c7afffe7a541a83b385c3b8989ef5ad213226c 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, gettext, vala
, python3, desktop-file-utils, libcanberra, gtk3, libgee, granite, libnotify
, libunity, pango, plank, bamf, sqlite, libdbusmenu-gtk3, zeitgeist, glib-networking
-, elementary-icon-theme, gobject-introspection, wrapGAppsHook }:
+, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "files";
- version = "4.1.7";
+ version = "4.1.8";
name = "elementary-${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1fz7zawqkb9fa2vy36hg1wz1sxzgm307hp5kckb7icarqfrx0gih";
+ sha256 = "1frslwbqnv3mwv5dpb1sbhxnwl87cps2ambkkhnn9wwckjpm7p8f";
};
passthru = {
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
desktop-file-utils
gettext
glib-networking
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index 78ddeb6e6d90d5d4f08a24f7b9793d3075375523..cba593e4c96006d5213491b5d050dcf4a379341d 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
-, ninja, vala, desktop-file-utils, libxml2, gtk3, granite
+, ninja, vala, desktop-file-utils, gtk3, granite
, python3, libgee, clutter-gtk, json-glib, libgda, libgpod
, libnotify, libpeas, libsoup, zeitgeist, gst_all_1, taglib
, libdbusmenu, libsignon-glib, libaccounts-glib
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 493e7a97805b867b5060538d449e14b4f18a8e88..1704db78c5e9e9544f31d9debbdba2fa6464d5ad 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils
-, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2, fetchpatch
+, gtk3, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2
, granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3
-, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }:
+, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, elementary-icon-theme }:
stdenv.mkDerivation rec {
pname = "photos";
- version = "2.6.3";
+ version = "2.6.4";
name = "elementary-${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1s0ww5g26wj0gd1drj8gxs74gvg2c9fdj4ixpifj8jh8yafdmrvg";
+ sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1";
};
passthru = {
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
appstream
desktop-file-utils
- gobject-introspection
meson
ninja
pkgconfig
@@ -66,12 +65,6 @@ stdenv.mkDerivation rec {
"-Dplugins=false"
];
- patches = [
- # https://github.com/elementary/photos/pull/505
- # Unrelated line got dropped in https://github.com/elementary/photos/pull/498
- ./fix-missing-line.patch
- ];
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch b/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch
deleted file mode 100644
index ae859d9dff9273b8cb53f26b2093719e66d4a56d..0000000000000000000000000000000000000000
--- a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 88ee69b57f94efa2779595d1544109fed6a3211c Mon Sep 17 00:00:00 2001
-From: Fabio Valentini
-Date: Tue, 16 Apr 2019 16:12:47 +0200
-Subject: [PATCH] photos/PhotoMetadata: fix issue introduced with PR #498
-
----
- src/photos/PhotoMetadata.vala | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
-index f0a4a73b..34dcbb55 100644
---- a/src/photos/PhotoMetadata.vala
-+++ b/src/photos/PhotoMetadata.vala
-@@ -197,6 +197,7 @@ public class PhotoMetadata : MediaMetadata {
- #else
- exiv2.from_app1_segment (buffer, length);
- #endif
-+ exif = Exif.Data.new_from_data (buffer, length);
- source_name = "".printf (length);
- }
-
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index 2644d31d79836ac09f8b4a3699b6c86b42582378..74af15e27879e2041f55d0f8188330c407e8a5a4 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, callPackage
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
-, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, libcanberra, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 19bf4ce098bc8a554549d121d31567e5edff9537..2c146169f4274643be7cb979982d17319b440186 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
, vala, desktop-file-utils, gtk3, libxml2, granite, libnotify, vte, libgee
-, elementary-icon-theme, appstream, gobject-introspection, wrapGAppsHook }:
+, elementary-icon-theme, appstream, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "terminal";
- version = "5.3.4";
+ version = "5.3.5";
name = "elementary-${pname}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "08vwgd385j7cbi7c8442sjygzw9qy2phsi5lva4jaxwm8l15hk86";
+ sha256 = "1gd5m24digmx3sgs21ggfiqiwhgym6s1dlg1sv9mdqh5wgsa6b8f";
};
passthru = {
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
appstream
desktop-file-utils
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index b123d4cbf5bc3ce626698d3157db19fa47fed11c..2d978d966b93a96dcba7edacd65c59f38a6682c3 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3
, desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1
-, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "videos";
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index 1883e2294797e1d985a6185d9ded4790d3e51896..859e04eb954d33d641edaf5beb984e5516ab127f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+, vala, libgee, granite, gtk3, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-a11y";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index d217ad20d2ed55f18c8ff6c6203c5adf3686cdea..6d7ecbffa3146230bd9f36e1dbac1f617c724f89 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, pciutils, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja
+, pkgconfig, vala, libgee, granite, gtk3, switchboard, pciutils }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index ed4dc0c844733844f053351eab0f3dba40fde34b..0d7586391ce07d5e6e5b2e70d4bc96e3f0c58cfa 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja
+, pkgconfig, vala, libgee, granite, gtk3, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-applications";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index db653a7f8ffe350cbd6033a021cf92c8c36583df..547b6d897e4ee448b4155c6e3a7fb191560da4ba 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee
-, granite, gtk3, bluez, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
+, vala, libgee, granite, gtk3, bluez, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-bluetooth";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index 8c00ff4728e8c1c605ba5280100eb6c211cf8b7c..e1303a3cc48a994a54c525f3b68d8e6d1c195504 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, substituteAll, pkgconfig
-, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata, gobject-introspection }:
+, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-datetime";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index f5fbb0a51cfbc50c84aad4a63e2f44e342ce7a56..22fb795297e0ece9e2fbd4bbc86d27d4c25922af 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja
+, pkgconfig, vala, libgee, granite, gtk3, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 50256b8f77d7ae2237dd7a8be05010fe4a5f42d7..71f865bdeb6299fd087eb23aa3c7ef3fce3bf0d2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig, vala, libgee
-, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig
+, vala, libgee, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index eaf15fdb81557b929c7c5fc75aac5c531d37f31b..76edfa18add65711471eba3fd3e461002e79c75b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, fetchpatch, meson, ninja, pkgconfig, vala
-, libgee, granite, gtk3, switchboard, elementary-settings-daemon, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
+, libgee, granite, gtk3, switchboard, elementary-settings-daemon }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-mouse-touchpad";
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 95b558901d20b254789ac9e3a8e2f5af7c0937f7..283a13bd82aa5068f39955a14b41476685a7f2cc 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, substituteAll, vala
-, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard, gobject-introspection }:
+, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-network";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index a6fb86bb828c1445960118280f41ba67742f1dbd..277f70cf984ccf0fb156b1cd8629632012488cf6 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja
+, pkgconfig, vala, libgee, granite, gtk3, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-notifications";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 0417d33df7d7be3fc2cf02707b8ca7ee85de6007..496a69ce1f6b8d75a831999a81090271ef6c6a57 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
, libgee, granite, gtk3, libaccounts-glib, libsignon-glib, json-glib
-, librest, webkitgtk, libsoup, switchboard, gobject-introspection }:
+, librest, webkitgtk, libsoup, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index 6c29282652c85e94d658ead8d539a33c10bdf1d0..4d6a1f5c5c67b35aaa6372a990234e2ce1cbd00d 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop
-, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf }:
+, gala, wingpanel, plank, switchboard, gettext, bamf }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gettext
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 0178f23f5e1a2247febc1a58c2cd81f1427cfca6..8a56a8535e8b41e167f4ba8ee991a0156f82c5c3 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja
, pkgconfig, vala, libgee, elementary-dpms-helper, elementary-settings-daemon
-, makeWrapper, granite, gtk3, dbus, polkit, switchboard, gobject-introspection }:
+, granite, gtk3, dbus, polkit, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-power";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index 11bd70894edd398c032e102627272f9a6123c617..293faad51c745dbd2ed393455c0be6ef152ccbca 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, cups, switchboard, gobject-introspection }:
+, vala, libgee, granite, gtk3, cups, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-printers";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index ff59768e363f6d08e3d4f08831c0acc6fb11e92b..d35844320a16d545f216959f203501cb91676b7e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja
, pkgconfig, vala, libgee, granite, gtk3, polkit, zeitgeist
-, switchboard, lightlocker, pantheon-agent-geoclue2, gobject-introspection }:
+, switchboard, lightlocker }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 9660daa7715d20b70c3d587eb35679de9762790b..265352ed8815f0d3e389eca9e037be92a19dde88 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+, vala, libgee, granite, gtk3, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-sharing";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index ad379f37471ac0cea5b647220ac19d6bb61a4b83..907bdc37e2a7f129a5a840f5668a203e1da00e53 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3
-, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee
+, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3, switchboard }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 310230c7aaccf5441fc318974316ad62991aad4f..12edf97f6ba96ca372a92906433c661ed65a8b4e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja
, vala, gtk3, libgee, granite, gettext, clutter-gtk, libunity
-, elementary-icon-theme, wrapGAppsHook, gobject-introspection }:
+, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "switchboard";
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gettext
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index cae8e74f4ba7475134b4c50e5601766c91056b36..f02f79b15a8a0f4e186db01f6460c1316834cdd1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, symlinkJoin, switchboard, switchboardPlugs, plugs }:
+{ makeWrapper, symlinkJoin, switchboard, switchboardPlugs, plugs }:
let
selectedPlugs = if plugs == null then switchboardPlugs else plugs;
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 0e0fa1069580de6f51bd6fd5d54374a97a3e4633..1ce18a1ec40184d439ca9f1a86309e938b8efbb6 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "stylesheet";
- version = "5.2.3";
+ version = "5.2.4";
name = "elementary-gtk-theme-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1ghb6zl9yszsrxdkg8va1b29kyazbny2kncr9fdw6v2rbjnp7zhr";
+ sha256 = "1zhh9s4bmmk69k6j0klvfjmyv32wnwf0g575brm6gswn47nr2fni";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 23fb8445838ad6e2e66932cb9146d4817284915b..d8fa143686ecb8fbb57ca6ae5efa496734f5fdde 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "icons";
- version = "5.0.3";
+ version = "5.0.4";
name = "elementary-icon-theme-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0wpv7yirf44bfqfmyshzfw9605j1idm7c9jqg68k3nmymmd6iqzf";
+ sha256 = "0ha7biqvmkv68x1gi9bfcn5z0ld067pa5czx0pyf053pa86lg3hx";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index 39299d2c2eb7d7da0961dbfb9b65873bfc08cd7d..e7aea3be91efeb3daa9db14cc0c063c3621f8ccd 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pantheon }:
+{ stdenv, fetchFromGitHub, pantheon }:
stdenv.mkDerivation rec {
pname = "default-settings";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 32083d3ada6264dc6d6ce42fed00087e5cb7f4df..a71736887bb1ebdd05a9f6aec46ff4390cd9c4a0 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, makeWrapper, meson
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, meson
, ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon
-, gnome-desktop, mutter, gobject-introspection, elementary-icon-theme, wingpanel-with-indicators
-, elementary-gtk-theme, nixos-artwork, elementary-default-settings, lightdm, numlockx
+, gnome-desktop, mutter, elementary-icon-theme, wingpanel-with-indicators
+, elementary-gtk-theme, nixos-artwork, lightdm, numlockx
, clutter-gtk, libGL, dbus, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index a6ec70a6b5846f72fe2a72e0df0424f5bc7b2336..5fe22f0db8161126d8b3bde238603b9fa7721509 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeTextFile, writeShellScriptBin, elementary-settings-daemon, runtimeShell }:
+{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeShellScriptBin, elementary-settings-daemon, runtimeShell }:
let
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index 6ceebf1980c685ef8b478e45b4feeaa732df97bd..ca0ab888f149b4ae3ac5d9ca7451053fc8181ace 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, libxml2, desktop-file-utils
-, gtk3, glib, granite, libgee, elementary-icon-theme, gobject-introspection, wrapGAppsHook }:
+, gtk3, glib, granite, libgee, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "shortcut-overlay";
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index ba14621e8bdd1b4dea36a37c8ddacbd2cb00ae7e..9117a7b8f7435b8c3ee96c726ffaf4e668b527c0 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala
, desktop-file-utils, gettext, libxml2, gtk3, granite, libgee, bamf, libcanberra
-, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, gobject-introspection
-, elementary-icon-theme, elementary-settings-daemon, wrapGAppsHook }:
+, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, elementary-icon-theme
+, elementary-settings-daemon, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "gala";
- version = "unstable-2019-02-09"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
+ version = "unstable-2019-07-01"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
- rev = "1a96644c6aac405927499dacb308dea13512e919";
- sha256 = "1zi7xyzhsypf52zzfwf7dwcxgd0skxbsssv1vsxgmswszg23p7i3";
+ rev = "5f1dbf15a7571bd16779d964b0cb3bd54232a928";
+ sha256 = "1mbxqqfl54pydgs9pvvgfdbbck91vwyg770gd3vgzc6kmf6c34d5";
};
passthru = {
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
gettext
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 2461ea4875ec5fadf7c0a36682ee9c2d25010fee..0d00ee2072dd7ac0956ce7596e7fae8fe3f58d85 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, cmake, ninja
+{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3
, pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus
-, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3
-, zeitgeist, gobject-introspection, elementary-icon-theme, bc, wrapGAppsHook }:
+, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, zeitgeist
+, bc }:
stdenv.mkDerivation rec {
pname = "applications-menu";
- version = "2.4.2";
+ version = "2.4.3";
name = "wingpanel-${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0y7kh50ixvm4m56v18c70s05hhpfp683c4qi3sxy50p2368d772x";
+ sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd";
};
passthru = {
@@ -25,18 +25,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
appstream
- cmake
- ninja
gettext
- gobject-introspection
+ meson
+ ninja
pkgconfig
+ python3
vala
- wrapGAppsHook
];
buildInputs = [
bamf
- elementary-icon-theme
gnome-menus
granite
gtk3
@@ -44,13 +42,16 @@ stdenv.mkDerivation rec {
libgee
libsoup
libunity
- libwnck3
plank
switchboard
wingpanel
zeitgeist
];
+ mesonFlags = [
+ "--sysconfdir=${placeholder ''out''}/etc"
+ ];
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
@@ -59,9 +60,13 @@ stdenv.mkDerivation rec {
src = ./bc.patch;
exec = "${bc}/bin/bc";
})
- ./xdg.patch
];
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
meta = with stdenv.lib; {
description = "Lightweight and stylish app launcher for Pantheon";
homepage = https://github.com/elementary/applications-menu;
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch
deleted file mode 100644
index f17e2581e07e27407b0ca446a5fcc010124c0514..0000000000000000000000000000000000000000
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 928976a..7f0ea58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,7 +90,7 @@ link_directories (${DEPS_LIBRARY_DIRS})
-
- # Installation
- install (TARGETS ${APPNAME} RUNTIME DESTINATION bin)
--install (FILES ${applications_menu} DESTINATION /etc/xdg/menus)
-+install (FILES ${applications_menu} DESTINATION etc/xdg/menus)
- file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
-
- # Settings schema
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 8db8eb5d5e0e2d7cc3b7641711ff2a3e1dfaf9a9..4d7868a1d14c10967e8af3aff5b7f3414b76d4a6 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3
, ninja, vala, gtk3, granite, libnotify, wingpanel, libgee, libxml2
-, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1gx0xglp6b3znxl4d2vpzhfkxz5z8q04hh7z2mrihj1in155bn44";
+ sha256 = "04ggakf7qp4q0kah5xksbwjn78wpdrp9kdgkj6ibzsb97ngn70g9";
};
passthru = {
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 297e99fe47b13a87af7bb1bbac57910462d9b522..701296900603589c54e77bc20f7dc5c5b15bac43 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, python3
-, ninja, substituteAll, vala, gtk3, granite, wingpanel, evolution-data-server
-, libical, libgee, libxml2, libsoup, gobject-introspection
-, elementary-calendar, elementary-icon-theme, wrapGAppsHook }:
+, ninja, vala, gtk3, granite, wingpanel, evolution-data-server
+, libical, libgee, libxml2, libsoup, elementary-calendar, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime";
@@ -21,7 +20,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index f34ca29a98bb6baeea89033e63b8db512ee9ae0c..aa63f82c9652393e28c25f2b4700cba391f87355 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja
, substituteAll, vala, gtk3, granite, libxml2, wingpanel, libgee
-, xorg, libgnomekbd, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, xorg, libgnomekbd, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-keyboard";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
libxml2
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index 2ac05fdc6d82fc06c05817c4823c68143ba10ed9..a201d6864a66e1afab7b7bdc29d0e86751f8775c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
, gtk3, granite, networkmanager, networkmanagerapplet, wingpanel
-, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, libgee, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-network";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 8e450726976bf5ea518622f0db68090a9893d420..fd4e1cc7e1775f19820d2848a2c1c8d7e2e9ca3f 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
-, gtk3, granite, wingpanel, libgee, libxml2, gobject-introspection
-, elementary-icon-theme, wrapGAppsHook }:
+, gtk3, granite, wingpanel, libgee, libxml2, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-nightlight";
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 6a7fcfbb4e03951551d7e02d7d37bcb4515906f5..03369c3ad42e1b968c96115b9339a37dd71c6733 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, gtk3, granite
-, wingpanel, libgee, libwnck3, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, wingpanel, libgee, libwnck3, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index 45a4e543b662530dc479d26105fe54ce83658a2e..a9af53449c9abe33001b812cc5e6550a8ad06544 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3
, ninja, vala, gtk3, granite, bamf, libgtop, udev, wingpanel
-, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, libgee, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-power";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index a46e001e7a0eb8c6c364e6aa656ee3e2f1f50ed0..b6607d54a7e8b3d3a29f8acbf498002186b9fff4 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
, ninja, vala, gtk3, granite, wingpanel, accountsservice
-, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, libgee, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-session";
- version = "2.2.3";
+ version = "2.2.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1y0blff02p3w23sv17yg7fq0yq0g2k8j7vjmk92k664fx72kjjzh";
+ sha256 = "1x2p2sjal42bspmqcg9lzixv6rnihvgmwk92gfcccrmvk8j4bx6s";
};
passthru = {
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index fc40c2faf5ef73a8a96f895fa16054514cc25550..3e17813fde2a905ff518907d70ca9bebad5fcccc 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
, python3, ninja, vala, gtk3, granite, wingpanel, libnotify
, pulseaudio, libcanberra-gtk3, libgee, libxml2, wrapGAppsHook
-, gobject-introspection, elementary-icon-theme }:
+, elementary-icon-theme }:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
libxml2
meson
ninja
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index 28b226bdedb98eacbf1c37c076e72690bdad8ff5..be6c89f9c05d8192171d7d640629cafb53b61d84 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchFromGitHub, pantheon, fetchpatch, wrapGAppsHook, pkgconfig, meson, ninja
-, vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib
-, python3, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja
+, vala, gala, gtk3, libgee, granite, gettext, mutter, json-glib, python3 }:
stdenv.mkDerivation rec {
pname = "wingpanel";
- version = "2.2.4";
+ version = "2.2.5";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "17xl4l0znr91aj6kb9p0rswyii4gy8k16r9fvj7d96dd5szdp4mc";
+ sha256 = "15pl3km8jfmlgrrb2fcabdd0rkc849arz6sc3vz6azzpln7gxbq7";
};
passthru = {
@@ -21,8 +20,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gettext
- glib-networking
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix
index 66ba331ddcdc75ac4d59d14d0a40ebb5c70e8202..cc612407bf6143fe426c518c84399ae2f4f170a5 100644
--- a/pkgs/desktops/pantheon/granite/default.nix
+++ b/pkgs/desktops/pantheon/granite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, gobject-introspection, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "granite";
diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix
index 59983469c114021789fc761bdc3775d3e544a593..da5e544b0058e79422dee4325e991f864a080524 100644
--- a/pkgs/desktops/pantheon/services/cerbere/default.nix
+++ b/pkgs/desktops/pantheon/services/cerbere/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "cerbere";
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index e77948ccf295a32b0c078eb56e36d02450143b02..055706b1521a03703c84dd7665833d7c9dec18c9 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala
-, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, gobject-introspection, wrapGAppsHook }:
+, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "capnet-assist";
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
index 4dab02d5083401e80bd6f15cfefd490914ecbef7..54f556e3a92ec1cebbb66af5f600ead1777812b6 100644
--- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pantheon, makeWrapper, lib, meson, ninja, desktop-file-utils, glib, coreutils, elementary-settings-daemon, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, pantheon, makeWrapper, meson, ninja, desktop-file-utils, glib, coreutils, elementary-settings-daemon, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "dpms-helper";
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index eeca04eff4e8f9ef62395210e4c6932bf44d6be3..d8514c51f4f703e89a35cafee9e96ef67d8a8e07 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -36,25 +36,26 @@
, systemd
, tzdata
, upower
+, libXtst
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-settings-daemon";
- version = "3.32.0";
+ version = "3.30.2";
projectName = "gnome-settings-daemon";
src = fetchurl {
url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz";
- sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63";
+ sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
};
# Source for ubuntu's patchset
src2 = fetchgit {
url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}";
rev = "refs/tags/ubuntu/${version}-1ubuntu1";
- sha256 = "0ayd50mr0pv2h4j1r1haf8y2hj8jv59vypa7lx8jis0llrm7s3yn";
+ sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c";
};
# We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build.
@@ -66,10 +67,12 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit tzdata mousetweaks;
})
+ ./global-backlight-helper.patch
"${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch"
"${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
"${patchPath}/correct_logout_action.patch"
"${patchPath}/ubuntu-lid-close-suspend.patch"
+ "${patchPath}/revert-wacom-migration.patch"
"${patchPath}/revert-gsettings-removals.patch"
"${patchPath}/revert-mediakeys-dbus-interface-drop.patch"
"${patchPath}/ubuntu_ibus_configs.patch"
@@ -98,6 +101,10 @@ stdenv.mkDerivation rec {
# This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8
# TODO: shouldn't be neeed for the 5.1 greeter (awaiting release)
rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop
+
+ # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper
+ mkdir -p $out/bin/elementary-settings-daemon
+ ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper
'';
nativeBuildInputs = [
@@ -124,6 +131,7 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas
gtk3
lcms2
+ libXtst
libcanberra-gtk3
libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
libgudev
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c073b23e6b9f42a02d89f05ce8f780f5adf4e89d
--- /dev/null
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
@@ -0,0 +1,26 @@
+diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
+index e83f1549..15890053 100644
+--- a/plugins/power/gpm-common.c
++++ b/plugins/power/gpm-common.c
+@@ -452,7 +452,7 @@ run_backlight_helper (enum BacklightHelperCommand command,
+ gchar *argv[5] = { 0 };
+
+ argv[0] = "pkexec";
+- argv[1] = LIBEXECDIR "/gsd-backlight-helper";
++ argv[1] = "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper";
+ argv[2] = helper_args[command];
+ argv[3] = value;
+
+diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
+index f16300f8..f19bba3e 100644
+--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
++++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
+@@ -25,7 +25,7 @@
+ no
+ yes
+
+- @libexecdir@/gsd-backlight-helper
++ /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper
+
+
+
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index 2487c4ba3af4d8b61857d99f96c9f9802787dfb1..79bc4bc6a0126b4af72ece5b88348e22fbd1bcd3 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, vala, glib
-, gtk3, libgee, desktop-file-utils, geoclue2, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, glib
+, gtk3, libgee, desktop-file-utils, geoclue2, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "pantheon-agent-geoclue2";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0fww65dnbg9zn0gy1q2db39kjra50ykzw05pmn9iwxkijyxi8hm5";
+ sha256 = "1hjnbbzsch09090b200b3i85x8fv95agfqd6nrlc9za3jqjhm2xs";
};
passthru = {
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index 4fdaa4a8bf9fd0824c8edcf9c9afa8dfea4067aa..d9e5512ce784aec6a27bd75cdfed694860e2b418 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja
-, vala, gtk3, libgee, polkit, gobject-introspection, wrapGAppsHook }:
+, vala, gtk3, libgee, polkit, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "pantheon-agent-polkit";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
pkgconfig
diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix
index 48fd2f2bf858f9e9e341e61a6c98805924a89954..0162de7349a3cdd57ac9c051cec6c39c83b60925 100644
--- a/pkgs/desktops/pantheon/update.nix
+++ b/pkgs/desktops/pantheon/update.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeScript, runCommand, nix, bash, git, jq, nix-prefetch-scripts, coreutils, common-updater-scripts, gnugrep, gnused, curl }:
+{ runCommand, nix, bash, git, jq, nix-prefetch-scripts, coreutils, common-updater-scripts, gnugrep, gnused, curl }:
{ repoName, attrPath ? repoName, versionPolicy ? "release" }:
let
script = ./update.sh;
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index cd2fa293e7d0e65782da08de8084d978583dec51..034b57ec06a3de5d206cdb1ff0b90fbda34f9a6f 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.3/ )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.5/ )
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 2866cddbea18737c2873eed5e32f9049ea6aba6e..680021e350b74793e049124422602c3711d63edd 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, fetchpatch,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index cfafc4d13219bcc6cef5a2914e60f1234c71c4f1..ac0a3494c226ee80f07bfd859a1bb82fa66d48b0 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,363 +3,363 @@
{
bluedevil = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/bluedevil-5.15.3.tar.xz";
- sha256 = "1vdij1ydrwj51nsf3ysmql3wy3y7ayipzrqgxwa52r9n49zckva0";
- name = "bluedevil-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz";
+ sha256 = "7379230de96c5e6d4ea40f4dfa8732e20a6ee3bd291e6f119ccb57646c33fe1f";
+ name = "bluedevil-5.15.5.tar.xz";
};
};
breeze = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/breeze-5.15.3.tar.xz";
- sha256 = "0l7yngc32af7gdi8p68c8267bbzhfvpynqclq3il4fvaxc6vbq2b";
- name = "breeze-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/breeze-5.15.5.tar.xz";
+ sha256 = "a13de0472dacd5240c3d38d0841ea7b9098405cf1f8cff77504d1824d09dcac4";
+ name = "breeze-5.15.5.tar.xz";
};
};
breeze-grub = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/breeze-grub-5.15.3.tar.xz";
- sha256 = "0ccx8yfxhc5r3kv7snv80wpz7h5a9l762iz1cx5sfjpmmq2jhi64";
- name = "breeze-grub-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz";
+ sha256 = "4a27689446d66b7de043321022093e8f457dd4d47c124186f233b0606ddcfd64";
+ name = "breeze-grub-5.15.5.tar.xz";
};
};
breeze-gtk = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/breeze-gtk-5.15.3.tar.xz";
- sha256 = "1rg323fyq0q07k00xi63csi0f3bwzi1cbm6srshqih0cnfgq69j4";
- name = "breeze-gtk-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz";
+ sha256 = "d4e16ffbcbe74c48fda7c5bfd18c3f479f56d54b761d9b1d9678119479412ca8";
+ name = "breeze-gtk-5.15.5.tar.xz";
};
};
breeze-plymouth = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/breeze-plymouth-5.15.3.tar.xz";
- sha256 = "0f654kys4xw2c84iblz2q2x53z4mb2javgngb1dr3jkafysr0h37";
- name = "breeze-plymouth-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz";
+ sha256 = "0a518d5a9e1bddeb3e1c7329966ce178a36ab0a0bd6dd28caf803fe8c1680de8";
+ name = "breeze-plymouth-5.15.5.tar.xz";
};
};
discover = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/discover-5.15.3.tar.xz";
- sha256 = "1b6mc81xr4wl29bjw95jm8k72j3hhn1ps8a5dvzanbslfx31hf1b";
- name = "discover-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/discover-5.15.5.tar.xz";
+ sha256 = "6f2bbaade87b959c8bd847e90ecec0c9aa8b4accee63318d25e5beb77deaf854";
+ name = "discover-5.15.5.tar.xz";
};
};
drkonqi = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/drkonqi-5.15.3.tar.xz";
- sha256 = "0y4bkrv7bx69hm4kbbd2jfjnccj99686s0k5lm4ldv3wvf66k4sx";
- name = "drkonqi-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz";
+ sha256 = "8669913aa8485257cbb19bbe5bb6956044d0a6896a365cea024b1247d0a6502e";
+ name = "drkonqi-5.15.5.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kactivitymanagerd-5.15.3.tar.xz";
- sha256 = "1lz3mm0bli2w8xwr3n06ss7qqzm4clvs3d9hfydyf7xq03mszrym";
- name = "kactivitymanagerd-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz";
+ sha256 = "e38ec9074e0bc5c1a21bd5eee97b7d99e6528186918e832fecf1e3f95da239db";
+ name = "kactivitymanagerd-5.15.5.tar.xz";
};
};
kde-cli-tools = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kde-cli-tools-5.15.3.tar.xz";
- sha256 = "1praysa894m67kwy4xaqh354c0shwfyyrqf4n9wrfwwrchdw6ypg";
- name = "kde-cli-tools-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz";
+ sha256 = "fbff40188d7864a11aa6aea0b6d8cca2c66025924b3cb29275ac6d282ece9ace";
+ name = "kde-cli-tools-5.15.5.tar.xz";
};
};
kdecoration = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kdecoration-5.15.3.tar.xz";
- sha256 = "1ymp6szphpnfvdnhg8n1wan76z1s5xw68xsmwm21zrjf8lmrwkdh";
- name = "kdecoration-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz";
+ sha256 = "33d613b706b83c025675d7d2b20e074219c9a0953a500c306081c24fcf84d99f";
+ name = "kdecoration-5.15.5.tar.xz";
};
};
kde-gtk-config = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kde-gtk-config-5.15.3.tar.xz";
- sha256 = "1ysw26sfx2wyd79bkknvvcmg5s4b154iyds9c6wp8brmcn6ng3s8";
- name = "kde-gtk-config-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz";
+ sha256 = "958163b1134b7c9e9735b5b6a4448973f09dbf43991511f768b29bd038baa185";
+ name = "kde-gtk-config-5.15.5.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kdeplasma-addons-5.15.3.tar.xz";
- sha256 = "071wnwxgywg6bqqgwmjyswai3k0n4c15lq8mspcy92kym3msqkrn";
- name = "kdeplasma-addons-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz";
+ sha256 = "1e11158f636e1d4bb25bbe4bb2f2fca37728c6aae07340ca6c2c1ec9e882ece3";
+ name = "kdeplasma-addons-5.15.5.tar.xz";
};
};
kgamma5 = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kgamma5-5.15.3.tar.xz";
- sha256 = "12cnrnmr2wp14afg6x438gm502514pk61mfr26cypvcd6azpc2my";
- name = "kgamma5-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz";
+ sha256 = "5e5d2dd439d4fd298eb0283fd9f2bad009c5efe22f72aea795138d22adfdc1e7";
+ name = "kgamma5-5.15.5.tar.xz";
};
};
khotkeys = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/khotkeys-5.15.3.tar.xz";
- sha256 = "0gnkdl6kki8xph3787bacggapm4vbakj39y9kcjqvqrqxifp1ml5";
- name = "khotkeys-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz";
+ sha256 = "59dd6a571d52401b1963cde732b6c6c589a328438155ec0e0c5c77b5ac029127";
+ name = "khotkeys-5.15.5.tar.xz";
};
};
kinfocenter = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kinfocenter-5.15.3.tar.xz";
- sha256 = "0rhhrsp0fmgfsmrfv468l4xinyfyghf6921s1581sgg5fk9qhrwr";
- name = "kinfocenter-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz";
+ sha256 = "0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8";
+ name = "kinfocenter-5.15.5.tar.xz";
};
};
kmenuedit = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kmenuedit-5.15.3.tar.xz";
- sha256 = "1s7bhpxiapmx496f3y3klmc9i2347fs25yhd2brg92jziw73jpab";
- name = "kmenuedit-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz";
+ sha256 = "ad407757e93928dc506271998881a2e5f4a4c96bf763c25e80347e3e23361c26";
+ name = "kmenuedit-5.15.5.tar.xz";
};
};
kscreen = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kscreen-5.15.3.tar.xz";
- sha256 = "1izq1anl0r9ysmsdnc2ny7cx73xc190qbad59nrnlqcxrsplb68f";
- name = "kscreen-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz";
+ sha256 = "c0c47c6d5c618e2c40794dd37586a1733ef6939383b4bb760638e8758a0bd6f7";
+ name = "kscreen-5.15.5.tar.xz";
};
};
kscreenlocker = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kscreenlocker-5.15.3.tar.xz";
- sha256 = "0bglpgibrc8l6yi24pj4kja33mc02clgi1vbdvw1qpp65ixhpzna";
- name = "kscreenlocker-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz";
+ sha256 = "09d9d63e81a60d1c95532639287ba29403e0b04d7e4d46f5a49adbfccf215dcd";
+ name = "kscreenlocker-5.15.5.tar.xz";
};
};
ksshaskpass = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/ksshaskpass-5.15.3.tar.xz";
- sha256 = "1zrjc74srb4jp8sw6pi0ik2i4yxffvgv037d50yk1fif1xyvnf9s";
- name = "ksshaskpass-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz";
+ sha256 = "4b6eae3b594480f6265843fa0b2f3d2051fd45894d27eee3681b7b33c4f52e7e";
+ name = "ksshaskpass-5.15.5.tar.xz";
};
};
ksysguard = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/ksysguard-5.15.3.tar.xz";
- sha256 = "1nxgadymq45yn92cs08gfmv5krc2ylwgbn5qcc2aq6ryrrhrw89q";
- name = "ksysguard-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz";
+ sha256 = "c767cfff83cb8d6d99a6ba13fa534656d6d31666a3eaa7cdce677535e9f9624a";
+ name = "ksysguard-5.15.5.tar.xz";
};
};
kwallet-pam = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kwallet-pam-5.15.3.tar.xz";
- sha256 = "1w3vf92k3k2084cflv4fwav16czc4vqg62gi8x1alri38ziyb793";
- name = "kwallet-pam-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz";
+ sha256 = "36f3e50019dcd9919755d47b62abf99412299aa87ee27fecbf1dca212a94d22e";
+ name = "kwallet-pam-5.15.5.tar.xz";
};
};
kwayland-integration = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kwayland-integration-5.15.3.tar.xz";
- sha256 = "0grb9fnk7pfgwzj3c9d11zl1j9jy9k6d4pw2n2fdrs02g3yg603h";
- name = "kwayland-integration-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz";
+ sha256 = "8dec5719104a551fc8c1d6249568accedce9b8d18691d818f2b7abc13f21fd17";
+ name = "kwayland-integration-5.15.5.tar.xz";
};
};
kwin = {
- version = "5.15.3.2";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.2.tar.xz";
- sha256 = "0iri6993zsxmrm7qnf76py7ihc27x9y741ar7g9fry8c8knmqyrw";
- name = "kwin-5.15.3.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kwin-5.15.5.tar.xz";
+ sha256 = "e341c8165354643fd201292e53418050970bf8819b2cd0dd932423a342d2f805";
+ name = "kwin-5.15.5.tar.xz";
};
};
kwrited = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/kwrited-5.15.3.tar.xz";
- sha256 = "0xhdmnfkpr35sks7k66s5cbq220yrmbn8ixcsdqwsgpji2sx4g7v";
- name = "kwrited-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz";
+ sha256 = "fbc27517898e57aa6b4c476673971f310121ac3d61e1d30a23e9289930056510";
+ name = "kwrited-5.15.5.tar.xz";
};
};
libkscreen = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/libkscreen-5.15.3.tar.xz";
- sha256 = "0fzfk8ga5qinsmag61l29cf92r7qm4nlb8hrhddyff7d7c7kr3vj";
- name = "libkscreen-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz";
+ sha256 = "bee15b0ce38e17475542b0e500a82567fdbe0a635e84a543b2f3255ac8c58d87";
+ name = "libkscreen-5.15.5.tar.xz";
};
};
libksysguard = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/libksysguard-5.15.3.tar.xz";
- sha256 = "05cfb51xcmxb8k2k14n2i5ysj47aism9yq7lk2rw216bsdp2mqnj";
- name = "libksysguard-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz";
+ sha256 = "4255a997c4f0b2039201db6e00038e08519c5fde73032ba709ae9bcfaceabfd0";
+ name = "libksysguard-5.15.5.tar.xz";
};
};
milou = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/milou-5.15.3.tar.xz";
- sha256 = "1prq9mdrysz8ckf7n6sjfn3qc87135nj69v2jcayn9irb0k8wz01";
- name = "milou-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/milou-5.15.5.tar.xz";
+ sha256 = "2740cbfae30483c402471349f4d1315b98edf054827ec70980bb966cd6b3fcf9";
+ name = "milou-5.15.5.tar.xz";
};
};
oxygen = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/oxygen-5.15.3.tar.xz";
- sha256 = "0a069imvw0khkbcih8zvx0i0ks99jkwis6p73n4846qz544f3dvb";
- name = "oxygen-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz";
+ sha256 = "0791314c8894331bfa46d8b8aa30805972d09497a9e4bbe3f82270d4455be62c";
+ name = "oxygen-5.15.5.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-browser-integration-5.15.3.tar.xz";
- sha256 = "1mhaa5z63gyd8j7zplmyicnibqsv1xhd9mxip6clhj5bfk8q9jar";
- name = "plasma-browser-integration-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz";
+ sha256 = "f1883b504cb5e86a43e16fea803b93c81b09e4ce1339ae8bcf6cf35d7e734d3b";
+ name = "plasma-browser-integration-5.15.5.tar.xz";
};
};
plasma-desktop = {
- version = "5.15.3.2";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.2.tar.xz";
- sha256 = "12pz0bin3j2f98k88nwmb271lr6v6w3l28li0iri2x8pk144vr91";
- name = "plasma-desktop-5.15.3.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz";
+ sha256 = "42097c0b2553dd4767b6fde441db371d5e2defbd4e82389ca91d076f62ae3741";
+ name = "plasma-desktop-5.15.5.tar.xz";
};
};
plasma-integration = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-integration-5.15.3.tar.xz";
- sha256 = "08qw2ibl0j2nhsplc3b117vdc00bd2gn1q48nx0xy349bf64m735";
- name = "plasma-integration-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz";
+ sha256 = "05920610c68981a9effb1a97395a22d281d3b61e42d55d66adf8bb587da29621";
+ name = "plasma-integration-5.15.5.tar.xz";
};
};
plasma-nm = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-nm-5.15.3.tar.xz";
- sha256 = "1l9wh4hs2v0b9hdagcgl67z0w4amffakxczwy0nwymqzv0mxgqvz";
- name = "plasma-nm-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz";
+ sha256 = "6a2cde83ff031de3565465d48538578380301debb8e49345e25ff3f723c908ee";
+ name = "plasma-nm-5.15.5.tar.xz";
};
};
plasma-pa = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-pa-5.15.3.tar.xz";
- sha256 = "1lkhidd5b4mjn23mxcp2vfmxf7dwbk7y14svc4wy6xc1xg1pc125";
- name = "plasma-pa-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz";
+ sha256 = "326a6d3f6f9d462a3b88402ae6be2dac976f166995a5cb750d294d51085a0a92";
+ name = "plasma-pa-5.15.5.tar.xz";
};
};
plasma-sdk = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-sdk-5.15.3.tar.xz";
- sha256 = "1qzh0yy4zql7a50ql9ghhvlfxjnbckflbgbzdyd7i9x3ml7s5saw";
- name = "plasma-sdk-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz";
+ sha256 = "f91ccb03f016328c2bd54ac11a916b4f874cfe2304da1600f3fa014faeb7d329";
+ name = "plasma-sdk-5.15.5.tar.xz";
};
};
plasma-tests = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-tests-5.15.3.tar.xz";
- sha256 = "1z5vhw1dy1qks6w161yamn2fawrgkggv9mvvgpmljmy07qpafgkg";
- name = "plasma-tests-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-tests-5.15.5.tar.xz";
+ sha256 = "534c018f45f8545f027aeccea8731a26311179328e7a746522fa11961c5c5827";
+ name = "plasma-tests-5.15.5.tar.xz";
};
};
plasma-vault = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-vault-5.15.3.tar.xz";
- sha256 = "1my9dnqz11frn07fk505pfi2nkf2d642jfgjklh5zfngjxy589jy";
- name = "plasma-vault-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz";
+ sha256 = "2d7c356fa951b341fcb5ea48ed819f396fe9096e06e6f2026c9f59a59fa48fd5";
+ name = "plasma-vault-5.15.5.tar.xz";
};
};
plasma-workspace = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-5.15.3.tar.xz";
- sha256 = "08irdg8divr45z53kr6b1mv4s2jakmq3r79g7df6ja9rb6py5f59";
- name = "plasma-workspace-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz";
+ sha256 = "c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973";
+ name = "plasma-workspace-5.15.5.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-wallpapers-5.15.3.tar.xz";
- sha256 = "0xgssv66ksljv8xkj20v2x1bppkyn8z17wa3hynwlcqxh2g4afq4";
- name = "plasma-workspace-wallpapers-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz";
+ sha256 = "0dc21728f3a08d823106bae7dd99d9b6b28b9b77abe8cf8f213bd4cf5b66b945";
+ name = "plasma-workspace-wallpapers-5.15.5.tar.xz";
};
};
plymouth-kcm = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/plymouth-kcm-5.15.3.tar.xz";
- sha256 = "0fbr9nf263pc9inakhp901r58mlsm1jgw0xqp9fj08c9lj25z190";
- name = "plymouth-kcm-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz";
+ sha256 = "9454cff23e7acae549bdd61818cb351332b334f9cf0b7a7eb065d6dd784950aa";
+ name = "plymouth-kcm-5.15.5.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.15.3";
+ version = "1-5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/polkit-kde-agent-1-5.15.3.tar.xz";
- sha256 = "07gl57h9zmagbw7v2sfksbcbqrfdhr8isfmpcw10rc4k2awlsysy";
- name = "polkit-kde-agent-1-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz";
+ sha256 = "628ce9a02defa31e98a6a373abb6a1f2bf39f065eaf82fdbb4f93bf07165e267";
+ name = "polkit-kde-agent-1-5.15.5.tar.xz";
};
};
powerdevil = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/powerdevil-5.15.3.tar.xz";
- sha256 = "1f7ik3lh30irqzf0pgy59kkrsn4fkl8xwam1bikfm34bwzrsxb14";
- name = "powerdevil-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz";
+ sha256 = "c435cdcab2ff367ca86f91a45ac43fa9f9b68251e8e444b285b7edd33482ad06";
+ name = "powerdevil-5.15.5.tar.xz";
};
};
sddm-kcm = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/sddm-kcm-5.15.3.tar.xz";
- sha256 = "1mvp8p1k9csmn6h6iyk29yj1j4b4dfyd6j4v0v2ha1vdfjwjlsh2";
- name = "sddm-kcm-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz";
+ sha256 = "4d5ee74e494f78a90d1586862749d53f4dc34970f47307d62a4e6ead9161c25b";
+ name = "sddm-kcm-5.15.5.tar.xz";
};
};
systemsettings = {
- version = "5.15.3.2";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.2.tar.xz";
- sha256 = "0bqhff2s2qyz1x8nhrphnkyja0mhr7msf58cwdkscsl6lyamn2a2";
- name = "systemsettings-5.15.3.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz";
+ sha256 = "a29227329f8ddd2db2ba8aafb3eb5f2b09d01e3a6f761d291afba95935ceb93a";
+ name = "systemsettings-5.15.5.tar.xz";
};
};
user-manager = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/user-manager-5.15.3.tar.xz";
- sha256 = "18acg3xjcdhcwk3irsf1hgkwma9mn6msl6qwmf0slz1lydlrljs4";
- name = "user-manager-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz";
+ sha256 = "09e746e14bc732e296e93290929dfd1d378abe0b6b47fce084c97dd82a3f2431";
+ name = "user-manager-5.15.5.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.15.3";
+ version = "5.15.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.3/xdg-desktop-portal-kde-5.15.3.tar.xz";
- sha256 = "10cmy4j54nkwrgibxdpx6d30g596ikvb1dqqmp1gvmzr570gmbi7";
- name = "xdg-desktop-portal-kde-5.15.3.tar.xz";
+ url = "${mirror}/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz";
+ sha256 = "fd98af5fe77e5a387bee25bcbdfa39607d1b91ba1cd431ae72cff8103548ac50";
+ name = "xdg-desktop-portal-kde-5.15.5.tar.xz";
};
};
}
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix
index 5cf39639a126ca7bfc64804e3dde744b10cf2441..19bd560cbaef66781ce6bd3ca48371d7ea1b795f 100644
--- a/pkgs/desktops/xfce/applications/orage.nix
+++ b/pkgs/desktops/xfce/applications/orage.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
-, libnotify, popt, xfce, hicolor-icon-theme }:
+, libnotify, popt, xfce }:
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
diff --git a/pkgs/desktops/xfce4-13/exo/gtk3-only.patch b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch
deleted file mode 100644
index 74e6f812e3c73b890b27d8cd88bc86b9ac8ad787..0000000000000000000000000000000000000000
--- a/pkgs/desktops/xfce4-13/exo/gtk3-only.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urNZ a/configure.ac.in b/configure.ac.in
---- a/configure.ac.in 2017-11-20 02:57:40.476664918 +0000
-+++ b/configure.ac.in 2017-11-20 03:07:18.999128370 +0000
-@@ -165,11 +165,9 @@
- dnl ***********************************
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
- XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
--XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
- XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0])
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
--XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
- XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
-
-diff -urNZ a/exo/Makefile.am b/exo/Makefile.am
---- a/exo/Makefile.am 2017-11-20 02:57:34.444785202 +0000
-+++ b/exo/Makefile.am 2017-11-20 03:00:49.402897465 +0000
-@@ -117,7 +117,7 @@
-
- libexo_2_includedir = $(includedir)/exo-2/exo
-
--lib_LTLIBRARIES += libexo-2.la
-+lib_LTLIBRARIES = libexo-2.la
-
- libexo_2_include_HEADERS = \
- exo.h \
-Binary files a/.git/index and b/.git/index differ
diff --git a/pkgs/desktops/xfce4-13/garcon/12700.patch b/pkgs/desktops/xfce4-13/garcon/12700.patch
deleted file mode 100644
index fda36d696510a45bf769fd18fc4fac486b7ae6e4..0000000000000000000000000000000000000000
--- a/pkgs/desktops/xfce4-13/garcon/12700.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Yegor Timoshenko
-Date: Thu, 14 Dec 2017 21:13:02 +0000
-Subject: [PATCH] Decrement allocation counter on item unref (#12700)
-
-diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
-index 2017180..355e520 100644
---- a/garcon/garcon-menu-item-pool.c
-+++ b/garcon/garcon-menu-item-pool.c
-@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id,
- g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
-
-- return garcon_menu_node_tree_rule_matches (node, item);
-+ gboolean matches = garcon_menu_node_tree_rule_matches (node, item);
-+
-+ if (matches)
-+ garcon_menu_item_increment_allocated (item);
-+
-+ return matches;
- }
-
-
-diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
-index ca8cb63..b44acfe 100644
---- a/garcon/garcon-menu-item.c
-+++ b/garcon/garcon-menu-item.c
-@@ -1908,6 +1908,8 @@ garcon_menu_item_unref (GarconMenuItem *item)
- {
- g_return_if_fail (GARCON_IS_MENU_ITEM (item));
-
-+ garcon_menu_item_decrement_allocated (item);
-+
- /* Decrement the reference counter */
- g_object_unref (G_OBJECT (item));
- }
---
-2.15.1
diff --git a/pkgs/desktops/xfce4-13/garcon/13785.patch b/pkgs/desktops/xfce4-13/garcon/13785.patch
deleted file mode 100644
index 1b723d21d60a6ae63fd03df2810324513aea9f95..0000000000000000000000000000000000000000
--- a/pkgs/desktops/xfce4-13/garcon/13785.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001
-From: Stefan Berzl
-Date: Mon, 21 Aug 2017 18:39:07 +0300
-Subject: [PATCH] fix: some menu icons are too big (Bug #13785)
-
-Some packages only provide icons in sizes much bigger than the standard
-GTK menu size of 16px.
-
-The clipboard manager qlipper for example provides the following icon:
-/usr/share/icons/hicolor/128x128/apps/qlipper.png
-
-In GTK 3.22.18 the function gtk_image_new_from_icon_name when given
-GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128.
-
-The patch I have supplied uses existing code to scale such an image.
-
-Signed-off-by: Eric Koegel
----
- garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++--------------
- 1 file changed, 19 insertions(+), 14 deletions(-)
-
-diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
-index 41990f2..f31a1ed 100644
---- a/garcon-gtk/garcon-gtk-menu.c
-+++ b/garcon-gtk/garcon-gtk-menu.c
-@@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
- gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
- size = MIN (w, h);
-
-- if (! gtk_icon_theme_has_icon (icon_theme, icon_name))
-+ if (gtk_icon_theme_has_icon (icon_theme, icon_name))
-+ {
-+ pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);;
-+ }
-+ else
- {
- if (g_path_is_absolute (icon_name))
- {
-@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
- g_free (name);
- }
- }
-+ }
-
-- /* Turn the pixbuf into a gtk_image */
-- if (G_LIKELY (pixbuf))
-- {
-- /* scale the pixbuf down if it needs it */
-- GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
-- g_object_unref (pixbuf);
-- pixbuf = tmp;
-+ /* Turn the pixbuf into a gtk_image */
-+ if (G_LIKELY (pixbuf))
-+ {
-+ /* scale the pixbuf down if it needs it */
-+ GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
-+ g_object_unref (G_OBJECT (pixbuf));
-
-- image = gtk_image_new_from_pixbuf (pixbuf);
-- g_object_unref (G_OBJECT (pixbuf));
-- }
-+ image = gtk_image_new_from_pixbuf (pixbuf_scaled);
-+ g_object_unref (G_OBJECT (pixbuf_scaled));
-+ }
-+ else
-+ {
-+ /* display the placeholder at least */
-+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
- }
--
-- if (image == NULL)
-- image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
-
- return image;
- }
diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-13/garcon/default.nix
deleted file mode 100644
index a88d64702a1a62f10c94ce51b455e91a9915be93..0000000000000000000000000000000000000000
--- a/pkgs/desktops/xfce4-13/garcon/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }:
-
-mkXfceDerivation rec {
- category = "xfce";
- pname = "garcon";
- version = "0.6.1";
-
- sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8";
-
- patches = [ ./12700.patch ./13785.patch ];
- buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
-}
diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-13/gigolo/default.nix
deleted file mode 100644
index 0d7b2210b12ce9c019dd59f72e2cff20eed86655..0000000000000000000000000000000000000000
--- a/pkgs/desktops/xfce4-13/gigolo/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ mkXfceDerivation, gtk2, libX11 }:
-
-mkXfceDerivation rec {
- category = "apps";
- pname = "gigolo";
- version = "0.4.2";
-
- sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1";
-
- buildInputs = [ gtk2 libX11 ];
-}
diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
deleted file mode 100644
index d9a5991598bc9f0cf558f8cfd951d52595423ddb..0000000000000000000000000000000000000000
--- a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, mkXfceDerivation, exo, gtk2, gtk3 ? null, libwnck3 ? null, libXmu }:
-
-let
- inherit (lib) enableFeature;
-in
-
-mkXfceDerivation rec {
- category = "apps";
- pname = "xfce4-taskmanager";
- version = "1.2.1";
-
- sha256 = "1p0496r1fb5zqvn6c41kb6rjqwlqghqahgg6hkzw0gjy911im99w";
-
- nativeBuildInputs = [ exo ];
- buildInputs = [ gtk2 gtk3 libwnck3 libXmu ];
-
- configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];
-}
diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix
deleted file mode 100644
index 0209b79136021d51a4885a5888c0c9b9488a7438..0000000000000000000000000000000000000000
--- a/pkgs/desktops/xfce4-13/xfdesktop/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
-
-mkXfceDerivation rec {
- category = "xfce";
- pname = "xfdesktop";
- version = "4.13.2";
-
- sha256 = "0v6dlhraqh9v20qciyj03cbjmg3jb6gvmf0hqzavxqi2di3mv5fl";
-
- buildInputs = [
- exo
- gtk3
- libxfce4ui
- libxfce4util
- libwnck3
- xfconf
- ];
-
- meta = {
- description = "Xfce's desktop manager";
- };
-}
diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix
deleted file mode 100644
index 97d414d66932959ba76648632d0a06d09d2f5a2e..0000000000000000000000000000000000000000
--- a/pkgs/desktops/xfce4-13/xfwm4/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkXfceDerivation, exo, dbus-glib, epoxy, gtk2, libXdamage
-, libstartup_notification, libxfce4ui, libxfce4util, libwnck
-, libXpresent, xfconf }:
-
-mkXfceDerivation rec {
- category = "xfce";
- pname = "xfwm4";
- version = "4.13.0";
-
- sha256 = "19ikyls4xawsbz07qdz60g5yl2jbvpb90sfy5zql7ghypd69cgn9";
-
- nativeBuildInputs = [ exo ];
-
- buildInputs = [
- dbus-glib
- epoxy
- gtk2
- libXdamage
- libstartup_notification
- libxfce4ui
- libxfce4util
- libwnck
- libXpresent
- xfconf
- ];
-}
diff --git a/pkgs/desktops/xfce4-13/automakeAddFlags.sh b/pkgs/desktops/xfce4-14/automakeAddFlags.sh
similarity index 100%
rename from pkgs/desktops/xfce4-13/automakeAddFlags.sh
rename to pkgs/desktops/xfce4-14/automakeAddFlags.sh
diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-14/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/default.nix
rename to pkgs/desktops/xfce4-14/default.nix
diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-14/exo/default.nix
similarity index 52%
rename from pkgs/desktops/xfce4-13/exo/default.nix
rename to pkgs/desktops/xfce4-14/exo/default.nix
index 1096996ee6d571ca550f515fdb5e317a75036c29..933fa595aada68e38b2f7da2df27dd5853b82876 100644
--- a/pkgs/desktops/xfce4-13/exo/default.nix
+++ b/pkgs/desktops/xfce4-14/exo/default.nix
@@ -1,17 +1,22 @@
-{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3
+{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk3
, libxfce4ui, libxfce4util }:
mkXfceDerivation rec {
category = "xfce";
pname = "exo";
- version = "0.12.2";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "1b4hl9yxvf8b8akqf2zngq3m93yqnqcmxqqds1dwzm9vm5sqydgh";
+ sha256 = "0s91fv4yzafmdi25c63yin15sa25cfcyarpvavr4q3mmmiamzpi0";
nativeBuildInputs = [ libxslt perlPackages.URI ];
- buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
+ buildInputs = [ gtk3 libxfce4ui libxfce4util ];
postPatch = ''
+ substituteInPlace exo-helper/Makefile.am \
+ --replace 'exo_helper_2_CFLAGS =' \
+ 'exo_helper_2_CFLAGS = $(GIO_UNIX_CFLAGS)'
+
substituteInPlace docs/reference/Makefile.am \
--replace http://docbook.sourceforge.net/release/xsl/current \
${docbook_xsl}/share/xml/docbook-xsl
diff --git a/pkgs/desktops/xfce4-14/garcon/default.nix b/pkgs/desktops/xfce4-14/garcon/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a63ddeb52ea990914216d8df5872d1d78fa9a36e
--- /dev/null
+++ b/pkgs/desktops/xfce4-14/garcon/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }:
+
+mkXfceDerivation rec {
+ category = "xfce";
+ pname = "garcon";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
+
+ sha256 = "0d2fir4vbfdmng9k70nf5zv3fjwgr6g0czrp458x6qswih2gv2ik";
+
+ buildInputs = [ gtk3 libxfce4ui libxfce4util ];
+}
diff --git a/pkgs/desktops/xfce4-14/gigolo/default.nix b/pkgs/desktops/xfce4-14/gigolo/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..46b659b11d039e4fc236c46af490d76edc2b032a
--- /dev/null
+++ b/pkgs/desktops/xfce4-14/gigolo/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, exo, gtk3 }:
+
+mkXfceDerivation rec {
+ category = "apps";
+ pname = "gigolo";
+ version = "0.4.91";
+
+ sha256 = "1r075hw1jxbpv7jxzyqgfmd2rsw1lykd7snnx736gm55v84k15i7";
+
+ nativeBuildInputs = [ exo ];
+ buildInputs = [ gtk3 ];
+}
diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix
similarity index 80%
rename from pkgs/desktops/xfce4-13/libxfce4ui/default.nix
rename to pkgs/desktops/xfce4-14/libxfce4ui/default.nix
index f6997551262ef4ac77258bd0561abaa66f9f299d..77083fabbd35fc2894cf61b3e0a0f7d339b0cecd 100644
--- a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix
@@ -4,9 +4,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "libxfce4ui";
- version = "4.13.4";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy";
+ sha256 = "0kvqzf91ygxxkcy4drjminby4c3c42c54a3if8jwx0zmgbml7l8q";
buildInputs = [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ];
propagatedBuildInputs = [ libxfce4util libICE libSM ];
diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-14/libxfce4util/default.nix
similarity index 71%
rename from pkgs/desktops/xfce4-13/libxfce4util/default.nix
rename to pkgs/desktops/xfce4-14/libxfce4util/default.nix
index 6a3b633cd09db4a980ff2b85f94cca9c72116a80..e6cafcac8bbf26264175fd5c521c02ddf808252d 100644
--- a/pkgs/desktops/xfce4-13/libxfce4util/default.nix
+++ b/pkgs/desktops/xfce4-14/libxfce4util/default.nix
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "libxfce4util";
- version = "4.13.2";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "0sb6pzhmh0qzfdhixj1ard56zi68318k86z3a1h3f2fhqy7gyf98";
+ sha256 = "0s1fh798v86ifg46qn3zaykpwidn23vpqbkxq1fcbxpxb6rpxxwk";
buildInputs = [ gobject-introspection ];
diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/mkXfceDerivation.nix
rename to pkgs/desktops/xfce4-14/mkXfceDerivation.nix
diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-14/mousepad/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/mousepad/default.nix
rename to pkgs/desktops/xfce4-14/mousepad/default.nix
diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-14/orage/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/orage/default.nix
rename to pkgs/desktops/xfce4-14/orage/default.nix
diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-14/parole/default.nix
similarity index 89%
rename from pkgs/desktops/xfce4-13/parole/default.nix
rename to pkgs/desktops/xfce4-14/parole/default.nix
index e720791f1c478b2c026461c80d428d4b2f0377a5..f3a4561826e82b236c3aaf13eb0e769fafa4e746 100644
--- a/pkgs/desktops/xfce4-13/parole/default.nix
+++ b/pkgs/desktops/xfce4-14/parole/default.nix
@@ -8,9 +8,9 @@
mkXfceDerivation rec {
category = "apps";
pname = "parole";
- version = "1.0.1";
+ version = "1.0.2";
- sha256 = "0zq1imbjqmwfk3yrsha2s7lclzbh8xgggz0rbksa51siqk73swbb";
+ sha256 = "11i20pvbrcf1jbn77skb1cg72jdmdd0jvmf5khfn91slqky8gcbl";
postPatch = ''
substituteInPlace src/plugins/mpris2/Makefile.am \
diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-14/ristretto/default.nix
similarity index 84%
rename from pkgs/desktops/xfce4-13/ristretto/default.nix
rename to pkgs/desktops/xfce4-14/ristretto/default.nix
index b4b0778e9824de3df85aaee3794e63b5ae4e05c8..b2da81399301513958023bd0af13575240042dab 100644
--- a/pkgs/desktops/xfce4-13/ristretto/default.nix
+++ b/pkgs/desktops/xfce4-14/ristretto/default.nix
@@ -4,7 +4,7 @@
mkXfceDerivation rec {
category = "apps";
pname = "ristretto";
- version = "0.8.3";
+ version = "0.8.4";
postPatch = ''
automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS
@@ -14,5 +14,5 @@ mkXfceDerivation rec {
nativeBuildInputs = [ automakeAddFlags exo ];
buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ];
- sha256 = "02i61ddzpv0qjwahkksnzla57zdmkywyg1qrqs57z4bzj6l4nmkx";
+ sha256 = "0vnivwl0xwhzpflys9zwds6x9gqd3v069qn04afmakhi2m8qr6hf";
}
diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-14/thunar-volman/default.nix
similarity index 66%
rename from pkgs/desktops/xfce4-13/thunar-volman/default.nix
rename to pkgs/desktops/xfce4-14/thunar-volman/default.nix
index 0055d0d82179669d82e80f1afed2ad1697918b47..db7324140c5b0fb1e5fd81df17072f19670483e3 100644
--- a/pkgs/desktops/xfce4-13/thunar-volman/default.nix
+++ b/pkgs/desktops/xfce4-14/thunar-volman/default.nix
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "thunar-volman";
- version = "0.9.0";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
- sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7";
+ sha256 = "0jl863z6rxz50vqa31s58dfn429yn5x8scg492bvgl4cnmni6a30";
}
diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix
similarity index 83%
rename from pkgs/desktops/xfce4-13/thunar/default.nix
rename to pkgs/desktops/xfce4-14/thunar/default.nix
index dbeb80ac9bd26cce6f8d6d8f90462e2facf2ef3a..e559505aca65bc40d474f7ed669def2572abc16c 100644
--- a/pkgs/desktops/xfce4-13/thunar/default.nix
+++ b/pkgs/desktops/xfce4-14/thunar/default.nix
@@ -4,9 +4,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "thunar";
- version = "1.8.1";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "00n5iinhg3xgzj2rcy7zl6g9449i59x2l09cnlkhyrjzghb4k5ha";
+ sha256 = "0b17yf8ss8s8xyr65v4zrq15ayr5nskqpxy4wxah33n7lz09dh8r";
postPatch = ''
substituteInPlace docs/Makefile.am \
diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix
similarity index 69%
rename from pkgs/desktops/xfce4-13/tumbler/default.nix
rename to pkgs/desktops/xfce4-14/tumbler/default.nix
index 05a4f4ecde3c568e20215d5172f21e731de69a24..e67c7f1e29896eb2b7b0df55e71c502f5bbe9cfd 100644
--- a/pkgs/desktops/xfce4-13/tumbler/default.nix
+++ b/pkgs/desktops/xfce4-14/tumbler/default.nix
@@ -6,9 +6,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "tumbler";
- version = "0.2.3";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "1gb4dav6q9bn64c2ayi4896cr79lb8k63ja2sm3lwsjxgg1r4hw9";
+ sha256 = "1k579g8dmcfpw1vakspv6k2qkr1y1axyr8cbd0fqjhqdj4pis81i";
buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];
}
diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/xfburn/default.nix
rename to pkgs/desktops/xfce4-14/xfburn/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
similarity index 68%
rename from pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
index 65941fee4c4a2fae50579e2e667250f37392968f..22a6b6fedd29010d97f61b0e41cc5f1629e8d662 100644
--- a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-appfinder";
- version = "4.13.0";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy";
+ sha256 = "0vr5lx4fv0kldqvqfnsjp6ss7ciz0b2yjq4fhmrhk8czkf8p7va8";
nativeBuildInputs = [ exo ];
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix
similarity index 75%
rename from pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix
index b4b5ff7b71487336658be204dd29f5574193939a..376551b09c0f8951bef05569240ad1499fa7ba23 100644
--- a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix
@@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-battery-plugin";
- version = "1.1.0";
+ version = "1.1.2";
rev = version;
- sha256 = "0mz0lj3wjrsj9n4wcqrvv08430g38nkjbdimxdy8316n6bqgngfn";
+ sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
}
diff --git a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix
similarity index 76%
rename from pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix
index 28f63a6769d733fe2dabfa0295c7c96b00efaf70..74628a325d416e67d9afee7db8d149334f07ae70 100644
--- a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix
@@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-clipman-plugin";
- version = "1.4.2";
+ version = "1.4.3";
rev = version;
- sha256 = "1c2h1cs7pycf1rhpirmvb0l0dfvlacb7xgm31q9rxmhihnycd2na";
+ sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq";
buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ];
}
diff --git a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
similarity index 73%
rename from pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
index e17204c0cd55f5dd96103955de9e181cd0a65818..84cb74276997fc2d537cff8ea3c30f1e1dfa7106 100644
--- a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
@@ -3,8 +3,8 @@
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-cpufreq-plugin";
- version = "1.2.0";
- sha256 = "0zhs7b7py1njczmpnib4532fwpnd3vnpqfhss2r136cfgy72kp6g";
+ version = "1.2.1";
+ sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
}
diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
similarity index 83%
rename from pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
index 9dedb8674dc221a9194341980489ef154d2f61cb..49133b0ba2d9c2203eac1f0e6a3df18bc7418874 100644
--- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
@@ -4,9 +4,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-dev-tools";
- version = "4.12.0";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "0bbmlmw2dpm10q2wv3vy592i0vx7b5h1qnd35j0fdzxqb8x2hbw2";
+ sha256 = "11g5byxjihgkn0wi7gp8627d04wr59k117lpv53vdbsvv2qgksmg";
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
rename to pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh
diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch b/pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch
similarity index 100%
rename from pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
rename to pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch
diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
similarity index 82%
rename from pkgs/desktops/xfce4-13/xfce4-dict/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-dict/default.nix
index 1236b60175d0355eca4125a10ddc5f4fcb6bb3b7..603863264efcd5251ded3a7ed4e87e5c02de40e5 100644
--- a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
@@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "apps";
pname = "xfce4-dict";
- version = "0.8.1";
+ version = "0.8.2";
- sha256 = "0kxirzqmpp7qlr8220i8kipz4bgzkam7h1lpx7yzld5xf7wdzvaf";
+ sha256 = "1zbb0k0984ny7wy4gbk6ymkh87rbfakpim54yq4r3h5ymslx7iv7";
patches = [ ./configure-gio.patch ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-mixer/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
similarity index 76%
rename from pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
index bac2587850790124157140f0212fa2b19d08c6eb..98ed6882a024b775c9bb25314b4cf193141eec5f 100644
--- a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
@@ -4,9 +4,9 @@
mkXfceDerivation rec {
category = "apps";
pname = "xfce4-notifyd";
- version = "0.4.2";
+ version = "0.4.4";
- sha256 = "1zxwzigrhms74crasbqpnzidmq2mnyxpmc9pqr4p4qj14yw4sam9";
+ sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";
buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
}
diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
similarity index 90%
rename from pkgs/desktops/xfce4-13/xfce4-panel/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-panel/default.nix
index 27c8e1e58c71467c91cfe3b96e52da3bc56a6651..4f1de32abdf210d25e1ecd83087e3afae897a2d1 100644
--- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-panel";
- version = "4.13.4";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "13hnzh31d2b1331lnsbfaxg4fqhqa7hmdwkiqsl9hyr8pqimjb2g";
+ sha256 = "1p0bkbxjh14kgny2lpcjg2q8pm55l8i7qsr5bsvdppw3ab46kz34";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
similarity index 83%
rename from pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
index 5389af668820c7a6f70a942d451cd4baeddb8eba..a855f2c977e98a4dc7579f4dba6daa70b23f3eb8 100644
--- a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
@@ -4,9 +4,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-power-manager";
- version = "1.6.1";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "0b32m46v3dv1ln3xwlpqbnpflknm4gyfk2w6gn7xjx1k7igcjym3";
+ sha256 = "1x1ssji4v9qp64si38paz15bgsgs1w3hkx080qznnmcxqlg7zpj9";
nativeBuildInputs = [ automakeAddFlags exo ];
buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
similarity index 81%
rename from pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
index 0dfad21d07ba5d5249f823613b130719276088be..95af146903b16b6ecc9fdefbf12bbc5708edd31f 100644
--- a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
@@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "apps";
pname = "xfce4-screenshooter";
- version = "1.9.2";
+ version = "1.9.5";
- sha256 = "1zl16xcmgrb1s6rsrn37mpl5w522i1i9s7x167xf2d092x333yx2";
+ sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-session/default.nix b/pkgs/desktops/xfce4-14/xfce4-session/default.nix
similarity index 87%
rename from pkgs/desktops/xfce4-13/xfce4-session/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-session/default.nix
index ecf1f6ac505ed3fb897cc23ae67cc7dac4610a2e..a39a70b09a8163007464f86800b162f3083e8160 100644
--- a/pkgs/desktops/xfce4-13/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-session/default.nix
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-session";
- version = "4.13.0";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "0d6h1kgqq6g084jrxx4jxw98h5g0vwsxqrvk0bmapyxh2sbrg07y";
+ sha256 = "1asfy11rp6zmn70a3w5dqssxpxywhpm9ns7zyiaz6pnpcq075dr0";
buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
similarity index 87%
rename from pkgs/desktops/xfce4-13/xfce4-settings/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-settings/default.nix
index 6eb917fd76fd1907f50c117d08418012654d098e..a939f5e213cbacdc118ac19b201e6b741cd11591 100644
--- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
@@ -5,9 +5,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-settings";
- version = "4.13.4";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "0qnnpvcs2hpfq3n4byjwq343p95i9xw96rq7ym4md4mahnk176dy";
+ sha256 = "0agi5flbzbc9q29yh7wbk3giif74finf4shq3q7v2h91w5kvyc9j";
postPatch = ''
automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS
diff --git a/pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..776b3797f76929f1d9efc089d67820fdaa3a3544
--- /dev/null
+++ b/pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix
@@ -0,0 +1,12 @@
+{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
+
+mkXfceDerivation {
+ category = "apps";
+ pname = "xfce4-taskmanager";
+ version = "1.2.2";
+
+ sha256 = "03js0pmhrybxa7hrp3gx4rm7j061ansv0bp2dwhnbrdpmzjysysc";
+
+ nativeBuildInputs = [ exo ];
+ buildInputs = [ gtk3 libwnck3 libXmu ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix
similarity index 85%
rename from pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix
index 41a1ef82932bc152d945f0917750e7866db4a20c..41cd491a7dc2a94d79313584d8e59c1043a7072f 100644
--- a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix
@@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-whiskermenu-plugin";
- version = "2.2.0";
+ version = "2.3.2";
rev = "v${version}";
- sha256 = "1d35xxkdzw8pl3d5ps226mmrrjk0hqczsbvl5smh7l7jbwfambjm";
+ sha256 = "0ha6c259d7a0wzpf87ynyzpj3y178iwhpcb87m9zxm66i513qmbs";
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix
rename to pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix
diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-14/xfconf/default.nix
similarity index 55%
rename from pkgs/desktops/xfce4-13/xfconf/default.nix
rename to pkgs/desktops/xfce4-14/xfconf/default.nix
index def60bcfe21c6a0bb7bcc0b4ad1135a00cea95e1..8a37aefab4155439bc606852801fb17cedc81be1 100644
--- a/pkgs/desktops/xfce4-13/xfconf/default.nix
+++ b/pkgs/desktops/xfce4-14/xfconf/default.nix
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfconf";
- version = "4.13.5";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
- sha256 = "0xpnwb04yw5qdn0bj8b740a7rmiy316vhja5pp8p6sdiqm32yi8a";
+ sha256 = "056r2dkkw8hahqin1p5k8rz0r9r0z8piniy855nd1ns0mx2sh47k";
buildInputs = [ libxfce4util ];
}
diff --git a/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/pkgs/desktops/xfce4-14/xfdesktop/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6b99b1b6a3505f482dd6887856bc49ed120caa39
--- /dev/null
+++ b/pkgs/desktops/xfce4-14/xfdesktop/default.nix
@@ -0,0 +1,25 @@
+{ mkXfceDerivation, exo, wrapGAppsHook, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
+
+mkXfceDerivation rec {
+ category = "xfce";
+ pname = "xfdesktop";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
+
+ sha256 = "14sfcxbwxhhwn9nmiap46nz6idvw5hwr8wyjqrhq4h79x78g18k4";
+
+ nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
+
+ buildInputs = [
+ exo
+ gtk3
+ libxfce4ui
+ libxfce4util
+ libwnck3
+ xfconf
+ ];
+
+ meta = {
+ description = "Xfce's desktop manager";
+ };
+}
diff --git a/pkgs/desktops/xfce4-14/xfwm4/default.nix b/pkgs/desktops/xfce4-14/xfwm4/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..34b5bdae45a0acd1cbb94cc9444c33457897c2fd
--- /dev/null
+++ b/pkgs/desktops/xfce4-14/xfwm4/default.nix
@@ -0,0 +1,27 @@
+{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage
+, libstartup_notification, libxfce4ui, libxfce4util, libwnck3
+, libXpresent, xfconf }:
+
+mkXfceDerivation rec {
+ category = "xfce";
+ pname = "xfwm4";
+ version = "4.14pre2";
+ rev = "xfce-4.14pre2";
+
+ sha256 = "00nysv5qrv5n4xzyqv4jnsmgljwr2wyynis1gpdbm2kvl5ndxrrd";
+
+ nativeBuildInputs = [ exo librsvg ];
+
+ buildInputs = [
+ dbus-glib
+ epoxy
+ gtk3
+ libXdamage
+ libstartup_notification
+ libxfce4ui
+ libxfce4util
+ libwnck3
+ libXpresent
+ xfconf
+ ];
+}
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index cca0f0d4adbc7b5300c73eefd9f6edfce45d4e4e..fcdd2eb518116986919d977d23f3a4bdbbce39ce 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ stdenv
, makeWrapper
, runCommand, wrapBintoolsWith, wrapCCWith
, buildAndroidndk, androidndk, targetAndroidndkPkgs
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix
index 341cdf72028d81fff238537e920ed2fe3c3919b1..e35444ed516e827a2fd928e129a11082ebe5a7a8 100644
--- a/pkgs/development/androidndk-pkgs/default.nix
+++ b/pkgs/development/androidndk-pkgs/default.nix
@@ -1,5 +1,4 @@
{ androidenv, buildPackages, pkgs, targetPackages
-, includeSources ? true, licenseAccepted ? false
}:
rec {
@@ -21,7 +20,7 @@ rec {
inherit (buildPackages)
makeWrapper;
inherit (pkgs)
- lib stdenv
+ stdenv
runCommand wrapBintoolsWith wrapCCWith;
# buildPackages.foo rather than buildPackages.buildPackages.foo would work,
# but for splicing messing up on infinite recursion for the variants we
diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix
index 9cefd1dfe54f171fa604a2468f6bce5a97fcd2db..2178226ab9d365aff16da97775df23d30fc4de0d 100644
--- a/pkgs/development/arduino/arduino-mk/default.nix
+++ b/pkgs/development/arduino/arduino-mk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "1.6.0";
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index a1eedaad6a0f1093ca30243c4e414d3f3ac755c8..63d046c7b47e193d53a86edbb51ce9866bdb99bf 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -43,27 +43,27 @@ let
# BEAM-based languages.
elixir = elixir_1_7;
- elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
+ elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix {
inherit rebar erlang;
debugInfo = true;
};
- elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
+ elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
inherit rebar erlang;
debugInfo = true;
};
- elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
+ elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
inherit rebar erlang;
debugInfo = true;
};
- elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
+ elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
inherit rebar erlang;
debugInfo = true;
};
- elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix {
+ elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
inherit rebar erlang;
debugInfo = true;
};
diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix
index a94d803f0d326d20b6cce4181a1f0279879461a0..389e07beca6c4f069b94bd2102ddee60f0c1004e 100644
--- a/pkgs/development/beam-modules/fetch-rebar-deps.nix
+++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix
@@ -1,4 +1,4 @@
-{ stdenv, rebar3, curl }:
+{ stdenv, rebar3 }:
{ name, version, sha256, src
, meta ? {}
@@ -29,4 +29,5 @@ stdenv.mkDerivation ({
outputHash = sha256;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
+ inherit meta;
})
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index 7e91153bed51c48575f99b7ec0ea7e34e9fdda6c..e8faa9c0a9ce1eed8efc3a2935aa840a87e85b26 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -8,13 +8,13 @@ let
pkg = self: stdenv.mkDerivation rec {
pname = "hex";
- version = "0.17.1";
+ version = "0.20.1";
src = fetchFromGitHub {
owner = "hexpm";
repo = "hex";
rev = "v${version}";
- sha256 = "1s4asar1mcavzj3w37jcz243ka0z5jm0r42yws3h4aagawxxg02z";
+ sha256 = "0yxw7r31kk45b1nk48pajwwv9zl746kc9pwqfb73za8b1g8bgxd3";
};
setupHook = writeText "setupHook.sh" ''
diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix
index 837d0ccf15cf60486041c9ce16342a36d570faf3..1ec9f244d6c1e42d95a46b0ab17bd24ec2085676 100644
--- a/pkgs/development/beam-modules/rebar3-release.nix
+++ b/pkgs/development/beam-modules/rebar3-release.nix
@@ -1,5 +1,5 @@
-{ stdenv, writeText, erlang, rebar3, openssl, libyaml,
- pc, lib }:
+{ stdenv, writeText, erlang, rebar3, openssl,
+ lib }:
{ name, version
, src
@@ -18,8 +18,6 @@
with stdenv.lib;
let
- debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";
-
shell = drv: stdenv.mkDerivation {
name = "interactive-shell-${drv.name}";
buildInputs = [ drv ];
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 48661ba407c92225aca21ada84c235a16be7fd15..77f051156d1e345328be11f385d3a07ea4bae39f 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,11 +1,11 @@
{ stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
let
- defaultVersion = "45";
+ defaultVersion = "86";
# Map from git revs to SHA256 hashes
sha256s = {
- "version_45" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc";
+ "version_86" = "12h5018rdwg7vjni0mz91vkpdwyqw0nfacig3vg9dvyn4fnfm76z";
"1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
};
in
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index ff0faf408394bf3e73e9a6de279f27db629700f4..a3b32ceee0cfcec6dae694a3b4834d3e4c643db5 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
let
- version = "5.0.0";
+ version = "5.1.0";
platform = with stdenv;
if isDarwin then "macosx"
else if isCygwin then "cygwin"
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
- sha256 = "15b5yrzfa8aimzba79x7v6y282f898rxqxfxrr446sjx9jwlpfd8";
+ sha256 = "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw";
};
setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix
index 04f7551f32d9a39d9ec9012b9efd32a90cacfdd8..2d3324ceaca46b4a2271013a6421256fcebd147a 100644
--- a/pkgs/development/compilers/chicken/5/eggs.nix
+++ b/pkgs/development/compilers/chicken/5/eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs }:
rec {
inherit (pkgs) eggDerivation fetchegg;
diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/development/compilers/colm/cross-compile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..470ea23aaf1baee645127c87beb51ae8f8d175ef
--- /dev/null
+++ b/pkgs/development/compilers/colm/cross-compile.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac 2019-07-09 22:41:03.166948024 -0700
++++ b/configure.ac 2019-07-09 22:41:16.699948056 -0700
+@@ -40,9 +40,7 @@
+
+ dnl Choose a default for the build_manual var. If the dist file is present in
+ dnl the root then default to no, otherwise go for it.
+-AC_CHECK_FILES( [$srcdir/DIST],
+- [. $srcdir/DIST;],
+- [build_manual=yes; ] )
++build_manual=yes;
+
+ dnl Set to true if the manual should be built.
+ AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"])
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index 61b24a851941f17313f519f2298e4afa983663e2..237a80280ec838a961e81696c965c77e0ffad92b 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }:
+{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
stdenv.mkDerivation rec {
name = "colm-${version}";
- version = "0.13.0.6";
+ version = "0.13.0.7";
src = fetchurl {
url = "https://www.colm.net/files/colm/${name}.tar.gz";
- sha256 = "0jd3qmqdm8yszy0yysbp3syk7pcbxvwzv9mibdwz7v9bv1nrai26";
+ sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
};
- nativeBuildInputs = [ makeWrapper asciidoc ];
+ patches = [ ./cross-compile.patch ];
+
+ nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ];
doCheck = true;
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 4538d3031489441a8000dcba6c1c8aac86a045cd..33957b5a8dcf959b41581a47e67b2ca92f3cae28 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper
+{ stdenv, lib, fetchFromGitHub, makeWrapper
, coq, ocamlPackages, coq2html
, tools ? stdenv.cc
}:
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 3c6f3693401d6368f98e7adda010f9d3453a3dbe..2e823fe1f0f8feedff4d1267f2f5fd057143e7fc 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
-, gmp, openssl, readline, tzdata, libxml2, libyaml
+, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml
, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }:
# We need multiple binaries as a given binary isn't always able to build
-# (even slightly) older or newer version.
+# (even slightly) older or newer versions.
# - 0.26.1 can build 0.25.x and 0.26.x but not 0.27.x
-# - 0.27.2 can build 0.27.x but not 0.25.x and 0.26.x
+# - 0.27.2 can build 0.27.x but not 0.25.x, 0.26.x and 0.29.x
#
# We need to keep around at least the latest version released with a stable
# NixOS
@@ -19,7 +19,7 @@ let
arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
- checkInputs = [ gmp openssl readline libxml2 libyaml tzdata ];
+ checkInputs = [ git gmp openssl readline libxml2 libyaml ];
genericBinary = { version, sha256s, rel ? 1 }:
stdenv.mkDerivation rec {
@@ -38,8 +38,8 @@ let
generic = { version, sha256, binary, doCheck ? true }:
stdenv.mkDerivation rec {
- inherit doCheck;
- name = "crystal-${version}";
+ pname = "crystal";
+ inherit doCheck version;
src = fetchFromGitHub {
owner = "crystal-lang";
@@ -48,14 +48,30 @@ let
inherit sha256;
};
+ # we are almost able to run the full test suite now
postPatch = ''
+ substituteInPlace src/crystal/system/unix/time.cr \
+ --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo
+
ln -s spec/compiler spec/std
+
+ substituteInPlace spec/std/file_spec.cr \
+ --replace '/bin/ls' '${coreutils}/bin/ls' \
+ --replace '/usr/share' '/tmp/test'
+
substituteInPlace spec/std/process_spec.cr \
- --replace /bin/ /run/current-system/sw/bin/
+ --replace '/bin/cat' '${coreutils}/bin/cat' \
+ --replace '/bin/ls' '${coreutils}/bin/ls' \
+ --replace '/usr/bin/env' '${coreutils}/bin/env' \
+ --replace '"env"' '"${coreutils}/bin/env"' \
+ --replace '"/usr"' '"/tmp"'
+
+ substituteInPlace spec/std/system_spec.cr \
+ --replace '`hostname`' '`${nettools}/bin/hostname`'
'';
buildInputs = [
- boehmgc libatomic_ops pcre libevent
+ boehmgc libatomic_ops pcre libevent libyaml
llvm zlib openssl
] ++ stdenv.lib.optionals stdenv.isDarwin [
libiconv
@@ -111,7 +127,11 @@ let
checkTarget = "spec";
preCheck = ''
+ export HOME=/tmp
+ mkdir -p $HOME/test
+
export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
+ export PATH=${lib.makeBinPath checkInputs}:$PATH
'';
meta = with lib; {
@@ -129,7 +149,7 @@ in rec {
sha256s = {
"x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
"i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
- "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k";
+ "x86_64-darwin" = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s";
};
};
@@ -142,6 +162,15 @@ in rec {
};
};
+ binaryCrystal_0_29 = genericBinary {
+ version = "0.29.0";
+ sha256s = {
+ "x86_64-linux" = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna";
+ "i686-linux" = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2";
+ "x86_64-darwin" = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd";
+ };
+ };
+
crystal_0_25 = generic {
version = "0.25.1";
sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl";
@@ -163,5 +192,12 @@ in rec {
binary = binaryCrystal_0_27;
};
- crystal = crystal_0_27;
+ crystal_0_29 = generic {
+ version = "0.29.0";
+ sha256 = "0v9l253b2x8yw6a43vvalywpwciwr094l3g5wakmndfrzak2s3zr";
+ doCheck = false; # 6 checks are failing now
+ binary = binaryCrystal_0_29;
+ };
+
+ crystal = crystal_0_29;
}
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index e2c3c8fe587b26a5b5b95ec18ebc62d6a84f8207..6a18c05f38e5d60d67da121e879ddbd51f34575b 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses5, expat, python27, zlib
, gcc48, gcc49, gcc5, gcc6, gcc7
, xorg, gtk2, gdk_pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
+, addOpenGLRunpath
}:
let
@@ -39,7 +40,7 @@ let
outputs = [ "out" "lib" "doc" ];
- nativeBuildInputs = [ perl makeWrapper ];
+ nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
buildInputs = [ gdk_pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
runtimeDependencies = [
ncurses5 expat python zlib glibc
@@ -143,10 +144,19 @@ let
else
rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
fi
- patchelf --set-rpath $rpath2 --force-rpath $i
+ patchelf --set-rpath "$rpath2" --force-rpath $i
done < <(find $out $lib $doc -type f -print0)
'';
+ # Set RPATH so that libcuda and other libraries in
+ # /run/opengl-driver(-32)/lib can be found. See the explanation in
+ # addOpenGLRunpath. Don't try to figure out which libraries really need
+ # it, just patch all (but not the stubs libraries). Note that
+ # --force-rpath prevents changing RPATH (set above) to RUNPATH.
+ postFixup = ''
+ addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so
+ '';
+
# cuda-gdb doesn't run correctly when not using sandboxing, so
# temporarily disabling the install check. This should be set to true
# when we figure out how to get `cuda-gdb --version` to run correctly
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index b15e1a9aa3098be420cfd76ad980435fdaacd6b8..b3b58e8362153cb832c972fc6dea2e08ecf7a2de 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch
+{ stdenv, lib, fetchFromGitHub
, makeWrapper, unzip, which, writeTextFile
, curl, tzdata, gdb, darwin, git
-, callPackage, targetPackages, ldc
+, targetPackages, ldc
, version ? "2.085.1"
, dmdSha256 ? "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660"
, druntimeSha256 ? "109f2glsqrlshk06761xlw4r5v22mivp873cq9g5gcax3g00k617"
@@ -103,8 +103,7 @@ stdenv.mkDerivation rec {
checkPhase = ''
cd dmd
- # https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846
- #make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL
+ make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL
cd ../druntime
make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
cd ../phobos
@@ -112,8 +111,6 @@ stdenv.mkDerivation rec {
cd ..
'';
- dontStrip = true;
-
installPhase = ''
cd dmd
mkdir $out
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index 4e8ab34b1011b82f0fca1142abda749889bbc7ae..6c1fa37e81a43c83bd619a7fa15a6b27a50f3f46 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -12,27 +12,23 @@ let
rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
in
stdenv.mkDerivation rec {
- version = "2.2.103";
- netCoreVersion = "2.2.1";
- name = "dotnet-sdk-${version}";
+ version = "2.2.203";
+ netCoreVersion = "2.2.4";
+ pname = "dotnet-sdk";
src = fetchurl {
- url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
+ url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz";
# use sha512 from the download page
- sha512 = "777AC6DCD0200BA447392E451A1779F0FBFA548BD620A7BBA3EEBDF35892236C3F10B19FF81D4F64B5BC134923CB47F9CC45EE6B004140E1249582249944DB69";
+ sha512 = "8DA955FA0AEEBB6513A6E8C4C23472286ED78BD5533AF37D79A4F2C42060E736FDA5FD48B61BF5AEC10BBA96EB2610FACC0F8A458823D374E1D437B26BA61A5C";
};
- unpackPhase = ''
- mkdir src
- cd src
- tar xvzf $src
- '';
+ sourceRoot = ".";
buildPhase = ''
runHook preBuild
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./dotnet
+ patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ./dotnet
patchelf --set-rpath "${rpath}" ./dotnet
- find -type f -name "*.so" -exec patchelf --set-rpath "${rpath}" {} \;
+ find -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
echo -n "dotnet-sdk version: "
./dotnet --version
runHook postBuild
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index f14bce5d96b30fc4ca502ecef02c895f2a1d5dc3..a819361f4d45ad5ab1275da5ed870a57cc74d04a 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,14 +1,23 @@
-{ lib, stdenv, buildEnv
+{ lib, stdenv, pkgs
, haskell, nodejs
-, fetchurl, fetchpatch, makeWrapper, git }:
-
+, fetchurl, fetchpatch, makeWrapper, writeScriptBin }:
let
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
+
+ patchBinwrap = import ./packages/patch-binwrap.nix { inherit lib writeScriptBin stdenv; };
+
+ elmNodePackages =
+ import ./packages/node-composition.nix {
+ inherit nodejs pkgs;
+ inherit (stdenv.hostPlatform) system;
+ };
+
hsPkgs = haskell.packages.ghc864.override {
overrides = self: super: with haskell.lib;
- let elmPkgs = {
+ let elmPkgs = rec {
elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
# sadly with parallelism most of the time breaks compilation
+ # also compilation is slower with increasing number of cores anyway (Tested on Ryzen 7 and i7)
enableParallelBuilding = false;
preConfigure = self.fetchElmDeps {
elmPackages = (import ./packages/elm-srcs.nix);
@@ -30,12 +39,25 @@ let
/*
The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
- `pacakge/nix/build.sh`
+ `package/nix/build.sh`
*/
elm-format = justStaticExecutables (doJailbreak (self.callPackage ./packages/elm-format.nix {}));
+ elmi-to-json = justStaticExecutables (self.callPackage ./packages/elmi-to-json.nix {});
+
inherit fetchElmDeps;
elmVersion = elmPkgs.elm.version;
+
+ /*
+ Node/NPM based dependecies can be upgraded using script
+ `packages/generate-node-packages.sh`.
+ Packages which rely on `bin-wrap` will fail by default
+ and can be patched using `patchBinwrap` function defined in `packages/patch-binwrap.nix`.
+ */
+ elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test;
+ elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples;
+ elm-analyse = elmNodePackages."elm-analyse-0.16.3";
+ inherit (elmNodePackages) elm-doc-preview elm-upgrade;
};
in elmPkgs // {
inherit elmPkgs;
diff --git a/pkgs/development/compilers/elm/packages/README.md b/pkgs/development/compilers/elm/packages/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..5b21736afc00b9664e278cdc8637838bed100afc
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/README.md
@@ -0,0 +1,25 @@
+# Elm packages
+
+Mixtures of useful Elm lang tooling containing both Haskell and Node.js based utilities.
+
+## Upgrades
+
+Haskell parts of the ecosystem are using [cabal2nix](https://github.com/NixOS/cabal2nix).
+Please refer to [nix documentation](https://nixos.org/nixpkgs/manual/#how-to-create-nix-builds-for-your-own-private-haskell-packages)
+and [cabal2nix readme](https://github.com/NixOS/cabal2nix#readme) for more information. Elm-format [update scripts](https://github.com/avh4/elm-format/tree/master/package/nix)
+is part of its repository.
+
+Node dependencies are defined in [node-packages.json](node-packages.json).
+[Node2nix](https://github.com/svanderburg/node2nix) is used for generating nix expression
+from this file. Use [generate-node-packages.sh](generate-node-packages.sh) for updates of nix expressions.
+
+## Binwrap Patch
+
+Some node packages might use [binwrap](https://github.com/avh4/binwrap) typically for installing
+[elmi-to-json](https://github.com/stoeffel/elmi-to-json). Binwrap is not compatible with nix.
+To overcome issues with those packages apply [patch-binwrap.nix](patch-binwrap.nix) which essentially does 2 things.
+
+1. It replaces binwrap scripts with noop shell scripts
+2. It uses nix for installing the binaries to expected location in `node_modules`
+
+Example usage be found in `elm/default.nix`.
diff --git a/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/pkgs/development/compilers/elm/packages/elmi-to-json.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f6a0b9e24263ddc463e86cef0032724caea1c98a
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elmi-to-json.nix
@@ -0,0 +1,27 @@
+{ mkDerivation, aeson, async, base, binary, bytestring, containers
+, directory, filepath, hpack, optparse-applicative, safe-exceptions
+, stdenv, text, fetchgit
+}:
+mkDerivation {
+ pname = "elmi-to-json";
+ version = "0.19.4";
+ src = fetchgit {
+ url = "https://github.com/stoeffel/elmi-to-json.git";
+ rev = "357ad96f05e4c68023b036f27f6f65c4377c7427";
+ sha256 = "0vj9fdqgg2zd1nxpll6v02fk6bcyhx00xhp3s8sd7ycvirwsim9n";
+ };
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async base binary bytestring containers directory filepath
+ optparse-applicative safe-exceptions text
+ ];
+ libraryToolDepends = [ hpack ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ preConfigure = "hpack";
+ homepage = "https://github.com/stoeffel/elmi-to-json#readme";
+ description = "Translates elmi binary files to JSON representation";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ turbomack ];
+}
diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0e1835c6ffaa94fdd8e9930cdab0df781347cc9c
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nodePackages.node2nix
+
+set -eu -o pipefail
+
+rm -f node-env.nix
+node2nix --nodejs-10 -i node-packages.json -o node-packages.nix -c node-composition.nix
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1039eb51fe277fab833da0f58514ec51f2f8ab22
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.6.0. Do not edit!
+
+{pkgs ? import {
+ inherit system;
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+
+let
+ nodeEnv = import ./node-env.nix {
+ inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit nodejs;
+ libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+ };
+in
+import ./node-packages.nix {
+ inherit (pkgs) fetchurl fetchgit;
+ inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/development/compilers/elm/packages/node-env.nix b/pkgs/development/compilers/elm/packages/node-env.nix
new file mode 100644
index 0000000000000000000000000000000000000000..720e0cc08503cf6ff0294e4f5dc04ca2751aaa93
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/node-env.nix
@@ -0,0 +1,542 @@
+# This file originates from node2nix
+
+{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+
+let
+ python = if nodejs ? python then nodejs.python else python2;
+
+ # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
+ tarWrapper = runCommand "tarWrapper" {} ''
+ mkdir -p $out/bin
+
+ cat > $out/bin/tar <> $out/nix-support/hydra-build-products
+ '';
+ };
+
+ includeDependencies = {dependencies}:
+ stdenv.lib.optionalString (dependencies != [])
+ (stdenv.lib.concatMapStrings (dependency:
+ ''
+ # Bundle the dependencies of the package
+ mkdir -p node_modules
+ cd node_modules
+
+ # Only include dependencies if they don't exist. They may also be bundled in the package.
+ if [ ! -e "${dependency.name}" ]
+ then
+ ${composePackage dependency}
+ fi
+
+ cd ..
+ ''
+ ) dependencies);
+
+ # Recursively composes the dependencies of a package
+ composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+ ''
+ DIR=$(pwd)
+ cd $TMPDIR
+
+ unpackFile ${src}
+
+ # Make the base dir in which the target dependency resides first
+ mkdir -p "$(dirname "$DIR/${packageName}")"
+
+ if [ -f "${src}" ]
+ then
+ # Figure out what directory has been unpacked
+ packageDir="$(find . -maxdepth 1 -type d | tail -1)"
+
+ # Restore write permissions to make building work
+ find "$packageDir" -type d -print0 | xargs -0 chmod u+x
+ chmod -R u+w "$packageDir"
+
+ # Move the extracted tarball into the output folder
+ mv "$packageDir" "$DIR/${packageName}"
+ elif [ -d "${src}" ]
+ then
+ # Get a stripped name (without hash) of the source directory.
+ # On old nixpkgs it's already set internally.
+ if [ -z "$strippedName" ]
+ then
+ strippedName="$(stripHash ${src})"
+ fi
+
+ # Restore write permissions to make building work
+ chmod -R u+w "$strippedName"
+
+ # Move the extracted directory into the output folder
+ mv "$strippedName" "$DIR/${packageName}"
+ fi
+
+ # Unset the stripped name to not confuse the next unpack step
+ unset strippedName
+
+ # Include the dependencies of the package
+ cd "$DIR/${packageName}"
+ ${includeDependencies { inherit dependencies; }}
+ cd ..
+ ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ '';
+
+ pinpointDependencies = {dependencies, production}:
+ let
+ pinpointDependenciesFromPackageJSON = writeTextFile {
+ name = "pinpointDependencies.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ function resolveDependencyVersion(location, name) {
+ if(location == process.env['NIX_STORE']) {
+ return null;
+ } else {
+ var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
+
+ if(fs.existsSync(dependencyPackageJSON)) {
+ var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
+
+ if(dependencyPackageObj.name == name) {
+ return dependencyPackageObj.version;
+ }
+ } else {
+ return resolveDependencyVersion(path.resolve(location, ".."), name);
+ }
+ }
+ }
+
+ function replaceDependencies(dependencies) {
+ if(typeof dependencies == "object" && dependencies !== null) {
+ for(var dependency in dependencies) {
+ var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+
+ if(resolvedVersion === null) {
+ process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+ } else {
+ dependencies[dependency] = resolvedVersion;
+ }
+ }
+ }
+ }
+
+ /* Read the package.json configuration */
+ var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+ /* Pinpoint all dependencies */
+ replaceDependencies(packageObj.dependencies);
+ if(process.argv[2] == "development") {
+ replaceDependencies(packageObj.devDependencies);
+ }
+ replaceDependencies(packageObj.optionalDependencies);
+
+ /* Write the fixed package.json file */
+ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
+ '';
+ };
+ in
+ ''
+ node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+
+ ${stdenv.lib.optionalString (dependencies != [])
+ ''
+ if [ -d node_modules ]
+ then
+ cd node_modules
+ ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+ cd ..
+ fi
+ ''}
+ '';
+
+ # Recursively traverses all dependencies of a package and pinpoints all
+ # dependencies in the package.json file to the versions that are actually
+ # being used.
+
+ pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+ ''
+ if [ -d "${packageName}" ]
+ then
+ cd "${packageName}"
+ ${pinpointDependencies { inherit dependencies production; }}
+ cd ..
+ ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ fi
+ '';
+
+ # Extract the Node.js source code which is used to compile packages with
+ # native bindings
+ nodeSources = runCommand "node-sources" {} ''
+ tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
+ mv node-* $out
+ '';
+
+ # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
+ addIntegrityFieldsScript = writeTextFile {
+ name = "addintegrityfields.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ function augmentDependencies(baseDir, dependencies) {
+ for(var dependencyName in dependencies) {
+ var dependency = dependencies[dependencyName];
+
+ // Open package.json and augment metadata fields
+ var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
+ var packageJSONPath = path.join(packageJSONDir, "package.json");
+
+ if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
+ console.log("Adding metadata fields to: "+packageJSONPath);
+ var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
+
+ if(dependency.integrity) {
+ packageObj["_integrity"] = dependency.integrity;
+ } else {
+ packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
+ }
+
+ packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+ fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
+ }
+
+ // Augment transitive dependencies
+ if(dependency.dependencies !== undefined) {
+ augmentDependencies(packageJSONDir, dependency.dependencies);
+ }
+ }
+ }
+
+ if(fs.existsSync("./package-lock.json")) {
+ var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
+
+ if(packageLock.lockfileVersion !== 1) {
+ process.stderr.write("Sorry, I only understand lock file version 1!\n");
+ process.exit(1);
+ }
+
+ if(packageLock.dependencies !== undefined) {
+ augmentDependencies(".", packageLock.dependencies);
+ }
+ }
+ '';
+ };
+
+ # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
+ reconstructPackageLock = writeTextFile {
+ name = "addintegrityfields.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+ var lockObj = {
+ name: packageObj.name,
+ version: packageObj.version,
+ lockfileVersion: 1,
+ requires: true,
+ dependencies: {}
+ };
+
+ function augmentPackageJSON(filePath, dependencies) {
+ var packageJSON = path.join(filePath, "package.json");
+ if(fs.existsSync(packageJSON)) {
+ var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+ dependencies[packageObj.name] = {
+ version: packageObj.version,
+ integrity: "sha1-000000000000000000000000000=",
+ dependencies: {}
+ };
+ processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
+ }
+ }
+
+ function processDependencies(dir, dependencies) {
+ if(fs.existsSync(dir)) {
+ var files = fs.readdirSync(dir);
+
+ files.forEach(function(entry) {
+ var filePath = path.join(dir, entry);
+ var stats = fs.statSync(filePath);
+
+ if(stats.isDirectory()) {
+ if(entry.substr(0, 1) == "@") {
+ // When we encounter a namespace folder, augment all packages belonging to the scope
+ var pkgFiles = fs.readdirSync(filePath);
+
+ pkgFiles.forEach(function(entry) {
+ if(stats.isDirectory()) {
+ var pkgFilePath = path.join(filePath, entry);
+ augmentPackageJSON(pkgFilePath, dependencies);
+ }
+ });
+ } else {
+ augmentPackageJSON(filePath, dependencies);
+ }
+ }
+ });
+ }
+ }
+
+ processDependencies("node_modules", lockObj.dependencies);
+
+ fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
+ '';
+ };
+
+ # Builds and composes an NPM package including all its dependencies
+ buildNodePackage =
+ { name
+ , packageName
+ , version
+ , dependencies ? []
+ , buildInputs ? []
+ , production ? true
+ , npmFlags ? ""
+ , dontNpmInstall ? false
+ , bypassCache ? false
+ , preRebuild ? ""
+ , dontStrip ? true
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ... }@args:
+
+ let
+ forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+ extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+ in
+ stdenv.mkDerivation ({
+ name = "node-${name}-${version}";
+ buildInputs = [ tarWrapper python nodejs ]
+ ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+ ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+ ++ buildInputs;
+
+ inherit dontStrip; # Stripping may fail a build for some package deployments
+ inherit dontNpmInstall preRebuild unpackPhase buildPhase;
+
+ compositionScript = composePackage args;
+ pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+ passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
+
+ installPhase = ''
+ # Create and enter a root node_modules/ folder
+ mkdir -p $out/lib/node_modules
+ cd $out/lib/node_modules
+
+ # Compose the package and all its dependencies
+ source $compositionScriptPath
+
+ # Pinpoint the versions of all dependencies to the ones that are actually being used
+ echo "pinpointing versions of dependencies..."
+ source $pinpointDependenciesScriptPath
+
+ # Patch the shebangs of the bundled modules to prevent them from
+ # calling executables outside the Nix store as much as possible
+ patchShebangs .
+
+ # Deploy the Node.js package by running npm install. Since the
+ # dependencies have been provided already by ourselves, it should not
+ # attempt to install them again, which is good, because we want to make
+ # it Nix's responsibility. If it needs to install any dependencies
+ # anyway (e.g. because the dependency parameters are
+ # incomplete/incorrect), it fails.
+ #
+ # The other responsibilities of NPM are kept -- version checks, build
+ # steps, postprocessing etc.
+
+ export HOME=$TMPDIR
+ cd "${packageName}"
+ runHook preRebuild
+
+ ${stdenv.lib.optionalString bypassCache ''
+ if [ ! -f package-lock.json ]
+ then
+ echo "No package-lock.json file found, reconstructing..."
+ node ${reconstructPackageLock}
+ fi
+
+ node ${addIntegrityFieldsScript}
+ ''}
+
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+
+ if [ "$dontNpmInstall" != "1" ]
+ then
+ # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+ rm -f npm-shrinkwrap.json
+
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+ fi
+
+ # Create symlink to the deployed executable folder, if applicable
+ if [ -d "$out/lib/node_modules/.bin" ]
+ then
+ ln -s $out/lib/node_modules/.bin $out/bin
+ fi
+
+ # Create symlinks to the deployed manual page folders, if applicable
+ if [ -d "$out/lib/node_modules/${packageName}/man" ]
+ then
+ mkdir -p $out/share
+ for dir in "$out/lib/node_modules/${packageName}/man/"*
+ do
+ mkdir -p $out/share/man/$(basename "$dir")
+ for page in "$dir"/*
+ do
+ ln -s $page $out/share/man/$(basename "$dir")
+ done
+ done
+ fi
+
+ # Run post install hook, if provided
+ runHook postInstall
+ '';
+ } // extraArgs);
+
+ # Builds a development shell
+ buildNodeShell =
+ { name
+ , packageName
+ , version
+ , src
+ , dependencies ? []
+ , buildInputs ? []
+ , production ? true
+ , npmFlags ? ""
+ , dontNpmInstall ? false
+ , bypassCache ? false
+ , dontStrip ? true
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ... }@args:
+
+ let
+ forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+
+ extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+
+ nodeDependencies = stdenv.mkDerivation ({
+ name = "node-dependencies-${name}-${version}";
+
+ buildInputs = [ tarWrapper python nodejs ]
+ ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+ ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+ ++ buildInputs;
+
+ inherit dontStrip; # Stripping may fail a build for some package deployments
+ inherit dontNpmInstall unpackPhase buildPhase;
+
+ includeScript = includeDependencies { inherit dependencies; };
+ pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+ passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+
+ installPhase = ''
+ mkdir -p $out/${packageName}
+ cd $out/${packageName}
+
+ source $includeScriptPath
+
+ # Create fake package.json to make the npm commands work properly
+ cp ${src}/package.json .
+ chmod 644 package.json
+ ${stdenv.lib.optionalString bypassCache ''
+ if [ -f ${src}/package-lock.json ]
+ then
+ cp ${src}/package-lock.json .
+ fi
+ ''}
+
+ # Pinpoint the versions of all dependencies to the ones that are actually being used
+ echo "pinpointing versions of dependencies..."
+ cd ..
+ ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+ source $pinpointDependenciesScriptPath
+ cd ${packageName}
+
+ # Patch the shebangs of the bundled modules to prevent them from
+ # calling executables outside the Nix store as much as possible
+ patchShebangs .
+
+ export HOME=$PWD
+
+ ${stdenv.lib.optionalString bypassCache ''
+ if [ ! -f package-lock.json ]
+ then
+ echo "No package-lock.json file found, reconstructing..."
+ node ${reconstructPackageLock}
+ fi
+
+ node ${addIntegrityFieldsScript}
+ ''}
+
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+
+ ${stdenv.lib.optionalString (!dontNpmInstall) ''
+ # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+ rm -f npm-shrinkwrap.json
+
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+ ''}
+
+ cd ..
+ ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+ mv ${packageName} lib
+ ln -s $out/lib/node_modules/.bin $out/bin
+ '';
+ } // extraArgs);
+ in
+ stdenv.mkDerivation {
+ name = "node-shell-${name}-${version}";
+
+ buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+ buildCommand = ''
+ mkdir -p $out/bin
+ cat > $out/bin/shell < zlib != null;
+
+# Make sure we get GNU sed.
+assert stdenv.hostPlatform.isDarwin -> gnused != null;
+
+# The go frontend is written in c++
+assert langGo -> langCC;
+
+with stdenv.lib;
+with builtins;
+
+let version = "9.1.0";
+
+ inherit (stdenv) buildPlatform hostPlatform targetPlatform;
+
+ patches =
+ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
+ ++ optional noSysDirs ../no-sys-dirs.patch
+ /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
+ url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
+ sha256 = ""; # TODO: uncomment and check hash when available.
+ }) */
+ ++ optional langFortran ../gfortran-driving.patch
+ ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;
+
+ /* Cross-gcc settings (build == host != target) */
+ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+ crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
+ crossConfigureFlags =
+ # Ensure that -print-prog-name is able to find the correct programs.
+ [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
+ "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
+ (if crossMingw && crossStageStatic then [
+ "--with-headers=${libcCross}/include"
+ "--with-gcc"
+ "--with-gnu-as"
+ "--with-gnu-ld"
+ "--with-gnu-ld"
+ "--disable-shared"
+ "--disable-nls"
+ "--disable-debug"
+ "--enable-sjlj-exceptions"
+ "--enable-threads=win32"
+ "--disable-win32-registry"
+ "--disable-libmpx" # requires libc
+ ] else if crossStageStatic then [
+ "--disable-libssp"
+ "--disable-nls"
+ "--without-headers"
+ "--disable-threads"
+ "--disable-libgomp"
+ "--disable-libquadmath"
+ "--disable-shared"
+ "--disable-libatomic" # requires libc
+ "--disable-decimal-float" # requires libc
+ "--disable-libmpx" # requires libc
+ ] else [
+ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
+ "--enable-__cxa_atexit"
+ "--enable-long-long"
+ ] ++
+ (if crossMingw then [
+ "--enable-threads=win32"
+ "--enable-sjlj-exceptions"
+ "--enable-hash-synchronization"
+ "--enable-libssp"
+ "--disable-nls"
+ "--with-dwarf2"
+ # To keep ABI compatibility with upstream mingw-w64
+ "--enable-fully-dynamic-string"
+ ] else
+ optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
+ # libsanitizer requires netrom/netrom.h which is not
+ # available in uclibc.
+ "--disable-libsanitizer"
+ # In uclibc cases, libgomp needs an additional '-ldl'
+ # and as I don't know how to pass it, I disable libgomp.
+ "--disable-libgomp"
+ # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
+ "--disable-libmpx"
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]));
+ stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
+ crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+
+ bootstrap = targetPlatform == hostPlatform;
+
+in
+
+stdenv.mkDerivation ({
+ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+
+ builder = ../builder.sh;
+
+ src = fetchurl {
+ url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
+ sha256 = "1817nc2bqdc251k0lpc51cimna7v68xjrnvqzvc50q3ax4s6i9kr";
+ };
+
+ inherit patches;
+
+ outputs = [ "out" "lib" "man" "info" ];
+ setOutputFlags = false;
+ NIX_NO_SELF_RPATH = true;
+
+ libc_dev = stdenv.cc.libc_dev;
+
+ hardeningDisable = [ "format" "pie" ];
+
+ # This should kill all the stdinc frameworks that gcc and friends like to
+ # insert into default search paths.
+ prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+ substituteInPlace gcc/config/darwin-c.c \
+ --replace 'if (stdinc)' 'if (0)'
+
+ substituteInPlace libgcc/config/t-slibgcc-darwin \
+ --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
+
+ substituteInPlace libgfortran/configure \
+ --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
+ '';
+
+ postPatch = ''
+ configureScripts=$(find . -name configure)
+ for configureScript in $configureScripts; do
+ patchShebangs $configureScript
+ done
+ '' + (
+ if targetPlatform != hostPlatform || stdenv.cc.libc != null then
+ # On NixOS, use the right path to the dynamic linker instead of
+ # `/lib/ld*.so'.
+ let
+ libc = if libcCross != null then libcCross else stdenv.cc.libc;
+ in
+ (
+ '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..."
+ for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+ do
+ grep -q _DYNAMIC_LINKER "$header" || continue
+ echo " fixing \`$header'..."
+ sed -i "$header" \
+ -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \
+ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
+ done
+ ''
+ + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+ ''
+ sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
+ ''
+ )
+ else "");
+
+ inherit noSysDirs staticCompiler crossStageStatic
+ libcCross crossMingw;
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ texinfo which gettext ]
+ ++ (optional (perl != null) perl);
+
+ # For building runtime libs
+ depsBuildTarget =
+ if hostPlatform == buildPlatform then [
+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
+ stdenv.cc
+ ];
+
+ buildInputs = [
+ gmp mpfr libmpc libelf
+ targetPackages.stdenv.cc.bintools # For linking code at run-time
+ ] ++ (optional (isl != null) isl)
+ ++ (optional (zlib != null) zlib)
+ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+ # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+ ++ (optional hostPlatform.isDarwin gnused)
+ ;
+
+ NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
+
+ preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+ export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+ export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+ export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+ export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+ '';
+
+ dontDisableStatic = true;
+
+ # TODO(@Ericson2314): Always pass "--target" and always prefix.
+ configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
+ configureFlags =
+ # Basic dependencies
+ [
+ "--with-gmp-include=${gmp.dev}/include"
+ "--with-gmp-lib=${gmp.out}/lib"
+ "--with-mpfr-include=${mpfr.dev}/include"
+ "--with-mpfr-lib=${mpfr.out}/lib"
+ "--with-mpc=${libmpc}"
+ ] ++
+ optional (libelf != null) "--with-libelf=${libelf}" ++
+ optional (!(crossMingw && crossStageStatic))
+ "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+
+ # Basic configuration
+ [
+ "--enable-lto"
+ "--disable-libstdcxx-pch"
+ "--without-included-gettext"
+ "--with-system-zlib"
+ "--enable-static"
+ "--enable-languages=${
+ concatStrings (intersperse ","
+ ( optional langC "c"
+ ++ optional langCC "c++"
+ ++ optional langFortran "fortran"
+ ++ optional langGo "go"
+ ++ optional langObjC "objc"
+ ++ optional langObjCpp "obj-c++"
+ ++ optionals crossDarwin [ "objc" "obj-c++" ]
+ )
+ )
+ }"
+ ] ++
+
+ (if (enableMultilib || targetPlatform.isAvr)
+ then ["--enable-multilib" "--disable-libquadmath"]
+ else ["--disable-multilib"]) ++
+ optional (!enableShared) "--disable-shared" ++
+ (if enablePlugin
+ then ["--enable-plugin"]
+ else ["--disable-plugin"]) ++
+
+ # Optional features
+ optional (isl != null) "--with-isl=${isl}" ++
+
+ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
+ optional (targetPlatform != hostPlatform) crossConfigureFlags ++
+ optional (!bootstrap) "--disable-bootstrap" ++
+
+ # Platform-specific flags
+ optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
+ optionals hostPlatform.isSunOS [
+ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
+ # On Illumos/Solaris GNU as is preferred
+ "--with-gnu-as" "--without-gnu-ld"
+ ]
+ ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+ "--disable-libsanitizer"
+ "--disable-symvers"
+ "libat_cv_have_ifunc=no"
+ "--disable-gnu-indirect-function"
+ ]
+ ;
+
+ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
+
+ buildFlags = optional
+ (bootstrap && hostPlatform == buildPlatform)
+ (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+
+ dontStrip = !stripped;
+
+ installTargets =
+ if stripped
+ then "install-strip"
+ else "install";
+
+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+ ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
+
+ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
+ # library headers and binaries, regarless of the language being compiled.
+ #
+ # Likewise, the LTO code doesn't find zlib.
+ #
+ # Cross-compiling, we need gcc not to read ./specs in order to build the g++
+ # compiler (after the specs for the cross-gcc are created). Having
+ # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.
+
+ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]
+ ++ optional (zlib != null) zlib
+ ));
+
+ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
+
+ EXTRA_TARGET_FLAGS = optionals
+ (targetPlatform != hostPlatform && libcCross != null)
+ ([
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
+ ] ++ optionals (! crossStageStatic) [
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
+ ]);
+
+ EXTRA_TARGET_LDFLAGS = optionals
+ (targetPlatform != hostPlatform && libcCross != null)
+ ([
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
+ ] ++ (if crossStageStatic then [
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
+ ] else [
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
+ ]));
+
+ passthru = {
+ inherit langC langCC langObjC langObjCpp langFortran langGo version;
+ isGNU = true;
+ };
+
+ enableParallelBuilding = true;
+ inherit enableMultilib;
+
+ inherit (stdenv) is64bit;
+
+ meta = {
+ homepage = https://gcc.gnu.org/;
+ license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
+ description = "GNU Compiler Collection, version ${version}"
+ + (if stripped then "" else " (with debugging info)");
+
+ longDescription = ''
+ The GNU Compiler Collection includes compiler front ends for C, C++,
+ Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
+ libraries for these languages (libstdc++, libgomp,...).
+
+ GCC development is a part of the GNU Project, aiming to improve the
+ compiler used in the GNU system including the GNU/Linux variant.
+ '';
+
+ maintainers = with stdenv.lib.maintainers; [ synthetica ];
+
+ platforms =
+ stdenv.lib.platforms.linux ++
+ stdenv.lib.platforms.freebsd ++
+ stdenv.lib.platforms.illumos ++
+ stdenv.lib.platforms.darwin;
+ };
+}
+
+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
+ makeFlags = [ "all-gcc" "all-target-libgcc" ];
+ installTargets = "install-gcc install-target-libgcc";
+}
+
+// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
+)
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index a88cf9c011655e423b55f2608244d71a99fc178d..9b942da25a630b1d85ac64d96375dc2e46238ed0 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -3,6 +3,7 @@
# build-tools
, bootPkgs
, autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx
+, bash
, runCommand
, libiconv ? null, ncurses
@@ -218,7 +219,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = [ perl ] ++ (libDeps hostPlatform);
+ buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -230,6 +231,10 @@ stdenv.mkDerivation (rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+ # See #63511 - the only unstripped file is the debug rts which isn't meant to
+ # be stripped.
+ dontStrip = true;
+
checkTarget = "test";
doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop."
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index da72c351ec66e08891e60b56a72fd3fe43c17f13..a355f57a5c7661e2ad33e1189114b6f95200884c 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -3,6 +3,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
+, bash
, libiconv ? null, ncurses
@@ -195,7 +196,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = [ perl ] ++ (libDeps hostPlatform);
+ buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -207,6 +208,10 @@ stdenv.mkDerivation (rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+ # See #63511 - the only unstripped file is the debug rts which isn't meant to
+ # be stripped.
+ dontStrip = true;
+
checkTarget = "test";
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix
index 640709aba1b8e3b53cbe0db18cee3b5fd1474249..ff9ef0a5c38aa933250f5fa4c66ee3fd2bc78d38 100644
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ b/pkgs/development/compilers/ghc/8.6.4.nix
@@ -3,13 +3,14 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
+, bash
, libiconv ? null, ncurses
, # GHC can be built with system libffi or a bundled one.
libffi ? null
-, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
+, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
@@ -31,7 +32,8 @@
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
- ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
@@ -193,7 +195,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = [ perl ] ++ (libDeps hostPlatform);
+ buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -205,6 +207,10 @@ stdenv.mkDerivation (rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+ # See #63511 - the only unstripped file is the debug rts which isn't meant to
+ # be stripped.
+ dontStrip = true;
+
checkTarget = "test";
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index e891ff42ff60e96a7b7691c427025e92b432cc1d..44ad6da2ff51d57e98886c2041ee3463919e4145 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -3,13 +3,14 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
+, bash
, libiconv ? null, ncurses
, # GHC can be built with system libffi or a bundled one.
libffi ? null
-, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
+, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
@@ -31,7 +32,8 @@
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
- ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
@@ -193,7 +195,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = [ perl ] ++ (libDeps hostPlatform);
+ buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -205,6 +207,10 @@ stdenv.mkDerivation (rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+ # See #63511 - the only unstripped file is the debug rts which isn't meant to
+ # be stripped.
+ dontStrip = true;
+
checkTarget = "test";
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 9772d045b765a26709a33b2c71e78a4860fc960c..07b9cd1e1aaf60e09038520abca3c767830db964 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -2,14 +2,15 @@
# build-tools
, bootPkgs
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
+, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
+, bash
, libiconv ? null, ncurses
, # GHC can be built with system libffi or a bundled one.
libffi ? null
-, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
+, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
@@ -31,7 +32,8 @@
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
- ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
@@ -84,12 +86,12 @@ let
in
stdenv.mkDerivation (rec {
- version = "8.8.0.20190424";
+ version = "8.8.0.20190613";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
- url = "https://downloads.haskell.org/~ghc/8.8.1-alpha1/ghc-${version}-src.tar.xz";
- sha256 = "1lwzy4q9hhaayamr1ij3lk8l7zdwfqza5b2racylp7xn2y9wanl9";
+ url = "https://downloads.haskell.org/~ghc/8.8.1-alpha2/ghc-${version}-src.tar.xz";
+ sha256 = "17531jabkdmlhj57mkshjfwlri2g3jgal8fw9zpkl1kbplnrivyr";
};
enableParallelBuilding = true;
@@ -178,7 +180,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = [ perl ] ++ (libDeps hostPlatform);
+ buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 88b273500dc09c1b447aaf305e0fd663d9c679c6..2edb49bd4633c79ed6435cb9898258f82692fc98 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -2,11 +2,12 @@
# build-tools
, bootPkgs
-, autoconf, automake, coreutils, fetchgit, fetchurl, fetchpatch, perl, python3, m4, sphinx
+, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3, m4, sphinx
+, bash
, libiconv ? null, ncurses
-, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
+, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
@@ -26,10 +27,11 @@
, # Whetherto build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
-, version ? "8.7.20190115"
+, version ? "8.9.20190601"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
- ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
@@ -87,14 +89,24 @@ stdenv.mkDerivation (rec {
src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
- rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65";
- sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834";
+ rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204";
+ sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v";
};
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
+ patches = [
+ (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
+ url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
+ name = "loadpluginsinmodules.diff";
+ sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
+ extraPrefix = "utils/haddock/";
+ stripLen = 1;
+ })
+ ];
+
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
@@ -176,7 +188,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = [ perl ] ++ (libDeps hostPlatform);
+ buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
index 8681aceacd7f3937048a163efd53da3692dd57fa..53b6dd4313426899708379ac6c90c33b15b5c841 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
+++ b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
@@ -1,6 +1,6 @@
{ haskellLib }:
-let inherit (haskellLib) dontCheck doJailbreak dontHaddock;
+let inherit (haskellLib) doJailbreak dontHaddock;
in self: super: {
haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs;
haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 93e6a47934fc1945f015f1a6b9092de55f46d01f..e9c303b88b6e6af0af120c7fac1cee550203b51d 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -29,7 +29,7 @@
, lens
, parallel, safe, shelly, split, stringsearch, syb
, tar, terminfo
-, vector, yaml, fetchgit, fetchFromGitHub
+, vector, yaml
, alex, happy, git, gnumake, autoconf, patch
, automake, libtool
, cryptohash
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 784d66a0f2425a8d0994f45dec16510cf88b5399..3c46dfc107b8c849e2773f731d41b96c6344e920 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, jq, python, spirv-tools, spirv-headers }:
+{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }:
stdenv.mkDerivation rec {
name = "glslang-${version}";
version = "7.11.3113";
diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..69507685f29b3804dff51ab4ba8c3ee42dde3c05
--- /dev/null
+++ b/pkgs/development/compilers/go-jsonnet/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "go-jsonnet-${version}";
+ version = "0.13.0";
+
+ goPackagePath = "github.com/google/go-jsonnet";
+
+ # regenerate deps.nix using following steps:
+ #
+ # go get -u github.com/google/go-jsonnet
+ # cd $GOPATH/src/github.com/google/go-jsonnet
+ # git checkout
+ # dep init
+ # dep2nix
+ goDeps = ./deps.nix;
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "google";
+ repo = "go-jsonnet";
+ sha256 = "0x95sqhrw4pscxq0q8781wix0w881k9my5kn5nf6k0fg1d6qlgiy";
+ fetchSubmodules = true;
+ };
+
+ meta = {
+ description = "An implementation of Jsonnet in pure Go";
+ maintainers = with lib.maintainers; [ nshalman ];
+ license = lib.licenses.asl20;
+ homepage = https://github.com/google/go-jsonnet;
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/compilers/go-jsonnet/deps.nix b/pkgs/development/compilers/go-jsonnet/deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1f413a16d81d19ea8bc85368873282b974f99d26
--- /dev/null
+++ b/pkgs/development/compilers/go-jsonnet/deps.nix
@@ -0,0 +1,48 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
+ sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "1311e847b0cb909da63b5fecfb5370aa66236465";
+ sha256 = "0rqfh1rj6f5wm8p2ky7inm8g10152p7w6n2cli17kf9gad797i8h";
+ };
+ }
+ {
+ goPackagePath = "github.com/sergi/go-diff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sergi/go-diff";
+ rev = "1744e2970ca51c86172c8190fadad617561ed6e7";
+ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "4c4f7f33c9ed00de01c4c741d2177abfcfe19307";
+ sha256 = "191001bxqyc3xfs46nnqmm7jdk0r73vk7a4zqngfl7zwjv9smwsq";
+ };
+ }
+]
\ No newline at end of file
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 5dce1529a8b80030eb0cd704bf494503894da32b..39de36293c8ea4c9fe551423af77ae5943012f38 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
+, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
, fetchpatch
}:
@@ -131,11 +131,6 @@ stdenv.mkDerivation rec {
})
];
- postPatch = optionalString stdenv.isDarwin ''
- echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
- substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
- '';
-
GOOS = if stdenv.isDarwin then "darwin" else "linux";
GOARCH = if stdenv.isDarwin then "amd64"
else if stdenv.hostPlatform.system == "i686-linux" then "386"
@@ -187,5 +182,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan orivej velovix mic92 ];
platforms = platforms.linux ++ platforms.darwin;
+ badPlatforms = [ "x86_64-darwin" ];
};
}
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 1e3a63983f4a1ff8325acbd33f85b434c11dfb9e..d382bd90e4798344a93169b4baf460fd9f053a82 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
+{ stdenv, fetchurl, tzdata, iana-etc, runCommand
+, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages, pkgsTargetTarget
}:
@@ -29,12 +29,12 @@ let
in
stdenv.mkDerivation rec {
- name = "go-${version}";
- version = "1.11.6";
+ pname = "go";
+ version = "1.11.11";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
- sha256 = "0cz1sdhxf9283p1p4jxb020pym0ncd0qlfh36r3hkv6bbm1a2vd9";
+ sha256 = "130g5lhg4h5xwa6chvxfi80nvdx8qb26xfbamzgyc8i5xwrprzqz";
};
# perl is used for testing go vet
@@ -136,11 +136,6 @@ stdenv.mkDerivation rec {
./skip-test-extra-files-on-386.patch
];
- postPatch = optionalString stdenv.isDarwin ''
- echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
- substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
- '';
-
GOOS = stdenv.targetPlatform.parsed.kernel.name;
GOARCH = goarch stdenv.targetPlatform;
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
@@ -188,7 +183,7 @@ stdenv.mkDerivation rec {
(cd src && ./make.bash)
'';
- doCheck = stdenv.hostPlatform == stdenv.targetPlatform;
+ doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
checkPhase = ''
runHook preCheck
diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index 44304006f6b4ca442c407ae83c9e2571eaca8820..247845b6ad8cee8ac7572aadf390098826efe15f 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
+{ stdenv, fetchurl, tzdata, iana-etc, runCommand
+, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages, pkgsTargetTarget
}:
@@ -29,12 +29,12 @@ let
in
stdenv.mkDerivation rec {
- name = "go-${version}";
- version = "1.12.1";
+ pname = "go";
+ version = "1.12.6";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
- sha256 = "12l12mmgqvy3nbscy7sz83qj4m6iz5a322aq9sk45f7l9ml2gq8b";
+ sha256 = "1jmlj8pygg4hjpkziicihcf76lz61w1qljdpm3hqlqsmfk65qv69";
};
# perl is used for testing go vet
@@ -141,9 +141,6 @@ stdenv.mkDerivation rec {
postPatch = ''
find . -name '*.orig' -exec rm {} ';'
- '' + optionalString stdenv.isDarwin ''
- echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
- substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
'';
GOOS = stdenv.targetPlatform.parsed.kernel.name;
@@ -193,7 +190,7 @@ stdenv.mkDerivation rec {
(cd src && ./make.bash)
'';
- doCheck = stdenv.hostPlatform == stdenv.targetPlatform;
+ doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
checkPhase = ''
runHook preCheck
diff --git a/pkgs/development/compilers/graalvm/001_mx.py.patch b/pkgs/development/compilers/graalvm/001_mx.py.patch
new file mode 100644
index 0000000000000000000000000000000000000000..25a9efa96415a28ad87dfb1b95f7b12708f6ef59
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/001_mx.py.patch
@@ -0,0 +1,257 @@
+diff --git a/mx.py b/mx.py
+index d119b62..471fe98 100644
+--- a/mx.py
++++ b/mx.py
+@@ -4961,30 +4961,6 @@ class PackedResourceLibrary(ResourceLibrary):
+
+ def get_path(self, resolve):
+ extract_path = _make_absolute(self.extract_path, self.suite.dir)
+- download_path = super(PackedResourceLibrary, self).get_path(resolve)
+- if resolve and self._check_extract_needed(extract_path, download_path):
+- extract_path_tmp = tempfile.mkdtemp(suffix=basename(extract_path), dir=dirname(extract_path))
+- try:
+- # extract archive
+- Extractor.create(download_path).extract(extract_path_tmp)
+- # ensure modification time is up to date
+- os.utime(extract_path_tmp, None)
+- logv("Moving temporary directory {} to {}".format(extract_path_tmp, extract_path))
+- try:
+- # attempt atomic overwrite
+- os.rename(extract_path_tmp, extract_path)
+- except OSError:
+- # clean destination & re-try for cases where atomic overwrite doesn't work
+- rmtree(extract_path, ignore_errors=True)
+- os.rename(extract_path_tmp, extract_path)
+- except OSError as ose:
+- # Rename failed. Race with other process?
+- if self._check_extract_needed(extract_path, download_path):
+- # ok something really went wrong
+- abort("Extracting {} failed!".format(download_path), context=ose)
+- finally:
+- rmtree(extract_path_tmp, ignore_errors=True)
+-
+ return extract_path
+
+ def _check_download_needed(self):
+@@ -5885,7 +5861,7 @@ class HgConfig(VC):
+
+ def update_to_branch(self, vcdir, branch, abortOnError=True):
+ cmd = ['update', branch]
+- self.hg_command(vcdir, cmd, abortOnError=abortOnError)
++ self.run(['hg', vcdir] + cmd)
+
+ def add(self, vcdir, path, abortOnError=True):
+ return self.run(['hg', '-q', '-R', vcdir, 'add', path]) == 0
+@@ -5922,7 +5898,7 @@ class HgConfig(VC):
+ return None
+
+ def parent_info(self, vcdir, abortOnError=True):
+- out = self.hg_command(vcdir, ["log", "-r", ".", "--template", "{author}|||{date|hgdate}"], abortOnError=abortOnError)
++ out = _check_output_str(["hg", '-R', vcdir, "log", "-r", ".", "--template", "{author}|||{date|hgdate}"])
+ author, date = out.split("|||")
+ ts, _ = date.split(" ")
+ return self._sanitize_parent_info({
+@@ -8287,46 +8263,8 @@ class SuiteImport:
+ version = import_dict.get("version")
+ suite_dir = None
+ version_from = import_dict.get("versionFrom")
+- if version_from and version:
+- abort("In import for '{}': 'version' and 'versionFrom' can not be both set".format(name), context=context)
+- if version is None and version_from is None:
+- if not (in_subdir and (importer.vc_dir != importer.dir or isinstance(importer, BinarySuite))):
+- abort("In import for '{}': No version given and not a 'subdir' suite of the same repository".format(name), context=context)
+- if importer.isSourceSuite():
+- suite_dir = join(importer.vc_dir, name)
+- version = importer.version()
+- if urls is None:
+- if not in_subdir:
+- if import_dict.get("subdir") is None and importer.vc_dir != importer.dir:
+- warn("In import for '{}': No urls given but 'subdir' is not set, assuming 'subdir=True'".format(name), context)
+- in_subdir = True
+- else:
+- abort("In import for '{}': No urls given and not a 'subdir' suite".format(name), context=context)
+- return SuiteImport(name, version, None, None, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir)
+- # urls a list of alternatives defined as dicts
+- if not isinstance(urls, list):
+- abort('suite import urls must be a list', context=context)
+- urlinfos = []
+- mainKind = None
+- for urlinfo in urls:
+- if isinstance(urlinfo, dict) and urlinfo.get('url') and urlinfo.get('kind'):
+- kind = urlinfo.get('kind')
+- if not VC.is_valid_kind(kind):
+- abort('suite import kind ' + kind + ' illegal', context=context)
+- else:
+- abort('suite import url must be a dict with {"url", kind", attributes', context=context)
+- vc = vc_system(kind)
+- if kind != 'binary':
+- assert not mainKind or mainKind == kind, "Only expecting one non-binary kind"
+- mainKind = kind
+- url = mx_urlrewrites.rewriteurl(urlinfo.get('url'))
+- urlinfos.append(SuiteImportURLInfo(url, kind, vc))
+- vc_kind = None
+- if mainKind:
+- vc_kind = mainKind
+- elif urlinfos:
+- vc_kind = 'binary'
+- return SuiteImport(name, version, urlinfos, vc_kind, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir)
++ suite_dir = join(get_env('MX_GIT_CACHE_DIR'), name)
++ return SuiteImport(name, version, [], None, True, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir)
+
+ @staticmethod
+ def get_source_urls(source, kind=None):
+@@ -8367,8 +8305,6 @@ class Suite(object):
+ :type dists: list[Distribution]
+ """
+ def __init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=False):
+- if primary is True and vc_dir is None:
+- abort("The primary suite must be in a vcs repository")
+ self.imported_by = [] if primary else [importing_suite]
+ self.mxDir = mxDir
+ self.dir = dirname(mxDir)
+@@ -8396,7 +8332,7 @@ class Suite(object):
+ self._outputRoot = None
+ self._preloaded_suite_dict = None
+ self.vc = vc
+- self.vc_dir = vc_dir
++ self.vc_dir = get_env('MX_GIT_CACHE_DIR')
+ self._preload_suite_dict()
+ self._init_imports()
+ if load:
+@@ -9295,7 +9231,9 @@ def get_dynamic_imports():
+ class SourceSuite(Suite):
+ """A source suite"""
+ def __init__(self, mxDir, primary=False, load=True, internal=False, importing_suite=None, dynamicallyImported=False):
+- vc, vc_dir = VC.get_vc_root(dirname(mxDir), abortOnError=False)
++ vc, vc_dir_test = VC.get_vc_root(dirname(mxDir), abortOnError=False)
++ vc_dir = get_env('MX_GIT_CACHE_DIR')
++ warn("LOOKING FOR: " + mxDir)
+ Suite.__init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=dynamicallyImported)
+ logvv("SourceSuite.__init__({}), got vc={}, vc_dir={}".format(mxDir, self.vc, self.vc_dir))
+ self.projects = []
+@@ -9344,17 +9282,7 @@ class SourceSuite(Suite):
+ """
+ Gets the release tag from VC or create a time based once if VC is unavailable
+ """
+- if snapshotSuffix not in self._releaseVersion:
+- _version = self._get_early_suite_dict_property('version')
+- if _version and self.getMxCompatibility().addVersionSuffixToExplicitVersion():
+- if not self.is_release():
+- _version = _version + '-' + snapshotSuffix
+- if not _version:
+- _version = self.vc.release_version_from_tags(self.vc_dir, self.name, snapshotSuffix=snapshotSuffix)
+- if not _version:
+- _version = 'unknown-{0}-{1}'.format(platform.node(), time.strftime('%Y-%m-%d_%H-%M-%S_%Z'))
+- self._releaseVersion[snapshotSuffix] = _version
+- return self._releaseVersion[snapshotSuffix]
++ return get_env('version')
+
+ def scm_metadata(self, abortOnError=False):
+ scm = self.scm
+@@ -12526,55 +12454,8 @@ def _attempt_download(url, path, jarEntryName=None):
+ return False
+
+ def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):
+- """
+- Attempts to downloads content for each URL in a list, stopping after the first successful download.
+- If the content cannot be retrieved from any URL, the program is aborted, unless abortOnError=False.
+- The downloaded content is written to the file indicated by `path`.
+- """
+- if not verifyOnly:
+- ensure_dirname_exists(path)
+- assert not path.endswith(os.sep)
+-
+- # https://docs.oracle.com/javase/7/docs/api/java/net/JarURLConnection.html
+- jarURLPattern = re.compile('jar:(.*)!/(.*)')
+- verify_errors = {}
+- for url in urls:
+- if not verifyOnly or verbose:
+- log('Downloading ' + url + ' to ' + path)
+- m = jarURLPattern.match(url)
+- jarEntryName = None
+- if m:
+- url = m.group(1)
+- jarEntryName = m.group(2)
+-
+- if verifyOnly:
+- try:
+- conn = _urlopen(url, timeout=10)
+- conn.close()
+- return True
+- except (IOError, socket.timeout) as e:
+- _suggest_tlsv1_error(e)
+- verify_errors[url] = e
+- continue
+-
+- for i in range(4):
+- if i != 0:
+- time.sleep(1)
+- warn('Retry {} to download from {}'.format(i, url))
+- res = _attempt_download(url, path, jarEntryName)
+- if res is True:
+- return True
+- if res is False:
+- break
+-
+- if abortOnError:
+- msg = 'Could not download to ' + path + ' from any of the following URLs: ' + ', '.join(urls)
+- if verifyOnly:
+- for url, e in verify_errors.items():
+- msg += '\n ' + url + ': ' + str(e)
+- abort(msg)
+- else:
+- return False
++ print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly))
++ return True
+
+ def update_file(path, content, showDiff=False):
+ """
+@@ -13378,6 +13259,7 @@ class Archiver(SafeFileCreation):
+
+ def _add_zip(self, filename, archive_name, provenance):
+ self._add_provenance(archive_name, provenance)
++ os.utime(filename, (315532800, 315532800))
+ self.zf.write(filename, archive_name)
+
+ def _add_str_zip(self, data, archive_name, provenance):
+@@ -18526,12 +18408,35 @@ def _find_suite_import(importing_suite, suite_import, fatalIfMissing=True, load=
+ Attempts to locate an existing suite in the local context
+ Returns the path to the mx.name dir if found else None
+ """
+- if mode == 'binary':
+- # binary suites are always stored relative to the importing suite in mx-private directory
+- return importing_suite._find_binary_suite_dir(suite_import.name)
++ warn("FAKE CLONE: " + str(suite_import))
++ if (suite_import.name == "truffle"):
++ return join(get_env('TMP'), "source", "truffle", "mx.truffle")
++ if (suite_import.name == "graal-nodejs"):
++ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-nodejs", "mx.graal-nodejs")
++ if (suite_import.name == "truffleruby"):
++ return join(get_env('MX_GIT_CACHE_DIR'), "truffleruby", "mx.truffleruby")
++ if (suite_import.name == "graalpython"):
++ return join(get_env('MX_GIT_CACHE_DIR'), "graalpython", "mx.graalpython")
++ if (suite_import.name == "vm"):
++ return join(get_env('TMP'), "source", "vm", "mx.vm")
++ if (suite_import.name == "fastr"):
++ return join(get_env('MX_GIT_CACHE_DIR'), "fastr", "mx.fastr")
++ if (suite_import.name == "sdk"):
++ return join(get_env('TMP'), "source", "sdk", "mx.sdk")
++ if (suite_import.name == "graal-js"):
++ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-js", "mx.graal-js")
++ if (suite_import.name == "regex"):
++ return join(get_env('TMP'), "source", "regex", "mx.regex")
++ if (suite_import.name == "substratevm"):
++ return join(get_env('TMP'), "source", "substratevm", "mx.substratevm")
++ if (suite_import.name == "tools"):
++ return join(get_env('TMP'), "source", "tools", "mx.tools")
++ if (suite_import.name == "sulong"):
++ return join(get_env('TMP'), "source", "sulong", "mx.sulong")
++ if (suite_import.name == "compiler"):
++ return join(get_env('TMP'), "source", "compiler", "mx.compiler")
+ else:
+- # use the SuiteModel to locate a local source copy of the suite
+- return _suitemodel.find_suite_dir(suite_import)
++ return join(get_env('MX_GIT_CACHE_DIR'), suite_import.name)
+
+ def _get_import_dir(url, mode):
+ """Return directory where the suite will be cloned to"""
diff --git a/pkgs/development/compilers/graalvm/002_setjmp.c.patch b/pkgs/development/compilers/graalvm/002_setjmp.c.patch
new file mode 100644
index 0000000000000000000000000000000000000000..38a29fd8fbfd7da0a43b81fd2ff3e84c41fea99f
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/002_setjmp.c.patch
@@ -0,0 +1,16 @@
+diff --git a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c
+index 16b869354d8..3691739d13b 100644
+--- a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c
++++ b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c
+@@ -41,11 +41,3 @@ int sigsetjmp(sigjmp_buf env, int savesigs) {
+ WARN_UNSUPPORTED(sigsetjmp);
+ return 0;
+ }
+-
+-void longjmp(jmp_buf env, int val) {
+- ERR_UNSUPPORTED(longjmp);
+-}
+-
+-void siglongjmp(sigjmp_buf env, int val) {
+- ERR_UNSUPPORTED(siglongjmp);
+-}
diff --git a/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch b/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bb9a0068712443f5223c722a9719e57f8347a6c5
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch
@@ -0,0 +1,12 @@
+diff --git a/truffle/mx.truffle/mx_truffle.py b/truffle/mx.truffle/mx_truffle.py
+index 8889c5ad810..add211a45c5 100644
+--- a/truffle/mx.truffle/mx_truffle.py
++++ b/truffle/mx.truffle/mx_truffle.py
+@@ -695,6 +695,7 @@ class LibffiBuildTask(mx.AbstractNativeBuildTask):
+ os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)]
+ for patch in self.subject.patches:
+ mx.run(git_apply + [patch], cwd=self.subject.suite.vc_dir)
++ mx.run(['cp', os.path.join(os.getenv('TMP'), 'truffle.make'), os.path.join(self.subject.delegate.dir, 'Makefile')])
+
+ self.delegate.logBuild()
+ self.delegate.build()
diff --git a/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch b/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0aa1bc9b88ddc09f76478bbe37e99853b3522d28
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch
@@ -0,0 +1,12 @@
+diff --git a/mx.jvmci/mx_jvmci.py b/mx.jvmci/mx_jvmci.py
+index 491fc19ab9..b4ddc03abb 100644
+--- a/mx.jvmci/mx_jvmci.py
++++ b/mx.jvmci/mx_jvmci.py
+@@ -192,6 +192,7 @@ class HotSpotVMJDKDeployedDist(JDKDeployedDist):
+ if m.name in _hs_deploy_map:
+ targetDir = join(jdkDir, _hs_deploy_map[m.name])
+ mx.logv('Deploying {} from {} to {}'.format(m.name, dist.name, targetDir))
++ subprocess.call(["chmod", "-R", "+rw", targetDir])
+ tar.extract(m, targetDir)
+
+ """
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index f051b24065a519a06ffbe2a44adad6e759a89fad..b30f47c08e50ebdf47c27075e6a58bf2beaf4991 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -1,31 +1,86 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }:
+{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial, python27,
+ zlib, makeWrapper, openjdk, unzip, git, clang, llvm, which, icu, ruby, bzip2
+ # gfortran, readline, bzip2, lzma, pcre, curl, ed, tree ## WIP: fastr deps
+}:
let
+ version = "1.0.0-rc15";
+ truffleMake = ./truffle.make;
+ makeMxGitCache = list: out: ''
+ mkdir ${out}
+ ${lib.concatMapStrings ({ url, name, rev, sha256 }: ''
+ mkdir -p ${out}/${name}
+ cp -rf ${fetchgit { inherit url rev sha256; }}/* ${out}/${name}
+ ''
+ ) list}
+
+ # # GRAAL-NODEJS # #
+ chmod -R +rw ${out}
+ sed -i "s|#include \"../../../../mxbuild/trufflenode/coremodules/node_snapshots.h\"| \
+ #include \"$NIX_BUILD_TOP/mxbuild/graal-nodejs/trufflenode/coremodules/node_snapshots.h\"|g" \
+ ${out}/graaljs/graal-nodejs/deps/v8/src/graal/callbacks.cc
+
+ # patch the shebang in python script runner
+ chmod -R +rw ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2
+ patchShebangs ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2/python
+
+ cd ${out}
+ hg init
+ hg add
+ hg commit -m 'dummy commit'
+ hg tag ${lib.escapeShellArg "vm${version}"}
+ hg checkout ${lib.escapeShellArg "vm${version}"}
+ '';
+
# pre-download some cache entries ('mx' will not be able to download under nixbld1)
makeMxCache = list:
stdenv.mkDerivation {
name = "mx-cache";
- buildCommand = ''
+ buildInputs = [ unzip ];
+ buildCommand = with lib; ''
mkdir $out
- ${lib.concatMapStrings ({url, name, sha1}: ''
- install -D ${fetchurl { inherit url sha1; }} $out/${name}
- echo -n ${sha1} > $out/${name}.sha1
- '') list}
+ ${lib.concatMapStrings
+ ({url, name, sha1, isNinja ? false}: ''
+ install -D ${fetchurl { inherit url sha1; }} $out/${name}
+ echo -n ${sha1} > $out/${name}.sha1
+ ${if isNinja then ''
+ export BASENAME=${removeSuffix ".zip" name}
+ mkdir "$out/$BASENAME.extracted" &&
+ unzip "$out/${name}" -d "$out/$BASENAME.extracted"
+
+ # Ninja is called later in the build process
+ if [ -f $out/$BASENAME.extracted/ninja ]; then
+ patchelf --set-interpreter \
+ "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${stdenv.cc.cc.lib}/lib64" \
+ $out/$BASENAME.extracted/ninja
+ fi
+ ''
+ else ""}
+ '') list}
'';
};
jvmci8-mxcache = [
- rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}/jacococore.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; }
- rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE_${sha1}/jacococore.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; }
- rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}/jacocoreport.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; }
- rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT_${sha1}/jacocoreport.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; }
+ rec { sha1 = "977b33afe2344a9ee801fd3317c54d8e1f9d7a79"; name = "JACOCOCORE_0.8.2_${sha1}/jacococore-0.8.2.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.8.2/org.jacoco.core-0.8.2.jar; }
+ rec { sha1 = "46f38efb779fb08216379e1a196396f4e22bbe41"; name = "JACOCOCORE_0.8.2_${sha1}/jacococore-0.8.2.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.8.2/org.jacoco.core-0.8.2-sources.jar; }
+ rec { sha1 = "50e133cdfd2d31ca5702b73615be70f801d3ae26"; name = "JACOCOREPORT_0.8.2_${sha1}/jacocoreport-0.8.2.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.8.2/org.jacoco.report-0.8.2.jar; }
+ rec { sha1 = "7488cd6e42cc4fa85b51200b7f451465692e033b"; name = "JACOCOREPORT_0.8.2_${sha1}/jacocoreport-0.8.2.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.8.2/org.jacoco.report-0.8.2-sources.jar; }
+ rec { sha1 = "4806883004063feb978b8811f00d5ea2138750bb"; name = "JACOCOAGENT_0.8.2_${sha1}/jacocoagent-0.8.2.jar"; url = mirror://maven/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2-runtime.jar; }
rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; }
rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; }
rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; }
rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; }
rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; }
rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; }
- rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}/asm-debug-all.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; }
+ rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM_6.2.1_${sha1}/asm-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar; }
+ rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM_6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar; }
+ rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE_6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar; }
+ rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE_6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar; }
+ rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS_6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar; }
+ rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS_6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar; }
+ rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS_6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar; }
+ rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS_6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar; }
rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; }
rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; }
rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}/jmh-1-18.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; }
@@ -36,63 +91,125 @@ let
rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12-sources.jar; }
rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; }
rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar; }
- rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "jvmci/intel-hsdis-amd64-linux-${sha1}.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; }
+ rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; }
];
graal-mxcache = jvmci8-mxcache ++ [
+ rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar; }
+ rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar; }
+ rec { sha1 = "344483aefa15147c121a8fb6fb35a2406768cc5c"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-linux-x86_64.jar; }
+ rec { sha1 = "503402aa0cf80fd95ede043c0011152c2b4556fd"; name = "LLVM_PLATFORM_${sha1}/llvm-platform.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm-platform/6.0.1-1.4.2/llvm-platform-6.0.1-1.4.2.jar; }
+ rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar; }
+ rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar; }
+ rec { sha1 = "702ca2d0ae93841c5ab75e4d119b29780ec0b7d9"; name = "NINJA_SYNTAX_${sha1}/ninja-syntax.tar.gz"; url = "https://pypi.org/packages/source/n/ninja_syntax/ninja_syntax-1.7.2.tar.gz"; }
+ rec { sha1 = "987234c4ce45505c21302e097c24efef4873325c"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip";
+ isNinja = true; }
rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; }
rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; }
- rec { sha1 = "30b13b7efc55b7feea667691509cf59902375001"; name = "ANTLR4_${sha1}/antlr4.jar"; url = mirror://maven/org/antlr/antlr4-runtime/4.7/antlr4-runtime-4.7.jar; }
- rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}/jline.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; }
+ rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar"; url = mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar; }
+ rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar"; url = mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar; }
rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar; }
- rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; }
+ rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; }
rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar; }
- rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}/libffi.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; }
+ rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_SOURCES_${sha1}/libffi-sources.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; }
rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; }
rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar; }
- rec { sha1 = "a828a4f32caf9ac0b74f2548f87310959558c526"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612.tar.gz; }
- rec { sha1 = "7ac829f0c9a37f5cc39afd2265588a365480720d"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612-linux-amd64.tar.gz; }
+ rec { sha1 = "5a5574f03b58465226166a638641a384b9f44445"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-655.tar.gz; }
+ rec { sha1 = "64f07398bac9897e9b8123edeaf5cf9ff19517b5"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-655-linux-amd64.tar.gz; }
rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar; }
+ rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar"; url = mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar; }
+ # This duplication of asm with underscore and minus is totally weird
+ rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar; }
+ rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar; }
+ rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar; }
+ rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar; }
+ rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar; }
+ rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar; }
+ rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar; }
+ rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar; }
+ # From here on the deps are new
+ rec { sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1.jar; }
+ rec { sha1 = "c9f7246bf93bb0dc7fe9e7c9eca531a8fb98d252"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1-sources.jar; }
+ rec { sha1 = "4b52bd03014f6d080ef0528865c1ee50621e35c6"; name = "NETBEANS_PROFILER_${sha1}/netbeans-profiler.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/org-netbeans-lib-profiler-8.2-201609300101.jar; }
+ rec { sha1 = "b5840706cc8ce639fcafeab1bc61da2d8aa37afd"; name = "NASHORN_INTERNAL_TESTS_${sha1}/nashorn-internal-tests.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/nashorn-internal-tests-700f5e3f5ff2.jar; }
+ rec { sha1 = "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5"; name = "JACKSON_ANNOTATIONS_${sha1}/jackson-annotations.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-annotations/2.8.6/jackson-annotations-2.8.6.jar; }
+ rec { sha1 = "2ef7b1cc34de149600f5e75bc2d5bf40de894e60"; name = "JACKSON_CORE_${sha1}/jackson-core.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar; }
+ rec { sha1 = "c43de61f74ecc61322ef8f402837ba65b0aa2bf4"; name = "JACKSON_DATABIND_${sha1}/jackson-databind.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar; }
+ rec { sha1 = "2838952e91baa37ac73ed817451268a193ba440a"; name = "JCODINGS_${sha1}/jcodings.jar"; url = mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40.jar; }
+ rec { sha1 = "0ed89e096c83d540acac00d6ee3ea935b4c905ff"; name = "JCODINGS_${sha1}/jcodings.sources.jar"; url = mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40-sources.jar; }
+ rec { sha1 = "5dbb09787a9b8780737b71fbf942235ef59051b9"; name = "JONI_${sha1}/joni.jar"; url = mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25.jar; }
+ rec { sha1 = "505a09064f6e2209616f38724f6d97d8d889aa92"; name = "JONI_${sha1}/joni.sources.jar"; url = mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25-sources.jar; }
+ rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar"; url = mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar; }
+ rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz"; url = http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz; }
+ rec { sha1 = "90aa8308da72ae610207d8f6ca27736921be692a"; name = "ANTLR4_COMPLETE_${sha1}/antlr4-complete.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7.1-complete.jar; }
+ ];
+
+ graal-mxcachegit = [
+ { sha256 = "0siryzvmj9h8zkyr0d3gy9fqgyxb9s5xs15rf7lnx9zh3ykq549y"; name = "graaljs";
+ url = "http://github.com/graalvm/graaljs.git"; rev = "vm-${version}"; }
+ { sha256 = "1ii3mwa0c2zk9vm51hyrymdz3whfihm6sccd2r5ja2v53jcdc1a3"; name = "truffleruby";
+ url = "http://github.com/oracle/truffleruby.git"; rev = "vm-${version}"; }
+ { sha256 = "1nz8yqg2k9shpmhj3jv7k2icfg72cm55baf354rsh1pqanay8qb7"; name = "fastr";
+ url = "http://github.com/oracle/fastr.git"; rev = "vm-${version}"; }
+ { sha256 = "1c8nnrl30fys22gk3y6dvxzq0fq1a5hjkqrw15p68cwpz9wma4gi"; name = "graalpython";
+ url = "https://github.com/graalvm/graalpython.git"; rev = "vm-${version}"; }
];
+ ninja-syntax = python27.pkgs.buildPythonPackage rec {
+ version = "1.7.2";
+ pname = "ninja_syntax";
+ doCheck = false;
+ src = python27.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "07zg30m0khx55fv2gxxn7pqd549z0vk3x592mrdlk9l8krxwjb9l";
+ };
+ };
+
findbugs = fetchzip {
name = "findbugs-3.0.0";
url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip;
sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m";
};
+ python27withPackages = python27.withPackages (ps: [ ninja-syntax ]);
+
in rec {
mx = stdenv.mkDerivation rec {
- version = "5.192.0";
+ version = "5.215.4";
pname = "mx";
src = fetchFromGitHub {
owner = "graalvm";
repo = "mx";
rev = version;
- sha256 = "04gdf1gzlc8a6li8lcnrs2j9zicj11fs1vqqf7cmhb4pm2h72hml";
+ sha256 = "0wrwfiwqjw6xp0bvp2g15jn6yrjb9w6jw1xnwvkyhkw1s6m0w0z1";
};
nativeBuildInputs = [ makeWrapper ];
+ prePatch = ''
+ cp mx.py bak_mx.py
+ '';
+ patches = [ ./001_mx.py.patch ];
+ postPatch = ''
+ mv mx.py internal_mx.py
+ mv bak_mx.py mx.py
+ '';
buildPhase = ''
substituteInPlace mx --replace /bin/pwd pwd
- # forbid network access while simulate success for passing obligatory "VerifyLibraryURL"
- substituteInPlace mx.py --replace \
- 'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):' \
- 'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):
- print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly))
- return True'
-
# avoid crash with 'ValueError: ZIP does not support timestamps before 1980'
- substituteInPlace mx.py --replace \
- 'zipfile.ZipInfo(arcname, time.localtime(os.path.getmtime(join(root, f)))[:6])' \
+ substituteInPlace internal_mx.py --replace \
+ 'zipfile.ZipInfo(arcname, time.localtime(getmtime(join(root, f)))[:6])' \
'zipfile.ZipInfo(arcname, time.strptime ("1 Jan 1980", "%d %b %Y" )[:6])'
'';
installPhase = ''
mkdir -p $out/bin
cp -dpR * $out/bin
wrapProgram $out/bin/mx \
- --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} \
+ --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \
+ --set FINDBUGS_HOME ${findbugs}
+ makeWrapper ${python27}/bin/python $out/bin/mx-internal \
+ --add-flags "$out/bin/internal_mx.py" \
+ --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \
--set FINDBUGS_HOME ${findbugs}
'';
meta = with stdenv.lib; {
@@ -103,22 +220,16 @@ in rec {
};
};
- # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too)
jvmci8 = stdenv.mkDerivation rec {
- version = "0.49";
- name = let
- n = "jvmci${/*"8u191"*/ lib.removePrefix "oraclejdk-" oraclejdk8.name}-${version}";
- in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then
- n
- else
- throw "length of string `${n}' must be equal to the length of `${oraclejdk8.name}'";
+ version = "0.58";
+ name = "jvmci-${version}";
src = fetchFromGitHub {
owner = "graalvm";
repo = "graal-jvmci-8";
rev = "jvmci-${version}";
- sha256 = "1zgin0w1qa7wmfhcisx470fhnmddfxxp5nyyix31yaa7dznql82k";
+ sha256 = "0p8icn3d99zggsh6pqb15dz1j186ck442sjpn2cv43n4nvdmmp1m";
};
- buildInputs = [ mx mercurial ];
+ buildInputs = [ mx mercurial openjdk ];
postUnpack = ''
# a fake mercurial dir to prevent mx crash and supply the version to mx
( cd $sourceRoot
@@ -129,46 +240,55 @@ in rec {
hg checkout ${lib.escapeShellArg src.rev}
)
'';
+ patches = [ ./004_mx_jvmci.py.patch ];
+ postPatch =''
+ # The hotspot version name regex fix
+ substituteInPlace mx.jvmci/mx_jvmci.py \
+ --replace "\\d+.\\d+-b\\d+" "\\d+.\\d+-bga"
+ '';
hardeningDisable = [ "fortify" ];
NIX_CFLAGS_COMPILE = [
"-Wno-error=format-overflow" # newly detected by gcc7
"-Wno-error=nonnull"
];
buildPhase = ''
- cp -dpR ${oraclejdk8} writable-copy-of-jdk
- chmod +w -R writable-copy-of-jdk
-
export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache}
- mx --java-home $(pwd)/writable-copy-of-jdk build
+
+ mx-internal --primary-suite . --vm=server -v build -DFULL_DEBUG_SYMBOLS=0
+ mx-internal --primary-suite . --vm=server -v vm -version
+ mx-internal --primary-suite . --vm=server -v unittest
'';
installPhase = ''
- mv jdk1.8.0_*/linux-amd64/product $out
- find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \;
-
- install -v -m0555 -D $MX_CACHE_DIR/jvmci/*hsdis*.so $out/jre/lib/amd64/hsdis-amd64.so
+ mkdir -p $out
+ mv openjdk1.8.0_*/linux-amd64/product/* $out
+ install -v -m0555 -D $MX_CACHE_DIR/hsdis*/hsdis.so $out/jre/lib/amd64/hsdis-amd64.so
'';
dontFixup = true; # do not nuke path of ffmpeg etc
dontStrip = true; # why? see in oraclejdk derivation
- inherit (oraclejdk8) meta;
+ meta = openjdk.meta // { inherit (graalvm8.meta) platforms; };
+ inherit (openjdk) postFixup;
};
graalvm8 = stdenv.mkDerivation rec {
- version = "1.0.0-rc8";
- name = let
- n = "graal-${version}";
- in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then
- n
- else
- throw "length of string `${n}' must be equal to the length of `${jvmci8.name}'";
+ inherit version;
+ name = "graal-${version}";
src = fetchFromGitHub {
owner = "oracle";
repo = "graal";
rev = "vm-${version}";
- sha256 = "1fada4awrr8bhw294xdiq4bagvgrlcr44mw6338gaal0ky3vkm0p";
+ sha256 = "18fqah8x7gwz02ji40b4vyqav9x5dw703xwikjc117wlyymb1k56";
};
- buildInputs = [ mx zlib mercurial jvmci8 ];
+ patches = [ ./002_setjmp.c.patch ./003_mx_truffle.py.patch ];
+ buildInputs = [ mx zlib mercurial jvmci8 git clang llvm
+ python27withPackages which icu ruby bzip2
+ # gfortran readline bzip2 lzma pcre.dev curl ed ## WIP: fastr dependencies
+ ];
postUnpack = ''
+ cp ${stdenv.cc.cc}/include/c++/${stdenv.cc.cc.version}/stdlib.h \
+ $sourceRoot/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include
+ cp ${truffleMake} $TMP && mv *truffle.make truffle.make
+ rm $sourceRoot/truffle/src/libffi/patches/others/0001-Add-mx-bootstrap-Makefile.patch
# a fake mercurial dir to prevent mx crash and supply the version to mx
( cd $sourceRoot
hg init
@@ -188,58 +308,54 @@ in rec {
'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");'
substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
--replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";'
+ # prevent cyclical imports caused by identical names
+ substituteInPlace sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/stdlib.h \
+ --replace '# include ' '# include "${stdenv.cc.cc}/include/c++/${stdenv.cc.cc.version}/cstdlib"'
+ # dragonegg can't seem to compile on nix, so let's not require it
+ substituteInPlace sulong/mx.sulong/suite.py \
+ --replace '"requireDragonegg" : True,' '"requireDragonegg" : False,'
+ substituteInPlace truffle/mx.truffle/mx_truffle.py \
+ --replace 'os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)' \
+ 'self.subject.delegate.dir'
+
+ # Patch the native-image template, as it will be run during build
+ chmod +x vm/mx.vm/launcher_template.sh && patchShebangs vm/mx.vm
'';
+
buildPhase = ''
# make a copy of jvmci8
- cp -dpR ${jvmci8} $out
- chmod +w -R $out
- find $out -type f -exec sed -i "s#${jvmci8}#$out#g" {} \;
+ mkdir $NIX_BUILD_TOP/jvmci8
+ cp -dpR ${jvmci8}/* $NIX_BUILD_TOP/jvmci8
+ chmod +w -R $NIX_BUILD_TOP/jvmci8
export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
export MX_CACHE_DIR=${makeMxCache graal-mxcache}
+ export MX_GIT_CACHE='refcache'
+ export MX_GIT_CACHE_DIR=$NIX_BUILD_TOP/mxgitcache
+ export JVMCI_VERSION_CHECK='ignore'
+ export JAVA_HOME=$NIX_BUILD_TOP/jvmci8
+ # export FASTR_RELEASE=true ## WIP
+ ${makeMxGitCache graal-mxcachegit "$MX_GIT_CACHE_DIR"}
+ cd $NIX_BUILD_TOP/source
- ( cd substratevm
-
- mkdir -p clibraries
- mx --java-home $out build
-
- # bootstrap native-image (that was removed from mx build in https://github.com/oracle/graal/commit/140d7a7edf54ec5872a8ff45869cd1ae499efde4)
- mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/jdk1.8/svm-driver.jar com.oracle.svm.driver.NativeImage
- )
- ( cd tools
- mx --java-home $out build
+ ( cd vm
+ mx-internal -v --dynamicimports /substratevm,/tools,sulong,/graal-nodejs,graalpython build
)
'';
- installPhase = ''
- # add graal files modelling after directory structure of "graalvm-ce" binary distribution
- mkdir -p $out/jre/tools/{profiler,chromeinspector,truffle/builder} $out/jre/lib/{graal,include,truffle/include}
- cp -vpLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks
- cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/bin/* $out/jre/lib/amd64/
- cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-*processor*.jar $out/jre/lib/graal/
- cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/include/
- cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-management.jar $out/jre/lib/jvmci/
- cp -vdpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/
- cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/* $out/jre/lib/truffle/
- cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/truffle/include/
- cp -vpLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/
- cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/
- cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/
- cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/* $out/jre/tools/truffle/
- cp -vp $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/truffle-nfi.jar $out/jre/tools/truffle/builder/
-
- echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties
- echo -n "graal" > $out/jre/lib/jvmci/compiler-name
- echo -n "../truffle/truffle-api.jar:../truffle/truffle-nfi.jar" > $out/jre/lib/jvmci/parentClassLoader.classpath
- install -v -m0555 -D substratevm/com.oracle.svm.driver.nativeimage $out/jre/lib/svm/bin/native-image
- ln -s ../lib/svm/bin/native-image $out/jre/bin/native-image
- ln -s ../jre/bin/native-image $out/bin/native-image
+ installPhase = ''
+ mkdir -p $out
+ cp -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM_CMP_GU_GVM_INS_JS_LIBPOLY_NFI_NJS_POLY_POLYNATIVE_PRO_PYN_RGX_SLG_SVM_SVMAG_SVMCF_SVML_TFL_VVM/graalvm-unknown-${version}/* $out
# BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
substituteInPlace $out/jre/lib/security/java.security \
--replace file:/dev/random file:/dev/./urandom \
--replace NativePRNGBlocking SHA1PRNG
+ # Organize the out dir
+ mkdir -p $out/share && mv $out/man $out/share
+ rm $out/ASSEMBLY_EXCEPTION $out/release $out/LICENSE $out/THIRD_PARTY_README
'';
+
dontFixup = true; # do not nuke path of ffmpeg etc
dontStrip = true; # why? see in oraclejdk derivation
doInstallCheck = true;
@@ -268,8 +384,8 @@ in rec {
meta = with stdenv.lib; {
homepage = https://github.com/oracle/graal;
description = "High-Performance Polyglot VM";
- license = licenses.unfree;
- maintainers = with maintainers; [ volth ];
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ volth hlolli ];
platforms = [ "x86_64-linux" ];
};
};
diff --git a/pkgs/development/compilers/graalvm/truffle.make b/pkgs/development/compilers/graalvm/truffle.make
new file mode 100644
index 0000000000000000000000000000000000000000..da887c142408f96f31d44f97ef4b5120667f02bc
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/truffle.make
@@ -0,0 +1,14 @@
+# This Makefile is used by mx to bootstrap libffi build.
+
+# `make MX_VERBOSE=y` will report all lines executed. The actual value doesn't
+# matter as long as it's not empty.
+QUIETLY$(MX_VERBOSE) = @
+
+.PHONY: default
+
+default:
+ $(QUIETLY) echo CONFIGURE libffi
+ $(QUIETLY) mkdir ../$(OUTPUT)
+ $(QUIETLY) cd ../$(OUTPUT) && ../$(SOURCES)/configure $(CONFIGURE_ARGS) > ../libffi.configure.log
+ $(QUIETLY) echo MAKE libffi
+ $(QUIETLY) $(MAKE) -C ../$(OUTPUT) > ../libffi.build.log
diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index 1d3b13937fc04b6b4762a83dc5004ff6a0e6e255..683f8d7ace09d14fbdaf535f43ec67cc977caf4c 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -1,5 +1,5 @@
{ llvmPackages, lib, fetchFromGitHub, cmake
-, libpng, libjpeg, mesa_noglu, eigen, openblas
+, libpng, libjpeg, mesa, eigen, openblas
}:
let
@@ -37,7 +37,7 @@ in llvmPackages.stdenv.mkDerivation {
# Note: only openblas and not atlas part of this Nix expression
# see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
# to get a hint howto setup atlas instead of openblas
- buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen openblas ];
+ buildInputs = [ llvmPackages.llvm libpng libjpeg mesa eigen openblas ];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 2657ee6633b7862217f73dd8fa4779d2924022dc..1cbe95232eb72ee478791b414512c45105e64890 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, fetchpatch, which, m4, python, bison, flex, llvmPackages,
+{stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages,
testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents
}:
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 6104ffc7aaa325c145a1bef51092ce4cbaa75800..7bbad0e12016f0d7577f845596fabcd64c95f6f1 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -2,25 +2,27 @@
stdenv.mkDerivation rec {
name = "jsonnet-${version}";
- version = "0.12.1";
+ version = "0.13.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "google";
repo = "jsonnet";
- sha256 = "13a0sf1k8ivxhc28w0d0axzr0sj3jccl9sjq6l0dkyzrnmbxzmkb";
+ sha256 = "1fibr1kysbxcf8jp2a4xvs3n7i8d9k2430agxzc9mdyqrh79zlxk";
};
enableParallelBuilding = true;
makeFlags = [
"jsonnet"
+ "jsonnetfmt"
"libjsonnet.so"
];
installPhase = ''
mkdir -p $out/bin $out/lib $out/include
cp jsonnet $out/bin/
+ cp jsonnetfmt $out/bin/
cp libjsonnet*.so $out/lib/
cp -a include/*.h $out/include/
'';
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
index ffa5e3ba55d001db0e7e72932e91d0cff2936b3c..d8d521952bdaec7f31518ee699f4877987120846 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/pkgs/development/compilers/julia/shared.nix
@@ -9,7 +9,7 @@
{ stdenv, fetchurl, fetchzip
# build tools
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, llvm, cmake
+, cmake
# libjulia dependencies
, libunwind, readline, utf8proc, zlib
# standard library dependencies
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
makeFlags =
let
arch = head (splitString "-" stdenv.system);
- march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
+ march = { "x86_64" = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; "i686" = "pentium4"; }."${arch}"
or (throw "unsupported architecture: ${arch}");
# Julia requires Pentium 4 (SSE2) or better
cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
@@ -173,16 +173,11 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_ZLIB=1"
];
- NIX_CFLAGS_COMPILE = [ "-fPIC" ];
-
LD_LIBRARY_PATH = makeLibraryPath [
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
openspecfun pcre2
];
- dontStrip = true;
- dontPatchELF = true;
-
enableParallelBuilding = true;
doCheck = !stdenv.isDarwin;
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 87c798c8d382e7663a4eab31fda5efeacd067e0d..f49d63168d40eb2ccdd46e7ab3224325348abcc1 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
let
- version = "1.3.31";
+ version = "1.3.40";
in stdenv.mkDerivation rec {
inherit version;
name = "kotlin-${version}";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
- sha256 = "0sldhjxh2ghzwkabgziyiq4609iws0vninr8zxclzbqmcgajawqh";
+ sha256 = "14n3x0771d0a1yqncig97lk4bigkx2nvx20khpcnvf873c2b3h28";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 71473be580ea3c8957d7d2f5fb00069ad575af5f..e4ef37e4721d30bc0751213b9dd991836b3046c4 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, cmake, ninja, llvm, llvm_8, curl, tzdata
+{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata
, python, libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, targetPackages
, bootstrapVersion ? false
-, version ? "1.15.0"
-, ldcSha256 ? "1qnfy2q8zkywvby7wa8jm20mlpghn28x6w357cpc8hi56g7y1q6p"
+, version ? "1.16.0"
+, ldcSha256 ? "00kk6pijn1ay2kkrp6b5ismawxr10azwij89k1rkszavqq6rsva2"
}:
let
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) [
# https://github.com/NixOS/nixpkgs/issues/57120
# https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515
- llvm
+ llvm_5
]
++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
]
++ stdenv.lib.optional (bootstrapVersion) [
- libconfig llvm
+ libconfig llvm_5
]
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
deleted file mode 100644
index 4ccd00af6846682d1acc66d8872b26f22b9a9609..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }:
-
-let
- gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
- self = stdenv.mkDerivation {
- name = "clang-${version}";
-
- unpackPhase = ''
- unpackFile ${fetch "cfe" "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"}
- mv cfe-${version}.src clang
- sourceRoot=$PWD/clang
- unpackFile ${clang-tools-extra_src}
- mv clang-tools-extra-* $sourceRoot/tools/extra
- '';
-
- buildInputs = [ cmake libxml2 llvm ];
-
- cmakeFlags = [
- "-DCMAKE_CXX_FLAGS=-std=c++11"
- ] ++
- # Maybe with compiler-rt this won't be needed?
- (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
- (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
-
- patches = [ ./purity.patch ];
-
- postPatch = ''
- sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
- sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
- '';
-
- # Clang expects to find LLVMgold in its own prefix
- # Clang expects to find sanitizer libraries in its own prefix
- postInstall = ''
- if [ -e ${llvm}/lib/LLVMgold.so ]; then
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
- fi
-
- ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
- ln -sv $out/bin/clang $out/bin/cpp
- '';
-
- enableParallelBuilding = true;
-
- passthru = {
- lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
- isClang = true;
- inherit llvm;
- } // stdenv.lib.optionalAttrs stdenv.isLinux {
- inherit gcc;
- };
-
- meta = {
- description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
- homepage = http://llvm.org/;
- license = stdenv.lib.licenses.ncsa;
- platforms = stdenv.lib.platforms.all;
- };
- };
-in self
diff --git a/pkgs/development/compilers/llvm/3.7/clang/purity.patch b/pkgs/development/compilers/llvm/3.7/clang/purity.patch
deleted file mode 100644
index ee73b26eb5cec03e9f8c6b74879e29433b0581ec..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/clang/purity.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/lib/Driver/Tools.cpp 2015-07-31 00:47:41.000000000 +0200
-+++ b/lib/Driver/Tools.cpp 2015-09-11 21:30:50.057895565 +0200
-@@ -8150,15 +8150,6 @@
- CmdArgs.push_back("-shared");
- }
-
-- if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
-- Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb ||
-- (!Args.hasArg(options::OPT_static) &&
-- !Args.hasArg(options::OPT_shared))) {
-- CmdArgs.push_back("-dynamic-linker");
-- CmdArgs.push_back(Args.MakeArgString(
-- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
-- }
--
- CmdArgs.push_back("-o");
- CmdArgs.push_back(Output.getFilename());
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
deleted file mode 100644
index 3c557711449ffb51d40e14460179e4b4a1350a3e..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl
-, overrideCC, wrapCCWith
-, buildLlvmTools # tools, but from the previous stage, for cross
-, targetLlvmLibraries # libraries, but from the next stage, for cross
-}:
-
-let
- version = "3.7.1";
-
- fetch = fetch_v version;
- fetch_v = ver: name: sha256: fetchurl {
- url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz";
- inherit sha256;
- };
-
- compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx";
- clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa";
-
- tools = stdenv.lib.makeExtensible (tools: let
- callPackage = newScope (tools // { inherit stdenv isl version fetch; });
- in {
- llvm = callPackage ./llvm.nix {
- inherit compiler-rt_src;
- inherit (targetLlvmLibraries) libcxxabi;
- };
-
- clang-unwrapped = callPackage ./clang {
- inherit clang-tools-extra_src;
- };
-
- clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
-
- libstdcxxClang = wrapCCWith {
- cc = tools.clang-unwrapped;
- extraPackages = [ libstdcxxHook ];
- };
-
- libcxxClang = wrapCCWith {
- cc = tools.clang-unwrapped;
- extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
- };
-
- lldb = callPackage ./lldb.nix {};
- });
-
- libraries = stdenv.lib.makeExtensible (libraries: let
- callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
- in {
-
- stdenv = overrideCC stdenv buildLlvmTools.clang;
-
- libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
-
- libcxx = callPackage ./libc++ {};
-
- libcxxabi = callPackage ./libc++abi.nix {};
- });
-
-in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch
deleted file mode 100644
index bf83f169cfc35c6de4cd20fb480c0fa62ec60dd4..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt
---- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100
-+++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200
-@@ -56,7 +56,7 @@
- "-compatibility_version 1"
- "-current_version ${LIBCXX_VERSION}"
- "-install_name /usr/lib/libc++.1.dylib"
-- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib"
-+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
- "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
- "/usr/lib/libSystem.B.dylib")
- else()
-@@ -64,14 +64,14 @@
- list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7)
- if (OSX_HAS_ARMV7)
- set(OSX_RE_EXPORT_LINE
-- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"
-+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
- "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
- else()
- set(OSX_RE_EXPORT_LINE
-- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib")
-+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib")
- endif()
- else()
-- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
-+ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
- endif()
-
- list(APPEND link_flags
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
deleted file mode 100644
index 462e35a483f4e9f1fc2904a02c8a17d6d7e78c08..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
-
-stdenv.mkDerivation rec {
- name = "libc++-${version}";
-
- src = fetch "libcxx" "0i7iyzk024krda5spfpfi8jksh83yp3bxqkal0xp76ffi11bszrm";
-
- postUnpack = ''
- unpackFile ${libcxxabi.src}
- '';
-
- preConfigure = ''
- # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
- cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
- '';
-
- patches = [
- ./darwin.patch
- ./r242056.patch
- # glibc 2.26 fix
- ./xlocale-glibc-2.26.patch
- ];
-
- buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
-
- cmakeFlags = [
- "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
- "-DLIBCXX_LIBCPPABI_VERSION=2"
- "-DLIBCXX_CXX_ABI=libcxxabi"
- ];
-
- enableParallelBuilding = true;
-
- linkCxxAbi = stdenv.isLinux;
-
- setupHooks = [
- ../../../../../build-support/setup-hooks/role.bash
- ./setup-hook.sh
- ];
-
- meta = {
- homepage = http://libcxx.llvm.org/;
- description = "A new implementation of the C++ standard library, targeting C++11";
- license = with stdenv.lib.licenses; [ ncsa mit ];
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch b/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch
deleted file mode 100644
index 96245e76653a65d385291b4743702232891ac09d..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/include/string 2015/07/13 20:04:56 242056
-+++ b/include/string 2015/07/18 20:40:46 242623
-@@ -1936,7 +1936,12 @@
- template
- inline _LIBCPP_INLINE_VISIBILITY
- basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a)
-- : __r_(__a)
-+#if _LIBCPP_STD_VER <= 14
-+ _NOEXCEPT_(is_nothrow_copy_constructible::value)
-+#else
-+ _NOEXCEPT
-+#endif
-+: __r_(__a)
- {
- #if _LIBCPP_DEBUG_LEVEL >= 2
- __get_db()->__insert_c(this);
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
deleted file mode 100644
index 6611259165ae2547d92a1bc04a5b83ae4fc595e1..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-linkCxxAbi="@linkCxxAbi@"
-export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch b/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch
deleted file mode 100644
index 5ee8f6b82305c701735e2dd493d2ff0dbebdd004..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/include/__locale b/include/__locale
-index 1989558..1e42905 100644
---- a/include/__locale
-+++ b/include/__locale
-@@ -34,10 +34,10 @@
- # include
- #elif defined(_NEWLIB_VERSION)
- # include
--#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
-+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
- || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
- # include
--#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
-+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
-
- #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
- #pragma GCC system_header
diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
deleted file mode 100644
index 2c79d7b3b1b568cd3d701f3a7539eded0811e680..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ stdenv, cmake, fetch, fetchpatch, libcxx, libunwind, llvm, version }:
-
-let
- # Newer LLVMs (3.8 onwards) have changed how some basic C++ stuff works, which breaks builds of this older version
- llvm38-and-above = fetchpatch {
- url = "https://trac.macports.org/raw-attachment/ticket/50304/0005-string-Fix-exception-declaration.patch";
- sha256 = "1lm38n7s0l5dbl7kp4i49pvzxz1mcvlr2vgsnj47agnwhhm63jvr";
- };
-in stdenv.mkDerivation {
- name = "libc++abi-${version}";
-
- src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4";
-
- nativeBuildInputs = [ cmake ];
- buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
-
- postUnpack = ''
- unpackFile ${libcxx.src}
- unpackFile ${llvm.src}
- export NIX_CFLAGS_COMPILE+=" -I$PWD/include"
- export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- export TRIPLE=x86_64-apple-darwin
- '';
-
- # I can't use patches directly because this is actually a patch for libc++'s source, which we manually extract
- # into the libc++abi build environment above.
- prePatch = ''(
- cd ../libcxx-*
- patch -p1 < ${llvm38-and-above}
- )'';
-
- installPhase = if stdenv.isDarwin
- then ''
- for file in lib/*.dylib; do
- # this should be done in CMake, but having trouble figuring out
- # the magic combination of necessary CMake variables
- # if you fancy a try, take a look at
- # http://www.cmake.org/Wiki/CMake_RPATH_handling
- install_name_tool -id $out/$file $file
- done
- make install
- install -d 755 $out/include
- install -m 644 ../include/*.h $out/include
- ''
- else ''
- install -d -m 755 $out/include $out/lib
- install -m 644 lib/libc++abi.so.1.0 $out/lib
- install -m 644 ../include/cxxabi.h $out/include
- ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
- ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
- '';
-
- meta = {
- homepage = http://libcxxabi.llvm.org/;
- description = "A new implementation of low level support for a standard C++ library";
- license = with stdenv.lib.licenses; [ ncsa mit ];
- maintainers = with stdenv.lib.maintainers; [ vlstill ];
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix
deleted file mode 100644
index 294410f99869a302942ef3032392e48ddb359f69..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/lldb.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv
-, fetch
-, cmake
-, zlib
-, ncurses
-, swig
-, which
-, libedit
-, llvm
-, clang-unwrapped
-, python2
-, version
-}:
-
-stdenv.mkDerivation {
- name = "lldb-${version}";
-
- src = fetch "lldb" "008fdbyza13ym3v0xpans4z4azw4y16hcbgrrnc4rx2mxwaw62ws";
-
- patchPhase = ''
- sed -i 's|/usr/bin/env||' \
- scripts/Python/finish-swig-Python-LLDB.sh \
- scripts/Python/build-swig-Python.sh
- '';
-
- buildInputs = [ cmake python2 which swig ncurses zlib libedit ];
-
- preConfigure = ''
- export CXXFLAGS="-pthread"
- export LDFLAGS="-ldl"
- '';
-
- cmakeFlags = [
- "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
- "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
- "-DPYTHON_VERSION_MAJOR=2"
- "-DPYTHON_VERSION_MINOR=7"
- "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
- ];
-
- enableParallelBuilding = true;
-
- meta = {
- description = "A next-generation high-performance debugger";
- homepage = http://llvm.org/;
- license = stdenv.lib.licenses.ncsa;
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
deleted file mode 100644
index a6fd18f94d68b80d8a3e81a660ee452a845d7566..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ stdenv
-, fetch
-, fetchpatch
-, perl
-, groff
-, cmake
-, python2
-, libffi
-, libbfd
-, libxml2
-, ncurses
-, version
-, zlib
-, compiler-rt_src
-, libcxxabi
-, debugVersion ? false
-, enableSharedLibraries ? !stdenv.isDarwin
-}:
-
-let
- src = fetch "llvm" "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy";
-in stdenv.mkDerivation rec {
- name = "llvm-${version}";
-
- unpackPhase = ''
- unpackFile ${src}
- mv llvm-${version}.src llvm
- sourceRoot=$PWD/llvm
- unpackFile ${compiler-rt_src}
- mv compiler-rt-* $sourceRoot/projects/compiler-rt
- '';
-
- buildInputs = [ perl groff cmake libxml2 python2 libffi ]
- ++ stdenv.lib.optional stdenv.isDarwin libcxxabi;
-
- propagatedBuildInputs = [ ncurses zlib ];
-
- # The goal here is to disable LLVM bindings (currently go and ocaml) regardless
- # of whether the impure CMake search sheananigans find the compilers in global
- # paths. This mostly exists because sandbox builds don't work very well on Darwin
- # and sometimes you get weird behavior if CMake finds go in your system path.
- # This would be far prettier if there were a CMake option to just disable bindings
- # but from what I can tell, there isn't such a thing. The file in question only
- # contains `if(WIN32)` conditions to check whether to disable bindings, so making
- # those always succeed has the net effect of disabling all bindings.
- prePatch = ''
- substituteInPlace cmake/config-ix.cmake --replace "if(WIN32)" "if(1)"
- ''
- + stdenv.lib.optionalString (stdenv ? glibc) ''
- (
- cd projects/compiler-rt
- patch -p1 < ${
- fetchpatch {
- name = "sigaltstack.patch"; # for glibc-2.26
- url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
- sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
- }
- }
- )
- '';
-
- # hacky fix: created binaries need to be run before installation
- preBuild = ''
- mkdir -p $out/
- ln -sv $PWD/lib $out
- '';
-
- patches = stdenv.lib.optionals (!stdenv.isDarwin) [
- # llvm-config --libfiles returns (non-existing) static libs
- ../fix-llvm-config.patch
- ];
-
- cmakeFlags = with stdenv; [
- "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
- "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
- "-DLLVM_BUILD_TESTS=ON"
- "-DLLVM_ENABLE_FFI=ON"
- "-DLLVM_ENABLE_RTTI=ON"
- ] ++ stdenv.lib.optional enableSharedLibraries
- "-DBUILD_SHARED_LIBS=ON"
- ++ stdenv.lib.optional (!isDarwin)
- "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
- ++ stdenv.lib.optionals ( isDarwin) [
- "-DLLVM_ENABLE_LIBCXX=ON"
- "-DCAN_TARGET_i386=false"
- ];
-
- NIX_LDFLAGS = "-lpthread"; # no idea what's the problem
-
- postBuild = ''
- rm -fR $out
- '';
-
- enableParallelBuilding = true;
-
- passthru.src = src;
-
- meta = {
- description = "Collection of modular and reusable compiler and toolchain technologies";
- homepage = http://llvm.org/;
- license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 6c935fd88de550d852d99ae6d7e1f1efad235399..174cb17908ccb6ba03ba852440c672dbdbce77ea 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -22,10 +22,13 @@ assert (stdenv.hostPlatform != stdenv.buildPlatform) -> !enableSharedLibraries;
let
src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
- # Used when creating a version-suffixed symlink of libLLVM.dylib
- shortVersion = with stdenv.lib;
- concatStringsSep "." (take 2 (splitString "." version));
-in stdenv.mkDerivation rec {
+ # Used when creating a versioned symlinks of libLLVM.dylib
+ versionSuffixes = with stdenv.lib;
+ let parts = splitString "." version; in
+ imap (i: _: concatStringsSep "." (take i parts)) parts;
+in
+
+stdenv.mkDerivation {
name = "llvm-${version}";
unpackPhase = ''
@@ -153,8 +156,9 @@ in stdenv.mkDerivation rec {
+ stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${version}.dylib
+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
+ '') versionSuffixes}
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index 21b0c1c3601c1d5e30d276193c00530280cf5a35..cf6de26a9e83f26e9111761dd1ed4b87f99308e2 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
homepage = http://lld.llvm.org/;
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
+ badPlatforms = [ "x86_64-darwin" ];
};
}
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 5cd7901fe22c5753ba8619164064e520229f5835..ecb18a5805408cd5f4fa34fa8cacb0135fdd1acb 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -19,10 +19,13 @@
let
src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
- # Used when creating a version-suffixed symlink of libLLVM.dylib
- shortVersion = with stdenv.lib;
- concatStringsSep "." (take 2 (splitString "." release_version));
-in stdenv.mkDerivation (rec {
+ # Used when creating a versioned symlinks of libLLVM.dylib
+ versionSuffixes = with stdenv.lib;
+ let parts = splitString "." release_version; in
+ imap (i: _: concatStringsSep "." (take i parts)) parts;
+in
+
+stdenv.mkDerivation (rec {
name = "llvm-${version}";
unpackPhase = ''
@@ -136,8 +139,9 @@ in stdenv.mkDerivation (rec {
+ stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
+ '') versionSuffixes}
'';
doCheck = stdenv.isLinux && (!stdenv.isi686);
diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix
index 9a47435cf140dac82d12fc4dadedbe681ccde2e3..bf23f80ef1039bc535302a1123ee91e504ca0ae0 100644
--- a/pkgs/development/compilers/llvm/5/lld.nix
+++ b/pkgs/development/compilers/llvm/5/lld.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
homepage = http://lld.llvm.org/;
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
+ badPlatforms = [ "x86_64-darwin" ];
};
}
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 41dc20ec4fe351a316f7f7056a2fb701f358552c..122576cc726e1e67be84d90773701443b803e62f 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -9,7 +9,6 @@
, version
, release_version
, zlib
-, libcxxabi
, debugVersion ? false
, enableManpages ? false
, enableSharedLibraries ? !enableManpages
@@ -18,10 +17,13 @@
let
src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm";
- # Used when creating a version-suffixed symlink of libLLVM.dylib
- shortVersion = with stdenv.lib;
- concatStringsSep "." (take 2 (splitString "." release_version));
-in stdenv.mkDerivation (rec {
+ # Used when creating a versioned symlinks of libLLVM.dylib
+ versionSuffixes = with stdenv.lib;
+ let parts = splitString "." release_version; in
+ imap (i: _: concatStringsSep "." (take i parts)) parts;
+in
+
+stdenv.mkDerivation (rec {
name = "llvm-${version}";
unpackPhase = ''
@@ -119,8 +121,9 @@ in stdenv.mkDerivation (rec {
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \
--replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib"
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
+ '') versionSuffixes}
'';
doCheck = stdenv.isLinux && (!stdenv.isi686);
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 1d96513a0ece8d160ef1be8ec567ddb5485e585a..9237d442b776cabbdba073d8e823cc3d0e7c7259 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -21,11 +21,13 @@ let
src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn";
- # Used when creating a version-suffixed symlink of libLLVM.dylib
- shortVersion = with stdenv.lib;
- concatStringsSep "." (take 2 (splitString "." release_version));
+ # Used when creating a versioned symlinks of libLLVM.dylib
+ versionSuffixes = with stdenv.lib;
+ let parts = splitString "." release_version; in
+ imap (i: _: concatStringsSep "." (take i parts)) parts;
+in
-in stdenv.mkDerivation (rec {
+stdenv.mkDerivation (rec {
name = "llvm-${version}";
unpackPhase = ''
@@ -133,8 +135,9 @@ in stdenv.mkDerivation (rec {
+ optionalString (stdenv.isDarwin && enableSharedLibraries) ''
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
+ '') versionSuffixes}
'';
doCheck = stdenv.isLinux && (!stdenv.isi686);
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
index e4252647ce6d1d82b12271b070b40275bb210579..a4877b3fe6f58efbb054d39276d970d19db9a038 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -9,7 +9,7 @@ let
name = "clang-${version}";
unpackPhase = ''
- unpackFile ${fetch "cfe" "067lwggnbg0w1dfrps790r5l6k8n5zwhlsw7zb6zvmfpwpfn4nx4"}
+ unpackFile ${fetch "cfe" "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"}
mv cfe-${version}* clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch b/pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch
deleted file mode 100644
index f9323ed95c05cb573cbbec3c0151daf47c35e078..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-commit f00c7bccf7955b7dfbb4859fd9019e9eb3349f2d
-Author: Tobias Mayer
-Date: Wed Feb 13 12:44:17 2019 +0100
-
- Provide clock_gettime for xray on macos < 10.12
-
-diff --git a/lib/xray/xray_basic_logging.cc b/lib/xray/xray_basic_logging.cc
-index a46c151af..38aea6932 100644
---- a/lib/xray/xray_basic_logging.cc
-+++ b/lib/xray/xray_basic_logging.cc
-@@ -36,6 +36,29 @@
- #include "xray_tsc.h"
- #include "xray_utils.h"
-
-+#if __MACH__
-+#include
-+#include
-+enum clockid_t {
-+ CLOCK_MONOTONIC = REALTIME_CLOCK,
-+ CLOCK_REALTIME = REALTIME_CLOCK
-+};
-+
-+int clock_gettime(clockid_t clock_id, struct timespec *ts) {
-+ if (ts != NULL) {
-+ clock_serv_t cclock;
-+ mach_timespec_t mts;
-+ host_get_clock_service(mach_host_self(), clock_id, &cclock);
-+ clock_get_time(cclock, &mts);
-+ mach_port_deallocate(mach_task_self(), cclock);
-+ ts->tv_sec = mts.tv_sec;
-+ ts->tv_nsec = mts.tv_nsec;
-+ return 0;
-+ }
-+ return -1;
-+}
-+#endif
-+
- namespace __xray {
-
- SpinMutex LogMutex;
-diff --git a/lib/xray/xray_fdr_logging.cc b/lib/xray/xray_fdr_logging.cc
-index 4b308b27f..1d044c8fd 100644
---- a/lib/xray/xray_fdr_logging.cc
-+++ b/lib/xray/xray_fdr_logging.cc
-@@ -38,6 +38,29 @@
- #include "xray_tsc.h"
- #include "xray_utils.h"
-
-+#if __MACH__
-+#include
-+#include
-+enum clockid_t {
-+ CLOCK_MONOTONIC = REALTIME_CLOCK,
-+ CLOCK_REALTIME = REALTIME_CLOCK
-+};
-+
-+int clock_gettime(clockid_t clock_id, struct timespec *ts) {
-+ if (ts != NULL) {
-+ clock_serv_t cclock;
-+ mach_timespec_t mts;
-+ host_get_clock_service(mach_host_self(), clock_id, &cclock);
-+ clock_get_time(cclock, &mts);
-+ mach_port_deallocate(mach_task_self(), cclock);
-+ ts->tv_sec = mts.tv_sec;
-+ ts->tv_nsec = mts.tv_nsec;
-+ return 0;
-+ }
-+ return -1;
-+}
-+#endif
-+
- namespace __xray {
-
- atomic_sint32_t LoggingStatus = {XRayLogInitStatus::XRAY_LOG_UNINITIALIZED};
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 7a6c91fb832ba6fb28844f295e6d78fd668cbe44..989529ff8cc8937d372356639e44d4ce86a5df49 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "compiler-rt-${version}";
inherit version;
- src = fetch "compiler-rt" "065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq";
+ src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
- ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
- ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch;
+ ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
+ ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 060bef69bc15bd3e83079209c2726f4587db163e..7f99cc9ae2cdb3f085e7224b1b15b7395de69253 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -5,7 +5,7 @@
}:
let
- release_version = "7.0.1";
+ release_version = "7.1.0";
version = release_version; # differentiating these is important for rc's
fetch = name: sha256: fetchurl {
@@ -13,7 +13,7 @@ let
inherit sha256;
};
- clang-tools-extra_src = fetch "clang-tools-extra" "1v9vc7id1761qm7mywlknsp810232iwyz8rd4y5km4h7pg9cg4sc";
+ clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w";
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index d372984dac7cf775716b800f82a285589752a511..e2ec4e274f4c4e52420d90d2cce610281a86d896 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "libc++-${version}";
- src = fetch "libcxx" "1wdrxg365ig0kngx52pd0n820sncp24blb0zpalc579iidhh4002";
+ src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4";
postUnpack = ''
unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index b65b75b36886fd6dd9fbe9a28a12cb3dc21475b0..2fe6f1c58f660ea78847c73ab3ae332c91599666 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libc++abi-${version}";
- src = fetch "libcxxabi" "1n6yx0949l9bprh75dffchahn8wplkm79ffk4f2ap9vw2lx90s41";
+ src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";
nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix
index 33085eb3c8081626fd540d163215b3ba0d96bbda..63ad43e62cd7f480d60371134326bd845d775514 100644
--- a/pkgs/development/compilers/llvm/7/lld.nix
+++ b/pkgs/development/compilers/llvm/7/lld.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation {
name = "lld-${version}";
- src = fetch "lld" "0ca0qygrk87lhjk6cpv1wbmdfnficqqjsda3k7b013idvnralsc8";
+ src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1";
nativeBuildInputs = [ cmake ];
buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix
index 14cc0514fe6d2e738677890cb7e361cb092aa80d..f58871f1d7cdfaaa05e7f00e6cfb408e4e4fa5bb 100644
--- a/pkgs/development/compilers/llvm/7/lldb.nix
+++ b/pkgs/development/compilers/llvm/7/lldb.nix
@@ -17,7 +17,7 @@
stdenv.mkDerivation {
name = "lldb-${version}";
- src = fetch "lldb" "10k9lyk3i72j9hca523r9pz79qp7d8q7jqnjy0i3saj1bgknpd3n";
+ src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v";
postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place
@@ -27,6 +27,9 @@ stdenv.mkDerivation {
cmake/modules/LLDBStandalone.cmake
sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \
cmake/modules/LLDBStandalone.cmake
+ sed -i -e 's,message(SEND_ERROR "Cannot find debugserver on system."),,' \
+ -e 's,string(STRIP ''${XCODE_DEV_DIR} XCODE_DEV_DIR),,' \
+ tools/debugserver/source/CMakeLists.txt
'';
nativeBuildInputs = [ cmake python which swig ];
@@ -36,8 +39,11 @@ stdenv.mkDerivation {
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ];
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2";
+
cmakeFlags = [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+ "-DSKIP_DEBUGSERVER=ON"
];
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index 34f8a5478d1be85cd69d12c02c913b405e837bc3..dc10de26ba100c77e905c50b248db63fb22784b7 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -15,19 +15,22 @@
, debugVersion ? false
, enableManpages ? false
, enableSharedLibraries ? true
-, enablePFM ? !stdenv.isDarwin
+, enablePFM ? !(stdenv.isDarwin
+ || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
+ )
, enablePolly ? false
}:
let
inherit (stdenv.lib) optional optionals optionalString;
- src = fetch "llvm" "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3";
- polly_src = fetch "polly" "0wgvayfilgb530bq51l7szxfb13l24nnrmyji2f6ncq95a24dw8v";
+ src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v";
+ polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h";
- # Used when creating a version-suffixed symlink of libLLVM.dylib
- shortVersion = with stdenv.lib;
- concatStringsSep "." (take 1 (splitString "." release_version));
+ # Used when creating a versioned symlinks of libLLVM.dylib
+ versionSuffixes = with stdenv.lib;
+ let parts = splitString "." release_version; in
+ imap (i: _: concatStringsSep "." (take i parts)) parts;
in stdenv.mkDerivation (rec {
name = "llvm-${version}";
@@ -53,12 +56,6 @@ in stdenv.mkDerivation (rec {
propagatedBuildInputs = [ ncurses zlib ];
patches = [
- # https://bugs.llvm.org/show_bug.cgi?id=39427
- # https://github.com/NixOS/nixpkgs/issues/54370
- (fetchpatch {
- url = "https://github.com/llvm-mirror/llvm/commit/57567def148f387153a8149fb590bd39b1b006a1.patch";
- sha256 = "1w1xg5pxpc6cals1nf5j5k4p6qi8lcrpvn0paxc86m415i79xmcg";
- })
# backport, fix building rust crates with lto
(fetchpatch {
url = "https://github.com/llvm-mirror/llvm/commit/da1fb72bb305d6bc1f3899d541414146934bf80f.patch";
@@ -89,6 +86,14 @@ in stdenv.mkDerivation (rec {
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+ '' + optionalString stdenv.hostPlatform.isAarch32 ''
+ # skip failing X86 test cases on armv7l
+ rm test/DebugInfo/X86/debug_addr.ll
+ rm test/tools/llvm-dwarfdump/X86/debug_addr.s
+ rm test/tools/llvm-dwarfdump/X86/debug_addr_address_size_mismatch.s
+ rm test/tools/llvm-dwarfdump/X86/debug_addr_dwarf4.s
+ rm test/tools/llvm-dwarfdump/X86/debug_addr_unsupported_version.s
+ rm test/tools/llvm-dwarfdump/X86/debug_addr_version_mismatch.s
'' + ''
patchShebangs test/BugPoint/compile-custom.ll.py
'';
@@ -148,8 +153,9 @@ in stdenv.mkDerivation (rec {
+ optionalString (stdenv.isDarwin && enableSharedLibraries) ''
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
- ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
+ '') versionSuffixes}
'';
doCheck = stdenv.isLinux && (!stdenv.isx86_32);
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix
index fb856eaa51fd196f31de191a5b8c0256c19fa4ef..e55f4aa5ba138d2c57f7a223cfbe319708ce9974 100644
--- a/pkgs/development/compilers/llvm/7/openmp.nix
+++ b/pkgs/development/compilers/llvm/7/openmp.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation {
name = "openmp-${version}";
- src = fetch "openmp" "030dkg5cypd7j9hq0mcqb5gs31lxwmzfq52j81l7v9ldcy5bf5mz";
+ src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy";
nativeBuildInputs = [ cmake perl ];
buildInputs = [ llvm ];
diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix
index 8709e47dd3aa65bbfba05443b0ba8c1812e9351a..5a8b8922eb064cf6f05278b8d1edccc62ccf5acf 100644
--- a/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/8/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, fetchpatch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
, fixDarwinDylibNames
, enableManpages ? false
, enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -42,7 +42,7 @@ let
# Backport for -static-pie, which the latter touches, and which is nice in
# its own right.
./static-pie.patch
- # Backport for the `--unwindlib=[libgcc|complier-rt]` flag, which is
+ # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is
# needed for our bootstrapping to not interfere with C.
./unwindlib.patch
];
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt-clock_gettime.patch b/pkgs/development/compilers/llvm/8/compiler-rt-clock_gettime.patch
deleted file mode 100644
index f9323ed95c05cb573cbbec3c0151daf47c35e078..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/llvm/8/compiler-rt-clock_gettime.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-commit f00c7bccf7955b7dfbb4859fd9019e9eb3349f2d
-Author: Tobias Mayer
-Date: Wed Feb 13 12:44:17 2019 +0100
-
- Provide clock_gettime for xray on macos < 10.12
-
-diff --git a/lib/xray/xray_basic_logging.cc b/lib/xray/xray_basic_logging.cc
-index a46c151af..38aea6932 100644
---- a/lib/xray/xray_basic_logging.cc
-+++ b/lib/xray/xray_basic_logging.cc
-@@ -36,6 +36,29 @@
- #include "xray_tsc.h"
- #include "xray_utils.h"
-
-+#if __MACH__
-+#include
-+#include
-+enum clockid_t {
-+ CLOCK_MONOTONIC = REALTIME_CLOCK,
-+ CLOCK_REALTIME = REALTIME_CLOCK
-+};
-+
-+int clock_gettime(clockid_t clock_id, struct timespec *ts) {
-+ if (ts != NULL) {
-+ clock_serv_t cclock;
-+ mach_timespec_t mts;
-+ host_get_clock_service(mach_host_self(), clock_id, &cclock);
-+ clock_get_time(cclock, &mts);
-+ mach_port_deallocate(mach_task_self(), cclock);
-+ ts->tv_sec = mts.tv_sec;
-+ ts->tv_nsec = mts.tv_nsec;
-+ return 0;
-+ }
-+ return -1;
-+}
-+#endif
-+
- namespace __xray {
-
- SpinMutex LogMutex;
-diff --git a/lib/xray/xray_fdr_logging.cc b/lib/xray/xray_fdr_logging.cc
-index 4b308b27f..1d044c8fd 100644
---- a/lib/xray/xray_fdr_logging.cc
-+++ b/lib/xray/xray_fdr_logging.cc
-@@ -38,6 +38,29 @@
- #include "xray_tsc.h"
- #include "xray_utils.h"
-
-+#if __MACH__
-+#include
-+#include
-+enum clockid_t {
-+ CLOCK_MONOTONIC = REALTIME_CLOCK,
-+ CLOCK_REALTIME = REALTIME_CLOCK
-+};
-+
-+int clock_gettime(clockid_t clock_id, struct timespec *ts) {
-+ if (ts != NULL) {
-+ clock_serv_t cclock;
-+ mach_timespec_t mts;
-+ host_get_clock_service(mach_host_self(), clock_id, &cclock);
-+ clock_get_time(cclock, &mts);
-+ mach_port_deallocate(mach_task_self(), cclock);
-+ ts->tv_sec = mts.tv_sec;
-+ ts->tv_nsec = mts.tv_nsec;
-+ return 0;
-+ }
-+ return -1;
-+}
-+#endif
-+
- namespace __xray {
-
- atomic_sint32_t LoggingStatus = {XRayLogInitStatus::XRAY_LOG_UNINITIALIZED};
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 2b591cc94affe73b49e306474524dfb1c21a7520..a8bbb1f719bf3320fe76ac4cd50f8d0ac2736584 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
- ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch;
+ ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix
index a187d0adc9947009241e84f7b82f000a2c704216..a4ceb9102ef8370591c8da7a0a03fcf17b4ee809 100644
--- a/pkgs/development/compilers/llvm/8/libunwind.nix
+++ b/pkgs/development/compilers/llvm/8/libunwind.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, libcxx, fetchpatch }:
+{ stdenv, version, fetch, cmake, fetchpatch }:
stdenv.mkDerivation {
name = "libunwind-${version}";
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix
index 5d8d0816729818719f7db5931d5dfc0b200eb0ae..18013a9cfad5a6674de2e49113468c7679d1fe46 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/pkgs/development/compilers/llvm/8/llvm.nix
@@ -1,6 +1,5 @@
{ stdenv
, fetch
-, fetchpatch
, cmake
, python
, libffi
@@ -15,7 +14,9 @@
, debugVersion ? false
, enableManpages ? false
, enableSharedLibraries ? true
-, enablePFM ? !stdenv.isDarwin
+, enablePFM ? !(stdenv.isDarwin
+ || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
+)
, enablePolly ? false
}:
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index 8ec249ed360a7a9d9ae47a6ca8537dd6d4b67248..72626ec0014baa648a26634f3f3b6c6f3917b1e0 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -2,13 +2,13 @@
with stdenv.lib; stdenv.mkDerivation rec {
name = "mkcl-${version}";
- version = "1.1.10.2017-11-14";
+ version = "1.1.11";
src = fetchFromGitHub {
owner = "jcbeaudoin";
repo = "mkcl";
- rev = "d3f5afe945907153db2be5a17a419966f83d7653";
- sha256 = "1jfmnh96b5dy1874a9y843vihd14ya4by46rb4h5izldp6x3j3kl";
+ rev = "v${version}";
+ sha256 = "0i2bfkda20lfypis6i4m7srfz6miyf66d8knp693d6sms73m2l26";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch b/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch
deleted file mode 100644
index 779391fc62a9ecb92b08188aca49c2c1ae651c4b..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f3db284516105fd30b5513a5528104574a7b8545 Mon Sep 17 00:00:00 2001
-From: Samuel Dionne-Riel
-Date: Thu, 9 Aug 2018 19:07:45 -0400
-Subject: [PATCH] Disables `IO#isatty` test for sandboxed builds.
-
----
- mrbgems/mruby-io/test/io.rb | 13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb
-index e06b1499..e8a54736 100644
---- a/mrbgems/mruby-io/test/io.rb
-+++ b/mrbgems/mruby-io/test/io.rb
-@@ -342,19 +342,6 @@ assert('IO#_read_buf') do
- io.closed?
- end
-
--assert('IO#isatty') do
-- skip "isatty is not supported on this platform" if MRubyIOTestUtil.win?
-- f1 = File.open("/dev/tty")
-- f2 = File.open($mrbtest_io_rfname)
--
-- assert_true f1.isatty
-- assert_false f2.isatty
--
-- f1.close
-- f2.close
-- true
--end
--
- assert('IO#pos=, IO#seek') do
- fd = IO.sysopen $mrbtest_io_rfname
- io = IO.new fd
---
-2.16.4
-
diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix
index cfc1f00a80360f71672e408f3c0d2deb1a9e8d0f..03f3d56fd93d6c4d8f08aa7e494fde4548b3a3fe 100644
--- a/pkgs/development/compilers/mruby/default.nix
+++ b/pkgs/development/compilers/mruby/default.nix
@@ -1,20 +1,16 @@
{ stdenv, ruby, bison, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "mruby-${version}";
- version = "2.0.0";
+ pname = "mruby";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "mruby";
repo = "mruby";
rev = version;
- sha256 = "1r6w1asjshff43ymdwa6xmrkggza99mi2kw88k7ic6ag2j81hcj5";
+ sha256 = "1zm2d5kj9fnfx8ifj8ysrrr838ipwmvz35byzjhprakrg64911p9";
};
- patches = [
- ./0001-Disables-IO-isatty-test-for-sandboxed-builds.patch
- ];
-
nativeBuildInputs = [ ruby bison ];
# Necessary so it uses `gcc` instead of `ld` for linking.
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 0d319d235fd3a7740b2f3517e59e0c30d8d966de..77d8710cdf938c477e95b8ba4f023215a3bfe8c4 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,14 +1,15 @@
# based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
-{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-10_x, openssl, pcre, readline, boehmgc, sfml, tzdata, coreutils }:
+{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-11_x, openssl, pcre, readline,
+ boehmgc, sfml, tzdata, coreutils, sqlite }:
stdenv.mkDerivation rec {
name = "nim-${version}";
- version = "0.19.4";
+ version = "0.20.0";
src = fetchurl {
url = "https://nim-lang.org/download/${name}.tar.xz";
- sha256 = "0k59dhfsg5wnkc3nxg5a336pjd9jnfxabns63bl9n28iwdg16hgl";
+ sha256 = "144sd7icg2p6qsrr29jdnl11hr34daxq4h16ywwrayz866w7kx2i";
};
doCheck = !stdenv.isDarwin;
@@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
"-lpcre"
"-lreadline"
"-lgc"
+ "-lsqlite3"
];
# 1. nodejs is only needed for tests
@@ -27,19 +29,21 @@ stdenv.mkDerivation rec {
# used for bootstrapping, but koch insists on moving the nim compiler around
# as part of building it, so it cannot be read-only
+ checkInputs = [
+ nodejs-slim-11_x tzdata coreutils
+ ];
+
nativeBuildInputs = [
- makeWrapper nodejs-slim-10_x tzdata coreutils
+ makeWrapper
];
buildInputs = [
- openssl pcre readline boehmgc sfml
+ openssl pcre readline boehmgc sfml sqlite
];
- phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "checkPhase" ];
-
buildPhase = ''
- # use $CC to trigger the linker since calling ld in build.sh causes an error
- LD=$CC
+ runHook preBuild
+
# build.sh wants to write to $HOME/.cache
HOME=$TMPDIR
sh build.sh
@@ -48,36 +52,55 @@ stdenv.mkDerivation rec {
-d:useGnuReadline \
${lib.optionals (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"}
./koch tools -d:release
- '';
- installPhase = ''
- install -Dt $out/bin bin/* koch
- ./koch install $out
- mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin
- mv $out/nim/* $out/ && rmdir $out/nim
- wrapProgram $out/bin/nim \
- --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
+ runHook postBuild
'';
- patchPhase =
+ prePatch =
let disableTest = ''sed -i '1i discard \"\"\"\n disabled: true\n\"\"\"\n\n' '';
disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' '';
disableCompile = ''sed -i -e 's/^/#/' '';
in ''
- substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep"
substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
- # disable tests requiring network access (not available in the build container)
+ # reported upstream: https://github.com/nim-lang/Nim/issues/11435
+ ${disableTest} ./tests/misc/tstrace.nim
+
+ # runs out of memory on a machine with 8GB RAM
+ ${disableTest} ./tests/system/t7894.nim
+
+ # requires network access (not available in the build container)
${disableTest} ./tests/stdlib/thttpclient.nim
'' + lib.optionalString stdenv.isAarch64 ''
- # disable test supposedly broken on aarch64
+ # supposedly broken on aarch64
${disableStdLibTest} ./lib/pure/stats.nim
+
+ # reported upstream: https://github.com/nim-lang/Nim/issues/11463
+ ${disableCompile} ./lib/nimhcr.nim
+ ${disableTest} ./tests/dll/nimhcr_unit.nim
+ ${disableTest} ./tests/dll/nimhcr_integration.nim
'';
checkPhase = ''
- PATH=$PATH:$out/bin
- ./koch tests
+ runHook preCheck
+
+ ./koch tests --nim:bin/nim all
+
+ runHook postCheck
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dt $out/bin bin/* koch
+ ./koch install $out
+ mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin
+ mv $out/nim/* $out/ && rmdir $out/nim
+ wrapProgram $out/bin/nim \
+ --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
+
+ runHook postInstall
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index b6e2aea7eca583d4f48c1801fe056088d1b31acf..6bd4af05da36b86e04cd0ec58cfc284cf747a297 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = http://developer.nvidia.com/cg-toolkit;
+ homepage = https://developer.nvidia.com/cg-toolkit;
license = lib.licenses.unfreeRedistributable;
};
}
diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix
index 53d4ceef92a794d6badfcfe06e65500781eeb26f..4f9b8ebd294cf224a1694cb0f57e1653a06da490 100644
--- a/pkgs/development/compilers/ocaml/4.08.nix
+++ b/pkgs/development/compilers/ocaml/4.08.nix
@@ -1,8 +1,8 @@
import ./generic.nix {
major_version = "4";
minor_version = "08";
- patch_version = "0+beta3";
- sha256 = "02pk4bxrgqb12hvpbxyqnl4nwr4g2h96wsfzfd1k8vj8h0jmxzc4";
+ patch_version = "0";
+ sha256 = "0si976y8snbmhm96671di65z0rrdyldxd55wjxn2mkn6654nryna";
# If the executable is stripped it does not work
dontStrip = true;
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 5840061ed53e5f62c89957d630837eb1afac4519..3f593dbcd6d66f38997fc75fb510d5528f6754a1 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -1,9 +1,10 @@
{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype
-, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir
+, alsaLib, bootjdk, perl, fontconfig, zlib, lndir
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
, libjpeg, giflib
, setJavaClassPath
, minimal ? false
+, enableJavaFX ? true, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:
@@ -68,6 +69,7 @@ let
''
+ lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""
+ lib.optionalString minimal " \"--enable-headless-only\""
+ + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\""
+ ");"
# https://bugzilla.redhat.com/show_bug.cgi?id=1306558
# https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4ee007281e29f22f3ec877e8248c18979f1b65fd
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -0,0 +1,110 @@
+{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf
+, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }:
+
+let
+ major = "11";
+ update = ".0.3";
+ build = "1";
+ repover = "${major}${update}+${build}";
+ gradle_ = (gradleGen.override {
+ jdk = bootjdk;
+ }).gradle_4_10;
+
+ makePackage = args: stdenv.mkDerivation ({
+ version = "${major}${update}-${repover}";
+
+ src = fetchurl {
+ url = "http://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";
+ sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194";
+ };
+
+ buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
+ nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
+
+ dontUseCmakeConfigure = true;
+
+ config = writeText "gradle.properties" (''
+ CONF = Release
+ JDK_HOME = ${bootjdk}/lib/openjdk
+ '' + args.gradleProperties or "");
+
+ buildPhase = ''
+ runHook preBuild
+
+ export GRADLE_USER_HOME=$(mktemp -d)
+ ln -s $config gradle.properties
+ export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
+ gradle --no-daemon $gradleFlags sdk
+
+ runHook postBuild
+ '';
+ } // args);
+
+ # Fake build to pre-download deps into fixed-output derivation.
+ # We run nearly full build because I see no other way to download everything that's needed.
+ # Anyone who knows a better way?
+ deps = makePackage {
+ pname = "openjfx-deps";
+
+ # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
+ installPhase = ''
+ find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \
+ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+ | sh
+ rm -rf $out/tmp
+ '';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash =
+ # Downloaded AWT jars differ by platform.
+ if stdenv.system == "x86_64-linux" then "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"
+ else if stdenv.system == "i686-linux" then "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"
+ else throw "Unsupported platform";
+ };
+
+in makePackage {
+ pname = "openjfx-modular-sdk";
+
+ gradleProperties = ''
+ COMPILE_MEDIA = true
+ COMPILE_WEBKIT = true
+ '';
+
+ preBuild = ''
+ swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
+ substituteInPlace build.gradle \
+ --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \
+ --replace 'name: SWT_FILE_NAME' "files('$swtJar')"
+ '';
+
+ installPhase = ''
+ cp -r build/modular-sdk $out
+ '';
+
+ stripDebugList = [ "." ];
+
+ postFixup = ''
+ # Remove references to bootstrap.
+ find "$out" -name \*.so | while read lib; do
+ new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')"
+ patchelf --set-rpath "$new_refs" "$lib"
+ done
+
+ # Test to make sure that we don't depend on the bootstrap
+ if grep -q -r '${bootjdk}' "$out"; then
+ echo "Extraneous references to ${bootjdk} detected" >&2
+ exit 1
+ fi
+ '';
+
+ passthru.deps = deps;
+
+ meta = with stdenv.lib; {
+ homepage = http://openjdk.java.net/projects/openjfx/;
+ license = openjdk.meta.license;
+ description = "The next-generation Java client toolkit.";
+ maintainers = with maintainers; [ abbradar ];
+ platforms = openjdk.meta.platforms;
+ };
+}
diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix
index 71bda3e03d96db9be38bd1e0fd9f5c6359a9a1ec..690707265b4af3e1e18ebafc24b678605f20155e 100644
--- a/pkgs/development/compilers/openspin/default.nix
+++ b/pkgs/development/compilers/openspin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "openspin-${version}";
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 1a81a5ec20a786142267ce09dcfd7141f52cd869..4540a3016106df9421f81dfb8549537a935fe9ce 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "orc-0.4.28";
+ name = "orc-0.4.29";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
- sha256 = "bfcd7c6563b05672386c4eedfc4c0d4a0a12b4b4775b74ec6deb88fc2bcd83ce";
+ sha256 = "1cisbbn69p9c8vikn0nin14q0zscby5m8cyvzxyw2pjb2kwh32ag";
};
outputs = [ "out" "dev" ];
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc
'';
- # https://bugzilla.gnome.org/show_bug.cgi?id=728129#c15
- doCheck = stdenv.hostPlatform.system != "i686-linux"; # not sure about cross-compiling
+ # i686 https://gitlab.freedesktop.org/gstreamer/orc/issues/18
+ # armv7l https://gitlab.freedesktop.org/gstreamer/orc/issues/9
+ doCheck = (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32);
meta = with stdenv.lib; {
description = "The Oil Runtime Compiler";
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index a498eafd4254de5cabb1ed601bb04d0480b238ab..ff4e387f07e7d9a8d91d3028ac6cc79fbefac3b7 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}";
- version = "1.10.4";
+ version = "1.10.5";
src = fetchFromGitHub {
owner = "imageworks";
repo = "OpenShadingLanguage";
- rev = "Release-1.10.4";
- sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g";
+ rev = "Release-1.10.5";
+ sha256 = "1g7izkjqb5xmp87k2aw0fgkxhcf7b9jn9hi60lwav3yhs50j8qsi";
};
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 749fbcc2fafb9283f6ae1644886286828662f915..e16e2c514a855b65e7605261e068715223498a46 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
pname = "ponyc";
- version = "0.28.0";
+ version = "0.28.1";
src = fetchFromGitHub {
owner = "ponylang";
repo = pname;
rev = version;
- sha256 = "011qxhiq75j6d37ws4nb6a8bdfw2cvlcsb2fgdkn1hx2xb81h6wc";
+ sha256 = "1yi41a03039yz9rf34l9iq8haf5vb6gwzplr04rahfhd8xsd38gq";
};
buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 67818bfa1dc99c409dd1886cc2c051092cd1ec89..d25cd9fee770bf0b4df46bcfd1a4d6e725438700 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, gmp, ncurses5, lib }:
+{ stdenv, pkgs, fetchurl, zlib, gmp, ncurses5, lib }:
# from justinwoo/easy-purescript-nix
# https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix
@@ -18,19 +18,19 @@ let
in stdenv.mkDerivation rec {
pname = "purescript";
- version = "0.12.5";
+ version = "0.13.0";
src =
if stdenv.isDarwin
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
- sha256 = "15j9lkrl15dicx37bmh0199b3qdixig7w24wvdzi20jqbacz8nkn";
+ sha256 = "0xpisy38gj6fgyyzm6fdl0v819dhjmil4634xxangvhvs7jf5il0";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
- sha256 = "07dva5gxq77g787krscv4dsz5088fzkvpmm9fwxw9a59jszzs7kq";
+ sha256 = "06g5q69yv6c3alq9vr8zjqqzamlii7xf6vj9j52akjq5lww214ba";
};
@@ -50,6 +50,11 @@ in stdenv.mkDerivation rec {
mkdir -p $out/etc/bash_completion.d/
$PURS --bash-completion-script $PURS > $out/etc/bash_completion.d/purs-completion.bash
'';
+
+ passthru.tests = {
+ minimal-module = pkgs.callPackage ./test-minimal-module {};
+ };
+
meta = with stdenv.lib; {
description = "A strongly-typed functional programming language that compiles to JavaScript";
homepage = http://www.purescript.org/;
diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js
new file mode 100644
index 0000000000000000000000000000000000000000..a3547e206b7c52713ba3787daab96aa416a69740
--- /dev/null
+++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js
@@ -0,0 +1,8 @@
+"use strict"
+
+exports.log = function (s) {
+ return function () {
+ console.log(s);
+ return {};
+ };
+};
diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs
new file mode 100644
index 0000000000000000000000000000000000000000..8bf5a23f3469e0b7ba75aa5d6d48cdab9442c52b
--- /dev/null
+++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs
@@ -0,0 +1,9 @@
+module Main where
+
+foreign import data Effect :: Type -> Type
+data Unit = Unit
+
+foreign import log :: String -> Effect Unit
+
+main :: Effect Unit
+main = log "hello world"
diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5f01298960cd19a734625e929698d878d2b0a942
--- /dev/null
+++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix
@@ -0,0 +1,11 @@
+{ runCommand, purescript, nodejs }:
+
+runCommand "purescript-test-minimal-module" {} ''
+ ${purescript}/bin/purs compile -o ./output ${./.}/Main.purs
+
+ echo 'require("./output/Main/index.js").main()' > node.js
+
+ ${nodejs}/bin/node node.js | grep "hello world" || echo "did not output hello world"
+
+ touch $out
+''
diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d7315b73c9b50325039765beb4cceec727dd2cf6
--- /dev/null
+++ b/pkgs/development/compilers/qbe/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+ pname = "qbe";
+ version = "unstable-2019-05-15";
+
+ src = fetchgit {
+ url = "git://c9x.me/qbe.git";
+ rev = "acc3af47330fd6610cf0fbdb28e9fbd05160888f";
+ sha256 = "1c8ynqbakgz3hfdcyhwdmz7i1hnyd9m25f9y47sc21bvxwfrbzpi";
+ };
+
+ makeFlags = [ "PREFIX=$(out)" ];
+ meta = with stdenv.lib; {
+ homepage = "https://c9x.me/compile/";
+ description = "A small compiler backend written in C";
+ maintainers = with maintainers; [ fgaz ];
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index f883500eeb9f2733f6305a468d3e9b8055feb7eb..eee4507d6cecca829d1de37975be8369707a3278 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -1,21 +1,35 @@
-{stdenv, fetchFromGitHub, yacc}:
+{stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}:
+
+# TODO: byacc is the recommended parser generator but due to https://github.com/rednex/rgbds/issues/333
+# it does not work for the moment. We should switch back to byacc as soon as the fix is integrated
+# in a published version.
stdenv.mkDerivation rec {
name = "rgbds-${version}";
- version = "0.2.4";
+ version = "0.3.8";
src = fetchFromGitHub {
- owner = "bentley";
+ owner = "rednex";
repo = "rgbds";
rev = "v${version}";
- sha256 = "0dwq0p9g1lci8sm12a2rfk0g33z2vr75x78zdf1g84djwbz8ipc6";
+ sha256 = "0db37z886026svhj6qnc3wk56sndbnz1vi41gn2k3bl6ppbnjlpk";
};
- nativeBuildInputs = [ yacc ];
+ nativeBuildInputs = [ bison flex pkg-config libpng ];
installFlags = "PREFIX=\${out}";
meta = with stdenv.lib; {
- homepage = https://www.anjbe.name/rgbds/;
- description = "An assembler/linker package that produces Game Boy programs";
- license = licenses.free;
+ homepage = https://rednex.github.io/rgbds/;
+ description = "A free assembler/linker package for the Game Boy and Game Boy Color";
+ license = licenses.mit;
+ longDescription =
+ ''RGBDS (Rednex Game Boy Development System) is a free assembler/linker package for the Game Boy and Game Boy Color. It consists of:
+
+ - rgbasm (assembler)
+ - rgblink (linker)
+ - rgbfix (checksum/header fixer)
+ - rgbgfx (PNGâ€toâ€Game Boy graphics converter)
+
+ This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools.
+ '';
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.all;
};
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
index 77dba7f9e620e0234213ec0ce95b6e77457eff9b..cb2fba96e181e11c2937c835079248cd0e41432a 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -31,7 +31,8 @@ rec {
license = [ licenses.mit licenses.asl20 ];
};
- buildInputs = [ bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;
+ buildInputs = [ bash ]
+ ++ stdenv.lib.optional stdenv.isDarwin Security;
postPatch = ''
patchShebangs .
@@ -53,17 +54,6 @@ rec {
"$out/bin/cargo"
''}
- ${optionalString (stdenv.isDarwin && bootstrapping) ''
- install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustc"
- install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc"
- install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
- install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
- install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
- for f in $out/lib/lib*.dylib; do
- install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f"
- done
- ''}
-
# Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
# (or similar) here. It causes strange effects where rustc loads
# the wrong libraries in a bootstrap-build causing failures that
@@ -85,7 +75,8 @@ rec {
license = [ licenses.mit licenses.asl20 ];
};
- buildInputs = [ makeWrapper bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;
+ buildInputs = [ makeWrapper bash ]
+ ++ stdenv.lib.optional stdenv.isDarwin Security;
postPatch = ''
patchShebangs .
@@ -102,12 +93,6 @@ rec {
"$out/bin/cargo"
''}
- ${optionalString (stdenv.isDarwin && bootstrapping) ''
- install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
- install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
- install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
- ''}
-
wrapProgram "$out/bin/cargo" \
--suffix PATH : "${rustc}/bin"
'';
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index b3446436179dd086eab1393e34ce4dcf8de8708a..5eccc92a0c7dbb53ca632f7a3b4caca00c56c326 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
- version = "1.33.0";
+ version = "1.34.2";
- # fetch hashes by running `print-hashes.sh 1.33.0`
+ # fetch hashes by running `print-hashes.sh 1.34.2`
hashes = {
- i686-unknown-linux-gnu = "c379203687d98e60623aa88c4df4992dd5a9548bc30674b9fc8e671a979e9f3a";
- x86_64-unknown-linux-gnu = "6623168b9ee9de79deb0d9274c577d741ea92003768660aca184e04fe774393f";
- armv7-unknown-linux-gnueabihf = "f6f0ec0a98d922c4bfd79703bc9e9eef439ba347453f33608a87cd63c47e7245";
- aarch64-unknown-linux-gnu = "a308044e4076b62f637313ea803fa0a8f340b0f1b53136856f2c43afcabe5387";
- i686-apple-darwin = "ed20809d56bbaea041721ce6fc9f10f7ae7a720c5821587f01a537d07a5454b1";
- x86_64-apple-darwin = "864e7c074a0b88e38883c87c169513d072300bb52e1d320a067bd34cf14f66bd";
+ i686-unknown-linux-gnu = "926bafd09eb90ba7d5a0195fcffb8f33dd57e515af4f8987a143459f6b1d3f04";
+ x86_64-unknown-linux-gnu = "2bf6622d980a52832bae141304e96f317c8a1ccd2dfd69a134a14033e6e43c0f";
+ armv7-unknown-linux-gnueabihf = "70d1057fcc133dc3e44377060a00d2f9d3a134e2670963d3f1d93f3dbfa0548e";
+ aarch64-unknown-linux-gnu = "15fc6b7ec121df9d4e42483dd12c677203680bec8c69b6f4f62e5a35a07341a8";
+ i686-apple-darwin = "b9fc44cbb06050975664f1033d1337bb38d5ea73b503a5d3af5409033397be5c";
+ x86_64-apple-darwin = "6fdd4bf7fe26dded0cd57b41ab5f0500a5a99b7bc770523a425e9e34f63d0fd8";
};
platform =
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 47df7e716dc114a93870ce6d496c6633bd2a5395..0e3de0c4ab9845c9c422f5129e15be3d841c775d 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, lib, overrideCC
+{ stdenv, lib
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
+, llvmPackages_5
+, pkgsBuildTarget, pkgsBuildBuild
}: rec {
makeRustPlatform = { rustc, cargo, ... }: {
rust = {
@@ -48,10 +50,15 @@
buildRustPackages = buildPackages.rust.packages.stable;
# Analogous to stdenv
rustPlatform = makeRustPlatform self.buildRustPackages;
- rustc = self.callPackage ./rustc.nix {
+ rustc = self.callPackage ./rustc.nix ({
# Use boot package set to break cycle
rustPlatform = bootRustPlatform;
- };
+ } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
+ stdenv = llvmPackages_5.stdenv;
+ pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages_5.stdenv; };
+ pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages_5.stdenv; };
+ pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages_5.stdenv; };
+ });
cargo = self.callPackage ./cargo.nix {
# Use boot package set to break cycle
rustPlatform = bootRustPlatform;
diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
index 1bb9a98f7b6d308a8962f9a18e4605df46172da5..57abb3117ec12592ae34bac61471cdf64d5a0d80 100644
--- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
+++ b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
@@ -1,8 +1,7 @@
-diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
-index 86ecb10edf..626be0a52d 100644
---- a/src/libstd/net/tcp.rs
-+++ b/src/libstd/net/tcp.rs
-@@ -955,6 +955,7 @@ mod tests {
+diff -ru -x '*~' rustc-1.35.0-src-orig/src/libstd/net/tcp.rs rustc-1.35.0-src/src/libstd/net/tcp.rs
+--- rustc-1.35.0-src-orig/src/libstd/net/tcp.rs 2019-05-20 14:10:15.000000000 +0200
++++ rustc-1.35.0-src/src/libstd/net/tcp.rs 2019-06-13 19:59:46.740611889 +0200
+@@ -973,6 +973,7 @@
}
}
@@ -10,7 +9,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn listen_localhost() {
let socket_addr = next_test_ip4();
-@@ -1013,6 +1014,7 @@ mod tests {
+@@ -1031,6 +1032,7 @@
})
}
@@ -18,7 +17,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn read_eof() {
each_ip(&mut |addr| {
-@@ -1032,6 +1034,7 @@ mod tests {
+@@ -1050,6 +1052,7 @@
})
}
@@ -26,7 +25,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn write_close() {
each_ip(&mut |addr| {
-@@ -1058,6 +1061,7 @@ mod tests {
+@@ -1076,6 +1079,7 @@
})
}
@@ -34,7 +33,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn multiple_connect_serial() {
each_ip(&mut |addr| {
-@@ -1080,6 +1084,7 @@ mod tests {
+@@ -1098,6 +1102,7 @@
})
}
@@ -42,7 +41,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn multiple_connect_interleaved_greedy_schedule() {
const MAX: usize = 10;
-@@ -1116,6 +1121,7 @@ mod tests {
+@@ -1134,6 +1139,7 @@
}
#[test]
@@ -50,7 +49,7 @@ index 86ecb10edf..626be0a52d 100644
fn multiple_connect_interleaved_lazy_schedule() {
const MAX: usize = 10;
each_ip(&mut |addr| {
-@@ -1394,6 +1400,7 @@ mod tests {
+@@ -1467,6 +1473,7 @@
}
#[test]
@@ -58,7 +57,7 @@ index 86ecb10edf..626be0a52d 100644
fn clone_while_reading() {
each_ip(&mut |addr| {
let accept = t!(TcpListener::bind(&addr));
-@@ -1504,7 +1511,10 @@ mod tests {
+@@ -1597,7 +1604,10 @@
// FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
// no longer has rounding errors.
@@ -67,30 +66,30 @@ index 86ecb10edf..626be0a52d 100644
+ target_os = "netbsd",
+ target_os = "openbsd",
+ target_os = "macos"), ignore)]
+ #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
#[test]
fn timeouts() {
- let addr = next_test_ip4();
-@@ -1591,6 +1601,7 @@ mod tests {
+@@ -1643,6 +1653,7 @@
drop(listener);
}
+ #[cfg_attr(target_os = "macos", ignore)]
#[test]
- fn nodelay() {
- let addr = next_test_ip4();
-@@ -1605,6 +1616,7 @@ mod tests {
- assert_eq!(false, t!(stream.nodelay()));
+ #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
+ fn test_read_with_timeout() {
+@@ -1687,6 +1698,7 @@
+ drop(listener);
}
+ #[cfg_attr(target_os = "macos", ignore)]
#[test]
- fn ttl() {
- let ttl = 100;
-@@ -1642,6 +1654,7 @@ mod tests {
- }
+ #[cfg_attr(target_env = "sgx", ignore)]
+ fn nodelay() {
+@@ -1719,6 +1731,7 @@
+ assert_eq!(ttl, t!(stream.ttl()));
}
+ #[cfg_attr(target_os = "macos", ignore)]
#[test]
- fn peek() {
- each_ip(&mut |addr| {
+ #[cfg_attr(target_env = "sgx", ignore)]
+ fn set_nonblocking() {
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 9b9800431005008dd20154e03ded31c0fe3de0d8..099e41805aba03fe0c3be6af4ac064c6e70742c5 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,6 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
-, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
-, llvm_7, ncurses, darwin, git, cmake, curl, rustPlatform
+, fetchurl, file, python2, tzdata, ps
+, llvm_7, darwin, git, cmake, rustPlatform
, which, libffi, gdb
, withBundledLLVM ? false
}:
@@ -17,11 +17,11 @@ let
llvmShared = llvm_7.override { enableSharedLibraries = true; };
in stdenv.mkDerivation rec {
pname = "rustc";
- version = "1.34.0";
+ version = "1.35.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
- sha256 = "0n8z1wngkxab1rvixqg6w8b727hzpnm9wp9h8iy3mpbrzp7mmj3s";
+ sha256 = "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas";
};
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 469d7847409fe6f47d19d53aba0219a53ae583d1..e2cc7adc26e1e5259385cb4fd8e29f2af9a6c35c 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
- version = "1.5.1";
+ version = "1.5.3";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
- sha256 = "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph";
+ sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj";
};
buildInputs = [texinfo];
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/2.12.nix
similarity index 100%
rename from pkgs/development/compilers/scala/default.nix
rename to pkgs/development/compilers/scala/2.12.nix
diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ab27d93a7cf90b54197ad77d672e4bc3073e4adc
--- /dev/null
+++ b/pkgs/development/compilers/scala/2.13.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
+
+stdenv.mkDerivation rec {
+ name = "scala-2.13.0";
+
+ src = fetchurl {
+ url = "https://www.scala-lang.org/files/archive/${name}.tgz";
+ sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p";
+ };
+
+ propagatedBuildInputs = [ jre ] ;
+ buildInputs = [ makeWrapper ] ;
+
+ installPhase = ''
+ mkdir -p $out
+ rm "bin/"*.bat
+ mv * $out
+
+ # put docs in correct subdirectory
+ mkdir -p $out/share/doc
+ mv $out/doc $out/share/doc/scala
+
+ for p in $(ls $out/bin/) ; do
+ wrapProgram $out/bin/$p \
+ --prefix PATH ":" ${coreutils}/bin \
+ --prefix PATH ":" ${gnugrep}/bin \
+ --prefix PATH ":" ${jre}/bin \
+ --set JAVA_HOME ${jre}
+ done
+ '';
+
+ meta = {
+ description = "General purpose programming language";
+ longDescription = ''
+ Scala is a general purpose programming language designed to express
+ common programming patterns in a concise, elegant, and type-safe way.
+ It smoothly integrates features of object-oriented and functional
+ languages, enabling Java and other programmers to be more productive.
+ Code sizes are typically reduced by a factor of two to three when
+ compared to an equivalent Java application.
+ '';
+ homepage = https://www.scala-lang.org/;
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix
index a999bd422e637a7c2107674c84ebf039308cb4eb..7bc7fa3d4c2481376b49689331f26511b744848d 100644
--- a/pkgs/development/compilers/scala/dotty.nix
+++ b/pkgs/development/compilers/scala/dotty.nix
@@ -9,7 +9,7 @@ in
stdenv.mkDerivation {
name = "dotty-${dotty-bare.version}";
- unpackPhase = ":";
+ dontUnpack = true;
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index f74299334535a2543eaa5eb95fc727320cdaa9b1..4fd46c35a0a9a2157b5ffc374b655459dd388fbb 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, gputils ? null
+{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null
, excludePorts ? [] }:
with stdenv.lib;
@@ -10,14 +10,14 @@ in
stdenv.mkDerivation rec {
name = "sdcc-${version}";
- version = "3.7.0";
+ version = "3.9.0";
src = fetchurl {
url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
- sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5";
+ sha256 = "0dn0cy6whcrvbfh9x467jdi8dmzjrvixz2bz63pgxwzpz9rsxv4l";
};
- buildInputs = [ autoconf bison boost flex gputils texinfo ];
+ buildInputs = [ autoconf bison boost flex gputils texinfo zlib ];
configureFlags = map (f: "--disable-${f}-port") excludedPorts;
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index 7ce7f9cefe51d12ddb41bfd202efd7accde676c7..7f4c895d85a080423e27c0e982b799c5dab28624 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python }:
+{ stdenv, fetchFromGitHub, cmake, python3 }:
# Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use
# the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from
# https://github.com/google/shaderc/blob/known-good/known_good.json
@@ -8,24 +8,24 @@ let
glslang = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
- rev = "712cd6618df2c77e126d68042ad7a81a69ee4a6f";
- sha256 = "0wncdj6q1hn40lc7cnz97mx5qjvb8p13mhxilnncgcmf0crsvblz";
+ rev = "d3692c701b1265955221aa0d6ebc656bc4442b2a";
+ sha256 = "11cvwbzlpr4zrcmmyd9h0kbfhmhr6r696ydmn0yp1jrixby4bmji";
};
spirv-tools = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
- rev = "df5bd2d05ac1fd3ec3024439f885ec21cc949b22";
- sha256 = "0l8ds4nn2qcfi8535ai8891i3547x35hscs2jxwwq6qjgw1sgkax";
+ rev = "08cc49ec59c3ff4d6bd4bb4f2097ede35e802158";
+ sha256 = "1xhgcppx02fp3nr7654mr3qrgy1fxlxdyl87jhmn3k9jf24gmmmz";
};
spirv-headers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
- rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f";
- sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
+ rev = "8b911bd2ba37677037b38c9bd286c7c05701bcda";
+ sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2";
};
in stdenv.mkDerivation rec {
name = "shaderc-${version}";
- version = "2018.0";
+ version = "2019.0";
outputs = [ "out" "lib" "bin" "dev" "static" ];
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
owner = "google";
repo = "shaderc";
rev = "v${version}";
- sha256 = "0qigmj0riw43pgjn5f6kpvk72fajssz1lc2aiqib5qvmj9rqq3hl";
+ sha256 = "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2";
};
patchPhase = ''
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers
'';
- nativeBuildInputs = [ cmake python ];
+ nativeBuildInputs = [ cmake python3 ];
postInstall = ''
moveToOutput "lib/*.a" $static
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index b0ca96f23acf0d9974aa0289711f5514805674e5..dce46ade45924ea441d2bc21c391cec08c255d9a 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -1,32 +1,32 @@
-{ stdenv, fetchurl, darwin }:
+{ stdenv, fetchurl }:
let
- version = "110.85";
+ version = "110.91";
baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
sources = map fetchurl [
- { url = "${baseurl}/config.tgz"; sha256 = "1qlir3q0vi7f1wyz2jyaiqy3z72d0xngsa122ks5g0b7b0hcdgm1"; }
- { url = "${baseurl}/cm.tgz"; sha256 = "0330jkmaxgy085hsgajqikm242gms650rks24mfxhgk11r4ks105"; }
- { url = "${baseurl}/compiler.tgz"; sha256 = "1zrqqvi9332g3clrh01z19sl06g3zlnp6zzz5z8rvsfwbiqp929m"; }
- { url = "${baseurl}/runtime.tgz"; sha256 = "1n9hd99s2i834yihx4n59gl1cnh7hiiz8im735bmifmv50vzfdf4"; }
- { url = "${baseurl}/system.tgz"; sha256 = "17samia4lzcz3mk73i330bspap2ks937arx35n9dr7bws0appfm8"; }
- { url = "${baseurl}/MLRISC.tgz"; sha256 = "039g6dwxy96bkvw1z19vwn8q150h7s8jlcmsg851bgz3j3h6vs18"; }
- { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1wk4w1npipm6qqgwis2xrbdjamwmiwv6ci4y40nzryhb37yxfj6d"; }
- { url = "${baseurl}/old-basis.tgz"; sha256 = "0lkhbkkglz7lk1c93hc1y1di5dx20fgfhybvsqjp1bcwz8jsd70y"; }
- { url = "${baseurl}/ckit.tgz"; sha256 = "14qxgw2vhq4dfiv5zl2gdhvjp75s10dqw97mqxffmh3vayyad1fi"; }
- { url = "${baseurl}/nlffi.tgz"; sha256 = "16l8iszkyh34dqdbplsxycipvbw61yjamgxllcq8axiq4h7spy7w"; }
- { url = "${baseurl}/cml.tgz"; sha256 = "05dlqz4r3qa3rpqgjlx91fsfx7j6gk3dkw28zcgg5g32irmd1la3"; }
- { url = "${baseurl}/eXene.tgz"; sha256 = "07mahzxns26hkfax9gc8cq4s8sfzj531wwnm47b8qkhd72d3ncn2"; }
- { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0073hfn98l61ryshhqw9855fb49vs9qcz9nplbg2pa2f7manqbk0"; }
- { url = "${baseurl}/ml-lex.tgz"; sha256 = "106km17f4wyvhzkx62cfq2gp4ihya8l234550laqb50zf8vxyklq"; }
- { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1r0k7lz8xnir271pykbs4agadysbs35kkmg1p816kzfyz5bsrrq9"; }
- { url = "${baseurl}/ml-burg.tgz"; sha256 = "10jqasplbxp50ryq74aazbnyaz8l492rhdij5mr1kzyfj79fysh9"; }
- { url = "${baseurl}/pgraph.tgz"; sha256 = "1pxqddbrb7y9kp89gz8v8vfjmw4wajfy6757gb8c6x499jarxa60"; }
- { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0fkalpdzdrm1gmafn33ck4dw8s92p9iwm4fav4m9jcqyha9az3g7"; }
- { url = "${baseurl}/heap2asm.tgz"; sha256 = "056gkmrylyrf0q0r3cpx76zx8mc62033jkn1bnjn0f8r31yhbipc"; }
- { url = "${baseurl}/smlnj-c.tgz"; sha256 = "04c4jnylj5dnd4sjywzwnqlv9g7dkrilq6d4cy543dw03yhjdykw"; }
- { url = "${baseurl}/doc.tgz"; sha256 = "1rpk9g1nhjpc2b4pmzmj8v80knrhljn17ghiwznnljv53hka7jzx"; }
- { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "05rh1y74jvp6zs96mb7nkwbgwwbss0zy2iw4gicdkyf6in0nk4la"; }
- { url = "${baseurl}/asdl.tgz"; sha256 = "1d465bncgy92ni6430dbq6isvnysfhvykjrxm98dz82iih7a6vqb"; }
+ { url = "${baseurl}/config.tgz"; sha256 = "00vbg2kpwgkf272m697p5hd35pawficbrifchn7dnd519wpdx436"; }
+ { url = "${baseurl}/cm.tgz"; sha256 = "0wxb0s2fwh7lbb3z2pfvmvhk5v0gm75kchkv7gg9f895ahyvm6yd"; }
+ { url = "${baseurl}/compiler.tgz"; sha256 = "0iq06ycivy562i59vvbma9zi575zw1djhdfkcy0bn7m9kfzzbgkh"; }
+ { url = "${baseurl}/runtime.tgz"; sha256 = "0km8p4vmy3m38xv0rl8d3mh2nlk2mvx010npm34gs374bmmzc7z9"; }
+ { url = "${baseurl}/system.tgz"; sha256 = "16d5vs1rn7ly6jxjm08222cj0sry73pr57xpc9d6k286b1v0910b"; }
+ { url = "${baseurl}/MLRISC.tgz"; sha256 = "1c9sw8zm90ykas5nwbhk2wic7sxkjrylb610x37v46m5ips1wlma"; }
+ { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "09ka20ym7ahrpj4r6vc5phflc8y57dj09qvwk8ambfwb2p2274sw"; }
+ { url = "${baseurl}/old-basis.tgz"; sha256 = "1bhq9fv6p8diz489h9571g0xrsi8yx7h6gh9410255klxjrw964h"; }
+ { url = "${baseurl}/ckit.tgz"; sha256 = "1lq9ljai0shc6hszx5v6bqmkz16a3f295mfg7q622apzgzark3vd"; }
+ { url = "${baseurl}/nlffi.tgz"; sha256 = "1xjmlwiclgckj73z5hz3hnqlavp3ax9sfvgc0rvj3xpy3i3n6axj"; }
+ { url = "${baseurl}/cml.tgz"; sha256 = "1sjzipxnvr9dgcg16bllfk3b46ac9f8h353nh1ccykwwq4whi9bf"; }
+ { url = "${baseurl}/eXene.tgz"; sha256 = "04clbchrlqx5v35gkbydbfnpl720i4nqijkshiwn0v592n4xfdf4"; }
+ { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0max073nzwv7vx13caj7zmlhslvxlgg8rj52278g7f6fqcrwp5cf"; }
+ { url = "${baseurl}/ml-lex.tgz"; sha256 = "0x2mbg45l71049sgvvkl6bnqc5svz70vh1m1rbf3xk41z5bapcgr"; }
+ { url = "${baseurl}/ml-yacc.tgz"; sha256 = "0a1pbwpw1y6d1xn9yjarqpmybrxqwp5snp28by36745h1jvb1p1b"; }
+ { url = "${baseurl}/ml-burg.tgz"; sha256 = "119mq5jrbkn9vf9fgb0wyz483hf26al9hwb91xpmlmfx5qqnfzik"; }
+ { url = "${baseurl}/pgraph.tgz"; sha256 = "1s7jmh3q88rz29bk02y3gzdqrgvk484j5ji8bn7s6fc78m50nqp8"; }
+ { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1gzf1pbmw2cn5w6f5qfdm3d6n6069n1nnzz6z4v7mr07x54c6mdv"; }
+ { url = "${baseurl}/heap2asm.tgz"; sha256 = "09cgj568a9x017awysjdx35mlp5zkdmc2fs67fvnm5ifl7ivfs8j"; }
+ { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1g4xhcxychs9q25x7a5lvqfamq52c5ljlx84bc5cazvpkhixyg04"; }
+ { url = "${baseurl}/doc.tgz"; sha256 = "1l0x91dscizk2pyj1lw595r84h1h0shxh0x5hva891717a1hfa51"; }
+ { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "0f6x4nfhrgm1z4dx862df2yaffdh1sd6zx2lyb2vph5mhp7x9n58"; }
+ { url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; }
];
in stdenv.mkDerivation {
name = "smlnj-${version}";
@@ -36,15 +36,7 @@ in stdenv.mkDerivation {
patchPhase = ''
sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
- '' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; ''
- sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\
-\ \*x86-darwin\*)\
-\ INCLFILE=${stdenv.lib.getDev apple_sdk.sdk}/include/unistd.h\
-\ ;;\
-\ \*) ;;
-' base/runtime/config/gen-posix-names.sh
- sed -i 's|^AS =\([[:space:]]*\)/usr/bin/as|AS =\1as|' base/runtime/objs/mk.x86-darwin
- '');
+ '';
unpackPhase = ''
for s in $sources; do
@@ -74,7 +66,7 @@ in stdenv.mkDerivation {
description = "Standard ML of New Jersey, a compiler";
homepage = http://smlnj.org;
license = licenses.bsd3;
- platforms = [ "i686-linux" ] ++ platforms.darwin;
+ platforms = [ "i686-linux" ];
maintainers = with maintainers; [ thoughtpolice ];
};
}
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 8f005d475dc7e24069e9b1d7635a54f39edf4074..941f92fd322e5330ec1da96c5aacaed2fb1d4bf2 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchFromGitHub, boost, cmake
+{ stdenv, fetchzip, boost, cmake, ncurses, python2
, z3Support ? true, z3 ? null
}:
@@ -6,49 +6,68 @@ assert z3Support -> z3 != null;
assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0";
let
- version = "0.5.7";
- rev = "6da8b019e4a155d1f70abe7a3acc0f9765480a9e";
- sha256 = "0ii868r0ra6brjnn453kxqvw76p4bwjbvdyqfcn6v1bl2h4s60ir";
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
jsoncpp = fetchzip {
url = jsoncppURL;
sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
};
+ buildSharedLibs = stdenv.hostPlatform.isLinux;
in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+
name = "solc-${version}";
+ version = "0.5.10";
- src = fetchFromGitHub {
- owner = "ethereum";
- repo = "solidity";
- inherit rev sha256;
+ # upstream suggests avoid using archive generated by github
+ src = fetchzip {
+ url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
+ sha256 = "1ns562h8blvv32lz462rf5835fs2hgn698mvi6ss5y7ar6k5y5xw";
};
- patches = [
- ./patches/shared-libs-install.patch
- ];
+ patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ];
postPatch = ''
- touch prerelease.txt
- echo >commit_hash.txt "${rev}"
substituteInPlace cmake/jsoncpp.cmake \
--replace "${jsoncppURL}" ${jsoncpp}
'';
cmakeFlags = [
"-DBoost_USE_STATIC_LIBS=OFF"
+ ] ++ stdenv.lib.optionals buildSharedLibs [
"-DBUILD_SHARED_LIBS=ON"
] ++ stdenv.lib.optionals (!z3Support) [
"-DUSE_Z3=OFF"
];
- doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
- checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:./test/tools/yulInterpreter:$LD_LIBRARY_PATH " +
- "./test/soltest -p true -- --no-ipc --no-smt --testpath ../test";
-
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost ]
- ++ stdenv.lib.optionals z3Support [ z3 ];
+ buildInputs = [ boost ] ++ stdenv.lib.optionals z3Support [ z3 ];
+ checkInputs = [ ncurses python2 ];
+
+ # Test fails on darwin for unclear reason
+ doCheck = stdenv.hostPlatform.isLinux;
+
+ checkPhase = ''
+ while IFS= read -r -d ''' dir
+ do
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/$dir
+ export LD_LIBRARY_PATH
+ done < <(find . -type d -print0)
+
+ pushd ..
+ # IPC tests need aleth avaliable, so we disable it
+ sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
+ for i in ./scripts/*.sh; do
+ patchShebangs "$i"
+ done
+ for i in ./scripts/*.py; do
+ patchShebangs "$i"
+ done
+ for i in ./test/*.sh; do
+ patchShebangs "$i"
+ done
+ TERM=xterm ./scripts/tests.sh
+ popd
+ '';
outputs = [ "out" "dev" ];
@@ -57,7 +76,7 @@ stdenv.mkDerivation {
homepage = https://github.com/ethereum/solidity;
license = licenses.gpl3;
platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ dbrock akru lionello ];
+ maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
inherit version;
};
}
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index e106c9bbb742c47571b9c7a5f70387210ab3c890..382d49599c7f7938ed5140102eb65fe7b4d602d7 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -49,8 +49,8 @@ index 0bdec4b4..e876177e 100644
+++ b/libsolidity/CMakeLists.txt
@@ -29,6 +29,7 @@ endif()
- add_library(solidity ${sources} ${headers})
- target_link_libraries(solidity PUBLIC yul evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+ add_library(solidity ${sources} ${z3_SRCS} ${cvc4_SRCS})
+ target_link_libraries(solidity PUBLIC yul evmasm langutil devcore Boost::boost Boost::filesystem Boost::system)
+install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
if (${Z3_FOUND})
diff --git a/pkgs/development/compilers/souper/cmake-fix.patch b/pkgs/development/compilers/souper/cmake-fix.patch
deleted file mode 100644
index 5ef289f53e935d342dd55fcf4a3a18f278e47085..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/souper/cmake-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt.orig 2017-01-20 13:55:14.783632588 -0600
-+++ souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt 2017-01-20 13:55:20.505728456 -0600
-@@ -33,7 +33,10 @@
- OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
--set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}")
-+
-+if (LLVM_SYSTEM_LIBS)
-+ set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}")
-+endif()
-
- execute_process(
- COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix
deleted file mode 100644
index 2203dc980b132daaf238695494674191ca81db17..0000000000000000000000000000000000000000
--- a/pkgs/development/compilers/souper/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper
-, llvmPackages_4, hiredis, z3, gtest
-}:
-
-let
- klee = fetchFromGitHub {
- owner = "rsas";
- repo = "klee";
- rev = "57cd3d43056b029d9da3c6b3c666c4153554c04f";
- sha256 = "197wb7nbirlfpx2jr3afpjjhcj7slc4dxxi02j3kmazz9kcqaygz";
- };
-in stdenv.mkDerivation rec {
- name = "souper-unstable-${version}";
- version = "2017-03-23";
-
- src = fetchFromGitHub {
- owner = "google";
- repo = "souper";
- rev = "cf2911d2eb1e7c8ab465df5a722fa5cdac06e6fc";
- sha256 = "1kg08a1af4di729pn1pip2lzqzlvjign6av95214f5rr3cq2q0cl";
- };
-
- nativeBuildInputs = [
- cmake
- makeWrapper
- ];
-
- buildInputs = [
- llvmPackages_4.llvm
- llvmPackages_4.clang-unwrapped
- hiredis
- gtest
- ];
-
- patches = [ ./cmake-fix.patch ];
-
- enableParallelBuilding = true;
-
- preConfigure = ''
- mkdir -pv third_party
- cp -R "${klee}" third_party/klee
- '';
-
- installPhase = ''
- mkdir -pv $out/bin
- cp -v ./souper $out/bin/
- cp -v ./clang-souper $out/bin/
- wrapProgram "$out/bin/souper" \
- --add-flags "-z3-path=\"${z3}/bin/z3\""
- '';
-
- meta = with stdenv.lib; {
- description = "A superoptimizer for LLVM IR";
- homepage = "https://github.com/google/souper";
- license = licenses.asl20;
- maintainers = with maintainers; [ taktoa ];
- platforms = with platforms; linux;
- };
-}
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 97b4a627540c76f9a3433a00d054a47f4e8850ca..bf452d21d1dc70ce965d98e78da7e37726a947d2 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
-, libXinerama, libarchive, db, pcre, libedit, libossp_uuid, libXft, libXpm
+{ stdenv, fetchgit, jdk, gmp, readline, openssl, unixODBC, zlib
+, libarchive, db, pcre, libedit, libossp_uuid, libXpm
, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin
, git, cacert, cmake, libyaml
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 91fb962f87cc56992961f706309d47be32a5fed3..94d0a4327d9d892c9c2192978350f25867d5e119 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -1,5 +1,4 @@
{ stdenv
-, targetPackages
, cmake
, coreutils
, glibc
@@ -34,7 +33,7 @@
}:
let
- v_base = "4.2.3";
+ v_base = "5.0.1";
version = "${v_base}-RELEASE";
version_friendly = "${v_base}";
@@ -52,48 +51,48 @@ let
# For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
clang = fetch {
repo = "swift-clang";
- sha256 = "0l6w4xzpl3w2nax9a0b885nfzhfj38p2g99158nb5bzfd4s0man7";
+ sha256 = "1ap26425zhn2sdw3m9snyrqhi4phv2fgblyv9wp8xppjlnjkax9k";
};
llvm = fetch {
repo = "swift-llvm";
- sha256 = "1664zwxbq0a1cmxr9n5a0vw6vdk6ygr7rpglpdsfc7ki857vpsyv";
+ sha256 = "1bnscqsiljiclij60f44h2fyx5c84pzry0lz1jbwknphwmqd6f84";
};
compilerrt = fetch {
repo = "swift-compiler-rt";
- sha256 = "19s6qxn4i0kxpf39xjp2i7zg427iinbmaxqkbb1p91g616y367sf";
+ sha256 = "0bba54xa7z0wj6k7a24q74gc4yajc6s64g1m894i3yd6swdk7f6r";
};
cmark = fetch {
repo = "swift-cmark";
- sha256 = "1nmxp0fj749sgar682c5nsj7zxxigqwg973baxj2r656a7ybh325";
+ sha256 = "079smm79hbwr06bvghd2sb86b8gpkprnzlyj9kh95jy38xhlhdnj";
};
lldb = fetch {
repo = "swift-lldb";
- sha256 = "00kz0xhj1p6ckyandj2gs1yfl29kxv84x9pfph00r8crbkd2jz7b";
+ sha256 = "01yrhc1ggv89qii03fdjdvb2aq9v4hd1wk83n8ygrwwc75p44qmi";
};
llbuild = fetch {
repo = "swift-llbuild";
- sha256 = "1mkkhydshhxr28igbldzr0hhqvb6ql43cpf3ba5vglfkbcz6wh6q";
+ sha256 = "0ipwryzpqxpk3rzkxilfahlkz06k39j91q2lv7fprf0slqknrdms";
};
pm = fetch {
repo = "swift-package-manager";
- sha256 = "1aqvmgq9g5zs4k2qnkvw3h3mar66d690hqq6g2dmrapsyb321j9l";
+ sha256 = "1mnywlm7i2mbp16q0rskskvnbx1ap8lchwr8q3gx0xs3b2fs6chh";
};
xctest = fetch {
repo = "swift-corelibs-xctest";
- sha256 = "1n4w7bfgy73vjzbvbphlwayy0dw73bbrayrpkqq8lbidg0x9lam8";
+ sha256 = "1vpljkxhfk3yd07ry0xsv3qwbn62pwd2mdn9cw22jhbhvqinc13z";
};
foundation = fetch {
repo = "swift-corelibs-foundation";
- sha256 = "11kwc5pcq4ibxkyglmqs7h7gka3xkzl9j856x1rq2xdvq756wq2s";
+ sha256 = "11w0iapccrk13hjbrwylq8g71znrncnc3mrm345gvnjfgz08ffaq";
};
libdispatch = fetch {
repo = "swift-corelibs-libdispatch";
- sha256 = "09c15mn9s5lf2akzfhik70zk91h97nnm8pq1ppfqry2nn3vmib2i";
+ sha256 = "1mgzsq3nfzbkssfkswzvvjgsbv2fx36i1r83d4nzw3di8spxmg32";
fetchSubmodules = true;
};
swift = fetch {
repo = "swift";
- sha256 = "09wksqad0w6pk3xdxc278w4mj300h48rvbvx0m4an7npkj6i7n9q";
+ sha256 = "02bv47pd0k0xy4k7q6c3flwxwkm2palnzvpr4w3nmvqk0flrbsq6";
};
};
@@ -120,6 +119,9 @@ let
builder = ''
# gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found
NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE"
+ # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked.
+ # This compiler is not using the Nix wrappers, so it needs some help to find things.
+ export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE"
$SWIFT_SOURCE_ROOT/swift/utils/build-script \
--preset=buildbot_linux \
@@ -132,23 +134,25 @@ in
stdenv.mkDerivation rec {
name = "swift-${version_friendly}";
- buildInputs = devInputs ++ [
+ nativeBuildInputs = [
autoconf
automake
bash
- clang
cmake
coreutils
+ findutils
+ gnumake
libtool
+ makeWrapper
ninja
perl
pkgconfig
python
rsync
which
- findutils
- makeWrapper
- gnumake
+ ];
+ buildInputs = devInputs ++ [
+ clang
];
# TODO: Revisit what's propagated and how
@@ -212,13 +216,12 @@ stdenv.mkDerivation rec {
substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \
--replace '/usr/include' "${stdenv.cc.libc.dev}/include"
- substituteInPlace swift-corelibs-libdispatch/src/CMakeLists.txt \
- --replace '/usr/include' "${stdenv.cc.libc.dev}/include"
substituteInPlace swift/utils/build-script-impl \
--replace '/usr/include/c++' "${clang.cc.gcc}/include/c++"
patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch}
patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch}
patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch}
+ patch -p1 -d swift -i ${./patches/0003-build-presets-linux-don-t-build-extra-libs.patch}
patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch}
sed -i swift/utils/build-presets.ini \
@@ -227,10 +230,12 @@ stdenv.mkDerivation rec {
-e 's/^validation-test$/# \0/' \
-e 's/^long-test$/# \0/' \
-e 's/^stress-test$/# \0/' \
- -e 's/^test-optimized$/# \0/'
+ -e 's/^test-optimized$/# \0/' \
+ \
+ -e 's/^swift-install-components=autolink.*$/\0;editor-integration/'
- # https://bugs.swift.org/browse/SR-5779
- sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake
+ # https://bugs.swift.org/browse/SR-10559
+ patch -p1 -d swift-corelibs-libdispatch -i ${./patches/libdispatch-fortify-fix.patch}
substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \
--replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "'
@@ -241,8 +246,6 @@ stdenv.mkDerivation rec {
sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
PREFIX=''${out/#\/}
- substituteInPlace swift-corelibs-foundation/build.py \
- --replace usr/lib "$PREFIX/lib"
substituteInPlace swift-corelibs-xctest/build_script.py \
--replace usr "$PREFIX"
substituteInPlace swiftpm/Utilities/bootstrap \
@@ -250,9 +253,19 @@ stdenv.mkDerivation rec {
--replace usr/lib "$PREFIX/lib"
'';
+ buildPhase = builder;
+
doCheck = false;
- buildPhase = builder;
+ checkInputs = [ file ];
+
+ # TODO: investigate the non-working tests
+ checkPhase = ''
+ checkTarget=check-swift-all
+ ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}'
+
+ ninjaCheckPhase
+ '';
installPhase = ''
mkdir -p $out
@@ -262,13 +275,10 @@ stdenv.mkDerivation rec {
tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX
find $out -type d -empty -delete
- # TODO: Use wrappers to get these on the PATH for swift tools, instead
- ln -s ${clang}/bin/* $out/bin/
- ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar
-
wrapProgram $out/bin/swift \
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
- --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include
+ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
+ --suffix LIBRARY_PATH : $icu/lib
'';
# Hack to avoid TMPDIR in RPATHs.
diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
index f2b30e5dcdb6e95eabc4455b515fb1f217ee9597..79482ac10e693913d7c4ce6f9df7091d59f4333a 100644
--- a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
+++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
@@ -11,8 +11,8 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 7ee57ad2df..e6b0af3581 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
-@@ -717,7 +717,7 @@ swiftpm
- xctest
+@@ -721,7 +721,7 @@ swiftpm
+
dash-dash
-build-ninja
diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
index 612b33cdb48376beae11caaf985a172ea1dd95a9..5c1927acb7f1e34fcbbdf53051fcd7b6a685d029 100644
--- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
+++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
@@ -9,17 +9,17 @@ Subject: [PATCH 2/4] build-presets: (linux) allow custom install prefix
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index e6b0af3581..1095cbaab7 100644
---- a/utils/build-presets.ini
-+++ b/utils/build-presets.ini
-@@ -723,7 +723,7 @@ install-lldb
- install-llbuild
+--- a/utils/build-presets.ini 2019-04-11 14:51:40.060259462 +0200
++++ b/utils/build-presets.ini 2019-04-11 15:16:17.471137969 +0200
+@@ -728,7 +728,7 @@
install-swiftpm
install-xctest
+ install-libicu
-install-prefix=/usr
+install-prefix=%(install_prefix)s
- swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
- build-swift-static-stdlib
- build-swift-static-sdk-overlay
+ swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
+ llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
+ install-libcxx
--
2.12.2
diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5d766bc25901dce7d3042a532202068dbd1bf7de
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch
@@ -0,0 +1,23 @@
+--- a/utils/build-presets.ini 2019-04-11 15:19:57.845178834 +0200
++++ b/utils/build-presets.ini 2019-04-11 15:27:42.041297057 +0200
+@@ -716,8 +716,6 @@
+ llbuild
+ swiftpm
+ xctest
+-libicu
+-libcxx
+
+ dash-dash
+
+@@ -727,11 +725,9 @@
+ install-llbuild
+ install-swiftpm
+ install-xctest
+-install-libicu
+ install-prefix=%(install_prefix)s
+ swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
+ llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
+-install-libcxx
+ build-swift-static-stdlib
+ build-swift-static-sdk-overlay
+ build-swift-stdlib-unittest-extra
diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
index e84c7eb2a08ad05467155e8113b1b1681e4f285c..1d0a6a9577aadaf82dbe71819493f19c3390ea15 100644
--- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
+++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 1739e91dc2..0608fed9c1 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
-@@ -740,6 +740,8 @@ install-destdir=%(install_destdir)s
+@@ -743,6 +743,8 @@ install-destdir=%(install_destdir)s
# Path to the .tar.gz package we would create.
installable-package=%(installable_package)s
diff --git a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
index 650e1a2429d46bb726226138a79dff81422fe249..df906f9c84c7e05a7c648d58d43a24e274bbc60b 100644
--- a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
+++ b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
@@ -1,13 +1,13 @@
The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories.
---- swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 17:51:51.581766303 +0200
-+++ swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 18:40:04.118956708 +0200
-@@ -65,7 +65,7 @@
+--- swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.493801403 +0200
++++ swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.577800593 +0200
+@@ -68,7 +68,7 @@
endif()
set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
- set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}")
+ set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
- if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/")
+ if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/" AND NOT "${sdk}" STREQUAL "ANDROID")
set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}")
diff --git a/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch b/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d23a308d68f4f84d0a82a3d86499fe7a6608168b
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch
@@ -0,0 +1,13 @@
+Nix compiles with _FORTIFY_SOURCE enabled. Fix error due to -Werror and an unused return value warning.
+
+--- swift-corelibs-libdispatch/src/internal.h 2019-04-26 09:33:38.287289099 +0200
++++ swift-corelibs-libdispatch/src/internal.h 2019-04-26 15:31:10.485334128 +0200
+@@ -1053,7 +1053,7 @@
+ #else
+ #define _dispatch_client_assert_fail(fmt, ...) do { \
+ char *_msg = NULL; \
+- asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
++ (void)asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
+ ##__VA_ARGS__); \
+ _dispatch_assert_crash(_msg); \
+ free(_msg); \
diff --git a/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
index 9523943c48014b0a38df215601d8d66a1be27a7e..789c0be7e7a8b68cd7b7c8c1265ec360181188e3 100644
--- a/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
+++ b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
@@ -2,7 +2,7 @@ Only use the Nix include dirs when no sysroot is configured.
--- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200
+++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200
-@@ -565,7 +565,7 @@
+@@ -641,7 +641,7 @@
// Check for configure-time C include directories.
StringRef CIncludeDirs(C_INCLUDE_DIRS);
diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch
index d10e407260a51bf1cd9904479f795590cf9520d0..832decdc41f570691aa18df649cfbcdf7612f74d 100644
--- a/pkgs/development/compilers/swift/purity.patch
+++ b/pkgs/development/compilers/swift/purity.patch
@@ -11,7 +11,7 @@ diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index fe3c0191bb..c6a482bece 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -398,13 +398,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+@@ -380,13 +380,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
if (!Args.hasArg(options::OPT_static)) {
if (Args.hasArg(options::OPT_rdynamic))
CmdArgs.push_back("-export-dynamic");
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index 312facde948922b36a3e9a8d22f8946120ca86e8..b1f9ee799e5c28204b8aafd191d13d8c998badcf 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -37,26 +37,20 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- mkdir -pv $out/lib
- cp -v release/lib/terra.so $out/lib
-
- mkdir -pv $bin/bin
- cp -v release/bin/terra $bin/bin
-
- mkdir -pv $static/lib
- cp -v release/lib/libterra.a $static/lib
+ install -Dm755 -t $bin/bin release/bin/terra
+ install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary}
+ install -Dm644 -t $static/lib release/lib/libterra.a
mkdir -pv $dev/include
cp -rv release/include/terra $dev/include
- ''
- ;
+ '';
buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ];
meta = with stdenv.lib; {
- inherit (src.meta) homepage;
description = "A low-level counterpart to Lua";
- platforms = [ "x86_64-linux" ];
+ homepage = http://terralang.org/;
+ platforms = platforms.x86_64;
maintainers = with maintainers; [ jb55 ];
license = licenses.mit;
};
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index d81ddd9b58f737798ef973d4a6dcf4106b505c90..2300d63015b9d46223868d87dc8c075a1899b459 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, file, openssl, mlton
-, mysql, postgresql, sqlite, gcc
+, mysql, postgresql, sqlite, gcc, icu
}:
stdenv.mkDerivation rec {
name = "urweb-${version}";
- version = "20180616";
+ version = "20190217";
src = fetchurl {
url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz";
- sha256 = "04iy2ky78q6w0d2xyfz2a1k26g2yrwsh1hw1bgs5ia9v3ih965r1";
+ sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
};
- buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite ];
+ buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ];
prePatch = ''
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index dfd40c92ecfac9b0b981577eb717c3df13d4fabf..6400f6e138756db5bb1cb110d0192b512f3dc09f 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, autoreconfHook
, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll
}:
let
generic = lib.makeOverridable ({
- major, minor, sha256,
+ version, sha256,
extraNativeBuildInputs ? [],
extraBuildInputs ? [],
withGraphviz ? false
}:
let
- atLeast = lib.versionAtLeast "${major}.${minor}";
-
# Patches from the openembedded-core project to build vala without graphviz
# support. We need to apply an additional patch to allow building when the
# header file isn't available at all, but that patch (./gvc-compat.patch)
@@ -43,23 +41,23 @@ let
# We've reverted the addition of the "--disable-valadoc" option
# and then applied the following patch.
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch
- "0.44" = ./disable-graphviz-0.44.1.patch;
+ "0.44" = ./disable-graphviz-0.44.3.patch;
- }.${major} or (throw "no graphviz patch for this version of vala");
+ }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");
- disableGraphviz = atLeast "0.38" && !withGraphviz;
+ disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz;
in stdenv.mkDerivation rec {
- name = "vala-${version}";
- version = "${major}.${minor}";
+ pname = "vala";
+ inherit version;
setupHook = substituteAll {
src = ./setup-hook.sh;
- apiVersion = major;
+ apiVersion = lib.versions.majorMinor version;
};
src = fetchurl {
- url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
inherit sha256;
};
@@ -78,19 +76,27 @@ let
nativeBuildInputs = [
pkgconfig flex bison libxslt
- ] ++ lib.optional (stdenv.isDarwin && (atLeast "0.38")) expat
+ ] ++ lib.optional (stdenv.isDarwin && (lib.versionAtLeast version "0.38")) expat
++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure
++ extraNativeBuildInputs;
buildInputs = [
glib libiconv libintl
- ] ++ lib.optional (atLeast "0.38" && withGraphviz) graphviz
+ ] ++ lib.optional (lib.versionAtLeast version "0.38" && withGraphviz) graphviz
++ extraBuildInputs;
enableParallelBuilding = true;
doCheck = false; # fails, requires dbus daemon
+ # Wait for PR #59372
+ #passthru = {
+ # updateScript = gnome3.updateScript {
+ # attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}";
+ # packageName = pname;
+ # };
+ #};
+
meta = with stdenv.lib; {
description = "Compiler for GObject type system";
homepage = https://wiki.gnome.org/Projects/Vala;
@@ -102,34 +108,29 @@ let
in rec {
vala_0_36 = generic {
- major = "0.36";
- minor = "18";
- sha256 = "0csb9skgy663y05kl813dsarzjbfcdsmx5fvz13p8gas3hycciq9";
+ version = "0.36.19";
+ sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar";
};
vala_0_38 = generic {
- major = "0.38";
- minor = "10";
+ version = "0.38.10";
sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw";
extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool;
};
vala_0_40 = generic {
- major = "0.40";
- minor = "14";
- sha256 = "0llid9b9cgjcrcclc0pw2skkssb7br7b2clq9cql3p14dl94gki0";
+ version = "0.40.15";
+ sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19";
};
vala_0_42 = generic {
- major = "0.42";
- minor = "6";
- sha256 = "14024gvs23q323fmd62hqd8jiypaxbjjvamyd782ixbhxmpz8x1p";
+ version = "0.42.7";
+ sha256 = "029ksbsdpl581wzy570kj4kkw8b4bizgh494c051zsvkwck55p83";
};
vala_0_44 = generic {
- major = "0.44";
- minor = "1";
- sha256 = "1qiglkgymws6a3m8xz1v8b3na165ywx2dbipp3bdg134bi0w3a4n";
+ version = "0.44.3";
+ sha256 = "1sgas7z6y9r2mf4pxry3fx2awdnzn3vlg2sxd3hqpy2a90ib8lw5";
};
vala = vala_0_44;
diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch b/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch
similarity index 96%
rename from pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch
rename to pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch
index 2752aa1e2050042bd150314349c5b000d23cdee9..fc971c26492b1960c26dbf07a0731da184f74697 100644
--- a/pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch
+++ b/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch
@@ -19,17 +19,17 @@ index f70234759..b3d6c3833 100644
- --enable-valadoc \
- --enable-unversioned \
- $(NULL)
-
+
if ENABLE_UNVERSIONED
aclocaldir = $(datadir)/aclocal
diff --git a/configure.ac b/configure.ac
-index 16ebd1f81..cf23db4b8 100644
+index 504db13aa..622397747 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -156,10 +156,11 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
- AC_SUBST(GMODULE_CFLAGS)
+@@ -157,10 +157,11 @@ AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
-
+
+ AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check)
-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
-if test x$enable_valadoc = xyes; then
+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
@@ -40,14 +40,14 @@ index 16ebd1f81..cf23db4b8 100644
cgraph_tmp_LIBADD="$LIBADD"
cgraph_tmp_CFLAGS="$CFLAGS"
LIBADD="$LIBADD $LIBGVC_LIBS"
-@@ -186,8 +187,8 @@ if test x$enable_valadoc = xyes; then
+@@ -198,8 +199,8 @@ if test x$enable_valadoc = xyes; then
LIBADD="$cgraph_tmp_LIBADD"
CFLAGS="$cgraph_tmp_CFLAGS"
fi
+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
-AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
-
+
AC_PATH_PROG([XSLTPROC], [xsltproc], :)
AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -55,14 +55,14 @@ index d2684a0e0..b343c7c10 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,16 +6,11 @@ SUBDIRS = \
-
+
dist_man_MANS = \
valac.1 \
+ valadoc.1 \
vala-gen-introspect.1 \
vapigen.1 \
$(NULL)
-
+
-if ENABLE_VALADOC
-dist_man_MANS += \
- valadoc.1 \
@@ -74,7 +74,7 @@ index d2684a0e0..b343c7c10 100644
valadoc.h2m \
@@ -24,11 +19,7 @@ EXTRA_DIST = \
$(NULL)
-
+
if HAVE_HELP2MAN
-if ENABLE_VALADOC
manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
@@ -83,7 +83,7 @@ index d2684a0e0..b343c7c10 100644
-endif
@rm $^
$(MAKE) $(AM_MAKEFLAGS) $^
-
+
@@ -37,13 +28,11 @@ valac.1:
--include $(srcdir)/valac.h2m \
--libtool --no-info \
@@ -108,18 +108,18 @@ index d2684a0e0..b343c7c10 100644
cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
endif
-
-
+
+
-if ENABLE_VALADOC
COMMON_VALADOCFLAGS = \
--force \
--verbose \
@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
@touch $@
-
+
internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
-endif
-
+
clean-local:
rm -rf $(builddir)/internal-apis
diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
@@ -147,7 +147,7 @@ index 7456fb836..107338e91 100644
html/htmlmarkupwriter.vala \
html/htmlrenderer.vala \
$(NULL)
-
+
+if ENABLE_GRAPHVIZ
+libvaladoc_la_VALASOURCES += \
+ charts/chart.vala \
@@ -177,23 +177,23 @@ index 7456fb836..107338e91 100644
$(filter %.vala %.c,$^)
touch $@
@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
-
+
valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
cp $< $@
+if !ENABLE_GRAPHVIZ
+ sed -i "s/libgvc //g" $@
+endif
-
+
vapidir = $(datadir)/vala/vapi
dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
-
+
valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
cp $< $@
+if !ENABLE_GRAPHVIZ
+ sed -i "s/libgvc//g" $@
+endif
-
+
EXTRA_DIST = \
$(libvaladoc_la_VALASOURCES) \
diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
@@ -211,20 +211,20 @@ index 46578c28f..f6ce7097c 100644
+#endif
protected ErrorReporter reporter;
protected string package_list_link = "../index.html";
-
+
@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
this.linker = new LinkHelper ();
-
+
_renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
+#if HAVE_GRAPHVIZ
this.image_factory = new SimpleChartFactory (settings, linker);
+#endif
}
-
-
+
+
@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
}
-
+
protected void write_image_block (Api.Node element) {
+#if HAVE_GRAPHVIZ
if (element is Class || element is Interface || element is Struct) {
@@ -236,7 +236,7 @@ index 46578c28f..f6ce7097c 100644
}
+#endif
}
-
+
public void write_namespace_content (Namespace node, Api.Node? parent) {
diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
index 5aa4afdea..e79b0b8f5 100644
@@ -245,7 +245,7 @@ index 5aa4afdea..e79b0b8f5 100644
@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
}
}
-
+
+#if HAVE_GRAPHVIZ
public unowned MarkupWriter add_usemap (Charts.Chart chart) {
string? buf = (string?) chart.write_buffer ("cmapx");
@@ -256,6 +256,6 @@ index 5aa4afdea..e79b0b8f5 100644
+#else
+ public unowned MarkupWriter add_usemap (void* chart) {
+#endif
-
+
return this;
}
diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix
index 78df2583140bed607b36890da1e63eeb2804d010..5f83845a12a944b0996fae394c0da3a87c02e40c 100644
--- a/pkgs/development/compilers/wla-dx/default.nix
+++ b/pkgs/development/compilers/wla-dx/default.nix
@@ -1,18 +1,16 @@
{stdenv, fetchFromGitHub, cmake}:
stdenv.mkDerivation rec {
- version = "2017-06-05";
- name = "wla-dx-git-${version}";
+ pname = "wla-dx";
+ version = "9.8";
src = fetchFromGitHub {
owner = "vhelin";
repo = "wla-dx";
- rev = "ae6843f9711cbc2fa6dd8c200877b40bd2bcad7f";
- sha256 = "09c2kz12ld97ad41j6r8r65jknllrak1x8r43fgr26x7hdlxz5c6";
+ rev = "v${version}-fix";
+ sha256 = "1dsxhy19nif983lr20vxl099giwzgmzqyh7ass705hkphmwagcv6";
};
- hardeningDisable = [ "format" ];
-
installPhase = ''
mkdir -p $out/bin
install binaries/* $out/bin
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
index a26bc41c5945d4f30c131c2331a340f00acbd7a2..88666148da3ff18f64c273b1a24c22d445d6476f 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub
+{ stdenv, fetchFromGitHub
, automake, autoconf, readline
, libX11, bluez, SDL2
}:
diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix
index 1590075dc2a01448892b8f63ed8e03759069268e..19056ec2b6fdc35c03655766d0e5fc850e17512b 100644
--- a/pkgs/development/compilers/z88dk/default.nix
+++ b/pkgs/development/compilers/z88dk/default.nix
@@ -1,37 +1,46 @@
-{ fetchFromGitHub, fetchpatch, stdenv, makeWrapper, unzip, libxml2, m4, uthash }:
+{ fetchFromGitHub, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }:
stdenv.mkDerivation rec {
- name = "z88dk-${version}";
- version = "20180217";
- rev = "49a7c6032b2675af742f5b0b3aa5bd5260bdd814";
- short_rev = "${builtins.substring 0 7 rev}";
+ pname = "z88dk";
+ version = "unstable-2019-05-09";
src = fetchFromGitHub {
owner = "z88dk";
repo = "z88dk";
- inherit rev;
- sha256 = "00vbklh6lkq1gyd08ig2vcg6c1mghvlwfx3vq3wldf34hcs3k4pp";
+ rev = "826d68632c3a7c17df88dd2ec54571a6041da69c";
+ sha256 = "104qgb01sdb97mkcxnq1cdlqi5qvjm4rd9bg5r42pdfz81ss49xj";
+ fetchSubmodules = true;
};
- # https://github.com/z88dk/z88dk/pull/612
- patches = [(fetchpatch {
- url = "https://github.com/Mic92/z88dk/commit/5b4ca132fa1f31c9ac48cf2220358715739ca0b2.patch";
- sha256 = "1p2l31j68p7jzykhkhd9iagn2lr08hdclk3cl9l32p1q6ghdipfv";
- })];
-
postPatch = ''
# we dont rely on build.sh :
export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite
export ZCCCFG=$PWD/lib/config/
+ # we don't want to build zsdcc since it required network (svn)
+ # we test in checkPhase
+ substituteInPlace Makefile \
+ --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\
+ --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT ='
+ '';
+
+ checkPhase = ''
+ make testsuite
'';
+ #failed on Issue_1105_function_pointer_calls
+ doCheck = stdenv.hostPlatform.system != "aarch64-linux";
+
+ #_FORTIFY_SOURCE requires compiling with optimization (-O)
+ NIX_CFLAGS_COMPILE = "-O";
+ short_rev = "${builtins.substring 0 7 src.rev}";
makeFlags = [
- "prefix=$(out)"
"git_rev=${short_rev}"
"version=${version}"
+ "prefix=$(out)"
"git_count=0"
];
- nativeBuildInputs = [ makeWrapper unzip ];
+
+ nativeBuildInputs = [ which makeWrapper unzip ];
buildInputs = [ libxml2 m4 uthash ];
preInstall = ''
@@ -41,10 +50,10 @@ stdenv.mkDerivation rec {
installTargets = "libs install";
meta = with stdenv.lib; {
- homepage = https://www.z88dk.org;
+ homepage = "https://www.z88dk.org";
description = "z80 Development Kit";
license = licenses.clArtistic;
maintainers = [ maintainers.genesis ];
- platforms = [ "x86_64-linux" ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix
index 2429ccf3cf60028d1317a6b63e49f954e0a94d8f..d58f65102190de27b8665d1575042c2f9c33c900 100644
--- a/pkgs/development/coq-modules/Cheerios/default.nix
+++ b/pkgs/development/coq-modules/Cheerios/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
passthru = {
- compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+ compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
};
}
diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix
index 6b908f5a09a36263be69fe152b02e2b83c6dcf1a..4fe86c3fae18575df4142a0ec06fc22759266fbb 100644
--- a/pkgs/development/coq-modules/InfSeqExt/default.nix
+++ b/pkgs/development/coq-modules/InfSeqExt/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
passthru = {
- compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
+ compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
};
}
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index ee1aeb1503e0e20d3042bf29ae0d06680417446b..874b99f2bebf01a02d4bf403ab0ee227e3e22d9c 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -14,23 +14,23 @@ let params =
sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
};
- "8.7" = {
- version = "20171212";
- rev = "195e550a1cf0810497734356437a1720ebb6d744";
- sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1";
- };
"8.8" = rec {
- preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
version = "20190311";
rev = "22af9e9a223d0038f05638654422e637e863b355";
sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
- buildInputs = with coq.ocamlPackages; [ ocamlbuild num ];
- propagatedBuildInputs = [ coq-ext-lib simple-io ];
+ };
+
+ "8.9" = rec {
+ version = "1.1.0";
+ rev = "v${version}";
+ sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
};
};
param = params."${coq.coq-version}";
in
+let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
+
stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-QuickChick-${param.version}";
@@ -41,16 +41,19 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
+ preConfigure = stdenv.lib.optionalString recent
+ "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
+
buildInputs = [ coq ]
++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ])
- ++ (param.buildInputs or [])
+ ++ stdenv.lib.optionals recent
+ (with coq.ocamlPackages; [ ocamlbuild num ])
;
- propagatedBuildInputs = [ ssreflect ] ++ (param.propagatedBuildInputs or []);
+ propagatedBuildInputs = [ ssreflect ]
+ ++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ];
enableParallelBuilding = false;
- preConfigure = param.preConfigure or null;
-
installPhase = ''
make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
'';
diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix
index 55d59b931404a2bcf0199f019445aa2125ff8d84..e33b9427223ecffa72fa1341d3ee3d0b5da4e640 100644
--- a/pkgs/development/coq-modules/StructTact/default.nix
+++ b/pkgs/development/coq-modules/StructTact/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coq, mathcomp }:
+{ stdenv, fetchFromGitHub, coq }:
let param =
{
diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix
index 9b3b5320c8ede01e39e1e1b52226c6c51573d5b8..00d088a4a92c3d39b3a1348bd67b748357ebca3b 100644
--- a/pkgs/development/coq-modules/Verdi/default.nix
+++ b/pkgs/development/coq-modules/Verdi/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
passthru = {
- compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+ compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
};
}
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index 0d5a892e2e96345c76fcc1df2e452e9767506418..a074b27ff65879201580ca336abe5d5553dc3476 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -1,25 +1,29 @@
{ stdenv, fetchFromGitHub, coq }:
-let params =
- let v_8_8_0 = {
- rev = "V8.8.0";
- sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
+let params = {
+ "8.6" = {
+ rev = "v8.6.0";
+ sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj";
+ };
+ "8.7" = {
+ rev = "V8.7.0";
+ sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
+ };
+ "8.8" = {
+ rev = "V8.8.0";
+ sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
+ };
+ "8.9" = {
+ rev = "V8.9.0";
+ sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01";
+ };
+ "8.10" = {
+ rev = "V8.10+beta1";
+ sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404";
+ };
};
- in
- {
- "8.6" = {
- rev = "v8.6.0";
- sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj";
- };
- "8.7" = {
- rev = "V8.7.0";
- sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
- };
- "8.8" = v_8_8_0;
- "8.9" = v_8_8_0;
- };
- param = params."${coq.coq-version}"
-; in
+ param = params."${coq.coq-version}";
+in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
index 191812b3f2ebc06fd39bda29deed93d4e5b3365e..c67342f1a2f74be51225c5b7c9e306ac41a167d4 100644
--- a/pkgs/development/coq-modules/coqprime/default.nix
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -13,6 +13,7 @@ let params =
};
"8.8" = v_8_8;
"8.9" = v_8_8;
+ "8.10" = v_8_8;
};
param = params."${coq.coq-version}"
; in
diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix
index dc0f0873d07e33908d6b9044c89de2f02e44e855..e5fa11c5cad4a64d35d19217eec08af7e27f3e06 100644
--- a/pkgs/development/coq-modules/corn/default.nix
+++ b/pkgs/development/coq-modules/corn/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
};
passthru = {
- compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+ compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
};
}
diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index 86e5687321b407376e19893f9892ba3e8ea4582f..b31fcde1b80bd81a565e38853e2d3af4a0474fdb 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -15,15 +15,15 @@ let
};
"8.8" = {
- version = "1.0";
- rev = "v1.0-8.8";
- sha256 = "0dd7zd5j2sv5cw3mfwg33ss2vcj634q3qykakc41sv7f3rfgqfnn";
+ version = "1.2beta2";
+ rev = "v1.2-beta2-8.8";
+ sha256 = "1v9asdlhhks25ngnjn4dafx7nrcc5p0lhriqckh3y79nxbgpq4lx";
};
"8.9" = {
- version = "1.2beta";
- rev = "v1.2-beta-8.9";
- sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz";
+ version = "1.2beta2";
+ rev = "v1.2-beta2-8.9";
+ sha256 = "0y2zwv7jxs1crprj5qvg46h0v9wyfn99ln40yskq91y9h1lj5h3j";
};
};
param = params."${coq.coq-version}";
diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c610039eeec9c402ed1ff6dc15f47ff2a6e0327e
--- /dev/null
+++ b/pkgs/development/coq-modules/gappalib/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, which, coq, flocq }:
+
+stdenv.mkDerivation {
+ name = "coq${coq.coq-version}-gappalib-1.4.1";
+ src = fetchurl {
+ url = https://gforge.inria.fr/frs/download.php/file/37917/gappalib-coq-1.4.1.tar.gz;
+ sha256 = "0d3f23a871haglg8hq1jgxz3y5nryiwy12b5xfnfjn279jfqqjw4";
+ };
+
+ nativeBuildInputs = [ which ];
+ buildInputs = [ coq coq.ocamlPackages.ocaml ];
+ propagatedBuildInputs = [ flocq ];
+
+ configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Gappa";
+ buildPhase = "./remake";
+ installPhase = "./remake install";
+
+ meta = {
+ description = "Coq support library for Gappa";
+ license = stdenv.lib.licenses.lgpl21;
+ homepage = http://gappa.gforge.inria.fr/;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (coq.meta) platforms;
+ };
+
+ passthru = {
+ compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.7" "8.8" "8.9" ];
+ };
+
+}
diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..30917fcb78f23471edb9db3d188fc744a2365072
--- /dev/null
+++ b/pkgs/development/coq-modules/ltac2/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, which, coq }:
+
+let params = {
+ "8.7" = {
+ version = "0.1";
+ rev = "v0.1-8.7";
+ sha256 = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0";
+ };
+ "8.8" = {
+ version = "0.1";
+ rev = "0.1";
+ sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7";
+ };
+ "8.9" = {
+ version = "0.1";
+ rev = "a69551a49543b22a7d4e6a2484356b56bd05068e";
+ sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73";
+ };
+};
+ param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+ inherit (param) version;
+ name = "coq${coq.coq-version}-ltac2-${version}";
+
+ src = fetchFromGitHub {
+ owner = "coq";
+ repo = "ltac2";
+ inherit (param) rev sha256;
+ };
+
+ nativeBuildInputs = [ which ];
+ buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
+
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ meta = {
+ description = "A robust and expressive tactic language for Coq";
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ license = stdenv.lib.licenses.lgpl21;
+ inherit (coq.meta) platforms;
+ inherit (src.meta) homepage;
+ };
+
+ passthru = {
+ compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params;
+ };
+}
diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix
index 364366ced497fc3e080239ca33a74b301981f3d5..0fa17e292faadfc387c595f04855f7e7312f7112 100644
--- a/pkgs/development/coq-modules/math-classes/default.nix
+++ b/pkgs/development/coq-modules/math-classes/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
};
passthru = {
- compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+ compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
};
}
diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
deleted file mode 100644
index 8c3153712295b1033d8aa9cea6fc21390d49b21b..0000000000000000000000000000000000000000
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }:
-
-stdenv.mkDerivation rec {
- version = "0.2.0";
- name = "coq${coq.coq-version}-mathcomp-analysis-${version}";
-
- src = fetchFromGitHub {
- owner = "math-comp";
- repo = "analysis";
- rev = version;
- sha256 = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd";
- };
-
- buildInputs = [ coq ];
- propagatedBuildInputs = [ mathcomp-bigenough mathcomp-finmap ];
-
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
-
- meta = {
- description = "Analysis library compatible with Mathematical Components";
- inherit (src.meta) homepage;
- inherit (coq.meta) platforms;
- license = stdenv.lib.licenses.cecill-c;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.8" "8.9" ];
- };
-}
diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix
deleted file mode 100644
index e1f58edc9cbc2baf1dc09944a74d5d5af3097357..0000000000000000000000000000000000000000
--- a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchFromGitHub, coq, mathcomp }:
-
-stdenv.mkDerivation rec {
- version = "1.0.0";
- name = "coq${coq.coq-version}-mathcomp-bigenough-${version}";
-
- src = fetchFromGitHub {
- owner = "math-comp";
- repo = "bigenough";
- rev = version;
- sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg";
- };
-
- buildInputs = [ coq ];
- propagatedBuildInputs = [ mathcomp ];
-
- installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/";
-
- meta = {
- description = "A small library to do epsilon - N reasonning";
- inherit (src.meta) homepage;
- inherit (mathcomp.meta) platforms license;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
- };
-}
diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix
deleted file mode 100644
index c36b72711ff61eede0a5a87cc033ef09aeed82b8..0000000000000000000000000000000000000000
--- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchFromGitHub, coq, mathcomp }:
-
-let param =
- if stdenv.lib.versionAtLeast mathcomp.version "1.8.0"
- then {
- version = "1.2.0";
- sha256 = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4";
- } else {
- version = "1.1.0";
- sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
- }
-; in
-
-stdenv.mkDerivation rec {
- inherit (param) version;
- name = "coq${coq.coq-version}-mathcomp-finmap-${version}";
-
- src = fetchFromGitHub {
- owner = "math-comp";
- repo = "finmap";
- rev = version;
- inherit (param) sha256;
- };
-
- buildInputs = [ coq ];
- propagatedBuildInputs = [ mathcomp ];
-
- installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/";
-
- meta = {
- description = "A finset and finmap library";
- inherit (src.meta) homepage;
- inherit (mathcomp.meta) platforms license;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
- };
-}
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 8b4c74fb1a54e7fdada7e8b3a9257ea6cfd395ae..d573eca809a276c5d8031036560765d4fbbdc110 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,70 +1,168 @@
-{ stdenv, fetchFromGitHub, coq, ncurses, which
-, graphviz, withDoc ? false
+{ stdenv, fetchFromGitHub, ncurses, which, graphviz, coq,
+ recurseIntoAttrs, withDoc ? false
}:
-
-let param =
-
- if stdenv.lib.versionAtLeast coq.coq-version "8.7" then
- {
- version = "1.8.0";
- sha256 = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
- }
- else if stdenv.lib.versionAtLeast coq.coq-version "8.6" then
- {
- version = "1.7.0";
- sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
- }
- else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then
- {
- version = "1.6.1";
- sha256 = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i";
- }
- else throw "No version of math-comp is available for Coq ${coq.coq-version}";
-
-in
-
-stdenv.mkDerivation rec {
- name = "coq${coq.coq-version}-mathcomp-${version}";
-
- # used in ssreflect
- inherit (param) version;
-
- src = fetchFromGitHub {
- owner = "math-comp";
- repo = "math-comp";
- rev = "mathcomp-${param.version}";
- inherit (param) sha256;
+with builtins // stdenv.lib;
+let
+ ####################################
+ # CONFIGURATION (please edit this) #
+ ####################################
+ # sha256 of released mathcomp versions
+ mathcomp-sha256 = {
+ "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";
+ "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
+ "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
+ "1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i";
+ };
+ # versions of coq compatible with released mathcomp versions
+ mathcomp-coq-versions = {
+ "1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"];
+ "1.8.0" = flip elem ["8.7" "8.8" "8.9"];
+ "1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"];
+ "1.6.1" = flip elem ["8.5"];
};
+ # computes the default version of mathcomp given a version of Coq
+ max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions));
+ # mathcomp prefered version by decreasing order
+ # (the first version in the list will be tried first)
+ mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.7.0" "1.6.1" ];
- nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
- buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
+ ##############################################################
+ # COMPUTED using the configuration above (edit with caution) #
+ ##############################################################
+ default-mathcomp-version = let v = head (
+ filter (mc: mathcomp-coq-versions."${mc}" coq.coq-version)
+ mathcomp-version-preference ++ ["0.0.0"]);
+ in if v == "0.0.0" then max-mathcomp-version else v;
- enableParallelBuilding = true;
+ # list of core mathcomp packages sorted by dependency order
+ mathcomp-packages =
+ [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ];
+ # compute the dependencies of the core package pkg
+ # (assuming the total ordering above, rewrite if necessary)
+ mathcomp-deps = pkg: if pkg == "single" then [] else
+ (split (x: x == pkg) mathcomp-packages).left;
- buildFlags = stdenv.lib.optionalString withDoc "doc";
+ # generic split function (TODO: move to lib?)
+ split = pred: l:
+ let loop = v: l: if l == [] then {left = v; right = [];}
+ else let hd = builtins.head l; tl = builtins.tail l; in
+ if pred hd then {left = v; right = tl;} else loop (v ++ [hd]) tl;
+ in loop [] l;
- COQBIN = "${coq}/bin/";
+ # exported, documented at the end.
+ mathcompGen = mkMathcompGenFrom (_: {}) mathcomp-packages;
- preBuild = ''
- patchShebangs etc/utils/ssrcoqdep || true
- cd mathcomp
- '';
+ # exported, documented at the end.
+ mathcompGenSingle = mkMathcompGen (_: {}) "single";
- installPhase = ''
- make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
- '' + stdenv.lib.optionalString withDoc ''
- make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
- '';
+ # mkMathcompGen: internal mathcomp package generator
+ # returns {error = ...} if impossible to generate
+ # returns {${mathcomp-pkg} = } otherwise
+ mkMathcompGenFrom = o: l: mcv: fold (pkg: pkgs: pkgs // mkMathcompGen o pkg mcv) {} l;
+ mkMathcompGen = overrides: mathcomp-pkg: mathcomp-version:
+ let
+ coq-version-check = mathcomp-coq-versions.${mathcomp-version} or (_: false);
+ pkgpath = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp/${mathcomp-pkg}";
+ pkgname = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp-${mathcomp-pkg}";
+ pkgallMake = ''
+ echo "all.v" > Make
+ echo "-I ." >> Make
+ echo "-R . mathcomp.all" >> Make
+ '';
+ is-released = builtins.isString mathcomp-version;
+ custom-version = if is-released then mathcomp-version else "custom";
- meta = with stdenv.lib; {
- homepage = http://ssr.msr-inria.inria.fr/;
- license = licenses.cecill-b;
- maintainers = [ maintainers.vbgl maintainers.jwiegley ];
- platforms = coq.meta.platforms;
- };
+ # the base set of attributes for mathcomp
+ attrs = rec {
+ name = "coq${coq.coq-version}-${pkgname}-${custom-version}";
- passthru = {
- compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
- };
+ # used in ssreflect
+ version = custom-version;
+
+ src = if is-released then fetchFromGitHub {
+ owner = "math-comp";
+ repo = "math-comp";
+ rev = "mathcomp-${mathcomp-version}";
+ sha256 = mathcomp-sha256.${mathcomp-version};
+ } else mathcomp-version;
+
+ nativeBuildInputs = optionals withDoc [ graphviz ];
+ buildInputs = [ ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
+ propagatedBuildInputs = [ coq ] ++
+ attrValues (mkMathcompGenFrom overrides (mathcomp-deps mathcomp-pkg) mathcomp-version);
+ enableParallelBuilding = true;
+
+ buildFlags = optionalString withDoc "doc";
+
+ COQBIN = "${coq}/bin/";
+
+ preBuild = ''
+ patchShebangs etc/utils/ssrcoqdep || true
+ cd ${pkgpath}
+ '' + optionalString (mathcomp-pkg == "all") pkgallMake;
+
+ installPhase = ''
+ make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+ '' + optionalString withDoc ''
+ make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://ssr.msr-inria.inria.fr/;
+ license = licenses.cecill-b;
+ maintainers = [ maintainers.vbgl maintainers.jwiegley ];
+ platforms = coq.meta.platforms;
+ };
+
+ passthru = {
+ compatibleCoqVersions = coq-version-check;
+ currentOverrides = overrides;
+ overrideMathcomp = moreOverrides:
+ (mkMathcompGen (old: let new = overrides old; in new // moreOverrides new)
+ mathcomp-pkg mathcomp-version).${mathcomp-pkg};
+ mathcompGen = moreOverrides:
+ (mkMathcompGenFrom (old: let new = overrides old; in new // moreOverrides new)
+ mathcomp-packages mathcomp-version);
+ };
+ };
+ in
+ {"${mathcomp-pkg}" = stdenv.mkDerivation (attrs // overrides attrs);};
+
+getAttrOr = a: n: a."${n}" or (throw a.error);
+
+mathcompCorePkgs_1_7 = mathcompGen "1.7.0";
+mathcompCorePkgs_1_8 = mathcompGen "1.8.0";
+mathcompCorePkgs_1_9 = mathcompGen "1.9.0";
+mathcompCorePkgs = recurseIntoAttrs
+ (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version));
+
+in rec {
+# mathcompGenSingle: given a version of mathcomp
+# generates an attribute set {single = ;} with the single mathcomp derivation
+inherit mathcompGenSingle;
+mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single";
+mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single";
+mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single";
+mathcomp_single = dontDistribute
+ (getAttrOr (mathcompGenSingle default-mathcomp-version) "single");
+
+# mathcompGen: given a version of mathcomp
+# generates an attribute set {ssreflect = ; ... character = ; all = ;}.
+# each of these have a special attribute overrideMathcomp which
+# must be used instead of overrideAttrs in order to also fix the dependencies
+inherit mathcompGen mathcompCorePkgs
+ mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9;
+
+
+mathcomp = getAttrOr mathcompCorePkgs "all";
+mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all";
+mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all";
+mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all";
+
+ssreflect = getAttrOr mathcompCorePkgs "ssreflect";
-}
+} //
+(mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) //
+(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) //
+(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) //
+(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9)
diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0d9557623c36fb3902534d180547bc34e5d5f649
--- /dev/null
+++ b/pkgs/development/coq-modules/mathcomp/extra.nix
@@ -0,0 +1,202 @@
+{ stdenv, fetchFromGitHub, coq, ssreflect, coqPackages,
+ recurseIntoAttrs }:
+with builtins // stdenv.lib;
+let current-ssreflect = ssreflect; in
+let
+# configuring packages
+param = {
+ finmap = {
+ version-sha256 = {
+ "1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf";
+ "1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4";
+ "1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
+ "1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa";
+ };
+ description = "A finset and finmap library";
+ };
+ bigenough = {
+ version-sha256 = {"1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg";};
+ description = "A small library to do epsilon - N reasonning";
+ };
+ multinomials = {
+ version-sha256 = {
+ "1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4";
+ "1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq";
+ "1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s";
+ "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
+ };
+ description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
+ };
+ analysis = {
+ version-sha256 = {
+ "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk";
+ "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd";
+ "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al";
+ };
+ compatibleCoqVersions = flip elem ["8.8" "8.9"];
+ description = "Analysis library compatible with Mathematical Components";
+ license = stdenv.lib.licenses.cecill-c;
+ };
+ real-closed = {
+ version-sha256 = {
+ "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb";
+ "1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl";
+ "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg";
+ };
+ description = "Mathematical Components Library on real closed fields";
+ };
+ coqeal = {
+ version-sha256 = {
+ "1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii";
+ };
+ description = "CoqEAL - The Coq Effective Algebra Library";
+ owner = "CoqEAL";
+ compatibleCoqVersions = flip elem ["8.7" "8.8" "8.9"];
+ license = stdenv.lib.licenses.mit;
+ };
+};
+versions = {
+ "1.9.0" = {
+ finmap.version = "1.2.1";
+ bigenough.version = "1.0.0";
+ analysis = {
+ version = "0.2.2";
+ core-deps = with coqPackages; [ mathcomp-field_1_9 ];
+ extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ];
+ };
+ multinomials = {
+ version = "1.3";
+ core-deps = with coqPackages; [ mathcomp-algebra_1_9 ];
+ extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ];
+ };
+ real-closed = {
+ version = "1.0.3";
+ core-deps = with coqPackages; [ mathcomp-field_1_9 ];
+ extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ];
+ };
+ };
+ "1.8.0" = {
+ finmap.version = "1.2.1";
+ bigenough.version = "1.0.0";
+ analysis = {
+ version = "0.2.2";
+ core-deps = with coqPackages; [ mathcomp-field_1_8 ];
+ extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ];
+ };
+ multinomials = {
+ version = "1.3";
+ core-deps = with coqPackages; [ mathcomp-algebra_1_8 ];
+ extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ];
+ };
+ real-closed = {
+ version = "1.0.3";
+ core-deps = with coqPackages; [ mathcomp-field_1_8 ];
+ extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ];
+ };
+ coqeal = {
+ version = "1.0.0";
+ core-deps = with coqPackages; [ mathcomp-algebra_1_8 ];
+ extra-deps = with coqPackages; [ bignums paramcoq mathcomp_1_8-multinomials ];
+ };
+ };
+ "1.7.0" = {
+ finmap.version = "1.1.0";
+ bigenough.version = "1.0.0";
+ analysis = {
+ version = "0.1.0";
+ core-deps = with coqPackages; [ mathcomp-field_1_7 ];
+ extra-deps = with coqPackages; [ mathcomp_1_7-finmap mathcomp_1_7-bigenough ];
+ };
+ multinomials = {
+ version = "1.1";
+ core-deps = with coqPackages; [ mathcomp-algebra_1_7 ];
+ extra-deps = with coqPackages; [ mathcomp_1_7-finmap_1_0 mathcomp_1_7-bigenough ];
+ };
+ real-closed = {
+ version = "1.0.1";
+ core-deps = with coqPackages; [ mathcomp-field_1_7 ];
+ extra-deps = with coqPackages; [ mathcomp_1_7-bigenough ];
+ };
+ };
+};
+
+# generic package generator
+packageGen = {
+ # optional arguments
+ src ? "",
+ owner ? "math-comp",
+ extra-deps ? [],
+ ssreflect ? current-ssreflect,
+ core-deps ? null,
+ compatibleCoqVersions ? null,
+ license ? ssreflect.meta.license,
+ # mandatory
+ package, version ? "broken", version-sha256, description
+ }:
+ let
+ theCompatibleCoqVersions = if compatibleCoqVersions == null
+ then ssreflect.compatibleCoqVersions
+ else compatibleCoqVersions;
+ mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps;
+ in
+ { "${package}" = let from = src; in
+
+ stdenv.mkDerivation rec {
+ inherit version;
+ name = "coq${coq.coq-version}-mathcomp${ssreflect.version}-${package}-${version}";
+
+ src = if from == "" then fetchFromGitHub {
+ owner = owner;
+ repo = package;
+ rev = version;
+ sha256 = version-sha256."${version}";
+ } else from;
+
+ propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps;
+
+ installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ meta = {
+ inherit description;
+ inherit license;
+ inherit (src.meta) homepage;
+ inherit (ssreflect.meta) platforms;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ broken = (version == "broken");
+ };
+
+ passthru = {
+ inherit version-sha256;
+ compatibleCoqVersions = if meta.broken then _: false
+ else theCompatibleCoqVersions;
+ };
+ };
+ };
+
+current-versions = versions."${current-ssreflect.version}" or {};
+
+select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x);
+
+for-version = v: suffix: (mapAttrs' (n: pkg:
+ {name = "mathcomp_${suffix}-${n}";
+ value = (packageGen ({
+ ssreflect = coqPackages."mathcomp-ssreflect_${suffix}";
+ } // pkg))."${n}";})
+ (select versions."${v}"));
+
+all = (for-version "1.7.0" "1_7") //
+ (for-version "1.8.0" "1_8") //
+ (for-version "1.9.0" "1_9") //
+ (recurseIntoAttrs (mapDerivationAttrset dontDistribute (
+ mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";})
+ (select current-versions))));
+in
+{
+mathcompExtraGen = packageGen;
+mathcomp_1_7-finmap_1_0 =
+ (packageGen (select {finmap = {version = "1.0.0";
+ ssreflect = coqPackages.mathcomp-ssreflect_1_7;};
+ }).finmap).finmap;
+multinomials = all.mathcomp-multinomials;
+coqeal = all.mathcomp-coqeal;
+} // all
diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix
deleted file mode 100644
index aa22c96256f591609f9267dc783c089a7905ff4b..0000000000000000000000000000000000000000
--- a/pkgs/development/coq-modules/multinomials/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub, coq, mathcomp }:
-
-stdenv.mkDerivation rec {
- name = "coq${coq.coq-version}-multinomials-${version}";
- version = "1.0";
- src = fetchFromGitHub {
- owner = "math-comp";
- repo = "multinomials";
- rev = version;
- sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
- };
-
- buildInputs = [ coq ];
- propagatedBuildInputs = [ mathcomp ];
-
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
-
- meta = {
- description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
- inherit (src.meta) homepage;
- license = stdenv.lib.licenses.cecill-b;
- inherit (coq.meta) platforms;
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
- };
-}
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
index 6ed343952f217053472ec2b22386e82458f5e8cf..e74b158d33a31e19ef215a80eb1d1e6d1dd5db59 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, coq, coq-ext-lib }:
stdenv.mkDerivation rec {
- version = "1.0.0";
+ version = "1.2.0";
name = "coq${coq.coq-version}-simple-io-${version}";
src = fetchFromGitHub {
owner = "Lysxia";
repo = "coq-simple-io";
rev = version;
- sha256 = "06gnbl8chv6ig18rlxnp8gg0np6863kxd7j15h46q0v1cnpx84lp";
+ sha256 = "1im1vwp7l7ha8swnhgbih0qjg187n8yx14i003nf6yy7p0ryxc9m";
};
buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
};
passthru = {
- compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.7";
+ compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" ];
};
}
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 1fcb7e2da8ae5c4069a69ed6a225b6879067a63f..01df38375efb5ee7e800dd43bb6786686ead9fb0 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coq, ncurses, which
+{ stdenv, coq, ncurses, which
, graphviz, mathcomp, withDoc ? false
}:
diff --git a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch
deleted file mode 100644
index ed9b7adbef2137a9aba4c10d578c1e5264666c32..0000000000000000000000000000000000000000
--- a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj.old 2015-01-11 06:46:39.000000000 +0000
-+++ Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj 2015-05-25 21:29:40.546808622 +0100
-@@ -52,6 +52,8 @@
-
-
-
-+
-+
-
-
-
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index fed0234b46c2407673260f0e088960c09d583b9e..cd98aa1fa9a68e25cfb427e2d57d91e4f0a95cc2 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -54,6 +54,7 @@ let
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
+ mkdir -p "''${GOPATH}/pkg/mod/cache/download"
runHook postConfigure
'';
@@ -124,7 +125,7 @@ let
local type;
type="$1"
if [ -n "$subPackages" ]; then
- echo "./$subPackages"
+ echo "$subPackages" | sed "s,\(^\| \),\1./,g"
else
find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique
fi
@@ -143,6 +144,7 @@ let
export NIX_BUILD_CORES=1
fi
for pkg in $(getGoDirs ""); do
+ echo "Building subPackage $pkg"
buildGoDir install "$pkg"
done
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index eb45f446dc9d65ea62f5563957ba00335e436fba..b3386aaf24bf24380a37fbde7cbdb4c6e7db340d 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -35,14 +35,12 @@
# IE: programs coupled with the compiler
, allowGoReference ? false
-, meta ? {}, ... } @ args':
+, meta ? {}, ... } @ args:
with builtins;
let
- args = lib.filterAttrs (name: _: name != "extraSrcs") args';
-
removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
@@ -74,14 +72,19 @@ let
goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
else extraSrcs;
- package = go.stdenv.mkDerivation (
- (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
+ package = stdenv.mkDerivation (
+ (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // {
nativeBuildInputs = [ removeReferencesTo go ]
++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
buildInputs = buildInputs;
- inherit (go) GOOS GOARCH;
+ inherit (go) GOOS GOARCH GO386 CGO_ENABLED;
+
+ GOHOSTARCH = go.GOHOSTARCH or null;
+ GOHOSTOS = go.GOHOSTOS or null;
+
+ GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
configurePhase = args.configurePhase or ''
runHook preConfigure
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index 4bd49b06796dc7a7e8f5b92ded73ffd652465a07..592e6ad89994e59eded4662c91e2c44e3cf18c69 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ guile cairo expat ];
enableParallelBuilding = true;
- doCheck = true;
+ doCheck = false; # Cannot find unit-test module from guile-lib
checkInputs = [ guile-lib ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index c3aa8400791742c1505f52d62055a8733b9808f6..cea464ad5d279c8e5ac74141a67efba1e3080d04 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -4,23 +4,18 @@ assert stdenv ? cc && stdenv.cc.isGNU;
let
name = "guile-lib-${version}";
- version = "0.2.2";
+ version = "0.2.6.1";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://savannah/guile-lib/${name}.tar.gz";
- sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b";
+ sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ guile texinfo ];
- # One test doesn't seem to be compatible with guile_2_2.
- patchPhase = ''
- sed -i -e '/sxml.ssax.scm/d' unit-tests/Makefile*
- '';
-
doCheck = true;
preCheck = ''
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4aa21ca04d55a7666ac2cee4813ed819840f43d4..c975b1e2a2caedd62ecd7ee9539f7ae7a1fff9e7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -38,26 +38,17 @@ self: super: {
# The test suite depends on old versions of tasty and QuickCheck.
hackage-security = dontCheck super.hackage-security;
- # Link statically to avoid runtime dependency on GHC.
- jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
-
# enable using a local hoogle with extra packagages in the database
# nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
# $ hoogle server
hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; };
- # Break infinite recursions.
- attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; };
- Dust-crypto = dontCheck super.Dust-crypto;
- hasql-postgres = dontCheck super.hasql-postgres;
- hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; };
- hspec-expectations = dontCheck super.hspec-expectations;
- HTTP = dontCheck super.HTTP;
- http-streams = dontCheck super.http-streams;
- nanospec = dontCheck super.nanospec;
- options = dontCheck super.options;
+ # Needs older QuickCheck version
+ attoparsec-varword = dontCheck super.attoparsec-varword;
+
+ # Tests are failing
+ # https://github.com/bos/statistics/issues/123
statistics = dontCheck super.statistics;
- vector-builder = dontCheck super.vector-builder;
# These packages (and their reverse deps) cannot be built with profiling enabled.
ghc-heap-view = disableLibraryProfiling super.ghc-heap-view;
@@ -66,16 +57,13 @@ self: super: {
# This test keeps being aborted because it runs too quietly for too long
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
- # Use the default version of mysql to build this package (which is actually mariadb).
- # test phase requires networking
- mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
-
# check requires mysql server
mysql-simple = dontCheck super.mysql-simple;
mysql-haskell = dontCheck super.mysql-haskell;
- # Link the proper version.
- zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
+ # Tests failing, fixed once 0.8.0 is in stackage
+ # https://gitlab.com/twittner/zeromq-haskell/issues/63
+ zeromq4-haskell = dontCheck super.zeromq4-haskell;
# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
# https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
@@ -84,7 +72,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "08gw3b5gbbxs2dr3b4zf9xsvhbvpqjj4ikmvzmcvs3fh1q65xbgl";
+ sha256 = "11d4qyhmc774h2xyrpyn9rxx99x3vjs0fcxsg49gj5ayzmykafap";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -104,7 +92,7 @@ self: super: {
# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;
- # Test suite doesn't terminate
+ # Tests require older tasty
hzk = dontCheck super.hzk;
# Tests require a Kafka broker running locally
@@ -142,6 +130,7 @@ self: super: {
feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1
hoodle-core = dontHaddock super.hoodle-core;
hsc3-db = dontHaddock super.hsc3-db;
+ classy-prelude-yesod = dontHaddock super.classy-prelude-yesod; # https://github.com/haskell/haddock/issues/979
# https://github.com/techtangents/ablist/issues/1
ABList = dontCheck super.ABList;
@@ -164,10 +153,7 @@ self: super: {
then dontCheck (overrideCabal super.hakyll (drv: {
testToolDepends = [];
}))
- else appendPatch super.hakyll (pkgs.fetchpatch {
- url = "https://github.com/jaspervdj/hakyll/pull/691/commits/a44ad37cd15310812e78f7dab58d6d460451f20c.patch";
- sha256 = "13xpznm19rjp51ds165ll9ahyps1r4131c77b8r7gpjd6i505832";
- });
+ else super.hakyll;
double-conversion = if !pkgs.stdenv.isDarwin
then super.double-conversion
@@ -371,6 +357,7 @@ self: super: {
pwstore-cli = dontCheck super.pwstore-cli;
quantities = dontCheck super.quantities;
redis-io = dontCheck super.redis-io;
+ reflex = dontCheck super.reflex; # test suite uses hlint, which has different haskell-src-exts version
rethinkdb = dontCheck super.rethinkdb;
Rlang-QQ = dontCheck super.Rlang-QQ;
safecopy = dontCheck super.safecopy;
@@ -764,7 +751,7 @@ self: super: {
};
in overrideCabal super.servant (old: {
postInstall = old.postInstall or "" + ''
- ln -s ${docs} $doc/share/doc/servant
+ ln -s ${docs} ''${!outputDoc}/share/doc/servant
'';
});
@@ -874,7 +861,7 @@ self: super: {
# Wrap the generated binaries to include their run-time dependencies in
# $PATH. Also, cryptol needs a version of sbl that's newer than what we have
# in LTS-13.x.
- cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: {
+ cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_3; }) (drv: {
buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ];
postInstall = drv.postInstall or "" + ''
for b in $out/bin/cryptol $out/bin/cryptol-html; do
@@ -1101,10 +1088,33 @@ self: super: {
# https://github.com/haskell-hvr/hgettext/issues/14
hgettext = doJailbreak super.hgettext;
+ # haddock-api-2.22.0: Break out of “QuickCheck ==2.11.*, hspec >=2.4.4 && <2.6â€
+ haddock-api = dontHaddock (doJailbreak (super.haddock-api));
+
# 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_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
+ # haskell-names-0.9.4: Break out of “tasty >=0.12 && <1.2â€
+ haskell-names = doJailbreak super.haskell-names;
+
+ haskell-names_0_9_6 = super.haskell-names_0_9_6.overrideScope (self: super: {
+ haskell-src-exts = self.haskell-src-exts_1_21_0;
+ });
+
+ # hdocs-0.5.3.1: Break out of “haddock-api ==2.21.*â€
+ # cannot use doJailbreak due to https://github.com/peti/jailbreak-cabal/issues/7
+ hdocs = overrideCabal super.hdocs (drv: {
+ postPatch = ''
+ sed -i 's#haddock-api == 2\.21\.\*,#haddock-api == 2.22.*,#' hdocs.cabal
+ '';
+ });
+
+ hsdev_0_3_3_1 = super.hsdev_0_3_3_1.overrideScope (self: super: {
+ haskell-names = self.haskell-names_0_9_6;
+ network = self.network_3_0_1_1;
+ });
+
# Break out of tasty >=0.10 && <1.2.
aeson-compat = doJailbreak super.aeson-compat;
@@ -1113,7 +1123,15 @@ self: super: {
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
- stack = generateOptparseApplicativeCompletion "stack" super.stack;
+ stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
+ ansi-terminal = self.ansi-terminal_0_9_1;
+ concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version
+ hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser); # Avoid depending on newer hspec versions.
+ http-download = dontCheck (unmarkBroken super.http-download);
+ pantry-tmp = dontCheck (unmarkBroken super.pantry-tmp);
+ rio = self.rio_0_1_10_0;
+ rio-prettyprint = unmarkBroken super.rio-prettyprint;
+ }));
# musl fixes
# dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
@@ -1188,14 +1206,13 @@ self: super: {
# https://github.com/mgajda/json-autotype/issues/25
json-autotype = dontCheck super.json-autotype;
- # The LTS-12.x version doesn't suffice to build hlint, hoogle, etc.
+ # The LTS-13.x versions doesn't suffice to build these packages.
hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
# Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
these = doJailbreak super.these; # until these >= 0.7.6
- insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch;
uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch {
url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch";
@@ -1232,23 +1249,27 @@ self: super: {
# Use latest pandoc despite what LTS says.
# Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309.
- pandoc = doDistribute super.pandoc_2_7_2;
+ cmark-gfm = self.cmark-gfm_0_2_0;
+ pandoc = dontCheck (doDistribute super.pandoc_2_7_3); # test suite failure: https://github.com/jgm/pandoc/issues/5582
pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2;
+ skylighting = self.skylighting_0_8_1_1;
+ skylighting-core = self.skylighting-core_0_8_1_1;
- # https://github.com/qfpl/tasty-hedgehog/issues/24
- tasty-hedgehog = dontCheck super.tasty-hedgehog;
+ # Current versions of tasty-hedgehog need hedgehog 1.x, which
+ # we don't have in LTS-13.x.
+ tasty-hedgehog = super.tasty-hedgehog.override { hedgehog = self.hedgehog_1_0; };
# The latest release version is ancient. You really need this tool from git.
haskell-ci = generateOptparseApplicativeCompletion "haskell-ci"
(addBuildDepend (overrideSrc (dontCheck super.haskell-ci) {
- version = "20190307-git";
+ version = "20190625-git";
src = pkgs.fetchFromGitHub {
owner = "haskell-CI";
repo = "haskell-ci";
- rev = "2baceb59bc2f36e798ff9fb6e8865c449f01d3a2";
- sha256 = "1wqhqajxni6h9rrj22xj6421d4m0gs8qk2glghpdp307ns5gr2j4";
+ rev = "260f967c6973dfb22ecc8061a1811a2ea4b79e01";
+ sha256 = "1mvn6pqa6wfcm4jxhlhm4l54pwrlgnz7vdrmkwabliwz4q0bzgqk";
};
- }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck]));
+ }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck exceptions temporary]));
# Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
@@ -1262,4 +1283,38 @@ self: super: {
lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; socks = self.socks_0_6_0; connection = self.connection_0_3_0; haskell-src-exts = self.haskell-src-exts_1_21_0; });
+ # Some tests depend on a postgresql instance
+ # Haddock failure: https://github.com/haskell/haddock/issues/979
+ esqueleto = dontHaddock (dontCheck super.esqueleto);
+
+ # Requires API keys to run tests
+ algolia = dontCheck super.algolia;
+
+ # antiope-s3's latest stackage version has a hspec < 2.6 requirement, but
+ # hspec which isn't in stackage is already past that
+ antiope-s3 = doJailbreak super.antiope-s3;
+
+ # Has tasty < 1.2 requirement, but works just fine with 1.2
+ temporary-resourcet = doJailbreak super.temporary-resourcet;
+
+ # Requires dhall >= 1.23.0
+ ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_24_0; };
+ dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_24_0; };
+
+ # Test suite doesn't work with current QuickCheck
+ # https://github.com/pruvisto/heap/issues/11
+ heap = dontCheck super.heap;
+
+ # https://github.com/hslua/tasty-lua/issues/1
+ tasty-lua = dontCheck super.tasty-lua;
+
+ # Test suite won't link for no apparent reason.
+ constraints-deriving = dontCheck super.constraints-deriving;
+
+ # The old LTS-13.x version does not compile.
+ ip = self.ip_1_5_0;
+
+ # Needs deque >= 0.3, but latest version on stackage is 2.7
+ butcher = super.butcher.override { deque = self.deque_0_4_2_3; };
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 2b58e5ce5e2378470ab06dede13664bb625fad14..dc3071e5fab3a8be4b56a9d02165916f48e98de6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -41,8 +41,49 @@ self: super: {
unix = null;
xhtml = null;
+ # Use the current git version of cabal-install.
+ cabal-install = overrideCabal (super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal-git; })) (drv: {
+ src = pkgs.fetchFromGitHub {
+ owner = "haskell";
+ repo = "cabal";
+ rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386";
+ sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i";
+ };
+ version = "20190510-git";
+ editedCabalFile = null;
+ postUnpack = "sourceRoot+=/cabal-install";
+ jailbreak = true;
+ });
+ Cabal-git = overrideCabal super.Cabal_2_4_1_0 (drv: {
+ src = pkgs.fetchFromGitHub {
+ owner = "haskell";
+ repo = "cabal";
+ rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386";
+ sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i";
+ };
+ version = "20190510-git";
+ editedCabalFile = null;
+ postUnpack = "sourceRoot+=/Cabal";
+ });
+
# Ignore overly restrictive upper version bounds.
+ async = doJailbreak super.async;
+ ChasingBottoms = doJailbreak super.ChasingBottoms;
+ cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
+ Diff = dontCheck super.Diff;
doctest = doJailbreak super.doctest;
+ hashable = doJailbreak super.hashable;
+ hashable-time = doJailbreak super.hashable-time;
+ integer-logarithms = doJailbreak super.integer-logarithms;
+ lucid = doJailbreak super.lucid;
+ parallel = doJailbreak super.parallel;
+ quickcheck-instances = doJailbreak super.quickcheck-instances;
+ setlocale = doJailbreak super.setlocale;
+ split = doJailbreak super.split;
+ tasty-expected-failure = doJailbreak super.tasty-expected-failure;
+ test-framework = doJailbreak super.test-framework;
+ th-lift = self.th-lift_0_8_0_1;
+ hledger-lib = doJailbreak super.hledger-lib; # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3
# These packages don't work and need patching and/or an update.
primitive = overrideSrc (doJailbreak super.primitive) {
@@ -54,5 +95,110 @@ self: super: {
sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
};
};
+ tar = overrideCabal (appendPatch super.tar (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.patch";
+ sha256 = "1inbfpamfdpi3yfac59j5xpaq5fvh5g1ca8hlbpic1bizd3s03i0";
+ })) (drv: {
+ configureFlags = ["-f-old-time"];
+ editedCabalFile = null;
+ preConfigure = ''
+ cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.cabal"; sha256 = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";}} tar.cabal
+ sed -i -e 's/time < 1.9/time < 2/' tar.cabal
+ '';
+ });
+ resolv = overrideCabal (overrideSrc super.resolv {
+ version = "20180411-git";
+ src = pkgs.fetchFromGitHub {
+ owner = "haskell-hvr";
+ repo = "resolv";
+ rev = "a22f9dd900cb276b3dd70f4781fb436d617e2186";
+ sha256 = "1j2jyywmxjhyk46kxff625yvg5y37knv7q6y0qkwiqdwdsppccdk";
+ };
+ }) (drv: {
+ buildTools = with pkgs; [autoconf];
+ preConfigure = "autoreconf --install";
+ });
+ dlist = appendPatch (doJailbreak super.dlist) (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch";
+ sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc";
+ });
+ vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
+ sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
+ });
+ cabal-doctest = appendPatch (doJailbreak super.cabal-doctest) (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch";
+ sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j";
+ });
+ QuickCheck = appendPatch super.QuickCheck (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/QuickCheck-2.13.1.patch";
+ sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcvbl";
+ });
+ regex-base = appendPatch super.regex-base (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
+ sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";
+ });
+ regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
+ sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
+ });
+ th-abstraction = appendPatch (doJailbreak super.th-abstraction) (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/th-abstraction-0.2.11.0.patch";
+ sha256 = "0czqfszfblz6bvsybcd1z5jijj79f9czqq6dn992wp2gibsbrgj3";
+ });
+ zlib = appendPatch super.zlib (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch";
+ sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif";
+ });
+ haskell-src-exts = appendPatch super.haskell-src-exts_1_21_0 (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch";
+ sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3";
+ });
+ optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
+ sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
+ });
+ HTTP = appendPatch (doJailbreak super.HTTP) (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/HTTP-4000.3.13.patch";
+ sha256 = "1fadi529x7dnmbfmls5969qfn9d4z954nc4lbqxmrwgirphkpmn4";
+ });
+ hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
+ sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
+ });
+ happy = appendPatch super.happy (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.9.patch";
+ sha256 = "1zmcb7dgcwivq2mddcy1f20djw2kds1m7ahwsa4xpbbwnijc6zjx";
+ });
+ hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch";
+ sha256 = "04xwznd3lfgracfz68ls6vfm19rhq8fb74r6ii0grpv6cx4rr21i";
+ });
+ easytest = self.easytest_0_3;
+ regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
+ sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
+ });
+ unordered-containers = self.unordered-containers_0_2_10_0;
+ attoparsec = appendPatch super.attoparsec (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
+ sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
+ });
+ aeson = appendPatch (dontCheck super.aeson) (pkgs.fetchpatch { # the test suite breaks the compiler
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/aeson-1.4.3.0.patch";
+ sha256 = "1z6wmsmc682qs3y768r0zx493dxardwbsp0wdc4dsx83c0m5x66f";
+ });
+ cassava = appendPatch super.cassava (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
+ sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
+ });
+ shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
+ sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
+ });
+ lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch";
+ sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1";
+ });
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5952cbd16c2bb7cd3e61a5c2940f2c4c6bb28dbc..ee519f903ca9588eb34a4edc8c632a15a718c0ef 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,10 +43,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
- # Newer versions don't work in LTS-12.x
- - alsa-mixer < 0.3
- - cassava-megaparsec < 2
- # LTS Haskell 13.19
+ # LTS Haskell 13.27
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -64,19 +61,19 @@ default-package-overrides:
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.1.1.0
- aeson-compat ==0.3.9
- - aeson-diff ==1.1.0.5
+ - aeson-diff ==1.1.0.7
- aeson-extra ==0.4.1.1
- aeson-generic-compat ==0.0.1.3
- aeson-iproute ==0.2
- aeson-picker ==0.1.0.4
- aeson-pretty ==0.8.7
- aeson-qq ==0.8.2
- - aeson-typescript ==0.1.1.0
+ - aeson-typescript ==0.1.3.0
- aeson-utils ==0.3.0.2
- aeson-yak ==0.1.1.3
- al ==0.1.4.2
- alarmclock ==0.6.0.2
- - alerts ==0.1.0.0
+ - alerts ==0.1.2.0
- alex ==3.2.4
- alg ==0.2.10.0
- algebraic-graphs ==0.3
@@ -88,7 +85,7 @@ default-package-overrides:
- alsa-seq ==0.6.0.7
- alternative-vector ==0.0.0
- alternators ==1.0.0.0
- - ALUT ==2.4.0.2
+ - ALUT ==2.4.0.3
- amazonka ==1.6.1
- amazonka-apigateway ==1.6.1
- amazonka-application-autoscaling ==1.6.1
@@ -196,7 +193,7 @@ default-package-overrides:
- apecs-gloss ==0.2.0
- apecs-physics ==0.3.2
- api-field-json-th ==0.1.0.2
- - appar ==0.1.7
+ - appar ==0.1.8
- appendmap ==0.1.5
- apply-refact ==0.6.0.0
- apportionment ==0.0.0.3
@@ -206,21 +203,21 @@ default-package-overrides:
- arithmoi ==0.8.0.0
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
- - asciidiagram ==1.3.3.2
+ - asciidiagram ==1.3.3.3
- ascii-progress ==0.3.3.0
- asif ==3.2.0
- asn1-encoding ==0.9.5
- asn1-parse ==0.9.4
- - asn1-types ==0.3.2
+ - asn1-types ==0.3.3
- assert-failure ==0.1.2.2
- astro ==0.4.2.1
- - async ==2.2.1
+ - async ==2.2.2
- async-extra ==0.2.0.0
- async-refresh ==0.3.0.0
- async-refresh-tokens ==0.4.0.0
- async-timer ==0.2.0.0
- atom-basic ==0.2.5
- - atomic-primops ==0.8.2
+ - atomic-primops ==0.8.3
- atomic-write ==0.2.0.6
- attoparsec ==0.13.2.2
- attoparsec-base64 ==0.0.0
@@ -235,12 +232,13 @@ default-package-overrides:
- authenticate-oauth ==1.6
- auto ==0.4.3.1
- autoexporter ==1.1.13
- - auto-update ==0.1.4.1
+ - auto-update ==0.1.5
- avers ==0.0.17.1
- avers-api ==0.1.0
- avers-server ==0.1.0.1
- - avro ==0.4.4.2
+ - avro ==0.4.4.3
- avwx ==0.3.0.2
+ - aws-lambda-haskell-runtime ==2.0.1
- axel ==0.0.9
- backprop ==0.2.6.2
- bank-holidays-england ==0.1.0.8
@@ -279,10 +277,10 @@ default-package-overrides:
- binary-list ==1.1.1.2
- binary-orphans ==0.1.8.0
- binary-parser ==0.5.5
- - binary-parsers ==0.2.3.0
+ - binary-parsers ==0.2.4.0
- binary-search ==1.0.0.3
- binary-shared ==0.8.3
- - binary-tagged ==0.1.5.1
+ - binary-tagged ==0.1.5.2
- bindings-DSL ==1.0.25
- bindings-GLFW ==3.2.1.1
- bindings-libzip ==1.0.1
@@ -293,7 +291,7 @@ default-package-overrides:
- bitcoin-script ==0.11.1
- bitcoin-tx ==0.13.1
- bitcoin-types ==0.9.2
- - bits ==0.5.1
+ - bits ==0.5.2
- bitset-word8 ==0.1.1.1
- bits-extra ==0.0.1.3
- bit-stream ==0.1.0.2
@@ -303,7 +301,7 @@ default-package-overrides:
- blas-hs ==0.1.1.0
- blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.1.0
- - blaze-colonnade ==1.2.2
+ - blaze-colonnade ==1.2.2.1
- blaze-html ==0.9.1.1
- blaze-markup ==0.8.2.2
- blaze-svg ==0.3.6.1
@@ -316,7 +314,7 @@ default-package-overrides:
- boolean-normal-forms ==0.0.1
- boolsimplifier ==0.1.8
- bordacount ==0.1.0.0
- - boring ==0.1.1
+ - boring ==0.1.2
- both ==0.1.1.0
- bound ==2.0.1
- BoundedChan ==1.0.3.0
@@ -324,7 +322,7 @@ default-package-overrides:
- bower-json ==1.0.0.1
- boxes ==0.1.5
- bsb-http-chunked ==0.0.0.4
- - bson ==0.3.2.7
+ - bson ==0.3.2.8
- bson-lens ==0.1.1
- btrfs ==0.2.0.0
- buffer-builder ==0.2.4.7
@@ -342,16 +340,15 @@ default-package-overrides:
- bytestring-builder ==0.10.8.2.0
- bytestring-conversion ==0.3.1
- bytestring-lexing ==0.5.0.2
- - bytestring-strict-builder ==0.4.5.1
- - bytestring-tree-builder ==0.2.7.2
+ - bytestring-strict-builder ==0.4.5.3
+ - bytestring-tree-builder ==0.2.7.3
- bzlib ==0.5.0.5
- bzlib-conduit ==0.3.0.1
- c2hs ==0.28.6
- - Cabal ==2.4.1.0
- cabal2spec ==2.2.2.1
- cabal-doctest ==1.0.6
- cabal-rpm ==0.12.6
- - cache ==0.1.1.1
+ - cache ==0.1.1.2
- cachix ==0.2.0
- cachix-api ==0.2.0
- cacophony ==0.10.1
@@ -371,7 +368,7 @@ default-package-overrides:
- cayley-client ==0.4.9
- cborg ==0.2.1.0
- cborg-json ==0.2.1.0
- - cereal ==0.5.8.0
+ - cereal ==0.5.8.1
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
- cereal-time ==0.1.0.0
@@ -425,14 +422,14 @@ default-package-overrides:
- coercible-utils ==0.0.0
- co-log ==0.2.0
- co-log-core ==0.1.1
- - colonnade ==1.2.0.1
+ - colonnade ==1.2.0.2
- colorful-monoids ==0.2.1.2
- colorize-haskell ==1.0.1
- - colour ==2.3.4
+ - colour ==2.3.5
- combinatorial ==0.1.0.1
- comfort-graph ==0.0.3.1
- commutative ==0.0.2
- - comonad ==5.0.4
+ - comonad ==5.0.5
- compactmap ==0.1.4.2.1
- compensated ==0.7.2
- compiler-warnings ==0.1.0
@@ -448,17 +445,17 @@ default-package-overrides:
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- conduit ==1.3.1.1
- - conduit-algorithms ==0.0.9.0
+ - conduit-algorithms ==0.0.10.1
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
- - conduit-connection ==0.1.0.4
- - conduit-extra ==1.3.1.1
+ - conduit-connection ==0.1.0.5
+ - conduit-extra ==1.3.3
- conduit-iconv ==0.1.1.3
- conduit-parse ==0.2.1.0
- conduit-throttle ==0.3.1.0
- conduit-zstd ==0.0.1.1
- confcrypt ==0.1.0.4
- - configuration-tools ==0.4.0
+ - configuration-tools ==0.4.1
- configurator ==0.3.0.0
- configurator-export ==0.1.0.1
- connection ==0.2.8
@@ -466,7 +463,7 @@ default-package-overrides:
- console-style ==0.0.2.1
- constraint ==0.1.3.0
- constraints ==0.10.1
- - contravariant ==1.5
+ - contravariant ==1.5.2
- contravariant-extras ==0.3.4
- control-bool ==0.2.1
- control-dsl ==0.2.1.3
@@ -486,7 +483,7 @@ default-package-overrides:
- cql-io ==1.0.1.1
- crackNum ==2.3
- credential-store ==0.1.2
- - criterion ==1.5.4.0
+ - criterion ==1.5.5.0
- criterion-measurement ==0.1.1.0
- cron ==0.6.1
- crypto-api ==0.13.3
@@ -519,7 +516,7 @@ default-package-overrides:
- cubicspline ==0.1.2
- cublas ==0.5.0.0
- cuckoo-filter ==0.2.0.2
- - cuda ==0.10.0.0
+ - cuda ==0.10.1.0
- cue-sheet ==2.0.1
- cufft ==0.9.0.1
- curl ==1.3.8
@@ -527,7 +524,8 @@ default-package-overrides:
- currency ==0.2.0.0
- cusparse ==0.2.0.0
- cutter ==0.0
- - czipwith ==1.0.1.1
+ - cyclotomic ==1.0
+ - czipwith ==1.0.1.2
- data-accessor ==0.2.2.8
- data-accessor-mtl ==0.2.0.4
- data-accessor-template ==0.2.1.16
@@ -542,7 +540,7 @@ default-package-overrides:
- data-default-instances-old-locale ==0.0.1
- data-diverse ==4.6.0.0
- data-diverse-lens ==4.3.0.0
- - datadog ==0.2.3.0
+ - datadog ==0.2.4.0
- data-dword ==0.3.1.2
- data-endian ==0.1.1
- data-fix ==0.2.0
@@ -563,15 +561,16 @@ default-package-overrides:
- DAV ==1.3.3
- dbcleaner ==0.1.3
- DBFunctor ==0.1.1.1
- - dbus ==1.2.6
+ - dbus ==1.2.7
- debian-build ==0.10.1.2
- debug ==0.1.1
- debug-trace-var ==0.2.0
+ - dec ==0.0.3
- decidable ==0.1.5.0
- Decimal ==0.5.1
- declarative ==0.5.2
- deepseq-generics ==0.2.0.0
- - deferred-folds ==0.9.10
+ - deferred-folds ==0.9.10.1
- dejafu ==1.11.0.5
- dense-linear-algebra ==0.1.0.0
- dependent-map ==0.2.4.0
@@ -579,13 +578,13 @@ default-package-overrides:
- dependent-sum-template ==0.0.0.6
- deque ==0.2.7
- deriveJsonNoPrefix ==0.1.0.1
- - deriving-compat ==0.5.5
+ - deriving-compat ==0.5.6
- derulo ==1.0.5
- detour-via-sci ==1.0.0
- dhall ==1.19.1
- dhall-bash ==1.0.18
- dhall-json ==1.2.6
- - dhall-text ==1.0.16
+ - dhall-text ==1.0.18
- diagrams ==1.4
- diagrams-contrib ==1.4.3
- diagrams-core ==1.4.1.1
@@ -625,7 +624,7 @@ default-package-overrides:
- double-conversion ==2.0.2.0
- download ==0.3.2.7
- drinkery ==0.4
- - dsp ==0.2.4.1
+ - dsp ==0.2.5
- dual-tree ==0.2.2
- dublincore-xml-conduit ==0.1.0.2
- dunai ==0.5.1
@@ -643,7 +642,7 @@ default-package-overrides:
- edit-distance ==0.2.2.1
- edit-distance-vector ==1.0.0.4
- editor-open ==0.6.0.0
- - either ==5.0.1
+ - either ==5.0.1.1
- either-both ==0.1.0.0
- ekg ==0.4.0.15
- ekg-core ==0.1.1.6
@@ -673,7 +672,7 @@ default-package-overrides:
- errors ==2.3.0
- errors-ext ==0.4.2
- error-util ==0.0.1.2
- - ersatz ==0.4.4
+ - ersatz ==0.4.7
- esqueleto ==2.6.0
- etc ==0.4.1.0
- eventful-core ==0.2.0
@@ -688,23 +687,23 @@ default-package-overrides:
- exact-pi ==0.5.0.1
- exceptional ==0.3.0.0
- exception-mtl ==0.4.0.1
- - exceptions ==0.10.1
+ - exceptions ==0.10.2
- exception-transformers ==0.4.0.7
- executable-hash ==0.2.0.4
- executable-path ==0.0.3.1
- exit-codes ==1.0.0
- exomizer ==1.0.0
- expiring-cache-map ==0.0.6.1
- - explicit-exception ==0.1.9.2
+ - explicit-exception ==0.1.10
- exp-pairs ==0.2.0.0
- extensible-exceptions ==0.1.1.4
- - extra ==1.6.15
+ - extra ==1.6.17
- extractable-singleton ==0.0.1
- extrapolate ==0.3.3
- fail ==4.9.0.0
- farmhash ==0.1.0.5
- fast-digits ==0.2.1.0
- - fast-logger ==2.4.15
+ - fast-logger ==2.4.16
- fast-math ==1.0.2
- fb ==1.2.1
- fclabels ==2.0.3.3
@@ -718,14 +717,14 @@ default-package-overrides:
- filecache ==0.4.1
- file-embed ==0.0.11
- file-embed-lzma ==0
- - filelock ==0.1.1.2
+ - filelock ==0.1.1.3
- filemanip ==0.3.6.3
- file-modules ==0.1.2.4
- filepattern ==0.1.1
- fileplow ==0.1.0.0
- filter-logger ==0.6.0.0
- filtrable ==0.1.1.0
- - fin ==0.0.2
+ - fin ==0.0.3
- FindBin ==0.0.5
- fingertree ==0.1.4.2
- finite-typelits ==0.1.4.2
@@ -745,7 +744,7 @@ default-package-overrides:
- floatshow ==0.2.4
- flow ==1.0.18
- fmlist ==0.9.2
- - fmt ==0.6.1.1
+ - fmt ==0.6.1.2
- fn ==0.3.0.2
- focus ==1.0.1.3
- focuslist ==0.1.0.2
@@ -758,11 +757,11 @@ default-package-overrides:
- force-layout ==0.4.0.6
- foreign-store ==0.2
- forkable-monad ==0.2.0.3
- - forma ==1.1.1
+ - forma ==1.1.2
- format-numbers ==0.1.0.0
- formatting ==6.3.7
- foundation ==0.0.23
- - free ==5.1
+ - free ==5.1.1
- freenect ==1.2.1
- freer-simple ==1.2.1.0
- freetype2 ==0.1.2
@@ -782,7 +781,7 @@ default-package-overrides:
- fuzzy-dates ==0.1.1.1
- fuzzyset ==0.1.0.8
- gauge ==0.2.4
- - gc ==0.0.2
+ - gc ==0.0.3
- gd ==3000.7.3
- gdp ==0.0.0.2
- general-games ==1.1.1
@@ -795,7 +794,7 @@ default-package-overrides:
- generics-eot ==0.4.0.1
- generics-mrsop ==1.2.2
- generics-sop ==0.4.0.1
- - generics-sop-lens ==0.1.2.1
+ - generics-sop-lens ==0.1.3
- genvalidity ==0.7.0.2
- genvalidity-aeson ==0.2.0.2
- genvalidity-bytestring ==0.3.0.1
@@ -804,7 +803,7 @@ default-package-overrides:
- genvalidity-hspec-aeson ==0.3.0.1
- genvalidity-hspec-binary ==0.2.0.3
- genvalidity-hspec-cereal ==0.2.0.3
- - genvalidity-hspec-hashable ==0.2.0.3
+ - genvalidity-hspec-hashable ==0.2.0.4
- genvalidity-hspec-optics ==0.1.1.1
- genvalidity-path ==0.3.0.2
- genvalidity-property ==0.3.0.0
@@ -823,25 +822,25 @@ default-package-overrides:
- ghcjs-codemirror ==0.0.0.2
- ghc-paths ==0.1.0.9
- ghc-prof ==1.4.1.5
- - ghc-syntax-highlighter ==0.0.3.1
+ - ghc-syntax-highlighter ==0.0.4.0
- ghc-tcplugins-extra ==0.3
- ghc-typelits-extra ==0.3
- ghc-typelits-knownnat ==0.6
- ghc-typelits-natnormalise ==0.6.2
- ghost-buster ==0.1.1.0
- - gi-atk ==2.0.15
+ - gi-atk ==2.0.18
- gi-cairo ==1.0.17
- gi-gdk ==3.0.16
- - gi-gdkpixbuf ==2.0.18
+ - gi-gdkpixbuf ==2.0.20
- gi-gio ==2.0.19
- gi-glib ==2.0.17
- - gi-gobject ==2.0.16
+ - gi-gobject ==2.0.19
- gi-gtk ==3.0.27
- gi-gtk-hs ==0.3.6.3
- gi-gtksource ==3.0.16
- gi-javascriptcore ==4.0.16
- gingersnap ==0.3.1.0
- - gi-pango ==1.0.16
+ - gi-pango ==1.0.19
- giphy-api ==0.6.0.1
- githash ==0.1.3.1
- github-release ==1.2.4
@@ -859,9 +858,9 @@ default-package-overrides:
- gloss-algorithms ==1.13.0.1
- gloss-examples ==1.13.0.2
- gloss-raster ==1.13.0.2
- - gloss-rendering ==1.13.0.2
+ - gloss-rendering ==1.13.1.1
- GLURaw ==2.0.0.4
- - GLUT ==2.7.0.14
+ - GLUT ==2.7.0.15
- gnuplot ==0.5.6
- goggles ==0.3.2
- google-isbn ==1.0.3
@@ -873,7 +872,7 @@ default-package-overrides:
- gravatar ==0.8.0
- graylog ==0.1.0.1
- greskell ==0.2.3.0
- - greskell-core ==0.1.2.5
+ - greskell-core ==0.1.2.6
- greskell-websocket ==0.1.1.2
- groom ==0.1.2.1
- groundhog ==0.10.0
@@ -895,14 +894,13 @@ default-package-overrides:
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- hapistrano ==0.3.9.2
- - happy ==1.19.9
+ - happy ==1.19.11
- hasbolt ==0.1.3.3
- hashable ==1.2.7.0
- hashable-time ==0.2.0.2
- hashids ==1.0.2.4
- hashmap ==1.3.3
- - hashtables ==1.2.3.1
- - haskeline ==0.7.5.0
+ - hashtables ==1.2.3.3
- haskell-gi ==0.21.5
- haskell-gi-base ==0.21.5
- haskell-gi-overloading ==1.0
@@ -916,11 +914,11 @@ default-package-overrides:
- haskell-src-exts ==1.20.3
- haskell-src-exts-util ==0.2.5
- haskell-src-meta ==0.8.2
- - haskey-btree ==0.3.0.0
+ - haskey-btree ==0.3.0.1
- haskoin-core ==0.8.4
- - hasql ==1.3.0.5
- - hasql-optparse-applicative ==0.3.0.3
- - hasql-pool ==0.5.0.2
+ - hasql ==1.3.0.6
+ - hasql-optparse-applicative ==0.3.0.4
+ - hasql-pool ==0.5.1
- hasql-transaction ==0.7.1
- hasty-hamiltonian ==1.3.2
- haxl ==2.0.1.1
@@ -961,11 +959,11 @@ default-package-overrides:
- hmatrix ==0.19.0.0
- hmatrix-backprop ==0.1.2.5
- hmatrix-gsl ==0.19.0.1
- - hmatrix-gsl-stats ==0.4.1.7
+ - hmatrix-gsl-stats ==0.4.1.8
- hmatrix-morpheus ==0.1.1.2
- hmatrix-vector-sized ==0.1.1.3
- hmpfr ==0.4.4
- - hoauth2 ==1.8.4
+ - hoauth2 ==1.8.7
- Hoed ==0.5.1
- hOpenPGP ==2.7.4.1
- hopfli ==0.2.2.1
@@ -979,7 +977,7 @@ default-package-overrides:
- hpack-dhall ==0.5.2
- hreader ==1.1.0
- hreader-lens ==0.1.3.0
- - hruby ==0.3.6
+ - hruby ==0.3.8
- hsass ==0.8.0
- hs-bibutils ==6.7.0.0
- hschema ==0.0.1.1
@@ -1000,9 +998,9 @@ default-package-overrides:
- hsinstall ==2.2
- HSlippyMap ==3.0.1
- hslogger ==1.2.12
- - hslua ==1.0.2
+ - hslua ==1.0.3.1
- hslua-aeson ==1.0.0
- - hslua-module-text ==0.2.0
+ - hslua-module-text ==0.2.1
- HsOpenSSL ==0.11.4.16
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
@@ -1028,7 +1026,7 @@ default-package-overrides:
- hstatsd ==0.1
- HStringTemplate ==0.8.7
- HSvm ==0.1.1.3.22
- - HsYAML ==0.1.1.3
+ - HsYAML ==0.1.2.0
- hsyslog ==5.0.2
- htaglib ==1.2.0
- HTF ==0.13.2.5
@@ -1039,34 +1037,34 @@ default-package-overrides:
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
- http2 ==1.6.5
- - HTTP ==4000.3.13
+ - HTTP ==4000.3.14
- http-api-data ==0.4
- http-client ==0.5.14
- http-client-tls ==0.3.5.3
- http-common ==0.8.2.0
- - http-conduit ==2.3.7
+ - http-conduit ==2.3.7.1
- http-date ==0.0.8
- - http-directory ==0.1.1
+ - http-directory ==0.1.5
- httpd-shed ==0.4.0.3
- http-link-header ==1.0.3.1
- http-media ==0.7.1.3
- http-reverse-proxy ==0.6.0
- http-streams ==0.8.6.1
- http-types ==0.12.3
- - human-readable-duration ==0.2.1.3
+ - human-readable-duration ==0.2.1.4
- HUnit ==1.6.0.0
- HUnit-approx ==1.1.1.1
- hunit-dejafu ==1.2.1.0
- hvect ==0.4.0.0
- hvega ==0.1.0.3
- - hw-balancedparens ==0.2.0.2
+ - hw-balancedparens ==0.2.0.4
- hw-bits ==0.7.0.6
- hw-conduit ==0.2.0.5
- hw-conduit-merges ==0.2.0.0
- - hw-diagnostics ==0.0.0.5
+ - hw-diagnostics ==0.0.0.7
- hweblib ==0.6.3
- hw-eliasfano ==0.1.0.1
- - hw-excess ==0.2.0.2
+ - hw-excess ==0.2.2.0
- hw-fingertree-strict ==0.1.1.1
- hw-hspec-hedgehog ==0.1.0.4
- hw-int ==0.0.0.3
@@ -1074,14 +1072,14 @@ default-package-overrides:
- hw-json ==0.9.0.1
- hw-mquery ==0.1.0.3
- hw-packed-vector ==0.0.0.1
- - hw-parser ==0.1.0.0
- - hw-prim ==0.6.2.23
+ - hw-parser ==0.1.0.1
+ - hw-prim ==0.6.2.28
- hw-rankselect ==0.12.0.4
- hw-rankselect-base ==0.3.2.1
- hw-streams ==0.0.0.10
- hw-string-parse ==0.0.0.4
- hw-succinct ==0.1.0.1
- - hxt ==9.3.1.16
+ - hxt ==9.3.1.18
- hxt-charproperties ==9.2.0.1
- hxt-css ==0.1.0.3
- hxt-curl ==9.1.1.1
@@ -1115,22 +1113,22 @@ default-package-overrides:
- influxdb ==1.6.1.3
- ini ==0.3.6
- inline-c ==0.7.0.1
- - inline-c-cpp ==0.3.0.1
+ - inline-c-cpp ==0.3.0.2
- inliterate ==0.1.0
- - insert-ordered-containers ==0.2.1.0
- - inspection-testing ==0.4.1.2
+ - insert-ordered-containers ==0.2.2
+ - inspection-testing ==0.4.2.1
- instance-control ==0.1.2.0
- integer-logarithms ==1.0.3
- integration ==0.2.1
- intern ==0.9.2
- interpolate ==0.2.0
- interpolatedstring-perl6 ==1.0.1
- - interpolation ==0.1.1
- - interpolator ==0.1.1
+ - interpolation ==0.1.1.1
+ - interpolator ==0.1.2
- IntervalMap ==0.6.1.1
- intervals ==0.8.1
- intset-imperative ==0.1.0.0
- - invariant ==0.5.2
+ - invariant ==0.5.3
- invertible ==0.2.0.5
- io-choice ==0.0.7
- io-machine ==0.2.0.0
@@ -1146,8 +1144,8 @@ default-package-overrides:
- IPv6Addr ==1.1.2
- ipython-kernel ==0.9.1.0
- irc ==0.6.1.0
- - irc-client ==1.1.0.5
- - irc-conduit ==0.3.0.1
+ - irc-client ==1.1.0.7
+ - irc-conduit ==0.3.0.3
- irc-ctcp ==0.1.3.0
- islink ==0.1.0.0
- iso3166-country-codes ==0.20140203.8
@@ -1169,21 +1167,21 @@ default-package-overrides:
- json-rpc-client ==0.2.5.0
- json-rpc-generic ==0.2.1.5
- json-rpc-server ==0.2.6.0
- - JuicyPixels ==3.3.3
- - JuicyPixels-extra ==0.4.0
+ - JuicyPixels ==3.3.3.1
+ - JuicyPixels-extra ==0.4.1
- JuicyPixels-scale-dct ==0.1.2
- justified-containers ==0.3.0.0
- kan-extensions ==5.2
- - kanji ==3.4.0
+ - kanji ==3.4.0.2
- katip ==0.7.0.0
- kawhi ==0.3.0
- kazura-queue ==0.1.0.4
- kdt ==0.2.4
- keycode ==0.2.2
- - keys ==3.12.1
- - kind-apply ==0.3.0.0
+ - keys ==3.12.2
+ - kind-apply ==0.3.1.0
- kind-generics ==0.3.0.0
- - kind-generics-th ==0.1.0.0
+ - kind-generics-th ==0.1.1.0
- kleene ==0
- kmeans ==0.1.3
- koofr-client ==1.0.0.3
@@ -1199,8 +1197,8 @@ default-package-overrides:
- language-ecmascript ==0.19
- language-haskell-extract ==0.2.4
- language-java ==0.2.9
- - language-javascript ==0.6.0.11
- - language-puppet ==1.4.4
+ - language-javascript ==0.6.0.13
+ - language-puppet ==1.4.5
- lapack-ffi ==0.0.2
- lapack-ffi-tools ==0.1.2
- largeword ==1.2.5
@@ -1212,6 +1210,7 @@ default-package-overrides:
- leancheck ==0.8.0
- leancheck-instances ==0.0.3
- leapseconds-announced ==2017.1.0.1
+ - learn-physics ==0.6.4
- lens ==4.17.1
- lens-action ==0.2.3
- lens-aeson ==1.0.2
@@ -1234,21 +1233,21 @@ default-package-overrides:
- libraft ==0.1.1.0
- libyaml ==0.1.1.0
- LibZip ==1.0.1
- - lifted-async ==0.10.0.3
+ - lifted-async ==0.10.0.4
- lifted-base ==0.2.3.12
- lift-generics ==0.1.2
- line ==4.0.1
- - linear ==1.20.8
+ - linear ==1.20.9
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.3.0
- List ==0.6.2
- - ListLike ==4.6
+ - ListLike ==4.6.2
- listsafe ==0.1.0.1
- list-t ==1.0.3.1
- ListTree ==0.2.3
- llvm-hs-pure ==7.0.0
- lmdb ==0.2.5
- - load-env ==0.2.0.2
+ - load-env ==0.2.1.0
- loc ==0.1.3.4
- locators ==0.2.4.4
- loch-th ==0.2.2
@@ -1257,10 +1256,10 @@ default-package-overrides:
- log-domain ==0.12
- logfloat ==0.13.3.3
- logger-thread ==0.1.0.2
- - logging-effect ==1.3.3
+ - logging-effect ==1.3.4
- logging-facade ==0.3.0
- logging-facade-syslog ==1
- - logict ==0.6.0.2
+ - logict ==0.6.0.3
- long-double ==0.1
- loop ==0.3.0
- lrucaching ==0.3.3
@@ -1282,7 +1281,7 @@ default-package-overrides:
- markdown ==0.1.17.4
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- - massiv ==0.2.8.0
+ - massiv ==0.2.8.1
- massiv-io ==0.1.6.0
- mathexpr ==0.3.0.0
- math-functions ==0.3.1.0
@@ -1297,7 +1296,7 @@ default-package-overrides:
- mbug ==1.3.2
- mcmc-types ==1.0.3
- median-stream ==0.7.0.0
- - megaparsec ==7.0.4
+ - megaparsec ==7.0.5
- mega-sdist ==0.3.3.2
- memory ==0.14.18
- MemoTrie ==0.6.9
@@ -1310,7 +1309,7 @@ default-package-overrides:
- microbench ==0.1
- microformats2-parser ==1.0.1.9
- microlens ==0.4.10
- - microlens-aeson ==2.3.0.1
+ - microlens-aeson ==2.3.0.4
- microlens-contra ==0.1.0.2
- microlens-ghc ==0.4.10
- microlens-mtl ==0.1.11.1
@@ -1335,10 +1334,10 @@ default-package-overrides:
- mixpanel-client ==0.1.1
- mltool ==0.2.0.1
- mmap ==0.5.9
- - mmark ==0.0.6.2
+ - mmark ==0.0.7.0
- mmark-cli ==0.0.5.0
- mmark-ext ==0.2.1.2
- - mmorph ==1.1.2
+ - mmorph ==1.1.3
- mnist-idx ==0.1.2.8
- mockery ==0.3.5
- modern-uri ==0.3.0.1
@@ -1376,8 +1375,7 @@ default-package-overrides:
- mono-traversable ==1.0.11.0
- mono-traversable-instances ==0.1.0.0
- mountpoints ==1.0.2
- - mtl ==2.2.2
- - mtl-compat ==0.2.1.3
+ - mtl-compat ==0.2.2
- mtl-prelude ==2.0.3.1
- multiarg ==0.30.0.10
- multimap ==1.2.1
@@ -1418,19 +1416,20 @@ default-package-overrides:
- network-anonymous-i2p ==0.10.0
- network-anonymous-tor ==0.11.0
- network-attoparsec ==0.12.2
+ - network-bsd ==2.8.0.0
- network-byte-order ==0.0.0.0
- network-conduit-tls ==1.3.2
- network-house ==0.1.0.2
- network-info ==0.2.0.10
- network-ip ==0.3.0.2
- - network-messagepack-rpc ==0.1.1.0
+ - network-messagepack-rpc ==0.1.1.1
- network-multicast ==0.2.0
- - network-simple ==0.4.3
+ - network-simple ==0.4.5
- network-simple-tls ==0.3.2
- - network-transport ==0.5.2
+ - network-transport ==0.5.4
- network-transport-composed ==0.2.1
- network-uri ==2.6.1.0
- - newtype ==0.2
+ - newtype ==0.2.1.0
- newtype-generics ==0.5.3
- nicify-lib ==1.0.1
- NineP ==0.0.2.1
@@ -1438,14 +1437,15 @@ default-package-overrides:
- NoHoed ==0.1.1
- nonce ==1.0.7
- nondeterminism ==1.4
- - non-empty ==0.3.1
+ - non-empty ==0.3.2
- nonempty-containers ==0.1.1.0
- nonemptymap ==0.0.6.0
- non-empty-sequence ==0.2.0.2
- non-negative ==0.1.2
+ - not-gloss ==0.7.7.0
- nowdoc ==0.1.1.0
- nqe ==0.6.1
- - nsis ==0.3.2
+ - nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- numeric-prelude ==0.4.3.1
@@ -1468,13 +1468,13 @@ default-package-overrides:
- OneTuple ==0.2.2
- Only ==0.1
- oo-prototypes ==0.1.0.0
- - opaleye ==0.6.7003.1
- - OpenAL ==1.7.0.4
+ - opaleye ==0.6.7004.0
+ - OpenAL ==1.7.0.5
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- - OpenGL ==3.0.2.2
- - OpenGLRaw ==3.3.2.0
- - openpgp-asciiarmor ==0.1.1
+ - OpenGL ==3.0.3.0
+ - OpenGLRaw ==3.3.3.0
+ - openpgp-asciiarmor ==0.1.2
- opensource ==0.1.1.0
- openssl-streams ==1.2.2.0
- open-witness ==0.4.0.1
@@ -1488,7 +1488,7 @@ default-package-overrides:
- optparse-simple ==0.1.1.2
- optparse-text ==0.1.1.0
- overhang ==1.0.0
- - packcheck ==0.4.1
+ - packcheck ==0.4.2
- pager ==0.1.1.0
- pagination ==0.2.1
- pairing ==0.1.4
@@ -1500,16 +1500,15 @@ default-package-overrides:
- parallel-io ==0.3.3
- paripari ==0.6.0.0
- parseargs ==0.2.0.9
- - parsec ==3.1.13.0
- parsec-class ==1.0.0.0
- parsec-numbers ==0.1.0
- parsec-numeric ==0.1.0.0
- ParsecTools ==0.0.2.0
- - parser-combinators ==1.0.2
- - parsers ==0.12.9
+ - parser-combinators ==1.0.3
+ - parsers ==0.12.10
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.2.1
- - partial-semigroup ==0.5.1.0
+ - partial-semigroup ==0.5.1.1
- path ==0.6.1
- path-extra ==0.2.0
- path-io ==1.4.2
@@ -1520,7 +1519,7 @@ default-package-overrides:
- pattern-arrows ==0.0.2
- pcf-font ==0.2.2.0
- pcf-font-embed ==0.1.2.0
- - pcg-random ==0.1.3.5
+ - pcg-random ==0.1.3.6
- pcre-heavy ==1.0.0.2
- pcre-light ==0.4.0.4
- pcre-utils ==0.1.8.1.1
@@ -1540,11 +1539,11 @@ default-package-overrides:
- persistent-postgresql ==2.9.1
- persistent-sqlite ==2.9.3
- persistent-template ==2.5.4
- - pgp-wordlist ==0.1.0.2
+ - pgp-wordlist ==0.1.0.3
- pg-transact ==0.1.0.1
- phantom-state ==0.2.1.2
- pid1 ==0.1.2.0
- - pipes ==4.3.9
+ - pipes ==4.3.10
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
- pipes-binary ==0.4.2
@@ -1589,7 +1588,7 @@ default-package-overrides:
- pptable ==0.3.0.0
- pqueue ==1.4.1.2
- prefix-units ==0.2.0
- - prelude-compat ==0.0.0.1
+ - prelude-compat ==0.0.0.2
- prelude-safeenum ==0.1.1.2
- present ==4.1.0
- prettyclass ==1.0.0.0
@@ -1602,7 +1601,7 @@ default-package-overrides:
- prettyprinter-compat-wl-pprint ==1.0.0.1
- pretty-show ==1.9.5
- pretty-simple ==2.2.0.1
- - pretty-sop ==0.2.0.2
+ - pretty-sop ==0.2.0.3
- pretty-types ==0.2.3.1
- primes ==0.2.1.0
- primitive ==0.6.4.0
@@ -1635,12 +1634,12 @@ default-package-overrides:
- protolude ==0.2.3
- proxied ==0.3.1
- psql-helpers ==0.1.0.0
- - psqueues ==0.2.7.1
+ - psqueues ==0.2.7.2
- pureMD5 ==2.1.3
- purescript-bridge ==0.13.0.0
- pure-zlib ==0.6.4
- pushbullet-types ==0.4.1.0
- - pusher-http-haskell ==1.5.1.7
+ - pusher-http-haskell ==1.5.1.9
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0
- qnap-decrypt ==0.3.4
@@ -1653,7 +1652,7 @@ default-package-overrides:
- quickcheck-classes ==0.6.0.0
- quickcheck-instances ==0.3.19
- quickcheck-io ==0.2.0
- - quickcheck-simple ==0.1.0.4
+ - quickcheck-simple ==0.1.1.0
- quickcheck-special ==0.1.0.6
- quickcheck-state-machine ==0.4.3
- quickcheck-text ==0.1.2.1
@@ -1663,7 +1662,7 @@ default-package-overrides:
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.1
- - random-bytestring ==0.1.3.1
+ - random-bytestring ==0.1.3.2
- random-fu ==0.2.7.0
- random-shuffle ==0.0.4
- random-source ==0.3.0.6
@@ -1672,7 +1671,7 @@ default-package-overrides:
- range-set-list ==0.1.3
- rank1dynamic ==0.4.0
- rank2classes ==1.2.1
- - Rasterific ==0.7.4.2
+ - Rasterific ==0.7.4.4
- rasterific-svg ==0.3.3.2
- ratel ==1.0.8
- ratel-wai ==1.0.5
@@ -1680,14 +1679,14 @@ default-package-overrides:
- rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0
- raw-strings-qq ==1.1
- - rcu ==0.2.3
+ - rcu ==0.2.4
- re2 ==0.3
- readable ==0.3.1
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- - rebase ==1.3.1
+ - rebase ==1.3.1.1
- record-dot-preprocessor ==0.1.5
- - records-sop ==0.1.0.2
+ - records-sop ==0.1.0.3
- recursion-schemes ==5.1.3
- reducers ==3.12.3
- refact ==0.3.0.2
@@ -1704,26 +1703,26 @@ default-package-overrides:
- regex-pcre-builtin ==0.94.4.8.8.35
- regex-pcre-text ==0.94.0.1
- regex-posix ==0.95.2
- - regex-tdfa ==1.2.3.1
+ - regex-tdfa ==1.2.3.2
- regex-tdfa-text ==1.0.0.3
- regex-with-pcre ==1.0.2.0
- - registry ==0.1.3.5
+ - registry ==0.1.6.2
- reinterpret-cast ==0.1.0
- relapse ==1.0.0.0
- - relational-query ==0.12.1.0
- - relational-query-HDBC ==0.7.1.1
+ - relational-query ==0.12.2.1
+ - relational-query-HDBC ==0.7.2.0
- relational-record ==0.2.2.0
- - relational-schemas ==0.1.6.2
+ - relational-schemas ==0.1.7.0
- relude ==0.4.0
- renderable ==0.2.0.1
- repa ==3.4.1.4
- repa-algorithms ==3.4.1.3
- repa-io ==3.4.1.1
- - repline ==0.2.0.0
+ - repline ==0.2.1.0
- req ==1.2.1
- req-conduit ==1.0.0
- req-url-extra ==0.1.0.0
- - rerebase ==1.3.1
+ - rerebase ==1.3.1.1
- resource-pool ==0.2.3.2
- resourcet ==1.2.2
- result ==0.2.6.0
@@ -1732,6 +1731,7 @@ default-package-overrides:
- rev-state ==0.1.2
- rfc1751 ==0.1.2
- rfc5051 ==0.1.0.4
+ - rg ==1.4.0.0
- rio ==0.1.8.0
- rio-orphans ==0.1.1.0
- rng-utils ==0.3.0
@@ -1769,7 +1769,7 @@ default-package-overrides:
- scanf ==0.1.0.0
- scanner ==0.3
- scientific ==0.3.6.2
- - scotty ==0.11.3
+ - scotty ==0.11.4
- scrypt ==0.5.0
- sdl2 ==2.4.1.0
- sdl2-gfx ==0.2
@@ -1786,8 +1786,8 @@ default-package-overrides:
- semigroups ==0.18.5
- semirings ==0.2.1.1
- semiring-simple ==1.0.0.1
- - semver ==0.3.3.1
- - sendfile ==0.7.10
+ - semver ==0.3.4
+ - sendfile ==0.7.11.1
- seqalign ==0.2.0.4
- serf ==0.1.1.0
- serialise ==0.2.1.0
@@ -1810,7 +1810,7 @@ default-package-overrides:
- servant-foreign ==0.15
- servant-js ==0.9.4
- servant-JuicyPixels ==0.3.0.4
- - servant-kotlin ==0.1.1.7
+ - servant-kotlin ==0.1.1.8
- servant-lucid ==0.8.1
- servant-mock ==0.8.5
- servant-pandoc ==0.5.0.0
@@ -1819,14 +1819,14 @@ default-package-overrides:
- servant-server ==0.15
- servant-static-th ==0.2.2.0
- servant-streaming ==0.3.0.0
- - servant-swagger ==1.1.7
- - servant-swagger-ui ==0.3.2.3.19.3
- - servant-swagger-ui-core ==0.3.2
- - servant-swagger-ui-redoc ==0.3.2.1.22.2
+ - servant-swagger ==1.1.7.1
+ - servant-swagger-ui ==0.3.4.3.22.2
+ - servant-swagger-ui-core ==0.3.3
+ - servant-swagger-ui-redoc ==0.3.3.1.22.2
- servant-tracing ==0.1.0.2
- servant-websockets ==1.1.0
- servant-yaml ==0.1.0.1
- - serverless-haskell ==0.8.7
+ - serverless-haskell ==0.8.8
- serversession ==1.0.1
- serversession-frontend-wai ==1.0
- servius ==1.2.3.0
@@ -1849,9 +1849,10 @@ default-package-overrides:
- siggy-chardust ==1.0.0
- signal ==0.1.0.4
- silently ==1.2.5
+ - simple-cabal ==0.0.0
- simple-cmd ==0.1.4
- - simple-cmd-args ==0.1.1
- - simple-log ==0.9.11
+ - simple-cmd-args ==0.1.2
+ - simple-log ==0.9.12
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.28
- simple-vec3 ==0.4.0.10
@@ -1886,6 +1887,7 @@ default-package-overrides:
- sox ==0.2.3.1
- soxlib ==0.0.3.1
- sparse-linear-algebra ==0.3.1
+ - spatial-math ==0.5.0.1
- special-values ==0.1.0.0
- speculate ==0.3.5
- speedy-slice ==0.3.0
@@ -1898,10 +1900,10 @@ default-package-overrides:
- spreadsheet ==0.1.3.8
- sqlite-simple ==0.4.16.0
- sqlite-simple-errors ==0.6.1.0
- - sql-words ==0.1.6.2
+ - sql-words ==0.1.6.3
- srcloc ==0.5.1.2
- stache ==2.0.1
- - stack2nix ==0.2.2
+ - stack2nix ==0.2.3
- starter ==0.3.0
- state-codes ==0.1.3
- stateref ==0.3
@@ -1911,25 +1913,24 @@ default-package-overrides:
- statistics ==0.15.0.0
- stb-image-redux ==0.2.1.2
- step-function ==0.2
- - stm ==2.5.0.0
- stm-chans ==3.0.0.4
- stm-conduit ==4.0.1
- stm-delay ==0.1.1.1
- stm-extras ==0.1.0.3
- stm-split ==0.0.2.1
- - stopwatch ==0.1.0.5
+ - stopwatch ==0.1.0.6
- storable-complex ==0.2.3.0
- storable-record ==0.0.4
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13
- - store ==0.5.1.0
+ - store ==0.5.1.1
- store-core ==0.4.4
- Strafunski-StrategyLib ==5.0.1.0
- stratosphere ==0.29.1
- streaming ==0.2.2.0
- - streaming-attoparsec ==1.0.0
+ - streaming-attoparsec ==1.0.0.1
- streaming-bytestring ==0.1.6
- - streaming-commons ==0.2.1.0
+ - streaming-commons ==0.2.1.1
- streaming-wai ==0.1.1
- streamly ==0.5.2
- streamproc ==1.6.2
@@ -1944,10 +1945,10 @@ default-package-overrides:
- string-conversions ==0.4.0.1
- string-qq ==0.0.2
- stringsearch ==0.3.6.6
- - string-transform ==1.1.0
+ - string-transform ==1.1.1
- strive ==5.0.8
- - structs ==0.1.1
- - stylish-haskell ==0.9.2.1
+ - structs ==0.1.2
+ - stylish-haskell ==0.9.2.2
- summoner ==1.2.0
- sum-type-boilerplate ==0.1.1
- sundown ==0.6
@@ -1956,11 +1957,11 @@ default-package-overrides:
- sv-core ==0.3.1
- svg-builder ==0.1.1
- SVGFonts ==1.7.0.1
- - svg-tree ==0.6.2.3
+ - svg-tree ==0.6.2.4
- swagger ==0.3.0
- swagger2 ==2.3.1.1
- swish ==0.10.0.1
- - syb ==0.7
+ - syb ==0.7.1
- symbol ==0.2.4
- symengine ==0.1.2.0
- sysinfo ==0.1.1
@@ -1972,10 +1973,10 @@ default-package-overrides:
- tagchup ==0.4.1.1
- tagged ==0.8.6
- tagged-binary ==0.2.0.1
- - tagged-identity ==0.1.2
+ - tagged-identity ==0.1.3
- tagged-transformer ==0.8.1
- tagshare ==0.0
- - tagsoup ==0.14.7
+ - tagsoup ==0.14.8
- tagstream-conduit ==0.5.5.3
- tao ==1.0.0
- tao-example ==1.0.0
@@ -1993,7 +1994,7 @@ default-package-overrides:
- tasty-kat ==0.0.3
- tasty-leancheck ==0.0.1
- tasty-program ==1.0.5
- - tasty-quickcheck ==0.10
+ - tasty-quickcheck ==0.10.1
- tasty-silver ==3.1.12
- tasty-smallcheck ==0.8.1
- tasty-th ==0.1.7
@@ -2020,9 +2021,8 @@ default-package-overrides:
- testing-feat ==1.1.0.0
- testing-type-modifiers ==0.1.0.1
- texmath ==0.11.2.2
- - text ==1.2.3.1
- text-binary ==0.2.1.1
- - text-builder ==0.6.5
+ - text-builder ==0.6.5.1
- text-conversions ==0.3.0
- text-format ==0.3.2
- text-icu ==0.7.0.1
@@ -2057,9 +2057,9 @@ default-package-overrides:
- throttle-io-stream ==0.2.0.1
- throwable-exceptions ==0.1.0.9
- th-strict-compat ==0.1.0.1
- - th-utilities ==0.2.1.0
+ - th-utilities ==0.2.3.0
- thyme ==0.3.5.5
- - tidal ==1.0.13
+ - tidal ==1.0.14
- tile ==0.3.0.0
- time-compat ==0.1.0.3
- timeit ==2.0
@@ -2067,6 +2067,7 @@ default-package-overrides:
- time-lens ==0.4.0.2
- time-locale-compat ==0.1.1.5
- time-locale-vietnamese ==1.0.0.0
+ - time-manager ==0.0.0
- time-parsers ==0.1.2.1
- time-qq ==0.0.1.0
- timerep ==2.0.0.2
@@ -2078,7 +2079,7 @@ default-package-overrides:
- tldr ==0.4.0.1
- tls ==1.4.1
- tls-debug ==0.4.5
- - tls-session-manager ==0.0.0.2
+ - tls-session-manager ==0.0.2.1
- tmapchan ==0.0.3
- tmapmvar ==0.0.4
- tmp-postgres ==0.1.2.2
@@ -2089,13 +2090,13 @@ default-package-overrides:
- transaction ==0.1.1.3
- transformers-base ==0.4.5.2
- transformers-bifunctors ==0.1
- - transformers-compat ==0.6.4
+ - transformers-compat ==0.6.5
- transformers-fix ==1.0
- traverse-with-class ==1.0.0.0
- - tree-diff ==0.0.2
+ - tree-diff ==0.0.2.1
- tree-fun ==0.8.1.0
- trifecta ==2
- - triplesec ==0.2.2.0
+ - triplesec ==0.2.2.1
- tsv2csv ==0.1.0.2
- ttrie ==0.1.2.1
- tuple ==0.3.0.2
@@ -2103,7 +2104,8 @@ default-package-overrides:
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- turtle ==1.5.14
- - typed-process ==0.2.4.0
+ - TypeCompose ==0.9.14
+ - typed-process ==0.2.5.0
- type-fun ==0.1.1
- type-hint ==0.1
- type-level-integers ==0.0.1
@@ -2129,7 +2131,7 @@ default-package-overrides:
- unconstrained ==0.1.0.2
- unicode ==0.0.1.1
- unicode-show ==0.1.0.3
- - unicode-transforms ==0.3.5
+ - unicode-transforms ==0.3.6
- unification-fd ==0.10.0.1
- union ==0.1.2
- union-find ==0.2
@@ -2145,11 +2147,11 @@ default-package-overrides:
- universum ==1.5.0
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.1
- - unix-time ==0.4.5
- - unliftio ==0.2.10
+ - unix-time ==0.4.7
+ - unliftio ==0.2.11
- unliftio-core ==0.1.2.0
- unlit ==0.4.0.0
- - unordered-containers ==0.2.9.0
+ - unordered-containers ==0.2.10.0
- unordered-intmap ==0.1.1
- unsafe ==0.0
- uri-bytestring ==0.3.2.1
@@ -2182,7 +2184,7 @@ default-package-overrides:
- valor ==0.1.0.0
- vault ==0.3.1.2
- vec ==0.1.1
- - vector ==0.12.0.2
+ - vector ==0.12.0.3
- vector-algorithms ==0.8.0.1
- vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
@@ -2190,7 +2192,7 @@ default-package-overrides:
- vector-bytes-instances ==0.1.1
- vector-instances ==3.4
- vector-mmap ==0.0.3
- - vector-sized ==1.2.0.0
+ - vector-sized ==1.2.0.1
- vector-space ==0.15
- vector-split ==1.0.0.2
- vector-th-unbox ==0.2.1.6
@@ -2201,22 +2203,22 @@ default-package-overrides:
- vivid ==0.4.2.3
- vivid-osc ==0.5.0.0
- vivid-supercollider ==0.4.1.2
- - void ==0.7.2
+ - void ==0.7.3
- vty ==5.25.1
- - wai ==3.2.2
+ - wai ==3.2.2.1
- wai-app-static ==3.1.6.3
- wai-cli ==0.1.1
- wai-conduit ==3.0.0.4
- - wai-cors ==0.2.6
+ - wai-cors ==0.2.7
- wai-eventsource ==3.0.0
- - wai-extra ==3.0.25
+ - wai-extra ==3.0.26.1
- wai-handler-launch ==3.0.2.4
- - wai-logger ==2.3.4
+ - wai-logger ==2.3.5
- wai-middleware-auth ==0.1.2.1
- wai-middleware-caching ==0.1.0.2
- wai-middleware-crowd ==0.1.4.2
- wai-middleware-static ==0.8.2
- - wai-middleware-throttle ==0.3.0.0
+ - wai-middleware-throttle ==0.3.0.1
- wai-middleware-travisci ==0.1.0
- wai-predicates ==0.10.0
- wai-session ==0.3.3
@@ -2224,12 +2226,12 @@ default-package-overrides:
- wai-slack-middleware ==0.2.0
- wai-transformers ==0.1.0
- wai-websockets ==3.0.1.2
- - warp ==3.2.27
- - warp-tls ==3.2.5
+ - warp ==3.2.28
+ - warp-tls ==3.2.7
- warp-tls-uid ==0.2.0.6
- wave ==0.1.5
- wcwidth ==0.0.2
- - web3 ==0.8.3.1
+ - web3 ==0.8.3.2
- webdriver ==0.8.5
- webex-teams-api ==0.2.0.0
- webex-teams-conduit ==0.2.0.0
@@ -2239,17 +2241,17 @@ default-package-overrides:
- web-routes-wai ==0.24.3.1
- webrtc-vad ==0.1.0.3
- websockets ==0.12.5.3
- - websockets-snap ==0.10.3.0
+ - websockets-snap ==0.10.3.1
- weigh ==0.0.14
- wide-word ==0.1.0.8
- wikicfp-scraper ==0.1.0.11
- - wild-bind ==0.1.2.3
- - wild-bind-x11 ==0.2.0.6
+ - wild-bind ==0.1.2.4
+ - wild-bind-x11 ==0.2.0.7
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- winery ==0.3.1
- wire-streams ==0.1.1.0
- - witherable ==0.3
+ - witherable ==0.3.1
- with-location ==0.1.0
- witness ==0.4
- wizards ==1.0.3
@@ -2263,7 +2265,7 @@ default-package-overrides:
- wrap ==0.0.0
- wreq ==0.5.3.1
- ws ==0.0.5
- - wuss ==1.1.12
+ - wuss ==1.1.14
- X11 ==1.9
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
@@ -2275,8 +2277,7 @@ default-package-overrides:
- xdg-basedir ==0.2.2
- xeno ==0.3.5.1
- xenstore ==0.1.1
- - xhtml ==3000.2.2.1
- - xls ==0.1.1
+ - xls ==0.1.2
- xlsx ==0.7.2
- xlsx-tabular ==0.2.2.1
- xml ==1.3.14
@@ -2303,13 +2304,13 @@ default-package-overrides:
- xxhash-ffi ==0.2.0.0
- yam ==0.5.17
- yam-datasource ==0.5.17
- - yaml ==0.11.0.0
+ - yaml ==0.11.1.0
- yeshql ==4.1.0.1
- yeshql-core ==4.1.0.2
- yeshql-hdbc ==4.1.0.2
- yesod ==1.6.0
- - yesod-alerts ==0.1.2.0
- - yesod-auth ==1.6.6
+ - yesod-alerts ==0.1.3.0
+ - yesod-auth ==1.6.7
- yesod-auth-hashdb ==1.7.1.1
- yesod-auth-oauth2 ==0.6.1.1
- yesod-bin ==1.6.0.3
@@ -2317,27 +2318,27 @@ default-package-overrides:
- yesod-csp ==0.2.5.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
- - yesod-form ==1.6.4
- - yesod-form-bootstrap4 ==2.1.0
+ - yesod-form ==1.6.5
+ - yesod-form-bootstrap4 ==2.1.2
- yesod-gitrepo ==0.3.0
- yesod-gitrev ==0.2.1
- - yesod-markdown ==0.12.6.1
+ - yesod-markdown ==0.12.6.2
- yesod-newsfeed ==1.6.1.0
- yesod-paginator ==1.1.0.2
- yesod-persistent ==1.6.0.2
- yesod-recaptcha2 ==0.3.0
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.0.1
- - yesod-test ==1.6.6
+ - yesod-test ==1.6.6.1
- yesod-text-markdown ==0.1.10
- - yesod-websockets ==0.3.0.1
+ - yesod-websockets ==0.3.0.2
- yes-precure5-command ==5.5.3
- yi-language ==0.18.0
- yi-rope ==0.11
- yjtools ==0.9.18
- yoga ==0.0.0.5
- youtube ==0.2.1.1
- - zero ==0.1.4
+ - zero ==0.1.5
- zeromq4-haskell ==0.7.0
- zeromq4-patterns ==0.3.1.0
- zim-parser ==0.2.1.0
@@ -2349,7 +2350,7 @@ default-package-overrides:
- zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1
- zot ==0.0.3
- - zstd ==0.1.0.0
+ - zstd ==0.1.1.2
- ztail ==1.2.0.2
extra-packages:
@@ -2436,8 +2437,6 @@ package-maintainers:
- hsyslog
- jailbreak-cabal
- json-autotype
- - lambdabot-core
- - lambdabot-irc-plugins
- language-nix
- liquid-fixpoint
- liquidhaskell
@@ -2625,12 +2624,9 @@ broken-packages:
- AC-VanillaArray
- AC-Vector
- AC-Vector-Fancy
- - accelerate
- accelerate-arithmetic
- accelerate-fftw
- accelerate-fourier
- - accelerate-io
- - accelerate-llvm
- accelerate-llvm-native
- accelerate-random
- accelerate-typelits
@@ -2660,6 +2656,7 @@ broken-packages:
- acme-stringly-typed
- acme-zalgo
- acme-zero
+ - acousticbrainz-client
- ActionKid
- activehs
- activehs-base
@@ -2693,7 +2690,6 @@ broken-packages:
- aeson-applicative
- aeson-decode
- aeson-diff-generic
- - aeson-extra
- aeson-flowtyped
- aeson-injector
- aeson-native
@@ -2721,9 +2717,6 @@ broken-packages:
- airship
- airtable-api
- aivika-distributed
- - aivika-experiment-cairo
- - aivika-experiment-chart
- - aivika-experiment-diagrams
- ajhc
- AlanDeniseEricLauren
- alerta
@@ -2734,9 +2727,9 @@ broken-packages:
- algebra
- algebra-sql
- algebraic
+ - algebraic-graphs
- algebraic-prelude
- algo-s
- - algolia
- AlgoRhythm
- AlgorithmW
- align-text
@@ -2757,7 +2750,6 @@ broken-packages:
- amazon-emailer
- amazon-emailer-client-snap
- amazon-products
- - amazonka-s3-streaming
- amby
- AMI
- ampersand
@@ -2789,16 +2781,13 @@ broken-packages:
- anticiv
- antigate
- antimirov
- - antiope-contract
- - antiope-messages
- - antiope-s3
- - antiope-sqs
- antisplice
- antlr-haskell
- antlrc
- anydbm
- aosd
- apart
+ - apecs-stm
- apelsin
- api-builder
- api-tools
@@ -2865,6 +2854,7 @@ broken-packages:
- artery
- artifact
- ascii-flatten
+ - ascii-string
- ascii-vector-avc
- ascii85-conduit
- asic
@@ -2872,7 +2862,6 @@ broken-packages:
- asil
- asn
- asn1-codec
- - AspectAG
- assert
- assertions
- asset-map
@@ -2884,7 +2873,6 @@ broken-packages:
- async-combinators
- async-dejafu
- async-manager
- - async-pool
- async-timer
- asynchronous-exceptions
- aterm
@@ -2906,14 +2894,11 @@ broken-packages:
- AttoJson
- attoparsec-data
- attoparsec-enumerator
- - attoparsec-ip
- attoparsec-iteratee
- attoparsec-text
- attoparsec-text-enumerator
- attoparsec-time
- attoparsec-trans
- - attoparsec-uri
- - attoparsec-varword
- attosplit
- Attrac
- atuin
@@ -2963,11 +2948,13 @@ broken-packages:
- aws-sign4
- aws-simple
- aws-sns
+ - axel
- axiom
- azubi
- azure-service-api
- azure-servicebus
- azurify
+ - b9
- babylon
- backdropper
- backtracking-exceptions
@@ -3010,6 +2997,7 @@ broken-packages:
- battleship-combinatorics
- battleships
- bayes-stack
+ - bbi
- BCMtools
- bdcs
- bdcs-api
@@ -3022,8 +3010,6 @@ broken-packages:
- Befunge93
- bein
- belka
- - bench-graph
- - bench-show
- BenchmarkHistory
- bencodex
- berkeleydb
@@ -3033,9 +3019,7 @@ broken-packages:
- besout
- bet
- betacode
- - betris
- bff
- - bgmax
- bgzf
- bhoogle
- bibdb
@@ -3054,6 +3038,7 @@ broken-packages:
- binary-ext
- binary-file
- binary-indexed-tree
+ - binary-instances
- binary-protocol
- binary-protocol-zmq
- binary-streams
@@ -3092,7 +3077,6 @@ broken-packages:
- bindynamic
- binembed
- binembed-example
- - bins
- bio
- bio-sequence
- bioace
@@ -3100,6 +3084,7 @@ broken-packages:
- Biobase
- BiobaseBlast
- BiobaseDotP
+ - BiobaseENA
- BiobaseEnsembl
- BiobaseFasta
- BiobaseFR3D
@@ -3126,6 +3111,7 @@ broken-packages:
- bird
- BirdPP
- bisect-binary
+ - bishbosh
- bit-array
- bit-stream
- bitcoin-hs
@@ -3170,6 +3156,7 @@ broken-packages:
- blockhash
- Blogdown
- blogination
+ - BlogLiterately
- BlogLiterately-diagrams
- bloodhound
- bloodhound-amazonka-auth
@@ -3197,10 +3184,8 @@ broken-packages:
- boombox
- boomslang
- borel
- - boring
- boring-window-switcher
- bot
- - bound-extras
- bounded-array
- bowntz
- braid
@@ -3217,8 +3202,6 @@ broken-packages:
- bricks-rendering
- bricks-syntax
- brillig
- - brittany
- - broadcast-chan
- broadcast-chan-conduit
- broadcast-chan-pipes
- broadcast-chan-tests
@@ -3253,12 +3236,11 @@ broken-packages:
- Buster
- buster-gtk
- buster-network
- - butcher
- butter
- butterflies
- bv-sized
- bytable
- - bytestring-arbitrary
+ - byteslice
- bytestring-builder-varword
- bytestring-class
- bytestring-csv
@@ -3290,7 +3272,6 @@ broken-packages:
- cabal-ghc-dynflags
- cabal-ghci
- cabal-graphdeps
- - cabal-helper
- Cabal-ide-backend
- cabal-info
- cabal-install-bundle
@@ -3338,7 +3319,6 @@ broken-packages:
- call-haskell-from-anything
- camfort
- campfire
- - canon
- canonical-filepath
- canonical-json
- canteven-http
@@ -3349,7 +3329,6 @@ broken-packages:
- cao
- cap
- Capabilities
- - capability
- capataz
- capnp
- capped-list
@@ -3375,7 +3354,6 @@ broken-packages:
- cash
- cassandra-cql
- Cassava
- - cassava-streams
- cassette
- cassy
- castle
@@ -3424,10 +3402,6 @@ broken-packages:
- chalkboard
- chalkboard-viewer
- charade
- - Chart
- - Chart-cairo
- - Chart-diagrams
- - Chart-gtk
- chart-histogram
- Chart-simple
- chart-unit
@@ -3436,8 +3410,8 @@ broken-packages:
- chatwork
- cheapskate-terminal
- check-pvp
- - Checked
- checked
+ - Checked
- checkmate
- chessIO
- chevalier-common
@@ -3495,7 +3469,6 @@ broken-packages:
- ClassLaws
- classy-miso
- classy-parallel
- - classy-prelude-yesod
- ClassyPrelude
- clay
- clckwrks
@@ -3551,6 +3524,8 @@ broken-packages:
- cmt
- cmv
- cnc-spec-compiler
+ - co-log
+ - co-log-polysemy
- co-log-sys
- Coadjute
- coalpit
@@ -3561,6 +3536,7 @@ broken-packages:
- codecov-haskell
- codemonitor
- codepad
+ - codeworld-api
- codex
- coin
- coinbase-exchange
@@ -3578,7 +3554,6 @@ broken-packages:
- colorless
- colorless-http-client
- colorless-scotty
- - colour-accelerate
- colour-space
- coltrane
- columbia
@@ -3590,7 +3565,6 @@ broken-packages:
- combinatorial-problems
- Combinatorrent
- combobuffer
- - comic
- Command
- commander
- Commando
@@ -3630,29 +3604,25 @@ broken-packages:
- concrete-haskell-autogen
- concrete-relaxng-parser
- concrete-typerep
- - concurrency-benchmarks
- concurrent-buffer
- Concurrent-Cache
- concurrent-machines
- concurrent-state
- Concurrential
- ConcurrentUtils
- - Condor
- condor
+ - Condor
- condorcet
- conductive-base
- conductive-hsc3
- conductive-song
- - conduit-algorithms
- conduit-audio-lame
- conduit-audio-samplerate
- conduit-find
- - conduit-merge
- conduit-network-stream
- conduit-resumablesink
- conduit-throttle
- conduit-tokenize-attoparsec
- - conduit-zstd
- conf
- conffmt
- confide
@@ -3671,8 +3641,8 @@ broken-packages:
- connection-string
- Conscript
- consistent
- - console-program
- const-math-ghc-plugin
+ - constrained-categories
- constrained-category
- constrained-dynamic
- constrained-monads
@@ -3680,9 +3650,7 @@ broken-packages:
- constraint-manip
- constraint-reflection
- ConstraintKinds
- - constraints-deriving
- constraints-emerge
- - constraints-extras
- constructive-algebra
- consul-haskell
- Consumer
@@ -3694,12 +3662,13 @@ broken-packages:
- context-free-grammar
- context-stack
- ContextAlgebra
+ - contiguous
+ - contiguous-checked
- contiguous-fft
- continue
- continuum
- continuum-client
- Contract
- - control-event
- control-monad-attempt
- control-monad-exception
- control-monad-exception-monadsfd
@@ -3714,14 +3683,8 @@ broken-packages:
- convert-annotation
- convertible-ascii
- convertible-text
- - copilot
- - copilot-c99
- copilot-cbmc
- - copilot-core
- - copilot-language
- - copilot-libraries
- copilot-sbv
- - copilot-theorem
- copr
- COrdering
- core
@@ -3748,6 +3711,7 @@ broken-packages:
- cparsing
- CPBrainfuck
- cpio-conduit
+ - cpkg
- cplusplus-th
- cprng-aes-effect
- cpuperf
@@ -3801,7 +3765,6 @@ broken-packages:
- crystalfontz
- cse-ghc-plugin
- csg
- - csound-catalog
- CSPM-cspm
- CSPM-FiringRules
- CSPM-Frontend
@@ -3818,7 +3781,6 @@ broken-packages:
- cube
- cuboid
- cudd
- - curl-runnings
- currency-convert
- curry-frontend
- CurryDB
@@ -3828,15 +3790,14 @@ broken-packages:
- curves
- custom-prelude
- CV
- - cyclotomic
- cypher
- d-bus
- d3js
- dag
- DAG-Tournament
- Dangerous
- - Dao
- dao
+ - Dao
- dapi
- darcs-benchmark
- darcs-beta
@@ -3870,7 +3831,6 @@ broken-packages:
- data-fin
- data-fin-simple
- data-flagset
- - data-interval
- data-ivar
- data-kiln
- data-layer
@@ -3891,8 +3851,8 @@ broken-packages:
- data-repr
- data-result
- data-rev
- - Data-Rope
- data-rope
+ - Data-Rope
- data-rtuple
- data-size
- data-spacepart
@@ -3954,6 +3914,7 @@ broken-packages:
- dead-simple-json
- Deadpan-DDP
- debian
+ - debug
- debug-me
- debug-trace-var
- decepticons
@@ -4002,11 +3963,11 @@ broken-packages:
- derp-lib
- descript-lang
- deterministic-game-engine
+ - detour-via-sci
- detour-via-uom
- deunicode
- devil
- dewdrop
- - df1
- dfinity-radix-tree
- Dflow
- dfsbuild
@@ -4014,11 +3975,7 @@ broken-packages:
- dgs
- dhall-check
- dhall-nix
- - dhall-to-cabal
- dhcp-lease-parser
- - di
- - di-df1
- - di-handle
- dia-base
- dia-functions
- diagrams-boolean
@@ -4053,6 +4010,7 @@ broken-packages:
- digestive-functors-hsp
- DigitalOcean
- digitalocean-kzs
+ - digraph
- dimensional-tf
- DimensionalHash
- dingo-core
@@ -4068,6 +4026,7 @@ broken-packages:
- direct-rocksdb
- directed-cubical
- dirfiles
+ - dirtree
- discogs-haskell
- discord-gateway
- discord-haskell
@@ -4082,12 +4041,9 @@ broken-packages:
- disjoint-set-stateful
- diskhash
- disposable
- - Dist
- dist-upload
- distance
- DisTract
- - distributed-closure
- - distributed-fork
- distributed-fork-aws-lambda
- distributed-process
- distributed-process-async
@@ -4115,6 +4071,7 @@ broken-packages:
- dixi
- djembe
- djinn-th
+ - dl-fedora
- dmenu
- dmenu-pkill
- dmenu-pmount
@@ -4127,13 +4084,13 @@ broken-packages:
- doc-review
- doccheck
- docidx
- - docker
- docker-build-cacher
- dockercook
- DocTest
- doctest-discover-configurator
- doctest-driver-gen
- doctest-prop
+ - docusign-client
- docusign-example
- docvim
- doi
@@ -4169,6 +4126,7 @@ broken-packages:
- DrIFT-cabalized
- drifter-postgresql
- drmaa
+ - drone
- dropbox-sdk
- dropsolve
- ds-kanren
@@ -4177,7 +4135,6 @@ broken-packages:
- dsh-sql
- dsmc
- dsmc-tools
- - dson
- dson-parsec
- DSTM
- dstring
@@ -4193,6 +4150,7 @@ broken-packages:
- Dust-crypto
- Dust-tools
- Dust-tools-pcap
+ - dvault
- dvda
- dvdread
- dvi-processing
@@ -4216,8 +4174,6 @@ broken-packages:
- easy-api
- easyjson
- easyplot
- - easytensor
- - easytensor-vulkan
- ebeats
- ebnf-bff
- ecma262
@@ -4234,8 +4190,7 @@ broken-packages:
- editline
- EditTimeReport
- effect-handlers
- - effects
- - effects-parser
+ - effect-stack
- effin
- egison-quote
- egison-tutorial
@@ -4250,34 +4205,30 @@ broken-packages:
- ekg-elasticsearch
- ekg-influxdb
- ekg-log
- - ekg-prometheus-adapter
- ekg-push
- ekg-rrd
- elevator
- elision
- elm-websocket
- - elsa
- emacs-keys
- email
- email-header
- email-postmark
- - email-validator
- emailparse
- embeddock
- embeddock-example
- embroidery
- - emd
- emgm
- Emping
- Empty
- empty-monad
+ - enchant
- encoding
- encoding-io
- engine-io-growler
- engine-io-snap
- engine-io-wai
- engine-io-yesod
- - ENIG
- entangle
- EntrezHTTP
- entwine
@@ -4308,6 +4259,7 @@ broken-packages:
- eros
- eros-client
- eros-http
+ - error-codes
- error-context
- error-continuations
- error-list
@@ -4323,7 +4275,6 @@ broken-packages:
- esotericbot
- EsounD
- espial
- - esqueleto
- ess
- estimators
- EstProgress
@@ -4353,7 +4304,7 @@ broken-packages:
- event-monad
- eventful-dynamodb
- eventful-postgresql
- - eventloop
+ - eventlog2html
- EventSocket
- eventsource-geteventstore-store
- eventstore
@@ -4362,7 +4313,6 @@ broken-packages:
- exact-real
- exact-real-positional
- except-exceptions
- - exception-hierarchy
- exception-monads-fd
- exchangerates
- execs
@@ -4392,7 +4342,6 @@ broken-packages:
- extemp
- extended-categories
- extensible-data
- - extensible-effects-concurrent
- Extra
- extract-dependencies
- extractelf
@@ -4401,6 +4350,7 @@ broken-packages:
- f-ree-hack-cheats-free-v-bucks-generator
- Facebook-Password-Hacker-Online-Latest-Version
- faceted
+ - factory
- Facts
- factual-api
- fadno
@@ -4409,7 +4359,6 @@ broken-packages:
- failable-list
- failure-detector
- FailureT
- - fake
- fake-type
- faktory
- falling-turnip
@@ -4423,23 +4372,13 @@ broken-packages:
- fastedit
- fastirc
- fastly
- - fastparser
- FastPush
- FastxPipe
- fathead-util
- fault-tree
- - fay
- - fay-base
- fay-builder
- - fay-dom
- - fay-geoposition
- fay-hsx
- - fay-jquery
- - fay-ref
- fay-simplejson
- - fay-text
- - fay-uri
- - fay-websockets
- fb-persistent
- fbmessenger-api
- fca
@@ -4489,21 +4428,21 @@ broken-packages:
- FileManipCompat
- fileneglect
- filepath-io-access
- - FilePather
- filepather
+ - FilePather
- Files
- FileSystem
- filesystem-conduit
- filesystem-enumerator
- filesystem-trees
- fillit
- - fin
- final-pretty-printer
- Finance-Quote-Yahoo
- Finance-Treasury
- find-clumpiness
- find-conduit
- find-source-files
+ - findhttp
- fingertree-psqueue
- fingertree-tf
- FiniteMap
@@ -4511,6 +4450,7 @@ broken-packages:
- first-and-last
- firstify
- FirstOrderTheory
+ - fishfood
- fit
- fitsio
- fix-parser-simple
@@ -4539,6 +4479,7 @@ broken-packages:
- flexiwrap
- flexiwrap-smallcheck
- flickr
+ - flight-kml
- Flippi
- flite
- float-binstring
@@ -4637,8 +4578,6 @@ broken-packages:
- fresh
- friday-devil
- friday-scale-dct
- - friendly
- - front
- frown
- frp-arduino
- frpnow
@@ -4657,7 +4596,6 @@ broken-packages:
- FTPLine
- ftshell
- full-sessions
- - full-text-search
- fullstop
- funbot
- funbot-client
@@ -4667,6 +4605,7 @@ broken-packages:
- function-instances-algebra
- functional-arrow
- functor
+ - functor-combinators
- functorm
- funflow
- funflow-nix
@@ -4684,6 +4623,8 @@ broken-packages:
- fwgl-glfw
- fwgl-javascript
- g-npm
+ - g2
+ - g2q
- g4ip
- gact
- game-probability
@@ -4724,7 +4665,6 @@ broken-packages:
- GeneralTicTacToe
- generators
- generic-accessors
- - generic-aeson
- generic-binary
- generic-church
- generic-enum
@@ -4736,7 +4676,6 @@ broken-packages:
- generic-tree
- generic-xml
- generic-xmlpickler
- - generics-eot
- genericserialize
- genesis
- genesis-test
@@ -4765,11 +4704,10 @@ broken-packages:
- getflag
- GGg
- ggtsTC
+ - gh-labeler
- ghc-core-smallstep
- ghc-datasize
- - ghc-dump-core
- ghc-dump-tree
- - ghc-dump-util
- ghc-dup
- ghc-events-analyze
- ghc-events-parallel
@@ -4780,7 +4718,6 @@ broken-packages:
- ghc-man-completion
- ghc-mod
- ghc-parmake
- - ghc-parser
- ghc-pkg-autofix
- ghc-pkg-lib
- ghc-proofs
@@ -4800,8 +4737,6 @@ broken-packages:
- ghci-lib
- ghci-ng
- ghcjs-base-stub
- - ghcjs-dom
- - ghcjs-dom-jsaddle
- ghcjs-dom-jsffi
- ghcjs-fetch
- ghcjs-hplay
@@ -4810,14 +4745,30 @@ broken-packages:
- ghclive
- ght
- gi-cairo-again
+ - gi-dbusmenu
+ - gi-dbusmenugtk3
+ - gi-gdkx11
+ - gi-ggit
+ - gi-girepository
+ - gi-gst
+ - gi-gstaudio
+ - gi-gstbase
- gi-gstpbutils
- gi-gsttag
+ - gi-gstvideo
- gi-gtkosxapplication
+ - gi-handy
- gi-notify
+ - gi-ostree
+ - gi-pangocairo
- gi-poppler
+ - gi-secret
+ - gi-soup
- gi-wnck
+ - gi-xlib
- giak
- Gifcurry
+ - ginger
- ginsu
- gipeda
- gist
@@ -4828,12 +4779,13 @@ broken-packages:
- git-fmt
- git-gpush
- git-jump
- - git-monitor
- git-object
+ - git-remote-ipfs
- git-repair
- git-sanity
- git-vogue
- gitdo
+ - github
- github-backup
- github-data
- github-tools
@@ -4841,14 +4793,12 @@ broken-packages:
- github-webhook-handler
- github-webhook-handler-snap
- gitignore
+ - gitit
- gitlab-api
- gitlib-cross
- - gitlib-libgit2
- gitlib-s3
- - gitlib-test
- gitlib-utils
- gitson
- - gitter
- glade
- gladexml-accessor
- glapp
@@ -4869,7 +4819,6 @@ broken-packages:
- glome-hs
- GlomeTrace
- GlomeView
- - gloss-accelerate
- gloss-banana
- gloss-devil
- gloss-export
@@ -4877,10 +4826,6 @@ broken-packages:
- gloss-sodium
- glpk-hs
- glue
- - glue-common
- - glue-core
- - glue-ekg
- - glue-example
- gmap
- gmndl
- gnome-desktop
@@ -4910,7 +4855,6 @@ broken-packages:
- googlepolyline
- GoogleSB
- GoogleTranslate
- - gopher-proxy
- gopherbot
- gore-and-ash
- gore-and-ash-actor
@@ -4925,7 +4869,6 @@ broken-packages:
- GotoT-transformers
- gotta-go-fast
- gpah
- - GPipe
- GPipe-Collada
- GPipe-Examples
- GPipe-GLFW
@@ -4988,7 +4931,6 @@ broken-packages:
- GroteTrap
- groundhog-converters
- group-with
- - grouped-list
- growler
- GrowlNotify
- grpc-etcd-client
@@ -5002,6 +4944,7 @@ broken-packages:
- GTALib
- gtfs
- gtk-serialized-event
+ - gtk-sni-tray
- gtk-toy
- gtk2hs-hello
- gtk2hs-rpn
@@ -5062,8 +5005,6 @@ broken-packages:
- hackmanager
- hactor
- hactors
- - haddock
- - haddock-api
- haddock-leksah
- haddock-test
- haddocset
@@ -5090,10 +5031,12 @@ broken-packages:
- hakyll-contrib-hyphenation
- hakyll-contrib-links
- hakyll-convert
+ - hakyll-dhall
- hakyll-filestore
- hakyll-ogmarkup
- hakyll-R
- hakyll-shortcode
+ - hakyll-shortcut-links
- halberd
- halfs
- halipeto
@@ -5173,7 +5116,6 @@ broken-packages:
- haroonga-httpd
- harpy
- harvest-api
- - has
- has-th
- HasCacBDD
- hascas
@@ -5209,7 +5151,6 @@ broken-packages:
- haskell-conll
- haskell-course-preludes
- haskell-disque
- - haskell-docs
- haskell-eigen-util
- haskell-formatter
- haskell-ftp
@@ -5221,7 +5162,6 @@ broken-packages:
- haskell-lsp-client
- haskell-ml
- haskell-mpfr
- - haskell-names
- haskell-neo4j-client
- haskell-openflow
- haskell-overridez
@@ -5320,6 +5260,10 @@ broken-packages:
- hasktorch-signatures-partial
- hasktorch-signatures-support
- hasktorch-zoo
+ - haskus-binary
+ - haskus-system-build
+ - haskus-utils
+ - haskus-utils-compat
- haskus-web
- haslo
- hasloGUI
@@ -5327,7 +5271,10 @@ broken-packages:
- hasql-backend
- hasql-class
- hasql-cursor-query
+ - hasql-cursor-transaction
+ - hasql-dynamic-statements
- hasql-generic
+ - hasql-implicits
- hasql-migration
- hasql-optparse-applicative
- hasql-pool
@@ -5356,6 +5303,7 @@ broken-packages:
- haxl-amazonka
- haxl-facebook
- haxparse
+ - haxr
- haxr-th
- haxy
- hayland
@@ -5388,8 +5336,8 @@ broken-packages:
- hdaemonize-buildfix
- hdbc-aeson
- HDBC-mysql
- - HDBC-postgresql-hstore
- hdbc-postgresql-hstore
+ - HDBC-postgresql-hstore
- hdbi
- hdbi-conduit
- hdbi-postgresql
@@ -5403,13 +5351,11 @@ broken-packages:
- hdiscount
- hdm
- hdo
- - hdocs
- hdph
- hdph-closure
- hdr-histogram
- HDRUtils
- headergen
- - heap
- heartbeat-streams
- heatitup
- heatitup-complete
@@ -5417,7 +5363,10 @@ broken-packages:
- heckle
- hedgehog-checkers
- hedgehog-checkers-lens
+ - hedgehog-classes
+ - hedgehog-fn
- hedgehog-gen-json
+ - hedgehog-quickcheck
- Hedi
- hedis-config
- hedis-pile
@@ -5464,6 +5413,7 @@ broken-packages:
- hevm
- hevolisa
- hevolisa-dph
+ - HExcel
- hexchat
- hexif
- hexmino
@@ -5475,7 +5425,6 @@ broken-packages:
- hexquote
- hext
- heyefi
- - heyting-algebras
- hF2
- hfann
- hfd
@@ -5508,6 +5457,7 @@ broken-packages:
- hgrib
- hharp
- HHDL
+ - hi-file-parser
- hi3status
- hiccup
- hichi
@@ -5520,7 +5470,6 @@ broken-packages:
- hierarchy
- hiernotify
- Hieroglyph
- - higgledy
- HiggsSet
- higherorder
- highjson
@@ -5540,7 +5489,6 @@ broken-packages:
- hinter
- hinvaders
- hinze-streams
- - hip
- hipbot
- hipchat-hs
- hipe
@@ -5565,6 +5513,7 @@ broken-packages:
- hjsonpointer
- hjsonschema
- HJVM
+ - hkgr
- hlatex
- hlbfgsb
- hlcm
@@ -5582,15 +5531,14 @@ broken-packages:
- hlibfam
- HList
- HListPP
- - HLogger
- hlogger
+ - HLogger
- hlongurl
- hls
- hlwm
- hly
- hmark
- hmarkup
- - hmatrix-backprop
- hmatrix-banded
- hmatrix-mmap
- hmatrix-morpheus
@@ -5614,7 +5562,6 @@ broken-packages:
- Hmpf
- hmt-diagrams
- hmumps
- - hnix
- HNM
- hnormalise
- ho-rewriting
@@ -5626,6 +5573,7 @@ broken-packages:
- hocker
- hodatime
- HODE
+ - Hoed
- hog
- hogg
- hoggl
@@ -5702,6 +5650,7 @@ broken-packages:
- hpqtypes
- hpqtypes-extras
- hprotoc-fork
+ - hprox
- hps
- hps-cairo
- hps-kmeans
@@ -5870,8 +5819,6 @@ broken-packages:
- hsreadability
- hsseccomp
- hsSqlite3
- - hssqlppp
- - hssqlppp-th
- HsSVN
- hstatistics
- hstats
@@ -5890,6 +5837,7 @@ broken-packages:
- hsx-jmacro
- hsx-xhtml
- hsXenCtrl
+ - HsYAML-aeson
- hsyscall
- hsyslog-tcp
- hsyslog-udp
@@ -5917,16 +5865,20 @@ broken-packages:
- http-client-streams
- http-conduit-browser
- http-conduit-downloader
+ - http-directory
- http-dispatch
+ - http-download
- http-enumerator
- http-grammar
- http-kinder
- http-monad
+ - http-pony
- http-pony-serve-wai
- http-proxy
- http-querystring
- http-response-decoder
- http-shed
+ - http-streams
- http-wget
- http2-client-grpc
- http2-grpc-types
@@ -5936,6 +5888,7 @@ broken-packages:
- htune
- htvm
- htzaar
+ - hubigraph
- huck
- HueAPI
- huff
@@ -5972,17 +5925,15 @@ broken-packages:
- hw-ip
- hw-json
- hw-json-lens
- - hw-json-simd
+ - hw-json-simple-cursor
+ - hw-json-standard-cursor
- hw-packed-vector
- - hw-parser
- - hw-prim
- - hw-prim-bits
- hw-rankselect
- hw-rankselect-base
- hw-simd
- hw-streams
- hw-succinct
- - hw-vector
+ - hw-uri
- hw-xml
- hwall-auth-iitk
- hweblib
@@ -6031,6 +5982,7 @@ broken-packages:
- hypher
- hzulip
- i18n
+ - i3blocks-hs-contrib
- i3ipc
- iap-verifier
- ib-api
@@ -6081,6 +6033,7 @@ broken-packages:
- imap
- imapget
- imbib
+ - imgur
- imgurder
- imj-animation
- imj-base
@@ -6122,6 +6075,7 @@ broken-packages:
- inject-function
- inline-java
- inserts
+ - inspection-proxy
- inspector-wrecker
- instana-haskell-trace-sdk
- instant-aeson
@@ -6150,22 +6104,20 @@ broken-packages:
- invertible-hlist
- io-capture
- io-reactive
- - ion
- IOR
- IORefCAS
- iostring
- iothread
- iotransaction
- - ip
- ip2location
- ip2proxy
- ipatch
- ipc
+ - ipld-cid
- ipopt-hs
- iptables-helpers
- iptadmin
- IPv6DB
- - ipython-kernel
- Irc
- irc-dcc
- irc-fun-bot
@@ -6198,16 +6150,7 @@ broken-packages:
- iterIO
- iterio-server
- ivor
- - ivory
- - ivory-backend-c
- ivory-bitdata
- - ivory-eval
- - ivory-examples
- - ivory-hw
- - ivory-opts
- - ivory-quickcheck
- - ivory-serialize
- - ivory-stdlib
- ivy-web
- ixdopp
- ixmonad
@@ -6215,14 +6158,13 @@ broken-packages:
- iyql
- j2hs
- jack-bindings
- - JackMiniMix
- jackminimix
+ - JackMiniMix
- jacobi-roots
- jaeger-flamegraph
- jail
- jalaali
- jalla
- - jammittools
- jarfind
- jarify
- jason
@@ -6257,13 +6199,13 @@ broken-packages:
- jonathanscard
- jpeg
- js-good-parts
- - jsaddle-dom
- jsaddle-hello
- jsaddle-warp
- jsaddle-wkwebview
- JsContracts
- jsmw
- json-api
+ - json-api-lib
- json-ast-json-encoder
- json-ast-quickcheck
- json-b
@@ -6287,7 +6229,7 @@ broken-packages:
- JSONb
- jsonextfilter
- JsonGrammar
- - JSONParser
+ - jsonpath
- jsonresume
- jsonrpc-conduit
- jsons-to-schema
@@ -6315,10 +6257,9 @@ broken-packages:
- kademlia
- kafka-client
- kaleidoscope
- - Kalman
- kalman
+ - Kalman
- kangaroo
- - kanji
- kansas-lava
- kansas-lava-cores
- kansas-lava-papilio
@@ -6335,7 +6276,6 @@ broken-packages:
- kawaii
- kd-tree
- kdesrc-build-extra
- - kdt
- keccak
- keera-hails-i18n
- keera-hails-mvc-environment-gtk
@@ -6350,6 +6290,7 @@ broken-packages:
- keera-hails-reactive-yampa
- keera-hails-reactivelenses
- keera-hails-reactivevalues
+ - kerry
- Ketchup
- keter
- kevin
@@ -6398,12 +6339,17 @@ broken-packages:
- lambda-calculator
- lambda-canvas
- lambda-devs
- - lambda-options
- lambda-toolbox
- lambda2js
- lambdaBase
- lambdabot
+ - lambdabot-core
- lambdabot-haskell-plugins
+ - lambdabot-irc-plugins
+ - lambdabot-misc-plugins
+ - lambdabot-novelty-plugins
+ - lambdabot-reference-plugins
+ - lambdabot-social-plugins
- lambdabot-utils
- lambdabot-zulip
- lambdacms-core
@@ -6429,6 +6375,7 @@ broken-packages:
- LambdaShell
- lambdatex
- lambdatwit
+ - Lambdaya
- lambdaya-bus
- lambdiff
- lame
@@ -6439,6 +6386,7 @@ broken-packages:
- language-c-comments
- language-c-inline
- language-conf
+ - language-csharp
- language-css
- language-dart
- language-dockerfile
@@ -6481,7 +6429,6 @@ broken-packages:
- latex-formulae-image
- latex-formulae-pandoc
- LATS
- - lattices
- launchpad-control
- lawless-concurrent-machines
- layers
@@ -6503,10 +6450,10 @@ broken-packages:
- ldif
- leaf
- leaky
+ - lean
- leanpub-wreq
- leapseconds
- learn
- - learn-physics
- learn-physics-examples
- Learning
- leetify
@@ -6516,10 +6463,11 @@ broken-packages:
- legion-extra
- leksah-server
- lendingclub
- - lens-accelerate
+ - lens-filesystem
- lens-prelude
- lens-text-encoding
- lens-time
+ - lens-toml-parser
- lens-tutorial
- lensref
- level-monad
@@ -6538,7 +6486,6 @@ broken-packages:
- libconfig
- libcspm
- libexpect
- - libffi-dynamic
- libGenI
- libhbb
- libinfluxdb
@@ -6552,10 +6499,10 @@ broken-packages:
- liboleg
- libpafe
- libpq
+ - libraft
- librandomorg
- librato
- libsystemd-daemon
- - libsystemd-journal
- libtagc
- libxls
- libxml-enumerator
@@ -6574,7 +6521,7 @@ broken-packages:
- limp-cbc
- linda
- linden
- - linear-accelerate
+ - line-drawing
- linear-algebra-cblas
- linear-circuit
- linear-code
@@ -6605,7 +6552,6 @@ broken-packages:
- lio-simple
- lipsum-gen
- liquid
- - liquidhaskell-cabal-demo
- list-fusion-probe
- list-mux
- list-prompt
@@ -6634,7 +6580,6 @@ broken-packages:
- llvm-general
- llvm-general-pure
- llvm-general-quote
- - llvm-hs
- llvm-hs-pretty
- llvm-ht
- llvm-pkg-config
@@ -6662,7 +6607,6 @@ broken-packages:
- logging-effect-extra
- logging-effect-extra-file
- logging-effect-extra-handler
- - logging-facade-journald
- Logic
- logic-classes
- logic-TPTP
@@ -6708,7 +6652,6 @@ broken-packages:
- lua-bc
- luachunk
- luautils
- - lucid-svg
- lucienne
- Lucu
- lui
@@ -6739,7 +6682,6 @@ broken-packages:
- madlang
- mage
- magic-wormhole
- - magicbane
- MagicHaskeller
- magico
- magma
@@ -6777,7 +6719,6 @@ broken-packages:
- mangopay
- manifold-random
- manifolds
- - manifolds-core
- map-exts
- map-reduce-folds
- map-syntax
@@ -6789,6 +6730,7 @@ broken-packages:
- markdown2svg
- marked-pretty
- markov-processes
+ - markov-realization
- markup
- marmalade-upload
- marquise
@@ -6837,13 +6779,12 @@ broken-packages:
- mecab
- mech
- Mecha
- - Mechs
- mechs
+ - Mechs
- med-module
- mediabus
- mediabus-fdk-aac
- mediabus-rtp
- - median-stream
- mediawiki
- medium-sdk-haskell
- mellon-core
@@ -6896,6 +6837,7 @@ broken-packages:
- midimory
- midisurface
- mighttpd
+ - mighttpd2
- mighty-metropolis
- mikmod
- mikrokosmos
@@ -6913,10 +6855,10 @@ broken-packages:
- miniplex
- minirotate
- ministg
- - minitypeset-opengl
- minst-idx
- mios
- mirror-tweet
+ - miso-action-logger
- miss
- miss-porcelain
- missing-py2
@@ -6928,30 +6870,32 @@ broken-packages:
- ml-w
- mlist
- mltool
+ - mmark
+ - mmark-cli
+ - mmark-ext
- mmtf
- mmtl
- mmtl-base
- moan
- Mobile-Legends-Hack-Cheats
- - model
- modelicaparser
- modify-fasta
- modsplit
- - modular
- modular-prelude
- modular-prelude-classy
- modularity
- module-management
- modulespection
- modulo
- - Moe
- moe
+ - Moe
- MoeDict
- mohws
- mole
- mollie-api-haskell
- monad-atom
- monad-atom-simple
+ - monad-chronicle
- monad-codec
- monad-dijkstra
- monad-exception
@@ -6979,7 +6923,6 @@ broken-packages:
- monad-unify
- monad-var
- monad-wrap
- - monadacme
- MonadCatchIO-mtl
- MonadCatchIO-mtl-foreign
- MonadCatchIO-transformers
@@ -7018,7 +6961,6 @@ broken-packages:
- monzo
- moo
- moonshine
- - more-containers
- morfette
- morfeusz
- morley
@@ -7029,8 +6971,7 @@ broken-packages:
- morphisms-objects
- morte
- mosaico-lib
- - moto
- - moto-postgresql
+ - moss
- mount
- movie-monad
- mp
@@ -7041,14 +6982,13 @@ broken-packages:
- mpris
- mprover
- mps
+ - mptcp-pm
- mpvguihs
- mqtt
- mqtt-hs
- mrifk
- mrm
- ms
- - msgpack
- - msgpack-aeson
- msgpack-idl
- msgpack-rpc
- msh
@@ -7072,9 +7012,10 @@ broken-packages:
- multi-cabal
- multiaddr
- multiarg
- - multifile
+ - multibase
- multifocal
- multihash
+ - multihash-serialise
- multilinear
- multilinear-io
- multipass
@@ -7083,7 +7024,6 @@ broken-packages:
- multirec-alt-deriver
- multirec-binary
- multisetrewrite
- - multistate
- multivariant
- Munkres-simple
- muon
@@ -7110,7 +7050,6 @@ broken-packages:
- mvc
- mvc-updates
- mvclient
- - mwc-random-accelerate
- mxnet
- mxnet-dataiter
- mxnet-examples
@@ -7145,7 +7084,6 @@ broken-packages:
- nanovg
- nanovg-simple
- nanq
- - naqsha
- narc
- nat-sized-numbers
- nationstates
@@ -7171,7 +7109,8 @@ broken-packages:
- nested-sequence
- NestedFunctor
- nestedmap
- - net-spider
+ - net-spider-pangraph
+ - net-spider-rpl
- netclock
- netcore
- netease-fm
@@ -7187,6 +7126,8 @@ broken-packages:
- netwire-vinylglfw-examples
- network-address
- network-anonymous-i2p
+ - network-anonymous-tor
+ - network-bsd
- network-builder
- network-bytestring
- network-connection
@@ -7201,7 +7142,10 @@ broken-packages:
- network-rpca
- network-server
- network-service
+ - network-simple
- network-simple-sockaddr
+ - network-simple-tls
+ - network-simple-ws
- network-simple-wss
- network-stream
- network-topic-models
@@ -7209,7 +7153,6 @@ broken-packages:
- network-transport-inmemory
- network-transport-tcp
- network-transport-tests
- - network-transport-zeromq
- network-voicetext
- network-wai-router
- network-websocket
@@ -7219,6 +7162,8 @@ broken-packages:
- neural-network-hmatrix
- newhope
- newports
+ - newsletter
+ - newsletter-mailgun
- newt
- newtype-deriving
- newtype-th
@@ -7232,12 +7177,12 @@ broken-packages:
- nice-html
- nicovideo-translator
- nikepub
- - nimber
- Ninjas
- nirum
- nitro
- - nix-eval
+ - niv
- nixfromnpm
+ - nixpkgs-update
- nkjp
- nlp-scores
- nlp-scores-scripts
@@ -7256,16 +7201,18 @@ broken-packages:
- Nomyx-Web
- non-empty-zipper
- NonEmpty
+ - nonempty-containers
- NonEmptyList
- normalization-insensitive
- NoSlow
- not-gloss-examples
- notcpp
+ - notifications-tray-icon
- notmuch-haskell
- notmuch-web
- - NoTrace
- np-linear
- nptools
+ - ntha
- ntrip-client
- NTRU
- null-canvas
@@ -7280,15 +7227,14 @@ broken-packages:
- numeric-qq
- numeric-ranges
- numerical
- - numhask
- numhask-array
+ - numhask-hedgehog
- numhask-histogram
- numhask-prelude
- numhask-range
- numhask-test
- Nussinov78
- Nutri
- - nvim-hs-ghcid
- NXT
- NXTDSL
- nylas
@@ -7324,11 +7270,10 @@ broken-packages:
- oidc-client
- ois-input-manager
- olwrapper
- - om-elm
- omaketex
- ombra
- - Omega
- omega
+ - Omega
- omnifmt
- on-a-horse
- onama
@@ -7343,11 +7288,9 @@ broken-packages:
- open-haddock
- open-pandoc
- open-signals
- - open-typerep
- OpenAFP
- OpenAFP-Utils
- openapi-petstore
- - opench-meteo
- OpenCL
- OpenCLRaw
- OpenCLWrappers
@@ -7413,7 +7356,6 @@ broken-packages:
- packunused
- pacman-memcache
- padKONTROL
- - pads-haskell
- pagarme
- PageIO
- pagure-hook-receiver
@@ -7421,7 +7363,6 @@ broken-packages:
- pam
- panda
- pandoc-include
- - pandoc-include-code
- pandoc-japanese-filters
- pandoc-lens
- pandoc-plantuml-diagrams
@@ -7430,6 +7371,7 @@ broken-packages:
- pang-a-lambda
- pangraph
- panpipe
+ - pantry-tmp
- papa-export
- papa-implement
- papa-include
@@ -7447,7 +7389,6 @@ broken-packages:
- Parallel-Arrows-Eden
- parallel-tasks
- parameterized
- - parameterized-utils
- paramtree
- paranoia
- parco
@@ -7463,6 +7404,7 @@ broken-packages:
- parsec-pratt
- parseerror-eq
- parsely
+ - parser-combinators-tests
- parser-helper
- parser241
- parsergen
@@ -7477,7 +7419,6 @@ broken-packages:
- pasta
- pastis
- pasty
- - patat
- patches-vector
- Pathfinder
- pathfindingcore
@@ -7512,7 +7453,6 @@ broken-packages:
- pedestrian-dag
- peg
- peggy
- - pencil
- penny
- penny-bin
- penny-lib
@@ -7522,8 +7462,8 @@ broken-packages:
- peregrin
- perf
- perf-analysis
- - PerfectHash
- perfecthash
+ - PerfectHash
- perhaps
- periodic
- perm
@@ -7535,6 +7475,7 @@ broken-packages:
- persistent-audit
- persistent-cereal
- persistent-database-url
+ - persistent-documentation
- persistent-equivalence
- persistent-hssqlppp
- persistent-map
@@ -7557,7 +7498,6 @@ broken-packages:
- peyotls-codec
- pez
- pg-harness
- - pg-harness-server
- pg-recorder
- pg-store
- pg-transact
@@ -7583,7 +7523,6 @@ broken-packages:
- picoparsec
- picosat
- pictikz
- - pidfile
- pier
- pier-core
- piet
@@ -7609,10 +7548,12 @@ broken-packages:
- pipes-illumina
- pipes-io
- pipes-key-value-csv
+ - pipes-network
+ - pipes-network-tls
+ - pipes-network-ws
- pipes-p2p
- pipes-p2p-examples
- pipes-protolude
- - pipes-random
- pipes-rt
- pipes-s3
- pipes-shell
@@ -7629,11 +7570,11 @@ broken-packages:
- pkcs10
- pkcs7
- pkggraph
+ - pkgtreediff
- plailude
- plan-applicative
- plan-b
- planar-graph
- - planb-token-introspection
- planet-mitchell
- planet-mitchell-test
- plankton
@@ -7650,11 +7591,11 @@ broken-packages:
- Plot-ho-matic
- plot-lab
- plot-light-examples
- - plots
- PlslTools
- plugins
- plugins-auto
- plugins-multistage
+ - plur
- plural
- png-file
- pngload
@@ -7679,11 +7620,14 @@ broken-packages:
- polydata
- polydata-core
- polynomial
+ - polysemy
+ - polysemy-plugin
+ - polysemy-RandomFu
+ - polysemy-zoo
- polyseq
- polysoup
- polytypeable
- polytypeable-utils
- - pomaps
- pomodoro
- pomohoro
- ponder
@@ -7694,10 +7638,10 @@ broken-packages:
- poppler
- portager
- porte
- - porter
- PortFusion
- ports
- posix-acl
+ - posix-api
- posix-realtime
- posix-waitpid
- postcodes
@@ -7751,18 +7695,21 @@ broken-packages:
- presburger
- press
- presto-hdbc
- - pretty-ghci
- pretty-ncols
- pretty-relative-time
- prettyprinter-vty
- preview
- prim-array
- - prim-instances
- primes-type
+ - primitive-addr
+ - primitive-atomic
+ - primitive-checked
- primitive-containers
+ - primitive-extras
- primitive-indexed
- - primitive-maybe
- primitive-simd
+ - primitive-sort
+ - primitive-unlifted
- primula-board
- primula-bot
- pringletons
@@ -7797,12 +7744,12 @@ broken-packages:
- project-m36
- projectile
- prolog-graph
- - prometheus
- prometheus-effect
- promise
- pronounce
- proof-combinators
- propane
+ - propellor
- Proper
- properties
- property-list
@@ -7823,7 +7770,6 @@ broken-packages:
- proxy-mapping
- psc-ide
- pseudo-trie
- - pthread
- PTQ
- ptr
- publicsuffixlistcreate
@@ -7895,7 +7841,6 @@ broken-packages:
- QuickAnnotate
- quickbooks
- quickcheck-arbitrary-template
- - quickcheck-classes
- quickcheck-poly
- quickcheck-property-comb
- quickcheck-property-monad
@@ -7927,7 +7872,6 @@ broken-packages:
- quoridor-hs
- qux
- R-pandoc
- - raaz
- rad
- radium
- radium-formula-parser
@@ -7960,7 +7904,6 @@ broken-packages:
- rank1dynamic
- rank2classes
- Ranka
- - rapid
- rapid-term
- rasa
- rasa-example-config
@@ -7986,8 +7929,6 @@ broken-packages:
- razom-text-util
- rbr
- rc
- - rcu
- - rdf
- rdf4h
- rdioh
- react-flux
@@ -8037,13 +7978,9 @@ broken-packages:
- refcount
- Referees
- refh
- - refined
- reflection-extras
- - reflex
- reflex-animation
- reflex-backend-wai
- - reflex-basic-host
- - reflex-dom-core
- reflex-dom-svg
- reflex-gloss
- reflex-gloss-scene
@@ -8075,6 +8012,7 @@ broken-packages:
- regions-mtl
- register-machine-typelevel
- registry
+ - registry-hedgehog
- regress
- regular
- regular-extras
@@ -8085,7 +8023,6 @@ broken-packages:
- reified-records
- reify
- relacion
- - relation
- relational-postgresql8
- relative-date
- reload
@@ -8106,12 +8043,12 @@ broken-packages:
- repa-flow
- repa-linear-algebra
- repa-plugin
- - repa-scalar
- repa-series
- repa-stream
- repa-v4l2
- repl
- RepLib
+ - replica
- replicant
- ReplicateEffects
- repo-based-blog
@@ -8154,6 +8091,7 @@ broken-packages:
- reversi
- ReviewBoard
- rewrite
+ - rewrite-inspector
- rewriting
- rezoom
- rfc
@@ -8163,17 +8101,14 @@ broken-packages:
- rfc-psql
- rfc-redis
- rfc-servant
- - rhine
- - rhine-gloss
+ - rfc1413-server
- rhythm-game-tutorial
- - ribosome
- RichConditional
- - ridley
- - ridley-extras
- riemann
- riff
- ring-buffer
- ring-buffers
+ - rio-prettyprint
- riot
- risc386
- riscv-isa
@@ -8194,7 +8129,8 @@ broken-packages:
- RNAFoldProgs
- RNAlien
- RNAwolf
- - rncryptor
+ - rng-utils
+ - rob
- robin
- robots-txt
- roc-cluster
@@ -8228,7 +8164,6 @@ broken-packages:
- rspp
- rss-conduit
- rss2irc
- - rtnetlink
- rtorrent-rpc
- rts-loader
- ruby-marshal
@@ -8236,6 +8171,7 @@ broken-packages:
- ruin
- ruler
- ruler-core
+ - run-st
- rungekutta
- runmany
- runtime-arbitrary
@@ -8251,11 +8187,6 @@ broken-packages:
- safe-json
- safe-lazy-io
- safe-length
- - safe-money
- - safe-money-aeson
- - safe-money-cereal
- - safe-money-serialise
- - safe-money-store
- safe-money-xmlbf
- safe-plugins
- safe-printf
@@ -8268,7 +8199,6 @@ broken-packages:
- saferoute
- sai-shape-syb
- sajson
- - salak
- salak-toml
- salak-yaml
- Salsa
@@ -8307,12 +8237,12 @@ broken-packages:
- scalendar
- SCalendar
- scalp-webhooks
+ - scan-metadata
- scan-vector-machine
- scc
- scenegraph
- schedevr
- schedule-planner
- - scheduler
- schedyield
- schematic
- scholdoc
@@ -8320,7 +8250,10 @@ broken-packages:
- scholdoc-texmath
- scholdoc-types
- SciBaseTypes
+ - scidb-hquery
- science-constants-dimensional
+ - SciFlow
+ - SciFlow-drmaa
- scion
- scion-browser
- scons2dot
@@ -8364,23 +8297,23 @@ broken-packages:
- secret-sharing
- secrm
- sednaDBXML
+ - selda-json
- selectors
- SelectSequencesFromMSA
- selenium
- selenium-server
- - self-extract
- selinux
- Semantique
- semdoc
- semi-iso
- - semibounded-lattices
+ - semialign
+ - semialign-indexed
- Semigroup
- semigroupoids-syntax
- semigroups-actions
- semilattices
- semiring
- semiring-num
- - semver-range
- sendgrid-haskell
- sendgrid-v3
- sensei
@@ -8410,6 +8343,7 @@ broken-packages:
- servant-auth-token-leveldb
- servant-auth-token-persistent
- servant-auth-token-rocksdb
+ - servant-cli
- servant-client-namedargs
- servant-csharp
- servant-db
@@ -8419,6 +8353,7 @@ broken-packages:
- servant-generate
- servant-generic
- servant-github
+ - servant-github-webhook
- servant-haxl-client
- servant-hmac-auth
- servant-http-streams
@@ -8431,10 +8366,10 @@ broken-packages:
- servant-pool
- servant-postgresql
- servant-proto-lens
- - servant-purescript
- servant-pushbullet-client
- servant-py
- servant-quickcheck
+ - servant-reason
- servant-reflex
- servant-router
- servant-scotty
@@ -8445,6 +8380,7 @@ broken-packages:
- servant-streaming-docs
- servant-streaming-server
- servant-waargonaut
+ - servant-xml
- servant-zeppelin
- servant-zeppelin-client
- servant-zeppelin-server
@@ -8454,6 +8390,7 @@ broken-packages:
- serversession-frontend-snap
- serversession-frontend-yesod
- services
+ - ses-html
- ses-html-snaplet
- SessionLogger
- sessions
@@ -8513,7 +8450,6 @@ broken-packages:
- shorten-strings
- ShortestPathProblems
- showdown
- - shower
- shpider
- shuffle
- si-clock
@@ -8521,7 +8457,6 @@ broken-packages:
- sifflet
- sifflet-lib
- sigma-ij
- - sign
- signals
- signed-multiset
- silvi
@@ -8554,7 +8489,6 @@ broken-packages:
- simple-tabular
- simple-tar
- simple-templates
- - simple-ui
- simple-units
- simple-vec3
- simple-zipper
@@ -8567,7 +8501,6 @@ broken-packages:
- simplenote
- simpleprelude
- SimpleServer
- - simplest-sqlite
- simseq
- singleton-dict
- singleton-typelits
@@ -8594,16 +8527,16 @@ broken-packages:
- skylark-client
- skype4hs
- slack
+ - slave-thread
- slidemews
- Slides
- slim
- sloane
- - slope-field
- slot-lambda
- sloth
- slug
+ - small-bytearray-builder
- smallarray
- - smallcaps
- smallcheck-laws
- smallcheck-lens
- smallpt-hs
@@ -8637,7 +8570,6 @@ broken-packages:
- snap-configuration-utilities
- snap-error-collector
- snap-extras
- - snap-language
- snap-routes
- snap-stream
- snap-testing
@@ -8737,7 +8669,6 @@ broken-packages:
- sparsecheck
- sparser
- spata
- - spatial-rotations
- special-functors
- special-keys
- specialize-th
@@ -8761,10 +8692,7 @@ broken-packages:
- splot
- Spock
- Spock-api-ghcjs
- - Spock-api-server
- Spock-auth
- - Spock-core
- - Spock-digestive
- Spock-lucid
- Spock-worker
- spoonutil
@@ -8785,6 +8713,7 @@ broken-packages:
- sqlvalue-list
- sqsd-local
- squeal-postgresql
+ - squeeze
- srcinst
- sscan
- sscgi
@@ -8808,12 +8737,14 @@ broken-packages:
- stack-run-auto
- stack-type
- stack2cabal
+ - stack2nix
- stackage
- stackage-build-plan
- stackage-cabal
- stackage-cli
- stackage-curator
- stackage-metadata
+ - stackage-query
- stackage-sandbox
- stackage-setup
- stackage-to-hackage
@@ -8821,7 +8752,6 @@ broken-packages:
- stackage-upload
- stackage2nix
- standalone-derive-topdown
- - standalone-haddock
- starling
- stash
- Stasis
@@ -8842,9 +8772,7 @@ broken-packages:
- statsd
- statsd-client
- statsdi
- - staversion
- stb-image-redux
- - stb-truetype
- stdata
- stdf
- stdio
@@ -8854,11 +8782,11 @@ broken-packages:
- stemmer-german
- stepwise
- stgi
- - STL
- stm-chunked-queues
+ - stm-containers
- stm-firehose
+ - stm-hamt
- stm-io-hooks
- - stm-lifted
- stm-promise
- stm-stats
- stmcontrol
@@ -8882,19 +8810,16 @@ broken-packages:
- stream-monad
- streamdeck
- streamed
- - streaming-benchmarks
- streaming-brotli
- streaming-cassava
- - streaming-concurrency
- streaming-conduit
- streaming-fft
- streaming-lzma
- - streaming-osm
- - streaming-pcap
- streaming-png
- streaming-postgresql-simple
- streaming-process
- streaming-sort
+ - streaming-utils
- strelka
- strict-data
- StrictBench
@@ -8907,7 +8832,7 @@ broken-packages:
- stripe
- stripe-haskell
- stripe-http-client
- - strongswan-sql
+ - stripe-http-streams
- structural-induction
- structural-traversal
- structured-mongoDB
@@ -8920,7 +8845,6 @@ broken-packages:
- subleq-toolchain
- submark
- subsample
- - substring-parser
- subwordgraph
- successors
- suffix-array
@@ -8950,8 +8874,8 @@ broken-packages:
- SVD2HS
- svfactor
- svg-builder-fork
- - SVG2Q
- svg2q
+ - SVG2Q
- svgutils
- svm-simple
- svndump
@@ -8970,7 +8894,6 @@ broken-packages:
- sym-plot
- symantic
- symantic-cli
- - symantic-grammar
- symantic-http-test
- symantic-lib
- symengine
@@ -8978,7 +8901,6 @@ broken-packages:
- sync
- sync-mht
- syncthing-hs
- - syntactic
- syntax
- syntax-attoparsec
- syntax-example
@@ -9005,15 +8927,15 @@ broken-packages:
- t3-server
- ta
- table
- - table-layout
- table-tennis
- tableaux
- - Tables
- tables
+ - Tables
- tablestorage
- Tablify
- tabloid
- tabs
+ - taffybar
- tag-bits
- tag-stream
- tagged-exception-core
@@ -9045,11 +8967,11 @@ broken-packages:
- tasty-auto
- tasty-fail-fast
- tasty-groundhog-converters
+ - tasty-hedgehog-coverage
- tasty-integrate
- tasty-jenkins-xml
- tasty-laws
- tasty-lens
- - tasty-quickcheck-laws
- tasty-stats
- tasty-tap
- tasty-travis
@@ -9063,7 +8985,6 @@ broken-packages:
- tcp
- tcp-streams-openssl
- tdd-util
- - tdigest-Chart
- tds
- TeaHS
- teams
@@ -9083,7 +9004,6 @@ broken-packages:
- templatepg
- tempodb
- temporal-csound
- - temporary-resourcet
- tempus
- tensor
- tensorflow
@@ -9097,7 +9017,6 @@ broken-packages:
- terminal-punch
- terminal-text
- termination-combinators
- - termonad
- termplot
- terntup
- terrahs
@@ -9129,6 +9048,7 @@ broken-packages:
- text-containers
- text-generic-pretty
- text-icu-normalized
+ - text-icu-translit
- text-lens
- text-locale-encoding
- text-markup
@@ -9136,6 +9056,7 @@ broken-packages:
- text-plus
- text-position
- text-register-machine
+ - text-show-instances
- text-time
- text-utf8
- text-xml-qq
@@ -9160,25 +9081,24 @@ broken-packages:
- th-traced
- th-typegraph
- thank-you-stars
- - themoviedb
+ - theatre
- thentos-cookie-session
- Theora
- theoremquest
- theoremquest-client
+ - these-lens
- these-skinny
- thih
- thimk
- Thingie
- thorn
- threadmanager
- - threads-supervisor
- threadscope
- threepenny-gui-contextmenu
- threepenny-gui-flexbox
- thrift
- throttled-io-loop
- through-text
- - throwable-exceptions
- thumbnail-plus
- tic-tac-toe
- tickle
@@ -9197,7 +9117,6 @@ broken-packages:
- time-http
- time-io-access
- time-machine
- - time-parsers
- time-quote
- time-recurrence
- time-series
@@ -9236,7 +9155,6 @@ broken-packages:
- to-string-class
- to-string-instances
- toboggan
- - todo
- todos
- tofromxml
- toilet
@@ -9250,8 +9168,8 @@ broken-packages:
- tomland
- too-many-cells
- toodles
- - Top
- top
+ - Top
- topkata
- torch
- TORCS
@@ -9270,7 +9188,6 @@ broken-packages:
- traced
- tracetree
- tracker
- - trackit
- traction
- tracy
- traildb
@@ -9291,14 +9208,20 @@ broken-packages:
- translatable-intset
- translate
- translate-cli
- - trasa
- - trasa-client
- - trasa-server
- - trasa-th
- travis
- travis-meta-yaml
- trawl
- traypoweroff
+ - tree-sitter
+ - tree-sitter-go
+ - tree-sitter-haskell
+ - tree-sitter-java
+ - tree-sitter-json
+ - tree-sitter-php
+ - tree-sitter-python
+ - tree-sitter-ruby
+ - tree-sitter-tsx
+ - tree-sitter-typescript
- tree-traversals
- TreeCounter
- treemap-html
@@ -9314,7 +9237,6 @@ broken-packages:
- tries
- trigger
- trimpolya
- - triplesec
- tripLL
- trivia
- tropical
@@ -9327,6 +9249,7 @@ broken-packages:
- tsparse
- tsuntsun
- tsvsql
+ - tsweb
- ttask
- ttn-client
- tttool
@@ -9344,7 +9267,6 @@ broken-packages:
- twee
- tweet-hs
- twentefp-eventloop-graphics
- - twentefp-eventloop-trees
- twentefp-graphs
- twentefp-rosetree
- twentefp-trees
@@ -9374,6 +9296,7 @@ broken-packages:
- type-combinators-singletons
- type-digits
- type-eq
+ - type-errors
- type-indexed-queues
- type-int
- type-interpreter
@@ -9401,6 +9324,7 @@ broken-packages:
- typelevel-tensor
- TypeNat
- typeparams
+ - typerep-map
- types-compat
- typesafe-precure
- typescript-docs
@@ -9415,12 +9339,12 @@ broken-packages:
- uhc-light
- uhc-util
- uhexdump
+ - uhttpc
- ui-command
- UMM
- unagi-bloomfilter
- unagi-streams
- unamb-custom
- - unbeliever
- unbound
- unbounded-delays-units
- unboxed-containers
@@ -9462,7 +9386,6 @@ broken-packages:
- unsequential
- unused
- uom-plugin
- - up
- update-nix-fetchgit
- Updater
- uploadcare
@@ -9482,7 +9405,6 @@ broken-packages:
- urldecode
- UrlDisp
- urldisp-happstack
- - urlpath
- URLT
- urn
- urn-random
@@ -9508,6 +9430,7 @@ broken-packages:
- uuagc-bootstrap
- uuagc-diagrams
- uuid-aeson
+ - uuid-orphans
- uvector
- uvector-algorithms
- uxadt
@@ -9518,7 +9441,6 @@ broken-packages:
- vacuum-graphviz
- vacuum-opengl
- vacuum-ubigraph
- - vado
- valid-names
- validate-input
- validated-literals
@@ -9532,7 +9454,6 @@ broken-packages:
- variable-precision
- variables
- variation
- - vault-tool
- vault-tool-server
- vault-trans
- vaultaire-common
@@ -9541,7 +9462,6 @@ broken-packages:
- vcf
- vcsgui
- vcswrapper
- - vec
- Vec-Boolean
- Vec-OpenGLRaw
- Vec-Transform
@@ -9552,7 +9472,6 @@ broken-packages:
- vector-clock
- vector-conduit
- vector-endian
- - vector-extras
- vector-functorlazy
- vector-heterogenous
- vector-instances-collections
@@ -9579,7 +9498,6 @@ broken-packages:
- views
- vigilance
- Villefort
- - vimeta
- vimus
- vintage-basic
- vinyl-json
@@ -9609,11 +9527,11 @@ broken-packages:
- vty-ui
- vty-ui-extras
- vulkan
- - vulkan-api
- waargonaut
- wacom-daemon
- waddle
- wahsp
+ - wai-app-file-cgi
- wai-devel
- wai-git-http
- wai-graceful
@@ -9643,7 +9561,6 @@ broken-packages:
- wai-request-spec
- wai-responsible
- wai-router
- - wai-routes
- wai-routing
- wai-secure-cookies
- wai-session-alt
@@ -9698,12 +9615,12 @@ broken-packages:
- webfinger-client
- webify
- webkit-javascriptcore
- - webkit2gtk3-javascriptcore
- Webrexp
- webserver
- webshow
- websockets-rpc
- webwire
+ - weekdaze
- weighted
- weighted-regexp
- welshy
@@ -9718,7 +9635,6 @@ broken-packages:
- whiskers
- whitespace
- why3
- - wide-word
- WikimediaParser
- wikipedia4epub
- wild-bind-indicator
@@ -9730,8 +9646,8 @@ broken-packages:
- Wired
- wires
- wiring
- - withdependencies
- wkt
+ - wkt-geom
- wl-pprint-ansiterm
- wl-pprint-terminfo
- WL500gPControl
@@ -9743,7 +9659,7 @@ broken-packages:
- wolf
- word2vec-model
- WordAlignment
- - wordchoice
+ - wordify
- WordNet
- WordNet-ghc74
- wordpass
@@ -9766,8 +9682,6 @@ broken-packages:
- writer-cps-lens
- writer-cps-monads-tf
- writer-cps-morph
- - ws
- - ws-chans
- wsdl
- wsedit
- wss-client
@@ -9832,7 +9746,6 @@ broken-packages:
- xml2x
- xmlbf-xmlhtml
- XmlHtmlWriter
- - XMLParser
- xmltv
- XMMS
- xmms2-client
@@ -9867,8 +9780,6 @@ broken-packages:
- yahoo-web-search
- yajl
- yajl-enumerator
- - yam
- - yam-datasource
- yam-job
- yam-redis
- yam-servant
@@ -9897,7 +9808,6 @@ broken-packages:
- yate
- yavie
- yaya
- - yaya-hedgehog
- yaya-unsafe
- ycextra
- yeller
@@ -9931,7 +9841,6 @@ broken-packages:
- yesod-dsl
- yesod-examples
- yesod-fast-devel
- - yesod-fay
- yesod-form-richtext
- yesod-gitrev
- yesod-goodies
@@ -9940,10 +9849,8 @@ broken-packages:
- yesod-links
- yesod-lucid
- yesod-mangopay
- - yesod-markdown
- yesod-paginate
- yesod-pagination
- - yesod-paginator
- yesod-paypal-rest
- yesod-platform
- yesod-pnotify
@@ -9962,6 +9869,7 @@ broken-packages:
- yesod-sass
- yesod-session-redis
- yesod-static-angular
+ - yesod-static-remote
- yesod-test-json
- yesod-tls
- yesod-vend
@@ -10003,6 +9911,7 @@ broken-packages:
- yuuko
- yx
- yxdb-utils
+ - z3
- z3-encoding
- z85
- zabt
@@ -10018,9 +9927,7 @@ broken-packages:
- zeromq3-haskell
- zeromq4-clone-pattern
- zeromq4-conduit
- - zeromq4-haskell == 0.7.*
- zeromq4-patterns
- - zeromq4-simple
- zeroth
- ZFS
- zifter
@@ -10049,9 +9956,6 @@ broken-packages:
- zoom-refs
- zre
- zsh-battery
- - zstd
- zsyntax
- - ztar
- zuramaru
- Zwaluw
- - zxcvbn-c
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index af5bd2220d47a35fae1d6643f2264170d1d76bd2..9d40b8d98a2ca4aacbe8d279ecb117625d4df61c 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -130,17 +130,18 @@ self: super: builtins.intersectAttrs super {
# Prevents needing to add `security_tool` as a run-time dependency for
# everything using x509-system to give access to the `security` executable.
- x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
- then let inherit (pkgs.darwin) security_tool;
- in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
- # darwin.security_tool is broken in Mojave (#45042)
-
- # We will use the system provided security for now.
- # Beware this WILL break in sandboxes!
-
- # TODO(matthewbauer): If someone really needs this to work in sandboxes,
- # I think we can add a propagatedImpureHost dep here, but I’m hoping to
- # get a proper fix available soonish.
+ x509-system =
+ if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
+ then
+ # darwin.security_tool is broken in Mojave (#45042)
+
+ # We will use the system provided security for now.
+ # Beware this WILL break in sandboxes!
+
+ # TODO(matthewbauer): If someone really needs this to work in sandboxes,
+ # I think we can add a propagatedImpureHost dep here, but I’m hoping to
+ # get a proper fix available soonish.
+ overrideCabal super.x509-system (drv: {
postPatch = (drv.postPatch or "") + ''
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
'';
@@ -279,7 +280,8 @@ self: super: builtins.intersectAttrs super {
then dontCheck
else pkgs.lib.id;
in dontCheckDarwin (super.llvm-hs.override {
- llvm-config = pkgs.llvm_6;
+ llvm-config = pkgs.llvm_8;
+ llvm-hs-pure = super.llvm-hs-pure_8_0_0;
});
# Needs help finding LLVM.
@@ -490,7 +492,11 @@ self: super: builtins.intersectAttrs super {
servant-streaming-server = dontCheck super.servant-streaming-server;
# https://github.com/haskell-servant/servant/pull/1128
- servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch;
+ servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.15" then
+ appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch
+ else
+ super.servant-client-core;
+
# tests run executable, relying on PATH
# without this, tests fail with "Couldn't launch intero process"
@@ -568,4 +574,16 @@ self: super: builtins.intersectAttrs super {
# Avoid infitite recursion with tonatona.
tonaparser = dontCheck super.tonaparser;
+ # Needs internet to run tests
+ HTTP = dontCheck super.HTTP;
+
+ # Break infinite recursions.
+ Dust-crypto = dontCheck super.Dust-crypto;
+ nanospec = dontCheck super.nanospec;
+ options = dontCheck super.options;
+ snap-server = dontCheck super.snap-server;
+
+ # Tests require internet
+ dhall_1_24_0 = dontCheck super.dhall_1_24_0;
+
}
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index b2d7d0eaf9cb74ed6c505027cdcab1cbeb864f0d..87d3b5ae496c1b5be78fa92fa009a637508e786b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -96,7 +96,7 @@ assert stdenv.hostPlatform.isWindows -> enableStaticLibraries == false;
let
inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast
- concatStringsSep enableFeature optionalAttrs toUpper;
+ concatStringsSep enableFeature optionalAttrs;
isGhcjs = ghc.isGhcjs or false;
isHaLVM = ghc.isHaLVM or false;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 97ac7757e8a4d7aaf034df396468977c58bf1018..c7443a42e5b6d4142eda5c1c305c48e5233be9d3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -527,8 +527,8 @@ self: {
({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }:
mkDerivation {
pname = "ALUT";
- version = "2.4.0.2";
- sha256 = "11sb715z6rkmwf9n7l9q32g81qiv2ld8a9z42dfxiwgmh2ilsdmq";
+ version = "2.4.0.3";
+ sha256 = "04nrh7vribs4jvg99hj3fmshzcw6kkf45r842iys19ln3l51p2bi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base OpenAL StateVar transformers ];
@@ -768,8 +768,8 @@ self: {
}:
mkDerivation {
pname = "Agda";
- version = "2.6.0";
- sha256 = "1f3gq1vd9ra3421ff5an6q33mlfzc2qvaxmfg9qhvr4z99ivqwdz";
+ version = "2.6.0.1";
+ sha256 = "1s600ry1qwizr3ynyj05rvlx7jdcw9a1viyc0ycjamm5sjf8mf3v";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -942,15 +942,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "Allure_0_9_4_1" = callPackage
+ "Allure_0_9_5_0" = callPackage
({ mkDerivation, async, base, enummapset, filepath, ghc-compact
, LambdaHack, optparse-applicative, primitive, random
, template-haskell, text, transformers
}:
mkDerivation {
pname = "Allure";
- version = "0.9.4.1";
- sha256 = "05zmidzwl24aqzgvnbv3hmsav7a6wq90qjhiirrbqpck3c33xqb9";
+ version = "0.9.5.0";
+ sha256 = "0cl1r3rcbkj8q290l3q5xva7lkh444s49xz8bm8sbgrk0q3zx041";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -1104,20 +1104,21 @@ self: {
}) {};
"AspectAG" = callPackage
- ({ mkDerivation, base, containers, HList, mtl, template-haskell }:
+ ({ mkDerivation, base, containers, ghc-prim, mtl, tagged
+ , template-haskell, th-strict-compat
+ }:
mkDerivation {
pname = "AspectAG";
- version = "0.3.6.1";
- sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf";
- revision = "1";
- editedCabalFile = "0w0098491vypmvhpy23bzs2vdbym4qfllxymysc1j4gjx8q81dnm";
+ version = "0.5.0.0";
+ sha256 = "039k40swscsg21b4k4a3q95migvkflcp7sgx2a8gpzanrkx3ckz2";
+ revision = "2";
+ editedCabalFile = "1afrgn3hhkfrb3khfnbj7x9p4dh8j682zjhp5lc7s7syr8zp8pxy";
libraryHaskellDepends = [
- base containers HList mtl template-haskell
+ base containers ghc-prim mtl tagged template-haskell
+ th-strict-compat
];
- description = "Attribute Grammars in the form of an EDSL";
- license = "LGPL";
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ description = "Strongly typed Attribute Grammars implemented using type-level programming";
+ license = stdenv.lib.licenses.gpl3;
}) {};
"AttoBencode" = callPackage
@@ -1524,19 +1525,22 @@ self: {
}) {};
"BiobaseBlast" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes
- , BiobaseXNA, bytestring, cereal, containers, deepseq, directory
- , filepath, PrimitiveArray, split, tasty, tasty-quickcheck
- , tasty-silver, tasty-th, text, vector, vector-th-unbox
+ ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseENA
+ , BiobaseTypes, BiobaseXNA, bytestring, cereal, containers, deepseq
+ , directory, file-embed, filepath, lens, log-domain, mtl
+ , PrimitiveArray, SciBaseTypes, split, tasty, tasty-quickcheck
+ , tasty-silver, tasty-th, text, unordered-containers, vector
+ , vector-th-unbox
}:
mkDerivation {
pname = "BiobaseBlast";
- version = "0.2.1.0";
- sha256 = "1vrdnb8mjl6r02b37w3r25pf6kxn97w7zya148qpnlfgc2ffa23a";
+ version = "0.3.0.0";
+ sha256 = "1p6ammx4fw5a9bvw503g46smmw5rx4rrpvlf8lmw7c73aczm9ga1";
libraryHaskellDepends = [
- aeson attoparsec base binary BiobaseTypes BiobaseXNA bytestring
- cereal containers deepseq directory PrimitiveArray vector
- vector-th-unbox
+ aeson attoparsec base binary BiobaseENA BiobaseTypes BiobaseXNA
+ bytestring cereal containers deepseq directory file-embed lens
+ log-domain mtl PrimitiveArray SciBaseTypes text
+ unordered-containers vector vector-th-unbox
];
testHaskellDepends = [
base bytestring containers filepath split tasty tasty-quickcheck
@@ -1561,6 +1565,30 @@ self: {
broken = true;
}) {};
+ "BiobaseENA" = callPackage
+ ({ mkDerivation, base, BiobaseTypes, bytestring, containers
+ , directory, file-embed, lens, megaparsec, mtl, QuickCheck, tasty
+ , tasty-quickcheck, tasty-th, text, vector, vector-th-unbox
+ }:
+ mkDerivation {
+ pname = "BiobaseENA";
+ version = "0.0.0.1";
+ sha256 = "0wkfaxrv4s34amjjl02q0si5nvs18f74z9dxp5r024fd42g3fdka";
+ libraryHaskellDepends = [
+ base BiobaseTypes bytestring containers directory file-embed lens
+ megaparsec mtl text vector vector-th-unbox
+ ];
+ testHaskellDepends = [
+ base BiobaseTypes bytestring containers directory file-embed lens
+ megaparsec mtl QuickCheck tasty tasty-quickcheck tasty-th text
+ vector vector-th-unbox
+ ];
+ description = "European Nucleotide Archive data";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"BiobaseEnsembl" = callPackage
({ mkDerivation, aeson, attoparsec, base, binary, bytestring
, cereal, containers, deepseq, directory, either-unwrap, text
@@ -1598,22 +1626,22 @@ self: {
}) {};
"BiobaseFasta" = callPackage
- ({ mkDerivation, base, BiobaseTypes, bytestring, filepath, lens
- , QuickCheck, resourcet, streaming, streaming-bytestring
+ ({ mkDerivation, base, BiobaseTypes, bytestring, DPutils, filepath
+ , lens, QuickCheck, resourcet, streaming, streaming-bytestring
, string-conversions, tasty, tasty-golden, tasty-hunit
, tasty-quickcheck, tasty-silver, tasty-th, text
}:
mkDerivation {
pname = "BiobaseFasta";
- version = "0.3.0.0";
- sha256 = "0ka04dfgqv031k17dwnxkrq77r7xzmmbj8byrdrqr7r0z0ad0ns1";
+ version = "0.3.0.1";
+ sha256 = "11vwvqln5jv4k97miyjgqs3yckm8fhyclclhfxq473i4g22amjyh";
libraryHaskellDepends = [
- base BiobaseTypes bytestring lens resourcet streaming
+ base BiobaseTypes bytestring DPutils lens resourcet streaming
streaming-bytestring string-conversions
];
testHaskellDepends = [
- base BiobaseTypes bytestring filepath lens QuickCheck resourcet
- streaming streaming-bytestring string-conversions tasty
+ base BiobaseTypes bytestring DPutils filepath lens QuickCheck
+ resourcet streaming streaming-bytestring string-conversions tasty
tasty-golden tasty-hunit tasty-quickcheck tasty-silver tasty-th
text
];
@@ -1650,6 +1678,8 @@ self: {
pname = "BiobaseHTTPTools";
version = "1.0.0";
sha256 = "1sbwhil0d0118nwx7wsryk6j8a7rysdxqksphvyrlxfdm7pd3l1z";
+ revision = "1";
+ editedCabalFile = "1aibwdw1bh0gl4czff4n8jkf79ma3isqwqgnjh186xn1rbnibvmw";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -1789,23 +1819,28 @@ self: {
, bytestring, cereal, cereal-text, cereal-vector, containers
, data-default, deepseq, ForestStructures, hashable, intern, lens
, mtl, primitive, PrimitiveArray, QuickCheck, SciBaseTypes
- , string-conversions, tasty, tasty-quickcheck, tasty-th, text
- , text-binary, utf8-string, vector, vector-binary-instances
+ , streaming, string-conversions, tasty, tasty-quickcheck, tasty-th
+ , text, text-binary, utf8-string, vector, vector-binary-instances
, vector-th-unbox
}:
mkDerivation {
pname = "BiobaseTypes";
- version = "0.2.0.0";
- sha256 = "16irdkcrih8b1mnjmnzq1bz2hbn02ayzhsmx97fqvy9py21mvrgv";
+ version = "0.2.0.1";
+ sha256 = "1ygyq169dcz1bswppljkskvqamvvs61n8fwyyplyf4348i1v938i";
libraryHaskellDepends = [
aeson attoparsec base bimaps binary bytestring cereal cereal-text
cereal-vector containers data-default deepseq ForestStructures
hashable intern lens mtl primitive PrimitiveArray QuickCheck
- SciBaseTypes string-conversions text text-binary utf8-string vector
- vector-binary-instances vector-th-unbox
+ SciBaseTypes streaming string-conversions text text-binary
+ utf8-string vector vector-binary-instances vector-th-unbox
];
testHaskellDepends = [
- base bytestring lens QuickCheck tasty tasty-quickcheck tasty-th
+ aeson attoparsec base bimaps binary bytestring cereal cereal-text
+ cereal-vector containers data-default deepseq ForestStructures
+ hashable intern lens mtl primitive PrimitiveArray QuickCheck
+ SciBaseTypes streaming string-conversions tasty tasty-quickcheck
+ tasty-th text text-binary utf8-string vector
+ vector-binary-instances vector-th-unbox
];
description = "Collection of types for bioinformatics";
license = stdenv.lib.licenses.bsd3;
@@ -1832,32 +1867,43 @@ self: {
"BiobaseXNA" = callPackage
({ mkDerivation, aeson, attoparsec, base, bimaps, binary
- , BiobaseTypes, bytes, bytestring, cereal, cereal-vector, cmdargs
- , containers, csv, deepseq, file-embed, ForestStructures, hashable
- , lens, mtl, primitive, PrimitiveArray, QuickCheck, split, tasty
- , tasty-quickcheck, tasty-th, text, tuple, vector
- , vector-binary-instances, vector-th-unbox
+ , BiobaseENA, BiobaseTypes, bytes, bytestring, cereal
+ , cereal-vector, cmdargs, containers, csv, data-default, deepseq
+ , file-embed, ForestStructures, hashable, lens, mtl, primitive
+ , PrimitiveArray, QuickCheck, split, tasty, tasty-quickcheck
+ , tasty-th, text, tuple, vector, vector-binary-instances
+ , vector-th-unbox
}:
mkDerivation {
pname = "BiobaseXNA";
- version = "0.10.0.0";
- sha256 = "0ah8qzr3wv4x1khh970isbrdn2fabsa7f9v92wif7ls798hw5abz";
+ version = "0.11.0.0";
+ sha256 = "1yrq14mv5bbw6drlpk2cf6incdg2wqw3i0zgdd0vpfmxbwr3wjl4";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson attoparsec base bimaps binary BiobaseTypes bytes bytestring
- cereal cereal-vector containers csv deepseq file-embed
- ForestStructures hashable lens mtl primitive PrimitiveArray
- QuickCheck split text tuple vector vector-binary-instances
- vector-th-unbox
+ aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes
+ bytestring cereal cereal-vector containers csv data-default deepseq
+ file-embed ForestStructures hashable lens mtl primitive
+ PrimitiveArray QuickCheck split text tuple vector
+ vector-binary-instances vector-th-unbox
+ ];
+ executableHaskellDepends = [
+ aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes
+ bytestring cereal cereal-vector cmdargs containers csv data-default
+ deepseq file-embed ForestStructures hashable lens mtl primitive
+ PrimitiveArray QuickCheck split text tuple vector
+ vector-binary-instances vector-th-unbox
];
- executableHaskellDepends = [ base cmdargs ];
testHaskellDepends = [
- base QuickCheck tasty tasty-quickcheck tasty-th vector
+ aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes
+ bytestring cereal cereal-vector containers csv data-default deepseq
+ file-embed ForestStructures hashable lens mtl primitive
+ PrimitiveArray QuickCheck split tasty tasty-quickcheck tasty-th
+ text tuple vector vector-binary-instances vector-th-unbox
];
description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
- license = stdenv.lib.licenses.gpl3;
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -1925,17 +1971,17 @@ self: {
}) {};
"BlastHTTP" = callPackage
- ({ mkDerivation, base, BiobaseBlast, biocore, biofasta, blastxml
- , bytestring, conduit, either-unwrap, HTTP, http-conduit, hxt, mtl
- , network, transformers
+ ({ mkDerivation, base, BiobaseBlast, BiobaseFasta, bytestring
+ , conduit, either-unwrap, HTTP, http-conduit, hxt, mtl, network
+ , transformers, zip-archive
}:
mkDerivation {
pname = "BlastHTTP";
- version = "1.3.0";
- sha256 = "1hlb6mmhcb7ijpd3xbsq2piw817k9pk09w4lgq1cgfgs1r6f3vdh";
+ version = "1.4.0";
+ sha256 = "0gvgwjsqrbk42vmbsh47d8fiwbwhdbsk5mlqj99pfmqi8fddwdm3";
libraryHaskellDepends = [
- base BiobaseBlast biocore biofasta blastxml bytestring conduit
- either-unwrap HTTP http-conduit hxt mtl network transformers
+ base BiobaseBlast BiobaseFasta bytestring conduit either-unwrap
+ HTTP http-conduit hxt mtl network transformers zip-archive
];
description = "Libary to interface with the NCBI blast REST interface";
license = stdenv.lib.licenses.gpl3;
@@ -1988,6 +2034,8 @@ self: {
executableHaskellDepends = [ base cmdargs ];
description = "A tool for posting Haskelly articles to blogs";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"BlogLiterately-diagrams" = callPackage
@@ -2827,8 +2875,6 @@ self: {
];
description = "A library for generating 2D Charts and Plots";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Chart-cairo" = callPackage
@@ -2845,8 +2891,6 @@ self: {
];
description = "Cairo backend for Charts";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Chart-diagrams" = callPackage
@@ -2868,8 +2912,6 @@ self: {
];
description = "Diagrams backend for Charts";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Chart-gtk" = callPackage
@@ -2886,8 +2928,6 @@ self: {
];
description = "Utility functions for using the chart library with GTK";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Chart-simple" = callPackage
@@ -4494,14 +4534,12 @@ self: {
({ mkDerivation, base, containers, MonadRandom }:
mkDerivation {
pname = "Dist";
- version = "0.4.1.0";
- sha256 = "1fmln09jai679lwpxngx8dn0yr2g5dsccvjhacl69s3hy76czd0b";
+ version = "0.5.0";
+ sha256 = "1x4yg2hhccx7mpa1fch609ibcqz2b1vmg5fiik4qimq5yw9j7g99";
libraryHaskellDepends = [ base containers MonadRandom ];
testHaskellDepends = [ base containers MonadRandom ];
description = "A Haskell library for probability distributions";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"DistanceTransform" = callPackage
@@ -4846,8 +4884,8 @@ self: {
}:
mkDerivation {
pname = "ENIG";
- version = "0.0.0.2";
- sha256 = "0rnqp6bdib4w683gvj6i0p3p7ms0zw6vwvmsgy9gwfwxqkh6m3ps";
+ version = "0.0.1.0";
+ sha256 = "1zv6dybsnj3kssiyyg69lxyj5wvi5qjx0xp7skg362xzqmi97ch3";
libraryHaskellDepends = [ base text unicode-transforms vector ];
testHaskellDepends = [
base HUnit QuickCheck test-framework test-framework-hunit
@@ -4856,8 +4894,6 @@ self: {
];
description = "Auto Korean conjugator/adjustor/adopter/converter";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Earley" = callPackage
@@ -5315,10 +5351,8 @@ self: {
}:
mkDerivation {
pname = "Euterpea";
- version = "2.0.6";
- sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw";
- revision = "1";
- editedCabalFile = "1yrr18wv22ri1v8mij4lazl5lpri7sf8bxbz7igsbs8dngmycn9r";
+ version = "2.0.7";
+ sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8";
libraryHaskellDepends = [
array arrows base bytestring containers deepseq ghc-prim HCodecs
heap PortMidi random stm
@@ -6221,8 +6255,8 @@ self: {
}:
mkDerivation {
pname = "Frames-map-reduce";
- version = "0.1.0.0";
- sha256 = "05xk49qc5l8h7qnxhyxj9k2r2igcf7qc4njiw9w28fajlmnrgcw3";
+ version = "0.1.0.1";
+ sha256 = "1m3ifx867hn4zhrj9xlars44w3sv1sp6ja38kb6f3lnhr86nf8g2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -6493,8 +6527,8 @@ self: {
}:
mkDerivation {
pname = "GLUT";
- version = "2.7.0.14";
- sha256 = "01i162fly4q1751fp60lgkzlb8kr0qqbvmxj74zc6skb19qggy2w";
+ version = "2.7.0.15";
+ sha256 = "0271vnf6wllhxjwy0m348x90kv27aybxcbqkkglmd5w4cpwjg5g9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -6546,8 +6580,8 @@ self: {
}:
mkDerivation {
pname = "GPipe";
- version = "2.2.3";
- sha256 = "19bn3471h6p7a34l3ydgyvqn118f4wb6l3djldlx0cvrga6wmfkp";
+ version = "2.2.4";
+ sha256 = "0l3s3j41fwwcjdc0nymzqmdsd7wlvaqyn1lg7n1wdx65wy4iz6j0";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base Boolean containers exception-transformers gl hashtables linear
@@ -6555,8 +6589,6 @@ self: {
];
description = "Typesafe functional GPU graphics programming";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"GPipe-Collada" = callPackage
@@ -7022,6 +7054,8 @@ self: {
pname = "Glob";
version = "0.10.0";
sha256 = "0953f91f62ncna402vsrfzdcyxhdpjna3bgdw017kad0dfymacs7";
+ revision = "1";
+ editedCabalFile = "0zfd4wimwgnmgqkz9g9jqj2dq2r50wdcqmcz6v7is1zrpwhszk5v";
libraryHaskellDepends = [
base containers directory dlist filepath transformers
transformers-compat
@@ -7828,6 +7862,24 @@ self: {
broken = true;
}) {inherit (pkgs) mpfr;};
+ "HExcel" = callPackage
+ ({ mkDerivation, base, microlens, microlens-th, time, transformers
+ , xlsxwriter, zlib
+ }:
+ mkDerivation {
+ pname = "HExcel";
+ version = "0.1.0.0";
+ sha256 = "1g761qaqijwsnwinhbk44m967myz7iz8qfz60vhh9fljv89afifg";
+ libraryHaskellDepends = [
+ base microlens microlens-th time transformers
+ ];
+ librarySystemDepends = [ xlsxwriter zlib ];
+ description = "Create Excel files with Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {xlsxwriter = null; inherit (pkgs) zlib;};
+
"HFitUI" = callPackage
({ mkDerivation, base, blaze-html, blaze-markup, MissingH, mtl
, process, random, shakespeare, template-haskell, text, uuid
@@ -8444,6 +8496,8 @@ self: {
pname = "HList";
version = "0.5.0.0";
sha256 = "16qf076p66caf3cabajbz0lgqzffqzcg0jr6lb4af18kpnpq4zqb";
+ revision = "1";
+ editedCabalFile = "0hxc725laxdz2gy18bf0rwzaxsqvl8a54v7r1ghy19q1ipp0nykx";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base base-orphans ghc-prim mtl profunctors semigroups tagged
@@ -9075,6 +9129,8 @@ self: {
pname = "HTF";
version = "0.13.2.5";
sha256 = "1kmf95y4vijdiih27xa35acl02dsxqnd9qa56z1waki5qqiz6nin";
+ revision = "1";
+ editedCabalFile = "0l18mp06jjwpjbnvj548naas1xhnc46c8l0pbgzi3bm6siq5hhv6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -9083,9 +9139,11 @@ self: {
pretty process QuickCheck random regex-compat text time unix vector
xmlgen
];
+ libraryToolDepends = [ cpphs ];
executableHaskellDepends = [
array base cpphs directory HUnit mtl old-time random text
];
+ executableToolDepends = [ cpphs ];
testHaskellDepends = [
aeson aeson-pretty base bytestring directory filepath HUnit mtl
process random regex-compat template-haskell temporary text
@@ -9102,8 +9160,8 @@ self: {
}:
mkDerivation {
pname = "HTTP";
- version = "4000.3.13";
- sha256 = "0xb66msgr6d4vxr80a7wvwb0fwh20xfimdwakkg7x7qk4bdx6657";
+ version = "4000.3.14";
+ sha256 = "0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6";
libraryHaskellDepends = [
array base bytestring mtl network network-uri parsec time
];
@@ -9349,16 +9407,16 @@ self: {
"HaTeX" = callPackage
({ mkDerivation, base, bytestring, containers, hashable, matrix
- , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
- , wl-pprint-extras
+ , parsec, prettyprinter, QuickCheck, tasty, tasty-quickcheck, text
+ , transformers
}:
mkDerivation {
pname = "HaTeX";
- version = "3.20.0.0";
- sha256 = "0rfrmv14kcgsanpsa6wzl445jmirwbd4l3if1kl1j81mqil5z58l";
+ version = "3.21.0.0";
+ sha256 = "0vavvs83r63sgzz4vyb617xady51ncli4ra9zwjhks8avzw3l1z1";
libraryHaskellDepends = [
- base bytestring containers hashable matrix parsec QuickCheck text
- transformers wl-pprint-extras
+ base bytestring containers hashable matrix parsec prettyprinter
+ QuickCheck text transformers
];
testHaskellDepends = [
base parsec QuickCheck tasty tasty-quickcheck text
@@ -9632,8 +9690,8 @@ self: {
}:
mkDerivation {
pname = "HasCacBDD";
- version = "0.1.0.1";
- sha256 = "0mvhhwgz2k46d2adrrs5bhc4x2yx3zr5fwi2nnxzrjhm1ki9b8zb";
+ version = "0.1.0.2";
+ sha256 = "1yilx2pl0j4bw3c83kzc1y9wmg67r88gpahbwykff1jjr2xnrsp0";
setupHaskellDepends = [ base Cabal directory ];
libraryHaskellDepends = [ base process QuickCheck ];
librarySystemDepends = [ CacBDD ];
@@ -9765,6 +9823,8 @@ self: {
pname = "HaskellNet";
version = "0.5.1";
sha256 = "0f581izyh6bdk85i0g07xdp3fdzdfdfjiqpnl89r17vgswdd6i9j";
+ revision = "1";
+ editedCabalFile = "12p3v58jhr54yzsmqgza3rbrp19w2iq5m43g568hcx20n7zwzwjk";
libraryHaskellDepends = [
array base base64-string bytestring cryptohash mime-mail mtl
network old-time pretty text
@@ -10169,6 +10229,8 @@ self: {
testHaskellDepends = [ base process QuickCheck ];
description = "Lightweight algorithmic debugging";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"HoleyMonoid" = callPackage
@@ -10440,8 +10502,8 @@ self: {
pname = "HsOpenSSL";
version = "0.11.4.16";
sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19";
- revision = "1";
- editedCabalFile = "0hc113g6jp7ci5gxx2chhp1h64nzx47c4ahwisyqgs3f6prm6dqr";
+ revision = "2";
+ editedCabalFile = "1cg28q793cg4w8c574yzzfxcn1r8595vs77mlrkw68j8hzgs6lj3";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base bytestring network time ];
librarySystemDepends = [ openssl ];
@@ -10532,8 +10594,8 @@ self: {
({ mkDerivation, base, bytestring, containers, mtl, parsec, text }:
mkDerivation {
pname = "HsYAML";
- version = "0.1.1.3";
- sha256 = "0awkwmdbdis5cbazrshiskds02kri51i19jbmgmrqbnqqhk3rl2x";
+ version = "0.1.2.0";
+ sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -10555,6 +10617,8 @@ self: {
];
description = "JSON to YAML Adapter";
license = stdenv.lib.licenses.gpl2Plus;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"Hsed" = callPackage
@@ -11050,13 +11114,11 @@ self: {
({ mkDerivation, base, parsec }:
mkDerivation {
pname = "JSONParser";
- version = "0.1.0.3";
- sha256 = "0nznnp9mr36npdzy8avbxbpm07mzm8mz4na1hfyv24g9iqmp31f8";
+ version = "0.1.0.4";
+ sha256 = "1xda2dy2mizpvxvn3gyhx7aql7pi26zvw044r3bm14xr5qj11q26";
libraryHaskellDepends = [ base parsec ];
description = "Parse JSON";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"JSONb" = callPackage
@@ -11148,6 +11210,18 @@ self: {
broken = true;
}) {};
+ "Jazzkell" = callPackage
+ ({ mkDerivation, base, Euterpea, random }:
+ mkDerivation {
+ pname = "Jazzkell";
+ version = "0.0.1";
+ sha256 = "11sqcvdi1msnxn6fp590sy272lv2dp6qlzfard6sp1xnwqxx85nh";
+ libraryHaskellDepends = [ base Euterpea random ];
+ description = "Library for modeling jazz improvisation";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Jdh" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -11232,10 +11306,8 @@ self: {
}:
mkDerivation {
pname = "JuicyPixels";
- version = "3.3.3";
- sha256 = "1i5k81nfgibbmf5f70iicbh8rqbng61r926wcf9hwy2aa2vba11c";
- revision = "1";
- editedCabalFile = "1q8xyxn1a4ldaa1grmr7dywdbf4vqjw65v52h6z7ssz12hgjx0gq";
+ version = "3.3.3.1";
+ sha256 = "1zwp78zk4ybaqg57njhww67x3bb75h1i3rdliz40q4p4050gn6mf";
libraryHaskellDepends = [
base binary bytestring containers deepseq mtl primitive
transformers vector zlib
@@ -11286,8 +11358,8 @@ self: {
}:
mkDerivation {
pname = "JuicyPixels-extra";
- version = "0.4.0";
- sha256 = "19lc2s80ww1pw2dy2vidrl14lhdvs3ji855l893p7p0sa23gkgqc";
+ version = "0.4.1";
+ sha256 = "0k2bz2xn15qg400xl6xs52j2abcc3js42rd9p9sy4dwlkcdmblbj";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base JuicyPixels ];
testHaskellDepends = [ base hspec JuicyPixels ];
@@ -11812,7 +11884,7 @@ self: {
broken = true;
}) {};
- "LambdaHack_0_9_4_1" = callPackage
+ "LambdaHack_0_9_5_0" = callPackage
({ mkDerivation, assert-failure, async, base, base-compat, binary
, bytestring, containers, deepseq, directory, enummapset, filepath
, ghc-compact, ghc-prim, hashable, hsini, keys, miniutter
@@ -11822,8 +11894,8 @@ self: {
}:
mkDerivation {
pname = "LambdaHack";
- version = "0.9.4.1";
- sha256 = "05p80yrfa5v5fq7zyhwpd8ndbw2kgc7a6i2hnikb222lna99b6gk";
+ version = "0.9.5.0";
+ sha256 = "1y5345cmwl40p0risziyqlxfa8jv1rm9x6ivv85xhznrsmr0406h";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -11955,6 +12027,8 @@ self: {
];
description = "Library for RedPitaya";
license = stdenv.lib.licenses.lgpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"LargeCardinalHierarchy" = callPackage
@@ -12206,10 +12280,8 @@ self: {
}:
mkDerivation {
pname = "ListLike";
- version = "4.6";
- sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1";
- revision = "2";
- editedCabalFile = "1mca2r4gjznqdh4kck5cjkn53isgkhvkf3ri09qsn7nsssvgki0g";
+ version = "4.6.2";
+ sha256 = "0m65x8yaq7q50gznln8mga2wrc8cvjx6gw9rim8s7xqcrx6y5zjh";
libraryHaskellDepends = [
array base bytestring containers deepseq dlist fmlist text
utf8-string vector
@@ -12218,7 +12290,7 @@ self: {
array base bytestring containers dlist fmlist HUnit QuickCheck
random text utf8-string vector
];
- description = "Generic support for list-like structures";
+ description = "Generalized support for list-like structures";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -12926,7 +12998,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "MissingH_1_4_0_1" = callPackage
+ "MissingH" = callPackage
({ mkDerivation, array, base, containers, directory
, errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
, old-locale, old-time, parsec, process, QuickCheck, random
@@ -12934,10 +13006,10 @@ self: {
}:
mkDerivation {
pname = "MissingH";
- version = "1.4.0.1";
- sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8";
+ version = "1.4.1.0";
+ sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29";
revision = "2";
- editedCabalFile = "0dqrzacp2qr5bm9p8jipnadknizn9zr5gyk5fvgf9av36yl4p2rb";
+ editedCabalFile = "1k7d8cgvpmln4imcrfpj4c02n3c5l1gkd5hs4hnar9ln0qh61cfx";
libraryHaskellDepends = [
array base containers directory filepath hslogger HUnit mtl network
old-locale old-time parsec process random regex-compat time unix
@@ -12949,30 +13021,29 @@ self: {
];
description = "Large utility library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "MissingH" = callPackage
+ "MissingH_1_4_2_1" = callPackage
({ mkDerivation, array, base, containers, directory
, errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
- , old-locale, old-time, parsec, process, QuickCheck, random
- , regex-compat, testpack, time, unix
+ , old-locale, old-time, parsec, process, random, regex-compat, time
+ , unix
}:
mkDerivation {
pname = "MissingH";
- version = "1.4.1.0";
- sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29";
+ version = "1.4.2.1";
+ sha256 = "1m9qdgs2ma1svjcagv7qd31xcvym2mnzx001qwchdh46q9y288k1";
libraryHaskellDepends = [
- array base containers directory filepath hslogger HUnit mtl network
+ array base containers directory filepath hslogger mtl network
old-locale old-time parsec process random regex-compat time unix
];
testHaskellDepends = [
- array base containers directory errorcall-eq-instance filepath
- hslogger HUnit mtl network old-locale old-time parsec process
- QuickCheck random regex-compat testpack time unix
+ base containers directory errorcall-eq-instance filepath HUnit
+ old-time parsec regex-compat time unix
];
description = "Large utility library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"MissingK" = callPackage
@@ -13198,8 +13269,8 @@ self: {
pname = "MonadRandom";
version = "0.5.1.1";
sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb";
- revision = "2";
- editedCabalFile = "0l6a39vmqxig7jpr6snync4sli77wm6lwzypmmvx103d65p17k8k";
+ revision = "3";
+ editedCabalFile = "0fiblwmwk48d1g9j99qrcg1ak904csgfb86y80d1nl2vr782cq6w";
libraryHaskellDepends = [
base mtl primitive random transformers transformers-compat
];
@@ -13897,14 +13968,12 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "NoTrace";
- version = "0.3.0.3";
- sha256 = "0cdva0d5xp0fw4jfwmhaz8m4pm1d00wazg32hcqjli4blc9s1hvf";
+ version = "0.3.0.4";
+ sha256 = "0nb7cqqd7p62gnmcp1hhjv113faihwps6m8xds5ng6zi7jdzz6n1";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Remove all the functions come from Debug.Trace after debugging";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Noise" = callPackage
@@ -14384,8 +14453,8 @@ self: {
pname = "OneTuple";
version = "0.2.2";
sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq";
- revision = "1";
- editedCabalFile = "07jd23glblzmnlw7sn565sk9gm7vj9h459j46bkbcrrxnp0n0myq";
+ revision = "2";
+ editedCabalFile = "1ii7hpmxi794xywx89agnvinxgral1rfn5hfnanr4zw26nczhcv3";
libraryHaskellDepends = [ base ];
description = "Singleton Tuple";
license = stdenv.lib.licenses.bsd3;
@@ -14450,8 +14519,8 @@ self: {
}:
mkDerivation {
pname = "OpenAL";
- version = "1.7.0.4";
- sha256 = "067in6qb2i0xwy6bnkxfhzbn7gq88cf03p8421al6y23zv2gd29r";
+ version = "1.7.0.5";
+ sha256 = "167qgbls1439wbckva281cf61bclkca0krbbi4451l7qjinm8fil";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -14510,8 +14579,10 @@ self: {
}:
mkDerivation {
pname = "OpenGL";
- version = "3.0.2.2";
- sha256 = "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc";
+ version = "3.0.3.0";
+ sha256 = "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as";
+ revision = "1";
+ editedCabalFile = "1748mrb6r9mpf5jbrx436lwbg8w6dadyy8dhxw2dwnrj5z7zf741";
libraryHaskellDepends = [
base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
text transformers
@@ -14541,8 +14612,8 @@ self: {
}:
mkDerivation {
pname = "OpenGLRaw";
- version = "3.3.2.0";
- sha256 = "1qy41qpqmksvgy7j73b46ksvm00mh6amgy9n9wkal4czkaj26kpj";
+ version = "3.3.3.0";
+ sha256 = "0zgllb4bcash2i2cispa3j565aw3dpxs41ghmhpvyvi4a6xmyldx";
libraryHaskellDepends = [
base bytestring containers fixed half text transformers
];
@@ -14679,15 +14750,15 @@ self: {
}:
mkDerivation {
pname = "OrderedBits";
- version = "0.0.1.2";
- sha256 = "1xax6wldwqlgidpbp35wzskxaqj0k2c5y248qmafl8jqvbg5z18l";
+ version = "0.0.2.0";
+ sha256 = "1kfb7z5xbzgn1aj8kpij4ry5i4v3v5h55pp3g6qzvgayn25xqc05";
libraryHaskellDepends = [
base bits primitive vector vector-algorithms
];
testHaskellDepends = [
base QuickCheck tasty tasty-quickcheck tasty-th vector
];
- benchmarkHaskellDepends = [ base criterion vector ];
+ benchmarkHaskellDepends = [ base criterion ];
description = "Efficient ordered (by popcount) enumeration of bits";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -15460,8 +15531,8 @@ self: {
}:
mkDerivation {
pname = "PrimitiveArray";
- version = "0.9.1.0";
- sha256 = "1kz3jvq4bc7hap7633a87nbgp9gi081qnnhmld26j8rj7wdzkrbp";
+ version = "0.9.1.1";
+ sha256 = "0q6i5754ysay2c4xs7m6hz69l35qd7irzxinmga431nvmbnqa21y";
libraryHaskellDepends = [
aeson base binary bits cereal cereal-vector containers deepseq
DPutils hashable lens log-domain mtl OrderedBits primitive
@@ -15835,8 +15906,8 @@ self: {
pname = "QuickCheck";
version = "2.12.6.1";
sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb";
- revision = "1";
- editedCabalFile = "0w5gygp6pmyjzjjx5irfflcbx586zfnqidq669ssqqfsadf944xv";
+ revision = "3";
+ editedCabalFile = "1cxsn5y6mnzqp681fcghjiqk47bq8mnkvcfc5c8c7yvl258lz5yf";
libraryHaskellDepends = [
base containers deepseq erf random template-haskell tf-random
transformers
@@ -15846,14 +15917,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "QuickCheck_2_13_1" = callPackage
+ "QuickCheck_2_13_2" = callPackage
({ mkDerivation, base, containers, deepseq, process, random
, splitmix, template-haskell, transformers
}:
mkDerivation {
pname = "QuickCheck";
- version = "2.13.1";
- sha256 = "1inri6n4rr7v7wrmajikcqmbjh77lvf9m4fw2ib6szdgwyb3lim6";
+ version = "2.13.2";
+ sha256 = "0426j43af8v3qmdjjqxivazsvr3a2brac8yw09vpgpjkb2m0nmkv";
libraryHaskellDepends = [
base containers deepseq random splitmix template-haskell
transformers
@@ -16166,32 +16237,32 @@ self: {
}) {};
"RNAlien" = callPackage
- ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP
- , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers
- , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
- , hierarchical-clustering, HTTP, http-conduit, http-types, hxt
- , matrix, network, parsec, process, pureMD5, random, split
- , Taxonomy, text, text-metrics, time, transformers, vector
- , ViennaRNAParser
+ ({ mkDerivation, aeson, base, BiobaseBlast, BiobaseFasta
+ , BiobaseHTTP, BiobaseTypes, BlastHTTP, bytestring, cassava
+ , ClustalParser, cmdargs, containers, directory, edit-distance
+ , either-unwrap, filepath, hierarchical-clustering, HTTP
+ , http-conduit, http-types, hxt, matrix, network, parsec, process
+ , pureMD5, random, split, Taxonomy, text, text-metrics, time
+ , transformers, vector, ViennaRNAParser
}:
mkDerivation {
pname = "RNAlien";
- version = "1.3.7";
- sha256 = "19a8hb92jvklnfw38xpzdxvh7d9jyrak2nhmxrl9bkgfha4jfm6y";
+ version = "1.6.0";
+ sha256 = "0pp9rim4k1gbc2dscqygi90c2721xc6q1fl2sqkfpafz30m022pq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base biocore biofasta BlastHTTP blastxml bytestring cassava
- ClustalParser cmdargs containers directory edit-distance
- either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP
- http-conduit http-types hxt matrix network parsec process pureMD5
- random Taxonomy text text-metrics transformers vector
- ViennaRNAParser
+ aeson base BiobaseBlast BiobaseFasta BiobaseHTTP BiobaseTypes
+ BlastHTTP bytestring cassava ClustalParser cmdargs containers
+ directory edit-distance either-unwrap filepath
+ hierarchical-clustering HTTP http-conduit http-types hxt matrix
+ network parsec process pureMD5 random Taxonomy text text-metrics
+ transformers vector ViennaRNAParser
];
executableHaskellDepends = [
- base biocore biofasta bytestring cassava cmdargs containers
- directory either-unwrap filepath process random split text time
- vector ViennaRNAParser
+ base BiobaseFasta BiobaseTypes bytestring cassava cmdargs
+ containers directory either-unwrap filepath process random split
+ text time vector ViennaRNAParser
];
description = "Unsupervized construction of RNA family models";
license = stdenv.lib.licenses.gpl3;
@@ -16336,6 +16407,8 @@ self: {
pname = "Ranged-sets";
version = "0.4.0";
sha256 = "1skd2a6yw7dd5vq8x81kwh28gi8sgyzg9qqqyadxmgpvy11sh9ab";
+ revision = "2";
+ editedCabalFile = "1dl69wa509yn2jvl0d4c5c036swq22i6nd73kqn0bp7vhbj4rfq4";
libraryHaskellDepends = [ base HUnit QuickCheck ];
testHaskellDepends = [ base HUnit QuickCheck ];
description = "Ranged sets for Haskell";
@@ -16389,8 +16462,8 @@ self: {
}:
mkDerivation {
pname = "Rasterific";
- version = "0.7.4.2";
- sha256 = "1sg63cvcb64gbrxkn5pgs1nvvb1c9qfya7xxwn5daqpjgan426w1";
+ version = "0.7.4.4";
+ sha256 = "1s8d0yyh2xz8kb9476nr11jzxvgq0y9sgspgzhh9shf44fbz4gs0";
libraryHaskellDepends = [
base bytestring containers dlist FontyFruity free JuicyPixels mtl
primitive transformers vector vector-algorithms
@@ -16986,13 +17059,11 @@ self: {
({ mkDerivation, attoparsec, base, bytestring, cereal, text }:
mkDerivation {
pname = "STL";
- version = "0.3.0.4";
- sha256 = "0nms0gbyjzgb6ldhqgzfbpn150dv0ig40df1fgkqmhl0mbg4r2r9";
+ version = "0.3.0.6";
+ sha256 = "18bz9qxsl7lq3j18ilczi175j3djwlpckzj5a65l4dj7d1sw1c35";
libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
description = "STL 3D geometry format parsing and pretty-printing";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"STLinkUSB" = callPackage
@@ -17038,15 +17109,17 @@ self: {
}) {};
"STMonadTrans" = callPackage
- ({ mkDerivation, array, base, Cabal, mtl }:
+ ({ mkDerivation, array, base, mtl, tasty, tasty-hunit
+ , tasty-quickcheck, transformers
+ }:
mkDerivation {
pname = "STMonadTrans";
- version = "0.4.3";
- sha256 = "1nr26fnmi5fdjc6d00w13kjhmfyvb5b837d0006w4dj0yxndaksp";
- revision = "1";
- editedCabalFile = "09kqrv9a4yhsdpix49h9qjw0j2fhxrgkjnfrnyxg1nspmqrvl50m";
+ version = "0.4.4";
+ sha256 = "00vih8xi5jf4jc4h6i9jwxb29w40gx8lakcg3fc1900b0r02ms0s";
libraryHaskellDepends = [ array base mtl ];
- testHaskellDepends = [ array base Cabal mtl ];
+ testHaskellDepends = [
+ base tasty tasty-hunit tasty-quickcheck transformers
+ ];
description = "A monad transformer version of the ST monad";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -17246,26 +17319,47 @@ self: {
}) {};
"SciFlow" = callPackage
- ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
- , containers, data-default-class, directory, exceptions
- , executable-path, fgl, graphviz, lens, lifted-async, mtl, network
- , optparse-applicative, rainbow, split, sqlite-simple
- , template-haskell, temporary, text, th-lift, th-lift-instances
- , time, transformers, yaml
+ ({ mkDerivation, base, binary, bytestring, constraints
+ , cryptohash-sha256, distributed-process
+ , distributed-process-monad-control, exceptions, hashable
+ , lifted-async, memory, monad-control, mtl, network-transport
+ , network-transport-tcp, rainbow, sqlite-simple, stm
+ , template-haskell, text, th-lift-instances, time
+ , unordered-containers
}:
mkDerivation {
pname = "SciFlow";
- version = "0.6.2";
- sha256 = "1d5qw79809v7q2dvyz7h857lhdbahcj8915pz0bz95nmknbjc50f";
+ version = "0.7.0";
+ sha256 = "1fm94yr872dg21j6pc0rxs5qvq7i72yn4338bhn73d1sv95c29ir";
+ libraryHaskellDepends = [
+ base binary bytestring constraints cryptohash-sha256
+ distributed-process distributed-process-monad-control exceptions
+ hashable lifted-async memory monad-control mtl network-transport
+ network-transport-tcp rainbow sqlite-simple stm template-haskell
+ text th-lift-instances time unordered-containers
+ ];
+ description = "Scientific workflow management system";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "SciFlow-drmaa" = callPackage
+ ({ mkDerivation, base, distributed-process, drmaa, hostname
+ , network-transport-tcp, random, SciFlow, stm, unordered-containers
+ }:
+ mkDerivation {
+ pname = "SciFlow-drmaa";
+ version = "0.1.0";
+ sha256 = "08lgdm7nlqapz54ixaf7z319laqiknk3vhhhljbch093vb0925bv";
libraryHaskellDepends = [
- aeson base bytestring cereal cereal-text containers
- data-default-class directory exceptions executable-path fgl
- graphviz lens lifted-async mtl network optparse-applicative rainbow
- split sqlite-simple template-haskell temporary text th-lift
- th-lift-instances time transformers yaml
+ base distributed-process drmaa hostname network-transport-tcp
+ random SciFlow stm unordered-containers
];
description = "Scientific workflow management system";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ScratchFs" = callPackage
@@ -17985,6 +18079,8 @@ self: {
pname = "Spock";
version = "0.13.0.0";
sha256 = "1l0sff6xq99hvcmr2fnsr2x6lbzcpynyjl7n21ycv0l9xgfs6wwa";
+ revision = "1";
+ editedCabalFile = "1glpfh1w9zahfwi4nc7kbxd429ni9xwvx3cd880mi3zdixlz4ghn";
libraryHaskellDepends = [
base base64-bytestring bytestring containers cryptonite focus
hashable http-types hvect list-t monad-control mtl reroute
@@ -18038,8 +18134,6 @@ self: {
libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
description = "Another Haskell web framework for rapid development";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Spock-auth" = callPackage
@@ -18081,8 +18175,6 @@ self: {
];
description = "Another Haskell web framework for rapid development";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Spock-digestive" = callPackage
@@ -18099,8 +18191,6 @@ self: {
];
description = "Digestive functors support for Spock";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Spock-lucid" = callPackage
@@ -18199,6 +18289,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "StateVar_1_2" = callPackage
+ ({ mkDerivation, base, stm, transformers }:
+ mkDerivation {
+ pname = "StateVar";
+ version = "1.2";
+ sha256 = "12sz6zkc9j5z3lwrjvljrkfxa5vhwnir5wsarigz2f6d3w13dh5g";
+ libraryHaskellDepends = [ base stm transformers ];
+ description = "State variables";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"StateVar-transformer" = callPackage
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
@@ -20056,8 +20158,8 @@ self: {
}:
mkDerivation {
pname = "Win32-errors";
- version = "0.2.2.3";
- sha256 = "1glcaykk6ylmmsqxw4jfhrdnw5dg4syxc4v77q13wxsbzzrz3yn6";
+ version = "0.2.2.4";
+ sha256 = "1iziwz05s1rvq3xhidkciwyb39fbyn6bqqzn6g2m12pi0xjfzgc2";
libraryHaskellDepends = [ base template-haskell text Win32 ];
testHaskellDepends = [ base hspec QuickCheck Win32 ];
description = "Alternative error handling for Win32 foreign calls";
@@ -20124,8 +20226,8 @@ self: {
({ mkDerivation, Advapi32, base, Win32, Win32-errors }:
mkDerivation {
pname = "Win32-services";
- version = "0.4";
- sha256 = "1zxi8m98n5pgpx7z20f4g40w4njqllw7gfnlfxwgw3iismxiyyp8";
+ version = "0.4.0.1";
+ sha256 = "1skf8w3d1n61847bjpvll3bql65mrc6vg03q84bg21mlh77mx1s3";
libraryHaskellDepends = [ base Win32 Win32-errors ];
librarySystemDepends = [ Advapi32 ];
description = "Windows service applications";
@@ -20449,13 +20551,11 @@ self: {
({ mkDerivation, base, parsec }:
mkDerivation {
pname = "XMLParser";
- version = "0.1.0.6";
- sha256 = "0ybdwdxv9pfr20dr40xn6s3mjqqvk1fy4rwl1siams2dlx233k6j";
+ version = "0.1.0.8";
+ sha256 = "1vdgbmf27ghvyjzkcymsz9fgv9lcss41n5hiyqc58nzg0w18r0ik";
libraryHaskellDepends = [ base parsec ];
description = "A library to parse xml";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"XMMS" = callPackage
@@ -21130,8 +21230,6 @@ self: {
testHaskellDepends = [ base doctest ];
description = "An embedded language for accelerated array processing";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"accelerate-arithmetic" = callPackage
@@ -21432,8 +21530,6 @@ self: {
];
description = "Read and write Accelerate arrays in various formats";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"accelerate-llvm" = callPackage
@@ -21455,8 +21551,6 @@ self: {
];
description = "Accelerate backend component generating LLVM IR";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"accelerate-llvm-native" = callPackage
@@ -22340,6 +22434,8 @@ self: {
];
description = "AcousticBrainz API client";
license = stdenv.lib.licenses.cc0;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"acquire" = callPackage
@@ -22542,8 +22638,8 @@ self: {
}:
mkDerivation {
pname = "adblock2privoxy";
- version = "2.0.0";
- sha256 = "0wd6zavym2afw7ba2h6i5snwp5gyq64q81gwwlw7y0kslv3xkaw9";
+ version = "2.0.1";
+ sha256 = "048l78mf3ccb7l0p1zg1wsvqmvpsaqwgik29xm333y7fjlcm0kq6";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -22869,25 +22965,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "aeson_1_4_3_0" = callPackage
+ "aeson_1_4_4_0" = callPackage
({ mkDerivation, attoparsec, base, base-compat, base-orphans
, base16-bytestring, bytestring, containers, deepseq, Diff
, directory, dlist, filepath, generic-deriving, ghc-prim, hashable
, hashable-time, integer-logarithms, primitive, QuickCheck
, quickcheck-instances, scientific, tagged, tasty, tasty-golden
, tasty-hunit, tasty-quickcheck, template-haskell, text
- , th-abstraction, time, time-locale-compat, unordered-containers
+ , th-abstraction, time, time-compat, unordered-containers
, uuid-types, vector
}:
mkDerivation {
pname = "aeson";
- version = "1.4.3.0";
- sha256 = "068caag4pfn9cmmdksv5yxblzffs0nws8vvhzk54pk99nh7sqr35";
+ version = "1.4.4.0";
+ sha256 = "0bjdgr6wjq6cci5hxb63i18yrg66p892n6xj23rih7k5rbd7rihp";
libraryHaskellDepends = [
attoparsec base base-compat bytestring containers deepseq dlist
ghc-prim hashable primitive scientific tagged template-haskell text
- th-abstraction time time-locale-compat unordered-containers
- uuid-types vector
+ th-abstraction time time-compat unordered-containers uuid-types
+ vector
];
testHaskellDepends = [
attoparsec base base-compat base-orphans base16-bytestring
@@ -22895,7 +22991,7 @@ self: {
generic-deriving ghc-prim hashable hashable-time integer-logarithms
QuickCheck quickcheck-instances scientific tagged tasty
tasty-golden tasty-hunit tasty-quickcheck template-haskell text
- time time-locale-compat unordered-containers uuid-types vector
+ time time-compat unordered-containers uuid-types vector
];
description = "Fast JSON parsing and encoding";
license = stdenv.lib.licenses.bsd3;
@@ -23016,6 +23112,8 @@ self: {
pname = "aeson-compat";
version = "0.3.9";
sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0";
+ revision = "1";
+ editedCabalFile = "0m154kalrzqbnp41306i6md3ncvw02myb730bz8bv6ah59jq1qy6";
libraryHaskellDepends = [
aeson attoparsec attoparsec-iso8601 base base-compat bytestring
containers exceptions hashable scientific tagged text time
@@ -23052,35 +23150,6 @@ self: {
}) {};
"aeson-diff" = callPackage
- ({ mkDerivation, aeson, base, bytestring, directory, doctest
- , edit-distance-vector, filepath, Glob, hashable, mtl
- , optparse-applicative, QuickCheck, quickcheck-instances
- , scientific, text, unordered-containers, vector
- }:
- mkDerivation {
- pname = "aeson-diff";
- version = "1.1.0.5";
- sha256 = "1kzvqzbl6pp5g49dp4qqc7cbisnkpqz0i18b6nmdb7f1nrhdvnb1";
- revision = "1";
- editedCabalFile = "0a29nph4a1ny365nhsxlm73mk6zgaam4sfx6knzqjy8dxp1gkj48";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring edit-distance-vector hashable mtl scientific
- text unordered-containers vector
- ];
- executableHaskellDepends = [
- aeson base bytestring optparse-applicative text
- ];
- testHaskellDepends = [
- aeson base bytestring directory doctest filepath Glob QuickCheck
- quickcheck-instances text unordered-containers vector
- ];
- description = "Extract and apply patches to JSON documents";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "aeson-diff_1_1_0_7" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, doctest
, edit-distance-vector, filepath, Glob, hashable, mtl
, optparse-applicative, QuickCheck, quickcheck-instances
@@ -23105,7 +23174,6 @@ self: {
];
description = "Extract and apply patches to JSON documents";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"aeson-diff-generic" = callPackage
@@ -23156,8 +23224,35 @@ self: {
];
description = "Extra goodies for aeson";
license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "aeson-extra_0_4_1_2" = callPackage
+ ({ mkDerivation, aeson, aeson-compat, align, attoparsec
+ , attoparsec-iso8601, base, base-compat-batteries, bytestring
+ , containers, deepseq, exceptions, hashable, parsec
+ , quickcheck-instances, recursion-schemes, scientific, semialign
+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+ , these, time, time-parsers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "aeson-extra";
+ version = "0.4.1.2";
+ sha256 = "1i6bm91d332117fx829imaxz6y59a0vqa7fjsr293sp8xyhlkkax";
+ revision = "1";
+ editedCabalFile = "0zvqb36r3dsh1dsrw3cbzqiia416qjby0gpskx5xz6nnab0l8mg4";
+ libraryHaskellDepends = [
+ aeson aeson-compat attoparsec attoparsec-iso8601 base
+ base-compat-batteries bytestring containers deepseq exceptions
+ hashable parsec recursion-schemes scientific semialign
+ template-haskell text these time unordered-containers vector
+ ];
+ testHaskellDepends = [
+ align base containers quickcheck-instances tasty tasty-hunit
+ tasty-quickcheck time time-parsers unordered-containers vector
+ ];
+ description = "Extra goodies for aeson";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"aeson-filthy" = callPackage
@@ -23230,20 +23325,22 @@ self: {
}) {};
"aeson-gadt-th" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, dependent-sum, hspec, HUnit
- , markdown-unlit, template-haskell, transformers
+ ({ mkDerivation, aeson, aeson-qq, base, containers, dependent-map
+ , dependent-sum, dependent-sum-template, hspec, HUnit
+ , template-haskell, transformers
}:
mkDerivation {
pname = "aeson-gadt-th";
- version = "0.2.0.0";
- sha256 = "111bx44s451qmnk70bvmf4f1z3wmi2pnwxqmmarvaz8zl4sw91c5";
+ version = "0.2.1.1";
+ sha256 = "18lkf75pw8lp03bj4b8vknj7ysvbhpix6zkzd86qaq0z3yh6s6jv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base dependent-sum template-haskell transformers
+ aeson base containers dependent-sum template-haskell transformers
+ ];
+ executableHaskellDepends = [
+ aeson base dependent-map dependent-sum dependent-sum-template
];
- executableHaskellDepends = [ aeson base dependent-sum ];
- executableToolDepends = [ markdown-unlit ];
testHaskellDepends = [
aeson aeson-qq base dependent-sum hspec HUnit
];
@@ -23631,8 +23728,32 @@ self: {
}:
mkDerivation {
pname = "aeson-typescript";
- version = "0.1.1.0";
- sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp";
+ version = "0.1.3.0";
+ sha256 = "0vn6pckb03vf7lwpfjari4v86clyhq5fpqw9vvnr4gcgh5hhsa1v";
+ libraryHaskellDepends = [
+ aeson base containers interpolate mtl template-haskell text
+ th-abstraction unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers directory filepath hspec
+ interpolate mtl process template-haskell temporary text
+ th-abstraction unordered-containers
+ ];
+ description = "Generate TypeScript definition files from your ADTs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "aeson-typescript_0_2_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, directory
+ , filepath, hspec, interpolate, mtl, process, template-haskell
+ , temporary, text, th-abstraction, unordered-containers
+ }:
+ mkDerivation {
+ pname = "aeson-typescript";
+ version = "0.2.0.0";
+ sha256 = "15w28x2b8h402fic5agq96g51ssryvd7q3zs22n5mz9aa43qlphw";
libraryHaskellDepends = [
aeson base containers interpolate mtl template-haskell text
th-abstraction unordered-containers
@@ -24159,8 +24280,6 @@ self: {
];
description = "Cairo-based charting backend for the Aivika simulation library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"aivika-experiment-chart" = callPackage
@@ -24178,8 +24297,6 @@ self: {
];
description = "Simulation experiments with charting for the Aivika library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"aivika-experiment-diagrams" = callPackage
@@ -24196,8 +24313,6 @@ self: {
];
description = "Diagrams-based charting backend for the Aivika simulation library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"aivika-gpss" = callPackage
@@ -24383,8 +24498,8 @@ self: {
({ mkDerivation, base, blaze-html, text }:
mkDerivation {
pname = "alerts";
- version = "0.1.0.0";
- sha256 = "0s6af3267qfg18zsy0fb43hfwf3dym2zpr864n05xwgzmg9qwhaj";
+ version = "0.1.2.0";
+ sha256 = "14fyckdwwhp786z2gg6m92xmz0rbvqwalj0bylqagi9n295ni74f";
libraryHaskellDepends = [ base blaze-html text ];
description = "Alert messages for web applications";
license = stdenv.lib.licenses.bsd3;
@@ -24494,6 +24609,8 @@ self: {
pname = "alga";
version = "0.2.2";
sha256 = "1wi0x4750c525zaqk8hzin4n1k38219nmgynv85rdsxik5qm141y";
+ revision = "1";
+ editedCabalFile = "1g1cxg4rxcm53pwlc0wh47s4w8h4lp5dsvnacrc1f5pmjhx3740y";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -24620,6 +24737,29 @@ self: {
];
description = "A library for algebraic graph construction and transformation";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "algebraic-graphs_0_4" = callPackage
+ ({ mkDerivation, array, base, base-compat, base-orphans, containers
+ , deepseq, extra, inspection-testing, mtl, QuickCheck
+ }:
+ mkDerivation {
+ pname = "algebraic-graphs";
+ version = "0.4";
+ sha256 = "1dyk8qgaahrvcp4gsl9c6s3hwmwys4xvznwnh0y1x8bqc4md61f9";
+ libraryHaskellDepends = [
+ array base base-compat containers deepseq mtl
+ ];
+ testHaskellDepends = [
+ array base base-compat base-orphans containers extra
+ inspection-testing QuickCheck
+ ];
+ description = "A library for algebraic graph construction and transformation";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"algebraic-prelude" = callPackage
@@ -24689,8 +24829,6 @@ self: {
testToolDepends = [ tasty-discover ];
description = "A client implementing the Algolia search API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"align" = callPackage
@@ -24734,8 +24872,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "alist";
- version = "0.1.1.6";
- sha256 = "0shfvjakcq2cmqizqvsqdvc7mnxkbalj6drp289lqqcmy4nxszin";
+ version = "0.1.1.7";
+ sha256 = "1kklhgksg0lvl4v80y82c5zsfwrr7nbdb8sl64529589sfrsrpsw";
libraryHaskellDepends = [ base ];
description = "lists with O(1) append";
license = stdenv.lib.licenses.bsd3;
@@ -27164,25 +27302,22 @@ self: {
}) {};
"amazonka-s3-streaming" = callPackage
- ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
- , bytestring, conduit, deepseq, dlist, exceptions, http-client
- , lens, lifted-async, mmap, mmorph, mtl, resourcet
+ ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, async, base
+ , bytestring, conduit, dlist, exceptions, http-client, lens, mmorph
+ , mtl
}:
mkDerivation {
pname = "amazonka-s3-streaming";
- version = "0.2.0.5";
- sha256 = "1j9jp409gjq7gnwx163i7qpk4ih3rff7z2icsfmzakiarwmg2ff2";
+ version = "1.0.0.2";
+ sha256 = "1k7l49h3zdqw3va70mr4rrmsyjpbzgbnr3bhj7yl24np77r6cs99";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- amazonka amazonka-core amazonka-s3 base bytestring conduit deepseq
- dlist exceptions http-client lens lifted-async mmap mmorph mtl
- resourcet
+ amazonka amazonka-core amazonka-s3 async base bytestring conduit
+ dlist exceptions http-client lens mmorph mtl
];
description = "Provides conduits to upload data to S3 using the Multipart API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"amazonka-sagemaker" = callPackage
@@ -27734,6 +27869,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "amqp_0_18_3" = callPackage
+ ({ mkDerivation, base, binary, bytestring, clock, connection
+ , containers, data-binary-ieee754, hspec, hspec-expectations
+ , monad-control, network, network-uri, split, stm, text, vector
+ , xml
+ }:
+ mkDerivation {
+ pname = "amqp";
+ version = "0.18.3";
+ sha256 = "1cyzazl3hz5yd2i220b4g8xs0fm47xqlwyvgarxbnn5gnrm8ys21";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring clock connection containers
+ data-binary-ieee754 monad-control network network-uri split stm
+ text vector
+ ];
+ executableHaskellDepends = [ base containers xml ];
+ testHaskellDepends = [
+ base binary bytestring clock connection containers
+ data-binary-ieee754 hspec hspec-expectations network network-uri
+ split stm text vector
+ ];
+ description = "Client library for AMQP servers (currently only RabbitMQ)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amqp-conduit" = callPackage
({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec
, HUnit, lifted-base, monad-control, mtl, resourcet, text
@@ -28244,6 +28407,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "annotated-fix" = callPackage
+ ({ mkDerivation, base, recursion-schemes }:
+ mkDerivation {
+ pname = "annotated-fix";
+ version = "0.1.0.0";
+ sha256 = "1lhyllmi8j9r5mdr5pngw1s1xzs1cwv2hh2ym8kkdrxvrq93dk2i";
+ libraryHaskellDepends = [ base recursion-schemes ];
+ description = "A fixpoint of a functor that can be annotated";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"annotated-wl-pprint" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -28327,12 +28501,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ansi-terminal_0_9" = callPackage
+ "ansi-terminal_0_9_1" = callPackage
({ mkDerivation, base, colour }:
mkDerivation {
pname = "ansi-terminal";
- version = "0.9";
- sha256 = "00xcq21rp0y8248pwik9rlrfb2m8c27aasla37zdg741yb0c4mfp";
+ version = "0.9.1";
+ sha256 = "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base colour ];
@@ -28343,19 +28517,23 @@ self: {
"ansi-terminal-game" = callPackage
({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
- , clock, hspec, linebreak, split, terminal-size, timers-tick
+ , clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck
+ , split, terminal-size, timers-tick
}:
mkDerivation {
pname = "ansi-terminal-game";
- version = "0.2.1.0";
- sha256 = "0a227gs7a0hz705lgq97mx4sdlbwqflns0zls7qsr9yr6ljc4836";
+ version = "0.4.0.0";
+ sha256 = "1mjc62z7d6gzvwnwg2gsgf42hlv1l2xqpjy9v83my4s945p422lg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- ansi-terminal array base bytestring cereal clock linebreak split
- terminal-size timers-tick
+ ansi-terminal array base bytestring cereal clock exceptions
+ linebreak mintty mtl QuickCheck split terminal-size timers-tick
+ ];
+ testHaskellDepends = [
+ ansi-terminal array base bytestring cereal clock exceptions hspec
+ linebreak mtl QuickCheck split terminal-size timers-tick
];
- testHaskellDepends = [ array base hspec linebreak ];
description = "sdl-like functions for terminal applications, based on ansi-terminal";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -28368,13 +28546,27 @@ self: {
pname = "ansi-wl-pprint";
version = "0.6.8.2";
sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56";
- revision = "1";
- editedCabalFile = "00b704rygy4ap540jj3ry7cgiqwwi5zx9nhj7c3905m6n6v3in88";
+ revision = "2";
+ editedCabalFile = "0xq83bwya8mfijp3dn9zfsqbbkl1wpzfjcmnkw8a06icjh9vg458";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ ansi-terminal base ];
+ description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "ansi-wl-pprint_0_6_9" = callPackage
+ ({ mkDerivation, ansi-terminal, base }:
+ mkDerivation {
+ pname = "ansi-wl-pprint";
+ version = "0.6.9";
+ sha256 = "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ ansi-terminal base ];
description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ansigraph" = callPackage
@@ -28400,6 +28592,8 @@ self: {
pname = "antagonist";
version = "0.1.0.30";
sha256 = "1bgsal1030ydg05pn5xd8gdnpm68pmd135n52dqh5cwhjmhzc0g6";
+ revision = "1";
+ editedCabalFile = "0hm0flgi9h1y84pspr2921skwybrs490yazbs8pz8wi0bhvfg1bc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -28449,6 +28643,8 @@ self: {
pname = "anticiv";
version = "0.1.0.5";
sha256 = "0sxxa2kylgagbnlf7msrgfq98jaf26lvlas6afypnr15aavvlfzh";
+ revision = "1";
+ editedCabalFile = "0r2dllym065wi443g2i20sarqmr12dm0z6q515djzq33kdkjddyc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -28519,14 +28715,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "antiope-athena_7_0_0" = callPackage
+ "antiope-athena_7_1_2" = callPackage
({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base
, lens, resourcet, text, unliftio-core
}:
mkDerivation {
pname = "antiope-athena";
- version = "7.0.0";
- sha256 = "0d5h0wqh8lndp34w42agsccv7yjma0dzr4n999g8mg9s95ygq7an";
+ version = "7.1.2";
+ sha256 = "19xh9cm859r3p5n0plpwddp4zkgr3sg74xx8m4zv160xi3dggjia";
libraryHaskellDepends = [
amazonka amazonka-athena amazonka-core base lens resourcet text
unliftio-core
@@ -28544,15 +28740,13 @@ self: {
({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
mkDerivation {
pname = "antiope-contract";
- version = "7.0.0";
- sha256 = "19q8rzgxrvz326pmsr5vff7sbpryz1wy6sl2mm5vx2x3nr8jp7yb";
+ version = "7.1.2";
+ sha256 = "0k6zn6nhl5b92qjbaxlm1fk21k4anhlm1p86ggydnw8alh9r2lwc";
libraryHaskellDepends = [
aeson antiope-s3 avro base bytestring text
];
description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"antiope-core" = callPackage
@@ -28577,7 +28771,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "antiope-core_7_0_0" = callPackage
+ "antiope-core_7_1_2" = callPackage
({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
, bytestring, exceptions, generic-lens, hedgehog, hspec
, http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet
@@ -28585,8 +28779,8 @@ self: {
}:
mkDerivation {
pname = "antiope-core";
- version = "7.0.0";
- sha256 = "0yhv5jda2llydrn6n9mvqgidhmfmz85xmwxyylc1ax5f3bpjvbdr";
+ version = "7.1.2";
+ sha256 = "0i3gwc07hkl50abkk80jnjkp6iixn6hr6q2h1kj206d6cigjx0cn";
libraryHaskellDepends = [
aeson amazonka amazonka-core base bytestring exceptions
generic-lens http-client http-types lens mtl resourcet text
@@ -28623,15 +28817,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "antiope-dynamodb_7_0_0" = callPackage
+ "antiope-dynamodb_7_1_2" = callPackage
({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb
, antiope-core, base, generic-lens, lens, text, unliftio-core
, unordered-containers
}:
mkDerivation {
pname = "antiope-dynamodb";
- version = "7.0.0";
- sha256 = "0ikfxl8ysgkqiny8cxfvvh1j4mh7552147qj7k8m8wg6b29n332m";
+ version = "7.1.2";
+ sha256 = "0g74fg6fclmrfjkhgqyhq95l967bhjah6rk0davrbd3dfandr612";
libraryHaskellDepends = [
amazonka amazonka-core amazonka-dynamodb antiope-core base
generic-lens lens text unliftio-core unordered-containers
@@ -28665,11 +28859,9 @@ self: {
unliftio-core
];
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
- "antiope-messages_7_0_0" = callPackage
+ "antiope-messages_7_1_2" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
, generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens
, lens-aeson, monad-loops, network-uri, scientific, text
@@ -28677,8 +28869,8 @@ self: {
}:
mkDerivation {
pname = "antiope-messages";
- version = "7.0.0";
- sha256 = "0z7qaywm37w73q472piszf4h2mfcv3ixrvrd7nvpyarjykjj19ma";
+ version = "7.1.2";
+ sha256 = "0y2dwf0sbay4dm9ns11k2qpjqmgnvxswmd508bwf52305avi97vc";
libraryHaskellDepends = [
aeson amazonka amazonka-core base bytestring generic-lens lens
lens-aeson monad-loops network-uri text unliftio-core
@@ -28691,7 +28883,25 @@ self: {
description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ }) {};
+
+ "antiope-optparse-applicative" = callPackage
+ ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, base
+ , hedgehog, hspec, hw-hspec-hedgehog, optparse-applicative, text
+ }:
+ mkDerivation {
+ pname = "antiope-optparse-applicative";
+ version = "7.1.2";
+ sha256 = "0cp9yizvibhi7bwm22z62gx8hv3cm1vbpbv70a0ws4k2i2cq8yrr";
+ libraryHaskellDepends = [
+ amazonka amazonka-core amazonka-s3 base optparse-applicative text
+ ];
+ testHaskellDepends = [
+ aeson amazonka amazonka-core amazonka-s3 base hedgehog hspec
+ hw-hspec-hedgehog
+ ];
+ description = "Please see the README on Github at ";
+ license = stdenv.lib.licenses.mit;
}) {};
"antiope-s3" = callPackage
@@ -28717,11 +28927,9 @@ self: {
network-uri resourcet text unliftio-core
];
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
- "antiope-s3_7_0_0" = callPackage
+ "antiope-s3_7_1_2" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
, antiope-core, antiope-messages, attoparsec, base, bytestring
, conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec
@@ -28730,8 +28938,8 @@ self: {
}:
mkDerivation {
pname = "antiope-s3";
- version = "7.0.0";
- sha256 = "0xz77pkjfg8v23ivg0b6idcm8rfrn6v5xyfi8hbdqjg1xq3li9ic";
+ version = "7.1.2";
+ sha256 = "1z85kn6675r54f1hnfn6g0yhg7cjfka32h913qnljd7qmb6ikhhs";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 antiope-core
antiope-messages attoparsec base bytestring conduit conduit-extra
@@ -28747,7 +28955,6 @@ self: {
description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"antiope-sns" = callPackage
@@ -28769,15 +28976,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "antiope-sns_7_0_0" = callPackage
+ "antiope-sns_7_1_2" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
, bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog
, lens, text, time, unliftio-core
}:
mkDerivation {
pname = "antiope-sns";
- version = "7.0.0";
- sha256 = "1hr35p9bxc3ah63ld1lyppnkx6yazs5ylnfcp036ai4ad42qx7lh";
+ version = "7.1.2";
+ sha256 = "14mq13q6gvg8r3dm329xzbbxlxxx0p5r5gyyqglpqfmdi5dy9948";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-sns base bytestring
generic-lens lens text time unliftio-core
@@ -28812,23 +29019,22 @@ self: {
monad-loops network-uri text unliftio-core
];
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
- "antiope-sqs_7_0_0" = callPackage
+ "antiope-sqs_7_1_2" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
, bytestring, conduit, generic-lens, hedgehog, hspec
, hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl
- , network-uri, text, time, unliftio-core, unordered-containers
+ , network-uri, split, text, time, unliftio-core
+ , unordered-containers
}:
mkDerivation {
pname = "antiope-sqs";
- version = "7.0.0";
- sha256 = "18hd7l6w0765rckqrvsk1kpxdvw6w708ink82di4l20w8wncxx07";
+ version = "7.1.2";
+ sha256 = "0gpg340nwnni7ybzcq82i7p3j61gw1120209s9ziyqfrlbs7r976";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
- generic-lens lens lens-aeson monad-loops mtl network-uri text
+ generic-lens lens lens-aeson monad-loops mtl network-uri split text
unliftio-core unordered-containers
];
testHaskellDepends = [
@@ -28839,7 +29045,6 @@ self: {
description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"antiprimes" = callPackage
@@ -29125,6 +29330,8 @@ self: {
];
description = "STM stores for apecs";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"apelsin" = callPackage
@@ -29153,21 +29360,19 @@ self: {
"api-builder" = callPackage
({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
, containers, hspec, HTTP, http-client, http-client-tls, http-types
- , text, tls, transformers
+ , QuickCheck, text, tls, transformers
}:
mkDerivation {
pname = "api-builder";
- version = "0.15.0.0";
- sha256 = "1bjqg484z9si3pyfwpvcakm0y71gca80bh6j1njc0qnjf2ddd3ad";
- revision = "1";
- editedCabalFile = "0sw6vdnzlqyv9n7gdhy1ibh7vrzfflc1cy2q558a4i23gn74k74s";
+ version = "0.16.0.0";
+ sha256 = "1va2h0sbmx15a29ffmnqqidwzj1kk6dbcgdlcx2lpfk3cwwnpj8m";
libraryHaskellDepends = [
aeson base bifunctors bytestring HTTP http-client http-client-tls
http-types text tls transformers
];
testHaskellDepends = [
- aeson base bytestring Cabal containers hspec http-client text
- transformers
+ aeson base bytestring Cabal containers hspec http-client QuickCheck
+ text transformers
];
description = "Library for easily building REST API wrappers in Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -29191,6 +29396,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "api-monobank" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, hs-coindesk-api
+ , http-client, http-client-tls, http-conduit, servant
+ , servant-client, stm, text, time
+ }:
+ mkDerivation {
+ pname = "api-monobank";
+ version = "0.1.2.0";
+ sha256 = "0n9nj6cfszp2wz003sn0xk9533pawlv3afk5p96l6id964dpcdhb";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring http-client http-client-tls http-conduit
+ servant servant-client text time
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring http-client http-conduit stm text time
+ ];
+ testHaskellDepends = [ base bytestring hs-coindesk-api ];
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {hs-coindesk-api = null;};
+
"api-opentheory-unicode" = callPackage
({ mkDerivation, base, bytestring, directory, opentheory-unicode }:
mkDerivation {
@@ -29655,8 +29884,8 @@ self: {
({ mkDerivation, base, bytestring }:
mkDerivation {
pname = "appar";
- version = "0.1.7";
- sha256 = "07zjgx7xpjgkjqvga0wv542cyrjzh1mszlczg82nbmij2cflzppn";
+ version = "0.1.8";
+ sha256 = "07v3h766q9mnhphsm53718h1lds147ix7dj15kc5hnsj4vffvkn4";
libraryHaskellDepends = [ base bytestring ];
description = "A simple applicative parser";
license = stdenv.lib.licenses.bsd3;
@@ -31136,8 +31365,8 @@ self: {
}:
mkDerivation {
pname = "ascii-string";
- version = "1.0.1.3";
- sha256 = "1m11ms0x5di5qbckh2n7vnqqh94wv9p6zzynglg4ngijqhn4qjls";
+ version = "1.0.1.4";
+ sha256 = "1hzqckcbinhmsg8866y9gaghz4jvdhy7h5na9q0ylapx6kq71plf";
libraryHaskellDepends = [
base bytestring cereal deepseq deferred-folds foldl hashable
primitive primitive-extras
@@ -31148,6 +31377,8 @@ self: {
];
description = "Compact representation of ASCII strings";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ascii-table" = callPackage
@@ -31221,17 +31452,17 @@ self: {
"asciidiagram" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
- , rasterific-svg, svg-tree, text, vector
+ , pandoc-types, rasterific-svg, svg-tree, text, vector
}:
mkDerivation {
pname = "asciidiagram";
- version = "1.3.3.2";
- sha256 = "0kbf4jswdyvd0x4yk00ss4yjqla852rd64081lkf1xn7yi0k8d1b";
+ version = "1.3.3.3";
+ sha256 = "09k1kdaa0xi2fx9vfdlv2w2nxx5x1vnlkz7gp8s998a325w1x7q1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring containers FontyFruity JuicyPixels lens linear mtl
- rasterific-svg svg-tree text vector
+ pandoc-types rasterific-svg svg-tree text vector
];
executableHaskellDepends = [
base bytestring directory filepath FontyFruity JuicyPixels
@@ -31294,7 +31525,7 @@ self: {
broken = true;
}) {};
- "asif_6_0_0" = callPackage
+ "asif_6_0_1" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, conduit
, conduit-combinators, conduit-extra, containers, cpu, directory
, either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits
@@ -31304,8 +31535,8 @@ self: {
}:
mkDerivation {
pname = "asif";
- version = "6.0.0";
- sha256 = "1kiafpfr1xgbsp2j0fdyiavp6b8lbnrfcfvczbhbwm6vy0w0l4bq";
+ version = "6.0.1";
+ sha256 = "1lbz2i0ijr23vsc3b064khz3kzj1jwikwxcmjlnzkqvgnbr70grw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -31446,8 +31677,8 @@ self: {
({ mkDerivation, base, bytestring, hourglass, memory }:
mkDerivation {
pname = "asn1-types";
- version = "0.3.2";
- sha256 = "05vjchyqiy9n275cygffhn0ma7fz7jx52j0dcdm9qm8h9bziymqc";
+ version = "0.3.3";
+ sha256 = "162lacdl9jr42pdhaj9hxqlba6hjxm6g866anna74q6v3cvw5ssp";
libraryHaskellDepends = [ base bytestring hourglass memory ];
description = "ASN.1 types";
license = stdenv.lib.licenses.bsd3;
@@ -31657,6 +31888,18 @@ self: {
broken = true;
}) {};
+ "ast-path" = callPackage
+ ({ mkDerivation, base, tasty, tasty-hunit }:
+ mkDerivation {
+ pname = "ast-path";
+ version = "0.2.0";
+ sha256 = "1pal5zw12f2vv7la2ijb6wgh4s3pafy4krsakgz9pcvbx96x1yxg";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base tasty tasty-hunit ];
+ description = "vocabulary representation for predicting program properties";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"astar" = callPackage
({ mkDerivation, base, hashable, psqueues, unordered-containers }:
mkDerivation {
@@ -31747,10 +31990,8 @@ self: {
}:
mkDerivation {
pname = "async";
- version = "2.2.1";
- sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
- revision = "1";
- editedCabalFile = "0lg8c3iixm7vjjq2nydkqswj78i4iyx2k83hgs12z829yj196y31";
+ version = "2.2.2";
+ sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base hashable stm ];
@@ -31875,8 +32116,8 @@ self: {
pname = "async-pool";
version = "0.9.0.2";
sha256 = "1wg78y80zd7qyizyis073dmmvq4s67ni1pkaq31jl5klr49rs5g0";
- revision = "1";
- editedCabalFile = "0w3l3lbnfdm9ihp7pfda4sf1y1cqpc6g6q6wjzafdi088l3lklkn";
+ revision = "2";
+ editedCabalFile = "1nqqjsgc44fpnsf3v37n0c866s733inssljw7wmd0fdqlxhmijis";
libraryHaskellDepends = [
async base containers fgl monad-control stm transformers
transformers-base
@@ -31887,8 +32128,6 @@ self: {
];
description = "A modified version of async that supports worker groups and many-to-many task dependencies";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"async-refresh" = callPackage
@@ -32018,8 +32257,8 @@ self: {
}:
mkDerivation {
pname = "atlassian-connect-core";
- version = "0.8.0.0";
- sha256 = "1gja0q9bxr86wd4cwi6w4iv5bimb37jk7gy5bzc727fp2k75ja42";
+ version = "0.8.0.1";
+ sha256 = "1h2702rkygjjjni9qfxhmnk49g2182s0js5dx8j0hvdpkg9w4q0l";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson atlassian-connect-descriptor base base64-bytestring
@@ -32042,8 +32281,8 @@ self: {
}:
mkDerivation {
pname = "atlassian-connect-descriptor";
- version = "0.4.8.0";
- sha256 = "0vqwrzr9axhxc2mvbwv4qzk5jgf9wplh2ss1hkbaqc9zp7wb4j7f";
+ version = "0.4.9.0";
+ sha256 = "1wgfgdimfp2fnd630s8288dciip26ysl7p0lmvm321migm22idq9";
libraryHaskellDepends = [
aeson base cases network network-uri text time-units
unordered-containers
@@ -32149,29 +32388,30 @@ self: {
}) {};
"atom-conduit" = callPackage
- ({ mkDerivation, base, blaze-builder, conduit, data-default
- , filepath, lens-simple, parsers, pretty-simple
- , quickcheck-instances, refined, resourcet, safe-exceptions, tasty
- , tasty-golden, tasty-hunit, tasty-quickcheck, text, time, timerep
+ ({ mkDerivation, base-noprelude, blaze-builder, conduit
+ , data-default, filepath, generic-random, lens-simple, parsers
+ , pretty-simple, prettyprinter, QuickCheck, quickcheck-instances
+ , refined, relude, resourcet, safe-exceptions, tasty, tasty-golden
+ , tasty-hunit, tasty-quickcheck, text, time, timerep
, uri-bytestring, xml-conduit, xml-types
}:
mkDerivation {
pname = "atom-conduit";
- version = "0.6.0.0";
- sha256 = "1j88cnilxmybjc981a4z4hgsdq94gv386hc1zlbrm8zklq2rpgx2";
+ version = "0.7.0.0";
+ sha256 = "1xl2p06s26zm65sn9a13bzcq30d5vggnq32s8f51ss86b4h431q2";
libraryHaskellDepends = [
- base blaze-builder conduit lens-simple parsers refined
- safe-exceptions text time timerep uri-bytestring xml-conduit
- xml-types
+ base-noprelude blaze-builder conduit lens-simple parsers
+ prettyprinter refined relude safe-exceptions text time timerep
+ uri-bytestring xml-conduit xml-types
];
testHaskellDepends = [
- base blaze-builder conduit data-default filepath lens-simple
- parsers pretty-simple quickcheck-instances refined resourcet
- safe-exceptions tasty tasty-golden tasty-hunit tasty-quickcheck
+ base-noprelude conduit data-default filepath generic-random
+ lens-simple pretty-simple QuickCheck quickcheck-instances refined
+ relude resourcet tasty tasty-golden tasty-hunit tasty-quickcheck
text time uri-bytestring xml-conduit xml-types
];
description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
- license = stdenv.lib.licenses.publicDomain;
+ license = stdenv.lib.licenses.cc0;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -32221,10 +32461,8 @@ self: {
({ mkDerivation, base, ghc-prim, primitive }:
mkDerivation {
pname = "atomic-primops";
- version = "0.8.2";
- sha256 = "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37";
- revision = "1";
- editedCabalFile = "0gdcd84x2s4jiry0was74rzv9l53an1q6ad8jiaj37fr4fim0wcc";
+ version = "0.8.3";
+ sha256 = "03n5dmyplrqgbyf8dr91izkxci7gkl3i3fnp82i5ld869zrgjfh0";
libraryHaskellDepends = [ base ghc-prim primitive ];
description = "A safe approach to CAS and other atomic ops in Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -32370,10 +32608,8 @@ self: {
}:
mkDerivation {
pname = "ats-pkg";
- version = "3.2.5.13";
- sha256 = "040ac4pw1f4nfrydqx56jv0mzap306sbr76kd164vi2n8y4a09cz";
- revision = "1";
- editedCabalFile = "1by5wg58g69r8xcp3nds4s5w2n3zjb1gshgsxi4fg52gfjq0wlfh";
+ version = "3.2.5.17";
+ sha256 = "0ss71fn4d1grasgm1rvg7y4sngfnhsknmf6gxby0yvwfm95fi8aj";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -32521,8 +32757,8 @@ self: {
pname = "attoparsec";
version = "0.13.2.2";
sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx";
- revision = "2";
- editedCabalFile = "1j06na26rsahrbkzrs71nl7ym8fk390pnvh577wlxs4ik6hsn2va";
+ revision = "3";
+ editedCabalFile = "1birva836xdp92lf1v5yrs8lj3bgj9vnarrfh2ssfxxacqj1gjji";
libraryHaskellDepends = [
array base bytestring containers deepseq scientific text
transformers
@@ -32655,8 +32891,6 @@ self: {
];
description = "Parse IP data types with attoparsec";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"attoparsec-iso8601" = callPackage
@@ -32800,8 +33034,6 @@ self: {
];
description = "URI parser / printer using attoparsec";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"attoparsec-varword" = callPackage
@@ -32819,8 +33051,6 @@ self: {
];
description = "Variable-length integer decoding for Attoparsec";
license = stdenv.lib.licenses.lgpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"attosplit" = callPackage
@@ -32939,15 +33169,15 @@ self: {
}) {};
"aur" = callPackage
- ({ mkDerivation, aeson, base, errors, http-client, http-client-tls
- , servant, servant-client, tasty, tasty-hunit, text
+ ({ mkDerivation, aeson, base, http-client, http-client-tls, servant
+ , servant-client, tasty, tasty-hunit, text
}:
mkDerivation {
pname = "aur";
- version = "6.1.0";
- sha256 = "1wgff9vbp8sxqa0hyd6ifkld6yly20qijm15dfk72wpcsia86jx6";
+ version = "6.2.0.1";
+ sha256 = "00h5v3b4is5jc11x85cjzq25lsqrlhidibsyn847bl0cpn9292d2";
libraryHaskellDepends = [
- aeson base errors http-client servant servant-client text
+ aeson base http-client servant servant-client text
];
testHaskellDepends = [
base http-client http-client-tls tasty tasty-hunit
@@ -33142,13 +33372,26 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "auto-update";
- version = "0.1.4.1";
- sha256 = "1jfgxwicd0r31dcbcd83sj99v1w9mbg873xp7v7z21gmxhalpzrm";
+ version = "0.1.5";
+ sha256 = "0gyczrbz85gp90ibig99556gvi1m0j3rrilxdms6jryw70kkxbnz";
libraryHaskellDepends = [ base ];
description = "Efficiently run periodic, on-demand actions";
license = stdenv.lib.licenses.mit;
}) {};
+ "auto-update_0_1_6" = callPackage
+ ({ mkDerivation, base, exceptions, hspec, HUnit, retry }:
+ mkDerivation {
+ pname = "auto-update";
+ version = "0.1.6";
+ sha256 = "1i36xc2i34aync8271x3pv515l3zb53i518dybn8ghqkhzf27q7l";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base exceptions hspec HUnit retry ];
+ description = "Efficiently run periodic, on-demand actions";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"autoexporter" = callPackage
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
@@ -33358,8 +33601,8 @@ self: {
pname = "avers";
version = "0.0.17.1";
sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
- revision = "30";
- editedCabalFile = "0z7awvdz7447gjgg98z8682d7q1gqn85qcm0dsdgrhv67rkfnadz";
+ revision = "31";
+ editedCabalFile = "03nzgni96r6yfmn196iya6akrzh46njqzd2873aj341ynfaqjyy1";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock containers cryptonite
filepath inflections memory MonadRandom mtl network network-uri
@@ -33510,8 +33753,8 @@ self: {
}:
mkDerivation {
pname = "avro";
- version = "0.4.4.2";
- sha256 = "1x01f05rhz4nhvzbzai5817c9ajqnph1vfn0z8cp4y7r4srm55w0";
+ version = "0.4.4.3";
+ sha256 = "12r08n7bz8qwknv8108qz3j0n7x12ia0wnzqng54pjb47jfdgfzi";
libraryHaskellDepends = [
aeson array base base16-bytestring bifunctors binary bytestring
containers data-binary-ieee754 deepseq fail hashable mtl scientific
@@ -33695,8 +33938,8 @@ self: {
}:
mkDerivation {
pname = "aws-cloudfront-signed-cookies";
- version = "0.2.0.0";
- sha256 = "0cbhlxrdx09050pblca1p8f0f7n51p4nifp1xk48203ap435dnpj";
+ version = "0.2.0.1";
+ sha256 = "1yk40n6gjs72pyi6yjwhqj0dngqc4b74rpg0ji61852nbb0snl28";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -34034,23 +34277,19 @@ self: {
}) {};
"aws-lambda-haskell-runtime" = callPackage
- ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
- , directory, filepath, hspec, http-client, microlens-platform, mtl
- , optparse-generic, process, template-haskell, text, uuid, wreq
+ ({ mkDerivation, aeson, base, bytestring, hspec, http-client
+ , http-types, path, path-io, safe-exceptions-checked
+ , template-haskell, text
}:
mkDerivation {
pname = "aws-lambda-haskell-runtime";
- version = "1.0.10";
- sha256 = "09rd4jfw59j003q14y76isdb5dg23r0vxqkg8jqf49c9gap7wqsq";
- isLibrary = true;
- isExecutable = true;
+ version = "2.0.1";
+ sha256 = "0q8x5zqxql403wm9ndii42lac8737i0qhd7p7nsy3i2sswfr5gry";
libraryHaskellDepends = [
- aeson base bytestring case-insensitive conduit directory filepath
- http-client microlens-platform mtl optparse-generic process
- template-haskell text uuid wreq
+ aeson base bytestring http-client http-types path path-io
+ safe-exceptions-checked template-haskell text
];
- executableHaskellDepends = [ base mtl ];
- testHaskellDepends = [ base hspec mtl ];
+ testHaskellDepends = [ base hspec ];
description = "Haskell runtime for AWS Lambda";
license = stdenv.lib.licenses.asl20;
}) {};
@@ -34341,6 +34580,8 @@ self: {
testToolDepends = [ tasty-discover ];
description = "The Axel programming language";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"axiom" = callPackage
@@ -34564,6 +34805,8 @@ self: {
];
description = "A tool and library for building virtual machine images";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"babl" = callPackage
@@ -34942,6 +35185,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bank-holidays-england_0_2_0_1" = callPackage
+ ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
+ mkDerivation {
+ pname = "bank-holidays-england";
+ version = "0.2.0.1";
+ sha256 = "0vnadqs924k54f5zdm0airnss47gafqbrak59wvrmc667xn01k0h";
+ libraryHaskellDepends = [ base containers time ];
+ testHaskellDepends = [ base containers hspec QuickCheck time ];
+ description = "Calculation of bank holidays in England and Wales";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"banwords" = callPackage
({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit
, test-framework, test-framework-hunit, text, vector
@@ -34979,6 +35235,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "barbies_1_1_3_0" = callPackage
+ ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "barbies";
+ version = "1.1.3.0";
+ sha256 = "0fb7d0fr46zm8y00nipq8vvq5fvhsx41jj52zvz27f690azpj961";
+ libraryHaskellDepends = [ base bifunctors ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Classes for working with types that can change clothes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"barchart" = callPackage
({ mkDerivation, base, cmdargs, csv, diagrams, filepath }:
mkDerivation {
@@ -35128,6 +35401,8 @@ self: {
pname = "base-compat-batteries";
version = "0.10.5";
sha256 = "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p";
+ revision = "1";
+ editedCabalFile = "15sn2qc8k0hxbb2nai341kkrci98hlhzcj2ci087m0zxcg5jcdbp";
libraryHaskellDepends = [ base base-compat ];
testHaskellDepends = [ base hspec QuickCheck ];
testToolDepends = [ hspec-discover ];
@@ -35398,6 +35673,8 @@ self: {
pname = "base64-bytestring-type";
version = "1.0.1";
sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn";
+ revision = "1";
+ editedCabalFile = "13yjasdw3dh33rv1jhx5hjdvpp7cnxymrk836jk1mnpjw32606c9";
libraryHaskellDepends = [
aeson base base-compat base64-bytestring binary bytestring cereal
deepseq hashable http-api-data QuickCheck serialise text
@@ -35472,8 +35749,8 @@ self: {
pname = "basement";
version = "0.0.10";
sha256 = "01gmqkwd8cizlsn24wb1ld358k40kbaw84579y0h5nl7f41iniz3";
- revision = "1";
- editedCabalFile = "1n5wv093zx760rrd5vs5symj61fnr8pcbpzs0sbpl6n82qys3c8i";
+ revision = "2";
+ editedCabalFile = "0ysyr6ir3i05a52rphsd3sp5izw397b0idamb7hm23jzl58qhj5v";
libraryHaskellDepends = [ base ghc-prim ];
description = "Foundation scrap box of array & string";
license = stdenv.lib.licenses.bsd3;
@@ -35603,10 +35880,8 @@ self: {
({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }:
mkDerivation {
pname = "basic-sop";
- version = "0.2.0.2";
- sha256 = "0cd5zlv3w3r99ck5cz43kppand0n9vx26g4d4fqqcmvjxk8zwhy7";
- revision = "1";
- editedCabalFile = "0rvhcbywgpidnq1vg79a9scq6hraqdyv67j63vyidm0q20ml5mpv";
+ version = "0.2.0.3";
+ sha256 = "1aa3iwfbhqczmnnribz79nns5ppc397pwv4hx277jbfdxx0m8ks8";
libraryHaskellDepends = [
base deepseq generics-sop QuickCheck text
];
@@ -35836,6 +36111,23 @@ self: {
broken = true;
}) {};
+ "bazel-coverage-report-renderer" = callPackage
+ ({ mkDerivation, base, cmdargs, directory, filepath, hxt, hxt-xpath
+ , listsafe, MissingH
+ }:
+ mkDerivation {
+ pname = "bazel-coverage-report-renderer";
+ version = "0.1.0";
+ sha256 = "19bin8hym1zqd85v7kbkk4jbpqs19yn4588q8x903i8m7863p83v";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base cmdargs directory filepath hxt hxt-xpath listsafe MissingH
+ ];
+ description = "HTML Coverage Reports for Rules_Haskell";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"bazel-runfiles" = callPackage
({ mkDerivation, base, directory, filepath }:
mkDerivation {
@@ -35863,18 +36155,25 @@ self: {
}) {};
"bbi" = callPackage
- ({ mkDerivation, base, bytestring, cereal, conduit, containers, mtl
- , zlib
+ ({ mkDerivation, base, bioinformatics-toolkit, bytestring, cereal
+ , conduit, containers, mtl, random, tasty, tasty-golden
+ , tasty-hunit, vector, zlib
}:
mkDerivation {
pname = "bbi";
- version = "0.1.0";
- sha256 = "0y18lc7h5sljzvcbfa69n22p0l12a1rjymp4x24wlz25jbq9bm2g";
+ version = "0.1.1";
+ sha256 = "1m9rhng6kpqzsgmyr5ilq7brvx9jpkvqgqaixbdlx79ijxkw7dz3";
libraryHaskellDepends = [
base bytestring cereal conduit containers mtl zlib
];
+ testHaskellDepends = [
+ base bioinformatics-toolkit bytestring conduit mtl random tasty
+ tasty-golden tasty-hunit vector
+ ];
description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"bcrypt" = callPackage
@@ -36338,6 +36637,8 @@ self: {
pname = "bench";
version = "1.0.12";
sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6";
+ revision = "1";
+ editedCabalFile = "0sk6vkjwk7g1diwah67ifj7s69qvwi52ngaijkfx5prn0vz24ldn";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -36361,8 +36662,6 @@ self: {
testHaskellDepends = [ base split text ];
description = "Plot and compare benchmarks";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"bench-show" = callPackage
@@ -36381,8 +36680,6 @@ self: {
testHaskellDepends = [ base split text ];
description = "Show, plot and compare benchmark results";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"benchmark-function" = callPackage
@@ -36626,8 +36923,6 @@ self: {
];
description = "A horizontal version of tetris for braille users";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"between" = callPackage
@@ -36682,17 +36977,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bglib" = callPackage
+ ({ mkDerivation, async, base, binary, bytestring, monad-loops, mtl
+ , optparse-applicative, serialport, stm
+ }:
+ mkDerivation {
+ pname = "bglib";
+ version = "2.0.0.0";
+ sha256 = "1h9ql3xz5yciwk2hd1mljql0avrqv66fswdl8bll0xpga7jnpvr8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring monad-loops mtl serialport stm
+ ];
+ executableHaskellDepends = [
+ async base bytestring mtl optparse-applicative serialport stm
+ ];
+ description = "Implementation of the BGAPI serial protocol";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"bgmax" = callPackage
({ mkDerivation, attoparsec, base, bytestring, time }:
mkDerivation {
pname = "bgmax";
- version = "0.2.0.3";
- sha256 = "15w8ib36spnlsvr41rb4n6dp6nh6ksyb07lzwlcf1a4ajfx23ns6";
+ version = "0.2.0.4";
+ sha256 = "0cgxdq5dfs9dvj5ly9sd52pf75yslrnds45hg9nwv5zrfld90rdv";
libraryHaskellDepends = [ attoparsec base bytestring time ];
description = "Parse BgMax-files";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"bgzf" = callPackage
@@ -36841,6 +37154,8 @@ self: {
pname = "bifunctors";
version = "5.5.4";
sha256 = "134vn71wd194175k2fcdvd0ak2bdmdbk6ql5lls4byff7zs2rmi9";
+ revision = "1";
+ editedCabalFile = "05qh2xh2j3w5f1q94wfgfp06z9c4fyrgm4cncy6y2lbb1ficsh3j";
libraryHaskellDepends = [
base base-orphans comonad containers tagged template-haskell
th-abstraction transformers
@@ -37003,6 +37318,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bimap_0_4_0" = callPackage
+ ({ mkDerivation, base, containers, deepseq, exceptions, QuickCheck
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "bimap";
+ version = "0.4.0";
+ sha256 = "1794iykd7rhj29y0w4vyjyn6wnw28hi8sxzvm1j5ivdzmf39d8yi";
+ libraryHaskellDepends = [ base containers deepseq exceptions ];
+ testHaskellDepends = [
+ base containers deepseq exceptions QuickCheck template-haskell
+ ];
+ description = "Bidirectional mapping between two key types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bimap-server" = callPackage
({ mkDerivation, aeson, base, bimap, binary, directory, http-types
, unix, wai, warp
@@ -37054,8 +37386,8 @@ self: {
pname = "binary";
version = "0.7.6.1";
sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg";
- revision = "1";
- editedCabalFile = "0lq4zn0wzfh7pwc163l2fain297njpd82jgjwkylbza3qs0nfx9m";
+ revision = "2";
+ editedCabalFile = "0kk10dhawx3lravnlxi2f3n430k0qz3i5p8mpmi0bi6j72ihlddw";
libraryHaskellDepends = [ array base bytestring containers ];
testHaskellDepends = [
array base bytestring Cabal containers directory filepath HUnit
@@ -37070,20 +37402,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "binary_0_8_6_0" = callPackage
- ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
- , containers, criterion, deepseq, directory, filepath
- , generic-deriving, HUnit, mtl, QuickCheck, random, test-framework
- , test-framework-quickcheck2, unordered-containers, zlib
+ "binary_0_8_7_0" = callPackage
+ ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring
+ , Cabal, cereal, containers, criterion, deepseq, directory
+ , filepath, generic-deriving, HUnit, mtl, QuickCheck, random
+ , test-framework, test-framework-quickcheck2, unordered-containers
+ , zlib
}:
mkDerivation {
pname = "binary";
- version = "0.8.6.0";
- sha256 = "0pz1va9bmj4daw8gi8r6d1rrnqsd4bislky6d8pjwwbyrgrw9s8y";
+ version = "0.8.7.0";
+ sha256 = "1r29yg94imhrbzjsv8ghf3217rhlas7945cp9i3dxzskzviyz78x";
libraryHaskellDepends = [ array base bytestring containers ];
testHaskellDepends = [
- array base bytestring Cabal containers directory filepath HUnit
- QuickCheck random test-framework test-framework-quickcheck2
+ array base base-orphans bytestring Cabal containers directory
+ filepath HUnit QuickCheck random test-framework
+ test-framework-quickcheck2
];
benchmarkHaskellDepends = [
array attoparsec base bytestring cereal containers criterion
@@ -37251,6 +37585,35 @@ self: {
broken = true;
}) {};
+ "binary-instances" = callPackage
+ ({ mkDerivation, aeson, base, binary, binary-orphans
+ , case-insensitive, hashable, QuickCheck, quickcheck-instances
+ , scientific, tagged, tasty, tasty-quickcheck, text, text-binary
+ , time-compat, unordered-containers, vector
+ , vector-binary-instances
+ }:
+ mkDerivation {
+ pname = "binary-instances";
+ version = "1";
+ sha256 = "07y9582vsw94ks8whkd3dcmf4wdwlq8riyk2shmxxprkq0gsv3z0";
+ revision = "1";
+ editedCabalFile = "141hhr872rg0g2pvz1mbxamz9cijik9jilr1y0wdx5r71x0m1vyd";
+ libraryHaskellDepends = [
+ aeson base binary binary-orphans case-insensitive hashable
+ scientific tagged text text-binary time-compat unordered-containers
+ vector vector-binary-instances
+ ];
+ testHaskellDepends = [
+ aeson base binary case-insensitive hashable QuickCheck
+ quickcheck-instances scientific tagged tasty tasty-quickcheck text
+ time-compat unordered-containers vector
+ ];
+ description = "Orphan instances for binary";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"binary-list" = callPackage
({ mkDerivation, base, binary, bytestring, criterion, deepseq
, phantom-state, transformers
@@ -37306,6 +37669,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "binary-orphans_1_0_1" = callPackage
+ ({ mkDerivation, base, binary, QuickCheck, quickcheck-instances
+ , tagged, tasty, tasty-quickcheck, transformers
+ }:
+ mkDerivation {
+ pname = "binary-orphans";
+ version = "1.0.1";
+ sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3";
+ revision = "1";
+ editedCabalFile = "0sww1904gn3sxvj94ac8l1g50v0j3fgpfiynbpvg0yhqsbfazi3n";
+ libraryHaskellDepends = [ base binary transformers ];
+ testHaskellDepends = [
+ base binary QuickCheck quickcheck-instances tagged tasty
+ tasty-quickcheck
+ ];
+ description = "Compatibility package for binary; provides instances";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"binary-parser" = callPackage
({ mkDerivation, base, base-prelude, bytestring, mtl
, quickcheck-instances, rerebase, tasty, tasty-hunit
@@ -37336,10 +37719,8 @@ self: {
}:
mkDerivation {
pname = "binary-parsers";
- version = "0.2.3.0";
- sha256 = "0yi13cf36w5ilh1cyd7rvyagibbbgbjdym7gp6zgq3lm7d4raqdw";
- revision = "1";
- editedCabalFile = "09ag18yr1m26fl3w7ab1d5q5j201ygbw7qsbsy41bwd6iq87rq15";
+ version = "0.2.4.0";
+ sha256 = "1jmr9djkp9ndysly8g1najzy38xhjpflri5jkwlyfnd2vk9x74yi";
libraryHaskellDepends = [
base binary bytestring bytestring-lexing scientific
];
@@ -37502,10 +37883,8 @@ self: {
}:
mkDerivation {
pname = "binary-tagged";
- version = "0.1.5.1";
- sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh";
- revision = "1";
- editedCabalFile = "1z612d3wbrlywcx96lc52svi9b2s6nskdnwnwm3d5mylcqaqckcx";
+ version = "0.1.5.2";
+ sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
generics-sop hashable scientific SHA tagged text time
@@ -37526,6 +37905,40 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "binary-tagged_0_2" = callPackage
+ ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+ , binary, binary-instances, bytestring, containers, criterion
+ , cryptohash-sha1, deepseq, generics-sop, hashable, nats
+ , quickcheck-instances, scientific, semigroups, SHA, tagged, tasty
+ , tasty-hunit, tasty-quickcheck, text, time, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "binary-tagged";
+ version = "0.2";
+ sha256 = "1pgb2p0kdh9vkmgn509c2v3h9dnhl9vyq2gyisfqvn27g2422c0j";
+ libraryHaskellDepends = [
+ aeson array base base16-bytestring binary bytestring containers
+ cryptohash-sha1 generics-sop hashable scientific tagged text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson array base base16-bytestring bifunctors binary
+ binary-instances bytestring containers generics-sop hashable
+ quickcheck-instances scientific tagged tasty tasty-hunit
+ tasty-quickcheck text time unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ aeson array base base16-bytestring binary binary-instances
+ bytestring containers criterion deepseq generics-sop hashable nats
+ scientific semigroups SHA tagged text time unordered-containers
+ vector
+ ];
+ description = "Tagged binary serialisation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"binary-tree" = callPackage
({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq
, doctest, ghc-prim, HUnit, QuickCheck, random, test-framework
@@ -37567,6 +37980,17 @@ self: {
broken = true;
}) {};
+ "binary-varint" = callPackage
+ ({ mkDerivation, base, binary }:
+ mkDerivation {
+ pname = "binary-varint";
+ version = "0.1.0.0";
+ sha256 = "1i183ab4bbq3yarijnb2pwgbi9k1w1nc0fs6ph8d8xnysj6ws8l8";
+ libraryHaskellDepends = [ base binary ];
+ description = "VarInt encoding/decoding via Data.Binary";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"binarydefer" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -38419,6 +38843,8 @@ self: {
pname = "bindynamic";
version = "1.0.0.1";
sha256 = "1dp52xagwgzmm77f1cm8mvwjy7xnckbkf1inxskq0c7xcch4wbfb";
+ revision = "1";
+ editedCabalFile = "0mq2h1j1xd52irb35y9j0znxzpk661w3dl4d5a011sln4jd3f663";
libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
license = stdenv.lib.licenses.gpl3;
@@ -38493,8 +38919,6 @@ self: {
];
description = "Aggregate continuous values into discrete bins";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"bio" = callPackage
@@ -38607,19 +39031,19 @@ self: {
}) {};
"biohazard" = callPackage
- ({ mkDerivation, async, attoparsec, base, base-prelude, bytestring
- , containers, exceptions, hashable, primitive, stm, text
- , transformers, unix, unordered-containers, vector
- , vector-algorithms, vector-th-unbox, zlib
+ ({ mkDerivation, attoparsec, base, base-prelude, bytestring
+ , containers, directory, exceptions, hashable, primitive, stm
+ , streaming, text, transformers, unix, unordered-containers, vector
+ , vector-algorithms, zlib
}:
mkDerivation {
pname = "biohazard";
- version = "1.1.1";
- sha256 = "1b9jba89l4jsyzxn3s40qp0njq4b5hdgvbs07vsrrbnlwlvshb7a";
+ version = "2.0";
+ sha256 = "0aq884bl3p4sr0lldwhmgqdhvmr6mxmcvnghli472jrrnijgbrxh";
libraryHaskellDepends = [
- async attoparsec base base-prelude bytestring containers exceptions
- hashable primitive stm text transformers unix unordered-containers
- vector vector-algorithms vector-th-unbox zlib
+ attoparsec base base-prelude bytestring containers directory
+ exceptions hashable primitive stm streaming text transformers unix
+ unordered-containers vector vector-algorithms zlib
];
description = "bioinformatics support library";
license = stdenv.lib.licenses.bsd3;
@@ -38639,8 +39063,8 @@ self: {
}:
mkDerivation {
pname = "bioinformatics-toolkit";
- version = "0.7.0";
- sha256 = "1wdxlpi24c5axy8d0b9hq8wqr58ikbqy9cwrixi9dc1yya6c2mxg";
+ version = "0.8.0";
+ sha256 = "0mkcxqnszkr9r8w2rqb79501wxfpgd2g17rn2lrjcqllmxdvkgwk";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson aeson-pretty attoparsec base bytestring bytestring-lexing
@@ -38754,8 +39178,8 @@ self: {
}:
mkDerivation {
pname = "birch-beer";
- version = "0.1.1.1";
- sha256 = "0gr7hqjdv9c5adghzf6jakwkhhpmza9a28bdcgrll02lsz8yb44g";
+ version = "0.1.4.0";
+ sha256 = "0vmyp13lxppkar2lgkc231kx7am0h8p2gq6m0swzaz3ra64yh39c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -38802,17 +39226,16 @@ self: {
"bisc" = callPackage
({ mkDerivation, base, configurator, directory, filepath, mtl
- , selda, selda-sqlite, text, xdg-basedir
+ , selda, selda-sqlite, text
}:
mkDerivation {
pname = "bisc";
- version = "0.2.0.0";
- sha256 = "07fgilmgkz95ar8gc1dvxq65xd82hvqr7y54550f1i55d2h3q95j";
+ version = "0.2.2.0";
+ sha256 = "0ypkz75pzrqy12kfpkhai0xmz80bjkjz9m5ydrmzlbcwjwvzlvjz";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base configurator directory filepath mtl selda selda-sqlite text
- xdg-basedir
];
description = "A small tool that clears qutebrowser cookies";
license = stdenv.lib.licenses.gpl3;
@@ -38848,8 +39271,8 @@ self: {
}:
mkDerivation {
pname = "bishbosh";
- version = "0.0.0.3";
- sha256 = "0kwscgfwpyn5ppwg8kfvxbmm6gmg1cvf9d7dhmbi6qydxaj0n11v";
+ version = "0.0.0.4";
+ sha256 = "0d9mn2jn1iv9x41c1yskfkx9d7papwn863gc1wffcb6aw8wg4mrz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -38868,6 +39291,8 @@ self: {
];
description = "Plays chess";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"bit-array" = callPackage
@@ -39231,10 +39656,8 @@ self: {
}:
mkDerivation {
pname = "bits";
- version = "0.5.1";
- sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5";
- revision = "5";
- editedCabalFile = "012qycmsfz5l6y82d3zgjmp1k3pgvhlpjdk6rwlpc1wlfbpdqiaw";
+ version = "0.5.2";
+ sha256 = "1q5grjma421qiwjkwvnsakd4hxnf02bavfinky2skfhqvg63hkav";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [ base bytes mtl transformers ];
testHaskellDepends = [ base doctest ];
@@ -39761,8 +40184,8 @@ self: {
pname = "blank-canvas";
version = "0.6.2";
sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84";
- revision = "4";
- editedCabalFile = "03l1k5b58b9p8ajm2aiq5xfryj45zipzv04mxc2qnl5xk9jz0iqw";
+ revision = "5";
+ editedCabalFile = "1csa2lsr4jv9x3867l1nbd1brnvw10q9qla027r19csscx5pg726";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base base-compat base64-bytestring bytestring colour
@@ -39781,20 +40204,18 @@ self: {
"blank-canvas" = callPackage
({ mkDerivation, aeson, base, base-compat-batteries
, base64-bytestring, bytestring, colour, containers
- , data-default-class, directory, http-types, kansas-comet
+ , data-default-class, directory, fail, http-types, kansas-comet
, mime-types, process, scotty, semigroups, shake, stm, text
, text-show, time, transformers, unix, vector, wai, wai-extra, warp
}:
mkDerivation {
pname = "blank-canvas";
- version = "0.6.3";
- sha256 = "1d10ngvsgi2hz6xick59rkq1wzfbsgckply2jmg6gz9mf3zj97bk";
- revision = "2";
- editedCabalFile = "0sybv2swx9gwpkjh704xfmilm9jhdb66jqc296agpzp85s2s75zz";
+ version = "0.7";
+ sha256 = "11blkr9yhag4l8lyg5gyi2wzcnapkgihkh01mp9lm28f3bb1v1z7";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base base-compat-batteries base64-bytestring bytestring
- colour containers data-default-class http-types kansas-comet
+ colour containers data-default-class fail http-types kansas-comet
mime-types scotty semigroups stm text text-show transformers vector
wai wai-extra warp
];
@@ -39843,8 +40264,8 @@ self: {
}:
mkDerivation {
pname = "blas-comfort-array";
- version = "0.0.0.1";
- sha256 = "1m6kq46sz4chjfc5kh1vqvdfzvn0c46iq93hv9d5rrc9adhma7gb";
+ version = "0.0.0.2";
+ sha256 = "1n9w905ppb08w0d8xbxvgipr9fv1iapwq3ybvk0dbj009w341kd1";
libraryHaskellDepends = [
base blas-ffi comfort-array netlib-comfort-array netlib-ffi
storable-complex transformers
@@ -39994,17 +40415,17 @@ self: {
"blaze-colonnade" = callPackage
({ mkDerivation, base, blaze-html, blaze-markup, colonnade, doctest
- , text
+ , profunctors, text
}:
mkDerivation {
pname = "blaze-colonnade";
- version = "1.2.2";
- sha256 = "0k51iqfr2dvc445q6jzvf4mb3q3x4z0vvf9p8fhd4npazwb72bqz";
+ version = "1.2.2.1";
+ sha256 = "1wh0q72qv2s6a42i13lqb94i0b5bgmqwqw7d5xy89dc76j0ncd2d";
libraryHaskellDepends = [
- base blaze-html blaze-markup colonnade text
+ base blaze-html blaze-markup colonnade profunctors text
];
testHaskellDepends = [ base colonnade doctest ];
- description = "Helper functions for using blaze-html with colonnade";
+ description = "blaze-html backend for colonnade";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -40476,8 +40897,8 @@ self: {
}:
mkDerivation {
pname = "bloomfilter-redis";
- version = "0.1.0.3";
- sha256 = "0wqsynfc1ps8gxfvggp1f6q6kd2wp4blvasv7yn5ld20iw0qawid";
+ version = "0.1.0.4";
+ sha256 = "0kl166hfdnq1j2ghra4n2fi4zvi1wj1md43rmx3jcmyhj7q4s2f0";
libraryHaskellDepends = [
arithmoi base binary bytestring hashable hedis
];
@@ -40692,14 +41113,14 @@ self: {
}) {};
"board-games" = callPackage
- ({ mkDerivation, array, base, cgi, containers, html, httpd-shed
- , network-uri, non-empty, QuickCheck, random, transformers
- , utility-ht
+ ({ mkDerivation, array, base, cgi, containers, criterion, html
+ , httpd-shed, network-uri, non-empty, QuickCheck, random
+ , transformers, utility-ht
}:
mkDerivation {
pname = "board-games";
- version = "0.2";
- sha256 = "1plgnwlpx0bw0wjwd0dxbh616vy37frclwir692x1fr2lq85y98c";
+ version = "0.2.1";
+ sha256 = "1gsbk1m58f82b1ic0fv1ygslz4lyxxdl0a849q5hl4qbl9s7rbqb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -40714,6 +41135,9 @@ self: {
array base containers non-empty QuickCheck random transformers
utility-ht
];
+ benchmarkHaskellDepends = [
+ base containers criterion non-empty utility-ht
+ ];
description = "Three games for inclusion in a web server";
license = "GPL";
}) {};
@@ -41245,22 +41669,22 @@ self: {
}) {};
"boring" = callPackage
- ({ mkDerivation, adjunctions, base, base-compat, constraints, fin
- , generics-sop, streams, tagged, transformers, transformers-compat
- , vec
+ ({ mkDerivation, adjunctions, base, base-compat, constraints, dec
+ , fin, generics-sop, singleton-bool, streams, tagged, transformers
+ , transformers-compat, vec
}:
mkDerivation {
pname = "boring";
- version = "0.1.1";
- sha256 = "1v33mj4rqg0l7161ajmd35k73n66cscg7wsnmb84z0wp1wxlmhwg";
+ version = "0.1.2";
+ sha256 = "0978dq53rpb7clz1ydjm6x38nrx0vkp3safqcbjp2kq6jlaz29jr";
+ revision = "1";
+ editedCabalFile = "010k2mw8q3iby78ak56xamp6pzdwijn92r64r76hblw32k1i80c0";
libraryHaskellDepends = [
- adjunctions base base-compat constraints fin generics-sop streams
- tagged transformers transformers-compat vec
+ adjunctions base base-compat constraints dec fin generics-sop
+ singleton-bool streams tagged transformers transformers-compat vec
];
description = "Boring and Absurd types";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"boring-game" = callPackage
@@ -41313,6 +41737,8 @@ self: {
pname = "both";
version = "0.1.1.0";
sha256 = "13hf6j8qfaqw446ifyx0y60j9kvlvm0yj3r4h910bcszfjvyhkkg";
+ revision = "1";
+ editedCabalFile = "0fi2lvxcdnj9bi683kl840xpyj12wxwxvqbi86a6qp4r8bq8442n";
libraryHaskellDepends = [ base semigroups zero ];
description = "Like Maybe, but with a different Monoid instance";
license = stdenv.lib.licenses.mit;
@@ -41341,8 +41767,8 @@ self: {
pname = "bound";
version = "2.0.1";
sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9";
- revision = "6";
- editedCabalFile = "18fqzxy3f8r09jwcsfzjlrpvnlz711jq5gcjp4dal1pvsbbw6i09";
+ revision = "7";
+ editedCabalFile = "0amr5rpq8andqq3z2dsh8hn67g3x7ykcmqq899vbkxwnpvg60h5r";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bifunctors binary bytes cereal comonad deepseq hashable mmorph
@@ -41365,6 +41791,8 @@ self: {
pname = "bound-extras";
version = "0.0.1";
sha256 = "0f49yqz5s5h4f3m3i7kpm2fqnd42nl4dbl24lvm6z3nb8qrx6ynq";
+ revision = "1";
+ editedCabalFile = "1gyhbcnb1q1f8fdlmsmjn19xp4nvi2vb6ns0h8h2dvvpz9x3wgab";
libraryHaskellDepends = [
base bound deepseq hashable transformers
];
@@ -41374,8 +41802,6 @@ self: {
];
description = "ScopeH and ScopeT extras for bound";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"bound-gen" = callPackage
@@ -41402,6 +41828,18 @@ self: {
broken = true;
}) {};
+ "bounded-queue" = callPackage
+ ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit }:
+ mkDerivation {
+ pname = "bounded-queue";
+ version = "1.0.0";
+ sha256 = "18jlkdzfkw0v6ifz8fzqkzagc3g97kg13ng8yldq869casnmcw5d";
+ libraryHaskellDepends = [ base containers deepseq ];
+ testHaskellDepends = [ base tasty tasty-hunit ];
+ description = "A strict, immutable, thread-safe, single-ended, bounded queue";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bounded-tchan" = callPackage
({ mkDerivation, base, stm }:
mkDerivation {
@@ -41523,8 +41961,8 @@ self: {
({ mkDerivation, array, base, containers, parsec }:
mkDerivation {
pname = "brain-bleep";
- version = "0.1.0.1";
- sha256 = "18d9nfr9pykj5xb50m1gc024nw5h8i75facw2a1wz325jyzncg84";
+ version = "0.1.0.2";
+ sha256 = "08rb1b7m5lpgiwdy1gl3dkc2ymc6l8ifssj4q2rqp46b27nbwsgz";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ array base containers parsec ];
@@ -41626,8 +42064,8 @@ self: {
}:
mkDerivation {
pname = "breve";
- version = "0.4.4.0";
- sha256 = "1pkjiwxm8lkrjnyya14f6kmmyv9w5lx7328wdyf1w1871daw208p";
+ version = "0.4.5.1";
+ sha256 = "1db93l3lb09rsb6yh3pkbfpyh736a9ki0q1x8s8rcp4dsy79b3va";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -41638,7 +42076,7 @@ self: {
xdg-basedir
];
description = "a url shortener";
- license = stdenv.lib.licenses.mit;
+ license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -41666,8 +42104,8 @@ self: {
}:
mkDerivation {
pname = "brick";
- version = "0.47";
- sha256 = "1glj71qajc2rdn9akhhh0yryhps57s33x0i2fb4mf12zg8pp5kj7";
+ version = "0.47.1";
+ sha256 = "0s0frxr6spgxzzvnym8rf40wj261clv7yfy2fxgm8iyjrr0ki49h";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -41899,10 +42337,8 @@ self: {
}:
mkDerivation {
pname = "brittany";
- version = "0.11.0.0";
- sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26";
- revision = "2";
- editedCabalFile = "1f20w6zzbygnpa7f6xbaqxx34l62r53ikywg2snn0zkfizf3lcgx";
+ version = "0.12.0.0";
+ sha256 = "058ffj00x374iaz75zzd9l0ab4crdsq2zjrq1r8lvcpp63fmsa7h";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -41928,8 +42364,6 @@ self: {
];
description = "Haskell source code formatter";
license = stdenv.lib.licenses.agpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"broadcast-chan" = callPackage
@@ -41944,8 +42378,6 @@ self: {
benchmarkHaskellDepends = [ async base criterion deepseq stm ];
description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"broadcast-chan-conduit" = callPackage
@@ -41996,6 +42428,8 @@ self: {
pname = "broadcast-chan-tests";
version = "0.2.0.2";
sha256 = "1m7m06pd9vfvz0rfnylpr6pjvizxv31qizri3a400rkz3zanhkym";
+ revision = "1";
+ editedCabalFile = "0vlqyhz02y5jkmxlic1rsxf1ddfffrsvkp67vsaf2zmqjjkvc8rh";
libraryHaskellDepends = [
async base broadcast-chan clock containers optparse-applicative
paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis
@@ -42073,6 +42507,8 @@ self: {
pname = "bronyradiogermany-common";
version = "1.0.0.1";
sha256 = "1hwqif1jnwjhkb22j7rsc7fznvd7373gbfsl46196bb6489bbcvy";
+ revision = "1";
+ editedCabalFile = "158y92fki5kk8pk7z5whc70qbw0w17v0j0zn486hym3bq6qif74k";
libraryHaskellDepends = [
aeson base bytestring network-uri text time tz uuid-types
];
@@ -42089,6 +42525,8 @@ self: {
pname = "bronyradiogermany-streaming";
version = "1.0.0.1";
sha256 = "1a2yz2cbjpcywis7fy5l1w3pipirh6rjfcgs1mdyhgza12qnbx09";
+ revision = "1";
+ editedCabalFile = "0zhgpm0yxr9ablrc4b99wpwpj1qv2a8bq8mpz525ni17jix3iqc8";
libraryHaskellDepends = [
aeson base bronyradiogermany-common bytestring case-insensitive
http-types mtl streaming streaming-bytestring streaming-utils text
@@ -42213,23 +42651,21 @@ self: {
}) {};
"bson" = callPackage
- ({ mkDerivation, base, binary, bytestring, cryptohash
+ ({ mkDerivation, base, binary, bytestring, cryptohash-md5
, data-binary-ieee754, mtl, network, QuickCheck, test-framework
, test-framework-quickcheck2, text, time
}:
mkDerivation {
pname = "bson";
- version = "0.3.2.7";
- sha256 = "0avzr3aa3mbr9hcjwd0nr0pnpiym7s35qw7nghz51mrzb76rsci7";
- revision = "1";
- editedCabalFile = "1y6gy4rq2wb123p1qc35p0hnk8dqh2hnlys2c97znwcjjsd5p203";
+ version = "0.3.2.8";
+ sha256 = "1xqxjs0vhlrvnclkxn8y5dr4liaja4flqizphk1000km2kvvw748";
libraryHaskellDepends = [
- base binary bytestring cryptohash data-binary-ieee754 mtl network
- text time
+ base binary bytestring cryptohash-md5 data-binary-ieee754 mtl
+ network text time
];
testHaskellDepends = [
- base binary bytestring cryptohash data-binary-ieee754 mtl network
- QuickCheck test-framework test-framework-quickcheck2 text time
+ base bytestring QuickCheck test-framework
+ test-framework-quickcheck2 text time
];
description = "BSON documents are JSON-like objects with a standard binary encoding";
license = stdenv.lib.licenses.asl20;
@@ -42738,6 +43174,35 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "bulletproofs_1_0_0" = callPackage
+ ({ mkDerivation, arithmoi, base, containers, criterion, cryptonite
+ , galois-field, memory, MonadRandom, pairing, protolude, QuickCheck
+ , random-shuffle, tasty, tasty-discover, tasty-hunit
+ , tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "bulletproofs";
+ version = "1.0.0";
+ sha256 = "1q1d8bj8hh2ik4arrgqrkhk4gwirvabfiw8mbazmpgvir8yv19s0";
+ libraryHaskellDepends = [
+ arithmoi base containers cryptonite galois-field memory MonadRandom
+ pairing protolude QuickCheck random-shuffle text
+ ];
+ testHaskellDepends = [
+ arithmoi base containers cryptonite galois-field memory MonadRandom
+ pairing protolude QuickCheck random-shuffle tasty tasty-discover
+ tasty-hunit tasty-quickcheck text
+ ];
+ testToolDepends = [ tasty-discover ];
+ benchmarkHaskellDepends = [
+ arithmoi base containers criterion cryptonite galois-field memory
+ MonadRandom pairing protolude QuickCheck random-shuffle tasty
+ tasty-hunit tasty-quickcheck text
+ ];
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bumper" = callPackage
({ mkDerivation, base, Cabal, containers, fclabels, process
, regex-compat, split, strict
@@ -42919,8 +43384,8 @@ self: {
}:
mkDerivation {
pname = "butcher";
- version = "1.3.2.1";
- sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda";
+ version = "1.3.2.3";
+ sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5";
libraryHaskellDepends = [
base bifunctors containers deque extra free microlens microlens-th
mtl multistate pretty transformers unsafe void
@@ -42931,8 +43396,6 @@ self: {
];
description = "Chops a command or program invocation into digestable pieces";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"butter" = callPackage
@@ -43025,7 +43488,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "bv-little_1_0_0" = callPackage
+ "bv-little_1_0_1" = callPackage
({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp
, keys, mono-traversable, mono-traversable-keys, primitive
, QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck
@@ -43033,8 +43496,8 @@ self: {
}:
mkDerivation {
pname = "bv-little";
- version = "1.0.0";
- sha256 = "0hdzwcdm3cdiqyjkl5k9hg61za51w61j5168c17nfs1yyhh0fdms";
+ version = "1.0.1";
+ sha256 = "1as21xhzrzcqmrqybczwxhh81avgkmdgn7hhk534dxv6csd7jyp6";
libraryHaskellDepends = [
base deepseq hashable integer-gmp keys mono-traversable
mono-traversable-keys primitive QuickCheck text-show
@@ -43105,6 +43568,18 @@ self: {
broken = true;
}) {};
+ "byte-order" = callPackage
+ ({ mkDerivation, base, primitive }:
+ mkDerivation {
+ pname = "byte-order";
+ version = "0.1.0.0";
+ sha256 = "1g0bqx4xzv9y5shjn4wbnrrskahrmybzm1sw1kryyn5z8w7srw34";
+ libraryHaskellDepends = [ base primitive ];
+ testHaskellDepends = [ base primitive ];
+ description = "Portable big-endian and little-endian conversions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"byteable" = callPackage
({ mkDerivation, base, bytestring }:
mkDerivation {
@@ -43163,6 +43638,8 @@ self: {
pname = "bytes";
version = "0.15.5";
sha256 = "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683";
+ revision = "1";
+ editedCabalFile = "0k05cszpxmdwgnbxhmlmmvsxkwlanvz8dn0p3f6bzs8qlv3kbhm7";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base binary bytestring cereal containers hashable mtl scientific
@@ -43188,14 +43665,16 @@ self: {
}) {};
"byteslice" = callPackage
- ({ mkDerivation, base, primitive }:
+ ({ mkDerivation, base, primitive, primitive-addr }:
mkDerivation {
pname = "byteslice";
- version = "0.1.0.0";
- sha256 = "13qzkhj2ify1q097n1zrjwjkw2803153vp9a4281i5idkm7x9pfg";
- libraryHaskellDepends = [ base primitive ];
- description = "Slicing ByteArray and MutableByteArray";
+ version = "0.1.1.0";
+ sha256 = "08abffrd6psiab220d8081lcs7ba7fvr7waqzykdk8i5dcm9iyvb";
+ libraryHaskellDepends = [ base primitive primitive-addr ];
+ description = "Slicing managed and unmanaged memory";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"bytestring_0_10_8_2" = callPackage
@@ -43224,8 +43703,8 @@ self: {
}:
mkDerivation {
pname = "bytestring-arbitrary";
- version = "0.1.2";
- sha256 = "0ifa4913qbq5zqzx7c11hzyggqxyk5sfj4id0rsp7m10r53fdvgz";
+ version = "0.1.3";
+ sha256 = "0xgdrd5jzy3ihpjmxpga6xj5p90fnfqj4509q5vvgy5x9l3jigrv";
libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ];
testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
benchmarkHaskellDepends = [
@@ -43233,8 +43712,6 @@ self: {
];
description = "Arbitrary instances for ByteStrings";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"bytestring-builder" = callPackage
@@ -43545,10 +44022,10 @@ self: {
}:
mkDerivation {
pname = "bytestring-strict-builder";
- version = "0.4.5.1";
- sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q";
+ version = "0.4.5.3";
+ sha256 = "0p4yhi2x8k2jn6xxq15r38m10h4dkxkryzqzgnw4sq47270p5k5d";
revision = "1";
- editedCabalFile = "1snn8qb17maa76zji75i4yfz9x8ci16xp6zwg6kgwb33lf06imnd";
+ editedCabalFile = "0i3gnzb2dlhxyjx5zbbgycf9l285amwj98s6drvq2hih21z4d3h6";
libraryHaskellDepends = [
base base-prelude bytestring semigroups
];
@@ -43611,8 +44088,8 @@ self: {
}:
mkDerivation {
pname = "bytestring-tree-builder";
- version = "0.2.7.2";
- sha256 = "03h2nmhyrr63gw4xmflsrmwf80gvayhs32wnpg3k9aqfjzpz4bd1";
+ version = "0.2.7.3";
+ sha256 = "0v78jwzmpipw4iyr0i9klxhcfxf98vljxz3had1xklslhzsabk16";
libraryHaskellDepends = [
base base-prelude bytestring semigroups text
];
@@ -44065,31 +44542,33 @@ self: {
"cabal-cache" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
- , antiope-core, antiope-s3, base, bytestring, conduit-extra
- , containers, cryptonite, deepseq, directory, exceptions, filepath
- , generic-lens, hedgehog, hspec, hspec-discover, http-types
- , hw-hedgehog, hw-hspec-hedgehog, lens, mtl, optparse-applicative
- , process, raw-strings-qq, resourcet, selective, stringsearch, tar
- , temporary, text, time, unliftio, zlib
+ , antiope-core, antiope-optparse-applicative, antiope-s3, base
+ , bytestring, conduit-extra, containers, cryptonite, deepseq
+ , directory, exceptions, filepath, generic-lens, hedgehog, hspec
+ , hspec-discover, http-client, http-types, hw-hedgehog
+ , hw-hspec-hedgehog, lens, mtl, optparse-applicative, process
+ , raw-strings-qq, relation, resourcet, selective, stm, stringsearch
+ , tar, temporary, text, time, topograph, unliftio, zlib
}:
mkDerivation {
pname = "cabal-cache";
- version = "1.0.0.1";
- sha256 = "030hnkbs3cpcab7yczh12f6zmngwnbl4jgy73hkaipwkzc1qw0sc";
+ version = "1.0.1.0";
+ sha256 = "0x013n44ppwm6vh9n9wch8hki2g3pr2bahngymdm7vd6628jpshz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3
- base bytestring conduit-extra containers cryptonite deepseq
- directory exceptions filepath generic-lens http-types lens mtl
- optparse-applicative process resourcet selective stringsearch tar
- temporary text time unliftio zlib
+ aeson amazonka amazonka-core amazonka-s3 antiope-core
+ antiope-optparse-applicative antiope-s3 base bytestring
+ conduit-extra containers cryptonite deepseq directory exceptions
+ filepath generic-lens http-client http-types lens mtl
+ optparse-applicative process relation resourcet selective stm
+ stringsearch tar temporary text time topograph unliftio zlib
];
executableHaskellDepends = [ base optparse-applicative ];
testHaskellDepends = [
- aeson antiope-core antiope-s3 base bytestring filepath generic-lens
- hedgehog hspec hw-hedgehog hw-hspec-hedgehog lens raw-strings-qq
- text
+ aeson antiope-core antiope-s3 base bytestring containers filepath
+ generic-lens hedgehog hspec http-types hw-hedgehog
+ hw-hspec-hedgehog lens raw-strings-qq relation text
];
testToolDepends = [ hspec-discover ];
description = "CI Assistant for Haskell projects";
@@ -44330,8 +44809,8 @@ self: {
}:
mkDerivation {
pname = "cabal-helper";
- version = "0.8.1.2";
- sha256 = "1pxyba12m9kyzfm4nn8qfd19fqwnq6kjy1967wic2xaz151x6nil";
+ version = "0.8.2.0";
+ sha256 = "1j3h28w9sva1kj410irysl4lbwbar0nbddb9w5gv6jn82ca2dl93";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal ];
@@ -44354,8 +44833,6 @@ self: {
doCheck = false;
description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"cabal-info" = callPackage
@@ -44392,8 +44869,8 @@ self: {
pname = "cabal-install";
version = "2.4.1.0";
sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39";
- revision = "2";
- editedCabalFile = "18llmvfaf8gcz2dvhhs3j0a6kzzisajh1bms7wwnrl0hi4xyx012";
+ revision = "3";
+ editedCabalFile = "1mnm6mfrgavq3blvkm3wz45pqrj10apjihg1g9cds58qp19m9r1h";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath process ];
@@ -44662,15 +45139,15 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
- "cabal-rpm_0_13_2" = callPackage
+ "cabal-rpm_0_13_3" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
, http-client, http-client-tls, http-conduit, process, simple-cmd
, time, unix
}:
mkDerivation {
pname = "cabal-rpm";
- version = "0.13.2";
- sha256 = "1q4nqmxd0cn023nm8dnlh40wqk3n7cd5v873bawhv6gmysgyxhn7";
+ version = "0.13.3";
+ sha256 = "04d5m74i0r6livhkhmccrwhshpa2aizyb77i2qcqhxradw0lkvl4";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -44955,8 +45432,8 @@ self: {
}:
mkDerivation {
pname = "cabal2nix";
- version = "2.14.2";
- sha256 = "0fa0rhglp3xlv8zr9pnx2l14bz7jvdvdxwiy63rpvf44jzjdknkr";
+ version = "2.14.4";
+ sha256 = "0pxqdwxqc5siqrp7mqvz6g380wx4xn3y3mph8vjywvycvpqg2gqh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -45046,6 +45523,8 @@ self: {
pname = "cabalgraph";
version = "0.1";
sha256 = "1kgw1n22zh1ap6dfzhmh18d0wkr6ppd9b20r77f7q6m371hhbkvy";
+ revision = "1";
+ editedCabalFile = "01vkf16s9kplp61sbf4w6zfdd48wg65d1m31m5jqk28361c76sh7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -45159,22 +45638,6 @@ self: {
}) {cabocha = null;};
"cache" = callPackage
- ({ mkDerivation, base, clock, hashable, hspec, stm, transformers
- , unordered-containers
- }:
- mkDerivation {
- pname = "cache";
- version = "0.1.1.1";
- sha256 = "04azn2g1rndfpf6zl3sachzz471hhxykxh4clrz0vl5da8frja8h";
- libraryHaskellDepends = [
- base clock hashable stm transformers unordered-containers
- ];
- testHaskellDepends = [ base clock hspec stm transformers ];
- description = "An in-memory key/value store with expiration support";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cache_0_1_1_2" = callPackage
({ mkDerivation, base, clock, hashable, hspec, stm, transformers
, unordered-containers
}:
@@ -45188,7 +45651,6 @@ self: {
testHaskellDepends = [ base clock hspec stm transformers ];
description = "An in-memory key/value store with expiration support";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cached" = callPackage
@@ -45278,6 +45740,44 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "cachix_0_2_1" = callPackage
+ ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
+ , bytestring, cachix-api, conduit, conduit-extra, cookie
+ , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here
+ , hspec, hspec-discover, http-client, http-client-tls, http-conduit
+ , http-types, lzma-conduit, megaparsec, memory, mmorph, netrc
+ , optparse-applicative, process, protolude, resourcet, retry
+ , safe-exceptions, servant, servant-auth, servant-auth-client
+ , servant-client, servant-client-core, servant-conduit, temporary
+ , text, unix, uri-bytestring, versions
+ }:
+ mkDerivation {
+ pname = "cachix";
+ version = "0.2.1";
+ sha256 = "1yz0qfpp8d2n4h9k9cy394zgqg24vvb9ahzxdsvabjwbpmg9sijv";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ async base base16-bytestring base64-bytestring bytestring
+ cachix-api conduit conduit-extra cookie cryptonite dhall directory
+ ed25519 filepath fsnotify here http-client http-client-tls
+ http-conduit http-types lzma-conduit megaparsec memory mmorph netrc
+ optparse-applicative process protolude resourcet retry
+ safe-exceptions servant servant-auth servant-auth-client
+ servant-client servant-client-core servant-conduit text unix
+ uri-bytestring versions
+ ];
+ executableHaskellDepends = [ base cachix-api ];
+ executableToolDepends = [ hspec-discover ];
+ testHaskellDepends = [
+ base cachix-api directory here hspec protolude temporary
+ ];
+ description = "Command line client for Nix binary cache hosting https://cachix.org";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cachix-api" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
, conduit, cookie, cryptonite, deepseq, exceptions, hspec
@@ -45313,6 +45813,42 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "cachix-api_0_2_1" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , conduit, cookie, cryptonite, deepseq, exceptions, hspec
+ , hspec-discover, http-api-data, http-media, lens, memory
+ , protolude, resourcet, servant, servant-auth, servant-auth-server
+ , servant-auth-swagger, servant-client, servant-swagger
+ , servant-swagger-ui-core, string-conv, swagger2, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "cachix-api";
+ version = "0.2.1";
+ sha256 = "1ja724ji12whjhyw135yi2fq323a65h4bj37r43b5d9ir1c04g67";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring conduit cookie cryptonite
+ deepseq exceptions http-api-data http-media lens memory resourcet
+ servant servant-auth servant-auth-server servant-auth-swagger
+ servant-client servant-swagger string-conv swagger2 text
+ transformers
+ ];
+ executableHaskellDepends = [ aeson base ];
+ testHaskellDepends = [
+ aeson base base16-bytestring bytestring conduit cookie cryptonite
+ hspec http-api-data http-media lens memory protolude servant
+ servant-auth servant-auth-server servant-auth-swagger
+ servant-swagger servant-swagger-ui-core string-conv swagger2 text
+ transformers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Servant HTTP API specification for https://cachix.org";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cacophony" = callPackage
({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
, bytestring, criterion, cryptonite, deepseq, directory, exceptions
@@ -45740,33 +46276,38 @@ self: {
"camfort" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
, directory, fgl, filepath, flint, fortran-src, GenericPretty
- , ghc-prim, happy, hmatrix, hspec, lattices, lens, matrix, mmorph
- , mtl, optparse-applicative, partial-order, QuickCheck, sbv
- , silently, singletons, syb, syz, template-haskell, temporary, text
- , time, transformers, uniplate, vector, verifiable-expressions
- , vinyl
+ , ghc-prim, happy, hmatrix, hspec, hspec-discover, lattices, lens
+ , matrix, mmorph, mtl, optparse-applicative, parallel, pretty
+ , QuickCheck, sbv, silently, singletons, strict, syb, syz
+ , template-haskell, temporary, text, time, transformers, uniplate
+ , vector, verifiable-expressions, vinyl, writer-cps-morph
+ , writer-cps-mtl, writer-cps-transformers
}:
mkDerivation {
pname = "camfort";
- version = "0.905";
- sha256 = "14wp9xkssingashbys07i536xnmrgh891260drc0f88d0mwjc935";
+ version = "0.906";
+ sha256 = "164zrga458nmlyxaaa9wa0x1vamrlf1w1jisnwp87khkw8622nyi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
array base binary bytestring containers directory fgl filepath
fortran-src GenericPretty ghc-prim hmatrix lattices lens matrix
- mmorph mtl partial-order sbv singletons syb syz template-haskell
- text transformers uniplate vector verifiable-expressions vinyl
+ mmorph mtl parallel pretty sbv singletons strict syb syz
+ template-haskell text transformers uniplate vector
+ verifiable-expressions vinyl writer-cps-morph writer-cps-mtl
+ writer-cps-transformers
];
librarySystemDepends = [ flint ];
libraryToolDepends = [ alex happy ];
- executableHaskellDepends = [ base directory optparse-applicative ];
+ executableHaskellDepends = [
+ base directory fortran-src optparse-applicative
+ ];
testHaskellDepends = [
array base binary bytestring containers directory fgl filepath
- fortran-src hmatrix hspec lattices lens mtl partial-order
- QuickCheck sbv silently temporary text time uniplate
- verifiable-expressions
+ fortran-src hmatrix hspec lattices lens mtl QuickCheck sbv silently
+ temporary text time uniplate verifiable-expressions
];
+ testToolDepends = [ hspec-discover ];
description = "CamFort - Cambridge Fortran infrastructure";
license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -45808,18 +46349,14 @@ self: {
}) {};
"canon" = callPackage
- ({ mkDerivation, arithmoi, array, base, containers, polynomial }:
+ ({ mkDerivation, arithmoi, array, base, containers, random }:
mkDerivation {
pname = "canon";
- version = "0.1.0.4";
- sha256 = "0hy28s1rgzsqcbs600ppj74ls1xvm39fdjjba4p3f1cfw7g5ai1f";
- libraryHaskellDepends = [
- arithmoi array base containers polynomial
- ];
- description = "Massive Number Arithmetic";
+ version = "0.1.1.1";
+ sha256 = "0z2s4bk6xs9p2lgg7r70nhr6igvw3z5iarc29slsg0cv9w4232c1";
+ libraryHaskellDepends = [ arithmoi array base containers random ];
+ description = "Arithmetic for Psychedelically Large Numbers";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"canonical-filepath" = callPackage
@@ -46055,8 +46592,6 @@ self: {
];
description = "Extensional capabilities and deriving combinators";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"capataz" = callPackage
@@ -46066,8 +46601,8 @@ self: {
}:
mkDerivation {
pname = "capataz";
- version = "0.2.0.0";
- sha256 = "0b026vbp9xkwfis5xr1z4svi5z5b4dpj5c3w28133fr4rl6cdpx4";
+ version = "0.2.1.0";
+ sha256 = "14mda2yvg0phpfhkacm5whh4hqcvyw14xiilx28ghc4rkf7al0fi";
libraryHaskellDepends = [
async base bytestring pretty-show prettyprinter rio teardown time
uuid
@@ -46509,6 +47044,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "case-insensitive_1_2_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+ , HUnit, test-framework, test-framework-hunit, text
+ }:
+ mkDerivation {
+ pname = "case-insensitive";
+ version = "1.2.1.0";
+ sha256 = "01p40hfjyldfds5jg6vlvvn3ihs4ki63xn6fh8yzngaz1izc2v99";
+ libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+ testHaskellDepends = [
+ base bytestring HUnit test-framework test-framework-hunit text
+ ];
+ benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
+ description = "Case insensitive string comparison";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"case-insensitive-match" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, criterion, mtl
, QuickCheck, random-strings, tagsoup, text
@@ -46602,21 +47155,15 @@ self: {
}) {};
"casr-logbook" = callPackage
- ({ mkDerivation, base, containers, digit, directory, doctest
- , filepath, lens, lucid, QuickCheck, template-haskell, text, time
+ ({ mkDerivation, base, containers, digit, lens, lucid, text, time
}:
mkDerivation {
pname = "casr-logbook";
- version = "0.3.0";
- sha256 = "1hbrvwpr5crrnqwsi9i2pcw89rpy5fy3dg40al1318lmxp6miznh";
- revision = "1";
- editedCabalFile = "03llwc37nhb4syw8a7wsp8n1135x57q9xacakfzw2rm5gby7hywm";
+ version = "0.5.4";
+ sha256 = "06r160c9cjqmiqldpdd9h4dx5g9gj6cmrajprwbcabcar6ckdsci";
libraryHaskellDepends = [
base containers digit lens lucid text time
];
- testHaskellDepends = [
- base directory doctest filepath QuickCheck template-haskell
- ];
description = "CASR 61.345 Pilot Personal Logbook";
license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
@@ -46824,8 +47371,8 @@ self: {
pname = "cassava";
version = "0.5.1.0";
sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n";
- revision = "1";
- editedCabalFile = "1brz20js95synh0yw942ihy4y9y6nk4xnsqcjqi9580y24zcigkl";
+ revision = "2";
+ editedCabalFile = "13mbhan3agzf8ki8hcac1xf50h9nbzx2b47zjqrch2050v6xa351";
configureFlags = [ "-f-bytestring--lt-0_10_4" ];
libraryHaskellDepends = [
array attoparsec base bytestring containers deepseq hashable Only
@@ -46937,8 +47484,6 @@ self: {
];
description = "io-streams interface for the cassava CSV library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"cassette" = callPackage
@@ -46995,20 +47540,20 @@ self: {
}) {};
"caster" = callPackage
- ({ mkDerivation, base, bytestring, directory, fast-builder
+ ({ mkDerivation, base, bytestring, directory, fast-builder, mtl
, QuickCheck, quickcheck-instances, stm, tasty, tasty-discover
, tasty-hunit, tasty-quickcheck, text, unix-time
}:
mkDerivation {
pname = "caster";
- version = "0.0.1.0";
- sha256 = "0yybmrlqfki2v2952gf5xhfh5nr4dj0ldq780landjwh2ywrdcvq";
+ version = "0.0.3.0";
+ sha256 = "0wmczsiv7cf1yx82yd8da90fab5y8p3mgazfhssv6jd19iaxrakj";
libraryHaskellDepends = [
base bytestring fast-builder stm text unix-time
];
testHaskellDepends = [
- base bytestring directory fast-builder QuickCheck
- quickcheck-instances tasty tasty-discover tasty-hunit
+ base bytestring directory fast-builder mtl QuickCheck
+ quickcheck-instances stm tasty tasty-discover tasty-hunit
tasty-quickcheck text
];
testToolDepends = [ tasty-discover ];
@@ -47615,8 +48160,8 @@ self: {
}:
mkDerivation {
pname = "cereal";
- version = "0.5.8.0";
- sha256 = "10j205g4w311ypk24ds2nmv1816s8645788s6a1vrfippa56dlrp";
+ version = "0.5.8.1";
+ sha256 = "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id";
libraryHaskellDepends = [
array base bytestring containers ghc-prim
];
@@ -48408,6 +48953,8 @@ self: {
pname = "chatty";
version = "0.7.0.1";
sha256 = "0d7cfp3vvrmn7b6lc83j5pi7a90sk1rc1y48zb78f8plipp7ngb6";
+ revision = "1";
+ editedCabalFile = "1vh058qw0wphwn0l1lchhxms96p9bhsjna4j7lyvczmc9ba2mgdp";
libraryHaskellDepends = [
ansi-terminal base chatty-utils directory mtl process random setenv
template-haskell text time transformers unix
@@ -48422,6 +48969,8 @@ self: {
pname = "chatty-text";
version = "0.6.2.1";
sha256 = "00f3h0vw0mxrcqjfwas9ddx9hhcvfzvy0p43xqq29ibwdcgms3w2";
+ revision = "1";
+ editedCabalFile = "11vpzarrbk0jlsnamrnf4xp3gzkgwrbs6x5mr9m5rr4lrw1f9q0v";
libraryHaskellDepends = [ base chatty transformers ];
description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
license = stdenv.lib.licenses.agpl3;
@@ -48435,6 +48984,8 @@ self: {
pname = "chatty-utils";
version = "0.7.3.4";
sha256 = "1dp1k641sryzp7zh5l3f8v4dajc71ly8l9fyv1c45cf0s81cxhys";
+ revision = "1";
+ editedCabalFile = "0b1bvxkp1yhw3ws12mkdys5dnml03phzj03sqkrk1289jm5nlfn9";
libraryHaskellDepends = [ base mtl text transformers ];
description = "Some utilities every serious chatty-based application may need";
license = stdenv.lib.licenses.agpl3;
@@ -48563,17 +49114,18 @@ self: {
"check-pvp" = callPackage
({ mkDerivation, base, Cabal, containers, explicit-exception
- , filepath, haskell-src-exts, non-empty, transformers, utility-ht
+ , filepath, haskell-packages, haskell-src-exts, hse-cpp, non-empty
+ , tagged, transformers, utility-ht
}:
mkDerivation {
pname = "check-pvp";
- version = "0.0.1";
- sha256 = "18xhm11xwvy9cz149ddm3lj4gxb514jglwhdr50mkrdd4rw8w59f";
+ version = "0.0.3";
+ sha256 = "1x7bzl7fb5h1d69ggqcg3dk0dnw75h4namjqhjh4izxf02zvic7m";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base Cabal containers explicit-exception filepath haskell-src-exts
- non-empty transformers utility-ht
+ base Cabal containers explicit-exception filepath haskell-packages
+ haskell-src-exts hse-cpp non-empty tagged transformers utility-ht
];
description = "Check whether module and package imports conform to the PVP";
license = stdenv.lib.licenses.bsd3;
@@ -48705,29 +49257,36 @@ self: {
}) {};
"chessIO" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, directory, haskeline
- , megaparsec, mtl, parallel, parser-combinators, process, split
- , stm, time, unordered-containers, vector
+ ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+ , directory, extra, file-embed, haskeline, megaparsec, MonadRandom
+ , mtl, o-clock, optparse-applicative, parallel, parser-combinators
+ , prettyprinter, process, random, stm, text, time
+ , unordered-containers, vector
}:
mkDerivation {
pname = "chessIO";
- version = "0.2.0.0";
- sha256 = "01vgr2h1m5ww9j0239lv4k75sshhaa42kzi0bg8134j64i5k8ghd";
+ version = "0.3.1.1";
+ sha256 = "05jwz1nq5wiqdpnwn31wyc4gpryh9b4qzil4rkgx7vhavck2w1ap";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- attoparsec base bytestring megaparsec parser-combinators process
- stm unordered-containers vector
+ attoparsec base binary bytestring containers file-embed megaparsec
+ MonadRandom o-clock parser-combinators prettyprinter process random
+ stm text unordered-containers vector
];
executableHaskellDepends = [
- attoparsec base bytestring haskeline megaparsec mtl
- parser-combinators process split stm unordered-containers vector
+ attoparsec base binary bytestring containers extra file-embed
+ haskeline megaparsec MonadRandom mtl o-clock optparse-applicative
+ parser-combinators prettyprinter process random stm text time
+ unordered-containers vector
];
testHaskellDepends = [
- attoparsec base bytestring directory megaparsec parallel
- parser-combinators process stm time unordered-containers vector
+ attoparsec base binary bytestring containers directory file-embed
+ megaparsec MonadRandom o-clock parallel parser-combinators
+ prettyprinter process random stm text time unordered-containers
+ vector
];
- description = "Basic chess move generation and UCI client library";
+ description = "Basic chess library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -49173,6 +49732,8 @@ self: {
pname = "chronos";
version = "1.0.5";
sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz";
+ revision = "3";
+ editedCabalFile = "13gjxvybjkgw0qs1vi45b7vs4d2lbh7l76kl8m99dd13dvvb49qf";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock hashable primitive
semigroups text torsor vector
@@ -50248,8 +50809,8 @@ self: {
}:
mkDerivation {
pname = "classify-frog";
- version = "0.2.4.1";
- sha256 = "1jw61n54g65s9chqmp58ikngzmrabg8s90ghsqvm2hjg8hbx4h7p";
+ version = "0.2.4.2";
+ sha256 = "1q1jr4q1a27wscznrkr04fxlaac2xp7l02rzspmf8bpkadfp3wfw";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -50384,8 +50945,6 @@ self: {
];
description = "Provide a classy prelude including common Yesod functionality";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"classyplate" = callPackage
@@ -50431,8 +50990,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks";
- version = "0.24.0.10";
- sha256 = "1jzbwfiyf0zigxf15c31ibmva7pxqdbkkp3l65s6gkcnq71isz6k";
+ version = "0.24.0.15";
+ sha256 = "1b9cjx4i196rdj1p4w243rk6pxk8h2fnwda9jadzj61nxz5sc3xv";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
@@ -50460,8 +51019,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-cli";
- version = "0.2.17.2";
- sha256 = "0anrbigkx4y4fz8bsm1vgypf4s0ypapqh0kjyrcnyrpvn3ar5d45";
+ version = "0.2.17.3";
+ sha256 = "1akbfin1avsdd3r4f65p034divl8i24g4h627frcdypkc25j8qgf";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -50532,8 +51091,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-plugin-ircbot";
- version = "0.6.17.3";
- sha256 = "1fk6jyjvkqs11khj8mriqbj56kz19ayhha3kq79cnhjm8c7184cb";
+ version = "0.6.17.5";
+ sha256 = "069dvpw4g61da7v9n9ygs3lsw4c68qph4iqy6c5l9kcrkww9s3pv";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
acid-state attoparsec base blaze-html bytestring clckwrks
@@ -50583,8 +51142,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-plugin-media";
- version = "0.6.16.5";
- sha256 = "1k20i500f28pb55618zv80hg94ip4g6vkbn6szp468m4f2z01j9r";
+ version = "0.6.16.6";
+ sha256 = "05gmr0y5ygsybmdp1k2xcfhbn7wix9mrwvwsv4x0has9l8xc92q1";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
acid-state attoparsec base blaze-html cereal clckwrks containers
@@ -50610,8 +51169,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-plugin-page";
- version = "0.4.3.15";
- sha256 = "0ks0dr5arc1kvyk1qhin153v77wi0p0hrpnp563g85scgdyl82bw";
+ version = "0.4.3.16";
+ sha256 = "15m1bhiyw5rzfx1y6yhra2d0zkiaffy9rvp408pb4ccfdxg4bi2s";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
acid-state aeson attoparsec base clckwrks containers directory
@@ -51011,6 +51570,18 @@ self: {
broken = true;
}) {};
+ "clisparkline" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "clisparkline";
+ version = "0.1.0.0";
+ sha256 = "1ldsjx6y74cspxy5c143zdww7pxa50pn59s4v2dd1iky1x2yrygc";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ description = "Tiny library to pretty print sparklines onto the CLI";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"clist" = callPackage
({ mkDerivation, base, natural-induction, peano }:
mkDerivation {
@@ -51960,6 +52531,8 @@ self: {
pname = "co-log";
version = "0.2.0";
sha256 = "1xd83srrm659nf2s2xrm3zjg6zhrmhvj6s6mwx4axrgvnxf2lbjr";
+ revision = "1";
+ editedCabalFile = "0np7g6sqm6iyjyrypwlgrz67n0vhasvgp1k6cwrcj2lnmvjcrmvl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -51970,6 +52543,38 @@ self: {
executableToolDepends = [ markdown-unlit ];
description = "Composable Contravariant Comonadic Logging Library";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "co-log_0_3_0_0" = callPackage
+ ({ mkDerivation, ansi-terminal, base, bytestring, chronos
+ , co-log-core, containers, contravariant, directory, filepath
+ , hedgehog, markdown-unlit, mtl, stm, text, transformers
+ , typerep-map
+ }:
+ mkDerivation {
+ pname = "co-log";
+ version = "0.3.0.0";
+ sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha";
+ revision = "2";
+ editedCabalFile = "12h6rgqgqd1wcm2ahl6b3wglsgq4ynjacrz9m0wkyry3k0jwzd8f";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base bytestring chronos co-log-core containers
+ contravariant directory filepath mtl stm text transformers
+ typerep-map
+ ];
+ executableHaskellDepends = [
+ base co-log-core mtl text typerep-map
+ ];
+ executableToolDepends = [ markdown-unlit ];
+ testHaskellDepends = [ base co-log-core hedgehog ];
+ description = "Composable Contravariant Comonadic Logging Library";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"co-log-core" = callPackage
@@ -51984,6 +52589,37 @@ self: {
license = stdenv.lib.licenses.mpl20;
}) {};
+ "co-log-core_0_2_0_0" = callPackage
+ ({ mkDerivation, base, doctest, Glob }:
+ mkDerivation {
+ pname = "co-log-core";
+ version = "0.2.0.0";
+ sha256 = "0q0vhk100qm6dfdfnbgg1mr07d1lzwbfkpkm0ivinfhaz2vnsr2j";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base doctest Glob ];
+ description = "Composable Contravariant Comonadic Logging Library";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "co-log-polysemy" = callPackage
+ ({ mkDerivation, base, co-log-core, polysemy }:
+ mkDerivation {
+ pname = "co-log-polysemy";
+ version = "0.0.0.0";
+ sha256 = "02kv0r3ijv410lv9wz40mw4vgv4fmhgrxwppz4l0p50wyra5vq04";
+ revision = "1";
+ editedCabalFile = "1ig0giws954lsrhkw4frwmh01fsghvhpkwpj975n5fxrnzy46xy5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base co-log-core polysemy ];
+ executableHaskellDepends = [ base co-log-core polysemy ];
+ description = "Composable Contravariant Comonadic Logging Library";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"co-log-sys" = callPackage
({ mkDerivation, aeson, base, co-log-core, fmt, microlens
, monad-control, mtl, network, universum, unix
@@ -52224,6 +52860,8 @@ self: {
];
description = "Graphics library for CodeWorld";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"codex" = callPackage
@@ -52644,17 +53282,22 @@ self: {
}) {};
"colonnade" = callPackage
- ({ mkDerivation, base, bytestring, contravariant, doctest
- , profunctors, text, vector
+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, contravariant
+ , doctest, fast-logger, profunctors, QuickCheck, semigroupoids
+ , semigroups, text, vector
}:
mkDerivation {
pname = "colonnade";
- version = "1.2.0.1";
- sha256 = "12ryrg42qgg1hnflz757fik1lrg51l9bg4145bb678y9c1ixisrj";
+ version = "1.2.0.2";
+ sha256 = "1asjx71gp26a15v7g3p8bfddb5nnzky6672c35xx35hq73mhykr4";
+ revision = "1";
+ editedCabalFile = "1aq72ri6labv8vsf6s3h8mkry4kiig9659lgdmrqr8ngyp7jwp69";
libraryHaskellDepends = [
- base bytestring contravariant profunctors text vector
+ base bytestring contravariant profunctors semigroups text vector
+ ];
+ testHaskellDepends = [
+ ansi-wl-pprint base doctest fast-logger QuickCheck semigroupoids
];
- testHaskellDepends = [ base doctest ];
description = "Generic types and functions for columnar encoding and decoding";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -52787,6 +53430,8 @@ self: {
pname = "colour";
version = "2.3.3";
sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
+ revision = "1";
+ editedCabalFile = "0r0pgrsbk4a3fp9pig7q1d8wrc6cd411gb58qiq3wd5dqw0lbmjk";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base ];
description = "A model for human colour/color perception";
@@ -52800,8 +53445,8 @@ self: {
}:
mkDerivation {
pname = "colour";
- version = "2.3.4";
- sha256 = "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg";
+ version = "2.3.5";
+ sha256 = "1rq4l46jx4lpdppy71wf7m1n7pw2jwy788rm35ycwzb1g4clg39v";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base ];
testHaskellDepends = [
@@ -52822,8 +53467,6 @@ self: {
libraryHaskellDepends = [ accelerate base ];
description = "Working with colours in Accelerate";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"colour-space" = callPackage
@@ -53128,19 +53771,23 @@ self: {
}) {};
"comfort-array" = callPackage
- ({ mkDerivation, base, containers, deepseq, guarded-allocation
- , non-empty, primitive, QuickCheck, storable-record, transformers
+ ({ mkDerivation, base, ChasingBottoms, containers, deepseq
+ , guarded-allocation, non-empty, prelude-compat, primitive
+ , QuickCheck, semigroups, storable-record, tagged, transformers
, utility-ht
}:
mkDerivation {
pname = "comfort-array";
- version = "0.3.1";
- sha256 = "1lbfx35v8qzi2wacqg47v6hw4kx2rxs5xml8mwb1fyqqxbzbv7n7";
+ version = "0.4";
+ sha256 = "0jvksvvslvg5wiqin5pd0q0q8a7snhfjh26a98mdakk8dziw1p1m";
libraryHaskellDepends = [
- base containers deepseq guarded-allocation non-empty primitive
- QuickCheck storable-record transformers utility-ht
+ base containers deepseq guarded-allocation non-empty prelude-compat
+ primitive QuickCheck semigroups storable-record tagged transformers
+ utility-ht
+ ];
+ testHaskellDepends = [
+ base ChasingBottoms containers QuickCheck tagged
];
- testHaskellDepends = [ base containers QuickCheck ];
description = "Arrays where the index type is a function of the shape type";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -53177,8 +53824,6 @@ self: {
];
description = "A format for describing comics";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"comma" = callPackage
@@ -53317,17 +53962,16 @@ self: {
"comonad" = callPackage
({ mkDerivation, base, Cabal, cabal-doctest, containers
- , contravariant, distributive, doctest, semigroups, tagged
- , transformers, transformers-compat
+ , distributive, doctest, tagged, transformers, transformers-compat
}:
mkDerivation {
pname = "comonad";
- version = "5.0.4";
- sha256 = "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q";
+ version = "5.0.5";
+ sha256 = "1l7snp2mszgnjgd0nc9kzfyd13vla0rlazqi03rwx2akcxk14n3c";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
- base containers contravariant distributive semigroups tagged
- transformers transformers-compat
+ base containers distributive tagged transformers
+ transformers-compat
];
testHaskellDepends = [ base doctest ];
description = "Comonads";
@@ -54523,8 +55167,6 @@ self: {
];
description = "Benchmarks to compare concurrency APIs";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"concurrent-barrier" = callPackage
@@ -54650,6 +55292,23 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "concurrent-output_1_10_10" = callPackage
+ ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+ , process, stm, terminal-size, text, transformers, unix
+ }:
+ mkDerivation {
+ pname = "concurrent-output";
+ version = "1.10.10";
+ sha256 = "1wnjxnwbc3l853kiiijagzjyb6fmhz3lmkwls24plbximl1qrr22";
+ libraryHaskellDepends = [
+ ansi-terminal async base directory exceptions process stm
+ terminal-size text transformers unix
+ ];
+ description = "Ungarble output from several threads or commands";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"concurrent-rpc" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -54912,8 +55571,8 @@ self: {
}:
mkDerivation {
pname = "conduit-algorithms";
- version = "0.0.9.0";
- sha256 = "1d2d9ak3mn77lklxr80xw9xpay31f71h5hd66mgrixk48bfr9p8i";
+ version = "0.0.10.1";
+ sha256 = "0lil9krb1gj4lckyfqlf9jmdb21n3wrf00kiiwcv1qc277p39z6y";
libraryHaskellDepends = [
async base bytestring bzlib-conduit conduit conduit-combinators
conduit-extra conduit-zstd containers deepseq exceptions
@@ -54935,8 +55594,6 @@ self: {
];
description = "Conduit-based algorithms";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"conduit-audio" = callPackage
@@ -55047,8 +55704,8 @@ self: {
}:
mkDerivation {
pname = "conduit-connection";
- version = "0.1.0.4";
- sha256 = "1z11r3rf6hmz5b00w4xymp6x0s00acyvbyw6n99wd3b9ycbl2y2y";
+ version = "0.1.0.5";
+ sha256 = "0mvsvxfps6pnlanl5zx7cz6qxpn907qgx5bcl18vb9vhn8frh0m6";
libraryHaskellDepends = [
base bytestring conduit connection resourcet transformers
];
@@ -55071,8 +55728,8 @@ self: {
pname = "conduit-extra";
version = "1.2.3.2";
sha256 = "1xihl8zrd6jyfnlmsrqshwwqc8176whs5im4jvxvk9038wl6cnqx";
- revision = "2";
- editedCabalFile = "0x77alx5h3v07ra0l0l5b36rx5qb3vg2f5k711yvin1q40vwvhqg";
+ revision = "3";
+ editedCabalFile = "0m68hvcmg4wwn12wcczqx1i60i8g2nv95c05abnl8ymq0377c7wi";
libraryHaskellDepends = [
async attoparsec base blaze-builder bytestring conduit directory
exceptions filepath monad-control network primitive process
@@ -55102,8 +55759,8 @@ self: {
}:
mkDerivation {
pname = "conduit-extra";
- version = "1.3.1.1";
- sha256 = "0jaj350vv6mbb26gdwcqz4gwzfzrjydv5pis2da49wz1npbakcfw";
+ version = "1.3.3";
+ sha256 = "037k62w01iskzkg0mw4rk8dp2szshzwskgsc3shffhbkqk654ksm";
libraryHaskellDepends = [
async attoparsec base bytestring conduit directory filepath network
primitive process resourcet stm streaming-commons text transformers
@@ -55121,6 +55778,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "conduit-extra_1_3_4" = callPackage
+ ({ mkDerivation, async, attoparsec, base, bytestring
+ , bytestring-builder, conduit, directory, exceptions, filepath
+ , gauge, hspec, network, primitive, process, QuickCheck, resourcet
+ , stm, streaming-commons, text, transformers, transformers-base
+ , typed-process, unliftio-core
+ }:
+ mkDerivation {
+ pname = "conduit-extra";
+ version = "1.3.4";
+ sha256 = "1d853d39vj5pb8yxfcsnjwdzqzkm34ixzbnba8bslpihb7182wxi";
+ libraryHaskellDepends = [
+ async attoparsec base bytestring conduit directory filepath network
+ primitive process resourcet stm streaming-commons text transformers
+ typed-process unliftio-core
+ ];
+ testHaskellDepends = [
+ async attoparsec base bytestring bytestring-builder conduit
+ directory exceptions filepath hspec process QuickCheck resourcet
+ stm streaming-commons text transformers transformers-base
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring bytestring-builder conduit gauge transformers
+ ];
+ description = "Batteries included conduit: adapters for common libraries";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"conduit-find" = callPackage
({ mkDerivation, attoparsec, base, conduit, conduit-combinators
, conduit-extra, directory, doctest, either, exceptions, filepath
@@ -55181,13 +55867,11 @@ self: {
({ mkDerivation, base, conduit, mtl }:
mkDerivation {
pname = "conduit-merge";
- version = "0.1.2.0";
- sha256 = "07nfq13cqn8mwnkdkrn96mpw479ynfb261w1mx2w6yacmwq2ycsd";
+ version = "0.1.3.0";
+ sha256 = "0ys65vs5wb412bimmsmkmf14krk2339n9rswynnwy3rdb74bsswf";
libraryHaskellDepends = [ base conduit mtl ];
description = "Merge multiple sorted conduits";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"conduit-network-stream" = callPackage
@@ -55293,6 +55977,56 @@ self: {
broken = true;
}) {};
+ "conduit-vfs" = callPackage
+ ({ mkDerivation, base, bytestring, classy-prelude, conduit
+ , conduit-extra, directory, exceptions, extra, filepath
+ , monad-loops, mono-traversable, mtl, resourcet, text, transformers
+ , unix, unliftio, unordered-containers
+ }:
+ mkDerivation {
+ pname = "conduit-vfs";
+ version = "0.1.0.3";
+ sha256 = "1nsq4s0cxag6drynkfl79q0lirh37r3l59nzhkdyjlak4bzq5g1f";
+ libraryHaskellDepends = [
+ base bytestring classy-prelude conduit conduit-extra directory
+ exceptions extra filepath monad-loops mono-traversable mtl
+ resourcet text transformers unix unliftio unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring classy-prelude conduit conduit-extra directory
+ exceptions extra filepath monad-loops mono-traversable mtl
+ resourcet text transformers unix unliftio unordered-containers
+ ];
+ description = "Virtual file system for Conduit; disk, pure, and in-memory impls";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "conduit-vfs-zip" = callPackage
+ ({ mkDerivation, base, bytestring, classy-prelude, conduit
+ , conduit-extra, conduit-vfs, directory, exceptions, extra
+ , filepath, monad-loops, mono-traversable, mtl, resourcet, text
+ , transformers, unix, unliftio, unordered-containers, zip-archive
+ }:
+ mkDerivation {
+ pname = "conduit-vfs-zip";
+ version = "0.1.0.1";
+ sha256 = "07c2r03if3bminakcf4z7k990c8nf94w3q41csrzd4zy3qk0acr5";
+ libraryHaskellDepends = [
+ base bytestring classy-prelude conduit conduit-extra conduit-vfs
+ directory exceptions extra filepath monad-loops mono-traversable
+ mtl resourcet text transformers unix unliftio unordered-containers
+ zip-archive
+ ];
+ testHaskellDepends = [
+ base bytestring classy-prelude conduit conduit-extra conduit-vfs
+ directory exceptions extra filepath monad-loops mono-traversable
+ mtl resourcet text transformers unix unliftio unordered-containers
+ zip-archive
+ ];
+ description = "Zip archive interface for the Conduit Virtual File System";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"conduit-zstd" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-combinators
, conduit-extra, directory, HUnit, test-framework
@@ -55309,8 +56043,6 @@ self: {
];
description = "Conduit-based ZStd Compression";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"conf" = callPackage
@@ -55382,7 +56114,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "confcrypt_0_2_3_0" = callPackage
+ "confcrypt_0_2_3_3" = callPackage
({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring
, bytestring, conduit, containers, crypto-pubkey-openssh
, crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec
@@ -55391,8 +56123,8 @@ self: {
}:
mkDerivation {
pname = "confcrypt";
- version = "0.2.3.0";
- sha256 = "1pqgh5jhnf18mfhhq8z39l2kv5pn11zw9zqxb30r75l5qhqvjjic";
+ version = "0.2.3.3";
+ sha256 = "18z0p9bd2ca43a64k3idsywm2f1vv6qh03l8isgnahjh7j96ngih";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -55533,10 +56265,8 @@ self: {
}:
mkDerivation {
pname = "config-schema";
- version = "0.5.0.1";
- sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp";
- revision = "3";
- editedCabalFile = "102mwr18aas924hlxsyyx5pi8skkb2misic1h95f6khpz7wcy3vy";
+ version = "1.1.0.0";
+ sha256 = "1nr1jyrgvvm1zlzvlfpz35zb5iydn1mpk89kljp0h1cvkl35mjkl";
libraryHaskellDepends = [
base config-value containers free kan-extensions pretty
semigroupoids text transformers
@@ -55639,14 +56369,14 @@ self: {
, case-insensitive, connection, data-default, deepseq, directory
, dlist, enclosed-exceptions, filepath, http-client
, http-client-tls, http-types, monad-control, mtl, network-uri
- , optparse-applicative, process, profunctors, semigroups, text, tls
- , transformers, unordered-containers, wai, warp, warp-tls, x509
- , x509-system, x509-validation, yaml
+ , optparse-applicative, process, profunctors, semigroupoids
+ , semigroups, text, tls, transformers, unordered-containers, wai
+ , warp, warp-tls, x509, x509-system, x509-validation, yaml
}:
mkDerivation {
pname = "configuration-tools";
- version = "0.4.0";
- sha256 = "0bsxvbdhcgrhz9dm32bs5fb7ywdjb68xii74wdli4s0axs4q5dpx";
+ version = "0.4.1";
+ sha256 = "1c6yk6516v4ld8rmhwg4s4f3s6k40gx3dsqfrl2y9lcx3477nlj8";
setupHaskellDepends = [
base bytestring Cabal directory filepath process
];
@@ -55655,9 +56385,9 @@ self: {
base64-bytestring bytestring Cabal case-insensitive connection
data-default deepseq directory dlist enclosed-exceptions filepath
http-client http-client-tls http-types monad-control mtl
- network-uri optparse-applicative process profunctors semigroups
- text tls transformers unordered-containers x509 x509-system
- x509-validation yaml
+ network-uri optparse-applicative process profunctors semigroupoids
+ semigroups text tls transformers unordered-containers x509
+ x509-system x509-validation yaml
];
testHaskellDepends = [
base base-unicode-symbols bytestring Cabal enclosed-exceptions
@@ -55732,6 +56462,26 @@ self: {
broken = true;
}) {};
+ "configurator-pg" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, filepath
+ , HUnit, protolude, scientific, test-framework
+ , test-framework-hunit, text
+ }:
+ mkDerivation {
+ pname = "configurator-pg";
+ version = "0.1.0.3";
+ sha256 = "0fc77ihnablff8v0kgr88pcc3rn41ca14bvfxr21jx807fn8g63p";
+ libraryHaskellDepends = [
+ attoparsec base containers protolude scientific text
+ ];
+ testHaskellDepends = [
+ base bytestring filepath HUnit protolude test-framework
+ test-framework-hunit text
+ ];
+ description = "Reduced parser for configurator-ng config files";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"confsolve" = callPackage
({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio
, system-filepath, text, time, unordered-containers
@@ -55939,8 +56689,6 @@ self: {
];
description = "Interpret the command line and a config file as commands and options";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"console-prompt" = callPackage
@@ -55991,14 +56739,20 @@ self: {
}) {};
"constrained-categories" = callPackage
- ({ mkDerivation, base, semigroups, tagged, void }:
+ ({ mkDerivation, base, contravariant, semigroups, tagged
+ , trivial-constraint, void
+ }:
mkDerivation {
pname = "constrained-categories";
- version = "0.3.1.1";
- sha256 = "00h8pw0pqj7lmngwzmz27lmvglpidgxhhxrdf275s49cdnkf8cvk";
- libraryHaskellDepends = [ base semigroups tagged void ];
+ version = "0.4.0.0";
+ sha256 = "1wq4ivkgxbwxxrfk5lwn2psbbiaq87dr8zf1z9b9yhw2hi75lsgw";
+ libraryHaskellDepends = [
+ base contravariant semigroups tagged trivial-constraint void
+ ];
description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"constrained-category" = callPackage
@@ -56131,6 +56885,27 @@ self: {
pname = "constraints";
version = "0.10.1";
sha256 = "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q";
+ revision = "1";
+ editedCabalFile = "1i2rd805mjz5q7s98ryy1m91zd4b9hx92gw1rwr6kpibqqw9smcb";
+ libraryHaskellDepends = [
+ base binary deepseq ghc-prim hashable mtl semigroups transformers
+ transformers-compat
+ ];
+ testHaskellDepends = [ base hspec ];
+ testToolDepends = [ hspec-discover ];
+ description = "Constraint manipulation";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
+ "constraints_0_11" = callPackage
+ ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
+ , hspec-discover, mtl, semigroups, transformers
+ , transformers-compat
+ }:
+ mkDerivation {
+ pname = "constraints";
+ version = "0.11";
+ sha256 = "1ik97w6ci9kw5ppw9nmh65j6ldqq2az8c37jlg3h5x3prn2cds1d";
libraryHaskellDepends = [
base binary deepseq ghc-prim hashable mtl semigroups transformers
transformers-compat
@@ -56139,6 +56914,7 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Constraint manipulation";
license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"constraints-deriving" = callPackage
@@ -56147,8 +56923,8 @@ self: {
}:
mkDerivation {
pname = "constraints-deriving";
- version = "1.0.1.1";
- sha256 = "08dggdvl4qgx376vh037ss2blha4x7qmf0xh0fjx4m4ljabg3k4f";
+ version = "1.0.4.0";
+ sha256 = "1a78bb8gld07g5m9lwg6phdx3i87pmlk47hic2vbpi9n68kl055v";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal ];
@@ -56158,8 +56934,6 @@ self: {
];
description = "Manipulating constraints and deriving class instances programmatically";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"constraints-emerge" = callPackage
@@ -56181,22 +56955,17 @@ self: {
}) {};
"constraints-extras" = callPackage
- ({ mkDerivation, aeson, base, constraints, markdown-unlit
- , template-haskell
- }:
+ ({ mkDerivation, aeson, base, constraints, template-haskell }:
mkDerivation {
pname = "constraints-extras";
- version = "0.2.3.4";
- sha256 = "1xkivpkjgnnrs5fyg0g77f84zh3sxqgxif0l2rhcq1wdad709q55";
+ version = "0.3.0.1";
+ sha256 = "0majx5yrddpyvymfl84dqwrqf4bf91jskgaki4ia0h8vhzqfcivx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base constraints template-haskell ];
executableHaskellDepends = [ aeson base constraints ];
- executableToolDepends = [ markdown-unlit ];
description = "Utility package for constraints";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"constrictor" = callPackage
@@ -56271,8 +57040,8 @@ self: {
}:
mkDerivation {
pname = "consumers";
- version = "2.2.0.0";
- sha256 = "0r7v5gfi7lw19h9chhn80fwnlgph5ak6n1vf153gq6l7bm10hacl";
+ version = "2.2.0.1";
+ sha256 = "14gs07nl759qfnmi44pyhj24xqmd2xl3ikwhl8s5zykavdpjaimx";
libraryHaskellDepends = [
base containers exceptions extra hpqtypes lifted-base
lifted-threads log-base monad-control monad-time mtl stm time
@@ -56338,24 +57107,13 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "containers_0_6_0_1" = callPackage
- ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq
- , ghc-prim, HUnit, QuickCheck, random, test-framework
- , test-framework-hunit, test-framework-quickcheck2, transformers
- }:
+ "containers_0_6_2_1" = callPackage
+ ({ mkDerivation, array, base, deepseq }:
mkDerivation {
pname = "containers";
- version = "0.6.0.1";
- sha256 = "0smc1g58l968jxcjxhxcd4qpfm4zk7zr6r4q6wf6ay75av9rf4d7";
- libraryHaskellDepends = [ array base deepseq ghc-prim ];
- testHaskellDepends = [
- array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
- transformers
- ];
- benchmarkHaskellDepends = [
- base criterion deepseq ghc-prim random transformers
- ];
+ version = "0.6.2.1";
+ sha256 = "05h0sc70xy4jm0hvzv0pnqy1sbi61f73whawk46jwcjzyfa5f30k";
+ libraryHaskellDepends = [ array base deepseq ];
description = "Assorted concrete container types";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -56482,14 +57240,23 @@ self: {
}) {};
"contiguous" = callPackage
- ({ mkDerivation, base, deepseq, primitive }:
+ ({ mkDerivation, base, deepseq, primitive, primitive-unlifted
+ , QuickCheck, quickcheck-instances, vector
+ }:
mkDerivation {
pname = "contiguous";
- version = "0.3.3.0";
- sha256 = "0hpglbbydyi46rw0jybb87g4wsc5qp4vnswijznav90j8sl34lhc";
- libraryHaskellDepends = [ base deepseq primitive ];
+ version = "0.4.0.1";
+ sha256 = "1hs9jvl9zzy7jdbxna0aw8nbq3af327xfgb0cgzwmp55iwpjn9rn";
+ libraryHaskellDepends = [
+ base deepseq primitive primitive-unlifted
+ ];
+ testHaskellDepends = [
+ base primitive QuickCheck quickcheck-instances vector
+ ];
description = "Unified interface for primitive arrays";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"contiguous-checked" = callPackage
@@ -56501,6 +57268,8 @@ self: {
libraryHaskellDepends = [ base contiguous primitive ];
description = "contiguous with bounds checks";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"contiguous-fft" = callPackage
@@ -56602,8 +57371,8 @@ self: {
({ mkDerivation, base, StateVar, transformers }:
mkDerivation {
pname = "contravariant";
- version = "1.5";
- sha256 = "1hn31wl0jai2jrwc6cz19aflbv9xbyl3m5ab57zzysddjav6gw3f";
+ version = "1.5.2";
+ sha256 = "0366gl62wwwdbl9i6kqy60asf60876k55v91la6bmhnwwcj2q9n4";
libraryHaskellDepends = [ base StateVar transformers ];
description = "Contravariant functors";
license = stdenv.lib.licenses.bsd3;
@@ -56685,13 +57454,12 @@ self: {
({ mkDerivation, base, containers, stm, time }:
mkDerivation {
pname = "control-event";
- version = "1.2.1.1";
- sha256 = "0hwsidsxnzi4b3aphn3f7lsf1z508ql6cnhfq6zbqfsvcynm7565";
+ version = "1.3";
+ sha256 = "1a48h7nna7padcffdfyaavhfl43lqfhvib5ddsxbqm7y99nylni6";
libraryHaskellDepends = [ base containers stm time ];
+ testHaskellDepends = [ base containers stm time ];
description = "Event scheduling system";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"control-iso" = callPackage
@@ -57151,8 +57919,6 @@ self: {
];
description = "A stream DSL for writing embedded C programs";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"copilot-c99" = callPackage
@@ -57162,16 +57928,14 @@ self: {
}:
mkDerivation {
pname = "copilot-c99";
- version = "3.0.1";
- sha256 = "11vrin2d0zfqzn3c9ikn1ra76m2083nlrk3l8j4hk0pnssy9kjvp";
+ version = "3.0.2";
+ sha256 = "02987kxwsrxcjicgfnj55prabiv12y5d1s82nr34kk3scrlixl1y";
libraryHaskellDepends = [
base containers copilot-core directory filepath language-c99
language-c99-simple language-c99-util mtl pretty
];
description = "A compiler for Copilot targeting C99";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"copilot-cbmc" = callPackage
@@ -57203,8 +57967,6 @@ self: {
];
description = "An intermediate representation for Copilot";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"copilot-language" = callPackage
@@ -57221,8 +57983,6 @@ self: {
];
description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"copilot-libraries" = callPackage
@@ -57238,8 +57998,6 @@ self: {
];
description = "Libraries for the Copilot language";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"copilot-sbv" = callPackage
@@ -57274,8 +58032,6 @@ self: {
];
description = "k-induction for Copilot";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"copr" = callPackage
@@ -57646,8 +58402,8 @@ self: {
pname = "country";
version = "0.1.6";
sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9";
- revision = "1";
- editedCabalFile = "04a2s0zlm4garihnm3xl9avf88vjnbvpsyb2ckk3z7ydjq0y3938";
+ revision = "3";
+ editedCabalFile = "034cd94hiwgci0qhkdkkqmx2igmf1wxmd4b70g6sdlk1kklcn7x1";
libraryHaskellDepends = [
aeson attoparsec base bytestring deepseq ghc-prim hashable
primitive scientific text unordered-containers
@@ -57790,25 +58546,23 @@ self: {
"cpkg" = callPackage
({ mkDerivation, base, binary, bytestring, bzlib, containers, cpphs
- , dhall, directory, filemanip, filepath, hashable, hspec
- , hspec-megaparsec, http-client, http-client-tls, libarchive, lzma
- , megaparsec, microlens, mtl, network-uri, optparse-applicative
- , prettyprinter, process, recursion, tar, temporary, text
- , zip-archive, zlib
+ , dhall, dir-traverse, directory, filemanip, filepath, hashable
+ , hspec, hspec-megaparsec, http-client, http-client-tls, libarchive
+ , lzma, megaparsec, microlens, mtl, network-uri
+ , optparse-applicative, prettyprinter, process, recursion, tar
+ , temporary, text, zip-archive, zlib
}:
mkDerivation {
pname = "cpkg";
- version = "0.1.3.1";
- sha256 = "1myivznx5p2c8zw5frvp9drj7gidanq39r7lh11xyxg4rsw1y89n";
- revision = "1";
- editedCabalFile = "1ww05lik01k44xfrmjjs542qd66afisx6gglwqsylil86hjbs6gp";
+ version = "0.2.1.0";
+ sha256 = "0wwfdw4qvgf25zych8pvknx99pr4zrxknyi80laqx7b7w5l0rnvc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base binary bytestring bzlib containers dhall directory filemanip
- filepath hashable http-client http-client-tls libarchive lzma
- megaparsec microlens mtl network-uri prettyprinter process
- recursion tar temporary text zip-archive zlib
+ base binary bytestring bzlib containers dhall dir-traverse
+ directory filemanip filepath hashable http-client http-client-tls
+ libarchive lzma megaparsec microlens mtl network-uri prettyprinter
+ process recursion tar temporary text zip-archive zlib
];
libraryToolDepends = [ cpphs ];
executableHaskellDepends = [
@@ -57817,6 +58571,8 @@ self: {
testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
description = "Build tool for C";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"cplex-hs" = callPackage
@@ -58746,8 +59502,8 @@ self: {
}:
mkDerivation {
pname = "criterion";
- version = "1.5.4.0";
- sha256 = "1yh4dk4hi6d3jz2jmn8jc9i6jqb02w63g2rq3aagi16qfyanlqbg";
+ version = "1.5.5.0";
+ sha256 = "1a5i9ghy4hr3355ml4b0rc3b94fa2ijfflh398ncn9sw1ivmx8pa";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -59569,8 +60325,8 @@ self: {
pname = "cryptoids";
version = "0.5.1.0";
sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466";
- revision = "3";
- editedCabalFile = "0pjdc90i3qyzxc289kjvn90hnn5xjjzjpgnb24iwqj6ik9asi86g";
+ revision = "4";
+ editedCabalFile = "017fm7rcls5z2sjx4117h9bcc0szh2vs89gj2d8510vajq70yvwq";
libraryHaskellDepends = [
base binary bytestring cryptoids-class cryptoids-types cryptonite
directory exceptions filepath memory
@@ -59600,8 +60356,8 @@ self: {
pname = "cryptoids-types";
version = "1.0.0";
sha256 = "0dhv92hdydhhgwgdihl3wpiyxl10szrgfnb68ygn07xxhmmfc3hf";
- revision = "1";
- editedCabalFile = "0fy6fxzaimgi0nrplzdgi0s26cjz2nrv7y5gdnk0z6k3jd1x5qgb";
+ revision = "2";
+ editedCabalFile = "0nszxjdf9zd7dh4ar2vbnjs8a5awbqh2m3p0pvsypgiflcrlp9wn";
libraryHaskellDepends = [
aeson base binary deepseq hashable http-api-data path-pieces
];
@@ -59664,6 +60420,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cryptonite_0_26" = callPackage
+ ({ mkDerivation, base, basement, bytestring, deepseq, gauge
+ , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
+ , tasty-kat, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "cryptonite";
+ version = "0.26";
+ sha256 = "1pdf0zzbfr0cdzls6bab6f6kpx08wa8c2qc1zfqzv5ajapgr0wy4";
+ libraryHaskellDepends = [
+ base basement bytestring deepseq ghc-prim integer-gmp memory
+ ];
+ testHaskellDepends = [
+ base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring deepseq gauge memory random
+ ];
+ description = "Cryptography Primitives sink";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cryptonite-conduit" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-combinators
, conduit-extra, cryptonite, exceptions, memory, resourcet, tasty
@@ -59837,8 +60616,6 @@ self: {
];
description = "a gallery of Csound instruments";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"csound-expression" = callPackage
@@ -60153,6 +60930,8 @@ self: {
pname = "ctpl";
version = "0.1.0.4";
sha256 = "03vcy5qb4wg1wpqcpnr33nwfmyfq3fk01ga3vawh6alppingbvi9";
+ revision = "1";
+ editedCabalFile = "02wisimqzgjbpaw95fvmwqq97bh3zix710k672gcdbkqsx9x06kn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base chatty-text chatty-utils ];
@@ -60333,26 +61112,6 @@ self: {
}) {};
"cuda" = callPackage
- ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
- , pretty, template-haskell, uuid-types
- }:
- mkDerivation {
- pname = "cuda";
- version = "0.10.0.0";
- sha256 = "17l482fnackx4081mxax0dx0bsaqbbg4rxy4zmi5iv5q6f6v37x7";
- isLibrary = true;
- isExecutable = true;
- setupHaskellDepends = [ base Cabal directory filepath ];
- libraryHaskellDepends = [
- base bytestring filepath template-haskell uuid-types
- ];
- libraryToolDepends = [ c2hs ];
- executableHaskellDepends = [ base pretty ];
- description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cuda_0_10_1_0" = callPackage
({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
, pretty, template-haskell, uuid-types
}:
@@ -60372,7 +61131,6 @@ self: {
executableHaskellDepends = [ base pretty ];
description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cudd" = callPackage
@@ -60494,8 +61252,6 @@ self: {
testHaskellDepends = [ base directory hspec hspec-expectations ];
description = "A framework for declaratively writing curl based API tests";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"curlhs" = callPackage
@@ -60879,8 +61635,6 @@ self: {
];
description = "A subfield of the complex numbers for exact calculation";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"cypher" = callPackage
@@ -60908,8 +61662,8 @@ self: {
({ mkDerivation, base, template-haskell, transformers }:
mkDerivation {
pname = "czipwith";
- version = "1.0.1.1";
- sha256 = "0hs296mwx62alp9fkpkhw9jsjqlygagvb911nx22b0pgyiwqa52a";
+ version = "1.0.1.2";
+ sha256 = "17zf2blgjp47dahjcprkpymg9kb1ll6386pkr109gjr78f261gs1";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base transformers ];
description = "CZipWith class and deriving via TH";
@@ -61565,6 +62319,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "data-accessor_0_2_3" = callPackage
+ ({ mkDerivation, array, base, containers, transformers }:
+ mkDerivation {
+ pname = "data-accessor";
+ version = "0.2.3";
+ sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x";
+ libraryHaskellDepends = [ array base containers transformers ];
+ description = "Utilities for accessing and manipulating fields of records";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"data-accessor-monadLib" = callPackage
({ mkDerivation, base, data-accessor, monadLib }:
mkDerivation {
@@ -61787,6 +62553,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "data-combinator-gen" = callPackage
+ ({ mkDerivation, base, template-haskell }:
+ mkDerivation {
+ pname = "data-combinator-gen";
+ version = "0.1.0.4";
+ sha256 = "0f1qw5rk9x3yd7nfhkwmpig7a6dc46yzl78fi8aaxpwqbsazpkjy";
+ libraryHaskellDepends = [ base template-haskell ];
+ description = "Generate a special combinator from any data type";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"data-compat" = callPackage
({ mkDerivation, base, constraints }:
mkDerivation {
@@ -62473,8 +63250,6 @@ self: {
];
description = "Interval datatype, interval arithmetic and interval-based containers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"data-inttrie" = callPackage
@@ -63306,8 +64081,8 @@ self: {
}:
mkDerivation {
pname = "datadog";
- version = "0.2.3.0";
- sha256 = "0d0rbi269hc0bq4asww69pfw4gf0z3p9ji3iw1h129h4qyhyvdcv";
+ version = "0.2.4.0";
+ sha256 = "063avwbrrv6g1icw6fl7yv04izlmh6wcpngxdzzjz1qqmirb8qn4";
libraryHaskellDepends = [
aeson auto-update base buffer-builder bytestring containers dlist
http-client http-client-tls http-types lens lifted-base
@@ -63328,31 +64103,31 @@ self: {
"datadog-tracing" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, data-default
- , ffunctor, generic-random, hspec-golden-aeson, http-media, msgpack
- , mtl, prettyprinter, QuickCheck, quickcheck-text, refined
- , scientific, servant, servant-client, servant-server, tasty
- , tasty-discover, tasty-hspec, text, time, unordered-containers
- , vector, wai-extra, warp
+ , ffunctor, generic-random, hspec-golden-aeson, http-media
+ , jaeger-flamegraph, msgpack, mtl, prettyprinter, QuickCheck
+ , quickcheck-text, refined, scientific, servant, servant-client
+ , servant-server, tasty, tasty-discover, tasty-hspec, text, time
+ , unordered-containers, vector, wai-extra, warp
}:
mkDerivation {
pname = "datadog-tracing";
- version = "1.4.2";
- sha256 = "1yrig10a38sy6zkj18snqiv4r7b1gd16xk3ni9jm8vn7ls7niwcc";
+ version = "1.5.1";
+ sha256 = "1jjgavp9winbl2gyix61y30myvzhvzb500l2zwcb087cqzy7z6nb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring containers ffunctor generic-random http-media
- msgpack mtl prettyprinter QuickCheck quickcheck-text refined
- scientific servant servant-client text time unordered-containers
- vector
+ jaeger-flamegraph msgpack mtl prettyprinter QuickCheck
+ quickcheck-text refined scientific servant servant-client text time
+ unordered-containers vector
];
executableHaskellDepends = [
- aeson base bytestring containers data-default mtl servant
- servant-server text wai-extra warp
+ aeson base bytestring containers data-default jaeger-flamegraph mtl
+ servant servant-server text wai-extra warp
];
testHaskellDepends = [
- aeson base bytestring containers hspec-golden-aeson mtl servant
- tasty tasty-hspec text
+ aeson base bytestring containers hspec-golden-aeson
+ jaeger-flamegraph mtl servant tasty tasty-hspec text
];
testToolDepends = [ tasty-discover ];
description = "Datadog tracing client and mock agent";
@@ -63569,16 +64344,17 @@ self: {
}) {};
"dates" = callPackage
- ({ mkDerivation, base, base-unicode-symbols, parsec, syb, time }:
+ ({ mkDerivation, base, base-unicode-symbols, hspec, parsec, syb
+ , time
+ }:
mkDerivation {
pname = "dates";
- version = "0.2.2.2";
- sha256 = "1vsjd3wwvg90yvj7g9921dz1b4j48h539jxapix319wkp0krk5cl";
- revision = "1";
- editedCabalFile = "1rm3s52hnrq1dgbslvilc7543k6z6fv109rn4ixwfi1wqfs1id8w";
+ version = "0.2.3.0";
+ sha256 = "1l9df5815gb8lxgl1kmsn4q58qrjqii5b957z5gn4hk5cjnr456k";
libraryHaskellDepends = [
base base-unicode-symbols parsec syb time
];
+ testHaskellDepends = [ base hspec ];
description = "Small library for parsing different dates formats";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -63870,8 +64646,35 @@ self: {
}:
mkDerivation {
pname = "dbus";
- version = "1.2.6";
- sha256 = "0qqa6ch7113fygrx0fl3xr1lr8hik6c4y2r05q36pzaknhxsywgl";
+ version = "1.2.7";
+ sha256 = "0ypkjlw9fn65g7p28kb3p82glk7qs7p7vyffccw7qxa3z57s12w5";
+ libraryHaskellDepends = [
+ base bytestring cereal conduit containers deepseq exceptions
+ filepath lens network parsec random split template-haskell text
+ th-lift transformers unix vector xml-conduit xml-types
+ ];
+ testHaskellDepends = [
+ base bytestring cereal containers directory extra filepath network
+ parsec process QuickCheck random resourcet tasty tasty-hunit
+ tasty-quickcheck text transformers unix vector
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ doCheck = false;
+ description = "A client library for the D-Bus IPC system";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
+ "dbus_1_2_8" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, conduit, containers
+ , criterion, deepseq, directory, exceptions, extra, filepath, lens
+ , network, parsec, process, QuickCheck, random, resourcet, split
+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+ , th-lift, transformers, unix, vector, xml-conduit, xml-types
+ }:
+ mkDerivation {
+ pname = "dbus";
+ version = "1.2.8";
+ sha256 = "1jk43ngc9z6wq5idhnzmvjy3psdvivzcpva62x83c6fnb10vg25f";
libraryHaskellDepends = [
base bytestring cereal conduit containers deepseq exceptions
filepath lens network parsec random split template-haskell text
@@ -63886,6 +64689,7 @@ self: {
doCheck = false;
description = "A client library for the D-Bus IPC system";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dbus-client" = callPackage
@@ -64533,6 +65337,8 @@ self: {
];
description = "Simple trace-based debugger";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"debug-diff" = callPackage
@@ -64546,6 +65352,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "debug-dump" = callPackage
+ ({ mkDerivation, base, bytestring, directory, random, text }:
+ mkDerivation {
+ pname = "debug-dump";
+ version = "0.1.1.0";
+ sha256 = "0il889gy8fdi1yxm7f1nmj4s5gxqyq35jm8p5fax6yhj6lmyciwl";
+ libraryHaskellDepends = [ base bytestring directory random text ];
+ description = "File-based debug output";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"debug-me" = callPackage
({ mkDerivation, aeson, async, base, bytestring, Cabal, cereal
, containers, cryptonite, directory, filepath, graphviz
@@ -64645,6 +65462,17 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "dec" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "dec";
+ version = "0.0.3";
+ sha256 = "1y8bvlm2371dq2v0jv1srki98nbhbz091wh0g2x58wz78h971f6r";
+ libraryHaskellDepends = [ base ];
+ description = "Decidable propositions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"decepticons" = callPackage
({ mkDerivation, base, comonad-transformers }:
mkDerivation {
@@ -64838,6 +65666,8 @@ self: {
pname = "deepseq";
version = "1.4.4.0";
sha256 = "09kfpmgl679l74b6dadia11pvhya9ik4wrd8x76cgkxk7gwcbkrc";
+ revision = "1";
+ editedCabalFile = "0mbby1hig605jyiyy4m2y2nnjjf5i2adzc6x269hbz4pxscjp43n";
libraryHaskellDepends = [ array base ];
testHaskellDepends = [
array base ghc-prim HUnit test-framework test-framework-hunit
@@ -64951,8 +65781,8 @@ self: {
}:
mkDerivation {
pname = "deferred-folds";
- version = "0.9.10";
- sha256 = "0rvb7cv45xs087jrm4dmv9ajyx5kfs8n01cclc7msfg90fcs60fx";
+ version = "0.9.10.1";
+ sha256 = "15lwcc7i7wmi1gkkmak677qw0fnz4a4ldnv842xaimfi64753shv";
libraryHaskellDepends = [
base bytestring containers foldl hashable primitive transformers
unordered-containers vector
@@ -65628,14 +66458,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "deque_0_4_2_1" = callPackage
+ "deque_0_4_2_3" = callPackage
({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances
, rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck
}:
mkDerivation {
pname = "deque";
- version = "0.4.2.1";
- sha256 = "0w7d2z43flj739l3qd5vkn4bcz1ci3f24g92ky33z2gvkfiwvw9x";
+ version = "0.4.2.3";
+ sha256 = "18j4pqqn65nh4wp3fkw4bd10x1gxnv5zfkzan02fqvdg1ljk9sq0";
libraryHaskellDepends = [ base mtl strict-list ];
testHaskellDepends = [
QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -65866,8 +66696,8 @@ self: {
}:
mkDerivation {
pname = "deriving-compat";
- version = "0.5.5";
- sha256 = "1y1xy5w6ar4p6kc7g67fh93ccwnjnj81l6py1lkxlp8x4x5hpbca";
+ version = "0.5.6";
+ sha256 = "1rsjq3s2m69x2h880r087qbiwp3173pwv2yihlb8aw7dmjybydmf";
libraryHaskellDepends = [
base containers ghc-boot-th ghc-prim template-haskell
th-abstraction transformers transformers-compat
@@ -65920,6 +66750,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "describe" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, QuickCheck }:
+ mkDerivation {
+ pname = "describe";
+ version = "0.1.0.0";
+ sha256 = "0bbi6jih3d2fbsqhvmac8970jczwsq0zq61nlvrvr7nzgl2v07fl";
+ libraryHaskellDepends = [ base bytestring cereal ];
+ testHaskellDepends = [ base bytestring cereal QuickCheck ];
+ description = "Combinators for describing binary data structures";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"descrilo" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -66051,6 +66893,8 @@ self: {
];
description = "JSON and CSV encoding for rationals as decimal point numbers";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"detour-via-uom" = callPackage
@@ -66161,8 +67005,6 @@ self: {
];
description = "Type, render and parse the df1 hierarchical structured log format";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"dfinity-radix-tree" = callPackage
@@ -66302,22 +67144,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall_1_22_0" = callPackage
+ "dhall_1_24_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
, bytestring, case-insensitive, cborg, cborg-json, containers
, contravariant, criterion, cryptonite, deepseq, Diff, directory
, doctest, dotgen, exceptions, filepath, foldl, haskeline
, http-client, http-client-tls, http-types, lens-family-core
, megaparsec, memory, mockery, mtl, optparse-applicative, parsers
- , prettyprinter, prettyprinter-ansi-terminal, QuickCheck
- , quickcheck-instances, repline, scientific, serialise, tasty
- , tasty-hunit, tasty-quickcheck, template-haskell, text
- , transformers, turtle, unordered-containers, uri-encode, vector
+ , prettyprinter, prettyprinter-ansi-terminal, profunctors
+ , QuickCheck, quickcheck-instances, repline, scientific, serialise
+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+ , transformers, transformers-compat, turtle, unordered-containers
+ , uri-encode, vector
}:
mkDerivation {
pname = "dhall";
- version = "1.22.0";
- sha256 = "0f80vxry3vns6kyviradvpn32nkcl51lva5j2naakdg9kgcq4xxz";
+ version = "1.24.0";
+ sha256 = "1n04jk45qjl00wx7gxzp36j7d1m1ca7h7y4qlp8gxhykpkr6zzv7";
+ revision = "1";
+ editedCabalFile = "1b0gqva12rh0fynddal7q8jy6i3yax79br8xbfp9kh7936w9cs1j";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -66326,16 +67171,16 @@ self: {
dotgen exceptions filepath haskeline http-client http-client-tls
http-types lens-family-core megaparsec memory mtl
optparse-applicative parsers prettyprinter
- prettyprinter-ansi-terminal repline scientific serialise
- template-haskell text transformers unordered-containers uri-encode
- vector
+ prettyprinter-ansi-terminal profunctors repline scientific
+ serialise template-haskell text transformers transformers-compat
+ unordered-containers uri-encode vector
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
base bytestring cborg containers deepseq directory doctest filepath
- foldl mockery prettyprinter QuickCheck quickcheck-instances
- serialise tasty tasty-hunit tasty-quickcheck text transformers
- turtle vector
+ foldl megaparsec mockery prettyprinter QuickCheck
+ quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck
+ text transformers turtle vector
];
benchmarkHaskellDepends = [
base bytestring containers criterion directory serialise text
@@ -66366,14 +67211,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall-bash_1_0_20" = callPackage
+ "dhall-bash_1_0_21" = callPackage
({ mkDerivation, base, bytestring, containers, dhall
, neat-interpolation, optparse-generic, shell-escape, text
}:
mkDerivation {
pname = "dhall-bash";
- version = "1.0.20";
- sha256 = "1nqiyvyj0dw1a6shy9bb1qxzjrnh8544hsa2c6rwg2j36f0lk73d";
+ version = "1.0.21";
+ sha256 = "06rv0wrs1ym6szy78wg3nyfwaqm279vy6m7zny9s90lnpa6dc098";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -66434,29 +67279,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall-json_1_2_8" = callPackage
+ "dhall-json_1_3_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
- , dhall, exceptions, optparse-applicative, scientific, tasty
- , tasty-hunit, text, unordered-containers, vector, yaml
+ , dhall, exceptions, lens, libyaml, optparse-applicative
+ , scientific, tasty, tasty-hunit, text, unordered-containers
+ , vector, yaml
}:
mkDerivation {
pname = "dhall-json";
- version = "1.2.8";
- sha256 = "0s5iygh9rfmhx3v62dnfr55xz60rjvnicrq9ydspy129mhf0zzgd";
+ version = "1.3.0";
+ sha256 = "176i30shaklranbhmb4m4zqn13cn9hd6lqiqdjv9qmckkapbkjpi";
+ revision = "1";
+ editedCabalFile = "101xfp3zg9i7qyibknjpcdhha8sc024xmylphiwb509h3fjy3yks";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base dhall optparse-applicative text unordered-containers
+ aeson aeson-pretty base bytestring containers dhall exceptions lens
+ libyaml optparse-applicative scientific text unordered-containers
+ vector yaml
];
executableHaskellDepends = [
- aeson aeson-pretty base bytestring containers dhall exceptions
- optparse-applicative scientific text unordered-containers vector
- yaml
+ aeson aeson-pretty base bytestring dhall exceptions
+ optparse-applicative text
];
testHaskellDepends = [
aeson base bytestring dhall tasty tasty-hunit text
];
- description = "Compile Dhall to JSON or YAML";
+ description = "Convert between Dhall and JSON or YAML";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -66508,23 +67357,10 @@ self: {
({ mkDerivation, base, dhall, optparse-applicative, text }:
mkDerivation {
pname = "dhall-text";
- version = "1.0.16";
- sha256 = "1hjqm03vj89pkpnrl49jgqwzmlw6s4xr54ga7y50wkj5sd2lrwd1";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- base dhall optparse-applicative text
- ];
- description = "Template text using Dhall";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "dhall-text_1_0_17" = callPackage
- ({ mkDerivation, base, dhall, optparse-applicative, text }:
- mkDerivation {
- pname = "dhall-text";
- version = "1.0.17";
- sha256 = "0bs246857r801qnqvh8cb5wm1rplr7grynl4h989i61qz7vcqf53";
+ version = "1.0.18";
+ sha256 = "1nwvj67glqyn5yd62ni16wqppv8d3hy7d9aw87p35zkch1vr8vsd";
+ revision = "1";
+ editedCabalFile = "1dynw76kmca5l43jqrmgmzbdd7hqixiyfpb4pcx4dzr6ghar49s7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -66532,27 +67368,26 @@ self: {
];
description = "Template text using Dhall";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dhall-to-cabal" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, contravariant
- , dhall, Diff, directory, filepath, hashable, microlens
- , optparse-applicative, prettyprinter, tasty, tasty-golden
- , tasty-hunit, text, transformers, vector
+ , dhall, Diff, directory, filepath, microlens, optparse-applicative
+ , prettyprinter, tasty, tasty-golden, tasty-hunit, text
+ , transformers, vector
}:
mkDerivation {
pname = "dhall-to-cabal";
- version = "1.3.2.0";
- sha256 = "1cy7pqqfrmli3a8p24j0dgksfwhj08kjpbp31bdibnr8ix204jjc";
+ version = "1.3.4.0";
+ sha256 = "1z69nx98wgrjhgra0rw6lvsgnjzmqpixjwd673nvs79jg98yafm7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring Cabal containers contravariant dhall filepath
- hashable text transformers vector
+ microlens text transformers vector
];
executableHaskellDepends = [
- base bytestring Cabal dhall directory filepath microlens
+ base bytestring Cabal containers dhall directory filepath microlens
optparse-applicative prettyprinter text transformers
];
testHaskellDepends = [
@@ -66561,8 +67396,6 @@ self: {
];
description = "Compile Dhall expressions to Cabal files";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"dhcp-lease-parser" = callPackage
@@ -66598,8 +67431,6 @@ self: {
];
description = "Typeful hierarchical structured logging using di, mtl and df1";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"di-core" = callPackage
@@ -66638,8 +67469,6 @@ self: {
];
description = "Write logs in the df1 format using the di logging framework";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"di-handle" = callPackage
@@ -66653,8 +67482,6 @@ self: {
];
description = "IO support for file handles in di-core";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"di-monad" = callPackage
@@ -67559,8 +68386,8 @@ self: {
}:
mkDerivation {
pname = "differential";
- version = "0.1.1.0";
- sha256 = "0h6w082zq4f4p7j61bdi3jzpb42wwgh1d3067jywlnx2qwa0ijhp";
+ version = "0.1.2.0";
+ sha256 = "1mw70yrxi72q55h5xvyds7qp5az7j1qc3xix6ahck17dv5w8fpyl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -67699,6 +68526,8 @@ self: {
pname = "digestive-functors";
version = "0.8.4.0";
sha256 = "17l70z0bn5aahjaydg3qcwyip6jk0q4vkar5abhrhls59j5hk6z0";
+ revision = "2";
+ editedCabalFile = "1a8z8fmjvwab222ayc04xd3wxqagfq6nwf68ynljcbwdbbjyjb7b";
libraryHaskellDepends = [
base bytestring containers mtl old-locale semigroups text time
];
@@ -67846,10 +68675,8 @@ self: {
}:
mkDerivation {
pname = "digit";
- version = "0.7";
- sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql";
- revision = "2";
- editedCabalFile = "0335fzcbrf4hciz9gdkk41y9jkd5vm5vbz99v9ick76q48h2bs6p";
+ version = "0.8";
+ sha256 = "0m3m9c2452b0x7ccglkz7mr3ivi7r98qa44zwfnf7a55d6xckfa9";
libraryHaskellDepends = [
base lens parsers scientific semigroupoids semigroups
template-haskell
@@ -67893,6 +68720,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "digraph" = callPackage
+ ({ mkDerivation, base, containers, deepseq, fgl, hashable, massiv
+ , mwc-random, QuickCheck, streaming, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "digraph";
+ version = "0.1.0.2";
+ sha256 = "1kkvihqg3rhhsqz25yq7np211813kf3xqqi27lpdf1kdmq8vvf80";
+ libraryHaskellDepends = [
+ base containers deepseq hashable massiv mwc-random streaming
+ transformers unordered-containers
+ ];
+ testHaskellDepends = [ base fgl hashable massiv QuickCheck ];
+ description = "Directed Graphs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dihaa" = callPackage
({ mkDerivation, base, FontyFruity, JuicyPixels, Rasterific, vector
}:
@@ -67958,13 +68805,16 @@ self: {
}) {};
"dimensions" = callPackage
- ({ mkDerivation, base, Cabal, QuickCheck }:
+ ({ mkDerivation, base, Cabal, constraints-deriving, ghc, QuickCheck
+ }:
mkDerivation {
pname = "dimensions";
- version = "1.0.1.1";
- sha256 = "18f0b82vgzwk8yf0d8h10ni18jq2x34rgb1lsprlb1xxpw0dskda";
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base Cabal QuickCheck ];
+ version = "2.0.0.0";
+ sha256 = "1k0j8lcshscs5cd18i6qqiwb7sjy55mcfha5kl5f4x9nxrnn6xa8";
+ libraryHaskellDepends = [ base constraints-deriving ghc ];
+ testHaskellDepends = [
+ base Cabal constraints-deriving QuickCheck
+ ];
description = "Safe type-level dimensionality for multidimensional data";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -68112,18 +68962,16 @@ self: {
}) {};
"dir-traverse" = callPackage
- ({ mkDerivation, base, composition-prelude, criterion, directory
- , dirstream, dlist, filepath, pipes, pipes-safe, system-filepath
+ ({ mkDerivation, base, criterion, directory, dirstream, pipes
+ , pipes-safe, system-filepath
}:
mkDerivation {
pname = "dir-traverse";
- version = "0.1.0.0";
- sha256 = "1sxw6hr8ajs7gxqp7kwj5v635wb7m0gxix37navp3gddr34jhan2";
- libraryHaskellDepends = [
- base composition-prelude directory dlist filepath
- ];
+ version = "0.2.1.0";
+ sha256 = "08xzl64clnx3mfx5bw82kpksagyl4bajkaxmbl1dpnmdc4jz35ks";
+ libraryHaskellDepends = [ base directory ];
benchmarkHaskellDepends = [
- base criterion dirstream pipes pipes-safe system-filepath
+ base criterion directory dirstream pipes pipes-safe system-filepath
];
description = "Simple directory traversal library";
license = stdenv.lib.licenses.bsd3;
@@ -68271,12 +69119,12 @@ self: {
broken = true;
}) {};
- "directory_1_3_3_2" = callPackage
+ "directory_1_3_4_0" = callPackage
({ mkDerivation, base, filepath, time, unix }:
mkDerivation {
pname = "directory";
- version = "1.3.3.2";
- sha256 = "0nr0lwpi20slgqc22br9ldrs57573irqbck8am0pz0gz3yvmqis3";
+ version = "1.3.4.0";
+ sha256 = "19akp75rb3zwjfxcjamj05br865rd54y1gbyyfrb3a9506zcpsfm";
libraryHaskellDepends = [ base filepath time unix ];
testHaskellDepends = [ base filepath time unix ];
description = "Platform-agnostic library for filesystem operations";
@@ -68381,6 +69229,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dirtree" = callPackage
+ ({ mkDerivation, base, containers, deepseq, directory, filepath
+ , hspec, hspec-discover, hspec-expectations-pretty-diff, lens
+ }:
+ mkDerivation {
+ pname = "dirtree";
+ version = "0.0.1";
+ sha256 = "0i7prw2bzf5yjk42y1zvpjph8s5a73x1rj3dgba4mzdx3qpcs1gj";
+ libraryHaskellDepends = [
+ base containers deepseq directory filepath lens
+ ];
+ testHaskellDepends = [
+ base containers deepseq directory filepath hspec hspec-discover
+ hspec-expectations-pretty-diff lens
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "A small library for working with directories";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"disassembler" = callPackage
({ mkDerivation, array, base, containers, mtl, parsec }:
mkDerivation {
@@ -68417,6 +69287,17 @@ self: {
broken = true;
}) {};
+ "discokitty" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "discokitty";
+ version = "0.1.0";
+ sha256 = "0axz9k5j9yfk58icnycr93b6d5fqylgqlxi8v7w5sv1n28hrpvvj";
+ libraryHaskellDepends = [ base containers ];
+ description = "DisCoCat implementation";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"discord-gateway" = callPackage
({ mkDerivation, aeson, base, discord-types, hslogger, transformers
, url, websockets, wuss
@@ -68444,8 +69325,8 @@ self: {
}:
mkDerivation {
pname = "discord-haskell";
- version = "0.8.3";
- sha256 = "15nm4dp20ch27wf86s0z3qd98419hhc988dmbv4z9qhq0f8sdcmb";
+ version = "0.8.4";
+ sha256 = "1x2rqnvmxcyf320l0vyrj2dw5p1nql588zp8nknnwpk0sp0dxmjm";
libraryHaskellDepends = [
aeson async base base64-bytestring bytestring containers
data-default http-client iso8601-time JuicyPixels MonadRandom req
@@ -68583,19 +69464,17 @@ self: {
"discrimination" = callPackage
({ mkDerivation, array, base, containers, contravariant, criterion
- , deepseq, ghc-prim, hashable, primitive, profunctors, promises
- , semigroups, transformers, transformers-compat
+ , deepseq, ghc-prim, hashable, integer-gmp, primitive, profunctors
+ , promises, semigroups, transformers, transformers-compat
, unordered-containers, vector, void
}:
mkDerivation {
pname = "discrimination";
- version = "0.3";
- sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n";
- revision = "1";
- editedCabalFile = "1p39vcdmv9k9wxlkh49w1dr1isvn2hvhjjbs95qwljpxca74i23g";
+ version = "0.4";
+ sha256 = "085lhsvyp4d135p9yhgyl2s92f4cjdsghk1nsp8mjjddh6hxl20a";
libraryHaskellDepends = [
array base containers contravariant deepseq ghc-prim hashable
- primitive profunctors promises semigroups transformers
+ integer-gmp primitive profunctors promises semigroups transformers
transformers-compat vector void
];
benchmarkHaskellDepends = [
@@ -68798,8 +69677,6 @@ self: {
testHaskellDepends = [ base binary hspec QuickCheck ];
description = "Serializable closures for distributed programming";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"distributed-fork" = callPackage
@@ -68818,8 +69695,6 @@ self: {
testHaskellDepends = [ base tasty tasty-hunit unix ];
description = "Like 'forkIO', but uses remote machines instead of local threads";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"distributed-fork-aws-lambda" = callPackage
@@ -69390,8 +70265,8 @@ self: {
}:
mkDerivation {
pname = "distributed-static";
- version = "0.3.8";
- sha256 = "1hpzsjwmmaj3cj4i54mg6g9dkk6vgwda66y8j14pjqmn49bzcjwm";
+ version = "0.3.9";
+ sha256 = "1nch2k8dnlf6is2p4skh8vd0qbkgai4r6msfn6r5cr0cqaarb6pf";
libraryHaskellDepends = [
base binary bytestring containers deepseq rank1dynamic
];
@@ -69627,12 +70502,36 @@ self: {
broken = true;
}) {};
+ "dl-fedora" = callPackage
+ ({ mkDerivation, base, bytestring, directory, filepath
+ , http-directory, http-types, optparse-applicative, regex-posix
+ , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs
+ }:
+ mkDerivation {
+ pname = "dl-fedora";
+ version = "0.5";
+ sha256 = "1zfdf2s8cq171ik3iwq0zcha60i3czpjiy9bqa5wxczbwp0jpaxa";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring directory filepath http-directory http-types
+ optparse-applicative regex-posix simple-cmd simple-cmd-args text
+ unix xdg-userdirs
+ ];
+ description = "Fedora image download tool";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dlist" = callPackage
({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
mkDerivation {
pname = "dlist";
version = "0.8.0.6";
sha256 = "0gy70df86pfmqwbmnafdw2w5jnflvn5mca8npxzfg23f3p4ll2vq";
+ revision = "1";
+ editedCabalFile = "0f3r78gjdrhg5zg693dgdfx78ds6vbp5bg1sws1y1vbamraa65sf";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [ base Cabal QuickCheck ];
description = "Difference lists";
@@ -69659,8 +70558,8 @@ self: {
pname = "dlist-nonempty";
version = "0.1.1";
sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
- revision = "4";
- editedCabalFile = "10kkj4sf1bn87z6744p9gn6mkciqri2d3l9vmg9ylpi8g7priil2";
+ revision = "5";
+ editedCabalFile = "01x05d62y8f3kippxawra3fdr7jdms3zcgd7c4n8wf39np9wy556";
libraryHaskellDepends = [
base base-compat deepseq dlist semigroupoids
];
@@ -69984,8 +70883,8 @@ self: {
}:
mkDerivation {
pname = "docker";
- version = "0.6.0.0";
- sha256 = "0i90nkj1fc4swr6nral2y6raa6mmdz8x40sg47ww42dw18q00fjd";
+ version = "0.6.0.2";
+ sha256 = "00xs5khq74rlc4yqlln7fdhxagzbl526mnd762ivkyikn5ip3p9r";
libraryHaskellDepends = [
aeson base blaze-builder bytestring conduit conduit-combinators
conduit-extra containers data-default-class directory exceptions
@@ -70002,8 +70901,6 @@ self: {
];
description = "An API client for docker written in Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"docker-build-cacher" = callPackage
@@ -70158,6 +71055,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "doctest_0_16_1" = callPackage
+ ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+ , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
+ , QuickCheck, setenv, silently, stringbuilder, syb, transformers
+ }:
+ mkDerivation {
+ pname = "doctest";
+ version = "0.16.1";
+ sha256 = "1xnm1sbm9lpfxw5yav8qpqr85aap94k9df6n5kx70bp6h69qnrrq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base-compat code-page deepseq directory filepath ghc ghc-paths
+ process syb transformers
+ ];
+ executableHaskellDepends = [
+ base base-compat code-page deepseq directory filepath ghc ghc-paths
+ process syb transformers
+ ];
+ testHaskellDepends = [
+ base base-compat code-page deepseq directory filepath ghc ghc-paths
+ hspec HUnit mockery process QuickCheck setenv silently
+ stringbuilder syb transformers
+ ];
+ description = "Test interactive Haskell examples";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"doctest-discover" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, doctest
, filepath
@@ -70272,19 +71198,22 @@ self: {
"docusign-client" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
, data-default, docusign-base-minimal, exceptions, http-client
- , http-client-tls, http-types, servant-client, text, uuid
+ , http-client-tls, http-types, servant-client, servant-client-core
+ , text, uuid
}:
mkDerivation {
pname = "docusign-client";
- version = "0.0.2";
- sha256 = "14dpb1wdi6372b129hi85ksj2klxdvwnq758742akrrhaaz3lisx";
+ version = "0.0.3";
+ sha256 = "0gaqcxdl40fhpik6n8fgs717gri1g90xkhmxii5535513lp67id2";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring data-default
docusign-base-minimal exceptions http-client http-client-tls
- http-types servant-client text uuid
+ http-types servant-client servant-client-core text uuid
];
description = "Client bindings for the DocuSign API";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"docusign-example" = callPackage
@@ -70571,6 +71500,36 @@ self: {
broken = true;
}) {};
+ "dotenv_0_8_0_1" = callPackage
+ ({ mkDerivation, base, base-compat, containers, directory
+ , exceptions, hspec, hspec-megaparsec, megaparsec
+ , optparse-applicative, process, text, transformers, yaml
+ }:
+ mkDerivation {
+ pname = "dotenv";
+ version = "0.8.0.1";
+ sha256 = "1mp6j3wcxiz75yjf9bnb4kc5gw09v0ax1fz0hhh9i2glxi53m27l";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base base-compat containers directory exceptions megaparsec process
+ text transformers yaml
+ ];
+ executableHaskellDepends = [
+ base base-compat megaparsec optparse-applicative process text
+ transformers yaml
+ ];
+ testHaskellDepends = [
+ base base-compat containers directory exceptions hspec
+ hspec-megaparsec megaparsec process text transformers yaml
+ ];
+ description = "Loads environment variables from dotenv files";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dotfs" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, haskell-src, HFuse, HUnit, parsec, process, QuickCheck
@@ -70698,24 +71657,24 @@ self: {
"dovin" = callPackage
({ mkDerivation, base, Cabal, containers, directory, filepath
- , hashable, lens, mtl, parsec, tasty, tasty-discover, tasty-hunit
- , tasty-quickcheck, unordered-containers
+ , hashable, lens, mtl, parsec, split, tasty, tasty-discover
+ , tasty-hunit, tasty-quickcheck, unordered-containers
}:
mkDerivation {
pname = "dovin";
- version = "0.1.0.1";
- sha256 = "1imllaywr647vkgwk7j3ha1zv3h4bks64jpjn0y3q15mlzmrcdws";
+ version = "0.2";
+ sha256 = "0iy2hfmf3riwmj880if7ar30vrwnfpmyv8dhkx42hlzjb8mg538q";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
- base containers hashable lens mtl parsec unordered-containers
+ base containers hashable lens mtl parsec split unordered-containers
];
executableHaskellDepends = [
- base containers hashable lens mtl parsec unordered-containers
+ base containers hashable lens mtl parsec split unordered-containers
];
testHaskellDepends = [
- base containers hashable lens mtl parsec tasty tasty-discover
+ base containers hashable lens mtl parsec split tasty tasty-discover
tasty-hunit tasty-quickcheck unordered-containers
];
testToolDepends = [ tasty-discover ];
@@ -71014,6 +71973,29 @@ self: {
broken = true;
}) {};
+ "dprox" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, dns
+ , hspec, iproute, network, optparse-applicative, streaming-commons
+ , unix, unordered-containers
+ }:
+ mkDerivation {
+ pname = "dprox";
+ version = "0.1.2.1";
+ sha256 = "16z7qx76qy2gjz2j630maa2jgiqhphi8vpphbdywgk1abg7iwhrz";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ attoparsec base bytestring containers dns iproute network
+ optparse-applicative streaming-commons unix unordered-containers
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring containers dns hspec iproute network
+ optparse-applicative streaming-commons unix unordered-containers
+ ];
+ description = "a lightweight DNS proxy server";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"drClickOn" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -71189,6 +72171,26 @@ self: {
broken = true;
}) {drmaa = null;};
+ "drone" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, extensible
+ , formatting, hspec, microlens, req, servant-server, text, warp
+ }:
+ mkDerivation {
+ pname = "drone";
+ version = "1.0.1";
+ sha256 = "1qhgikixnzsqyywxnrgl2099klcxk17djbbz23hxvxmibay1pm8w";
+ libraryHaskellDepends = [
+ base bytestring containers extensible formatting microlens req text
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers extensible formatting hspec
+ microlens req servant-server text warp
+ ];
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dropbox-sdk" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
, certificate, conduit, HTTP, http-conduit, http-types, json
@@ -71340,13 +72342,11 @@ self: {
({ mkDerivation, base, parsec }:
mkDerivation {
pname = "dson";
- version = "0.3.0.0";
- sha256 = "15pqja0q1lram7xi5xk8dlcfg5m1z0l4zscqw24wm50hmqpxi09d";
+ version = "0.3.0.1";
+ sha256 = "1vv32n736ncjsy4psp8zlqmpp0r7mncjq65zwkhq5i99jx4chb1q";
libraryHaskellDepends = [ base parsec ];
- description = "Haskell DogeScript Object Notation Parser";
+ description = "Haskell Doge Serialized Object Notation Parser";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"dson-parsec" = callPackage
@@ -71366,8 +72366,8 @@ self: {
({ mkDerivation, array, base, containers, QuickCheck, random }:
mkDerivation {
pname = "dsp";
- version = "0.2.4.1";
- sha256 = "0b748v9v9i7kw2djnb9a89yjw0nhwhb5sfml3x6ajydjhx79a8ik";
+ version = "0.2.5";
+ sha256 = "1lka6l0xf3p7cb9ikzvszwgr7pl3gjm0s5v312p6k4w1fqqsycl5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base containers random ];
@@ -71513,8 +72513,8 @@ self: {
pname = "dual-game";
version = "0.1.0.1";
sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg";
- revision = "4";
- editedCabalFile = "1ln3lwx4h7yi3gf5r4ix92nvjcjjhphiqan1lnci81wn0frs9wrz";
+ revision = "5";
+ editedCabalFile = "1i87w3frlicplbc3gkp0msz1ck1irfmy9ym2n2ffxglv18vaczb6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -71800,6 +72800,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dvault" = callPackage
+ ({ mkDerivation, base, bytestring, containers, crypto-rng
+ , data-default, directory, process, vector
+ }:
+ mkDerivation {
+ pname = "dvault";
+ version = "0.1.0.0";
+ sha256 = "1djk7c7zbkhr95nvrn4wf864yl425w0ifwgsb5f4al0gyv1cx0c9";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring containers crypto-rng data-default directory
+ process vector
+ ];
+ description = "Dead simple password manager";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dvda" = callPackage
({ mkDerivation, ad, base, containers, directory, fgl
, file-location, graphviz, hashable, hashtables, mtl, process
@@ -72132,10 +73152,8 @@ self: {
}:
mkDerivation {
pname = "dynamic-plot";
- version = "0.3.0.0";
- sha256 = "0a674aqs9jnkga3a9sp24qyr3fssbizh4p1zwfvzwafnjrbmrc5c";
- revision = "1";
- editedCabalFile = "0f0n6pkgvhgvqh33dlzid3mb35r87w9kirdilky6zk8bcr2li4da";
+ version = "0.4.0.0";
+ sha256 = "1klq7lwvfwwp6z842g50a2xx6cqihp8a6551f935nr2sx9hwdr94";
libraryHaskellDepends = [
base colour colour-space constrained-categories containers
data-default deepseq diagrams-cairo diagrams-core diagrams-gtk
@@ -72190,19 +73208,18 @@ self: {
"dynamodb-simple" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
, base, bytestring, conduit, containers, double-conversion
- , exceptions, generics-sop, hashable, hspec, lens, monad-loops
- , monad-supply, safe-exceptions, scientific, semigroups, tagged
- , template-haskell, text, transformers, unordered-containers
- , uuid-types, vector
+ , exceptions, generics-sop, hashable, hspec, lens, monad-loops, mtl
+ , safe-exceptions, scientific, semigroups, tagged, template-haskell
+ , text, transformers, unordered-containers, uuid-types, vector
}:
mkDerivation {
pname = "dynamodb-simple";
- version = "0.6.0.1";
- sha256 = "00966z61119p2qammdiaxnfc5by0b12pj95745i792kqw647vygj";
+ version = "0.6.0.2";
+ sha256 = "1mx2ylbvcyskv0pc053mcwlz3mycqrq3g4rgrbk4qhnywx8p7gav";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-dynamodb base bytestring
conduit containers double-conversion exceptions generics-sop
- hashable lens monad-loops monad-supply scientific semigroups tagged
+ hashable lens monad-loops mtl scientific semigroups tagged
template-haskell text transformers unordered-containers uuid-types
vector
];
@@ -72465,31 +73482,34 @@ self: {
}) {};
"easytensor" = callPackage
- ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }:
+ ({ mkDerivation, base, Cabal, constraints-deriving, dimensions
+ , QuickCheck, template-haskell, time
+ }:
mkDerivation {
pname = "easytensor";
- version = "1.0.1.0";
- sha256 = "0s1w8ldd25m3jlqysikhzs4ygv4ar476iynbcy18nfn5qh8dvf8k";
- libraryHaskellDepends = [ base dimensions ];
- testHaskellDepends = [ base Cabal dimensions QuickCheck ];
- benchmarkHaskellDepends = [ base dimensions time ];
+ version = "2.0.1.0";
+ sha256 = "018g738yq7ac386ahbl18jnkjzd25jbgb744fg0kxz90734iwwdv";
+ libraryHaskellDepends = [ base constraints-deriving dimensions ];
+ testHaskellDepends = [
+ base Cabal constraints-deriving dimensions QuickCheck
+ template-haskell
+ ];
+ benchmarkHaskellDepends = [
+ base constraints-deriving dimensions time
+ ];
description = "Pure, type-indexed haskell vector, matrix, and tensor library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"easytensor-vulkan" = callPackage
({ mkDerivation, base, dimensions, easytensor, vulkan-api }:
mkDerivation {
pname = "easytensor-vulkan";
- version = "1.0.1.0";
- sha256 = "1mbykmlba5wlf66apiy2l2120fkj3wjhijj8b67plgpqrcw1kpp9";
+ version = "2.0.1.0";
+ sha256 = "0j3np8b24kr30bc2lcrvgpnv440a0mzcksjiyf37sp6l9fml65m5";
libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
description = "Use easytensor with vulkan-api";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"easytest" = callPackage
@@ -73069,6 +74089,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "effect-stack" = callPackage
+ ({ mkDerivation, base, constraints, mtl, transformers }:
+ mkDerivation {
+ pname = "effect-stack";
+ version = "0.2.1";
+ sha256 = "0sram572nbzpgwb3vi5fmg2f4ynsh693q05w0n5yjj8zl4a7p4ds";
+ libraryHaskellDepends = [ base constraints mtl transformers ];
+ description = "Reducing the pain of transformer stacks with duplicated effects";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"effective-aspects" = callPackage
({ mkDerivation, base, Cabal, ghc-prim, hashtables, HUnit, mtl
, QuickCheck, test-framework, test-framework-hunit
@@ -73120,8 +74153,6 @@ self: {
libraryHaskellDepends = [ base containers newtype-generics void ];
description = "Computational Effects";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"effects-parser" = callPackage
@@ -73133,8 +74164,6 @@ self: {
libraryHaskellDepends = [ base effects ];
description = "Parser Effect for the Control.Effects Library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"effin" = callPackage
@@ -73159,8 +74188,8 @@ self: {
}:
mkDerivation {
pname = "egison";
- version = "3.7.14";
- sha256 = "0iilizs6nj901fmzfam9s0s2phz91m2292wggqvzj8p6260589iq";
+ version = "3.8.2";
+ sha256 = "090zhf89faakidbf8kkbsa8ck0rl7fqbpg3fwymjqlafgnfx1jc2";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -73318,17 +74347,14 @@ self: {
"either" = callPackage
({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck
- , semigroupoids, semigroups, test-framework
- , test-framework-quickcheck2
+ , semigroupoids, test-framework, test-framework-quickcheck2
}:
mkDerivation {
pname = "either";
- version = "5.0.1";
- sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc";
- revision = "2";
- editedCabalFile = "0859h2dc77fq0f14jh11h4i89hrg3iqvzk0yrk78516k6m7n96zc";
+ version = "5.0.1.1";
+ sha256 = "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2";
libraryHaskellDepends = [
- base bifunctors mtl profunctors semigroupoids semigroups
+ base bifunctors mtl profunctors semigroupoids
];
testHaskellDepends = [
base QuickCheck test-framework test-framework-quickcheck2
@@ -73393,8 +74419,8 @@ self: {
pname = "ekg";
version = "0.4.0.15";
sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8";
- revision = "5";
- editedCabalFile = "0jwzwqr4giinq6wvl46399454nm9vc5g6mc2k2mx4wjdcl07qbgm";
+ revision = "6";
+ editedCabalFile = "012y235n8k7hhx651l01xf88vgr2wskapbsn83w18ls1h1njqnzk";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring ekg-core ekg-json filepath network snap-core
@@ -73576,8 +74602,6 @@ self: {
testHaskellDepends = [ base ];
description = "Easily expose your EKG metrics to Prometheus";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ekg-push" = callPackage
@@ -73629,8 +74653,8 @@ self: {
pname = "ekg-statsd";
version = "0.2.4.0";
sha256 = "1nvsiblha1fzykvfaq1s0fyvfmhm32wvxdsfkn9pqd6dl5ivyx2y";
- revision = "2";
- editedCabalFile = "1l0lh77qy4kbybkys1d4gg563fc593w27wpf4k1cg9j6ix6y604x";
+ revision = "3";
+ editedCabalFile = "0va7fliya7g546f5qbc42bl7dyh74al38sspd2smjyl7a9d5mmlk";
libraryHaskellDepends = [
base bytestring ekg-core network text time unordered-containers
];
@@ -74186,6 +75210,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "elminator" = callPackage
+ ({ mkDerivation, aeson, base, containers, mtl, template-haskell
+ , text
+ }:
+ mkDerivation {
+ pname = "elminator";
+ version = "0.2.4.1";
+ sha256 = "0b8xn26k2pmb7m5v6yn1l2kv4fv94qjl7k8563zq2aqkrfwdm068";
+ libraryHaskellDepends = [
+ aeson base containers mtl template-haskell text
+ ];
+ testHaskellDepends = [
+ aeson base containers mtl template-haskell text
+ ];
+ description = "Generate ELM types/encoders/decoders from Haskell types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"elo" = callPackage
({ mkDerivation, base, tasty }:
mkDerivation {
@@ -74238,8 +75280,6 @@ self: {
testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
description = "A tiny language for understanding the lambda-calculus";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"emacs-keys" = callPackage
@@ -74389,8 +75429,6 @@ self: {
];
description = "Perform basic syntax and deliverability checks on email addresses";
license = stdenv.lib.licenses.agpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"emailaddress" = callPackage
@@ -74468,6 +75506,17 @@ self: {
broken = true;
}) {};
+ "embla" = callPackage
+ ({ mkDerivation, base, chronos }:
+ mkDerivation {
+ pname = "embla";
+ version = "0.1";
+ sha256 = "1nk689j21ghaiymqnddlf4j8pgb9z61xflfrcgxw3zrxiv5jslk6";
+ libraryHaskellDepends = [ base chronos ];
+ description = "execute actions periodically while avoiding drift";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"embroidery" = callPackage
({ mkDerivation, base, bytestring, dlist, gloss, haskell98, HCodecs
, mtl
@@ -74505,8 +75554,6 @@ self: {
testHaskellDepends = [ base containers HUnit ];
description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"emgm" = callPackage
@@ -74579,6 +75626,8 @@ self: {
testHaskellDepends = [ base ];
description = "Binding to the Enchant library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) enchant;};
"enclosed-exceptions" = callPackage
@@ -75623,15 +76672,17 @@ self: {
}) {};
"error-codes" = callPackage
- ({ mkDerivation, base, primitive }:
+ ({ mkDerivation, base, primitive, primitive-unlifted }:
mkDerivation {
pname = "error-codes";
- version = "0.1.0.0";
- sha256 = "1i78vxk5ldasbn0fs8nwjfsjzkxjmg05i6vgzs4jlj1ajsgwhhkj";
- libraryHaskellDepends = [ base primitive ];
+ version = "0.1.0.1";
+ sha256 = "0df14g66vwz56bbiyjbis86cv106rlnniaf39kqzrnrdwswx1s1d";
+ libraryHaskellDepends = [ base primitive primitive-unlifted ];
testHaskellDepends = [ base ];
description = "Error code functions";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"error-context" = callPackage
@@ -75811,14 +76862,14 @@ self: {
"ersatz" = callPackage
({ mkDerivation, array, attoparsec, base, bytestring, Cabal
- , cabal-doctest, containers, data-default, directory, doctest
+ , cabal-doctest, containers, data-default, directory, doctest, fail
, filepath, lens, mtl, parsec, process, semigroups, temporary
, transformers, unordered-containers
}:
mkDerivation {
pname = "ersatz";
- version = "0.4.4";
- sha256 = "06d0fc5s5yxk1q54fsbnnhmvf25m5g86fqdzb42f0ckc0h3sbp22";
+ version = "0.4.7";
+ sha256 = "0kddsh02yrpn7xack6xcs0c93hmf4gkmh56zip2n6q7j0xgdrl6d";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -75828,7 +76879,7 @@ self: {
process semigroups temporary transformers unordered-containers
];
executableHaskellDepends = [
- array base containers lens mtl parsec semigroups
+ array base containers fail lens mtl parsec semigroups
];
testHaskellDepends = [ array base directory doctest filepath mtl ];
description = "A monad for expressing SAT or QSAT problems using observable sharing";
@@ -76064,8 +77115,6 @@ self: {
];
description = "Type-safe EDSL for SQL queries on persistent backends";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"esqueleto_3_0_0" = callPackage
@@ -76095,7 +77144,6 @@ self: {
description = "Type-safe EDSL for SQL queries on persistent backends";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ess" = callPackage
@@ -76812,6 +77860,8 @@ self: {
pname = "eventful-sql-common";
version = "0.2.0";
sha256 = "1g5f6rvb14hi81dby2hdcq444zhv2vl76ql4lsrh9gdmpf6a2vm4";
+ revision = "1";
+ editedCabalFile = "1w2qq0p4304zsjkwmqx79azpq5v0ajz5grg740vwkca8qvdvdq91";
libraryHaskellDepends = [
aeson base bytestring eventful-core mtl persistent
persistent-template text uuid
@@ -76857,6 +77907,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "eventlog2html" = callPackage
+ ({ mkDerivation, aeson, array, attoparsec, base, blaze-html
+ , bytestring, containers, file-embed, filepath, ghc-events
+ , hashtables, hvega, mtl, optparse-applicative, semigroups, text
+ , time
+ }:
+ mkDerivation {
+ pname = "eventlog2html";
+ version = "0.2.0";
+ sha256 = "106jydjz8lg80xmj2ahllvqz57dfkf8qybm6nqib3hrw956igy4c";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson array attoparsec base blaze-html bytestring containers
+ file-embed filepath ghc-events hashtables hvega mtl
+ optparse-applicative semigroups text time
+ ];
+ executableHaskellDepends = [ aeson base filepath text ];
+ description = "Visualise an eventlog";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"eventloop" = callPackage
({ mkDerivation, aeson, base, bytestring, concurrent-utilities
, deepseq, network, stm, suspend, text, timers, websockets
@@ -76871,8 +77945,6 @@ self: {
];
description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"eventsource-api" = callPackage
@@ -77015,6 +78087,43 @@ self: {
broken = true;
}) {};
+ "eventstore_1_3_0" = callPackage
+ ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+ , cereal, clock, connection, containers, dns, dotnet-timespan
+ , ekg-core, exceptions, fast-logger, file-embed, hashable
+ , http-client, interpolate, lifted-async, lifted-base
+ , monad-control, monad-logger, mono-traversable, mtl, protobuf
+ , random, safe, safe-exceptions, semigroups, stm, stm-chans
+ , streaming, tasty, tasty-hspec, tasty-hunit, text, time
+ , transformers-base, unordered-containers, uuid, vector
+ }:
+ mkDerivation {
+ pname = "eventstore";
+ version = "1.3.0";
+ sha256 = "0smn5ygshmxcd8zz7zg81y4dcqysawznv3222kbj5c1gwx80lm7c";
+ libraryHaskellDepends = [
+ aeson array base bifunctors bytestring cereal clock connection
+ containers dns dotnet-timespan ekg-core exceptions fast-logger
+ hashable http-client interpolate lifted-async lifted-base
+ monad-control monad-logger mono-traversable mtl protobuf random
+ safe safe-exceptions semigroups stm stm-chans streaming text time
+ transformers-base unordered-containers uuid vector
+ ];
+ testHaskellDepends = [
+ aeson async base bytestring cereal connection containers
+ dotnet-timespan exceptions fast-logger file-embed hashable
+ lifted-async lifted-base monad-control mono-traversable protobuf
+ safe safe-exceptions semigroups stm stm-chans streaming tasty
+ tasty-hspec tasty-hunit text time transformers-base
+ unordered-containers uuid vector
+ ];
+ description = "EventStore TCP Client";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = [ "x86_64-darwin" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"every" = callPackage
({ mkDerivation, async, base, stm }:
mkDerivation {
@@ -77176,8 +78285,6 @@ self: {
libraryHaskellDepends = [ base template-haskell ];
description = "Exception type hierarchy with TemplateHaskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"exception-mailer" = callPackage
@@ -77275,8 +78382,8 @@ self: {
}:
mkDerivation {
pname = "exceptions";
- version = "0.10.1";
- sha256 = "17fz74bi6qy3w7li7ifkcvsy3f9zyj69956jvaqvl5diyqnh791v";
+ version = "0.10.2";
+ sha256 = "0ajiq47xd1paingr7kksh69v6d072zsppfr6cy1gzjh3zg5jr34i";
libraryHaskellDepends = [
base mtl stm template-haskell transformers transformers-compat
];
@@ -77647,10 +78754,8 @@ self: {
}:
mkDerivation {
pname = "exitcode";
- version = "0.1.0.1";
- sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5";
- revision = "2";
- editedCabalFile = "0g30lnsl947bsxcw53swl0vv3qg8c7vqf8axpdnhl28mdrxa0ax9";
+ version = "0.1.0.2";
+ sha256 = "1w3m5ib952kiyw85ysj049v01qzc8p8mlmn9mxsm1h0x0a5axf3y";
libraryHaskellDepends = [
base lens mmorph mtl semigroupoids semigroups transformers
];
@@ -77869,8 +78974,8 @@ self: {
({ mkDerivation, base, deepseq, semigroups, transformers }:
mkDerivation {
pname = "explicit-exception";
- version = "0.1.9.2";
- sha256 = "1xj9fqh28br5xyzzc28zl23jj913ayhikvwcw9ccj3pqfybh5xk0";
+ version = "0.1.10";
+ sha256 = "1g7q01zqxv9aj4pqfbv4r8b2zndkilispigvmlvxnlapyzb6gm00";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base deepseq semigroups transformers ];
@@ -78090,6 +79195,18 @@ self: {
broken = true;
}) {};
+ "extend-record-data-th" = callPackage
+ ({ mkDerivation, attoparsec, base, template-haskell, text }:
+ mkDerivation {
+ pname = "extend-record-data-th";
+ version = "0.1.0.2";
+ sha256 = "1gy730iic17hiiqf08j4riz1086wpz6iv7i5carc04mi39zdjf4h";
+ libraryHaskellDepends = [ attoparsec base template-haskell text ];
+ testHaskellDepends = [ attoparsec base template-haskell text ];
+ description = "TH to define a new record data type that extends the existing record data type";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"extended-categories" = callPackage
({ mkDerivation, base, constraints, ghc-prim, tagged }:
mkDerivation {
@@ -78125,20 +79242,21 @@ self: {
"extensible" = callPackage
({ mkDerivation, aeson, base, bytestring, cassava, comonad
, constraints, deepseq, exceptions, ghc-prim, hashable, lens
- , monad-skeleton, mtl, prettyprinter, primitive, profunctors
- , QuickCheck, resourcet, StateVar, tagged, template-haskell, text
- , th-lift, transformers, unordered-containers, vector
+ , membership, monad-skeleton, mtl, prettyprinter, primitive
+ , profunctors, QuickCheck, resourcet, StateVar, tagged
+ , template-haskell, text, th-lift, transformers
+ , unordered-containers, vector
}:
mkDerivation {
pname = "extensible";
- version = "0.5";
- sha256 = "1nsidp8rb3fnkybirgql2ij1vwjzsy2da3qp8abjb1g8aj50ih14";
+ version = "0.5.1";
+ sha256 = "0rqq2pwp5zzpl9xzjmk0m8a54mbs10d7dywswfd84wqrngknkp10";
libraryHaskellDepends = [
aeson base bytestring cassava comonad constraints deepseq
- exceptions ghc-prim hashable monad-skeleton mtl prettyprinter
- primitive profunctors QuickCheck resourcet StateVar tagged
- template-haskell text th-lift transformers unordered-containers
- vector
+ exceptions ghc-prim hashable membership monad-skeleton mtl
+ prettyprinter primitive profunctors QuickCheck resourcet StateVar
+ tagged template-haskell text th-lift transformers
+ unordered-containers vector
];
testHaskellDepends = [ base lens QuickCheck template-haskell ];
description = "Extensible, efficient, optics-friendly data types and effects";
@@ -78191,35 +79309,33 @@ self: {
({ mkDerivation, async, base, bytestring, containers, data-default
, deepseq, directory, exceptions, extensible-effects, filepath
, hostname, HUnit, lens, monad-control, mtl, network, parallel
- , process, QuickCheck, safe-exceptions, stm, tasty, tasty-discover
- , tasty-hunit, text, time, transformers-base
+ , pretty-types, process, QuickCheck, safe-exceptions, stm, tagged
+ , tasty, tasty-discover, tasty-hunit, text, time, transformers-base
}:
mkDerivation {
pname = "extensible-effects-concurrent";
- version = "0.22.1";
- sha256 = "1vjd8rr60zxgvv96i9fx5vjbvvxagj8fxz6891irmjgxhlb1v75z";
+ version = "0.29.2";
+ sha256 = "0a2nbnr8giil05jy5nr7d3gy3cgvq9058dzqb49as65n232n1iv1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
async base bytestring containers data-default deepseq directory
exceptions extensible-effects filepath hostname lens monad-control
- mtl network parallel process QuickCheck safe-exceptions stm text
- time transformers-base
+ mtl network parallel pretty-types process QuickCheck
+ safe-exceptions stm tagged text time transformers-base
];
executableHaskellDepends = [
base data-default deepseq directory extensible-effects filepath
- lens text
+ lens pretty-types text
];
testHaskellDepends = [
async base containers data-default deepseq extensible-effects
- filepath hostname HUnit lens QuickCheck stm tasty tasty-discover
- tasty-hunit text time
+ filepath hostname HUnit lens pretty-types QuickCheck stm tasty
+ tasty-discover tasty-hunit text time
];
testToolDepends = [ tasty-discover ];
description = "Message passing concurrency as extensible-effect";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"extensible-exceptions" = callPackage
@@ -78263,8 +79379,8 @@ self: {
}:
mkDerivation {
pname = "extra";
- version = "1.6.15";
- sha256 = "1kbx15x1y6mdzydm4apizym89in4dd71imwk239ywyg27hl8f4gv";
+ version = "1.6.17";
+ sha256 = "1zgp64ich4sjg59vwv6rgfz5amhhydcplv9l8k50p1mc49h2h2vc";
libraryHaskellDepends = [
base clock directory filepath process semigroups time unix
];
@@ -78431,8 +79547,8 @@ self: {
}:
mkDerivation {
pname = "factory";
- version = "0.3.2.0";
- sha256 = "1ihyqs8b2rgxny69iqaxh55a2pkamp4mb4i3gcy9c6pphjrbmyz3";
+ version = "0.3.2.1";
+ sha256 = "1vz273vni9335py69nlc2g92gkvy13rkfa238116g83qjjcx8w1f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -78448,6 +79564,8 @@ self: {
];
description = "Rational arithmetic in an irrational world";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"facts" = callPackage
@@ -78648,18 +79766,16 @@ self: {
}:
mkDerivation {
pname = "fake";
- version = "0.1.1.1";
- sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf";
+ version = "0.1.1.2";
+ sha256 = "0jwndfsyc5p7da97658j14x5gynbifkx7ikg8k09ym9gizkrmdd2";
revision = "1";
- editedCabalFile = "1a1rsa8hpgpyw8m2bq9ns76n4dbr4iymjhxqkiif6b6xvg8zwld5";
+ editedCabalFile = "0gpqpb6vmskw7l6k3q18cfb670azxldiirj9sapz043sqd5wc3di";
libraryHaskellDepends = [
base containers generics-sop random text time
];
testHaskellDepends = [ base hspec random text time ];
description = "Randomly generated fake data";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fake-type" = callPackage
@@ -78683,8 +79799,8 @@ self: {
}:
mkDerivation {
pname = "fakedata";
- version = "0.2.0";
- sha256 = "0297bppk69gn4sv5m5w1wh4wbshiz9w3b81sr9ps309k7bb6va9j";
+ version = "0.2.2";
+ sha256 = "11gsshxd23inh6lb3rbs0fkmh83ivffxdlcqrxsfi0ymdmzha3rr";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers directory exceptions filepath random
@@ -78927,8 +80043,8 @@ self: {
}:
mkDerivation {
pname = "fast-logger";
- version = "2.4.15";
- sha256 = "1mf2awyvc336wmcjr7v99zvx6spz8fw5xzpn19x0fldy33dr89yf";
+ version = "2.4.16";
+ sha256 = "090wv1as2ylr7f90dzhp5g9xzagg03zv0swy1zz08kar9qx3fwhc";
libraryHaskellDepends = [
array auto-update base bytestring directory easy-file filepath text
unix-compat unix-time
@@ -79151,8 +80267,6 @@ self: {
benchmarkHaskellDepends = [ base bytestring criterion ];
description = "A fast, but bare bones, bytestring parser combinators library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fastpbkdf2" = callPackage
@@ -79176,15 +80290,17 @@ self: {
}) {inherit (pkgs) openssl;};
"fastsum" = callPackage
- ({ mkDerivation, base, ghc-prim, hashable, template-haskell }:
+ ({ mkDerivation, base, deepseq, ghc-prim, hashable
+ , template-haskell
+ }:
mkDerivation {
pname = "fastsum";
- version = "0.1.0.0";
- sha256 = "19an2yx0x10mj1lxwh3sqj5zs8fcwbw1zj530sxs64127l2dby57";
+ version = "0.1.1.0";
+ sha256 = "0fa3wjdsjl8wwlw194g1b7j8rvwix2b1hgwm1s10fq91a10mca6n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base ghc-prim hashable template-haskell
+ base deepseq ghc-prim hashable template-haskell
];
description = "A fast open-union type suitable for 100+ contained alternatives";
license = stdenv.lib.licenses.bsd3;
@@ -79247,8 +80363,6 @@ self: {
executableHaskellDepends = [ base mtl optparse-applicative split ];
description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fay-base" = callPackage
@@ -79261,8 +80375,6 @@ self: {
libraryHaskellDepends = [ base fay ];
description = "The base package for Fay";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fay-builder" = callPackage
@@ -79296,8 +80408,6 @@ self: {
libraryHaskellDepends = [ fay-base ];
description = "DOM FFI wrapper library for Fay";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fay-geoposition" = callPackage
@@ -79310,8 +80420,6 @@ self: {
libraryHaskellDepends = [ fay-base fay-text ];
description = "W3C compliant implementation of GeoPosition API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fay-hsx" = callPackage
@@ -79338,8 +80446,6 @@ self: {
libraryHaskellDepends = [ fay-base fay-text ];
description = "jQuery bindings for Fay";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fay-ref" = callPackage
@@ -79352,8 +80458,6 @@ self: {
libraryHaskellDepends = [ fay-base ];
description = "Like IORef but for Fay";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fay-simplejson" = callPackage
@@ -79382,8 +80486,6 @@ self: {
libraryHaskellDepends = [ fay fay-base text ];
description = "Fay Text type represented as JavaScript strings";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fay-uri" = callPackage
@@ -79396,8 +80498,6 @@ self: {
libraryHaskellDepends = [ fay-base ];
description = "Persistent FFI bindings for using jsUri in Fay";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fay-websockets" = callPackage
@@ -79410,8 +80510,6 @@ self: {
libraryHaskellDepends = [ fay-base ];
description = "Websockets FFI library for Fay";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fb" = callPackage
@@ -79443,6 +80541,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fb_2_0_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
+ , conduit-extra, containers, cryptonite, data-default, hspec
+ , http-client, http-conduit, http-types, HUnit, memory
+ , monad-logger, QuickCheck, resourcet, text, time, transformers
+ , transformers-base, unliftio, unliftio-core, unordered-containers
+ }:
+ mkDerivation {
+ pname = "fb";
+ version = "2.0.0";
+ sha256 = "0z56cibxp5f616vamj4jm76g2n33w22zz8pc9hhs33lm5m0nlncw";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring conduit conduit-extra cryptonite
+ data-default http-client http-conduit http-types memory
+ monad-logger resourcet text time transformers transformers-base
+ unliftio unliftio-core unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring conduit containers data-default hspec
+ http-conduit HUnit QuickCheck resourcet text time transformers
+ unliftio
+ ];
+ description = "Bindings to Facebook's API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fb-persistent" = callPackage
({ mkDerivation, base, cereal, fb, persistent, text, time }:
mkDerivation {
@@ -79793,20 +80918,20 @@ self: {
}) {};
"fedora-img-dl" = callPackage
- ({ mkDerivation, base, bytestring, directory, filepath, http-client
- , http-client-tls, http-directory, http-types, optparse-applicative
- , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs
+ ({ mkDerivation, base, bytestring, directory, filepath
+ , http-directory, http-types, optparse-applicative, simple-cmd
+ , simple-cmd-args, text, unix, xdg-userdirs
}:
mkDerivation {
pname = "fedora-img-dl";
- version = "0.3";
- sha256 = "0mly2lmrirzskralw9ajywmcirmsv67gjws4dckvf1ns24cx33lw";
+ version = "0.4";
+ sha256 = "1wymwrcycyq0sf3vld4fxk57g8rdwhr0cgxpx2angdw9pjcmnyd7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bytestring directory filepath http-client http-client-tls
- http-directory http-types optparse-applicative simple-cmd
- simple-cmd-args text unix xdg-userdirs
+ base bytestring directory filepath http-directory http-types
+ optparse-applicative simple-cmd simple-cmd-args text unix
+ xdg-userdirs
];
description = "Fedora image download tool";
license = stdenv.lib.licenses.gpl3;
@@ -79889,6 +81014,8 @@ self: {
pname = "feed";
version = "1.1.0.0";
sha256 = "05hiasa6k13v1pzp9cs991zh04njda0ax9868rc7k906b19qqkjg";
+ revision = "1";
+ editedCabalFile = "0bn0vnn6v373ycrbxwqzp1ncmq649h13f2na8q8yf0i68mxampks";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base base-compat bytestring old-locale old-time safe text time
@@ -80388,8 +81515,8 @@ self: {
}:
mkDerivation {
pname = "ffunctor";
- version = "1.1.100";
- sha256 = "07s9ax9pi8bxvj94dfh237wfxdmx63gglkw8cx7pn2w1jybpb8v9";
+ version = "1.2.0";
+ sha256 = "0rq60a7ximvqdxqvijw1isd1d5gwqbjagmws91y0jvxlwmsgzf6w";
libraryHaskellDepends = [ base transformers ];
testHaskellDepends = [
aeson base exceptions generic-lens http-client mtl servant
@@ -80772,18 +81899,6 @@ self: {
}) {};
"filelock" = callPackage
- ({ mkDerivation, async, base, process, unix }:
- mkDerivation {
- pname = "filelock";
- version = "0.1.1.2";
- sha256 = "0g90wgm4bcfr5j44sc5s2jlcd7ggk092lph3jqjgf6f67sqxrw8g";
- libraryHaskellDepends = [ base unix ];
- testHaskellDepends = [ async base process ];
- description = "Portable interface to file locking (flock / LockFileEx)";
- license = stdenv.lib.licenses.publicDomain;
- }) {};
-
- "filelock_0_1_1_3" = callPackage
({ mkDerivation, async, base, process, unix }:
mkDerivation {
pname = "filelock";
@@ -80793,7 +81908,6 @@ self: {
testHaskellDepends = [ async base process ];
description = "Portable interface to file locking (flock / LockFileEx)";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"filemanip" = callPackage
@@ -81060,19 +82174,32 @@ self: {
}) {};
"fin" = callPackage
- ({ mkDerivation, base, deepseq, hashable, inspection-testing
+ ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing
, tagged
}:
mkDerivation {
pname = "fin";
- version = "0.0.2";
- sha256 = "1fdykzyqc43648ka7z3jg3dciyb71ipp67ya521mp6zk9is2fx5i";
- libraryHaskellDepends = [ base deepseq hashable ];
+ version = "0.0.3";
+ sha256 = "1g8fsl8hbh39g4r29597rjjh9000i3gwx38asa6pvmmnx7glqb2f";
+ libraryHaskellDepends = [ base dec deepseq hashable ];
+ testHaskellDepends = [ base inspection-testing tagged ];
+ description = "Nat and Fin: peano naturals and finite numbers";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "fin_0_1" = callPackage
+ ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing
+ , tagged
+ }:
+ mkDerivation {
+ pname = "fin";
+ version = "0.1";
+ sha256 = "17nv26cznhslrfb1ajcgxa9g3zacvk3prmncr7f8d7rvh42g2gnn";
+ libraryHaskellDepends = [ base dec deepseq hashable ];
testHaskellDepends = [ base inspection-testing tagged ];
description = "Nat and Fin: peano naturals and finite numbers";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"final" = callPackage
@@ -81179,6 +82306,26 @@ self: {
broken = true;
}) {};
+ "findhttp" = callPackage
+ ({ mkDerivation, base, basic-prelude, bytestring, directory
+ , filepath, Glob, http-directory, simple-cmd-args, text
+ }:
+ mkDerivation {
+ pname = "findhttp";
+ version = "0.1";
+ sha256 = "1hw7cbmy0b01kfpfxavq3gc17vnq4vr2fy3bcvh4jnz9rizfmr9w";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base basic-prelude bytestring directory filepath Glob
+ http-directory simple-cmd-args text
+ ];
+ description = "List http/html files";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"fingertree" = callPackage
({ mkDerivation, base, HUnit, QuickCheck, test-framework
, test-framework-hunit, test-framework-quickcheck2
@@ -81394,8 +82541,8 @@ self: {
}:
mkDerivation {
pname = "fishfood";
- version = "0.0.1.8";
- sha256 = "04wqj8s8b97i6448f66ljv5wk6nhcjs80vapg96vwmlslxwcmhnc";
+ version = "0.0.1.9";
+ sha256 = "128m9zhn57jzz5ijkz54mlw70g0d1byp2gisw7wyrgddi0j3x3i5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -81409,6 +82556,8 @@ self: {
];
description = "Calculates file-size frequency-distribution";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"fit" = callPackage
@@ -81545,6 +82694,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fixed_0_3" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "fixed";
+ version = "0.3";
+ sha256 = "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j";
+ libraryHaskellDepends = [ base ];
+ description = "Signed 15.16 precision fixed point arithmetic";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fixed-length" = callPackage
({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht
}:
@@ -82044,6 +83205,18 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "flags-applicative" = callPackage
+ ({ mkDerivation, base, containers, hspec, mtl, network, text }:
+ mkDerivation {
+ pname = "flags-applicative";
+ version = "0.0.5.2";
+ sha256 = "1yjwnh6mqq3ypc3rs7a13j998zizfn6fn35d2wijdkm4ahyjpjhv";
+ libraryHaskellDepends = [ base containers mtl network text ];
+ testHaskellDepends = [ base hspec text ];
+ description = "Applicative flag parsing";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"flamethrower" = callPackage
({ mkDerivation, base, template-haskell, text }:
mkDerivation {
@@ -82290,6 +83463,8 @@ self: {
];
description = "Parsing of pilot tracklogs dumped as KML";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"flip-cmd" = callPackage
@@ -82419,36 +83594,34 @@ self: {
}) {};
"floskell" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
- , criterion, data-default, deepseq, directory, exceptions, filepath
- , ghc-prim, haskell-src-exts, hspec, monad-dijkstra, monad-loops
- , mtl, optparse-applicative, text, transformers
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+ , containers, criterion, data-default, deepseq, directory
+ , exceptions, filepath, ghc-prim, haskell-src-exts, hspec
+ , monad-dijkstra, mtl, optparse-applicative, text, transformers
, unordered-containers, utf8-string
}:
mkDerivation {
pname = "floskell";
- version = "0.9.0";
- sha256 = "0zx61l6gggblb74ydsamjdvsdm8s8gzb8bmcl8sdhrq7bdbdmbav";
- revision = "2";
- editedCabalFile = "01ayyhmcj6jm4afwdgypd3p8xcrhrvc4g4rgpgi1vdbvwrw3jnb0";
+ version = "0.10.1";
+ sha256 = "1y79f6a6frcmhs70z34rdcpm5bqpgqf46bx29jnixgs313lwz229";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson base bytestring containers data-default haskell-src-exts
- monad-dijkstra monad-loops mtl text transformers
+ aeson attoparsec base bytestring containers data-default directory
+ filepath haskell-src-exts monad-dijkstra mtl text transformers
unordered-containers utf8-string
];
executableHaskellDepends = [
- aeson aeson-pretty base bytestring directory filepath ghc-prim
- haskell-src-exts optparse-applicative text unordered-containers
+ aeson-pretty base bytestring directory ghc-prim haskell-src-exts
+ optparse-applicative text
];
testHaskellDepends = [
- base bytestring deepseq directory exceptions haskell-src-exts hspec
- monad-loops mtl text utf8-string
+ base bytestring deepseq exceptions haskell-src-exts hspec text
+ utf8-string
];
benchmarkHaskellDepends = [
- base bytestring criterion deepseq directory exceptions ghc-prim
+ base bytestring criterion deepseq exceptions ghc-prim
haskell-src-exts text utf8-string
];
description = "A flexible Haskell source code pretty printer";
@@ -82650,8 +83823,8 @@ self: {
}:
mkDerivation {
pname = "fltkhs";
- version = "0.8.0.0";
- sha256 = "0gidczc4d3gi97w7ck3xp7q4amvnhkyzfpksyxc8r6cyfz29n9ic";
+ version = "0.8.0.2";
+ sha256 = "07q7xb7h48by6gj284fczszay4gg1r0j2nr7fmffj72nkjgzzyhx";
configureFlags = [ "-fopengl" ];
isLibrary = true;
isExecutable = true;
@@ -82734,8 +83907,8 @@ self: {
}:
mkDerivation {
pname = "fltkhs-themes";
- version = "0.2.0.0";
- sha256 = "1hmyr5vnv7inkjnffadfjiwp9fwsw9jr0c45dcbk5gs9kwpa77zz";
+ version = "0.2.0.2";
+ sha256 = "07f21cr07kfzzrsk6j63livwjbi0ci43i5czbplj3wsy58sq8pn7";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
@@ -82949,25 +84122,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fmlist_0_9_3" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "fmlist";
+ version = "0.9.3";
+ sha256 = "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf";
+ libraryHaskellDepends = [ base ];
+ description = "FoldMap lists";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fmt" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, call-stack
, containers, criterion, deepseq, doctest, doctest-discover
, formatting, hspec, interpolate, microlens, neat-interpolation
- , text, time, time-locale-compat, vector
+ , QuickCheck, text, time, time-locale-compat, vector
}:
mkDerivation {
pname = "fmt";
- version = "0.6.1.1";
- sha256 = "1bfj94ahc06xj6x5v5gmjzgw30cgxsc1vjygajqiqnanimbhn8i6";
- revision = "2";
- editedCabalFile = "1prdnb8a8n338clkvjx0c8hmbkiy8x2c9j87b94302bq6x7rmf9d";
+ version = "0.6.1.2";
+ sha256 = "1fcamg5vpbmn0h7y4xkyrrmpkbyqqkijpgm2bhsw82swnbfppvbq";
libraryHaskellDepends = [
base base64-bytestring bytestring call-stack containers formatting
microlens text time time-locale-compat
];
testHaskellDepends = [
base bytestring call-stack containers doctest hspec
- neat-interpolation text vector
+ neat-interpolation QuickCheck text vector
];
testToolDepends = [ doctest-discover ];
benchmarkHaskellDepends = [
@@ -83129,6 +84312,8 @@ self: {
pname = "foldl";
version = "1.4.5";
sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b";
+ revision = "3";
+ editedCabalFile = "0ci6wq1lqmz0i5rlb4my21ic6ziq87kg35mkp3f9la9y32zbq600";
libraryHaskellDepends = [
base bytestring comonad containers contravariant hashable
mwc-random primitive profunctors semigroupoids semigroups text
@@ -83641,22 +84826,6 @@ self: {
}) {};
"forma" = callPackage
- ({ mkDerivation, aeson, base, containers, hspec, mtl, text
- , unordered-containers
- }:
- mkDerivation {
- pname = "forma";
- version = "1.1.1";
- sha256 = "10q06yjz66h92qm0569l172v0c6mp9m3jfyakyva5v7xdqr8rvxb";
- libraryHaskellDepends = [
- aeson base containers mtl text unordered-containers
- ];
- testHaskellDepends = [ aeson base containers hspec mtl text ];
- description = "Parse and validate forms in JSON format";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "forma_1_1_2" = callPackage
({ mkDerivation, aeson, base, containers, hspec, mtl, text
, unordered-containers
}:
@@ -83670,7 +84839,6 @@ self: {
testHaskellDepends = [ aeson base containers hspec mtl text ];
description = "Parse and validate forms in JSON format";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"formal" = callPackage
@@ -83932,8 +85100,8 @@ self: {
}:
mkDerivation {
pname = "fortran-src";
- version = "0.2.1.1";
- sha256 = "000i0395k6wpmzymiqc4x4xi06y6a8q4yianqplfl7zn2ghyxcsz";
+ version = "0.3.0";
+ sha256 = "03a1lk0c50v66jax2dya7qhjr3si2anp4yzx03vpf49am2kn2rxq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -84386,8 +85554,8 @@ self: {
}:
mkDerivation {
pname = "free";
- version = "5.1";
- sha256 = "117axvibwyz429ixdws6mm3sk5vm0jygdxf45456m8yyh9f4shkh";
+ version = "5.1.1";
+ sha256 = "0f33n7x4z0mc733ck4gg6ljcinfmm946a20g5irv90g77c6jmmak";
libraryHaskellDepends = [
base comonad containers distributive exceptions mtl profunctors
semigroupoids template-haskell transformers transformers-base
@@ -85129,6 +86297,8 @@ self: {
pname = "friendly";
version = "0.1.0.0";
sha256 = "0ikbfki5yvagc3xjbqwmzzp29idfviaylnan6cr39kna6fc8ajgx";
+ revision = "2";
+ editedCabalFile = "12j953w8zcix2iyqwkn08zpw1r1dd7jk8p8a3v5hs5rya1qb74si";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -85136,8 +86306,6 @@ self: {
];
description = "Attempt to pretty-print any input";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"friendly-time" = callPackage
@@ -85208,8 +86376,6 @@ self: {
];
description = "A reactive frontend web framework";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"frontmatter" = callPackage
@@ -85262,6 +86428,8 @@ self: {
pname = "frpnow";
version = "0.18";
sha256 = "1ixhcif2db8v6k8m4bgrpiivl0ygb83padnj18w4jyy5br6s1bqz";
+ revision = "1";
+ editedCabalFile = "0biplda0z6pmnm28vcdnaa4k82zcbhrghynqzsy7whs0kc86zq4a";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base containers mtl transformers ];
description = "Principled practical FRP";
@@ -85697,8 +86865,6 @@ self: {
];
description = "In-memory full text search engine";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"fullstop" = callPackage
@@ -86008,8 +87174,8 @@ self: {
pname = "functor-classes-compat";
version = "1";
sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg";
- revision = "3";
- editedCabalFile = "1jx552ysdnxvd8wdvsf4bgxlsgldpb7a8zi54abyjmxv6mkp98ys";
+ revision = "4";
+ editedCabalFile = "1531cmcfgcgry254dn5mx7h5l6nd4afxz6lhlcr0lbbm4y1v59mk";
libraryHaskellDepends = [
base containers hashable unordered-containers vector
];
@@ -86017,6 +87183,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "functor-combinators" = callPackage
+ ({ mkDerivation, base, bifunctors, comonad, constraints, containers
+ , dependent-sum, deriving-compat, free, hedgehog, kan-extensions
+ , mmorph, mtl, natural-transformation, nonempty-containers, pointed
+ , profunctors, recursion-schemes, semigroupoids, tagged, tasty
+ , tasty-hedgehog, these, transformers, trivial-constraint, vinyl
+ }:
+ mkDerivation {
+ pname = "functor-combinators";
+ version = "0.1.1.0";
+ sha256 = "1x3a2rwqhvcyr298adfc9qband5s5qwh8wfd67cgrq5qx2z4j8xf";
+ revision = "2";
+ editedCabalFile = "09r6bgjlcsjjbwqhfxqbw5dk5sj9lsbfwwsjpdzmi8z8dywgyn2z";
+ libraryHaskellDepends = [
+ base bifunctors comonad constraints containers deriving-compat free
+ kan-extensions mmorph mtl natural-transformation
+ nonempty-containers pointed profunctors recursion-schemes
+ semigroupoids tagged these transformers trivial-constraint vinyl
+ ];
+ testHaskellDepends = [
+ base bifunctors dependent-sum free hedgehog nonempty-containers
+ semigroupoids tagged tasty tasty-hedgehog transformers
+ ];
+ description = "Tools for functor combinator-based program design";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"functor-combo" = callPackage
({ mkDerivation, base, base-orphans, containers, data-inttrie, lub
, type-unary, TypeCompose
@@ -86277,15 +87472,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "fused-effects_0_3_1_0" = callPackage
+ "fused-effects_0_4_0_0" = callPackage
({ mkDerivation, base, criterion, deepseq, doctest, hspec
, inspection-testing, MonadRandom, QuickCheck, random, transformers
, unliftio-core
}:
mkDerivation {
pname = "fused-effects";
- version = "0.3.1.0";
- sha256 = "0mg6sgp4j6my34wzsdpvjvsb07s9k515shvi8nnrnzf0djqq95rv";
+ version = "0.4.0.0";
+ sha256 = "1r6yzw0212p5wn9rad2r7pjijnw6jajhypirm4j8h1gz1a393ds8";
libraryHaskellDepends = [
base deepseq MonadRandom random transformers unliftio-core
];
@@ -86299,12 +87494,18 @@ self: {
}) {};
"fused-effects-exceptions" = callPackage
- ({ mkDerivation, base, fused-effects, safe-exceptions }:
+ ({ mkDerivation, base, fused-effects, safe-exceptions
+ , unliftio-core
+ }:
mkDerivation {
pname = "fused-effects-exceptions";
- version = "0.1.0.0";
- sha256 = "0ga4cjlmrc577gps0mhy37n1np2ds0wcfnq3nbhvz3fy3m5fzylz";
- libraryHaskellDepends = [ base fused-effects safe-exceptions ];
+ version = "0.1.1.0";
+ sha256 = "0b9rj752ry72n6ln4fj9n6m2d1qfdxp229hzkgxznag0rr3bm5rd";
+ revision = "1";
+ editedCabalFile = "1sg9gvv5lf4z7h70szjcqilhxxjmkiyriz95qyvahplln9p6281l";
+ libraryHaskellDepends = [
+ base fused-effects safe-exceptions unliftio-core
+ ];
description = "Handle exceptions thrown in IO with fused-effects";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -86312,12 +87513,12 @@ self: {
}) {};
"fused-effects-lens" = callPackage
- ({ mkDerivation, base, fused-effects, hspec, lens }:
+ ({ mkDerivation, base, fused-effects, hspec, lens, microlens }:
mkDerivation {
pname = "fused-effects-lens";
- version = "0.1.0.0";
- sha256 = "010gavgbv5zvszvn6gizz7sx405fclfh6ik58a2sd0kf8mvsgzs8";
- libraryHaskellDepends = [ base fused-effects lens ];
+ version = "0.2.0.0";
+ sha256 = "199afrkhb1dhah3jy3xyq5k71cqbzf9m8ninyh95qmam600r8q0m";
+ libraryHaskellDepends = [ base fused-effects microlens ];
testHaskellDepends = [ base fused-effects hspec lens ];
description = "Monadic lens combinators for fused-effects";
license = stdenv.lib.licenses.bsd3;
@@ -86353,8 +87554,8 @@ self: {
}:
mkDerivation {
pname = "futhark";
- version = "0.10.2";
- sha256 = "0mff8kdjihakaf2gmy3a1ln9ghnqis72gqldssp9b4ahn2xni1v8";
+ version = "0.11.2";
+ sha256 = "0bjbz5zan20bpid2i6kbjwk589gkdwfvfawlg27j13p8a82srpdf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -86606,6 +87807,53 @@ self: {
broken = true;
}) {};
+ "g2" = callPackage
+ ({ mkDerivation, array, base, bytestring, Cabal, concurrent-extra
+ , containers, directory, extra, filepath, ghc, ghc-paths, hashable
+ , hpc, HTTP, liquid-fixpoint, liquidhaskell, MissingH, mtl, parsec
+ , process, reducers, regex-base, regex-compat, split, tagged, tasty
+ , tasty-hunit, template-haskell, temporary-rc, text, time
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "g2";
+ version = "0.1.0.1";
+ sha256 = "0bknkpnyqmd2sxbbc9634rrd42ay3gp84g4wd6fb7h8zqww0icnq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bytestring Cabal concurrent-extra containers directory
+ extra filepath ghc ghc-paths hashable hpc HTTP liquid-fixpoint
+ liquidhaskell MissingH mtl parsec process reducers regex-base
+ regex-compat split template-haskell temporary-rc text time
+ unordered-containers
+ ];
+ executableHaskellDepends = [
+ base containers filepath ghc hpc text time unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers filepath ghc ghc-paths hashable hpc tagged tasty
+ tasty-hunit text time unordered-containers
+ ];
+ description = "Haskell symbolic execution engine";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "g2q" = callPackage
+ ({ mkDerivation, base, g2 }:
+ mkDerivation {
+ pname = "g2q";
+ version = "0.1.0.0";
+ sha256 = "1g42xkc4jc1a94s1krr1yrn191f8d6rmcpwk9ndwzk3nwby9v1vf";
+ libraryHaskellDepends = [ base g2 ];
+ description = "G2Q allows constraint programming, via writing Haskell predicates";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"g4ip" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -86656,6 +87904,32 @@ self: {
broken = true;
}) {};
+ "galois-field" = callPackage
+ ({ mkDerivation, base, criterion, integer-gmp, MonadRandom
+ , protolude, tasty, tasty-discover, tasty-quickcheck
+ , wl-pprint-text
+ }:
+ mkDerivation {
+ pname = "galois-field";
+ version = "0.2.0";
+ sha256 = "19q08k5aqnp1vcvlnlw6h4qmlh80dj1rglzckzf7ak78ifcwm1m8";
+ libraryHaskellDepends = [
+ base integer-gmp MonadRandom protolude tasty-quickcheck
+ wl-pprint-text
+ ];
+ testHaskellDepends = [
+ base integer-gmp MonadRandom protolude tasty tasty-discover
+ tasty-quickcheck wl-pprint-text
+ ];
+ testToolDepends = [ tasty-discover ];
+ benchmarkHaskellDepends = [
+ base criterion integer-gmp MonadRandom protolude tasty-quickcheck
+ wl-pprint-text
+ ];
+ description = "Galois field library";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"game-of-life" = callPackage
({ mkDerivation, array, base, hscurses, hspec, random, text }:
mkDerivation {
@@ -86892,18 +88166,12 @@ self: {
}) {};
"gc" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest
- , filepath, hlint, parallel
- }:
+ ({ mkDerivation, base }:
mkDerivation {
pname = "gc";
- version = "0.0.2";
- sha256 = "03637njk3pqbqvng7zf370ykykm3nnsxvmp09qcfp6iihz45mk1r";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
+ version = "0.0.3";
+ sha256 = "0cql0csrwqddpw28qmpr47mcnszmdc2szwvbnardr86pmjhvgwph";
libraryHaskellDepends = [ base ];
- testHaskellDepends = [
- base directory doctest filepath hlint parallel
- ];
description = "Poor Richard's Memory Manager";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -87527,8 +88795,6 @@ self: {
];
description = "Derivation of Aeson instances using GHC generics";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"generic-arbitrary" = callPackage
@@ -87588,15 +88854,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "generic-data_0_6_0_1" = callPackage
+ "generic-data_0_7_0_0" = callPackage
({ mkDerivation, base, base-orphans, contravariant, criterion
, deepseq, generic-lens, one-liner, show-combinators, tasty
, tasty-hunit
}:
mkDerivation {
pname = "generic-data";
- version = "0.6.0.1";
- sha256 = "0qahlf5vsnpy306xr9mpjif5hq21xzyw067051sfxv5k27gx4f1k";
+ version = "0.7.0.0";
+ sha256 = "156d8zx425bpghp903260x1fdgnvwkyd7483mdjdg5l54ff9via8";
libraryHaskellDepends = [
base base-orphans contravariant show-combinators
];
@@ -87658,6 +88924,8 @@ self: {
pname = "generic-deriving";
version = "1.12.4";
sha256 = "0vdg9qdq35jl3m11a87wk8cq1y71qm4i1g1b2pxki0wk70yw20a4";
+ revision = "1";
+ editedCabalFile = "16z0748pw4j28ib6vg5yzjm8wrarqkclr7l597q5zjxabjdn1ygj";
libraryHaskellDepends = [
base containers ghc-prim template-haskell th-abstraction
];
@@ -87711,6 +88979,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "generic-lens_1_2_0_0" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
+ , inspection-testing, lens, profunctors, QuickCheck, tagged, text
+ }:
+ mkDerivation {
+ pname = "generic-lens";
+ version = "1.2.0.0";
+ sha256 = "0qf49s01xkbhlfclc4a3ybhhf65g6mmigkkqj2psdjndgjdaxhb2";
+ libraryHaskellDepends = [ base profunctors tagged text ];
+ testHaskellDepends = [
+ base doctest HUnit inspection-testing lens profunctors
+ ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq lens QuickCheck
+ ];
+ description = "Generically derive traversals, lenses and prisms";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"generic-lens-labels" = callPackage
({ mkDerivation, base, generic-lens }:
mkDerivation {
@@ -87919,8 +89207,6 @@ self: {
testToolDepends = [ markdown-unlit ];
description = "A library for generic programming that aims to be easy to understand";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"generics-mrsop" = callPackage
@@ -87965,19 +89251,49 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "generics-sop_0_5_0_0" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "generics-sop";
+ version = "0.5.0.0";
+ sha256 = "18dkdain2g46b1637f3pbv0fkzg4b1a8frm16hfqvhpfk46i7rzc";
+ libraryHaskellDepends = [
+ base ghc-prim sop-core template-haskell
+ ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq template-haskell
+ ];
+ description = "Generic Programming using True Sums of Products";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"generics-sop-lens" = callPackage
({ mkDerivation, base, generics-sop, lens }:
mkDerivation {
pname = "generics-sop-lens";
- version = "0.1.2.1";
- sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf";
- revision = "6";
- editedCabalFile = "0j4j3kk2nsl5n5gp0vrzqdc5y9ly31b4nvhq0bpgcpzibvik7ssw";
+ version = "0.1.3";
+ sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay";
libraryHaskellDepends = [ base generics-sop lens ];
description = "Lenses for types in generics-sop";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "generics-sop-lens_0_2" = callPackage
+ ({ mkDerivation, base, generics-sop, lens }:
+ mkDerivation {
+ pname = "generics-sop-lens";
+ version = "0.2";
+ sha256 = "0cm3xnz5h1pxhvbgl8mm16fg8y339m6wvm6nlqmsm0jh37gvqc2a";
+ libraryHaskellDepends = [ base generics-sop lens ];
+ description = "Lenses for types in generics-sop";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genericserialize" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -88499,8 +89815,8 @@ self: {
}:
mkDerivation {
pname = "genvalidity-hspec-hashable";
- version = "0.2.0.3";
- sha256 = "0lb1aiv07fbbkyhh8ig2lhqgm9yibrny2bw9qwbdkwwsi6hk4566";
+ version = "0.2.0.4";
+ sha256 = "1vyd14cmsj54kbfbidgsy8r695zza635bxwg2i95gl1i314dzy1n";
libraryHaskellDepends = [
base genvalidity genvalidity-hspec genvalidity-property hashable
hspec QuickCheck validity
@@ -88943,6 +90259,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "geojson_4_0_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , hlint, lens, scientific, semigroups, tasty, tasty-hspec
+ , tasty-quickcheck, text, transformers, validation, vector
+ }:
+ mkDerivation {
+ pname = "geojson";
+ version = "4.0.1";
+ sha256 = "100k6j57r14yxxhfpqlgm9q1x5hrj3qdzm7cpbs5rfyqi5g7kyrj";
+ libraryHaskellDepends = [
+ aeson base containers deepseq lens scientific semigroups text
+ transformers validation vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers hlint tasty tasty-hspec
+ tasty-quickcheck text validation
+ ];
+ description = "A thin GeoJSON Layer above the aeson library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"geojson-types" = callPackage
({ mkDerivation, aeson, base, bson, bytestring, lens, text }:
mkDerivation {
@@ -89139,6 +90477,8 @@ self: {
];
description = "Github Standard Labeler";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"gh-pocket-knife" = callPackage
@@ -89308,8 +90648,6 @@ self: {
];
description = "An AST and compiler plugin for dumping GHC's Core representation";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ghc-dump-tree" = callPackage
@@ -89359,8 +90697,6 @@ self: {
];
description = "Handy tools for working with @ghc-dump@ dumps";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ghc-dup" = callPackage
@@ -89382,8 +90718,8 @@ self: {
}:
mkDerivation {
pname = "ghc-events";
- version = "0.8.0.2";
- sha256 = "1cg2p0scnjk4ijr1kjp41d2kls2v7ixsfhdv5331bs04nah06ddy";
+ version = "0.9.0";
+ sha256 = "004dfjqhqy0lpmadjmvz270ja6k2dmwbprnispdxmlg8rc5y3m10";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -89468,15 +90804,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-exactprint_0_6" = callPackage
+ "ghc-exactprint_0_6_1" = callPackage
({ mkDerivation, base, bytestring, containers, Diff, directory
, filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
, silently, syb
}:
mkDerivation {
pname = "ghc-exactprint";
- version = "0.6";
- sha256 = "1m5ri5rn9inh9m70bpm695848pbwkjvk8gvvk8my0jpcba1wsnlq";
+ version = "0.6.1";
+ sha256 = "12nqpqmi9c57a3hgpfy8q073zryz66ylmcvf29hyffpj7vmmnvhl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -89630,8 +90966,8 @@ self: {
}:
mkDerivation {
pname = "ghc-lib";
- version = "0.20190423";
- sha256 = "1jj4ph9ldxicccs3myqmll9x3a1rl9zv95b797mm9yas80sbijnx";
+ version = "8.8.0.20190424";
+ sha256 = "03f1racabmixc4jk3mn6k6cnhapaplswa8fbb9yajrzj56ag16wm";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -89655,8 +90991,8 @@ self: {
}:
mkDerivation {
pname = "ghc-lib-parser";
- version = "0.20190423";
- sha256 = "1vwfsyyj8h0x56zq498mhjbpj6bz9n901v3mwyn5hzp7c25zdv5k";
+ version = "8.8.0.20190424";
+ sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
@@ -89820,8 +91156,6 @@ self: {
libraryToolDepends = [ cpphs happy ];
description = "Haskell source parser from GHC";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ghc-paths" = callPackage
@@ -90056,8 +91390,8 @@ self: {
({ mkDerivation, base, ghc, hspec, hspec-discover, text }:
mkDerivation {
pname = "ghc-syntax-highlighter";
- version = "0.0.3.1";
- sha256 = "1r45954nchn5rink3qrdv6pqigwsm1a2fyb297b56kpgz47cfgd7";
+ version = "0.0.4.0";
+ sha256 = "1kw1h7n4ydn1klzll24nwwg405j23wry9hg8g96vba51vah0wc47";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base ghc text ];
testHaskellDepends = [ base hspec text ];
@@ -90409,6 +91743,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghcid_0_7_5" = callPackage
+ ({ mkDerivation, ansi-terminal, base, cmdargs, containers
+ , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
+ , terminal-size, time, unix
+ }:
+ mkDerivation {
+ pname = "ghcid";
+ version = "0.7.5";
+ sha256 = "0ics4ibkr9p8pd81hfr7wk1wi10rjbsmwqcln8sda61p9v46pdh4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base cmdargs directory extra filepath process time
+ ];
+ executableHaskellDepends = [
+ ansi-terminal base cmdargs containers directory extra filepath
+ fsnotify process terminal-size time unix
+ ];
+ testHaskellDepends = [
+ ansi-terminal base cmdargs containers directory extra filepath
+ fsnotify process tasty tasty-hunit terminal-size time unix
+ ];
+ description = "GHCi based bare bones IDE";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghcjs-ajax" = callPackage
({ mkDerivation, aeson, base, http-types, text }:
mkDerivation {
@@ -90494,8 +91855,6 @@ self: {
];
description = "DOM library that supports both GHCJS and GHC";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ghcjs-dom-hello" = callPackage
@@ -90530,8 +91889,6 @@ self: {
doHaddock = false;
description = "DOM library that supports both GHCJS and GHC using jsaddle";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ghcjs-dom-jsffi" = callPackage
@@ -90757,19 +92114,38 @@ self: {
}:
mkDerivation {
pname = "gi-atk";
- version = "2.0.15";
- sha256 = "1vmzby12nvbrka6f44pr1pjwccl0p6s984pxvibajzp72x2knxc9";
+ version = "2.0.18";
+ sha256 = "15lh4pxif4gw3b7lly5135wabj9156jxsylrwsdppkcfcvxlbp26";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ atk ];
- doHaddock = false;
description = "Atk bindings";
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) atk;};
+ "gi-atk_2_0_20" = callPackage
+ ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
+ , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-atk";
+ version = "2.0.20";
+ sha256 = "0pgmsd486l7ym8yi8png1zw90zk505jbdxj6jmh2hn096dl9wdrw";
+ setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-glib gi-gobject haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ atk ];
+ description = "Atk bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) atk;};
+
"gi-cairo" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, containers
, haskell-gi, haskell-gi-base, haskell-gi-overloading, text
@@ -90794,6 +92170,30 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) cairo;};
+ "gi-cairo_1_0_22" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+ , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "gi-cairo";
+ version = "1.0.22";
+ sha256 = "1kk91v31pw14jdk8q2jkhiknw7qx4pll2cljxs8ahraclinakj1r";
+ setupHaskellDepends = [ base Cabal haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers haskell-gi haskell-gi-base
+ haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ cairo ];
+ preCompileBuildDriver = ''
+ PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
+ setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
+ '';
+ description = "Cairo bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) cairo;};
+
"gi-cairo-again" = callPackage
({ mkDerivation, base, cairo-core, haskell-gi-base
, template-haskell
@@ -90834,6 +92234,8 @@ self: {
pname = "gi-cairo-render";
version = "0.0.1";
sha256 = "0arbynn7ilrc3shddff1rxcvlg6k3m617lrq4fdsqfas3amxarm4";
+ revision = "1";
+ editedCabalFile = "10lpmb8js19zfgnph31yz4nzyv7kbqvq1lx07w12q702khqcqb7z";
libraryHaskellDepends = [
array base bytestring haskell-gi-base mtl text utf8-string
];
@@ -90850,17 +92252,18 @@ self: {
}:
mkDerivation {
pname = "gi-dbusmenu";
- version = "0.4.1";
- sha256 = "0fi07jf6bsrxsk101ffpyv17lirjgyx4afz26lhbpkqadnpc3kp4";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "0.4.6";
+ sha256 = "0yyd6hyfzkpq2qn1bsj2gqgxk35z8ggi6rs8nnz908fcr0k1zr2m";
+ setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ libdbusmenu ];
- doHaddock = false;
description = "Dbusmenu bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) libdbusmenu;};
"gi-dbusmenugtk3" = callPackage
@@ -90871,18 +92274,22 @@ self: {
}:
mkDerivation {
pname = "gi-dbusmenugtk3";
- version = "0.4.2";
- sha256 = "0wflxyicav2p1z2sqdrjpvkf4blsilg7psvbr0cfl0r7vmy6nx4w";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "0.4.7";
+ sha256 = "143xhf8d968bj5w443211vfl0vs27ygj65cdzdsidfz3vh56ms9r";
+ setupHaskellDepends = [
+ base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib
+ gi-gobject gi-gtk haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf
gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base
haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
- doHaddock = false;
description = "DbusmenuGtk bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
"gi-gdk" = callPackage
@@ -90906,6 +92313,31 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) gtk3;};
+ "gi-gdk_3_0_21" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+ , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
+ , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "gi-gdk";
+ version = "3.0.21";
+ sha256 = "0lfsmq3kfcz7g16zhvz84x0vqc59ifagcbkm1vv2g0lk10j7zg5x";
+ setupHaskellDepends = [
+ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango
+ haskell-gi
+ ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
+ gi-gobject gi-pango haskell-gi haskell-gi-base
+ haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ gtk3 ];
+ description = "Gdk bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gtk3;};
+
"gi-gdkpixbuf" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
, gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
@@ -90913,19 +92345,40 @@ self: {
}:
mkDerivation {
pname = "gi-gdkpixbuf";
- version = "2.0.18";
- sha256 = "1b9ypv07siyr9gry471skc3qlaiwqf055ywz8nib5x39vs6rfcpj";
+ version = "2.0.20";
+ sha256 = "1i3z9yk2zb15pwpgijdvyr08q8yc7yzm92jijgscwly9z6nin6x4";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gdk_pixbuf ];
- doHaddock = false;
description = "GdkPixbuf bindings";
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) gdk_pixbuf;};
+ "gi-gdkpixbuf_2_0_22" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
+ , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+ , haskell-gi-overloading, text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-gdkpixbuf";
+ version = "2.0.22";
+ sha256 = "1mj7h1053ib8bzgka4zfn7mxyd1m05az7l0dijw531v32378s5kq";
+ setupHaskellDepends = [
+ base Cabal gi-gio gi-glib gi-gobject haskell-gi
+ ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ gdk_pixbuf ];
+ description = "GdkPixbuf bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gdk_pixbuf;};
+
"gi-gdkx11" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
, gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi
@@ -90933,18 +92386,21 @@ self: {
}:
mkDerivation {
pname = "gi-gdkx11";
- version = "3.0.4";
- sha256 = "0pm1jnmal4vy53icndzzs76vcvxzn3lm31dfwg6nb6fnch5p4036";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "3.0.8";
+ sha256 = "0vz26ls00m16a4mfbiw4vwmnr3plyds4wr914q5jx9xrhr3mp202";
+ setupHaskellDepends = [
+ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject
gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text
transformers
];
libraryPkgconfigDepends = [ gtk3 ];
- doHaddock = false;
description = "GdkX11 bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gtk3;};
"gi-ggit" = callPackage
@@ -90954,17 +92410,20 @@ self: {
}:
mkDerivation {
pname = "gi-ggit";
- version = "1.0.2";
- sha256 = "17449xz5v5n1i6c7vgrszq395v78q2hp2zjlnc85zxj5qlnkwz64";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.7";
+ sha256 = "1x84yi4c97jg6f4spp3s1bxcm5ny310yyji5s9izkd3dzagb2kxf";
+ setupHaskellDepends = [
+ base Cabal gi-gio gi-glib gi-gobject haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ libgit2-glib ];
- doHaddock = false;
description = "libgit2-glib bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) libgit2-glib;};
"gi-gio" = callPackage
@@ -90986,6 +92445,26 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib;};
+ "gi-gio_2_0_24" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+ , gi-gobject, glib, haskell-gi, haskell-gi-base
+ , haskell-gi-overloading, text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-gio";
+ version = "2.0.24";
+ sha256 = "0f49a3bqv0izwz9pbc9yxb5ysg8hwjmw85qjyfzsqndanmjsrlrz";
+ setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-glib gi-gobject haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ glib ];
+ description = "Gio bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) glib;};
+
"gi-girepository" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base
@@ -90993,17 +92472,18 @@ self: {
}:
mkDerivation {
pname = "gi-girepository";
- version = "1.0.16";
- sha256 = "1kb7vyqks6br8z2bjp9wzj0dvh76s35dbx93iijgl138270ikww6";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.21";
+ sha256 = "15i5p1s8qj5f2m6kf69xzjndisgbi5184vya88py1b12284klvrv";
+ setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gobject-introspection ];
- doHaddock = false;
description = "GIRepository (gobject-introspection) bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gobject-introspection;};
"gi-glib" = callPackage
@@ -91025,6 +92505,26 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib;};
+ "gi-glib_2_0_22" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, glib
+ , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "gi-glib";
+ version = "2.0.22";
+ sha256 = "0wb494n9zci7kchw3043108rmdymycj0rkv83gib7l01gilpgjjl";
+ setupHaskellDepends = [ base Cabal haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers haskell-gi haskell-gi-base
+ haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ glib ];
+ description = "GLib bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) glib;};
+
"gi-gobject" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
, haskell-gi, haskell-gi-base, haskell-gi-overloading, text
@@ -91032,19 +92532,38 @@ self: {
}:
mkDerivation {
pname = "gi-gobject";
- version = "2.0.16";
- sha256 = "1bgn4ywx94py0v213iv7mbjjvvy3y7gvpgw4wpn38s2np7al8y65";
+ version = "2.0.19";
+ sha256 = "1s10417vmrzdbzwkqzxj88c8mvcvicpxgdc9hm1m99c2z132rj23";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib haskell-gi haskell-gi-base
haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ glib ];
- doHaddock = false;
description = "GObject bindings";
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib;};
+ "gi-gobject_2_0_21" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
+ , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "gi-gobject";
+ version = "2.0.21";
+ sha256 = "0il4z77wm6njilqx2jjjkldlgp0fk9m5lwwhfnalqasb7h2i90mn";
+ setupHaskellDepends = [ base Cabal gi-glib haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-glib haskell-gi haskell-gi-base
+ haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ glib ];
+ description = "GObject bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) glib;};
+
"gi-gst" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, gstreamer, haskell-gi, haskell-gi-base
@@ -91052,17 +92571,18 @@ self: {
}:
mkDerivation {
pname = "gi-gst";
- version = "1.0.16";
- sha256 = "0yygachni7ybb14sj8fqlb831154i1v4b7wn2z1qva6yx1h9gr3l";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.21";
+ sha256 = "1nj1iyhfvi3a5mwkr4x0gn26bykdjdam3gwsl1hkbg21zvjkd087";
+ setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gstreamer ];
- doHaddock = false;
description = "GStreamer bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs.gst_all_1) gstreamer;};
"gi-gstaudio" = callPackage
@@ -91072,17 +92592,20 @@ self: {
}:
mkDerivation {
pname = "gi-gstaudio";
- version = "1.0.15";
- sha256 = "0yw6z11d0wgfa19446s34hr260mfasbsd1h7mzfyd690nzicyh8p";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.20";
+ sha256 = "09v36n019ka4nj65x082gkg2j4r3q0ibvrcq5p6ka7kq8rhfxhx0";
+ setupHaskellDepends = [
+ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
haskell-gi haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gst-plugins-base ];
- doHaddock = false;
description = "GStreamerAudio bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
"gi-gstbase" = callPackage
@@ -91092,17 +92615,20 @@ self: {
}:
mkDerivation {
pname = "gi-gstbase";
- version = "1.0.16";
- sha256 = "1pqkiqlhvwjkw9b9i36md7nhi8205940d4jbcvaqywa82hv7k2aa";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.21";
+ sha256 = "03awzmc62hw1nmw0b3xczmxmk5drrlhq0clh7lhxlj1r1nzq2ack";
+ setupHaskellDepends = [
+ base Cabal gi-glib gi-gobject gi-gst haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gst-plugins-base ];
- doHaddock = false;
description = "GStreamerBase bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
"gi-gstpbutils" = callPackage
@@ -91113,16 +92639,18 @@ self: {
}:
mkDerivation {
pname = "gi-gstpbutils";
- version = "1.0.15";
- sha256 = "161wh4rn4f6lsnk8x12fwzn016fv4pymfb3vg6zlfijyj3avhdh9";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.20";
+ sha256 = "10kbk7mk829xc0rkzzhpz53v39xfl5f6my1smjdqdwdnxxgcsl5w";
+ setupHaskellDepends = [
+ base Cabal gi-glib gi-gobject gi-gst gi-gstaudio gi-gsttag
+ gi-gstvideo haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio
gi-gsttag gi-gstvideo haskell-gi haskell-gi-base
haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gstreamer-pbutils ];
- doHaddock = false;
description = "GStreamer Plugins Base Utils bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -91136,15 +92664,16 @@ self: {
}:
mkDerivation {
pname = "gi-gsttag";
- version = "1.0.15";
- sha256 = "1i5wqrhipyagsv94yfjfg6wmdbgnjg03mjxbfq5mx09g61iznl2r";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.20";
+ sha256 = "1jhly2jhfy2a79maj4x2p7idqr1f82znizfimkyvdnf8rbrr1h3h";
+ setupHaskellDepends = [
+ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
haskell-gi haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gstreamer-tag ];
- doHaddock = false;
description = "GStreamer Tag bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -91158,17 +92687,20 @@ self: {
}:
mkDerivation {
pname = "gi-gstvideo";
- version = "1.0.16";
- sha256 = "0g6z15di4lk3l6hxpl6yqffw23kya3r2khxs4ah6vmkdn42wcalw";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.21";
+ sha256 = "05sv1an6za2ywxh6dzy4d79g1dm0jyypqkhz40g0pk5kxvgi4gkm";
+ setupHaskellDepends = [
+ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
haskell-gi haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gst-plugins-base ];
- doHaddock = false;
description = "GStreamerVideo bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
"gi-gtk" = callPackage
@@ -91192,6 +92724,31 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) gtk3;};
+ "gi-gtk_3_0_31" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+ , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+ , gi-pango, gtk3, haskell-gi, haskell-gi-base
+ , haskell-gi-overloading, text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-gtk";
+ version = "3.0.31";
+ sha256 = "00bfy8hn56cm5zm005vdnwwzsw5bzangipxv47n01jp4ksn3wdpx";
+ setupHaskellDepends = [
+ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
+ gi-gobject gi-pango haskell-gi
+ ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+ gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
+ haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ gtk3 ];
+ description = "Gtk bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gtk3;};
+
"gi-gtk-declarative" = callPackage
({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject
, gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, mtl
@@ -91199,8 +92756,8 @@ self: {
}:
mkDerivation {
pname = "gi-gtk-declarative";
- version = "0.4.2";
- sha256 = "0ps400bw7vsb0g67b5k0hzka3li389mmlwvlivkhi7l5a1cz751j";
+ version = "0.4.3";
+ sha256 = "148daz8a6nj6djvsfiy5yk7lfyxhdjl5l34a7d6nn66mikc8538b";
libraryHaskellDepends = [
base gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base
haskell-gi-overloading mtl text unordered-containers vector
@@ -91219,8 +92776,8 @@ self: {
}:
mkDerivation {
pname = "gi-gtk-declarative-app-simple";
- version = "0.4.1";
- sha256 = "0m6x1pwfzrd2d1jkj777i10f736fzbsj9cw5wdfglakf5j2flb8p";
+ version = "0.4.2";
+ sha256 = "1ydaxs2isqpy8ld8nlg4plr7ry5xni3g93m9kxdm2klz8xzs3js7";
libraryHaskellDepends = [
async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative
haskell-gi haskell-gi-base haskell-gi-overloading pipes
@@ -91247,6 +92804,24 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {};
+ "gi-gtk-hs_0_3_7_0" = callPackage
+ ({ mkDerivation, base, base-compat, containers, gi-gdk
+ , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-gtk-hs";
+ version = "0.3.7.0";
+ sha256 = "0z64avmb13k7cvps51xj6j3jrxsdnqnpkh9038lm68vkkadv2dag";
+ libraryHaskellDepends = [
+ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
+ gi-gtk haskell-gi-base mtl text transformers
+ ];
+ description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"gi-gtkosxapplication" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
, gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi
@@ -91291,6 +92866,57 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) gtksourceview3;};
+ "gi-gtksource_3_0_21" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+ , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+ , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base
+ , haskell-gi-overloading, text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-gtksource";
+ version = "3.0.21";
+ sha256 = "1y64hlcpy536x053p7xkhm6jgb7ahhj0zkgzgf962d8mqadaqzr0";
+ setupHaskellDepends = [
+ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
+ gi-gobject gi-gtk gi-pango haskell-gi
+ ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+ gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ gtksourceview3 ];
+ description = "GtkSource bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gtksourceview3;};
+
+ "gi-handy" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+ , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, haskell-gi
+ , haskell-gi-base, haskell-gi-overloading, libhandy, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "gi-handy";
+ version = "0.0.5";
+ sha256 = "1a4ihmmqx82gmyn0lhwqcpijswciqjxq7dl17vbgycpvzabhpvyl";
+ setupHaskellDepends = [
+ base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk
+ haskell-gi
+ ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
+ gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text
+ transformers
+ ];
+ libraryPkgconfigDepends = [ libhandy ];
+ description = "libhandy bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {inherit (pkgs) libhandy;};
+
"gi-javascriptcore" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
@@ -91312,6 +92938,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) webkitgtk;};
+ "gi-javascriptcore_4_0_20" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+ , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
+ , text, transformers, webkitgtk
+ }:
+ mkDerivation {
+ pname = "gi-javascriptcore";
+ version = "4.0.20";
+ sha256 = "0n8aiazjsh74f8k2nbjia619401pwackdxmnb2chzpsqad9kqxrh";
+ setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-glib gi-gobject haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ webkitgtk ];
+ description = "JavaScriptCore bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) webkitgtk;};
+
"gi-notify" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
@@ -91319,15 +92965,16 @@ self: {
}:
mkDerivation {
pname = "gi-notify";
- version = "0.7.15";
- sha256 = "1lk27dw7kyiikknmj858g4hv9p48161ixs3qq8pb08jkjlzcwfw8";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "0.7.20";
+ sha256 = "0dr9zs6j3cbdxfd6ja2d5ch87scrqlnzp4xlj1dx6inwnhl150yq";
+ setupHaskellDepends = [
+ base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
haskell-gi haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ libnotify ];
- doHaddock = false;
description = "Libnotify bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -91341,18 +92988,21 @@ self: {
}:
mkDerivation {
pname = "gi-ostree";
- version = "1.0.6";
- sha256 = "04pq0vz2dcyyq03l2gr0mms1l0dvh4ci17kcla6h1nw1lq5f1l6m";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.11";
+ sha256 = "0gwxdc4rddndvnw1izwapvi926dl6v0ljpp5504k67a8kszaycx0";
+ setupHaskellDepends = [
+ base Cabal gi-gio gi-glib gi-gobject haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ ostree ];
- doHaddock = false;
description = "OSTree bindings";
license = stdenv.lib.licenses.lgpl21;
platforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) ostree;};
"gi-pango" = callPackage
@@ -91362,8 +93012,8 @@ self: {
}:
mkDerivation {
pname = "gi-pango";
- version = "1.0.16";
- sha256 = "1x3q1q4ww1v6v42p1wcaghxsja8cigqaqvklkfg4gxyp2f2cdg57";
+ version = "1.0.19";
+ sha256 = "1zrxqi5w9w3lgnmw64pah36y1iwp96vsgnzxwzjizmxc03waaf98";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi
@@ -91378,6 +93028,30 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) cairo; inherit (pkgs) pango;};
+ "gi-pango_1_0_21" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+ , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+ , haskell-gi-overloading, pango, text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-pango";
+ version = "1.0.21";
+ sha256 = "1adlwkwqlqnck3fq601my22iqh9lbvjy4vvy5zbmcs942j3lj691";
+ setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-glib gi-gobject haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ cairo pango ];
+ preCompileBuildDriver = ''
+ PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
+ setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
+ '';
+ description = "Pango bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
+
"gi-pangocairo" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, containers
, gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi
@@ -91386,21 +93060,24 @@ self: {
}:
mkDerivation {
pname = "gi-pangocairo";
- version = "1.0.17";
- sha256 = "1ysf9an7cmacyz7hzw0p7zshrn466v51d0dpqbkn2j1p2akr2v1a";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "1.0.22";
+ sha256 = "09axv2wn686xwsdmrh2v71j8p0qkchvws30aamkzcdclbfwxa3aw";
+ setupHaskellDepends = [
+ base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
haskell-gi haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ cairo pango ];
- doHaddock = false;
preCompileBuildDriver = ''
PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
description = "PangoCairo bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) cairo; inherit (pkgs) pango;};
"gi-poppler" = callPackage
@@ -91410,15 +93087,16 @@ self: {
}:
mkDerivation {
pname = "gi-poppler";
- version = "0.18.15";
- sha256 = "1qbsmgx0nfn3pm6ffkhaq1wy26jdwnq5zjsxs32cf8ipdzlhg3cv";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "0.18.20";
+ sha256 = "1jkzrrzdkn60akiijyzbq5sf0digawrzxm556dirxcjksh829zby";
+ setupHaskellDepends = [
+ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
haskell-gi haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ poppler ];
- doHaddock = false;
description = "Poppler bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -91432,17 +93110,20 @@ self: {
}:
mkDerivation {
pname = "gi-secret";
- version = "0.0.5";
- sha256 = "0jwdv8fmc7wbwbh3nc1may4ij078xz9xc55rkr62x1szxi6ihdq5";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "0.0.10";
+ sha256 = "1ylgn8yvrksf8swk1gw6n8kw0dqvr92l9fj4jzxzpskfrmgk82ln";
+ setupHaskellDepends = [
+ base Cabal gi-gio gi-glib gi-gobject haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ libsecret ];
- doHaddock = false;
description = "Libsecret bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) libsecret;};
"gi-soup" = callPackage
@@ -91452,17 +93133,20 @@ self: {
}:
mkDerivation {
pname = "gi-soup";
- version = "2.4.16";
- sha256 = "01qsq8hy974j8i35spac1iyc46jrl4p0nnlx666nlxqa08a1f438";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "2.4.21";
+ sha256 = "01zqzp4mpwkg3cfgx91harjds3bbxs0giqr4lly9z37ksbr2siv0";
+ setupHaskellDepends = [
+ base Cabal gi-gio gi-glib gi-gobject haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ libsoup ];
- doHaddock = false;
description = "Libsoup bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) libsoup;};
"gi-vte" = callPackage
@@ -91486,6 +93170,31 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {vte_291 = pkgs.vte;};
+ "gi-vte_2_91_24" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+ , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
+ , haskell-gi-base, haskell-gi-overloading, text, transformers
+ , vte_291
+ }:
+ mkDerivation {
+ pname = "gi-vte";
+ version = "2.91.24";
+ sha256 = "1grqallhd1sklcmfhrrmjisj5yp9znx1yqzdn3v5awldjcj54025";
+ setupHaskellDepends = [
+ base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango
+ haskell-gi
+ ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
+ gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading
+ text transformers
+ ];
+ libraryPkgconfigDepends = [ vte_291 ];
+ description = "Vte bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {vte_291 = pkgs.vte;};
+
"gi-webkit" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
@@ -91517,16 +93226,18 @@ self: {
}:
mkDerivation {
pname = "gi-webkit2";
- version = "4.0.19";
- sha256 = "1hnxp1vk2qhi7shr4qd7khi2nq0vpn58f1g6j7dkl0h23266fwz2";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "4.0.24";
+ sha256 = "1sxn9v361bp0arl3mq3dg9k1igaf9gcwxx0p7xlwqvqabgs4nr2q";
+ setupHaskellDepends = [
+ base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk
+ gi-javascriptcore gi-soup haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ webkitgtk ];
- doHaddock = false;
description = "WebKit2 bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -91540,16 +93251,18 @@ self: {
}:
mkDerivation {
pname = "gi-webkit2webextension";
- version = "4.0.17";
- sha256 = "0lpz5a9395bqfmxbhfjfbqi4832a68ybbr1y0c475r8ya6pnx4cq";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "4.0.23";
+ sha256 = "073rkgfp120ccabxk7nh72p3h7qs7b9qaqr3d1wlcb18grhnvyl4";
+ setupHaskellDepends = [
+ base Cabal gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup
+ haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-gio gi-gobject gi-gtk
gi-javascriptcore gi-soup haskell-gi haskell-gi-base
haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ webkitgtk ];
- doHaddock = false;
description = "WebKit2-WebExtension bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -91563,16 +93276,17 @@ self: {
}:
mkDerivation {
pname = "gi-wnck";
- version = "3.0.1";
- sha256 = "06l1gqnznpa7rgimk1l49i3yfzdaawb26vqz3baswrksmi9mhrhh";
- setupHaskellDepends = [ base Cabal haskell-gi ];
+ version = "3.0.6";
+ sha256 = "10x5ijcbxvgbrzi4l7mjx336q83kz1kmayan7kpa46zimvj8vn6g";
+ setupHaskellDepends = [
+ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gobject gi-gtk haskell-gi
+ ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-gdk gi-gdkpixbuf gi-gobject
gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text
transformers
];
libraryPkgconfigDepends = [ libwnck ];
- doHaddock = false;
description = "Wnck bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -91586,17 +93300,18 @@ self: {
}:
mkDerivation {
pname = "gi-xlib";
- version = "2.0.2";
- sha256 = "0w9dwnd7a9hh1qn3swa48i8hp4gx9kznc92zjf198lrmrbkamp22";
+ version = "2.0.7";
+ sha256 = "0rcl4wxnghlbyc2ddf131pm7wkj2psjzbqfhgv92av3kvz9y513z";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers haskell-gi haskell-gi-base
haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ xlibsWrapper ];
- doHaddock = false;
description = "xlib bindings";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) xlibsWrapper;};
"giak" = callPackage
@@ -91633,15 +93348,15 @@ self: {
"ginger" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring
- , data-default, filepath, http-types, mtl, parsec, process
- , regex-tdfa, safe, scientific, tasty, tasty-hunit
+ , data-default, filepath, http-types, mtl, optparse-applicative
+ , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit
, tasty-quickcheck, text, time, transformers, unordered-containers
, utf8-string, vector, yaml
}:
mkDerivation {
pname = "ginger";
- version = "0.8.4.0";
- sha256 = "0mk0jmw0qvbv73n7g8n14shnyxjkkq6wp3vnk1gx1dnmbk20vdm7";
+ version = "0.9.0.0";
+ sha256 = "14racx3vadxypk8h5cwj2qhg5fpc2pma6gmwlmr2ga6yswpgkl29";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -91651,8 +93366,8 @@ self: {
unordered-containers utf8-string vector
];
executableHaskellDepends = [
- aeson base bytestring data-default process text transformers
- unordered-containers yaml
+ aeson base bytestring data-default optparse-applicative process
+ text transformers unordered-containers utf8-string yaml
];
testHaskellDepends = [
aeson base bytestring data-default mtl tasty tasty-hunit
@@ -91661,6 +93376,8 @@ self: {
];
description = "An implementation of the Jinja2 template language in Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"gingersnap" = callPackage
@@ -91841,26 +93558,26 @@ self: {
({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder
, bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
, clientsession, concurrent-output, conduit, connection, containers
- , crypto-api, cryptonite, curl, data-default, DAV, dbus, directory
- , disk-free-space, dlist, edit-distance, exceptions, fdo-notify
- , feed, filepath, free, git, gnupg, hinotify, hslogger, http-client
- , http-client-tls, http-conduit, http-types, IfElse, lsof, magic
- , memory, microlens, monad-control, monad-logger, mountpoints, mtl
- , network, network-info, network-multicast, network-uri, old-locale
- , openssh, optparse-applicative, path-pieces, perl, persistent
- , persistent-sqlite, persistent-template, process, QuickCheck
- , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
- , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup
- , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
- , template-haskell, text, time, torrent, transformers, unix
- , unix-compat, unordered-containers, utf8-string, uuid, vector, wai
- , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
- , yesod-form, yesod-static
+ , crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq
+ , directory, disk-free-space, dlist, edit-distance, exceptions
+ , fdo-notify, feed, filepath, free, git, gnupg, hinotify, hslogger
+ , http-client, http-client-tls, http-conduit, http-types, IfElse
+ , lsof, magic, memory, microlens, monad-control, monad-logger
+ , mountpoints, mtl, network, network-info, network-multicast
+ , network-uri, old-locale, openssh, optparse-applicative
+ , path-pieces, perl, persistent, persistent-sqlite
+ , persistent-template, process, QuickCheck, random, regex-tdfa
+ , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
+ , socks, split, stm, stm-chans, tagsoup, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-rerun, template-haskell, text, time
+ , torrent, transformers, unix, unix-compat, unordered-containers
+ , utf8-string, uuid, vector, wai, wai-extra, warp, warp-tls, wget
+ , which, yesod, yesod-core, yesod-form, yesod-static
}:
mkDerivation {
pname = "git-annex";
- version = "7.20190322";
- sha256 = "1ylz38zp9dz6fyavjz88lzlv5bd9d2mic08ac5vsnxixqbj8rnnx";
+ version = "7.20190708";
+ sha256 = "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij";
configureFlags = [
"-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
"-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -91876,30 +93593,29 @@ self: {
aeson async attoparsec aws base blaze-builder bloomfilter byteable
bytestring case-insensitive clientsession concurrent-output conduit
connection containers crypto-api cryptonite data-default DAV dbus
- directory disk-free-space dlist edit-distance exceptions fdo-notify
- feed filepath free hinotify hslogger http-client http-client-tls
- http-conduit http-types IfElse magic memory microlens monad-control
- monad-logger mountpoints mtl network network-info network-multicast
- network-uri old-locale optparse-applicative path-pieces persistent
- persistent-sqlite persistent-template process QuickCheck random
- regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare
- socks split stm stm-chans tagsoup tasty tasty-hunit
- tasty-quickcheck tasty-rerun template-haskell text time torrent
- transformers unix unix-compat unordered-containers utf8-string uuid
- vector wai wai-extra warp warp-tls yesod yesod-core yesod-form
- yesod-static
+ deepseq directory disk-free-space dlist edit-distance exceptions
+ fdo-notify feed filepath free hinotify hslogger http-client
+ http-client-tls http-conduit http-types IfElse magic memory
+ microlens monad-control monad-logger mountpoints mtl network
+ network-info network-multicast network-uri old-locale
+ optparse-applicative path-pieces persistent persistent-sqlite
+ persistent-template process QuickCheck random regex-tdfa resourcet
+ SafeSemaphore sandi securemem shakespeare socks split stm stm-chans
+ tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun
+ template-haskell text time torrent transformers unix unix-compat
+ unordered-containers utf8-string uuid vector wai wai-extra warp
+ warp-tls yesod yesod-core yesod-form yesod-static
];
executableSystemDepends = [
bup curl git gnupg lsof openssh perl rsync wget which
];
preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
- installPhase = "make PREFIX=$out BUILDER=: install";
- checkPhase = ''
+ postBuild = ''
ln -sf dist/build/git-annex/git-annex git-annex
ln -sf git-annex git-annex-shell
- export PATH+=":$PWD"
- git-annex test
'';
+ installPhase = "make PREFIX=$out BUILDER=: install install-completions";
+ checkPhase = ''PATH+=":$PWD" git-annex test'';
enableSharedExecutables = false;
description = "manage files with git, without checking their contents into git";
license = stdenv.lib.licenses.agpl3;
@@ -92111,8 +93827,6 @@ self: {
];
description = "Passively snapshots working tree changes efficiently";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"git-object" = callPackage
@@ -92133,6 +93847,39 @@ self: {
broken = true;
}) {};
+ "git-remote-ipfs" = callPackage
+ ({ mkDerivation, aeson, async, attoparsec, base, bytestring
+ , conduit, conduit-extra, cryptonite, filepath, formatting
+ , generics-sop, git, http-client, ipfs-api, ipld-cid, lens
+ , lens-aeson, mtl, multibase, multihash-cryptonite, network-uri
+ , optparse-applicative, primitive, safe-exceptions, servant
+ , servant-client, stm, text, transformers, typed-process
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "git-remote-ipfs";
+ version = "0.1.0.0";
+ sha256 = "1zh7wbyd01p17c7lxx4xvj0rhnzqkpqcjdj1a3kynak2zi8wf6k2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async attoparsec base bytestring conduit cryptonite filepath
+ formatting generics-sop git http-client ipfs-api ipld-cid lens
+ lens-aeson mtl multibase multihash-cryptonite network-uri
+ optparse-applicative primitive safe-exceptions servant
+ servant-client stm text transformers typed-process
+ unordered-containers vector
+ ];
+ executableHaskellDepends = [
+ attoparsec base bytestring conduit conduit-extra mtl
+ optparse-applicative text
+ ];
+ description = "Git remote helper to store git objects on IPFS";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"git-repair" = callPackage
({ mkDerivation, async, base, bytestring, Cabal, containers
, data-default, directory, exceptions, filepath, hslogger, IfElse
@@ -92292,33 +94039,34 @@ self: {
"github" = callPackage
({ mkDerivation, aeson, base, base-compat, base16-bytestring
- , binary, binary-orphans, bytestring, containers, cryptohash-sha1
+ , binary, binary-instances, bytestring, containers, cryptohash-sha1
, deepseq, deepseq-generics, exceptions, file-embed, hashable
, hspec, hspec-discover, http-client, http-client-tls
, http-link-header, http-types, iso8601-time, mtl, network-uri
- , semigroups, tagged, text, time, tls, transformers
- , transformers-compat, unordered-containers, vector
- , vector-instances
+ , tagged, text, time, tls, transformers, transformers-compat
+ , unordered-containers, vector, vector-instances
}:
mkDerivation {
pname = "github";
- version = "0.21";
- sha256 = "1ck4mnvxzgbpzy1v7xgggfn69733hm2smhbivmcvdmxd104lzvsq";
+ version = "0.22";
+ sha256 = "15py79qcpj0k331i42njgwkirwyiacbc5razmxnm4672dvvip2qk";
libraryHaskellDepends = [
- aeson base base-compat base16-bytestring binary binary-orphans
+ aeson base base-compat base16-bytestring binary binary-instances
bytestring containers cryptohash-sha1 deepseq deepseq-generics
exceptions hashable http-client http-client-tls http-link-header
- http-types iso8601-time mtl network-uri semigroups tagged text time
- tls transformers transformers-compat unordered-containers vector
+ http-types iso8601-time mtl network-uri tagged text time tls
+ transformers transformers-compat unordered-containers vector
vector-instances
];
testHaskellDepends = [
- aeson base base-compat bytestring file-embed hspec
+ aeson base base-compat bytestring file-embed hspec tagged text
unordered-containers vector
];
testToolDepends = [ hspec-discover ];
description = "Access to the GitHub API, v3";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"github-backup" = callPackage
@@ -92597,6 +94345,8 @@ self: {
];
description = "Wiki using happstack, git or darcs, and pandoc";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"gitlab-api" = callPackage
@@ -92725,8 +94475,6 @@ self: {
];
description = "Libgit2 backend for gitlib";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"gitlib-s3" = callPackage
@@ -92789,8 +94537,6 @@ self: {
];
description = "Test library for confirming gitlib backend compliance";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"gitlib-utils" = callPackage
@@ -92861,15 +94607,13 @@ self: {
}:
mkDerivation {
pname = "gitter";
- version = "0.4";
- sha256 = "0lvsjpb1iakpbvh8prnwd90p8fp7hhj5120yp2w5ra9pm5fqcl49";
+ version = "0.5";
+ sha256 = "13whv4bv7b69vzq1c6xdcim9mlsr4qsnsjiwv36g7fykcvbr72rl";
libraryHaskellDepends = [
aeson base bytestring exceptions lens lens-aeson mtl text wreq
];
description = "Gitter.im API client";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"givegif" = callPackage
@@ -92930,8 +94674,8 @@ self: {
pname = "gl";
version = "0.8.0";
sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda";
- revision = "2";
- editedCabalFile = "0zbpf559ajlcwnylpbm6dbi4m3g3s08fciqfp5am3i2vrmw0wpi9";
+ revision = "3";
+ editedCabalFile = "0q8d4237ds78y4p35xl2arlmmpgs2ag7krw9chby6q9dcs00zxrl";
setupHaskellDepends = [
base Cabal containers directory filepath hxt transformers
];
@@ -92943,6 +94687,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) libGL;};
+ "gl_0_9" = callPackage
+ ({ mkDerivation, base, containers, fixed, half, libGL, transformers
+ }:
+ mkDerivation {
+ pname = "gl";
+ version = "0.9";
+ sha256 = "1kb1igc9cyjavf3f3ccv9xhhsfn46pcrsw47qd9m5793nnmg13ii";
+ revision = "1";
+ editedCabalFile = "19qyb9m2fy9qyirmhhayg51scas42n3i2rx7jcw6v3ra8c8r9rwr";
+ libraryHaskellDepends = [
+ base containers fixed half transformers
+ ];
+ librarySystemDepends = [ libGL ];
+ description = "Complete OpenGL raw bindings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) libGL;};
+
"gl-capture" = callPackage
({ mkDerivation, base, bytestring, OpenGL }:
mkDerivation {
@@ -93292,13 +95054,14 @@ self: {
, bytestring, Cabal, config-schema, config-value, containers
, directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
, HUnit, irc-core, kan-extensions, lens, network, process, psqueues
- , regex-tdfa, semigroupoids, split, stm, template-haskell, text
- , time, transformers, unix, unordered-containers, vector, vty
+ , regex-tdfa, regex-tdfa-text, semigroupoids, split, stm
+ , template-haskell, text, time, transformers, unix
+ , unordered-containers, vector, vty
}:
mkDerivation {
pname = "glirc";
- version = "2.30";
- sha256 = "1ky0xwspnfknbjyf0fa459f38nwqakwq6fh7ady4rch8ck22phql";
+ version = "2.32";
+ sha256 = "0rlqmmjxvynd4a2kxjyw7dm5i2rd27jgj7sm57pbh2nig2rbbbyj";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -93306,8 +95069,9 @@ self: {
async attoparsec base base64-bytestring bytestring config-schema
config-value containers directory filepath free gitrev hashable
hookup HsOpenSSL irc-core kan-extensions lens network process
- psqueues regex-tdfa semigroupoids split stm template-haskell text
- time transformers unix unordered-containers vector vty
+ psqueues regex-tdfa regex-tdfa-text semigroupoids split stm
+ template-haskell text time transformers unix unordered-containers
+ vector vty
];
executableHaskellDepends = [ base lens text vty ];
testHaskellDepends = [ base HUnit ];
@@ -93485,8 +95249,6 @@ self: {
libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
description = "Extras to interface Gloss and Accelerate";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"gloss-algorithms" = callPackage
@@ -93641,10 +95403,8 @@ self: {
({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
mkDerivation {
pname = "gloss-rendering";
- version = "1.13.0.2";
- sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0";
- revision = "1";
- editedCabalFile = "0r57zc8ryxgjb4ydcdlmq19hl3nj6gjm3z85wrmdkn0wrx16mqih";
+ version = "1.13.1.1";
+ sha256 = "1pkzm7zzfdya8cz3h66akx8785h3vxbnyb815liw4nilvwg01d9x";
libraryHaskellDepends = [
base bmp bytestring containers GLUT OpenGL
];
@@ -93733,8 +95493,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Make better services and clients";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"glue-core" = callPackage
@@ -93759,8 +95517,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Make better services and clients";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"glue-ekg" = callPackage
@@ -93785,8 +95541,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Make better services and clients";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"glue-example" = callPackage
@@ -93807,8 +95561,6 @@ self: {
];
description = "Make better services and clients";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"gluturtle" = callPackage
@@ -96695,8 +98447,8 @@ self: {
}:
mkDerivation {
pname = "gopher-proxy";
- version = "0.1.1.1";
- sha256 = "0kfg995ng54sf4lndz9grl5vxyxms0xxmcgq1xhcgmhis8bwr1cd";
+ version = "0.1.1.2";
+ sha256 = "1ji7gfvcagvnv716ii6hwlv3g1np9iif7dk94mg42k265j30h4gh";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -96706,8 +98458,6 @@ self: {
];
description = "proxy gopher over http";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"gopherbot" = callPackage
@@ -97002,6 +98752,8 @@ self: {
pname = "gpio";
version = "0.1.0.3";
sha256 = "1ky4i7hyx2cmxj75kx34b8w4rxrvags88xm7fbfjsb76bs1m9z10";
+ revision = "1";
+ editedCabalFile = "076vk0xf92ijl0yr1mcfnzmdlgm76nzk4s8k1xwmf6b1vj8240s7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -97087,6 +98839,31 @@ self: {
broken = true;
}) {};
+ "grab" = callPackage
+ ({ mkDerivation, base, criterion, hedgehog }:
+ mkDerivation {
+ pname = "grab";
+ version = "0.0.0.1";
+ sha256 = "1jsi8g538w4a441w412siqvrkzmvx8sff74nax93b5paiaqfwcrf";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hedgehog ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Applicative non-linear consumption";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "grab-form" = callPackage
+ ({ mkDerivation, base, containers, grab, hedgehog, text }:
+ mkDerivation {
+ pname = "grab-form";
+ version = "0.0.0.2";
+ sha256 = "1mi21d3p7jwmwmn69f7xy6zkks0w11kkwwvzmhxsd84zsafnis8k";
+ libraryHaskellDepends = [ base containers grab text ];
+ testHaskellDepends = [ base containers hedgehog text ];
+ description = "Applicative parsers for form parameter lists";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"graceful" = callPackage
({ mkDerivation, base, directory, filepath, hspec, network, process
, stm, unix
@@ -97715,8 +99492,8 @@ self: {
}:
mkDerivation {
pname = "graphite";
- version = "0.10.0.0";
- sha256 = "0cgsn0nwixgcamg9yp4qsz88dmm3rdmkcl7ahlnpvksgw7llnxa8";
+ version = "0.10.0.1";
+ sha256 = "1aqadpg3jm9f1z43ylpmh512gi320kqnnfl6qksp2l1w26lnd0vs";
libraryHaskellDepends = [
base bytestring cassava containers deepseq graphviz hashable
process QuickCheck random semigroups text unordered-containers
@@ -97806,8 +99583,8 @@ self: {
({ mkDerivation, base, containers, json, text }:
mkDerivation {
pname = "graphql-w-persistent";
- version = "0.3.1.2";
- sha256 = "0kd73yxack1allp27l4pp4xsdw3rs3g44kbk6qadhdvrws7d105z";
+ version = "0.4.0.0";
+ sha256 = "01k8h0fz0x8dfsg01d6xj9b43jaj47a6vb378f5y6zhf0s9ixzj1";
libraryHaskellDepends = [ base containers json text ];
description = "Haskell GraphQL query parser-interpreter-data processor";
license = stdenv.lib.licenses.isc;
@@ -98164,8 +99941,8 @@ self: {
}:
mkDerivation {
pname = "greskell-core";
- version = "0.1.2.5";
- sha256 = "1lxz9l968f8jgyyqvph3rvsfnh0kqdmnam95cn97jrfwcndc0wmp";
+ version = "0.1.2.6";
+ sha256 = "0p68kwcwccmqn58dx1vyy4k1sc9zk2n2l8hiligik6zpbv4vmkdz";
libraryHaskellDepends = [
aeson base containers hashable scientific semigroups text
unordered-containers uuid vector
@@ -98567,8 +100344,8 @@ self: {
}:
mkDerivation {
pname = "group-by-date";
- version = "0.1.0.2";
- sha256 = "09x5wag0s6bkmhqcdbrzcibpwjqg5jr8lfm9vcbwi0qyv2nn7f5h";
+ version = "0.1.0.3";
+ sha256 = "0lz2ygmzxanrcnhzpqcxi1fqh75c349fcrkd13jgih10zkgk86jh";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -98620,15 +100397,13 @@ self: {
}:
mkDerivation {
pname = "grouped-list";
- version = "0.2.2.0";
- sha256 = "0733wmdflxpd2ryrdx4ygizyclxmbd8xmkdfs7d7s4x8hffk0k5x";
+ version = "0.2.2.1";
+ sha256 = "1bs8rkdrg82v3k08icl6fsgdyfz8m0vkvsbxpm3iym01xcfmzzal";
libraryHaskellDepends = [ base binary containers deepseq pointed ];
testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
benchmarkHaskellDepends = [ base criterion ];
description = "Grouped lists. Equal consecutive elements are grouped.";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"groupoid" = callPackage
@@ -99130,6 +100905,8 @@ self: {
];
description = "A standalone StatusNotifierItem/AppIndicator tray";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gtk3;};
"gtk-strut" = callPackage
@@ -99554,6 +101331,19 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "gw" = callPackage
+ ({ mkDerivation, base, unix }:
+ mkDerivation {
+ pname = "gw";
+ version = "0.1";
+ sha256 = "055pkk3gg74r4yzh3fxq1zvp1fv3i8cd53jscy1b2n3mmzhbzahv";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base unix ];
+ description = "ghcWithPackages cmdline util";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"gyah-bin" = callPackage
({ mkDerivation, base, extra, GiveYouAHead }:
mkDerivation {
@@ -99957,6 +101747,56 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hOpenPGP_2_8" = callPackage
+ ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
+ , base16-bytestring, base64-bytestring, bifunctors, binary
+ , binary-conduit, bytestring, bzlib, conduit, conduit-extra
+ , containers, criterion, crypto-cipher-types, cryptonite, errors
+ , hashable, incremental-parser, ixset-typed, lens, memory
+ , monad-loops, nettle, network, network-uri, newtype
+ , openpgp-asciiarmor, prettyprinter, QuickCheck
+ , quickcheck-instances, resourcet, semigroups, split, tasty
+ , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
+ , transformers, unliftio-core, unordered-containers, zlib
+ }:
+ mkDerivation {
+ pname = "hOpenPGP";
+ version = "2.8";
+ sha256 = "1n6cpwgg934ii3b4ap2gp347q3k4b64dc9x37d4bj51hs6910pmw";
+ libraryHaskellDepends = [
+ aeson asn1-encoding attoparsec base base16-bytestring
+ base64-bytestring bifunctors binary binary-conduit bytestring bzlib
+ conduit conduit-extra containers crypto-cipher-types cryptonite
+ errors hashable incremental-parser ixset-typed lens memory
+ monad-loops nettle network-uri newtype openpgp-asciiarmor
+ prettyprinter resourcet semigroups split text time
+ time-locale-compat transformers unliftio-core unordered-containers
+ zlib
+ ];
+ testHaskellDepends = [
+ aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+ binary binary-conduit bytestring bzlib conduit conduit-extra
+ containers crypto-cipher-types cryptonite errors hashable
+ incremental-parser ixset-typed lens memory monad-loops nettle
+ network network-uri newtype prettyprinter QuickCheck
+ quickcheck-instances resourcet semigroups split tasty tasty-hunit
+ tasty-quickcheck text time time-locale-compat transformers
+ unliftio-core unordered-containers zlib
+ ];
+ benchmarkHaskellDepends = [
+ aeson base base16-bytestring base64-bytestring bifunctors binary
+ binary-conduit bytestring bzlib conduit conduit-extra containers
+ criterion crypto-cipher-types cryptonite errors hashable
+ incremental-parser ixset-typed lens memory monad-loops nettle
+ network network-uri newtype openpgp-asciiarmor prettyprinter
+ resourcet semigroups split text time time-locale-compat
+ transformers unliftio-core unordered-containers zlib
+ ];
+ description = "native Haskell implementation of OpenPGP (RFC4880)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hPDB" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, ghc-prim, iterable, linear, mmap, mtl, Octree, parallel
@@ -100853,8 +102693,8 @@ self: {
pname = "hackage-security";
version = "0.5.3.0";
sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v";
- revision = "5";
- editedCabalFile = "07mzv3bwb4rcwlmsd9c36g71y605qh72li0rsxf3c1k5bpcnl3yi";
+ revision = "6";
+ editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay";
libraryHaskellDepends = [
base base16-bytestring base64-bytestring bytestring Cabal
containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -101157,7 +102997,6 @@ self: {
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"haddock_2_17_5" = callPackage
@@ -101175,7 +103014,6 @@ self: {
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"haddock" = callPackage
@@ -101192,8 +103030,6 @@ self: {
preCheck = "unset GHC_PACKAGE_PATH";
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"haddock-api_2_15_0_2" = callPackage
@@ -101213,7 +103049,6 @@ self: {
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"haddock-api_2_16_1" = callPackage
@@ -101233,7 +103068,6 @@ self: {
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"haddock-api_2_17_4" = callPackage
@@ -101256,7 +103090,6 @@ self: {
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"haddock-api" = callPackage
@@ -101282,8 +103115,17 @@ self: {
testToolDepends = [ hspec-discover ];
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ }) {};
+
+ "haddock-cheatsheet" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "haddock-cheatsheet";
+ version = "0.1.0.1";
+ sha256 = "1nqq7k8ssl6h1d501d8ayzsdlihnbfrqy4l5z43msc6lr7ffvz2r";
+ libraryHaskellDepends = [ base ];
+ description = "A documentation-only package exemplifying haddock markup features";
+ license = stdenv.lib.licenses.mit;
}) {};
"haddock-leksah" = callPackage
@@ -101402,25 +103244,26 @@ self: {
"hadolint" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
- , filepath, gitrev, hspec, HUnit, language-docker, megaparsec, mtl
- , optparse-applicative, ShellCheck, split, text, void, yaml
+ , filepath, gitrev, hspec, HsYAML, HUnit, language-docker
+ , megaparsec, mtl, optparse-applicative, ShellCheck, split, text
+ , void
}:
mkDerivation {
pname = "hadolint";
- version = "1.16.3";
- sha256 = "0wpgj4gp6xjgk2564219cg3w54a3lfb9p3bmgdkf1pm6ilbzbf2n";
+ version = "1.17.1";
+ sha256 = "199kpx6wfshky0slgjv0h6ckibrsywy3r3j393r9ln4wcjzs31yi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring containers directory filepath language-docker
- megaparsec mtl ShellCheck split text void yaml
+ aeson base bytestring containers directory filepath HsYAML
+ language-docker megaparsec mtl ShellCheck split text void
];
executableHaskellDepends = [
base containers gitrev language-docker megaparsec
optparse-applicative text
];
testHaskellDepends = [
- aeson base bytestring hspec HUnit language-docker megaparsec
+ aeson base bytestring hspec HsYAML HUnit language-docker megaparsec
ShellCheck split text
];
description = "Dockerfile Linter JavaScript API";
@@ -101874,8 +103717,8 @@ self: {
}:
mkDerivation {
pname = "hakyll";
- version = "4.12.5.1";
- sha256 = "0zxl99qrzzngc6z08hpl4rxssb7djqdbccjay76sgq8akw40x720";
+ version = "4.12.5.2";
+ sha256 = "13dc8hj3xnnpyb395pbplwxb4pj4gzckdd8r5wcwg1ln0gd6w7d5";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -102064,8 +103907,8 @@ self: {
}:
mkDerivation {
pname = "hakyll-dhall";
- version = "0.2.2.2";
- sha256 = "0w2vhma28904mg7bymk0qd3gzwirbjkjkw862jxg2zzcnsg8m04i";
+ version = "0.2.3.0";
+ sha256 = "1a8aq1gmj6mwpv43s2vr7asp6v6bflms1vhd9dvs04jfnw3jbvpz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -102075,6 +103918,8 @@ self: {
executableHaskellDepends = [ base dhall hakyll ];
description = "Dhall compiler for Hakyll";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hakyll-dir-list" = callPackage
@@ -102237,6 +104082,26 @@ self: {
broken = true;
}) {};
+ "hakyll-shortcut-links" = callPackage
+ ({ mkDerivation, base, hakyll, hspec, megaparsec, mtl, pandoc
+ , pandoc-types, shortcut-links, text
+ }:
+ mkDerivation {
+ pname = "hakyll-shortcut-links";
+ version = "0.0.0.0";
+ sha256 = "1bzkq83rcpvx0cah77q6p27fd7f0l9hrnk8jyzpmngrnvgyjb2sz";
+ revision = "1";
+ editedCabalFile = "0ds3pb90djvqgz1z1w1kp2zdmwvbqkkgvwm05i34a9rh84lh8y8p";
+ libraryHaskellDepends = [
+ base hakyll megaparsec mtl pandoc-types shortcut-links text
+ ];
+ testHaskellDepends = [ base hspec mtl pandoc text ];
+ description = "Use shortcut-links in markdown file for Hakyll";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hal" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, envy
, exceptions, http-conduit, http-types, mtl, text, time
@@ -103138,8 +105003,8 @@ self: {
}:
mkDerivation {
pname = "happstack-authenticate";
- version = "2.3.4.15";
- sha256 = "1vgyzclziis403d08x4s26ml7ay0icwymixddbm409c99p6l8lif";
+ version = "2.3.4.16";
+ sha256 = "1m94q0bkhy88x0bm6jqbmiqx6fw05lcnd1iswzicj1cxbwiwfwbb";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
acid-state aeson authenticate base base64-bytestring boomerang
@@ -103524,6 +105389,8 @@ self: {
pname = "happstack-server";
version = "7.5.1.3";
sha256 = "0agxmrf2njd3whvgw4in0ixgss1qlmi6cdi9fglhs7nhykpkgllk";
+ revision = "1";
+ editedCabalFile = "15ira63nilqyq9ggl2jy5ip26aprw79sv5k1hp9n4wp9byhzzyjw";
libraryHaskellDepends = [
base base64-bytestring blaze-html bytestring containers directory
exceptions extensible-exceptions filepath hslogger html
@@ -103687,10 +105554,8 @@ self: {
}:
mkDerivation {
pname = "happy";
- version = "1.19.9";
- sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
- revision = "3";
- editedCabalFile = "0kwlh964nyqvfbm02np8vpc28gbhsby0r65jhz1918rm0wip9izq";
+ version = "1.19.11";
+ sha256 = "0xszsjl4943kp7cjzlpf7g5lx6yzqxj8xmgzy4s0m66vs2gd354h";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
@@ -103700,6 +105565,19 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "happy-hour" = callPackage
+ ({ mkDerivation, base, Chart, Chart-diagrams }:
+ mkDerivation {
+ pname = "happy-hour";
+ version = "0.0.0.1";
+ sha256 = "1dhqgv7q2qw9fc19mpsnfkc4y3h0d68433p2mrpx5fz81slfy4cf";
+ revision = "1";
+ editedCabalFile = "1yvz6nbqwxjyw7ffs95na7x75xc9ap8hp6m5jdvfqlgqcwlzmd6j";
+ libraryHaskellDepends = [ base Chart Chart-diagrams ];
+ description = "Generate simple okay-looking bar plots without much effort";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"happy-meta" = callPackage
({ mkDerivation, array, base, containers, happy, haskell-src-meta
, mtl, template-haskell
@@ -104032,8 +105910,6 @@ self: {
libraryHaskellDepends = [ base QuickCheck ];
description = "Entity based records";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"has-th" = callPackage
@@ -104077,8 +105953,8 @@ self: {
}:
mkDerivation {
pname = "hasbolt-extras";
- version = "0.0.0.16";
- sha256 = "1759pk8w5vvgm194lbfj1z9vxwh19d1s36lwpwni1qk7l1lpvvm6";
+ version = "0.0.0.18";
+ sha256 = "11ij6xrxf28sv8b464dqax9834k0r6q99hdyfsg030aw2i1rqygy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -104314,6 +106190,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hashable_1_3_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
+ , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, unix
+ }:
+ mkDerivation {
+ pname = "hashable";
+ version = "1.3.0.0";
+ sha256 = "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring deepseq ghc-prim integer-gmp text
+ ];
+ testHaskellDepends = [
+ base bytestring ghc-prim HUnit QuickCheck random test-framework
+ test-framework-hunit test-framework-quickcheck2 text unix
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion ghc-prim integer-gmp siphash text
+ ];
+ description = "A class for types that can be converted to a hash value";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hashable-extras" = callPackage
({ mkDerivation, base, bifunctors, bytestring, directory, doctest
, filepath, hashable, transformers, transformers-compat
@@ -104374,6 +106276,8 @@ self: {
pname = "hashable-time";
version = "0.2.0.2";
sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs";
+ revision = "1";
+ editedCabalFile = "1d43ia3cg9j9k1yam0w2a8b60df7xw4zydrdvk1m868ara3nlr58";
libraryHaskellDepends = [ base hashable time ];
description = "Hashable instances for Data.Time";
license = stdenv.lib.licenses.bsd3;
@@ -104536,8 +106440,8 @@ self: {
({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
mkDerivation {
pname = "hashtables";
- version = "1.2.3.1";
- sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg";
+ version = "1.2.3.3";
+ sha256 = "00rp3844z2kan1mdhxb8iw39hhjpirv6mhnwc32byfqjsvx8a3ny";
libraryHaskellDepends = [
base ghc-prim hashable primitive vector
];
@@ -105160,8 +107064,8 @@ self: {
}:
mkDerivation {
pname = "haskell-debug-adapter";
- version = "0.0.30.0";
- sha256 = "0vr5bc3qkd0h6rb3s4bihg4m9g9z0vzjz6w4m4m2gkw7c1pnirvs";
+ version = "0.0.31.0";
+ sha256 = "1qxbpllkcf9ybp94f3bhy2w5l6164na0j72c2d4r1va0bzmni4lp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -105207,25 +107111,24 @@ self: {
"haskell-docs" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal
, containers, cryptohash, directory, filepath, ghc, ghc-paths
- , haddock-api, monad-loops, process, text, unordered-containers
+ , haddock-api, haddock-library, monad-loops, process, text
+ , unordered-containers
}:
mkDerivation {
pname = "haskell-docs";
- version = "4.2.8";
- sha256 = "00a93rva9mpg0wf3fj0h9l4ljz566vx1dv9hh4xhc5n1zqijycpz";
+ version = "4.2.9";
+ sha256 = "10pgziq2f9wx92afmwh1m4bwxcyygpf4xg99vghm6r4ilh1fbkg7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base base16-bytestring bytestring Cabal containers cryptohash
- directory filepath ghc ghc-paths haddock-api monad-loops process
- text unordered-containers
+ directory filepath ghc ghc-paths haddock-api haddock-library
+ monad-loops process text unordered-containers
];
executableHaskellDepends = [ base ghc text ];
testHaskellDepends = [ base ];
description = "A program to find and display the docs and type of a name";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"haskell-eigen-util" = callPackage
@@ -105270,13 +107173,13 @@ self: {
"haskell-formatter" = callPackage
({ mkDerivation, base, containers, directory, directory-tree
, doctest, filemanip, filepath, haskell-src-exts, hlint
- , optparse-applicative, scientific, tasty, tasty-hunit, text
- , unordered-containers, yaml
+ , optparse-applicative, QuickCheck, scientific, tasty, tasty-hunit
+ , text, unordered-containers, yaml
}:
mkDerivation {
pname = "haskell-formatter";
- version = "1.0.0";
- sha256 = "0mrcd57g3pnn11smgak51pikxxf5zsi7h06f270pmf2r1vv2977b";
+ version = "2.0.1";
+ sha256 = "17cwpvc8yfflzvlhyvdk2kgqpi2k3s55kz1435axgn02ajvdlr75";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -105288,10 +107191,10 @@ self: {
];
testHaskellDepends = [
base containers directory-tree doctest filemanip filepath hlint
- tasty tasty-hunit
+ QuickCheck tasty tasty-hunit
];
description = "Haskell source code formatter";
- license = stdenv.lib.licenses.gpl3;
+ license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -105373,6 +107276,29 @@ self: {
pname = "haskell-gi";
version = "0.21.5";
sha256 = "1rvi9bmgxq7q6js8yb5yb156yxmnm9px9amgjwzxmr7sxz31dl8j";
+ revision = "1";
+ editedCabalFile = "144knmzybslqz8w9cwgl5s4sk1crs9qhynwiqv68wdq67q0s4k80";
+ libraryHaskellDepends = [
+ attoparsec base bytestring Cabal containers directory filepath
+ haskell-gi-base mtl pretty-show process regex-tdfa safe text
+ transformers xdg-basedir xml-conduit
+ ];
+ libraryPkgconfigDepends = [ glib gobject-introspection ];
+ testHaskellDepends = [ base doctest process ];
+ description = "Generate Haskell bindings for GObject Introspection capable libraries";
+ license = stdenv.lib.licenses.lgpl21;
+ }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
+
+ "haskell-gi_0_22_6" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
+ , directory, doctest, filepath, glib, gobject-introspection
+ , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
+ , text, transformers, xdg-basedir, xml-conduit
+ }:
+ mkDerivation {
+ pname = "haskell-gi";
+ version = "0.22.6";
+ sha256 = "0m1ixnxv1vq2ywnvf9fihipn81ka1ixbgga4fsmgmk9hl1ai48mm";
libraryHaskellDepends = [
attoparsec base bytestring Cabal containers directory filepath
haskell-gi-base mtl pretty-show process regex-tdfa safe text
@@ -105382,6 +107308,7 @@ self: {
testHaskellDepends = [ base doctest process ];
description = "Generate Haskell bindings for GObject Introspection capable libraries";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
"haskell-gi-base" = callPackage
@@ -105396,6 +107323,19 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib;};
+ "haskell-gi-base_0_22_2" = callPackage
+ ({ mkDerivation, base, bytestring, containers, glib, text }:
+ mkDerivation {
+ pname = "haskell-gi-base";
+ version = "0.22.2";
+ sha256 = "0rv46x4xgsdk25s1vd3zm95cjgc5vy4rwsbaxk1hyc5ga5qjyzx0";
+ libraryHaskellDepends = [ base bytestring containers text ];
+ libraryPkgconfigDepends = [ glib ];
+ description = "Foundation for libraries generated by haskell-gi";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) glib;};
+
"haskell-gi-overloading_0_0" = callPackage
({ mkDerivation }:
mkDerivation {
@@ -105585,33 +107525,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp_0_11_0_0" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, containers
- , data-default, directory, filepath, hashable, haskell-lsp-types
- , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec
- , QuickCheck, quickcheck-instances, sorted-list, stm, text, time
- , transformers, unordered-containers, vector, yi-rope
+ "haskell-lsp_0_15_0_0" = callPackage
+ ({ mkDerivation, aeson, async, attoparsec, base, bytestring
+ , containers, data-default, directory, filepath, hashable
+ , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
+ , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay
+ , sorted-list, stm, temporary, text, time, unordered-containers
}:
mkDerivation {
pname = "haskell-lsp";
- version = "0.11.0.0";
- sha256 = "09zpslvlqw68ywwlfmygyf5qsgfwxbiqijlxmjfc3j8annb8zcwz";
+ version = "0.15.0.0";
+ sha256 = "111c0hdlpnj979p3avlhswziyc6vh6apij5b2nhhi8wlfhqwrpcg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson async base bytestring containers data-default directory
- filepath hashable haskell-lsp-types hslogger lens mtl network-uri
- parsec sorted-list stm text time unordered-containers yi-rope
- ];
- executableHaskellDepends = [
- aeson base bytestring containers data-default directory filepath
- hslogger lens mtl network-uri parsec stm text time transformers
- unordered-containers vector yi-rope
+ aeson async attoparsec base bytestring containers data-default
+ directory filepath hashable haskell-lsp-types hslogger lens mtl
+ network-uri rope-utf16-splay sorted-list stm temporary text time
+ unordered-containers
];
testHaskellDepends = [
aeson base bytestring containers data-default directory filepath
hashable hspec lens network-uri QuickCheck quickcheck-instances
- sorted-list stm text yi-rope
+ rope-utf16-splay sorted-list stm text
];
testToolDepends = [ hspec-discover ];
description = "Haskell library for the Microsoft Language Server Protocol";
@@ -105650,6 +107586,8 @@ self: {
pname = "haskell-lsp-types";
version = "0.8.2.0";
sha256 = "13pgjm1pm1hp7bln115cn75ig6w3mj7g7rvnvpszlrg9lzmk3ip7";
+ revision = "1";
+ editedCabalFile = "0gmfxhjn92kzbpd9kzq5n3707lcpkxhnzxgg7lk34jhayiw5kyzj";
libraryHaskellDepends = [
aeson base bytestring data-default filepath hashable lens
network-uri scientific text unordered-containers
@@ -105658,17 +107596,17 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp-types_0_11_0_0" = callPackage
- ({ mkDerivation, aeson, base, bytestring, data-default, filepath
- , hashable, lens, network-uri, scientific, text
+ "haskell-lsp-types_0_15_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-default, deepseq
+ , filepath, hashable, lens, network-uri, scientific, text
, unordered-containers
}:
mkDerivation {
pname = "haskell-lsp-types";
- version = "0.11.0.0";
- sha256 = "019kaw306hjnb98d1g9dq2q9r169qrqaxrxbkbjq083plxxjg6cx";
+ version = "0.15.0.0";
+ sha256 = "1ky20lpgbdiijh3z6ilf7jn7cyxl2kshqnm2p4dgabfh97gbf8bb";
libraryHaskellDepends = [
- aeson base bytestring data-default filepath hashable lens
+ aeson base bytestring data-default deepseq filepath hashable lens
network-uri scientific text unordered-containers
];
description = "Haskell library for the Microsoft Language Server Protocol, data types";
@@ -105773,8 +107711,6 @@ self: {
];
description = "Name resolution library for Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"haskell-names_0_9_6" = callPackage
@@ -105799,7 +107735,6 @@ self: {
description = "Name resolution library for Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"haskell-neo4j-client" = callPackage
@@ -107372,6 +109307,20 @@ self: {
broken = true;
}) {};
+ "haskeme" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "haskeme";
+ version = "0.1.0.3";
+ sha256 = "14hrimm52v5hlgkdkqwijxrfnzj8x46bg3kh9nw1vlflf97053wf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ executableHaskellDepends = [ base ];
+ description = "Compiler from I- to S-Expressions for the Scheme Programming Language";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"haskey" = callPackage
({ mkDerivation, async, base, binary, bytestring, containers
, directory, exceptions, filepath, focus, haskey-btree, HUnit
@@ -107409,8 +109358,8 @@ self: {
}:
mkDerivation {
pname = "haskey-btree";
- version = "0.3.0.0";
- sha256 = "0nj6jhigzgjac45cg0qjbjamn152n7rvir5clkwj5yraisd7sf4h";
+ version = "0.3.0.1";
+ sha256 = "11zkj4a5j2f7g9kann4f0ab27aq30v6yn8cyn9hn7mhc3gslrx9m";
libraryHaskellDepends = [
base binary bytestring containers hashable mtl semigroups text
transformers vector
@@ -107737,41 +109686,40 @@ self: {
"haskoin-store" = callPackage
({ mkDerivation, aeson, base, bytestring, cereal, conduit
- , containers, data-default, directory, filepath, hashable
- , haskoin-core, haskoin-node, hspec, http-types, monad-logger, mtl
- , network, nqe, optparse-applicative, protocol-buffers
- , protocol-buffers-descriptor, random, rocksdb-haskell
- , rocksdb-query, scotty, string-conversions, text, time
- , transformers, unliftio, unordered-containers
+ , containers, data-default, filepath, hashable, haskoin-core
+ , haskoin-node, hspec, hspec-discover, http-types, monad-logger
+ , mtl, network, nqe, optparse-applicative, random, resourcet
+ , rocksdb-haskell, rocksdb-query, scotty, string-conversions, text
+ , time, transformers, unliftio, unordered-containers, uuid
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.14.1";
- sha256 = "0n5c51if17gm6ldsbpapqwc4bdshbnkxd403ssfgy3b923cmqm1r";
+ version = "0.16.5";
+ sha256 = "111gip8l2c9m85viaz02rlxhdb6svwx0jyhrkzcqjgz4j3y0n4lj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring cereal conduit containers data-default
hashable haskoin-core haskoin-node http-types monad-logger mtl
- network nqe protocol-buffers protocol-buffers-descriptor random
- rocksdb-haskell rocksdb-query scotty string-conversions text time
- transformers unliftio unordered-containers
+ network nqe random resourcet rocksdb-haskell rocksdb-query scotty
+ string-conversions text time transformers unliftio
+ unordered-containers uuid
];
executableHaskellDepends = [
aeson base bytestring cereal conduit containers data-default
- directory filepath hashable haskoin-core haskoin-node http-types
- monad-logger mtl network nqe optparse-applicative protocol-buffers
- protocol-buffers-descriptor random rocksdb-haskell rocksdb-query
- scotty string-conversions text time transformers unliftio
- unordered-containers
+ filepath hashable haskoin-core haskoin-node http-types monad-logger
+ mtl network nqe optparse-applicative random resourcet
+ rocksdb-haskell rocksdb-query scotty string-conversions text time
+ transformers unliftio unordered-containers uuid
];
testHaskellDepends = [
aeson base bytestring cereal conduit containers data-default
hashable haskoin-core haskoin-node hspec http-types monad-logger
- mtl network nqe protocol-buffers protocol-buffers-descriptor random
- rocksdb-haskell rocksdb-query scotty string-conversions text time
- transformers unliftio unordered-containers
+ mtl network nqe random resourcet rocksdb-haskell rocksdb-query
+ scotty string-conversions text time transformers unliftio
+ unordered-containers uuid
];
+ testToolDepends = [ hspec-discover ];
description = "Storage and index for Bitcoin and Bitcoin Cash";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -108346,6 +110294,8 @@ self: {
benchmarkHaskellDepends = [ base criterion ];
description = "Haskus binary format manipulation";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"haskus-system-build" = callPackage
@@ -108365,6 +110315,8 @@ self: {
];
description = "Haskus system build tool";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"haskus-utils" = callPackage
@@ -108385,6 +110337,8 @@ self: {
testHaskellDepends = [ base tasty tasty-quickcheck ];
description = "Haskus utility modules";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"haskus-utils-compat" = callPackage
@@ -108401,6 +110355,8 @@ self: {
];
description = "Compatibility modules with other external packages (ByteString, etc.)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"haskus-utils-data" = callPackage
@@ -108599,8 +110555,8 @@ self: {
}:
mkDerivation {
pname = "hasql";
- version = "1.3.0.5";
- sha256 = "0qs2x4gbaffrxndivb4237vxc6qrzn2rs5kbf04n4d6py9cdhbjv";
+ version = "1.3.0.6";
+ sha256 = "01kp8ajg7mw3j6g6d13fsygcbbw7gyrqh3hdllhb1jv53mr7fgb3";
libraryHaskellDepends = [
attoparsec base base-prelude bytestring bytestring-strict-builder
contravariant contravariant-extras data-default-class dlist
@@ -108616,6 +110572,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hasql_1_4" = callPackage
+ ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
+ , bytestring-strict-builder, contravariant, contravariant-extras
+ , criterion, dlist, hashable, hashtables, loch-th, mtl
+ , placeholders, postgresql-binary, postgresql-libpq, profunctors
+ , QuickCheck, quickcheck-instances, rebase, rerebase, tasty
+ , tasty-hunit, tasty-quickcheck, text, text-builder, transformers
+ , vector
+ }:
+ mkDerivation {
+ pname = "hasql";
+ version = "1.4";
+ sha256 = "0j2arb96i1dinpz1yxl2cjl4qhbljk9yph52cj9az50mvl8vx3w4";
+ libraryHaskellDepends = [
+ attoparsec base base-prelude bytestring bytestring-strict-builder
+ contravariant contravariant-extras dlist hashable hashtables
+ loch-th mtl placeholders postgresql-binary postgresql-libpq
+ profunctors text text-builder transformers vector
+ ];
+ testHaskellDepends = [
+ bug QuickCheck quickcheck-instances rebase rerebase tasty
+ tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ bug criterion rerebase ];
+ description = "An efficient PostgreSQL driver with a flexible mapping API";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hasql-backend" = callPackage
({ mkDerivation, base, base-prelude, bytestring, either, free
, list-t, text, transformers, vector
@@ -108666,8 +110651,8 @@ self: {
}:
mkDerivation {
pname = "hasql-cursor-query";
- version = "0.4.4.2";
- sha256 = "1h57x0az7hlmkbwmhdm0y4c63ypx48gkkw07rb2lj5sizn9j2qq9";
+ version = "0.4.4.3";
+ sha256 = "1f4qa5gfqllw3k5qxmlp247vby3g9gy8pb2mhhfrslhr2xynzxp1";
libraryHaskellDepends = [
base base-prelude bytestring contravariant foldl hasql
hasql-cursor-transaction hasql-transaction profunctors
@@ -108689,14 +110674,38 @@ self: {
}:
mkDerivation {
pname = "hasql-cursor-transaction";
- version = "0.6.3.1";
- sha256 = "05d01gb7ag9rcpk8vwizsbyi0lxd1fh6r6y4a6pvinj5sa2qn1hn";
+ version = "0.6.4";
+ sha256 = "00g365n4ai1bl8d7yipach1ivxs9apvzdfb9zcv59hnyhdn28wgr";
libraryHaskellDepends = [
base base-prelude bytestring bytestring-tree-builder contravariant
contravariant-extras hasql hasql-transaction transformers
];
description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "hasql-dynamic-statements" = callPackage
+ ({ mkDerivation, base, bytestring, containers, hasql
+ , hasql-implicits, ptr, QuickCheck, quickcheck-instances, rerebase
+ , tasty, tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "hasql-dynamic-statements";
+ version = "0.2.0.1";
+ sha256 = "087zkb89cr0d3brjrpq414jpwswvzvxkbzvw63ahcvmv7lfgaknh";
+ libraryHaskellDepends = [
+ base bytestring containers hasql hasql-implicits ptr
+ ];
+ testHaskellDepends = [
+ hasql QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ description = "Toolkit for constructing Hasql statements dynamically";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hasql-generic" = callPackage
@@ -108719,6 +110728,24 @@ self: {
broken = true;
}) {};
+ "hasql-implicits" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, hasql
+ , network-ip, ptr, scientific, text, time, uuid, vector
+ }:
+ mkDerivation {
+ pname = "hasql-implicits";
+ version = "0.1.0.1";
+ sha256 = "1b9j2za960h3sp48mxqk8lxhjsbhs47lnsvyah8p9wahf69qki5f";
+ libraryHaskellDepends = [
+ aeson base bytestring containers hasql network-ip ptr scientific
+ text time uuid vector
+ ];
+ description = "Implicit definitions for Hasql, such as default codecs for standard types";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hasql-migration" = callPackage
({ mkDerivation, base, bytestring, contravariant, cryptonite
, data-default-class, directory, hasql, hasql-transaction, hspec
@@ -108747,8 +110774,25 @@ self: {
}:
mkDerivation {
pname = "hasql-optparse-applicative";
- version = "0.3.0.3";
- sha256 = "0d33y3bzy3q5yj4vizi9i2xwwnw1lzyxq72jk2daqjs347dc7d33";
+ version = "0.3.0.4";
+ sha256 = "0pna4cmpm2chb3ax0i11wgkdx64zchdi4ivz0a0sgklrwq614pmx";
+ libraryHaskellDepends = [
+ base-prelude hasql hasql-pool optparse-applicative
+ ];
+ description = "\"optparse-applicative\" parsers for \"hasql\"";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "hasql-optparse-applicative_0_3_0_5" = callPackage
+ ({ mkDerivation, base-prelude, hasql, hasql-pool
+ , optparse-applicative
+ }:
+ mkDerivation {
+ pname = "hasql-optparse-applicative";
+ version = "0.3.0.5";
+ sha256 = "0q5ggbx3xlzq0lv6i6wac9zsf0x4k91cf1n5rg6q96wg90f0dxxq";
libraryHaskellDepends = [
base-prelude hasql hasql-pool optparse-applicative
];
@@ -108762,8 +110806,8 @@ self: {
({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }:
mkDerivation {
pname = "hasql-pool";
- version = "0.5.0.2";
- sha256 = "12289a6xn7gn58s8009bwcjffvr5ipycyb2ixzkxbigaxjbprar4";
+ version = "0.5.1";
+ sha256 = "0agl5ilp0amsp9pidhmgivdyaq43x3xi7hb80c91n9l92pv6163k";
libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
testHaskellDepends = [ base-prelude hasql hspec ];
description = "A pool of connections for Hasql";
@@ -108875,6 +110919,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hasql-transaction_0_7_2" = callPackage
+ ({ mkDerivation, async, base, bytestring, bytestring-tree-builder
+ , contravariant, contravariant-extras, hasql, mtl, rebase
+ , transformers
+ }:
+ mkDerivation {
+ pname = "hasql-transaction";
+ version = "0.7.2";
+ sha256 = "13d5zisr34bdbiypvpcb114d4c9yi6pyb9wnhigqpwd90vzpzsb5";
+ libraryHaskellDepends = [
+ base bytestring bytestring-tree-builder contravariant
+ contravariant-extras hasql mtl transformers
+ ];
+ testHaskellDepends = [ async hasql rebase ];
+ description = "A composable abstraction over the retryable transactions for Hasql";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hastache" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, containers
, directory, filepath, HUnit, ieee754, mtl, process, syb, text
@@ -109347,6 +111410,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "haxl_2_1_2_0" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, containers
+ , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
+ , stm, test-framework, test-framework-hunit, text, time
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "haxl";
+ version = "2.1.2.0";
+ sha256 = "1lwm9rs9r0qs32n3nw49j3sz41qzq2wxv0a9gpiziaw0sjlk00jy";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base binary bytestring containers deepseq exceptions filepath
+ ghc-prim hashable pretty stm text time transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base binary bytestring containers deepseq filepath hashable
+ HUnit test-framework test-framework-hunit text time
+ unordered-containers
+ ];
+ description = "A Haskell library for efficient, concurrent, and concise data access";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haxl-amazonka" = callPackage
({ mkDerivation, amazonka, amazonka-core, async, base, conduit
, hashable, haxl, transformers
@@ -109435,6 +111525,8 @@ self: {
];
description = "XML-RPC client and server library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"haxr-th" = callPackage
@@ -110439,8 +112531,6 @@ self: {
testHaskellDepends = [ base containers mtl ];
description = "Haskell docs tool";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hdph" = callPackage
@@ -110540,8 +112630,6 @@ self: {
testHaskellDepends = [ base QuickCheck ];
description = "Heaps in Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"heaps" = callPackage
@@ -110591,8 +112679,8 @@ self: {
}:
mkDerivation {
pname = "heatitup";
- version = "0.5.3.3";
- sha256 = "1bqindh91i4ra67516nl0c5i98fgm9bwsjy7vv0qjzmfqk3bqp84";
+ version = "0.5.4.0";
+ sha256 = "07qwsmk2hszm2q7ky4avmpwmd2j4xqprid7kvcrhh1s6d9f8nbz2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -110619,8 +112707,8 @@ self: {
}:
mkDerivation {
pname = "heatitup-complete";
- version = "0.5.3.3";
- sha256 = "1djs5hni6s4mzs4fniamfz6k7590l34mgvd1d2kglmdpb5m22pcz";
+ version = "0.5.4.0";
+ sha256 = "0zxyxwvpj0mkz10y4rf793cpxmd0bmlz3d4p8c0icgainacs6dsg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -110785,8 +112873,8 @@ self: {
pname = "hedgehog";
version = "0.6.1";
sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj";
- revision = "4";
- editedCabalFile = "0iaqqdv4qvkzw1vasnz829k9lh7mz5nkqr8i803rilwnq40xgipx";
+ revision = "5";
+ editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il";
libraryHaskellDepends = [
ansi-terminal async base bytestring concurrent-output containers
directory exceptions lifted-async mmorph monad-control mtl
@@ -110801,6 +112889,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hedgehog_1_0" = callPackage
+ ({ mkDerivation, ansi-terminal, async, base, bytestring
+ , concurrent-output, containers, directory, exceptions, fail
+ , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
+ , random, resourcet, semigroups, stm, template-haskell, text, time
+ , transformers, transformers-base, wl-pprint-annotated
+ }:
+ mkDerivation {
+ pname = "hedgehog";
+ version = "1.0";
+ sha256 = "1np9xg58x20kalfci9dxbd4wsg0sl3ka56ragzy3i9p0nx29pmns";
+ revision = "2";
+ editedCabalFile = "0sbw4hwcza5pb02cndl5f30cyqjl44mn5y3i72n4x8s8mknsy3a4";
+ libraryHaskellDepends = [
+ ansi-terminal async base bytestring concurrent-output containers
+ directory exceptions fail lifted-async mmorph monad-control mtl
+ pretty-show primitive random resourcet semigroups stm
+ template-haskell text time transformers transformers-base
+ wl-pprint-annotated
+ ];
+ testHaskellDepends = [
+ base containers mmorph mtl pretty-show semigroups text transformers
+ ];
+ description = "Release with confidence";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hedgehog-checkers" = callPackage
({ mkDerivation, base, containers, either, hedgehog, semigroupoids
, semigroups
@@ -110832,20 +112948,23 @@ self: {
}) {};
"hedgehog-classes" = callPackage
- ({ mkDerivation, aeson, base, containers, hedgehog, pretty-show
- , semirings, transformers, wl-pprint-annotated
+ ({ mkDerivation, aeson, base, binary, containers, hedgehog
+ , pretty-show, semirings, silently, transformers
+ , wl-pprint-annotated
}:
mkDerivation {
pname = "hedgehog-classes";
- version = "0.1.2";
- sha256 = "0lvlsv7mgmys03v4xnjvfb19426xa1vwfnrbpf0yg8h0pv6hz7wv";
+ version = "0.2.1";
+ sha256 = "1hkkbmsn397a73aqaasi2c076nx9g8s8vsdp6wdqq33a96q1b0mq";
libraryHaskellDepends = [
- aeson base containers hedgehog pretty-show semirings transformers
- wl-pprint-annotated
+ aeson base binary containers hedgehog pretty-show semirings
+ silently transformers wl-pprint-annotated
];
- testHaskellDepends = [ aeson base containers hedgehog ];
+ testHaskellDepends = [ aeson base binary containers hedgehog ];
description = "Hedgehog will eat your typeclass bugs";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hedgehog-corpus" = callPackage
@@ -110863,10 +112982,8 @@ self: {
({ mkDerivation, base, contravariant, hedgehog, transformers }:
mkDerivation {
pname = "hedgehog-fn";
- version = "0.6";
- sha256 = "0xi1y2cv2kkyxav261qaw9a4r4q8ng91187bdwi4rqlpp9zvc0pv";
- revision = "1";
- editedCabalFile = "19v7amg8l6s1gadnya8nxkcbi0vd3wqc7h6gvqvs099qaqm7zbb1";
+ version = "1.0";
+ sha256 = "05drd7jsz54kgwxr5z9vifmql6xif7ma7878qddw2nss5s6wa2qp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -110874,6 +112991,8 @@ self: {
];
description = "Function generation for `hedgehog`";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hedgehog-gen-json" = callPackage
@@ -110917,13 +113036,13 @@ self: {
({ mkDerivation, base, hedgehog, QuickCheck, transformers }:
mkDerivation {
pname = "hedgehog-quickcheck";
- version = "0.1";
- sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1";
- revision = "3";
- editedCabalFile = "08pglka9hc7q3fql7fsmqn17wm1xmixkpqfslv86l79hn4y3rfq3";
+ version = "0.1.1";
+ sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp";
libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
description = "Use QuickCheck generators in Hedgehog and vice versa";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hedis" = callPackage
@@ -110936,6 +113055,8 @@ self: {
pname = "hedis";
version = "0.10.10";
sha256 = "0hbjhccipvg2i1cyinvhlk4jgscam9y5897ib1fh6rc0qwnlblhs";
+ revision = "1";
+ editedCabalFile = "0fcpf0jqga8wh0ikbpkma8sw7f5376wbc9w9rsiqp51q8f23x04h";
libraryHaskellDepends = [
async base bytestring bytestring-lexing deepseq errors HTTP mtl
network network-uri resource-pool scanner stm text time tls
@@ -110950,7 +113071,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hedis_0_12_2" = callPackage
+ "hedis_0_12_5" = callPackage
({ mkDerivation, async, base, bytestring, bytestring-lexing
, deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
, resource-pool, scanner, stm, test-framework, test-framework-hunit
@@ -110958,8 +113079,8 @@ self: {
}:
mkDerivation {
pname = "hedis";
- version = "0.12.2";
- sha256 = "13kvi01v2bbz8xn44s4plmzka8khz3a4hc6pinw1walpfi8kygsx";
+ version = "0.12.5";
+ sha256 = "1alabz8j9lmd2ydm34hndqcyvihnfyvl7cgda6ycsch5sbffmjlp";
libraryHaskellDepends = [
async base bytestring bytestring-lexing deepseq errors HTTP mtl
network network-uri resource-pool scanner stm text time tls
@@ -111087,6 +113208,8 @@ self: {
pname = "hedn";
version = "0.2.0.1";
sha256 = "16yi4x6g27zabgqwd4xckp5zibxq882919mmyyr95g56r7pm8v1j";
+ revision = "1";
+ editedCabalFile = "1wr3zv0bj1714y1ip40va34zysmypicd6qp0l50bg9wj2db0misz";
libraryHaskellDepends = [
base containers deepseq deriving-compat megaparsec
parser-combinators prettyprinter scientific template-haskell text
@@ -112484,8 +114607,6 @@ self: {
];
description = "Heyting and Boolean algebras";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hfann" = callPackage
@@ -112891,6 +115012,8 @@ self: {
pname = "hgis";
version = "1.0.0.3";
sha256 = "00s87mna6lxr1q3275jg7ya17qhksr9bmfg2nw9mgadb05j6h2v8";
+ revision = "1";
+ editedCabalFile = "1p44ngzglxp8kdj6jlczgfjpms889r3fs7waz69zf50cbqq2am0c";
libraryHaskellDepends = [
ansi-wl-pprint base binary bytestring Chart Chart-cairo
Chart-diagrams colour composition-prelude data-binary-ieee754
@@ -113067,25 +115190,25 @@ self: {
"hhp" = callPackage
({ mkDerivation, base, Cabal, containers, deepseq, directory
- , doctest, filepath, ghc, hlint, hspec, io-choice, process, syb
+ , doctest, filepath, ghc, ghc-boot, hlint, hspec, process, syb
}:
mkDerivation {
pname = "hhp";
- version = "0.0.0";
- sha256 = "1520cax79wrf5a183630pji3bypz6qck73fa3p0x63vgcv3p5rwk";
+ version = "0.0.1";
+ sha256 = "0b3hliz1ags0c17kjwvsvl56ms4ga8wvaf5c7nmfiyzf0s6h0lp0";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base Cabal containers deepseq directory filepath ghc hlint
- io-choice process syb
+ base Cabal containers deepseq directory filepath ghc ghc-boot hlint
+ process syb
];
executableHaskellDepends = [
base containers directory filepath ghc
];
testHaskellDepends = [
- base Cabal containers deepseq directory doctest filepath ghc hlint
- hspec io-choice process syb
+ base Cabal containers deepseq directory doctest filepath ghc
+ ghc-boot hlint hspec process syb
];
description = "Happy Haskell Programming";
license = stdenv.lib.licenses.bsd3;
@@ -113121,6 +115244,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hi-file-parser" = callPackage
+ ({ mkDerivation, base, binary, bytestring, hspec, rio, vector }:
+ mkDerivation {
+ pname = "hi-file-parser";
+ version = "0.1.0.0";
+ sha256 = "09gs26z0jvkkhb1r43gj27pq0k5fc4i6fpr59g397vz4sm86gb2l";
+ revision = "1";
+ editedCabalFile = "1hylfzkd42mqap2ydh4wq96vwbblyp26zb8wwyn63yl72swbww23";
+ libraryHaskellDepends = [ base binary bytestring rio vector ];
+ testHaskellDepends = [ base binary bytestring hspec rio vector ];
+ description = "Parser for GHC's hi files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hi3status" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre
, network, prefix-units, process, regex-pcre-builtin, text, time
@@ -113418,14 +115557,14 @@ self: {
}:
mkDerivation {
pname = "higgledy";
- version = "0.1.1.0";
- sha256 = "0qkmf8bjg311a01qwb20vcihk1w8q4avy3lcfz0rj7qqhmfp6542";
+ version = "0.3.0.0";
+ sha256 = "11kcysplf8jzym5g6kd194p72i67scprxsd6hirhacvl8qypy8d6";
libraryHaskellDepends = [ barbies base generic-lens QuickCheck ];
- testHaskellDepends = [ base doctest hspec lens QuickCheck ];
+ testHaskellDepends = [
+ barbies base doctest hspec lens QuickCheck
+ ];
description = "Partial types as a type constructor";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"highWaterMark" = callPackage
@@ -113740,8 +115879,8 @@ self: {
}:
mkDerivation {
pname = "hindent";
- version = "5.3.0";
- sha256 = "0wkfik7mvqskk23kyh7ybgnlh3j9j1ym7d3ncahsbli9w654b7xg";
+ version = "5.3.1";
+ sha256 = "008s8zm9qs972b7v5kkmr8l3i9kc6zm7yj33mkw6dv69b7h3c01l";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -113988,6 +116127,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hint_0_9_0_1" = callPackage
+ ({ mkDerivation, base, containers, directory, exceptions
+ , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit
+ , mtl, random, temporary, unix
+ }:
+ mkDerivation {
+ pname = "hint";
+ version = "0.9.0.1";
+ sha256 = "15cnam704p7ynk70lqz3nvy91src5bd9amfdknvkfzpi5yf2825b";
+ libraryHaskellDepends = [
+ base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+ random temporary unix
+ ];
+ testHaskellDepends = [
+ base containers directory exceptions extensible-exceptions filepath
+ HUnit unix
+ ];
+ description = "Runtime Haskell interpreter (GHC API wrapper)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hint-server" = callPackage
({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl
}:
@@ -114100,8 +116261,6 @@ self: {
];
description = "Haskell Image Processing (HIP) Library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hipbot" = callPackage
@@ -114453,6 +116612,8 @@ self: {
pname = "hit-on";
version = "0.0.0";
sha256 = "14npvwxh33cn8z2klp7liij41r9pyr00rs4g28yva2zry75bf98r";
+ revision = "1";
+ editedCabalFile = "1fwvm0fz2agqziaspxlxxmdv44xrv65pf601i0938wkx4452v8fz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -114634,26 +116795,53 @@ self: {
}) {};
"hjugement-protocol" = callPackage
- ({ mkDerivation, base, bytestring, containers, cryptonite, hashable
- , memory, mmorph, QuickCheck, random, tasty, tasty-hunit
- , tasty-quickcheck, text, transformers, unordered-containers
+ ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+ , containers, criterion, cryptonite, deepseq, memory, QuickCheck
+ , random, reflection, tasty, tasty-hunit, tasty-quickcheck, text
+ , transformers, unordered-containers
}:
mkDerivation {
pname = "hjugement-protocol";
- version = "0.0.0.20190501";
- sha256 = "0jhc5qjraf3v54892134g1qlsi1wrl87kv9c0m4k40hd4fkjh894";
+ version = "0.0.1.20190623";
+ sha256 = "0rqsggij0vx9hh7wl8nzmycb55ilcm0j6dp33x94jycpyvqnc4ym";
libraryHaskellDepends = [
- base bytestring containers cryptonite memory mmorph random text
- transformers unordered-containers
+ aeson base base64-bytestring binary bytestring containers
+ cryptonite deepseq memory random reflection text transformers
+ unordered-containers
];
testHaskellDepends = [
- base containers hashable QuickCheck random tasty tasty-hunit
- tasty-quickcheck text transformers unordered-containers
+ aeson base containers QuickCheck random tasty tasty-hunit
+ tasty-quickcheck text transformers
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion QuickCheck random text transformers
];
description = "A cryptographic protocol for the Majority Judgment";
license = stdenv.lib.licenses.gpl3;
}) {};
+ "hkd-delta" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "hkd-delta";
+ version = "0.0.1";
+ sha256 = "0qb20y6nca61h4mpgyhi6xfcwxf4q92pscr5zqd8yklfcz4qqyz9";
+ libraryHaskellDepends = [ base ];
+ description = "Definition of \"Delta structures\" for higher kinded data";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hkd-lens" = callPackage
+ ({ mkDerivation, base, profunctors }:
+ mkDerivation {
+ pname = "hkd-lens";
+ version = "0.0.1";
+ sha256 = "0s3siyp85k84c9j1srg8y78ia6yj9s6vls9y1hnkgsmg1mx755qg";
+ libraryHaskellDepends = [ base profunctors ];
+ description = "Generic lens/prism/traversal-kinded data";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hkdf" = callPackage
({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }:
mkDerivation {
@@ -114666,6 +116854,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hkgr" = callPackage
+ ({ mkDerivation, base, directory, filepath, simple-cabal
+ , simple-cmd, simple-cmd-args
+ }:
+ mkDerivation {
+ pname = "hkgr";
+ version = "0.2.2";
+ sha256 = "1wz2yy3fiwy4601p0ir24dvv7yzfrqf99z07m8whc6gr2ypsnfjc";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base directory filepath simple-cabal simple-cmd simple-cmd-args
+ ];
+ description = "Simple Hackage release workflow for package maintainers";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hkt" = callPackage
({ mkDerivation, base, hspec, inspection-testing, protolude, text
}:
@@ -114883,8 +117090,8 @@ self: {
}:
mkDerivation {
pname = "hledger-flow";
- version = "0.11.2.0";
- sha256 = "17v9iqh9dhild0m67j2141yxv4hx5p59fjn51yl5q0jbib63gq14";
+ version = "0.12.3.1";
+ sha256 = "1a7idnrqjn7pcvskm1yd9ynlvsza9ql3qfd8d8ycb6z8gpc30fq0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -115178,22 +117385,22 @@ self: {
"hlint" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
, containers, cpphs, data-default, directory, extra, filepath
- , haskell-src-exts, haskell-src-exts-util, hscolour, process
- , refact, text, transformers, uniplate, unordered-containers
- , vector, yaml
+ , ghc-lib-parser, haskell-src-exts, haskell-src-exts-util, hscolour
+ , process, refact, text, transformers, uniplate
+ , unordered-containers, vector, yaml
}:
mkDerivation {
pname = "hlint";
- version = "2.1.17";
- sha256 = "0brinb3fjy619qh8yingqz2k03gcixc7mvqxzhzjadj69zlns6j3";
+ version = "2.2";
+ sha256 = "0921s4cnpjnxmsp8x5dhjs8qiv6mlw98nngwsq6ad5qrj1wn72lx";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-terminal base bytestring cmdargs containers cpphs
- data-default directory extra filepath haskell-src-exts
- haskell-src-exts-util hscolour process refact text transformers
- uniplate unordered-containers vector yaml
+ data-default directory extra filepath ghc-lib-parser
+ haskell-src-exts haskell-src-exts-util hscolour process refact text
+ transformers uniplate unordered-containers vector yaml
];
executableHaskellDepends = [ base ];
description = "Source code suggestions";
@@ -115282,10 +117489,8 @@ self: {
}:
mkDerivation {
pname = "hlrdb";
- version = "0.2.0.1";
- sha256 = "0rrpn3gsh2ck3skpc9d6mdprcac8xdxxc71m8y5jfi0yzh6priga";
- revision = "1";
- editedCabalFile = "0464nxq1q7cccfcm0wi9l3gjgppbpzg4vgm61g21x0l8fnvyv42q";
+ version = "0.3.0.0";
+ sha256 = "0pc3hqi6v9b78fijisnarfs59w6mw8jgyww25r1wmblgwyakl5ab";
libraryHaskellDepends = [
base base64-bytestring bytestring cryptonite hashable hedis
hlrdb-core memory random store time unordered-containers
@@ -115300,8 +117505,8 @@ self: {
}:
mkDerivation {
pname = "hlrdb-core";
- version = "0.1.3.0";
- sha256 = "1rjvhgy1bv5kzf8xkmpjndzclq16gc1ihalzn3swg8iyh91pqh89";
+ version = "0.1.4.0";
+ sha256 = "1sn23347mm9r4j45ba2jz4vw7swh6jgn5fds9xnwgr8rch9b0ljc";
libraryHaskellDepends = [
base bytestring hashable hedis lens mtl profunctors random time
unordered-containers
@@ -115413,6 +117618,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) openblasCompat;};
+ "hmatrix_0_20_0_0" = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, deepseq
+ , openblasCompat, random, semigroups, split, storable-complex
+ , vector
+ }:
+ mkDerivation {
+ pname = "hmatrix";
+ version = "0.20.0.0";
+ sha256 = "1sqy1aci5zfagkb34mz3xdil7cl96z4b4cx28cha54vc5sx1lhpg";
+ configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
+ libraryHaskellDepends = [
+ array base binary bytestring deepseq random semigroups split
+ storable-complex vector
+ ];
+ librarySystemDepends = [ openblasCompat ];
+ description = "Numeric Linear Algebra";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) openblasCompat;};
+
"hmatrix-backprop" = callPackage
({ mkDerivation, backprop, base, finite-typelits
, ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
@@ -115433,8 +117658,6 @@ self: {
];
description = "hmatrix operations lifted for backprop";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hmatrix-banded" = callPackage
@@ -115497,8 +117720,8 @@ self: {
}:
mkDerivation {
pname = "hmatrix-gsl-stats";
- version = "0.4.1.7";
- sha256 = "1gslgk58lzin43cvbpivhw7nrn9qyaa6qwhy1z9ypvyal5p8n3sa";
+ version = "0.4.1.8";
+ sha256 = "1cq049sj3q5r06x7i35hqrkf2jc4p4kfi9zv0jmi2vp7w4644i5q";
libraryHaskellDepends = [
base binary hmatrix storable-complex vector
];
@@ -115887,17 +118110,17 @@ self: {
}) {};
"hmm-lapack" = callPackage
- ({ mkDerivation, base, boxes, comfort-array, containers, deepseq
+ ({ mkDerivation, base, comfort-array, containers, deepseq
, explicit-exception, fixed-length, lapack, lazy-csv, netlib-ffi
, non-empty, prelude-compat, QuickCheck, random, semigroups, tfp
, transformers, utility-ht
}:
mkDerivation {
pname = "hmm-lapack";
- version = "0.3.0.3";
- sha256 = "0ng5nayyqcjd10ai1bgksavsy2ndmr3qyv32qpvz9yslds8d73xk";
+ version = "0.4";
+ sha256 = "0f0xf1fjsqqfimxx7skdwddw8zbdmas3l31y6921mxzy1syys30w";
libraryHaskellDepends = [
- base boxes comfort-array containers deepseq explicit-exception
+ base comfort-array containers deepseq explicit-exception
fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat
QuickCheck random semigroups tfp transformers utility-ht
];
@@ -116095,8 +118318,6 @@ self: {
];
description = "Haskell implementation of the Nix language";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hnix-store-core" = callPackage
@@ -116264,8 +118485,8 @@ self: {
}:
mkDerivation {
pname = "hoauth2";
- version = "1.8.4";
- sha256 = "0k7ibzd5q4bh46m6b46x155n09dd474375k4605d7fl034i16lsx";
+ version = "1.8.7";
+ sha256 = "0x99dh6k6njhsab5vk9q9q4jd5l4yq4cb9c08shvsv0xghsnlh4z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -116276,15 +118497,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hoauth2_1_8_5" = callPackage
+ "hoauth2_1_8_8" = callPackage
({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
, http-types, microlens, text, unordered-containers, uri-bytestring
, uri-bytestring-aeson
}:
mkDerivation {
pname = "hoauth2";
- version = "1.8.5";
- sha256 = "1s96zijcmsd3kfh7pjvbs4ks3hi6fkbq04pnxp9zfgr4di6ifmwz";
+ version = "1.8.8";
+ sha256 = "0ji9887m11k3dh7n36g0m9q1gy4d4729ygvapdzqfa3vi501ndwa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -117130,28 +119351,30 @@ self: {
}) {};
"hoogle" = callPackage
- ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit
- , conduit-extra, connection, containers, deepseq, directory, extra
- , filepath, foundation, hashable, haskell-src-exts, http-conduit
- , http-types, js-flot, js-jquery, mmap, network-uri, old-locale
- , process-extras, QuickCheck, resourcet, storable-tuple, tar
- , template-haskell, text, time, transformers, uniplate, utf8-string
- , vector, wai, wai-logger, warp, warp-tls, zlib
+ ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup
+ , bytestring, cmdargs, conduit, conduit-extra, connection
+ , containers, deepseq, directory, extra, filepath, foundation
+ , hashable, haskell-src-exts, http-conduit, http-types, js-flot
+ , js-jquery, mmap, old-locale, process-extras, QuickCheck
+ , resourcet, storable-tuple, tar, template-haskell, text, time
+ , transformers, uniplate, utf8-string, vector, wai, wai-logger
+ , warp, warp-tls, zlib
}:
mkDerivation {
pname = "hoogle";
- version = "5.0.17.6";
- sha256 = "0kgcgadrp02pcwp0pp56p09kvw3k9i6n4r7qsms3lagq1wcar4dv";
+ version = "5.0.17.9";
+ sha256 = "0s4p82issy3jlc0yz153r7i38ny1ygchf294hgms6jr1q467w86z";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson base binary bytestring cmdargs conduit conduit-extra
- connection containers deepseq directory extra filepath foundation
- hashable haskell-src-exts http-conduit http-types js-flot js-jquery
- mmap network-uri old-locale process-extras QuickCheck resourcet
- storable-tuple tar template-haskell text time transformers uniplate
- utf8-string vector wai wai-logger warp warp-tls zlib
+ aeson base binary blaze-html blaze-markup bytestring cmdargs
+ conduit conduit-extra connection containers deepseq directory extra
+ filepath foundation hashable haskell-src-exts http-conduit
+ http-types js-flot js-jquery mmap old-locale process-extras
+ QuickCheck resourcet storable-tuple tar template-haskell text time
+ transformers uniplate utf8-string vector wai wai-logger warp
+ warp-tls zlib
];
executableHaskellDepends = [ base ];
testTarget = "--test-option=--no-net";
@@ -117199,10 +119422,10 @@ self: {
}:
mkDerivation {
pname = "hookup";
- version = "0.2.2";
- sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf";
- revision = "4";
- editedCabalFile = "1l52m4pl1l0mrnl4czx25i8xvba03l7bvqskk59cgwfk8q1kk935";
+ version = "0.2.3";
+ sha256 = "03svzlzkykz4yqwq4vfgwdq6jdz8zzqhy1ggz3wps9cbx6yrl4cj";
+ revision = "1";
+ editedCabalFile = "1pc0ijak6psp5db1q29nzhp8pw0h15y2g8ssa1xxmlfjdl1c509d";
libraryHaskellDepends = [
attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
];
@@ -118367,21 +120590,21 @@ self: {
"hpqtypes" = callPackage
({ mkDerivation, aeson, async, base, bytestring, Cabal, containers
- , data-default-class, directory, exceptions, filepath, HUnit
- , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
- , resource-pool, scientific, semigroups, test-framework
- , test-framework-hunit, text, text-show, time, transformers
- , transformers-base, unordered-containers, vector
+ , directory, exceptions, filepath, HUnit, lifted-base
+ , monad-control, mtl, postgresql, QuickCheck, random, resource-pool
+ , scientific, semigroups, test-framework, test-framework-hunit
+ , text, text-show, time, transformers, transformers-base
+ , unordered-containers, vector
}:
mkDerivation {
pname = "hpqtypes";
- version = "1.6.1.0";
- sha256 = "02vh9l86dnayccvfq3cqmk6gbbwyqglnpg3mhr3v72vraxymm7jn";
+ version = "1.7.0.0";
+ sha256 = "0vk6yj7rw3cqdvyfmpjis10av1apj79v0b8d9hagc8v8zzfp0wki";
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
- aeson async base bytestring containers data-default-class
- exceptions lifted-base monad-control mtl resource-pool semigroups
- text text-show time transformers transformers-base vector
+ aeson async base bytestring containers exceptions lifted-base
+ monad-control mtl resource-pool semigroups text text-show time
+ transformers transformers-base vector
];
librarySystemDepends = [ postgresql ];
testHaskellDepends = [
@@ -118398,18 +120621,18 @@ self: {
"hpqtypes-extras" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, containers
- , cryptohash, data-default, exceptions, fields-json, hpqtypes
- , lifted-base, log-base, monad-control, mtl, safe, semigroups
- , tasty, tasty-hunit, text, text-show, transformers
+ , cryptohash, exceptions, fields-json, hpqtypes, lifted-base
+ , log-base, monad-control, mtl, safe, semigroups, tasty
+ , tasty-hunit, text, text-show, transformers
}:
mkDerivation {
pname = "hpqtypes-extras";
- version = "1.8.0.0";
- sha256 = "1q90y8qm5hmyh4q344p844p78cqi0l5w8sxzazyg3mmf8xmz9xy1";
+ version = "1.9.0.1";
+ sha256 = "04qlcs5vdzyxfdmamz65lhw1bjbm8rl9h5qf4xback6lcxr2h5q7";
libraryHaskellDepends = [
- base base16-bytestring bytestring containers cryptohash
- data-default exceptions fields-json hpqtypes lifted-base log-base
- monad-control mtl safe semigroups text text-show
+ base base16-bytestring bytestring containers cryptohash exceptions
+ fields-json hpqtypes lifted-base log-base monad-control mtl safe
+ semigroups text text-show
];
testHaskellDepends = [
base exceptions hpqtypes lifted-base log-base monad-control tasty
@@ -118478,6 +120701,29 @@ self: {
broken = true;
}) {};
+ "hprox" = callPackage
+ ({ mkDerivation, async, base, base64-bytestring, binary, bytestring
+ , case-insensitive, conduit, conduit-extra, http-client
+ , http-reverse-proxy, http-types, optparse-applicative, tls, unix
+ , wai, wai-extra, warp, warp-tls
+ }:
+ mkDerivation {
+ pname = "hprox";
+ version = "0.1.0.2";
+ sha256 = "0ajyv9zmi6nr8add7admfxavd691g3rvyy8ll6gra6hhpn0lwp0m";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ async base base64-bytestring binary bytestring case-insensitive
+ conduit conduit-extra http-client http-reverse-proxy http-types
+ optparse-applicative tls unix wai wai-extra warp warp-tls
+ ];
+ description = "a lightweight HTTP proxy server, and more";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hps" = callPackage
({ mkDerivation, base, filepath, hcg-minus, process }:
mkDerivation {
@@ -118725,6 +120971,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hrfsize" = callPackage
+ ({ mkDerivation, base, process, tasty, tasty-hunit }:
+ mkDerivation {
+ pname = "hrfsize";
+ version = "0.0.2";
+ sha256 = "1vffw7r3lx80ny2v19ykfj76xswqpsijp1mri4kmd4jnlv5z2nin";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base process tasty tasty-hunit ];
+ description = "File size in human readable format";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hricket" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -118774,8 +121032,8 @@ self: {
}:
mkDerivation {
pname = "hruby";
- version = "0.3.6";
- sha256 = "068mvb6bf583bldx07whc3cc0s3xbjlibi55r0ajjq9v4kxv98yx";
+ version = "0.3.8";
+ sha256 = "0x72gh0lzwrr10w7lply72yqz5q0hxq39virhm2sqqsmy9r305k8";
setupHaskellDepends = [ base Cabal process ];
libraryHaskellDepends = [
aeson attoparsec base bytestring scientific stm text
@@ -119503,6 +121761,26 @@ self: {
broken = true;
}) {};
+ "hs-zstd" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
+ , QuickCheck, test-framework, test-framework-quickcheck2, zlib
+ }:
+ mkDerivation {
+ pname = "hs-zstd";
+ version = "0.1.1.1";
+ sha256 = "1510r677j4vf9yrih3mimjrw31vgwcnw3wli41cddvghinm9paih";
+ libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
+ testHaskellDepends = [
+ base bytestring QuickCheck test-framework
+ test-framework-quickcheck2
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion ghc-prim zlib
+ ];
+ description = "Haskell bindings to the Zstandard compression algorithm";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hs2048" = callPackage
({ mkDerivation, base, criterion, doctest, Glob, hastache, hlint
, hspec, HUnit, process, QuickCheck, random, regex-compat
@@ -119888,8 +122166,8 @@ self: {
pname = "hsc2hs";
version = "0.68.4";
sha256 = "07qzyr1j76gxrrsds65vivm5cx33paxpifvxdlmkxprrm3s4z7z6";
- revision = "1";
- editedCabalFile = "1wab9n4wy3bffxly0b0v1ppzf6sfn6aqc8pi1r8jnwb4rzy94c3i";
+ revision = "2";
+ editedCabalFile = "178jimc9qwrjmiiz8f0kk7gv2jaf51vv1n40rp42ggmi8mvf0m4v";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -120761,6 +123039,20 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
+ "hsemail_2_2_0" = callPackage
+ ({ mkDerivation, base, hspec, parsec, time, time-compat }:
+ mkDerivation {
+ pname = "hsemail";
+ version = "2.2.0";
+ sha256 = "0078n2snnrgsnl6az7c6jpmgyfsls4k1zr09f7ny7kn6g33g5z84";
+ libraryHaskellDepends = [ base parsec time time-compat ];
+ testHaskellDepends = [ base hspec parsec time ];
+ description = "Parsec parsers for the Internet Message format (e-mail)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
+ }) {};
+
"hsemail-ns" = callPackage
({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }:
mkDerivation {
@@ -121023,8 +123315,8 @@ self: {
}:
mkDerivation {
pname = "hsimport";
- version = "0.8.8";
- sha256 = "0q6348iz4w8zfdrzv98vydw5rdxlhqapdqhxrnhd6dqlcjq3rf1j";
+ version = "0.10.0";
+ sha256 = "0l98yylpmpnlq6ahicpz86p4khg02yjjcg19nyf9rgml3qdw6829";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121035,7 +123327,8 @@ self: {
testHaskellDepends = [
base filepath haskell-src-exts tasty tasty-golden
];
- description = "A command line program for extending the import list of a Haskell source file";
+ doHaddock = false;
+ description = "Extend the import list of a Haskell source file";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -121253,8 +123546,8 @@ self: {
}:
mkDerivation {
pname = "hslua";
- version = "1.0.2";
- sha256 = "0w2gcp66ny3crxip0gn86abz8psz2z14nx2z2wna0s8p0n8v5agx";
+ version = "1.0.3.1";
+ sha256 = "1w11d5csjl5jdzjzcq8gkd7lzyfsgaxmby5gq97jaj6r32l3zy9m";
configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
libraryHaskellDepends = [
base bytestring containers exceptions fail mtl text
@@ -121278,6 +123571,8 @@ self: {
pname = "hslua-aeson";
version = "1.0.0";
sha256 = "0wvcf0adv2b5fn7mvi8p6ydzsyzbn43qyk1kjvvi9achrgvc59zz";
+ revision = "1";
+ editedCabalFile = "1ysgh5s99zv0khkwqw1kcli2r2vi77r7wz3yc0y0i7qr35shzklh";
libraryHaskellDepends = [
aeson base hashable hslua scientific text unordered-containers
vector
@@ -121296,8 +123591,8 @@ self: {
}:
mkDerivation {
pname = "hslua-module-system";
- version = "0.2.0";
- sha256 = "1yjkq6af7x1vyqxszdlb6fysv8q97q3424gycvqhdqjd8wf545b5";
+ version = "0.2.1";
+ sha256 = "1m7wz3g5c34pyizqw5mllzhsy2vziddhlbhjfwdvd7nhd3p4v3hh";
libraryHaskellDepends = [
base containers directory exceptions hslua temporary
];
@@ -121311,8 +123606,8 @@ self: {
}:
mkDerivation {
pname = "hslua-module-text";
- version = "0.2.0";
- sha256 = "0zlgin87cck5ccw82jf0bfjcrpdnqlylh4sfqifbdjgspswha5vi";
+ version = "0.2.1";
+ sha256 = "1ikdwvvxhbd5wmfr85dzs2ccamh9rbbpgy899z7s1vlv5q1dj0hk";
libraryHaskellDepends = [ base bytestring hslua text ];
testHaskellDepends = [ base hslua tasty tasty-hunit text ];
description = "Lua module for text";
@@ -121964,6 +124259,23 @@ self: {
broken = true;
}) {};
+ "hspec-golden" = callPackage
+ ({ mkDerivation, base, directory, hspec, hspec-core, silently
+ , simple-get-opt
+ }:
+ mkDerivation {
+ pname = "hspec-golden";
+ version = "0.1.0.0";
+ sha256 = "191z6pxks4ic1b8lzyfd8f3kw3zwmywvj8psd17lb65z121grj46";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory hspec-core ];
+ executableHaskellDepends = [ base directory simple-get-opt ];
+ testHaskellDepends = [ base directory hspec hspec-core silently ];
+ description = "Golden tests for hspec";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"hspec-golden-aeson" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
, filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt
@@ -122264,8 +124576,8 @@ self: {
}:
mkDerivation {
pname = "hspec-snap";
- version = "1.0.0.2";
- sha256 = "0d2mr14ksyjvzaprakfqb5pdrsdgxi8jlfa4a2bwd3yfsdmj8pp5";
+ version = "1.0.1.0";
+ sha256 = "0r7isf3vi8mc6h50s6n8cbmvbdmklk3v8d7wwb1ikzjl4izhimkn";
libraryHaskellDepends = [
aeson base bytestring containers digestive-functors HandsomeSoup
hspec hspec-core HUnit hxt lens mtl snap snap-core text
@@ -122413,8 +124725,8 @@ self: {
pname = "hspec2";
version = "0.6.1";
sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4";
- revision = "1";
- editedCabalFile = "0zqh0f7d89aw3ib7mx2wlkpc166f3zipgka4m54y2shcz3rbl7nl";
+ revision = "2";
+ editedCabalFile = "1q0pw1ggki7h839jicf2k0lllbm219qjcr3407hvcih9vfkbw03j";
libraryHaskellDepends = [ base hspec hspec-discover ];
description = "Alpha version of Hspec 2.0";
license = stdenv.lib.licenses.mit;
@@ -122856,8 +125168,8 @@ self: {
}:
mkDerivation {
pname = "hssqlppp";
- version = "0.6.1";
- sha256 = "06rqf8gkz2f1ay1vd3ba0nzv9n1098vxm9sc9ls4dk2ismab7cgz";
+ version = "0.6.2";
+ sha256 = "0lzy6laqxi6v6hlz9j2kvxm9rc4i89m9lnffymfkfwxlrgq7wg0s";
libraryHaskellDepends = [
base containers mtl parsec pretty pretty-show syb text transformers
uniplate
@@ -122868,8 +125180,6 @@ self: {
];
description = "SQL parser and type checker";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hssqlppp-th" = callPackage
@@ -122878,8 +125188,8 @@ self: {
}:
mkDerivation {
pname = "hssqlppp-th";
- version = "0.6.1";
- sha256 = "09mxb2pmnk43bvdl7f58r8wxaw3h372sy174p42k8pphlss9amkg";
+ version = "0.6.2";
+ sha256 = "1p17srzz09iikxn47yr7qmv5g6z7c5kc5svlszmxlhs5j0kgahb0";
libraryHaskellDepends = [
base hssqlppp syb template-haskell text
];
@@ -122888,8 +125198,6 @@ self: {
];
description = "hssqlppp extras which need template-haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hstatistics" = callPackage
@@ -123983,6 +126291,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http-api-data_0_4_1" = callPackage
+ ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat
+ , bytestring, Cabal, cabal-doctest, containers, cookie, directory
+ , doctest, filepath, hashable, hspec, hspec-discover, http-types
+ , HUnit, nats, QuickCheck, quickcheck-instances, tagged, text
+ , time-compat, unordered-containers, uuid-types
+ }:
+ mkDerivation {
+ pname = "http-api-data";
+ version = "0.4.1";
+ sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ attoparsec attoparsec-iso8601 base base-compat bytestring
+ containers cookie hashable http-types tagged text time-compat
+ unordered-containers uuid-types
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring cookie directory doctest filepath hspec
+ HUnit nats QuickCheck quickcheck-instances text time-compat
+ unordered-containers uuid-types
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-attoparsec" = callPackage
({ mkDerivation, attoparsec, base, bytestring, http-types }:
mkDerivation {
@@ -124297,34 +126633,6 @@ self: {
}) {};
"http-conduit" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
- , case-insensitive, conduit, conduit-extra, connection, cookie
- , data-default-class, hspec, http-client, http-client-tls
- , http-types, HUnit, mtl, network, resourcet, streaming-commons
- , temporary, text, time, transformers, unliftio, unliftio-core
- , utf8-string, wai, wai-conduit, warp, warp-tls
- }:
- mkDerivation {
- pname = "http-conduit";
- version = "2.3.7";
- sha256 = "18pj7f5gl72ry2mq2dqbm21spacn5ig14yr0xsdyq7yzs64kq17y";
- libraryHaskellDepends = [
- aeson attoparsec base bytestring conduit conduit-extra http-client
- http-client-tls http-types mtl resourcet transformers unliftio-core
- ];
- testHaskellDepends = [
- aeson base blaze-builder bytestring case-insensitive conduit
- conduit-extra connection cookie data-default-class hspec
- http-client http-types HUnit network resourcet streaming-commons
- temporary text time transformers unliftio utf8-string wai
- wai-conduit warp warp-tls
- ];
- doCheck = false;
- description = "HTTP client package with conduit interface and HTTPS support";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "http-conduit_2_3_7_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
, case-insensitive, conduit, conduit-extra, connection, cookie
, data-default-class, hspec, http-client, http-client-tls
@@ -124336,6 +126644,8 @@ self: {
pname = "http-conduit";
version = "2.3.7.1";
sha256 = "1xnjbwvil1an5crffcwapdqyinbvvss25rcdra05isqixcs26h39";
+ revision = "1";
+ editedCabalFile = "0mmlaxnpxpgm4kzxid3xlwwqd53djx8n9a07nhvk5awyql1h9yj5";
libraryHaskellDepends = [
aeson attoparsec base bytestring conduit conduit-extra http-client
http-client-tls http-types mtl resourcet transformers unliftio-core
@@ -124350,7 +126660,6 @@ self: {
doCheck = false;
description = "HTTP client package with conduit interface and HTTPS support";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http-conduit-browser" = callPackage
@@ -124418,19 +126727,22 @@ self: {
}) {};
"http-directory" = callPackage
- ({ mkDerivation, base, bytestring, html-conduit, http-client
- , http-date, http-types, text, time, xml-conduit
+ ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client
+ , http-client-tls, http-date, http-types, text, time, xml-conduit
}:
mkDerivation {
pname = "http-directory";
- version = "0.1.1";
- sha256 = "1wv92w3dfsxp4y9qai6qxxv7fq807p9vcmm844ggcc9xblmmcr4r";
+ version = "0.1.5";
+ sha256 = "075crysy7avf97vlskwlk8813q2bnqw9p3q29c5yb2yhmykrpwyn";
libraryHaskellDepends = [
- base bytestring html-conduit http-client http-date http-types text
- time xml-conduit
+ base bytestring html-conduit http-client http-client-tls http-date
+ http-types text time xml-conduit
];
+ testHaskellDepends = [ base hspec ];
description = "http directory listing library";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"http-dispatch" = callPackage
@@ -124452,6 +126764,36 @@ self: {
broken = true;
}) {};
+ "http-download" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, conduit
+ , conduit-extra, cryptonite, cryptonite-conduit, directory
+ , exceptions, filepath, hspec, hspec-discover, http-client
+ , http-conduit, http-types, memory, path, path-io, retry, rio
+ , rio-prettyprint
+ }:
+ mkDerivation {
+ pname = "http-download";
+ version = "0.1.0.0";
+ sha256 = "0wip7l6cls734ag306s5l0683qqh273b3lk5ibig66racmysjqyb";
+ revision = "3";
+ editedCabalFile = "147fjxz1y3rqwnrhvrhgg2d93fl6pbwkhc2fbzriwn7kyan8z06l";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring conduit conduit-extra cryptonite
+ cryptonite-conduit directory exceptions filepath http-client
+ http-conduit http-types memory path path-io retry rio
+ rio-prettyprint
+ ];
+ testHaskellDepends = [
+ base cryptonite hspec hspec-discover http-client path path-io retry
+ rio rio-prettyprint
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Verified downloads with retries";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"http-encodings" = callPackage
({ mkDerivation, base, bytestring, HTTP, iconv, mime, mtl, parsec
, text, utf8-string, zlib
@@ -124621,6 +126963,8 @@ self: {
pname = "http-media";
version = "0.7.1.3";
sha256 = "0kqjzvh5y8r6x5rw2kgd816w2963c6cbyw2qjvaj2mv59zxzqkrr";
+ revision = "1";
+ editedCabalFile = "19py5pspx80gg679p9dzqr3iidflppxc1x4vkldamjkidyi406j8";
libraryHaskellDepends = [
base bytestring case-insensitive containers utf8-string
];
@@ -124690,6 +127034,8 @@ self: {
];
description = "A type unsafe http library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"http-pony-serve-wai" = callPackage
@@ -124904,6 +127250,8 @@ self: {
];
description = "An HTTP client using io-streams";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"http-test" = callPackage
@@ -125006,6 +127354,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http2_2_0_3" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, array, base
+ , base16-bytestring, bytestring, case-insensitive, containers
+ , directory, doctest, filepath, gauge, Glob, heaps, hspec
+ , http-types, mwc-random, network, network-byte-order, psqueues
+ , stm, text, time-manager, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "http2";
+ version = "2.0.3";
+ sha256 = "14qh1g0f0m0gj8ciww7rh9mcsxxjyvp5sv3ggyyxb0qf3prhalds";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bytestring case-insensitive containers http-types
+ network network-byte-order psqueues stm time-manager
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty array base base16-bytestring bytestring
+ case-insensitive containers directory doctest filepath Glob hspec
+ http-types network network-byte-order psqueues stm text
+ time-manager unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ array base bytestring case-insensitive containers gauge heaps
+ mwc-random network-byte-order psqueues stm
+ ];
+ description = "HTTP/2 library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http2-client" = callPackage
({ mkDerivation, async, base, bytestring, containers, deepseq
, http2, lifted-async, lifted-base, mtl, network, stm, time, tls
@@ -125098,12 +127478,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "httpd-shed_0_4_1_0" = callPackage
+ "httpd-shed_0_4_1_1" = callPackage
({ mkDerivation, base, network, network-bsd, network-uri }:
mkDerivation {
pname = "httpd-shed";
- version = "0.4.1.0";
- sha256 = "11am9hnqw13chgzvl3b7v72gjklv2jxgps7dqk4acsl0z7jqip7y";
+ version = "0.4.1.1";
+ sha256 = "19dgdimpzr7pxk7pqvyin6j87gmvnf0rm35gzhmna8qr835wy3sr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base network network-bsd network-uri ];
@@ -125259,6 +127639,8 @@ self: {
libraryHaskellDepends = [ base containers haxr mtl ];
description = "A haskell wrap for Ubigraph";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hubris" = callPackage
@@ -125414,13 +127796,13 @@ self: {
}) {};
"human-readable-duration" = callPackage
- ({ mkDerivation, base, criterion, doctest, Glob }:
+ ({ mkDerivation, base, criterion, doctest, Glob, time }:
mkDerivation {
pname = "human-readable-duration";
- version = "0.2.1.3";
- sha256 = "1zq85v9knc73ck9lqrn4k0w121ifpjg7j053qmhgam0605j89236";
+ version = "0.2.1.4";
+ sha256 = "06yw7bab1hk8287d2zdg45m46pgp87fivh0cb2x1nxivvn1qfs6c";
libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base doctest Glob ];
+ testHaskellDepends = [ base doctest Glob time ];
benchmarkHaskellDepends = [ base criterion ];
description = "Provide duration helper";
license = stdenv.lib.licenses.bsd3;
@@ -125877,14 +128259,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hvega_0_2_0_0" = callPackage
+ "hvega_0_3_0_1" = callPackage
({ mkDerivation, aeson, base, text, vector }:
mkDerivation {
pname = "hvega";
- version = "0.2.0.0";
- sha256 = "07ynsm2karz34wyrszkcmk6xm2pw684isgc7gjnlnn1wq2gbyj9k";
+ version = "0.3.0.1";
+ sha256 = "04qrlqzi065r9b83wyw1zymnyjvpy5jhlzxxqd2j6m9zsngh7hl1";
libraryHaskellDepends = [ aeson base text vector ];
- description = "Create Vega-Lite visualizations in Haskell";
+ description = "Create Vega-Lite visualizations (version 3) in Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -125902,19 +128284,21 @@ self: {
}) {};
"hw-balancedparens" = callPackage
- ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
- , hw-prim, hw-rankselect-base, QuickCheck, vector
+ ({ mkDerivation, base, criterion, deepseq, hspec, hspec-discover
+ , hw-bits, hw-excess, hw-prim, hw-rankselect-base, QuickCheck
+ , vector
}:
mkDerivation {
pname = "hw-balancedparens";
- version = "0.2.0.2";
- sha256 = "0paphyp5icawflbybm40mn8r9ka7a6x128vwqagpiz6mb5zpa8hn";
+ version = "0.2.0.4";
+ sha256 = "166vb5armxah2r1qwa9yzzd5abd3dnssybgwl6kjzl8q43r0n84h";
libraryHaskellDepends = [
- base hw-bits hw-excess hw-prim hw-rankselect-base vector
+ base deepseq hw-bits hw-excess hw-prim hw-rankselect-base vector
];
testHaskellDepends = [
base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
];
+ testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
base criterion hw-bits hw-prim vector
];
@@ -125924,6 +128308,37 @@ self: {
broken = true;
}) {};
+ "hw-balancedparens_0_3_0_0" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, hedgehog, hspec
+ , hspec-discover, hw-bits, hw-excess, hw-fingertree
+ , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, transformers
+ , vector
+ }:
+ mkDerivation {
+ pname = "hw-balancedparens";
+ version = "0.3.0.0";
+ sha256 = "1xb2pyhmcwl927v4hc7nfi31bf9lvlz9mnqdbb7mzpl6bdlg7xc7";
+ revision = "1";
+ editedCabalFile = "1a8zs7j05vxbamcc63fi1xf6vvz7bg1zf0a72930xh4y4bd2m0qk";
+ libraryHaskellDepends = [
+ base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
+ hw-rankselect-base vector
+ ];
+ testHaskellDepends = [
+ base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim
+ hw-rankselect-base transformers vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base criterion hedgehog hw-bits hw-prim vector
+ ];
+ doHaddock = false;
+ description = "Balanced parentheses";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-bits" = callPackage
({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
, hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim
@@ -125933,6 +128348,8 @@ self: {
pname = "hw-bits";
version = "0.7.0.6";
sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm";
+ revision = "1";
+ editedCabalFile = "0yl5b2qcrb2bjncwv2k9j006582cwxmpfgsggcyk5vw7i6iwhmhb";
libraryHaskellDepends = [
base bytestring hw-int hw-prim hw-string-parse safe vector
];
@@ -126012,8 +128429,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "hw-diagnostics";
- version = "0.0.0.5";
- sha256 = "0cfrgcjj7c2bi5l4qan23ipylfa73qh19xc9x03sbia6qh0yrsjw";
+ version = "0.0.0.7";
+ sha256 = "1wfmrdpkvk2p045xchvwhnd1glq527ksgg0bs2qg5r0nyhsg55zi";
libraryHaskellDepends = [ base ];
description = "Diagnostics library";
license = stdenv.lib.licenses.bsd3;
@@ -126030,6 +128447,8 @@ self: {
pname = "hw-dsv";
version = "0.3.5";
sha256 = "15dy96ah7frs79g102vvsrihzlk2qc5c773y7bqdcm66mjhin3x2";
+ revision = "1";
+ editedCabalFile = "1i67wr9yhks9bzpcr0dqhqgvv2i94izv4p6wrcb2vbjl7wzzgs1v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -126109,19 +128528,61 @@ self: {
broken = true;
}) {};
+ "hw-eliasfano_0_1_1_0" = callPackage
+ ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+ , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+ , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim
+ , hw-rankselect, hw-rankselect-base, lens, mmap
+ , optparse-applicative, vector
+ }:
+ mkDerivation {
+ pname = "hw-eliasfano";
+ version = "0.1.1.0";
+ sha256 = "0q3lrpw72krsbfbykjkkm55aca43ravyl4b1d3k0wgh5wv340a3v";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base deepseq hw-bits hw-int hw-packed-vector hw-prim hw-rankselect
+ hw-rankselect-base vector
+ ];
+ executableHaskellDepends = [
+ base binary bytestring generic-lens hw-packed-vector lens
+ optparse-applicative vector
+ ];
+ testHaskellDepends = [
+ base hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-int
+ hw-packed-vector hw-prim vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion hedgehog hspec hw-bits hw-hedgehog
+ hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector
+ ];
+ description = "Elias-Fano";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-excess" = callPackage
- ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
- , QuickCheck, safe, vector
+ ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
+ , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim
+ , hw-rankselect-base, QuickCheck, safe, vector
}:
mkDerivation {
pname = "hw-excess";
- version = "0.2.0.2";
- sha256 = "1xm1nwab2zhlyd0n536pd5sny4miqr8p41pasl9mqvg89v6x0db7";
+ version = "0.2.2.0";
+ sha256 = "07d6q5m98z6r7p4hhzzm8ihn9sbd05hhf40a0hcq3ixxrdz7yyrb";
libraryHaskellDepends = [
base hw-bits hw-prim hw-rankselect-base safe vector
];
testHaskellDepends = [
- base hspec hw-bits hw-prim QuickCheck vector
+ base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck
+ vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion hw-prim vector
];
description = "Excess";
license = stdenv.lib.licenses.bsd3;
@@ -126130,19 +128591,18 @@ self: {
}) {};
"hw-fingertree" = callPackage
- ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
- , hw-hspec-hedgehog, QuickCheck, test-framework
- , test-framework-hunit, test-framework-quickcheck2
+ ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover
+ , hw-hspec-hedgehog, hw-prim
}:
mkDerivation {
pname = "hw-fingertree";
- version = "0.1.0.1";
- sha256 = "1nlla161156w21g3kdcv42bm5rfz9aslh5lw7rmlw8pdrgg6g3f3";
- libraryHaskellDepends = [ base deepseq ];
+ version = "0.1.1.0";
+ sha256 = "096lj6bhyk3pyal3jnif8cm6yprir1kpr5cvjl576kbfhyxdnhmy";
+ libraryHaskellDepends = [ base deepseq hw-prim ];
testHaskellDepends = [
- base deepseq hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
+ base deepseq hedgehog hspec hw-hspec-hedgehog
];
+ testToolDepends = [ hspec-discover ];
description = "Generic finger-tree structure, with example instances";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -126171,6 +128631,8 @@ self: {
pname = "hw-hedgehog";
version = "0.1.0.3";
sha256 = "0cck3kxxc7fxfqji9jv15vc9v1zpqz7rzacxfcjc0i6s1ll9vbv2";
+ revision = "1";
+ editedCabalFile = "1wvjv13pznqxzhix7ikjx2gpqc3ppn7z20yl7l6z80yslalh7pm2";
libraryHaskellDepends = [ base hedgehog vector ];
testHaskellDepends = [ base ];
description = "Extra hedgehog functionality";
@@ -126199,6 +128661,8 @@ self: {
pname = "hw-hspec-hedgehog";
version = "0.1.0.7";
sha256 = "0445b5ycr622qjann2yyri8ghkhkw0vqaqn2rlar9wq2ni3b85rv";
+ revision = "1";
+ editedCabalFile = "0gcfhqasff8ij0xr5wq74blp90ldzgv992agadp63bs4ikg4rajm";
libraryHaskellDepends = [
base call-stack hedgehog hspec HUnit transformers
];
@@ -126241,21 +128705,29 @@ self: {
broken = true;
}) {};
- "hw-ip_2_3_1_0" = callPackage
- ({ mkDerivation, appar, base, containers, generic-lens, hedgehog
- , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
+ "hw-ip_2_3_1_2" = callPackage
+ ({ mkDerivation, appar, base, binary, bytestring, containers
+ , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+ , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text
}:
mkDerivation {
pname = "hw-ip";
- version = "2.3.1.0";
- sha256 = "19a2z6lx064y4y2qzhfzzwwpy4hisf86a57ah1f9jjjrvnxr1363";
+ version = "2.3.1.2";
+ sha256 = "1j22dl3739ysg7p88aks19azyzs883drz5lc593m99w057j33wga";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
appar base containers generic-lens hw-bits iproute text
];
+ executableHaskellDepends = [
+ appar base binary bytestring generic-lens lens optparse-applicative
+ text
+ ];
testHaskellDepends = [
appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog
text
];
+ testToolDepends = [ hspec-discover ];
description = "Library for manipulating IP addresses and CIDR blocks";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -126299,38 +128771,43 @@ self: {
broken = true;
}) {};
- "hw-json_1_0_0_2" = callPackage
- ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
+ "hw-json_1_3_0_1" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
, bits-extra, bytestring, criterion, directory, dlist, generic-lens
, hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits
- , hw-hspec-hedgehog, hw-json-simd, hw-mquery, hw-parser, hw-prim
+ , hw-hspec-hedgehog, hw-json-simd, hw-json-simple-cursor
+ , hw-json-standard-cursor, hw-mquery, hw-parser, hw-prim
, hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap
- , optparse-applicative, text, transformers, vector, word8
+ , optparse-applicative, scientific, text, transformers, vector
+ , word8
}:
mkDerivation {
pname = "hw-json";
- version = "1.0.0.2";
- sha256 = "0lb38kfxhamvdhp6z3aw4as57nc6jxf6wj7nr3lmiry6h2gx15js";
+ version = "1.3.0.1";
+ sha256 = "10m4f4jv3wb4n4na1d1a26s81n7clxgmj2745xs9yrax1wvqnjg0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- ansi-wl-pprint array attoparsec base bits-extra bytestring dlist
- hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect
+ aeson ansi-wl-pprint attoparsec base bits-extra bytestring dlist
+ hw-balancedparens hw-bits hw-json-simple-cursor
+ hw-json-standard-cursor hw-mquery hw-parser hw-prim hw-rankselect
hw-rankselect-base hw-simd mmap text vector word8
];
executableHaskellDepends = [
base bytestring dlist generic-lens hw-balancedparens hw-json-simd
- hw-mquery hw-prim hw-rankselect hw-rankselect-base lens mmap
- optparse-applicative vector
+ hw-json-simple-cursor hw-json-standard-cursor hw-mquery hw-prim
+ hw-rankselect hw-rankselect-base lens mmap optparse-applicative
+ text vector
];
testHaskellDepends = [
- attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits
- hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base
- transformers vector
+ aeson attoparsec base bytestring hedgehog hspec hw-balancedparens
+ hw-bits hw-hspec-hedgehog hw-json-simple-cursor
+ hw-json-standard-cursor hw-prim hw-rankselect hw-rankselect-base
+ scientific text transformers vector
];
testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
- base bytestring criterion directory mmap
+ base bytestring criterion directory hw-json-standard-cursor mmap
];
description = "Memory efficient JSON parser";
license = stdenv.lib.licenses.bsd3;
@@ -126376,6 +128853,77 @@ self: {
testHaskellDepends = [ base bytestring hw-prim lens vector ];
description = "SIMD-based JSON semi-indexer";
license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hw-json-simple-cursor" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, directory
+ , generic-lens, hedgehog, hspec, hspec-discover, hw-balancedparens
+ , hw-bits, hw-hspec-hedgehog, hw-json-simd, hw-prim, hw-rankselect
+ , hw-rankselect-base, lens, mmap, optparse-applicative, text
+ , vector, word8
+ }:
+ mkDerivation {
+ pname = "hw-json-simple-cursor";
+ version = "0.1.0.1";
+ sha256 = "0asvkzz0dgcc5cjrn3wqhn3svxi13wfzxi0ggc8mzzmfci07jigy";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring hw-balancedparens hw-bits hw-prim hw-rankselect
+ hw-rankselect-base vector word8
+ ];
+ executableHaskellDepends = [
+ base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim
+ hw-rankselect hw-rankselect-base lens mmap optparse-applicative
+ text vector
+ ];
+ testHaskellDepends = [
+ base bytestring hedgehog hspec hw-balancedparens hw-bits
+ hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion directory mmap
+ ];
+ description = "Memory efficient JSON parser";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "hw-json-standard-cursor" = callPackage
+ ({ mkDerivation, array, base, bits-extra, bytestring, criterion
+ , directory, generic-lens, hedgehog, hspec, hspec-discover
+ , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json-simd
+ , hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap
+ , optparse-applicative, text, vector, word8
+ }:
+ mkDerivation {
+ pname = "hw-json-standard-cursor";
+ version = "0.2.1.1";
+ sha256 = "0z0lxzciyw6b49w1s88yx9lcqgk0fjmh1zv7qs3jnn9sk0bqldh5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bits-extra bytestring hw-balancedparens hw-bits
+ hw-json-simd hw-prim hw-rankselect hw-rankselect-base mmap vector
+ word8
+ ];
+ executableHaskellDepends = [
+ base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim
+ hw-rankselect hw-rankselect-base lens mmap optparse-applicative
+ text vector
+ ];
+ testHaskellDepends = [
+ base bytestring hedgehog hspec hw-balancedparens hw-bits
+ hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion directory mmap
+ ];
+ description = "Memory efficient JSON parser";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -126460,6 +129008,8 @@ self: {
pname = "hw-mquery";
version = "0.1.0.3";
sha256 = "0i020vl1f2nkk80rd1fmx9ilkrzyggp01ka3bz9n0365mcq5g3s5";
+ revision = "1";
+ editedCabalFile = "1i5kir4fxv564h01sjj29zs460w23rj7q5ykq98x3cwmynlrkl6l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -126485,6 +129035,8 @@ self: {
pname = "hw-mquery";
version = "0.2.0.1";
sha256 = "04jkhnljyirbjg1b693bacfnaa3i854rg1dgy3mifr7sbmk0xgnn";
+ revision = "1";
+ editedCabalFile = "0n6zicz4cdr9z7lzlagj8gamj9gnv3nhvjz7srw4wg1cnagimi0s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -126520,32 +129072,93 @@ self: {
broken = true;
}) {};
+ "hw-packed-vector_0_2_0_0" = callPackage
+ ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+ , directory, generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+ , hw-hedgehog, hw-hspec-hedgehog, hw-prim, lens
+ , optparse-applicative, vector
+ }:
+ mkDerivation {
+ pname = "hw-packed-vector";
+ version = "0.2.0.0";
+ sha256 = "1nspd5hwn32fjgxmg08bq8hmyxzh61gc72zgd24mcpy94kzq58xd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring deepseq hw-bits hw-prim vector
+ ];
+ executableHaskellDepends = [
+ base binary bytestring generic-lens hw-bits hw-prim lens
+ optparse-applicative vector
+ ];
+ testHaskellDepends = [
+ base bytestring hedgehog hspec hw-bits hw-hedgehog
+ hw-hspec-hedgehog hw-prim vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base criterion directory hedgehog hspec hw-prim vector
+ ];
+ description = "Packed Vector";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-parser" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }:
+ ({ mkDerivation, attoparsec, base, bytestring, hedgehog, hspec
+ , hspec-discover, hw-hspec-hedgehog, hw-prim, text
+ }:
mkDerivation {
pname = "hw-parser";
- version = "0.1.0.0";
- sha256 = "14ck19m0fizv7zpqxnpgv7fah9x3fp0p5ax5a5zxr5s52b52mq2x";
+ version = "0.1.0.1";
+ sha256 = "0df3238y4ld9j9w4p1x4lcv13lip9cf3fqn88z98xqjqmfzjdffn";
+ revision = "1";
+ editedCabalFile = "1nf0s726vr90dggcjxp1qz1msnvckjj908rsc4f991524gz4ygh7";
libraryHaskellDepends = [
attoparsec base bytestring hw-prim text
];
+ testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
+ testToolDepends = [ hspec-discover ];
description = "Simple parser support";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hw-prim" = callPackage
({ mkDerivation, base, bytestring, criterion, directory, exceptions
- , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, mmap
- , QuickCheck, semigroups, transformers, vector
+ , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
+ , mmap, QuickCheck, semigroups, transformers, vector
}:
mkDerivation {
pname = "hw-prim";
- version = "0.6.2.23";
- sha256 = "1kilyiq6gj44gz9hqy11ab1sm4j399rkz5k0a98fpzjd6b7ndrmy";
+ version = "0.6.2.28";
+ sha256 = "13sszlfw4k4vb2zzipjisk3b4qjs19jzmczfjhzs0dap6gw39haz";
libraryHaskellDepends = [
- base bytestring mmap semigroups transformers vector
+ base bytestring ghc-prim mmap semigroups transformers vector
+ ];
+ testHaskellDepends = [
+ base bytestring directory exceptions hedgehog hspec
+ hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion mmap semigroups transformers vector
+ ];
+ description = "Primitive functions and data types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hw-prim_0_6_2_29" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+ , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
+ , mmap, QuickCheck, semigroups, transformers, vector
+ }:
+ mkDerivation {
+ pname = "hw-prim";
+ version = "0.6.2.29";
+ sha256 = "1pbcmi3ysaidhb5jlllmdwdkh7gbky234qxf5j2r5lk3n0n6zzp1";
+ libraryHaskellDepends = [
+ base bytestring ghc-prim mmap semigroups transformers vector
];
testHaskellDepends = [
base bytestring directory exceptions hedgehog hspec
@@ -126558,7 +129171,6 @@ self: {
description = "Primitive functions and data types";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hw-prim-bits" = callPackage
@@ -126579,8 +129191,6 @@ self: {
benchmarkHaskellDepends = [ base criterion vector ];
description = "Primitive support for bit manipulation";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hw-rankselect" = callPackage
@@ -126618,22 +129228,22 @@ self: {
broken = true;
}) {};
- "hw-rankselect_0_13_0_0" = callPackage
+ "hw-rankselect_0_13_2_0" = callPackage
({ mkDerivation, base, bytestring, conduit, criterion, deepseq
, directory, generic-lens, hedgehog, hspec, hspec-discover
- , hw-balancedparens, hw-bits, hw-hedgehog, hw-hspec-hedgehog
- , hw-prim, hw-rankselect-base, lens, mmap, mtl
+ , hw-balancedparens, hw-bits, hw-fingertree, hw-hedgehog
+ , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens, mmap, mtl
, optparse-applicative, QuickCheck, resourcet, transformers, vector
}:
mkDerivation {
pname = "hw-rankselect";
- version = "0.13.0.0";
- sha256 = "13cdsrg7akizf5gcjvpwr8mwhl6ds9n3y7ql559w52xy5s8viqzv";
+ version = "0.13.2.0";
+ sha256 = "00k163jalapxdlcmcvi4ddk60bsj34f7ng05agvh1374kybqscb4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base
- vector
+ base deepseq hedgehog hspec hw-balancedparens hw-bits hw-fingertree
+ hw-prim hw-rankselect-base vector
];
executableHaskellDepends = [
base directory generic-lens hw-bits hw-prim hw-rankselect-base lens
@@ -126648,6 +129258,7 @@ self: {
base bytestring conduit criterion directory hw-bits hw-prim
hw-rankselect-base mmap resourcet vector
];
+ doHaddock = false;
description = "Rank-select";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -126663,6 +129274,8 @@ self: {
pname = "hw-rankselect-base";
version = "0.3.2.1";
sha256 = "0q4kywln4bls2dvazhqh2acw4yqnabnx0mdkhldgg70q8amnq2nj";
+ revision = "2";
+ editedCabalFile = "0djyix1fp00s8j0qjja4557wdflgixpz4fvrmwiw7x294zr9f9fw";
libraryHaskellDepends = [
base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector
];
@@ -126689,6 +129302,8 @@ self: {
pname = "hw-simd";
version = "0.1.1.4";
sha256 = "1rc4zzp3h87zqrdsgwvc9vxydv200jk7q02vcqfk23wqg0sxvpw0";
+ revision = "1";
+ editedCabalFile = "00a1wr7sbz6hyapd26asx4zs3g1r8x2y61zdckfb2dxxhyhs2kjw";
libraryHaskellDepends = [
base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
hw-rankselect-base vector
@@ -126721,6 +129336,8 @@ self: {
pname = "hw-streams";
version = "0.0.0.10";
sha256 = "08ghjvgyd13b1mby213j86p9b8fbk3j3jbj1n9czq4w9sbsbpxxw";
+ revision = "1";
+ editedCabalFile = "141vh52p5mwxv77gdnbs6n0k9kkapz4wnwdbm4jpirmhl45bxzph";
libraryHaskellDepends = [
base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups
transformers vector
@@ -126773,6 +129390,32 @@ self: {
broken = true;
}) {};
+ "hw-uri" = callPackage
+ ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
+ , antiope-core, antiope-s3, base, bytestring, directory, exceptions
+ , filepath, hedgehog, hspec, hspec-discover, http-client
+ , http-types, hw-hspec-hedgehog, lens, mtl, resourcet, text
+ }:
+ mkDerivation {
+ pname = "hw-uri";
+ version = "0.0.2.0";
+ sha256 = "0z2y9ykg6q3p7qgm7s66sg5cw3pf2cbjlqk8xf6l7qgpa7br1z2b";
+ libraryHaskellDepends = [
+ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3
+ base bytestring directory exceptions filepath http-client
+ http-types lens mtl resourcet text
+ ];
+ testHaskellDepends = [
+ aeson antiope-core antiope-s3 base bytestring filepath hedgehog
+ hspec http-types hw-hspec-hedgehog lens text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Supports IO on URIs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-vector" = callPackage
({ mkDerivation, base, bytestring, hspec, hw-prim, QuickCheck
, vector
@@ -126785,8 +129428,6 @@ self: {
testHaskellDepends = [ base hspec QuickCheck vector ];
description = "Vector type with convenient typeclass instances";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hw-xml" = callPackage
@@ -126799,8 +129440,8 @@ self: {
}:
mkDerivation {
pname = "hw-xml";
- version = "0.1.0.4";
- sha256 = "1ay4qz30m1aiych3rypbmpfbsc8wjal5w4l7h1zm44hl9ghiap9d";
+ version = "0.3.0.0";
+ sha256 = "1f7q4vqrj5iv2c2dcgc6cld6zaqqp8d575fnali1lg3fv5n1g69k";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -127106,8 +129747,8 @@ self: {
}:
mkDerivation {
pname = "hxt";
- version = "9.3.1.16";
- sha256 = "1qq3ykgn355rx242xjcbqqksgvwr6k2fdj5phw4iv28qqxff6m8d";
+ version = "9.3.1.18";
+ sha256 = "0836k65px3w9c5h1h2bmzq5a7mp6ajxwvfg3pfr2kbxwkgc0j63j";
libraryHaskellDepends = [
base binary bytestring containers deepseq directory filepath
hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
@@ -127161,6 +129802,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hxt-charproperties_9_4_0_0" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "hxt-charproperties";
+ version = "9.4.0.0";
+ sha256 = "1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm";
+ libraryHaskellDepends = [ base ];
+ description = "Character properties and classes for XML and Unicode";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hxt-css" = callPackage
({ mkDerivation, base, hxt, parsec, split }:
mkDerivation {
@@ -127264,6 +129917,8 @@ self: {
pname = "hxt-regex-xmlschema";
version = "9.2.0.3";
sha256 = "1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l";
+ revision = "1";
+ editedCabalFile = "0vg9vnfjmq1ma6zwwv4yvfih6wbslksvsvy9b41i4f81l0hh7ia8";
libraryHaskellDepends = [
base bytestring hxt-charproperties parsec text
];
@@ -127437,6 +130092,8 @@ self: {
pname = "hybrid-vectors";
version = "0.2.2";
sha256 = "1mw69xjdncj6kqa2mvag8xc79y4jijnh2qg6ahrhifb4vxqw7ij1";
+ revision = "1";
+ editedCabalFile = "16wpgh7cxgmap5acyccbff02b2jvhqiad5m3fknribpbahvmkk88";
libraryHaskellDepends = [
base deepseq primitive semigroups vector
];
@@ -127895,6 +130552,8 @@ self: {
pname = "hyperloglog";
version = "0.4.2";
sha256 = "0j0hbzpap3f92kvywsxjahxmqrdj51275jdv0h7f9lf9qby3rf7m";
+ revision = "1";
+ editedCabalFile = "1zh47rrwih6933hhq9vd0ly5s42w0bn196znkg9l8q6r6drl7xsf";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
approximate base binary bits bytes cereal cereal-vector comonad
@@ -127963,8 +130622,8 @@ self: {
pname = "hyphenation";
version = "0.7.1";
sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52";
- revision = "4";
- editedCabalFile = "0pp7qm40alsfd9z5dvp6l2c7dp9zp0skl9g0iib3jahxs3n8qcrr";
+ revision = "5";
+ editedCabalFile = "00wsp69aqi5i906liqa4sfs0p2yclhr1ihz8y1700b3ymb70lzql";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
@@ -127977,6 +130636,27 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "hyphenation_0_8" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers
+ , doctest, text, unordered-containers, zlib
+ }:
+ mkDerivation {
+ pname = "hyphenation";
+ version = "0.8";
+ sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii";
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base bytestring containers text unordered-containers zlib
+ ];
+ testHaskellDepends = [
+ base containers doctest unordered-containers
+ ];
+ description = "Configurable Knuth-Liang hyphenation";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hypher" = callPackage
({ mkDerivation, aeson, base, bytestring, Cabal, containers
, data-default, hashable, HTTP, http-conduit, http-types, HUnit
@@ -128016,6 +130696,8 @@ self: {
pname = "hyraxAbif";
version = "0.2.3.15";
sha256 = "1wfmlqgk751ij30x0dkyc9fyc6j1a96l0s7fjj1sywdvawd8cfh1";
+ revision = "1";
+ editedCabalFile = "07i4ippga6cnwr9yl6nkrhakl9sim73fprf29lnmsvdc8ynbifcd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -128141,6 +130823,27 @@ self: {
broken = true;
}) {};
+ "i3blocks-hs-contrib" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, lens, lens-aeson, text
+ , time, transformers, turtle, wreq
+ }:
+ mkDerivation {
+ pname = "i3blocks-hs-contrib";
+ version = "1.0.0";
+ sha256 = "1lg60cgmyavlmn5a9ywa45vxskndqfbpy18vc6r6kxl49xgcqmpn";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base text turtle ];
+ executableHaskellDepends = [
+ aeson attoparsec base lens lens-aeson text time transformers turtle
+ wreq
+ ];
+ description = "Base i3blocks written in haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"i3ipc" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, containers, hspec
, network, text, typed-process, vector
@@ -129071,8 +131774,8 @@ self: {
({ mkDerivation, aeson, base, hvega, ihaskell, text }:
mkDerivation {
pname = "ihaskell-hvega";
- version = "0.2.0.0";
- sha256 = "01y03r7jwxwvcs0hy8jjxz4lxg9hl5088g060w2c6pcnbz6zj7zj";
+ version = "0.2.0.2";
+ sha256 = "0xbv8801wxslcs9fsjssvdldz6nq8zmxm6l4pwkv8zpasqzq4k9q";
libraryHaskellDepends = [ aeson base hvega ihaskell text ];
description = "IHaskell display instance for hvega types";
license = stdenv.lib.licenses.bsd3;
@@ -129433,6 +132136,23 @@ self: {
broken = true;
}) {};
+ "imgur" = callPackage
+ ({ mkDerivation, base, data-default-class, http-client, req, text
+ , xml-conduit, xml-lens
+ }:
+ mkDerivation {
+ pname = "imgur";
+ version = "1.0";
+ sha256 = "140n07ygfjnyxfqbq2vzfgsk93b3j5m2s61jcivx74z6sc7g867h";
+ libraryHaskellDepends = [
+ base data-default-class http-client req text xml-conduit xml-lens
+ ];
+ description = "A function to post an image to imgur";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"imgurder" = callPackage
({ mkDerivation, base, curl, directory, haskell98, hxt, hxt-xpath
, url
@@ -129548,38 +132268,43 @@ self: {
}) {};
"imm" = callPackage
- ({ mkDerivation, aeson, atom-conduit, base, base-noprelude
+ ({ mkDerivation, aeson, async, atom-conduit, base-noprelude, binary
, blaze-html, blaze-markup, bytestring, case-insensitive, conduit
- , connection, containers, directory, dyre, fast-logger, filepath
+ , connection, containers, dhall, directory, fast-logger, filepath
, hashable, HaskellNet, HaskellNet-SSL, http-client
, http-client-tls, http-types, microlens, mime-mail, monad-time
- , monoid-subclasses, mtl, network, opml-conduit
- , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
- , refined, relude, rss-conduit, safe-exceptions, stm
- , streaming-bytestring, streaming-with, streamly, text, time
- , timerep, tls, transformers-base, uri-bytestring, xml, xml-conduit
- , xml-types
+ , msgpack, network, opml-conduit, optparse-applicative
+ , prettyprinter, prettyprinter-ansi-terminal, refined, relude
+ , rss-conduit, safe-exceptions, stm, stm-chans
+ , streaming-bytestring, streaming-with, text, time, timerep, tls
+ , typed-process, uri-bytestring, xml-conduit, xml-types
}:
mkDerivation {
pname = "imm";
- version = "1.5.0.0";
- sha256 = "005idmw68z28pfj8q6x6al809w5hd83m0jykg5m8m1xy9fv1plja";
+ version = "1.7.0.0";
+ sha256 = "0slgfg4ay8j1kcvskl60gd2xbwllxcip6104wg36hcmb1symgdf1";
isLibrary = true;
isExecutable = true;
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson atom-conduit base-noprelude blaze-html blaze-markup
- bytestring case-insensitive conduit connection containers directory
- dyre fast-logger filepath hashable HaskellNet HaskellNet-SSL
- http-client http-client-tls http-types microlens mime-mail
- monad-time monoid-subclasses mtl network opml-conduit
+ aeson async atom-conduit base-noprelude binary conduit containers
+ dhall directory filepath hashable http-types microlens monad-time
+ msgpack prettyprinter prettyprinter-ansi-terminal refined relude
+ rss-conduit safe-exceptions text time timerep tls uri-bytestring
+ xml-conduit xml-types
+ ];
+ executableHaskellDepends = [
+ aeson async atom-conduit base-noprelude blaze-html blaze-markup
+ bytestring case-insensitive conduit connection containers dhall
+ directory fast-logger filepath HaskellNet HaskellNet-SSL
+ http-client http-client-tls mime-mail msgpack network opml-conduit
optparse-applicative prettyprinter prettyprinter-ansi-terminal
- refined relude rss-conduit safe-exceptions stm streaming-bytestring
- streaming-with streamly text time timerep tls transformers-base
- uri-bytestring xml xml-conduit xml-types
+ refined relude rss-conduit safe-exceptions stm stm-chans
+ streaming-bytestring streaming-with text time typed-process
+ uri-bytestring xml-conduit xml-types
];
- executableHaskellDepends = [ base ];
- description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
- license = stdenv.lib.licenses.publicDomain;
+ description = "Execute arbitrary callbacks for each element of RSS/Atom feeds";
+ license = stdenv.lib.licenses.cc0;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -130072,6 +132797,20 @@ self: {
broken = true;
}) {};
+ "indent" = callPackage
+ ({ mkDerivation, base, containers, optparse-applicative, text }:
+ mkDerivation {
+ pname = "indent";
+ version = "0.0.5";
+ sha256 = "0xqvdns8rqdfqw872rcmnbiwnms8dkdp15vkczcypsxic1bliv5w";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers text ];
+ executableHaskellDepends = [ base optparse-applicative text ];
+ description = "Fix your indentation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"indentation" = callPackage
({ mkDerivation, base, indentation-core, indentation-parsec
, indentation-trifecta, mtl, parsec, parsers, trifecta
@@ -130490,6 +133229,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "influxdb_1_7_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+ , cabal-doctest, clock, containers, doctest, foldl, http-client
+ , http-types, lens, network, optional-args, scientific, tagged
+ , template-haskell, text, time, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "influxdb";
+ version = "1.7.0";
+ sha256 = "1a9la9gm5brsh9rs9ai1a50kcdk75kw8jmrh1rd6xs4xiwdca819";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring clock containers foldl http-client
+ http-types lens network optional-args scientific tagged text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [ base doctest template-haskell ];
+ description = "Haskell client library for InfluxDB";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"informative" = callPackage
({ mkDerivation, base, containers, csv, highlighting-kate
, http-conduit, monad-logger, pandoc, persistent
@@ -130500,6 +133263,8 @@ self: {
pname = "informative";
version = "0.1.0.27";
sha256 = "05h69883lmj9d80h847yig0ryl1a49y7pckdhq8gl9ahx3hzsgyh";
+ revision = "1";
+ editedCabalFile = "1bcdaykax075cal066v7j3f1jmbhkqpql0wkj3dny6ww9jdvq1ws";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -130703,6 +133468,32 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "inline-c_0_8_0_1" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+ , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
+ , regex-posix, template-haskell, transformers, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "inline-c";
+ version = "0.8.0.1";
+ sha256 = "1w8njc8k1g8kmpk8c8q5p7m8adgpv5v4k4643hsi5422jdaq0g3i";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-wl-pprint base bytestring containers hashable mtl parsec
+ parsers template-haskell transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+ raw-strings-qq regex-posix template-haskell transformers
+ unordered-containers vector
+ ];
+ description = "Write Haskell source files including C code inline. No FFI required.";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"inline-c-cpp_0_1_0_0" = callPackage
({ mkDerivation, base, inline-c, template-haskell }:
mkDerivation {
@@ -130722,8 +133513,8 @@ self: {
}:
mkDerivation {
pname = "inline-c-cpp";
- version = "0.3.0.1";
- sha256 = "00q4f2rv6ny5cnfyfdwqvmngw2w40jfs5zb1x7zs574w4l31g701";
+ version = "0.3.0.2";
+ sha256 = "03dfikf43mmx4vzlp6nd6f1c3niklh2f9mq1s2fwsikh8x8x3qp6";
libraryHaskellDepends = [
base inline-c safe-exceptions template-haskell
];
@@ -130778,8 +133569,8 @@ self: {
}:
mkDerivation {
pname = "inline-r";
- version = "0.10.1";
- sha256 = "15hiql8i7jp76a1csiry6zzsmdzm0wbvlgikai7g0zdgyylqw6hg";
+ version = "0.10.2";
+ sha256 = "1lwdmdd4mx800zmiyg5z8nkpg2x31lqw74pgb515kyb9v97jykr4";
libraryHaskellDepends = [
aeson base bytestring containers data-default-class deepseq
exceptions inline-c mtl pretty primitive process reflection setenv
@@ -130843,10 +133634,8 @@ self: {
}:
mkDerivation {
pname = "insert-ordered-containers";
- version = "0.2.1.0";
- sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp";
- revision = "9";
- editedCabalFile = "02d4zqyb9dbahkpcbpgxylrc5xxc0zbw1awj5w0jyrql2g2b6a5f";
+ version = "0.2.2";
+ sha256 = "1ikjhg0pdfpnx1d645r92k2dwlk7y935j1w5lcsk23nzpwhbkxja";
libraryHaskellDepends = [
aeson base base-compat hashable lens semigroupoids semigroups text
transformers unordered-containers
@@ -130888,6 +133677,8 @@ self: {
];
description = "A simple proxy for debugging plaintext protocols communication";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"inspection-testing" = callPackage
@@ -130896,8 +133687,8 @@ self: {
}:
mkDerivation {
pname = "inspection-testing";
- version = "0.4.1.2";
- sha256 = "1rh744nswl7i6wk2gv9qx5rbz74ndd1j5ynmfzdhw3i4jjr99q4v";
+ version = "0.4.2.1";
+ sha256 = "1aw6yj7aikzlisjk5w0gfvby1hqdxm7vj5a65haxs41nxfyifrfd";
libraryHaskellDepends = [
base containers ghc mtl template-haskell transformers
];
@@ -130940,8 +133731,8 @@ self: {
}:
mkDerivation {
pname = "instana-haskell-trace-sdk";
- version = "0.2.0.0";
- sha256 = "1yl8k10win4r06rfqxl1vfp4zb78lijrzsn6zpmlqycnpfm00zp0";
+ version = "0.3.0.0";
+ sha256 = "0dy947230ing6mv4xvd8ahiwfhkz557n2mrvi86whns8jbb71nbv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -130952,7 +133743,8 @@ self: {
];
executableHaskellDepends = [
aeson base binary bytestring hslogger http-client http-types
- servant servant-server text time transformers unix wai warp
+ servant servant-server text time transformers unix
+ unordered-containers wai warp
];
testHaskellDepends = [
aeson aeson-extra base bytestring directory ekg-core exceptions
@@ -131367,6 +134159,8 @@ self: {
pname = "intern";
version = "0.9.2";
sha256 = "081fyiq00cvx4nyagr34kwnag9njv65wdps5j4ydin6sjq7b58wk";
+ revision = "1";
+ editedCabalFile = "1mav591qx20p9dx4rg4xwpavqw8rciva82n7q0icdgvc1ayy7sl5";
libraryHaskellDepends = [
array base bytestring hashable text unordered-containers
];
@@ -131402,8 +134196,8 @@ self: {
}:
mkDerivation {
pname = "intero";
- version = "0.1.39";
- sha256 = "0qfns2rwgkmd1i28p5pgvcp0yza8lrpi9xlq3zpl7jqrawbxbp3v";
+ version = "0.1.40";
+ sha256 = "09p5bjjqagbz1xkcfd5psmgxbg3z057kyv39j0i63g4q484zznz3";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -131546,12 +134340,30 @@ self: {
broken = true;
}) {};
+ "interpolatedstring-qq2" = callPackage
+ ({ mkDerivation, base, bytestring, haskell-src-meta, HUnit
+ , template-haskell, text
+ }:
+ mkDerivation {
+ pname = "interpolatedstring-qq2";
+ version = "0.1.0.0";
+ sha256 = "0d7xq1pdrhfl1vfl1axhzpv04hbc9yhvfagisrfq42hj6mbh8djx";
+ libraryHaskellDepends = [
+ base bytestring haskell-src-meta template-haskell text
+ ];
+ testHaskellDepends = [
+ base bytestring haskell-src-meta HUnit template-haskell text
+ ];
+ description = "QuasiQuoter for multi-line interpolated strings";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"interpolation" = callPackage
({ mkDerivation, array, base, containers, QuickCheck, utility-ht }:
mkDerivation {
pname = "interpolation";
- version = "0.1.1";
- sha256 = "0rpzilzcld0xwcfz9pkhq9sx9qd8ysz9yy3znpdslk4ia8i507y7";
+ version = "0.1.1.1";
+ sha256 = "081xlf59xp0j1svigkqfcz5an3yl3p8f5402i6492hz9rpv5qwy5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base utility-ht ];
@@ -131569,8 +134381,8 @@ self: {
}:
mkDerivation {
pname = "interpolator";
- version = "0.1.1";
- sha256 = "13symhhxvv2dxn7449p8b9g7p37p98icj0ql63y9qkdg6s7b8rf0";
+ version = "0.1.2";
+ sha256 = "1kzqlwgpbzrq0flr90f9q359j8qjxll5adl9w5r9gp1yj3j7hrrz";
libraryHaskellDepends = [
aeson base containers either mono-traversable mtl
product-profunctors profunctors QuickCheck template-haskell text
@@ -131583,15 +134395,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "interpolator_0_1_2" = callPackage
+ "interpolator_1_0_0" = callPackage
({ mkDerivation, aeson, base, containers, either, hspec
, mono-traversable, mtl, product-profunctors, profunctors
, QuickCheck, template-haskell, text
}:
mkDerivation {
pname = "interpolator";
- version = "0.1.2";
- sha256 = "1kzqlwgpbzrq0flr90f9q359j8qjxll5adl9w5r9gp1yj3j7hrrz";
+ version = "1.0.0";
+ sha256 = "0kkasycgba525mag4362w8kirnxjydrmh7gjqk5xs6zgcp1ralb7";
libraryHaskellDepends = [
aeson base containers either mono-traversable mtl
product-profunctors profunctors QuickCheck template-haskell text
@@ -131686,6 +134498,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "intervals_0_9" = callPackage
+ ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
+ , distributive, doctest, filepath, ghc-prim, QuickCheck
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "intervals";
+ version = "0.9";
+ sha256 = "0v5z5h0lcsfxiz5m876b1pwygxic5l5p0ijnhzibbpzpqg1lahs4";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [ array base distributive ghc-prim ];
+ testHaskellDepends = [
+ base directory doctest filepath QuickCheck template-haskell
+ ];
+ description = "Interval Arithmetic";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"intricacy" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, crypto-api, crypto-pubkey-types, cryptohash, directory, filepath
@@ -131733,6 +134564,8 @@ self: {
pname = "intro";
version = "0.5.2.1";
sha256 = "0i5cpa5jx82nb1gi1wdhgnbmxlb7s4nbya46k6byajf7g50i5qp8";
+ revision = "1";
+ editedCabalFile = "19zndrl4rgzjrg97cbc2cyiqih15gaijgibz0vppphcbmn7v9fl8";
libraryHaskellDepends = [
base bytestring containers deepseq dlist extra hashable mtl safe
text transformers unordered-containers writer-cps-mtl
@@ -131847,8 +134680,8 @@ self: {
}:
mkDerivation {
pname = "invariant";
- version = "0.5.2";
- sha256 = "0k3rh5gzga9snj8piqpsix5h9437kmbam75sax7aa6pirhxx0dw0";
+ version = "0.5.3";
+ sha256 = "03245nhcqxx6b0yw81fzqaqd7cgllmx8awzhvs2xv7ys73pmsgnp";
libraryHaskellDepends = [
array base bifunctors comonad containers contravariant ghc-prim
profunctors StateVar stm tagged template-haskell th-abstraction
@@ -132143,6 +134976,8 @@ self: {
pname = "ioctl";
version = "0.0.1";
sha256 = "0rwh7mlwdd24ndzz4b4vd5b5daz9cga47m9nz6g75m03iyy237qs";
+ revision = "1";
+ editedCabalFile = "15i0plam5pr3zkvmmy0g5q9v1fwvp49r4gsyx3y5j89svyffwqaq";
libraryHaskellDepends = [ base network unix ];
description = "Type-safe I/O control package";
license = stdenv.lib.licenses.mit;
@@ -132166,8 +135001,6 @@ self: {
];
description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ioref-stable" = callPackage
@@ -132245,8 +135078,6 @@ self: {
];
description = "Library for IP and MAC addresses";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ip_1_5_0" = callPackage
@@ -132260,6 +135091,8 @@ self: {
pname = "ip";
version = "1.5.0";
sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j";
+ revision = "1";
+ editedCabalFile = "09r4flbanb4zq3ixx57zd47gjvl6ghyrv62k11smbxzs6wy3szr4";
libraryHaskellDepends = [
aeson attoparsec base bytestring deepseq hashable primitive text
vector wide-word
@@ -132276,7 +135109,6 @@ self: {
description = "Library for IP and MAC addresses";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ip-quoter" = callPackage
@@ -132310,8 +135142,8 @@ self: {
({ mkDerivation, base, binary, bytestring, iproute }:
mkDerivation {
pname = "ip2proxy";
- version = "1.0.0";
- sha256 = "0f1plyy6hxkk7xz9m4fv7p56vqmvnna9frg21ms1n3f99wfimldx";
+ version = "2.0.0";
+ sha256 = "0lhc0ni65wj32j97yw9iy2lawnl4bc7ml6lsjk12wks4mcy01nrv";
libraryHaskellDepends = [ base binary bytestring iproute ];
description = "IP2Proxy Haskell package for proxy detection";
license = stdenv.lib.licenses.mit;
@@ -132385,6 +135217,44 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "ipfs-api" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, http-media, http-types
+ , servant, text
+ }:
+ mkDerivation {
+ pname = "ipfs-api";
+ version = "0.1.0.0";
+ sha256 = "1fvvb36vfqpzbhsyp8ps0y9qpizj1b4xygiwxiqzf6g813yl53b8";
+ libraryHaskellDepends = [
+ aeson base bytestring http-media http-types servant text
+ ];
+ description = "Auto-generated IPFS HTTP API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "ipld-cid" = callPackage
+ ({ mkDerivation, base, binary, binary-varint, bytestring
+ , cryptonite, deepseq, hashable, hedgehog, multibase
+ , multihash-cryptonite, text
+ }:
+ mkDerivation {
+ pname = "ipld-cid";
+ version = "0.1.0.0";
+ sha256 = "1y08j0ibcrpfcm0zv1h17zdgbl3hm3sjvm0w9bk1lzdipd6p6cwj";
+ libraryHaskellDepends = [
+ base binary binary-varint bytestring cryptonite deepseq hashable
+ multibase multihash-cryptonite text
+ ];
+ testHaskellDepends = [
+ base bytestring cryptonite hedgehog multibase multihash-cryptonite
+ text
+ ];
+ description = "IPLD Content-IDentifiers ";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"ipopt-hs" = callPackage
({ mkDerivation, ad, ansi-wl-pprint, base, c2hs, containers, ipopt
, lens, mtl, nlopt, template-haskell, uu-parsinglib, vector
@@ -132526,8 +135396,6 @@ self: {
];
description = "A library for creating kernels for IPython frontends";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ipython-kernel_0_10_0_0" = callPackage
@@ -132551,7 +135419,6 @@ self: {
description = "A library for creating kernels for IPython frontends";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"irc" = callPackage
@@ -132590,8 +135457,8 @@ self: {
}:
mkDerivation {
pname = "irc-client";
- version = "1.1.0.5";
- sha256 = "13qc5acpkgd80nazlpac3q2viqp76fhq6qjk7fp5dp1w6bhj9qi7";
+ version = "1.1.0.7";
+ sha256 = "0vfcf4fsyqwvr6mjf89x368121m3dqscywrsgpn1qm80gpzsncj2";
libraryHaskellDepends = [
base bytestring conduit connection containers contravariant
exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
@@ -132620,8 +135487,8 @@ self: {
}:
mkDerivation {
pname = "irc-conduit";
- version = "0.3.0.1";
- sha256 = "0lividbrrc2yydqp55xqji8q6wigb49skrzw9vki6iivxcszka5h";
+ version = "0.3.0.3";
+ sha256 = "1wbgczkiwnbpcwwcpsv9zf8n7nisv0iv2kivpjrxnhin2j4c48y1";
libraryHaskellDepends = [
async base bytestring conduit conduit-extra connection irc irc-ctcp
network-conduit-tls profunctors text time tls transformers
@@ -132637,8 +135504,8 @@ self: {
}:
mkDerivation {
pname = "irc-core";
- version = "2.6.0";
- sha256 = "07w8nyvscc2d643dq02bl533c2kwx8zw8j1b1dizfwhixwnzgphq";
+ version = "2.7.1";
+ sha256 = "0syhcb1q9j68pcxzbv45pah6bkfvnqjzkpzn2356ci7jpb9qpbbn";
libraryHaskellDepends = [
attoparsec base base64-bytestring bytestring hashable primitive
text time vector
@@ -132897,6 +135764,8 @@ self: {
pname = "ironforge";
version = "0.1.0.36";
sha256 = "11fsph447c3cml0805zdf8454skd7v12ip0cflma6llp3cnfbbl6";
+ revision = "1";
+ editedCabalFile = "09xmdl9d92jg3l9b2j7crf2kkyhf7zw9vysvr8qfbrhwkkq8d56z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -133192,8 +136061,8 @@ self: {
}:
mkDerivation {
pname = "itanium-abi";
- version = "0.1.1.0";
- sha256 = "01fhzxgarbaccmkixn6l09wrbl5xr23kxcq3pf21k13zq6p971d8";
+ version = "0.1.1.1";
+ sha256 = "1dmr6sz4mf24781md81jjrwjsp431zyh7alkz71jlb224phc81nz";
libraryHaskellDepends = [
base boomerang text transformers unordered-containers
];
@@ -133524,8 +136393,6 @@ self: {
libraryToolDepends = [ alex happy ];
description = "Safe embedded C programming";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ivory-artifact" = callPackage
@@ -133561,8 +136428,6 @@ self: {
];
description = "Ivory C backend";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ivory-bitdata" = callPackage
@@ -133601,8 +136466,6 @@ self: {
];
description = "Simple concrete evaluator for Ivory programs";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ivory-examples" = callPackage
@@ -133625,8 +136488,6 @@ self: {
];
description = "Ivory examples";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ivory-hw" = callPackage
@@ -133639,8 +136500,6 @@ self: {
libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
description = "Ivory hardware model (STM32F4)";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ivory-opts" = callPackage
@@ -133657,8 +136516,6 @@ self: {
];
description = "Ivory compiler optimizations";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ivory-quickcheck" = callPackage
@@ -133680,8 +136537,6 @@ self: {
];
description = "QuickCheck driver for Ivory";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ivory-serialize" = callPackage
@@ -133698,8 +136553,6 @@ self: {
];
description = "Serialization library for Ivory";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ivory-stdlib" = callPackage
@@ -133712,8 +136565,6 @@ self: {
libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
description = "Ivory standard library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ivy-web" = callPackage
@@ -133964,19 +136815,20 @@ self: {
}:
mkDerivation {
pname = "jaeger-flamegraph";
- version = "1.2.0";
- sha256 = "1ha7zngxr9nin3gyqwwv6bplvrrc2n3j9sl8fp2dmxpjfwpi9r7f";
- revision = "1";
- editedCabalFile = "0xv7828z08rfd1m29ib8vlvigbavx5ksc67vj57293qiq590a3xf";
- isLibrary = false;
+ version = "1.3.0";
+ sha256 = "03j5hjrhyhmc6qjp7v4j0mr2y0fpk0zds6v55as24par508w72ka";
+ revision = "2";
+ editedCabalFile = "0p2pcfyrcbqh0rnmhhp5hbwixvlml62iz0d48z7dd6cwfdzlkfrr";
+ isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base QuickCheck ];
+ libraryHaskellDepends = [ aeson base containers QuickCheck text ];
executableHaskellDepends = [
aeson base bytestring containers extra optparse-applicative text
];
- testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ];
+ testHaskellDepends = [
+ aeson base containers tasty tasty-hspec tasty-quickcheck text
+ ];
testToolDepends = [ tasty-discover ];
- doHaddock = false;
description = "Generate flamegraphs from Jaeger .json dumps.";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -134071,8 +136923,6 @@ self: {
executableHaskellDepends = [ base boxes directory filepath ];
description = "Export sheet music and audio from Windows/Mac app Jammit";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"japanese-calendar" = callPackage
@@ -134516,6 +137366,8 @@ self: {
pname = "jmacro";
version = "0.6.16";
sha256 = "1kyrvxg5fwwrwv72aby694ar071yl2xmnfkjyrwi5wbc7hsb8rda";
+ revision = "1";
+ editedCabalFile = "0g7fn738ljrhh6ydmvkigj9znhh2szdvp79kqxw62m4ryqan23qq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -134962,8 +137814,6 @@ self: {
];
description = "DOM library that uses jsaddle to support both GHCJS and GHC";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"jsaddle-hello" = callPackage
@@ -135145,6 +137995,30 @@ self: {
broken = true;
}) {};
+ "json-api-lib" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+ , data-default, hspec, hspec-discover, lens, lens-aeson, text
+ , unordered-containers, uri-encode
+ }:
+ mkDerivation {
+ pname = "json-api-lib";
+ version = "0.1.1.1";
+ sha256 = "096n08y80rkjn090w9pybwbfbwamfdig451nbgd48x0nrk6c091n";
+ libraryHaskellDepends = [
+ aeson base containers data-default lens lens-aeson text
+ unordered-containers uri-encode
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base bytestring containers data-default hspec
+ lens lens-aeson text unordered-containers uri-encode
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Utilities for generating JSON-API payloads";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"json-assertions" = callPackage
({ mkDerivation, aeson, base, indexed, indexed-free, lens
, lens-aeson, text
@@ -135659,10 +138533,8 @@ self: {
}:
mkDerivation {
pname = "json-sop";
- version = "0.2.0.3";
- sha256 = "0ay2cymy4aar23cixcyqam91bs9x4z0vqiw2k0nvgy9nyqfz2r9h";
- revision = "2";
- editedCabalFile = "1lclvvcfvicr05v2nf1xkf21qry2g2bqjhd7gfhza89d571aq3gp";
+ version = "0.2.0.4";
+ sha256 = "0q1p15whyyzpggfnqm4vy9p8l12xlxmnc4d82ykxl8rxzhbjkh0i";
libraryHaskellDepends = [
aeson base generics-sop lens-sop tagged text time transformers
unordered-containers vector
@@ -135862,6 +138734,28 @@ self: {
broken = true;
}) {};
+ "jsonpath" = callPackage
+ ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
+ , file-embed, hspec, hspec-attoparsec, text, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "jsonpath";
+ version = "0.1.0.0";
+ sha256 = "0lr0sw30siaycw92b1xbnlrjn1pb7y8l9dflrjzr5d9k43lnrz42";
+ libraryHaskellDepends = [
+ aeson attoparsec base text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson aeson-casing attoparsec base bytestring file-embed hspec
+ hspec-attoparsec text unordered-containers vector
+ ];
+ description = "Library to parse and execute JSONPath";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"jsonresume" = callPackage
({ mkDerivation, aeson, base, bytestring, old-locale, text, time
, unordered-containers
@@ -136287,26 +139181,25 @@ self: {
"jvm-binary" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, containers
, criterion, data-binary-ieee754, deepseq, deriving-compat
- , directory, filepath, generic-random
- , hspec-expectations-pretty-diff, mtl, QuickCheck, tasty
- , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell
- , text, vector
+ , directory, filepath, generic-random, hspec, hspec-discover
+ , hspec-expectations-pretty-diff, mtl, QuickCheck, template-haskell
+ , text, vector, zip-archive
}:
mkDerivation {
pname = "jvm-binary";
- version = "0.3.0";
- sha256 = "0qbhxd13hmzmr5mn20rcm63sxy4wm1y794b7vznz028j2krlyv5w";
+ version = "0.5.0";
+ sha256 = "0v54x0015im3gbd2rsf87kmppkasd8780sb4pl8mqc82dbf4v18z";
libraryHaskellDepends = [
attoparsec base binary bytestring containers data-binary-ieee754
deepseq deriving-compat mtl template-haskell text vector
];
testHaskellDepends = [
attoparsec base binary bytestring containers data-binary-ieee754
- deepseq deriving-compat directory filepath generic-random
- hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover
- tasty-hspec tasty-quickcheck template-haskell text vector
+ deepseq deriving-compat directory filepath generic-random hspec
+ hspec-discover hspec-expectations-pretty-diff mtl QuickCheck
+ template-haskell text vector zip-archive
];
- testToolDepends = [ tasty-discover ];
+ testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
attoparsec base binary bytestring containers criterion
data-binary-ieee754 deepseq deriving-compat mtl template-haskell
@@ -136632,10 +139525,8 @@ self: {
}:
mkDerivation {
pname = "kanji";
- version = "3.4.0";
- sha256 = "1wc17b5515vb19ah7wm1zwmpf7b3jgjzrhk21hk8ysr14pcxwifr";
- revision = "2";
- editedCabalFile = "1bcc3kh6kndmkqi3vaxp27mg1qb7xbg1h8pgjc1kk1iawnhl930j";
+ version = "3.4.0.2";
+ sha256 = "017j8nwmwfbkxyaxjfp75js578kv6g5k7szsc46kidbw4l68dwmy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -136651,8 +139542,6 @@ self: {
benchmarkHaskellDepends = [ aeson base containers criterion text ];
description = "Perform æ¼¢å—検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"kansas-comet" = callPackage
@@ -136663,8 +139552,8 @@ self: {
pname = "kansas-comet";
version = "0.4";
sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz";
- revision = "16";
- editedCabalFile = "1fnncjd9wjwrnl0247gizlvwklihjbfk21pad6a4mqnaa3li5672";
+ revision = "17";
+ editedCabalFile = "1qnjg28rkwxwn2f8xisbx4f8pqxw2d70mczrjbrbyvx6gkdqzvri";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base containers data-default-class scotty stm text time
@@ -137281,8 +140170,6 @@ self: {
];
description = "Fast and flexible k-d trees for various types of point queries";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"keccak" = callPackage
@@ -137680,6 +140567,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "kerry" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+ , errors, hedgehog, hedgehog-corpus, mmorph, mtl, process
+ , resourcet, temporary-resourcet, text, transformers
+ , transformers-bifunctors
+ }:
+ mkDerivation {
+ pname = "kerry";
+ version = "0.1.1";
+ sha256 = "1b42mmwjvw39fyqi9b6gv67qpmswg6biabar55vggsxi8j43s76z";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring containers errors mmorph text
+ transformers transformers-bifunctors
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers hedgehog hedgehog-corpus mmorph
+ mtl process resourcet temporary-resourcet text transformers
+ ];
+ description = "Manage and abstract your packer configurations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"keter" = callPackage
({ mkDerivation, aeson, array, async, attoparsec, base
, blaze-builder, bytestring, case-insensitive, conduit
@@ -137786,8 +140697,8 @@ self: {
pname = "keycode";
version = "0.2.2";
sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan";
- revision = "3";
- editedCabalFile = "18dgbpf3xwdm3x9j63vsr5q7l028qvifgc6jmjf1ar4p2wv1fzz0";
+ revision = "4";
+ editedCabalFile = "081spzhywygv90i7jwhbcm7p1aqz6qqph02ddxvqncghar5kjc7n";
libraryHaskellDepends = [
base containers ghc-prim template-haskell
];
@@ -137830,8 +140741,10 @@ self: {
}:
mkDerivation {
pname = "keys";
- version = "3.12.1";
- sha256 = "1yqm4gpshsgswx6w78z64c83gpydh6jhgslx2lnc10nzhy0s9kkz";
+ version = "3.12.2";
+ sha256 = "1mw4c0dd21hmzhidf84p6fxrin7k05l2iz8iar3m7k5vbxihlldj";
+ revision = "1";
+ editedCabalFile = "1cx5bwd32mpqdgllrkld254a8ydks196m3j9dvm3razg8mxnz2x6";
libraryHaskellDepends = [
array base comonad containers free hashable semigroupoids
semigroups tagged transformers transformers-compat
@@ -138059,17 +140972,6 @@ self: {
}) {};
"kind-apply" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "kind-apply";
- version = "0.3.0.0";
- sha256 = "1k4plkf7j0spjvi565zfg25fshm2lkh6xjb5a0mr9c5nmq3cp2q7";
- libraryHaskellDepends = [ base ];
- description = "Utilities to work with lists of types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "kind-apply_0_3_1_0" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "kind-apply";
@@ -138078,7 +140980,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "Utilities to work with lists of types";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"kind-generics" = callPackage
@@ -138093,22 +140994,6 @@ self: {
}) {};
"kind-generics-th" = callPackage
- ({ mkDerivation, base, kind-generics, template-haskell
- , th-abstraction
- }:
- mkDerivation {
- pname = "kind-generics-th";
- version = "0.1.0.0";
- sha256 = "1dbx24yb8imy7sn9x6372ckdzhslxv9i0svzlwslaavbycpqyvzd";
- libraryHaskellDepends = [
- base kind-generics template-haskell th-abstraction
- ];
- testHaskellDepends = [ base kind-generics ];
- description = "Template Haskell support for generating `GenericK` instances";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "kind-generics-th_0_1_1_0" = callPackage
({ mkDerivation, base, kind-generics, template-haskell
, th-abstraction
}:
@@ -138122,7 +141007,6 @@ self: {
testHaskellDepends = [ base kind-generics ];
description = "Template Haskell support for generating `GenericK` instances";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"kinds" = callPackage
@@ -138269,16 +141153,16 @@ self: {
}) {};
"knead" = callPackage
- ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, storable-record
- , storable-tuple, tfp, transformers, utility-ht
+ ({ mkDerivation, base, bool8, comfort-array, llvm-extra, llvm-tf
+ , storable-record, storable-tuple, tfp, transformers, utility-ht
}:
mkDerivation {
pname = "knead";
- version = "0.3";
- sha256 = "0pghy04z5ps1m3v6qmq7pilnflrcswm83c68k2f8d4g56v9lcp40";
+ version = "0.4";
+ sha256 = "1p1zfa2mihy2di5wjb189mdq6kygr47y19194ycxdx47sh8y6s6y";
libraryHaskellDepends = [
- base bool8 llvm-extra llvm-tf storable-record storable-tuple tfp
- transformers utility-ht
+ base bool8 comfort-array llvm-extra llvm-tf storable-record
+ storable-tuple tfp transformers utility-ht
];
description = "Repa-like array processing using LLVM JIT";
license = stdenv.lib.licenses.bsd3;
@@ -138304,27 +141188,29 @@ self: {
"knit-haskell" = callPackage
({ mkDerivation, aeson-pretty, base, base64-bytestring
, blaze-colonnade, blaze-html, bytestring, case-insensitive
- , colonnade, containers, directory, Glob, here, http-client
- , http-client-tls, http-types, hvega, logging-effect, lucid, mtl
- , network, network-uri, pandoc, polysemy, prettyprinter, random
- , random-fu, random-source, text, time
+ , colonnade, constraints, containers, diagrams-lib, diagrams-svg
+ , directory, Glob, here, http-client, http-client-tls, http-types
+ , hvega, logging-effect, lucid, mtl, network, network-uri, pandoc
+ , plots, polysemy, polysemy-plugin, polysemy-RandomFu, polysemy-zoo
+ , prettyprinter, random, random-fu, random-source, svg-builder
+ , text, time
}:
mkDerivation {
pname = "knit-haskell";
- version = "0.2.0.0";
- sha256 = "0028g05plj8dsakb2c78ryl3lcbfaagg4n1hjfj6b92cxn1bg5hv";
- isLibrary = true;
- isExecutable = true;
+ version = "0.6.0.1";
+ sha256 = "0wsbi614sjn62ri4msdmav7kx9k11h35dkjpxsd2ndvky2njzi33";
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson-pretty base base64-bytestring blaze-colonnade blaze-html
- bytestring case-insensitive colonnade containers directory Glob
- http-client http-client-tls http-types hvega logging-effect lucid
- mtl network network-uri pandoc polysemy prettyprinter random
- random-fu random-source text time
+ bytestring case-insensitive colonnade constraints containers
+ diagrams-lib diagrams-svg directory Glob http-client
+ http-client-tls http-types hvega logging-effect lucid mtl network
+ network-uri pandoc polysemy polysemy-plugin polysemy-zoo
+ prettyprinter random random-fu random-source svg-builder text time
];
- executableHaskellDepends = [
- base blaze-html colonnade containers here hvega mtl polysemy
- random-fu text
+ testHaskellDepends = [
+ base blaze-html colonnade containers here hvega mtl plots polysemy
+ polysemy-plugin polysemy-RandomFu random-fu random-source text
];
description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc";
license = stdenv.lib.licenses.bsd3;
@@ -138437,6 +141323,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "korea-holidays" = callPackage
+ ({ mkDerivation, aeson, base, hspec, monad-extras, split
+ , template-haskell, yaml
+ }:
+ mkDerivation {
+ pname = "korea-holidays";
+ version = "0.1.0.3";
+ sha256 = "0v240dkvqy1jhkq1mzhyaiyg62m8lbbm79bc2g31jy9b7r1h93i2";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base monad-extras split template-haskell yaml
+ ];
+ testHaskellDepends = [
+ aeson base hspec monad-extras split template-haskell yaml
+ ];
+ description = "Korea Holidays";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"korfu" = callPackage
({ mkDerivation, base, bio, bytestring, haskell98, simpleargs }:
mkDerivation {
@@ -138608,6 +141513,38 @@ self: {
broken = true;
}) {};
+ "kurita" = callPackage
+ ({ mkDerivation, aeson, approximate, async, atomic-write, base
+ , bits, broadcast-chan, bytes, bytestring, containers, delay
+ , double-metaphone, hashable, http-types, hyperloglog, lens
+ , linklater, megaparsec, monad-loops, mtl, parser-combinators
+ , random, reflection, siphash, sorted-list, split, stm, text, time
+ , unordered-containers, uri-bytestring, vector, wai, wai-websockets
+ , warp, websockets, wreq, wuss
+ }:
+ mkDerivation {
+ pname = "kurita";
+ version = "0";
+ sha256 = "1drm9jbp8ypisg3smhrjlcpls7m7h4dxc5zv570wvjkfxhfkvf6d";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson approximate async atomic-write base broadcast-chan bytestring
+ containers delay double-metaphone hashable http-types hyperloglog
+ lens linklater megaparsec monad-loops mtl parser-combinators random
+ reflection sorted-list split stm text time unordered-containers
+ uri-bytestring vector wai wai-websockets websockets wreq wuss
+ ];
+ executableHaskellDepends = [
+ aeson async base bits bytes bytestring containers delay linklater
+ monad-loops siphash stm text time warp websockets
+ ];
+ testHaskellDepends = [ base ];
+ description = "Find the alpha emoji";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"kyotocabinet" = callPackage
({ mkDerivation, base, bytestring, cereal, kyotocabinet }:
mkDerivation {
@@ -138970,8 +141907,6 @@ self: {
];
description = "Declarative command-line parser using type-driven pattern matching";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"lambda-placeholders" = callPackage
@@ -139127,7 +142062,8 @@ self: {
];
description = "Lambdabot core functionality";
license = "GPL";
- maintainers = with stdenv.lib.maintainers; [ peti ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"lambdabot-haskell-plugins" = callPackage
@@ -139172,7 +142108,8 @@ self: {
];
description = "IRC plugins for lambdabot";
license = "GPL";
- maintainers = with stdenv.lib.maintainers; [ peti ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"lambdabot-misc-plugins" = callPackage
@@ -139194,6 +142131,8 @@ self: {
];
description = "Lambdabot miscellaneous plugins";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"lambdabot-novelty-plugins" = callPackage
@@ -139211,6 +142150,8 @@ self: {
];
description = "Novelty plugins for Lambdabot";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"lambdabot-reference-plugins" = callPackage
@@ -139228,6 +142169,8 @@ self: {
];
description = "Lambdabot reference plugins";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"lambdabot-social-plugins" = callPackage
@@ -139243,6 +142186,8 @@ self: {
];
description = "Social plugins for Lambdabot";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"lambdabot-trusted" = callPackage
@@ -139932,8 +142877,8 @@ self: {
({ mkDerivation, base, language-c99, language-c99-util, mtl }:
mkDerivation {
pname = "language-c99-simple";
- version = "0.1.1";
- sha256 = "15as36j4bsxxy59683h5p6k0r9d21pv5kr90nr82d2lmnwf46xic";
+ version = "0.1.2";
+ sha256 = "0v0y50n2ks8jp91y37az6q46ax6dqx1igmlkb4b7c76qngak88xi";
libraryHaskellDepends = [
base language-c99 language-c99-util mtl
];
@@ -139988,6 +142933,22 @@ self: {
broken = true;
}) {};
+ "language-csharp" = callPackage
+ ({ mkDerivation, alex, array, base, parsec, pretty, text }:
+ mkDerivation {
+ pname = "language-csharp";
+ version = "0.0.1";
+ sha256 = "1sg7i0mpq98nfwnq3rfmhd9y1lvjff99843fprif3r3ww62clp2c";
+ revision = "1";
+ editedCabalFile = "1x5pn0zr2wzhmcfs2rcdy5wjjwp2xhfg4fjs4zhglfh3svvlwpqx";
+ libraryHaskellDepends = [ array base parsec pretty text ];
+ libraryToolDepends = [ alex ];
+ description = "C# source code manipulation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"language-css" = callPackage
({ mkDerivation, base, pretty }:
mkDerivation {
@@ -140321,8 +143282,8 @@ self: {
}:
mkDerivation {
pname = "language-javascript";
- version = "0.6.0.11";
- sha256 = "0hv1rj3yarv035mpnnnbqys4sgd0awqlm5hyf29wp051r6dnwxfl";
+ version = "0.6.0.13";
+ sha256 = "0dzvbnzkrxg9v78x2g7mhhr76viyxcgjyqpksaw7l0p1x7brjsck";
libraryHaskellDepends = [
array base blaze-builder bytestring containers mtl text utf8-string
];
@@ -140651,8 +143612,8 @@ self: {
}:
mkDerivation {
pname = "language-puppet";
- version = "1.4.4";
- sha256 = "0dgbbyz89q1hhacy2pymhvmp8k5dvnzzsrxq0zc6l865nhha67ch";
+ version = "1.4.5";
+ sha256 = "1bn5gj89pxzxb8blj6v9pv8n03ksvxqrai0iin4syvyb10r7sxrq";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -140931,22 +143892,20 @@ self: {
}) {};
"lapack" = callPackage
- ({ mkDerivation, base, blas-ffi, boxes, ChasingBottoms
+ ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms
, comfort-array, data-ref, deepseq, fixed-length
- , guarded-allocation, lapack-ffi, lazyio, monoid-transformer
+ , guarded-allocation, hyper, lapack-ffi, lazyio, monoid-transformer
, netlib-ffi, non-empty, QuickCheck, quickcheck-transformer, random
- , semigroups, tfp, transformers, unique-logic-tf, utility-ht
+ , semigroups, text, tfp, transformers, unique-logic-tf, utility-ht
}:
mkDerivation {
pname = "lapack";
- version = "0.2.4";
- sha256 = "16rgcxinkrkv1h35pfyrgg9xihkhpk3i2xd5f3xw29b1hahsb9hv";
- isLibrary = true;
- isExecutable = true;
+ version = "0.3.0.1";
+ sha256 = "0i7zzsw7rdb2hja0rdmw0l45x8svv5dxmnmrjdfs52gxzqmq621g";
libraryHaskellDepends = [
- base blas-ffi boxes comfort-array deepseq fixed-length
- guarded-allocation lapack-ffi lazyio netlib-ffi non-empty
- semigroups tfp transformers utility-ht
+ base blas-ffi blaze-html boxes comfort-array deepseq fixed-length
+ guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty
+ semigroups text tfp transformers utility-ht
];
testHaskellDepends = [
base ChasingBottoms comfort-array data-ref monoid-transformer
@@ -140981,8 +143940,8 @@ self: {
}:
mkDerivation {
pname = "lapack-comfort-array";
- version = "0.0";
- sha256 = "06pzjr9n5pn0aqgf1p7njls65m10zfryzld3sxlr9ybailmnsa2j";
+ version = "0.0.0.1";
+ sha256 = "0kn9bb3q772sbzm54rdqbqrmp21kck2gvc0xagi974dq7b1wilh1";
libraryHaskellDepends = [
base comfort-array lapack-ffi netlib-comfort-array netlib-ffi
storable-complex transformers
@@ -141025,6 +143984,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lapack-ffi-tools_0_1_2_1" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, containers
+ , explicit-exception, filepath, non-empty, optparse-applicative
+ , parsec, pathtype, transformers, unordered-containers, utility-ht
+ , vector
+ }:
+ mkDerivation {
+ pname = "lapack-ffi-tools";
+ version = "0.1.2.1";
+ sha256 = "0hk54psm066acgn24mw5dbbhz4a0nqvyks75302cabijbp524gdh";
+ isLibrary = false;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ executableHaskellDepends = [
+ base bytestring cassava containers explicit-exception filepath
+ non-empty optparse-applicative parsec pathtype transformers
+ unordered-containers utility-ht vector
+ ];
+ description = "Generator for Haskell interface to Fortran LAPACK";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"large-hashable" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes
, bytestring, cereal, containers, cryptohash, deepseq, hashable
@@ -141254,8 +144236,6 @@ self: {
];
description = "Fine-grained library for constructing and manipulating lattices";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"lattices_2" = callPackage
@@ -141268,6 +144248,8 @@ self: {
pname = "lattices";
version = "2";
sha256 = "050c66rrzh5p204jyqmysyhm419f8pasi0mlbwv3n167y0fnr8xq";
+ revision = "1";
+ editedCabalFile = "08m46liplbh1xxnpsq0wnjabmyj625vbnnsyypd52jlhzclfhqz1";
libraryHaskellDepends = [
base base-compat containers deepseq hashable integer-logarithms
QuickCheck semigroupoids tagged transformers universe-base
@@ -141281,7 +144263,6 @@ self: {
description = "Fine-grained library for constructing and manipulating lattices";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"launchpad-control" = callPackage
@@ -141575,6 +144556,25 @@ self: {
broken = true;
}) {};
+ "lazyboy" = callPackage
+ ({ mkDerivation, aeson, base, hspec, microstache, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "lazyboy";
+ version = "0.2.2.0";
+ sha256 = "1kmiilikq4z003ngy3sk8j3973g0wh1jx7mvla68q12pii34p9gp";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base hspec microstache text transformers
+ ];
+ testHaskellDepends = [
+ aeson base hspec microstache text transformers
+ ];
+ description = "An EDSL for programming the Game Boy";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lazyio" = callPackage
({ mkDerivation, base, transformers, unsafe }:
mkDerivation {
@@ -141800,6 +144800,23 @@ self: {
broken = true;
}) {};
+ "lean" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, text-utf8
+ , transformers, util
+ }:
+ mkDerivation {
+ pname = "lean";
+ version = "0.0.0.1";
+ sha256 = "1i1xkaipjaczp32hn5g5g4x9a3ml98hamb4qaycy7rlcfbildiga";
+ libraryHaskellDepends = [
+ base base-unicode-symbols text-utf8 transformers util
+ ];
+ description = "Bonds to Lean theorem prover";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"leancheck" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@@ -141943,8 +144960,8 @@ self: {
}:
mkDerivation {
pname = "learn-physics";
- version = "0.6.3";
- sha256 = "0nhc53l963fsviw3yqz7yxwbjwxsrp8s4jckffbg6hl8npakhirh";
+ version = "0.6.4";
+ sha256 = "06f1p3rcb37lh0miih2c697w8jiciby3qgjcbjagmf91svx25mm0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141955,8 +144972,6 @@ self: {
];
description = "Haskell code for learning physics";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"learn-physics-examples" = callPackage
@@ -142227,6 +145242,8 @@ self: {
pname = "lens";
version = "4.17.1";
sha256 = "1gpkc53l2cggnfrgg5k4ih82rycjbdvpj9pnbi5cq8ms0dbvs4a7";
+ revision = "1";
+ editedCabalFile = "1zknh9h72qzszwrz9h25c5ssdr2pv5z67w6kv526sk1y8rnrbxk1";
setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
libraryHaskellDepends = [
array base base-orphans bifunctors bytestring call-stack comonad
@@ -142262,8 +145279,6 @@ self: {
libraryHaskellDepends = [ accelerate base lens ];
description = "Instances to mix lens with accelerate";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"lens-action" = callPackage
@@ -142319,6 +145334,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lens-errors" = callPackage
+ ({ mkDerivation, base, containers, either, hspec, lens }:
+ mkDerivation {
+ pname = "lens-errors";
+ version = "0.2.2.0";
+ sha256 = "0wr5wfzrmacf0s53511p9dg5ymx0wk2d5771jd90pgk7v3cr39j6";
+ libraryHaskellDepends = [ base either lens ];
+ testHaskellDepends = [ base containers either hspec lens ];
+ description = "Error handling in lens chains";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lens-family" = callPackage
({ mkDerivation, base, containers, lens-family-core, mtl
, transformers
@@ -142357,6 +145384,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lens-filesystem" = callPackage
+ ({ mkDerivation, base, directory, filepath, hspec, lens
+ , lens-action
+ }:
+ mkDerivation {
+ pname = "lens-filesystem";
+ version = "0.0.0.0";
+ sha256 = "0295n9hfdq72c1knx170ccfyi93wp09szahb2q5jym0mcryvdls8";
+ libraryHaskellDepends = [
+ base directory filepath lens lens-action
+ ];
+ testHaskellDepends = [
+ base directory filepath hspec lens lens-action
+ ];
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"lens-labels_0_1_0_2" = callPackage
({ mkDerivation, base, ghc-prim }:
mkDerivation {
@@ -142421,6 +145467,25 @@ self: {
broken = true;
}) {};
+ "lens-process" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath
+ , lens, process, tasty, tasty-hunit
+ }:
+ mkDerivation {
+ pname = "lens-process";
+ version = "0.3.0.0";
+ sha256 = "1bp2mw38qvlq98596pn1illb6c1l8prd6qrzrg0g6xin98sqigb0";
+ revision = "1";
+ editedCabalFile = "1wwj258gq4qg97dx7pn2sxj8znrlb5sm2xcidwkhyrs45r75500b";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [ base filepath lens process ];
+ testHaskellDepends = [
+ base doctest filepath lens process tasty tasty-hunit
+ ];
+ description = "Optics for system processes";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lens-properties" = callPackage
({ mkDerivation, base, lens, QuickCheck, transformers }:
mkDerivation {
@@ -142454,6 +145519,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lens-regex-pcre" = callPackage
+ ({ mkDerivation, base, hspec, lens, pcre-heavy, pcre-light
+ , template-haskell, text
+ }:
+ mkDerivation {
+ pname = "lens-regex-pcre";
+ version = "0.3.0.0";
+ sha256 = "1010nhik7vfk6gll9h8cwnq7mx3v4gnl3nlyn7ma5y93ghq0ckvs";
+ libraryHaskellDepends = [
+ base lens pcre-heavy pcre-light template-haskell text
+ ];
+ testHaskellDepends = [
+ base hspec lens pcre-heavy pcre-light template-haskell text
+ ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lens-simple" = callPackage
({ mkDerivation, base, lens-family, lens-family-core
, lens-family-th, mtl, transformers
@@ -142473,10 +145555,8 @@ self: {
({ mkDerivation, base, fclabels, generics-sop, transformers }:
mkDerivation {
pname = "lens-sop";
- version = "0.2.0.2";
- sha256 = "16bd95cwqiprz55s5272mv6wiw5pmv6mvihviiwbdbilhq400s3z";
- revision = "1";
- editedCabalFile = "0k7xdwj64kd56kjh7ghjwm79rjwjqxlw5nwzwj0cq5q56vb340jm";
+ version = "0.2.0.3";
+ sha256 = "0vgh6bj43qmhca6ij4b0bxqirhhfvxqd7xx5pryfs79fjghc47vv";
libraryHaskellDepends = [
base fclabels generics-sop transformers
];
@@ -142524,14 +145604,16 @@ self: {
];
description = "Lenses for toml-parser";
license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"lens-tutorial" = callPackage
({ mkDerivation, base, doctest, lens }:
mkDerivation {
pname = "lens-tutorial";
- version = "1.0.3";
- sha256 = "1x6lbmylfp1gbik32ssfq643nmkhvhliryz70fsvcmscscm0chxp";
+ version = "1.0.4";
+ sha256 = "1xcadr4ynnpdm1sdv1idvs15f7d2gbr75565csvwaid2a1hz6agj";
libraryHaskellDepends = [ base lens ];
testHaskellDepends = [ base doctest ];
description = "Tutorial for the lens library";
@@ -142607,26 +145689,26 @@ self: {
}) {};
"lentil" = callPackage
- ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
- , filepath, hspec, natural-sort, optparse-applicative, parsec
- , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
- , transformers
+ ({ mkDerivation, ansi-wl-pprint, base, csv, deepseq, directory
+ , dlist, filemanip, filepath, hspec, megaparsec, mtl, natural-sort
+ , optparse-applicative, regex-tdfa, semigroups
+ , terminal-progress-bar, text
}:
mkDerivation {
pname = "lentil";
- version = "1.1.2.0";
- sha256 = "1zhn8wpm1hd50j0nc776d9f3jq46lk5d62srrd66abfkvqxfxw6b";
+ version = "1.3.0.0";
+ sha256 = "15z32gk4ki0iz5mcakajyd70bcyn5impp0i322sc905j1wivvcz2";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- ansi-wl-pprint base csv directory filemanip filepath natural-sort
- optparse-applicative parsec pipes regex-tdfa semigroups
- terminal-progress-bar text transformers
+ ansi-wl-pprint base csv deepseq directory dlist filemanip filepath
+ megaparsec mtl natural-sort optparse-applicative regex-tdfa
+ semigroups terminal-progress-bar text
];
testHaskellDepends = [
- ansi-wl-pprint base csv directory filemanip filepath hspec
- natural-sort optparse-applicative parsec pipes regex-tdfa
- semigroups terminal-progress-bar text transformers
+ ansi-wl-pprint base csv deepseq directory dlist filemanip filepath
+ hspec megaparsec mtl natural-sort optparse-applicative regex-tdfa
+ semigroups terminal-progress-bar text
];
description = "frugal issue tracker";
license = stdenv.lib.licenses.gpl3;
@@ -142969,8 +146051,8 @@ self: {
}:
mkDerivation {
pname = "libarchive";
- version = "1.0.5.0";
- sha256 = "0ndla9nkrgc3q10dp2c407whqfwcwjv95rd22cmjx70c3609mm9r";
+ version = "1.0.5.1";
+ sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz";
libraryHaskellDepends = [
base bytestring composition-prelude dlist filepath
];
@@ -143071,14 +146153,12 @@ self: {
({ mkDerivation, base, contravariant, ffi, hashable, intern }:
mkDerivation {
pname = "libffi-dynamic";
- version = "0.0.0.1";
- sha256 = "0fh3a07qv6fgxycba2yy02warz2lm2npps9118nkxq0qf8gnvinv";
+ version = "0.0.0.2";
+ sha256 = "012dy9jcxfhxxwzfc5iky491mdgcimz71cd236bshsppscyinzkn";
libraryHaskellDepends = [ base contravariant hashable intern ];
librarySystemDepends = [ ffi ];
description = "LibFFI interface with dynamic bidirectional type-driven binding generation";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {ffi = null;};
"libgit" = callPackage
@@ -143322,6 +146402,8 @@ self: {
pname = "libmpd";
version = "0.9.0.9";
sha256 = "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv";
+ revision = "1";
+ editedCabalFile = "16pzbmhyzlpxy2djmxrs0wrv8mad3ahb040lx5kmf57say3qxgdl";
libraryHaskellDepends = [
attoparsec base bytestring containers data-default-class filepath
mtl network old-locale text time utf8-string
@@ -143488,6 +146570,8 @@ self: {
testToolDepends = [ tasty-discover ];
description = "Raft consensus algorithm";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"libraft_0_5_0_0" = callPackage
@@ -143540,6 +146624,7 @@ self: {
description = "Raft consensus algorithm";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"librandomorg" = callPackage
@@ -143595,6 +146680,17 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "librdkafka" = callPackage
+ ({ mkDerivation }:
+ mkDerivation {
+ pname = "librdkafka";
+ version = "0.0.0.0";
+ sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb";
+ doHaddock = false;
+ description = "TBA";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"libretls" = callPackage
({ mkDerivation, base, containers, hspec, HUnit, libressl, libtls
, monad-ste, primitive, transformers, vector
@@ -143707,8 +146803,8 @@ self: {
}:
mkDerivation {
pname = "libsystemd-journal";
- version = "1.4.3";
- sha256 = "1n79f0fzgrqyr9lw1qy8fzxsh74ai899pydpzpl6pfh2gfp7qvaq";
+ version = "1.4.4";
+ sha256 = "1114fv3dvljxkwgxyx9ycpks8bwzj401d4ziri80rkf2ycl0pxc7";
libraryHaskellDepends = [
base bytestring hashable hsyslog pipes pipes-safe semigroups text
transformers uniplate unix-bytestring unordered-containers uuid
@@ -143717,8 +146813,6 @@ self: {
libraryPkgconfigDepends = [ systemd ];
description = "Haskell bindings to libsystemd-journal";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {inherit (pkgs) systemd;};
"libtagc" = callPackage
@@ -143755,8 +146849,8 @@ self: {
({ mkDerivation, base, c2hs, libvirt, syb, unix }:
mkDerivation {
pname = "libvirt-hs";
- version = "0.2.1";
- sha256 = "02klbgyxsy5al0gmbq5g4p8vpna443kn7h8khnhglbddag6cgkdx";
+ version = "0.2.2";
+ sha256 = "1zrc7z0v3zarmbfhasv1mk2wcyhg8azhdpk7q4aayhrb9hcq3i0n";
libraryHaskellDepends = [ base syb unix ];
libraryPkgconfigDepends = [ libvirt ];
libraryToolDepends = [ c2hs ];
@@ -143898,6 +146992,20 @@ self: {
broken = true;
}) {};
+ "lie" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "lie";
+ version = "0.1.0.0";
+ sha256 = "1kvy0zsgwq2kgdbiz7z88q9d3ldhb9z9fb057x7mnhli7b3hd8fh";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ executableHaskellDepends = [ base ];
+ description = "Lie Algebras";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"life" = callPackage
({ mkDerivation, array, base, GLUT, OpenGL, random }:
mkDerivation {
@@ -143949,8 +147057,8 @@ self: {
pname = "lift-generics";
version = "0.1.2";
sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf";
- revision = "2";
- editedCabalFile = "171f8cpn0kw9psikx3n7cdwyqfwg8rr8gf1hja6g7pnm0683l5l8";
+ revision = "3";
+ editedCabalFile = "0ackkmjfqxyxhy9w03zlqvmi68la9yv4jf0sc8qdhyr5y30ac68s";
libraryHaskellDepends = [
base generic-deriving ghc-prim template-haskell
];
@@ -143979,8 +147087,8 @@ self: {
}:
mkDerivation {
pname = "lifted-async";
- version = "0.10.0.3";
- sha256 = "131bh83yc3jhy0hwgslvs9p9clgl4i2hhvwz2xgx7igpbhsrrl43";
+ version = "0.10.0.4";
+ sha256 = "0cwl1d0wjpdk0v1l1qxiqiksmak950c8gx169c1q77cg0z18ijf9";
libraryHaskellDepends = [
async base constraints lifted-base monad-control transformers-base
];
@@ -144348,23 +147456,25 @@ self: {
"line-bot-sdk" = callPackage
({ mkDerivation, aeson, aeson-qq, base, base64-bytestring
- , bytestring, cryptohash-sha256, errors, free, hspec
+ , bytestring, cryptohash-sha256, errors, exceptions, free, hspec
, hspec-expectations, hspec-wai, http-api-data, http-client
- , http-client-tls, http-types, scientific, servant, servant-client
- , servant-client-core, servant-server, string-conversions, text
- , time, transformers, wai, wai-extra, warp
+ , http-client-tls, http-types, monad-control, mtl, scientific
+ , servant, servant-client, servant-client-core, servant-server
+ , streaming, string-conversions, text, time, transformers
+ , transformers-base, wai, wai-extra, warp
}:
mkDerivation {
pname = "line-bot-sdk";
- version = "0.5.0.1";
- sha256 = "0d2a540dflyv3zjx9phs85qar1kpyl287f01hh8fxkp550wivfgg";
+ version = "0.5.0.2";
+ sha256 = "0b33z5h22mbzxa812phpi73nmilzyvdslh355802wv625br3ljq5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base base64-bytestring bytestring cryptohash-sha256 errors
- http-api-data http-client http-client-tls http-types scientific
- servant servant-client servant-client-core servant-server
- string-conversions text time transformers wai wai-extra
+ exceptions http-api-data http-client http-client-tls http-types
+ monad-control mtl scientific servant servant-client
+ servant-client-core servant-server streaming string-conversions
+ text time transformers transformers-base wai wai-extra
];
executableHaskellDepends = [
base servant servant-client servant-server time transformers wai
@@ -144393,6 +147503,20 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "line-drawing" = callPackage
+ ({ mkDerivation, base, hspec }:
+ mkDerivation {
+ pname = "line-drawing";
+ version = "0.1.0.0";
+ sha256 = "19hdx810mraygd1li8bw9l3i18ygbzmyxsqkyvh6q90saayglr4f";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec ];
+ description = "raster line drawing";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"line-size" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -144431,8 +147555,10 @@ self: {
}:
mkDerivation {
pname = "linear";
- version = "1.20.8";
- sha256 = "046vkvxlb0s286qr55s0c6db0rlwbm1cmlmwhrrkqbkzhfcipgay";
+ version = "1.20.9";
+ sha256 = "0h7yqigq593n7wsl7nz6a5f137wznm7y679wsii0ph0zsc4v5af5";
+ revision = "1";
+ editedCabalFile = "13ff7xvw25fpsikcvf0nly2ca614wzv10qyg4sh378p5r8rvfgka";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
adjunctions base base-orphans binary bytes cereal containers
@@ -144465,8 +147591,6 @@ self: {
testHaskellDepends = [ base doctest ];
description = "Lifting linear vector spaces into Accelerate";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"linear-algebra-cblas" = callPackage
@@ -144498,8 +147622,8 @@ self: {
}:
mkDerivation {
pname = "linear-circuit";
- version = "0.1";
- sha256 = "0rvmnk8fwyns645rs8s0nwyfcyk2nc0z8jk03raasrk4kv3f26z3";
+ version = "0.1.0.1";
+ sha256 = "1pm2pvx9ds1x9cb85n9b2km6ypmqqv5d3rwxyyszy10vcymypns4";
libraryHaskellDepends = [
base comfort-array comfort-graph containers lapack netlib-ffi
transformers utility-ht
@@ -144632,8 +147756,8 @@ self: {
pname = "linearmap-category";
version = "0.3.5.0";
sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf";
- revision = "1";
- editedCabalFile = "15yqlsx8wdp8lxkr8pgr1cfrjpy5v1zsgpi584bcd7szwm76mmsw";
+ revision = "2";
+ editedCabalFile = "129fgr6m9691cd3nzy1magiwd7f9x2jip96pqj10d0lgb931frzg";
libraryHaskellDepends = [
base call-stack constrained-categories containers
free-vector-spaces ieee754 lens linear manifolds-core semigroups
@@ -145245,12 +148369,14 @@ self: {
}) {inherit (pkgs) z3;};
"liquidhaskell-cabal" = callPackage
- ({ mkDerivation, base, Cabal, filepath }:
+ ({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
pname = "liquidhaskell-cabal";
- version = "0.2.0.0";
- sha256 = "1kxdl46m4fzv9d1c74b4xqgbw4qqah4sm4z296kb5cz2fmij4hmk";
- libraryHaskellDepends = [ base Cabal filepath ];
+ version = "0.2.1.0";
+ sha256 = "1150y4dqdg735jysyak4nfrc0lbmk94mwf6dw5s9lsp73pq6gy9n";
+ revision = "1";
+ editedCabalFile = "0c76lchw32dzfn8q4qckxqjzcnw909x7niiwlzadas8mv9p93ybl";
+ libraryHaskellDepends = [ base Cabal directory filepath ];
description = "Liquid Haskell integration for Cabal and Stack";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -145259,17 +148385,16 @@ self: {
({ mkDerivation, base, Cabal, liquidhaskell-cabal }:
mkDerivation {
pname = "liquidhaskell-cabal-demo";
- version = "0.2.0.1";
- sha256 = "0pwmdzdkidrbz8sgx0qs9kq4i5jrb7nlrlhjkp7v4lb1wr7vgjy9";
+ version = "0.2.1.1";
+ sha256 = "11k2j13gclnmj0ky8pd7cgzps8ip8gygkj25gnbrg7kqj5jbvj5x";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal liquidhaskell-cabal ];
libraryHaskellDepends = [ base liquidhaskell-cabal ];
executableHaskellDepends = [ base liquidhaskell-cabal ];
- description = "Demo of Liquid Haskell integration for Cabal and stack";
- license = stdenv.lib.licenses.bsd3;
+ description = "Demo of Liquid Haskell integration for Cabal and Stack";
+ license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"lispparser" = callPackage
@@ -145915,17 +149040,17 @@ self: {
}) {};
"llvm-extra" = callPackage
- ({ mkDerivation, base, bifunctors, bool8, containers, cpuid
- , llvm-tf, non-empty, tfp, transformers, unsafe, utility-ht
+ ({ mkDerivation, base, bool8, containers, cpuid, llvm-tf, non-empty
+ , prelude-compat, tfp, transformers, unsafe, utility-ht
}:
mkDerivation {
pname = "llvm-extra";
- version = "0.8.0.1";
- sha256 = "0hnad3cqrvaijnczjy0krbf0szxf0573c5g37746xspwsjy42srd";
+ version = "0.8.0.3";
+ sha256 = "1cqxfrjhfgliwxjgbmjkbpcy4dlv0fwwqzdd9jd8fiq96njfqfvp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bifunctors bool8 containers cpuid llvm-tf non-empty tfp
+ base bool8 containers cpuid llvm-tf non-empty prelude-compat tfp
transformers unsafe utility-ht
];
description = "Utility functions for the llvm interface";
@@ -145935,20 +149060,20 @@ self: {
}) {};
"llvm-ffi" = callPackage
- ({ mkDerivation, base, enumset, llvm }:
+ ({ mkDerivation, base, enumset, LLVM }:
mkDerivation {
pname = "llvm-ffi";
- version = "3.8.1";
- sha256 = "1j949vdscz7rcblfm1bz73dq347y7a16zmjyq2jvy7rx0f1aydnn";
+ version = "3.8.1.1";
+ sha256 = "1l74yyxgi3ndj9ffjk46wnzifgcn39gj19h9rcsbb8zvbcxw0lw6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base enumset ];
- libraryPkgconfigDepends = [ llvm ];
+ librarySystemDepends = [ LLVM ];
description = "FFI bindings to the LLVM compiler toolkit";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {inherit (self.llvmPackages) llvm;};
+ }) {LLVM = null;};
"llvm-ffi-tools" = callPackage
({ mkDerivation, base, bytestring, containers, regex-posix
@@ -146066,8 +149191,6 @@ self: {
];
description = "General purpose LLVM bindings";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {llvm-config = null;};
"llvm-hs-pretty" = callPackage
@@ -146373,8 +149496,8 @@ self: {
}:
mkDerivation {
pname = "load-env";
- version = "0.2.0.2";
- sha256 = "063zd2nbwbyndfy1hrir9x270f99wzbyarfj561r9dddak2754w1";
+ version = "0.2.1.0";
+ sha256 = "184l0km1i6rfliq9nsj9p67ynsx6nlq466hf056lbgmrzvx6vv73";
libraryHaskellDepends = [ base directory filepath parsec ];
testHaskellDepends = [
base directory doctest hspec parsec temporary
@@ -146724,8 +149847,8 @@ self: {
pname = "log-domain";
version = "0.12";
sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi";
- revision = "3";
- editedCabalFile = "19xc24jwfhzy3v26689sc4ma50w4ylqd378dpxphl0nrxili645z";
+ revision = "4";
+ editedCabalFile = "1z7p87dl1rj0v2gnfwfa7zmgaxccd093hvjkijc56whyg4b4az4y";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base binary bytes cereal comonad deepseq distributive hashable
@@ -146784,8 +149907,8 @@ self: {
}:
mkDerivation {
pname = "log-elasticsearch";
- version = "0.10.0.1";
- sha256 = "1nnchsrkcm08r1lrlldr7icqnzsz3g024dlwg2z9la66n9d0fvl0";
+ version = "0.10.1.0";
+ sha256 = "10a7p0z9bqjfmc04xvqsflwqrhhnxk72kbhk62sh8l1is0i94vcs";
libraryHaskellDepends = [
aeson aeson-pretty base base64-bytestring bloodhound bytestring
deepseq http-client http-client-tls log-base semigroups text
@@ -146805,10 +149928,8 @@ self: {
}:
mkDerivation {
pname = "log-postgres";
- version = "0.7.0.2";
- sha256 = "16v3wli0jll5j24pdzmya90lyawqv3rcvsfd4z88kgcchds07iji";
- revision = "1";
- editedCabalFile = "1f18nzrh3bxnb58cmd3zyqpwaw2jyfl92dg6qd30zhlvlnkz1q7q";
+ version = "0.7.1.1";
+ sha256 = "1mx43qbv9rbzzkxz7qgwgp26aq00a97rwka7a823l5hm5hamx74k";
libraryHaskellDepends = [
aeson aeson-pretty base base64-bytestring bytestring deepseq
hpqtypes http-client lifted-base log-base mtl semigroups split text
@@ -146991,8 +150112,8 @@ self: {
}:
mkDerivation {
pname = "logging-effect";
- version = "1.3.3";
- sha256 = "10pighhav1zmg54gvfnvxcvz83698ziaq9ccs3zqc7jxahmyaslr";
+ version = "1.3.4";
+ sha256 = "10xgh61ghwri21j7jr6svkd24h2s9nmawc33xkzjc6d4nbg261jf";
libraryHaskellDepends = [
async base exceptions free monad-control mtl prettyprinter
semigroups stm stm-delay text time transformers transformers-base
@@ -147096,8 +150217,6 @@ self: {
];
description = "Journald back-end for logging-facade";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"logging-facade-syslog" = callPackage
@@ -147170,20 +150289,21 @@ self: {
({ mkDerivation, base, mtl }:
mkDerivation {
pname = "logict";
- version = "0.6.0.2";
- sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
+ version = "0.6.0.3";
+ sha256 = "1a3sqws8bc55a7sxkl406a69ls75l60syv20b5rmkd30nbdisryh";
libraryHaskellDepends = [ base mtl ];
description = "A backtracking logic-programming monad";
license = stdenv.lib.licenses.bsd3;
}) {};
- "logict_0_6_0_3" = callPackage
- ({ mkDerivation, base, mtl }:
+ "logict_0_7_0_1" = callPackage
+ ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
mkDerivation {
pname = "logict";
- version = "0.6.0.3";
- sha256 = "1a3sqws8bc55a7sxkl406a69ls75l60syv20b5rmkd30nbdisryh";
+ version = "0.7.0.1";
+ sha256 = "1zzcfxdl156rrr120vjcn2wawa2qdrninm6d4mxj215ig1a3aak5";
libraryHaskellDepends = [ base mtl ];
+ testHaskellDepends = [ base mtl tasty tasty-hunit ];
description = "A backtracking logic-programming monad";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -147602,6 +150722,40 @@ self: {
broken = true;
}) {};
+ "loopbreaker" = callPackage
+ ({ mkDerivation, base, containers, ghc, hspec, hspec-discover
+ , inspection-testing, syb
+ }:
+ mkDerivation {
+ pname = "loopbreaker";
+ version = "0.1.1.0";
+ sha256 = "1hyw750r0kwyj5hb424dcxh2m11p7k694dfhgd2vadnqn80g0w5s";
+ libraryHaskellDepends = [ base containers ghc syb ];
+ testHaskellDepends = [
+ base containers ghc hspec inspection-testing syb
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "inline self-recursive definitions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "looper" = callPackage
+ ({ mkDerivation, aeson, base, hspec, optparse-applicative, text
+ , time, unliftio
+ }:
+ mkDerivation {
+ pname = "looper";
+ version = "0.0.0.2";
+ sha256 = "0w4aancb0lbfgmk2drnbc1w6bxlbdkhg0zy1qj7xp3kvgc76vqli";
+ libraryHaskellDepends = [
+ aeson base optparse-applicative text time unliftio
+ ];
+ testHaskellDepends = [
+ aeson base hspec optparse-applicative text time unliftio
+ ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"loops" = callPackage
({ mkDerivation, base, criterion, primitive, tasty
, tasty-quickcheck, transformers, vector
@@ -147848,8 +151002,8 @@ self: {
pname = "lrucaching";
version = "0.3.3";
sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
- revision = "7";
- editedCabalFile = "0bwl2hpj0w1wg86az52iwz0afs1h99b599vdn0fgygw2ivhbvqjv";
+ revision = "8";
+ editedCabalFile = "11ad87kg09s9md9lqzhbcw19kmzvii4v97nw49q0wb0rs0qizpki";
libraryHaskellDepends = [
base base-compat deepseq hashable psqueues vector
];
@@ -147926,22 +151080,22 @@ self: {
broken = true;
}) {};
- "lsp-test_0_5_2_0" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
+ "lsp-test_0_6_0_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
, bytestring, conduit, conduit-parse, containers, data-default
, Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
- , parser-combinators, process, text, transformers, unix
- , unordered-containers, yi-rope
+ , parser-combinators, process, rope-utf16-splay, text, transformers
+ , unix, unordered-containers
}:
mkDerivation {
pname = "lsp-test";
- version = "0.5.2.0";
- sha256 = "1yy9d2jljxiq869qq588b7pmdrv4z0fpb8aq3i5anwzk6bgw4lx2";
+ version = "0.6.0.0";
+ sha256 = "01l5i41907rqxrndhqmnb2kcp62k4mz1dpbamp7zvff22pyd5zzv";
libraryHaskellDepends = [
- aeson aeson-pretty ansi-terminal base bytestring conduit
+ aeson aeson-pretty ansi-terminal async base bytestring conduit
conduit-parse containers data-default Diff directory filepath
- haskell-lsp lens mtl parser-combinators process text transformers
- unix unordered-containers yi-rope
+ haskell-lsp lens mtl parser-combinators process rope-utf16-splay
+ text transformers unix unordered-containers
];
testHaskellDepends = [
aeson base data-default haskell-lsp hspec lens text
@@ -148252,15 +151406,13 @@ self: {
({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
mkDerivation {
pname = "lucid-svg";
- version = "0.7.0.0";
- sha256 = "0sqzgmadm7a0lydsc9p7632sd37152f8xf8x4abdfnakqpdvni3m";
+ version = "0.7.1";
+ sha256 = "1crfq5z0acv8ci7cj62dg1sy9hmsgpzhjwrjky9rkfnjs2brbf0n";
libraryHaskellDepends = [
base blaze-builder lucid text transformers
];
description = "DSL for SVG using lucid for HTML";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"lucienne" = callPackage
@@ -148829,6 +151981,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "machines_0_7" = callPackage
+ ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
+ , conduit, containers, criterion, distributive, doctest, mtl, pipes
+ , pointed, profunctors, semigroupoids, semigroups, streaming
+ , transformers, transformers-compat, void
+ }:
+ mkDerivation {
+ pname = "machines";
+ version = "0.7";
+ sha256 = "1zipij9y913j5s6pyhycv0srias9fqyvnbky3a432qb5p9sgmh0b";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ adjunctions base comonad containers distributive mtl pointed
+ profunctors semigroupoids semigroups transformers
+ transformers-compat void
+ ];
+ testHaskellDepends = [ base doctest ];
+ benchmarkHaskellDepends = [
+ base conduit criterion mtl pipes streaming
+ ];
+ description = "Networked stream transducers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"machines-amazonka" = callPackage
({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core
, amazonka-ec2, amazonka-s3, amazonka-sts, base
@@ -149134,8 +152311,8 @@ self: {
}:
mkDerivation {
pname = "magic-wormhole";
- version = "0.2.1";
- sha256 = "1wdn5nykn4wqb65xdhkpy8gpz216a5wi3nngadf58c7acym60gyx";
+ version = "0.3.3";
+ sha256 = "1wsm7y05k8byxizkmkyl7bciyz6f3jwxiwqc0gvsqi31kkqajxqn";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -149185,8 +152362,6 @@ self: {
];
description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"magico" = callPackage
@@ -149195,8 +152370,8 @@ self: {
}:
mkDerivation {
pname = "magico";
- version = "0.0.2";
- sha256 = "0hm160w9d89qhfzq84mpb6gm6586pcxdwa7njxww21g6b0l49qmw";
+ version = "0.0.2.1";
+ sha256 = "1kcqa7xcz378q6v8aypg3ngcmiwj5c730n58rnfi3ywwl01l0x4x";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -149266,6 +152441,28 @@ self: {
broken = true;
}) {};
+ "mail-pool" = callPackage
+ ({ mkDerivation, base, HaskellNet, HaskellNet-SSL, microlens
+ , mime-mail, network, optparse-applicative, resource-pool, time
+ }:
+ mkDerivation {
+ pname = "mail-pool";
+ version = "2.1.0";
+ sha256 = "1cjl7y6djiwr94h6vhrmwjv381xp89y8hv1zmbzz8fy0dywsiyiz";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base HaskellNet HaskellNet-SSL microlens mime-mail network
+ optparse-applicative resource-pool time
+ ];
+ executableHaskellDepends = [
+ base HaskellNet HaskellNet-SSL microlens mime-mail network
+ optparse-applicative resource-pool time
+ ];
+ description = "Preconfigured email connection pool on top of smtp";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"mailbox-count" = callPackage
({ mkDerivation, base, cmdargs, configurator, containers, directory
, doctest, filemanip, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3
@@ -149333,24 +152530,22 @@ self: {
}) {};
"mailgun" = callPackage
- ({ mkDerivation, base, bytestring, conduit, exceptions, failure
- , http-client, http-client-multipart, http-conduit, monad-control
- , network, text, transformers
+ ({ mkDerivation, aeson, aeson-filthy, ascii, base, bytestring
+ , containers, exceptions, filepath, ini, lens, lens-aeson, machines
+ , mime-mail, mime-types, mtl, text, these, time, transformers
+ , unordered-containers, wreq
}:
mkDerivation {
pname = "mailgun";
- version = "0.1.0.4";
- sha256 = "01xcr0dwbkpryavk054y52fdk9qis4s6df8d0yxz05kdl8b5nczq";
- isLibrary = true;
- isExecutable = true;
+ version = "0.2";
+ sha256 = "10gmic7hks35wanzy16ivrnc9zqx586yjxiqmcmhvmkiwrpha3yi";
libraryHaskellDepends = [
- base bytestring conduit exceptions failure http-client
- http-client-multipart http-conduit monad-control network text
- transformers
+ aeson aeson-filthy ascii base bytestring containers exceptions
+ filepath ini lens lens-aeson machines mime-mail mime-types mtl text
+ these time transformers unordered-containers wreq
];
- executableHaskellDepends = [ base http-conduit text transformers ];
- description = "Connector to Rackspace's Mailgun Service";
- license = stdenv.lib.licenses.mit;
+ description = "API binding for Mailgun";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -150062,8 +153257,8 @@ self: {
}:
mkDerivation {
pname = "manifold-random";
- version = "0.5.0.0";
- sha256 = "19p2yh8yrav6dljmw8mz3xnghxf2h9a5z5wqxnb6zsrl11mds95g";
+ version = "0.5.0.3";
+ sha256 = "12k5h3r6wnqjy5vzia3hypwjrh953cc5n912k1rfdwm4m4pznq03";
libraryHaskellDepends = [
base constrained-categories linearmap-category manifolds random-fu
semigroups vector-space
@@ -150075,7 +153270,7 @@ self: {
}) {};
"manifolds" = callPackage
- ({ mkDerivation, array, base, call-stack, comonad
+ ({ mkDerivation, array, base, binary, call-stack, comonad
, constrained-categories, containers, deepseq, free
, free-vector-spaces, ieee754, lens, linear, linearmap-category
, manifolds-core, MemoTrie, number-show, placeholders
@@ -150085,11 +153280,13 @@ self: {
}:
mkDerivation {
pname = "manifolds";
- version = "0.5.0.1";
- sha256 = "1l2rbf0axlbyvxdd62dhik4pk8n9jf2c6pxl86yi48hhvc3wyx07";
+ version = "0.5.0.3";
+ sha256 = "16g0xfs99xcccyngknplgmargz4y4ncfw0wjm7sinjcrfd7js9fb";
+ revision = "2";
+ editedCabalFile = "0l76g7aqjfpp8s9wxdap4lhp3m06hfghz9lgdkr5nfjx60bgy69x";
libraryHaskellDepends = [
- array base call-stack comonad constrained-categories containers
- deepseq free free-vector-spaces ieee754 lens linear
+ array base binary call-stack comonad constrained-categories
+ containers deepseq free free-vector-spaces ieee754 lens linear
linearmap-category manifolds-core MemoTrie number-show placeholders
pragmatic-show QuickCheck semigroups spatial-rotations tagged
transformers vector vector-space void
@@ -150109,13 +153306,11 @@ self: {
({ mkDerivation, base, call-stack, tagged, vector-space }:
mkDerivation {
pname = "manifolds-core";
- version = "0.5.0.1";
- sha256 = "0bq102vfxq47if5nf0az92inzxgbla9by09nggi2nww4gqrd37v3";
+ version = "0.5.0.3";
+ sha256 = "1r459qjbdqygxplv06bnqrysfl0xvmx5i7jkwgah1blpmipr4nwz";
libraryHaskellDepends = [ base call-stack tagged vector-space ];
description = "The basic classes for the manifolds hierarchy";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"map-classes" = callPackage
@@ -150158,8 +153353,8 @@ self: {
}:
mkDerivation {
pname = "map-reduce-folds";
- version = "0.1.0.0";
- sha256 = "03f5jkjsrn5a82g0cvjwm9dq1hn4c9m6a8hsyh035f92vflfk5vc";
+ version = "0.1.0.1";
+ sha256 = "0jvgg1wk8qaxd7w3d5y7hr62xswy7xqs7b12jdjwzxm7d6k47lvq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -150435,6 +153630,23 @@ self: {
license = "GPL";
}) {};
+ "markov-chain-usage-model" = callPackage
+ ({ mkDerivation, base, doctest, matrix, tasty, tasty-discover
+ , tasty-hunit, vector
+ }:
+ mkDerivation {
+ pname = "markov-chain-usage-model";
+ version = "0.0.0";
+ sha256 = "14r73bvh6w7qz7rqb97ky2iyf2z2j7y14iy4fcr8mjyxag3mk3jc";
+ libraryHaskellDepends = [ base matrix vector ];
+ testHaskellDepends = [
+ base doctest matrix tasty tasty-discover tasty-hunit vector
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "Computations for Markov chain usage models";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
"markov-processes" = callPackage
({ mkDerivation, assertions, base, bifunctors, memoize, MonadRandom
, random
@@ -150453,6 +153665,25 @@ self: {
broken = true;
}) {};
+ "markov-realization" = callPackage
+ ({ mkDerivation, base, comonad, configuration-tools, contravariant
+ , discrimination, generic-deriving, HTF, matrix, MonadRandom
+ }:
+ mkDerivation {
+ pname = "markov-realization";
+ version = "0.3.0";
+ sha256 = "0sgfz89cxv899f0p0v9fh1xprzqjk9rgm1r1zvkrg2x5fhh9hcca";
+ libraryHaskellDepends = [
+ base comonad configuration-tools contravariant discrimination
+ generic-deriving matrix MonadRandom
+ ];
+ testHaskellDepends = [ base HTF ];
+ description = "Realizations of Markov chains";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"markup" = callPackage
({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup
, clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl
@@ -150686,8 +153917,8 @@ self: {
}:
mkDerivation {
pname = "massiv";
- version = "0.2.8.0";
- sha256 = "01z57p6byvrrbl9hhr1jq90kpb823kjfbq0inhvmjjbcnbngqrf3";
+ version = "0.2.8.1";
+ sha256 = "10fq5h3nkgfibh0yix8j3h0ldqapyxivxj74jyrzc5zjbpa1j8pb";
libraryHaskellDepends = [
base bytestring data-default-class deepseq ghc-prim primitive
vector
@@ -150700,16 +153931,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "massiv_0_3_2_0" = callPackage
+ "massiv_0_3_6_0" = callPackage
({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest
, containers, data-default, data-default-class, deepseq, doctest
- , exceptions, hspec, primitive, QuickCheck, scheduler
- , template-haskell, unliftio, unliftio-core, vector
+ , exceptions, hspec, mersenne-random-pure64, primitive, QuickCheck
+ , random, scheduler, splitmix, template-haskell, unliftio
+ , unliftio-core, vector
}:
mkDerivation {
pname = "massiv";
- version = "0.3.2.0";
- sha256 = "0cap5rxy3d301ci1ysh4d0y3k4smgx6w4s7ngqkzdbw17fk74iam";
+ version = "0.3.6.0";
+ sha256 = "00bjgrb7pa59i8wmbjgscq0jw4x3r1gjvpns7sd58ffa8zfd6sgc";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bytestring data-default-class deepseq exceptions primitive
@@ -150717,7 +153949,8 @@ self: {
];
testHaskellDepends = [
async base bytestring containers data-default deepseq doctest hspec
- QuickCheck template-haskell unliftio vector
+ mersenne-random-pure64 QuickCheck random scheduler splitmix
+ template-haskell unliftio vector
];
description = "Massiv (МаÑÑив) is an Array Library";
license = stdenv.lib.licenses.bsd3;
@@ -150823,6 +154056,8 @@ self: {
pname = "matchable-th";
version = "0.1.0.0";
sha256 = "1381zpnpzgng7iwx326bjwi1i3300a0aa0hhp1j5wr0mxad8hyr3";
+ revision = "1";
+ editedCabalFile = "0az3cwf4gy0vhv0zqdvqpvk3j6ckhf1h2946kklvmij7z46x17ql";
libraryHaskellDepends = [
base matchable template-haskell th-abstraction
];
@@ -150899,6 +154134,28 @@ self: {
broken = true;
}) {};
+ "math-interpolate" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "math-interpolate";
+ version = "0.1.0.1";
+ sha256 = "0l8jv0zm1mar6848n5jyd6dzy02q0cvkgvgnry9db382i1r4g9bq";
+ libraryHaskellDepends = [ base ];
+ description = "Class for interpolation of values";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "math-metric" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "math-metric";
+ version = "0.1.0.1";
+ sha256 = "092qbl1x0l6hcm9vn3nx3gyxnqcfx3z2kkfkqw5zmmmyn9zkjsgx";
+ libraryHaskellDepends = [ base ];
+ description = "Typeclass for metric spaces";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"mathblog" = callPackage
({ mkDerivation, base, bytestring, ConfigFile, containers
, data-default, deepseq, directory, either, filepath, fsnotify
@@ -151224,8 +154481,8 @@ self: {
}:
mkDerivation {
pname = "matterhorn";
- version = "50200.3.1";
- sha256 = "0szcdiva6b4xkgjpxyvm200n8y5bdc3lk1yw06y3i907fz573q2i";
+ version = "50200.4.0";
+ sha256 = "0b4y48z3hn55y8q61l8zp7x8pf0fyps4inv1s52y1yg7b2rpyfzb";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -151257,20 +154514,20 @@ self: {
({ mkDerivation, aeson, base, binary, bytestring, connection
, containers, gitrev, hashable, HTTP, http-media, HUnit, memory
, microlens, microlens-th, mtl, network-uri, pretty-show, process
- , resource-pool, stm, tasty, tasty-hunit, template-haskell, text
- , time, unordered-containers, websockets
+ , resource-pool, split, stm, tasty, tasty-hunit, template-haskell
+ , text, time, unordered-containers, websockets
}:
mkDerivation {
pname = "mattermost-api";
- version = "50200.1.4";
- sha256 = "10z6h0d629i89yrlx7rww6j274dr57y6inlay3211k1vbfp25b62";
+ version = "50200.2.0";
+ sha256 = "1c0d2djv3a374k9avbg95sm2f22bhz8ssafw76dnphkk7yasr8h6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base binary bytestring connection containers gitrev hashable
HTTP http-media memory microlens microlens-th network-uri
- pretty-show process resource-pool stm template-haskell text time
- unordered-containers websockets
+ pretty-show process resource-pool split stm template-haskell text
+ time unordered-containers websockets
];
testHaskellDepends = [
aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit
@@ -151286,8 +154543,8 @@ self: {
}:
mkDerivation {
pname = "mattermost-api-qc";
- version = "50200.1.4";
- sha256 = "057m7i55bp1d5fs9imcfqbzwb54q8pqz7pvmjwkbf0w5kd111kly";
+ version = "50200.2.0";
+ sha256 = "0wryvjx9s5p1gvvkp1kzdfgrvwrmfpy81caqc85p6mwnr18ybrbq";
libraryHaskellDepends = [
base containers mattermost-api QuickCheck text time
];
@@ -151490,6 +154747,8 @@ self: {
pname = "mbox-utility";
version = "0.0.1";
sha256 = "1y792np4i24jlyxfsm4dw3m1bvij5wxj77dkqj2hvclm7kw0kq75";
+ revision = "1";
+ editedCabalFile = "0lhka293xbgsjs7sb3yrck6q7vw4dfdhpmpalc7s9az1mj4l4mjz";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -151500,6 +154759,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "mbox-utility_0_0_3" = callPackage
+ ({ mkDerivation, base, bytestring, hsemail, non-empty, parsec
+ , spreadsheet, time, utility-ht
+ }:
+ mkDerivation {
+ pname = "mbox-utility";
+ version = "0.0.3";
+ sha256 = "1y24y0n81f0v9c9829y4va22h42n0wmjndaj1d15n07xvhn4xdps";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring hsemail non-empty parsec spreadsheet time
+ utility-ht
+ ];
+ description = "List contents of an mbox file containing e-mails";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mbtiles" = callPackage
({ mkDerivation, base, bytestring, directory, HUnit, monad-control
, mtl, resource-pool, sqlite-simple, text, transformers
@@ -151953,8 +155231,6 @@ self: {
testHaskellDepends = [ base QuickCheck ];
description = "Constant-time queries for the median of a stream of numeric data";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"mediawiki" = callPackage
@@ -152061,6 +155337,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mega-sdist_0_4_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, optparse-simple, pantry-tmp
+ , path, path-io, rio, rio-orphans, yaml
+ }:
+ mkDerivation {
+ pname = "mega-sdist";
+ version = "0.4.0.0";
+ sha256 = "0d8z0jj4xm091zdlydkp5fgs22xrjrsydfm9czfr79pmcx83bdi4";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring optparse-simple pantry-tmp path path-io rio
+ rio-orphans yaml
+ ];
+ description = "Handles uploading to Hackage from mega repos";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"megaparsec_6_5_0" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, criterion, deepseq, hspec, hspec-discover, hspec-expectations
@@ -152089,32 +155384,6 @@ self: {
}) {};
"megaparsec" = callPackage
- ({ mkDerivation, base, bytestring, case-insensitive, containers
- , criterion, deepseq, hspec, hspec-expectations, mtl
- , parser-combinators, QuickCheck, scientific, text, transformers
- , weigh
- }:
- mkDerivation {
- pname = "megaparsec";
- version = "7.0.4";
- sha256 = "1hg83m85f4v78mqdkznd1ddk9y32hnrv0bgva7ir3vydx37aanrj";
- libraryHaskellDepends = [
- base bytestring case-insensitive containers deepseq mtl
- parser-combinators scientific text transformers
- ];
- testHaskellDepends = [
- base bytestring case-insensitive containers hspec
- hspec-expectations mtl parser-combinators QuickCheck scientific
- text transformers
- ];
- benchmarkHaskellDepends = [
- base containers criterion deepseq text weigh
- ];
- description = "Monadic parser combinators";
- license = stdenv.lib.licenses.bsd2;
- }) {};
-
- "megaparsec_7_0_5" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, criterion, deepseq, mtl, parser-combinators, scientific, text
, transformers, weigh
@@ -152132,7 +155401,6 @@ self: {
];
description = "Monadic parser combinators";
license = stdenv.lib.licenses.bsd2;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"megaparsec-tests" = callPackage
@@ -152145,6 +155413,8 @@ self: {
pname = "megaparsec-tests";
version = "7.0.5";
sha256 = "11kwf122bq38qvkpvhb1pkqzbv7yk9wi7klmg9yvls29x66shiyq";
+ revision = "1";
+ editedCabalFile = "1mayv955ipg94hbsix3dvpp1c2aay860h9zpg38qjmfiaks4zpjj";
libraryHaskellDepends = [
base bytestring containers hspec hspec-expectations
hspec-megaparsec megaparsec mtl QuickCheck text transformers
@@ -152273,6 +155543,22 @@ self: {
broken = true;
}) {};
+ "membership" = callPackage
+ ({ mkDerivation, base, constraints, deepseq, hashable
+ , prettyprinter, template-haskell, th-lift
+ }:
+ mkDerivation {
+ pname = "membership";
+ version = "0";
+ sha256 = "0hdy0yv64gcwja2kr6akfms21jgq6lqhzbxap603nhiwvf7n8ayv";
+ libraryHaskellDepends = [
+ base constraints deepseq hashable prettyprinter template-haskell
+ th-lift
+ ];
+ description = "Indices for type level lists";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"memcache" = callPackage
({ mkDerivation, base, binary, blaze-builder, bytestring, criterion
, data-default-class, hashable, network, resource-pool, time
@@ -152375,6 +155661,22 @@ self: {
broken = true;
}) {};
+ "memdb" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, hspec, QuickCheck
+ , vector
+ }:
+ mkDerivation {
+ pname = "memdb";
+ version = "1.0.0.0";
+ sha256 = "1rm1ijhhiyznbqidcpa1796lzj35dhi4jb0a2qbrvgim329ymsr2";
+ libraryHaskellDepends = [ base bytestring cereal vector ];
+ testHaskellDepends = [
+ base bytestring cereal hspec QuickCheck vector
+ ];
+ description = "Efficient in memory indexed database";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"memexml" = callPackage
({ mkDerivation, base, hxt }:
mkDerivation {
@@ -152610,8 +155912,8 @@ self: {
pname = "mercury-api";
version = "0.1.0.2";
sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg";
- revision = "1";
- editedCabalFile = "00qvar25y8fkr5vgavjkpy24nck8njy92fiq9fxfzl0yk2c1dr0g";
+ revision = "3";
+ editedCabalFile = "0v0fag8y821nr825cn9bqpmrr55zr6dqiqg5q1rfvifflmq73d37";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -152662,6 +155964,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "merkle-log" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, criterion, cryptonite
+ , deepseq, exceptions, hash-tree, memory, merkle-tree, mwc-random
+ , QuickCheck, random, random-bytestring, text
+ }:
+ mkDerivation {
+ pname = "merkle-log";
+ version = "0.1.0.0";
+ sha256 = "07q0ifgwq8agwm62k1k83sdrln4zbj6ln90nw9p9g3pgxnp3inia";
+ libraryHaskellDepends = [
+ base bytestring cryptonite deepseq exceptions memory text
+ ];
+ testHaskellDepends = [
+ base bytestring cryptonite deepseq exceptions memory QuickCheck
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring cereal criterion cryptonite deepseq hash-tree
+ memory merkle-tree mwc-random QuickCheck random random-bytestring
+ ];
+ description = "Merkle Tree Logs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"merkle-patricia-db" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, base, base16-bytestring
, binary, bytestring, containers, cryptonite, data-default
@@ -153108,6 +156433,8 @@ self: {
pname = "micro-recursion-schemes";
version = "5.0.2.2";
sha256 = "17jybjra4s1hapjz6i8bwlv8y6rm70g72vl7cd2y7xrq4vrd3p9v";
+ revision = "1";
+ editedCabalFile = "0zdyg5w4fhdps5cirp21wpd6056v09381lmdf9mizfxilhx4wziy";
libraryHaskellDepends = [ base template-haskell th-abstraction ];
libraryToolDepends = [ cpphs ];
testHaskellDepends = [ base HUnit template-haskell ];
@@ -153245,6 +156572,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens_0_4_11_2" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "microlens";
+ version = "0.4.11.2";
+ sha256 = "1z6zdprpr193a56r5s67q75554rrqyp2kk6srxn1gif7fd54sj2f";
+ libraryHaskellDepends = [ base ];
+ description = "A tiny lens library with no dependencies";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-aeson" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
, hashable, microlens, scientific, tasty, tasty-hunit, text
@@ -153252,10 +156591,8 @@ self: {
}:
mkDerivation {
pname = "microlens-aeson";
- version = "2.3.0.1";
- sha256 = "1ncb0dhhr62yw8808c1h43cl48ib6clifklcrfx7acj5j482ikcs";
- revision = "1";
- editedCabalFile = "18490w9yvsn8rx18wb29bg1wj5vxa7il3gsi3cz2myx9iawhnnxq";
+ version = "2.3.0.4";
+ sha256 = "0w630kk5bnily1qh41081gqgbwmslrh5ad21899gwnb2r3jripyw";
libraryHaskellDepends = [
aeson attoparsec base bytestring deepseq hashable microlens
scientific text unordered-containers vector
@@ -153307,6 +156644,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens-ghc_0_4_11_1" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, microlens
+ , transformers
+ }:
+ mkDerivation {
+ pname = "microlens-ghc";
+ version = "0.4.11.1";
+ sha256 = "19h3rgh3xhp7zgnhpqhpihca05s69mimzkx0sh30lg96p99wx69r";
+ libraryHaskellDepends = [
+ array base bytestring containers microlens transformers
+ ];
+ description = "microlens + array, bytestring, containers, transformers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-mtl" = callPackage
({ mkDerivation, base, microlens, mtl, transformers
, transformers-compat
@@ -153322,6 +156675,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens-mtl_0_2_0_1" = callPackage
+ ({ mkDerivation, base, microlens, mtl, transformers
+ , transformers-compat
+ }:
+ mkDerivation {
+ pname = "microlens-mtl";
+ version = "0.2.0.1";
+ sha256 = "0ijy7xyd5lbc3calhcrhy8czkf3fjcxrv68p7kd2a5b352rfi7fp";
+ libraryHaskellDepends = [
+ base microlens mtl transformers transformers-compat
+ ];
+ description = "microlens support for Reader/Writer/State from mtl";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-platform" = callPackage
({ mkDerivation, base, hashable, microlens, microlens-ghc
, microlens-mtl, microlens-th, text, unordered-containers, vector
@@ -153330,6 +156699,8 @@ self: {
pname = "microlens-platform";
version = "0.3.11";
sha256 = "18950lxgmsg5ksvyyi3zs1smjmb1qf1q73a3p3g44bh21miz0xwb";
+ revision = "1";
+ editedCabalFile = "14v7ffibzsa1fhf4pwvpw9ia67kgmk8wmxwibj7vr9rayrxy1ffv";
libraryHaskellDepends = [
base hashable microlens microlens-ghc microlens-mtl microlens-th
text unordered-containers vector
@@ -153338,6 +156709,40 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens-platform_0_4_0" = callPackage
+ ({ mkDerivation, base, hashable, microlens, microlens-ghc
+ , microlens-mtl, microlens-th, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "microlens-platform";
+ version = "0.4.0";
+ sha256 = "0q90qsrcr6pa0nvzk46573ykxrf21lr4xm0jp5sp5pd30kx21fmx";
+ libraryHaskellDepends = [
+ base hashable microlens microlens-ghc microlens-mtl microlens-th
+ text unordered-containers vector
+ ];
+ description = "microlens + all batteries included (best for apps)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "microlens-process" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath
+ , microlens, process
+ }:
+ mkDerivation {
+ pname = "microlens-process";
+ version = "0.2.0.0";
+ sha256 = "05bkm3nhiv2mprds9xlmmnzll91hn76navb9h9kc9nl5rnq4nwrn";
+ revision = "2";
+ editedCabalFile = "02h97gnxwsn20npxsc0mjhyv5s8fj41xkm18xwvcqcq7a4cj8jnw";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [ base filepath microlens process ];
+ testHaskellDepends = [ base doctest microlens process ];
+ description = "Micro-optics for the process library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"microlens-th" = callPackage
({ mkDerivation, base, containers, microlens, template-haskell
, th-abstraction, transformers
@@ -153357,6 +156762,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens-th_0_4_3_2" = callPackage
+ ({ mkDerivation, base, containers, microlens, template-haskell
+ , th-abstraction, transformers
+ }:
+ mkDerivation {
+ pname = "microlens-th";
+ version = "0.4.3.2";
+ sha256 = "0wz27ir4fs4231a20iiy2ghnyyg4qd75h45k6602017pww1hv44x";
+ libraryHaskellDepends = [
+ base containers microlens template-haskell th-abstraction
+ transformers
+ ];
+ testHaskellDepends = [ base microlens ];
+ description = "Automatic generation of record lenses for microlens";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"micrologger" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, hspec, lens
, text, text-format, time, transformers
@@ -153413,8 +156836,8 @@ self: {
pname = "microstache";
version = "1.0.1.1";
sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
- revision = "3";
- editedCabalFile = "1pq0h64vxc7zlncn2ld6k02wi6rfa5ccqc4z0hfkvaldj41y2sb1";
+ revision = "4";
+ editedCabalFile = "0rkc0zmwi2vx47l4ssjkxlyd54fxz0w3xrgdhn7baf66gr90nrc7";
libraryHaskellDepends = [
aeson base bytestring containers deepseq directory filepath parsec
text transformers unordered-containers vector
@@ -153519,18 +156942,18 @@ self: {
"midi-music-box" = callPackage
({ mkDerivation, base, containers, diagrams-lib
- , diagrams-postscript, event-list, midi, non-empty
- , optparse-applicative, utility-ht
+ , diagrams-postscript, event-list, midi, optparse-applicative
+ , utility-ht
}:
mkDerivation {
pname = "midi-music-box";
- version = "0.0.0.5";
- sha256 = "1zgskam31akqi58wvjxqfgag937fczskyvzanivvxd7p6gvj5l0g";
+ version = "0.0.1.1";
+ sha256 = "15i28iw6ssl7f8iivqyxgd8rg3vg76hspsyv347195d74xb5s7zb";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base containers diagrams-lib diagrams-postscript event-list midi
- non-empty optparse-applicative utility-ht
+ optparse-applicative utility-ht
];
description = "Convert MIDI file to music box punch tape";
license = stdenv.lib.licenses.bsd3;
@@ -153661,8 +157084,8 @@ self: {
}:
mkDerivation {
pname = "mighttpd2";
- version = "3.4.4";
- sha256 = "0n73zr3scn6sgqwaqjzcm3gybf2j0nwdcfq4cmsq9wanc5naz1pd";
+ version = "3.4.6";
+ sha256 = "0wg4cbgpsr997ag1vba0cpqq151l5fnhq0w63icq2lp4l172c57y";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -153681,6 +157104,8 @@ self: {
testHaskellDepends = [ base hspec http-client ];
description = "High performance web server on WAI/warp";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"mighty-metropolis" = callPackage
@@ -153899,6 +157324,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "min-max-pqueue" = callPackage
+ ({ mkDerivation, base, containers, criterion, hedgehog
+ , integer-logarithms, random
+ }:
+ mkDerivation {
+ pname = "min-max-pqueue";
+ version = "0.1.0.0";
+ sha256 = "142cfiybs6slzrdhc0k91rr5xxzi07saxcr834iic304cpbzcdrv";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [ base containers hedgehog ];
+ benchmarkHaskellDepends = [
+ base containers criterion integer-logarithms random
+ ];
+ description = "Double-ended priority queues";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"minecraft-data" = callPackage
({ mkDerivation, array, base, bytestring, cereal, containers, lens
, mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse
@@ -154007,29 +157449,30 @@ self: {
}) {};
"minilight" = callPackage
- ({ mkDerivation, aeson, base, containers, exceptions, FontyFruity
- , hashable, linear, microlens, microlens-mtl, mtl, mwc-random
- , scientific, sdl2, sdl2-gfx, sdl2-image, sdl2-ttf, tasty
- , tasty-discover, tasty-hspec, template-haskell, text, trifecta
+ ({ mkDerivation, aeson, aeson-diff, base, caster, containers
+ , exceptions, FontyFruity, fsnotify, hashable, hashtables, lens
+ , linear, microlens, mtl, mwc-random, scientific, sdl2, sdl2-gfx
+ , sdl2-image, sdl2-ttf, tasty, tasty-discover, tasty-hspec
+ , template-haskell, text, transformers, trifecta
, unordered-containers, uuid, vector, yaml
}:
mkDerivation {
pname = "minilight";
- version = "0.2.0";
- sha256 = "18kjzmqpm967z0560z09n7s61s21f13mkr6iwb5dp7a5vnwq8lxm";
+ version = "0.4.0";
+ sha256 = "1ishxvijigfjfvrqiibbds2l7bb5vp51lsy933q4nphapvqrhk2m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base containers exceptions FontyFruity hashable linear
- microlens microlens-mtl mtl mwc-random scientific sdl2 sdl2-gfx
- sdl2-image sdl2-ttf template-haskell text trifecta
- unordered-containers uuid vector yaml
+ aeson aeson-diff base caster containers exceptions FontyFruity
+ fsnotify hashable hashtables lens linear mtl mwc-random scientific
+ sdl2 sdl2-gfx sdl2-image sdl2-ttf template-haskell text
+ transformers trifecta unordered-containers uuid vector yaml
];
executableHaskellDepends = [
base linear microlens mtl mwc-random sdl2 sdl2-ttf text vector
];
testHaskellDepends = [
- aeson base tasty tasty-hspec trifecta yaml
+ aeson base tasty tasty-hspec trifecta vector yaml
];
testToolDepends = [ tasty-discover ];
description = "A SDL2-based graphics library, batteries-included";
@@ -154116,6 +157559,43 @@ self: {
broken = true;
}) {};
+ "minio-hs_1_3_1" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+ , case-insensitive, conduit, conduit-extra, connection, containers
+ , cryptonite, cryptonite-conduit, digest, directory, exceptions
+ , filepath, http-client, http-client-tls, http-conduit, http-types
+ , ini, memory, protolude, QuickCheck, raw-strings-qq, resourcet
+ , retry, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+ , temporary, text, time, transformers, unliftio, unliftio-core
+ , unordered-containers, xml-conduit
+ }:
+ mkDerivation {
+ pname = "minio-hs";
+ version = "1.3.1";
+ sha256 = "1z553cpflxmr5hy723bgmwyq061fpivi1jw0vq64x1i0bz0q1llp";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring binary bytestring case-insensitive
+ conduit conduit-extra connection containers cryptonite
+ cryptonite-conduit digest directory exceptions filepath http-client
+ http-client-tls http-conduit http-types ini memory protolude
+ raw-strings-qq resourcet retry text time transformers unliftio
+ unliftio-core unordered-containers xml-conduit
+ ];
+ testHaskellDepends = [
+ aeson base base64-bytestring binary bytestring case-insensitive
+ conduit conduit-extra connection containers cryptonite
+ cryptonite-conduit digest directory exceptions filepath http-client
+ http-client-tls http-conduit http-types ini memory protolude
+ QuickCheck raw-strings-qq resourcet retry tasty tasty-hunit
+ tasty-quickcheck tasty-smallcheck temporary text time transformers
+ unliftio unliftio-core unordered-containers xml-conduit
+ ];
+ description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"minions" = callPackage
({ mkDerivation, ansi-terminal, base, MissingH, process, time }:
mkDerivation {
@@ -154238,15 +157718,13 @@ self: {
}:
mkDerivation {
pname = "minitypeset-opengl";
- version = "0.2.0.1";
- sha256 = "0vf2npnm4zpslwqr051v4im82h5al5nl9mq5f68pk03limgrf8ik";
+ version = "0.3.0.0";
+ sha256 = "10q5071gm98vc16k5mdck1gcdf6p8aa6612wlsqwawnq3f2hj7d0";
libraryHaskellDepends = [
base containers filepath OpenGL stb-truetype
];
description = "Layout and render text with TrueType fonts using OpenGL";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"miniutter" = callPackage
@@ -154496,6 +157974,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "miso-action-logger" = callPackage
+ ({ mkDerivation, aeson, base, ghcjs-base, miso }:
+ mkDerivation {
+ pname = "miso-action-logger";
+ version = "0.1.0.1";
+ sha256 = "02xcj7ic4fh3h08h89naa2rl0rkksqx426wx8k8v0zl0d7rd12jc";
+ libraryHaskellDepends = [ aeson base ghcjs-base miso ];
+ description = "Miso state transition logger";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"miss" = callPackage
({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
, ChasingBottoms, containers, cryptohash-sha1, deepseq, digest
@@ -154815,15 +158306,16 @@ self: {
"mmark" = callPackage
({ mkDerivation, aeson, base, case-insensitive, containers
, criterion, deepseq, dlist, email-validate, foldl, hashable, hspec
- , hspec-discover, hspec-megaparsec, html-entity-map, lucid
- , megaparsec, microlens, microlens-th, modern-uri, mtl
- , parser-combinators, QuickCheck, text, text-metrics
- , unordered-containers, weigh, yaml
+ , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens
+ , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck
+ , text, text-metrics, unordered-containers, weigh, yaml
}:
mkDerivation {
pname = "mmark";
- version = "0.0.6.2";
- sha256 = "0j8n2rjfx590v0m3p9z8xhbfxgxbc1cxfkdg18vwyhayh55mn373";
+ version = "0.0.7.0";
+ sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx";
+ revision = "2";
+ editedCabalFile = "06hr9p2lqyh4zx38i601yd24acbl08p69l0pwh8266qvfripcsm9";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base case-insensitive containers deepseq dlist email-validate
@@ -154835,13 +158327,14 @@ self: {
aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
QuickCheck text
];
- testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [ base criterion text weigh ];
description = "Strict markdown processor for writers";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
- "mmark_0_0_7_0" = callPackage
+ "mmark_0_0_7_1" = callPackage
({ mkDerivation, aeson, base, case-insensitive, containers
, criterion, deepseq, dlist, email-validate, foldl, hashable, hspec
, hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens
@@ -154850,8 +158343,8 @@ self: {
}:
mkDerivation {
pname = "mmark";
- version = "0.0.7.0";
- sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx";
+ version = "0.0.7.1";
+ sha256 = "0apc582ck0g5ih0rpcljsfvss646ng62bjm37nj5z6k48symh16n";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base case-insensitive containers deepseq dlist email-validate
@@ -154867,6 +158360,7 @@ self: {
description = "Strict markdown processor for writers";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"mmark-cli" = callPackage
@@ -154879,6 +158373,8 @@ self: {
pname = "mmark-cli";
version = "0.0.5.0";
sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby";
+ revision = "1";
+ editedCabalFile = "11yrsr4hpl5vxrfav1nfg3gidcr1qy0rjv5mkh5hqsxdpxy6c7aj";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -154888,6 +158384,8 @@ self: {
];
description = "Command line interface to the MMark markdown processor";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"mmark-ext" = callPackage
@@ -154899,6 +158397,8 @@ self: {
pname = "mmark-ext";
version = "0.2.1.2";
sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c";
+ revision = "1";
+ editedCabalFile = "10dlh96l6fdbpl1slr8v022735z9zkdszd1aziid5ml3gf63ssd8";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri
@@ -154908,22 +158408,11 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Commonly useful extensions for the MMark markdown processor";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"mmorph" = callPackage
- ({ mkDerivation, base, mtl, transformers, transformers-compat }:
- mkDerivation {
- pname = "mmorph";
- version = "1.1.2";
- sha256 = "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9";
- libraryHaskellDepends = [
- base mtl transformers transformers-compat
- ];
- description = "Monad morphisms";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "mmorph_1_1_3" = callPackage
({ mkDerivation, base, mtl, transformers, transformers-compat }:
mkDerivation {
pname = "mmorph";
@@ -154934,7 +158423,6 @@ self: {
];
description = "Monad morphisms";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mmtf" = callPackage
@@ -155016,6 +158504,24 @@ self: {
broken = true;
}) {};
+ "mockazo" = callPackage
+ ({ mkDerivation, base, constraints, hspec, multistate, relude
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "mockazo";
+ version = "0.1.1";
+ sha256 = "113z5mmka7wkih0gm7x7d3l75ayql9217168b5pbyq7yvyh5f10m";
+ libraryHaskellDepends = [
+ base constraints multistate relude template-haskell
+ ];
+ testHaskellDepends = [
+ base constraints hspec multistate relude template-haskell
+ ];
+ description = "Mock records of functions easily";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"mockery" = callPackage
({ mkDerivation, base, base-compat, bytestring, directory, filepath
, hspec, logging-facade, temporary
@@ -155052,23 +158558,20 @@ self: {
"model" = callPackage
({ mkDerivation, base, containers, convertible, deepseq, doctest
, either, filemanip, ghc-prim, pretty, tasty, tasty-hunit
- , tasty-quickcheck, transformers
+ , transformers
}:
mkDerivation {
pname = "model";
- version = "0.4.4";
- sha256 = "1mmv1m78ychgqp0mblm56fszfmnxap3jwvxviy0h06s6wl2adq24";
+ version = "0.5";
+ sha256 = "0yynva6zk986yl04ilkr171m2m8k649fihc2z1lkvfn6vl8qpw0d";
libraryHaskellDepends = [
base containers convertible deepseq either pretty transformers
];
testHaskellDepends = [
base containers doctest filemanip ghc-prim pretty tasty tasty-hunit
- tasty-quickcheck
];
description = "Derive a model of a data type using Generics";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"modelicaparser" = callPackage
@@ -155173,8 +158676,6 @@ self: {
libraryHaskellDepends = [ base ghc-typelits-knownnat ];
description = "Type-safe modular arithmetic";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"modular-arithmetic" = callPackage
@@ -155500,6 +159001,24 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "monad-chronicle" = callPackage
+ ({ mkDerivation, base, data-default-class, mtl, semigroupoids
+ , these, transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "monad-chronicle";
+ version = "1";
+ sha256 = "03x19683pm99zcw7gkipmdkrqwaspcyvy7yv68nlh6g4swl31a0l";
+ libraryHaskellDepends = [
+ base data-default-class mtl semigroupoids these transformers
+ transformers-compat
+ ];
+ description = "These as a transformer, ChronicleT";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"monad-classes" = callPackage
({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph
, monad-control, peano, reflection, tasty, tasty-hunit
@@ -156017,8 +159536,8 @@ self: {
}:
mkDerivation {
pname = "monad-metrics";
- version = "0.2.1.3";
- sha256 = "0ryazqrn7s2pzgzgvzp4paibylbvl54p52gc70n3alwzz8x1b7bd";
+ version = "0.2.1.4";
+ sha256 = "0h83kh1qc3wf9i0l8k998zib6fvf8fpwzn3qiz0d6z7az0i947cf";
libraryHaskellDepends = [
base clock ekg-core exceptions hashable microlens mtl text
transformers unordered-containers
@@ -156320,8 +159839,8 @@ self: {
pname = "monad-ste";
version = "0.1.0.0";
sha256 = "0yqkx7rlrfms7wiymb41y5nxh8fyi4049729iamwablx6hdpsrw6";
- revision = "1";
- editedCabalFile = "17xfha8zn0snlqwi8cr44my3d1zbyvhh83qlmb747dblhmj1rdi1";
+ revision = "2";
+ editedCabalFile = "0dcdf3nifq26v63r6l1bxx4zv3ldgq7dxijf07ba9dliizwj2nr8";
libraryHaskellDepends = [ base exceptions ghc-prim primitive ];
testHaskellDepends = [ base hspec HUnit ];
description = "ST monad with efficient explicit errors";
@@ -156557,8 +160076,6 @@ self: {
libraryHaskellDepends = [ base transformers ];
description = "The Acme and AcmeT monads";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"monadbi" = callPackage
@@ -156892,6 +160409,37 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "mongoDB_2_5_0_0" = callPackage
+ ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
+ , binary, bson, bytestring, conduit, conduit-extra, containers
+ , criterion, cryptohash, data-default-class, hashtables, hspec
+ , lifted-base, monad-control, mtl, network, nonce, old-locale
+ , parsec, pureMD5, random, random-shuffle, resourcet, stm, tagged
+ , text, time, tls, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "mongoDB";
+ version = "2.5.0.0";
+ sha256 = "15zlh2ws9vs2d5rp1g299b4lrpj6a4gcdm1zqiig452w7m1bsyzd";
+ libraryHaskellDepends = [
+ array base base16-bytestring base64-bytestring binary bson
+ bytestring conduit conduit-extra containers cryptohash
+ data-default-class hashtables lifted-base monad-control mtl network
+ nonce parsec pureMD5 random random-shuffle resourcet stm tagged
+ text time tls transformers transformers-base
+ ];
+ testHaskellDepends = [ base hspec mtl old-locale text time ];
+ benchmarkHaskellDepends = [
+ array base base16-bytestring base64-bytestring binary bson
+ bytestring containers criterion cryptohash data-default-class
+ hashtables lifted-base monad-control mtl network nonce parsec
+ random random-shuffle stm text transformers-base
+ ];
+ description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mongodb-queue" = callPackage
({ mkDerivation, base, data-default, hspec, lifted-base
, monad-control, mongoDB, network, text, transformers
@@ -157397,17 +160945,15 @@ self: {
}) {};
"more-containers" = callPackage
- ({ mkDerivation, base, containers, hspec }:
+ ({ mkDerivation, base, binary, containers, hspec }:
mkDerivation {
pname = "more-containers";
- version = "0.1.2.0";
- sha256 = "0q3ljqjzzrx1y0vbsgvrnmbmvysxkfk2ky5xxix1kirpn1q45yjj";
- libraryHaskellDepends = [ base containers ];
- testHaskellDepends = [ base containers hspec ];
+ version = "0.2.1.2";
+ sha256 = "104ffslcjr8rfbsjy2g49v8l3nx9xrfqglmwcsfgar0n0xnh62ds";
+ libraryHaskellDepends = [ base binary containers ];
+ testHaskellDepends = [ base binary containers hspec ];
description = "A few more collections";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"more-extensible-effects" = callPackage
@@ -157464,39 +161010,46 @@ self: {
"morley" = callPackage
({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude
- , base16-bytestring, base58-bytestring, bifunctors, bytestring
- , containers, cryptonite, data-default, directory, filepath, fmt
- , formatting, hex-text, hspec, hspec-golden-aeson, HUnit, lens
- , megaparsec, memory, morley-prelude, mtl, named
- , optparse-applicative, parser-combinators, pretty-simple
+ , base16-bytestring, base58-bytestring, binary, bytestring
+ , constraints, containers, cryptonite, data-default, directory
+ , filepath, fmt, formatting, generic-arbitrary, ghc-prim, hex-text
+ , hspec, hspec-expectations, HUnit, lens, megaparsec, memory
+ , morley-prelude, mtl, named, optparse-applicative
+ , parser-combinators, pretty-simple, qm-interpolated-string
, QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances
- , singletons, text, time, timerep, transformers-compat, universum
- , vinyl, wl-pprint-text
+ , singletons, syb, tasty, tasty-ant-xml, tasty-discover
+ , tasty-hspec, tasty-quickcheck, template-haskell, text, time
+ , timerep, transformers-compat, vector, vinyl, wl-pprint-text
}:
mkDerivation {
pname = "morley";
- version = "0.2.0.1";
- sha256 = "1mkc3hfhm9isnw2m2zvdpmjcxw8fh2s7gzcp5r532spy2pv82wiz";
+ version = "0.3.0.1";
+ sha256 = "042kzx6n7jc6chqjvm7l14gpyywvy2s193xsnsvax5cisppm752m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-options aeson-pretty base-noprelude base16-bytestring
- base58-bytestring bifunctors bytestring containers cryptonite
- data-default directory fmt formatting hex-text hspec lens
- megaparsec memory morley-prelude mtl named parser-combinators
- QuickCheck singletons text time timerep transformers-compat vinyl
+ base58-bytestring binary bytestring constraints containers
+ cryptonite data-default filepath fmt formatting ghc-prim hex-text
+ hspec lens megaparsec memory morley-prelude mtl named
+ parser-combinators QuickCheck quickcheck-arbitrary-adt
+ quickcheck-instances singletons syb tasty tasty-ant-xml
+ template-haskell text time timerep transformers-compat vector vinyl
wl-pprint-text
];
executableHaskellDepends = [
- base-noprelude fmt megaparsec morley-prelude named
- optparse-applicative pretty-simple text
+ base-noprelude data-default directory filepath fmt megaparsec
+ morley-prelude named optparse-applicative pretty-simple text
];
testHaskellDepends = [
- aeson base-noprelude containers directory filepath fmt formatting
- hspec hspec-golden-aeson HUnit lens megaparsec morley-prelude
- QuickCheck quickcheck-arbitrary-adt quickcheck-instances text time
- universum vinyl
+ aeson base-noprelude bytestring containers data-default directory
+ filepath fmt formatting generic-arbitrary hex-text hspec
+ hspec-expectations HUnit lens megaparsec morley-prelude mtl
+ qm-interpolated-string QuickCheck quickcheck-arbitrary-adt
+ quickcheck-instances singletons syb tasty tasty-hspec
+ tasty-quickcheck text
];
+ testToolDepends = [ tasty-discover ];
description = "Developer tools for the Michelson Language";
license = stdenv.lib.licenses.agpl3Plus;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -157507,8 +161060,8 @@ self: {
({ mkDerivation, base-noprelude, universum }:
mkDerivation {
pname = "morley-prelude";
- version = "0.1.0.4";
- sha256 = "0k96m27ix80awh6cg7qncps6nn2gd0yr423b5gc22rw4ayqsdlr1";
+ version = "0.2.0.1";
+ sha256 = "0dc0hi1gnw5ri7m0fl0pk3frgsnav1al4b6h4kwamhz4qh3av9b2";
libraryHaskellDepends = [ base-noprelude universum ];
description = "A custom prelude used in Morley";
license = stdenv.lib.licenses.agpl3Plus;
@@ -157538,16 +161091,32 @@ self: {
}) {};
"morpheus-graphql" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
- , mtl, scientific, text, transformers, unordered-containers, vector
+ ({ mkDerivation, aeson, base, bytestring, containers, megaparsec
+ , mtl, scientific, scotty, tasty, tasty-hunit, text, transformers
+ , unordered-containers, uuid, vector, wai, wai-websockets, warp
+ , websockets
}:
mkDerivation {
pname = "morpheus-graphql";
- version = "0.0.1";
- sha256 = "1a9wkpsj8850abpz2z5cphphllpwzdc1l38ljfghd79y278cc1zm";
+ version = "0.1.1";
+ sha256 = "1sp7dpbqd9kksldcqc2z43zv0g39qs4qxv9xxy1zg7hw4rwislfn";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson attoparsec base bytestring containers mtl scientific text
- transformers unordered-containers vector
+ aeson base bytestring containers megaparsec mtl scientific text
+ transformers unordered-containers uuid vector wai-websockets
+ websockets
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring containers megaparsec mtl scientific scotty
+ text transformers unordered-containers uuid vector wai
+ wai-websockets warp websockets
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers megaparsec mtl scientific tasty
+ tasty-hunit text transformers unordered-containers uuid vector
+ wai-websockets websockets
];
description = "Morpheus GraphQL";
license = stdenv.lib.licenses.bsd3;
@@ -157682,6 +161251,8 @@ self: {
];
description = "Haskell client for Moss";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"moto" = callPackage
@@ -157707,8 +161278,6 @@ self: {
];
description = "General purpose migrations library";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"moto-postgresql" = callPackage
@@ -157724,8 +161293,6 @@ self: {
];
description = "PostgreSQL-based migrations registry for moto";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"motor" = callPackage
@@ -157734,8 +161301,8 @@ self: {
}:
mkDerivation {
pname = "motor";
- version = "0.3.0";
- sha256 = "0yx0gwdqny8p5nggigk5w57cyf2qjdjb5ypppwd84qjm663na9bh";
+ version = "0.4.0";
+ sha256 = "1mwvq4rzfj4fl5mcbg9cfk8x0c21p9w3wbx0h0fkm6m16k94b4p6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -157755,8 +161322,8 @@ self: {
}:
mkDerivation {
pname = "motor-diagrams";
- version = "0.3.0";
- sha256 = "1rvlb3gvnzdqzwrg3nm21vw6j33c4aqp6npsz8cdbh24ijc46jbr";
+ version = "0.4.0";
+ sha256 = "12niyizqd3hvi6g30fa38b8b2m2cxbdxzcpr95wbpdxzhvbqxs0h";
libraryHaskellDepends = [
base motor motor-reflection template-haskell text
];
@@ -157774,8 +161341,8 @@ self: {
}:
mkDerivation {
pname = "motor-reflection";
- version = "0.3.0";
- sha256 = "1mac2ywknribmzs79dpjigk45nzrwsx7as0zi1zaqrq2vy45xl8y";
+ version = "0.4.0";
+ sha256 = "1n66pylcgfnmrbfbgljzx16siwv38y5j752m8yimnlg1kny1a0i6";
libraryHaskellDepends = [ base motor template-haskell text ];
testHaskellDepends = [
base hspec hspec-discover indexed motor row-types
@@ -158027,6 +161594,34 @@ self: {
broken = true;
}) {};
+ "mptcp-pm" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
+ , c2hs, c2hsc, cereal, containers, fast-logger, HUnit, ip, netlink
+ , optparse-applicative, process
+ }:
+ mkDerivation {
+ pname = "mptcp-pm";
+ version = "0.0.1";
+ sha256 = "0sknhb9i0hshyjc33g301l7lxy5cigilhzdmwc6bi0gxhnkgycki";
+ isLibrary = true;
+ isExecutable = true;
+ libraryToolDepends = [ c2hs ];
+ executableHaskellDepends = [
+ aeson base bytestring bytestring-conversion c2hsc cereal containers
+ fast-logger ip netlink optparse-applicative process
+ ];
+ executableToolDepends = [ c2hs ];
+ testHaskellDepends = [
+ aeson base bytestring cereal containers HUnit ip netlink
+ ];
+ testToolDepends = [ c2hs ];
+ doHaddock = false;
+ description = "A work in progress Multipath TCP path manager";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"mpvguihs" = callPackage
({ mkDerivation, base, directory, filepath, gtk, mtl, process
, template-haskell, unix
@@ -158145,6 +161740,29 @@ self: {
broken = true;
}) {};
+ "ms-tds" = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, crypto-random
+ , data-default-class, mtl, network, template-haskell, text, time
+ , tls, uuid-types, x509-store, x509-system
+ }:
+ mkDerivation {
+ pname = "ms-tds";
+ version = "0.2.0.0";
+ sha256 = "0675h4w8nayvh2gm644anz8sqk37b1n5ia4w5fgyaf9y6drafyda";
+ libraryHaskellDepends = [
+ array base binary bytestring crypto-random data-default-class mtl
+ network template-haskell text time tls uuid-types x509-store
+ x509-system
+ ];
+ testHaskellDepends = [
+ array base binary bytestring crypto-random data-default-class mtl
+ network template-haskell text time tls uuid-types x509-store
+ x509-system
+ ];
+ description = "TDS Protocol implemented in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"msgpack" = callPackage
({ mkDerivation, async, base, binary, bytestring, containers
, data-binary-ieee754, deepseq, hashable, mtl, QuickCheck, tasty
@@ -158163,8 +161781,6 @@ self: {
];
description = "A Haskell implementation of MessagePack";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"msgpack-aeson" = callPackage
@@ -158183,8 +161799,6 @@ self: {
testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
description = "Aeson adapter for MessagePack";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"msgpack-idl" = callPackage
@@ -158265,6 +161879,24 @@ self: {
broken = true;
}) {};
+ "mssql-simple" = callPackage
+ ({ mkDerivation, base, binary, bytestring, hostname, ms-tds
+ , network, text, time, tls
+ }:
+ mkDerivation {
+ pname = "mssql-simple";
+ version = "0.2.0.0";
+ sha256 = "1pqw2kr8fyy62kmamvm600zsqri9d2201kixvr6gdy6z0ivyl0sz";
+ libraryHaskellDepends = [
+ base binary bytestring hostname ms-tds network text time tls
+ ];
+ testHaskellDepends = [
+ base binary bytestring hostname ms-tds network text time tls
+ ];
+ description = "SQL Server client library implemented in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"mstate" = callPackage
({ mkDerivation, base, fail, monad-peel, mtl, stm }:
mkDerivation {
@@ -158357,20 +161989,6 @@ self: {
}) {};
"mtl-compat" = callPackage
- ({ mkDerivation, base, mtl }:
- mkDerivation {
- pname = "mtl-compat";
- version = "0.2.1.3";
- sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34";
- revision = "4";
- editedCabalFile = "1mfrx8cpx0502sjv0bmlfkl0h46c4krldg8m89k4fj6iawwg2ab5";
- libraryHaskellDepends = [ base mtl ];
- doHaddock = false;
- description = "Backported Control.Monad.Except module from mtl";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "mtl-compat_0_2_2" = callPackage
({ mkDerivation, base, mtl }:
mkDerivation {
pname = "mtl-compat";
@@ -158380,7 +161998,6 @@ self: {
doHaddock = false;
description = "Backported Control.Monad.Except module from mtl";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mtl-evil-instances" = callPackage
@@ -158767,14 +162384,38 @@ self: {
broken = true;
}) {};
+ "multibase" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring
+ , base32-z-bytestring, base58-bytestring, base64-bytestring
+ , bytestring, Cabal, cabal-doctest, deepseq, doctest, formatting
+ , hashable, QuickCheck, sandi, serialise, tagged, template-haskell
+ , text
+ }:
+ mkDerivation {
+ pname = "multibase";
+ version = "0.1.0.0";
+ sha256 = "1gvbqq4kd94n7dmcbjb3k24z0qrv13qmi8lhs3yxwch3y13qv60m";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson base base16-bytestring base32-z-bytestring base58-bytestring
+ base64-bytestring bytestring deepseq formatting hashable sandi
+ serialise tagged text
+ ];
+ testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+ description = "Self-identifying base encodings, implementation of ";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"multifile" = callPackage
({ mkDerivation, base, directory, HaXml, optparse-applicative
, pretty, process, transformers
}:
mkDerivation {
pname = "multifile";
- version = "0.1.0.6";
- sha256 = "054nh8g4ngg1d4ik41iagp72qdp8p6nbvr2kjrzk9a30a0k4akar";
+ version = "0.1.0.7";
+ sha256 = "0nc19swda1v8fz3fhd2vkkr6a4nd7519qkgpcbhpm2hplkan6csn";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -158783,8 +162424,6 @@ self: {
];
description = "create many files from one";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"multifocal" = callPackage
@@ -158839,6 +162478,44 @@ self: {
broken = true;
}) {};
+ "multihash-cryptonite" = callPackage
+ ({ mkDerivation, base, binary, binary-varint, bytestring, Cabal
+ , cabal-doctest, cryptonite, deepseq, doctest, hashable, hedgehog
+ , memory
+ }:
+ mkDerivation {
+ pname = "multihash-cryptonite";
+ version = "0.1.0.0";
+ sha256 = "0gl13kjqz14lnwz7x162fad3j99qs1xa3zabpr30q53pkzk8adsi";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base binary binary-varint bytestring cryptonite deepseq hashable
+ memory
+ ];
+ testHaskellDepends = [ base cryptonite doctest hedgehog ];
+ description = "Self-identifying hashes, implementation of ";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "multihash-serialise" = callPackage
+ ({ mkDerivation, base, bytestring, cryptonite, hedgehog, memory
+ , multibase, multihash-cryptonite, serialise
+ }:
+ mkDerivation {
+ pname = "multihash-serialise";
+ version = "0.1.0.0";
+ sha256 = "1bvh0fm26nnbfykimp3j2934lxwh7kgk6jkk9v8yjpn0k9rxnkrb";
+ libraryHaskellDepends = [
+ base bytestring cryptonite memory multibase multihash-cryptonite
+ serialise
+ ];
+ testHaskellDepends = [ base cryptonite hedgehog serialise ];
+ description = "CBOR encoding of multihashes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"multihashmap" = callPackage
({ mkDerivation, base, hashable, unordered-containers }:
mkDerivation {
@@ -159195,8 +162872,8 @@ self: {
}:
mkDerivation {
pname = "multistate";
- version = "0.8.0.1";
- sha256 = "1s9fs29ki3l1df0ddi04ckbich1xid413sm2zx59aqp92dfpimvm";
+ version = "0.8.0.2";
+ sha256 = "0hypksjacpjgpkgvjn76fd5rgdz7hi6ri36ihdy0bdhpi83jnhn5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -159205,8 +162882,6 @@ self: {
testHaskellDepends = [ base hspec transformers ];
description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"multivariant" = callPackage
@@ -159955,8 +163630,6 @@ self: {
libraryHaskellDepends = [ accelerate base mwc-random ];
description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"mwc-random-monad" = callPackage
@@ -160383,8 +164056,8 @@ self: {
}:
mkDerivation {
pname = "mysql-simple-typed";
- version = "0.1.1.3";
- sha256 = "1gfj7s9rxp8n0fws8x6f94z3mi7kysa0vscvm6hky9awq83avbv4";
+ version = "0.1.2.0";
+ sha256 = "160pyhcazmg3qnqsvzl05gc4xrm0cd1s622zv4z8n9z2w7xqh5qa";
libraryHaskellDepends = [
base mysql mysql-simple template-haskell typedquery utf8-string
];
@@ -160569,6 +164242,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "nagios-config" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "nagios-config";
+ version = "0.1.0.0";
+ sha256 = "1m6phv3w8rbdz6xk2ar803r2m8fhdij9a26v5jz1s87f3hy6d5g6";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ executableHaskellDepends = [ base ];
+ description = "EDSL to specify Nagios configuration files";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"nagios-perfdata" = callPackage
({ mkDerivation, attoparsec, base, bifunctors, bytestring
, containers, hspec, HUnit, MissingH, mtl, transformers
@@ -161023,19 +164710,23 @@ self: {
}) {};
"naqsha" = callPackage
- ({ mkDerivation, base, bytestring, groups, hspec, HUnit, QuickCheck
- , vector
+ ({ mkDerivation, base, bytestring, groups, hspec, hspec-discover
+ , HUnit, QuickCheck, vector
}:
mkDerivation {
pname = "naqsha";
- version = "0.2.0.1";
- sha256 = "154wydlz7y6mic4d1670dwn9g1c7z92v6bydll0shn6z05324ha9";
+ version = "0.3.0.0";
+ sha256 = "1564aff7ynqilqa9aiv1ih3dl9rimvvzyzqczx1bb94iznrfzghi";
+ isLibrary = false;
+ isExecutable = false;
libraryHaskellDepends = [ base bytestring groups vector ];
- testHaskellDepends = [ base groups hspec HUnit QuickCheck ];
- description = "A library for working with geospatial data types";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ testHaskellDepends = [
+ base bytestring groups hspec hspec-discover HUnit QuickCheck vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ doHaddock = false;
+ description = "A library for working with anything map related";
+ license = "(Apache-2.0 OR BSD-3-Clause)";
}) {};
"narc" = callPackage
@@ -161120,8 +164811,8 @@ self: {
pname = "nats";
version = "1.1.2";
sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr";
- revision = "1";
- editedCabalFile = "1jzyysf758lfindlclqpzqcd0lrgrdv0rnz2lg8g1rvv07x2n7zh";
+ revision = "3";
+ editedCabalFile = "02ww45nskca28fsbh74iy0z4rm0yshws7lrxld45y053hrn1jdzc";
doHaddock = false;
description = "Natural numbers";
license = stdenv.lib.licenses.bsd3;
@@ -161791,8 +165482,8 @@ self: {
}:
mkDerivation {
pname = "net-spider";
- version = "0.2.0.0";
- sha256 = "0xka2fa5zxznm2fg5xmc2c2ppamwybdlmh5jqy00ivxjmliy20s0";
+ version = "0.3.0.0";
+ sha256 = "1wz37rrjpk4v8h1mh6pbld84f9kp5h3qcjxxh6fgbkij5l4g7m77";
libraryHaskellDepends = [
aeson base containers data-interval extended-reals greskell
greskell-websocket hashable monad-logger safe-exceptions text time
@@ -161803,6 +165494,43 @@ self: {
];
description = "A graph database middleware to maintain a time-varying graph";
license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "net-spider-pangraph" = callPackage
+ ({ mkDerivation, base, bytestring, doctest, doctest-discover
+ , greskell, hspec, net-spider, pangraph, text, time
+ }:
+ mkDerivation {
+ pname = "net-spider-pangraph";
+ version = "0.1.0.0";
+ sha256 = "1aiacaccml8477vmcnv9mqcrn87nyx7pbgwp7rppz7h5w0dsj8lx";
+ libraryHaskellDepends = [
+ base bytestring greskell net-spider pangraph text time
+ ];
+ testHaskellDepends = [
+ base doctest doctest-discover hspec net-spider pangraph text
+ ];
+ description = "Conversion between net-spider and pangraph";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "net-spider-rpl" = callPackage
+ ({ mkDerivation, aeson, base, greskell, hashable, hspec, ip
+ , net-spider, net-spider-pangraph, text, time
+ }:
+ mkDerivation {
+ pname = "net-spider-rpl";
+ version = "0.1.0.0";
+ sha256 = "0basbgcdkjksg9p2s5s0whnbas3w3wnrkkdsr907m8gppkdk6i69";
+ libraryHaskellDepends = [
+ aeson base greskell hashable ip net-spider net-spider-pangraph text
+ time
+ ];
+ testHaskellDepends = [ base hspec net-spider text ];
+ description = "NetSpider data model and utility for RPL networks";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -161902,8 +165630,8 @@ self: {
({ mkDerivation, base, comfort-array, netlib-ffi, transformers }:
mkDerivation {
pname = "netlib-comfort-array";
- version = "0.0";
- sha256 = "1lr28jpv4yznkfak9jvcmjnxfy6334bplvq8rkf7nsqs6jbjx3al";
+ version = "0.0.0.1";
+ sha256 = "0v4p1l8gjqkxncjrp6bv664x6xs3y6n5h76pvgccsja5rammwbp3";
libraryHaskellDepends = [
base comfort-array netlib-ffi transformers
];
@@ -162087,6 +165815,8 @@ self: {
pname = "nettle";
version = "0.3.0";
sha256 = "0pbxpxr9xdw3ha5lm9vnsbsvq0kzzsqv6gfk041ijllf1sc0hgyg";
+ revision = "1";
+ editedCabalFile = "1j8h6m4cj1ykxrsxmjiyb1c4mv6cawssgb8phl0aijrjn3b79f2b";
libraryHaskellDepends = [
base byteable bytestring crypto-cipher-types securemem tagged
];
@@ -162288,14 +166018,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "network_3_1_0_0" = callPackage
+ "network_3_1_0_1" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, hspec
, hspec-discover, HUnit
}:
mkDerivation {
pname = "network";
- version = "3.1.0.0";
- sha256 = "0xskqnv90h8lc663ilprwgsmx9nv7534kwsv9acxlcfvqy1nnq4s";
+ version = "3.1.0.1";
+ sha256 = "0r4x5ad7pl9fk7jknnv2wnizb83mi2ljambpavvarpj52b3mdwjs";
libraryHaskellDepends = [ base bytestring deepseq ];
testHaskellDepends = [ base bytestring directory hspec HUnit ];
testToolDepends = [ hspec-discover ];
@@ -162375,6 +166105,8 @@ self: {
];
description = "Haskell API for Tor anonymous networking";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"network-api-support" = callPackage
@@ -162460,6 +166192,20 @@ self: {
}) {};
"network-bsd" = callPackage
+ ({ mkDerivation, base, network }:
+ mkDerivation {
+ pname = "network-bsd";
+ version = "2.8.0.0";
+ sha256 = "0dfbwgrr28y6ypw7p1ppqg7v746qf14569q4xazj4ahdjw2xkpi5";
+ libraryHaskellDepends = [ base network ];
+ doHaddock = false;
+ description = "Network.BSD";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "network-bsd_2_8_1_0" = callPackage
({ mkDerivation, base, deepseq, network }:
mkDerivation {
pname = "network-bsd";
@@ -162470,6 +166216,8 @@ self: {
libraryHaskellDepends = [ base deepseq network ];
description = "POSIX network database () API";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"network-builder" = callPackage
@@ -162507,6 +166255,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "network-byte-order_0_1_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, doctest }:
+ mkDerivation {
+ pname = "network-byte-order";
+ version = "0.1.1.0";
+ sha256 = "16prqgaqxn1h56gw9r446cq5a4jyaiplg50pjy1ji4k7cvcpx5vk";
+ libraryHaskellDepends = [ base bytestring ];
+ testHaskellDepends = [ base bytestring doctest ];
+ description = "Network byte order utilities";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"network-bytestring" = callPackage
({ mkDerivation, base, bytestring, network, unix }:
mkDerivation {
@@ -162692,6 +166453,8 @@ self: {
pname = "network-info";
version = "0.2.0.10";
sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n";
+ revision = "1";
+ editedCabalFile = "07kiw56lhc56kqrnvpa11f5nnnid6by3aq00jrkcbbg7w0q71a6d";
libraryHaskellDepends = [ base ];
description = "Access the local computer's basic network configuration";
license = stdenv.lib.licenses.bsd3;
@@ -162737,8 +166500,8 @@ self: {
}:
mkDerivation {
pname = "network-messagepack-rpc";
- version = "0.1.1.0";
- sha256 = "13q3dr0l5a5yd693hb2h5nw86kxcw7vbm41dw3lbky7jr8hh2r0h";
+ version = "0.1.1.1";
+ sha256 = "1cmll84ida19f53cdvwi8nqym6bax8f0g40nq1a1gkh6mljby5a4";
libraryHaskellDepends = [
base bytestring data-msgpack safe-exceptions text
unordered-containers
@@ -162848,11 +166611,25 @@ self: {
pname = "network-multicast";
version = "0.2.0";
sha256 = "1wkmx5gic0zqghxxdyyrcysfaj1aknj53v50qq6c40d4qfmm0fqg";
+ revision = "2";
+ editedCabalFile = "1hha4vvyrx29d2lwwjl0bfpbaj00k85bd4w83s4hvawqbxqvvhkw";
libraryHaskellDepends = [ base network ];
description = "Simple multicast library";
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "network-multicast_0_3_2" = callPackage
+ ({ mkDerivation, base, network, network-bsd }:
+ mkDerivation {
+ pname = "network-multicast";
+ version = "0.3.2";
+ sha256 = "0whvi0pbwjy6dbwfdf9rv1j3yr3lcmfp3q7a8pwq63g537l4l2l3";
+ libraryHaskellDepends = [ base network network-bsd ];
+ description = "Simple multicast library";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"network-netpacket" = callPackage
({ mkDerivation, base, bytestring, foreign-storable-asymmetric
, ioctl, network, network-interfacerequest
@@ -162958,20 +166735,21 @@ self: {
}) {};
"network-simple" = callPackage
- ({ mkDerivation, base, bytestring, network, safe-exceptions, socks
- , transformers
+ ({ mkDerivation, base, bytestring, network, network-bsd
+ , safe-exceptions, socks, transformers
}:
mkDerivation {
pname = "network-simple";
- version = "0.4.3";
- sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d";
- revision = "2";
- editedCabalFile = "073g0agplvgan62s638w5hcq25biq8f811xhha6drfyxybs6cspn";
+ version = "0.4.5";
+ sha256 = "17hpgcwrsx2h8lrb2wwzy0anp33mn80dnwcgnqmb8prajwjvz807";
libraryHaskellDepends = [
- base bytestring network safe-exceptions socks transformers
+ base bytestring network network-bsd safe-exceptions socks
+ transformers
];
description = "Simple network sockets usage patterns";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"network-simple-sockaddr" = callPackage
@@ -163006,6 +166784,8 @@ self: {
];
description = "Simple interface to TLS secured network sockets";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"network-simple-ws" = callPackage
@@ -163022,6 +166802,8 @@ self: {
];
description = "Simple interface to WebSockets";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"network-simple-wss" = callPackage
@@ -163100,8 +166882,8 @@ self: {
}:
mkDerivation {
pname = "network-transport";
- version = "0.5.2";
- sha256 = "0m4hixari440lymj43l9q4485gz6i9a768g7mnzwfynn8cmng5g7";
+ version = "0.5.4";
+ sha256 = "0izcqi3zl7ynav0qqrrfmiax8vziqwrhflprddhjj6x6nkzhp1sv";
libraryHaskellDepends = [
base binary bytestring deepseq hashable transformers
];
@@ -163233,8 +167015,6 @@ self: {
];
description = "ZeroMQ backend for network-transport";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"network-uri" = callPackage
@@ -163508,14 +167288,61 @@ self: {
broken = true;
}) {};
+ "newsletter" = callPackage
+ ({ mkDerivation, aeson, base, blaze-html, bytestring, clientsession
+ , email-validate, http-api-data, lens, machines, mime-mail, mtl
+ , network-uri, psqueues, random, servant, servant-blaze
+ , servant-server, stm, text, time, unordered-containers, warp
+ }:
+ mkDerivation {
+ pname = "newsletter";
+ version = "0";
+ sha256 = "1cpc0g8bzx7dzvvs3pn76q8y7fkcz2jbh26jfss8bpfy5rwnfmd1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base blaze-html bytestring clientsession email-validate
+ http-api-data lens machines mime-mail mtl network-uri psqueues
+ random servant servant-blaze servant-server stm text time
+ unordered-containers
+ ];
+ executableHaskellDepends = [
+ aeson base blaze-html bytestring clientsession email-validate
+ http-api-data lens machines mime-mail mtl network-uri psqueues
+ random servant servant-blaze servant-server stm text time
+ unordered-containers warp
+ ];
+ description = "A basic newsletter implimentation, using various backends";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "newsletter-mailgun" = callPackage
+ ({ mkDerivation, base, exceptions, lens, machines, mailgun
+ , mime-mail, mtl, newsletter, text
+ }:
+ mkDerivation {
+ pname = "newsletter-mailgun";
+ version = "0";
+ sha256 = "1xzi6kb1mvvj0541l3dvyxwhlhwhw7iyrxqw585lhhinqzkp6zy0";
+ libraryHaskellDepends = [
+ base exceptions lens machines mailgun mime-mail mtl newsletter text
+ ];
+ description = "A mailgun backend for the newsletter package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"newsynth" = callPackage
({ mkDerivation, base, Cabal, containers, fixedprec, random
, superdoc, time
}:
mkDerivation {
pname = "newsynth";
- version = "0.3.0.5";
- sha256 = "1qfan8vf7s3bhdc3bfjsig4sv0cip0qfvqmyxw0iqc7gqbbkinzy";
+ version = "0.4.0.0";
+ sha256 = "1whipzp8gw08kgy3jyf4bvvjc69nbh2wpm4bv4ymf5m4fb0ikrvh";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal superdoc ];
@@ -163551,8 +167378,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "newtype";
- version = "0.2";
- sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p";
+ version = "0.2.1.0";
+ sha256 = "03fr1yfip09dvwff87dssy7r0vrv4rv184flxnp9gjzbg6h9byvb";
libraryHaskellDepends = [ base ];
description = "A typeclass and set of functions for working with newtypes";
license = stdenv.lib.licenses.bsd3;
@@ -163911,8 +167738,6 @@ self: {
libraryHaskellDepends = [ base integer-logarithms ];
description = "Finite nimber arithmetic";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"nirum" = callPackage
@@ -163981,6 +167806,34 @@ self: {
broken = true;
}) {};
+ "niv" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+ , file-embed, filepath, github, hashable, mtl, optparse-applicative
+ , process, string-qq, tasty, tasty-hunit, text, unliftio
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "niv";
+ version = "0.1.1";
+ sha256 = "1vrn5b753i949nf28g1wckqiax7pn4qx2xk5z7wdbx0w212nps8w";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring directory file-embed filepath
+ github hashable mtl optparse-applicative process string-qq tasty
+ tasty-hunit text unliftio unordered-containers
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty base bytestring directory file-embed filepath
+ github hashable mtl optparse-applicative process string-qq tasty
+ text unliftio unordered-containers
+ ];
+ description = "Easy dependency management for Nix projects";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"nix-delegate" = callPackage
({ mkDerivation, base, bytestring, foldl, managed
, neat-interpolation, optparse-applicative, text, turtle
@@ -164065,15 +167918,13 @@ self: {
}:
mkDerivation {
pname = "nix-eval";
- version = "0.3.3.0";
- sha256 = "1c8hg66s66hkn7f31ynw0km4bpdzhv0zdslzkpycvd36m3jm1wjb";
+ version = "0.4.1.0";
+ sha256 = "12krdqvkfxk587nnnddwmch5v0gpyfhmhjiwyjbf60aby0yj0xb4";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base hindent process strict ];
testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
description = "Evaluate Haskell expressions using Nix to get packages";
license = "GPL";
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"nix-paths" = callPackage
@@ -164150,6 +168001,8 @@ self: {
];
description = "Tool for semi-automatic updating of nixpkgs repository";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"nkjp" = callPackage
@@ -164548,11 +168401,12 @@ self: {
}:
mkDerivation {
pname = "non-empty";
- version = "0.3.1";
- sha256 = "0118vf88pzx1spzx4amc9sxz5vdrmfpryp816fh9l7k5hnzhy0bh";
+ version = "0.3.2";
+ sha256 = "0j47d1xaxi2ynsa3wckapjbcvzr66cwca74xpzi554ba70agq40v";
libraryHaskellDepends = [
base containers deepseq QuickCheck utility-ht
];
+ testHaskellDepends = [ base containers QuickCheck utility-ht ];
description = "List-like structures with static restrictions on the number of elements";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -164673,6 +168527,29 @@ self: {
];
description = "Non-empty variants of containers data types, with full API";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "nonempty-containers_0_3_1_0" = callPackage
+ ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
+ , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these
+ }:
+ mkDerivation {
+ pname = "nonempty-containers";
+ version = "0.3.1.0";
+ sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l";
+ libraryHaskellDepends = [
+ base comonad containers deepseq semigroupoids these
+ ];
+ testHaskellDepends = [
+ base comonad containers hedgehog hedgehog-fn semigroupoids tasty
+ tasty-hedgehog text these
+ ];
+ description = "Non-empty variants of containers data types, with full API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"nonemptymap" = callPackage
@@ -164874,18 +168751,45 @@ self: {
broken = true;
}) {};
+ "notifications-tray-icon" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, containers, dbus
+ , gi-dbusmenu, gi-gio, gi-glib, github, haskeline, hslogger
+ , http-conduit, http-types, optparse-applicative, process
+ , regex-compat, status-notifier-item, text, transformers, tuple
+ , vector
+ }:
+ mkDerivation {
+ pname = "notifications-tray-icon";
+ version = "0.1.0.0";
+ sha256 = "0w047kwqccwkcykmryn3dmf3kkpjkcffz0slsmyf52va604kk7x4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async base bytestring containers dbus gi-dbusmenu gi-gio
+ gi-glib github hslogger http-conduit http-types process
+ regex-compat status-notifier-item text transformers vector
+ ];
+ executableHaskellDepends = [
+ base bytestring github haskeline hslogger optparse-applicative text
+ transformers tuple
+ ];
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"notmuch" = callPackage
- ({ mkDerivation, base, bytestring, c2hs, deepseq, mtl, notmuch
- , profunctors, tagged, talloc, text, time
+ ({ mkDerivation, base, bytestring, c2hs, deepseq, filepath, mtl
+ , notmuch, profunctors, tagged, talloc, text, time
}:
mkDerivation {
pname = "notmuch";
- version = "0.2.0.0";
- sha256 = "1w3g4747q02m0r0n8l5bkfp8icwwnvkp4bf9amkh7h80vidzmspy";
+ version = "0.3.0.0";
+ sha256 = "0f4sq7wajxr9d614gyw727g2zbsbfbaw4spni1hgs9c9rllxrmsn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring deepseq mtl profunctors tagged text time
+ base bytestring deepseq filepath mtl profunctors tagged text time
];
librarySystemDepends = [ notmuch talloc ];
libraryToolDepends = [ c2hs ];
@@ -165058,8 +168962,8 @@ self: {
}:
mkDerivation {
pname = "nsis";
- version = "0.3.2";
- sha256 = "1jhmiydkiii350h6gdj8f6k8d0drsbp6a2dji4nik72nca6mp65r";
+ version = "0.3.3";
+ sha256 = "12vp44g56x6lkagh9qm5rf0hfrn7kqk4jxsswlml60iji7r8x9mx";
libraryHaskellDepends = [ base transformers uniplate ];
testHaskellDepends = [
base directory process transformers uniplate
@@ -165105,6 +169009,8 @@ self: {
testHaskellDepends = [ base containers hspec pretty ];
description = "A tiny statically typed functional programming language";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"nthable" = callPackage
@@ -165526,30 +169432,29 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "numhask";
- version = "0.2.3.1";
- sha256 = "04f1gzfhaikwazvdz0aigf6lz8yk75p8ji9pjb0wsdyxs8mly21k";
+ version = "0.3.0.0";
+ sha256 = "1zkiqav683mmghxz0hj0wjzg3sf95zfd4ghicw674d9j3vl4gmcw";
libraryHaskellDepends = [ base ];
description = "numeric classes";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"numhask-array" = callPackage
({ mkDerivation, adjunctions, base, deepseq, dimensions
- , distributive, doctest, numhask-prelude, protolude, QuickCheck
- , singletons, tasty, tasty-quickcheck, vector
+ , distributive, doctest, hedgehog, numhask-hedgehog
+ , numhask-prelude, protolude, singletons, vector
}:
mkDerivation {
pname = "numhask-array";
- version = "0.2.1.0";
- sha256 = "0d800ghafzfyz6afnaqza6b44pmjh8zq0gbxvxg2ach2wfcknd0h";
+ version = "0.3.0.1";
+ sha256 = "02pcjnj1y3q053czra9697b4xgyq8dr9ynp7yz3lj9ksnn8dpx5n";
libraryHaskellDepends = [
adjunctions base deepseq dimensions distributive numhask-prelude
- protolude QuickCheck singletons vector
+ protolude singletons vector
];
testHaskellDepends = [
- base doctest numhask-prelude tasty tasty-quickcheck
+ adjunctions base dimensions doctest hedgehog numhask-hedgehog
+ numhask-prelude
];
description = "n-dimensional arrays";
license = stdenv.lib.licenses.bsd3;
@@ -165557,6 +169462,24 @@ self: {
broken = true;
}) {};
+ "numhask-hedgehog" = callPackage
+ ({ mkDerivation, base, hedgehog, numhask, numhask-prelude
+ , numhask-space
+ }:
+ mkDerivation {
+ pname = "numhask-hedgehog";
+ version = "0.3";
+ sha256 = "0f7h2ah0z63v40hnk4fcxhj4b8qzi1fy8hipxwvi29g0mvpkxjds";
+ libraryHaskellDepends = [
+ base hedgehog numhask numhask-prelude numhask-space
+ ];
+ testHaskellDepends = [ base hedgehog numhask numhask-prelude ];
+ description = "Laws and tests for numhask";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"numhask-histogram" = callPackage
({ mkDerivation, base, containers, doctest, foldl, numhask-prelude
, numhask-range, tdigest
@@ -165576,12 +169499,13 @@ self: {
}) {};
"numhask-prelude" = callPackage
- ({ mkDerivation, base, doctest, numhask, protolude }:
+ ({ mkDerivation, base, doctest, numhask, numhask-space, protolude
+ }:
mkDerivation {
pname = "numhask-prelude";
- version = "0.1.0.1";
- sha256 = "0px2ijdzll1912h652dvncvjhapwrg2z1dni87w2afzk477mpwdi";
- libraryHaskellDepends = [ base numhask protolude ];
+ version = "0.3.1";
+ sha256 = "1j9da7ldacfzkw4yxrc84p0diygvbglj4xdqj9bam8ld2hv5i1mq";
+ libraryHaskellDepends = [ base numhask numhask-space protolude ];
testHaskellDepends = [ doctest ];
description = "A numeric prelude";
license = stdenv.lib.licenses.bsd3;
@@ -165611,6 +169535,21 @@ self: {
broken = true;
}) {};
+ "numhask-space" = callPackage
+ ({ mkDerivation, adjunctions, base, distributive, numhask
+ , semigroupoids
+ }:
+ mkDerivation {
+ pname = "numhask-space";
+ version = "0.1.1";
+ sha256 = "1rf86fbyrbs2a1dxrbr35a2dhfimclindlb4iimijs28is0zdz8s";
+ libraryHaskellDepends = [
+ adjunctions base distributive numhask semigroupoids
+ ];
+ description = "numerical spaces";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"numhask-test" = callPackage
({ mkDerivation, base, numhask-prelude, QuickCheck, tasty
, tasty-quickcheck
@@ -165726,8 +169665,8 @@ self: {
}:
mkDerivation {
pname = "nvim-hs";
- version = "2.1.0.0";
- sha256 = "02i6nvdk99vjy98r666sb3ik79zq8ssri0nhnfn9r60nfcpsrini";
+ version = "2.1.0.2";
+ sha256 = "0amlvrh213n9cfqax5gcy7zq3fd8q9hcskhjkbayvzsyf5hhr1rn";
libraryHaskellDepends = [
base bytestring cereal cereal-conduit conduit containers
data-default deepseq foreign-store hslogger megaparsec messagepack
@@ -165781,16 +169720,17 @@ self: {
}:
mkDerivation {
pname = "nvim-hs-ghcid";
- version = "1.0.0.0";
- sha256 = "06yz73sx2z86dm1yhs3pqpi8g88157885fpm8hd6gkl2q4pjcwc8";
+ version = "2.0.0.0";
+ sha256 = "0i9wc6mgxxzymw1smjvin70i4ynqsn2k3ig36pxmbb6qd0ci0hwg";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base bytestring containers directory filepath ghcid nvim-hs
nvim-hs-contrib resourcet transformers unliftio yaml
];
+ executableHaskellDepends = [ base nvim-hs ];
description = "Neovim plugin that runs ghcid to update the quickfix list";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"nvvm" = callPackage
@@ -165863,6 +169803,32 @@ self: {
broken = true;
}) {};
+ "nyx-game" = callPackage
+ ({ mkDerivation, async, base, bytestring, containers, deepseq
+ , dlist, lens, mtl, optparse-generic, random, sdl2, sdl2-image
+ , sdl2-mixer, sdl2-ttf, stm, text, vector
+ }:
+ mkDerivation {
+ pname = "nyx-game";
+ version = "1.0.0.0";
+ sha256 = "16a1bkw8i81qcp7diblgkc17snxppdsfqly6diirm0sxpbsx5d8s";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ async base bytestring containers deepseq dlist lens mtl
+ optparse-generic random sdl2 sdl2-image sdl2-mixer sdl2-ttf stm
+ text vector
+ ];
+ executableHaskellDepends = [
+ async base bytestring containers deepseq dlist lens mtl
+ optparse-generic random sdl2 sdl2-image sdl2-mixer sdl2-ttf stm
+ text vector
+ ];
+ description = "A bullet-hell game made with SDL2";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"o-clock" = callPackage
({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob
, hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec
@@ -166527,23 +170493,25 @@ self: {
}) {};
"oidc-client" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions
- , hspec, http-client, http-client-tls, http-types, jose-jwt
- , network, network-uri, text, time, tls
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, cryptonite
+ , exceptions, hspec, http-client, http-client-tls, http-types
+ , jose-jwt, network, network-uri, scientific, text, time, tls
}:
mkDerivation {
pname = "oidc-client";
- version = "0.3.0.1";
- sha256 = "0wk1lx3kqgza9dah89p10bza1iasdj4bnbax5x66h2a7imn7c4sk";
+ version = "0.4.0.0";
+ sha256 = "15lnxxmnpmkvz9zqgz8sq5lzjxvgc5x8a6hrizj3m0mzg9cvml0b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson attoparsec base bytestring exceptions http-client
- http-client-tls jose-jwt network network-uri text time tls
+ aeson attoparsec base bytestring cryptonite exceptions http-client
+ http-client-tls jose-jwt network network-uri scientific text time
+ tls
];
testHaskellDepends = [
- aeson base bytestring exceptions hspec http-client http-client-tls
- http-types jose-jwt network-uri text time
+ aeson base bytestring cryptonite exceptions hspec http-client
+ http-client-tls http-types jose-jwt network-uri scientific text
+ time
];
description = "OpenID Connect 1.0 library for RP";
license = stdenv.lib.licenses.mit;
@@ -166637,16 +170605,14 @@ self: {
}:
mkDerivation {
pname = "om-elm";
- version = "1.0.0.3";
- sha256 = "0i674vjbp03nkr76fdi7bjylv264nxwnxw0ija11fkpd1rdg045g";
+ version = "2.0.0.0";
+ sha256 = "0xg9wcmgsxc0rn9fvdma8zs3a588qsppcrxbvpnaa5j1h70nh2qb";
libraryHaskellDepends = [
base bytestring Cabal containers directory http-types safe
safe-exceptions template-haskell text unix wai
];
description = "Haskell utilities for building embedded Elm programs";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"omaketex" = callPackage
@@ -166993,10 +170959,8 @@ self: {
}:
mkDerivation {
pname = "opaleye";
- version = "0.6.7003.1";
- sha256 = "1lj4vz1526l11b0mc5y7j9sxf7v6kkzl8c1jymvb1vrqj2qkgxsx";
- revision = "1";
- editedCabalFile = "0nwyz9s81hfziwy7a18gpi0663xy6cfc6fl4vx8a1vkwdyfcjjli";
+ version = "0.6.7004.0";
+ sha256 = "1p897zswmxil3yrxgdnjszbafi01gib8rl0y9lay4vqj1mrwa14m";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring case-insensitive
contravariant postgresql-simple pretty product-profunctors
@@ -167006,7 +170970,7 @@ self: {
testHaskellDepends = [
aeson base containers contravariant dotenv hspec hspec-discover
multiset postgresql-simple product-profunctors profunctors
- QuickCheck semigroups text time transformers
+ QuickCheck semigroups text time transformers uuid
];
testToolDepends = [ hspec-discover ];
description = "An SQL-generating DSL targeting PostgreSQL";
@@ -167210,8 +171174,6 @@ self: {
benchmarkHaskellDepends = [ base criterion ];
description = "Open type representations and dynamic types";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"open-union" = callPackage
@@ -167283,8 +171245,6 @@ self: {
libraryHaskellDepends = [ aeson base data-default text time ];
description = "A Haskell implementation of the Swiss Meteo Net data API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"opencog-atomspace" = callPackage
@@ -167560,8 +171520,8 @@ self: {
}:
mkDerivation {
pname = "openpgp-asciiarmor";
- version = "0.1.1";
- sha256 = "01zna9zifixnzgalr3k21g9dv143cn49imawm4q9x37i2r9kybxr";
+ version = "0.1.2";
+ sha256 = "1g99llkpqp7r01xlbq9m9nrii33yagiy1ah4fgdcmjnkmqg64hjk";
libraryHaskellDepends = [
attoparsec base base64-bytestring binary bytestring
];
@@ -167571,7 +171531,7 @@ self: {
];
benchmarkHaskellDepends = [ base bytestring criterion ];
description = "OpenPGP (RFC4880) ASCII Armor codec";
- license = stdenv.lib.licenses.isc;
+ license = stdenv.lib.licenses.mit;
}) {};
"openpgp-crypto-api" = callPackage
@@ -168146,8 +172106,8 @@ self: {
}:
mkDerivation {
pname = "optima";
- version = "0.3.0.2";
- sha256 = "116h7rdv7g2h5bjxr883s15hg9l194q3nkyn045w2ygapk4xsimg";
+ version = "0.3.0.3";
+ sha256 = "1m6lbwy5y8nmgadqx6lax1laqgs90gbg9waffbd962n2xscbwbww";
libraryHaskellDepends = [
attoparsec attoparsec-data base optparse-applicative text
text-builder
@@ -168255,6 +172215,8 @@ self: {
pname = "optional-args";
version = "1.0.2";
sha256 = "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f";
+ revision = "1";
+ editedCabalFile = "0fda6mhm44qpbc9hfkf6jxnm3a7qszabywsmxa2iw0dz734a9xl3";
libraryHaskellDepends = [ base ];
description = "Optional function arguments";
license = stdenv.lib.licenses.bsd3;
@@ -168298,12 +172260,31 @@ self: {
pname = "optparse-applicative";
version = "0.14.3.0";
sha256 = "0qvn1s7jwrabbpmqmh6d6iafln3v3h9ddmxj2y4m0njmzq166ivj";
+ revision = "2";
+ editedCabalFile = "1a08dqjly1xy730f6jf45frr8g8gap0n1vg9b0mpzpydv0kgzmrp";
+ libraryHaskellDepends = [
+ ansi-wl-pprint base process transformers transformers-compat
+ ];
+ testHaskellDepends = [ base bytestring QuickCheck ];
+ description = "Utilities and combinators for parsing command line options";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "optparse-applicative_0_15_0_0" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
+ , QuickCheck, transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "optparse-applicative";
+ version = "0.15.0.0";
+ sha256 = "0210rv7scp2063n8pr39bzy7dbl2777zwdnnx6kp3c34jilssjxg";
libraryHaskellDepends = [
ansi-wl-pprint base process transformers transformers-compat
];
testHaskellDepends = [ base bytestring QuickCheck ];
description = "Utilities and combinators for parsing command line options";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"optparse-applicative-simple" = callPackage
@@ -168312,8 +172293,8 @@ self: {
}:
mkDerivation {
pname = "optparse-applicative-simple";
- version = "1.1";
- sha256 = "0v6nwgk94ax0k281fyxfi42njfi0rw36vrhak9i8k7h5z43xkfr3";
+ version = "1.1.0.2";
+ sha256 = "0vpb2y9niy00msxbz11r6v3qc399lr2rl3x0ih6hpxrm8iihypv7";
libraryHaskellDepends = [
attoparsec attoparsec-data base-prelude optparse-applicative text
];
@@ -168343,6 +172324,8 @@ self: {
pname = "optparse-generic";
version = "1.3.0";
sha256 = "13rr3hq26dpmbami8vb6d1ig9ywk6jia22sp5dkp6jkfc1c9k4l0";
+ revision = "2";
+ editedCabalFile = "1ldkzq0g70y2w69ywg2d5agrd74y7c4iblg3yflyvmzifr11d1ls";
libraryHaskellDepends = [
base bytestring Only optparse-applicative semigroups
system-filepath text time transformers void
@@ -168570,8 +172553,8 @@ self: {
({ mkDerivation, base, containers }:
mkDerivation {
pname = "ordered-containers";
- version = "0.2.1";
- sha256 = "1ycmlwyyflxd2bmrxqydkznqpz98sbs3c84zsszdmwn2dgyjgm01";
+ version = "0.2.2";
+ sha256 = "1j92dm36s0cfhc7s4k3dk36ibkvr6w1nhaq6q1m5vkbh1qrwfnn7";
libraryHaskellDepends = [ base containers ];
description = "Set- and Map-like types that remember the order elements were inserted";
license = stdenv.lib.licenses.bsd3;
@@ -169139,8 +173122,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "packcheck";
- version = "0.4.1";
- sha256 = "056sjs771gdfvbyynb3vaxgabqj747hyhnbfjq83d0nnqyks8rdy";
+ version = "0.4.2";
+ sha256 = "0za6ravq945g9gdm6sbxqklnkg56saap0kjg5ra42dabd1ma4iys";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
benchmarkHaskellDepends = [ base ];
@@ -169360,36 +173343,30 @@ self: {
}) {};
"pads-haskell" = callPackage
- ({ mkDerivation, base, byteorder, bytestring, Cabal, containers
- , directory, Glob, haskell-src, haskell-src-meta, HUnit
- , mainland-pretty, mtl, normaldistribution, old-locale, parsec
+ ({ mkDerivation, base, byteorder, bytestring, containers, ghc-prim
+ , haskell-src-meta, HUnit, mainland-pretty, mtl, mwc-random, parsec
, QuickCheck, random, regex-posix, syb, template-haskell
, test-framework, test-framework-hunit, test-framework-quickcheck2
, th-lift, time, transformers
}:
mkDerivation {
pname = "pads-haskell";
- version = "0.0.0.1";
- sha256 = "1glf9zfzl8lg6hvqzh76y7kpi1d8jhxgxplnkzz4pdzrh1dfzm9a";
- revision = "1";
- editedCabalFile = "1nfh2i2g4xzqr534hkwa7gygkgsdvyjk4g075n78dp6r48zynbz6";
+ version = "0.1.0.0";
+ sha256 = "0c4by0amwp5kki7h46pygd6p6f5yx0zzlbzcfhd68h5ka0alkfdf";
libraryHaskellDepends = [
- base byteorder bytestring containers Glob haskell-src
- haskell-src-meta HUnit mainland-pretty normaldistribution
- old-locale parsec random regex-posix syb template-haskell th-lift
- time transformers
+ base byteorder bytestring containers ghc-prim haskell-src-meta
+ HUnit mainland-pretty mtl mwc-random parsec random regex-posix syb
+ template-haskell th-lift time transformers
];
testHaskellDepends = [
- base byteorder bytestring Cabal containers directory Glob
- haskell-src haskell-src-meta HUnit mainland-pretty mtl old-locale
- parsec QuickCheck regex-posix syb template-haskell test-framework
+ base byteorder bytestring containers ghc-prim haskell-src-meta
+ HUnit mainland-pretty mtl mwc-random parsec QuickCheck random
+ regex-posix syb template-haskell test-framework
test-framework-hunit test-framework-quickcheck2 th-lift time
transformers
];
description = "PADS data description language for Haskell";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ license = stdenv.lib.licenses.mit;
}) {};
"pagarme" = callPackage
@@ -169526,32 +173503,36 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "pairing_0_2" = callPackage
- ({ mkDerivation, arithmoi, base, bytestring, criterion, cryptonite
- , memory, protolude, QuickCheck, quickcheck-instances, random
+ "pairing_0_4_1" = callPackage
+ ({ mkDerivation, arithmoi, base, binary, bytestring, criterion
+ , errors, galois-field, hexstring, integer-logarithms, memory
+ , MonadRandom, protolude, QuickCheck, quickcheck-instances, random
, tasty, tasty-discover, tasty-hunit, tasty-quickcheck
, wl-pprint-text
}:
mkDerivation {
pname = "pairing";
- version = "0.2";
- sha256 = "06w1vp9cqzxpqlg3hs68qxn8mjm46bkh7b5428ac6wh7f1zzxw88";
+ version = "0.4.1";
+ sha256 = "0phw8caxrxyr2wlk8gcmrr8k03d0vnc4rq5c88dh3bb9jz4fdpcw";
libraryHaskellDepends = [
- arithmoi base bytestring cryptonite memory protolude QuickCheck
- random wl-pprint-text
+ arithmoi base binary bytestring errors galois-field
+ integer-logarithms memory MonadRandom protolude QuickCheck random
+ wl-pprint-text
];
testHaskellDepends = [
- arithmoi base bytestring cryptonite memory protolude QuickCheck
+ arithmoi base binary bytestring errors galois-field hexstring
+ integer-logarithms memory MonadRandom protolude QuickCheck
quickcheck-instances random tasty tasty-discover tasty-hunit
tasty-quickcheck wl-pprint-text
];
testToolDepends = [ tasty-discover ];
benchmarkHaskellDepends = [
- arithmoi base bytestring criterion cryptonite memory protolude
- QuickCheck quickcheck-instances random tasty tasty-hunit
- tasty-quickcheck wl-pprint-text
+ arithmoi base binary bytestring criterion errors galois-field
+ integer-logarithms memory MonadRandom protolude QuickCheck
+ quickcheck-instances random tasty tasty-hunit tasty-quickcheck
+ wl-pprint-text
];
- description = "Optimal ate pairing over Barreto-Naehrig curves";
+ description = "Bilinear pairings";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -169674,26 +173655,24 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_2_7_2" = callPackage
+ "pandoc_2_7_3" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base
, base64-bytestring, binary, blaze-html, blaze-markup, bytestring
, case-insensitive, cmark-gfm, containers, criterion, data-default
, deepseq, Diff, directory, doctemplates, exceptions
, executable-path, filepath, Glob, haddock-library, hslua
- , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls
- , http-types, ipynb, JuicyPixels, mtl, network, network-uri
- , pandoc-types, parsec, process, QuickCheck, random, safe
- , scientific, SHA, skylighting, split, syb, tagsoup, tasty
- , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath
- , text, time, unicode-transforms, unix, unordered-containers
- , vector, weigh, xml, zip-archive, zlib
+ , hslua-module-system, hslua-module-text, HsYAML, HTTP, http-client
+ , http-client-tls, http-types, ipynb, JuicyPixels, mtl, network
+ , network-uri, pandoc-types, parsec, process, QuickCheck, random
+ , safe, scientific, SHA, skylighting, split, syb, tagsoup, tasty
+ , tasty-golden, tasty-hunit, tasty-lua, tasty-quickcheck, temporary
+ , texmath, text, time, unicode-transforms, unix
+ , unordered-containers, vector, weigh, xml, zip-archive, zlib
}:
mkDerivation {
pname = "pandoc";
- version = "2.7.2";
- sha256 = "1qjla7zk8whx17qapmv3zji6b98qdpd464gwhi4zv8g4hfzv7010";
- revision = "3";
- editedCabalFile = "17m7pd1d1q7blavh5vv9m9ll2v9z4pj48k7cn3x6k884c9haicwc";
+ version = "2.7.3";
+ sha256 = "0dpjrr40h54cljzhvixyym07z792a9izg6b9dmqpjlgcg4rj0xx8";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -169702,19 +173681,19 @@ self: {
aeson aeson-pretty attoparsec base base64-bytestring binary
blaze-html blaze-markup bytestring case-insensitive cmark-gfm
containers data-default deepseq directory doctemplates exceptions
- filepath Glob haddock-library hslua hslua-module-text HsYAML HTTP
- http-client http-client-tls http-types ipynb JuicyPixels mtl
- network network-uri pandoc-types parsec process random safe
- scientific SHA skylighting split syb tagsoup temporary texmath text
- time unicode-transforms unix unordered-containers vector xml
- zip-archive zlib
+ filepath Glob haddock-library hslua hslua-module-system
+ hslua-module-text HsYAML HTTP http-client http-client-tls
+ http-types ipynb JuicyPixels mtl network network-uri pandoc-types
+ parsec process random safe scientific SHA skylighting split syb
+ tagsoup temporary texmath text time unicode-transforms unix
+ unordered-containers vector xml zip-archive zlib
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
base base64-bytestring bytestring containers Diff directory
executable-path filepath Glob hslua pandoc-types process QuickCheck
- tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time
- xml zip-archive
+ tasty tasty-golden tasty-hunit tasty-lua tasty-quickcheck temporary
+ text time xml zip-archive
];
benchmarkHaskellDepends = [
base bytestring containers criterion mtl text time weigh
@@ -169774,6 +173753,8 @@ self: {
pname = "pandoc-citeproc";
version = "0.16.2";
sha256 = "15mm17awgi1b5yazwhr5nh8b59qml1qk6pz6gpyijks70fq2arsv";
+ revision = "2";
+ editedCabalFile = "0z7ia0f89lamrvnr75j7r6jhklkly0qcyplws9ww9rpbj9j7shyk";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -169854,8 +173835,8 @@ self: {
({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
mkDerivation {
pname = "pandoc-csv2table";
- version = "1.0.6";
- sha256 = "0yv58p7l0cdk8xnn0nczmnff189dci04jr9psxzsj1yfkrvpc32h";
+ version = "1.0.7";
+ sha256 = "0b6ycr50n24cjlli7jk3dh1shfsl9wqykvmdgabk1s8n2w1ps8sa";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -169954,10 +173935,11 @@ self: {
}:
mkDerivation {
pname = "pandoc-include-code";
- version = "1.3.0.0";
- sha256 = "1klmshyakhli0g9prqnllyrh9hsj67lps5b1cxh3jjlb6mxg5ic4";
+ version = "1.4.0.0";
+ sha256 = "0s3dayslfpnivr5h6napcrdh35bay7797z8nxjhr7c78ni7gdax9";
isLibrary = true;
isExecutable = true;
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [
base filepath mtl pandoc-types process text unordered-containers
];
@@ -169968,8 +173950,6 @@ self: {
];
description = "A Pandoc filter for including code from source files";
license = stdenv.lib.licenses.mpl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pandoc-japanese-filters" = callPackage
@@ -170006,6 +173986,31 @@ self: {
broken = true;
}) {};
+ "pandoc-markdown-ghci-filter" = callPackage
+ ({ mkDerivation, aeson, base, containers, ghcid, pandoc
+ , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+ , text
+ }:
+ mkDerivation {
+ pname = "pandoc-markdown-ghci-filter";
+ version = "0.1.0.0";
+ sha256 = "1m5hiqwkn1a0y3awrk8s7b9wwasspjaa3gdnck6w9xf7vgb5bgza";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base containers ghcid pandoc pandoc-types text
+ ];
+ executableHaskellDepends = [
+ aeson base containers ghcid pandoc pandoc-types text
+ ];
+ testHaskellDepends = [
+ aeson base containers ghcid pandoc pandoc-types QuickCheck tasty
+ tasty-hunit tasty-quickcheck text
+ ];
+ description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"pandoc-placetable" = callPackage
({ mkDerivation, aeson, base, bytestring, explicit-exception
, http-conduit, pandoc-types, spreadsheet, text, utf8-string
@@ -170068,17 +174073,17 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "pandoc-pyplot_2_1_1_0" = callPackage
+ "pandoc-pyplot_2_1_4_0" = callPackage
({ mkDerivation, base, containers, data-default-class, deepseq
, directory, filepath, hashable, hspec, hspec-expectations
- , open-browser, pandoc, pandoc-types, tasty, tasty-hspec
- , tasty-hunit, template-haskell, temporary, text, typed-process
- , yaml
+ , open-browser, optparse-applicative, pandoc, pandoc-types, tasty
+ , tasty-hspec, tasty-hunit, template-haskell, temporary, text
+ , typed-process, yaml
}:
mkDerivation {
pname = "pandoc-pyplot";
- version = "2.1.1.0";
- sha256 = "0s66m591v6x91qqdkyxl40zwlv6nan86zfq5z4cx73yz9xf3gjsx";
+ version = "2.1.4.0";
+ sha256 = "1mfyb8gyyc7dsg0n3l8kp8f7wx9ag0imn88xpibic5x6ff1g75br";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -170087,7 +174092,8 @@ self: {
];
executableHaskellDepends = [
base data-default-class deepseq directory filepath open-browser
- pandoc pandoc-types template-haskell temporary text
+ optparse-applicative pandoc pandoc-types template-haskell temporary
+ text
];
testHaskellDepends = [
base data-default-class directory filepath hspec hspec-expectations
@@ -170118,8 +174124,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-stylefrommeta";
- version = "0.2.0.2";
- sha256 = "12yvbh8cx5r6llx0gnz70n1b3zwm3zc8bdciq3cxyfivci5iks2r";
+ version = "0.2.1.1";
+ sha256 = "0jqgpgz1yx85zhm4f6qjaqcj94zi71ab0gam5vdz0jad79szr5l8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -170191,8 +174197,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "pandora";
- version = "0.1.3";
- sha256 = "067x0kklbqfi65hy9rq593z1fwr62sp0d01ili2wywkwq2m2dq32";
+ version = "0.1.7";
+ sha256 = "1wmp5c7b9scdrhrh50cpjfpcw1riw4kxs1vy935mzwja1y4zalsj";
description = "A box of patterns and paradigms";
license = stdenv.lib.licenses.mit;
}) {};
@@ -170341,6 +174347,62 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "pantry-tmp" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
+ , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
+ , containers, contravariant, cryptonite, cryptonite-conduit
+ , deepseq, digest, directory, exceptions, filelock, filepath
+ , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog
+ , hpack, hspec, http-client, http-client-tls, http-conduit
+ , http-download, http-types, integer-gmp, memory, mono-traversable
+ , mtl, network, network-uri, path, path-io, persistent
+ , persistent-sqlite, persistent-template, primitive, QuickCheck
+ , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
+ , safe, syb, tar-conduit, template-haskell, text, text-metrics
+ , th-lift, th-lift-instances, th-orphans, th-reify-many
+ , th-utilities, time, transformers, unix-compat, unliftio
+ , unordered-containers, vector, yaml, zip-archive
+ }:
+ mkDerivation {
+ pname = "pantry-tmp";
+ version = "0.1.0.0";
+ sha256 = "18b2ac5kb6xzkxa2c5hhl6n37npxcxzxghi0p5wnv5rps3ahsmnn";
+ revision = "3";
+ editedCabalFile = "12k0lqpc530ai9gb1ldx7l62qi86z4qc2s1bzif8fwaflk4c7ax6";
+ libraryHaskellDepends = [
+ aeson ansi-terminal array base base-orphans base64-bytestring
+ bytestring Cabal conduit conduit-extra containers contravariant
+ cryptonite cryptonite-conduit deepseq digest directory filelock
+ filepath generic-deriving ghc-prim hackage-security hashable hpack
+ http-client http-client-tls http-conduit http-download http-types
+ integer-gmp memory mono-traversable mtl network network-uri path
+ path-io persistent persistent-sqlite persistent-template primitive
+ resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit
+ template-haskell text text-metrics th-lift th-lift-instances
+ th-orphans th-reify-many th-utilities time transformers unix-compat
+ unliftio unordered-containers vector yaml zip-archive
+ ];
+ testHaskellDepends = [
+ aeson ansi-terminal array base base-orphans base64-bytestring
+ bytestring Cabal conduit conduit-extra containers contravariant
+ cryptonite cryptonite-conduit deepseq digest directory exceptions
+ filelock filepath generic-deriving ghc-prim hackage-security
+ hashable hedgehog hpack hspec http-client http-client-tls
+ http-conduit http-download http-types integer-gmp memory
+ mono-traversable mtl network network-uri path path-io persistent
+ persistent-sqlite persistent-template primitive QuickCheck
+ raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb
+ tar-conduit template-haskell text text-metrics th-lift
+ th-lift-instances th-orphans th-reify-many th-utilities time
+ transformers unix-compat unliftio unordered-containers vector yaml
+ zip-archive
+ ];
+ description = "Content addressable Haskell package management";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"papa" = callPackage
({ mkDerivation, base, papa-base, papa-base-export
, papa-base-implement, papa-bifunctors, papa-bifunctors-export
@@ -170925,8 +174987,6 @@ self: {
];
description = "Classes and data structures for working with data-kind indexed types";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"paramtree" = callPackage
@@ -171079,6 +175139,8 @@ self: {
pname = "paripari";
version = "0.6.0.0";
sha256 = "1604py5ms14xhmvsxdqx56xfbs3g4wkhjd8f5gsmhpqwz7acy511";
+ revision = "2";
+ editedCabalFile = "074z7wrb1p4c8wxwmqv3nxs6kp835r9pxmmnspqaajj0rag70ny3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -171412,13 +175474,49 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "parser-combinators";
- version = "1.0.2";
- sha256 = "1wb6xbx3p9fyisza9d7svnby4makv2bkp0yh7lfi2bg3kybg41ry";
+ version = "1.0.3";
+ sha256 = "0cqic88xwi60x5x6pli0r8401yljvg2cis8a67766zypfg0il3bp";
libraryHaskellDepends = [ base ];
description = "Lightweight package providing commonly useful parser combinators";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "parser-combinators_1_1_0" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "parser-combinators";
+ version = "1.1.0";
+ sha256 = "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc";
+ libraryHaskellDepends = [ base ];
+ description = "Lightweight package providing commonly useful parser combinators";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "parser-combinators-tests" = callPackage
+ ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations
+ , hspec-megaparsec, megaparsec, megaparsec-tests
+ , parser-combinators, QuickCheck
+ }:
+ mkDerivation {
+ pname = "parser-combinators-tests";
+ version = "1.1.0";
+ sha256 = "0m3xgdi1q3q638zfvgpdqyrhfq9abqwjripvbdx5z9rai4whzqmz";
+ revision = "1";
+ editedCabalFile = "0adgbzpylvk9p7ylxynsdrmqhhbh5pm8ww1s3nz3czl79y8lhh47";
+ isLibrary = false;
+ isExecutable = false;
+ testHaskellDepends = [
+ base hspec hspec-expectations hspec-megaparsec megaparsec
+ megaparsec-tests parser-combinators QuickCheck
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Test suite of parser-combinators";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"parser-helper" = callPackage
({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }:
mkDerivation {
@@ -171483,8 +175581,8 @@ self: {
}:
mkDerivation {
pname = "parsers";
- version = "0.12.9";
- sha256 = "1r05sc1mcglk8w596kq9a1brfn9c2vll8lq16j07ln0vsz4jzrc1";
+ version = "0.12.10";
+ sha256 = "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p";
libraryHaskellDepends = [
attoparsec base base-orphans binary charset containers mtl parsec
scientific semigroups text transformers unordered-containers
@@ -171660,8 +175758,8 @@ self: {
({ mkDerivation, base, doctest, hedgehog }:
mkDerivation {
pname = "partial-semigroup";
- version = "0.5.1.0";
- sha256 = "15rg80dgawmjz0gzfsspbb0b1045l6w5vvhwd4dgr7vv4hwj9gs9";
+ version = "0.5.1.1";
+ sha256 = "1n0nr7yprkg9ca86yd1w8d42zqjjdf6k7bbk818kfwbh72csxl0q";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest hedgehog ];
description = "A partial binary associative operator";
@@ -171672,8 +175770,8 @@ self: {
({ mkDerivation, base, hedgehog, partial-semigroup }:
mkDerivation {
pname = "partial-semigroup-hedgehog";
- version = "0.6.0.0";
- sha256 = "1qd9bg9qv0n80asfkrycvqwv92cdyy590871ypgkl82kx8x7qgbf";
+ version = "0.6.0.1";
+ sha256 = "0wn5gdgjza17qhxqmkp8mkj77ky2q39xs1gpjx4nrs5af34pavpy";
libraryHaskellDepends = [ base hedgehog partial-semigroup ];
description = "Property testing for partial semigroups using Hedgehog";
license = stdenv.lib.licenses.asl20;
@@ -171921,8 +176019,8 @@ self: {
}:
mkDerivation {
pname = "patat";
- version = "0.8.2.2";
- sha256 = "03k4njhn7sasr02446qj8x69hh8af7l35900lrvxr7qv741rc006";
+ version = "0.8.2.3";
+ sha256 = "0fkrm5zq2978qaqkxwibqj5dlmrrkpnlqv97ff436bf6ad5vpfw8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -171933,8 +176031,6 @@ self: {
];
description = "Terminal-based presentations using Pandoc";
license = stdenv.lib.licenses.gpl2;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"patch-combinators" = callPackage
@@ -171953,26 +176049,26 @@ self: {
({ mkDerivation, accelerate, accelerate-arithmetic
, accelerate-cufft, accelerate-fourier, accelerate-io
, accelerate-llvm-ptx, accelerate-utility, array, base, bool8
- , bytestring, Cabal, carray, cassava, containers, dsp, enumset
- , explicit-exception, fft, filepath, gnuplot, JuicyPixels, knead
- , llvm-extra, llvm-tf, non-empty, pqueue, prelude-compat
- , semigroups, storable-complex, storable-tuple, tfp
+ , bytestring, Cabal, carray, cassava, comfort-array, containers
+ , dsp, enumset, explicit-exception, fft, filepath, gnuplot
+ , JuicyPixels, knead, llvm-extra, llvm-tf, non-empty, pqueue
+ , prelude-compat, semigroups, storable-complex, storable-tuple, tfp
, unordered-containers, utility-ht, vector
}:
mkDerivation {
pname = "patch-image";
- version = "0.3.2.1";
- sha256 = "1z8m3lfdd2izb6riqzscc40kk8wc7588l24214sg0bkampss1ysg";
+ version = "0.3.3";
+ sha256 = "0jm723xrbiwpq7sci67z0vilsv8a8i2ndm795ssyqkgqm7g1psby";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
accelerate accelerate-arithmetic accelerate-cufft
accelerate-fourier accelerate-io accelerate-llvm-ptx
accelerate-utility array base bool8 bytestring Cabal carray cassava
- containers dsp enumset explicit-exception fft filepath gnuplot
- JuicyPixels knead llvm-extra llvm-tf non-empty pqueue
- prelude-compat semigroups storable-complex storable-tuple tfp
- unordered-containers utility-ht vector
+ comfort-array containers dsp enumset explicit-exception fft
+ filepath gnuplot JuicyPixels knead llvm-extra llvm-tf non-empty
+ pqueue prelude-compat semigroups storable-complex storable-tuple
+ tfp unordered-containers utility-ht vector
];
description = "Compose a big image from overlapping parts";
license = stdenv.lib.licenses.bsd3;
@@ -172220,8 +176316,8 @@ self: {
({ mkDerivation, base, containers, mtl, QuickCheck }:
mkDerivation {
pname = "pattern-matcher";
- version = "0.1.0.0";
- sha256 = "03adnzwcpc2mqqvfd2akiln0pfq6fn451an8vwxgx9gff0y85x5q";
+ version = "0.1.0.1";
+ sha256 = "1wk4kjdr5a3s6cwzw5cr52bij9ix5apn3vixrj3iycar7zsyzxgz";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers mtl QuickCheck ];
description = "A library for compiling pattern-matching to decision trees";
@@ -172530,13 +176626,14 @@ self: {
}) {};
"pcg-random" = callPackage
- ({ mkDerivation, base, bytestring, doctest, entropy, primitive
- , random
+ ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
+ , entropy, primitive, random
}:
mkDerivation {
pname = "pcg-random";
- version = "0.1.3.5";
- sha256 = "1920g1babivacds27m0gbjs9mylwiknjykvbrpagzq7r0n4gyhyy";
+ version = "0.1.3.6";
+ sha256 = "1m8xnic207ajbpz0q81h7xr9xmp1dzm6474vyvack6iidbzi4l08";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bytestring entropy primitive random
];
@@ -173070,18 +177167,20 @@ self: {
}:
mkDerivation {
pname = "pencil";
- version = "0.1.3";
- sha256 = "0kga9i19qxp6g51dyavnybfs6znsija87hxsfrxblsyi4gqs9hbp";
+ version = "1.0.1";
+ sha256 = "0a1lb0dclv6p6qkd6nd3zp665n6spkv10yd1i2m67rrqabg802cl";
+ revision = "1";
+ editedCabalFile = "012afvs4wghdw7adz0hw01pmi8ai89r8jhpykdwfyf4ignbrfpvq";
libraryHaskellDepends = [
base data-default directory edit-distance filepath hashable hsass
mtl pandoc parsec semigroups text time unordered-containers vector
xml yaml
];
- testHaskellDepends = [ base doctest text unordered-containers ];
+ testHaskellDepends = [
+ base doctest mtl text unordered-containers
+ ];
description = "Static site generator";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"penn-treebank" = callPackage
@@ -173169,20 +177268,37 @@ self: {
}) {};
"penrose" = callPackage
- ({ mkDerivation, ad, aeson, base, containers, gloss, megaparsec
- , old-time, random, text, websockets
+ ({ mkDerivation, ad, aeson, alex, ansi-terminal, array, base
+ , bytestring, containers, directory, docopt, extra, hmatrix
+ , hslogger, http-types, megaparsec, mtl, multimap, network
+ , old-time, parser-combinators, pretty, pretty-show
+ , pretty-terminal, process, random, random-shuffle, scotty, split
+ , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
+ , unordered-containers, uuid, websockets
}:
mkDerivation {
pname = "penrose";
- version = "0.1.0.2";
- sha256 = "0yva42b0av532a99kl0ldcfi229vs2m09w445r981i30xlilg5is";
- isLibrary = false;
+ version = "0.1.1.1";
+ sha256 = "0fak9lsa7gz1q2sbkwd76i01zi5aigi3p7q7gqlmz32y8sxsc8q0";
+ isLibrary = true;
isExecutable = true;
- executableHaskellDepends = [
- ad aeson base containers gloss megaparsec old-time random text
- websockets
+ libraryHaskellDepends = [
+ ad aeson ansi-terminal array base bytestring containers directory
+ docopt extra hmatrix hslogger http-types megaparsec mtl multimap
+ network old-time parser-combinators pretty pretty-show
+ pretty-terminal process random random-shuffle scotty split text
+ unordered-containers uuid websockets
+ ];
+ libraryToolDepends = [ alex ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ ad aeson ansi-terminal array base bytestring containers directory
+ docopt extra hmatrix hslogger http-types megaparsec mtl multimap
+ network old-time parser-combinators pretty pretty-show
+ pretty-terminal process random random-shuffle scotty split tasty
+ tasty-hunit tasty-quickcheck tasty-smallcheck text uuid websockets
];
- description = "A system that automatically visualize mathematics";
+ description = "Create beautiful diagrams just by typing mathematical notation in plain text";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -173346,6 +177462,25 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "perfect-vector-shuffle" = callPackage
+ ({ mkDerivation, base, MonadRandom, primitive, QuickCheck
+ , quickcheck-instances, random, tasty, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "perfect-vector-shuffle";
+ version = "0.1.0";
+ sha256 = "1nvwbmfqv9bq6423hxafjrvza6ynj3pry4m5ms1g2yf5vsx47w38";
+ libraryHaskellDepends = [
+ base MonadRandom primitive random vector
+ ];
+ testHaskellDepends = [
+ base QuickCheck quickcheck-instances random tasty tasty-quickcheck
+ vector
+ ];
+ description = "Library for performing vector shuffles";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"perfecthash" = callPackage
({ mkDerivation, array, base, bytestring, cmph, containers
, criterion, deepseq, hspec, QuickCheck, random, time
@@ -173735,10 +177870,8 @@ self: {
}:
mkDerivation {
pname = "persistent-documentation";
- version = "0.1.0.0";
- sha256 = "1m9hmvi6krksb64k5mqkqpcz3670xjbqr4vic0x1n350ji2mrngd";
- revision = "1";
- editedCabalFile = "06nrr2c4pprrgl4d2iwi8np7714rx685g4dagaad79q5x01k4d8v";
+ version = "0.1.0.1";
+ sha256 = "027fxb3ggzyxg2ykml7sdk2hycacd237161yr3w5cwi320b9ghyg";
libraryHaskellDepends = [
base containers mtl persistent template-haskell text
];
@@ -173749,6 +177882,8 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Documentation DSL for persistent entities";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"persistent-equivalence" = callPackage
@@ -174221,7 +178356,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {inherit (pkgs) sqlite;};
- "persistent-sqlite_2_10_0" = callPackage
+ "persistent-sqlite_2_10_1" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, containers
, exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger
, persistent, persistent-template, persistent-test, QuickCheck
@@ -174231,10 +178366,8 @@ self: {
}:
mkDerivation {
pname = "persistent-sqlite";
- version = "2.10.0";
- sha256 = "1h3ls1wg02q7336zqfrpggx64f1wm3x701dvkwvci6yn4hqvkpn2";
- revision = "1";
- editedCabalFile = "1kxqz47h2gxinck114ip75brbm0wsimff5fdzldv72mqv7id66nl";
+ version = "2.10.1";
+ sha256 = "1yan8ciljv2kkcxlc9yj97gvlgkzf1ha6369dqnr7fgk1xhr74nz";
configureFlags = [ "-fsystemlib" ];
isLibrary = true;
isExecutable = true;
@@ -174281,7 +178414,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
- "persistent-template_2_7_0" = callPackage
+ "persistent-template_2_7_1" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
, deepseq, deepseq-generics, file-embed, hspec, http-api-data
, monad-control, monad-logger, path-pieces, persistent, QuickCheck
@@ -174289,8 +178422,8 @@ self: {
}:
mkDerivation {
pname = "persistent-template";
- version = "2.7.0";
- sha256 = "0pz750b7ybg27nl9b7hiw25vg0dwjy8196c6kpj1xwfgcxkdizq5";
+ version = "2.7.1";
+ sha256 = "1yki4dvfk2p5cs2gfdnplsfyb1cxakhrdfjxgdgbnc0xxicbzx42";
libraryHaskellDepends = [
aeson base bytestring containers http-api-data monad-control
monad-logger path-pieces persistent template-haskell text
@@ -174332,38 +178465,23 @@ self: {
}) {};
"persistent-test" = callPackage
- ({ mkDerivation, aeson, aeson-compat, attoparsec, base
- , base64-bytestring, blaze-builder, blaze-html, blaze-markup
- , bytestring, cereal, conduit, containers, exceptions, fast-logger
- , hashable, hspec, hspec-expectations, http-api-data, HUnit
- , lifted-base, monad-logger, mtl, network, old-locale, path-pieces
- , persistent, persistent-sqlite, persistent-template, QuickCheck
- , quickcheck-instances, random, resource-pool, resourcet
- , scientific, semigroups, silently, system-fileio, system-filepath
- , tagged, template-haskell, text, time, transformers
- , transformers-base, unliftio, unliftio-core, unordered-containers
- , vector
+ ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
+ , containers, exceptions, hspec, hspec-expectations, HUnit
+ , monad-control, monad-logger, path-pieces, persistent
+ , persistent-template, QuickCheck, quickcheck-instances, random
+ , resourcet, text, time, transformers, transformers-base, unliftio
+ , unliftio-core, unordered-containers
}:
mkDerivation {
pname = "persistent-test";
- version = "2.0.0.3";
- sha256 = "1xjjbr780ipzxkbnj8cly0xl8wxbvqjvm293aqm0rnkyqwndhbn3";
- isLibrary = true;
- isExecutable = true;
+ version = "2.0.3.0";
+ sha256 = "1bspcv64qhcqiam964kxfxlc9afbns41dffh00k36dl2akr7p99a";
libraryHaskellDepends = [
- aeson aeson-compat attoparsec base base64-bytestring blaze-builder
- blaze-html blaze-markup bytestring cereal conduit containers
- exceptions fast-logger hashable hspec hspec-expectations
- http-api-data HUnit lifted-base monad-logger mtl network old-locale
- path-pieces persistent persistent-sqlite persistent-template
- QuickCheck quickcheck-instances random resource-pool resourcet
- scientific semigroups silently tagged template-haskell text time
- transformers transformers-base unliftio unliftio-core
- unordered-containers vector
- ];
- executableHaskellDepends = [
- base hspec persistent resourcet scientific system-fileio
- system-filepath
+ aeson base blaze-html bytestring conduit containers exceptions
+ hspec hspec-expectations HUnit monad-control monad-logger
+ path-pieces persistent persistent-template QuickCheck
+ quickcheck-instances random resourcet text time transformers
+ transformers-base unliftio unliftio-core unordered-containers
];
description = "Tests for Persistent";
license = stdenv.lib.licenses.mit;
@@ -174607,8 +178725,8 @@ self: {
}:
mkDerivation {
pname = "pg-harness-server";
- version = "0.6.1";
- sha256 = "1943rjcj4hbqdpg6vy7pcpq6575iag7bm15z2pdz4r8gfhq9z8an";
+ version = "0.6.2";
+ sha256 = "1wkr0vp41mjvq84q4gr29mwhrs1a805cipan0gamijhsjl2m75yc";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -174618,8 +178736,6 @@ self: {
];
description = "REST service for creating temporary PostgreSQL databases";
license = stdenv.lib.licenses.agpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pg-recorder" = callPackage
@@ -174742,8 +178858,8 @@ self: {
}:
mkDerivation {
pname = "pgp-wordlist";
- version = "0.1.0.2";
- sha256 = "0ri4m4a18kmnpw2a3vcw7zgjagccqr3snw2qgljg3b92abl6z2z2";
+ version = "0.1.0.3";
+ sha256 = "15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg";
libraryHaskellDepends = [ base bytestring containers text vector ];
testHaskellDepends = [
base bytestring deepseq doctest HUnit tasty tasty-hunit
@@ -175165,6 +179281,8 @@ self: {
pname = "pi-lcd";
version = "0.1.1.0";
sha256 = "0120zkza698ww8ng6svp54qywkrvn35pylvcgplfldw4ajln00vn";
+ revision = "1";
+ editedCabalFile = "0gkpx56dq7lqhlw9iq8zv1kqhpwpd7hkpvld2k86v0zyal526jms";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -175274,6 +179392,8 @@ self: {
pname = "picoparsec";
version = "0.1.2.3";
sha256 = "0l4i5s0yh4jcagcywcx2bwpvky6xy4hisbvwbghjvxpsirkyviwf";
+ revision = "1";
+ editedCabalFile = "0hr042sd52mxkg1s0j4abl0nfqcciz12868r074mq81kj3nbf3g0";
libraryHaskellDepends = [
array base bytestring containers deepseq monoid-subclasses
scientific text
@@ -175348,8 +179468,6 @@ self: {
libraryHaskellDepends = [ base unix ];
description = "Run an IO action protected by a pidfile";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pier" = callPackage
@@ -175466,6 +179584,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "pinboard-notes-backup" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring
+ , containers, http-client, http-types, mtl, optparse-applicative
+ , req, sqlite-simple, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "pinboard-notes-backup";
+ version = "1.0.4";
+ sha256 = "0frlxz9mqd0dypi3f6w926sngwp4jhrz47zr35zdxwrvv64z29g7";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson ansi-wl-pprint base bytestring containers http-client
+ http-types mtl optparse-applicative req sqlite-simple text time
+ transformers
+ ];
+ description = "Back up the notes you've saved to Pinboard";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"pinch" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
, ghc-prim, hashable, hspec, hspec-discover, QuickCheck, semigroups
@@ -175654,10 +179792,31 @@ self: {
}:
mkDerivation {
pname = "pipes";
- version = "4.3.9";
- sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w";
- revision = "1";
- editedCabalFile = "0mkwbbn8vlrsvm3pl2cyaw1qr9hbjqfm831naj7cbrmiksf2l5aa";
+ version = "4.3.10";
+ sha256 = "1vhq8z3518y6xl0nzgdxmcd44ax40c8fghlccwhgqq132bf59nb2";
+ libraryHaskellDepends = [
+ base exceptions mmorph mtl semigroups transformers void
+ ];
+ testHaskellDepends = [
+ base mtl QuickCheck test-framework test-framework-quickcheck2
+ transformers
+ ];
+ benchmarkHaskellDepends = [
+ base criterion mtl optparse-applicative transformers
+ ];
+ description = "Compositional pipelines";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "pipes_4_3_11" = callPackage
+ ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
+ , optparse-applicative, QuickCheck, semigroups, test-framework
+ , test-framework-quickcheck2, transformers, void
+ }:
+ mkDerivation {
+ pname = "pipes";
+ version = "4.3.11";
+ sha256 = "0h70djd6x306rci8zp356klqj6376xry6mkhyr12301adfhag8vv";
libraryHaskellDepends = [
base exceptions mmorph mtl semigroups transformers void
];
@@ -175670,6 +179829,7 @@ self: {
];
description = "Compositional pipelines";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pipes-aeson" = callPackage
@@ -175978,8 +180138,8 @@ self: {
pname = "pipes-concurrency";
version = "2.0.12";
sha256 = "17aqh6p1az09n6b6vs06pxcha5aq6dvqjwskgjcdiz7221vwchs3";
- revision = "1";
- editedCabalFile = "1c1rys2pp7a2z6si925ps610q8a38a6m26s182phwa5nfhyggpaw";
+ revision = "2";
+ editedCabalFile = "1c06nypirrd76jg5y508517smxh3izy98y6kj89k79kbpi5rncbj";
libraryHaskellDepends = [
async base contravariant pipes semigroups stm void
];
@@ -176377,6 +180537,8 @@ self: {
];
description = "Use network sockets together with the pipes library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pipes-network-tls" = callPackage
@@ -176394,6 +180556,8 @@ self: {
];
description = "TLS-secured network connections support for pipes";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pipes-network-ws" = callPackage
@@ -176407,6 +180571,8 @@ self: {
];
description = "WebSockets support for pipes";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pipes-ordered-zip" = callPackage
@@ -176516,15 +180682,11 @@ self: {
({ mkDerivation, base, mwc-random, pipes, vector }:
mkDerivation {
pname = "pipes-random";
- version = "1.0.0.4";
- sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl";
- revision = "2";
- editedCabalFile = "0czw2qfi05d5kbnwzhzr75j1ag6hfbn9nvbjyifdjradfzjxl2s9";
+ version = "1.0.0.5";
+ sha256 = "1xsb0cxksrrkv81yk9qb7b3g7niz3sc7sz0960hxn16hwjymkv5k";
libraryHaskellDepends = [ base mwc-random pipes vector ];
description = "Producers for handling randomness";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pipes-rt" = callPackage
@@ -176575,6 +180737,8 @@ self: {
pname = "pipes-safe";
version = "2.3.1";
sha256 = "0dfdd3fccfd7wfn5228hbfj3h10xq01sddpy1v2ds63wlg84kwly";
+ revision = "1";
+ editedCabalFile = "0qyx585dvyvnpkb6hmdml4ndl8sk0d1z747d40gfr0m7c320wjzm";
libraryHaskellDepends = [
base containers exceptions monad-control mtl pipes primitive
transformers transformers-base
@@ -176976,6 +181140,26 @@ self: {
broken = true;
}) {};
+ "pkgtreediff" = callPackage
+ ({ mkDerivation, async, base, directory, filepath, Glob
+ , http-directory, simple-cmd, simple-cmd-args, text
+ }:
+ mkDerivation {
+ pname = "pkgtreediff";
+ version = "0.3";
+ sha256 = "0n39cn75cdxzk39hn6fiimb7rm1qrvksmqidy5fgnx997y78z8s9";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ async base directory filepath Glob http-directory simple-cmd
+ simple-cmd-args text
+ ];
+ description = "Package tree diff tool";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"pktree" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -177075,26 +181259,24 @@ self: {
"planb-token-introspection" = callPackage
({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
, exceptions, http-client, http-client-tls, http-types, lens, mtl
- , random, safe-exceptions, tasty, tasty-hunit, text, th-format
- , transformers, unliftio-core
+ , random, safe-exceptions, tasty, tasty-hunit, text, transformers
+ , unliftio-core
}:
mkDerivation {
pname = "planb-token-introspection";
- version = "0.1.3.0";
- sha256 = "1n7ck623ik3rss5vhby9wz8q5r1kfww678d3yiqkx7pg5fn4rwmk";
+ version = "0.1.4.0";
+ sha256 = "0rgjvxs1bb6qz02g2y8b4cldmgn05kfzjbb81ny57724yv60xyp7";
libraryHaskellDepends = [
aeson aeson-casing base bytestring containers http-client
http-client-tls http-types mtl safe-exceptions text transformers
];
testHaskellDepends = [
aeson base bytestring containers exceptions http-client http-types
- lens mtl random safe-exceptions tasty tasty-hunit text th-format
+ lens mtl random safe-exceptions tasty tasty-hunit text
unliftio-core
];
description = "Token Introspection for PlanB";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"planet-mitchell" = callPackage
@@ -177535,10 +181717,8 @@ self: {
}:
mkDerivation {
pname = "plots";
- version = "0.1.0.2";
- sha256 = "0kdn2s686rfanqq4qfkbjfys53zzf2hgc2jx3m9zpfzjb3wabhg5";
- revision = "1";
- editedCabalFile = "1n3qzplpis1h90kw4x8fi4d8qhqy1xxxflv1d38516ikffwvai9x";
+ version = "0.1.1.2";
+ sha256 = "01w56qhyw8w6g8xffrvkp7d6k8l4w9as8v900v29jaq7gz680fhs";
libraryHaskellDepends = [
adjunctions base base-orphans colour containers data-default
diagrams-core diagrams-lib directory distributive filepath
@@ -177548,8 +181728,6 @@ self: {
];
description = "Diagrams based plotting library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"plotserver-api" = callPackage
@@ -177640,6 +181818,8 @@ self: {
testHaskellDepends = [ base hedgehog hedgehog-classes ];
description = "Plurality monad: Zero, one, or at least two";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"plural" = callPackage
@@ -177818,8 +181998,8 @@ self: {
pname = "pointed";
version = "5.0.1";
sha256 = "1p91a762xglckscnhpflxzav8byf49a02mli3983i4kpr2jkaimr";
- revision = "1";
- editedCabalFile = "1ccjmzz3jf5ybrzv7qdwm3qb8rz0yskvi4ackrixyhdk8bg5f3nc";
+ revision = "2";
+ editedCabalFile = "00m4f6rgxa3qa72j3jzpg6rrd9k9n4ll2idxlyybil3lxd63r80w";
libraryHaskellDepends = [
base comonad containers data-default-class hashable kan-extensions
semigroupoids semigroups stm tagged transformers
@@ -177857,8 +182037,8 @@ self: {
}:
mkDerivation {
pname = "pointfree";
- version = "1.1.1.4";
- sha256 = "03jnhppm39zdfrmg1784p1y5r7r5wd5di2ddq5d71slifq7j5wd1";
+ version = "1.1.1.5";
+ sha256 = "1h5igixmn36k9b4mnc7lgalc4i88yg71h396wzqnh041jz28y6wc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -177882,8 +182062,8 @@ self: {
}:
mkDerivation {
pname = "pointfree-fancy";
- version = "1.1.1.12";
- sha256 = "14ds1bqz82pdij0771q3z524x8qv11dd4gkrn5r0mafrvfw2q6as";
+ version = "1.1.1.13";
+ sha256 = "0f761h5a8byfpkf8nby4wkhra64qv7fzs3rx6gf4v07w9b2s5ph8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -177906,8 +182086,8 @@ self: {
pname = "pointful";
version = "1.0.11.0";
sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2";
- revision = "1";
- editedCabalFile = "1a7fc03c586w011amjq770ifvf7ajbp9x3xp2w2yz1da9rkga2qv";
+ revision = "2";
+ editedCabalFile = "0zdhhflhz853iwlcjfxh57bx1wf8capij4b0ysjgmp7bi8hw5ww0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -178113,18 +182293,22 @@ self: {
}) {};
"poly" = callPackage
- ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
- , semirings, tasty, tasty-quickcheck, vector
+ ({ mkDerivation, base, gauge, primitive, QuickCheck
+ , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector
+ , vector-algorithms
}:
mkDerivation {
pname = "poly";
- version = "0.2.0.0";
- sha256 = "19jdm2508ncwcci8bi9hwpaak3cymhbynnk3whmh0g6rny6zdla4";
- libraryHaskellDepends = [ base primitive semirings vector ];
+ version = "0.3.0.0";
+ sha256 = "0kwh1n9b6zh21kg2036v02jpr9xvvay6x72b044j4la65pal5h8i";
+ libraryHaskellDepends = [
+ base primitive semirings vector vector-algorithms
+ ];
testHaskellDepends = [
base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck
vector
];
+ benchmarkHaskellDepends = [ base gauge semirings vector ];
description = "Polynomials";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -178252,6 +182436,8 @@ self: {
pname = "polynomial";
version = "0.7.3";
sha256 = "0wl9wdaqrs6hs83xi27m879j7i2q04v14jqkrwns2qy3f2yhq2rr";
+ revision = "1";
+ editedCabalFile = "1cn1fj9hlzwvk65rpn60n74bdzk2bdicwp2rqb34ps5sccvbm1ij";
libraryHaskellDepends = [
base deepseq pretty vector vector-space vector-th-unbox
];
@@ -178288,41 +182474,104 @@ self: {
}) {};
"polysemy" = callPackage
- ({ mkDerivation, base, criterion, free, freer-simple, hspec
- , inspection-testing, mtl, random, syb, template-haskell
- , transformers
+ ({ mkDerivation, async, base, containers, criterion, doctest
+ , first-class-families, free, freer-simple, hspec, hspec-discover
+ , inspection-testing, mtl, syb, template-haskell, th-abstraction
+ , transformers, type-errors, unagi-chan
}:
mkDerivation {
pname = "polysemy";
- version = "0.1.2.0";
- sha256 = "18713nqrijbciwhazy7nvs3zizkxz2cs3c7q8xkc5j4bgk90vsxm";
+ version = "0.7.0.0";
+ sha256 = "0p9f5m2invppncmd1d9sim1kvnzcgramnq3y1vr0bisg02y0c8dc";
libraryHaskellDepends = [
- base mtl random syb template-haskell transformers
+ async base containers first-class-families mtl syb template-haskell
+ th-abstraction transformers type-errors unagi-chan
];
testHaskellDepends = [
- base hspec inspection-testing mtl random syb template-haskell
- transformers
+ async base containers doctest first-class-families hspec
+ inspection-testing mtl syb template-haskell th-abstraction
+ transformers type-errors unagi-chan
];
+ testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
- base criterion free freer-simple mtl random syb template-haskell
- transformers
+ async base containers criterion first-class-families free
+ freer-simple mtl syb template-haskell th-abstraction transformers
+ type-errors unagi-chan
];
description = "Higher-order, low-boilerplate, zero-cost free monads";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "polysemy-RandomFu" = callPackage
+ ({ mkDerivation, base, hspec, hspec-discover, polysemy
+ , polysemy-plugin, polysemy-zoo, random-fu, random-source, text
+ , vector
+ }:
+ mkDerivation {
+ pname = "polysemy-RandomFu";
+ version = "0.3.0.0";
+ sha256 = "17qh2p7nh091kgywdzfd8ckzk6vczm9zxyp9vs94c1ld9qxrhkv8";
+ libraryHaskellDepends = [
+ base polysemy polysemy-plugin polysemy-zoo random-fu random-source
+ ];
+ testHaskellDepends = [
+ base hspec polysemy polysemy-plugin polysemy-zoo random-fu
+ random-source text vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Experimental, RandomFu effect and interpreters for polysemy";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"polysemy-plugin" = callPackage
- ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec, polysemy }:
+ ({ mkDerivation, base, containers, doctest, ghc
+ , ghc-tcplugins-extra, hspec, hspec-discover, inspection-testing
+ , polysemy, should-not-typecheck, syb, transformers
+ }:
mkDerivation {
pname = "polysemy-plugin";
- version = "0.1.0.0";
- sha256 = "0zsgvb5l740a1mxjrjaxmzlcqd9qvzx973slnvb299z0l2h322fr";
- libraryHaskellDepends = [ base ghc ghc-tcplugins-extra polysemy ];
+ version = "0.2.2.0";
+ sha256 = "1z8dyhcg2r9vb8m93khjzvmzc3lk7zaj64yjjdsnjmzzv13k8hl5";
+ libraryHaskellDepends = [
+ base containers ghc ghc-tcplugins-extra polysemy syb transformers
+ ];
testHaskellDepends = [
- base ghc ghc-tcplugins-extra hspec polysemy
+ base containers doctest ghc ghc-tcplugins-extra hspec
+ inspection-testing polysemy should-not-typecheck syb transformers
];
+ testToolDepends = [ hspec-discover ];
description = "Disambiguate obvious uses of effects";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "polysemy-zoo" = callPackage
+ ({ mkDerivation, base, constraints, containers, hspec
+ , hspec-discover, mtl, polysemy, polysemy-plugin, random
+ , reflection, text
+ }:
+ mkDerivation {
+ pname = "polysemy-zoo";
+ version = "0.3.0.0";
+ sha256 = "1ww5qsxpz1h5jb1444fm2hnzkikcpnpf7gw4v1vkn8bh6cnmpxfy";
+ libraryHaskellDepends = [
+ base constraints containers mtl polysemy polysemy-plugin random
+ reflection
+ ];
+ testHaskellDepends = [
+ base constraints containers hspec mtl polysemy polysemy-plugin
+ random reflection text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Experimental, user-contributed effects and interpreters for polysemy";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"polyseq" = callPackage
@@ -178425,8 +182674,6 @@ self: {
];
description = "Maps and sets of partial orders";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pomodoro" = callPackage
@@ -178794,16 +183041,14 @@ self: {
}) {};
"porter" = callPackage
- ({ mkDerivation, haskell2010 }:
+ ({ mkDerivation, base }:
mkDerivation {
pname = "porter";
- version = "0.1";
- sha256 = "0aw1gq7z3h5ag5vzl6crw7vijg9w25s0jvxr4rkniv4jk0wlfmnk";
- libraryHaskellDepends = [ haskell2010 ];
+ version = "0.1.0.2";
+ sha256 = "12pvav3xx4mdjnvza15yhkdcphxlsjns2s1i66h2nfgbb9lc8h0q";
+ libraryHaskellDepends = [ base ];
description = "Implementation of the Porter stemming algorithm";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ports" = callPackage
@@ -178879,15 +183124,21 @@ self: {
}) {inherit (pkgs) acl;};
"posix-api" = callPackage
- ({ mkDerivation, base, primitive, tasty, tasty-hunit }:
+ ({ mkDerivation, base, primitive, primitive-addr, primitive-offset
+ , primitive-unlifted, tasty, tasty-hunit
+ }:
mkDerivation {
pname = "posix-api";
- version = "0.2.1.0";
- sha256 = "1vxasjdy3l41brzyrjqv13zazm1ryqy496p2rfvm19062bfpixji";
- libraryHaskellDepends = [ base primitive ];
+ version = "0.3.0.0";
+ sha256 = "172271qakd2w8hg68m57p8avwwb2cm8hds0qzq53559p2n1z69xq";
+ libraryHaskellDepends = [
+ base primitive primitive-addr primitive-offset primitive-unlifted
+ ];
testHaskellDepends = [ base primitive tasty tasty-hunit ];
description = "posix bindings";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"posix-error-codes" = callPackage
@@ -179403,6 +183654,8 @@ self: {
pname = "postgresql-simple";
version = "0.6.2";
sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv";
+ revision = "1";
+ editedCabalFile = "0v8a7ylnbl8iv6v3blahrsnggk3kldvrq2gpq1fxni8y2jmc96d6";
libraryHaskellDepends = [
aeson attoparsec base bytestring bytestring-builder
case-insensitive containers hashable Only postgresql-libpq
@@ -179596,22 +183849,27 @@ self: {
"postgresql-typed" = callPackage
({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
- , containers, convertible, cryptonite, haskell-src-meta, HDBC
- , HUnit, memory, network, old-locale, postgresql-binary, QuickCheck
- , scientific, template-haskell, text, time, utf8-string, uuid
+ , containers, convertible, criterion, cryptonite, data-default
+ , haskell-src-meta, HDBC, HUnit, memory, network, old-locale
+ , postgresql-binary, QuickCheck, scientific, template-haskell, text
+ , time, tls, utf8-string, uuid, x509, x509-store, x509-validation
}:
mkDerivation {
pname = "postgresql-typed";
- version = "0.5.3.0";
- sha256 = "0apq662lhkjc1xl4alpz20yz20x6mf3gz6li7wb86sp94441rh5k";
+ version = "0.6.0.1";
+ sha256 = "1kdapjx3mz7g6a35g21xql0wswrgnmp6x0hm2zpis3wp4ig503kk";
libraryHaskellDepends = [
aeson array attoparsec base binary bytestring containers cryptonite
- haskell-src-meta HDBC memory network old-locale postgresql-binary
- scientific template-haskell text time utf8-string uuid
+ data-default haskell-src-meta HDBC memory network old-locale
+ postgresql-binary scientific template-haskell text time tls
+ utf8-string uuid x509 x509-store x509-validation
];
testHaskellDepends = [
base bytestring containers convertible HDBC HUnit network
- QuickCheck time
+ QuickCheck time tls
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion network time tls
];
description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
license = stdenv.lib.licenses.bsd3;
@@ -179640,26 +183898,26 @@ self: {
"postgrest" = callPackage
({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async
, auto-update, base, base64-bytestring, bytestring
- , case-insensitive, cassava, configurator-ng, containers
- , contravariant, contravariant-extras, cookie, either, gitrev
- , hasql, hasql-pool, hasql-transaction, heredoc, hjsonschema, hspec
+ , case-insensitive, cassava, configurator-pg, containers
+ , contravariant, contravariant-extras, cookie, directory, either
+ , gitrev, hasql, hasql-pool, hasql-transaction, heredoc, hspec
, hspec-wai, hspec-wai-json, HTTP, http-types
, insert-ordered-containers, interpolatedstring-perl6, jose, lens
- , lens-aeson, monad-control, network-uri, optparse-applicative
- , parsec, process, protolude, Ranged-sets, regex-tdfa, retry
- , scientific, swagger2, text, time, transformers-base, unix
- , unordered-containers, vector, wai, wai-cors, wai-extra
- , wai-middleware-static, warp
+ , lens-aeson, monad-control, network, network-uri
+ , optparse-applicative, parsec, process, protolude, Ranged-sets
+ , regex-tdfa, retry, scientific, swagger2, text, time
+ , transformers-base, unix, unordered-containers, vector, wai
+ , wai-cors, wai-extra, wai-middleware-static, warp
}:
mkDerivation {
pname = "postgrest";
- version = "5.2.0";
- sha256 = "0h4167jr0k398paf2sgnxkm4iziqf3a9i61cbh7d0ix86z2v8a53";
+ version = "6.0.0";
+ sha256 = "0m0zplw8f1ncnbmrnsylq2z7pv8r86hsndsgbld52wfdc85b3r0z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-wl-pprint base base64-bytestring bytestring
- case-insensitive cassava configurator-ng containers contravariant
+ case-insensitive cassava configurator-pg containers contravariant
contravariant-extras cookie either gitrev hasql hasql-pool
hasql-transaction heredoc HTTP http-types insert-ordered-containers
interpolatedstring-perl6 jose lens lens-aeson network-uri
@@ -179668,15 +183926,16 @@ self: {
wai-cors wai-extra wai-middleware-static
];
executableHaskellDepends = [
- auto-update base base64-bytestring bytestring hasql hasql-pool
- hasql-transaction protolude retry text time unix warp
+ auto-update base base64-bytestring bytestring directory hasql
+ hasql-pool hasql-transaction network protolude retry text time unix
+ warp
];
testHaskellDepends = [
aeson aeson-qq async auto-update base base64-bytestring bytestring
case-insensitive cassava containers contravariant hasql hasql-pool
- hasql-transaction heredoc hjsonschema hspec hspec-wai
- hspec-wai-json http-types lens lens-aeson monad-control process
- protolude regex-tdfa time transformers-base wai wai-extra
+ hasql-transaction heredoc hspec hspec-wai hspec-wai-json http-types
+ lens lens-aeson monad-control process protolude regex-tdfa text
+ time transformers-base wai wai-extra
];
description = "REST API for any Postgres database";
license = stdenv.lib.licenses.mit;
@@ -179766,8 +184025,8 @@ self: {
}:
mkDerivation {
pname = "postmark-streams";
- version = "0.1.0.2";
- sha256 = "00d6rnijlr2095nd1d0vqgbsy5k8w6admi2bn69vdmj39cahgca2";
+ version = "0.1.0.3";
+ sha256 = "1qcyh34rjfgjxi6cs7jrfhr1qdp2chngga1p71jxisbgfd7rk2b4";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring binary bytestring
http-streams io-streams text time
@@ -180123,6 +184382,8 @@ self: {
pname = "pqueue";
version = "1.4.1.2";
sha256 = "1v4zhv2sc1zsw91hvnarkjhayx2dnf7ccxz6rrhsqpcs0szaranj";
+ revision = "1";
+ editedCabalFile = "1la186z2np3nv06p0485xwg342gyjp7a2ikg73qs7mbg086352zs";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [ base deepseq QuickCheck ];
description = "Reliable, persistent, fast priority queues";
@@ -180498,8 +184759,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "prelude-compat";
- version = "0.0.0.1";
- sha256 = "1m20zczq6hz6qv48g5pa6spd9p4ylq6w0vc60rzshrbjbdfqgp3v";
+ version = "0.0.0.2";
+ sha256 = "1mv00d5k5wqb39iyghdbf4lfqznwb1whcc9a564ly4wzka70y9f1";
libraryHaskellDepends = [ base ];
description = "Provide Prelude and Data.List with fixed content across GHC versions";
license = stdenv.lib.licenses.bsd3;
@@ -180819,8 +185080,6 @@ self: {
];
description = "Functionality for beautifying GHCi";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pretty-hex" = callPackage
@@ -180834,6 +185093,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pretty-loc" = callPackage
+ ({ mkDerivation, base, text }:
+ mkDerivation {
+ pname = "pretty-loc";
+ version = "0.1.0.1";
+ sha256 = "196slpa651p7yq8107c4pkwdfkfmg2bn6ibyqz22c46psklyrisb";
+ libraryHaskellDepends = [ base text ];
+ description = "Tracking and highlighting of locations in source files";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pretty-ncols" = callPackage
({ mkDerivation, base, pretty }:
mkDerivation {
@@ -180922,14 +185192,14 @@ self: {
}) {};
"pretty-sop" = callPackage
- ({ mkDerivation, base, generics-sop, pretty-show }:
+ ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }:
mkDerivation {
pname = "pretty-sop";
- version = "0.2.0.2";
- sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn";
- revision = "2";
- editedCabalFile = "04hzf2ajlnh3ynk72xr5s396v8y0d8fkr4pf11nqss7yf60dkxwi";
+ version = "0.2.0.3";
+ sha256 = "10vybwbkqgr3fi13c5qwwhrwns9sdj7zvlkz6vag966pk238gnxy";
libraryHaskellDepends = [ base generics-sop pretty-show ];
+ testHaskellDepends = [ base generics-sop pretty-show ];
+ testToolDepends = [ markdown-unlit ];
description = "A generic pretty-printer using generics-sop";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -181032,6 +185302,32 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "prettyprinter_1_3_0" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring
+ , containers, criterion, deepseq, doctest, mtl, pgp-wordlist
+ , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "prettyprinter";
+ version = "1.3.0";
+ sha256 = "1dc43z53s8pbrv6wf2mq6zvggd67lk415zqg8q9bcd1ld5m9h2x4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base text ];
+ testHaskellDepends = [
+ base bytestring doctest pgp-wordlist tasty tasty-hunit
+ tasty-quickcheck text
+ ];
+ benchmarkHaskellDepends = [
+ ansi-wl-pprint base base-compat containers criterion deepseq mtl
+ QuickCheck random text transformers
+ ];
+ description = "A modern, easy to use, well-documented, extensible pretty-printer";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"prettyprinter-ansi-terminal" = callPackage
({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text
}:
@@ -181155,22 +185451,15 @@ self: {
}) {};
"prim-instances" = callPackage
- ({ mkDerivation, base, base-orphans, primitive, QuickCheck
- , quickcheck-classes, quickcheck-instances, tasty, tasty-quickcheck
- }:
+ ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes }:
mkDerivation {
pname = "prim-instances";
- version = "0.1.0.0";
- sha256 = "1l2dvq5mrbxghzrcfd1ik49lzfvly3bq15jrmn1hilvjrsscx7nf";
+ version = "0.2";
+ sha256 = "0dx5byf61725220hvwd72k2yc2n1x0qpl6rj3gfdldww98g700iq";
libraryHaskellDepends = [ base primitive ];
- testHaskellDepends = [
- base base-orphans primitive QuickCheck quickcheck-classes
- quickcheck-instances tasty tasty-quickcheck
- ];
- description = "prim typeclass instances";
+ testHaskellDepends = [ base QuickCheck quickcheck-classes ];
+ description = "Prim typeclass instances";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"prim-ref" = callPackage
@@ -181278,49 +185567,87 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "primitive-atomic" = callPackage
+ "primitive_0_7_0_0" = callPackage
+ ({ mkDerivation, base, base-orphans, ghc-prim, QuickCheck
+ , semigroups, tagged, tasty, tasty-quickcheck, transformers
+ , transformers-compat
+ }:
+ mkDerivation {
+ pname = "primitive";
+ version = "0.7.0.0";
+ sha256 = "0xhmin3z2vp8jina1wzxg11nqiz8x63wisv2nw2ggji8lgz48skq";
+ libraryHaskellDepends = [ base ghc-prim transformers ];
+ testHaskellDepends = [
+ base base-orphans ghc-prim QuickCheck semigroups tagged tasty
+ tasty-quickcheck transformers transformers-compat
+ ];
+ description = "Primitive memory-related operations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "primitive-addr" = callPackage
({ mkDerivation, base, primitive }:
mkDerivation {
- pname = "primitive-atomic";
- version = "0.1.0.0";
- sha256 = "0qprxv3y1ayrdz9spgg1vkx5jkh0p5pz49c3gaaxcz8v0pdk0bzv";
+ pname = "primitive-addr";
+ version = "0.1.0.1";
+ sha256 = "01gr75k2j60dgs711w1s9r201ndapqlwapznrvd3cm6r4rm3i54i";
libraryHaskellDepends = [ base primitive ];
- testHaskellDepends = [ base primitive ];
+ description = "Addresses to unmanaged memory";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "primitive-atomic" = callPackage
+ ({ mkDerivation, base, primitive, primitive-unlifted }:
+ mkDerivation {
+ pname = "primitive-atomic";
+ version = "0.1.0.1";
+ sha256 = "0q7lgirw0a75cd0157xq705wnns45d4nx2gfgmvvx0qi6rzvx45s";
+ libraryHaskellDepends = [ base primitive primitive-unlifted ];
+ testHaskellDepends = [ base primitive primitive-unlifted ];
description = "Wrappers for primops around atomic operations";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"primitive-checked" = callPackage
({ mkDerivation, base, primitive }:
mkDerivation {
pname = "primitive-checked";
- version = "0.6.4.1";
- sha256 = "02jac6ra9qws5lp2zwqhz87zqy5j9vhs2hinwp43nnpjd4kngms1";
+ version = "0.7.0.0";
+ sha256 = "1h4gsririgjw8p72dz2p91yq8mxr37qca8rshmxmkmmds8yv6w1s";
libraryHaskellDepends = [ base primitive ];
description = "primitive functions with bounds-checking";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"primitive-containers" = callPackage
- ({ mkDerivation, aeson, base, containers, contiguous, deepseq
- , gauge, ghc-prim, hashable, HUnit, primitive, primitive-sort
- , quantification, QuickCheck, quickcheck-classes, random, tasty
- , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
+ ({ mkDerivation, base, containers, contiguous, deepseq, gauge
+ , ghc-prim, hashable, HUnit, primitive, primitive-sort
+ , primitive-unlifted, QuickCheck, quickcheck-classes, random, tasty
+ , tasty-hunit, tasty-quickcheck, text
}:
mkDerivation {
pname = "primitive-containers";
- version = "0.3.3";
- sha256 = "12qcgh20w3dk08gz2fwi69q2gqygiadsnvcgjvv2gqspncdwqxza";
+ version = "0.4.0";
+ sha256 = "0ljb6np2yxnclqvz2sbpvjs027z701nsdhvmgy607am95sskxlrz";
+ revision = "1";
+ editedCabalFile = "18pxbfqjy2kfxgq1033bp3ci6xjj1ilnik2v5dzdcqlxr923zvkc";
libraryHaskellDepends = [
- aeson base contiguous deepseq hashable primitive primitive-sort
- quantification text unordered-containers vector
+ base contiguous deepseq hashable primitive primitive-sort
+ primitive-unlifted
];
testHaskellDepends = [
- aeson base containers HUnit primitive quantification QuickCheck
+ base containers HUnit primitive primitive-unlifted QuickCheck
quickcheck-classes tasty tasty-hunit tasty-quickcheck text
];
benchmarkHaskellDepends = [
- base containers gauge ghc-prim primitive random
+ base containers gauge ghc-prim primitive primitive-unlifted random
];
description = "containers backed by arrays";
license = stdenv.lib.licenses.bsd3;
@@ -181330,17 +185657,17 @@ self: {
"primitive-extras" = callPackage
({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
- , foldl, list-t, primitive, profunctors, QuickCheck
- , quickcheck-instances, rerebase, tasty, tasty-hunit
+ , foldl, list-t, primitive, primitive-unlifted, profunctors
+ , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit
, tasty-quickcheck, vector
}:
mkDerivation {
pname = "primitive-extras";
- version = "0.7.1";
- sha256 = "1xfvp63qi21iiz1905l61726vp2nnx3sffpphwf53j8yn193c33n";
+ version = "0.8";
+ sha256 = "0g3b7b842wbdh7hqr6ikvycdwk1n3in9dq5yb09g744ydpmvg24r";
libraryHaskellDepends = [
base bytestring cereal deferred-folds focus foldl list-t primitive
- profunctors vector
+ primitive-unlifted profunctors vector
];
testHaskellDepends = [
cereal deferred-folds focus primitive QuickCheck
@@ -181348,6 +185675,20 @@ self: {
];
description = "Extras for the \"primitive\" library";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "primitive-foreign" = callPackage
+ ({ mkDerivation, base, primitive, QuickCheck }:
+ mkDerivation {
+ pname = "primitive-foreign";
+ version = "0.1";
+ sha256 = "0qznygyj4fsgdggrb02nc78nfjyvfjsdaznw01a0sw2b1yld0zqg";
+ libraryHaskellDepends = [ base primitive ];
+ testHaskellDepends = [ base primitive QuickCheck ];
+ description = "using the `Prim` interface for the FFI";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"primitive-indexed" = callPackage
@@ -181378,8 +185719,17 @@ self: {
];
description = "Arrays of Maybes";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ }) {};
+
+ "primitive-offset" = callPackage
+ ({ mkDerivation, base, primitive }:
+ mkDerivation {
+ pname = "primitive-offset";
+ version = "0.2.0.0";
+ sha256 = "0aspdlzx1xaw1fyiy8vnzadbklpg7hn2mb1g9qmw2vpkxglpspmi";
+ libraryHaskellDepends = [ base primitive ];
+ description = "Types for offsets into unboxed arrays";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"primitive-simd" = callPackage
@@ -181407,8 +185757,8 @@ self: {
pname = "primitive-sort";
version = "0.1.0.0";
sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3";
- revision = "2";
- editedCabalFile = "1yn5nwdw5jmzg603ln626gz2ifjn8fssgzq17g4nyriscqfg1aki";
+ revision = "3";
+ editedCabalFile = "1ld4wm2p75nl0qvzmgz1isgl1w59gk9ydg6hq0mijq362vx4ih2w";
libraryHaskellDepends = [ base contiguous ghc-prim primitive ];
testHaskellDepends = [
base containers doctest HUnit primitive QuickCheck smallcheck tasty
@@ -181417,6 +185767,45 @@ self: {
benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
description = "Sort primitive arrays";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "primitive-stablename" = callPackage
+ ({ mkDerivation, base, primitive }:
+ mkDerivation {
+ pname = "primitive-stablename";
+ version = "0.1";
+ sha256 = "1kdrzam5m2svxrpa7k3byg061i5xs0lc6q12hwgiq6l09savql6j";
+ libraryHaskellDepends = [ base primitive ];
+ description = "primitive operations on StableNames";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "primitive-unaligned" = callPackage
+ ({ mkDerivation, base, primitive }:
+ mkDerivation {
+ pname = "primitive-unaligned";
+ version = "0.1.1.0";
+ sha256 = "1dkxm1m22vap0xaw2ssqfqs19lmk41db09rkngbiid0by2yla1gp";
+ libraryHaskellDepends = [ base primitive ];
+ testHaskellDepends = [ base primitive ];
+ description = "Unaligned access to primitive arrays";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "primitive-unlifted" = callPackage
+ ({ mkDerivation, base, primitive, stm }:
+ mkDerivation {
+ pname = "primitive-unlifted";
+ version = "0.1.2.0";
+ sha256 = "1zq5fx032shxsk23hlyj9js8jdbg4r17l0gigsrbrnlajnwk4683";
+ libraryHaskellDepends = [ base primitive ];
+ testHaskellDepends = [ base primitive stm ];
+ description = "Primitive GHC types with unlifted types inside";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"primula-board" = callPackage
@@ -181710,6 +186099,8 @@ self: {
pname = "proc-net";
version = "1.0.0.2";
sha256 = "04zx462sj8kh21a8n7kk3jpcvdh6s64pvgdb0la0sxq0jycfybzz";
+ revision = "1";
+ editedCabalFile = "1ng8xnvzylj2f635kfwmdwhgjshbsmcm1x5c7bscz2m9x10brmhn";
libraryHaskellDepends = [
attoparsec base bytestring network unix
];
@@ -181717,14 +186108,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "process_1_6_5_0" = callPackage
+ "process_1_6_5_1" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, filepath
, unix
}:
mkDerivation {
pname = "process";
- version = "1.6.5.0";
- sha256 = "0a04jch13d0va47yhkf1ni7pk9hxsdr3m4h8645r4qs0mzvsby60";
+ version = "1.6.5.1";
+ sha256 = "1x9vdcj4g19ibf34w96nzgv2blxx727z0xb7dq012ky04ssblx8j";
libraryHaskellDepends = [ base deepseq directory filepath unix ];
testHaskellDepends = [ base bytestring directory ];
description = "Process libraries";
@@ -182185,6 +186576,8 @@ self: {
pname = "profunctors";
version = "5.3";
sha256 = "1dx3nkc27yxsrbrhh3iwhq7dl1xn6bj7n62yx6nh8vmpbg62lqvl";
+ revision = "1";
+ editedCabalFile = "1ynskm55fynsli6lpz6v5py344yhf1mq5xz2b1p7arvf2xqrx4kv";
libraryHaskellDepends = [
base base-orphans bifunctors comonad contravariant distributive
semigroups tagged transformers
@@ -182193,6 +186586,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "profunctors_5_4" = callPackage
+ ({ mkDerivation, base, base-orphans, bifunctors, comonad
+ , contravariant, distributive, tagged, transformers
+ }:
+ mkDerivation {
+ pname = "profunctors";
+ version = "5.4";
+ sha256 = "1b5hidvd3rd8ilzr5ipzw0mg0a2x0ldrrcx6bacalafg7407bfhh";
+ libraryHaskellDepends = [
+ base base-orphans bifunctors comonad contravariant distributive
+ tagged transformers
+ ];
+ description = "Profunctors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"progress" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -182518,18 +186928,14 @@ self: {
}:
mkDerivation {
pname = "prometheus";
- version = "2.1.1";
- sha256 = "09g3xi6x6m6h15p3ibwyabfq15rhcaphq7ix2w23aphjwc64ll97";
- revision = "1";
- editedCabalFile = "1jbs0p3ji5jz0qglkdw6gpr6x3i7ig044rcz58mcil04bsswymgq";
+ version = "2.1.2";
+ sha256 = "1qr8nnijzlp0rwz3rab7y49kxwa4ka7ipix9dix5d1mzqpa1sj5m";
libraryHaskellDepends = [
atomic-primops base bytestring containers http-client http-types
network-uri text transformers wai warp
];
description = "Prometheus Haskell Client";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"prometheus-client" = callPackage
@@ -182604,15 +187010,16 @@ self: {
}) {};
"prometheus-proc" = callPackage
- ({ mkDerivation, base, filepath, prometheus-client
- , regex-applicative, unix, unix-memory
+ ({ mkDerivation, base, directory, filepath, prometheus-client
+ , regex-applicative, text, unix, unix-memory
}:
mkDerivation {
pname = "prometheus-proc";
- version = "0.1.0.0";
- sha256 = "1384kcsnhby17ivjlii2ixqw1qhas6y4l1h8vq3lzaxqydbidhbm";
+ version = "0.1.1.0";
+ sha256 = "1mygx1kjjgrlqbi43g6867ylcynhqki52d9kjl4fi83smrjkhxa9";
libraryHaskellDepends = [
- base filepath prometheus-client regex-applicative unix unix-memory
+ base directory filepath prometheus-client regex-applicative text
+ unix unix-memory
];
description = "Export metrics from /proc for the current process";
license = stdenv.lib.licenses.bsd3;
@@ -182708,23 +187115,25 @@ self: {
"propellor" = callPackage
({ mkDerivation, ansi-terminal, async, base, bytestring, containers
, directory, exceptions, filepath, hashable, hslogger, IfElse, mtl
- , network, process, split, stm, text, time, transformers, unix
- , unix-compat
+ , network, process, split, stm, text, time, transformers
+ , type-errors, unix, unix-compat
}:
mkDerivation {
pname = "propellor";
- version = "5.8.0";
- sha256 = "0dzil48ayfy30cx1mxhp712nibr7qc3hn2pkc11nawkf2g73552f";
+ version = "5.9.0";
+ sha256 = "1hgqq782qyqdnr86cx7xc063ksqyq37pwf58jz2g0rn3sk8qmv1i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal async base bytestring containers directory exceptions
filepath hashable hslogger IfElse mtl network process split stm
- text time transformers unix unix-compat
+ text time transformers type-errors unix unix-compat
];
executableHaskellDepends = [ base ];
description = "property-based host configuration management in haskell";
license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"properties" = callPackage
@@ -182915,7 +187324,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "proto-lens_0_5_0_0" = callPackage
+ "proto-lens_0_5_1_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim
, lens-family, parsec, pretty, primitive, profunctors, QuickCheck
, tagged, test-framework, test-framework-quickcheck2, text
@@ -182923,8 +187332,8 @@ self: {
}:
mkDerivation {
pname = "proto-lens";
- version = "0.5.0.0";
- sha256 = "1h0ng6vymdswapc88c84rp7d4l2l19d9kg7v10a0zbj093k9m98s";
+ version = "0.5.1.0";
+ sha256 = "1jv88j9spv3q679syq0fbpbq8xjggaww5644as31gmvihjfaxby1";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim lens-family parsec
@@ -183676,19 +188085,17 @@ self: {
"psqueues" = callPackage
({ mkDerivation, array, base, containers, criterion, deepseq
, fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
- , QuickCheck, random, tagged, test-framework, test-framework-hunit
- , test-framework-quickcheck2, unordered-containers
+ , QuickCheck, random, tagged, tasty, tasty-hunit, tasty-quickcheck
+ , unordered-containers
}:
mkDerivation {
pname = "psqueues";
- version = "0.2.7.1";
- sha256 = "1hcfxb977lzxsmd47z0snjj4xdhiwnqzif8xkpwzw28dspn44zh4";
- revision = "1";
- editedCabalFile = "0336d9ckixv4n23vy5l3xk0wavfn3z9xk105gig0zv70b3jh3r3y";
+ version = "0.2.7.2";
+ sha256 = "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6";
libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
testHaskellDepends = [
- array base deepseq ghc-prim hashable HUnit QuickCheck tagged
- test-framework test-framework-hunit test-framework-quickcheck2
+ array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty
+ tasty-hunit tasty-quickcheck
];
benchmarkHaskellDepends = [
base containers criterion deepseq fingertree-psqueue ghc-prim
@@ -183716,15 +188123,13 @@ self: {
({ mkDerivation, base, generic-deriving, hspec, hspec-discover }:
mkDerivation {
pname = "pthread";
- version = "0.2.0";
- sha256 = "12130fpdskml0mdgbr38zki48n5ffid0diiixyn89kzcq948vvmn";
+ version = "0.2.1";
+ sha256 = "03whwpcf9ycdy6bhnw6k0xcwrlf5q92lcfzvh45j3wkksccf8vm6";
libraryHaskellDepends = [ base generic-deriving ];
testHaskellDepends = [ base hspec hspec-discover ];
testToolDepends = [ hspec-discover ];
description = "Bindings for the pthread library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ptr" = callPackage
@@ -183735,14 +188140,14 @@ self: {
}:
mkDerivation {
pname = "ptr";
- version = "0.16.6";
- sha256 = "1makksw42pb6088i3s755q0wyfismfq5avpwbcfvfbzcasn2kncs";
+ version = "0.16.6.1";
+ sha256 = "0d0ghvg2wx4z5bha33wb868wja28iafh3z5g5vsyy729nj7fp69k";
libraryHaskellDepends = [
base base-prelude bug bytestring contravariant mtl profunctors
semigroups text time transformers vector
];
testHaskellDepends = [
- bug QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
tasty-quickcheck
];
description = "Abstractions for operations on pointers";
@@ -183775,8 +188180,8 @@ self: {
}:
mkDerivation {
pname = "publicsuffix";
- version = "0.20190115";
- sha256 = "1w73kpqb8s6yc7h66cam89gcmz6qnsgis2fqvyr9vrqs466k3j01";
+ version = "0.20190630";
+ sha256 = "0b35jayk5n8p7zn2nkgzvqgpiai0h7g3pf27i5bzxlaw2zwm9320";
libraryHaskellDepends = [ base filepath template-haskell ];
testHaskellDepends = [ base hspec ];
benchmarkHaskellDepends = [ base criterion random ];
@@ -183824,25 +188229,25 @@ self: {
"publish" = callPackage
({ mkDerivation, base, bytestring, chronologique, deepseq
- , directory, filepath, hinotify, hspec, pandoc, pandoc-types
- , template-haskell, text, typed-process, unbeliever, unix
- , unordered-containers
+ , directory, filepath, hinotify, hspec, megaparsec, pandoc
+ , pandoc-types, template-haskell, text, typed-process, unbeliever
+ , unix, unordered-containers
}:
mkDerivation {
pname = "publish";
- version = "0.4.4";
- sha256 = "1a75pqz9gvzda70182gvfwjjzsrqdspngj00mlma1ayr9jy4sxr4";
+ version = "2.0.1";
+ sha256 = "12jhwihg6nlhs1q2cf4ivd7qw724qz1wk1i5rmi4akfga8ad7n4l";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base bytestring chronologique deepseq directory filepath hinotify
- pandoc pandoc-types template-haskell text typed-process unbeliever
- unix unordered-containers
+ megaparsec pandoc pandoc-types template-haskell text typed-process
+ unbeliever unix unordered-containers
];
testHaskellDepends = [
base bytestring chronologique deepseq directory filepath hinotify
- hspec pandoc pandoc-types template-haskell text typed-process
- unbeliever unix unordered-containers
+ hspec megaparsec pandoc pandoc-types template-haskell text
+ typed-process unbeliever unix unordered-containers
];
description = "Publishing tools for papers, books, and presentations";
license = stdenv.lib.licenses.bsd3;
@@ -184155,6 +188560,8 @@ self: {
pname = "pure-io";
version = "0.2.1";
sha256 = "0pzvkd8jxw859s187n972yaq5wmwi00cxwhivgffr7z29hr0zvx9";
+ revision = "1";
+ editedCabalFile = "04r055y62f46lxhm4wbfmdk115fslw7lapw06r16lzb1l48m0phj";
libraryHaskellDepends = [ base containers mtl safe ];
description = "Pure IO monad";
license = stdenv.lib.licenses.bsd3;
@@ -184282,63 +188689,67 @@ self: {
}) {};
"purescript" = callPackage
- ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
- , ansi-wl-pprint, array, base, base-compat, blaze-html, bower-json
- , boxes, bytestring, Cabal, cheapskate, clock, containers
- , data-ordlist, deepseq, directory, dlist, edit-distance
- , file-embed, filepath, fsnotify, gitrev, Glob, haskeline, hspec
- , hspec-discover, http-types, HUnit, language-javascript
- , lifted-base, microlens-platform, monad-control, monad-logger, mtl
- , network, optparse-applicative, parallel, parsec, pattern-arrows
- , process, protolude, regex-tdfa, safe, scientific, semigroups
- , sourcemap, split, stm, stringsearch, syb, tasty, tasty-hspec
- , text, time, transformers, transformers-base, transformers-compat
- , unordered-containers, utf8-string, vector, wai, wai-websockets
- , warp, websockets
+ ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty
+ , ansi-terminal, ansi-wl-pprint, array, base, base-compat
+ , blaze-html, bower-json, boxes, bytestring, Cabal, cheapskate
+ , clock, containers, data-ordlist, deepseq, directory, dlist
+ , edit-distance, file-embed, filepath, fsnotify, gitrev, Glob
+ , happy, haskeline, hspec, hspec-discover, http-types, HUnit
+ , language-javascript, lifted-async, lifted-base
+ , microlens-platform, monad-control, monad-logger, mtl, network
+ , optparse-applicative, parallel, parsec, pattern-arrows, process
+ , protolude, regex-tdfa, safe, scientific, semigroups, sourcemap
+ , split, stm, stringsearch, syb, tasty, tasty-golden, tasty-hspec
+ , tasty-quickcheck, text, time, transformers, transformers-base
+ , transformers-compat, unordered-containers, utf8-string, vector
+ , wai, wai-websockets, warp, websockets
}:
mkDerivation {
pname = "purescript";
- version = "0.12.5";
- sha256 = "0dpn0v510lgzd9zqglqan4m8l7bf891psqmih147pnrmigmiaa39";
+ version = "0.13.2";
+ sha256 = "0g4g2xsn3r5xxqndlyg1yxnsdgj27l5zll9q6wly119mkcllvvql";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-better-errors ansi-terminal array base base-compat
- blaze-html bower-json boxes bytestring Cabal cheapskate clock
- containers data-ordlist deepseq directory dlist edit-distance
+ aeson aeson-better-errors aeson-pretty ansi-terminal array base
+ base-compat blaze-html bower-json boxes bytestring Cabal cheapskate
+ clock containers data-ordlist deepseq directory dlist edit-distance
file-embed filepath fsnotify Glob haskeline language-javascript
- lifted-base microlens-platform monad-control monad-logger mtl
- parallel parsec pattern-arrows process protolude regex-tdfa safe
- scientific semigroups sourcemap split stm stringsearch syb text
- time transformers transformers-base transformers-compat
- unordered-containers utf8-string vector
+ lifted-async lifted-base microlens-platform monad-control
+ monad-logger mtl parallel parsec pattern-arrows process protolude
+ regex-tdfa safe scientific semigroups sourcemap split stm
+ stringsearch syb text time transformers transformers-base
+ transformers-compat unordered-containers utf8-string vector
];
+ libraryToolDepends = [ happy ];
executableHaskellDepends = [
- aeson aeson-better-errors ansi-terminal ansi-wl-pprint array base
- base-compat blaze-html bower-json boxes bytestring Cabal cheapskate
- clock containers data-ordlist deepseq directory dlist edit-distance
- file-embed filepath fsnotify gitrev Glob haskeline http-types
- language-javascript lifted-base microlens-platform monad-control
- monad-logger mtl network optparse-applicative parallel parsec
- pattern-arrows process protolude regex-tdfa safe scientific
- semigroups sourcemap split stm stringsearch syb text time
- transformers transformers-base transformers-compat
- unordered-containers utf8-string vector wai wai-websockets warp
- websockets
+ aeson aeson-better-errors aeson-pretty ansi-terminal ansi-wl-pprint
+ array base base-compat blaze-html bower-json boxes bytestring Cabal
+ cheapskate clock containers data-ordlist deepseq directory dlist
+ edit-distance file-embed filepath fsnotify gitrev Glob haskeline
+ http-types language-javascript lifted-async lifted-base
+ microlens-platform monad-control monad-logger mtl network
+ optparse-applicative parallel parsec pattern-arrows process
+ protolude regex-tdfa safe scientific semigroups sourcemap split stm
+ stringsearch syb text time transformers transformers-base
+ transformers-compat unordered-containers utf8-string vector wai
+ wai-websockets warp websockets
];
+ executableToolDepends = [ happy ];
testHaskellDepends = [
- aeson aeson-better-errors ansi-terminal array base base-compat
- blaze-html bower-json boxes bytestring Cabal cheapskate clock
- containers data-ordlist deepseq directory dlist edit-distance
+ aeson aeson-better-errors aeson-pretty ansi-terminal array base
+ base-compat blaze-html bower-json boxes bytestring Cabal cheapskate
+ clock containers data-ordlist deepseq directory dlist edit-distance
file-embed filepath fsnotify Glob haskeline hspec hspec-discover
- HUnit language-javascript lifted-base microlens-platform
- monad-control monad-logger mtl parallel parsec pattern-arrows
- process protolude regex-tdfa safe scientific semigroups sourcemap
- split stm stringsearch syb tasty tasty-hspec text time transformers
+ HUnit language-javascript lifted-async lifted-base
+ microlens-platform monad-control monad-logger mtl parallel parsec
+ pattern-arrows process protolude regex-tdfa safe scientific
+ semigroups sourcemap split stm stringsearch syb tasty tasty-golden
+ tasty-hspec tasty-quickcheck text time transformers
transformers-base transformers-compat unordered-containers
utf8-string vector
];
- testToolDepends = [ hspec-discover ];
+ testToolDepends = [ happy hspec-discover ];
doCheck = false;
description = "PureScript Programming Language Compiler";
license = stdenv.lib.licenses.bsd3;
@@ -184420,8 +188831,8 @@ self: {
}:
mkDerivation {
pname = "purescript-tsd-gen";
- version = "0.2.0.0";
- sha256 = "1l00xyz501gaig3fci9dyz28qdd2zdajzfwnp6hj17c46g8g95f6";
+ version = "0.3.0.0";
+ sha256 = "0246pxgwrqbrhsgixx6mp9w1h355qz29gx1b7bmdxxxafyn2il6n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -184624,8 +189035,8 @@ self: {
}:
mkDerivation {
pname = "pusher-http-haskell";
- version = "1.5.1.7";
- sha256 = "01p168y4hwn38b4lpf3pi7pv5w46pd8gmli42q7bs3jxd6jhhppc";
+ version = "1.5.1.9";
+ sha256 = "020f7dxlamc02r312z3nkr9r4q69z5dw5ly3ilfy0mrzngi8dvg3";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring cryptonite hashable
http-client http-types memory text time transformers
@@ -185129,12 +189540,46 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "qnap-decrypt_0_3_5" = callPackage
+ ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit
+ , conduit-extra, crypto-api, directory, filepath, hspec, HUnit
+ , optparse-applicative, streaming-commons, tagged, temporary
+ , utf8-string
+ }:
+ mkDerivation {
+ pname = "qnap-decrypt";
+ version = "0.3.5";
+ sha256 = "1mm08bm2jzcnh1zal7zdiyryl3z5z91ch2vyyl0p29nbwl2q06xb";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base binary bytestring cipher-aes128 conduit conduit-extra
+ crypto-api directory streaming-commons tagged utf8-string
+ ];
+ executableHaskellDepends = [
+ base binary bytestring cipher-aes128 conduit conduit-extra
+ crypto-api directory filepath optparse-applicative
+ streaming-commons tagged utf8-string
+ ];
+ testHaskellDepends = [
+ base binary bytestring cipher-aes128 conduit conduit-extra
+ crypto-api directory filepath hspec HUnit streaming-commons tagged
+ temporary utf8-string
+ ];
+ description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"qq-literals" = callPackage
({ mkDerivation, base, network-uri, template-haskell }:
mkDerivation {
pname = "qq-literals";
version = "0.1.0.0";
sha256 = "1fsl1639jzik9zrkks1badx6pd303rjdm3dmnb6cfjjb1jg50cqr";
+ revision = "1";
+ editedCabalFile = "1ckapl1mca1w61ifrfmaw2x06cy86chbicyb96kgp1hzkcpnx97k";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base network-uri template-haskell ];
description = "Compile-time checked literal values via QuasiQuoters";
@@ -185201,8 +189646,8 @@ self: {
}:
mkDerivation {
pname = "qrcode-core";
- version = "0.9.0";
- sha256 = "1kbd88p0px9p8w9v9jgxv03xsl2b7ksjsf6m5c5xffpmjilij9b4";
+ version = "0.9.1";
+ sha256 = "1mklz3r4z2ifzsl061rqjhrnis1a1fyvaxlp6dws4y95dy4slm92";
libraryHaskellDepends = [
base binary bytestring case-insensitive containers dlist primitive
text vector
@@ -185847,23 +190292,22 @@ self: {
];
description = "QuickCheck common typeclasses";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
- "quickcheck-classes_0_6_1_0" = callPackage
+ "quickcheck-classes_0_6_2_1" = callPackage
({ mkDerivation, aeson, base, base-orphans, bifunctors, containers
- , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings
- , tagged, tasty, tasty-quickcheck, transformers, vector
+ , contravariant, fail, primitive, primitive-addr, QuickCheck
+ , semigroupoids, semigroups, semirings, tagged, tasty
+ , tasty-quickcheck, transformers, vector
}:
mkDerivation {
pname = "quickcheck-classes";
- version = "0.6.1.0";
- sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h";
+ version = "0.6.2.1";
+ sha256 = "1pw4r4166a3f0ylvjifpcnicfh9kidz7lvjpgp4m0frhaqhx82ig";
libraryHaskellDepends = [
- aeson base base-orphans bifunctors containers fail primitive
- QuickCheck semigroupoids semigroups semirings tagged transformers
- vector
+ aeson base base-orphans bifunctors containers contravariant fail
+ primitive primitive-addr QuickCheck semigroupoids semigroups
+ semirings tagged transformers vector
];
testHaskellDepends = [
aeson base base-orphans containers primitive QuickCheck
@@ -185872,7 +190316,6 @@ self: {
description = "QuickCheck common typeclasses";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"quickcheck-combinators" = callPackage
@@ -185919,21 +190362,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "quickcheck-instances_0_3_20" = callPackage
+ "quickcheck-instances_0_3_22" = callPackage
({ mkDerivation, array, base, base-compat, bytestring
, case-insensitive, containers, hashable, old-time, QuickCheck
- , scientific, splitmix, tagged, text, time, transformers
- , transformers-compat, unordered-containers, uuid-types, vector
+ , scientific, splitmix, tagged, text, time, time-compat
+ , transformers, transformers-compat, unordered-containers
+ , uuid-types, vector
}:
mkDerivation {
pname = "quickcheck-instances";
- version = "0.3.20";
- sha256 = "1f5mr70hgzg0ys8x6fkhdlh7bvvy4c1p4z23s4qzc6r9jvd11vya";
+ version = "0.3.22";
+ sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax";
libraryHaskellDepends = [
array base base-compat bytestring case-insensitive containers
hashable old-time QuickCheck scientific splitmix tagged text time
- transformers transformers-compat unordered-containers uuid-types
- vector
+ time-compat transformers transformers-compat unordered-containers
+ uuid-types vector
];
testHaskellDepends = [
base containers QuickCheck tagged uuid-types
@@ -186092,8 +190536,8 @@ self: {
({ mkDerivation, base, QuickCheck }:
mkDerivation {
pname = "quickcheck-simple";
- version = "0.1.0.4";
- sha256 = "0524xkhx2qa6wfl7wf9qdjscr2djl0l08a1bk6ikigcpdabbb3l0";
+ version = "0.1.1.0";
+ sha256 = "0rclb8ghakcrcw3sz9q8lvb2zh1a4lafb711mqpfl0csd3yvlia4";
libraryHaskellDepends = [ base QuickCheck ];
description = "Test properties and default-mains for QuickCheck";
license = stdenv.lib.licenses.bsd3;
@@ -186234,8 +190678,8 @@ self: {
({ mkDerivation, base, QuickCheck, random, transformers }:
mkDerivation {
pname = "quickcheck-transformer";
- version = "0.3";
- sha256 = "1lj6w1ywy8bixiwvapgb7ng5yy0nrxgvr8y9dn4kl3yvah936k4j";
+ version = "0.3.1";
+ sha256 = "1jbn17gp2f5ppm83vs2gd3fcbkv3km45qfjgr6qz532ks1a8k0fl";
libraryHaskellDepends = [ base QuickCheck random transformers ];
description = "A GenT monad transformer for QuickCheck library";
license = stdenv.lib.licenses.mit;
@@ -186739,8 +191183,6 @@ self: {
];
description = "The raaz cryptographic library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"rabocsv2qif" = callPackage
@@ -186829,10 +191271,8 @@ self: {
}:
mkDerivation {
pname = "radius";
- version = "0.6.0.1";
- sha256 = "19c2bv0iq4j0709rf9k9jk5q2s756bvjnr1gy630mcgp92rg8d9j";
- revision = "1";
- editedCabalFile = "1a4q1kz21v2m4wfdfaawdlkfnq9s8c5iijzcrdprrgsbi3kplrdi";
+ version = "0.6.0.3";
+ sha256 = "01mj0b0pasx60d93pi843vzhj31949wgf41l59jd2ps6ykhayx5b";
libraryHaskellDepends = [
base binary bytestring cryptonite iproute memory
];
@@ -187299,10 +191739,8 @@ self: {
}:
mkDerivation {
pname = "random-bytestring";
- version = "0.1.3.1";
- sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k";
- revision = "1";
- editedCabalFile = "0gk5hcx1j06rklfd2cv63kh5dzjk8hr184riam784c7s9zg3s9a4";
+ version = "0.1.3.2";
+ sha256 = "16mjdb1sy7ppfbj5hshjpyrly6mklzvxip8vrqcvsfm869pkzayw";
libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
benchmarkHaskellDepends = [
async base bytestring criterion cryptonite entropy ghc-prim
@@ -187763,8 +192201,6 @@ self: {
];
description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"rapid-term" = callPackage
@@ -188033,6 +192469,8 @@ self: {
pname = "rasterific-svg";
version = "0.3.3.2";
sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2";
+ revision = "1";
+ editedCabalFile = "19i9wlk951d85dqnmbgrnz0fg4xcw7cbv9cs2h8b440lycj3p4cv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -188106,8 +192544,8 @@ self: {
}:
mkDerivation {
pname = "rating-chgk-info";
- version = "0.3.6.4";
- sha256 = "0sfrsjlxlg08k0g8g65v21i2qr1ibq0cfgy7sayb1xbkqc319jvr";
+ version = "0.3.6.5";
+ sha256 = "08qfrrhc8kg95jvhv5m99zrb062w64z1jzm46zm4ah6mdjlpac18";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -188204,31 +192642,31 @@ self: {
broken = true;
}) {};
- "rattletrap_6_3_0" = callPackage
+ "rattletrap_9_0_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
- , bytestring, clock, containers, filepath, http-client
- , http-client-tls, HUnit, template-haskell, temporary, text
+ , bytestring, containers, filepath, http-client, http-client-tls
+ , HUnit, scientific, template-haskell, temporary, text
, transformers
}:
mkDerivation {
pname = "rattletrap";
- version = "6.3.0";
- sha256 = "0b20ih5b1g74zpdyhlpi9j98zjimad1b6lwmxqqdcviw2wwih28p";
+ version = "9.0.1";
+ sha256 = "0b6w0zb5vzm0zp5lv00n599dqsqmvxbm96zdlnw4y9gx579qxpc6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty base binary binary-bits bytestring containers
- filepath http-client http-client-tls template-haskell text
- transformers
+ filepath http-client http-client-tls scientific template-haskell
+ text transformers
];
executableHaskellDepends = [
aeson aeson-pretty base binary binary-bits bytestring containers
- filepath http-client http-client-tls template-haskell text
- transformers
+ filepath http-client http-client-tls scientific template-haskell
+ text transformers
];
testHaskellDepends = [
- aeson aeson-pretty base binary binary-bits bytestring clock
- containers filepath http-client http-client-tls HUnit
+ aeson aeson-pretty base binary binary-bits bytestring containers
+ filepath http-client http-client-tls HUnit scientific
template-haskell temporary text transformers
];
description = "Parse and generate Rocket League replays";
@@ -188471,14 +192909,14 @@ self: {
"rcu" = callPackage
({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest
- , containers, criterion, deepseq, doctest, fail, ghc-prim, hlint
+ , containers, criterion, deepseq, doctest, fail, ghc-prim
, optparse-applicative, parallel, primitive, rdtsc, time
, transformers
}:
mkDerivation {
pname = "rcu";
- version = "0.2.3";
- sha256 = "17w0y843z5mr095cazfrz1jnf731zjsnd6vhgkx8ppras05vs371";
+ version = "0.2.4";
+ sha256 = "1zl6gl6b9x2ppxzrvb356216f7gi1kpwxsqb0w220f86wyzf9gbr";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -188486,15 +192924,13 @@ self: {
atomic-primops base fail ghc-prim parallel primitive transformers
];
executableHaskellDepends = [ base transformers ];
- testHaskellDepends = [ base doctest hlint parallel ];
+ testHaskellDepends = [ base doctest parallel ];
benchmarkHaskellDepends = [
base containers criterion deepseq ghc-prim optparse-applicative
primitive rdtsc time transformers
];
description = "Read-Copy-Update for Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"rdf" = callPackage
@@ -188515,8 +192951,6 @@ self: {
];
description = "Representation and Incremental Processing of RDF Data";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"rdf4h" = callPackage
@@ -189227,13 +193661,13 @@ self: {
, cubicbezier, diagrams, diagrams-contrib, diagrams-core
, diagrams-lib, diagrams-svg, directory, filepath, fsnotify
, hashable, JuicyPixels, lens, linear, matrices, matrix, mtl
- , palette, parallel, process, reanimate-svg, svg-builder, text
- , time, unix, websockets, xml
+ , open-browser, palette, parallel, process, reanimate-svg
+ , svg-builder, text, time, websockets, xml
}:
mkDerivation {
pname = "reanimate";
- version = "0.1.4.1";
- sha256 = "04yzlznyrd4c21732ijl1y5c8kg6x3139jv3d5qvcxphsmkxw81f";
+ version = "0.1.5.0";
+ sha256 = "1jh9inlx92qn3klzi9385nfvphrwmmdbbs2gql019bdwmyhd815x";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -189241,8 +193675,8 @@ self: {
attoparsec base bytestring containers cubicbezier diagrams
diagrams-contrib diagrams-core diagrams-lib diagrams-svg directory
filepath fsnotify hashable JuicyPixels lens linear matrices matrix
- mtl palette parallel process reanimate-svg svg-builder text time
- unix websockets xml
+ mtl open-browser palette parallel process reanimate-svg svg-builder
+ text time websockets xml
];
description = "Animation library based on SVGs";
license = stdenv.lib.licenses.publicDomain;
@@ -189268,6 +193702,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "reason-export" = callPackage
+ ({ mkDerivation, base, bytestring, containers, Diff, directory
+ , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck
+ , quickcheck-instances, text, time, wl-pprint-text
+ }:
+ mkDerivation {
+ pname = "reason-export";
+ version = "0.1.2.0";
+ sha256 = "0mgzpkxm38r4ghi418cp5axksh9lz3l6d439h8987rsf5n5bcndy";
+ libraryHaskellDepends = [
+ base bytestring containers directory formatting hashable mtl text
+ time wl-pprint-text
+ ];
+ testHaskellDepends = [
+ base bytestring containers Diff hashable hspec hspec-core HUnit
+ QuickCheck quickcheck-instances text time
+ ];
+ description = "Generate Reason types from Haskell";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"reasonable-lens" = callPackage
({ mkDerivation, base, mtl, split, template-haskell }:
mkDerivation {
@@ -189303,8 +193758,8 @@ self: {
}:
mkDerivation {
pname = "rebase";
- version = "1.3.1";
- sha256 = "1vnwc12dp8w1sbh4z8wh451nqrlp94jml4kakvj4vscsv6c14dy4";
+ version = "1.3.1.1";
+ sha256 = "0q4m2fa7wkgxs0grir8rlqwibasmi3s1x7c107ynndwfm62nzv0a";
libraryHaskellDepends = [
base base-prelude bifunctors bytestring containers contravariant
contravariant-extras deepseq dlist either fail hashable mtl
@@ -189539,10 +193994,8 @@ self: {
}:
mkDerivation {
pname = "records-sop";
- version = "0.1.0.2";
- sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5";
- revision = "1";
- editedCabalFile = "082f4dmdvbnv6jq28mrva8clxif366vcbn9m8d1bb8lcf9h3qxjb";
+ version = "0.1.0.3";
+ sha256 = "120kb6z4si5wqkahbqxqhm3qb8xpc9ivwg293ymz8a4ri1hdr0a5";
libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ];
testHaskellDepends = [
base deepseq generics-sop hspec should-not-typecheck
@@ -189588,6 +194041,8 @@ self: {
pname = "recursion-schemes";
version = "5.1.3";
sha256 = "0a0mkwy3sxg5f1mdlblpn0xl3lwgilnmzs94jqab0pqx9gjkc5xj";
+ revision = "1";
+ editedCabalFile = "0zxcmga4fy42arbyv1kzbyfnsghnll3prkpva58x654x4cg4diwk";
libraryHaskellDepends = [
base base-orphans comonad free template-haskell th-abstraction
transformers
@@ -189885,6 +194340,8 @@ self: {
pname = "reducers";
version = "3.12.3";
sha256 = "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki";
+ revision = "1";
+ editedCabalFile = "1v0r75wkaahxdv4y0sqgcikvgwymiz12fa8nkk59n1g4x9nng9wb";
libraryHaskellDepends = [
array base bytestring containers fingertree hashable semigroupoids
semigroups text transformers unordered-containers
@@ -190086,21 +194543,20 @@ self: {
}) {};
"refined" = callPackage
- ({ mkDerivation, aeson, base, deepseq, exceptions, mtl
- , prettyprinter, QuickCheck, template-haskell, these, transformers
+ ({ mkDerivation, aeson, base, deepseq, doctest, exceptions, mtl
+ , prettyprinter, QuickCheck, template-haskell, transformers
}:
mkDerivation {
pname = "refined";
- version = "0.4.1";
- sha256 = "1n3mdnknii99kvac4mmvjwi1nwk5527kci211w5n6z796dx56n8v";
+ version = "0.4.2.1";
+ sha256 = "0p74hqmlx0ns8zjn689ngfjn4y5rvap5fza0p9mpx7107bskdf9d";
libraryHaskellDepends = [
aeson base deepseq exceptions mtl prettyprinter QuickCheck
- template-haskell these transformers
+ template-haskell transformers
];
+ testHaskellDepends = [ base doctest ];
description = "Refinement types with static and runtime checking";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"reflection" = callPackage
@@ -190109,6 +194565,8 @@ self: {
pname = "reflection";
version = "2.1.4";
sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj";
+ revision = "1";
+ editedCabalFile = "05ibi4ivvh87d96xl09yh0day08p5www5vp568mvn2dp37rxyngc";
libraryHaskellDepends = [ base template-haskell ];
description = "Reifies arbitrary terms into types that can be reflected back into terms";
license = stdenv.lib.licenses.bsd3;
@@ -190175,8 +194633,6 @@ self: {
];
description = "Higher-order Functional Reactive Programming";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"reflex-animation" = callPackage
@@ -190237,8 +194693,6 @@ self: {
executableHaskellDepends = [ base mtl reflex ];
description = "A basic `reflex` host for backend work";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"reflex-dom" = callPackage
@@ -190508,8 +194962,8 @@ self: {
({ mkDerivation, base, containers, mtl, semigroups, text }:
mkDerivation {
pname = "reform";
- version = "0.2.7.3";
- sha256 = "18aqpbssm2cxjry567qc7ccvs0wy18gm292gjf5vgzl7gjk7k2n2";
+ version = "0.2.7.4";
+ sha256 = "0dl0jz5ibcj4vafpf0a0v52rac4nmmif69817g7qgxavc093nq82";
libraryHaskellDepends = [ base containers mtl semigroups text ];
description = "reform is a type-safe HTML form generation and validation library";
license = stdenv.lib.licenses.bsd3;
@@ -190694,6 +195148,8 @@ self: {
pname = "regex-base";
version = "0.93.2";
sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
+ revision = "1";
+ editedCabalFile = "1ijzh7yz7i6hvn8xlgyrc75l7zzn0z3kd4ks2yjfih4iir63y4ns";
libraryHaskellDepends = [ array base bytestring containers mtl ];
description = "Replaces/Enhances Text.Regex";
license = stdenv.lib.licenses.bsd3;
@@ -190975,8 +195431,8 @@ self: {
}:
mkDerivation {
pname = "regex-tdfa";
- version = "1.2.3.1";
- sha256 = "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala";
+ version = "1.2.3.2";
+ sha256 = "03yhpqrqz977nwlnhnyz9dacnbzw8xb6j18h365rkgmbc05sb3hf";
libraryHaskellDepends = [
array base bytestring containers ghc-prim mtl parsec regex-base
];
@@ -191144,8 +195600,8 @@ self: {
}:
mkDerivation {
pname = "regexchar";
- version = "0.9.0.16";
- sha256 = "01bn4vazmnqvng8a989l50v7vy9bd7g57x9v44d6cn78q773vfzh";
+ version = "0.9.0.17";
+ sha256 = "1vkljfqilk0sfwnww1b907lqsdqxd8fdy64kf4vg26r89rzcd5i9";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -191168,8 +195624,8 @@ self: {
}:
mkDerivation {
pname = "regexdot";
- version = "0.12.2.0";
- sha256 = "12vbdljm38nnl76byik6fzar51v0nyjm1dp4ky8fh16f5ghnm5b8";
+ version = "0.12.2.1";
+ sha256 = "0s8jbkhhlhhdadwf7d8hy1cjs05mlf1r3czc861llwqrshys3c8c";
libraryHaskellDepends = [
base data-default deepseq extra parallel parsec toolshed
];
@@ -191329,23 +195785,23 @@ self: {
"registry" = callPackage
({ mkDerivation, async, base, containers, exceptions, generic-lens
- , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl
+ , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl
, multimap, protolude, random, resourcet, semigroupoids, semigroups
, tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell
, text, transformers-base, universum
}:
mkDerivation {
pname = "registry";
- version = "0.1.3.5";
- sha256 = "1nyk32bimkhsbz2597hdy089c7w5025wj9yfj1i3gd0145liaf2h";
+ version = "0.1.6.2";
+ sha256 = "03j7m08wj0abr0nywb3vgsifyhmdrr7mvbn82gg8kx3gcbxvanbd";
libraryHaskellDepends = [
- base containers exceptions hashable mtl protolude resourcet
+ base containers exceptions hashable mmorph mtl protolude resourcet
semigroupoids semigroups template-haskell text transformers-base
];
testHaskellDepends = [
async base containers exceptions generic-lens hashable hedgehog
- hedgehog-corpus io-memoize MonadRandom mtl multimap protolude
- random resourcet semigroupoids semigroups tasty tasty-discover
+ io-memoize mmorph MonadRandom mtl multimap protolude random
+ resourcet semigroupoids semigroups tasty tasty-discover
tasty-hedgehog tasty-th template-haskell text transformers-base
universum
];
@@ -191356,6 +195812,33 @@ self: {
broken = true;
}) {};
+ "registry-hedgehog" = callPackage
+ ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph
+ , multimap, protolude, registry, tasty, tasty-discover
+ , tasty-hedgehog, tasty-th, template-haskell, text, transformers
+ , universum, unordered-containers
+ }:
+ mkDerivation {
+ pname = "registry-hedgehog";
+ version = "0.2.0.3";
+ sha256 = "138x33b9sficpy20dvcayf9isilv9crng2d46m2gh7ckidw94ghp";
+ libraryHaskellDepends = [
+ base containers hedgehog mmorph multimap protolude registry tasty
+ tasty-discover tasty-hedgehog tasty-th template-haskell text
+ transformers universum unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers generic-lens hedgehog mmorph multimap protolude
+ registry tasty tasty-discover tasty-hedgehog tasty-th
+ template-haskell text transformers universum unordered-containers
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "utilities to work with Hedgehog generators and `registry`";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"regress" = callPackage
({ mkDerivation, ad, base, vector }:
mkDerivation {
@@ -191556,16 +196039,20 @@ self: {
}) {};
"relation" = callPackage
- ({ mkDerivation, array, base, containers, groom }:
+ ({ mkDerivation, base, containers, hedgehog, hspec, hspec-discover
+ , hw-hspec-hedgehog
+ }:
mkDerivation {
pname = "relation";
- version = "0.2.1";
- sha256 = "03h6l8v3ppxbwg9ddgg121yx3i2v4vbcpwrv1vg3mgbw5pwq7x4c";
- libraryHaskellDepends = [ array base containers groom ];
+ version = "0.5";
+ sha256 = "13vzx6hq7ncd9z05ikvls60xp5dc4f7qb926s8df26zll4ayndlb";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [
+ base containers hedgehog hspec hw-hspec-hedgehog
+ ];
+ testToolDepends = [ hspec-discover ];
description = "A data structure representing Relations on Sets";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"relational-postgresql8" = callPackage
@@ -191595,8 +196082,8 @@ self: {
}:
mkDerivation {
pname = "relational-query";
- version = "0.12.1.0";
- sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k";
+ version = "0.12.2.1";
+ sha256 = "09ihkynff79kpgph6kwb0rr6q9crkppdhal4nz7gvb1nx3y8fw9s";
libraryHaskellDepends = [
array base bytestring containers dlist names-th persistable-record
product-isomorphic sql-words template-haskell text th-reify-compat
@@ -191618,8 +196105,8 @@ self: {
}:
mkDerivation {
pname = "relational-query-HDBC";
- version = "0.7.1.1";
- sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk";
+ version = "0.7.2.0";
+ sha256 = "0gzgjqh6pp4nf2zkc77xmm9sm02h2hya1bn339z1sa71nxs0ksc3";
libraryHaskellDepends = [
base containers convertible dlist HDBC HDBC-session names-th
persistable-record product-isomorphic relational-query
@@ -191652,13 +196139,13 @@ self: {
"relational-record-examples" = callPackage
({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
- , persistable-record, relational-query, relational-query-HDBC
- , relational-schemas, template-haskell
+ , persistable-record, product-isomorphic, relational-query
+ , relational-query-HDBC, relational-schemas, template-haskell, time
}:
mkDerivation {
pname = "relational-record-examples";
- version = "0.5.1.1";
- sha256 = "0ll6yjp0scbv2fl18b8qplj488a4wp985dr2km0hf4zjb1mri0i0";
+ version = "0.6.0.0";
+ sha256 = "1f37pzz60zrg5z09vf6sdp9in5f78kyvxag6gbyanapi7iki14k3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -191666,6 +196153,9 @@ self: {
relational-query relational-query-HDBC relational-schemas
template-haskell
];
+ executableHaskellDepends = [
+ base product-isomorphic relational-query template-haskell time
+ ];
description = "Examples of Haskell Relationa Record";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -191676,8 +196166,8 @@ self: {
}:
mkDerivation {
pname = "relational-schemas";
- version = "0.1.6.2";
- sha256 = "1c578lz7k06clwn92wi3xl20imn8ddivqblxn0vqrnn5hfkfy8jm";
+ version = "0.1.7.0";
+ sha256 = "1yhgn2sjq7530s31fyyaxms5vnqwl03pwvsn0sm8f6yyzjvwm38b";
libraryHaskellDepends = [
base bytestring containers relational-query template-haskell time
];
@@ -191705,8 +196195,8 @@ self: {
({ mkDerivation, aeson, base, chronos, text, torsor }:
mkDerivation {
pname = "relevant-time";
- version = "0.1.0.0";
- sha256 = "0i9g6rqq31y6y9jnc9bi0vfrpxmjr3vqfjz2w4q7jc87dplyd2qk";
+ version = "0.1.1.0";
+ sha256 = "0978g03dlkgx45hxzk3lwl68iln8jnf0hldchac4yqp4c9rsxf22";
libraryHaskellDepends = [ aeson base chronos text torsor ];
description = "humanised relevant time";
license = stdenv.lib.licenses.bsd3;
@@ -191792,6 +196282,8 @@ self: {
pname = "relude";
version = "0.5.0";
sha256 = "108xd4ybfj7v0cc0h71cym0z31fzsi17aad2l3s17j11h6ainhbm";
+ revision = "1";
+ editedCabalFile = "0qw27rmf14dn44lics58mqdf4wfcnx5z5zrwi13bsbf8qicmd7cb";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable mtl stm text
transformers unordered-containers
@@ -192095,8 +196587,8 @@ self: {
pname = "repa";
version = "3.4.1.4";
sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
- revision = "1";
- editedCabalFile = "1c5rf3ky5lw9q1ji2y37m721gs7m5liw3j84159ib0w0bb3ddzmi";
+ revision = "2";
+ editedCabalFile = "16kyy7ck3yki0mlcap0bbiadcn18yn6x90m4s2prkasi9ip0pcs8";
libraryHaskellDepends = [
base bytestring ghc-prim QuickCheck template-haskell vector
];
@@ -192200,8 +196692,8 @@ self: {
pname = "repa-examples";
version = "3.4.1.2";
sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d";
- revision = "1";
- editedCabalFile = "00w3cyd3r2jp1z962fwchsg4ffqfhq99mnl4anwcylxdkp15jv0l";
+ revision = "2";
+ editedCabalFile = "0aghk6pav63hx13dzmp9v9izq7zv4kdc0vbbv2wr14i234ghljh9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -192306,15 +196798,13 @@ self: {
}:
mkDerivation {
pname = "repa-scalar";
- version = "4.2.3.2";
- sha256 = "1w5q7b38zy08s13nllwjisxx6mxx9pnqhh3v5ydi1b32hrkyfk7c";
+ version = "4.2.3.3";
+ sha256 = "1qjzrmz010gm50in0yja817r6wl0n2iybd00dsfpcspdaq91ahvb";
libraryHaskellDepends = [
base bytestring double-conversion primitive time vector
];
description = "Scalar data types and conversions";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"repa-series" = callPackage
@@ -192415,6 +196905,29 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "replica" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, Diff
+ , file-embed, http-types, QuickCheck, quickcheck-instances
+ , template-haskell, text, wai, wai-websockets, websockets
+ }:
+ mkDerivation {
+ pname = "replica";
+ version = "0.1.0.0";
+ sha256 = "0q583krjbx8x45y8hy7vpw7b5y5c9bdfmyp0wh4bk3g8y7xxvvib";
+ libraryHaskellDepends = [
+ aeson base bytestring containers Diff file-embed http-types
+ template-haskell text wai wai-websockets websockets
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers Diff file-embed http-types
+ QuickCheck quickcheck-instances template-haskell text wai
+ wai-websockets websockets
+ ];
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"replicant" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, attoparsec
, base, bytestring, containers, either, exceptions, fast-logger
@@ -192444,17 +196957,6 @@ self: {
}) {};
"repline" = callPackage
- ({ mkDerivation, base, containers, haskeline, mtl, process }:
- mkDerivation {
- pname = "repline";
- version = "0.2.0.0";
- sha256 = "1ph21kbbanlcs8n5lwk16g9vqkb98mkbz5mzwrp8j2rls2921izc";
- libraryHaskellDepends = [ base containers haskeline mtl process ];
- description = "Haskeline wrapper for GHCi-like REPL interfaces";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "repline_0_2_1_0" = callPackage
({ mkDerivation, base, containers, fail, haskeline, mtl, process }:
mkDerivation {
pname = "repline";
@@ -192465,7 +196967,6 @@ self: {
];
description = "Haskeline wrapper for GHCi-like REPL interfaces";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"repo-based-blog" = callPackage
@@ -192640,7 +197141,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "req_2_0_1" = callPackage
+ "req_2_1_0" = callPackage
({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
, bytestring, case-insensitive, connection, hspec, hspec-core
, hspec-discover, http-api-data, http-client, http-client-tls
@@ -192649,10 +197150,8 @@ self: {
}:
mkDerivation {
pname = "req";
- version = "2.0.1";
- sha256 = "1mfm6yy23l64kqbxvp1yn3yqf7fl46as87rz4yazg7f5x13bas3r";
- revision = "1";
- editedCabalFile = "1ghz63gcgkfd7hqx3ff97fg6m3cw1ariqk06ck2x75cn4y42myvn";
+ version = "2.1.0";
+ sha256 = "07sm483bkwqq7fvhwqysl4ac0nw1mvhkywawwpgq0c1gw2wnv56n";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson authenticate-oauth base blaze-builder bytestring
@@ -192822,8 +197321,8 @@ self: {
({ mkDerivation, rebase }:
mkDerivation {
pname = "rerebase";
- version = "1.3.1";
- sha256 = "076gzpgkw19lknk8z7qidxwvg9n432934bnvc843chif075g6r0y";
+ version = "1.3.1.1";
+ sha256 = "1jbqif6k249rkknm2zwk8v8jil3kgi9ar53358v8l4ffx346rm82";
libraryHaskellDepends = [ rebase ];
description = "Reexports from \"base\" with a bunch of other standard libraries";
license = stdenv.lib.licenses.mit;
@@ -192838,6 +197337,8 @@ self: {
pname = "reroute";
version = "0.5.0.0";
sha256 = "1wl7g4z37rwghckwpi34qgg5b3rdy9h1zyf8dcgrm6hdfaabp65r";
+ revision = "2";
+ editedCabalFile = "1lyrm0ca4a9312b26a5gsi1s9vr6b6vlizwblc49h33hviy78q1k";
libraryHaskellDepends = [
base deepseq hashable http-api-data hvect mtl text
unordered-containers
@@ -192906,8 +197407,8 @@ self: {
({ mkDerivation, base, comfort-array, lapack }:
mkDerivation {
pname = "resistor-cube";
- version = "0.0.1";
- sha256 = "0gx2b45wyp61pqf0cwnmq1fznyvl6s3xcq9l38vggf9g90gs4fvz";
+ version = "0.0.1.1";
+ sha256 = "1prbjl1zm4pbkz7xwwkp00bnnq94fql7jlskrxfrk6vxp9ryp60a";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base comfort-array lapack ];
@@ -193692,6 +198193,27 @@ self: {
broken = true;
}) {};
+ "rewrite-inspector" = callPackage
+ ({ mkDerivation, base, binary, brick, containers, data-default
+ , hashable, microlens, microlens-th, prettyprinter, text, vty
+ }:
+ mkDerivation {
+ pname = "rewrite-inspector";
+ version = "0.1.0.9";
+ sha256 = "1f7jn46b311hlyb6zghrmqcg323235njisk4j31lf4kvbl848sn6";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary brick containers data-default hashable microlens
+ microlens-th prettyprinter text vty
+ ];
+ executableHaskellDepends = [ base prettyprinter ];
+ description = "Inspection of rewriting steps";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"rewriting" = callPackage
({ mkDerivation, base, containers, regular }:
mkDerivation {
@@ -193897,6 +198419,8 @@ self: {
libraryHaskellDepends = [ base network-simple rfc1413-types ];
description = "rfc1413 server";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"rfc1413-types" = callPackage
@@ -193953,6 +198477,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rg" = callPackage
+ ({ mkDerivation, array, base, fmt, possibly, tasty, tasty-hunit
+ , text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "rg";
+ version = "1.4.0.0";
+ sha256 = "1cnh3pmq80vziwr2rnz2zinlhak5abrkcpcrrs6x6jz0aq9npnj7";
+ libraryHaskellDepends = [
+ array base fmt possibly text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ array base fmt possibly tasty tasty-hunit text unordered-containers
+ vector
+ ];
+ description = "A dynamic/unbounded alternative to Bounded Enum";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rgb-color-model" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -193965,36 +198508,33 @@ self: {
}) {};
"rhine" = callPackage
- ({ mkDerivation, base, containers, deepseq, dunai, free, time
- , transformers, vector-sized
+ ({ mkDerivation, base, containers, deepseq, dunai, free
+ , MonadRandom, random, time, transformers, vector-sized
}:
mkDerivation {
pname = "rhine";
- version = "0.5.0.1";
- sha256 = "0mxqr441bav2gs856qmvivl9cd53gh28ycary112vxinalijjh23";
+ version = "0.5.1.0";
+ sha256 = "026hnakysi7xqhc630c5mbxs0y4j3wkyk71771mlrf7q2l94vh79";
libraryHaskellDepends = [
- base containers deepseq dunai free time transformers vector-sized
+ base containers deepseq dunai free MonadRandom random time
+ transformers vector-sized
];
description = "Functional Reactive Programming with type-level clocks";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"rhine-gloss" = callPackage
({ mkDerivation, base, dunai, gloss, rhine }:
mkDerivation {
pname = "rhine-gloss";
- version = "0.5.0.1";
- sha256 = "0pj0in2xyz3g81rf175m65gwbwndabd0k2icsdcp3jcyqakzwari";
+ version = "0.5.1.0";
+ sha256 = "0nq5m74ivkdk15qcqpqs8bp816454k3k2big0av6lq2dzk8cjrll";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base dunai gloss rhine ];
executableHaskellDepends = [ base ];
description = "Gloss backend for Rhine";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"rhythm-game-tutorial" = callPackage
@@ -194088,37 +198628,103 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ribbit" = callPackage
+ ({ mkDerivation, base, Only, postgresql-simple, text, time }:
+ mkDerivation {
+ pname = "ribbit";
+ version = "0.3.0.1";
+ sha256 = "0n2xgwwff1bgpqza2l0d5j7agynkz2ps3vc0y73rrpxwc0kn8z3n";
+ libraryHaskellDepends = [ base Only postgresql-simple text time ];
+ description = "Type-level Relational DB combinators";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ribosome" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
- , data-default, deepseq, directory, either, filepath, hslogger, HTF
- , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal
- , prettyprinter, prettyprinter-ansi-terminal, process, resourcet
- , safe, split, stm, text, time, transformers, typed-process, unix
- , unliftio, unliftio-core, utf8-string
+ ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
+ , cereal, cereal-conduit, chiasma, composition, composition-extra
+ , conduit, conduit-extra, containers, cornea, data-default, deepseq
+ , directory, either, exceptions, filepath, free, hslogger, lens
+ , lifted-async, lifted-base, messagepack, MissingH, monad-control
+ , monad-loops, mtl, nvim-hs, path, path-io, pretty-terminal
+ , prettyprinter, prettyprinter-ansi-terminal, process, relude
+ , resourcet, safe, split, stm, stm-chans, stm-conduit
+ , template-haskell, text, th-abstraction, time, transformers
+ , transformers-base, typed-process, unix, unliftio, unliftio-core
+ , utf8-string
}:
mkDerivation {
pname = "ribosome";
- version = "0.2.2.0";
- sha256 = "0cz0ksrxin9k8pnzfhvv6ihskba7kmrwn6np3bdg6rq2g9745v9d";
- libraryHaskellDepends = [
- aeson ansi-terminal base bytestring containers data-default deepseq
- directory either filepath hslogger lens messagepack MissingH mtl
- nvim-hs pretty-terminal prettyprinter prettyprinter-ansi-terminal
- process resourcet safe split stm text time transformers
- typed-process unix unliftio unliftio-core utf8-string
+ version = "0.3.0.1";
+ sha256 = "1dka9hqh48nib7y0rz4bxr6d3iqavzw0163q64xwcjxaib293kks";
+ libraryHaskellDepends = [
+ aeson ansi-terminal base-noprelude bytestring cereal cereal-conduit
+ chiasma composition composition-extra conduit conduit-extra
+ containers cornea data-default deepseq directory either exceptions
+ filepath free hslogger lens lifted-async lifted-base messagepack
+ MissingH monad-control monad-loops mtl nvim-hs path path-io
+ pretty-terminal prettyprinter prettyprinter-ansi-terminal process
+ relude resourcet safe split stm stm-chans stm-conduit
+ template-haskell text th-abstraction time transformers
+ transformers-base typed-process unix unliftio unliftio-core
+ utf8-string
];
+ description = "api extensions for nvim-hs";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "ribosome-root" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
+ , chiasma, composition-extra, conduit, containers, cornea
+ , data-default, deepseq, directory, either, exceptions, filepath
+ , hslogger, HTF, lens, lifted-base, messagepack, MissingH
+ , monad-control, mtl, nvim-hs, pretty-terminal, prettyprinter
+ , prettyprinter-ansi-terminal, process, relude, resourcet, ribosome
+ , ribosome-test, safe, split, stm, template-haskell, text
+ , th-abstraction, time, transformers, transformers-base
+ , typed-process, unix, unliftio, unliftio-core, utf8-string
+ }:
+ mkDerivation {
+ pname = "ribosome-root";
+ version = "0.3.0.0";
+ sha256 = "0x2mgx4wsx3ridvvsjf5pssdgdj1af9bvgc4gmwf4vll43b9x603";
+ isLibrary = false;
+ isExecutable = false;
testHaskellDepends = [
- aeson ansi-terminal base bytestring containers data-default deepseq
- directory either filepath hslogger HTF lens messagepack MissingH
- mtl nvim-hs pretty-terminal prettyprinter
- prettyprinter-ansi-terminal process resourcet safe split stm text
- time transformers typed-process unix unliftio unliftio-core
- utf8-string
+ aeson ansi-terminal base-noprelude bytestring chiasma
+ composition-extra conduit containers cornea data-default deepseq
+ directory either exceptions filepath hslogger HTF lens lifted-base
+ messagepack MissingH monad-control mtl nvim-hs pretty-terminal
+ prettyprinter prettyprinter-ansi-terminal process relude resourcet
+ ribosome ribosome-test safe split stm template-haskell text
+ th-abstraction time transformers transformers-base typed-process
+ unix unliftio unliftio-core utf8-string
];
description = "api extensions for nvim-hs";
- license = stdenv.lib.licenses.mit;
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "ribosome-test" = callPackage
+ ({ mkDerivation, base-noprelude, bytestring, chiasma, cornea
+ , data-default, directory, exceptions, filepath, free, hslogger
+ , HTF, lifted-base, messagepack, monad-control, mtl, nvim-hs
+ , process, relude, resourcet, ribosome, text, transformers
+ , typed-process, unix, unliftio, unliftio-core
+ }:
+ mkDerivation {
+ pname = "ribosome-test";
+ version = "0.3.0.1";
+ sha256 = "18pmb6db23ak29y5vqzvblvq3yqpi2zn8qk0cp7825sbahqxn320";
+ libraryHaskellDepends = [
+ base-noprelude bytestring chiasma cornea data-default directory
+ exceptions filepath free hslogger HTF lifted-base messagepack
+ monad-control mtl nvim-hs process relude resourcet ribosome text
+ transformers typed-process unix unliftio unliftio-core
+ ];
+ description = "test helpers for ribosome";
+ license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"richreports" = callPackage
@@ -194158,8 +198764,6 @@ self: {
];
description = "Quick metrics to grow your app strong";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ridley-extras" = callPackage
@@ -194177,8 +198781,6 @@ self: {
testHaskellDepends = [ base ];
description = "Handy metrics that don't belong to ridley";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"riemann" = callPackage
@@ -194301,7 +198903,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "rio_0_1_9_2" = callPackage
+ "rio_0_1_10_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, exceptions, filepath, hashable, hspec, microlens, mtl, primitive
, process, QuickCheck, text, time, typed-process, unix, unliftio
@@ -194309,8 +198911,8 @@ self: {
}:
mkDerivation {
pname = "rio";
- version = "0.1.9.2";
- sha256 = "14ai4z9d490bwh7xfvv3a5v4ykmfly0xli2srz98i6rg3ngv1nac";
+ version = "0.1.10.0";
+ sha256 = "1jhiy139jl8rc8j4fwl76k1w8mrmmjszhsja7xcs8n2nxr13cb2g";
libraryHaskellDepends = [
base bytestring containers deepseq directory exceptions filepath
hashable microlens mtl primitive process text time typed-process
@@ -194347,6 +198949,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rio-prettyprint" = callPackage
+ ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
+ , base, Cabal, colour, mtl, path, rio, text
+ }:
+ mkDerivation {
+ pname = "rio-prettyprint";
+ version = "0.1.0.0";
+ sha256 = "0n8ldc73i0954c6s8jh0hibxrisp84yh5pcxv3x3q0wg4v2xvr0m";
+ revision = "1";
+ editedCabalFile = "0ya7i766srm62p19idm7lwwfk01b81f8795q7jqqwl7rwk5rcdag";
+ libraryHaskellDepends = [
+ aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl
+ path rio text
+ ];
+ description = "Pretty-printing for RIO";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"riot" = callPackage
({ mkDerivation, base, containers, directory, haskell98, mtl
, ncurses, old-locale, packedstring, process, unix
@@ -194697,8 +199319,6 @@ self: {
benchmarkHaskellDepends = [ base bytestring criterion ];
description = "Haskell implementation of the RNCryptor file format";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"rng-utils" = callPackage
@@ -194716,6 +199336,8 @@ self: {
benchmarkHaskellDepends = [ base criterion ];
description = "RNG within an IORef for convenient concurrent use";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"rob" = callPackage
@@ -194737,6 +199359,8 @@ self: {
testHaskellDepends = [ base directory ];
description = "Simple projects generator";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"robin" = callPackage
@@ -194849,6 +199473,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rock" = callPackage
+ ({ mkDerivation, base, dependent-map, dependent-sum
+ , deriving-compat, mtl, protolude, transformers
+ }:
+ mkDerivation {
+ pname = "rock";
+ version = "0.1.0.1";
+ sha256 = "1a70c55k10algfbc77maaa8p2l16xkml6kddza52ab0vv8dn98d3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base dependent-map dependent-sum deriving-compat mtl protolude
+ transformers
+ ];
+ description = "A build system for incremental, parallel, and demand-driven computations";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rocksdb-haskell" = callPackage
({ mkDerivation, base, binary, bytestring, data-default, directory
, filepath, hspec, hspec-expectations, process, QuickCheck
@@ -195191,8 +199833,8 @@ self: {
}:
mkDerivation {
pname = "rope-utf16-splay";
- version = "0.2.0.0";
- sha256 = "078hkv21maydvks57pz6z3qyz0r4s1c6ypdmlr4xlmakyldrdlc3";
+ version = "0.3.1.0";
+ sha256 = "1ilcgwmdwqnp95vb7652fc03ji9dnzy6cm24pvbiwi2mhc4piy6b";
libraryHaskellDepends = [ base text ];
testHaskellDepends = [
base QuickCheck tasty tasty-hunit tasty-quickcheck text
@@ -195592,17 +200234,18 @@ self: {
}) {};
"row-types" = callPackage
- ({ mkDerivation, base, constraints, criterion, deepseq, hashable
- , text, unordered-containers
+ ({ mkDerivation, base, constraints, criterion, deepseq
+ , generic-lens, hashable, profunctors, text, unordered-containers
}:
mkDerivation {
pname = "row-types";
- version = "0.2.3.0";
- sha256 = "1dihp1bd6aw2hn2jbrg9kgq0rvbspbfwvcx6vv9zrq2j0jbbq250";
+ version = "0.3.0.0";
+ sha256 = "1w1xzkvg9fakz1d8a3dkfyi32gm52abrbky2knf8vhz6k5xc645i";
libraryHaskellDepends = [
- base constraints deepseq hashable text unordered-containers
+ base constraints deepseq generic-lens hashable profunctors text
+ unordered-containers
];
- testHaskellDepends = [ base ];
+ testHaskellDepends = [ base generic-lens ];
benchmarkHaskellDepends = [ base criterion deepseq ];
description = "Open Records and Variants";
license = stdenv.lib.licenses.mit;
@@ -195953,24 +200596,25 @@ self: {
}) {inherit (pkgs) rtl-sdr;};
"rtnetlink" = callPackage
- ({ mkDerivation, base, bytestring, cereal, hspec, monad-loops, mtl
- , pretty-hex, random, socket, transformers, unix
+ ({ mkDerivation, base, bits-bytestring, bytestring, cereal
+ , exceptions, hspec, linux-namespaces, pretty-hex, random, socket
+ , transformers, unix
}:
mkDerivation {
pname = "rtnetlink";
- version = "0.1.0.4";
- sha256 = "0z07ckrjkycfsh7a4llz7sr0fp9p1890kn5nd3imgmrs1d5s0wir";
+ version = "0.2.0.1";
+ sha256 = "1ly3cgkbnz24p33vlgbllmxx25f0b3d1rzr05gzcnhjlg7nxwwga";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring cereal monad-loops mtl pretty-hex random socket
- transformers unix
+ base bits-bytestring bytestring cereal exceptions pretty-hex random
+ socket transformers unix
+ ];
+ testHaskellDepends = [
+ base bytestring exceptions hspec linux-namespaces socket unix
];
- testHaskellDepends = [ base hspec socket unix ];
description = "Manipulate network devices, addresses, and routes on Linux";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"rtorrent-rpc" = callPackage
@@ -196161,6 +200805,19 @@ self: {
broken = true;
}) {};
+ "run-st" = callPackage
+ ({ mkDerivation, base, primitive, primitive-unlifted }:
+ mkDerivation {
+ pname = "run-st";
+ version = "0.1.0.0";
+ sha256 = "0gy5qkq8g7azfp170nsvbfdmj4k058zzfz6imvm2yvbqsny6i77a";
+ libraryHaskellDepends = [ base primitive primitive-unlifted ];
+ description = "runST without boxing penalty";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"rungekutta" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -196597,8 +201254,8 @@ self: {
}:
mkDerivation {
pname = "safe-money";
- version = "0.8.1";
- sha256 = "0yncqrdawf0p7y9qrcz6mc2xd265r3w5kj9lzwqybid8xqbaclij";
+ version = "0.9";
+ sha256 = "0c3xpsydqgcz183klmhgdn3xdagrj0falfqb63cmknk77z610s7f";
libraryHaskellDepends = [
base binary constraints deepseq hashable QuickCheck text
vector-space
@@ -196609,8 +201266,6 @@ self: {
];
description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"safe-money-aeson" = callPackage
@@ -196628,8 +201283,6 @@ self: {
];
description = "Instances from the aeson library for the safe-money library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"safe-money-cereal" = callPackage
@@ -196647,8 +201300,6 @@ self: {
];
description = "Instances from the cereal library for the safe-money library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"safe-money-serialise" = callPackage
@@ -196666,8 +201317,6 @@ self: {
];
description = "Instances from the serialise library for the safe-money library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"safe-money-store" = callPackage
@@ -196685,8 +201334,6 @@ self: {
];
description = "Instances from the store library for the safe-money library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"safe-money-xmlbf" = callPackage
@@ -196695,8 +201342,8 @@ self: {
}:
mkDerivation {
pname = "safe-money-xmlbf";
- version = "0.1.1";
- sha256 = "0624wkb3hsmr3rjm1x95zr5zl1cxhvlyzmc8b1p8px8jyxg9p3n6";
+ version = "0.1.2";
+ sha256 = "04jpv05w1q2xdmh78i5xy3j48vk7qsnb0dpjr3zfbqs0qwpc9vld";
libraryHaskellDepends = [ base safe-money text xmlbf ];
testHaskellDepends = [
base bytestring safe-money tasty tasty-hunit tasty-quickcheck text
@@ -197014,8 +201661,6 @@ self: {
];
description = "Configuration Loader";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"salak_0_2_9_3" = callPackage
@@ -197039,7 +201684,6 @@ self: {
description = "Configuration Loader";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"salak-toml" = callPackage
@@ -197705,6 +202349,34 @@ self: {
license = stdenv.lib.licenses.lgpl3;
}) {};
+ "sbp_2_6_3" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, array, base
+ , base64-bytestring, basic-prelude, binary, binary-conduit
+ , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754
+ , lens, lens-aeson, monad-loops, resourcet, tasty, tasty-hunit
+ , template-haskell, text, time, yaml
+ }:
+ mkDerivation {
+ pname = "sbp";
+ version = "2.6.3";
+ sha256 = "03d2wa73lg5l417c39di742x5x00bjjbqp7wkyr2vkpy04ilqvii";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson array base base64-bytestring basic-prelude binary bytestring
+ data-binary-ieee754 lens lens-aeson monad-loops template-haskell
+ text
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty base basic-prelude binary-conduit bytestring
+ cmdargs conduit conduit-extra resourcet time yaml
+ ];
+ testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
+ description = "SwiftNav's SBP Library";
+ license = stdenv.lib.licenses.lgpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sbp2udp" = callPackage
({ mkDerivation, base, basic-prelude, binary, binary-conduit
, bytestring, conduit, conduit-extra, network, optparse-generic
@@ -197752,7 +202424,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) z3;};
- "sbv_8_2" = callPackage
+ "sbv_8_3" = callPackage
({ mkDerivation, array, async, base, bytestring, containers
, crackNum, deepseq, directory, doctest, filepath, generic-deriving
, ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
@@ -197761,10 +202433,8 @@ self: {
}:
mkDerivation {
pname = "sbv";
- version = "8.2";
- sha256 = "11jvjgcbipnk65yxv758p5cja89fpjf3nkf8nvqi69lyx1jgb72q";
- revision = "1";
- editedCabalFile = "1bn2k9ydx5vyy4z91y22lc6yhnv299y7z2cyzp1prxpvb1dgh5xv";
+ version = "8.3";
+ sha256 = "0d2ph3wr6qga3x43w7xlrvdr63zzsx4x3xn8p7l994b6i7d6rdzd";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array async base containers crackNum deepseq directory filepath
@@ -198067,6 +202737,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "scan-metadata" = callPackage
+ ({ mkDerivation, aeson, antiope-core, antiope-s3, base, bytestring
+ , containers, generic-lens, hw-aeson, hw-ip, lens, mtl, text, thyme
+ , unliftio-core
+ }:
+ mkDerivation {
+ pname = "scan-metadata";
+ version = "0.2.1.0";
+ sha256 = "0qkvx4mpa8pmsfakxg6nl711qzpsc7jx0jcwsmnsf9ms6ij1gvya";
+ libraryHaskellDepends = [
+ aeson antiope-core antiope-s3 base bytestring containers
+ generic-lens hw-aeson hw-ip lens mtl text thyme unliftio-core
+ ];
+ description = "Metadata types for Albedo Scanners";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"scan-vector-machine" = callPackage
({ mkDerivation, accelerate, array, base, dph-base, HUnit }:
mkDerivation {
@@ -198255,19 +202944,20 @@ self: {
"scheduler" = callPackage
({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest
, criterion, deepseq, doctest, exceptions, fib, hspec, monad-par
- , parallel, QuickCheck, streamly, template-haskell, unliftio
- , unliftio-core
+ , mwc-random, parallel, primitive, QuickCheck, streamly
+ , template-haskell, unliftio, unliftio-core, vector
}:
mkDerivation {
pname = "scheduler";
- version = "1.1.0";
- sha256 = "1q4nj0ahhxcz0zzcfj58vgh1apid8hk13i5faxmqc52g9px464zd";
+ version = "1.4.1";
+ sha256 = "1m8l780pv9il661faa0angq05a5db9jpkyxxkil73285fx459fkl";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
- atomic-primops base deepseq exceptions unliftio-core
+ atomic-primops base deepseq exceptions primitive unliftio-core
];
testHaskellDepends = [
- base deepseq doctest hspec QuickCheck template-haskell unliftio
+ base deepseq doctest hspec mwc-random QuickCheck template-haskell
+ unliftio vector
];
benchmarkHaskellDepends = [
async base criterion deepseq fib monad-par parallel streamly
@@ -198275,8 +202965,6 @@ self: {
];
description = "Work stealing scheduler";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"schedyield" = callPackage
@@ -198479,6 +203167,39 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "scidb-hquery" = callPackage
+ ({ mkDerivation, alex, array, base, BNFC, bytestring, Cabal
+ , connection, cryptonite, data-default-class, directory, exceptions
+ , filepath, happy, haskeline, hostname-validate, HTTP, http-client
+ , http-client-tls, http-conduit, http-types, memory, mtl, network
+ , process, regex, safe, split, terminal-size, text, tls, x509-store
+ }:
+ mkDerivation {
+ pname = "scidb-hquery";
+ version = "2.8.0.432";
+ sha256 = "0swjsgf84kwkzv7nwrnrzlpxbhdvi3i5pnnjrlgql9x4c30bqw6i";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal filepath ];
+ libraryHaskellDepends = [
+ array base bytestring connection cryptonite data-default-class
+ exceptions haskeline hostname-validate HTTP http-client
+ http-client-tls http-conduit http-types memory mtl network process
+ regex safe split terminal-size text tls x509-store
+ ];
+ libraryToolDepends = [ alex BNFC happy ];
+ executableHaskellDepends = [
+ array base bytestring connection cryptonite data-default-class
+ directory exceptions filepath haskeline hostname-validate HTTP
+ http-client http-client-tls http-conduit http-types memory mtl
+ network process regex safe split terminal-size text tls x509-store
+ ];
+ description = "Haskell query for SciDB via shim";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"science-constants" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -198680,10 +203401,10 @@ self: {
}:
mkDerivation {
pname = "scotty";
- version = "0.11.3";
- sha256 = "14570k1klrlwra58zz7ip3j41nc75gaswrp8m4xwlrjzgpdqm70a";
- revision = "2";
- editedCabalFile = "0d5ls120fq9xfdsdzj1xgfh2prpcz46i4kc54r6pd6ncpnkfalyi";
+ version = "0.11.4";
+ sha256 = "13z0zmginaa1y5iywbbygvb9q3cmfgjkv6n2drs8gfbv3sirrf7i";
+ revision = "1";
+ editedCabalFile = "1kzp19ff7mh30y6mdqrxngyv7ph3rc95sahlnjzv9wj8j2fb66vn";
libraryHaskellDepends = [
aeson base blaze-builder bytestring case-insensitive
data-default-class exceptions fail http-types monad-control mtl
@@ -199268,6 +203989,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) SDL2;};
+ "sdl2_2_5_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, deepseq, exceptions, linear
+ , SDL2, StateVar, text, transformers, vector, weigh
+ }:
+ mkDerivation {
+ pname = "sdl2";
+ version = "2.5.0.0";
+ sha256 = "1x368yhdd55b3cvx8dvj1sj6nzygzigbhrwhssjs4k0rcxlwqfw8";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base bytestring exceptions linear StateVar text transformers vector
+ ];
+ librarySystemDepends = [ SDL2 ];
+ libraryPkgconfigDepends = [ SDL2 ];
+ testHaskellDepends = [ base deepseq linear vector weigh ];
+ description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) SDL2;};
+
"sdl2-cairo" = callPackage
({ mkDerivation, base, cairo, linear, sdl2 }:
mkDerivation {
@@ -199304,6 +204047,8 @@ self: {
pname = "sdl2-compositor";
version = "1.2.0.7";
sha256 = "1yfbqxrfhy951qdcf43vx9gxd4jj3l2dq5bz04blchpq4qzm4876";
+ revision = "1";
+ editedCabalFile = "0hyf1m8vi1zm88fbp4g3l4iz2lhm53mywppr3i72j78dxksyrl3l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -199325,6 +204070,8 @@ self: {
pname = "sdl2-fps";
version = "0.0.2";
sha256 = "0lid8c2fdy43i9qjjn60mzn6mrcfnn1jflmbwfl93gc6ab5fwz63";
+ revision = "1";
+ editedCabalFile = "09bgygx1il6j4s243frlm4xl0z5drpdqn8fdgsid8m5b2m8c48ya";
libraryHaskellDepends = [ base sdl2 ];
description = "Run of the mill, frames per second timer implementation";
license = stdenv.lib.licenses.bsd3;
@@ -199339,6 +204086,8 @@ self: {
pname = "sdl2-gfx";
version = "0.2";
sha256 = "03f541vrp1ifn26kzakamlc5f8pr9rfcf808cp6q5mvmlsvi07lc";
+ revision = "1";
+ editedCabalFile = "1gdasf1rq7gszfhin521cni8bxfzanvssznfi8m2fkgwz6ichhpv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -199359,6 +204108,8 @@ self: {
pname = "sdl2-image";
version = "2.0.0";
sha256 = "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr";
+ revision = "1";
+ editedCabalFile = "0471p3d1ws5n7r072xgk38n3vzs6ijjkmpv1r05vxn6qninlnq6m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -199378,6 +204129,8 @@ self: {
pname = "sdl2-mixer";
version = "1.1.0";
sha256 = "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g";
+ revision = "1";
+ editedCabalFile = "06h708gbvl5z590p6fn10ck6yxjzyjjbmvk6mxcwgygbj76sw2f8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -199399,6 +204152,8 @@ self: {
pname = "sdl2-sprite";
version = "0.0.1";
sha256 = "12xlq32sjvz064fll14ymbxbk52akcp24dm5vfa1x0s41z0x6fnq";
+ revision = "1";
+ editedCabalFile = "13s78cd2z14ja0cdy4p0j7y45rkj8brlv477jq3fd1v6x10wkrcy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base sdl2 sdl2-image ];
@@ -199853,6 +204608,38 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "selda_0_4_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, exceptions, mtl
+ , random, text, time, uuid-types
+ }:
+ mkDerivation {
+ pname = "selda";
+ version = "0.4.0.0";
+ sha256 = "1dqxwhipfran95gknbgab3a2nxxyg7x7m69mxs4jnn2ly97gpvbi";
+ libraryHaskellDepends = [
+ base bytestring containers exceptions mtl random text time
+ uuid-types
+ ];
+ description = "Multi-backend, high-level EDSL for interacting with SQL databases";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "selda-json" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, selda, text }:
+ mkDerivation {
+ pname = "selda-json";
+ version = "0.1.0.0";
+ sha256 = "0m4qcnj7bplh1wpxnfx5mcpxyy2gpd00886lwmlxfdpch0qg2bd0";
+ revision = "1";
+ editedCabalFile = "1sgqscdibw80qsm02kxgx01rzh810rj3rwi1ksjq6d2j6yb1snaj";
+ libraryHaskellDepends = [ aeson base bytestring selda text ];
+ description = "JSON support for the Selda database library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"selda-postgresql" = callPackage
({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
, selda, text
@@ -199870,6 +204657,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "selda-postgresql_0_1_8_0" = callPackage
+ ({ mkDerivation, base, bytestring, exceptions, postgresql-binary
+ , postgresql-libpq, selda, selda-json, text, time, uuid-types
+ }:
+ mkDerivation {
+ pname = "selda-postgresql";
+ version = "0.1.8.0";
+ sha256 = "0x7ncc8593lialllgsjdy759cinvgwh4spq2aarfd0j3zv78yvdi";
+ libraryHaskellDepends = [
+ base bytestring exceptions postgresql-binary postgresql-libpq selda
+ selda-json text time uuid-types
+ ];
+ description = "PostgreSQL backend for the Selda database EDSL";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"selda-sqlite" = callPackage
({ mkDerivation, base, direct-sqlite, directory, exceptions, selda
, text
@@ -199887,6 +204691,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "selda-sqlite_0_1_7_0" = callPackage
+ ({ mkDerivation, base, bytestring, direct-sqlite, directory
+ , exceptions, selda, text, time, uuid-types
+ }:
+ mkDerivation {
+ pname = "selda-sqlite";
+ version = "0.1.7.0";
+ sha256 = "0qiagfsd45v3vk1npdm8g28mlbdbnrp3drvb6hdnxyp3b5cmyzik";
+ libraryHaskellDepends = [
+ base bytestring direct-sqlite directory exceptions selda text time
+ uuid-types
+ ];
+ description = "SQLite backend for the Selda database EDSL";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"select" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -199910,19 +204731,17 @@ self: {
}) {};
"selective" = callPackage
- ({ mkDerivation, base, checkers, containers, mtl, QuickCheck, tasty
+ ({ mkDerivation, base, containers, mtl, QuickCheck, tasty
, tasty-expected-failure, tasty-quickcheck, transformers
}:
mkDerivation {
pname = "selective";
- version = "0.1.0";
- sha256 = "1f30y2q5xph8jp2pfwkqdy59byad3q70kfp9jgcy2039i268fjfv";
- revision = "1";
- editedCabalFile = "1p6r23ahxpsq6rkb925ryd0cn09876z435q61wfz4r2rnb3s2wb2";
- libraryHaskellDepends = [ base containers mtl transformers ];
+ version = "0.3";
+ sha256 = "135lq99h1iaip44d5kh7wpb3fcf8f6ypn5rxngm5agazy6ia42as";
+ libraryHaskellDepends = [ base containers transformers ];
testHaskellDepends = [
- base checkers containers mtl QuickCheck tasty
- tasty-expected-failure tasty-quickcheck
+ base containers mtl QuickCheck tasty tasty-expected-failure
+ tasty-quickcheck transformers
];
description = "Selective applicative functors";
license = stdenv.lib.licenses.mit;
@@ -199997,8 +204816,6 @@ self: {
executableHaskellDepends = [ base ];
description = "A Haskell library to make self-extracting executables";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"selfrestart" = callPackage
@@ -200026,6 +204843,17 @@ self: {
broken = true;
}) {selinux = null;};
+ "semantic" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "semantic";
+ version = "0.0.0";
+ sha256 = "17vfwyjr3pxzjf35lhqqxid5bds52vk0gdqmnq4hvbjin3l07l98";
+ libraryHaskellDepends = [ base ];
+ description = "Framework and service for analyzing and diffing untrusted code";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"semaphore-plus" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -200076,6 +204904,43 @@ self: {
broken = true;
}) {};
+ "semialign" = callPackage
+ ({ mkDerivation, base, base-compat, containers, hashable
+ , semigroupoids, tagged, these, transformers, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "semialign";
+ version = "1";
+ sha256 = "004x0a80sqqdgvsyk4z0nasxpi6z3g1d8kgwj804bj9ka8dlc75m";
+ libraryHaskellDepends = [
+ base base-compat containers hashable semigroupoids tagged these
+ transformers unordered-containers vector
+ ];
+ description = "Align and Zip type-classes from the common Semialign ancestor";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "semialign-indexed" = callPackage
+ ({ mkDerivation, base, containers, hashable, lens, semialign, these
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "semialign-indexed";
+ version = "1";
+ sha256 = "0m37c4bfvph7w241cgr2adp3x13ffgnw2l66wyn7y9rdvm2983k2";
+ libraryHaskellDepends = [
+ base containers hashable lens semialign these unordered-containers
+ vector
+ ];
+ description = "SemialignWithIndex, i.e. izip and ialign";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"semibounded-lattices" = callPackage
({ mkDerivation, base, containers, lattices }:
mkDerivation {
@@ -200086,8 +204951,6 @@ self: {
testHaskellDepends = [ base ];
description = "A Haskell implementation of semibounded lattices";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"semigroupoid-extras" = callPackage
@@ -200111,6 +204974,8 @@ self: {
pname = "semigroupoids";
version = "5.3.2";
sha256 = "01cxdcflfzx674bhdclf6c7lwgjpbj5yqv8w1fi9dvipyhyj3a31";
+ revision = "1";
+ editedCabalFile = "1r88pi1bvc1w0nys810p3drra6na02zhbaf257dl4lyxl8iv5466";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base base-orphans bifunctors comonad containers contravariant
@@ -200150,9 +205015,23 @@ self: {
pname = "semigroups";
version = "0.18.5";
sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb";
+ revision = "1";
+ editedCabalFile = "1inqcxrzzs8xz60pvbmznyi6g6xwzpxv7p6dqlcwariz31grzvs1";
+ libraryHaskellDepends = [ base ];
+ description = "Anything that associates";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "semigroups_0_19" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "semigroups";
+ version = "0.19";
+ sha256 = "1ficdd32y0v6bi0dxzjn9fph03ql0nmyjy0x3ahr8c4508xh779r";
libraryHaskellDepends = [ base ];
description = "Anything that associates";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"semigroups-actions" = callPackage
@@ -200258,14 +205137,16 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "semirings_0_4" = callPackage
+ "semirings_0_4_2" = callPackage
({ mkDerivation, base, containers, hashable, integer-gmp
, unordered-containers
}:
mkDerivation {
pname = "semirings";
- version = "0.4";
- sha256 = "0p5crw2n47nx76y9zsx3bpjb619wsi8p91wjq4pcw29jw6idvid0";
+ version = "0.4.2";
+ sha256 = "0bfcbi9hs9mv06ahkvq3bpf4vw6jprlssc9s8yjfb05p151qnx5j";
+ revision = "1";
+ editedCabalFile = "1wrkcfblq3j2688xg8f1ial05sijkssmdm2rv9sw6jfxiays60vq";
libraryHaskellDepends = [
base containers hashable integer-gmp unordered-containers
];
@@ -200275,14 +205156,14 @@ self: {
}) {};
"semver" = callPackage
- ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty
- , tasty-hunit, text
+ ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable
+ , tasty, tasty-hunit, text
}:
mkDerivation {
pname = "semver";
- version = "0.3.3.1";
- sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn";
- libraryHaskellDepends = [ attoparsec base deepseq text ];
+ version = "0.3.4";
+ sha256 = "0swffqyqraz2nxn64mwxp29zfdq7135q2j815yzwh2pk135xmns2";
+ libraryHaskellDepends = [ attoparsec base deepseq hashable text ];
testHaskellDepends = [ base tasty tasty-hunit text ];
benchmarkHaskellDepends = [ base criterion text ];
description = "Representation, manipulation, and de/serialisation of Semantic Versions";
@@ -200296,8 +205177,8 @@ self: {
}:
mkDerivation {
pname = "semver-range";
- version = "0.2.7";
- sha256 = "04492jx61yj4vq9bf1jg3xnviy22wb03d1kf358dy7w6xx1zzlfc";
+ version = "0.2.8";
+ sha256 = "1df663zkcf7y7a8cf5llf111rx4bsflhsi3fr1f840y4kdgxlvkf";
libraryHaskellDepends = [
base classy-prelude parsec text unordered-containers
];
@@ -200307,18 +205188,14 @@ self: {
];
description = "An implementation of semver and semantic version ranges";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"sendfile" = callPackage
({ mkDerivation, base, bytestring, network }:
mkDerivation {
pname = "sendfile";
- version = "0.7.10";
- sha256 = "1wnfmq64sq13siig0rrnln2bmk1aygnsgdwh5dh32agv9csrk4ab";
- revision = "1";
- editedCabalFile = "08k4clhyfa4h5ja9bz1mzg2wdx5337cg8bxd6lz25781f65llq7d";
+ version = "0.7.11.1";
+ sha256 = "0988snmx3bylpw3kcq8hsgji8idc6xcrcfp275qjv3apfdgc9rp0";
libraryHaskellDepends = [ base bytestring network ];
description = "A portable sendfile library";
license = stdenv.lib.licenses.bsd3;
@@ -200414,8 +205291,8 @@ self: {
}:
mkDerivation {
pname = "sensu-run";
- version = "0.6.1";
- sha256 = "1anxb5b8kmwf4bjzh49yxgnx3kkx37ydr4aw2xd46dph1gdk07mb";
+ version = "0.7.0.2";
+ sha256 = "08ymh5ckn6nwcyds683mgz42ik12q12wqknwb6m6c0dsbm901b57";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -200973,7 +205850,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant_0_16_0_1" = callPackage
+ "servant_0_16_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors
, bytestring, Cabal, cabal-doctest, case-insensitive, deepseq
, doctest, hspec, hspec-discover, http-api-data, http-media
@@ -200983,8 +205860,8 @@ self: {
}:
mkDerivation {
pname = "servant";
- version = "0.16.0.1";
- sha256 = "0ial3gvmsbaa26lgqlxk5sigpdqrr982cgkp2amlgniwg85sa2wp";
+ version = "0.16.1";
+ sha256 = "1v63b3ng1zck4jw79ijjv4vvsm8w1c8vz4c0dd8sklpkcrfbpxam";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson attoparsec base base-compat bifunctors bytestring
@@ -201509,7 +206386,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-checked-exceptions_2_1_0_0" = callPackage
+ "servant-checked-exceptions_2_2_0_0" = callPackage
({ mkDerivation, base, bytestring, hspec-wai, http-types, servant
, servant-checked-exceptions-core, servant-client
, servant-client-core, servant-server, tasty, tasty-hspec
@@ -201517,8 +206394,8 @@ self: {
}:
mkDerivation {
pname = "servant-checked-exceptions";
- version = "2.1.0.0";
- sha256 = "0dbbixk3852phxhfcj84v3525yp5nl5krcrw53wsgc91r0w529s7";
+ version = "2.2.0.0";
+ sha256 = "1shbnrjk2d0lq9nskl95jkfgr4ad79nx4k87zjg4c4m6m09nf5bh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -201556,20 +206433,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-checked-exceptions-core_2_1_0_0" = callPackage
- ({ mkDerivation, aeson, base, bytestring, doctest, Glob, http-media
- , http-types, profunctors, servant, servant-docs, tagged, text
- , world-peace
+ "servant-checked-exceptions-core_2_2_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, contravariant, doctest
+ , Glob, http-media, http-types, mtl, profunctors, servant
+ , servant-docs, tagged, text, transformers, world-peace
}:
mkDerivation {
pname = "servant-checked-exceptions-core";
- version = "2.1.0.0";
- sha256 = "1qmmbqniipx7bpinbjh9z0i2n0v71y6p3jak629aw0403rhq92pz";
+ version = "2.2.0.0";
+ sha256 = "1irakwsdj6f0yjp0cpgai6x01yq99qd2rwy1w3pb7xwiksdnxx6c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring http-media http-types profunctors servant
- servant-docs tagged text world-peace
+ aeson base bytestring contravariant http-media http-types mtl
+ profunctors servant servant-docs tagged text transformers
+ world-peace
];
testHaskellDepends = [ base doctest Glob ];
description = "Checked exceptions for Servant APIs";
@@ -201577,6 +206455,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-cli" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, case-insensitive
+ , containers, filepath, free, functor-combinators, http-client
+ , http-types, optparse-applicative, profunctors, random
+ , recursion-schemes, servant, servant-client, servant-client-core
+ , servant-docs, servant-server, text, transformers, vinyl, warp
+ }:
+ mkDerivation {
+ pname = "servant-cli";
+ version = "0.1.0.1";
+ sha256 = "12d18ca90b7mijaav3glx60b9c9qd1f2g4p5m4m7hzz2m22dyimn";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring case-insensitive containers filepath free
+ functor-combinators http-types optparse-applicative profunctors
+ recursion-schemes servant servant-client-core servant-docs text
+ transformers vinyl
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring containers http-client optparse-applicative
+ random servant servant-client servant-server text vinyl warp
+ ];
+ description = "Command line interface for Servant API clients";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"servant-client" = callPackage
({ mkDerivation, aeson, base, base-compat, bytestring, containers
, deepseq, entropy, exceptions, generics-sop, hspec, hspec-discover
@@ -201623,8 +206530,8 @@ self: {
pname = "servant-client";
version = "0.16";
sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj";
- revision = "1";
- editedCabalFile = "0grjsgdmyr9mp7mnmf5qw6wkciigpzxsyzsj6l8fbb7mq5rsid78";
+ revision = "2";
+ editedCabalFile = "0xdrs79farfhw12azl9jmkwvqslassnrjqvbgz0xjnnqnb0b9l86";
libraryHaskellDepends = [
base base-compat bytestring containers deepseq exceptions
http-client http-media http-types kan-extensions monad-control mtl
@@ -201830,8 +206737,8 @@ self: {
pname = "servant-docs";
version = "0.11.3";
sha256 = "0cys1h3m0aq77aw0szj7k6p7zqcr8074zrxzsjp58lss1daqisq7";
- revision = "2";
- editedCabalFile = "1zzv3mbfyvpqddhz8a7z8wfwy4w4y21rwpi7k15xzm9647sdgga5";
+ revision = "3";
+ editedCabalFile = "0hknxp6vxjmc6d4acwfs8ic9n915ldldz4ja8d86pzwv8vh5jzfv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -201919,6 +206826,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-elm_0_6_0_2" = callPackage
+ ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec
+ , HUnit, lens, servant, servant-client, servant-foreign, text
+ , wl-pprint-text
+ }:
+ mkDerivation {
+ pname = "servant-elm";
+ version = "0.6.0.2";
+ sha256 = "1ayj0gdl8z9ns6agm64i37w0j8r51ydw4zxn8kcwsn1akswrzz3z";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base directory elm-bridge lens servant servant-foreign text
+ wl-pprint-text
+ ];
+ testHaskellDepends = [
+ aeson base Diff elm-bridge hspec HUnit servant servant-client text
+ ];
+ description = "Automatically derive Elm functions to query servant webservices";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-examples" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, either
, http-types, js-jquery, lucid, random, servant, servant-client
@@ -202084,6 +207014,8 @@ self: {
];
description = "Servant combinators to facilitate writing GitHub webhooks";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"servant-haxl-client" = callPackage
@@ -202157,8 +207089,8 @@ self: {
pname = "servant-http-streams";
version = "0.16";
sha256 = "1gkgk13zxi8y071i9dx0i1kbs14rgp8cfnfcd7rpg86pffxkx6cp";
- revision = "1";
- editedCabalFile = "0i3668fw4h503hig1vd9d7k0mxlsis81cs7a5fh2k5yja5sj81ik";
+ revision = "2";
+ editedCabalFile = "10bpkdwlbg66zi9hzh7vbfwrcilvkav8rc0300xfmpbpw43z4iy0";
libraryHaskellDepends = [
base base-compat bytestring case-insensitive containers deepseq
exceptions http-common http-media http-streams http-types
@@ -202213,8 +207145,8 @@ self: {
pname = "servant-iCalendar";
version = "0.1.0.1";
sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
- revision = "6";
- editedCabalFile = "0pqn5lxcicccy73xbxsaqkxlga0ljc2kr8ysmdffxyndjyph4237";
+ revision = "7";
+ editedCabalFile = "0yf5gccdilswzabzysc2mrxxq84xdx7k18a647bksimwd44x2i68";
libraryHaskellDepends = [
base data-default http-media iCalendar servant
];
@@ -202276,8 +207208,8 @@ self: {
}:
mkDerivation {
pname = "servant-kotlin";
- version = "0.1.1.7";
- sha256 = "138xx3jn2ay38fradssi7biff5cc6g1g3wk003bid349irmgvid4";
+ version = "0.1.1.8";
+ sha256 = "0w68sfsf7x0wvj67klbl464jzkibr8p78knxix5fqxxd5kb5d25r";
libraryHaskellDepends = [
base containers directory formatting lens servant servant-foreign
text time wl-pprint-text
@@ -202336,8 +207268,8 @@ self: {
pname = "servant-machines";
version = "0.15";
sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i";
- revision = "1";
- editedCabalFile = "18ag4ynzq62n8n52551bm4y4xr7sn03jyp14f3kx08wid3pf5p8a";
+ revision = "2";
+ editedCabalFile = "0x7dw8mcvgaag53ai5c9nagc5dik4r06wxdhvp72q8f09pvabxxf";
libraryHaskellDepends = [ base bytestring machines mtl servant ];
testHaskellDepends = [
base base-compat bytestring http-client http-media machines servant
@@ -202633,8 +207565,8 @@ self: {
}:
mkDerivation {
pname = "servant-purescript";
- version = "0.9.0.2";
- sha256 = "1axj4rar4ncy20xiwa231hc67vpz6yi2vzddq8m6nswmdg6kja7p";
+ version = "0.9.0.3";
+ sha256 = "16ygfj1h9wrxxv5wcxh8rqn9icgx7xxy0yrgfdv5k6pmpxmgmi84";
libraryHaskellDepends = [
aeson base bytestring containers directory filepath http-types lens
mainland-pretty purescript-bridge servant servant-foreign
@@ -202646,8 +207578,6 @@ self: {
];
description = "Generate PureScript accessor functions for you servant API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"servant-pushbullet-client" = callPackage
@@ -202781,6 +207711,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-reason" = callPackage
+ ({ mkDerivation, aeson, base, Diff, directory, hspec, HUnit
+ , interpolate, lens, mockery, process, reason-export, servant
+ , servant-foreign, text, wl-pprint-text
+ }:
+ mkDerivation {
+ pname = "servant-reason";
+ version = "0.1.2.0";
+ sha256 = "0c8nwdi1xrym5q7k13qqa7mznbww9kc1ffimfpj8vr13r62j19ql";
+ libraryHaskellDepends = [
+ base lens reason-export servant servant-foreign text wl-pprint-text
+ ];
+ testHaskellDepends = [
+ aeson base Diff directory hspec HUnit interpolate lens mockery
+ process reason-export servant servant-foreign text wl-pprint-text
+ ];
+ description = "Derive Reason types to interact with a Haskell backend";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"servant-reflex" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, data-default, exceptions, ghcjs-dom, http-api-data, http-media
@@ -202910,7 +207862,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-server_0_16" = callPackage
+ "servant-server_0_16_1" = callPackage
({ mkDerivation, aeson, base, base-compat, base64-bytestring
, bytestring, Cabal, cabal-doctest, containers, directory, doctest
, exceptions, filepath, hspec, hspec-discover, hspec-wai
@@ -202922,10 +207874,8 @@ self: {
}:
mkDerivation {
pname = "servant-server";
- version = "0.16";
- sha256 = "18rv99hyb448mcv1cjvs0p6cqrkw9f3zpdh18nsd29fskcybsv3b";
- revision = "1";
- editedCabalFile = "1v0zr3mqzjhiqrgyqgbnixa9zjvgknis3rjwyi2a3ig5l36y6ifh";
+ version = "0.16.1";
+ sha256 = "1zkx6ipz4ay64jdvqxhhrq2sfxj6d6ma8z4cxwpascnawhjqjpq7";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -202996,38 +207946,35 @@ self: {
"servant-snap" = callPackage
({ mkDerivation, aeson, attoparsec, base, base64-bytestring
, bytestring, case-insensitive, containers, digestive-functors
- , directory, either, errors, exceptions, filepath, heist, hspec
- , hspec-core, hspec-snap, http-api-data, http-client, http-media
- , http-types, HUnit, io-streams, lens, map-syntax, mmorph, mtl
- , network, network-uri, parsec, process, QuickCheck, servant
- , servant-client, snap, snap-core, snap-cors, snap-server
- , string-conversions, temporary, text, time, transformers, word8
+ , directory, errors, exceptions, filepath, heist, hspec, hspec-core
+ , hspec-snap, http-api-data, http-media, http-types, HUnit
+ , io-streams, lens, map-syntax, mmorph, mtl, network, network-uri
+ , parsec, process, QuickCheck, servant, snap, snap-core
+ , snap-server, string-conversions, tagged, temporary, text, time
+ , transformers, word8
}:
mkDerivation {
pname = "servant-snap";
- version = "0.8.2";
- sha256 = "0iyiifr9przbayqjs7ydwbzwad5m79379ypmmfiyvcw9m14syhyk";
- revision = "1";
- editedCabalFile = "1lycc0iagcc2yd4hq778g2mkqh5fig6vcd3fv4s48wjgw4nic9qf";
+ version = "0.8.4.1";
+ sha256 = "1649s1n313rd8h409bfz2jkq2ch7ffw06y120j95rjcp6r8xgfv2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring bytestring case-insensitive
- containers either filepath http-api-data http-media http-types
- io-streams mmorph mtl network-uri servant snap snap-core
- snap-server string-conversions text transformers word8
+ containers filepath http-api-data http-media http-types io-streams
+ mmorph mtl network-uri servant snap snap-core snap-server
+ string-conversions tagged text transformers word8
];
executableHaskellDepends = [
- aeson base bytestring either errors heist http-client lens
- map-syntax servant servant-client snap snap-core snap-cors
- snap-server text transformers
+ aeson base bytestring errors heist lens map-syntax servant snap
+ snap-core snap-server text transformers
];
testHaskellDepends = [
aeson base base64-bytestring bytestring case-insensitive containers
- digestive-functors directory either exceptions hspec hspec-core
- hspec-snap http-types HUnit io-streams lens mtl network parsec
- process QuickCheck servant snap snap-core snap-cors snap-server
- string-conversions temporary text time transformers
+ digestive-functors directory exceptions hspec hspec-core hspec-snap
+ http-types HUnit io-streams lens mtl network parsec process
+ QuickCheck servant snap snap-core snap-server string-conversions
+ temporary text time transformers
];
description = "A family of combinators for defining webservices APIs and serving them";
license = stdenv.lib.licenses.bsd3;
@@ -203201,15 +208148,14 @@ self: {
({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
, Cabal, cabal-doctest, directory, doctest, filepath, hspec
, hspec-discover, http-media, insert-ordered-containers, lens
- , QuickCheck, servant, singleton-bool, swagger2, template-haskell
- , text, time, unordered-containers, utf8-string
+ , lens-aeson, QuickCheck, servant, singleton-bool, swagger2
+ , template-haskell, text, time, unordered-containers, utf8-string
+ , vector
}:
mkDerivation {
pname = "servant-swagger";
- version = "1.1.7";
- sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3";
- revision = "2";
- editedCabalFile = "1crl8c71ns8mnp056ba1zph57cf1l4dajbgw07gpcw2cvni6x560";
+ version = "1.1.7.1";
+ sha256 = "0vdjvn5bsd26q8wx1qdwn7vdfnd9jk8m9jzzm251gyn1ijxv8ild";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson aeson-pretty base base-compat bytestring hspec http-media
@@ -203218,23 +208164,38 @@ self: {
];
testHaskellDepends = [
aeson base base-compat directory doctest filepath hspec lens
- QuickCheck servant swagger2 template-haskell text time utf8-string
+ lens-aeson QuickCheck servant swagger2 template-haskell text time
+ utf8-string vector
];
testToolDepends = [ hspec-discover ];
description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-swagger-tags" = callPackage
+ ({ mkDerivation, base, containers, lens, servant, servant-mock
+ , servant-server, servant-swagger, swagger2, text
+ }:
+ mkDerivation {
+ pname = "servant-swagger-tags";
+ version = "0.1.0.0";
+ sha256 = "1938kr3jcpwy8imias0bk7xqp0v3ijajpdfdpgibyphklfqnck64";
+ libraryHaskellDepends = [
+ base containers lens servant servant-mock servant-server
+ servant-swagger swagger2 text
+ ];
+ description = "Swagger Tags for Servant";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"servant-swagger-ui" = callPackage
({ mkDerivation, base, bytestring, file-embed-lzma, servant
, servant-server, servant-swagger-ui-core, swagger2, text
}:
mkDerivation {
pname = "servant-swagger-ui";
- version = "0.3.2.3.19.3";
- sha256 = "0s2y6fhm26gzs344ig86nh6d1sy2dxfqpwpgz6c2dcg65jcbbpc7";
- revision = "2";
- editedCabalFile = "1p16lixhl9dbv3xlxpzy784a68xqnhvy91wyl5y183kixjniyf6f";
+ version = "0.3.4.3.22.2";
+ sha256 = "0ig05xzh4iybnwzh7bx8i7a337j0xfmsxbmfi9iaiz4g6f9s5clm";
libraryHaskellDepends = [
base bytestring file-embed-lzma servant servant-server
servant-swagger-ui-core swagger2 text
@@ -203250,10 +208211,8 @@ self: {
}:
mkDerivation {
pname = "servant-swagger-ui-core";
- version = "0.3.2";
- sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2";
- revision = "4";
- editedCabalFile = "0vvfqf9zh8a5sgd4sn4mkay803lqc5zd9dz175gxs3wmca0gr3fk";
+ version = "0.3.3";
+ sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3";
libraryHaskellDepends = [
base blaze-markup bytestring http-media servant servant-blaze
servant-server swagger2 text transformers transformers-compat
@@ -203269,10 +208228,8 @@ self: {
}:
mkDerivation {
pname = "servant-swagger-ui-jensoleg";
- version = "0.3.2";
- sha256 = "1ybkwa6dyi9v1rcqd0gzl1hqkinkmsqwz0ang0cmsa6d8ym3zmii";
- revision = "2";
- editedCabalFile = "0ckx9bvngl65mcg8d16baknvz0637z7griqqwkclcvgksx812kbh";
+ version = "0.3.3";
+ sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw";
libraryHaskellDepends = [
base bytestring file-embed-lzma servant servant-server
servant-swagger-ui-core swagger2 text
@@ -203287,10 +208244,8 @@ self: {
}:
mkDerivation {
pname = "servant-swagger-ui-redoc";
- version = "0.3.2.1.22.2";
- sha256 = "0d4r6rp48lkgd4903hfja14mlar1h17hrb4fhq05p3wga7kik6g0";
- revision = "2";
- editedCabalFile = "160acp4hvwm4m42kx275qr1nkg9s7bjxlk61agvm45hi3lg0lm6f";
+ version = "0.3.3.1.22.2";
+ sha256 = "0qkh4h5ijhizlnps79gg75jy533rpc1vcw7v7yxika585srndim1";
libraryHaskellDepends = [
base bytestring file-embed-lzma servant servant-server
servant-swagger-ui-core swagger2 text
@@ -203381,13 +208336,15 @@ self: {
}:
mkDerivation {
pname = "servant-xml";
- version = "1.0.1.3";
- sha256 = "0f033s1nmhw5xsmnvj3rqmrw6zd0ywbr7v6v9dxlx9daim4jps1v";
+ version = "1.0.1.4";
+ sha256 = "0jzzw4bwjcnax53xx8yjfldd21zgbvynpagf1ikxpzq3sgqhdl2x";
libraryHaskellDepends = [
base bytestring http-media servant xmlbf xmlbf-xeno
];
description = "Servant support for the XML Content-Type";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"servant-yaml" = callPackage
@@ -203523,8 +208480,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.8.7";
- sha256 = "0q73j6n6552ajv5sm52rbcj4kk86wjmvrh6khci1nbln4wxgbwq2";
+ version = "0.8.8";
+ sha256 = "14qjlji11xa2v72bskv1cqk3x0z4gjl77mx1vqi183sd4798xhci";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -203754,6 +208711,8 @@ self: {
];
description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ses-html-snaplet" = callPackage
@@ -204255,20 +209214,26 @@ self: {
}) {inherit (pkgs) zlib;};
"sgd" = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, data-default
- , deepseq, filepath, hmatrix, logfloat, monad-par, mtl, parallel
- , pipes, primitive, random, random-shuffle, temporary, vector
+ ({ mkDerivation, ad, base, binary, bytestring, containers
+ , data-default, deepseq, filepath, hmatrix, logfloat, monad-par
+ , mtl, parallel, pipes, primitive, random, random-shuffle, tasty
+ , tasty-hunit, temporary, vector
}:
mkDerivation {
pname = "sgd";
- version = "0.7.0.1";
- sha256 = "1bfj74i9m1989wav6irlfiwgq8mgyf9g49cpdipgdiqqb4qmhv13";
+ version = "0.8.0.2";
+ sha256 = "1lzfnzk2iqjrsp6xksfa4qm7a2qh4q1y10mdqigl8slr5nsy9045";
libraryHaskellDepends = [
base binary bytestring containers data-default deepseq filepath
hmatrix logfloat monad-par mtl parallel pipes primitive random
random-shuffle temporary vector
];
- description = "Stochastic gradient descent";
+ testHaskellDepends = [
+ ad base binary bytestring containers data-default deepseq filepath
+ hmatrix logfloat monad-par mtl parallel pipes primitive random
+ random-shuffle tasty tasty-hunit temporary vector
+ ];
+ description = "Stochastic gradient descent library";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -204461,8 +209426,8 @@ self: {
}:
mkDerivation {
pname = "shake";
- version = "0.17.9";
- sha256 = "0kkglnw7cwj9xkxg7ffj09dnjyribgs1vrsyl2hmpl3xy4gs0sdk";
+ version = "0.18.3";
+ sha256 = "0ywcdzxly8zvz2p3v5b3lp5bnkwsqxvdas7ysrhgxbhi3bnjvzjf";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -205221,8 +210186,8 @@ self: {
({ mkDerivation, base, markdown-unlit, process, text }:
mkDerivation {
pname = "shellmet";
- version = "0.0.1";
- sha256 = "11c53h3dvhmnkjhcjw1xjr1kx6pvdmayf86i5b6zhpl4q3q2ixlk";
+ version = "0.0.2.0";
+ sha256 = "04ylwpwzd2g3604xyqr4g8zd9dp13hrb8kajajrymv6hafm85m3i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base process text ];
@@ -205377,25 +210342,27 @@ self: {
}) {};
"shh" = callPackage
- ({ mkDerivation, async, base, containers, deepseq, directory
- , doctest, filepath, mtl, process, split, tasty, tasty-hunit
- , tasty-quickcheck, template-haskell, temporary, unix
+ ({ mkDerivation, async, base, bytestring, containers, deepseq
+ , directory, doctest, filepath, mtl, process, split, tasty
+ , tasty-hunit, tasty-quickcheck, template-haskell, temporary, unix
+ , utf8-string
}:
mkDerivation {
pname = "shh";
- version = "0.4.0.0";
- sha256 = "0ghkiz720g4p8gs5h3h43pkdsgcl7iffnqdis122qhvfliwqcmpr";
+ version = "0.6.0.0";
+ sha256 = "10l13iyik4m0z2c4f2cjlj5kjg51i4g4z6gp1vldqfa0i3shzvvz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- async base containers deepseq directory filepath mtl process split
- template-haskell unix
+ async base bytestring containers deepseq directory filepath mtl
+ process split template-haskell unix utf8-string
];
executableHaskellDepends = [
- async base deepseq directory temporary unix
+ async base bytestring deepseq directory temporary unix
];
testHaskellDepends = [
- async base directory doctest tasty tasty-hunit tasty-quickcheck
+ async base bytestring directory doctest tasty tasty-hunit
+ tasty-quickcheck utf8-string
];
description = "Simple shell scripting from Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -205677,6 +210644,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "show-prettyprint_0_3_0_1" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, containers, doctest
+ , prettyprinter, trifecta
+ }:
+ mkDerivation {
+ pname = "show-prettyprint";
+ version = "0.3.0.1";
+ sha256 = "030dzprz07ib41f8pg2409zdxymvkk8jq4m0vczvgaajq3gghkdk";
+ libraryHaskellDepends = [
+ ansi-wl-pprint base prettyprinter trifecta
+ ];
+ testHaskellDepends = [
+ base containers doctest prettyprinter trifecta
+ ];
+ description = "Robust prettyprinter for output of auto-generated Show instances";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"show-type" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -205705,25 +210691,26 @@ self: {
}) {};
"shower" = callPackage
- ({ mkDerivation, base, containers, directory, filepath, megaparsec
- , pretty, process, tasty, tasty-golden, temporary
+ ({ mkDerivation, aeson, base, containers, directory, filepath
+ , megaparsec, pretty, process, QuickCheck, tasty, tasty-golden
+ , tasty-quickcheck, temporary, text, unordered-containers
+ , utf8-string, vector
}:
mkDerivation {
pname = "shower";
- version = "0.1";
- sha256 = "1jnj0v8h01sb5znc3rlfrplkyis9aflxgwg01l9a5293l19jgs4r";
+ version = "0.2.0.1";
+ sha256 = "13qxddl6v3kcfgyr5q281hrr4xkflnc3nafbs3jq0w5k6njn7djb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base megaparsec pretty ];
executableHaskellDepends = [ base ];
testHaskellDepends = [
- base containers directory filepath process tasty tasty-golden
- temporary
+ aeson base containers directory filepath process QuickCheck tasty
+ tasty-golden tasty-quickcheck temporary text unordered-containers
+ utf8-string vector
];
description = "Clean up the formatting of 'show' output";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"shpider" = callPackage
@@ -205977,8 +210964,6 @@ self: {
];
description = "Arithmetic over signs and sets of signs";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"signal" = callPackage
@@ -206210,6 +211195,17 @@ self: {
broken = true;
}) {};
+ "simple-cabal" = callPackage
+ ({ mkDerivation, base, Cabal, directory, filepath }:
+ mkDerivation {
+ pname = "simple-cabal";
+ version = "0.0.0";
+ sha256 = "051xfg48y09qa6avndllv29nibpchys5ksp38d1p3lk82qqywvqd";
+ libraryHaskellDepends = [ base Cabal directory filepath ];
+ description = "Cabal file wrapper library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"simple-cmd" = callPackage
({ mkDerivation, base, directory, filepath, process, unix }:
mkDerivation {
@@ -206221,14 +211217,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "simple-cmd_0_2_0_1" = callPackage
+ ({ mkDerivation, base, directory, filepath, process, unix }:
+ mkDerivation {
+ pname = "simple-cmd";
+ version = "0.2.0.1";
+ sha256 = "0kd0kr27q72ay5jzrnyqnbbfl4q1lyrlq13s74iphxx4s2yzn03p";
+ libraryHaskellDepends = [ base directory filepath process unix ];
+ description = "Simple String-based process commands";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"simple-cmd-args" = callPackage
({ mkDerivation, base, optparse-applicative }:
mkDerivation {
pname = "simple-cmd-args";
- version = "0.1.1";
- sha256 = "0rgg8aqgq98yq9h5v29r0g2qjhr70gl1sgv713ihlpm7b7bykilz";
- revision = "1";
- editedCabalFile = "127m5x1k5c5ymxcxlbhjghlymdyci847qxq1ydfd8sf2m4qc4ffq";
+ version = "0.1.2";
+ sha256 = "1vj5yvqvch8ckf1jzp77d7l6g89wxzb8ngqn6iw3m215f8xl77p8";
libraryHaskellDepends = [ base optparse-applicative ];
description = "Simple command args parsing and execution";
license = stdenv.lib.licenses.bsd3;
@@ -206341,6 +211347,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "simple-enumeration" = callPackage
+ ({ mkDerivation, base, doctest, integer-gmp }:
+ mkDerivation {
+ pname = "simple-enumeration";
+ version = "0.2";
+ sha256 = "0792fcn7mxvhdvsqgc335lcyp89zcdk3fbfqyckz9fsmf6382hv4";
+ libraryHaskellDepends = [ base integer-gmp ];
+ testHaskellDepends = [ base doctest ];
+ description = "Finite or countably infinite sequences of values";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"simple-eval" = callPackage
({ mkDerivation, base, parsec, text, transformers }:
mkDerivation {
@@ -206459,8 +211477,8 @@ self: {
}:
mkDerivation {
pname = "simple-log";
- version = "0.9.11";
- sha256 = "1mqibcpcnwc0hqbcbvl32vv4458n02f2k2bnparh8ajm5n9h0cjk";
+ version = "0.9.12";
+ sha256 = "1038asbw9yi1wz3di0ggx62nazljh9m07dvf3lmjrvj1k8i7842w";
libraryHaskellDepends = [
async base base-unicode-symbols containers data-default deepseq
directory exceptions filepath hformat microlens microlens-platform
@@ -206761,20 +211779,16 @@ self: {
}) {};
"simple-sql-parser" = callPackage
- ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework
- , test-framework-hunit
- }:
+ ({ mkDerivation, base, mtl, parsec, pretty, tasty, tasty-hunit }:
mkDerivation {
pname = "simple-sql-parser";
- version = "0.4.4";
- sha256 = "1j1p94mfb7kzrayi39xcwmagxcf5j9lvxi7niqxc5jr70958csnl";
+ version = "0.5.0";
+ sha256 = "0d063wyrz8qynngy499i00hjkacd0xg01qni1wx2cbrcxg0xwcpd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl parsec pretty ];
- testHaskellDepends = [
- base HUnit mtl parsec pretty test-framework test-framework-hunit
- ];
- description = "A parser for SQL queries";
+ testHaskellDepends = [ base mtl parsec pretty tasty tasty-hunit ];
+ description = "A parser for SQL";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -206891,8 +211905,6 @@ self: {
];
description = "UI library for terminal";
license = stdenv.lib.licenses.gpl2;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"simple-units" = callPackage
@@ -206927,6 +211939,25 @@ self: {
broken = true;
}) {};
+ "simple-vec3_0_6" = callPackage
+ ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
+ , QuickCheck, tasty, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "simple-vec3";
+ version = "0.6";
+ sha256 = "1vw03xlnf8hj6rlcgpblg3swcbvqj4qp04zdv3a9j2a47j780qhh";
+ libraryHaskellDepends = [ base QuickCheck vector ];
+ testHaskellDepends = [
+ base doctest doctest-driver-gen tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ base criterion vector ];
+ description = "Three-dimensional vectors of doubles with basic operations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"simple-zipper" = callPackage
({ mkDerivation, base, hspec, lens }:
mkDerivation {
@@ -207092,8 +212123,6 @@ self: {
librarySystemDepends = [ sqlite ];
description = "Simplest SQLite3 binding";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {inherit (pkgs) sqlite;};
"simplex" = callPackage
@@ -207134,6 +212163,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "simplistic-generics" = callPackage
+ ({ mkDerivation, base, comonad, kind-apply }:
+ mkDerivation {
+ pname = "simplistic-generics";
+ version = "0.1.0.0";
+ sha256 = "11z02m4dr9p2y29xwhy6a3l2cz2np164c8cwp0a0b9vkhphw4y1j";
+ libraryHaskellDepends = [ base comonad kind-apply ];
+ description = "Generic programming without too many type classes";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"simseq" = callPackage
({ mkDerivation, base, bio, bytestring, random }:
mkDerivation {
@@ -207212,6 +212252,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "singleton-bool_0_1_5" = callPackage
+ ({ mkDerivation, base, dec }:
+ mkDerivation {
+ pname = "singleton-bool";
+ version = "0.1.5";
+ sha256 = "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0";
+ libraryHaskellDepends = [ base dec ];
+ description = "Type level booleans";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"singleton-dict" = callPackage
({ mkDerivation, base, singletons }:
mkDerivation {
@@ -207317,18 +212369,19 @@ self: {
"siphon" = callPackage
({ mkDerivation, attoparsec, base, bytestring, colonnade
, contravariant, doctest, either, HUnit, pipes, profunctors
- , QuickCheck, streaming, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, transformers, vector
+ , QuickCheck, semigroups, streaming, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text
+ , transformers, vector
}:
mkDerivation {
pname = "siphon";
- version = "0.8.1";
- sha256 = "0f0i6clnlzkmks7l7pjxyvv2xq7lcd45fmdpzr7xqfwdn17mq6sx";
- revision = "2";
- editedCabalFile = "0kw20g5qghyh1nh9x8dm70frx3jl89npylr2aypvw8igffwsj531";
+ version = "0.8.1.1";
+ sha256 = "1l8asyjbhhzj0zccf86g0scm2h8hp42c3v3wyymcvfwmd2wspnfr";
+ revision = "1";
+ editedCabalFile = "0xdl110lvjq23vd7p6q0fc68yspk72m5ixs90yc8j2g7fi52izsx";
libraryHaskellDepends = [
- attoparsec base bytestring colonnade streaming text transformers
- vector
+ attoparsec base bytestring colonnade semigroups streaming text
+ transformers vector
];
testHaskellDepends = [
base bytestring colonnade contravariant doctest either HUnit pipes
@@ -207809,6 +212862,30 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "skylighting_0_8_1_1" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+ , base64-bytestring, binary, blaze-html, bytestring
+ , case-insensitive, colour, containers, directory, filepath, hxt
+ , mtl, regex-pcre-builtin, safe, skylighting-core, text
+ , utf8-string
+ }:
+ mkDerivation {
+ pname = "skylighting";
+ version = "0.8.1.1";
+ sha256 = "0q1zkb053szbgx3lqpmllxas0krb9m425qi0aplffhdqwmd05w8w";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal attoparsec base base64-bytestring binary
+ blaze-html bytestring case-insensitive colour containers directory
+ filepath hxt mtl regex-pcre-builtin safe skylighting-core text
+ utf8-string
+ ];
+ description = "syntax highlighting library";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"skylighting-core" = callPackage
({ mkDerivation, aeson, ansi-terminal, attoparsec, base
, base64-bytestring, binary, blaze-html, bytestring
@@ -207841,6 +212918,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "skylighting-core_0_8_1_1" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+ , base64-bytestring, binary, blaze-html, bytestring
+ , case-insensitive, colour, containers, criterion, Diff, directory
+ , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
+ , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
+ , tasty-quickcheck, text, transformers, utf8-string
+ }:
+ mkDerivation {
+ pname = "skylighting-core";
+ version = "0.8.1.1";
+ sha256 = "1klk9jlnyz5ciz2gm1dx5mh85nkvz6y1xsflvyf45c2gw9grc2km";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal attoparsec base base64-bytestring binary
+ blaze-html bytestring case-insensitive colour containers directory
+ filepath hxt mtl regex-pcre-builtin safe text transformers
+ utf8-string
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers Diff directory filepath HUnit
+ pretty-show QuickCheck random tasty tasty-golden tasty-hunit
+ tasty-quickcheck text
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion directory filepath text
+ ];
+ description = "syntax highlighting library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"skylighting-extensions" = callPackage
({ mkDerivation, base, containers, skylighting, skylighting-modding
, text
@@ -208015,8 +213125,8 @@ self: {
}:
mkDerivation {
pname = "slate";
- version = "0.13.0.0";
- sha256 = "0b1mk6d79h4mkh71kgg208i15bik97a29hzs1j57qxipici680rj";
+ version = "0.13.1.0";
+ sha256 = "08d6i7dacfcgsc4iijhs4sbkfhy720hk3m0v9d1gwg5ycjys1qdr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -208053,6 +213163,8 @@ self: {
];
description = "A fundamental solution to ghost threads and silent exceptions";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"sleep" = callPackage
@@ -208194,8 +213306,6 @@ self: {
];
description = "Visualize mathematical function's slope fields";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"slot-lambda" = callPackage
@@ -208264,6 +213374,26 @@ self: {
broken = true;
}) {};
+ "small-bytearray-builder" = callPackage
+ ({ mkDerivation, base, byteslice, primitive, primitive-offset
+ , QuickCheck, run-st, tasty, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "small-bytearray-builder";
+ version = "0.1.0.0";
+ sha256 = "1dsjvgl15wbja1fzm1sawqavvijkmaqidfaqk9qgp42kifhh0hzh";
+ libraryHaskellDepends = [
+ base byteslice primitive primitive-offset run-st vector
+ ];
+ testHaskellDepends = [
+ base byteslice primitive QuickCheck tasty tasty-quickcheck vector
+ ];
+ description = "Serialize to a small byte arrays";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"smallarray" = callPackage
({ mkDerivation, base, bytestring, deepseq, hashable }:
mkDerivation {
@@ -208283,8 +213413,8 @@ self: {
}:
mkDerivation {
pname = "smallcaps";
- version = "0.6.0.5";
- sha256 = "06cqknha64gmf3rjjmcr3358fd5rii6xlgph5fvan0h25cnlk7nw";
+ version = "0.6.0.6";
+ sha256 = "10853yxysjzv3nq2z4p0klqz2jakcdknbwmdfvppzp604v7ip4jm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -208297,8 +213427,6 @@ self: {
];
description = "Flatten camel case text in LaTeX files";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"smallcheck" = callPackage
@@ -208407,6 +213535,37 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "smap" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, hashable, memory
+ , mmorph, optparse-applicative, resourcet, streaming
+ , streaming-bytestring, strict, text, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "smap";
+ version = "0.3.3";
+ sha256 = "17qdn1ag4pdizgdng1747jdpad6xca208w7633pw24j5nkfy72dx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base bytestring hashable memory mmorph
+ optparse-applicative resourcet streaming streaming-bytestring
+ strict text transformers unordered-containers
+ ];
+ executableHaskellDepends = [
+ attoparsec base bytestring hashable memory mmorph
+ optparse-applicative resourcet streaming streaming-bytestring
+ strict text transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring hashable memory mmorph
+ optparse-applicative resourcet streaming streaming-bytestring
+ strict text transformers unordered-containers
+ ];
+ description = "A command line tool for working with sets and maps";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"smartGroup" = callPackage
({ mkDerivation, base, bytestring, containers, template-haskell }:
mkDerivation {
@@ -208747,6 +213906,8 @@ self: {
pname = "smtp-mail";
version = "0.1.4.6";
sha256 = "1g0lsbd9h8bhk4xddgzm96i8fy233904jnqnl4i94ld2hzpwpnl6";
+ revision = "1";
+ editedCabalFile = "1lvzami2vzrkgz5na71k1yi7346xdarxm0sbi6alq3wbpj1raakq";
libraryHaskellDepends = [
array base base16-bytestring base64-bytestring bytestring
cryptohash filepath mime-mail network text
@@ -208755,6 +213916,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "smtp-mail_0_2_0_0" = callPackage
+ ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
+ , bytestring, connection, cryptohash, filepath, mime-mail, network
+ , network-bsd, text
+ }:
+ mkDerivation {
+ pname = "smtp-mail";
+ version = "0.2.0.0";
+ sha256 = "0qazfkh03rnrijan037bjspskbsma5x04gcavmn0g744f7xldcaz";
+ revision = "1";
+ editedCabalFile = "1kv84kywyj8f7iypzdq6a32wwkk8318khhy4x3p9q6mlvgv8275r";
+ libraryHaskellDepends = [
+ array base base16-bytestring base64-bytestring bytestring
+ connection cryptohash filepath mime-mail network network-bsd text
+ ];
+ description = "Simple email sending via SMTP";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"smtp-mail-ng" = callPackage
({ mkDerivation, attoparsec, base, base16-bytestring
, base64-bytestring, bytestring, crypto-random, cryptohash
@@ -208819,6 +214000,8 @@ self: {
pname = "smuggler";
version = "0.1.0";
sha256 = "0iyisn5s39haik3g1wld67pdpnl8h3zafxhkgyd3ajx9lg9nf741";
+ revision = "1";
+ editedCabalFile = "1lbkir8l81f6dq3d2q9h6a1bpi03cq69qg3xr6h9ppx8ksswsw1d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -209078,8 +214261,8 @@ self: {
}:
mkDerivation {
pname = "snap-extras";
- version = "0.12.2.1";
- sha256 = "0mzvw49v6i77ysdlxfrdva5kn0vj9p5h2br6qlwvhdwqq8269gqp";
+ version = "0.12.3.0";
+ sha256 = "0r21fmmhn90rjvgxmlcq5f1q8dxd1y2zr62z2llcnl206a2hpm2x";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -209106,15 +214289,13 @@ self: {
}:
mkDerivation {
pname = "snap-language";
- version = "0.1.0.4";
- sha256 = "144l44s587hizsxkh38bqrabyjndwacipklsg30hiwk8cdhqa8f4";
+ version = "0.1.0.5";
+ sha256 = "04zn5d8qz17gm1c77xmas059hvl4ach8sayh81q676fkadiwk3x7";
libraryHaskellDepends = [
attoparsec base bytestring containers snap-core
];
description = "Language handling for Snap";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"snap-loader-dynamic" = callPackage
@@ -209247,6 +214428,8 @@ self: {
pname = "snap-server";
version = "1.1.1.1";
sha256 = "0lw475wp0lnrbgc3jcfif3qjjc3pmrh2k74d8cgpnc1304g6a2s5";
+ revision = "1";
+ editedCabalFile = "094b7ll47lxd4lvr6kd59jyw0vz686gw5cx16w758d6fli0cy3x3";
configureFlags = [ "-fopenssl" ];
isLibrary = true;
isExecutable = true;
@@ -209885,8 +215068,8 @@ self: {
}:
mkDerivation {
pname = "snaplet-purescript";
- version = "0.5.2.0";
- sha256 = "19d6w59c37p8na9l6xa085x9jsxnndizhd9f76fabwa70yghml71";
+ version = "0.5.2.3";
+ sha256 = "1da5yx6ghqkknkzgarnn0dx2za711sn8gl3ai0ahyy2wa9mdv6kd";
libraryHaskellDepends = [
base configurator mtl raw-strings-qq shelly snap snap-core
string-conv text transformers
@@ -210570,6 +215753,8 @@ self: {
pname = "soap-tls";
version = "0.1.1.4";
sha256 = "051shlb128lsacd2cjm4kpyqkmzdcwcj7ppl7l4n1k5j9g6k72yf";
+ revision = "1";
+ editedCabalFile = "11djy824gaw3cbsvphq263hxjrn1b3v5p1kdivsvlyn7q9bgvms9";
libraryHaskellDepends = [
base configurator connection data-default http-client
http-client-tls soap text tls x509 x509-store x509-validation
@@ -210754,22 +215939,29 @@ self: {
}) {};
"sockets" = callPackage
- ({ mkDerivation, async, base, bytestring, entropy, error-codes, ip
- , posix-api, primitive, stm, tasty, tasty-hunit, text
+ ({ mkDerivation, async, base, byteslice, bytestring, entropy
+ , error-codes, ip, posix-api, primitive, primitive-addr
+ , primitive-offset, primitive-unlifted, stm, tasty, tasty-hunit
+ , text
}:
mkDerivation {
pname = "sockets";
- version = "0.3.1.0";
- sha256 = "0i1h7m7yrsgz8srmpm9fw2wa1jj0cfxah2alp7q88zpgyaz2zr9d";
+ version = "0.4.0.0";
+ sha256 = "0xv8341kvy6br88lj4g17hqci9sn8qbm063iv69gmfbyp5x7fs9d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring error-codes ip posix-api primitive stm text
+ base byteslice bytestring error-codes ip posix-api primitive
+ primitive-addr primitive-offset primitive-unlifted stm text
];
testHaskellDepends = [
- async base bytestring ip primitive tasty tasty-hunit
+ async base byteslice bytestring ip primitive primitive-addr
+ primitive-unlifted tasty tasty-hunit
+ ];
+ benchmarkHaskellDepends = [
+ base byteslice bytestring entropy ip primitive
];
- benchmarkHaskellDepends = [ base bytestring entropy ip primitive ];
+ doHaddock = false;
description = "High-level network sockets";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -211002,6 +216194,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sop-core_0_5_0_0" = callPackage
+ ({ mkDerivation, base, deepseq }:
+ mkDerivation {
+ pname = "sop-core";
+ version = "0.5.0.0";
+ sha256 = "12zqdr0g4s3fr6710ngph0fr06lbc12c849izcl4cjj4g9w3v3zz";
+ libraryHaskellDepends = [ base deepseq ];
+ description = "True Sums of Products";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sophia" = callPackage
({ mkDerivation, base, binary, bindings-sophia, bytestring
, criterion, directory, tasty, tasty-hunit
@@ -211299,6 +216503,29 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "spacecookie" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+ , directory, fast-logger, filepath, hxt-unicode, mtl, socket
+ , transformers, unix
+ }:
+ mkDerivation {
+ pname = "spacecookie";
+ version = "0.2.0.1";
+ sha256 = "04gghnfkbb26xykgksif8xx5s9pv9f1rjgznlx5mpniwk11ij940";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers directory fast-logger
+ filepath hxt-unicode mtl socket transformers unix
+ ];
+ executableHaskellDepends = [
+ aeson attoparsec base bytestring containers directory filepath mtl
+ socket transformers unix
+ ];
+ description = "gopher server daemon";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"spacefill" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -211618,8 +216845,8 @@ self: {
pname = "spatial-rotations";
version = "0.1.0.1";
sha256 = "02nysw4dbg5l37j83kdybxkrdzgjxn20h3lknnphwz0hr0n489ii";
- revision = "1";
- editedCabalFile = "1g2ib60nhwwdb9fjdnmn7z0bzrsac6xcsl6bs7wi6s5rr991pp1c";
+ revision = "2";
+ editedCabalFile = "174y0jgf9bxqsc895f984q0gwn981sxdxmnwd3c25jp03iidc6c4";
libraryHaskellDepends = [
base linear manifolds-core vector-space
];
@@ -211629,8 +216856,6 @@ self: {
];
description = "Rotate about any suitable axis";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"spawn" = callPackage
@@ -211903,8 +217128,8 @@ self: {
({ mkDerivation, base, composition-prelude }:
mkDerivation {
pname = "spherical";
- version = "0.1.2.1";
- sha256 = "0c6c5pf39dd9zpk8g3kcbg6hagsjvxcmqxmfk1imv5fmd2g8cv8p";
+ version = "0.1.2.2";
+ sha256 = "014fmxgzymyfa82qabc90avjyv4yp7c0s88kkmp02pvpkmjd6p24";
libraryHaskellDepends = [ base composition-prelude ];
description = "Geometry on a sphere";
license = stdenv.lib.licenses.bsd3;
@@ -212639,8 +217864,8 @@ self: {
({ mkDerivation, base, QuickCheck, quickcheck-simple }:
mkDerivation {
pname = "sql-words";
- version = "0.1.6.2";
- sha256 = "0f7bvmz2ppq6pwgi3klxzpilnj899ssrsf52r99g9apqz065lsiz";
+ version = "0.1.6.3";
+ sha256 = "11z6g85dzrvkhnz0g6rhv5s2ssqcyyzbi2pp5rwzp30xp0ivsx95";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base QuickCheck quickcheck-simple ];
description = "SQL keywords data constructors into OverloadedString";
@@ -212799,31 +218024,27 @@ self: {
"squeal-postgresql" = callPackage
({ mkDerivation, aeson, base, binary-parser, bytestring
, bytestring-strict-builder, deepseq, doctest, generics-sop, hspec
- , lifted-base, mmorph, monad-control, mtl, network-ip
- , postgresql-binary, postgresql-libpq, records-sop, resource-pool
- , scientific, text, time, transformers, transformers-base
- , uuid-types, vector
+ , mmorph, mtl, network-ip, postgresql-binary, postgresql-libpq
+ , records-sop, resource-pool, scientific, text, time, transformers
+ , unliftio, unliftio-pool, uuid-types, vector
}:
mkDerivation {
pname = "squeal-postgresql";
- version = "0.4.0.0";
- sha256 = "10z1rq6jz8g6sv52bh9hjmjsw0pml9m4l04gzi19zxnwa597xk2b";
+ version = "0.5.1.0";
+ sha256 = "139a93b2zy3wximrziqxl5m9mqd66d7awzprrymwrxhxgrlrf27q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base binary-parser bytestring bytestring-strict-builder
- deepseq generics-sop lifted-base mmorph monad-control mtl
- network-ip postgresql-binary postgresql-libpq records-sop
- resource-pool scientific text time transformers transformers-base
- uuid-types vector
+ deepseq generics-sop mmorph mtl network-ip postgresql-binary
+ postgresql-libpq records-sop resource-pool scientific text time
+ transformers unliftio unliftio-pool uuid-types vector
];
executableHaskellDepends = [
- base bytestring generics-sop mtl text transformers
- transformers-base vector
+ base bytestring generics-sop mtl text transformers vector
];
testHaskellDepends = [
- base bytestring doctest generics-sop hspec text transformers
- transformers-base vector
+ base bytestring doctest generics-sop hspec text transformers vector
];
description = "Squeal PostgreSQL Library";
license = stdenv.lib.licenses.bsd3;
@@ -212837,8 +218058,8 @@ self: {
}:
mkDerivation {
pname = "squeeze";
- version = "1.0.4.16";
- sha256 = "0ywlxh7988i87qxpmja79a98ri9myzk4648d2j3aihsfdm34w2cr";
+ version = "1.0.4.17";
+ sha256 = "10nm5jim5cw7qmkdr1j7665g646kay53w8n5rcsp1jz3lglpymdw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -212852,6 +218073,8 @@ self: {
];
description = "A file-packing application";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"sr-extra" = callPackage
@@ -213267,30 +218490,32 @@ self: {
}) {};
"stack" = callPackage
- ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
- , attoparsec, base, base64-bytestring, bindings-uname, bytestring
- , Cabal, conduit, conduit-extra, containers, cryptonite
+ ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
+ , async, attoparsec, base, base64-bytestring, bytestring, Cabal
+ , colour, conduit, conduit-extra, containers, cryptonite
, cryptonite-conduit, deepseq, directory, echo, exceptions, extra
, file-embed, filelock, filepath, fsnotify, generic-deriving
- , hackage-security, hashable, hpack, hpc, hspec, http-client
- , http-client-tls, http-conduit, http-types, memory, microlens
- , mintty, monad-logger, mono-traversable, mtl, mustache
- , neat-interpolation, network-uri, open-browser
- , optparse-applicative, path, path-io, persistent
+ , hackage-security, hashable, hi-file-parser, hpack, hpc, hspec
+ , http-client, http-client-tls, http-conduit, http-download
+ , http-types, memory, microlens, mintty, mono-traversable, mtl
+ , mustache, neat-interpolation, network-uri, open-browser
+ , optparse-applicative, pantry-tmp, path, path-io, persistent
, persistent-sqlite, persistent-template, pretty, primitive
- , process, project-template, QuickCheck, regex-applicative-text
- , resourcet, retry, rio, semigroups, smallcheck, split, stm, store
- , store-core, streaming-commons, tar, template-haskell, temporary
- , text, text-metrics, th-reify-many, time, tls, transformers
- , typed-process, unicode-transforms, unix, unix-compat, unliftio
- , unordered-containers, vector, yaml, zip-archive, zlib
+ , process, project-template, QuickCheck, raw-strings-qq
+ , regex-applicative-text, resource-pool, resourcet, retry, rio
+ , rio-prettyprint, semigroups, smallcheck, split, stm
+ , streaming-commons, tar, template-haskell, temporary
+ , terminal-size, text, text-metrics, th-reify-many, time, tls
+ , transformers, typed-process, unicode-transforms, unix
+ , unix-compat, unliftio, unordered-containers, vector, yaml
+ , zip-archive, zlib
}:
mkDerivation {
pname = "stack";
- version = "1.9.3.1";
- sha256 = "0lxx2gwwh4kjhy9d67ykdnhm5z9zsflv515jgsf97nkf6b8db8lj";
+ version = "2.1.1.1";
+ sha256 = "1qqy0hkcvr4nblpknwljc71hck8ccpdiqxbxhj5mjwp9ybvag1j2";
revision = "2";
- editedCabalFile = "1fypvcvjlhyxnr81gll1w0l4nw6zvsr1vhb1y5g1jnyzy8f278zj";
+ editedCabalFile = "0c2vqmw6rvq4jspmc1h1d33bdzmm63svrax1q5r9g70lvjfi7ax8";
configureFlags = [
"-fdisable-git-info" "-fhide-dependency-versions"
"-fsupported-build"
@@ -213299,55 +218524,58 @@ self: {
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
libraryHaskellDepends = [
- aeson annotated-wl-pprint ansi-terminal async attoparsec base
- base64-bytestring bindings-uname bytestring Cabal conduit
- conduit-extra containers cryptonite cryptonite-conduit deepseq
- directory echo exceptions extra file-embed filelock filepath
- fsnotify generic-deriving hackage-security hashable hpack hpc
- http-client http-client-tls http-conduit http-types memory
- microlens mintty monad-logger mono-traversable mtl mustache
+ aeson annotated-wl-pprint ansi-terminal array async attoparsec base
+ base64-bytestring bytestring Cabal colour conduit conduit-extra
+ containers cryptonite cryptonite-conduit deepseq directory echo
+ exceptions extra file-embed filelock filepath fsnotify
+ generic-deriving hackage-security hashable hi-file-parser hpack hpc
+ http-client http-client-tls http-conduit http-download http-types
+ memory microlens mintty mono-traversable mtl mustache
neat-interpolation network-uri open-browser optparse-applicative
- path path-io persistent persistent-sqlite persistent-template
- pretty primitive process project-template regex-applicative-text
- resourcet retry rio semigroups split stm store store-core
- streaming-commons tar template-haskell temporary text text-metrics
+ pantry-tmp path path-io persistent persistent-sqlite
+ persistent-template pretty primitive process project-template
+ regex-applicative-text resource-pool resourcet retry rio
+ rio-prettyprint semigroups split stm streaming-commons tar
+ template-haskell temporary terminal-size text text-metrics
th-reify-many time tls transformers typed-process
unicode-transforms unix unix-compat unliftio unordered-containers
vector yaml zip-archive zlib
];
executableHaskellDepends = [
- aeson annotated-wl-pprint ansi-terminal async attoparsec base
- base64-bytestring bindings-uname bytestring Cabal conduit
- conduit-extra containers cryptonite cryptonite-conduit deepseq
- directory echo exceptions extra file-embed filelock filepath
- fsnotify generic-deriving hackage-security hashable hpack hpc
- http-client http-client-tls http-conduit http-types memory
- microlens mintty monad-logger mono-traversable mtl mustache
+ aeson annotated-wl-pprint ansi-terminal array async attoparsec base
+ base64-bytestring bytestring Cabal colour conduit conduit-extra
+ containers cryptonite cryptonite-conduit deepseq directory echo
+ exceptions extra file-embed filelock filepath fsnotify
+ generic-deriving hackage-security hashable hi-file-parser hpack hpc
+ http-client http-client-tls http-conduit http-download http-types
+ memory microlens mintty mono-traversable mtl mustache
neat-interpolation network-uri open-browser optparse-applicative
- path path-io persistent persistent-sqlite persistent-template
- pretty primitive process project-template regex-applicative-text
- resourcet retry rio semigroups split stm store store-core
- streaming-commons tar template-haskell temporary text text-metrics
+ pantry-tmp path path-io persistent persistent-sqlite
+ persistent-template pretty primitive process project-template
+ regex-applicative-text resource-pool resourcet retry rio
+ rio-prettyprint semigroups split stm streaming-commons tar
+ template-haskell temporary terminal-size text text-metrics
th-reify-many time tls transformers typed-process
unicode-transforms unix unix-compat unliftio unordered-containers
vector yaml zip-archive zlib
];
testHaskellDepends = [
- aeson annotated-wl-pprint ansi-terminal async attoparsec base
- base64-bytestring bindings-uname bytestring Cabal conduit
- conduit-extra containers cryptonite cryptonite-conduit deepseq
- directory echo exceptions extra file-embed filelock filepath
- fsnotify generic-deriving hackage-security hashable hpack hpc hspec
- http-client http-client-tls http-conduit http-types memory
- microlens mintty monad-logger mono-traversable mtl mustache
+ aeson annotated-wl-pprint ansi-terminal array async attoparsec base
+ base64-bytestring bytestring Cabal colour conduit conduit-extra
+ containers cryptonite cryptonite-conduit deepseq directory echo
+ exceptions extra file-embed filelock filepath fsnotify
+ generic-deriving hackage-security hashable hi-file-parser hpack hpc
+ hspec http-client http-client-tls http-conduit http-download
+ http-types memory microlens mintty mono-traversable mtl mustache
neat-interpolation network-uri open-browser optparse-applicative
- path path-io persistent persistent-sqlite persistent-template
- pretty primitive process project-template QuickCheck
- regex-applicative-text resourcet retry rio semigroups smallcheck
- split stm store store-core streaming-commons tar template-haskell
- temporary text text-metrics th-reify-many time tls transformers
- typed-process unicode-transforms unix unix-compat unliftio
- unordered-containers vector yaml zip-archive zlib
+ pantry-tmp path path-io persistent persistent-sqlite
+ persistent-template pretty primitive process project-template
+ QuickCheck raw-strings-qq regex-applicative-text resource-pool
+ resourcet retry rio rio-prettyprint semigroups smallcheck split stm
+ streaming-commons tar template-haskell temporary terminal-size text
+ text-metrics th-reify-many time tls transformers typed-process
+ unicode-transforms unix unix-compat unliftio unordered-containers
+ vector yaml zip-archive zlib
];
doCheck = false;
preCheck = "export HOME=$TMPDIR";
@@ -213615,34 +218843,6 @@ self: {
}) {};
"stack2nix" = callPackage
- ({ mkDerivation, async, base, Cabal, cabal2nix, containers
- , directory, distribution-nixpkgs, filepath, hackage-db, hspec
- , language-nix, lens, optparse-applicative, path, pretty, process
- , regex-pcre, SafeSemaphore, stack, temporary, text, time
- }:
- mkDerivation {
- pname = "stack2nix";
- version = "0.2.2";
- sha256 = "0x5dsgq9mdibbbilc0wn86qqkdgjkm606y4ix57vwxpfgrgkd3wm";
- revision = "1";
- editedCabalFile = "1rxrdpzgql4pldx990hmhhjj39kirxvqphiqjmwr9gbhbkyv7hcg";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- async base Cabal cabal2nix containers directory
- distribution-nixpkgs filepath hackage-db language-nix lens
- optparse-applicative path pretty process regex-pcre SafeSemaphore
- stack temporary text time
- ];
- executableHaskellDepends = [
- base Cabal optparse-applicative time
- ];
- testHaskellDepends = [ base hspec ];
- description = "Convert stack.yaml files into Nix build instructions.";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "stack2nix_0_2_3" = callPackage
({ mkDerivation, async, base, bytestring, Cabal, cabal2nix
, containers, directory, distribution-nixpkgs, filepath, hackage-db
, hspec, language-nix, lens, optparse-applicative, path, pretty
@@ -213667,6 +218867,7 @@ self: {
description = "Convert stack.yaml files into Nix build instructions.";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"stackage" = callPackage
@@ -213857,23 +219058,28 @@ self: {
}) {};
"stackage-query" = callPackage
- ({ mkDerivation, aeson, base, Cabal, containers, directory
- , exceptions, filepath, hashable, optparse-applicative, process
- , safe, semigroups, text, time, unordered-containers, vector, yaml
+ ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+ , directory, exceptions, filepath, hashable, http-directory
+ , optparse-applicative, process, safe, semigroups, simple-cmd
+ , simple-cmd-args, text, time, unix, unordered-containers, vector
+ , yaml
}:
mkDerivation {
pname = "stackage-query";
- version = "0.1.3";
- sha256 = "01fjxgxbyd7hxr2js7jpa7gm6d0bdm58gxz4pzzwsgnbchm50q25";
+ version = "0.2.0";
+ sha256 = "1aqra70mfnxxirbv61q71ia00jnrcdfyhrrswnzrd4jf7ar2ja02";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- aeson base Cabal containers directory exceptions filepath hashable
- optparse-applicative process safe semigroups text time
+ aeson base bytestring Cabal containers directory exceptions
+ filepath hashable http-directory optparse-applicative process safe
+ semigroups simple-cmd simple-cmd-args text time unix
unordered-containers vector yaml
];
- description = "Stackage package query";
+ description = "Tool for querying Stackage";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"stackage-sandbox" = callPackage
@@ -213957,6 +219163,8 @@ self: {
pname = "stackage-types";
version = "1.2.0";
sha256 = "1jzlxnibl4fn6mqbxv9c8hw4zp7adyicwwkknr5w1am5k825a0n0";
+ revision = "1";
+ editedCabalFile = "0myabw8i41607z2yk5zz5y4mm0bm37qxp2zmnlfnb4267qq15klz";
libraryHaskellDepends = [
aeson base Cabal containers exceptions hashable safe semigroups
text time unordered-containers vector
@@ -214119,8 +219327,6 @@ self: {
];
description = "Generate standalone haddock documentation for a set of packages";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"star" = callPackage
@@ -214701,19 +219907,20 @@ self: {
}) {};
"status-notifier-item" = callPackage
- ({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger
- , filepath, hslogger, lens, network, optparse-applicative, spool
- , template-haskell, text, transformers, vector
+ ({ mkDerivation, base, bytestring, bytestring-to-vector, containers
+ , dbus, dbus-hslogger, filepath, hslogger, lens, network
+ , optparse-applicative, template-haskell, text, transformers
+ , vector
}:
mkDerivation {
pname = "status-notifier-item";
- version = "0.3.0.1";
- sha256 = "0wrw635r7c2qdb90hpm5lg3kb16c3dkw88ypbszf18m02f4dsk8h";
+ version = "0.3.0.4";
+ sha256 = "0abck5zvk46kng28qjhvqkxj485zw3l6bsakxpjijb58d1i0g667";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring containers dbus filepath hslogger lens network
- spool template-haskell text transformers vector
+ base bytestring bytestring-to-vector containers dbus filepath
+ hslogger lens network template-haskell text transformers vector
];
executableHaskellDepends = [
base dbus dbus-hslogger hslogger optparse-applicative
@@ -214759,8 +219966,6 @@ self: {
];
description = "What version is the package X in stackage lts-Y.ZZ?";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"stb-image" = callPackage
@@ -214797,8 +220002,17 @@ self: {
libraryHaskellDepends = [ array base bytestring containers ];
description = "A wrapper around Sean Barrett's TrueType rasterizer library";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ }) {};
+
+ "std" = callPackage
+ ({ mkDerivation }:
+ mkDerivation {
+ pname = "std";
+ version = "0";
+ sha256 = "0ldn5yxpj99yhhp5x7zlxjmd9qgqyjg68avr19k7argwcf3nr9y9";
+ doHaddock = false;
+ description = "TBA";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"stdata" = callPackage
@@ -214842,17 +220056,16 @@ self: {
({ mkDerivation, base, case-insensitive, deepseq, exceptions
, ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp
, libuv, primitive, QuickCheck, quickcheck-instances, scientific
- , stm, template-haskell, time, word8
+ , stm, tagged, template-haskell, time, unordered-containers, word8
}:
mkDerivation {
pname = "stdio";
- version = "0.1.1.0";
- sha256 = "1sspnrflqac9clf9h6zwnhlvsw52xx97dlxyl6lhw6czy2qy813d";
- revision = "1";
- editedCabalFile = "1xdw84i0nlc3iz3i01li9p44raxn265kqjd284ifbf83vvhbp897";
+ version = "0.2.0.0";
+ sha256 = "0j2ywcrzwx2q9fwa8slx7clzgrmfsnfz22ma08b77ii0yg0za271";
libraryHaskellDepends = [
base case-insensitive deepseq exceptions ghc-prim hashable
- integer-gmp primitive scientific stm template-haskell time word8
+ integer-gmp primitive QuickCheck scientific stm tagged
+ template-haskell time unordered-containers
];
libraryPkgconfigDepends = [ libuv ];
libraryToolDepends = [ hspec-discover ];
@@ -215153,6 +220366,8 @@ self: {
];
description = "Containers for STM";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"stm-delay" = callPackage
@@ -215206,8 +220421,8 @@ self: {
}:
mkDerivation {
pname = "stm-hamt";
- version = "1.2.0.2";
- sha256 = "17ywv40vxclkg2lgl52r3j30r1n0jcvahamcfnr3n5a1lh86149w";
+ version = "1.2.0.4";
+ sha256 = "0hlzi1zg58mgnb77982hkssm86ds66fs5nf1g2hcjjbjawchx3mj";
libraryHaskellDepends = [
base deferred-folds focus hashable list-t primitive
primitive-extras transformers
@@ -215222,6 +220437,8 @@ self: {
];
description = "STM-specialised Hash Array Mapped Trie";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"stm-io-hooks" = callPackage
@@ -215248,8 +220465,6 @@ self: {
libraryHaskellDepends = [ base stm transformers ];
description = "Software Transactional Memory lifted to MonadIO";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"stm-linkedlist" = callPackage
@@ -215472,18 +220687,6 @@ self: {
}) {};
"stopwatch" = callPackage
- ({ mkDerivation, base, clock, hspec, transformers }:
- mkDerivation {
- pname = "stopwatch";
- version = "0.1.0.5";
- sha256 = "0q9l27cpfz5hs3ggxij0lk8p3vrgkjg1binhv2nwss4dvygdc7j6";
- libraryHaskellDepends = [ base clock transformers ];
- testHaskellDepends = [ base clock hspec ];
- description = "A simple stopwatch utility";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "stopwatch_0_1_0_6" = callPackage
({ mkDerivation, base, clock, hspec, transformers }:
mkDerivation {
pname = "stopwatch";
@@ -215493,7 +220696,6 @@ self: {
testHaskellDepends = [ base clock hspec ];
description = "A simple stopwatch utility";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"storable" = callPackage
@@ -215639,10 +220841,61 @@ self: {
}:
mkDerivation {
pname = "store";
- version = "0.5.1.0";
- sha256 = "0r15b04vxfca45a0rv1n4lcd6zpxhlhc9gmg9if17r1bm63x59hr";
+ version = "0.5.1.1";
+ sha256 = "1lp2kcrb4d3wsyd1cfmw3927w693lq9hj2anv0j993wvpdvd1cgl";
revision = "1";
- editedCabalFile = "0nfy8lrvj9kzhmbx8nkg8vlvlha8hkr4k23vs9xasvrw2wp5rfhj";
+ editedCabalFile = "0v9rvm94afixryskpm7hn6cc6qkfciw3q7yi1dvrsq2rq75jbamk";
+ libraryHaskellDepends = [
+ array async base base-orphans base64-bytestring bifunctors
+ bytestring containers contravariant cryptohash deepseq directory
+ filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+ lifted-base monad-control mono-traversable network primitive
+ resourcet safe semigroups smallcheck store-core syb
+ template-haskell text th-lift th-lift-instances th-orphans
+ th-reify-many th-utilities time transformers unordered-containers
+ vector void
+ ];
+ testHaskellDepends = [
+ array async base base-orphans base64-bytestring bifunctors
+ bytestring clock containers contravariant cryptohash deepseq
+ directory filepath free ghc-prim hashable hspec hspec-smallcheck
+ integer-gmp lifted-base monad-control mono-traversable network
+ primitive resourcet safe semigroups smallcheck store-core syb
+ template-haskell text th-lift th-lift-instances th-orphans
+ th-reify-many th-utilities time transformers unordered-containers
+ vector void
+ ];
+ benchmarkHaskellDepends = [
+ array async base base-orphans base64-bytestring bifunctors
+ bytestring cereal cereal-vector containers contravariant criterion
+ cryptohash deepseq directory filepath free ghc-prim hashable hspec
+ hspec-smallcheck integer-gmp lifted-base monad-control
+ mono-traversable network primitive resourcet safe semigroups
+ smallcheck store-core syb template-haskell text th-lift
+ th-lift-instances th-orphans th-reify-many th-utilities time
+ transformers unordered-containers vector vector-binary-instances
+ void weigh
+ ];
+ description = "Fast binary serialization";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "store_0_5_1_2" = callPackage
+ ({ mkDerivation, array, async, base, base-orphans
+ , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
+ , clock, containers, contravariant, criterion, cryptohash, deepseq
+ , directory, filepath, free, ghc-prim, hashable, hspec
+ , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+ , mono-traversable, network, primitive, resourcet, safe, semigroups
+ , smallcheck, store-core, syb, template-haskell, text, th-lift
+ , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
+ , transformers, unordered-containers, vector
+ , vector-binary-instances, void, weigh
+ }:
+ mkDerivation {
+ pname = "store";
+ version = "0.5.1.2";
+ sha256 = "1abwlcj0z17hj5h94cbg1sgqfdsdgjhgfgd2aaspsn4zdfk5bjc5";
libraryHaskellDepends = [
array async base base-orphans base64-bytestring bifunctors
bytestring containers contravariant cryptohash deepseq directory
@@ -215676,6 +220929,7 @@ self: {
];
description = "Fast binary serialization";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"store-core" = callPackage
@@ -215773,15 +221027,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_36_0" = callPackage
+ "stratosphere_0_40_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.36.0";
- sha256 = "0890g86djpwg9nisqbb5nxxj42r2r8rh98vd5a0dk7lc72navp3k";
+ version = "0.40.0";
+ sha256 = "0xj8bclyfvhdw12jfndg6pivzrbhqjf2qky383n0w6if11cfli1z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -216000,6 +221254,8 @@ self: {
pname = "streaming";
version = "0.2.2.0";
sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss";
+ revision = "1";
+ editedCabalFile = "1sq8blxh4s1lsvxkc64x7drxwn75kszxicjhvw4cg505fp9bfc7y";
libraryHaskellDepends = [
base containers ghc-prim mmorph mtl semigroups transformers
transformers-base
@@ -216014,10 +221270,8 @@ self: {
}:
mkDerivation {
pname = "streaming-attoparsec";
- version = "1.0.0";
- sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z";
- revision = "2";
- editedCabalFile = "07hqs8nn1rhsqckqmw46yp19kd0vk35q139al6yq0k1dzpvsrcsx";
+ version = "1.0.0.1";
+ sha256 = "151gjivqbadh1wfbj53d0ahw4cjax4nnhg1v0l1piqnp1mbz7j8y";
libraryHaskellDepends = [
attoparsec base bytestring streaming streaming-bytestring
];
@@ -216073,8 +221327,6 @@ self: {
];
description = "Benchmarks to compare streaming packages";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"streaming-binary" = callPackage
@@ -216185,8 +221437,8 @@ self: {
}:
mkDerivation {
pname = "streaming-commons";
- version = "0.2.1.0";
- sha256 = "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq";
+ version = "0.2.1.1";
+ sha256 = "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52";
libraryHaskellDepends = [
array async base bytestring directory network process random stm
text transformers unix zlib
@@ -216207,8 +221459,8 @@ self: {
}:
mkDerivation {
pname = "streaming-concurrency";
- version = "0.3.1.2";
- sha256 = "0ra4svn595qx08rfg3qz2n30y6dsv2xj2kdl4s61xbhi4cmff819";
+ version = "0.3.1.3";
+ sha256 = "07fk9kdfh2983qawl78sy0ibqa8ngwna2slz3ckbm1fgc8sybzip";
libraryHaskellDepends = [
base exceptions lifted-async monad-control stm streaming
streaming-with transformers-base
@@ -216222,8 +221474,6 @@ self: {
];
description = "Concurrency support for the streaming ecosystem";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"streaming-conduit" = callPackage
@@ -216321,54 +221571,45 @@ self: {
"streaming-osm" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
- , criterion, streaming, streaming-bytestring, streaming-utils
+ , resourcet, streaming, streaming-attoparsec, streaming-bytestring
, tasty, tasty-hunit, text, transformers, vector, zlib
}:
mkDerivation {
pname = "streaming-osm";
- version = "1.0.0";
- sha256 = "1z1wpwmsgc4viy0w3zcmf5d88nylyynb359r1p2naajg65kbb46h";
+ version = "1.0.0.1";
+ sha256 = "0zf9f079ssmm1gy1ngcqz1faxyardv91ynv5lc5xfh8fhgk9a65c";
libraryHaskellDepends = [
- attoparsec base bytestring containers streaming
- streaming-bytestring streaming-utils text transformers vector zlib
+ attoparsec base bytestring containers resourcet streaming
+ streaming-attoparsec streaming-bytestring text transformers vector
+ zlib
];
testHaskellDepends = [
- attoparsec base bytestring streaming tasty tasty-hunit vector zlib
- ];
- benchmarkHaskellDepends = [
- attoparsec base bytestring criterion streaming vector zlib
+ attoparsec base bytestring resourcet streaming tasty tasty-hunit
+ vector zlib
];
description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"streaming-pcap" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, criterion, pcap
- , streaming, streaming-bytestring, streaming-utils, tasty
+ ({ mkDerivation, attoparsec, base, bytestring, pcap, resourcet
+ , streaming, streaming-attoparsec, streaming-bytestring, tasty
, tasty-hunit
}:
mkDerivation {
pname = "streaming-pcap";
- version = "1.1.1";
- sha256 = "1riw6n3n5rbzfqlm0z6qbznlx2lc8bk2s1qjy8a9zx90wbys0xp1";
+ version = "1.1.1.1";
+ sha256 = "1qzll7n2h9jgwhnx0gvrxzi19dkhqxy0fymbc414hwsn27f8sh8b";
libraryHaskellDepends = [
- attoparsec base bytestring pcap streaming streaming-bytestring
- streaming-utils
+ attoparsec base bytestring pcap resourcet streaming
+ streaming-attoparsec streaming-bytestring
];
testHaskellDepends = [
- attoparsec base bytestring pcap streaming streaming-bytestring
- streaming-utils tasty tasty-hunit
- ];
- benchmarkHaskellDepends = [
- attoparsec base bytestring criterion pcap streaming
- streaming-bytestring streaming-utils
+ attoparsec base bytestring pcap resourcet streaming
+ streaming-attoparsec streaming-bytestring tasty tasty-hunit
];
description = "Stream packets via libpcap";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"streaming-png" = callPackage
@@ -216478,6 +221719,8 @@ self: {
];
description = "http, attoparsec, pipes and other utilities for the streaming libraries";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"streaming-wai" = callPackage
@@ -216928,13 +222171,13 @@ self: {
"string-interpolate" = callPackage
({ mkDerivation, base, bytestring, criterion, formatting
, haskell-src-meta, hspec, interpolate, interpolatedstring-perl6
- , Interpolation, QuickCheck, quickcheck-instances, quickcheck-text
+ , QuickCheck, quickcheck-instances, quickcheck-text
, template-haskell, text, text-conversions, utf8-string
}:
mkDerivation {
pname = "string-interpolate";
- version = "0.1.0.0";
- sha256 = "1q80rkp7qhha1swz47rkjmpnmnr4p5837s1179l43v1117ck0yqa";
+ version = "0.1.0.1";
+ sha256 = "0gk5driazck1h1hnpp17kw0ylgp15s9jnnmz53wxz4rjqy6g3z4c";
libraryHaskellDepends = [
base bytestring haskell-src-meta template-haskell text
text-conversions utf8-string
@@ -216945,7 +222188,7 @@ self: {
];
benchmarkHaskellDepends = [
base bytestring criterion formatting interpolate
- interpolatedstring-perl6 Interpolation QuickCheck text
+ interpolatedstring-perl6 QuickCheck text
];
description = "Haskell string/text/bytestring interpolation that just works";
license = stdenv.lib.licenses.bsd3;
@@ -217039,8 +222282,8 @@ self: {
}:
mkDerivation {
pname = "string-transform";
- version = "1.1.0";
- sha256 = "1f76aiimm2knc68g08dc9j495mjkas87jw8w27silrsq3pzayzad";
+ version = "1.1.1";
+ sha256 = "08ay7r8ln4jwn7iq6smbny5lby3xgzlrlqj02yp61n1cn0sgzbhw";
libraryHaskellDepends = [ base bytestring text utf8-string ];
testHaskellDepends = [
base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
@@ -217177,6 +222420,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "strip-ansi-escape" = callPackage
+ ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }:
+ mkDerivation {
+ pname = "strip-ansi-escape";
+ version = "0.1.0.0";
+ sha256 = "0yxz4ygckhzav8s2vbd6355gclk1zs6xk0s0s90nxd7yxhahfpx8";
+ revision = "2";
+ editedCabalFile = "0pzp5wya73l732waxjl3fza3kkr7ip7bgsj6xhvsi1k0n69yvwh8";
+ libraryHaskellDepends = [ attoparsec base text ];
+ testHaskellDepends = [ base hspec QuickCheck text ];
+ description = "Strip ANSI escape code from string";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"stripe" = callPackage
({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
, mtl, text, time, unordered-containers, utf8-string
@@ -217199,8 +222456,8 @@ self: {
({ mkDerivation, base, bytestring, text }:
mkDerivation {
pname = "stripe-concepts";
- version = "1.0.0.0";
- sha256 = "0s518mlb181407w2gmlhaayaf3ypn03lzw3fmkzkiqz2c89kd1rw";
+ version = "1.0.1.0";
+ sha256 = "1bpxsi9dpazxjh3m5lbkvm7aszylmhvkpazw8hdgpdnkv3gryjv5";
libraryHaskellDepends = [ base bytestring text ];
description = "Types for the Stripe API";
license = stdenv.lib.licenses.mit;
@@ -217274,6 +222531,8 @@ self: {
doCheck = false;
description = "Stripe API for Haskell - http-streams backend";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"stripe-scotty" = callPackage
@@ -217295,15 +222554,16 @@ self: {
}) {};
"stripe-signature" = callPackage
- ({ mkDerivation, base, bytestring, cryptonite, hex-text, memory
- , stripe-concepts, text
+ ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite
+ , memory, stripe-concepts, text
}:
mkDerivation {
pname = "stripe-signature";
- version = "1.0.0.0";
- sha256 = "0hg5l9fyfr6yhna2awcyrfr38zlpd1q58b6q6fc3aq8qhbwk8zps";
+ version = "1.0.0.1";
+ sha256 = "1l5gw1lv63mpi8f2z70wv4b5809ljsi2zzdgj2mwc2zrdqfnharn";
libraryHaskellDepends = [
- base bytestring cryptonite hex-text memory stripe-concepts text
+ base base16-bytestring bytestring cryptonite memory stripe-concepts
+ text
];
testHaskellDepends = [ base bytestring text ];
description = "Verification of Stripe webhook signatures";
@@ -217409,8 +222669,6 @@ self: {
];
description = "Interface library for strongSwan SQL backend";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"strptime" = callPackage
@@ -217426,21 +222684,22 @@ self: {
"structs" = callPackage
({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory
- , doctest, filepath, ghc-prim, hlint, parallel, primitive
- , template-haskell
+ , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck
+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell
}:
mkDerivation {
pname = "structs";
- version = "0.1.1";
- sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z";
- revision = "2";
- editedCabalFile = "1v9gmnj17cm4p491rizvw9xdj255lk1y24gz6s8bqcz56sdb4d4s";
+ version = "0.1.2";
+ sha256 = "0myv13g48y8vn397lvg45lb942fmw4n9gs80v5nnjfvgika7qbw4";
+ revision = "1";
+ editedCabalFile = "1snsprlbv9npn06iliy937vxqpsjpcmv880bnkbzj3nz4c6c59pa";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base deepseq ghc-prim primitive template-haskell
];
testHaskellDepends = [
- base directory doctest filepath hlint parallel
+ base directory doctest filepath parallel primitive QuickCheck tasty
+ tasty-hunit tasty-quickcheck
];
description = "Strict GC'd imperative object-oriented programming with cheap pointers";
license = stdenv.lib.licenses.bsd3;
@@ -217698,8 +222957,8 @@ self: {
}:
mkDerivation {
pname = "stylish-haskell";
- version = "0.9.2.1";
- sha256 = "1ls11fdx6snvfx8yykpidz142zzxwi5bazl49hgfqlwx50rqcp7w";
+ version = "0.9.2.2";
+ sha256 = "1zs624xqp6j8vrl6pfv18dm8vz8hvz25grri65ximxhcizgwhnax";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -217751,28 +223010,21 @@ self: {
}) {};
"suavemente" = callPackage
- ({ mkDerivation, base, blaze-markup, bytestring, diagrams-core
- , diagrams-lib, diagrams-svg, interpolatedstring-perl6, lens, mtl
- , servant, servant-blaze, servant-server, servant-websockets, stm
- , streaming, svg-builder, transformers, warp, websockets
+ ({ mkDerivation, aeson, base, blaze-markup, bytestring, colour
+ , containers, diagrams-core, diagrams-lib, diagrams-svg
+ , interpolatedstring-perl6, lens, mtl, servant, servant-blaze
+ , servant-server, servant-websockets, stm, streaming, svg-builder
+ , text, transformers, warp, websockets
}:
mkDerivation {
pname = "suavemente";
- version = "0.1.0.0";
- sha256 = "1595jc7lqvdk60p0cc3vjag7lgd90ayfwb16n70i1j9sz3b2qvva";
- isLibrary = true;
- isExecutable = true;
+ version = "0.2.0.0";
+ sha256 = "0m5sfa3sx67mx1wsps0vpr4g4vq64rmdml6p930r1jp3b4rd41wa";
libraryHaskellDepends = [
- base blaze-markup bytestring diagrams-core diagrams-lib
- diagrams-svg interpolatedstring-perl6 lens mtl servant
+ aeson base blaze-markup bytestring colour containers diagrams-core
+ diagrams-lib diagrams-svg interpolatedstring-perl6 lens mtl servant
servant-blaze servant-server servant-websockets stm streaming
- svg-builder transformers warp websockets
- ];
- executableHaskellDepends = [
- base blaze-markup bytestring diagrams-core diagrams-lib
- diagrams-svg interpolatedstring-perl6 lens mtl servant
- servant-blaze servant-server servant-websockets stm streaming
- svg-builder transformers warp websockets
+ svg-builder text transformers warp websockets
];
description = "An applicative functor that seamlessly talks to HTML inputs";
license = stdenv.lib.licenses.bsd3;
@@ -217918,8 +223170,6 @@ self: {
];
description = "Match / replace substrings with a parser combinators";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"subtitleParser" = callPackage
@@ -218125,6 +223375,8 @@ self: {
pname = "summoner";
version = "1.3.0.1";
sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s";
+ revision = "3";
+ editedCabalFile = "0galzkk5y41akmy12vfk8zh5pm9pyv4a5034qpfcxm7ix0s2ivms";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -218151,6 +223403,8 @@ self: {
pname = "summoner-tui";
version = "0.1.0";
sha256 = "0ic9faw55qjljwz8r0nz8jmdw2pcc40nqc0zp07hshqh8qbiswl9";
+ revision = "1";
+ editedCabalFile = "0rjnrhh62m2jy74dqdiywkk2gqs1dds97h55qxc50qysdiiwmmal";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -218586,8 +223840,8 @@ self: {
pname = "sv";
version = "1.3.1";
sha256 = "0j92jgma41ggfjvd8a1la1wi2vms8ia1y6aqf6l7casavcn5vf2k";
- revision = "1";
- editedCabalFile = "19khsv0s2gk78fiwjkd3b1f2dkv78yhsl88rlb2jb2j48sjaqsgn";
+ revision = "2";
+ editedCabalFile = "1c0q010bpzdmjlncjn58fvz50l5z2wqp4hjpj0isvdr5iq96pgza";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring contravariant hw-dsv
semigroupoids sv-core transformers utf8-string validation
@@ -218664,8 +223918,8 @@ self: {
pname = "sv-core";
version = "0.4.1";
sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7";
- revision = "1";
- editedCabalFile = "1zdg2v5sxz0x6q6sgz79s71kqj79g8vn9pyl8hvqkw43b3g6zs4i";
+ revision = "2";
+ editedCabalFile = "05h0lsj434qv81b2fvnm80wyb7272wcwly3jfk4l1qp5hjyq6917";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
deepseq double-conversion lens mtl parsec profunctors readable
@@ -218766,8 +224020,8 @@ self: {
}:
mkDerivation {
pname = "svg-tree";
- version = "0.6.2.3";
- sha256 = "0snvv2l7fpj7nl1sxnpxz5h2xpskjxxl0l2c7bqkwhcj7571br99";
+ version = "0.6.2.4";
+ sha256 = "1hhs2w6fmd1m6768p1bfhj6vi4br4ray0g9f1hv8g19pqgip3r2c";
libraryHaskellDepends = [
attoparsec base bytestring containers JuicyPixels lens linear mtl
scientific text transformers vector xml
@@ -219001,6 +224255,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "swagger2_2_4" = callPackage
+ ({ mkDerivation, aeson, base, base-compat-batteries, bytestring
+ , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop
+ , Glob, hashable, hspec, hspec-discover, http-media, HUnit
+ , insert-ordered-containers, lens, mtl, network, QuickCheck
+ , quickcheck-instances, scientific, template-haskell, text, time
+ , transformers, transformers-compat, unordered-containers
+ , utf8-string, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "swagger2";
+ version = "2.4";
+ sha256 = "0m08l7nz53h6ix6xgzynnh3cf6l61437da9swdbsz8avx0rq2wci";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson base base-compat-batteries bytestring containers cookie
+ generics-sop hashable http-media insert-ordered-containers lens mtl
+ network QuickCheck scientific template-haskell text time
+ transformers transformers-compat unordered-containers uuid-types
+ vector
+ ];
+ testHaskellDepends = [
+ aeson base base-compat-batteries bytestring containers doctest Glob
+ hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+ quickcheck-instances template-haskell text time
+ unordered-containers utf8-string vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Swagger 2.0 data model";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"swapper" = callPackage
({ mkDerivation, base, binary, bytestring, deepseq, happstack-data
, happstack-state, parallel, tokyocabinet
@@ -219133,8 +224420,8 @@ self: {
({ mkDerivation, base, containers, HUnit, mtl }:
mkDerivation {
pname = "syb";
- version = "0.7";
- sha256 = "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq";
+ version = "0.7.1";
+ sha256 = "0077vxzyi9ppbphi2ialac3p376k49qly1kskdgf57wdwix9qjp0";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base containers HUnit mtl ];
description = "Scrap Your Boilerplate";
@@ -219266,8 +224553,8 @@ self: {
}:
mkDerivation {
pname = "symantic";
- version = "6.3.2.20180208";
- sha256 = "1a6ifwhrn35wfx0lf2gbq203rb882p7hl0yji7rwfrvxrp4ax518";
+ version = "6.3.3.20190614";
+ sha256 = "1l0a82r1fx6ai5csjaqiha8gngb1pay1cmj947619xy36iwng3pc";
libraryHaskellDepends = [
base containers mono-traversable symantic-document symantic-grammar
text transformers
@@ -219284,12 +224571,12 @@ self: {
}:
mkDerivation {
pname = "symantic-cli";
- version = "0.0.0.20180410";
- sha256 = "0025rgjjz198sh6gb8zzy7283pnb6vza3q3d7x5xl27c77mpivpx";
+ version = "2.2.4.20190701";
+ sha256 = "0qkfjhva0mrmirc4md82r5f738i6af4whlyqnxmksqz0jwa9r5nv";
libraryHaskellDepends = [
base containers megaparsec symantic-document text transformers
];
- description = "Library for Command Line Interface (CLI)";
+ description = "Symantics for parsing and documenting a CLI";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -219301,8 +224588,8 @@ self: {
}:
mkDerivation {
pname = "symantic-document";
- version = "0.1.2.20180831";
- sha256 = "1vlxgn9gdd03azqf2csxjiyqsplg68wv3qr6d08zj5dvqskz27by";
+ version = "1.2.3.20190628";
+ sha256 = "0ahbhksiyinfsbgb2xhikckly8m5g2lfads5cjk7mbi27zn9y2v8";
libraryHaskellDepends = [ ansi-terminal base text transformers ];
testHaskellDepends = [
base containers tasty tasty-hunit text transformers
@@ -219317,16 +224604,14 @@ self: {
}:
mkDerivation {
pname = "symantic-grammar";
- version = "0.3.1.20180831";
- sha256 = "0n2x5sb5gv9lkhfmq9yfjxfk6q19h71xqbskkg7ar8nglz0jhldp";
+ version = "0.3.3.20190614";
+ sha256 = "1vrf1kmvs7x8lzbnm90kmy114d2yd81fqw6i1j9nys8yq1z40v8a";
libraryHaskellDepends = [ base text ];
testHaskellDepends = [
base megaparsec tasty tasty-hunit text transformers
];
description = "Library for symantic grammars";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"symantic-http" = callPackage
@@ -219464,8 +224749,8 @@ self: {
}:
mkDerivation {
pname = "symantic-lib";
- version = "0.0.4.20180831";
- sha256 = "1agqlz7drckjm8a2swvqiryy7y6kdahq8d24rwkbzn3nw1bnyvk1";
+ version = "0.0.5.20190614";
+ sha256 = "02rzm43h71ivdx8vwbsa8ij5vv7jkf2y78f568lvkwgr1av84hz9";
libraryHaskellDepends = [
base containers mono-traversable symantic symantic-grammar text
transformers
@@ -219520,7 +224805,8 @@ self: {
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;};
+ }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx;
+ inherit (pkgs) symengine;};
"symengine-hs" = callPackage
({ mkDerivation, base, gmp, gmpxx, symengine }:
@@ -219539,7 +224825,8 @@ self: {
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;};
+ }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx;
+ inherit (pkgs) symengine;};
"symmetric-properties" = callPackage
({ mkDerivation, base, containers, hspec, HUnit }:
@@ -219706,8 +224993,6 @@ self: {
benchmarkHaskellDepends = [ base criterion deepseq ];
description = "Generic representation and manipulation of abstract syntax";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"syntactical" = callPackage
@@ -220451,6 +225736,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "systemd_2_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, network, transformers, unix }:
+ mkDerivation {
+ pname = "systemd";
+ version = "2.1.0";
+ sha256 = "1m6z5f3zaxxn9jcbd02b16rzgbifzwlwvpbw8v16qh5q8sy074dc";
+ libraryHaskellDepends = [
+ base bytestring network transformers unix
+ ];
+ testHaskellDepends = [ base network unix ];
+ description = "Systemd facilities (Socket activation, Notify)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"systemstats" = callPackage
({ mkDerivation, base, micrologger, optparse-applicative, statgrab
, text, text-format, transformers
@@ -220621,8 +225921,6 @@ self: {
];
description = "Layout text as grid or table";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"table-tennis" = callPackage
@@ -220770,43 +226068,49 @@ self: {
}) {};
"taffybar" = callPackage
- ({ mkDerivation, base, bytestring, ConfigFile, containers, dbus
- , dbus-hslogger, directory, dyre, either, enclosed-exceptions
- , filepath, gi-cairo, gi-cairo-connector, gi-cairo-render, gi-gdk
- , gi-gdkpixbuf, gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango
- , gtk-sni-tray, gtk-strut, gtk3, haskell-gi, haskell-gi-base
- , hslogger, HStringTemplate, http-client, http-client-tls
- , http-types, multimap, network, network-uri, old-locale
- , optparse-applicative, parsec, process, rate-limit, regex-compat
- , safe, scotty, split, status-notifier-item, stm, template-haskell
- , text, time, time-locale-compat, time-units, transformers
- , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir
- , xml, xml-helpers, xmonad
+ ({ mkDerivation, ansi-terminal, base, broadcast-chan, bytestring
+ , ConfigFile, containers, dbus, dbus-hslogger, directory, dyre
+ , either, enclosed-exceptions, filepath, gi-cairo
+ , gi-cairo-connector, gi-cairo-render, gi-gdk, gi-gdkpixbuf
+ , gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango, gtk-sni-tray
+ , gtk-strut, gtk3, haskell-gi, haskell-gi-base, hslogger
+ , HStringTemplate, http-client, http-client-tls, http-types
+ , multimap, network, network-uri, old-locale, optparse-applicative
+ , parsec, process, rate-limit, regex-compat, safe, scotty, split
+ , status-notifier-item, stm, template-haskell, text, time
+ , time-locale-compat, time-units, transformers, transformers-base
+ , tuple, unix, utf8-string, X11, xdg-basedir, xml, xml-helpers
+ , xmonad
}:
mkDerivation {
pname = "taffybar";
- version = "3.1.2";
- sha256 = "11k34kcxh2v8k7pr2nm1kib097n4l3klza6q8w9qp2dm31iww8y1";
+ version = "3.2.1";
+ sha256 = "1bha6b8p46pr6hw9iawbffdg8lf6cmv1ryw96r2qn1jfikl6h39v";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base bytestring ConfigFile containers dbus dbus-hslogger directory
- dyre either enclosed-exceptions filepath gi-cairo
- gi-cairo-connector gi-cairo-render gi-gdk gi-gdkpixbuf gi-gdkx11
- gi-glib gi-gtk gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi
- haskell-gi-base hslogger HStringTemplate http-client
- http-client-tls http-types multimap network network-uri old-locale
- parsec process rate-limit regex-compat safe scotty split
- status-notifier-item stm template-haskell text time
- time-locale-compat time-units transformers transformers-base tuple
- unix utf8-string X11 xdg-basedir xml xml-helpers xmonad
+ ansi-terminal base broadcast-chan bytestring ConfigFile containers
+ dbus dbus-hslogger directory dyre either enclosed-exceptions
+ filepath gi-cairo gi-cairo-connector gi-cairo-render gi-gdk
+ gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango
+ gtk-sni-tray gtk-strut haskell-gi haskell-gi-base hslogger
+ HStringTemplate http-client http-client-tls http-types multimap
+ network network-uri old-locale parsec process rate-limit
+ regex-compat safe scotty split status-notifier-item stm
+ template-haskell text time time-locale-compat time-units
+ transformers transformers-base tuple unix utf8-string X11
+ xdg-basedir xml xml-helpers xmonad
];
libraryPkgconfigDepends = [ gtk3 ];
- executableHaskellDepends = [ base hslogger optparse-applicative ];
+ executableHaskellDepends = [
+ base directory hslogger optparse-applicative
+ ];
executablePkgconfigDepends = [ gtk3 ];
description = "A desktop bar similar to xmobar, but with more GUI";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gtk3;};
"tag-bits" = callPackage
@@ -220911,8 +226215,8 @@ self: {
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
pname = "tagged-identity";
- version = "0.1.2";
- sha256 = "0402snxl1cpi7yq03aqkp036hjcrrqiy0if3c3bz6ljls7yxfvci";
+ version = "0.1.3";
+ sha256 = "1n5jafvcck6mq14fb1wrgclkrkxz4vd1x09y028awz66makn5v1c";
libraryHaskellDepends = [ base mtl transformers ];
description = "Trivial monad transformer that allows identical monad stacks have different types";
license = stdenv.lib.licenses.bsd3;
@@ -221100,22 +226404,6 @@ self: {
}) {};
"tagsoup" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, directory
- , process, QuickCheck, text, time
- }:
- mkDerivation {
- pname = "tagsoup";
- version = "0.14.7";
- sha256 = "09gcy5fd5nsk1b7zdrf7yb329fyr8hq5apd6w3cyh3nxd60z504r";
- libraryHaskellDepends = [ base bytestring containers text ];
- testHaskellDepends = [
- base bytestring deepseq directory process QuickCheck time
- ];
- description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "tagsoup_0_14_8" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, process, QuickCheck, text, time
}:
@@ -221129,7 +226417,6 @@ self: {
];
description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tagsoup-ht" = callPackage
@@ -221779,15 +227066,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "tasty_1_2_1" = callPackage
+ "tasty_1_2_3" = callPackage
({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
, optparse-applicative, stm, tagged, unbounded-delays, unix
, wcwidth
}:
mkDerivation {
pname = "tasty";
- version = "1.2.1";
- sha256 = "0yw8bb92x723md31nisd75mdbfsq9can1h5r4gchdjvwafxy98ia";
+ version = "1.2.3";
+ sha256 = "0qpn0avpw4w1qq5r2gwh2piipj0llqq6ylagr3xnqiraq6mhg8cc";
libraryHaskellDepends = [
ansi-terminal async base clock containers mtl optparse-applicative
stm tagged unbounded-delays unix wcwidth
@@ -221962,10 +227249,8 @@ self: {
}:
mkDerivation {
pname = "tasty-hedgehog";
- version = "0.2.0.0";
- sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
- revision = "6";
- editedCabalFile = "0d7s1474pvnyad6ilr5rvpama7s468ya9ns4ksbl0827z9vvga43";
+ version = "1.0.0.1";
+ sha256 = "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz";
libraryHaskellDepends = [ base hedgehog tagged tasty ];
testHaskellDepends = [
base hedgehog tasty tasty-expected-failure
@@ -221994,6 +227279,8 @@ self: {
];
description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"tasty-hspec" = callPackage
@@ -222043,6 +227330,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tasty-hunit_0_10_0_2" = callPackage
+ ({ mkDerivation, base, call-stack, tasty }:
+ mkDerivation {
+ pname = "tasty-hunit";
+ version = "0.10.0.2";
+ sha256 = "1xvf5xs0r8xqkcg354klz4wyzwyzvinalyl6f4fnxwqmzrgch8s8";
+ libraryHaskellDepends = [ base call-stack tasty ];
+ description = "HUnit support for the Tasty test framework";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tasty-hunit-adapter" = callPackage
({ mkDerivation, base, HUnit, tasty, tasty-hunit }:
mkDerivation {
@@ -222172,6 +227471,24 @@ self: {
broken = true;
}) {};
+ "tasty-lua" = callPackage
+ ({ mkDerivation, base, bytestring, directory, file-embed, filepath
+ , hslua, tasty, tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "tasty-lua";
+ version = "0.2.0.1";
+ sha256 = "0xlj36rrhkx312h7smx6ay20rhlhxvw2ma2ckdnzv1pvmdn6p5qx";
+ libraryHaskellDepends = [
+ base bytestring file-embed hslua tasty text
+ ];
+ testHaskellDepends = [
+ base directory filepath hslua tasty tasty-hunit
+ ];
+ description = "Write tests in Lua, integrate into tasty";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"tasty-program" = callPackage
({ mkDerivation, base, deepseq, directory, filepath, process, tasty
}:
@@ -222192,10 +227509,10 @@ self: {
}:
mkDerivation {
pname = "tasty-quickcheck";
- version = "0.10";
- sha256 = "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h";
+ version = "0.10.1";
+ sha256 = "0k4vvd5vmrncv1s6gdf03l4xijwlk428sb9jfx8n1zaz02971msh";
revision = "1";
- editedCabalFile = "1ndkkywcqgb2wj339vgckjv5915da5kd4ixlkaww9fsba3qsrnwx";
+ editedCabalFile = "1ms8ph2vp8x1icqiw468zlpsj4pii7xjm6g3k6ikkcy7cx3vnv4s";
libraryHaskellDepends = [
base optparse-applicative QuickCheck random tagged tasty
];
@@ -222217,8 +227534,6 @@ self: {
testHaskellDepends = [ base QuickCheck tasty ];
description = "Pre-built tasty trees for checking lawful class properties using QuickCheck";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"tasty-rerun" = callPackage
@@ -222599,8 +227914,8 @@ self: {
pname = "tdigest";
version = "0.2.1";
sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl";
- revision = "1";
- editedCabalFile = "1jrq22j9jbvx31pspwjvyb539gix7vfb8cinqkkb2abmr0jrhibn";
+ revision = "2";
+ editedCabalFile = "1q517siz4l55l7ssrbc3rm0szf41k7wy4p26lch03i57lzldf2hf";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base base-compat binary deepseq reducers semigroupoids transformers
@@ -222622,6 +227937,8 @@ self: {
pname = "tdigest-Chart";
version = "0.2";
sha256 = "1ciq7d187as9sk1dpccm2s02b6jdhij1l477wff0a7labgw21l0l";
+ revision = "1";
+ editedCabalFile = "1095k2sgyjd5m38j1qxa1df9izzdpjl80lrsmwhjm1jw4lmk8cys";
libraryHaskellDepends = [
base base-compat Chart colour lens semigroupoids tdigest
];
@@ -222631,8 +227948,6 @@ self: {
];
description = "Chart generation from tdigest";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"tdoc" = callPackage
@@ -223233,8 +228548,6 @@ self: {
];
description = "Portable temporary files and directories with automatic deletion";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"tempus" = callPackage
@@ -223295,8 +228608,8 @@ self: {
}:
mkDerivation {
pname = "tensor-safe";
- version = "0.1.0.0";
- sha256 = "077jy3k47aw182nsdi3352lq9h6zssc9dpm7vwv999ksysaymhpw";
+ version = "0.1.0.1";
+ sha256 = "1b69k6mbhd0qbxjij44fgaw8xdnripr27x7xy106192cj7x3q9xf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -223591,12 +228904,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "termbox_0_2_0" = callPackage
+ ({ mkDerivation, array, base, c2hs }:
+ mkDerivation {
+ pname = "termbox";
+ version = "0.2.0";
+ sha256 = "04y1wj65c6nhv08jd83ihvph45fs5279px4ivm5cinnz5m721jqg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ array base ];
+ libraryToolDepends = [ c2hs ];
+ executableHaskellDepends = [ base ];
+ description = "termbox bindings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"termbox-banana" = callPackage
({ mkDerivation, base, reactive-banana, termbox }:
mkDerivation {
pname = "termbox-banana";
- version = "0.1.1";
- sha256 = "0584n8fq3rdq4rw20sglqwm76w8qmg8akhrkvda8scrvmgi5xbck";
+ version = "0.2.0";
+ sha256 = "1n4775ahmm4h1vn1michsqp5l2j62py5wddnvcipb8225dcq8xsi";
+ revision = "1";
+ editedCabalFile = "123hndfs6x2ljwfh7izpikyv5v2d9hq122ddkk5nncnpbnb4bba5";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [ base reactive-banana termbox ];
description = "reactive-banana + termbox";
license = stdenv.lib.licenses.bsd3;
@@ -223661,16 +228994,14 @@ self: {
}:
mkDerivation {
pname = "terminal-progress-bar";
- version = "0.4.0.1";
- sha256 = "0xz2kbjh83hcxxx6iaijckddfqawjziiwhqyapwq77fdrc7p5af5";
- revision = "1";
- editedCabalFile = "08wp7ac11qq1zbq0axb4xvzz6grl1jgg54sgq7i9dx3c1a7035zg";
+ version = "0.4.1";
+ sha256 = "092yx9hal3xxcvpjwyqbfqww277l4gf83272pcnp3k6aj86a2756";
libraryHaskellDepends = [ base deepseq terminal-size text time ];
testHaskellDepends = [
base HUnit test-framework test-framework-hunit text time
];
benchmarkHaskellDepends = [ base criterion time ];
- description = "A simple progress bar in the terminal";
+ description = "A progress bar in the terminal";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -223776,8 +229107,8 @@ self: {
}:
mkDerivation {
pname = "termonad";
- version = "1.1.0.0";
- sha256 = "1xji47lpw560lj0lx79vab5bxcf96zgzsdjg0iyb02rsvjcsl5h4";
+ version = "1.3.0.0";
+ sha256 = "1vyvh0b7r1l060yhm9j572yzlpvz3pba50snaqi9cicvddrj3aj9";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -223797,8 +229128,6 @@ self: {
];
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;};
"termplot" = callPackage
@@ -223908,8 +229237,8 @@ self: {
pname = "test-framework";
version = "0.8.2.0";
sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm";
- revision = "2";
- editedCabalFile = "1kmv576j1zbms6p3vffripvas87ca3ypdb42h7pqkxsxxfi1gb8j";
+ revision = "3";
+ editedCabalFile = "0qg8zr0ga2kq8qrs9vckxmk11zrp105cbybcb9ra3dk4linngjw3";
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base containers hostname old-locale
random regex-posix time xml
@@ -224360,21 +229689,21 @@ self: {
}) {};
"testbench" = callPackage
- ({ mkDerivation, base, bytestring, cassava, criterion, deepseq
- , dlist, HUnit, optparse-applicative, process, statistics
- , streaming, streaming-cassava, streaming-with, temporary
- , transformers, weigh
+ ({ mkDerivation, base, bytestring, cassava, criterion
+ , criterion-measurement, deepseq, dlist, HUnit
+ , optparse-applicative, process, statistics, streaming
+ , streaming-cassava, streaming-with, temporary, transformers, weigh
}:
mkDerivation {
pname = "testbench";
- version = "0.2.1.2";
- sha256 = "1mvqvc7k9a7nwx4m1bqhsykmdc4zq3myma2b2vq7s8a88bm8w10r";
+ version = "0.2.1.3";
+ sha256 = "1fx4r8z87rv3kg5xznrvgv7drsvn82zapxzmiv5440r4gbqw5y0b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring cassava criterion deepseq dlist HUnit
- optparse-applicative process statistics streaming streaming-cassava
- streaming-with temporary transformers weigh
+ base bytestring cassava criterion criterion-measurement deepseq
+ dlist HUnit optparse-applicative process statistics streaming
+ streaming-cassava streaming-with temporary transformers weigh
];
description = "Create tests and benchmarks together";
license = stdenv.lib.licenses.mit;
@@ -224584,6 +229913,8 @@ self: {
pname = "text";
version = "1.2.3.1";
sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43";
+ revision = "2";
+ editedCabalFile = "0ax6h9mvs4567nzi936jkd8f94bi8jnxis4wikjzyaxqfwm5zc6f";
libraryHaskellDepends = [
array base binary bytestring deepseq ghc-prim integer-gmp
];
@@ -224662,8 +229993,8 @@ self: {
}:
mkDerivation {
pname = "text-builder";
- version = "0.6.5";
- sha256 = "1kf5r4cr4qw3awfshycnh9l7p3phssknlvwmkglabmdj3zf1xz5q";
+ version = "0.6.5.1";
+ sha256 = "0g40s5md7kfmhqsxxrfliwb3p4whg3m2wp31bai051nx1ddkkvay";
libraryHaskellDepends = [
base base-prelude bytestring deferred-folds semigroups text
transformers
@@ -224865,6 +230196,8 @@ self: {
];
description = "ICU transliteration";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) icu;};
"text-json-qq" = callPackage
@@ -225109,6 +230442,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "text-printer_0_5_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups
+ , test-framework, test-framework-quickcheck2, text, text-latin1
+ }:
+ mkDerivation {
+ pname = "text-printer";
+ version = "0.5.0.1";
+ sha256 = "065m64f5l4yyccb04c7bwax09wk6aafm2v9sl3w8w1asqw7ni9sq";
+ libraryHaskellDepends = [
+ base bytestring pretty semigroups text text-latin1
+ ];
+ testHaskellDepends = [
+ base QuickCheck test-framework test-framework-quickcheck2
+ ];
+ description = "Abstract interface for text builders/printers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-regex-replace" = callPackage
({ mkDerivation, attoparsec, base, hspec, QuickCheck, smallcheck
, text, text-icu
@@ -225193,8 +230545,8 @@ self: {
pname = "text-short";
version = "0.1.2";
sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk";
- revision = "1";
- editedCabalFile = "00w77idkh44m88vivkqsys0y1bbxrflh06yq66liq0wgjhhzdppj";
+ revision = "2";
+ editedCabalFile = "106p7c0399zxdlh9f9qkgy7g2gp3bxqdpy6m6lnfhzi0pm5y8mks";
libraryHaskellDepends = [
base binary bytestring deepseq ghc-prim hashable text
];
@@ -225240,7 +230592,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "text-show_3_8_1" = callPackage
+ "text-show_3_8_2" = callPackage
({ mkDerivation, array, base, base-compat-batteries, base-orphans
, bifunctors, bytestring, bytestring-builder, containers
, contravariant, criterion, deepseq, deriving-compat
@@ -225251,8 +230603,8 @@ self: {
}:
mkDerivation {
pname = "text-show";
- version = "3.8.1";
- sha256 = "18qaa89pfxqkwk7zpcr7r07b733dvl5ggnmcrl2cf9v9rza1gxiw";
+ version = "3.8.2";
+ sha256 = "0n46q5gjlxz3g4flj5mn8s78dpdfd65fjl7b5174pykanwqsqqwz";
libraryHaskellDepends = [
array base base-compat-batteries bifunctors bytestring
bytestring-builder containers contravariant generic-deriving
@@ -225278,34 +230630,34 @@ self: {
, containers, directory, generic-deriving, ghc-boot-th, ghc-prim
, haskeline, hpc, hspec, hspec-discover, old-locale, old-time
, pretty, QuickCheck, quickcheck-instances, random, semigroups
- , tagged, template-haskell, terminfo, text, text-show, th-orphans
- , time, transformers, transformers-compat, unix
+ , tagged, template-haskell, terminfo, text, text-short, text-show
+ , th-orphans, time, transformers, transformers-compat, unix
, unordered-containers, vector, xhtml
}:
mkDerivation {
pname = "text-show-instances";
- version = "3.7";
- sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c";
- revision = "1";
- editedCabalFile = "0rw9xbyinjrp0rgqwklsv4552k0g0n2nnq7n02i0015q8psfdz6z";
+ version = "3.8.1";
+ sha256 = "1z54vgw1rsck3lr6jnl5vdd0aq1hni1wy0fag985d6b73qmxlm1l";
libraryHaskellDepends = [
base base-compat-batteries bifunctors binary containers directory
ghc-boot-th haskeline hpc old-locale old-time pretty random
- semigroups tagged template-haskell terminfo text text-show time
- transformers transformers-compat unix unordered-containers vector
- xhtml
+ semigroups tagged template-haskell terminfo text text-short
+ text-show time transformers transformers-compat unix
+ unordered-containers vector xhtml
];
testHaskellDepends = [
base base-compat-batteries bifunctors binary containers directory
generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec
old-locale old-time pretty QuickCheck quickcheck-instances random
- tagged template-haskell terminfo text-show th-orphans time
- transformers transformers-compat unix unordered-containers vector
- xhtml
+ tagged template-haskell terminfo text-short text-show th-orphans
+ time transformers transformers-compat unix unordered-containers
+ vector xhtml
];
testToolDepends = [ hspec-discover ];
description = "Additional instances for text-show";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"text-stream-decode" = callPackage
@@ -225700,6 +231052,17 @@ self: {
broken = true;
}) {};
+ "th-bang-compat" = callPackage
+ ({ mkDerivation, base, template-haskell }:
+ mkDerivation {
+ pname = "th-bang-compat";
+ version = "0.0.1.0";
+ sha256 = "0p5zpiqk8141a4n362m3kpd92sx0192gpv172ixdnfgabk07gn1z";
+ libraryHaskellDepends = [ base template-haskell ];
+ description = "Compatibility for bang-type template";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"th-build" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@@ -225981,13 +231344,13 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "th-lift_0_8" = callPackage
+ "th-lift_0_8_0_1" = callPackage
({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
}:
mkDerivation {
pname = "th-lift";
- version = "0.8";
- sha256 = "1594v53fqah949nazqrjhy17gxhvc43v2ffrk93bfhdy07wgikia";
+ version = "0.8.0.1";
+ sha256 = "1a6qlbdg15cfr5rvl9g3blgwx4v1p0xic0pzv13zx165xbc36ld0";
libraryHaskellDepends = [
base ghc-prim template-haskell th-abstraction
];
@@ -226056,6 +231419,8 @@ self: {
pname = "th-orphans";
version = "0.13.7";
sha256 = "0qqxrm04nqh062cw6a2p6grvvfpg0nxkj3aymmar29yky17y8vgy";
+ revision = "1";
+ editedCabalFile = "1gf2rmphwgnqbbk4qcwfiprmsqp2d30xqlcxgs9h9ymazkwlh203";
libraryHaskellDepends = [
base mtl template-haskell th-lift th-lift-instances th-reify-many
];
@@ -226211,8 +231576,8 @@ self: {
}:
mkDerivation {
pname = "th-utilities";
- version = "0.2.1.0";
- sha256 = "1kc3zv43948whv47cpmwnqw90iz68dmi1bmw9b183bnd0yr7wnfb";
+ version = "0.2.3.0";
+ sha256 = "0bl4j81k7szn0lza8rnn1db6glc57dsn63ni0hwbwr3kxa3pb4x4";
libraryHaskellDepends = [
base bytestring containers directory filepath primitive syb
template-haskell text th-orphans
@@ -226262,6 +231627,8 @@ self: {
];
description = "Minimalistic actor library";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"themoviedb" = callPackage
@@ -226287,8 +231654,6 @@ self: {
];
description = "Haskell API bindings for http://themoviedb.org";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"themplate" = callPackage
@@ -226393,35 +231758,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "these_0_8" = callPackage
- ({ mkDerivation, aeson, assoc, base, base-compat, bifunctors
- , binary, containers, data-default-class, deepseq, hashable, keys
- , lens, mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty
- , tasty-quickcheck, transformers, transformers-compat
- , unordered-containers, vector, vector-instances
+ "these_1" = callPackage
+ ({ mkDerivation, aeson, assoc, base, base-compat, binary, deepseq
+ , hashable, QuickCheck, semigroupoids, unordered-containers
}:
mkDerivation {
pname = "these";
- version = "0.8";
- sha256 = "145m71z43rqgps0nh29hcfkr3cbs9l82y3dfycf7i5fjr2472rga";
- revision = "1";
- editedCabalFile = "0y7q2bzqgd2ii47kqy6fij1qd0l7immgcx6lkq9bswkgvdband11";
+ version = "1";
+ sha256 = "01pnibkkzbsdiry4w018img92ja2sqwjigpw53q12mfnabvsgvxn";
libraryHaskellDepends = [
- aeson assoc base base-compat bifunctors binary containers
- data-default-class deepseq hashable keys lens mtl QuickCheck
- semigroupoids transformers transformers-compat unordered-containers
- vector vector-instances
+ aeson assoc base base-compat binary deepseq hashable QuickCheck
+ semigroupoids unordered-containers
];
- testHaskellDepends = [
- aeson base base-compat bifunctors binary containers hashable lens
- QuickCheck quickcheck-instances tasty tasty-quickcheck transformers
- unordered-containers vector
- ];
- description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
+ description = "An either-or-both data type";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "these-lens" = callPackage
+ ({ mkDerivation, base, base-compat, lens, these }:
+ mkDerivation {
+ pname = "these-lens";
+ version = "1";
+ sha256 = "144ly13qng95mwnfis8dm7n3843z3w2vp4212qawbpw8hw921c7y";
+ libraryHaskellDepends = [ base base-compat lens these ];
+ description = "Lenses for These";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"these-skinny" = callPackage
({ mkDerivation, base, deepseq }:
mkDerivation {
@@ -226627,8 +231993,6 @@ self: {
];
description = "Simple, IO-based library for Erlang-style thread supervision";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"threadscope" = callPackage
@@ -226863,8 +232227,6 @@ self: {
testToolDepends = [ tasty-discover ];
description = "throwable-exceptions gives the easy way to throw exceptions";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"thumbnail" = callPackage
@@ -226972,15 +232334,15 @@ self: {
}) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;};
"tibetan-utils" = callPackage
- ({ mkDerivation, base, composition-prelude, either, hspec
- , hspec-megaparsec, megaparsec, text, text-show
+ ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec
+ , megaparsec, text
}:
mkDerivation {
pname = "tibetan-utils";
- version = "0.1.1.9";
- sha256 = "04xpncn9nnc51mzyvw1naydk47acbpkzpxipq1fgvvgclzda2gn8";
+ version = "0.1.1.10";
+ sha256 = "11bzcan2vfhdz6lwfvfgiyycqf30p4kdkzn47pm4ydr6bbpz8aia";
libraryHaskellDepends = [
- base composition-prelude either megaparsec text text-show
+ base composition-prelude megaparsec text
];
testHaskellDepends = [
base hspec hspec-megaparsec megaparsec text
@@ -227063,8 +232425,8 @@ self: {
}:
mkDerivation {
pname = "tidal";
- version = "1.0.13";
- sha256 = "0m28z3mlp6q51znzjgw1hsfy8g4npsxl8bydm8hm9dslqc7gdi7j";
+ version = "1.0.14";
+ sha256 = "15bcv5np25sm11ny7b5ak6i321vsy7v1kdxx58y6hqpyn8yx0mx0";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bifunctors bytestring clock colour containers hosc mwc-random
@@ -227259,14 +232621,14 @@ self: {
broken = true;
}) {};
- "time_1_9_2" = callPackage
+ "time_1_9_3" = callPackage
({ mkDerivation, base, deepseq, QuickCheck, random, tasty
, tasty-hunit, tasty-quickcheck, unix
}:
mkDerivation {
pname = "time";
- version = "1.9.2";
- sha256 = "05d0n44rwpqkjkns9nlgw2gpfv643a0bzp9cx97az0wmn31618nx";
+ version = "1.9.3";
+ sha256 = "03n7lsapydivwj7lv2azb5i31ph8365kzh7zbl3kcgzzmiz9cnsp";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [
base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck
@@ -227303,6 +232665,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "time-compat_1_9_2_2" = callPackage
+ ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit
+ , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time
+ }:
+ mkDerivation {
+ pname = "time-compat";
+ version = "1.9.2.2";
+ sha256 = "05va0rqs759vbridbcl6hksp967j9anjvys8vx72fnfkhlrn2s52";
+ revision = "1";
+ editedCabalFile = "0k8ph4sydaiqp8dav4if6hpiaq8h1xsr93khmdr7a1mmfwdxr64r";
+ libraryHaskellDepends = [ base base-orphans deepseq time ];
+ testHaskellDepends = [
+ base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit
+ tasty-quickcheck time
+ ];
+ description = "Compatibility package for time";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"time-extras" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -227433,6 +232815,17 @@ self: {
broken = true;
}) {};
+ "time-manager" = callPackage
+ ({ mkDerivation, auto-update, base }:
+ mkDerivation {
+ pname = "time-manager";
+ version = "0.0.0";
+ sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh";
+ libraryHaskellDepends = [ auto-update base ];
+ description = "Scalable timer";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"time-out" = callPackage
({ mkDerivation, base, data-default-class, exceptions
, time-interval, time-units, transformers
@@ -227465,8 +232858,6 @@ self: {
];
description = "Parsers for types in `time`";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"time-patterns" = callPackage
@@ -227882,17 +233273,13 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "timer-wheel_0_2_0" = callPackage
- ({ mkDerivation, atomic-primops, base, ghc-prim, primitive
- , psqueues, random
- }:
+ "timer-wheel_0_2_0_1" = callPackage
+ ({ mkDerivation, atomic-primops, base, psqueues, random, vector }:
mkDerivation {
pname = "timer-wheel";
- version = "0.2.0";
- sha256 = "0i1n9qbichgalrw9sp6qwhd9p4179havlp4gqbck2w9sbans05hp";
- libraryHaskellDepends = [
- atomic-primops base ghc-prim primitive psqueues
- ];
+ version = "0.2.0.1";
+ sha256 = "1m3bv095kbm4ksva3plhggkq2c0jf441wm994l57jfmlcng2i4xy";
+ libraryHaskellDepends = [ atomic-primops base psqueues vector ];
testHaskellDepends = [ base random ];
description = "A timer wheel";
license = stdenv.lib.licenses.bsd3;
@@ -227936,8 +233323,8 @@ self: {
({ mkDerivation, base, hspec }:
mkDerivation {
pname = "timers-tick";
- version = "0.4.0.0";
- sha256 = "02da32j9jz21awmsf38rrj3l3ks7s9a6vvqadr98c35shx3sxzcq";
+ version = "0.4.1.0";
+ sha256 = "1dbkgsvzfxgf4cgkzlmn1dcjw3rb7rrx56ix7n5r1k42n0wsyfsg";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
description = "tick based timers";
@@ -228112,18 +233499,18 @@ self: {
"tintin" = callPackage
({ mkDerivation, base, clay, containers, data-has, directory
- , frontmatter, inliterate, lucid, optparse-generic, process
- , require, temporary, text, universum, yaml
+ , frontmatter, inflections, inliterate, lucid, optparse-generic
+ , process, require, temporary, text, universum, yaml
}:
mkDerivation {
pname = "tintin";
- version = "1.9.5";
- sha256 = "1z7yvp0c10gkxljg6lkn26niigx0wkdmzs7pqjd666lgzk0ji5hy";
+ version = "1.10.0";
+ sha256 = "04946h5jr7pbj8n46vbipj46n5klqb83az9nasq7smkv1kdz6dv6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base clay containers data-has directory frontmatter inliterate
- lucid process require temporary text universum yaml
+ base clay containers data-has directory frontmatter inflections
+ inliterate lucid process require temporary text universum yaml
];
libraryToolDepends = [ require ];
executableHaskellDepends = [
@@ -228222,6 +233609,24 @@ self: {
license = stdenv.lib.licenses.mpl20;
}) {};
+ "tinylog_0_15_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, criterion
+ , double-conversion, fast-logger, text, transformers, unix-time
+ }:
+ mkDerivation {
+ pname = "tinylog";
+ version = "0.15.0";
+ sha256 = "0pwdymx4kx3im9pzah0lmh64x7agdklf6dwqpjx93ybswi61cwfb";
+ libraryHaskellDepends = [
+ base bytestring containers double-conversion fast-logger text
+ transformers unix-time
+ ];
+ benchmarkHaskellDepends = [ base bytestring criterion ];
+ description = "Simplistic logging using fast-logger";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tinytemplate" = callPackage
({ mkDerivation, base, QuickCheck, text }:
mkDerivation {
@@ -228447,6 +233852,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tls_1_5_0" = callPackage
+ ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
+ , cereal, cryptonite, data-default-class, gauge, hourglass, memory
+ , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers
+ , x509, x509-store, x509-validation
+ }:
+ mkDerivation {
+ pname = "tls";
+ version = "1.5.0";
+ sha256 = "04hdk8mdn8l928prj1h37xkn4ny44bnkrbbknxyqjba51y5y30bc";
+ libraryHaskellDepends = [
+ asn1-encoding asn1-types async base bytestring cereal cryptonite
+ data-default-class hourglass memory mtl network transformers x509
+ x509-store x509-validation
+ ];
+ testHaskellDepends = [
+ asn1-types async base bytestring cryptonite data-default-class
+ hourglass QuickCheck tasty tasty-quickcheck x509 x509-validation
+ ];
+ benchmarkHaskellDepends = [
+ asn1-types async base bytestring cryptonite data-default-class
+ gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation
+ ];
+ description = "TLS/SSL protocol native implementation (Server and Client)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tls-debug" = callPackage
({ mkDerivation, base, bytestring, cryptonite, data-default-class
, network, pem, time, tls, x509, x509-store, x509-system
@@ -228466,6 +233899,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tls-debug_0_4_6" = callPackage
+ ({ mkDerivation, base, bytestring, cryptonite, data-default-class
+ , network, pem, tls, tls-session-manager, x509, x509-store
+ , x509-system, x509-validation
+ }:
+ mkDerivation {
+ pname = "tls-debug";
+ version = "0.4.6";
+ sha256 = "0xfjwyiazjdyba6x9bps93ibah9p22ww24wlmr6iksfsdhs79l7n";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring cryptonite data-default-class network pem tls
+ tls-session-manager x509 x509-store x509-system x509-validation
+ ];
+ description = "Set of programs for TLS testing and debugging";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tls-extra" = callPackage
({ mkDerivation, base, bytestring, certificate, cipher-aes
, cipher-rc4, crypto-pubkey, crypto-random, cryptohash, mtl
@@ -228488,12 +233941,16 @@ self: {
}) {};
"tls-session-manager" = callPackage
- ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
+ ({ mkDerivation, auto-update, base, basement, bytestring, clock
+ , memory, psqueues, tls
+ }:
mkDerivation {
pname = "tls-session-manager";
- version = "0.0.0.2";
- sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5";
- libraryHaskellDepends = [ auto-update base clock psqueues tls ];
+ version = "0.0.2.1";
+ sha256 = "19pygahf2hb5yp06spninqjs7a0078lmggmrqkq16ri9vifq6454";
+ libraryHaskellDepends = [
+ auto-update base basement bytestring clock memory psqueues tls
+ ];
description = "In-memory TLS session manager";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -228557,6 +234014,30 @@ self: {
broken = true;
}) {};
+ "tmp-postgres_0_2_0_0" = callPackage
+ ({ mkDerivation, async, base, bytestring, directory, hspec
+ , hspec-discover, network, port-utils, postgresql-simple, process
+ , temporary, unix
+ }:
+ mkDerivation {
+ pname = "tmp-postgres";
+ version = "0.2.0.0";
+ sha256 = "08w88rh8yap7dmh2jn3x8rd918jxscw46jzljfbdyda9rzfz7kq4";
+ libraryHaskellDepends = [
+ async base bytestring directory network port-utils
+ postgresql-simple process temporary unix
+ ];
+ testHaskellDepends = [
+ base bytestring directory hspec hspec-discover postgresql-simple
+ process temporary
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Start and stop a temporary postgres for testing";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"tmpl" = callPackage
({ mkDerivation, base, bytestring, directory, template, text }:
mkDerivation {
@@ -228676,13 +234157,11 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "todo";
- version = "0.2.0.1";
- sha256 = "0paxykbni3gwxgs25lkjsb8jfk4bc5gwnrfp16v189smqj1slc3g";
+ version = "0.2.0.2";
+ sha256 = "1gh2jdrxph0x9cc03kk8xxjyicivwcqfs9qv2nfr7mn570cmjrmw";
libraryHaskellDepends = [ base ];
description = "A todo bottom";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"todos" = callPackage
@@ -228976,7 +234455,7 @@ self: {
broken = true;
}) {};
- "tomland_1_0_0" = callPackage
+ "tomland_1_1_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, deepseq
, gauge, hashable, hedgehog, hspec-megaparsec, htoml
, htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec
@@ -228986,10 +234465,8 @@ self: {
}:
mkDerivation {
pname = "tomland";
- version = "1.0.0";
- sha256 = "0zxal12gn6d2657a14idzzjxymwmnrzkkicf7gqwlgwpn0lnr4p6";
- revision = "1";
- editedCabalFile = "14n2zgnzfdg549pjrj7f8v02wz68mp5lr9gnyx3w1hv96jb9ksx6";
+ version = "1.1.0.0";
+ sha256 = "0ip3pp76jf6di18r10ksxw35a2594k7h1iygm0b4k77m4fx4bqzn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -229181,8 +234658,8 @@ self: {
}:
mkDerivation {
pname = "too-many-cells";
- version = "0.1.5.0";
- sha256 = "0896l7zk6avkcxi2s3q2bch0bjclk4lafbm2vzmpygkscz7kqv9b";
+ version = "0.1.8.0";
+ sha256 = "0xf9q5x4ch4v1yr41fs155rvymdhslphj6d4dsjhf12ahq8rs5rl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -229219,8 +234696,8 @@ self: {
}:
mkDerivation {
pname = "toodles";
- version = "1.1.1";
- sha256 = "0n1z99f2zr2xj55y90ll9dvqq51sv4r4zyhjx7qilqw34djzfn88";
+ version = "1.2.1";
+ sha256 = "19z8xx8pw66m9q9xq0qldpzhmjwfsln4hn8smmz2pjk2x713883c";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -229252,8 +234729,8 @@ self: {
}:
mkDerivation {
pname = "toolshed";
- version = "0.18.0.0";
- sha256 = "0x8sn6gvmns81xjkzs1r5jfaar3qjhcyl6q9dbniyglk5y7w35gm";
+ version = "0.18.0.1";
+ sha256 = "0sw7fxcqr1pfb7kjzvra56ji6nl02175rscb1s4bvw6rrq7xjb6v";
libraryHaskellDepends = [
array base containers data-default deepseq directory filepath
QuickCheck random
@@ -229649,6 +235126,25 @@ self: {
broken = true;
}) {};
+ "tptp" = callPackage
+ ({ mkDerivation, attoparsec, base, Cabal, directory, doctest, extra
+ , generic-random, prettyprinter, QuickCheck, scientific, text
+ }:
+ mkDerivation {
+ pname = "tptp";
+ version = "0.1.0.3";
+ sha256 = "1h00g4263akyfgirvdw5ylbiskl3hhrx58jar59blj57k0i969wi";
+ libraryHaskellDepends = [
+ attoparsec base prettyprinter scientific text
+ ];
+ testHaskellDepends = [
+ attoparsec base Cabal directory doctest extra generic-random
+ prettyprinter QuickCheck scientific text
+ ];
+ description = "A parser and a pretty printer for the TPTP language";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"trace" = callPackage
({ mkDerivation, base, containers, deepseq, monad-control, mtl
, transformers, transformers-base
@@ -229737,6 +235233,27 @@ self: {
broken = true;
}) {};
+ "tracing" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , case-insensitive, containers, hspec, http-client, ip, mtl
+ , network, random, stm, text, time, transformers, unliftio
+ }:
+ mkDerivation {
+ pname = "tracing";
+ version = "0.0.4.0";
+ sha256 = "1l0sh9rmbysjysh169902hzx86dahiffgss8wnac8vcz95kc5qjb";
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring case-insensitive containers
+ http-client ip mtl network random stm text time transformers
+ unliftio
+ ];
+ testHaskellDepends = [
+ base containers hspec mtl stm text unliftio
+ ];
+ description = "Distributed tracing";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"tracker" = callPackage
({ mkDerivation, base, containers, glib }:
mkDerivation {
@@ -229756,8 +235273,8 @@ self: {
}:
mkDerivation {
pname = "trackit";
- version = "0.6";
- sha256 = "0944m0s1r2f53m9cmfw7jzv4xxgrfppy0cnh0a98j129n6xn39sq";
+ version = "0.6.2";
+ sha256 = "13xydhv9aaw0yk2wa0r2izwn98b0vgsx4vr2r8zpg0qxlhhriidv";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -229766,8 +235283,6 @@ self: {
];
description = "A command-line tool for live monitoring";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"traction" = callPackage
@@ -229777,8 +235292,8 @@ self: {
}:
mkDerivation {
pname = "traction";
- version = "0.0.1";
- sha256 = "15sl663zk2fys3f5r5vizazid64ij2kwya2p8yk3gyhmnklccqmn";
+ version = "0.1.0";
+ sha256 = "1vf6hrzxr28yp6rijdxcq83c60hzkyvjkc2caiifmfi5ay2hzlzq";
libraryHaskellDepends = [
base bytestring containers exceptions mmorph postgresql-simple
resource-pool syb template-haskell text time transformers
@@ -229787,6 +235302,7 @@ self: {
testHaskellDepends = [
base hedgehog mmorph postgresql-simple resource-pool text
];
+ description = "Tools for postgresql-simple";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -229854,6 +235370,40 @@ self: {
broken = true;
}) {};
+ "trans-fx-core" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "trans-fx-core";
+ version = "0.0.1";
+ sha256 = "0hkwl1dygghym6w5qci53ylkhk298bzddfvahisr2gw5wibknrfs";
+ libraryHaskellDepends = [ base ];
+ description = "Monadic effect framework";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "trans-fx-data" = callPackage
+ ({ mkDerivation, base, trans-fx-core }:
+ mkDerivation {
+ pname = "trans-fx-data";
+ version = "0.0.1";
+ sha256 = "0y4hnn1ixgsqd9x829cxyn0n2psxpjczxxaa99jv9wrfwfvssgid";
+ libraryHaskellDepends = [ base trans-fx-core ];
+ description = "Monadic effect framework";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "trans-fx-io" = callPackage
+ ({ mkDerivation, base, time, trans-fx-core, trans-fx-data }:
+ mkDerivation {
+ pname = "trans-fx-io";
+ version = "0.0.1";
+ sha256 = "1yf3j35q0j5if1hpl11083bwrcyyr378wwnp98m1f5gsrlj62qpw";
+ libraryHaskellDepends = [ base time trans-fx-core trans-fx-data ];
+ testHaskellDepends = [ base time trans-fx-core ];
+ description = "Monadic effect framework";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"transaction" = callPackage
({ mkDerivation, base, doctest, Glob, hspec, mono-traversable
, QuickCheck
@@ -230020,6 +235570,8 @@ self: {
pname = "transformers-bifunctors";
version = "0.1";
sha256 = "01s8516m9cybx5gqxk8g00fnkbwpfi5vrm1pgi62pxk1cgbx699w";
+ revision = "1";
+ editedCabalFile = "1vjyk2ldwfi2pkvk79p37ii5xgg1399kxqhkq3l4wvag4j5p4afs";
libraryHaskellDepends = [ base mmorph transformers ];
description = "Bifunctors over monad transformers";
license = stdenv.lib.licenses.bsd3;
@@ -230029,8 +235581,8 @@ self: {
({ mkDerivation, base, ghc-prim, transformers }:
mkDerivation {
pname = "transformers-compat";
- version = "0.6.4";
- sha256 = "036f7qnzhxjbflypgggkd3v0gjpbcqbb1ryagyiknlrnsrav8zxd";
+ version = "0.6.5";
+ sha256 = "02v2fjbvcrlpvhcsssap8dy8y9pp95jykrlc5arm39sxa48wyrys";
libraryHaskellDepends = [ base ghc-prim transformers ];
description = "A small compatibility shim for the transformers library";
license = stdenv.lib.licenses.bsd3;
@@ -230141,10 +235693,8 @@ self: {
({ mkDerivation, base, transformers, writer-cps-transformers }:
mkDerivation {
pname = "transformers-lift";
- version = "0.2.0.1";
- sha256 = "17g03r5hpnygx0c9ybr9za6208ay0cjvz47rkyplv1r9zcivzn0b";
- revision = "3";
- editedCabalFile = "0rkbjlpn460gn93qr0l7025ggkgj46j6pkcil6m2chkzk91cpk9i";
+ version = "0.2.0.2";
+ sha256 = "1w6wb8f8ad41l3gl4879289rb22jsgsj4qdaygf0wff45d04mq94";
libraryHaskellDepends = [
base transformers writer-cps-transformers
];
@@ -230180,15 +235730,15 @@ self: {
"transient" = callPackage
({ mkDerivation, atomic-primops, base, bytestring, containers
- , directory, mtl, random, stm, time, transformers
+ , directory, mtl, primitive, random, stm, time, transformers
}:
mkDerivation {
pname = "transient";
- version = "0.6.0.1";
- sha256 = "1k3zh4ahzzmj5ni0jyahzhfhbnvksa1ybq93541faa4g98h44ggy";
+ version = "0.6.3";
+ sha256 = "02zy60hilgagxa08j7bvd35wkpap5dzffc5af258hxiy0gdpdw0a";
libraryHaskellDepends = [
- atomic-primops base bytestring containers directory mtl random stm
- time transformers
+ atomic-primops base bytestring containers directory mtl primitive
+ random stm time transformers
];
testHaskellDepends = [
atomic-primops base bytestring containers directory mtl random stm
@@ -230316,8 +235866,6 @@ self: {
testHaskellDepends = [ base doctest ];
description = "Type Safe Web Routing";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"trasa-client" = callPackage
@@ -230334,8 +235882,6 @@ self: {
];
description = "Type safe http requests";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"trasa-reflex" = callPackage
@@ -230369,8 +235915,6 @@ self: {
];
description = "Type safe web server";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"trasa-th" = callPackage
@@ -230387,8 +235931,6 @@ self: {
testHaskellDepends = [ base trasa ];
description = "Template Haskell to generate trasa routes";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"traverse-with-class" = callPackage
@@ -230528,10 +236070,8 @@ self: {
}:
mkDerivation {
pname = "tree-diff";
- version = "0.0.2";
- sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq";
- revision = "2";
- editedCabalFile = "07pz7mhzvh7iwgn2rvw29valfdm4y845zqqffxb89ywbb6gnm8x8";
+ version = "0.0.2.1";
+ sha256 = "0hz7jklzb4cc63l68jxc58ik0ybgim9niwq2gfi0cskv5g2yr3ym";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -230546,6 +236086,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tree-diff_0_1" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
+ , base-compat, bytestring, bytestring-builder, containers, hashable
+ , parsec, parsers, pretty, QuickCheck, scientific, tagged, tasty
+ , tasty-golden, tasty-quickcheck, text, time, trifecta
+ , unordered-containers, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "tree-diff";
+ version = "0.1";
+ sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3";
+ libraryHaskellDepends = [
+ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
+ bytestring-builder containers hashable parsec parsers pretty
+ QuickCheck scientific tagged text time unordered-containers
+ uuid-types vector
+ ];
+ testHaskellDepends = [
+ ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck
+ tagged tasty tasty-golden tasty-quickcheck trifecta
+ ];
+ description = "Diffing of (expression) trees";
+ license = stdenv.lib.licenses.gpl2Plus;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tree-fun" = callPackage
({ mkDerivation, base, containers, mtl }:
mkDerivation {
@@ -230568,6 +236134,159 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tree-sitter" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, filepath
+ , fused-effects, hedgehog, hspec, split, template-haskell, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "tree-sitter";
+ version = "0.1.0.0";
+ sha256 = "16yanr4k3zc55xgm5yajka7wgy475x2aq9lfv4j5lmxk0z7m9n9m";
+ libraryHaskellDepends = [
+ aeson base bytestring directory filepath fused-effects hedgehog
+ split template-haskell text unordered-containers
+ ];
+ testHaskellDepends = [ base hedgehog hspec ];
+ description = "Unstable bindings for the tree-sitter parsing library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "tree-sitter-go" = callPackage
+ ({ mkDerivation, base, template-haskell, tree-sitter }:
+ mkDerivation {
+ pname = "tree-sitter-go";
+ version = "0.1.0.0";
+ sha256 = "0lpj6sphc8gfyy8yz4pkrykwvrly3vdhy7j9n7jiacjsxnbw33ag";
+ libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ doHaddock = false;
+ description = "Tree-sitter grammar/parser for Go";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "tree-sitter-haskell" = callPackage
+ ({ mkDerivation, base, template-haskell, tree-sitter }:
+ mkDerivation {
+ pname = "tree-sitter-haskell";
+ version = "0.1.0.0";
+ sha256 = "0jglvy6p4xwdwpk7jn9sh83j0zv51crvzfc45l10s8lflprydk1m";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ doHaddock = false;
+ description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "tree-sitter-java" = callPackage
+ ({ mkDerivation, base, template-haskell, tree-sitter }:
+ mkDerivation {
+ pname = "tree-sitter-java";
+ version = "0.1.0.0";
+ sha256 = "1npa7i8c24hb0ds52cphfhn5cw087f8iq5w56x5wsjkvm531zblr";
+ libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ doHaddock = false;
+ description = "Tree-sitter grammar/parser for Java";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "tree-sitter-json" = callPackage
+ ({ mkDerivation, base, template-haskell, tree-sitter }:
+ mkDerivation {
+ pname = "tree-sitter-json";
+ version = "0.1.0.0";
+ sha256 = "0agmr5nj4rjdlwcf64ijjwbmkpgl10gbgg26v8bpnx84cxhfjpa3";
+ libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ doHaddock = false;
+ description = "Tree-sitter grammar/parser for JSON";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "tree-sitter-php" = callPackage
+ ({ mkDerivation, base, template-haskell, tree-sitter }:
+ mkDerivation {
+ pname = "tree-sitter-php";
+ version = "0.1.0.0";
+ sha256 = "0a8sp6kvw2qxx5mmfyp08fgi65fvchizrw47ay985vbrkmmqgip5";
+ libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ doHaddock = false;
+ description = "Tree-sitter grammar/parser for PHP";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "tree-sitter-python" = callPackage
+ ({ mkDerivation, aeson, base, directory, filepath, template-haskell
+ , tree-sitter
+ }:
+ mkDerivation {
+ pname = "tree-sitter-python";
+ version = "0.1.0.1";
+ sha256 = "0pq4cl4fb14x9dfnc83glpvzq65li4bvl0jidbsji34v9hzkr2x1";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base directory filepath template-haskell tree-sitter
+ ];
+ doHaddock = false;
+ description = "Tree-sitter grammar/parser for Python";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "tree-sitter-ruby" = callPackage
+ ({ mkDerivation, base, template-haskell, tree-sitter }:
+ mkDerivation {
+ pname = "tree-sitter-ruby";
+ version = "0.1.0.0";
+ sha256 = "1rcaqib1ly4p54vqwm2mivijqirc031w18hgkccrnyv97yxrbhw9";
+ libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ doHaddock = false;
+ description = "Tree-sitter grammar/parser for Ruby";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "tree-sitter-tsx" = callPackage
+ ({ mkDerivation, base, template-haskell, tree-sitter }:
+ mkDerivation {
+ pname = "tree-sitter-tsx";
+ version = "0.1.0.0";
+ sha256 = "0jsc5kx5dw4b686dfs7n3vdafyg8mpf94cq2mscwmcyv9w1f3gma";
+ libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ doHaddock = false;
+ description = "Tree-sitter grammar/parser for TSX";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "tree-sitter-typescript" = callPackage
+ ({ mkDerivation, base, template-haskell, tree-sitter }:
+ mkDerivation {
+ pname = "tree-sitter-typescript";
+ version = "0.1.0.0";
+ sha256 = "1mpk1vhahbva8733anx624vl66fg3h6l9lsby87kf98yrp55ycbn";
+ libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ doHaddock = false;
+ description = "Tree-sitter grammar/parser for TypeScript";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"tree-traversals" = callPackage
({ mkDerivation, base, containers, doctest, mtl }:
mkDerivation {
@@ -230812,8 +236531,8 @@ self: {
pname = "trifecta";
version = "2";
sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk";
- revision = "1";
- editedCabalFile = "1qqkiwy0yvnj4yszsw9jrv83qf5hw87jdqdb34401dskaf81gwrm";
+ revision = "2";
+ editedCabalFile = "1ihw0dm0sjn7cql6rb3y0gb5kxy1ca3ggflm4lxlmhm3gfrj2sxc";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -230902,8 +236621,8 @@ self: {
}:
mkDerivation {
pname = "triplesec";
- version = "0.2.2.0";
- sha256 = "1gxks45hjr3a1lnr2v75cl0iwsmlzaq3yzd3p9s0pn5227f34zh7";
+ version = "0.2.2.1";
+ sha256 = "0wfrb1qkisbypfw4djm2cwlzrb1xhmkkv6cy8wyxvyrhqs5zzdrs";
libraryHaskellDepends = [
base cryptonite memory mtl transformers
];
@@ -230913,8 +236632,6 @@ self: {
];
description = "TripleSec is a simple, triple-paranoid, symmetric encryption library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"trivia" = callPackage
@@ -230934,8 +236651,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "trivial-constraint";
- version = "0.4.0.0";
- sha256 = "1hc6vjgw32sz5x40zifgxy1zd107d4gyfi6mmmdqr87a5f4ldz0p";
+ version = "0.5.1.0";
+ sha256 = "0wk925w1qswr5ma6427p0p1gl96hr1pfdqkn08r3ccpbibz6q1sy";
libraryHaskellDepends = [ base ];
description = "Constraints that any type, resp. no type fulfills";
license = stdenv.lib.licenses.gpl3;
@@ -231230,6 +236947,36 @@ self: {
broken = true;
}) {};
+ "tsweb" = callPackage
+ ({ mkDerivation, base, beam-core, beam-postgres, bytestring, clay
+ , cryptonite, http-api-data, hvect, postgresql-simple
+ , pretty-simple, reroute, resource-pool, Spock, Spock-core
+ , stm-containers, superrecord, tagged, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "tsweb";
+ version = "0.1.2";
+ sha256 = "00akn8nj068pd3c8zhd49n3v9y2a8slykwx8sc3mcj363bwin8ad";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base beam-core beam-postgres bytestring clay cryptonite
+ http-api-data hvect postgresql-simple pretty-simple reroute
+ resource-pool Spock Spock-core stm-containers superrecord tagged
+ text time transformers
+ ];
+ executableHaskellDepends = [
+ base beam-core beam-postgres bytestring clay cryptonite
+ http-api-data hvect postgresql-simple pretty-simple reroute
+ resource-pool Spock Spock-core stm-containers superrecord tagged
+ text time transformers
+ ];
+ description = "An API binding Web.Spock to Database.Beam";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"ttask" = callPackage
({ mkDerivation, base, directory, either, extra, filepath, lens
, optparse-declarative, safe, strict, time, transformers
@@ -231260,10 +237007,8 @@ self: {
}:
mkDerivation {
pname = "ttl-hashtables";
- version = "1.3.0.0";
- sha256 = "1qlwwxylj9d2p4jm4bi0a3x60cfzd6g982v6q0crs323zn8q5cj5";
- revision = "1";
- editedCabalFile = "0nbf825s51pls4y0nc9jzik8z6szfvqd66dfjp6ybbywrrdzckf3";
+ version = "1.3.1.0";
+ sha256 = "0ny9iynlhpaqvqip7i9n5as21mk0kzm6akbcy7xgkams8dv76k5h";
libraryHaskellDepends = [
base clock containers data-default failable hashable hashtables mtl
transformers
@@ -231672,8 +237417,8 @@ self: {
pname = "turtle";
version = "1.5.14";
sha256 = "10sxbmis82z5r2ksfkik5kryz5i0xwihz9drc1dzz4fb76kkb67z";
- revision = "1";
- editedCabalFile = "0jfa861ch7cibalcqszywjiyqa95xs7k1dqjjkqqx6fih9y13n0l";
+ revision = "3";
+ editedCabalFile = "0rmmfqsphhv7h72a8lbdbpqi3rc4k6k83x8p9mamh57108qrs3xy";
libraryHaskellDepends = [
ansi-wl-pprint async base bytestring clock containers directory
exceptions foldl hostname managed optional-args
@@ -231834,8 +237579,6 @@ self: {
libraryHaskellDepends = [ base eventloop ];
description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"twentefp-graphs" = callPackage
@@ -232251,22 +237994,21 @@ self: {
"twitter-types" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, derive
- , directory, filepath, HUnit, old-locale, QuickCheck
- , template-haskell, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, time, unordered-containers
+ , directory, filepath, HUnit, QuickCheck, template-haskell
+ , test-framework, test-framework-hunit, test-framework-quickcheck2
+ , text, time, unordered-containers
}:
mkDerivation {
pname = "twitter-types";
- version = "0.7.2.2";
- sha256 = "0n3d3j24kk2rdc61sl9lfanwcv8f0ri7ihiy0zs5rjaxzilyi3kn";
+ version = "0.8.0";
+ sha256 = "1ijvmra797hnhhi5ag7yfqrzyyjkqk9if565054c8743jlhd3xzk";
libraryHaskellDepends = [
aeson base text time unordered-containers
];
testHaskellDepends = [
aeson attoparsec base bytestring derive directory filepath HUnit
- old-locale QuickCheck template-haskell test-framework
- test-framework-hunit test-framework-quickcheck2 text time
- unordered-containers
+ QuickCheck template-haskell test-framework test-framework-hunit
+ test-framework-quickcheck2 text time unordered-containers
];
description = "Twitter JSON parser and types";
license = stdenv.lib.licenses.bsd3;
@@ -232278,10 +238020,8 @@ self: {
}:
mkDerivation {
pname = "twitter-types-lens";
- version = "0.7.2";
- sha256 = "04mjrwd5f960kd7v5xq4wlyzksw06d3qj52ql1lhjki3f3papzjg";
- revision = "1";
- editedCabalFile = "0rag7vz1irirnqxh18xwvp8rg7ysx4lwrb9ysv5wcfjdggp6b6gs";
+ version = "0.8.1";
+ sha256 = "0yxhvl54zd33wg0lhk6278jcgi521k8j94i293h61i9jg8ywkaiq";
libraryHaskellDepends = [
base lens template-haskell text time twitter-types
];
@@ -232579,6 +238319,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "type-errors" = callPackage
+ ({ mkDerivation, base, doctest, first-class-families, syb
+ , template-haskell, th-abstraction
+ }:
+ mkDerivation {
+ pname = "type-errors";
+ version = "0.2.0.0";
+ sha256 = "1d1fi4ij18q39rpibc056mgvly75zqixkba4l8bn307c62f50k8p";
+ libraryHaskellDepends = [
+ base first-class-families syb template-haskell th-abstraction
+ ];
+ testHaskellDepends = [
+ base doctest first-class-families syb template-haskell
+ th-abstraction
+ ];
+ description = "Tools for writing better type errors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"type-fun" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -232665,13 +238426,16 @@ self: {
}) {};
"type-iso" = callPackage
- ({ mkDerivation, base, data-default, nats, numericpeano, text }:
+ ({ mkDerivation, base, containers, data-default, nats, numericpeano
+ , text, vector, vector-builder
+ }:
mkDerivation {
pname = "type-iso";
- version = "1.0.0.0";
- sha256 = "11xcadzvvp9y7gm54k0nfsnx0hfr3g5bd8g8f8mlfqy24p0mq1m1";
+ version = "1.0.1.0";
+ sha256 = "1jhkx115jv36v1bbws061f4bn4apr6ps9zlisasfwfry3hd34cf6";
libraryHaskellDepends = [
- base data-default nats numericpeano text
+ base containers data-default nats numericpeano text vector
+ vector-builder
];
description = "Typeclasses for injective relations and isomorphisms between types";
license = stdenv.lib.licenses.asl20;
@@ -233156,8 +238920,8 @@ self: {
}:
mkDerivation {
pname = "typed-process";
- version = "0.2.4.0";
- sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr";
+ version = "0.2.5.0";
+ sha256 = "01mx5zsivir6dpw8ih4y801figld65l0anbr1hfl5a6vwnmnjr2r";
libraryHaskellDepends = [
async base bytestring process stm transformers
];
@@ -233169,6 +238933,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "typed-process_0_2_6_0" = callPackage
+ ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
+ , process, stm, temporary, transformers, unliftio-core
+ }:
+ mkDerivation {
+ pname = "typed-process";
+ version = "0.2.6.0";
+ sha256 = "1cf2pfym8zdxvvy7xv72ixj7wy3rjrdss6f57k1ysgs66cgsi8ii";
+ libraryHaskellDepends = [
+ async base bytestring process stm transformers unliftio-core
+ ];
+ testHaskellDepends = [
+ async base base64-bytestring bytestring hspec process stm temporary
+ transformers unliftio-core
+ ];
+ description = "Run external processes, with strong typing of streams";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"typed-spreadsheet" = callPackage
({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
, diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -233347,6 +239131,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "typelits-witnesses_0_4_0_0" = callPackage
+ ({ mkDerivation, base, dependent-sum }:
+ mkDerivation {
+ pname = "typelits-witnesses";
+ version = "0.4.0.0";
+ sha256 = "1khy5nacmsl7h4vg7driv4yb9m3zvkhbf8divyhd249i6bdmql70";
+ libraryHaskellDepends = [ base dependent-sum ];
+ description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"typenums" = callPackage
({ mkDerivation, base, hspec, QuickCheck }:
mkDerivation {
@@ -233417,6 +239213,8 @@ self: {
doHaddock = false;
description = "Efficient implementation of a dependent map with types as keys";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"typerep-map_0_3_2" = callPackage
@@ -233429,6 +239227,8 @@ self: {
pname = "typerep-map";
version = "0.3.2";
sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0";
+ revision = "3";
+ editedCabalFile = "032y3parcz7ffmsqichmshczk7zxkg66dciwvr5d7fznqvy3sg1s";
libraryHaskellDepends = [
base containers deepseq ghc-prim primitive vector
];
@@ -233445,6 +239245,7 @@ self: {
description = "Efficient implementation of a dependent map with types as keys";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"types-compat" = callPackage
@@ -233480,8 +239281,8 @@ self: {
}:
mkDerivation {
pname = "typesafe-precure";
- version = "0.7.3.1";
- sha256 = "15wgcf0q3xj3npb1ivfj8b0w78dwcz90fyxqp75wcnxyv2ksvd3m";
+ version = "0.7.4.1";
+ sha256 = "1nm74fj819kws9rrksk80gyrl3m5dxsm17bm2a18mp8dca76iix2";
libraryHaskellDepends = [
aeson aeson-pretty autoexporter base bytestring dlist
monad-skeleton template-haskell text th-data-compat
@@ -233762,8 +239563,8 @@ self: {
pname = "ucam-webauth";
version = "0.1.0.0";
sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k";
- revision = "3";
- editedCabalFile = "01j0296a60hpw0n5d50327hnqpkxwzz7pngxq8da5ram0q13cfzw";
+ revision = "5";
+ editedCabalFile = "1hii6sjyc3dps800ffwkjq6fq82idlpkdv68k1y9ivv477plw24a";
libraryHaskellDepends = [
aeson attoparsec base bytestring containers cryptonite errors
http-api-data http-types microlens microlens-mtl mtl
@@ -233789,8 +239590,8 @@ self: {
pname = "ucam-webauth-types";
version = "0.1.0.0";
sha256 = "0jq66amdmrbkg69m0cbbw7xfvsc9iy74khn1k39n7jkq821pzjni";
- revision = "3";
- editedCabalFile = "1png0b60pfhx5gfwbmxxq42nfy9yj2zrcw8krq0vm45qgjw4gd8g";
+ revision = "4";
+ editedCabalFile = "1lb0yq1051fi71qrbnkyg39c7rn5x62w2qkqvp88ih4wzdib8fzv";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring case-insensitive containers
deepseq http-types microlens microlens-mtl mtl text time timerep
@@ -233985,18 +239786,17 @@ self: {
"uhttpc" = callPackage
({ mkDerivation, async, base, bytestring, bytestring-lexing
- , deepseq, network, network-uri, optparse-applicative
+ , deepseq, network, network-bsd, network-uri, optparse-applicative
}:
mkDerivation {
pname = "uhttpc";
- version = "0.1.1.0";
- sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb";
- revision = "4";
- editedCabalFile = "0g4rcm7kbanayv18bad7pakrnghqg2qpxq4aib1n4d8h7ximgly2";
+ version = "0.1.1.1";
+ sha256 = "01plkj4n34s1xbdaky61xzqnc7z2zfx6dzqdlv21np8rk6lirr7d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring bytestring-lexing deepseq network network-uri
+ base bytestring bytestring-lexing deepseq network network-bsd
+ network-uri
];
executableHaskellDepends = [
async base bytestring bytestring-lexing deepseq network
@@ -234004,6 +239804,8 @@ self: {
];
description = "Minimal HTTP client library optimized for benchmarking";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ui-command" = callPackage
@@ -234105,8 +239907,8 @@ self: {
pname = "unagi-chan";
version = "0.4.1.0";
sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb";
- revision = "1";
- editedCabalFile = "0hfyjcngxj7wksjpkpf20w94xjbisi690bzx9clclqillzcqvq4p";
+ revision = "2";
+ editedCabalFile = "06iygfs8k6agspfhci3p76chc84z0pcyq918fr10xnjbzpjfkrrg";
libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
testHaskellDepends = [
atomic-primops base containers ghc-prim primitive
@@ -234194,8 +239996,6 @@ self: {
];
description = "Opinionated Haskell Interoperability";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"unbound" = callPackage
@@ -234301,6 +240101,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unboxing-vector" = callPackage
+ ({ mkDerivation, base, deepseq, HUnit, mono-traversable, primitive
+ , should-not-typecheck, vector
+ }:
+ mkDerivation {
+ pname = "unboxing-vector";
+ version = "0.1.1.0";
+ sha256 = "0i2d5gzvrdi5alaj8inw0jzlh0kkd23pg5dwm24h8jyqh0kmnhj8";
+ libraryHaskellDepends = [
+ base deepseq mono-traversable primitive vector
+ ];
+ testHaskellDepends = [
+ base deepseq HUnit mono-traversable primitive should-not-typecheck
+ vector
+ ];
+ benchmarkHaskellDepends = [
+ base deepseq mono-traversable primitive vector
+ ];
+ description = "A newtype-friendly variant of unboxed vectors";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"unbreak" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
, bytestring, cereal, cmdargs, cryptonite, memory, process, text
@@ -234652,8 +240474,10 @@ self: {
}:
mkDerivation {
pname = "unicode-transforms";
- version = "0.3.5";
- sha256 = "0gm0dwbhr666s7xx71qdrha5r3qwfyyv0wsrvq8jxva3mcwd3xy9";
+ version = "0.3.6";
+ sha256 = "1akscvyssif4hki3g6hy0jmjyr8cqly1whzvzj0km2b3qh0x09l3";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [ base bitarray bytestring text ];
testHaskellDepends = [
base deepseq getopt-generics QuickCheck split text
@@ -234810,6 +240634,8 @@ self: {
pname = "uniplate";
version = "1.6.12";
sha256 = "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw";
+ revision = "1";
+ editedCabalFile = "0gsrs2mk58jg3x36dyzxi4y46isd5p6q0rd6m9l834h5r7ds6a54";
libraryHaskellDepends = [
base containers hashable syb unordered-containers
];
@@ -234854,8 +240680,8 @@ self: {
pname = "unique";
version = "0";
sha256 = "140a9avcxs1fkj1v2awplq6prd1g13yg0kckccw6i1qpgcdigyz3";
- revision = "1";
- editedCabalFile = "0pq3a5y8ddgd37x21vafwxpyi079ir7k9g96y99pygmxwibkg4v8";
+ revision = "2";
+ editedCabalFile = "0ydjjd6j7gr4mibky6j5rqwhy9frvfii0sr4g8shaxnph3y0kb6b";
libraryHaskellDepends = [ base ghc-prim hashable ];
description = "Fully concurrent unique identifiers";
license = stdenv.lib.licenses.bsd3;
@@ -235131,6 +240957,8 @@ self: {
pname = "universe";
version = "1.1";
sha256 = "0zghqcv6jyl9x3qfmbnqyfvr4pkf3m6lil0vg66m16xlrgz68hds";
+ revision = "1";
+ editedCabalFile = "0639gsf8irhpgcp69lq9l7987lsh4wnw3z9ai0dqrvx5ixpg3k5h";
libraryHaskellDepends = [
universe-base universe-dependent-sum universe-instances-extended
universe-reverse-instances
@@ -235152,13 +240980,13 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "universe-base_1_1" = callPackage
+ "universe-base_1_1_1" = callPackage
({ mkDerivation, base, containers, QuickCheck, tagged, transformers
}:
mkDerivation {
pname = "universe-base";
- version = "1.1";
- sha256 = "1alr2gbmdp9lsarnhfl72zkcqrfwxwvmlq3nyb9ilmwinahlzf0n";
+ version = "1.1.1";
+ sha256 = "1a6yyvrzkz7jnjz4lyp8aw0r5hci1nx8c06v3dicgfqs3frk1v8x";
libraryHaskellDepends = [ base containers tagged transformers ];
testHaskellDepends = [ base containers QuickCheck ];
description = "A class for finite and recursively enumerable types";
@@ -235174,6 +241002,8 @@ self: {
pname = "universe-dependent-sum";
version = "1.1.0.1";
sha256 = "1mfvfh7rnk8lnd5lgxbhi40y31sar11dmgh5s7g2kgsprzmg1qpi";
+ revision = "1";
+ editedCabalFile = "0mvb919ig57zpvhpmqjsznwjd2wzglwk16w7hkfxzp73p4a21821";
libraryHaskellDepends = [
base dependent-sum template-haskell th-abstraction transformers
universe-base
@@ -235206,6 +241036,8 @@ self: {
pname = "universe-instances-base";
version = "1.1";
sha256 = "17g4xf7zcxd9a2am0p401b0l87ynxwpm3c2lqc4vmw4sz071kccb";
+ revision = "1";
+ editedCabalFile = "0hjrjjl6v5q9f7cmxhrdxfdk1l86im0b8anxkpgrry7s8q998979";
libraryHaskellDepends = [ base universe-base ];
description = "Universe instances for types from the base package";
license = stdenv.lib.licenses.bsd3;
@@ -235218,6 +241050,8 @@ self: {
pname = "universe-instances-extended";
version = "1.1";
sha256 = "12ads0n5md27wznrv7ah668ip2pp3gryn8d6my74kyhsz6g2fn5q";
+ revision = "1";
+ editedCabalFile = "02267na4xac77q4rnsy53h8nh0gfcmjzkb89qmi4qmvpps8h15y5";
libraryHaskellDepends = [ adjunctions base comonad universe-base ];
description = "Universe instances for types from selected extra packages";
license = stdenv.lib.licenses.bsd3;
@@ -235248,6 +241082,8 @@ self: {
pname = "universe-instances-trans";
version = "1.1";
sha256 = "0dp37rb61g5mqj4kfkgi6zxcjhrm9npz197sksqwg1skgjdgbbn6";
+ revision = "1";
+ editedCabalFile = "0pyqcg8mfw6gg7gxxd46xq3hnhcpd39g7jb9q1awcdipzq7xjrh2";
libraryHaskellDepends = [ base universe-base ];
description = "Universe instances for types from the transformers and mtl packages";
license = stdenv.lib.licenses.bsd3;
@@ -235275,6 +241111,8 @@ self: {
pname = "universe-reverse-instances";
version = "1.1";
sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd";
+ revision = "1";
+ editedCabalFile = "1v8cqdx20b5a2lrmyyvig8fkwl4ljycmf78g8rap5gngvhfz30rk";
libraryHaskellDepends = [ base containers universe-base ];
description = "Instances of standard classes that are made possible by enumerations";
license = stdenv.lib.licenses.bsd3;
@@ -235339,8 +241177,8 @@ self: {
pname = "unix";
version = "2.7.2.2";
sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq";
- revision = "2";
- editedCabalFile = "0d6dv944rp8g69p336b1ik9xl1f182jd8lz82ykhfjhasw8d1waf";
+ revision = "3";
+ editedCabalFile = "1bbn41bx46b9h8hbri50rw69996h75nfhm9zgyvnr8lzgfhnk4p6";
libraryHaskellDepends = [ base bytestring time ];
description = "POSIX functionality";
license = stdenv.lib.licenses.bsd3;
@@ -235364,6 +241202,8 @@ self: {
pname = "unix-compat";
version = "0.5.1";
sha256 = "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3";
+ revision = "1";
+ editedCabalFile = "0c4ak3y72nhv3nf025cyfi1dri2wjmsal3icjwj0aczmlb0imwrd";
libraryHaskellDepends = [ base unix ];
description = "Portable POSIX-compatibility layer";
license = stdenv.lib.licenses.bsd3;
@@ -235465,8 +241305,8 @@ self: {
}:
mkDerivation {
pname = "unix-time";
- version = "0.4.5";
- sha256 = "1bwg132x2613k93wxka17461fc72wrjy5vmgcyami0nn5b30ay7y";
+ version = "0.4.7";
+ sha256 = "02fyh298lm8jsg52i3z0ikazwz477ljqjmhnqr2d88grmn5ky8qr";
libraryHaskellDepends = [ base binary bytestring old-time ];
testHaskellDepends = [
base bytestring hspec old-locale old-time QuickCheck time
@@ -235531,8 +241371,8 @@ self: {
}:
mkDerivation {
pname = "unliftio";
- version = "0.2.10";
- sha256 = "0p0vrw8yxfc5d31zybx08mp302fafs0a6lwq3n40qd1wiy2nw78l";
+ version = "0.2.11";
+ sha256 = "1bc80845pbrs19xh0557w14k1ymzdysc8sf5vh63cfx63vpkw772";
libraryHaskellDepends = [
async base deepseq directory filepath process stm time transformers
unix unliftio-core
@@ -235636,29 +241476,6 @@ self: {
}) {};
"unordered-containers" = callPackage
- ({ mkDerivation, base, bytestring, ChasingBottoms, containers
- , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
- , mtl, QuickCheck, random, test-framework, test-framework-hunit
- , test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "unordered-containers";
- version = "0.2.9.0";
- sha256 = "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37";
- libraryHaskellDepends = [ base deepseq hashable ];
- testHaskellDepends = [
- base ChasingBottoms containers hashable HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
- ];
- benchmarkHaskellDepends = [
- base bytestring containers criterion deepseq deepseq-generics
- hashable hashmap mtl random
- ];
- description = "Efficient hashing-based container types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "unordered-containers_0_2_10_0" = callPackage
({ mkDerivation, base, bytestring, ChasingBottoms, containers
, criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
, mtl, QuickCheck, random, test-framework, test-framework-hunit
@@ -235668,6 +241485,8 @@ self: {
pname = "unordered-containers";
version = "0.2.10.0";
sha256 = "0wy5hfrs880hh8hvp648bl07ws777n3kkmczzdszr7papnyigwb5";
+ revision = "1";
+ editedCabalFile = "01727lm2spbqfn0rl89zv9zhpsmnls0kmizyckqf5nc3j9d0k6sy";
libraryHaskellDepends = [ base deepseq hashable ];
testHaskellDepends = [
base ChasingBottoms containers hashable HUnit QuickCheck
@@ -235679,7 +241498,6 @@ self: {
];
description = "Efficient hashing-based container types";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"unordered-containers-rematch" = callPackage
@@ -236052,17 +241870,15 @@ self: {
}:
mkDerivation {
pname = "up";
- version = "1.0.0.4";
- sha256 = "03rlzqaj148mmxlr0h783z4cm2p7qsdzhx7s861mkfnra8pp84il";
+ version = "1.0.0.5";
+ sha256 = "1b41pqj2v6j0vgj7j18wlparbbkvf92xcfr59lvgf9k8xvarl43k";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base directory filepath lambda-options mtl split
];
- description = "Command line tool to generate pathnames to facilitate moving upward in a file system";
+ description = "Command-line tool to generate paths for moving upward in a file system";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"up-grade" = callPackage
@@ -236536,8 +242352,6 @@ self: {
];
description = "Painfully simple URL deployment";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"urn" = callPackage
@@ -237269,13 +243083,15 @@ self: {
}:
mkDerivation {
pname = "uuid-orphans";
- version = "1.4.2";
- sha256 = "1rsaskv8xhj773abijsq3xi3maa0ixw1k2qywcmw4bdm25pyxsr2";
+ version = "1.4.3";
+ sha256 = "0bfjyc6dg0k7vrd0i1w7ijdld3ns46jdy3dhybh9r2k08kr7fkgy";
libraryHaskellDepends = [
base safecopy text th-lift uuid-types web-routes
];
description = "Orphan instances for the UUID datatype";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"uuid-quasi" = callPackage
@@ -237298,8 +243114,8 @@ self: {
pname = "uuid-types";
version = "1.0.3";
sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj";
- revision = "1";
- editedCabalFile = "0iwwj07gp28g357hv76k4h8pvlzamvchnw003cv3qk778pcpx201";
+ revision = "2";
+ editedCabalFile = "1lmlmng4lph57cljga3r9jy2axdls5mllsb2xzcwy2a34wgidarc";
libraryHaskellDepends = [
base binary bytestring deepseq hashable random text
];
@@ -237546,8 +243362,6 @@ self: {
];
description = "Runs commands on remote machines using ssh";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"valid" = callPackage
@@ -237665,6 +243479,8 @@ self: {
pname = "validation";
version = "1.1";
sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5";
+ revision = "1";
+ editedCabalFile = "1rrjg9z399k6pb55nv85mlr5bkmdqbjwkvl1cy7ydccdx6ks4syp";
libraryHaskellDepends = [
base bifunctors deepseq lens semigroupoids semigroups
];
@@ -238053,8 +243869,6 @@ self: {
];
description = "Client library for HashiCorp's Vault tool (via HTTP API)";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"vault-tool-server" = callPackage
@@ -238293,6 +244107,27 @@ self: {
pname = "vec";
version = "0.1.1";
sha256 = "1ryc6jshm26dh21xlf4wg4fhkw035bxx4smd3xyisjqm7nncq7n5";
+ revision = "1";
+ editedCabalFile = "0yaqc8ci0iy46fimznmr499c5ygrvhfspwbkxdhn112zrci3b7af";
+ libraryHaskellDepends = [
+ adjunctions base base-compat deepseq distributive fin hashable lens
+ semigroupoids transformers
+ ];
+ testHaskellDepends = [ base fin inspection-testing tagged ];
+ benchmarkHaskellDepends = [ base criterion fin vector ];
+ description = "Vec: length-indexed (sized) list";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "vec_0_1_1_1" = callPackage
+ ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq
+ , distributive, fin, hashable, inspection-testing, lens
+ , semigroupoids, tagged, transformers, vector
+ }:
+ mkDerivation {
+ pname = "vec";
+ version = "0.1.1.1";
+ sha256 = "0gzypyi4vv5ajysbmnpicm8r2qh95nmmrj9l6hp30b95i36cb5as";
libraryHaskellDepends = [
adjunctions base base-compat deepseq distributive fin hashable lens
semigroupoids transformers
@@ -238302,7 +244137,6 @@ self: {
description = "Vec: length-indexed (sized) list";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"vect" = callPackage
@@ -238370,25 +244204,6 @@ self: {
}) {};
"vector" = callPackage
- ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
- , primitive, QuickCheck, random, template-haskell, test-framework
- , test-framework-hunit, test-framework-quickcheck2, transformers
- }:
- mkDerivation {
- pname = "vector";
- version = "0.12.0.2";
- sha256 = "1wy0pfa3ks6s2dkp1fwrl1s9d3wjmqy9d09icnwfs2zimyn9vs2j";
- libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
- testHaskellDepends = [
- base base-orphans HUnit primitive QuickCheck random
- template-haskell test-framework test-framework-hunit
- test-framework-quickcheck2 transformers
- ];
- description = "Efficient Arrays";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "vector_0_12_0_3" = callPackage
({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
, primitive, QuickCheck, random, template-haskell, test-framework
, test-framework-hunit, test-framework-quickcheck2, transformers
@@ -238397,8 +244212,8 @@ self: {
pname = "vector";
version = "0.12.0.3";
sha256 = "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq";
- revision = "1";
- editedCabalFile = "0nkx1kwrvskp7xx1193d7b72fk7b678nlljzjqazhcbvi7qxpdxr";
+ revision = "2";
+ editedCabalFile = "1kjs6jnbxziv1q0md2jiqic0r19ry8xlg7wdr8b52rz7yjyb08hl";
libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
testHaskellDepends = [
base base-orphans HUnit primitive QuickCheck random
@@ -238407,7 +244222,6 @@ self: {
];
description = "Efficient Arrays";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"vector-algorithms" = callPackage
@@ -238418,6 +244232,8 @@ self: {
pname = "vector-algorithms";
version = "0.8.0.1";
sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m";
+ revision = "2";
+ editedCabalFile = "0ms473xd1d81dbg47kjr9gxqs11ipg2j1kk99q37rhvrbr5xv5l4";
libraryHaskellDepends = [ base bytestring primitive vector ];
testHaskellDepends = [
base bytestring containers QuickCheck vector
@@ -238587,8 +244403,6 @@ self: {
];
description = "Utilities for the \"vector\" library";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"vector-fftw" = callPackage
@@ -238724,8 +244538,8 @@ self: {
}:
mkDerivation {
pname = "vector-sized";
- version = "1.2.0.0";
- sha256 = "04r43b30vayg56n88b5r3b5krh2kjxnqgmr4kx052bgpl8k6zh54";
+ version = "1.2.0.1";
+ sha256 = "1l7d9nzazxh372pc7fwvbxib7hfmgkjg8c5iv7m5d240n1qk13pj";
libraryHaskellDepends = [
adjunctions base comonad deepseq distributive finite-typelits
hashable indexed-list-literals primitive vector
@@ -238990,8 +244804,8 @@ self: {
}:
mkDerivation {
pname = "verifiable-expressions";
- version = "0.4.0";
- sha256 = "0s0wqhss8155xy2gkdwylvp61cn0ra5245fa5l2k9rvqr8xxrfkd";
+ version = "0.5.0";
+ sha256 = "04bm6m9aflf2zcbwbgga6sl3ydxmp295pgwp9wfbvnzyc2bggrg5";
libraryHaskellDepends = [
base containers lens mtl sbv transformers union vinyl
];
@@ -239093,6 +244907,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vflow-types" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, ip, json-alt
+ , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes
+ , scientific, text
+ }:
+ mkDerivation {
+ pname = "vflow-types";
+ version = "0.1";
+ sha256 = "01iycni552yrikn59lh6mvsf16aq52kcgwapqk6al8y623vqg5hi";
+ libraryHaskellDepends = [
+ aeson base ip json-alt json-autotype scientific text
+ ];
+ testHaskellDepends = [
+ aeson base bytestring ip json-alt neat-interpolation QuickCheck
+ quickcheck-classes text
+ ];
+ description = "types for ingesting vflow data with aeson";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"vfr-waypoints" = callPackage
({ mkDerivation, base, containers, dimensional, fuzzy
, geodetic-types, lens, monoid-subclasses, optparse-applicative
@@ -239299,8 +245133,6 @@ self: {
executableHaskellDepends = [ base ];
description = "Frontend for video metadata tagging tools";
license = stdenv.lib.licenses.bsd2;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"vimus" = callPackage
@@ -239795,8 +245627,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "void";
- version = "0.7.2";
- sha256 = "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk";
+ version = "0.7.3";
+ sha256 = "05vk3x1r9a2pqnzfji475m5gdih2im1h7rbi2sc67p1pvj6pbbsk";
libraryHaskellDepends = [ base ];
description = "A Haskell 98 logically uninhabited data type";
license = stdenv.lib.licenses.bsd3;
@@ -239880,23 +245712,23 @@ self: {
"vt-utils" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring
- , case-insensitive, directory, http-client, http-types, HUnit
- , parsec, process, text, time, transformers, unordered-containers
- , vector, wai, warp
+ , case-insensitive, directory, either, hashable, http-client
+ , http-types, HUnit, parsec, process, text, time, transformers
+ , unordered-containers, vector, wai, warp
}:
mkDerivation {
pname = "vt-utils";
- version = "1.2.0.0";
- sha256 = "1mbc4a8s6h3f5w3da2ln95050c1ssnh7pyj4i34nvmm5gqrb3jb9";
+ version = "1.3.0.0";
+ sha256 = "07xn1izv59h8b6nk294gyxcfn489n2f6fcpi5g9nkscr59hmkj2v";
libraryHaskellDepends = [
aeson aeson-pretty base bytestring case-insensitive directory
- http-client http-types HUnit parsec process text time transformers
- unordered-containers vector wai
+ either hashable http-client http-types HUnit parsec process text
+ time transformers unordered-containers vector wai
];
testHaskellDepends = [
aeson aeson-pretty base bytestring case-insensitive directory
- http-client http-types HUnit parsec process text time transformers
- unordered-containers vector wai warp
+ either hashable http-client http-types HUnit parsec process text
+ time transformers unordered-containers vector wai warp
];
description = "Vector and Text utilities";
license = stdenv.lib.licenses.mit;
@@ -240065,13 +245897,11 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "vulkan-api";
- version = "1.1.4.0";
- sha256 = "10q98v71miyb1yhnpvz9dlhjs38m4pbz7x1hndz8cfsnjk3n5b22";
+ version = "1.3.0.0";
+ sha256 = "1afnj053p3azm9wwdsr49w2s82k64lb0f12ak2g2v8vgidrjl7qk";
libraryHaskellDepends = [ base ];
description = "Low-level low-overhead vulkan api bindings";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"waargonaut" = callPackage
@@ -240087,8 +245917,8 @@ self: {
}:
mkDerivation {
pname = "waargonaut";
- version = "0.6.1.0";
- sha256 = "0ygwwiq3nr8szp5vhs9306pwf9mqh7x75vsh1wfh369h6psqqp11";
+ version = "0.6.2.0";
+ sha256 = "1s9il54r5hqp4fbxn5012f7l6ir6fy2v6xv5xf57zh1sz0ifxj2f";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
@@ -240101,7 +245931,8 @@ self: {
testHaskellDepends = [
attoparsec base bytestring containers contravariant digit directory
distributive doctest filepath generics-sop hedgehog hedgehog-fn
- lens mtl natural scientific semigroupoids semigroups tagged tasty
+ hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mtl
+ natural scientific semigroupoids semigroups tagged tasty
tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit
template-haskell text unordered-containers vector zippers
];
@@ -240188,8 +246019,8 @@ self: {
}:
mkDerivation {
pname = "wai";
- version = "3.2.2";
- sha256 = "1qbzq4k8b23pg1knw5y99rdvkfywnncwqkfrkp2w7g6p054xar1a";
+ version = "3.2.2.1";
+ sha256 = "058871axlq6r0gcqxbjw37w57df9xbv81dmz99b1zq59wf329xzy";
libraryHaskellDepends = [
base bytestring http-types network text transformers vault
];
@@ -240229,8 +246060,8 @@ self: {
}:
mkDerivation {
pname = "wai-app-file-cgi";
- version = "3.1.7";
- sha256 = "17cj50p16adyzqr28f28ll64g3gr8ri756dngrdgly0g7060fg53";
+ version = "3.1.9";
+ sha256 = "1knf3dmal9immsxj4cvqf2i4ijlrn17fick6slxb1mrms7f50wkq";
libraryHaskellDepends = [
array attoparsec attoparsec-conduit base bytestring
case-insensitive conduit conduit-extra containers
@@ -240244,6 +246075,8 @@ self: {
];
description = "File/CGI/Rev Proxy App of WAI";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"wai-app-static" = callPackage
@@ -240258,8 +246091,8 @@ self: {
pname = "wai-app-static";
version = "3.1.6.3";
sha256 = "0s6bpz5gmjy797bnnw1y5mwy9761h46bjp1srnrh7cxlnvm93c4c";
- revision = "2";
- editedCabalFile = "17wd7cxqwimhww53qihchrr62hnzirggk86migi9bcwv4wjykmqc";
+ revision = "3";
+ editedCabalFile = "01qzkb1niv0jzbsh802gw1a9w85h0nhp1vd6hln958hsxf25n0d9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -240343,8 +246176,8 @@ self: {
}:
mkDerivation {
pname = "wai-cors";
- version = "0.2.6";
- sha256 = "11m9d8hn9pb9brprz0kglldmcqj83kjkjdwdpxdbl12430ii1ina";
+ version = "0.2.7";
+ sha256 = "10gv3jjlkcb13031frr818p56v2s0qf6dqjsfpwlhwdxdssvx5r5";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
attoparsec base base-unicode-symbols bytestring case-insensitive
@@ -240452,37 +246285,6 @@ self: {
}) {};
"wai-extra" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
- , bytestring, case-insensitive, containers, cookie
- , data-default-class, deepseq, directory, fast-logger, hspec
- , http-types, HUnit, iproute, network, old-locale, resourcet
- , streaming-commons, text, time, transformers, unix, unix-compat
- , vault, void, wai, wai-logger, word8, zlib
- }:
- mkDerivation {
- pname = "wai-extra";
- version = "3.0.25";
- sha256 = "0caz1miwnyjqg6gdfgv7ibyfdyjzlq2i8v07zhan1nniv9pj3w6y";
- revision = "2";
- editedCabalFile = "0gdg5rfxqfgwj922lxz7ya637nj1qhh1imskiaf453hdpj619aaf";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson ansi-terminal base base64-bytestring bytestring
- case-insensitive containers cookie data-default-class deepseq
- directory fast-logger http-types iproute network old-locale
- resourcet streaming-commons text time transformers unix unix-compat
- vault void wai wai-logger word8 zlib
- ];
- testHaskellDepends = [
- base bytestring case-insensitive cookie fast-logger hspec
- http-types HUnit resourcet text time transformers wai zlib
- ];
- description = "Provides some basic WAI handlers and middleware";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "wai-extra_3_0_26" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
, bytestring, case-insensitive, containers, cookie
, data-default-class, deepseq, directory, fast-logger, hspec
@@ -240492,10 +246294,8 @@ self: {
}:
mkDerivation {
pname = "wai-extra";
- version = "3.0.26";
- sha256 = "1vax87kchm92az0f4axn793bavp8pwjh7a9mc1lwwwni678h35gq";
- revision = "1";
- editedCabalFile = "02475xywcp12xysa6l2p6ibx800978lsa6rkgx9gnhans7z6yj16";
+ version = "3.0.26.1";
+ sha256 = "1gsjji9i471j224sfp4xdm4vga3jcbdvdg7f40y3l58pplf6a3qd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -240511,7 +246311,6 @@ self: {
];
description = "Provides some basic WAI handlers and middleware";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-frontend-monadcgi" = callPackage
@@ -240610,6 +246409,8 @@ self: {
pname = "wai-handler-launch";
version = "3.0.2.4";
sha256 = "0019vz9ha2mvliz3drjbj62v26mwhl9bl1vqr06ki40865hrr78f";
+ revision = "1";
+ editedCabalFile = "1mjxbzw3a5wybcp8s4x05rx91p2qaabpfci6w2k6p6nw4rjvfijv";
libraryHaskellDepends = [
async base bytestring http-types process streaming-commons
transformers wai warp
@@ -240709,8 +246510,8 @@ self: {
}:
mkDerivation {
pname = "wai-http2-extra";
- version = "0.1.0";
- sha256 = "1gqm346vr2asshb55dyml28ifiyb975zj5mklg0yfjq2hpbn97ld";
+ version = "0.1.1";
+ sha256 = "00fr1rg92vfkn6cb7cgdwmj7lavmyj8m9y0xxj05ws4b93r5f2z5";
libraryHaskellDepends = [
auto-update base bytestring containers http-types wai warp word8
];
@@ -240799,8 +246600,8 @@ self: {
}:
mkDerivation {
pname = "wai-logger";
- version = "2.3.4";
- sha256 = "004ng1r1qij0frlsyps0nz9b0ijn0zlk3i6qbb7lq1f4209ikzlk";
+ version = "2.3.5";
+ sha256 = "05gbipyw0672irynsc3wqvvgzqixhmq69ay2mxh2phb734r8bcmm";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base byteorder bytestring fast-logger http-types network wai
@@ -241403,8 +247204,8 @@ self: {
pname = "wai-middleware-static";
version = "0.8.2";
sha256 = "1z5yapcf8j9w71f2na30snmalsajlyi8an2f9qrjdmajabyykr0b";
- revision = "1";
- editedCabalFile = "0n7i81jrjsrav8bpg31avrd18vh95l5z6bfj4fqkrdj4h1v6armi";
+ revision = "2";
+ editedCabalFile = "17vq38dh7x1kqzfwla1s0rldd5hzm5mcrx49sjlzy8b66gd2n3ac";
libraryHaskellDepends = [
base bytestring containers cryptonite directory expiring-cache-map
filepath http-types memory mime-types mtl old-locale semigroups
@@ -241460,8 +247261,8 @@ self: {
}:
mkDerivation {
pname = "wai-middleware-throttle";
- version = "0.3.0.0";
- sha256 = "16qhfqc0f5ahz2qc04a4by6iw1agxzcf14aqqkf1arf0hknvbvvv";
+ version = "0.3.0.1";
+ sha256 = "0mpw7b56k1a89kzwa3v4c4ff66m0py9s9p2jan2zhp8k3b8862jq";
libraryHaskellDepends = [
base bytestring bytestring-builder cache clock containers hashable
http-types mtl network safe-exceptions stm text token-bucket
@@ -241483,8 +247284,8 @@ self: {
pname = "wai-middleware-travisci";
version = "0.1.0";
sha256 = "0a58mlgimr6137aiwcdxjk15zy3y58dds4zxffd3vvn0lkzg5jdv";
- revision = "1";
- editedCabalFile = "0fd99j9lyb562p3rsdb8d7swg31bwahzhgjm6afijc5f6i5awcw3";
+ revision = "2";
+ editedCabalFile = "0j1k2y75gwbny72zf5nrwzanh7sn2plscnrjd4hw5npccxi4dchx";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring cryptonite http-types text
transformers vault wai
@@ -241625,8 +247426,6 @@ self: {
];
description = "Typesafe URLs for Wai applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"wai-routing" = callPackage
@@ -242090,34 +247889,68 @@ self: {
, gauge, ghc-prim, hashable, hspec, http-client, http-date
, http-types, http2, HUnit, iproute, lifted-base, network, process
, QuickCheck, simple-sendfile, stm, streaming-commons, text, time
- , transformers, unix, unix-compat, vault, wai, word8
+ , time-manager, transformers, unix, unix-compat, vault, wai, word8
}:
mkDerivation {
pname = "warp";
- version = "3.2.27";
- sha256 = "0p2w88q0zd55ms20qylipbi0qzbf324i9r8b9qqxyds5yc1anq76";
+ version = "3.2.28";
+ sha256 = "0w2w3aiccpb2f8zssqiszcxzqdysihqi5xply23lwif5arz4saw7";
libraryHaskellDepends = [
array async auto-update base bsb-http-chunked bytestring
case-insensitive containers ghc-prim hashable http-date http-types
http2 iproute network simple-sendfile stm streaming-commons text
- unix unix-compat vault wai word8
+ time-manager unix unix-compat vault wai word8
];
testHaskellDepends = [
array async auto-update base bsb-http-chunked bytestring
case-insensitive containers directory doctest ghc-prim hashable
hspec http-client http-date http-types http2 HUnit iproute
lifted-base network process QuickCheck simple-sendfile stm
- streaming-commons text time transformers unix unix-compat vault wai
- word8
+ streaming-commons text time time-manager transformers unix
+ unix-compat vault wai word8
];
benchmarkHaskellDepends = [
auto-update base bytestring containers gauge hashable http-date
- http-types network unix unix-compat
+ http-types network time-manager unix unix-compat
];
description = "A fast, light-weight web server for WAI applications";
license = stdenv.lib.licenses.mit;
}) {};
+ "warp_3_3_0" = callPackage
+ ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
+ , bytestring, case-insensitive, containers, directory, gauge
+ , ghc-prim, hashable, hspec, http-client, http-date, http-types
+ , http2, HUnit, iproute, lifted-base, network, process, QuickCheck
+ , simple-sendfile, stm, streaming-commons, text, time, time-manager
+ , unix, unix-compat, vault, wai, word8
+ }:
+ mkDerivation {
+ pname = "warp";
+ version = "3.3.0";
+ sha256 = "0dqh1rrrmhw343786337qwgjwap8yk91zrxc9vxdmal6mkf1q4dq";
+ libraryHaskellDepends = [
+ array async auto-update base bsb-http-chunked bytestring
+ case-insensitive containers ghc-prim hashable http-date http-types
+ http2 iproute network simple-sendfile stm streaming-commons text
+ time-manager unix unix-compat vault wai word8
+ ];
+ testHaskellDepends = [
+ array async auto-update base bsb-http-chunked bytestring
+ case-insensitive containers directory ghc-prim hashable hspec
+ http-client http-date http-types http2 HUnit iproute lifted-base
+ network process QuickCheck simple-sendfile stm streaming-commons
+ text time time-manager unix unix-compat vault wai word8
+ ];
+ benchmarkHaskellDepends = [
+ auto-update base bytestring containers gauge hashable http-date
+ http-types network time-manager unix unix-compat
+ ];
+ description = "A fast, light-weight web server for WAI applications";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"warp-dynamic" = callPackage
({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
mkDerivation {
@@ -242184,8 +248017,8 @@ self: {
}:
mkDerivation {
pname = "warp-tls";
- version = "3.2.5";
- sha256 = "1z98jxn1l9mp6hh2jja6cz48nx8zvp5iqrr23wmbp235vva4llmf";
+ version = "3.2.7";
+ sha256 = "1h6m9jhvk4ai945p5s6sa9lxq40cn00gjfj4yiqhj2q5ymxfgfba";
libraryHaskellDepends = [
base bytestring cryptonite data-default-class network
streaming-commons tls tls-session-manager wai warp
@@ -242846,8 +248679,8 @@ self: {
}:
mkDerivation {
pname = "web3";
- version = "0.8.3.1";
- sha256 = "1pvyyvaamxjz2pyxz25sw3f8hv8605qg99qpgx40bhbhrfvg8zpi";
+ version = "0.8.3.2";
+ sha256 = "1yk24r1pbavvp8si8yxk4p5n4s80h1klz5rav49sgrw8zj69n3x7";
libraryHaskellDepends = [
aeson async base basement bytestring cereal cryptonite data-default
exceptions generics-sop http-client http-client-tls machines memory
@@ -242930,8 +248763,8 @@ self: {
}:
mkDerivation {
pname = "webby";
- version = "0.1.0.2";
- sha256 = "1yndypl1x5pcxhc1mp2midbidbzvgvjy3s7h076lxpra1dvi6h7r";
+ version = "0.1.1";
+ sha256 = "0415vhp8h3lr8wlfkg6a7njq19ka1wyi9klcmsd117phd9m46whb";
libraryHaskellDepends = [
aeson base binary bytestring fast-logger formatting http-api-data
http-types monad-logger protolude resourcet text unliftio
@@ -243052,6 +248885,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "webdriver_0_9_0_1" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+ , bytestring, call-stack, data-default-class, directory
+ , directory-tree, exceptions, filepath, http-client, http-types
+ , lifted-base, monad-control, network, network-uri, scientific
+ , temporary, text, time, transformers, transformers-base
+ , unordered-containers, vector, zip-archive
+ }:
+ mkDerivation {
+ pname = "webdriver";
+ version = "0.9.0.1";
+ sha256 = "1w6z95swrz5ijmcxh0x3i521kpxqfp6pxgqfqwix7fc4jy450n8k";
+ libraryHaskellDepends = [
+ aeson attoparsec base base64-bytestring bytestring call-stack
+ data-default-class directory directory-tree exceptions filepath
+ http-client http-types lifted-base monad-control network
+ network-uri scientific temporary text time transformers
+ transformers-base unordered-containers vector zip-archive
+ ];
+ description = "a Haskell client for the Selenium WebDriver protocol";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"webdriver-angular" = callPackage
({ mkDerivation, aeson, base, hspec, hspec-webdriver
, language-javascript, template-haskell, text, transformers
@@ -243325,8 +249182,6 @@ self: {
libraryPkgconfigDepends = [ webkitgtk ];
description = "JavaScriptCore FFI from webkitgtk";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {inherit (pkgs) webkitgtk;};
"webkitgtk3" = callPackage
@@ -243536,8 +249391,8 @@ self: {
}:
mkDerivation {
pname = "websockets-snap";
- version = "0.10.3.0";
- sha256 = "1r1v6ypnaap99vy2gh3lmghqv2y3zaaq0wiv4d2bn49179c40jmk";
+ version = "0.10.3.1";
+ sha256 = "1hpszqb61xhbgfvxd6g56kdfxsyi14q7xh12jbdnyycbfijb9bqk";
libraryHaskellDepends = [
base bytestring bytestring-builder io-streams mtl snap-core
snap-server websockets
@@ -243620,6 +249475,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "weekdaze" = callPackage
+ ({ mkDerivation, array, base, bytestring, Cabal, containers
+ , cryptohash, data-default, deepseq, directory, extra, factory
+ , filepath, hxt, mtl, parallel, QuickCheck, random, time, toolshed
+ , unix, xhtml
+ }:
+ mkDerivation {
+ pname = "weekdaze";
+ version = "0.0.0.1";
+ sha256 = "13nxi6gqm4by2y6wd3vwj0rqjircpfng0nz5h2spci2jrbmv52d3";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array base bytestring Cabal containers cryptohash data-default
+ deepseq extra factory filepath hxt mtl random toolshed xhtml
+ ];
+ executableHaskellDepends = [
+ array base Cabal containers cryptohash data-default deepseq
+ directory extra factory filepath hxt mtl parallel random time
+ toolshed unix xhtml
+ ];
+ testHaskellDepends = [
+ array base Cabal containers factory mtl QuickCheck toolshed
+ ];
+ description = "A school-timetable problem-solver";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"weigh" = callPackage
({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
mkDerivation {
@@ -243873,6 +249759,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wholepixels" = callPackage
+ ({ mkDerivation, base, cairo, colour, directory, hsnoise
+ , MonadRandom, mtl, random, random-fu, random-shuffle
+ , random-source, relude, temporary, time
+ }:
+ mkDerivation {
+ pname = "wholepixels";
+ version = "1.1";
+ sha256 = "1xxdf0znpa54bzifj1apmc9yda4mdhy1vzdm58ihnywi9mch1c0l";
+ libraryHaskellDepends = [
+ base cairo colour directory hsnoise MonadRandom mtl random
+ random-fu random-shuffle random-source relude temporary time
+ ];
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"why3" = callPackage
({ mkDerivation, alex, array, base, bytestring, containers, deepseq
, directory, filepath, happy, monadLib, pretty, pretty-show
@@ -243901,6 +249803,8 @@ self: {
pname = "wide-word";
version = "0.1.0.8";
sha256 = "1n6g9kn7k8gi2qi8fbik5pi2yj5mbzzj62512as1gjysv3y3l2dj";
+ revision = "1";
+ editedCabalFile = "189p1g51xx0a1lhxlhr0i8qv7mvr4zsjfdpb4i8ja2hfi0ssszdx";
libraryHaskellDepends = [ base deepseq primitive ];
testHaskellDepends = [
base bytestring ghc-prim hedgehog QuickCheck quickcheck-classes
@@ -243908,8 +249812,6 @@ self: {
];
description = "Data types for large but fixed width signed and unsigned integers";
license = stdenv.lib.licenses.bsd2;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"wigner-symbols" = callPackage
@@ -243986,8 +249888,8 @@ self: {
}:
mkDerivation {
pname = "wild-bind";
- version = "0.1.2.3";
- sha256 = "1dl3vh4xn6mml2mydapyqwlg872pczgz7lv912skzwnzv55hxg12";
+ version = "0.1.2.4";
+ sha256 = "14cl18vfna21mq3ln9y3s6x7yvp13hynqfmjjv192z928wabyxqz";
libraryHaskellDepends = [
base containers semigroups text transformers
];
@@ -244040,8 +249942,8 @@ self: {
}:
mkDerivation {
pname = "wild-bind-x11";
- version = "0.2.0.6";
- sha256 = "0dqxcmdx3dinqkpwdnkb5nlc0cvn1gnwril5qmzixzshh03c8va9";
+ version = "0.2.0.7";
+ sha256 = "00lpx5lqahd5wx3f2rp0glhi9m5k0miys39fpq7p57iwvdzjhgxa";
libraryHaskellDepends = [
base containers fold-debounce mtl semigroups stm text transformers
wild-bind X11
@@ -244331,8 +250233,6 @@ self: {
testHaskellDepends = [ base conduit hspec HUnit mtl ];
description = "Run computations that depend on one or more elements in a stream";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"witherable" = callPackage
@@ -244341,8 +250241,8 @@ self: {
}:
mkDerivation {
pname = "witherable";
- version = "0.3";
- sha256 = "1h0rvygjr76avrpp8dzhama1accm2i9q3245m54543nm6yfn23v2";
+ version = "0.3.1";
+ sha256 = "0sjpr1fnmxicpiyhh715fh8cznc971awhhd1mzqn03ybrja8278l";
libraryHaskellDepends = [
base base-orphans containers hashable transformers
transformers-compat unordered-containers vector
@@ -244381,8 +250281,8 @@ self: {
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "wizard";
- version = "0.1.0.0";
- sha256 = "0j485hbk42ipmc14ydickfm268b7z183rs37ih3j99lbzrdm1s8l";
+ version = "0.1.1";
+ sha256 = "0bldcvd7zjask8myh1nwj59ml4q6wlinp2h7q6hdfjg8djf2mnca";
libraryHaskellDepends = [ base transformers ];
description = "the fantastical wizard monoid";
license = stdenv.lib.licenses.bsd3;
@@ -244431,8 +250331,8 @@ self: {
}:
mkDerivation {
pname = "wkt-geom";
- version = "0.0.8";
- sha256 = "123y2xl22gmg28dcj244gk9bsbw0chz32gim48dz4bmqnkmvl7wl";
+ version = "0.0.10";
+ sha256 = "10hzfa063sp2f4v3ki7322x74iqn8wan0klalhddqfr554j3b1g5";
libraryHaskellDepends = [
base base16-bytestring binary bytestring containers geojson
scientific trifecta utf8-string vector
@@ -244444,6 +250344,8 @@ self: {
];
description = "A parser of WKT, WKB and eWKB";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"wl-pprint" = callPackage
@@ -244818,8 +250720,6 @@ self: {
benchmarkHaskellDepends = [ base criterion pandoc text ];
description = "Get word counts and distributions";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"wordcloud" = callPackage
@@ -244845,6 +250745,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wordify" = callPackage
+ ({ mkDerivation, array, base, containers, directory, errors
+ , filepath, HUnit, listsafe, mtl, parsec, QuickCheck, random, safe
+ , semigroups, split, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "wordify";
+ version = "0.1.0.0";
+ sha256 = "1iw3sk8sspscl29chnvd69g8l7pfz7vlpj9vyai8fkwipmc3jrwv";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base containers errors listsafe mtl parsec random safe
+ semigroups split transformers unordered-containers
+ ];
+ executableHaskellDepends = [
+ array base containers errors listsafe mtl parsec random safe
+ semigroups split transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ array base containers directory errors filepath HUnit listsafe mtl
+ parsec QuickCheck random safe semigroups split test-framework
+ test-framework-hunit test-framework-quickcheck2 transformers
+ unordered-containers
+ ];
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"wordlist" = callPackage
({ mkDerivation, base, MonadRandom, optparse-applicative, text
, vector
@@ -245100,6 +251031,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "world-peace_1_0_0_0" = callPackage
+ ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors
+ , should-not-typecheck, tagged, tasty, tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "world-peace";
+ version = "1.0.0.0";
+ sha256 = "1fx8f7dfrslqwmkbcyff5q7iafa5znc73f77il7y87hz23q9yzmx";
+ libraryHaskellDepends = [ aeson base deepseq profunctors tagged ];
+ testHaskellDepends = [
+ base doctest Glob should-not-typecheck tasty tasty-hunit text
+ ];
+ description = "Open Union and Open Product Types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wp-archivebot" = callPackage
({ mkDerivation, base, feed, HTTP, network, parallel, tagsoup }:
mkDerivation {
@@ -245178,6 +251126,8 @@ self: {
pname = "wrecker";
version = "1.3.1.0";
sha256 = "0z0a9k88npw09n54mplg2aa98y4p8kmk14v8ks2dc2ilf24lrri7";
+ revision = "1";
+ editedCabalFile = "1wzpw1cdbrb3mz7qaissdjidwdafhv9jph14066gn9dnyffg1w02";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -245251,8 +251201,8 @@ self: {
pname = "wreq";
version = "0.5.3.1";
sha256 = "1i2f2bxx84l8qzkz9v3qhx5sbl78ysc3vqadfhrxk3h0ljklwfz3";
- revision = "1";
- editedCabalFile = "016sf02sm58fjsa7nmj12y8m2rwg34md8cnn533kdxm831jc9zyb";
+ revision = "2";
+ editedCabalFile = "1rjz4012vp9q7a3szpm8a7rnn62d5cbbp1pp3qwfyi1fgyd5rp6c";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -245291,6 +251241,8 @@ self: {
pname = "wreq";
version = "0.5.3.2";
sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36";
+ revision = "1";
+ editedCabalFile = "0gz674sb266hv6si9l79c3bv7n2nbssl1262c24in79sk27887gb";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -245555,8 +251507,6 @@ self: {
];
description = "A simple CLI utility for interacting with a websocket";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ws-chans" = callPackage
@@ -245579,8 +251529,6 @@ self: {
];
description = "Unagi chan based websocket client";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"wsdl" = callPackage
@@ -245801,28 +251749,13 @@ self: {
}:
mkDerivation {
pname = "wuss";
- version = "1.1.12";
- sha256 = "1xnnyavkgf2cdnsm494bl1z275l9rynh9s3djq3mqk6lrr4bvsix";
- libraryHaskellDepends = [
- base bytestring connection network websockets
- ];
- description = "Secure WebSocket (WSS) clients";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "wuss_1_1_13" = callPackage
- ({ mkDerivation, base, bytestring, connection, network, websockets
- }:
- mkDerivation {
- pname = "wuss";
- version = "1.1.13";
- sha256 = "16ll4wfk3i570id7ki5ab34q5wwzgr5k7fqmx8hvnxmdsr8h85cy";
+ version = "1.1.14";
+ sha256 = "1r0ljrp7kfksvmm4029b633cypdg5lqk5nga31si22bi5yz7fkiq";
libraryHaskellDepends = [
base bytestring connection network websockets
];
description = "Secure WebSocket (WSS) clients";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wx" = callPackage
@@ -246236,8 +252169,8 @@ self: {
}:
mkDerivation {
pname = "xcffib";
- version = "0.7.0";
- sha256 = "1b9qp3z0j3qpxwh8kczkarbqa0hb6x8wxm6by6j49qhd7fn6dkin";
+ version = "0.8.1";
+ sha256 = "183f7rpckhr3cipwci6hfhrfilqq5jijkwp98r5wi0l43inj29jc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -246332,6 +252265,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "xdg-desktop-entry" = callPackage
+ ({ mkDerivation, base, ConfigFile, directory, either, filepath
+ , multimap, safe, transformers, unix
+ }:
+ mkDerivation {
+ pname = "xdg-desktop-entry";
+ version = "0.1.1.0";
+ sha256 = "0ss4marv4lyh94v9x12sy5wfdsiw0jppqpgndmg1w8b3mfk0d6s2";
+ libraryHaskellDepends = [
+ base ConfigFile directory either filepath multimap safe
+ transformers unix
+ ];
+ description = "Parse files conforming to the xdg desktop entry spec";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"xdg-userdirs" = callPackage
({ mkDerivation, base, containers, directory, filepath, xdg-basedir
}:
@@ -246658,6 +252607,8 @@ self: {
pname = "xkcd";
version = "0.1.1";
sha256 = "15zwx7rkxm52pnxjhx3p979h48cls1ipb7hmryxll5rcxz9aga29";
+ revision = "1";
+ editedCabalFile = "0sy66hmwgk5mb9nxlqh7k1nzb2r6cw617sn31aaf54hwk0gkx32m";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -246692,8 +252643,8 @@ self: {
}:
mkDerivation {
pname = "xls";
- version = "0.1.1";
- sha256 = "0a09zw90xiaklr68w932md38s95jzwid914lw7frnf3qd8j12xq9";
+ version = "0.1.2";
+ sha256 = "0gpfc973g6ha9w3fqm9dy59kgl21hw20l2b444rrz0lxs9ix1wyp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -247129,8 +253080,8 @@ self: {
pname = "xml-lens";
version = "0.1.6.3";
sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd";
- revision = "1";
- editedCabalFile = "1fbk4wv7zr10wsh8a0svd799im64fybnlb09rjpfl2pvb6i6h1qs";
+ revision = "2";
+ editedCabalFile = "1phba1j6ggxfsq4ivhd5wibzw1b9hwppqmgichyj3xg9z3widmnl";
libraryHaskellDepends = [
base case-insensitive containers lens text xml-conduit
];
@@ -247457,22 +253408,22 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
- "xmlbf_0_5" = callPackage
+ "xmlbf_0_6" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, QuickCheck
- , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
- , transformers, unordered-containers
+ , quickcheck-instances, selective, tasty, tasty-hunit
+ , tasty-quickcheck, text, transformers, unordered-containers
}:
mkDerivation {
pname = "xmlbf";
- version = "0.5";
- sha256 = "1wm7xypplnz9sl6ckh8kjsb66pd2cqgr412sdhdm0d7y0yixv2zy";
+ version = "0.6";
+ sha256 = "02wcjmpgjla568ic621hglzkgqaiq9g1s93fq4iqq4lf20yszr9y";
libraryHaskellDepends = [
- base bytestring containers deepseq text transformers
+ base bytestring containers deepseq selective text transformers
unordered-containers
];
testHaskellDepends = [
- base bytestring deepseq QuickCheck quickcheck-instances tasty
- tasty-hunit tasty-quickcheck text transformers unordered-containers
+ base bytestring QuickCheck quickcheck-instances tasty tasty-hunit
+ tasty-quickcheck text transformers
];
description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints";
license = stdenv.lib.licenses.asl20;
@@ -247552,6 +253503,8 @@ self: {
pname = "xmlgen";
version = "0.6.2.2";
sha256 = "1milbbr2iqwckqbq6i9sypinvs4hs7mzqn274x350psjfy6ajvwj";
+ revision = "1";
+ editedCabalFile = "0vwnqd0lsw81llsn0psga5r6pw7jh69vfbj3rnz7c2fpkc0gjh3j";
libraryHaskellDepends = [
base blaze-builder bytestring containers mtl text
];
@@ -247709,8 +253662,8 @@ self: {
base containers extensible-exceptions QuickCheck X11
];
postInstall = ''
- install -D man/xmonad.1 $doc/share/man/man1/xmonad.1
- install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs
+ install -D man/xmonad.1 ''${!outputDoc}/share/man/man1/xmonad.1
+ install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs
'';
description = "A tiling window manager";
license = stdenv.lib.licenses.bsd3;
@@ -248506,11 +254459,9 @@ self: {
];
description = "Yam Web";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
- "yam_0_6_1" = callPackage
+ "yam_0_6_3" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring
, data-default, exceptions, fast-logger, hspec, http-client
, http-types, lens, menshen, monad-logger, mtl, mwc-random
@@ -248521,8 +254472,8 @@ self: {
}:
mkDerivation {
pname = "yam";
- version = "0.6.1";
- sha256 = "1llgyx9giibm1yzgk61c47jnr0ppgj5q4sq0ml9bz99j5c16id70";
+ version = "0.6.3";
+ sha256 = "1mw4yylh8cmrm22cqpdkd64idklkwig8c4rbvrmpw5j5s0hdmdly";
libraryHaskellDepends = [
aeson base base16-bytestring binary bytestring data-default
exceptions fast-logger http-client http-types lens menshen
@@ -248542,7 +254493,6 @@ self: {
description = "A wrapper of servant";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"yam-app" = callPackage
@@ -248597,19 +254547,17 @@ self: {
];
description = "Yam DataSource Middleware";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
- "yam-datasource_0_6_1" = callPackage
+ "yam-datasource_0_6_3" = callPackage
({ mkDerivation, base, conduit, data-default, monad-logger
, persistent, resource-pool, resourcet, salak, servant-server, text
, unliftio-core, yam
}:
mkDerivation {
pname = "yam-datasource";
- version = "0.6.1";
- sha256 = "1k373bhh7pyb6i021a0akvsjfkpw7h3vw33a2ag57f97yalfwha4";
+ version = "0.6.3";
+ sha256 = "0zcwd32iz01b3m3xg1n3axvrljbkcld196pblc7cn0kb2n0w6ilp";
libraryHaskellDepends = [
base conduit data-default monad-logger persistent resource-pool
resourcet salak servant-server text unliftio-core yam
@@ -248617,7 +254565,6 @@ self: {
description = "Yam DataSource Middleware";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"yam-job" = callPackage
@@ -248653,8 +254600,8 @@ self: {
}:
mkDerivation {
pname = "yam-redis";
- version = "0.6.1";
- sha256 = "07qswsac1ygsfm97njry4ar1j9hb6ghkzmna7hw7f7a1y77x9m9p";
+ version = "0.6.3";
+ sha256 = "0xvv9azq8ihyxgz11089xkvxmisp6ajggldayj8bdg045m74lv9r";
libraryHaskellDepends = [
base bytestring data-default hedis menshen monad-logger mtl salak
servant-server text yam
@@ -248783,8 +254730,8 @@ self: {
}:
mkDerivation {
pname = "yaml";
- version = "0.11.0.0";
- sha256 = "1gr72lb3zan7g9pxqzxn3zxcbnrkc0vapm2dvp1mdlm4576ncr76";
+ version = "0.11.1.0";
+ sha256 = "1kd64j2ka246n8c0z30rckq75998ajaja6ylmpdc74pzn23iydq9";
configureFlags = [ "-fsystem-libyaml" ];
isLibrary = true;
isExecutable = true;
@@ -249009,6 +254956,8 @@ self: {
pname = "yampa-canvas";
version = "0.2.3";
sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r";
+ revision = "2";
+ editedCabalFile = "1zyb6z4q46f09lsnswk3z401p5nry65k5cp3jypbcwc8m122hgb1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
@@ -249339,8 +255288,6 @@ self: {
libraryHaskellDepends = [ base deriving-compat hedgehog yaya ];
description = "Hedgehog testing support for the Yaya recursion scheme library";
license = stdenv.lib.licenses.agpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"yaya-unsafe" = callPackage
@@ -249568,8 +255515,8 @@ self: {
}:
mkDerivation {
pname = "yesod-alerts";
- version = "0.1.2.0";
- sha256 = "0vqlkcb2q3wz6hp6ay6gj41vwlmq4x7flfbgq36ygnwwxjkwhllf";
+ version = "0.1.3.0";
+ sha256 = "1x7l1h4xziqg6fjjp5qnqdmbnrpiryzv37q322llnmsi1f89zvzv";
libraryHaskellDepends = [
alerts base blaze-html blaze-markup safe text yesod-core
];
@@ -249653,10 +255600,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth";
- version = "1.6.6";
- sha256 = "0ibmv3ghxrrjjjqb9jg4wnwr7w4hl4lsvwic13ys8fihg40ln6ka";
- revision = "1";
- editedCabalFile = "14l8v1znq9y628vc6vj7dlgbryjkhf09kk2l2f5spr697lygh3qp";
+ version = "1.6.7";
+ sha256 = "0p9c26ic45bmsjvfb7kam87ja2vbd4m7qm27znvfrn9wvijhjzp9";
libraryHaskellDepends = [
aeson authenticate base base16-bytestring base64-bytestring binary
blaze-builder blaze-html blaze-markup bytestring conduit
@@ -250391,8 +256336,8 @@ self: {
}:
mkDerivation {
pname = "yesod-elements";
- version = "1.1";
- sha256 = "0rxx3lxl55q0mxdzfixwy2d0cnzmfxx2zg24k6kdgghg0k77g3d3";
+ version = "1.1.1";
+ sha256 = "0i2qx53jl1hspfs2dv7n28hnwskqs1hy5h7q0kpazn70691k1b9b";
libraryHaskellDepends = [
base blaze-html blaze-markup bytestring text yesod-core
];
@@ -250479,8 +256424,6 @@ self: {
];
description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"yesod-fb" = callPackage
@@ -250532,8 +256475,8 @@ self: {
}:
mkDerivation {
pname = "yesod-form";
- version = "1.6.4";
- sha256 = "0iqcrbmwhgfk78qi2n1n3i39izqr7km4i8fa1zmvplqkcbyi149c";
+ version = "1.6.5";
+ sha256 = "007six9sky5qc979jiagannfd5163vijl7g6grf9rlwbqdc8x7dg";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder blaze-html blaze-markup
byteable bytestring containers data-default email-validate
@@ -250546,12 +256489,16 @@ self: {
}) {};
"yesod-form-bootstrap4" = callPackage
- ({ mkDerivation, base, text, yesod-core, yesod-form }:
+ ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text
+ , yesod-core, yesod-form
+ }:
mkDerivation {
pname = "yesod-form-bootstrap4";
- version = "2.1.0";
- sha256 = "1wf1jbhfs4f75977rnrrkahgysxqrcas4qi1ay1ggq29hp1z4hic";
- libraryHaskellDepends = [ base text yesod-core yesod-form ];
+ version = "2.1.2";
+ sha256 = "1rx18ik8y55697g9mjdfpgclkny4i9d996fm874ckdmq1qwzn84k";
+ libraryHaskellDepends = [
+ base blaze-html blaze-markup shakespeare text yesod-core yesod-form
+ ];
description = "renderBootstrap4";
license = stdenv.lib.licenses.mit;
}) {};
@@ -250770,8 +256717,8 @@ self: {
}:
mkDerivation {
pname = "yesod-markdown";
- version = "0.12.6.1";
- sha256 = "00f235w631rdw5kkrkb0xqvpw18k4faiv6sjzbbn5jzzi5asscyj";
+ version = "0.12.6.2";
+ sha256 = "0w9fmqk49b4c9g26dhrrmbwshrfcrnwcnsba97jyhb2m8bc4s1xj";
libraryHaskellDepends = [
base blaze-html blaze-markup bytestring directory pandoc persistent
shakespeare text xss-sanitize yesod-core yesod-form
@@ -250779,8 +256726,6 @@ self: {
testHaskellDepends = [ base blaze-html hspec text ];
description = "Tools for using markdown in a yesod application";
license = stdenv.lib.licenses.gpl2;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"yesod-media-simple" = callPackage
@@ -250869,8 +256814,6 @@ self: {
];
description = "A pagination approach for yesod";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"yesod-paypal-rest" = callPackage
@@ -251428,6 +257371,24 @@ self: {
broken = true;
}) {};
+ "yesod-static-remote" = callPackage
+ ({ mkDerivation, base, bytestring, directory, filepath, http-client
+ , http-client-tls, template-haskell, yesod-static
+ }:
+ mkDerivation {
+ pname = "yesod-static-remote";
+ version = "0.0.0.0";
+ sha256 = "03ry2712hg80w97p7k1r1gspzs3xyds28mapdl7axqzk9zpw1j75";
+ libraryHaskellDepends = [
+ base bytestring directory filepath http-client http-client-tls
+ template-haskell yesod-static
+ ];
+ testHaskellDepends = [ base yesod-static ];
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"yesod-table" = callPackage
({ mkDerivation, base, bytestring, containers, contravariant
, semigroups, text, yesod-core
@@ -251484,31 +257445,6 @@ self: {
}) {};
"yesod-test" = callPackage
- ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
- , bytestring, case-insensitive, conduit, containers, cookie, hspec
- , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
- , semigroups, text, time, transformers, unliftio, wai, wai-extra
- , xml-conduit, xml-types, yesod-core, yesod-form
- }:
- mkDerivation {
- pname = "yesod-test";
- version = "1.6.6";
- sha256 = "1h82njqkbr6h6saixkzim83srx794s6x6qrcmr0w82z5mfl2nfjf";
- libraryHaskellDepends = [
- attoparsec base blaze-builder blaze-html bytestring
- case-insensitive conduit containers cookie hspec-core html-conduit
- http-types HUnit network pretty-show semigroups text time
- transformers wai wai-extra xml-conduit xml-types yesod-core
- ];
- testHaskellDepends = [
- base bytestring containers cookie hspec html-conduit http-types
- HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form
- ];
- description = "integration testing for WAI/Yesod Applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-test_1_6_6_1" = callPackage
({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
, bytestring, case-insensitive, conduit, containers, cookie, hspec
, hspec-core, html-conduit, http-types, HUnit, network, pretty-show
@@ -251531,7 +257467,6 @@ self: {
];
description = "integration testing for WAI/Yesod Applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-test-json" = callPackage
@@ -251639,8 +257574,8 @@ self: {
}:
mkDerivation {
pname = "yesod-websockets";
- version = "0.3.0.1";
- sha256 = "1k41qglb5fdzykyfpml4w74cg2m95ggm2jrnqy7bkj2l0fm4gjc6";
+ version = "0.3.0.2";
+ sha256 = "1k206l84g25xml8yg4q7i62x5aydxq2hni2fk2cc36dlvl0rgih1";
libraryHaskellDepends = [
base conduit mtl transformers unliftio wai-websockets websockets
yesod-core
@@ -252588,6 +258523,8 @@ self: {
pname = "yx";
version = "0.0.2.0";
sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z";
+ revision = "1";
+ editedCabalFile = "19px5wf8ca7awam013ij62z04rsplgn7ks56j8jzhznarsg45ksq";
libraryHaskellDepends = [ array base bytestring ];
testHaskellDepends = [ array base bytestring hspec ];
description = "Row-major coordinates";
@@ -252651,6 +258588,8 @@ self: {
testHaskellDepends = [ base hspec QuickCheck ];
description = "Bindings for the Z3 Theorem Prover";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {gomp = null; inherit (pkgs) z3;};
"z3-encoding" = callPackage
@@ -252873,8 +258812,8 @@ self: {
({ mkDerivation, base, semigroups }:
mkDerivation {
pname = "zero";
- version = "0.1.4";
- sha256 = "1mfmc7na5q2lrlz168hwzdjpmaqdqqpdlsfyk44v9f3kjqnwdk9q";
+ version = "0.1.5";
+ sha256 = "1yb00wcgcyckzlf8kdxsdxpqra0r1sakwdph7pv9naa6q8zhhllw";
libraryHaskellDepends = [ base semigroups ];
description = "Semigroups with absorption";
license = stdenv.lib.licenses.bsd3;
@@ -253030,8 +258969,6 @@ self: {
];
description = "Bindings to ZeroMQ 4.x";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {inherit (pkgs) zeromq;};
"zeromq4-haskell_0_8_0" = callPackage
@@ -253094,8 +259031,6 @@ self: {
];
description = "More constrained extensions to zeromq4-haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"zeroth" = callPackage
@@ -253460,6 +259395,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "zippers_0_3" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest
+ , fail, lens, profunctors, semigroupoids, semigroups
+ }:
+ mkDerivation {
+ pname = "zippers";
+ version = "0.3";
+ sha256 = "0hrsgk8sh9g3438kl79131s6vjydhivgya04yxv3h70m7pky1dpm";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base fail lens profunctors semigroupoids semigroups
+ ];
+ testHaskellDepends = [ base doctest ];
+ benchmarkHaskellDepends = [ base criterion lens ];
+ description = "Traversal based zippers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"zippo" = callPackage
({ mkDerivation, base, mtl, yall }:
mkDerivation {
@@ -253861,8 +259815,8 @@ self: {
}:
mkDerivation {
pname = "zstd";
- version = "0.1.0.0";
- sha256 = "1zsb8wgmd23gdzk26wf0i0q4n23qd5lagq6min7wz1yrk43q8x88";
+ version = "0.1.1.2";
+ sha256 = "147s496zvw13akxqzg65mgfvk3bvhrcilxgf8n786prxg5cm4jz2";
libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
testHaskellDepends = [
base bytestring QuickCheck test-framework
@@ -253873,8 +259827,6 @@ self: {
];
description = "Haskell bindings to the Zstandard compression algorithm";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"zsyntax" = callPackage
@@ -253932,8 +259884,6 @@ self: {
];
description = "Creating and extracting arbitrary archives";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"zuramaru" = callPackage
@@ -253985,8 +259935,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "Password strength estimation";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
}
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 41ce20373d62f3f4ec4c0984c5fc79ce2dc4308c..35f56a12560a85fd766a52ebb6ec5a6bd6b64b9e 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -161,6 +161,7 @@ rec {
disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; });
+ unmarkBroken = drv: overrideCabal drv (drv: { broken = false; });
markBrokenVersion = version: drv: assert drv.version == version; markBroken drv;
enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; });
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 6b5ecc1df8afcad9abd8d9bc10ff7e7e1808e48a..a4c040673487e1a53b41e55a9f9e5a84d970c057 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -118,9 +118,10 @@ let
inherit packages;
};
+ # Use cabal2nix to create a default.nix for the package sources found at 'src'.
haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }:
let
- sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
+ sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"'';
in pkgs.buildPackages.stdenv.mkDerivation {
name = "cabal2nix-${name}";
nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ];
@@ -174,13 +175,19 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
inherit (haskellLib) packageSourceOverrides;
+ # callHackage :: Text -> Text -> AttrSet -> HaskellPackage
+ #
+ # e.g., while overriding a package set:
+ # '... foo = self.callHackage "foo" "1.5.3" {}; ...'
callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version);
+ # callHackageDirect :: Text -> Text -> AttrSet -> HaskellPackage
+ #
# This function does not depend on all-cabal-hashes and therefore will work
# for any version that has been released on hackage as opposed to only
# versions released before whatever version of all-cabal-hashes you happen
# to be currently using.
- callHackageDirect = {pkg, ver, sha256}@args:
+ callHackageDirect = {pkg, ver, sha256}:
let pkgver = "${pkg}-${ver}";
in self.callCabal2nix pkg (pkgs.fetchzip {
url = "mirror://hackage/${pkgver}/${pkgver}.tar.gz";
diff --git a/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch b/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch
deleted file mode 100644
index 712bd53092f9b7534450aecb6c1f611084d4311b..0000000000000000000000000000000000000000
--- a/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/Setup.hs b/Setup.hs
-index ddf5a02..7ad1f26 100644
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -1,4 +1,4 @@
--
-+{-# LANGUAGE CPP #-}
- import Control.Monad (when)
- import Language.Haskell.TH
- import Distribution.Simple (defaultMainWithHooks, simpleUserHooks, UserHooks(postConf), Args)
-@@ -6,14 +6,25 @@ import Distribution.Simple.Utils (cabalVersion)
- import Distribution.Simple.LocalBuildInfo
- import Distribution.Simple.Setup (ConfigFlags)
- import Distribution.Version (Version(..))
-+#if MIN_VERSION_Cabal(1,25,0)
-+import Distribution.Version (mkVersion)
-+#endif
- import Distribution.PackageDescription (PackageDescription)
- import Debug.Trace
-
-+#if MIN_VERSION_Cabal(1,25,0)
-+versionBranch :: Version -> Version
-+versionBranch = id
-+#else
-+mkVersion :: [Int] -> Version
-+mkVersion vs = Version vs []
-+#endif
-+
- -- I couldn't figure out a way to do this check from the cabal file, so we drop down
- -- here to do it instead:
- checkGoodVersion :: IO ()
- checkGoodVersion =
-- if cabalVersion >= Version [1,17,0] []
-+ if cabalVersion >= mkVersion [1,17,0]
- then putStrLn (" [Setup.hs] This version of Cabal is ok for profiling: "++show cabalVersion)
- else error (" [Setup.hs] This package should not be used in profiling mode with cabal version "++
- show (versionBranch cabalVersion)++" < 1.17.0\n"++
diff --git a/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
deleted file mode 100644
index e72bb793da735ffb4ebe991e7659ae02a4b5510f..0000000000000000000000000000000000000000
--- a/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs
---- graphviz.old/Data/GraphViz/Algorithms.hs 2015-05-18 15:21:38.379771357 +0300
-+++ graphviz/Data/GraphViz/Algorithms.hs 2015-05-18 15:01:01.940122684 +0300
-@@ -38,6 +38,7 @@
- import Data.GraphViz.Types.Canonical
- import Data.GraphViz.Types.Internal.Common
-
-+import Prelude hiding (traverse)
- import Control.Arrow (first, second, (***))
- import Control.Monad (unless)
- import Control.Monad.Trans.State
diff --git a/pkgs/development/haskell-modules/patches/hie-testsuite.patch b/pkgs/development/haskell-modules/patches/hie-testsuite.patch
deleted file mode 100644
index 86cac15c2464ff4ab513bd2f6e863592dd3fd259..0000000000000000000000000000000000000000
--- a/pkgs/development/haskell-modules/patches/hie-testsuite.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/test/HaRePluginSpec.hs b/test/HaRePluginSpec.hs
-index 039c094..d0d1fa4 100644
---- a/test/HaRePluginSpec.hs
-+++ b/test/HaRePluginSpec.hs
-@@ -326,35 +326,6 @@ hareSpec = do
- $ List [TextEdit (Range (Position 4 0) (Position 8 12))
- "parseStr = char '\"' *> (many1 (noneOf \"\\\"\")) <* char '\"'"])
- Nothing)
-- it "finds definition across components" $ do
-- let u = filePathToUri "./app/Main.hs"
-- let lreq = setTypecheckedModule u
-- let req = findDef u (toPos (7,8))
-- r <- dispatchRequestPGoto $ lreq >> req
-- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib.hs")
-- (Range (toPos (6,1)) (toPos (6,9)))]
-- let req2 = findDef u (toPos (7,20))
-- r2 <- dispatchRequestPGoto $ lreq >> req2
-- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs")
-- (Range (toPos (5,1)) (toPos (5,2)))]
-- it "finds definition in the same component" $ do
-- let u = filePathToUri "./src/Lib2.hs"
-- let lreq = setTypecheckedModule u
-- let req = findDef u (toPos (6,5))
-- r <- dispatchRequestPGoto $ lreq >> req
-- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib.hs")
-- (Range (toPos (6,1)) (toPos (6,9)))]
-- it "finds local definitions" $ do
-- let u = filePathToUri "./src/Lib2.hs"
-- let lreq = setTypecheckedModule u
-- let req = findDef u (toPos (7,11))
-- r <- dispatchRequestPGoto $ lreq >> req
-- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs")
-- (Range (toPos (10,9)) (toPos (10,10)))]
-- let req2 = findDef u (toPos (10,13))
-- r2 <- dispatchRequestPGoto $ lreq >> req2
-- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd "test/testdata/gototest/src/Lib2.hs")
-- (Range (toPos (9,9)) (toPos (9,10)))]
-
-
- -- ---------------------------------
diff --git a/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch b/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch
deleted file mode 100644
index 1e9ac5aa66a432a817d417d95a2236d7f825455b..0000000000000000000000000000000000000000
--- a/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal
-index 0e8923a..bfbbec4 100644
---- a/insert-ordered-containers.cabal
-+++ b/insert-ordered-containers.cabal
-@@ -21,8 +21,8 @@ tested-with:
- GHC==7.10.3,
- GHC==8.0.1,
- GHC==8.2.2,
-- GHC==8.4.3,
-- GHC==8.6.1
-+ GHC==8.4.4,
-+ GHC==8.6.3
-
- extra-source-files:
- CHANGELOG.md
-@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests
- , unordered-containers
- , base
- , insert-ordered-containers
-- , tasty >= 0.10.1.2 && <1.2
-+ , tasty >= 0.10.1.2 && <1.3
- , tasty-quickcheck >= 0.8.3.2 && <0.11
- , QuickCheck >=2.7.6 && <2.13
- default-language: Haskell2010
-
diff --git a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch b/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch
deleted file mode 100644
index 9b7b7cfb8f966913efd5add83eda898fa507e841..0000000000000000000000000000000000000000
--- a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-index 60e134c..246d8ca 100644
---- lambdabot-core/src/Lambdabot/Config.hs
-+++ lambdabot-core/src/Lambdabot/Config.hs
-@@ -29,9 +29,9 @@ import Data.Typeable
- import Data.Generics (everywhere, mkT)
- import Language.Haskell.TH
-
--data Config t where Config :: (Typeable1 k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t
-+data Config t where Config :: (Typeable k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t
-
--cast1 :: (Typeable1 f, Typeable1 g) => f a -> Maybe (g a)
-+cast1 :: (Typeable f, Typeable g) => f a -> Maybe (g a)
- cast1 = fmap runIdentity . gcast1 . Identity
-
- instance GEq Config where
diff --git a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch
deleted file mode 100644
index 3917c2f0afd72187337cc74033ae40fffe3da636..0000000000000000000000000000000000000000
--- a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001
-From: Michiel Derhaeg
-Date: Tue, 20 Mar 2018 22:06:18 +0100
-Subject: [PATCH] update to work with GHC 8.4.1
-
----
- XMonad/Hooks/FadeWindows.hs | 6 +++++-
- XMonad/Hooks/WallpaperSetter.hs | 6 +++++-
- XMonad/Layout/Mosaic.hs | 6 +++++-
- xmonad-contrib.cabal | 5 +++--
- 5 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs
-index 4b8e62b6..01d06792 100644
---- a/XMonad/Hooks/FadeWindows.hs
-+++ b/XMonad/Hooks/FadeWindows.hs
-@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask
- ,asks)
- import Control.Monad.State (gets)
- import qualified Data.Map as M
--import Data.Monoid
-+import Data.Monoid hiding ((<>))
-+import Data.Semigroup
-
- import Graphics.X11.Xlib.Extras (Event(..))
-
-@@ -134,6 +135,9 @@ instance Monoid Opacity where
- r `mappend` OEmpty = r
- _ `mappend` r = r
-
-+instance Semigroup Opacity where
-+ (<>) = mappend
-+
- -- | A FadeHook is similar to a ManageHook, but records window opacity.
- type FadeHook = Query Opacity
-
-diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs
-index 00a3b1c3..d4f5ccb2 100644
---- a/XMonad/Hooks/WallpaperSetter.hs
-+++ b/XMonad/Hooks/WallpaperSetter.hs
-@@ -41,7 +41,8 @@ import Data.Ord (comparing)
- import Control.Monad
- import Control.Applicative
- import Data.Maybe
--import Data.Monoid
-+import Data.Monoid hiding ((<>))
-+import Data.Semigroup
-
- -- $usage
- -- This module requires imagemagick and feh to be installed, as these are utilized
-@@ -86,6 +87,9 @@ instance Monoid WallpaperList where
- mappend (WallpaperList w1) (WallpaperList w2) =
- WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1)
-
-+instance Semigroup WallpaperList where
-+ (<>) = mappend
-+
- -- | Complete wallpaper configuration passed to the hook
- data WallpaperConf = WallpaperConf {
- wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/)
-diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs
-index 05655d4c..da44fc50 100644
---- a/XMonad/Layout/Mosaic.hs
-+++ b/XMonad/Layout/Mosaic.hs
-@@ -38,7 +38,8 @@ import Control.Monad(mplus)
- import Data.Foldable(Foldable,foldMap, sum)
- import Data.Function(on)
- import Data.List(sortBy)
--import Data.Monoid(Monoid,mempty, mappend)
-+import Data.Monoid(Monoid,mempty, mappend, (<>))
-+import Data.Semigroup
-
-
- -- $usage
-@@ -202,6 +203,9 @@ instance Monoid (Tree a) where
- mappend x Empty = x
- mappend x y = Branch x y
-
-+instance Semigroup (Tree a) where
-+ (<>) = mappend
-+
- makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a
- makeTree _ [] = Empty
- makeTree _ [x] = Leaf x
-diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
-index dde3ccda..c401c6e6 100644
---- a/xmonad-contrib.cabal
-+++ b/xmonad-contrib.cabal
-@@ -36,7 +36,7 @@ cabal-version: >= 1.6
- build-type: Simple
- bug-reports: https://github.com/xmonad/xmonad-contrib/issues
-
--tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1
-+tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1
-
- source-repository head
- type: git
-@@ -66,7 +66,8 @@ library
- unix,
- X11>=1.6.1 && < 1.9,
- xmonad>=0.13 && < 0.14,
-- utf8-string
-+ utf8-string,
-+ semigroups
-
- if flag(use_xft)
- build-depends: X11-xft >= 0.2
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index 8aa413b51c315cc57f6d30b945ee629d821b8092..650d843be84316319a8fd1faae86fa84ad937733 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -4,15 +4,15 @@
}:
build-idris-package {
name = "tparsec";
- version = "2018-12-21";
+ version = "2019-06-18";
ipkgName = "TParsec";
src = fetchFromGitHub {
owner = "gallais";
repo = "idris-tparsec";
- rev = "6fafcaa894def6f2af86bc799e507013b56e7741";
- sha256 = "0alnw0hqjs200gvb5f58lb16rna48j1v6wnvq4q7zbw99dcxsxwn";
+ rev = "3809afd8735b0054e5db788f18a7fa8ed71d8278";
+ sha256 = "0wmgg1zg9p8gqlfvcsnww17jsifx9987cxqdq6kbdgasn26w2rqx";
};
meta = {
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index cc88b32119e75c020422e295940a1bd04b054055..a88d07d1655fa175be67a8572d273ec9cac3f834 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -4,15 +4,15 @@
let hashes = {
"8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
- "8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd";
+ "8.2" = "1x33kv6w9cbqzvyrihn61pzmqlvnk3drm8ksd5v0arg38i95awi3";
};
revs = {
"8.0" = "8.0";
- "8.1" = "8.1";
+ "8.2" = "8.2";
};
in stdenv.mkDerivation rec {
name = "acl2-${version}";
- version = "8.1";
+ version = "8.2";
src = fetchFromGitHub {
owner = "acl2-devel";
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 4fe1e1820954cf7edcef126c0e67800290e7181d..8df64de3acb680e11e853d7e7bbd35a0cf317f52 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }:
+{ stdenv, fetchurl, jdk11, rlwrap, makeWrapper }:
stdenv.mkDerivation rec {
- name = "clojure-${version}";
- version = "1.10.0.442";
+ pname = "clojure";
+ version = "1.10.1.462";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
- sha256 = "147pkid3pvw60gq8vansid3x6wwfy9pqdbla3wfd5qaxqbcrhclw";
+ sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6";
};
buildInputs = [ makeWrapper ];
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "prefix" ];
installPhase = let
- binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
+ binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
in ''
mkdir -p $prefix/libexec
cp clojure-tools-${version}.jar $prefix/libexec
- cp {,example-}deps.edn $prefix
+ cp example-deps.edn $prefix
substituteInPlace clojure --replace PREFIX $prefix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
offers a software transactional memory system and reactive Agent
system that ensure clean, correct, multithreaded designs.
'';
- maintainers = with maintainers; [ the-kenny ];
+ maintainers = with maintainers; [ jlesquembre ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index bc2d0e5be5a8c85f2612d0dd0fe09c88018df19a..16f3e7f73e205f13c214bd1964b26a39c83f7b9c 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -119,7 +119,6 @@ let # packageJSON=./package.json;
cljdeps = import ./deps.nix { inherit pkgs; };
- cljpaths = cljdeps.makePaths {};
classp = cljdeps.makeClasspaths {
extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"];
};
diff --git a/pkgs/development/interpreters/elixir/1.4.nix b/pkgs/development/interpreters/elixir/1.4.nix
deleted file mode 100644
index 9ddd9062acd9d86918153381fa1e464f648d9a0b..0000000000000000000000000000000000000000
--- a/pkgs/development/interpreters/elixir/1.4.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation rec {
- version = "1.4.5";
- sha256 = "18ivcxmh5bak13k3rjy7jjzin57rgb2nffhwnqb2wl7bpi8mrarw";
- minimumOTPVersion = "18";
-}
diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix
index 40136fd22de85a6b86336601b74518b373e6ba9e..e240e1907e06133de3f64688d12289b2e2381415 100644
--- a/pkgs/development/interpreters/elixir/1.8.nix
+++ b/pkgs/development/interpreters/elixir/1.8.nix
@@ -1,7 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
- version = "1.8.1";
- sha256 = "1npnrkn21kqqfqrsn06mr78jxs6n5l8c935jpxvnmj7iysp50pf9";
+ version = "1.8.2";
+ sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq";
minimumOTPVersion = "20";
}
diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix
new file mode 100644
index 0000000000000000000000000000000000000000..622f2343c6e14dcd2c1a37fa35445afd45c1a390
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.9.nix
@@ -0,0 +1,7 @@
+{ mkDerivation }:
+
+mkDerivation rec {
+ version = "1.9.0";
+ sha256 = "0yfqh07wjgm10v6acn5pw8l8jndjly5kpzgw4harlj81wcaymlsw";
+ minimumOTPVersion = "20";
+}
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 844d6eeb4fb9d6fdb839bd45bf4a510ea7929040..b7e98af21097f2ae953ada223e72d98a403bd99c 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -22,10 +22,8 @@ in
buildInputs = [ erlang rebar makeWrapper ];
- LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
- "${pkgs.glibcLocales}/lib/locale/locale-archive";
- LANG = "en_US.UTF-8";
- LC_TYPE = "en_US.UTF-8";
+ LANG = "C.UTF-8";
+ LC_TYPE = "C.UTF-8";
setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix
index 714924514edb7ea94ca4f001f08fe07ee553f762..c263551de2dae5ad1bb7da54e164a207a9ddf659 100644
--- a/pkgs/development/interpreters/erlang/R16B02-basho.nix
+++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix
@@ -27,7 +27,7 @@ mkDerivation rec {
installTargets = "install";
postInstall = let
manpages = pkgs.fetchurl {
- url = "http://www.erlang.org/download/otp_doc_man_R16B02.tar.gz";
+ url = "https://www.erlang.org/download/otp_doc_man_R16B02.tar.gz";
sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p";
};
in ''
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix
index 28166dfc0b0a4951793a78706a1e699e8a5882f7..60eb6c8a6a5ef52e2a97a105f5ddfaa5d15c2965 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,8 +1,8 @@
{ mkDerivation }:
mkDerivation rec {
- version = "21.2.3";
- sha256 = "1v47c7bddbp31y6f8yzdjyvgcx9sskxql33k7cs0p5fmr05hhxws";
+ version = "21.3.8.3";
+ sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw";
prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1af047f43bd77ff0932ef792e5b7a3ea7e2bd85d
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R22.nix
@@ -0,0 +1,11 @@
+{ mkDerivation }:
+
+mkDerivation rec {
+ version = "22.0.4";
+ sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai";
+
+ prePatch = ''
+ substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' '10.10'
+ substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' ""
+ '';
+}
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index bc0b728ecce4b0c6be4b83d2b12892b444a9b7e3..a795741869fc0da0724334e864c362eea9cffb92 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -1,5 +1,5 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
-, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook
+, libxml2, libxslt, ncurses, openssl, perl, autoconf
, openjdk ? null # javacSupport
, unixODBC ? null # odbcSupport
, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
@@ -48,7 +48,7 @@ in stdenv.mkDerivation ({
inherit src version;
- nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ];
+ nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ];
buildInputs = [ ncurses openssl ]
++ optionals wxSupport wxPackages2
@@ -108,8 +108,8 @@ in stdenv.mkDerivation ({
setupHook = ./setup-hook.sh;
meta = with stdenv.lib; ({
- homepage = http://www.erlang.org/;
- downloadPage = "http://www.erlang.org/download.html";
+ homepage = https://www.erlang.org/;
+ downloadPage = "https://www.erlang.org/download.html";
description = "Programming language used for massively scalable soft real-time systems";
longDescription = ''
diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
index 5481c4e7d05af636a9f0d794366aa7cadc4a5a8a..a0d20b7ebe4fc752e57eabaef0ea878b5f40a383 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gauche-${version}";
- version = "0.9.7";
+ version = "0.9.8";
src = fetchurl {
url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
- sha256 = "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd";
+ sha256 = "0jxp1ladpy8kvfvk561c64spf1c3d6giqla6zscqkd6qa480vcry";
};
nativeBuildInputs = [ pkgconfig texinfo ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"--with-iconv=${libiconv}"
"--with-dbm=gdbm"
"--with-zlib=${zlib}"
- "--with-ca-bundle=$SSL_CERT_FILE"
+ "--with-ca-bundle=$NIX_SSL_CERT_FILE"
# TODO: Enable slib
# Current slib in nixpkgs is specialized to Guile
# "--with-slib=${slibGuile}/lib/slib"
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index dc04e72c7411ca9310f66a85b01e4dac9859ee26..efbd72dcefa869ce51a5f46acc6600c2ebbc2327 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
- version = "2.5.6";
+ version = "2.5.7";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
- sha256 = "14lfxnc03hmakwagvl3sb6c0b298v3awcdr1gafwnmsqv03hhkdn";
+ sha256 = "1q69xg7p790dfk09wyijpx8y85n8g9lfd0fikl6qr73k9zz5v41x";
};
buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 17ca1d1dcd95a52190868f02dbfbe648980fa2f7..24266d59676506d34379b7de0941b9a0ff75bad5 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -46,7 +46,14 @@
})
./riscv.patch
] ++
- (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
+ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
+ ++ stdenv.lib.optionals stdenv.isDarwin [
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
+ sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
+ })
+ ./filter-mkostemp-darwin.patch
+ ];
# Explicitly link against libgcc_s, to work around the infamous
# "libgcc_s.so.1 must be installed for pthread_cancel to work".
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 5e458c6e2cccce0081438b49d604abd618991216..fce94ecc846f45769fadbd2063853dccdfa65082 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -2,6 +2,7 @@
, fetchurl, makeWrapper, gawk, pkgconfig
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
+, fetchpatch
}:
# Do either a coverage analysis build or a standard build.
@@ -11,11 +12,11 @@
(rec {
name = "guile-${version}";
- version = "2.2.3";
+ version = "2.2.6";
src = fetchurl {
url = "mirror://gnu/guile/${name}.tar.xz";
- sha256 = "11j01agvnci2cx32wwpqs9078856yxmvs15gcsz7ganpkj2ahlw3";
+ sha256 = "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk";
};
outputs = [ "out" "dev" "info" ];
@@ -41,9 +42,11 @@
patches = [
./eai_system.patch
- ./riscv.patch
- ] ++
- (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
+ ] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
+ ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
+ sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
+ });
# Explicitly link against libgcc_s, to work around the infamous
# "libgcc_s.so.1 must be installed for pthread_cancel to work".
diff --git a/pkgs/development/interpreters/guile/filter-mkostemp-darwin.patch b/pkgs/development/interpreters/guile/filter-mkostemp-darwin.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8b9b853fb00dbb31ea59f55af7e5299ac96fc271
--- /dev/null
+++ b/pkgs/development/interpreters/guile/filter-mkostemp-darwin.patch
@@ -0,0 +1,28 @@
+Filter incompat. mkostemp(3) flags on macOS 10.12
+
+macOS Sierra introduces a mkostemp(3) function which is used when
+present. Contrary to the GNUlib version of mkostemp(3) that was used
+previously, this version fails with 'invalid argument' when flags other
+than from a specified set are passed. From mktemp(3):
+
+| The mkostemp() function is like mkstemp() but allows specifying
+| additional open(2) flags (defined in ). The permitted flags
+| are O_APPEND, O_SHLOCK, O_EXLOCK and O_CLOEXEC.
+
+Signed-off-by: Clemens Lang
+Upstream-Status: Submitted [https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23]
+--- a/libguile/filesys.c.orig 2017-01-09 00:53:27.000000000 +0100
++++ b/libguile/filesys.c 2017-01-09 00:54:48.000000000 +0100
+@@ -1486,6 +1486,12 @@
+ mode_bits = scm_i_mode_bits (mode);
+ }
+
++#ifdef __APPLE__
++ /* macOS starting with 10.12 defines mkostemp(2) which is used if defined,
++ * but only accepts some flags according to its manpage. It fails with
++ * invalid argument when other flags are passed. */
++ open_flags &= O_APPEND | O_SHLOCK | O_EXLOCK | O_CLOEXEC;
++#endif
+ SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
+ if (rv == -1)
+ SCM_SYSERROR;
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index 12631cee38ae5768c060289df25620d3e06396de..a6acd603c8154b030353c0dcadad302762fa3d05 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -1,23 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "hy-${version}";
- version = "0.16.0";
+ pname = "hy";
+ version = "0.17.0";
- src = fetchurl {
- url = "mirror://pypi/h/hy/${name}.tar.gz";
- sha256 = "00lq38ppikrpyw38fn5iy9iwrsamsv22507cp146dsjbzkwjpzrd";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "1gdbqsirsdxj320wnp7my5awzs1kfs6m4fqmkzbd1zd47qzj0zfi";
};
- patches = [
- (fetchpatch {
- name = "bytecode-error-handling.patch";
- url = "https://github.com/hylang/hy/commit/57326785b97b7b0a89f6258fe3d04dccdc06cfc0.patch";
- sha256 = "1lxxs7mxbh0kaaa25b1pbqs9d8asyjnlf2n86qg8hzsv32jfcq92";
- excludes = [ "AUTHORS" "NEWS.rst" ];
- })
- ];
-
propagatedBuildInputs = with pythonPackages; [
appdirs
astor
@@ -27,11 +18,11 @@ pythonPackages.buildPythonApplication rec {
rply
];
- meta = {
+ meta = with stdenv.lib; {
description = "A LISP dialect embedded in Python";
- homepage = http://hylang.org/;
- license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.nixy ];
- platforms = stdenv.lib.platforms.all;
+ homepage = "http://hylang.org/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ nixy ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index 22ccdec8a107ec7f108a1b5aee25d3a0758863e8..546b2123826d09c835aefcb2e2ce19f44cea30cf 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, meson, ninja }:
stdenv.mkDerivation rec {
pname = "janet";
- version = "0.4.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "janet-lang";
- repo = "janet";
+ repo = pname;
rev = "v${version}";
- sha256 = "06iq2y7c9i4pcmmgc8x2fklqkj2i3jrvmq694djiiyd4x81kzcj5";
+ sha256 = "1n91xsq9c3x99pb3a964873kksavs223hhy62l8yiylbl81b8vix";
};
- JANET_BUILD=''\"release\"'';
- PREFIX = placeholder "out";
+ nativeBuildInputs = [ meson ninja ];
+ mesonFlags = ["-Dgit_hash=release"];
doCheck = true;
meta = with stdenv.lib; {
description = "Janet programming language";
homepage = https://janet-lang.org/;
- license = stdenv.lib.licenses.mit;
+ license = licenses.mit;
platforms = platforms.all;
- maintainers = with stdenv.lib.maintainers; [ andrewchambers ];
+ maintainers = with maintainers; [ andrewchambers ];
};
}
diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index 3d82535d29aa933ca98035be88c15a59cd5293a7..f822fdd9c8f0bd1c5189740e5e971ee5dcd610bb 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
- unpackPhase = ":";
+ dontUnpack = true;
installPhase = ''
mkdir -pv $out/bin
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index bc41d86256b203583990c63c4e86b2872ba5b504..74ccb91030aa1f068da4b72c66dca2b0690773f9 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -1,7 +1,6 @@
# Generic builder for lua packages
{ lib
, lua
-, stdenv
, wrapLua
# Whether the derivation provides a lua module or not.
, toLuaModule
@@ -13,7 +12,9 @@ name ? "${attrs.pname}-${attrs.version}"
, version
# by default prefix `name` e.g. "lua5.2-${name}"
-, namePrefix ? "lua" + lua.luaversion + "-"
+, namePrefix ? if lua.pkgs.isLuaJIT
+ then lua.name + "-"
+ else "lua" + lua.luaversion + "-"
# Dependencies for building the package
, buildInputs ? []
@@ -28,12 +29,13 @@ name ? "${attrs.pname}-${attrs.version}"
, propagatedNativeBuildInputs ? []
# used to disable derivation, useful for specific lua versions
+# TODO move from this setting meta.broken to a 'disabled' attribute on the
+# package, then use that to skip/include in each lua${ver}Packages set?
, disabled ? false
# Additional arguments to pass to the makeWrapper function, which wraps
# generated binaries.
, makeWrapperArgs ? []
-, external_deps ? propagatedBuildInputs ++ buildInputs
# Skip wrapping of lua programs altogether
, dontWrapLuaPrograms ? false
@@ -43,11 +45,19 @@ name ? "${attrs.pname}-${attrs.version}"
, passthru ? {}
, doCheck ? false
-# appended to the luarocks generated config
-# in peculiar variables like { EVENT_INCDIR } can be useful to work around
-# luarocks limitations, ie, luarocks consider include/lib folders to be subfolders of the same package in external_deps_dirs
-# as explained in https://github.com/luarocks/luarocks/issues/766
+# Non-Lua / system (e.g. C library) dependencies. Is a list of deps, where
+# each dep is either a derivation, or an attribute set like
+# { name = "rockspec external_dependencies key"; dep = derivation; }
+# The latter is used to work-around luarocks having a problem with
+# multiple-output derivations as external deps:
+# https://github.com/luarocks/luarocks/issues/766
+, externalDeps ? lib.unique (lib.filter (drv: !drv ? luaModule) (propagatedBuildInputs ++ buildInputs))
+
+# Appended to the generated luarocks config
, extraConfig ? ""
+# Inserted into the generated luarocks config in the "variables" table
+, extraVariables ? ""
+# The two above arguments have access to builder variables -- e.g. to $out
# relative to srcRoot, path to the rockspec to use when using rocks
, rockspecFilename ? "../*.rockspec"
@@ -59,44 +69,95 @@ name ? "${attrs.pname}-${attrs.version}"
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
-if disabled
-then throw "${name} not supported for interpreter ${lua}"
-else
let
-
- deps_dirs= lib.concatStringsSep ", " (
- map (x: "\"${builtins.toString x}\"") external_deps
- );
-
- # TODO
- # - add rocktrees (look at torch-distro.nix/https://github.com/luarocks/luarocks/wiki/Config-file-format)
- # - silence warnings
- luarocks_config = "luarocksConfig";
+ # TODO fix warnings "Couldn't load rockspec for ..." during manifest
+ # construction -- from initial investigation, appears it will require
+ # upstream luarocks changes to fix cleanly (during manifest construction,
+ # luarocks only looks for rockspecs in the default/system tree instead of all
+ # configured trees)
+ luarocks_config = "luarocks-config.lua";
luarocks_content = ''
local_cache = ""
- -- array of strings
+ -- To prevent collisions when creating environments, we install the rock
+ -- files into per-package subdirectories
+ rocks_subdir = '${rocksSubdir}'
+ -- Then we need to tell luarocks where to find the rock files per
+ -- dependency
+ rocks_trees = {
+ ${lib.concatStringsSep "\n, " rocksTrees}
+ }
+ '' + lib.optionalString lua.pkgs.isLuaJIT ''
+ -- Luajit provides some additional functionality built-in; this exposes
+ -- that to luarock's dependency system
+ rocks_provided = {
+ jit='${lua.luaversion}-1';
+ ffi='${lua.luaversion}-1';
+ luaffi='${lua.luaversion}-1';
+ bit='${lua.luaversion}-1';
+ }
+ '' + ''
+ -- For single-output external dependencies
external_deps_dirs = {
- ${deps_dirs}
+ ${lib.concatStringsSep "\n, " externalDepsDirs}
}
- rocks_trees = {
+ variables = {
+ -- Some needed machinery to handle multiple-output external dependencies,
+ -- as per https://github.com/luarocks/luarocks/issues/766
+ ${lib.optionalString (lib.length depVariables > 0) ''
+ ${lib.concatStringsSep "\n " depVariables}''}
+ ${extraVariables}
}
${extraConfig}
'';
+
+ rocksSubdir = "${attrs.pname}-${version}-rocks";
+
+ externalDepsDirs = map
+ (x: "'${builtins.toString x}'")
+ (lib.filter (lib.isDerivation) externalDeps);
+
+ rocksTrees = lib.imap0
+ (i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }")
+ requiredLuaRocks;
+
+ # Filter out the lua derivation itself from the Lua module dependency
+ # closure, as it doesn't have a rock tree :)
+ requiredLuaRocks = lib.filter (d: d ? luaModule)
+ (lua.pkgs.requiredLuaModules propagatedBuildInputs);
+
+ # Explicitly point luarocks to the relevant locations for multiple-output
+ # derivations that are external dependencies, to work around an issue it has
+ # (https://github.com/luarocks/luarocks/issues/766)
+ depVariables = lib.concatMap ({name, dep}: [
+ "${name}_INCDIR='${lib.getDev dep}/include';"
+ "${name}_LIBDIR='${lib.getLib dep}/lib';"
+ "${name}_BINDIR='${lib.getBin dep}/bin';"
+ ]) externalDeps';
+
+ # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
+ externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
in
toLuaModule ( lua.stdenv.mkDerivation (
-builtins.removeAttrs attrs ["disabled" "checkInputs"] // {
+builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // {
name = namePrefix + name;
buildInputs = [ wrapLua lua.pkgs.luarocks ]
++ buildInputs
++ lib.optionals doCheck checkInputs
+ ++ (map (d: d.dep) externalDeps')
;
# propagate lua to active setup-hook in nix-shell
propagatedBuildInputs = propagatedBuildInputs ++ [ lua ];
- doCheck = false;
+ inherit doCheck;
+
+ # @-patterns do not capture formal argument default values, so we need to
+ # explicitly inherit this for it to be available as a shell variable in the
+ # builder
+ inherit rockspecFilename;
+ inherit rocksSubdir;
# enabled only for src.rock
setSourceRoot= let
@@ -163,23 +224,20 @@ builtins.removeAttrs attrs ["disabled" "checkInputs"] // {
nix_debug "ROCKSPEC $rockspecFilename"
nix_debug "cwd: $PWD"
- $LUAROCKS make --deps-mode=none --tree $out ''${rockspecFilename}
-
- # to prevent collisions when creating environments
- # also added -f as it doesn't always exist
- # don't remove the whole directory as
- rm -rf $out/lib/luarocks/rocks-${lua.luaversion}/manifest
+ $LUAROCKS make --deps-mode=all --tree=$out ''${rockspecFilename}
runHook postInstall
'';
passthru = {
inherit lua; # The lua interpreter
+ inherit externalDeps;
} // passthru;
meta = with lib.maintainers; {
platforms = lua.meta.platforms;
# add extra maintainer(s) to every package
maintainers = (meta.maintainers or []) ++ [ ];
+ broken = disabled;
} // meta;
}))
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index fb709227180f8821dbb496d19b994e62cacc1622..08645dfb77f3cdefb091e3ce6ca4d9e2af12528b 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -59,7 +59,7 @@ in rec {
luajit_2_1 = import ../luajit/2.1.nix {
self = luajit_2_1;
- inherit callPackage lib;
+ inherit callPackage;
};
}
diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix
index 7f584c0f0aff6de70175e4028f8d0de05b2c065b..14bd4a416468aa05ae7db21a8fcd7def91d92460 100644
--- a/pkgs/development/interpreters/lua-5/wrapper.nix
+++ b/pkgs/development/interpreters/lua-5/wrapper.nix
@@ -3,7 +3,6 @@
, extraOutputsToInstall ? []
, postBuild ? ""
, ignoreCollisions ? false
-, lib
, requiredLuaModules
, makeWrapperArgs ? []
}:
diff --git a/pkgs/development/interpreters/lua-5/zip.nix b/pkgs/development/interpreters/lua-5/zip.nix
deleted file mode 100644
index 295f41aaa2b83d3aeb49944f05d9ffabb41d6edb..0000000000000000000000000000000000000000
--- a/pkgs/development/interpreters/lua-5/zip.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ pkgs, stdenv, fetchurl, lua5_1, zziplib }:
-
-stdenv.mkDerivation rec {
- version = "1.2.3";
- name = "lua-zip-${version}";
- isLibrary = true;
- src = fetchurl {
- url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip";
- sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50";
- };
-
- buildInputs = [ pkgs.unzip lua5_1 zziplib ];
-
- preBuild = ''
- makeFlagsArray=(
- PREFIX=$out
- LUA_LIBDIR="$out/lib/lua/${lua5_1.luaversion}"
- LUA_INC="-I${lua5_1}/include");
- '';
-
- patches = [ ./zip.patch ];
-
- meta = {
- homepage = https://github.com/luaforge/luazip;
- hydraPlatforms = stdenv.lib.platforms.linux;
- license = stdenv.lib.licenses.mit;
- };
-}
diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix
index 0f223963132efc9a5469b8e0ed9aa3c260d38f45..e8f1b8b338c4981c71c4b18e8c811d83145b8c66 100644
--- a/pkgs/development/interpreters/luajit/2.1.nix
+++ b/pkgs/development/interpreters/luajit/2.1.nix
@@ -1,4 +1,4 @@
-{ self, callPackage, lib }:
+{ self, callPackage }:
callPackage ./default.nix {
inherit self;
version = "2.1.0-beta3";
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index abd1fda47cb6d9c8036ba6e6332cbccacd16034f..7db8feb98e71be24cc9668c19223c387efec3035 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildPackages
+{ stdenv, fetchurl, buildPackages
, name ? "luajit-${version}"
, isStable
, sha256
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index f071aab94c7800f212cea8c562fa3d23f6e89273..ceea3932063a586e456ae0a887a3e267866dda22 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mujs-${version}";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchurl {
url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
- sha256 = "02cqrfnww2s3ylcvqin1951f2c5nzpby8gxb207p2hbrivbg8f0l";
+ sha256 = "1q9w2dcspfp580pzx7sw7x9gbn8j0ak6dvj75wd1ml3f3q3i43df";
};
buildInputs = [ readline ];
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index c95d9b3009a79729cd3e2b52258310c9094f256a..3bcedc47c4bdeb2432521b0d848572cceb62eee7 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, stdenv, fetchurl, buildPackages, callPackage
+{ config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage
, enableThreading ? stdenv ? glibc, makeWrapper
}:
@@ -23,7 +23,7 @@ let
libcLib = lib.getLib libc;
crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform;
- common = { self, version, sha256 }: stdenv.mkDerivation (rec {
+ common = { perl, buildPerl, version, sha256 }: stdenv.mkDerivation (rec {
inherit version;
name = "perl-${version}";
@@ -106,14 +106,14 @@ let
setupHook = ./setup-hook.sh;
passthru = rec {
- interpreter = "${self}/bin/perl";
+ interpreter = "${perl}/bin/perl";
libPrefix = "lib/perl5/site_perl";
pkgs = callPackage ../../../top-level/perl-packages.nix {
- perl = self;
+ inherit perl buildPerl;
overrides = config.perlPackageOverrides or (p: {}); # TODO: (self: super: {}) like in python
};
buildEnv = callPackage ./wrapper.nix {
- perl = self;
+ inherit perl;
inherit (pkgs) requiredPerlModules;
};
withPackages = f: buildEnv.override { extraLibs = f pkgs; };
@@ -171,11 +171,11 @@ let
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
};
} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
- crossVersion = "9e4051cd28b7b3afb162776f5627c7abe4c7b9ea"; # Apr 21, 2019
+ crossVersion = "2152db1ea241f796206ab309036be1a7d127b370"; # May 25, 2019
perl-cross-src = fetchurl {
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
- sha256 = "0dj99w2dicbp3c3wn0k32785pc4c68iqnlyxswnza6mhw6wvl9v7";
+ sha256 = "1k08iqdkf9q00hbcq2b933w3vmds7xkfr90phhk0qf64l18wdrkf";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@@ -190,18 +190,27 @@ let
# TODO merge setup hooks
setupHook = ./setup-hook-cross.sh;
});
-in rec {
+in {
# the latest Maint version
perl528 = common {
- self = perl528;
+ perl = pkgs.perl528;
+ buildPerl = buildPackages.perl528;
version = "5.28.2";
sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da";
};
+ perl530 = common {
+ perl = pkgs.perl530;
+ buildPerl = buildPackages.perl530;
+ version = "5.30.0";
+ sha256 = "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5";
+ };
+
# the latest Devel version
perldevel = common {
- self = perldevel;
- version = "5.29.9";
- sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm";
+ perl = pkgs.perldevel;
+ buildPerl = buildPackages.perldevel;
+ version = "5.30.0";
+ sha256 = "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5";
};
}
diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix
index 9142a1f4fc3649ae8c511ab4d590612641f41761..95122aebf039d7272cc9c170d262189948708d0d 100644
--- a/pkgs/development/interpreters/perl/wrapper.nix
+++ b/pkgs/development/interpreters/perl/wrapper.nix
@@ -3,9 +3,7 @@
, extraOutputsToInstall ? []
, postBuild ? ""
, ignoreCollisions ? false
-, lib
, requiredPerlModules
-, makeWrapperArgs ? []
}:
# Create a perl executable that knows about additional packages.
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 97aa610273b173ba87bff73bbbcda324b4274b52..ea314789ce7879a9d33ff456804912388ee9dc74 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,10 +1,10 @@
# pcre functionality is tested in nixos/tests/php-pcre.nix
-{ lib, stdenv, fetchurl, flex, bison, autoconf
+{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype
+, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
-, libzip, re2c, valgrind
+, libzip, valgrind
}:
with lib;
@@ -48,7 +48,7 @@ let
, ftpSupport ? config.php.ftp or true
, fpmSupport ? config.php.fpm or true
, gmpSupport ? config.php.gmp or true
- , ztsSupport ? config.php.zts or false
+ , ztsSupport ? (config.php.zts or false) || (apxs2Support)
, calendarSupport ? config.php.calendar or true
, sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
, tidySupport ? (config.php.tidy or false)
@@ -59,10 +59,8 @@ let
, cliSupport ? config.php.cli or true
, pharSupport ? config.php.phar or true
, xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support)
- , re2cSupport ? config.php.re2c or true
- , cgotoSupport ? (config.php.cgoto or false) && (re2cSupport)
+ , cgotoSupport ? config.php.cgoto or false
, valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2")
- , valgrindPcreSupport ? (config.php.valgrindPcreSupport or false) && (valgrindSupport) && (versionAtLeast version "7.2")
}:
let
@@ -76,8 +74,8 @@ let
enableParallelBuilding = true;
- nativeBuildInputs = [ pkgconfig autoconf ];
- buildInputs = [ flex bison ]
+ nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ];
+ buildInputs = [ ]
++ optional (versionOlder version "7.3") pcre
++ optional (versionAtLeast version "7.3") pcre2
++ optional withSystemd systemd
@@ -108,7 +106,6 @@ let
++ optional tidySupport html-tidy
++ optional argon2Support libargon2
++ optional libzipSupport libzip
- ++ optional re2cSupport re2c
++ optional valgrindSupport valgrind;
CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
@@ -192,8 +189,7 @@ let
++ optional (!pharSupport) "--disable-phar"
++ optional xmlrpcSupport "--with-xmlrpc"
++ optional cgotoSupport "--enable-re2c-cgoto"
- ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"
- ++ optional valgrindPcreSupport "--with-pcre-valgrind";
+ ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}";
hardeningDisable = [ "bindnow" ];
@@ -257,25 +253,17 @@ let
};
in {
- php71 = generic {
- version = "7.1.28";
- sha256 = "1jal5kr3h9krgb4x46l7wg9czfiigax6vni6cagfdi8zzqrqg7kk";
-
- # https://bugs.php.net/bug.php?id=76826
- extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;
- };
-
php72 = generic {
- version = "7.2.17";
- sha256 = "0xag1735q92kj8p09gyydxknisgz7h56pksr44qwnykddymi3a4i";
+ version = "7.2.20";
+ sha256 = "116a1m0xjn2yi8d5kwzjk335q4brgl7xplcji2p87i2l9vjjkf4z";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};
php73 = generic {
- version = "7.3.4";
- sha256 = "0y1bl4nwpr0z11wsdizrs3nvkx1xs3xzy7mn8gj4jdn82a13sb1f";
+ version = "7.3.7";
+ sha256 = "065z2q6imjxlbh6w1r7565ygqhigfbzcz70iaic74hj626kqyq63";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
diff --git a/pkgs/development/interpreters/php/php71-darwin-isfinite.patch b/pkgs/development/interpreters/php/php71-darwin-isfinite.patch
deleted file mode 100644
index ebfcd94f8d4b0f44306d4b9d4e5e9df5ab93ee57..0000000000000000000000000000000000000000
--- a/pkgs/development/interpreters/php/php71-darwin-isfinite.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru a/Zend/configure.in b/Zend/configure.in
---- a/Zend/configure.in 2018-11-07 15:35:26.000000000 +0000
-+++ b/Zend/configure.in 2018-11-27 00:28:48.000000000 +0000
-@@ -70,7 +70,7 @@
- #endif
-
- #ifndef zend_isnan
--#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
-+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
- #define zend_isnan(a) isnan(a)
- #elif defined(HAVE_FPCLASS)
- #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
-@@ -79,7 +79,7 @@
- #endif
- #endif
-
--#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
-+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
- #define zend_isinf(a) isinf(a)
- #elif defined(INFINITY)
- /* Might not work, but is required by ISO C99 */
-@@ -90,7 +90,7 @@
- #define zend_isinf(a) 0
- #endif
-
--#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
-+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
- #define zend_finite(a) isfinite(a)
- #elif defined(HAVE_FINITE)
- #define zend_finite(a) finite(a)
-diff -ru a/configure.in b/configure.in
---- a/configure.in 2018-11-07 15:35:26.000000000 +0000
-+++ b/configure.in 2018-11-27 00:28:48.000000000 +0000
-@@ -75,7 +75,7 @@
- #endif
-
- #ifndef zend_isnan
--#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
-+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
- #define zend_isnan(a) isnan(a)
- #elif defined(HAVE_FPCLASS)
- #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
-@@ -84,7 +84,7 @@
- #endif
- #endif
-
--#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
-+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
- #define zend_isinf(a) isinf(a)
- #elif defined(INFINITY)
- /* Might not work, but is required by ISO C99 */
-@@ -95,7 +95,7 @@
- #define zend_isinf(a) 0
- #endif
-
--#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
-+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
- #define zend_finite(a) isfinite(a)
- #elif defined(HAVE_FINITE)
- #define zend_finite(a) finite(a)
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 058a83b6b436d3a1025ebfa2fdd9642357a0175d..5adf41a0f3b63edc8a54f3e9a013a02c5bd5f7f1 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, jdk, makeWrapper }:
+{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "picoLisp-${version}";
- version = "18.12";
+ version = "19.6";
src = fetchurl {
url = "https://www.software-lab.de/${name}.tgz";
- sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk";
+ sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq";
};
- buildInputs = [makeWrapper] ++ optional stdenv.is64bit jdk;
+ buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
patchPhase = ''
sed -i "s/which java/command -v java/g" mkAsm
@@ -23,6 +23,9 @@ stdenv.mkDerivation rec {
''}
'';
sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
+ postBuild = ''
+ cd ../src; make gate
+ '';
installPhase = ''
cd ..
@@ -30,9 +33,11 @@ stdenv.mkDerivation rec {
cp -r . "$out/share/picolisp/build-dir"
ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"
+ ln -s "$out/lib/picolisp/bin/httpGate" "$out/bin/httpGate"
makeWrapper $out/bin/picolisp $out/bin/pil \
+ --prefix PATH : ${w3m}/bin \
--add-flags "$out/lib/picolisp/lib.l" \
--add-flags "@lib/misc.l" \
--add-flags "@lib/btree.l" \
diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix
index 9a30ae7d8a85dca55d077f147d6ade0f272dbee4..5710f1066757f10c032e4bfc6ba264ed5cf350cc 100644
--- a/pkgs/development/interpreters/proglodyte-wasm/default.nix
+++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, clang, python, v8_static, coreutils }:
+{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
let
sexpr_wasm_prototype = stdenv.mkDerivation {
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
installPhase = ''
export DESTDIR=$out
export MKTEMPDIR=${coreutils}/bin
- export D8DIR=${v8_static}/bin
+ export D8DIR=${v8}/bin
export SWDIR=${sexpr_wasm_prototype}/bin
make install
'';
diff --git a/pkgs/development/interpreters/python/build-python-package-wheel.nix b/pkgs/development/interpreters/python/build-python-package-wheel.nix
index 7be0a4c304a3287095875f86736aaebf07c86051..e3c4e13c0e2d770c2eb7ca9b74b7ef750bf0823a 100644
--- a/pkgs/development/interpreters/python/build-python-package-wheel.nix
+++ b/pkgs/development/interpreters/python/build-python-package-wheel.nix
@@ -8,7 +8,7 @@
attrs // {
unpackPhase = ''
mkdir dist
- cp $src dist/"''${src#*-}"
+ cp "$src" "dist/$(stripHash "$src")"
'';
# Wheels are pre-compiled
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix
index 98322312f7f3ae181630ed8eb6fedcf22fa0192e..61c1186cef9e60e8e54251426e4d35375db7cb9b 100644
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/pkgs/development/interpreters/python/build-python-package.nix
@@ -23,7 +23,7 @@ let
common = import ./build-python-package-common.nix { inherit python; };
mkPythonDerivation = import ./mk-python-derivation.nix {
inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook;
- inherit toPythonModule namePrefix writeScript update-python-libraries;
+ inherit toPythonModule namePrefix update-python-libraries;
};
in
diff --git a/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch b/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch
new file mode 100644
index 0000000000000000000000000000000000000000..56c75cbdeeaf7a1cef2c9e276f0aba0808c29264
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch
@@ -0,0 +1,41 @@
+diff --git a/Lib/py_compile.py b/Lib/py_compile.py
+index 978da73..3559eb9 100644
+--- a/Lib/py_compile.py
++++ b/Lib/py_compile.py
+@@ -120,16 +120,27 @@ def compile(file, cfile=None, dfile=None, doraise=False):
+ return
+ if cfile is None:
+ cfile = file + (__debug__ and 'c' or 'o')
+- with open(cfile, 'wb') as fc:
+- fc.write('\0\0\0\0')
+- if "DETERMINISTIC_BUILD" in os.environ:
++ # Atomically write the pyc/pyo file. Issue #13146.
++ # id() is used to generate a pseudo-random filename.
++ path_tmp = '{}.{}'.format(cfile, id(cfile))
++ try:
++ with open(path_tmp, 'wb') as fc:
+ fc.write('\0\0\0\0')
+- else:
+- wr_long(fc, timestamp)
+- marshal.dump(codeobject, fc)
+- fc.flush()
+- fc.seek(0, 0)
+- fc.write(MAGIC)
++ if "DETERMINISTIC_BUILD" in os.environ:
++ fc.write('\0\0\0\0')
++ else:
++ wr_long(fc, timestamp)
++ marshal.dump(codeobject, fc)
++ fc.flush()
++ fc.seek(0, 0)
++ fc.write(MAGIC)
++ os.rename(path_tmp, cfile)
++ except OSError:
++ try:
++ os.unlink(path_tmp)
++ except OSError:
++ pass
++ raise
+
+ def main(args=None):
+ """Compile several source files.
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 505929df8ef0e648cca69edbbadfb1da13bf3e5b..1503c221bdd4544bf36ff1ecc5d78ba5cb1f799f 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -10,7 +10,6 @@
, sqlite
, tcl ? null, tk ? null, tix ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false
, zlib
-, callPackage
, self
, CF, configd, coreutils
, python-setup-hook
@@ -22,6 +21,7 @@
, sourceVersion
, sha256
, passthruFun
+, static ? false
}:
assert x11Support -> tcl != null
@@ -42,7 +42,7 @@ let
executable = libPrefix;
pythonVersion = with sourceVersion; "${major}.${minor}";
sitePackages = "lib/${libPrefix}/site-packages";
- inherit pythonForBuild;
+ inherit hasDistutilsCxxPatch pythonForBuild;
} // {
inherit ucsEncoding;
};
@@ -79,6 +79,12 @@ let
sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
})
+ # Fix race-condition during pyc creation. Has a slight backwards
+ # incompatible effect: pyc symlinks will now be overridden
+ # (https://bugs.python.org/issue17222). Included in python >= 3.4,
+ # backported in debian since 2013.
+ # https://bugs.python.org/issue13146
+ ./atomic_pyc.patch
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [
@@ -164,7 +170,8 @@ let
]
# Never even try to use lchmod on linux,
# don't rely on detecting glibc-isms.
- ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
+ ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"
+ ++ optional static "LDFLAGS=-static";
buildInputs =
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
diff --git a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a1f9d68eb1663143da59a937368ca555a4b8e3c5
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
@@ -0,0 +1,100 @@
+From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk
+Date: Mon, 28 Aug 2017 09:24:06 +0200
+Subject: [PATCH] Don't use ldconfig
+
+---
+ Lib/ctypes/util.py | 70 ++----------------------------------------------------
+ 1 file changed, 2 insertions(+), 68 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 5e8b31a854..7b45ce6c15 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -94,46 +94,7 @@ elif os.name == "posix":
+ import re, tempfile
+
+ def _findLib_gcc(name):
+- # Run GCC's linker with the -t (aka --trace) option and examine the
+- # library name it prints out. The GCC command will fail because we
+- # haven't supplied a proper program with main(), but that does not
+- # matter.
+- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
+-
+- c_compiler = shutil.which('gcc')
+- if not c_compiler:
+- c_compiler = shutil.which('cc')
+- if not c_compiler:
+- # No C compiler available, give up
+- return None
+-
+- temp = tempfile.NamedTemporaryFile()
+- try:
+- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
+-
+- env = dict(os.environ)
+- env['LC_ALL'] = 'C'
+- env['LANG'] = 'C'
+- try:
+- proc = subprocess.Popen(args,
+- stdout=subprocess.PIPE,
+- stderr=subprocess.STDOUT,
+- env=env)
+- except OSError: # E.g. bad executable
+- return None
+- with proc:
+- trace = proc.stdout.read()
+- finally:
+- try:
+- temp.close()
+- except FileNotFoundError:
+- # Raised if the file was already removed, which is the normal
+- # behaviour of GCC if linking fails
+- pass
+- res = re.search(expr, trace)
+- if not res:
+- return None
+- return os.fsdecode(res.group(0))
++ return None
+
+
+ if sys.platform == "sunos5":
+@@ -255,34 +216,7 @@ elif os.name == "posix":
+ else:
+
+ def _findSoname_ldconfig(name):
+- import struct
+- if struct.calcsize('l') == 4:
+- machine = os.uname().machine + '-32'
+- else:
+- machine = os.uname().machine + '-64'
+- mach_map = {
+- 'x86_64-64': 'libc6,x86-64',
+- 'ppc64-64': 'libc6,64bit',
+- 'sparc64-64': 'libc6,64bit',
+- 's390x-64': 'libc6,64bit',
+- 'ia64-64': 'libc6,IA-64',
+- }
+- abi_type = mach_map.get(machine, 'libc6')
+-
+- # XXX assuming GLIBC's ldconfig (with option -p)
+- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
+- regex = os.fsencode(regex % (re.escape(name), abi_type))
+- try:
+- with subprocess.Popen(['/sbin/ldconfig', '-p'],
+- stdin=subprocess.DEVNULL,
+- stderr=subprocess.DEVNULL,
+- stdout=subprocess.PIPE,
+- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+- res = re.search(regex, p.stdout.read())
+- if res:
+- return os.fsdecode(res.group(1))
+- except OSError:
+- pass
++ return None
+
+ def _findLib_ld(name):
+ # See issue #9998 for why this is needed
+--
+2.15.0
+
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 7d90e201d192f99703d8a78038b10850c41a4fd5..5eb7f3ec1661530ac555f637b24a3c93782d744a 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -10,7 +10,6 @@
, sqlite
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false
, zlib
-, callPackage
, self
, CF, configd
, python-setup-hook
@@ -39,7 +38,7 @@ let
executable = libPrefix;
pythonVersion = with sourceVersion; "${major}.${minor}";
sitePackages = "lib/${libPrefix}/site-packages";
- inherit pythonForBuild;
+ inherit hasDistutilsCxxPatch pythonForBuild;
};
version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index ef4cab35021115b6a41a2a188e0239d9511c4a24..7f21d03fc3a59806a03e5898fa8d8e2faf4ba721 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -13,6 +13,7 @@ with pkgs;
, pythonVersion
, packageOverrides
, sitePackages
+ , hasDistutilsCxxPatch
, pythonForBuild
, self
}: let
@@ -40,7 +41,7 @@ with pkgs;
inherit sourceVersion;
pythonAtLeast = lib.versionAtLeast pythonVersion;
pythonOlder = lib.versionOlder pythonVersion;
- inherit pythonForBuild;
+ inherit hasDistutilsCxxPatch pythonForBuild;
};
in {
@@ -97,6 +98,19 @@ in {
inherit passthruFun;
};
+ python38 = callPackage ./cpython {
+ self = python38;
+ sourceVersion = {
+ major = "3";
+ minor = "8";
+ patch = "0";
+ suffix = "b2";
+ };
+ sha256 = "1rh9dz5vmc56y45d6j2wfjw4m7x25i6v8vyld4mrqh06s2gn1hbl";
+ inherit (darwin) CF configd;
+ inherit passthruFun;
+ };
+
pypy27 = callPackage ./pypy {
self = pypy27;
sourceVersion = {
diff --git a/pkgs/development/interpreters/python/fetchpypi.nix b/pkgs/development/interpreters/python/fetchpypi.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e60c9df1f8bb87a60cb8d28abb522dbb89cd5964
--- /dev/null
+++ b/pkgs/development/interpreters/python/fetchpypi.nix
@@ -0,0 +1,28 @@
+# `fetchPypi` function for fetching artifacts from PyPI.
+{ fetchurl
+, makeOverridable
+}:
+
+let
+ computeUrl = {format ? "setuptools", ... } @attrs: let
+ computeWheelUrl = {pname, version, python ? "py2.py3", abi ? "none", platform ? "any"}:
+ # Fetch a wheel. By default we fetch an universal wheel.
+ # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments.
+ "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
+
+ computeSourceUrl = {pname, version, extension ? "tar.gz"}:
+ # Fetch a source tarball.
+ "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}";
+
+ compute = (if format == "wheel" then computeWheelUrl
+ else if format == "setuptools" then computeSourceUrl
+ else throw "Unsupported format ${format}");
+
+ in compute (builtins.removeAttrs attrs ["format"]);
+
+in makeOverridable( {format ? "setuptools", sha256 ? "", hash ? "", ... } @attrs:
+ let
+ url = computeUrl (builtins.removeAttrs attrs ["sha256" "hash"]) ;
+ in fetchurl {
+ inherit url sha256 hash;
+ })
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index d986490310bc780b9a06a1a1426c8f37d1c29f1b..6a9e3d48bdb5843055dfdd014d4dd10e7055059d 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -10,7 +10,6 @@
# Whether the derivation provides a Python module or not.
, toPythonModule
, namePrefix
-, writeScript
, update-python-libraries
}:
@@ -49,6 +48,9 @@
# Skip wrapping of python programs altogether
, dontWrapPythonPrograms ? false
+# Skip setting the PYTHONNOUSERSITE environment variable in wrapped programs
+, permitUserSite ? false
+
# Remove bytecode from bin folder.
# When a Python script has the extension `.py`, bytecode is generated
# Typically, executables in bin have no extension, so no bytecode is generated.
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 46cf0475de45d791a0ab90fa5b6424b394091c2f..42b652978bcc347c5537c330e84523a15e0264af 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, substituteAll, fetchurl
, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
-, callPackage, self, gdbm, db, lzma
+, self, gdbm, db, lzma
, python-setup-hook
# For the Python package set
, packageOverrides ? (self: super: {})
@@ -24,6 +24,7 @@ let
executable = "pypy${if isPy3k then "3" else ""}";
pythonForBuild = self; # No cross-compiling for now.
sitePackages = "site-packages";
+ hasDistutilsCxxPatch = false;
};
pname = passthru.executable;
version = with sourceVersion; "${major}.${minor}.${patch}";
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index ee556ba05bf5548df3ac5a34a2aac7d340fb40c1..6af198e65ead1d5844822cc5e7aa3b95e35cebb8 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -34,14 +34,13 @@ let
executable = "pypy${if isPy3k then "3" else ""}";
pythonForBuild = self; # Not possible to cross-compile with.
sitePackages = "site-packages";
+ hasDistutilsCxxPatch = false;
};
pname = "${passthru.executable}_prebuilt";
version = with sourceVersion; "${major}.${minor}.${patch}";
majorVersion = substring 0 1 pythonVersion;
- setupHook = python-setup-hook sitePackages;
-
deps = [
bzip2
zlib
diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh
index 77ec9e9ac0bf88560169c9259dc1941703e5b0cc..523df5762fadb752f406737e67ca35999754545c 100644
--- a/pkgs/development/interpreters/python/setup-hook.sh
+++ b/pkgs/development/interpreters/python/setup-hook.sh
@@ -12,7 +12,9 @@ toPythonPath() {
echo $result
}
-addEnvHooks "$hostOffset" addPythonPath
+if [ -z "${dontAddPythonPath:-}" ]; then
+ addEnvHooks "$hostOffset" addPythonPath
+fi
# Determinism: The interpreter is patched to write null timestamps when compiling python files.
# This way python doesn't try to update them when we freeze timestamps in nix store.
diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh
index b2d65422db459c6733ca92713f4ff77a8e139927..c7201c7a997b89ce567bfb37fecc68ccd9b60acb 100644
--- a/pkgs/development/interpreters/python/wrap.sh
+++ b/pkgs/development/interpreters/python/wrap.sh
@@ -73,9 +73,12 @@ wrapPythonProgramsIn() {
# (see pkgs/build-support/setup-hooks/make-wrapper.sh)
local -a wrap_args=("$f"
--prefix PATH ':' "$program_PATH"
- --set PYTHONNOUSERSITE "true"
)
+ if [ -z "$permitUserSite" ]; then
+ wrap_args+=(--set PYTHONNOUSERSITE "true")
+ fi
+
# Add any additional arguments provided by makeWrapperArgs
# argument to buildPythonPackage.
local -a user_args="($makeWrapperArgs)"
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 27d01e4e1f51dc2c7f572139f16eac5396b1c04a..5a2ec567b9ebd85916efe9870664109e67ad3e8a 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -3,6 +3,7 @@
, extraOutputsToInstall ? []
, postBuild ? ""
, ignoreCollisions ? false
+, permitUserSite ? false
, requiredPythonModules
# Wrap executables with the given argument.
, makeWrapperArgs ? []
@@ -34,7 +35,7 @@ let
if [ -f "$prg" ]; then
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
- makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
+ makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 9d65997ffe5ab37ec17ec2a3a000ab66b08acf01..e37c43a0bd65f3351e189f4c5df9994c37ca48dd 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeFontsConf, makeWrapper
+{ stdenv, fetchurl, makeFontsConf
, cacert
, cairo, coreutils, fontconfig, freefont_ttf
, glib, gmp
@@ -46,7 +46,7 @@ in
stdenv.mkDerivation rec {
name = "racket-${version}";
- version = "7.2"; # always change at once with ./minimal.nix
+ version = "7.3"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
fetchurl rec {
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
}
)) {
inherit name;
- sha256 = "12cq0kiigmf9bxb4rcgxdhwc2fcdwvlyb1q3f8x4hswcpgq1ybg4";
+ sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl";
};
FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index 0710c4e2d2a6bffc97b5d41d7061f920959eccec..a3d4a7a3c4fd44a889e1df21f20825a94ce62128 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
- sha256 = "01wsiyqfiiwn2n4xxk8d8di92l2ng7yhc4bfmgrvkgaqzy3zfhhx";
+ sha256 = "1byvg1vy8hn1j64d5gjiwzfbghdp7lhja9xwz9x8iicwfldkjybj";
};
meta = oldAttrs.meta // {
diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix
index 25e125b9af6368148ee8668c20fa8ba5343447de..22eee0f6ead8514a1e148317f859ba37471c6aaf 100644
--- a/pkgs/development/interpreters/rascal/default.nix
+++ b/pkgs/development/interpreters/rascal/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper jdk ];
- unpackPhase = "true";
+ dontUnpack = true;
installPhase =
''
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 16434837dd140cd90a51c99cccbf82780bda1c46..d97d2295341a07fb4ae6c715f925eef3374b7cf4 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -7,7 +7,7 @@ with pythonPackages;
stdenv.mkDerivation rec {
name = "renpy-${version}";
- version = "7.2.2";
+ version = "7.3.0";
meta = with stdenv.lib; {
description = "Ren'Py Visual Novel Engine";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
- sha256 = "0b8pky0npi4gw59cnjicyrc9q1x2zsxa7x68y74dbgjg9r0dgkd7";
+ sha256 = "18617fgnwnm6kh191h7sqm7nfvrck20llqv2a0dw9am5f08wfvbq";
};
patches = [
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index ed2bf99d197c02523a82fd6a6cbbb4a51fc9915f..4e617ce67eb99b21af10951d61e582033612bfaf 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPackages, lib
-, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
+, fetchurl, fetchFromSavannah, fetchFromGitHub
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
, autoconf, libiconv, libobjc, libunwind, Foundation
, buildEnv, bundler, bundix
@@ -11,14 +11,7 @@ let
opString = lib.optionalString;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix { inherit fetchFromSavannah; };
- rubygemsSrc = import ./rubygems-src.nix { inherit fetchurl; };
- rubygemsPatch = fetchpatch {
- url = "https://github.com/zimbatm/rubygems/compare/v2.6.6...v2.6.6-nix.patch";
- sha256 = "0297rdb1m6v75q8665ry9id1s74p9305dv32l95ssf198liaihhd";
- };
- unpackdir = obj:
- lib.removeSuffix ".tgz"
- (lib.removeSuffix ".tar.gz" obj.name);
+ rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
# Contains the ruby version heuristics
rubyVersion = import ./ruby-version.nix { inherit lib; };
@@ -33,24 +26,29 @@ let
ver = version;
tag = ver.gitTag;
atLeast25 = lib.versionAtLeast ver.majMin "2.5";
- baseruby = self.override { useRailsExpress = false; };
+ baseruby = self.override {
+ useRailsExpress = false;
+ docSupport = false;
+ };
self = lib.makeOverridable (
{ stdenv, buildPackages, lib
- , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
+ , fetchurl, fetchFromSavannah, fetchFromGitHub
, useRailsExpress ? true
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
, ncurses, readline, cursesSupport ? true
- , groff, docSupport ? false
+ , groff, docSupport ? true
, libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true
, autoreconfHook, bison, autoconf
, buildEnv, bundler, bundix
, libiconv, libobjc, libunwind, Foundation
}:
- let rubySrc =
- if useRailsExpress then fetchFromGitHub {
+ stdenv.mkDerivation rec {
+ name = "ruby-${version}";
+
+ src = if useRailsExpress then fetchFromGitHub {
owner = "ruby";
repo = "ruby";
rev = tag;
@@ -59,20 +57,12 @@ let
url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz";
sha256 = sha256.src;
};
- in
- stdenv.mkDerivation rec {
- name = "ruby-${version}";
-
- srcs = [ rubySrc rubygemsSrc ];
- sourceRoot =
- if useRailsExpress then
- rubySrc.name
- else
- unpackdir rubySrc;
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = if docSupport then "${groff}/bin/nroff" else null;
+ outputs = [ "out" ] ++ lib.optional docSupport "devdoc";
+
nativeBuildInputs = [ autoreconfHook bison ]
++ (op docSupport groff)
++ op (stdenv.buildPlatform != stdenv.hostPlatform) buildPackages.ruby;
@@ -100,10 +90,7 @@ let
})."${ver.majMinTiny}";
postUnpack = ''
- cp -r ${unpackdir rubygemsSrc} ${sourceRoot}/rubygems
- pushd ${sourceRoot}/rubygems
- patch -p1 < ${rubygemsPatch}
- popd
+ cp -r ${rubygems} $sourceRoot/rubygems
'';
postPatch = if atLeast25 then ''
@@ -130,6 +117,10 @@ let
++ op (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-baseruby=${buildRuby}";
+ preConfigure = opString docSupport ''
+ configureFlagsArray+=("--with-ridir=$devdoc/share/ri")
+ '';
+
# fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
# mostly TZ- and patch-related tests
# TZ- failures are caused by nix sandboxing, I didn't investigate others
@@ -146,6 +137,7 @@ let
postInstall = ''
# Update rubygems
pushd rubygems
+ chmod +w bundler/bundler.gemspec
${buildRuby} setup.rb --destdir $GEM_HOME
popd
@@ -158,12 +150,26 @@ let
addGemPath() {
addToSearchPath GEM_PATH \$1/${passthru.gemPath}
}
+ addRubyLibPath() {
+ addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
+ addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}
+ addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.targetPlatform.system}
+ }
addEnvHooks "$hostOffset" addGemPath
+ addEnvHooks "$hostOffset" addRubyLibPath
EOF
- '' + opString useRailsExpress ''
- rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+ rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+ '' + opString docSupport ''
+ # Prevent the docs from being included in the closure
+ sed -i "s|\$(DESTDIR)$devdoc|\$(datarootdir)/\$(RI_BASE_NAME)|" $rbConfig
+ sed -i "s|'--with-ridir=$devdoc/share/ri'||" $rbConfig
+
+ # Add rbconfig shim so ri can find docs
+ mkdir -p $devdoc/lib/ruby/site_ruby
+ cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb
+ '' + opString useRailsExpress ''
# Prevent the baseruby from being included in the closure.
sed -i '/^ CONFIG\["BASERUBY"\]/d' $rbConfig
sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
diff --git a/pkgs/development/interpreters/ruby/rbconfig.rb b/pkgs/development/interpreters/ruby/rbconfig.rb
new file mode 100644
index 0000000000000000000000000000000000000000..eeba930b54b7624a4b6bbd0b7e28dad4c6022190
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/rbconfig.rb
@@ -0,0 +1,25 @@
+# This is a shim around whatever real rbconfig.rb is in the LOAD_PATH,
+# so that RbConfig::CONFIG["ridir"] can be overridden to point to the
+# custom location of the ri docs, without the main derivation having
+# those docs in its closure.
+
+MY_PATH = File.realpath(__FILE__)
+
+candidates = $LOAD_PATH.map { |dir| File.join(dir, "rbconfig.rb") }
+
+# First, drop everything _before_ this file in the LOAD_PATH, just on
+# the off-chance somebody is composing shims like this for some reason.
+candidates.drop_while { |c| !File.exist?(c) || File.realpath(c) != MY_PATH }
+
+# Now, the wrapped rbconfig.rb is the next rbconfig.rb in the LOAD_PATH
+# that isn't this same file. (Yes, duplicate LOAD_PATH entries are a
+# thing we have to deal with.)
+next_rbconfig = candidates.find { |c|
+ File.exist?(c) && File.realpath(c) != MY_PATH
+}
+
+# Load the wrapped rbconfig.rb
+require next_rbconfig
+
+# Now we have RbConfig, and can modify it for our own ends.
+RbConfig::CONFIG["ridir"] = File.expand_path("../../../share/ri", __dir__)
diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix
deleted file mode 100644
index 4e5793f11139e2ad55e3d0e935e1f8e2cc1a43bb..0000000000000000000000000000000000000000
--- a/pkgs/development/interpreters/ruby/rubygems-src.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ fetchurl
-, version ? "2.7.7"
-, sha256 ? "1jsmmd31j8j066b83lin4bbqz19jhrirarzb41f3sjhfdjiwkcjc"
-}:
-fetchurl {
- url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
- sha256 = sha256;
-}
diff --git a/pkgs/development/interpreters/ruby/rubygems/0001-add-post-extract-hook.patch b/pkgs/development/interpreters/ruby/rubygems/0001-add-post-extract-hook.patch
new file mode 100644
index 0000000000000000000000000000000000000000..84d1d52409e52cec3b3a7693bb8597f55acbdc21
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/rubygems/0001-add-post-extract-hook.patch
@@ -0,0 +1,34 @@
+From a6485cfcdf51ff8be452980f93cebfea97f34dec Mon Sep 17 00:00:00 2001
+From: zimbatm
+Date: Wed, 21 Sep 2016 09:32:34 +0100
+Subject: [PATCH 1/3] add post-extract hook
+
+Allows nix to execute scripts just after the gem extraction
+---
+ lib/rubygems/installer.rb | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
+index d26b1e88..bf18fb7f 100644
+--- a/lib/rubygems/installer.rb
++++ b/lib/rubygems/installer.rb
+@@ -848,7 +848,15 @@ TEXT
+ # Ensures that files can't be installed outside the gem directory.
+
+ def extract_files
+- @package.extract_files gem_dir
++ ret = @package.extract_files gem_dir
++ if ENV['NIX_POST_EXTRACT_FILES_HOOK']
++ puts
++ puts "running NIX_POST_EXTRACT_FILES_HOOK #{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{gem_dir}"
++ system(ENV['NIX_POST_EXTRACT_FILES_HOOK'], gem_dir.to_s)
++ puts "running NIX_POST_EXTRACT_FILES_HOOK done"
++ puts
++ end
++ ret
+ end
+
+ ##
+--
+2.21.0
+
diff --git a/pkgs/development/interpreters/ruby/rubygems/0002-binaries-with-env-shebang.patch b/pkgs/development/interpreters/ruby/rubygems/0002-binaries-with-env-shebang.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d6eba67e10650c0c303349ae78a7a9eeb64cd145
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/rubygems/0002-binaries-with-env-shebang.patch
@@ -0,0 +1,28 @@
+From 2e1328bcdddd35e557eabdff83ac07f3591dc693 Mon Sep 17 00:00:00 2001
+From: zimbatm
+Date: Wed, 21 Sep 2016 19:37:05 +0100
+Subject: [PATCH 2/3] binaries with env shebang
+
+By default, don't point to the absolute ruby derivation path. As a user
+installing a gem in the home, it would freeze the selected ruby version
+to the currently-installed ruby derivation.
+---
+ lib/rubygems/dependency_installer.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
+index 34620860..00ab31d9 100644
+--- a/lib/rubygems/dependency_installer.rb
++++ b/lib/rubygems/dependency_installer.rb
+@@ -18,7 +18,7 @@ class Gem::DependencyInstaller
+ extend Gem::Deprecate
+
+ DEFAULT_OPTIONS = { # :nodoc:
+- :env_shebang => false,
++ :env_shebang => true,
+ :document => %w[ri],
+ :domain => :both, # HACK dup
+ :force => false,
+--
+2.21.0
+
diff --git a/pkgs/development/interpreters/ruby/rubygems/0003-gem-install-default-to-user.patch b/pkgs/development/interpreters/ruby/rubygems/0003-gem-install-default-to-user.patch
new file mode 100644
index 0000000000000000000000000000000000000000..138d432c82037978a1a6427d9c6637ab4e7cec12
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/rubygems/0003-gem-install-default-to-user.patch
@@ -0,0 +1,26 @@
+From d69249d0ff210316121b44d971ddd2439b1bc393 Mon Sep 17 00:00:00 2001
+From: zimbatm
+Date: Wed, 21 Sep 2016 09:40:39 +0100
+Subject: [PATCH 3/3] gem install default to user
+
+Default to not installing gems to the read-only system derivation.
+---
+ lib/rubygems/path_support.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/rubygems/path_support.rb b/lib/rubygems/path_support.rb
+index ed680d65..749b9ea6 100644
+--- a/lib/rubygems/path_support.rb
++++ b/lib/rubygems/path_support.rb
+@@ -23,7 +23,7 @@ class Gem::PathSupport
+ # hashtable, or defaults to ENV, the system environment.
+ #
+ def initialize(env)
+- @home = env["GEM_HOME"] || Gem.default_dir
++ @home = env["GEM_HOME"] || Gem.user_dir
+
+ if File::ALT_SEPARATOR
+ @home = @home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
+--
+2.21.0
+
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b9548284355d11391692427a14bd77af68fda8fc
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "rubygems";
+ version = "3.0.3";
+
+ src = fetchurl {
+ url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
+ sha256 = "0b6b9ads8522804xv8b8498gqwsv4qawv13f81kyc7g966y7lfmy";
+ };
+
+ patches = [
+ ./0001-add-post-extract-hook.patch
+ ./0002-binaries-with-env-shebang.patch
+ ./0003-gem-install-default-to-user.patch
+ ];
+
+ installPhase = ''
+ runHook preInstall
+ cp -r . $out
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Package management framework for Ruby";
+ homepage = https://rubygems.org/;
+ license = with licenses; [ mit /* or */ ruby ];
+ maintainers = with maintainers; [ qyliss zimbatm ];
+ };
+}
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index feac99b2d8e516da1addaaae84cd3ffe4cee9b98..2ec5923b0e1f0151ba0014a057f7247c26d9f83b 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr, buildPackages }:
+{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, zip, which, readline, icu, zlib, nspr, buildPackages }:
let
version = "52.9.0";
diff --git a/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch b/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch
deleted file mode 100644
index 8258a46b174829a9e1a2094d1805542537acd851..0000000000000000000000000000000000000000
--- a/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001
-From: Zheng Xu
-Date: Fri, 02 Sep 2016 17:40:05 +0800
-Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits are clear. r=ehoogeveen
-
-There might be 48-bit VA on arm64 depending on kernel configuration.
-Manually mmap heap memory to align with the assumption made by JS engine.
-
-Change-Id: Ic5d2b2fe4b758b3c87cc0688348af7e71a991146
----
-
-diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
-index 5b386a2..38101cf 100644
---- a/js/src/gc/Memory.cpp
-+++ b/js/src/gc/Memory.cpp
-@@ -309,6 +309,75 @@
- #endif
- }
-
-+static inline void *
-+MapMemory(size_t length, int prot, int flags, int fd, off_t offset)
-+{
-+#if defined(__ia64__)
-+ /*
-+ * The JS engine assumes that all allocated pointers have their high 17 bits clear,
-+ * which ia64's mmap doesn't support directly. However, we can emulate it by passing
-+ * mmap an "addr" parameter with those bits clear. The mmap will return that address,
-+ * or the nearest available memory above that address, providing a near-guarantee
-+ * that those bits are clear. If they are not, we return NULL below to indicate
-+ * out-of-memory.
-+ *
-+ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual
-+ * address space.
-+ *
-+ * See Bug 589735 for more information.
-+ */
-+ void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset);
-+ if (region == MAP_FAILED)
-+ return MAP_FAILED;
-+ /*
-+ * If the allocated memory doesn't have its upper 17 bits clear, consider it
-+ * as out of memory.
-+ */
-+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) {
-+ JS_ALWAYS_TRUE(0 == munmap(region, length));
-+ return MAP_FAILED;
-+ }
-+ return region;
-+#elif defined(__aarch64__)
-+ /*
-+ * There might be similar virtual address issue on arm64 which depends on
-+ * hardware and kernel configurations. But the work around is slightly
-+ * different due to the different mmap behavior.
-+ *
-+ * TODO: Merge with the above code block if this implementation works for
-+ * ia64 and sparc64.
-+ */
-+ const uintptr_t start = (uintptr_t)(0x0000070000000000UL);
-+ const uintptr_t end = (uintptr_t)(0x0000800000000000UL);
-+ const uintptr_t step = ChunkSize;
-+ /*
-+ * Optimization options if there are too many retries in practice:
-+ * 1. Examine /proc/self/maps to find an available address. This file is
-+ * not always available, however. In addition, even if we examine
-+ * /proc/self/maps, we may still need to retry several times due to
-+ * racing with other threads.
-+ * 2. Use a global/static variable with lock to track the addresses we have
-+ * allocated or tried.
-+ */
-+ uintptr_t hint;
-+ void* region = MAP_FAILED;
-+ for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) {
-+ region = mmap((void*)hint, length, prot, flags, fd, offset);
-+ if (region != MAP_FAILED) {
-+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) {
-+ if (munmap(region, length)) {
-+ MOZ_ASSERT(errno == ENOMEM);
-+ }
-+ region = MAP_FAILED;
-+ }
-+ }
-+ }
-+ return region == MAP_FAILED ? NULL : region;
-+#else
-+ return mmap(NULL, length, prot, flags, fd, offset);
-+#endif
-+}
-+
- void *
- MapAlignedPages(size_t size, size_t alignment)
- {
-@@ -322,12 +391,12 @@
-
- /* Special case: If we want page alignment, no further work is needed. */
- if (alignment == PageSize) {
-- return mmap(NULL, size, prot, flags, -1, 0);
-+ return MapMemory(size, prot, flags, -1, 0);
- }
-
- /* Overallocate and unmap the region's edges. */
- size_t reqSize = Min(size + 2 * alignment, 2 * size);
-- void *region = mmap(NULL, reqSize, prot, flags, -1, 0);
-+ void *region = MapMemory(reqSize, prot, flags, -1, 0);
- if (region == MAP_FAILED)
- return NULL;
-
diff --git a/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch b/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch
deleted file mode 100644
index bf41ce0a8a21c148b972701e81a7a361348be3b4..0000000000000000000000000000000000000000
--- a/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru mozjs17.0.0-orig/mfbt/double-conversion/utils.h mozjs17.0.0/mfbt/double-conversion/utils.h
---- mozjs17.0.0-orig/mfbt/double-conversion/utils.h 2013-02-11 17:33:28.000000000 -0500
-+++ mozjs17.0.0/mfbt/double-conversion/utils.h 2016-12-03 20:39:07.915042988 -0500
-@@ -58,7 +58,8 @@
- defined(__mips__) || defined(__powerpc__) || \
- defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
- defined(__SH4__) || defined(__alpha__) || \
-- defined(_MIPS_ARCH_MIPS32R2)
-+ defined(_MIPS_ARCH_MIPS32R2) || \
-+ defined(__AARCH64EL__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index c16b57dcb9c5f5b78ee54cf5122249dbbef0fbdc..057375182f53162a363478d8867869a5603289ad 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, pkgconfig, alsaLib
, libjack2, libsndfile, fftw, curl, gcc
-, libXt, qtbase, qttools, qtwebkit, readline
-, useSCEL ? false, emacs
+, libXt, qtbase, qttools, qtwebengine
+, readline, qtwebsockets, useSCEL ? false, emacs
}:
let optional = stdenv.lib.optional;
@@ -9,12 +9,12 @@ in
stdenv.mkDerivation rec {
name = "supercollider-${version}";
- version = "3.9.3";
+ version = "3.10.2";
src = fetchurl {
url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2";
- sha256 = "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr";
+ sha256 = "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq";
};
hardeningDisable = [ "stackprotector" ];
@@ -27,14 +27,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig qttools ];
buildInputs = [
- gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ]
+ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
++ optional (!stdenv.isDarwin) alsaLib
++ optional useSCEL emacs;
- meta = {
+ meta = with stdenv.lib; {
description = "Programming language for real time audio synthesis";
homepage = http://supercollider.sourceforge.net/;
- license = stdenv.lib.licenses.gpl3Plus;
+ maintainers = with maintainers; [ mrmebelman ];
+ license = licenses.gpl3;
platforms = [ "x686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix
index 61d67a874e90ba23528572fa4145d4b653154aaa..d76ceb3421de4cb95036f854ef5f46c365862d8d 100644
--- a/pkgs/development/interpreters/tcl/8.6.nix
+++ b/pkgs/development/interpreters/tcl/8.6.nix
@@ -2,10 +2,10 @@
callPackage ./generic.nix (args // rec {
release = "8.6";
- version = "${release}.6";
+ version = "${release}.9";
src = fetchurl {
url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
- sha256 = "01zypqhy57wvh1ikk28bg733sk5kf4q568pq9v6fvcz4h6bl0rd2";
+ sha256 = "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d";
};
})
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 11c02acf1de3dc7b3271d91bbca2153d2eb9f4b0..cd377e70cd9cd4051267fe43e2f3817f164e5d55 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -33,11 +33,12 @@ stdenv.mkDerivation rec {
postInstall = ''
make install-private-headers
ln -s $out/bin/tclsh${release} $out/bin/tclsh
+ ln -s $out/lib/libtcl${release}.so $out/lib/libtcl.so
'';
meta = with stdenv.lib; {
- description = "The Tcl scription language";
- homepage = http://www.tcl.tk/;
+ description = "The Tcl scripting language";
+ homepage = https://www.tcl.tk/;
license = licenses.tcltk;
platforms = platforms.all;
maintainers = with maintainers; [ vrthra ];
diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix
index cf0fad18d1ca4fd46b3df56df6db2d2894e25234..ac291668e2d96f26151731d346e113bf12157a4d 100644
--- a/pkgs/development/interpreters/wasm-gc/default.nix
+++ b/pkgs/development/interpreters/wasm-gc/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date
- cargoSha256 = "1jvk9n324p3x3j6q6x0p5diig3b5c683k74cfflff25i7gsmmvc7";
+ cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2";
meta = with stdenv.lib; {
description = "gc-sections for wasm";
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index 499b2c65b7700c875d8ab32019d10f6fdd246792..a7196c6e0314ed9ca53e47bcd59089c532a33631 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -5,7 +5,7 @@ with builtins;
with stdenv.lib;
let
- mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv maven; };
+ mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; };
in stdenv.mkDerivation rec {
inherit mavenDeps src name meta m2Path;
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index a3c3b2bf96f68acdc6b570c8bc110f1d83270f19..36c4af5f496145fe15c3f8fcc79e25875f2b50b9 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -58,7 +58,7 @@ in
meta = with stdenv.lib; {
description = "Java libraries for 3D Graphics, Multimedia and Processing";
- homepage = http://jogamp.org/;
+ homepage = https://jogamp.org/;
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
};
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index ca7cc7027be7110a542d9e7fb87bd013df060b4e..f63c91cd360a8d6d610b0489a40c25cd81b59a03 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, maven }:
+{ stdenv, pkgs }:
with stdenv.lib;
with pkgs.javaPackages;
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 007cd02957ba8e99f0b27d8b76cbce4ad70435de..fd3c6b471453ac6877525a83177f36012a5ddba0 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
+{ stdenv, config, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
+, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported, libGL, libGLU
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 8f1b7d93d002abb3d6c0cf6bb833b4fdef5107dd..a2db9c2349d1d56cf23746007ec3e9e47ddfd31a 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, config, libGLSupported, fetchurl, pkgconfig
+{ stdenv, config, fetchurl, pkgconfig
+, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported, libGL
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
@@ -9,6 +10,7 @@
, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, dbus
, udevSupport ? false, udev
, ibusSupport ? false, ibus
+, fcitxSupport ? false, fcitx
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid
, libpulseaudio
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
@@ -55,6 +57,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libiconv ]
++ dlopenBuildInputs
++ optional ibusSupport ibus
+ ++ optional fcitxSupport fcitx
++ optionals stdenv.isDarwin [
AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL
# Needed for NSDefaultRunLoopMode symbols.
diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..dc88b7b12ef3995523a2f55b82fbe7ed6d4dcd56
--- /dev/null
+++ b/pkgs/development/libraries/SDL_gpu/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU }:
+
+stdenv.mkDerivation rec {
+ pname = "SDL_gpu-unstable";
+ version = "2019-01-24";
+
+ src = fetchFromGitHub {
+ owner = "grimfang4";
+ repo = "sdl-gpu";
+ rev = "e3d350b325a0e0d0b3007f69ede62313df46c6ef";
+ sha256 = "0kibcaim01inb6xxn4mr6affn4hm50vz9kahb5k9iz8dmdsrhxy1";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ SDL2 libGLU ];
+
+ cmakeFlags = [
+ "-DSDL_gpu_BUILD_DEMOS=OFF"
+ "-DSDL_gpu_BUILD_TOOLS=OFF"
+ "-DSDL_gpu_BUILD_VIDEO_TEST=OFF"
+ "-DSDL_gpu_BUILD_TESTS=OFF"
+ ];
+
+ patchPhase = ''
+ sed -ie '210s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt
+ sed -ie '213s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A library for high-performance, modern 2D graphics with SDL written in C";
+ homepage = "https://github.com/grimfang4/sdl-gpu";
+ license = licenses.mit;
+ maintainers = with maintainers; [ pmiddend ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index c20167138b720cd2b48bdcead8321c9a1b572dc7..8713663ecca74f43a216ff36cd4dd554c86ceeec 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -1,45 +1,77 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper, shadow
-, gobject-introspection, polkit, systemd, coreutils, meson, dbus
-, ninja, python3 }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, substituteAll
+, pkgconfig
+, glib
+, shadow
+, gobject-introspection
+, polkit
+, systemd
+, coreutils
+, meson
+, dbus
+, ninja
+, python3
+, gettext
+}:
stdenv.mkDerivation rec {
- name = "accountsservice-${version}";
+ pname = "accountsservice";
version = "0.6.55";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
- url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
+ url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
sha256 = "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz";
};
- nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ];
+ nativeBuildInputs = [
+ dbus
+ gettext
+ gobject-introspection
+ meson
+ ninja
+ pkgconfig
+ python3
+ ];
+
+ buildInputs = [
+ glib
+ polkit
+ ];
- buildInputs = [ glib intltool gobject-introspection polkit systemd dbus ];
+ mesonFlags = [
+ "-Dadmin_group=wheel"
+ "-Dlocalstatedir=/var"
+ "-Dsystemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
+ ];
- mesonFlags = [ "-Dsystemdsystemunitdir=etc/systemd/system"
- "-Dlocalstatedir=/var" ];
- prePatch = ''
+ postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
-
- substituteInPlace src/daemon.c --replace '"/usr/sbin/useradd"' '"${shadow}/bin/useradd"' \
- --replace '"/usr/sbin/userdel"' '"${shadow}/bin/userdel"'
- substituteInPlace src/user.c --replace '"/usr/sbin/usermod"' '"${shadow}/bin/usermod"' \
- --replace '"/usr/bin/chage"' '"${shadow}/bin/chage"' \
- --replace '"/usr/bin/passwd"' '"${shadow}/bin/passwd"' \
- --replace '"/bin/cat"' '"${coreutils}/bin/cat"'
'';
patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit shadow coreutils;
+ })
./no-create-dirs.patch
./Disable-methods-that-change-files-in-etc.patch
+ # Systemd unit improvements. Notably using StateDirectory eliminating the
+ # need of an ad-hoc script.
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/152b845bbd3ca2a64516691493a160825f1a2046.patch";
+ sha256 = "114wrf5mwj5bgc5v1g05md4ridcnwdrwppr3bjz96sknwh5hk8s5";
+ })
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/0e712e935abd26499ff5995ab363e5bfd9ee7c4c.patch";
+ sha256 = "1y60a5fmgfqjzprwpizilrazqn3mggdlgc5sgcpsprsp62fv78rl";
+ })
];
- preFixup = ''
- wrapProgram "$out/libexec/accounts-daemon" \
- --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/users" \
- --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons"
- '';
-
meta = with stdenv.lib; {
description = "D-Bus interface for user account query and manipulation";
homepage = https://www.freedesktop.org/wiki/Software/AccountsService;
diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/pkgs/development/libraries/accountsservice/fix-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0bf6ee3d91a54a3aabd8001ca52163bef20100e7
--- /dev/null
+++ b/pkgs/development/libraries/accountsservice/fix-paths.patch
@@ -0,0 +1,125 @@
+diff --git a/src/daemon.c b/src/daemon.c
+index c52bda3..75d214e 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -1106,7 +1106,7 @@ daemon_create_user_authorized_cb (Daemon *daemon,
+
+ sys_log (context, "create user '%s'", cd->user_name);
+
+- argv[0] = "/usr/sbin/useradd";
++ argv[0] = "@shadow@/bin/useradd";
+ argv[1] = "-m";
+ argv[2] = "-c";
+ argv[3] = cd->real_name;
+@@ -1318,7 +1318,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon,
+
+ user_set_saved (user, FALSE);
+
+- argv[0] = "/usr/sbin/userdel";
++ argv[0] = "@shadow@/bin/userdel";
+ if (ud->remove_files) {
+ argv[1] = "-f";
+ argv[2] = "-r";
+diff --git a/src/user.c b/src/user.c
+index 9f57af5..e65289d 100644
+--- a/src/user.c
++++ b/src/user.c
+@@ -844,7 +844,7 @@ user_change_real_name_authorized_cb (Daemon *daemon,
+ accounts_user_get_uid (ACCOUNTS_USER (user)),
+ name);
+
+- argv[0] = "/usr/sbin/usermod";
++ argv[0] = "@shadown@/bin/usermod";
+ argv[1] = "-c";
+ argv[2] = name;
+ argv[3] = "--";
+@@ -913,7 +913,7 @@ user_change_user_name_authorized_cb (Daemon *daemon,
+ accounts_user_get_uid (ACCOUNTS_USER (user)),
+ name);
+
+- argv[0] = "/usr/sbin/usermod";
++ argv[0] = "@shadow@/bin/usermod";
+ argv[1] = "-l";
+ argv[2] = name;
+ argv[3] = "--";
+@@ -1321,7 +1321,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon,
+ accounts_user_get_uid (ACCOUNTS_USER (user)),
+ home_dir);
+
+- argv[0] = "/usr/sbin/usermod";
++ argv[0] = "@shadow@/bin/usermod";
+ argv[1] = "-m";
+ argv[2] = "-d";
+ argv[3] = home_dir;
+@@ -1378,7 +1378,7 @@ user_change_shell_authorized_cb (Daemon *daemon,
+ accounts_user_get_uid (ACCOUNTS_USER (user)),
+ shell);
+
+- argv[0] = "/usr/sbin/usermod";
++ argv[0] = "@shadow@/bin/usermod";
+ argv[1] = "-s";
+ argv[2] = shell;
+ argv[3] = "--";
+@@ -1520,7 +1520,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
+ return;
+ }
+
+- argv[0] = "/bin/cat";
++ argv[0] = "@coreutils@/bin/cat";
+ argv[1] = filename;
+ argv[2] = NULL;
+
+@@ -1601,7 +1601,7 @@ user_change_locked_authorized_cb (Daemon *daemon,
+ locked ? "locking" : "unlocking",
+ accounts_user_get_user_name (ACCOUNTS_USER (user)),
+ accounts_user_get_uid (ACCOUNTS_USER (user)));
+- argv[0] = "/usr/sbin/usermod";
++ argv[0] = "@shadow@/bin/usermod";
+ argv[1] = locked ? "-L" : "-U";
+ argv[2] = "--";
+ argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+@@ -1726,7 +1726,7 @@ user_change_account_type_authorized_cb (Daemon *daemon,
+
+ g_free (groups);
+
+- argv[0] = "/usr/sbin/usermod";
++ argv[0] = "@shadow@/bin/usermod";
+ argv[1] = "-G";
+ argv[2] = str->str;
+ argv[3] = "--";
+@@ -1794,7 +1794,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
+ if (mode == PASSWORD_MODE_SET_AT_LOGIN ||
+ mode == PASSWORD_MODE_NONE) {
+
+- argv[0] = "/usr/bin/passwd";
++ argv[0] = "/run/wrappers/bin/passwd";
+ argv[1] = "-d";
+ argv[2] = "--";
+ argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+@@ -1806,7 +1806,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
+ }
+
+ if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
+- argv[0] = "/usr/bin/chage";
++ argv[0] = "@shadow@/bin/chage";
+ argv[1] = "-d";
+ argv[2] = "0";
+ argv[3] = "--";
+@@ -1827,7 +1827,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
+ accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
+ }
+ else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
+- argv[0] = "/usr/sbin/usermod";
++ argv[0] = "@shadow@/bin/usermod";
+ argv[1] = "-U";
+ argv[2] = "--";
+ argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+@@ -1905,7 +1905,7 @@ user_change_password_authorized_cb (Daemon *daemon,
+
+ g_object_freeze_notify (G_OBJECT (user));
+
+- argv[0] = "/usr/sbin/usermod";
++ argv[0] = "@shadow@/bin/usermod";
+ argv[1] = "-p";
+ argv[2] = strings[0];
+ argv[3] = "--";
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 48ca86aaa4b7bd6f498331af4b4077fb2918c4ec..5c25da9205569dafd1990cd5866cdfdd897adce8 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
name = "alembic-${version}";
- version = "1.7.10";
+ version = "1.7.11";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = "${version}";
- sha256 = "186wwlbz90gmzr4vsykk4z8bgkd45yhbyfpn8bqwidf9fcimcr2a";
+ sha256 = "1lalbqn4cwf0vp4hiq72gwpd7kq501j21rnjb380mv26pk7r2ivz";
};
outputs = [ "bin" "dev" "out" "lib" ];
diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
index 6f4fd09015e5e2e31fe63423319849e5773acf4b..f98c8fa480e1d6796e7a189c0c42260236627628 100644
--- a/pkgs/development/libraries/alkimia/default.nix
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -1,19 +1,20 @@
{ mkDerivation, fetchurl, lib
-, extra-cmake-modules, doxygen, graphviz, qtbase, mpir
+, extra-cmake-modules, doxygen, graphviz, qtbase, qtwebkit, mpir
+, kdelibs4support, plasma-framework, knewstuff, kpackage
}:
mkDerivation rec {
name = "alkimia-${version}";
- version = "7.0.1";
+ version = "8.0.1";
src = fetchurl {
- url = "mirror://kde/stable/alkimia/${version}/src/${name}.tar.xz";
- sha256 = "1fri76465058fgsyrmdrc3hj1javz4g10mfzqp5rsj7qncjr1i22";
+ url = "mirror://kde/stable/alkimia/${version}/${name}.tar.xz";
+ sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m";
};
nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
- buildInputs = [ qtbase ];
+ buildInputs = [ qtbase qtwebkit kdelibs4support plasma-framework knewstuff kpackage ];
propagatedBuildInputs = [ mpir ];
meta = {
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index f59a3fd713f907e38688852a537fba39fd6a5ffa..429da8de835044b6190f53ab0f0db66a11b994ea 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext
, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
, pcre, itstool, gperf, vala
diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix
index ba68f046b0a0d1eb82917ee276459c96debc5ed1..9d506b10e3534c3830f12b459e5078ddde3f3636 100644
--- a/pkgs/development/libraries/aravis/default.nix
+++ b/pkgs/development/libraries/aravis/default.nix
@@ -33,13 +33,13 @@ in
stdenv.mkDerivation rec {
pname = "aravis";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchFromGitHub {
owner = "AravisProject";
repo = pname;
rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}";
- sha256 = "0zlmw040iv0xx9qw7ygzbl96bli6ivll2fbziv19f4bdc0yhqjpw";
+ sha256 = "0lmgx854z522dwcxsg37bxdyiai9fnycpx1nvgayksj38h39kfn2";
};
outputs = [ "bin" "dev" "out" "lib" ];
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index 4c34e40586f32a7e84d86c3fa16292e070feaccd..eb58003a5f63ce658e0f8d48c4aee5649028ed5d 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, fetchpatch, mpir, gmp, mpfr, flint}:
+{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "arb";
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 7ef4feab188d64178354110616ef4c9a0b400c71..10649092d20dc2848e54dabec3c811eb27d6ea37 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
stdenv.mkDerivation rec {
- version = "9.300.2";
+ version = "9.500.2";
name = "armadillo-${version}";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
- sha256 = "1d2nsbspj9vzgzb6w2vgjv2wzidjzc8sr8wkz2zl7wxpgspl299n";
+ sha256 = "17npgyavzrbf4d3m28f9j7j8hk2pc91ai9nkkp39hkdflq3kw6hb";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 7f7ef3336a4cefccb21c498a3560b763eb9206f7..c4cbd970d41182d29602b3703f3cf86953920a6d 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
+{ stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
let
parquet-testing = fetchFromGitHub {
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
./darwin.patch
];
- nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ];
+ nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [
boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson
snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 0fc50f2c641f830a47e8e3c40fe88eedae483225..e5d5313eeb1058f24f13c06c007774e66e4fc284 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "at-spi2-core";
- version = "2.32.0";
+ version = "2.32.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923";
+ sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 390ca6bb04b733b5a8bafd07dc4b960e01583c54..0e1445ca9ee1f801d75746c94c70c4afe30f62fe 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -11,7 +11,7 @@ let
x86_64-linux = "x64/libbass.so";
};
urlpath = "bass${version}-linux.zip";
- sha256 = "0alxx7knkvzwwifqrmzavafwq53flja7s1ckaabk6p2ir2f0j5cp";
+ sha256 = "1hjxp1akj8367qlglv5rqpwq2dimfz3bkllwq39abavz4sp8smjz";
};
bass_fx = {
@@ -21,7 +21,7 @@ let
x86_64-linux = "x64/libbass_fx.so";
};
urlpath = "z/0/bass_fx${version}-linux.zip";
- sha256 = "0j1cbq88j3vnqf2bibcqnfhciz904w48ldgycyh9d8954hwyg22m";
+ sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin";
};
};
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
index 0f3f1fce42b062747c05632aa9dd9c5deb8cca41..41bb9ca9f11b6b3dc6192ef98a285bb38e6ed98b 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }:
stdenv.mkDerivation rec {
- version = "2.1.1";
+ version = "4.0.0";
name = "rtmidi-${version}";
src = fetchFromGitHub {
owner = "thestk";
repo = "rtmidi";
rev = "${version}";
- sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96";
+ sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index f276d0bf12ee31962d23a909554e68019164f075..76010dacc5e2276a973a884c160c95dbc12ab4f8 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -3,7 +3,9 @@
, gtk3Support ? false, gtk3 ? null
, qt4 ? null
, qt4Support ? false
-, withLibdnssdCompat ? false }:
+, withLibdnssdCompat ? false
+, python ? null
+, withPython ? false }:
assert qt4Support -> qt4 != null;
@@ -30,6 +32,9 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional gtk3Support gtk3)
++ (stdenv.lib.optional qt4Support qt4);
+ propagatedBuildInputs =
+ stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
+
nativeBuildInputs = [ pkgconfig gettext intltool glib ];
configureFlags =
@@ -37,13 +42,16 @@ stdenv.mkDerivation rec {
"--disable-gtk"
(stdenv.lib.enableFeature gtk3Support "gtk3")
"--${if qt4Support then "enable" else "disable"}-qt4"
- "--disable-python" "--localstatedir=/var" "--with-distro=none"
+ (stdenv.lib.enableFeature withPython "python")
+ "--localstatedir=/var" "--with-distro=none"
# A systemd unit is provided by the avahi-daemon NixOS module
"--with-systemdsystemunitdir=no" ]
++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"
# autoipd won't build on darwin
++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd";
+ NIX_CFLAGS_COMPILE = "-DAVAHI_SERVICE_DIR=\"/etc/avahi/services\"";
+
preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i '20 i\
#define __APPLE_USE_RFC_2292' \
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix
index 580cd1bd73f5bc884424532a7c6d56b717dd74c1..cbd29a095d4571dd603634a0d0fe6b2c1be1eff7 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/pkgs/development/libraries/avro-c/default.nix
@@ -1,13 +1,13 @@
{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }:
let
- version = "1.8.2";
+ version = "1.9.0";
in stdenv.mkDerivation rec {
name = "avro-c-${version}";
src = fetchurl {
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
- sha256 = "03pixl345kkpn1jds03rpdcwjabi41rgdzi8f7y93gcg5cmrhfa6";
+ sha256 = "1ch8z9jpkjxjx2zh28z0946gz3vwj1jnkrzg4vwvfa287128cml0";
};
postPatch = ''
diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix
index 5b938ddb03cf55c4e30ba9e50f8c4c9b368efcdd..4286eedc87b267c1a5af9828b441d42fbf4307fc 100644
--- a/pkgs/development/libraries/aws-c-common/default.nix
+++ b/pkgs/development/libraries/aws-c-common/default.nix
@@ -1,20 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libexecinfo }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "aws-c-common";
- version = "0.3.4";
+ version = "0.3.11";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "1z02ndb9jjn0p5bcc49pq0d8c0q2pq33dlszw77l76jkhrfx0921";
+ sha256 = "0a7hi4crnc3j1j39qcnd44zqdfwzw1xghcf80marx5vdf1qdzy6p";
};
nativeBuildInputs = [ cmake ];
- buildInputs = lib.optional stdenv.hostPlatform.isMusl libexecinfo;
-
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
"-Wno-nullability-extension"
"-Wno-typedef-redefinition"
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index e53c75e6f74e84039f76bebad4ab7a8fb5902371..7233a187053e4a07a1d8a467c45ff527409b6838 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
name = "aws-sdk-cpp-${version}";
- version = "1.7.56";
+ version = "1.7.90";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
- sha256 = "0vfw5bqlwm5r0ikziz3jx6yb5v24lwig0m62979zy3ndx36kpb9b";
+ sha256 = "0zpqi612qmm0n53crxiisv0vdif43ymg13kafy6vv43j2wmh66ga";
};
# FIXME: might be nice to put different APIs in different outputs
@@ -37,9 +37,11 @@ stdenv.mkDerivation rec {
"-DBUILD_DEPS=OFF"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
- ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF"
- ++ lib.optional (apis != ["*"])
- "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
+ ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ "-DENABLE_TESTING=OFF"
+ "-DCURL_HAS_H2=0"
+ ] ++ lib.optional (apis != ["*"])
+ "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
preConfigure =
''
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 947065997ec9c0d26441f1f07fd7da0e4dee9705..eff6ff626325e5f91208b7f5d724adbaee43d9ed 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "babl-0.1.62";
+ pname = "babl";
+ version = "0.1.66";
src = fetchurl {
- url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
- sha256 = "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw";
+ url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+ sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n";
};
doCheck = true;
diff --git a/pkgs/development/libraries/beignet/clang_llvm.patch b/pkgs/development/libraries/beignet/clang_llvm.patch
index 88876f157cdbf79a4344a284395d5eb506761299..bcdad510e10d85dfa50958e73dfe2bd252236fd5 100644
--- a/pkgs/development/libraries/beignet/clang_llvm.patch
+++ b/pkgs/development/libraries/beignet/clang_llvm.patch
@@ -47,16 +47,3 @@ index a148321..96cafb8 100644
set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB})
unset(CLANG_LIB CACHE)
endmacro()
-diff --git a/./CMakeLists.txt b/../Beignet-1.1.2-Source_new/CMakeLists.txt
-index 88985d7..01bca9e 100644
---- a/./CMakeLists.txt
-+++ b/../Beignet-1.1.2-Source_new/CMakeLists.txt
-@@ -205,7 +205,7 @@ IF(OCLIcd_FOUND)
- "intel-beignet.icd.in"
- "${ICD_FILE_NAME}"
- )
-- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors)
-+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors)
- ELSE(OCLIcd_FOUND)
- MESSAGE(STATUS "Looking for OCL ICD header file - not found")
- ENDIF(OCLIcd_FOUND)
diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index ba6fc7cb541b1eef580641a515fc852f5bf6a4f2..05ff5593205a6e10893d7bd3b31c2a932fee2f8e 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -1,5 +1,5 @@
{ stdenv
-, fetchurl
+, fetchFromGitHub
, cmake
, pkgconfig
, clang-unwrapped
@@ -19,11 +19,13 @@
stdenv.mkDerivation rec {
name = "beignet-${version}";
- version = "1.3.2";
+ version = "unstable-2018.08.20";
- src = fetchurl {
- url = "https://01.org/sites/default/files/${name}-source.tar.gz";
- sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5";
+ src = fetchFromGitHub {
+ owner = "intel";
+ repo = "beignet";
+ rev = "fc5f430cb7b7a8f694d86acbb038bd5b38ec389c";
+ sha256 = "1z64v69w7f52jrskh1jfyh1x46mzfhjrqxj9hhgzh3xxv9yla32h";
};
patches = [ ./clang_llvm.patch ];
@@ -31,6 +33,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postPatch = ''
+ substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors"
patchShebangs src/git_sha1.sh
'';
@@ -101,8 +104,8 @@ stdenv.mkDerivation rec {
homepage = https://cgit.freedesktop.org/beignet/;
description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
longDescription = ''
- The package provides an open source implementation of the OpenCL specification for Intel GPUs.
- It supports the Intel OpenCL runtime library and compiler.
+ The package provides an open source implementation of the OpenCL specification for Intel GPUs.
+ It supports the Intel OpenCL runtime library and compiler.
'';
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ artuuge zimbatm ];
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 2618d35ff794b2e87dbafdbededdd0ea0691968e..a241b42e1878009fd2e14cc1a6ae080368609e8a 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops
+{ lib, stdenv, fetchurl
, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
}:
@@ -14,9 +14,6 @@ stdenv.mkDerivation rec {
sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3";
};
- buildInputs = [ libatomic_ops ];
- nativeBuildInputs = [ pkgconfig ];
-
outputs = [ "out" "dev" "doc" ];
separateDebugInfo = stdenv.isLinux;
@@ -29,20 +26,12 @@ stdenv.mkDerivation rec {
lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
configureFlags =
- [ "--enable-cplusplus" ]
+ [ "--enable-cplusplus" "--with-libatomic-ops=none" ]
++ lib.optional enableLargeConfig "--enable-large-config"
- ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"
- # Configure script can't detect whether C11 atomic intrinsics are available
- # when cross-compiling, so it links to libatomic_ops, which has to be
- # propagated to all dependencies. To avoid this, assume that the intrinsics
- # are available.
- ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-libatomic-ops=none";
+ ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
doCheck = true; # not cross;
- # Don't run the native `strip' when cross-compiling.
- dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
-
enableParallelBuilding = true;
meta = {
diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix
index 603d7883c647ea4ffa6e5c6ce1b5919236a1473d..f4931dfe547401013c97e7886af3c476a0ea14d2 100644
--- a/pkgs/development/libraries/boost/1.59.nix
+++ b/pkgs/development/libraries/boost/1.59.nix
@@ -7,34 +7,4 @@ callPackage ./generic.nix (args // rec {
url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2";
sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";
};
-
- patches = stdenv.lib.optionals stdenv.isCygwin [
- ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
- ./cygwin-fedora-boost-1.50.0-pool.patch
- ./cygwin-fedora-boost-1.57.0-mpl-print.patch
- ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
- ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
- ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
- ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch
- ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
- ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
- ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch
- ./cygwin-fedora-boost-1.57.0-move-is_class.patch
- ./cygwin-1.40.0-cstdint-cygwin.patch
- ./cygwin-1.57.0-asio-cygwin.patch
- ./cygwin-1.55.0-asio-MSG_EOR.patch
- ./cygwin-1.57.0-config-cygwin.patch
- ./cygwin-1.57.0-context-cygwin.patch
- ./cygwin-1.57.0-filesystem-cygwin.patch
- ./cygwin-1.55.0-interlocked-cygwin.patch
- ./cygwin-1.40.0-iostreams-cygwin.patch
- ./cygwin-1.57.0-locale-cygwin.patch
- ./cygwin-1.57.0-log-cygwin.patch
- ./cygwin-1.40.0-python-cygwin.patch
- ./cygwin-1.40.0-regex-cygwin.patch
- ./cygwin-1.57.0-smart_ptr-cygwin.patch
- ./cygwin-1.57.0-system-cygwin.patch
- ./cygwin-1.45.0-jam-cygwin.patch
- ./cygwin-1.50.0-jam-pep3149.patch
- ];
})
diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix
index 938892ef35542cff804c8b2b7c8091e336e2f060..406e63b9622b52b7916825baad1fa8f22531e629 100644
--- a/pkgs/development/libraries/boost/1.67.nix
+++ b/pkgs/development/libraries/boost/1.67.nix
@@ -3,11 +3,33 @@
callPackage ./generic.nix (args // rec {
version = "1.67.0";
- patches = [ (fetchpatch {
- url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
- sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
- stripLen = 1;
- })];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
+ sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
+ stripLen = 1;
+ })
+ ] ++ stdenv.lib.optionals stdenv.cc.isClang [
+ # Fixes https://github.com/boostorg/atomic/issues/15
+ (fetchpatch {
+ url = https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch;
+ sha256 = "102g35ygvv8cxagp9651284xk4vybk93q2fm577y4mdxf5k46b7a";
+ stripLen = 1;
+ })
+
+ # Needed for the next patch
+ (fetchpatch {
+ url = https://github.com/boostorg/asio/commit/38cb19719748ad56b14d73ca1fff5828f36e5894.patch;
+ sha256 = "0cj9cxz9rfbsx8p8f5alxx00dq3r7g0vh23j68bbxbs9gq1arq2n";
+ stripLen = 1;
+ })
+ # Fixes https://github.com/boostorg/asio/pull/91
+ (fetchpatch {
+ url = https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb.patch;
+ sha256 = "1c2ds164s2ygvpb4785p4ncv8ywbpm08cphirb99xp4mqvb693is";
+ stripLen = 1;
+ })
+ ];
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2";
diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5f7b39c1189eb67dd277f447b3ff85945e664a3d
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.70.nix
@@ -0,0 +1,11 @@
+{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+ version = "1.70.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/boost/boost_1_70_0.tar.bz2";
+ # SHA256 from http://www.boost.org/users/history/version_1_70_0.html
+ sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778";
+ };
+})
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch
deleted file mode 100644
index 61791c60d9e078bf1151f798134f85a905de0e2f..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-These were fixed in ~1.7.0-46
-
---- boost_1_40_0/boost/cstdint.hpp 2009-01-14 04:18:19.000000000 -0600
-+++ boost_1_40_0/boost/cstdint.hpp 2009-08-27 23:41:34.063543700 -0500
-@@ -40,15 +40,6 @@
- # include
- # else
- # include
--
--// There is a bug in Cygwin two _C macros
--# if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__)
--# undef INTMAX_C
--# undef UINTMAX_C
--# define INTMAX_C(c) c##LL
--# define UINTMAX_C(c) c##ULL
--# endif
--
- # endif
-
- #ifdef __QNX__
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch
deleted file mode 100644
index 6641ba823b17b09cb24f67dc6e0b759caf6e622d..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2008-03-22 16:45:55.000000000 -0500
-+++ boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2009-08-27 23:41:34.082544800 -0500
-@@ -44,8 +44,7 @@
- //------------------Locale support--------------------------------------------//
-
- #ifndef BOOST_IOSTREAMS_NO_LOCALE
--# if defined(BOOST_NO_STD_LOCALE) || \
-- defined(__CYGWIN__) && \
-+# if defined(BOOST_NO_STD_LOCALE) && \
- ( !defined(__MSL_CPP__) || defined(_MSL_NO_WCHART_CPP_SUPPORT) ) \
- /**/
- # define BOOST_IOSTREAMS_NO_LOCALE
---- boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2008-03-22 16:45:55.000000000 -0500
-+++ boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2009-08-27 23:41:34.087545100 -0500
-@@ -13,8 +13,7 @@
-
- // BOOST_IOSTREAMS_POSIX or BOOST_IOSTREAMS_WINDOWS specify which API to use.
- #if !defined( BOOST_IOSTREAMS_WINDOWS ) && !defined( BOOST_IOSTREAMS_POSIX )
--# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \
-- !defined(__CYGWIN__) \
-+# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32))
- /**/
- # define BOOST_IOSTREAMS_WINDOWS
- # else
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch
deleted file mode 100644
index 7932b0e124b5efc7fb12123e2bd2e68383373be9..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- boost_1_40_0/boost/python/detail/config.hpp 2007-11-25 12:07:19.000000000 -0600
-+++ boost_1_40_0/boost/python/detail/config.hpp 2009-08-27 23:41:34.092545400 -0500
-@@ -83,7 +83,7 @@
- # endif
- # define BOOST_PYTHON_DECL_FORWARD
- # define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default")))
--# elif (defined(_WIN32) || defined(__CYGWIN__))
-+# elif defined(_WIN32)
- # if defined(BOOST_PYTHON_SOURCE)
- # define BOOST_PYTHON_DECL __declspec(dllexport)
- # define BOOST_PYTHON_BUILD_DLL
---- boost_1_40_0/boost/python/detail/wrap_python.hpp 2007-04-27 17:16:47.000000000 -0500
-+++ boost_1_40_0/boost/python/detail/wrap_python.hpp 2009-08-27 23:41:34.096545600 -0500
-@@ -82,8 +82,8 @@
- // Some things we need in order to get Python.h to work with compilers other
- // than MSVC on Win32
- //
--#if defined(_WIN32) || defined(__CYGWIN__)
--# if defined(__GNUC__) && defined(__CYGWIN__)
-+#if defined(_WIN32)
-+# if defined(__GNUC__)
-
- # define SIZEOF_LONG 4
-
---- boost_1_40_0/boost/python/module_init.hpp 2007-06-07 13:08:54.000000000 -0500
-+++ boost_1_40_0/boost/python/module_init.hpp 2009-08-27 23:41:34.101545900 -0500
-@@ -15,7 +15,7 @@ BOOST_PYTHON_DECL void init_module(char
-
- }}}
-
--# if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE)
-+# if defined(_WIN32) && !defined(BOOST_PYTHON_STATIC_MODULE)
-
- # define BOOST_PYTHON_MODULE_INIT(name) \
- void init_module_##name(); \
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch
deleted file mode 100644
index 969bb814bd104fdc450c848811ff4491f2ddae43..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- boost_1_40_0/boost/regex/v4/fileiter.hpp 2007-11-25 12:07:19.000000000 -0600
-+++ boost_1_40_0/boost/regex/v4/fileiter.hpp 2009-08-27 23:41:34.106546200 -0500
-@@ -28,11 +28,7 @@
-
- #ifndef BOOST_REGEX_NO_FILEITER
-
--#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32)
--#error "Sorry, can't mix with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows"
--#define BOOST_REGEX_FI_WIN32_MAP
--#define BOOST_REGEX_FI_POSIX_DIR
--#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
-+#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
- #define BOOST_REGEX_FI_WIN32_MAP
- #define BOOST_REGEX_FI_WIN32_DIR
- #else
diff --git a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch
deleted file mode 100644
index 1a00851fa92e42ee67b024ef515e9689d959ffed..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-OS_CYGWIN is used to assume cygpath, Win32-isms
-
---- boost_1_48_0/tools/build/src/engine/jam.h
-+++ boost_1_48_0/tools/build/src/engine/jam.h
-@@ -245,7 +245,6 @@
- #endif
- #if defined(__cygwin__) || defined(__CYGWIN__)
- #define OSMINOR "OS=CYGWIN"
-- #define OS_CYGWIN
- #endif
- #if defined(__FreeBSD__) && !defined(__DragonFly__)
- #define OSMINOR "OS=FREEBSD"
diff --git a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch
deleted file mode 100644
index 4bc6ec9d36e164bfebbc216ec74162bf2978a979..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/build/src/tools/python.jam 2012-04-25 22:35:55.000000000 -0500
-+++ b/tools/build/src/tools/python.jam 2013-01-21 07:22:30.814373200 -0600
-@@ -376,7 +376,7 @@ local rule path-to-native ( paths * )
- #
- local rule split-version ( version )
- {
-- local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ;
-+ local major-minor = [ MATCH ^([0-9]+)\.([0-9]+[dmu]*)(.*)$ : $(version) : 1 2 3 ] ;
- if ! $(major-minor[2]) || $(major-minor[3])
- {
- ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ;
diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch
deleted file mode 100644
index 46308a59cb078d1c8adc44c25b54060f25088f0e..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:54.186255800 -0500
-+++ boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:03.887868700 -0500
-@@ -332,7 +332,11 @@ typedef int signed_size_type;
- # define BOOST_ASIO_OS_DEF_MSG_OOB MSG_OOB
- # define BOOST_ASIO_OS_DEF_MSG_PEEK MSG_PEEK
- # define BOOST_ASIO_OS_DEF_MSG_DONTROUTE MSG_DONTROUTE
-+#ifdef MSG_EOR
- # define BOOST_ASIO_OS_DEF_MSG_EOR MSG_EOR
-+#else
-+# define BOOST_ASIO_OS_DEF_MSG_EOR 0
-+#endif
- # define BOOST_ASIO_OS_DEF_SHUT_RD SHUT_RD
- # define BOOST_ASIO_OS_DEF_SHUT_WR SHUT_WR
- # define BOOST_ASIO_OS_DEF_SHUT_RDWR SHUT_RDWR
diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch
deleted file mode 100644
index df3edf51e7b9ae73af32708b34b308681bae8852..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- boost_1_55_0/boost/detail/interlocked.hpp 2013-10-24 09:01:53.000000000 -0500
-+++ boost_1_55_0/boost/detail/interlocked.hpp 2014-08-31 13:01:33.830313500 -0500
-@@ -160,7 +160,7 @@ extern "C" void* __cdecl _InterlockedExc
- ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange)))
- # endif
-
--#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
-+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
-
- #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport)
-
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch
deleted file mode 100644
index 3702d475c8e9aa3ba89278489a7b27a8adeb8a06..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch
+++ /dev/null
@@ -1,1835 +0,0 @@
---- boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2015-05-04 17:33:18.798985800 -0500
-@@ -42,7 +42,7 @@ protected:
- BOOST_ASIO_DECL static void init_native_buffer(
- native_buffer_type& buf,
- const boost::asio::const_buffer& buffer);
--#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#elif defined(BOOST_ASIO_WINDOWS)
- // The maximum number of buffers to support in a single operation.
- enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
-
-@@ -61,7 +61,7 @@ protected:
- buf.buf = const_cast(boost::asio::buffer_cast(buffer));
- buf.len = static_cast(boost::asio::buffer_size(buffer));
- }
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- // The maximum number of buffers to support in a single operation.
- enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
-
-@@ -92,7 +92,7 @@ protected:
- boost::asio::buffer_cast(buffer)));
- iov.iov_len = boost::asio::buffer_size(buffer);
- }
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- };
-
- // Helper class to translate buffers into the native buffer representation.
---- boost_1_57_0/boost/asio/detail/config.hpp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/config.hpp 2015-05-04 17:34:30.756623300 -0500
-@@ -474,7 +474,7 @@
- #endif // !defined(BOOST_ASIO_WINDOWS)
-
- // Windows: target OS version.
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS)
- # if defined(_MSC_VER) || defined(__BORLANDC__)
- # pragma message( \
-@@ -512,29 +512,29 @@
- # error You must add -D__USE_W32_SOCKETS to your compiler options.
- # endif // !defined(__USE_W32_SOCKETS)
- # endif // defined(__CYGWIN__)
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- // Windows: minimise header inclusion.
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN)
- # if !defined(WIN32_LEAN_AND_MEAN)
- # define WIN32_LEAN_AND_MEAN
- # endif // !defined(WIN32_LEAN_AND_MEAN)
- # endif // !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN)
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- // Windows: suppress definition of "min" and "max" macros.
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- # if !defined(BOOST_ASIO_NO_NOMINMAX)
- # if !defined(NOMINMAX)
- # define NOMINMAX 1
- # endif // !defined(NOMINMAX)
- # endif // !defined(BOOST_ASIO_NO_NOMINMAX)
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- // Windows: IO Completion Ports.
- #if !defined(BOOST_ASIO_HAS_IOCP)
--# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# if defined(BOOST_ASIO_WINDOWS)
- # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
- # if !defined(UNDER_CE)
- # if !defined(BOOST_ASIO_DISABLE_IOCP)
-@@ -542,7 +542,7 @@
- # endif // !defined(BOOST_ASIO_DISABLE_IOCP)
- # endif // !defined(UNDER_CE)
- # endif // defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
--# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# endif // defined(BOOST_ASIO_WINDOWS)
- #endif // !defined(BOOST_ASIO_HAS_IOCP)
-
- // Linux: epoll, eventfd and timerfd.
-@@ -599,8 +599,7 @@
- #if !defined(BOOST_ASIO_HAS_SERIAL_PORT)
- # if defined(BOOST_ASIO_HAS_IOCP) \
- || !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- # if !defined(__SYMBIAN32__)
- # if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT)
- # define BOOST_ASIO_HAS_SERIAL_PORT 1
-@@ -609,7 +608,6 @@
- # endif // defined(BOOST_ASIO_HAS_IOCP)
- // || !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- #endif // !defined(BOOST_ASIO_HAS_SERIAL_PORT)
-
- // Windows: stream handles.
-@@ -633,11 +631,11 @@
- // Windows: object handles.
- #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE)
- # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE)
--# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# if defined(BOOST_ASIO_WINDOWS)
- # if !defined(UNDER_CE)
- # define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1
- # endif // !defined(UNDER_CE)
--# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# endif // defined(BOOST_ASIO_WINDOWS)
- # endif // !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE)
- #endif // !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE)
-
-@@ -654,12 +652,10 @@
- #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
- # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR)
- # if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- # define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1
- # endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- # endif // !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR)
- #endif // !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
-
-@@ -667,12 +663,10 @@
- #if !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
- # if !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS)
- # if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- # define BOOST_ASIO_HAS_LOCAL_SOCKETS 1
- # endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS)
- #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
-
-@@ -680,12 +674,10 @@
- #if !defined(BOOST_ASIO_HAS_SIGACTION)
- # if !defined(BOOST_ASIO_DISABLE_SIGACTION)
- # if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- # define BOOST_ASIO_HAS_SIGACTION 1
- # endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- # endif // !defined(BOOST_ASIO_DISABLE_SIGACTION)
- #endif // !defined(BOOST_ASIO_HAS_SIGACTION)
-
-@@ -700,7 +692,7 @@
-
- // Can use getaddrinfo() and getnameinfo().
- #if !defined(BOOST_ASIO_HAS_GETADDRINFO)
--# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# if defined(BOOST_ASIO_WINDOWS)
- # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
- # define BOOST_ASIO_HAS_GETADDRINFO 1
- # elif defined(UNDER_CE)
---- boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2015-05-04 17:33:18.826989400 -0500
-@@ -18,8 +18,7 @@
- #include
-
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-
- #include
- #include
-@@ -114,6 +113,5 @@ BOOST_ASIO_DECL int poll_write(int d,
-
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
-
- #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_OPS_HPP
---- boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2015-05-04 17:33:18.830489800 -0500
-@@ -17,7 +17,7 @@
-
- #include
-
--#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#if !defined(BOOST_ASIO_WINDOWS)
-
- #include
- #include
-@@ -116,6 +116,6 @@ private:
-
- #include
-
--#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#endif // !defined(BOOST_ASIO_WINDOWS)
-
- #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_READ_OP_HPP
---- boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2015-05-04 17:33:18.833490200 -0500
-@@ -17,7 +17,7 @@
-
- #include
-
--#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#if !defined(BOOST_ASIO_WINDOWS)
-
- #include
- #include
-@@ -116,6 +116,6 @@ private:
-
- #include
-
--#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#endif // !defined(BOOST_ASIO_WINDOWS)
-
- #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_WRITE_OP_HPP
---- boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2015-05-04 17:33:18.836490600 -0500
-@@ -26,7 +26,7 @@ namespace boost {
- namespace asio {
- namespace detail {
-
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- typedef win_fd_set_adapter fd_set_adapter;
- #else
- typedef posix_fd_set_adapter fd_set_adapter;
---- boost_1_57_0/boost/asio/detail/hash_map.hpp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/hash_map.hpp 2015-05-04 17:33:18.839991000 -0500
-@@ -21,9 +21,9 @@
- #include
- #include
-
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- # include
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- #include
-
-@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value(
- + (reinterpret_cast(p) >> 3);
- }
-
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- inline std::size_t calculate_hash_value(SOCKET s)
- {
- return static_cast(s);
- }
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- // Note: assumes K and V are POD types.
- template
---- boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2015-05-04 17:33:18.843491500 -0500
-@@ -21,8 +21,7 @@
- #include
-
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-
- #include
-
-@@ -448,6 +447,5 @@ int poll_write(int d, state_type state,
-
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
-
- #endif // BOOST_ASIO_DETAIL_IMPL_DESCRIPTOR_OPS_IPP
---- boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2015-05-04 17:33:18.846991900 -0500
-@@ -19,7 +19,6 @@
-
- #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- #if !defined(BOOST_ASIO_WINDOWS)
--#if !defined(__CYGWIN__)
- #if !defined(__SYMBIAN32__)
- #if !defined(BOOST_ASIO_HAS_EVENTFD)
-
-@@ -119,7 +118,6 @@ bool pipe_select_interrupter::reset()
-
- #endif // !defined(BOOST_ASIO_HAS_EVENTFD)
- #endif // !defined(__SYMBIAN32__)
--#endif // !defined(__CYGWIN__)
- #endif // !defined(BOOST_ASIO_WINDOWS)
- #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-
---- boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2015-05-04 17:33:18.849992300 -0500
-@@ -18,8 +18,7 @@
- #include
-
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-
- #include
- #include
-@@ -205,6 +204,5 @@ void reactive_descriptor_service::start_
-
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
-
- #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_DESCRIPTOR_SERVICE_IPP
---- boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2015-05-04 17:33:18.853492700 -0500
-@@ -19,7 +19,7 @@
- #include
-
- #if defined(BOOST_ASIO_HAS_SERIAL_PORT)
--#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#if !defined(BOOST_ASIO_WINDOWS)
-
- #include
- #include
-@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria
-
- #include
-
--#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#endif // !defined(BOOST_ASIO_WINDOWS)
- #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT)
-
- #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_SERIAL_PORT_SERVICE_IPP
---- boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2015-05-04 17:29:21.281324900 -0500
-@@ -187,7 +187,7 @@ void select_reactor::run(bool block, op_
- max_fd = fd_sets_[i].max_descriptor();
- }
-
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- // Connection operations on Windows use both except and write fd_sets.
- have_work_to_do = have_work_to_do || !op_queue_[connect_op].empty();
- fd_sets_[write_op].set(op_queue_[connect_op], ops);
-@@ -196,7 +196,7 @@ void select_reactor::run(bool block, op_
- fd_sets_[except_op].set(op_queue_[connect_op], ops);
- if (fd_sets_[except_op].max_descriptor() > max_fd)
- max_fd = fd_sets_[except_op].max_descriptor();
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- // We can return immediately if there's no work to do and the reactor is
- // not supposed to block.
-@@ -226,11 +226,11 @@ void select_reactor::run(bool block, op_
- // Dispatch all ready operations.
- if (retval > 0)
- {
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- // Connection operations on Windows use both except and write fd_sets.
- fd_sets_[except_op].perform(op_queue_[connect_op], ops);
- fd_sets_[write_op].perform(op_queue_[connect_op], ops);
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- // Exception operations must be processed first to ensure that any
- // out-of-band data is read before normal data.
---- boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2015-05-04 17:33:18.857993300 -0500
-@@ -60,12 +60,10 @@ signal_state* get_signal_state()
- void boost_asio_signal_handler(int signal_number)
- {
- #if defined(BOOST_ASIO_WINDOWS) \
-- || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- || defined(__CYGWIN__)
-+ || defined(BOOST_ASIO_WINDOWS_RUNTIME)
- signal_set_service::deliver_signal(signal_number);
- #else // defined(BOOST_ASIO_WINDOWS)
- // || defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // || defined(__CYGWIN__)
- int saved_errno = errno;
- signal_state* state = get_signal_state();
- signed_size_type result = ::write(state->write_descriptor_,
-@@ -74,7 +72,6 @@ void boost_asio_signal_handler(int signa
- errno = saved_errno;
- #endif // defined(BOOST_ASIO_WINDOWS)
- // || defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // || defined(__CYGWIN__)
-
- #if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION)
- ::signal(signal_number, boost_asio_signal_handler);
-@@ -82,8 +79,7 @@ void boost_asio_signal_handler(int signa
- }
-
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- class signal_set_service::pipe_read_op : public reactor_op
- {
- public:
-@@ -115,30 +111,25 @@ public:
- };
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
-
- signal_set_service::signal_set_service(
- boost::asio::io_service& io_service)
- : io_service_(boost::asio::use_service(io_service)),
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- reactor_(boost::asio::use_service(io_service)),
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- next_(0),
- prev_(0)
- {
- get_signal_state()->mutex_.init();
-
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- reactor_.init_task();
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
-
- for (int i = 0; i < max_signal_number; ++i)
- registrations_[i] = 0;
-@@ -174,8 +165,7 @@ void signal_set_service::fork_service(
- boost::asio::io_service::fork_event fork_ev)
- {
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- signal_state* state = get_signal_state();
- static_mutex::scoped_lock lock(state->mutex_);
-
-@@ -217,11 +207,9 @@ void signal_set_service::fork_service(
- }
- #else // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- (void)fork_ev;
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- }
-
- void signal_set_service::construct(
-@@ -281,12 +269,12 @@ boost::system::error_code signal_set_ser
- if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR)
- # endif // defined(BOOST_ASIO_HAS_SIGACTION)
- {
--# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# if defined(BOOST_ASIO_WINDOWS)
- ec = boost::asio::error::invalid_argument;
--# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# else // defined(BOOST_ASIO_WINDOWS)
- ec = boost::system::error_code(errno,
- boost::asio::error::get_system_category());
--# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# endif // defined(BOOST_ASIO_WINDOWS)
- delete new_registration;
- return ec;
- }
-@@ -351,12 +339,12 @@ boost::system::error_code signal_set_ser
- if (::signal(signal_number, SIG_DFL) == SIG_ERR)
- # endif // defined(BOOST_ASIO_HAS_SIGACTION)
- {
--# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# if defined(BOOST_ASIO_WINDOWS)
- ec = boost::asio::error::invalid_argument;
--# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# else // defined(BOOST_ASIO_WINDOWS)
- ec = boost::system::error_code(errno,
- boost::asio::error::get_system_category());
--# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# endif // defined(BOOST_ASIO_WINDOWS)
- return ec;
- }
- }
-@@ -405,12 +393,12 @@ boost::system::error_code signal_set_ser
- if (::signal(reg->signal_number_, SIG_DFL) == SIG_ERR)
- # endif // defined(BOOST_ASIO_HAS_SIGACTION)
- {
--# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# if defined(BOOST_ASIO_WINDOWS)
- ec = boost::asio::error::invalid_argument;
--# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# else // defined(BOOST_ASIO_WINDOWS)
- ec = boost::system::error_code(errno,
- boost::asio::error::get_system_category());
--# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# endif // defined(BOOST_ASIO_WINDOWS)
- return ec;
- }
- }
-@@ -500,11 +488,11 @@ void signal_set_service::add_service(sig
- signal_state* state = get_signal_state();
- static_mutex::scoped_lock lock(state->mutex_);
-
--#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#if !defined(BOOST_ASIO_WINDOWS)
- // If this is the first service to be created, open a new pipe.
- if (state->service_list_ == 0)
- open_descriptors();
--#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#endif // !defined(BOOST_ASIO_WINDOWS)
-
- // Insert service into linked list of all services.
- service->next_ = state->service_list_;
-@@ -514,8 +502,7 @@ void signal_set_service::add_service(sig
- state->service_list_ = service;
-
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- // Register for pipe readiness notifications.
- int read_descriptor = state->read_descriptor_;
- lock.unlock();
-@@ -523,7 +510,6 @@ void signal_set_service::add_service(sig
- read_descriptor, service->reactor_data_, new pipe_read_op);
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- }
-
- void signal_set_service::remove_service(signal_set_service* service)
-@@ -534,8 +520,7 @@ void signal_set_service::remove_service(
- if (service->next_ || service->prev_ || state->service_list_ == service)
- {
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- // Disable the pipe readiness notifications.
- int read_descriptor = state->read_descriptor_;
- lock.unlock();
-@@ -544,7 +529,6 @@ void signal_set_service::remove_service(
- lock.lock();
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
-
- // Remove service from linked list of all services.
- if (state->service_list_ == service)
-@@ -556,19 +540,18 @@ void signal_set_service::remove_service(
- service->next_ = 0;
- service->prev_ = 0;
-
--#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#if !defined(BOOST_ASIO_WINDOWS)
- // If this is the last service to be removed, close the pipe.
- if (state->service_list_ == 0)
- close_descriptors();
--#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#endif // !defined(BOOST_ASIO_WINDOWS)
- }
- }
-
- void signal_set_service::open_descriptors()
- {
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- signal_state* state = get_signal_state();
-
- int pipe_fds[2];
-@@ -593,14 +576,12 @@ void signal_set_service::open_descriptor
- }
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- }
-
- void signal_set_service::close_descriptors()
- {
- #if !defined(BOOST_ASIO_WINDOWS) \
-- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
-- && !defined(__CYGWIN__)
-+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- signal_state* state = get_signal_state();
-
- if (state->read_descriptor_ != -1)
-@@ -612,7 +593,6 @@ void signal_set_service::close_descripto
- state->write_descriptor_ = -1;
- #endif // !defined(BOOST_ASIO_WINDOWS)
- // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-- // && !defined(__CYGWIN__)
- }
-
- void signal_set_service::start_wait_op(
---- boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2015-05-04 17:32:20.048025400 -0500
-@@ -33,12 +33,12 @@
- # include
- #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME)
-
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) \
-+#if defined(BOOST_ASIO_WINDOWS) \
- || defined(__MACH__) && defined(__APPLE__)
- # if defined(BOOST_ASIO_HAS_PTHREADS)
- # include
- # endif // defined(BOOST_ASIO_HAS_PTHREADS)
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- // || defined(__MACH__) && defined(__APPLE__)
-
- #include
-@@ -50,9 +50,9 @@ namespace socket_ops {
-
- #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- struct msghdr { int msg_namelen; };
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- #if defined(__hpux)
- // HP-UX doesn't declare these functions extern "C", so they are declared again
-@@ -65,7 +65,7 @@ extern "C" unsigned int if_nametoindex(c
-
- inline void clear_last_error()
- {
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- WSASetLastError(0);
- #else
- errno = 0;
-@@ -78,7 +78,7 @@ template
- inline ReturnType error_wrapper(ReturnType return_value,
- boost::system::error_code& ec)
- {
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- ec = boost::system::error_code(WSAGetLastError(),
- boost::asio::error::get_system_category());
- #else
-@@ -313,11 +313,11 @@ int close(socket_type s, state_type& sta
- }
-
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- result = error_wrapper(::closesocket(s), ec);
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- result = error_wrapper(::close(s), ec);
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- if (result != 0
- && (ec == boost::asio::error::would_block
-@@ -329,10 +329,10 @@ int close(socket_type s, state_type& sta
- // current OS where this behaviour is seen, Windows, says that the socket
- // remains open. Therefore we'll put the descriptor back into blocking
- // mode and have another attempt at closing it.
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- ioctl_arg_type arg = 0;
- ::ioctlsocket(s, FIONBIO, &arg);
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- # if defined(__SYMBIAN32__)
- int flags = ::fcntl(s, F_GETFL, 0);
- if (flags >= 0)
-@@ -341,15 +341,15 @@ int close(socket_type s, state_type& sta
- ioctl_arg_type arg = 0;
- ::ioctl(s, FIONBIO, &arg);
- # endif // defined(__SYMBIAN32__)
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- state &= ~non_blocking;
-
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- result = error_wrapper(::closesocket(s), ec);
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- result = error_wrapper(::close(s), ec);
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- }
- }
-
-@@ -368,7 +368,7 @@ bool set_user_non_blocking(socket_type s
- }
-
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- ioctl_arg_type arg = (value ? 1 : 0);
- int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec);
- #elif defined(__SYMBIAN32__)
-@@ -421,7 +421,7 @@ bool set_internal_non_blocking(socket_ty
- }
-
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- ioctl_arg_type arg = (value ? 1 : 0);
- int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec);
- #elif defined(__SYMBIAN32__)
-@@ -543,7 +543,6 @@ bool non_blocking_connect(socket_type s,
- // Check if the connect operation has finished. This is required since we may
- // get spurious readiness notifications from the reactor.
- #if defined(BOOST_ASIO_WINDOWS) \
-- || defined(__CYGWIN__) \
- || defined(__SYMBIAN32__)
- fd_set write_fds;
- FD_ZERO(&write_fds);
-@@ -556,7 +555,6 @@ bool non_blocking_connect(socket_type s,
- zero_timeout.tv_usec = 0;
- int ready = ::select(s + 1, 0, &write_fds, &except_fds, &zero_timeout);
- #else // defined(BOOST_ASIO_WINDOWS)
-- // || defined(__CYGWIN__)
- // || defined(__SYMBIAN32__)
- pollfd fds;
- fds.fd = s;
-@@ -564,7 +562,6 @@ bool non_blocking_connect(socket_type s,
- fds.revents = 0;
- int ready = ::poll(&fds, 1, 0);
- #endif // defined(BOOST_ASIO_WINDOWS)
-- // || defined(__CYGWIN__)
- // || defined(__SYMBIAN32__)
- if (ready == 0)
- {
-@@ -593,7 +590,7 @@ bool non_blocking_connect(socket_type s,
- int socketpair(int af, int type, int protocol,
- socket_type sv[2], boost::system::error_code& ec)
- {
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- (void)(af);
- (void)(type);
- (void)(protocol);
-@@ -619,11 +616,11 @@ bool sockatmark(socket_type s, boost::sy
-
- #if defined(SIOCATMARK)
- ioctl_arg_type value = 0;
--# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# if defined(BOOST_ASIO_WINDOWS)
- int result = error_wrapper(::ioctlsocket(s, SIOCATMARK, &value), ec);
--# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# else // defined(BOOST_ASIO_WINDOWS)
- int result = error_wrapper(::ioctl(s, SIOCATMARK, &value), ec);
--# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# endif // defined(BOOST_ASIO_WINDOWS)
- if (result == 0)
- ec = boost::system::error_code();
- # if defined(ENOTTY)
-@@ -648,11 +645,11 @@ size_t available(socket_type s, boost::s
- }
-
- ioctl_arg_type value = 0;
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- int result = error_wrapper(::ioctlsocket(s, FIONREAD, &value), ec);
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- int result = error_wrapper(::ioctl(s, FIONREAD, &value), ec);
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- if (result == 0)
- ec = boost::system::error_code();
- #if defined(ENOTTY)
-@@ -689,32 +686,32 @@ inline void init_buf_iov_base(T& base, v
- base = static_cast(addr);
- }
-
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- typedef WSABUF buf;
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- typedef iovec buf;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- void init_buf(buf& b, void* data, size_t size)
- {
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- b.buf = static_cast(data);
- b.len = static_cast(size);
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- init_buf_iov_base(b.iov_base, data);
- b.iov_len = size;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- }
-
- void init_buf(buf& b, const void* data, size_t size)
- {
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- b.buf = static_cast(const_cast(data));
- b.len = static_cast(size);
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- init_buf_iov_base(b.iov_base, const_cast(data));
- b.iov_len = size;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- }
-
- inline void init_msghdr_msg_name(void*& name, socket_addr_type* addr)
-@@ -743,7 +740,7 @@ signed_size_type recv(socket_type s, buf
- int flags, boost::system::error_code& ec)
- {
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- // Receive some data.
- DWORD recv_buf_count = static_cast(count);
- DWORD bytes_transferred = 0;
-@@ -758,7 +755,7 @@ signed_size_type recv(socket_type s, buf
- return socket_error_retval;
- ec = boost::system::error_code();
- return bytes_transferred;
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- msghdr msg = msghdr();
- msg.msg_iov = bufs;
- msg.msg_iovlen = static_cast(count);
-@@ -766,7 +763,7 @@ signed_size_type recv(socket_type s, buf
- if (result >= 0)
- ec = boost::system::error_code();
- return result;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- }
-
- size_t sync_recv(socket_type s, state_type state, buf* bufs,
-@@ -889,7 +886,7 @@ signed_size_type recvfrom(socket_type s,
- boost::system::error_code& ec)
- {
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- // Receive some data.
- DWORD recv_buf_count = static_cast(count);
- DWORD bytes_transferred = 0;
-@@ -906,7 +903,7 @@ signed_size_type recvfrom(socket_type s,
- return socket_error_retval;
- ec = boost::system::error_code();
- return bytes_transferred;
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- msghdr msg = msghdr();
- init_msghdr_msg_name(msg.msg_name, addr);
- msg.msg_namelen = static_cast(*addrlen);
-@@ -917,7 +914,7 @@ signed_size_type recvfrom(socket_type s,
- if (result >= 0)
- ec = boost::system::error_code();
- return result;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- }
-
- size_t sync_recvfrom(socket_type s, state_type state, buf* bufs,
-@@ -1014,10 +1011,10 @@ signed_size_type recvmsg(socket_type s,
- int in_flags, int& out_flags, boost::system::error_code& ec)
- {
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- out_flags = 0;
- return socket_ops::recv(s, bufs, count, in_flags, ec);
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- msghdr msg = msghdr();
- msg.msg_iov = bufs;
- msg.msg_iovlen = static_cast(count);
-@@ -1030,7 +1027,7 @@ signed_size_type recvmsg(socket_type s,
- else
- out_flags = 0;
- return result;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- }
-
- size_t sync_recvmsg(socket_type s, state_type state,
-@@ -1126,7 +1123,7 @@ signed_size_type send(socket_type s, con
- int flags, boost::system::error_code& ec)
- {
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- // Send the data.
- DWORD send_buf_count = static_cast(count);
- DWORD bytes_transferred = 0;
-@@ -1141,7 +1138,7 @@ signed_size_type send(socket_type s, con
- return socket_error_retval;
- ec = boost::system::error_code();
- return bytes_transferred;
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- msghdr msg = msghdr();
- msg.msg_iov = const_cast(bufs);
- msg.msg_iovlen = static_cast(count);
-@@ -1152,7 +1149,7 @@ signed_size_type send(socket_type s, con
- if (result >= 0)
- ec = boost::system::error_code();
- return result;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- }
-
- size_t sync_send(socket_type s, state_type state, const buf* bufs,
-@@ -1253,7 +1250,7 @@ signed_size_type sendto(socket_type s, c
- boost::system::error_code& ec)
- {
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- // Send the data.
- DWORD send_buf_count = static_cast(count);
- DWORD bytes_transferred = 0;
-@@ -1268,7 +1265,7 @@ signed_size_type sendto(socket_type s, c
- return socket_error_retval;
- ec = boost::system::error_code();
- return bytes_transferred;
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- msghdr msg = msghdr();
- init_msghdr_msg_name(msg.msg_name, addr);
- msg.msg_namelen = static_cast(addrlen);
-@@ -1281,7 +1278,7 @@ signed_size_type sendto(socket_type s, c
- if (result >= 0)
- ec = boost::system::error_code();
- return result;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- }
-
- size_t sync_sendto(socket_type s, state_type state, const buf* bufs,
-@@ -1358,7 +1355,7 @@ socket_type socket(int af, int type, int
- boost::system::error_code& ec)
- {
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- socket_type s = error_wrapper(::WSASocketW(af, type, protocol, 0, 0,
- WSA_FLAG_OVERLAPPED), ec);
- if (s == invalid_socket)
-@@ -1556,7 +1553,7 @@ int getsockopt(socket_type s, state_type
- }
- ec = boost::asio::error::fault;
- return socket_error_retval;
--#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#elif defined(BOOST_ASIO_WINDOWS)
- clear_last_error();
- int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen,
- s, level, optname, optval, optlen), ec);
-@@ -1574,7 +1571,7 @@ int getsockopt(socket_type s, state_type
- if (result == 0)
- ec = boost::system::error_code();
- return result;
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- clear_last_error();
- int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen,
- s, level, optname, optval, optlen), ec);
-@@ -1593,7 +1590,7 @@ int getsockopt(socket_type s, state_type
- if (result == 0)
- ec = boost::system::error_code();
- return result;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- }
-
- template
-@@ -1615,7 +1612,7 @@ int getpeername(socket_type s, socket_ad
- return socket_error_retval;
- }
-
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- if (cached)
- {
- // Check if socket is still connected.
-@@ -1636,9 +1633,9 @@ int getpeername(socket_type s, socket_ad
- ec = boost::system::error_code();
- return 0;
- }
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- (void)cached;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- clear_last_error();
- int result = error_wrapper(call_getpeername(
-@@ -1685,7 +1682,7 @@ int ioctl(socket_type s, state_type& sta
- }
-
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec);
- #elif defined(__MACH__) && defined(__APPLE__) \
- || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-@@ -1726,7 +1723,7 @@ int select(int nfds, fd_set* readfds, fd
- fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec)
- {
- clear_last_error();
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- if (!readfds && !writefds && !exceptfds && timeout)
- {
- DWORD milliseconds = timeout->tv_sec * 1000 + timeout->tv_usec / 1000;
-@@ -1746,7 +1743,7 @@ int select(int nfds, fd_set* readfds, fd
- if (timeout && timeout->tv_sec == 0
- && timeout->tv_usec > 0 && timeout->tv_usec < 1000)
- timeout->tv_usec = 1000;
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
-
- #if defined(__hpux) && defined(__SELECT)
- timespec ts;
-@@ -1772,7 +1769,6 @@ int poll_read(socket_type s, state_type
- }
-
- #if defined(BOOST_ASIO_WINDOWS) \
-- || defined(__CYGWIN__) \
- || defined(__SYMBIAN32__)
- fd_set fds;
- FD_ZERO(&fds);
-@@ -1784,7 +1780,6 @@ int poll_read(socket_type s, state_type
- clear_last_error();
- int result = error_wrapper(::select(s + 1, &fds, 0, 0, timeout), ec);
- #else // defined(BOOST_ASIO_WINDOWS)
-- // || defined(__CYGWIN__)
- // || defined(__SYMBIAN32__)
- pollfd fds;
- fds.fd = s;
-@@ -1794,7 +1789,6 @@ int poll_read(socket_type s, state_type
- clear_last_error();
- int result = error_wrapper(::poll(&fds, 1, timeout), ec);
- #endif // defined(BOOST_ASIO_WINDOWS)
-- // || defined(__CYGWIN__)
- // || defined(__SYMBIAN32__)
- if (result == 0)
- ec = (state & user_set_non_blocking)
-@@ -1813,7 +1807,6 @@ int poll_write(socket_type s, state_type
- }
-
- #if defined(BOOST_ASIO_WINDOWS) \
-- || defined(__CYGWIN__) \
- || defined(__SYMBIAN32__)
- fd_set fds;
- FD_ZERO(&fds);
-@@ -1825,7 +1818,6 @@ int poll_write(socket_type s, state_type
- clear_last_error();
- int result = error_wrapper(::select(s + 1, 0, &fds, 0, timeout), ec);
- #else // defined(BOOST_ASIO_WINDOWS)
-- // || defined(__CYGWIN__)
- // || defined(__SYMBIAN32__)
- pollfd fds;
- fds.fd = s;
-@@ -1835,7 +1827,6 @@ int poll_write(socket_type s, state_type
- clear_last_error();
- int result = error_wrapper(::poll(&fds, 1, timeout), ec);
- #endif // defined(BOOST_ASIO_WINDOWS)
-- // || defined(__CYGWIN__)
- // || defined(__SYMBIAN32__)
- if (result == 0)
- ec = (state & user_set_non_blocking)
-@@ -1854,7 +1845,6 @@ int poll_connect(socket_type s, boost::s
- }
-
- #if defined(BOOST_ASIO_WINDOWS) \
-- || defined(__CYGWIN__) \
- || defined(__SYMBIAN32__)
- fd_set write_fds;
- FD_ZERO(&write_fds);
-@@ -1869,7 +1859,6 @@ int poll_connect(socket_type s, boost::s
- ec = boost::system::error_code();
- return result;
- #else // defined(BOOST_ASIO_WINDOWS)
-- // || defined(__CYGWIN__)
- // || defined(__SYMBIAN32__)
- pollfd fds;
- fds.fd = s;
-@@ -1881,7 +1870,6 @@ int poll_connect(socket_type s, boost::s
- ec = boost::system::error_code();
- return result;
- #endif // defined(BOOST_ASIO_WINDOWS)
-- // || defined(__CYGWIN__)
- // || defined(__SYMBIAN32__)
- }
-
-@@ -1926,7 +1914,7 @@ const char* inet_ntop(int af, const void
- ec = boost::asio::error::address_family_not_supported;
- return 0;
- }
--#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#elif defined(BOOST_ASIO_WINDOWS)
- using namespace std; // For memcpy.
-
- if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6))
-@@ -1981,7 +1969,7 @@ const char* inet_ntop(int af, const void
- ec = boost::asio::error::invalid_argument;
-
- return result == socket_error_retval ? 0 : dest;
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
- const char* result = error_wrapper(::inet_ntop(
- af, src, dest, static_cast