diff options
Diffstat (limited to 'pkgs')
54 files changed, 1364 insertions, 665 deletions
diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index 3c3198e17348..e3f1b6acf874 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -40,15 +40,6 @@ stdenv.mkDerivation rec { substituteInPlace "chibios/os/various/shell.c" \ --replace "#ifdef __DATE__" "#if 0" - # Hardcode full path to compiler tools - for f in "firmware/Makefile.patch" \ - "firmware/Makefile" \ - "firmware/flasher/Makefile" \ - "firmware/mounter/Makefile"; do - substituteInPlace "$f" \ - --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-" - done - # Hardcode path to "make" for f in "firmware/compile_firmware_linux.sh" \ "firmware/compile_patch_linux.sh"; do diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix new file mode 100644 index 000000000000..e528e9699a73 --- /dev/null +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk_pixbuf }: + +stdenv.mkDerivation rec { + version = "2018-10-11"; + name = "cmusfm-unstable-${version}"; + src = fetchFromGitHub { + owner = "Arkq"; + repo = "cmusfm"; + rev = "ad2fd0aad3f4f1a25add1b8c2f179e8859885873"; + sha256 = "0wpwdwgyrp64nvwc6shy0n387p31j6aw6cnmfi9x2y1jhl5hbv6b"; + }; + # building + configureFlags = [ "--enable-libnotify" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ curl libnotify gdk_pixbuf ]; + + meta = with stdenv.lib; { + description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player"; + longDescription = '' + Features: + + Listening now notification support + + Off-line played track cache for later submission + + POSIX ERE-based file name parser + + Desktop notification support (optionally) + + Customizable scrobbling service + + Small memory footprint + Configuration: + + run `cmusfm init` to generate configuration file under ~/.config/cmus/cmusfm.conf + + Inside cmus run `:set status_display_program=cmusfm` to set up cmusfm + ''; + homepage = https://github.com/Arkq/cmusfm/; + maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 4d4cb0239bf3..87ffd3256a88 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3 +{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3 , granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3 , discount, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "quilter"; - version = "1.6.3"; + version = "1.6.8"; name = "${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1wa0i6dgg6fgb7q9z33v9qmn1a1dn3ik58v1f3a49dvd5xyf8q6q"; + sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5"; }; nativeBuildInputs = [ @@ -22,40 +22,19 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ discount + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + gnome3.libgee granite gtk3 gtksourceview gtkspell3 webkitgtk - gnome3.libgee - ]; - - patches = [ - # Fix build with vala 0.42 - Drop these in next release - (fetchpatch { - url = "https://github.com/lainsce/quilter/commit/a58838213cd7f2d33048c7b34b96dc8875612624.patch"; - sha256 = "1a4w1zql4zfk8scgrrssrm9n3sh5fsc1af5zvrqk8skbv7f2c80n"; - }) - (fetchpatch { - url = "https://github.com/lainsce/quilter/commit/d1800ce830343a1715bc83da3339816554896be5.patch"; - sha256 = "0xl5iz8bgx5661vbbq8qa1wkfvw9d3da67x564ckjfi05zq1vddz"; - }) - # Correct libMarkdown dependency discovery: See https://github.com/lainsce/quilter/pull/170 - (fetchpatch { - url = "https://github.com/lainsce/quilter/commit/8b1f3a60bd14cb86c1c62f9917c5f0c12bc4e459.patch"; - sha256 = "1kjc6ygf9yjvqfa4xhzxiava3338swp9wbjhpfaa3pyz3ayh188n"; - }) - # post_install script cleanups: See https://github.com/lainsce/quilter/pull/171 - (fetchpatch { - url = "https://github.com/lainsce/quilter/commit/55bf3b10cd94fcc40b0867bbdb1931a09f577922.patch"; - sha256 = "1330amichaif2qfrh4qkxwqbcpr87ipik7vzjbjdm2bv3jz9353r"; - }) ]; postPatch = '' @@ -65,9 +44,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Focus on your writing - designed for elementary OS"; - homepage = https://github.com/lainsce/quilter; - license = licenses.gpl2Plus; + homepage = https://github.com/lainsce/quilter; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 808ff2d6f610..f529fa395d93 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 = "14289"; + version = "14382"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "102dph3479qskzf72cpb9139pq9ifka6pzna1c6s5rs2il6mfvsb"; + sha256 = "1a2nx9jr1fvw95gdvl9kj3z0cs6ndafm0k4l0lwfx9p9qn4lgzjg"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 59ba45e6f376..09c49135ca1c 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite +{ stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite , gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "notejot"; - version = "1.4.5"; + version = "1.4.7"; name = "${pname}-${version}"; @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee granite gtk3 @@ -39,9 +40,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stupidly-simple sticky notes applet"; - homepage = https://github.com/lainsce/notejot; - license = licenses.gpl2Plus; + homepage = https://github.com/lainsce/notejot; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 0aecc43d1e53..95a2f2b940c2 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -42,6 +42,7 @@ in stdenv.mkDerivation { # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" + "-DNANO=OFF" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index c1b1cfb48a28..6f056292d775 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -3,47 +3,51 @@ , gettext , libxml2 , pkgconfig -, gtk3 +, glib , granite +, gtk3 , gnome3 -, cmake +, meson , ninja -, vala -, elementary-cmake-modules +, gobjectIntrospection +, gsettings-desktop-schemas +, vala_0_40 , wrapGAppsHook }: stdenv.mkDerivation rec { name = "regextester-${version}"; - version = "0.1.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "artemanufrij"; repo = "regextester"; rev = version; - sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n"; + sha256 = "1xwwv1hccni1mrbl58f7ly4qfq6738vn24bcbl2q346633cd7kx3"; }; - XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ - "${granite}/share" - "${gnome3.libgee}/share" - ]; - nativeBuildInputs = [ pkgconfig - wrapGAppsHook - vala - cmake + meson ninja gettext + gobjectIntrospection libxml2 - elementary-cmake-modules + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + wrapGAppsHook ]; buildInputs = [ - gtk3 + glib granite + gtk3 + gnome3.defaultIconTheme gnome3.libgee + gsettings-desktop-schemas ]; + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + meta = with stdenv.lib; { description = "A desktop application to test regular expressions interactively"; homepage = https://github.com/artemanufrij/regextester; diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 261d067eb1d0..421fc652a328 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -11,8 +11,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.17.0"; - sha256 = "1zmywmcgfmx5ccp0qxj912sqymisxdg2s84b4qclfa225hrbaqpn"; + version = "1.21.0"; + sha256 = "17853l2s5z1y2g24wdkapdp26hw0sx5w73y118h0px85fiwhkq79"; }; archive = { @@ -39,15 +39,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.38.0"; - sha256 = "1jhr2l8p7wf7kgr2y0c40n1jb9p2153xkpcp4b2half2vhsh1nwi"; + version = "1.42.0"; + sha256 = "1wi1m7i6vq53p36x1prax4yaz400834024q494zg0ckk4rvngfp6"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.15.0"; - sha256 = "1pdmj0ww5y2nwxivlf5l886nwd76hpqhwdayab2fp16zyl1qbpfd"; + version = "1.17.0"; + sha256 = "03sjlqkwy0qa382sjwi21g6h2fz1mpsiqcd4naj5zh76fkp8aslw"; }; azurestack = { @@ -88,8 +88,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-circonus"; - version = "0.1.1"; - sha256 = "05n1q9hc0h31icxsmyi2y60wiwd5fs2hz1dqm3bl6hgh5x3ss1im"; + version = "0.2.0"; + sha256 = "1vcia3p31cgdwjs06k4244bk7ib2qp1f2lhc7hmyhdfi1c8jym45"; }; clc = { @@ -102,8 +102,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.5.0"; - sha256 = "0l8bmnxmjr2g3xxw8w0ay91cvs4kzc65wkdwybfahvq9r6mww45n"; + version = "1.7.0"; + sha256 = "0sqq6miwyh6z86b3wq2bhkaj4x39g2nqq784py8nm8gvs06gcm5a"; }; cloudscale = { @@ -130,22 +130,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-consul"; - version = "2.1.0"; - sha256 = "1qm29vj8ms37zb4b3bhdv4b4vrl0am134zmc654lb2g582cnj9yw"; + version = "2.2.0"; + sha256 = "13jwvf7n7238pzvdq9m6vnl9vqa9hkr1mrcf9sa1q9lxkim9ijfk"; }; datadog = { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.3.0"; - sha256 = "0d3xccfkzibjp4jl8irja1cdhppdn3b7nh4wy857zvfxpfhz7aj2"; + version = "1.4.0"; + sha256 = "06ik2k0jkm4200d8njpsidwfjl12ikn5ciqkmlxfwr3b8s1w8kpa"; }; digitalocean = { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - version = "0.1.3"; - sha256 = "10crxciw7y2gnm8vqp007vw0k7c1a1xk2z2zsjr5rksk6qlnri4k"; + version = "1.0.2"; + sha256 = "0ilkdnadzsidq8hia5wk4jyk6034pmajrpkgwf4ryz7kx41vy2g6"; }; dme = { @@ -172,8 +172,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "1.0.1"; - sha256 = "1q5bsdvp47gvpiyqlzgrpxczlh6m9g870pn84ks49xfkwk5izpz6"; + version = "1.1.0"; + sha256 = "1ba9z9fd69hpg6kg30nf95zzskzipi74s1aadywc068gfrkdm9jj"; }; dyn = { @@ -193,15 +193,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.3.0"; - sha256 = "1hh4s81g256iy1rvp9snqbyhidz8n6p7pzanlxp89ffrq9p32sp0"; + version = "0.4.0"; + sha256 = "1fkn9b6ibs36cmhknb3x05g31rf73w70xwx05rh9fhybrz5dd9z9"; }; flexibleengine = { owner = "terraform-providers"; repo = "terraform-provider-flexibleengine"; - version = "1.1.0"; - sha256 = "07g6kc211crxf9nvgvghg05jdahd1fb09lpwfcps9ph259pwwam3"; + version = "1.2.1"; + sha256 = "000v6fmmnwfibzfssk23s9qwrb8a9l0j1qd14x2dqsc7ql0kbnz8"; }; github = { @@ -221,8 +221,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.18.0"; - sha256 = "0zwy1imby0xqvb86a82rdvglipf2sfpi3rmsj72iikp7vi3mqk64"; + version = "1.19.1"; + sha256 = "1n2a1y9103xkndmvr5cvj7i1m8s9lv61vgijgk3m2f73pb4znak0"; }; grafana = { @@ -235,15 +235,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.3.0"; - sha256 = "0sb9pajsy0if18vgw5pllgv8qvb4v7pv65m2f3hfkck2za82ndwb"; + version = "1.4.0"; + sha256 = "00mq6p2y61z4hg9dncf3mj59cp6fx4iqrn86m96wkw346shs6prs"; + }; + helm = + { + owner = "terraform-providers"; + repo = "terraform-provider-helm"; + version = "0.6.2"; + sha256 = "11j4lpzbrdszgkjf1gjyibh9c5w0fly01qdkrflv98ry5csx9q5b"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "1.4.0"; - sha256 = "159a9add5v4dj2bry1b85i74q2lb4pjjypkm5hzrbqys6gn2imhn"; + version = "1.5.0"; + sha256 = "0hzzhqd87vkcbzndsn15g4nl3qhv2kvnhs9zv6kbxaxm7p7rm3pz"; }; http = { @@ -284,8 +291,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - version = "1.2.0"; - sha256 = "0slvhj8f7p27r9v4vb5vjyqpmzlpaji1djzwsxsf247df68mka61"; + version = "1.3.0"; + sha256 = "0fhh0r92whcxqz4z2kb6qx9dyygms5mz7ifhb9c7s2r22jnfz1j3"; }; librato = { @@ -294,6 +301,13 @@ version = "0.1.0"; sha256 = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923"; }; + linode = + { + owner = "terraform-providers"; + repo = "terraform-provider-linode"; + version = "1.1.0"; + sha256 = "19c269w8jjx04a8rhm4x7bg2xad3y0s74wgis446mwaw7mhla3l3"; + }; local = { owner = "terraform-providers"; @@ -340,8 +354,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - version = "1.0.1"; - sha256 = "0g4fd2rvx90f2bmjl6jjdvrsx7ayhf30vj9y3mklhxgsd9x83wpq"; + version = "1.1.0"; + sha256 = "040pxbr4xp0h6s0njdwy0phlkblnk5p3xrcms2gkwyzkqpd82s8b"; }; nomad = { @@ -371,12 +385,19 @@ version = "1.0.0"; sha256 = "12vpa09xrq8z1pjq0bwzq3889c4fl6c5kvynwqy0z1pdx21m60ha"; }; + nutanix = + { + owner = "terraform-providers"; + repo = "terraform-provider-nutanix"; + version = "1.0.0"; + sha256 = "16nky5ryyjvv7vny18ymxvy20ivwmqw7lagnz48pq8mnwwrp5541"; + }; oci = { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.1.1"; - sha256 = "0wrvb44gs0c1khvam5lrq53l2889japg7d4nyk2hrpywy9japc8m"; + version = "3.5.0"; + sha256 = "0f4m6rahis1n62w0h0amg8sjs5bb3ifnrfzq1dys7r01k5411wcf"; }; oneandone = { @@ -389,22 +410,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.2.1"; - sha256 = "0mnvi47kbdwwpfzdlcd1mhd15w5b0ivwxi1a5lvs0zyqf0g0cas8"; + version = "1.3.0"; + sha256 = "1ksqjfp6gxgrpc9gcs9jv3wj5058z93h7prv4mhvc2bilal4gc0p"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.9.0"; - sha256 = "0prmdj78jsyrns876cglfp8a3dbpfl33bwb0dj072flh4yknfrdr"; + version = "1.11.0"; + sha256 = "1wqb7q10nyr4jy9ny4giazblwhh3qrn4s1f0xb5q702b5igbfwwm"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.1.0"; - sha256 = "04pcgygcz2ld5hp7f29j2z3d4ypy4fm4m1zbbs9l9gc3fya88iny"; + version = "1.2.0"; + sha256 = "05w899l18gmdywfhakjvaxqxxzd9cxga3s932ljfibr0ssipkhh9"; }; opsgenie = { @@ -431,8 +452,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.2.4"; - sha256 = "11ga29d5bzmn6rzlb6sb28nh1zbbwglinzn185pysqx6n21l6wva"; + version = "1.2.5"; + sha256 = "1c40w1q18piip4fn572mnf67g07h6g03hnin23c7jw265m4yr222"; }; pagerduty = { @@ -445,8 +466,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-panos"; - version = "1.4.0"; - sha256 = "033xpglbn0q805b129kf1ywl13m4pgrkwlvgl347nldysryiasxq"; + version = "1.4.1"; + sha256 = "1mlz01v01675cf9ja8i42c6ssklf65kd8wpjzf0j472lfwki4xpp"; }; postgresql = { @@ -508,15 +529,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-runscope"; - version = "0.4.0"; - sha256 = "1n3q2hdwvkkn5rphrcl5qfv4ry2mrr13dcjwzhbym2i1nhpxkld0"; + version = "0.5.0"; + sha256 = "0n0m39gaiwhqigjny51a7g36ldik33alimkqqbv6hqyzrhk0qs8h"; }; scaleway = { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.6.0"; - sha256 = "1ykcakfw0gp239jp4brpjynxzzvlhldfpv12hkgymj22s37n5jnn"; + version = "1.7.0"; + sha256 = "0gsjvpwfw2sc6ncy8v3j6gs0aanq3b08j3gid43687mfd782f4gk"; }; softlayer = { @@ -553,6 +574,13 @@ version = "1.0.0"; sha256 = "0jl6bp6gwg96sdk5j6s13vv1j9gxjpy2yva3barmzv9138i665mz"; }; + tencentcloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-tencentcloud"; + version = "1.2.2"; + sha256 = "1ypsfm48c30szg3zc1sknblhwcnca8aapfgp62bhszyqxq6zq37s"; + }; terraform = { owner = "terraform-providers"; @@ -592,8 +620,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.1.4"; - sha256 = "00i9rl9pnmicvndkmvcmlj6y80341dmkqnhq09f94yljh1w1zpvv"; + version = "1.2.0"; + sha256 = "1z92dcr5b665l69gxs1hw1rizc5znvf0ck1lksphd301l2ywk97b"; }; vcd = { @@ -606,8 +634,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "1.8.1"; - sha256 = "0y6n7mvv1f3jqsxlvf68iq85k69fj7a333203vkvc83dba84aqki"; + version = "1.9.0"; + sha256 = "1by9klwvdw3m854jffimfnsz1lnbaixi4zcv4zzs63dc3flwy2b2"; }; matchbox = { diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a4ffe27102a6..583b6a06aeab 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -113,8 +113,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.8"; - sha256 = "1kdmx21l32vj5kvkimkx0s5mxgmgkdwlgbin4f3iqjflzip0cddh"; + version = "0.11.10"; + sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index a97dfce27448..576fbcc7b8a0 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.2.1"; + version = "60.3.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ar/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ar/thunderbird-60.3.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "026d4f74378ab0c94e14689161187793ec614a3c492a20d41401714d3a51a5478d060d0a6072a48e20dca88e7d0f4853efc293d36999ddfea431de466dcf94d6"; + sha512 = "7cbd8c54fb220ad3f781cbc908d42f2723109786a1d7a947646bcc231e8849035c014335daa4ab85f9cd69646fa870cbfac3a0e0ec45d3fa82d0f0b74591b6a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ast/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ast/thunderbird-60.3.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a9156cd525d072711a78f7c45261d50e9057f1f797fe0847c0b52ebdcb42a9f283432da036c870209aedc37183b2fd4df12527e128f46a06d5eb289bdb11d379"; + sha512 = "936a6366add759a89db391394479ff2e7865248b46c81cf45457ddb6fa6b37660ca9efa6f125fe97b22f6db2cdfae7ad0abefdc3874820fa3ef0bee91f6caa74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/be/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/be/thunderbird-60.3.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d75dc81e7ed655e5bc539362b4ea212ef47bed496c483a6401c8cc52fe2aa7c89f12024ef5364e8e44826c5df2a7cc0eae01a55cbfb22c78b7d29744e05c2389"; + sha512 = "4580436c4719a2ca5821d9676aa6bfd5f2c731cdf0bdc2969fd0177bfd2c3cc2570479de60515e59b152e0aec4611c437fedce7d0bd13c7a06bcebafff0bd20d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/bg/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/bg/thunderbird-60.3.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4302c20cec5239d3cffd1c5756537059f98eb19ebe6332ce255ddeb555f8f07b6ce03c18ccfd2adc7b1a51c954a0ef3dfbd98ca2a5238cf510d4abea48d10df9"; + sha512 = "fafc3c2d186616be2b56e1087df528d3fb93ce431ae24c286c0209177a9dcf5f229ec5aa521d68ae531c5d763ca4c2e339945a7f874825e73ad63f86d13b510b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/br/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/br/thunderbird-60.3.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c22bd6606886c50fd782f1646f03917d9988a76020fc5e1a210e39a771980badcea965332ddc80f6f08fd062be4f08a499cbf7ea3585c78cb7089d40b40b92af"; + sha512 = "71fe4d4e67971bfdc56ff6ad73eecffe15d2b808e07b25a7b4c827094b95afa7c04d451081dc45045e0d1eb83b15a3c8e964186a615f72a0a545dece221318d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ca/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ca/thunderbird-60.3.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7827c61dcc0294b85db7709029021daf52148a9d00b1d06c3a05f2e3591ca1e9e75a84bed3ac01da3a7f4af7bb2842b7574ec519849c8a5cde30600f0d237c85"; + sha512 = "0be271223abd6f0fe79d0914b037cea5ea765ac1486a78922123666bec1ce8ec3bcbfa54c7fa552101adbe4a22bed0628eabed39391e4ca1dbccb118157fbded"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cs/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/cs/thunderbird-60.3.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "dd51fee0d4e2c87e841c1e13aeff54c49e375bb95ed69f539320815cb551d57853032d42346516627024f88ba77154a8f1aeba651f3e90b5d5ef206dfeb23c5b"; + sha512 = "5d9f911af1f29928ddfb96d114fc7e484370e69f9f1aabdad753dae5ba0b6ad476d7b0c373919a2ccec3c2528f4fc78ee874a72fe691ad3e7d2e3e9e1650f76a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cy/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/cy/thunderbird-60.3.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "29c32c26fc56d1fe7ae47fc93d121b8591e75f0d42b25ef3e1f9d98f3bfa66bdce551d96c8f98f553bca6425173da43f9e9a13f3f006db1259f1b69a68abb7cc"; + sha512 = "18c7dabbcdb5235bcfe0dd01746f39d82d88bc71c2a4c4986ee268d15ab5a5cc060273f4783b2e472dafbcdcd98f29f8ad2c2b33ed87a9a3c484f61dbf0a7492"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/da/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/da/thunderbird-60.3.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f57484cf06388193dbf3e6ec9c8c631829e6e0914dd785fa81b007bcd9789cdffc777d6f5df5939a1e125f66f9cd2a04d0b4a9dac5250aa615c7033bffb70d97"; + sha512 = "f6dcc69ed4509b6d81b856cf6981d7d00e3ca3689f3e28b64b858d64f96ef96196a4b9b2c14ee5292507b5ba00bedbfd5ecf4b2db241068b36d8ee786eacf1c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/de/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/de/thunderbird-60.3.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d12857d40c23f3817809e09e1edf9cf1131939d2aa5e830da2e9a13b4971096f33691deed0a29188510c2f84aeaa2a7ab704f54ced3c79885ea7b883cbd88f49"; + sha512 = "a60ab91787961d405c926027570d161e9f6cfef77f6e8d40a24e97ac5c0c9b515a31dde5b9386e7b2a855f4970ff7533be4252474136e242a998cafab123de66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/dsb/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/dsb/thunderbird-60.3.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c65ce176520eaafe2afe54cf3ff6266bdeaef437c29f82e5580f286c31bb97881fe9724435995b5debd14306332ce2d379e45a30350296473f140d8caaeaee6f"; + sha512 = "c827f7b392fe42cd2f6432870552239bd73e808ddfad10ac2c86968915697dfe119c965469baa6e2098bfd0fb61c36fbb5ed17378e423531b64b0ebd153602d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/el/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/el/thunderbird-60.3.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8aad41efc6bae79e6e5f238ad6209f0cec7ff3ed0f82a4ef22a0e1e12c3ffb2577ff105983b1f1892591e1b2a58f2d8bb8d9ea51051ec930649dfa954341b219"; + sha512 = "287be8c4ca83f7238833cad36de9476907bcf9c8c915626dd0c5114328160e75d95bfe25a0db10900f3c2a727e76f583fe1902a76c208106480fc3349c2ed917"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-GB/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/en-GB/thunderbird-60.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "b75eab236a8749a185083c33b8f28492d903ee84b2b5a9aa3659e04eae7bc72cc93493a6cafa39ca29ebd0c065301e1091d21a23836b41bc4a5b60f4e61f6668"; + sha512 = "aae1c22caeab14d262054af5855f6e983b34fc54e8f9d8cd0f49f5ae7ad3425d74f26025d85b4948a7d519ba771f7298ca7bf14fbd67c3d8ed84f0e9e394b9da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-US/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/en-US/thunderbird-60.3.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "71308c1d6691894ef60144f7bc119709491eaa3af400197e4fec61f25231266b085e925fe1163d6de8d3d1f3ce34475a299968e9405341a9881c512fbd6e4362"; + sha512 = "53b3872c3e4c49080e34540f95d5dec680b2320890601249eeb09e26d8aec66bce8e46e40368c8cfbc6937186a894a078348f64065ead28d32453a310a43891f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-AR/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/es-AR/thunderbird-60.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "061f0ea13b7c213ef2020aa2cf9ebee51b6b72f0de9b65ccb095f7e67152f5325d6806af90b5f600b7498d8cbd18916079e81914affd29308e04de0c7535939e"; + sha512 = "9ae6f2a7c93a1d7a4efa22bdc8f6f5df8fb5a46f42507146eec7ceed6ee47d175d6c7791decc661be0c7d3cfd7513cc9a050138fe6661daf192f5f6064bc6a8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-ES/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/es-ES/thunderbird-60.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "39c7b2806400cd57cd3e778d57f174a45eaa6e15bf1975d7e82f082d31d965e13a43ef130952e00300df9a13470c780c60f0ec9b398210b183593492d30c158a"; + sha512 = "6dcc03919a384f7dcfae1264e3176d57ced792cb40ce7aa469a1c5229c9c97bcc83a0e58947f0ed14ff0ff74ddc529c74e7bcd3e38fb89edcdc4038f491a1c08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/et/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/et/thunderbird-60.3.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "29b0399f7d896b09bb74b9ab78d10686061052493b880f72ee31c00db7cc226e3fe04e9519ff23e139c9644045bf9d6a45a8570d105a9675cbbbc310a930370f"; + sha512 = "eb18921995d209a95444ae213740596ebb0d70d362662741a94a196e75c8b5857ff999ab4c822c95eed1ba3339038b82c725dc46e05d21bc4a5692323a87c589"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/eu/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/eu/thunderbird-60.3.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d53ced6a20ff89966888d9241fe483d0a6a5586ae8da4a6d9584f6298a8c254a06e2e1e4527536e38c42f92cc14b778cc8264f402efa6abbaba6ca52486c5e06"; + sha512 = "5fc6dd684e9f1ec9be951929f2bbed0e75f5e2c0215206496a2efecb361f194a2009fe5bf2e91f09cae63dfc3f08b51e47a2a82d6b59d425df8dcf4ba316b271"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fi/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fi/thunderbird-60.3.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "2fdf8b87cee0829e78d130ebf87b5d4bf62266abf17475d349440f7dca043ff7e1c14feef1f69b630cc81afb42bca52440643d0e2f833ce0a61f19e1c1f25721"; + sha512 = "9da23f9aba9cc5f8939bdcf632f764566acbafc48bd05dc04036eae5fc04f41df506a4f80f3543b60a09b057939c074f3ae9eefc2353f765256dc9e0db1aa8e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fr/thunderbird-60.3.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "288f8346cf90dd666cbb082f1761ad8fdd77a33e43bcca1cfa58c1f84c86bd6c3f7cd6d1d4effdb9ed77c6a50d07b8e5ef3505dc2e2098dc3c38ec32e7fa99c2"; + sha512 = "0c844ef274cf892cadceea78c93efde1f7a110bfd0bdbe3cfdba5c23fef0e2fbb7b3fc3dc59f9b6edbb5c346a6d5ac06b69f4b19541942d09c5d088d6b0e0322"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fy-NL/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fy-NL/thunderbird-60.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "836a74aaf424a93304e12a412f0104ed5d577bd10ad1beceed1b78f2dac65d096103e9999298e25cdb8fea9d616fb4f814ad8c3bca84aeaff0cdcdc38b8763e9"; + sha512 = "0df85e025f9a72255a23ca93a692a0f79a69c9447f8391ff97eea075077a147c6eb164f4851dee47d771dd3db3bacb3dcac71aed91b39fc34dbd65c8ae67bcf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ga-IE/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ga-IE/thunderbird-60.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8c680f783e26193a26c507491b82128b123ed89e73dba328391d18264c5780ad88b9f077d4d12868dab6968f4be7e8f1c0dbe397196b556a5af31c07c1b1072e"; + sha512 = "e1feb134d5ed55269fead90efea01f4d74ab03517def2fb9418435c5c699735d14ef3f64bfd33109b87bedefcb90034b1c12da74b798eb0e6b7bc74766d3f425"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gd/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/gd/thunderbird-60.3.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e5b092f6b1b79b93225c0cae4022bde8452598d8c36b9e5ebd8fb4b9449d265df048526c30a1207b9ebeb7a5ad421ae77085306dbeb9d1d5b9c34decb98da1af"; + sha512 = "3483c8655e81938554d95492952b967770cd659b625c25dc8864e59dfd5b6cc94bef725f495e725d6ceb24bc05edeb1d2c3ce41a303bc313715788ab03b75c9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/gl/thunderbird-60.3.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ec235f57cdc56a66885f2d8098ab9ce80ab3fb87fb30b4c5cc97cde874ae321e326b3ce4fc9e69a6c7f0e61e43cbfb28c0392349151b25ee25a2503e13bf5c3a"; + sha512 = "012ca498f3907f077c9e75e2bceb53fd0a781752b98319cf3b7ccb94a9112896dc2360d45acc440d7c50bdad0a15e125ad8123e13203a3a017e905c2f0e3d252"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/he/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/he/thunderbird-60.3.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fc9f1ef3dd117b6b4198a09997e3e4095036dddcbf50a32b94a36f53ec886bfdb33debaa2c69b68c14ba7af945c1a35891b11fe9ae8602c11842d381bdf0286b"; + sha512 = "1d7f92a0274bed7390ad0f813066dd7d71bd66f03ea8203d71f025a8f8a8fb4480e2b660ecbc052290a27351662d3f7811c1311eb8ff02e63ffc5f0c8745edfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hr/thunderbird-60.3.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "4d548d121cc8111711ff7a35383ffe859cdd99a692b255dc71d52cb4cfa90614a5415a58f000ce447209c998b03fa545608333a53c5230fe01527aa882eea295"; + sha512 = "6d19c5ad55486b3aff055476a29353179bf8ff7e9285618f29490c430817af2ff3bc51cfa75c52c82d804a7bce0e367e8ee4d444a03b0bdf4bda57ab75bcd016"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hsb/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hsb/thunderbird-60.3.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "2f98ebdaa190aeebbe60fe20d6246d027425c3d5408abfefcbd50857ba800e9fc53b0177f54cf8b710a013bfc59e4a58b237991058a123cd2f8f0e1f4afaa1b6"; + sha512 = "452927013a6ddc2f2f0dfe3a69a585641df06aac24f6458bb269095abe35101bff6c1a37d21afe8f37f1856a7a3311d49409bd0c456b52eb494cf846e426e2dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hu/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hu/thunderbird-60.3.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b54703d9b7eb868a771538c0f5ffb0e881efd9137ed29b684dc149e77b3f9a675d0b59feac21c8b1f54c35545b9a2ea2274bcb485ce583102a406e916c3c25f2"; + sha512 = "bbda4eceb8258bf46ed5a90d4bff27a769e0f74a14d76f50e77fc3b2f1b53863fe8a68f0e375aadcd0d60b177f7f31edc6876666dfb95e955083078f813896b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hy-AM/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hy-AM/thunderbird-60.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "f3e3918538df95e6a278bd680d019b39c5382078c79eece57f23810aeadd43fd61810967aa384f222f6d21d5d815cf3bd7520a7d31e44b3d2e6c024ff6b46a47"; + sha512 = "79ca9e61fcfb62da522c2cd23a39e1ec8be14dd09bbf3d1cee23bd2a74a9a94a4b9b20af6f37e2a6a75d4b416fbf2b8c3f5196ea4fa52495dc0628a2ae5b26bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/id/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/id/thunderbird-60.3.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3b1956f69a4b82a900dca97f90b29d7cb685c79e6d6063b58bd8de629fd604dca58d058c8b0855ae46daf9517edb1451c40f669cc98e986ada02e317b131b19c"; + sha512 = "2959a8ed196509a6a844db918b283bb3b133b1489cf229e0649ea0033fcd0536cc8fa792554adc7148c41267dabc92309670da6fbaaa1329bb65340192ced249"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/is/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/is/thunderbird-60.3.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "fa5e7574bd73c1d85d300b151a5d1c7852fb035ca5e4599b675008170074736045ee034169108eafe6171371ee94b84003922088e8e0dc4b1c05ba7837499c4f"; + sha512 = "f78de4c7e0125b14a5930cb081bae4b49010b47726268b4e6ce01a0eb0e26b627d5ba47284c060031175787146406d4bca86404fa3d79f3ea67a67443e813862"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/it/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/it/thunderbird-60.3.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a2bd51df6adf2caf4bb22edd02b3b70d94abb1d3ce22731a3188c718161b492f860be1cdd94c39c4a64e6ccbbbe80092310448ff08d671d870ec565b36466b33"; + sha512 = "2a855ca03a703a7e843c7101ff02be356e5851fd2f6d01d1c1a6012946fb5bc57c018fc4e9804cdf66a7febc91c80c278fd420f068bef36bf1daff6f8a3c7640"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ja/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ja/thunderbird-60.3.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b065494dbefeb8ed79b40b255bc8551dca4f0606c204f00d7c0cc0534fa1aeff45d0b7fa80454fe8ae8803b002600d3e332f7b3138894005922aac48cbdf9ef3"; + sha512 = "323222bffb53d7a8c983bd5a2e06d388fa64689e4a31f888e6919b1c5fd9fb192840fb6c914db1ef988ae0f7505339d086b5388e9690eb77d377ef8037880eef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kab/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/kab/thunderbird-60.3.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a22017107f11151f2b383d11d6a6b8aa45571c3c4def1ce422fa4b108b546273a362279889c60bf5b01dff73b497879d881b0f8960be97ad92526ceb0ae16488"; + sha512 = "432426fa6185ef49dc7a204f97e38214dbc70e63a960036ca96d85c1a8fe10e7818dec80013c7d812d40808303cc09b70bf1bac8534eebde089e0d41387be797"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/kk/thunderbird-60.3.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9d9abbd85a6bda636aacf361dafa05b7f64dff8a7cebe81d2ff9b6d5eca9c800753cfbd3e9dd66ca17edea0bdf8b656d242f47e53f5aab364b14a88d2917da0d"; + sha512 = "a0d4da436365759f0019250f42bb05304a5c80886268a0ac2ea76bb52167670be71fd036392efa6965d699171341b23e2360f795770de0ebc5f4973ce6cdadfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ko/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ko/thunderbird-60.3.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "083b33b6b50af83380e2976fffcfe9d4fa3fc64199bd6895606392842888ac66734deff738788dbbe449ee7c7a1e06608caa25320c12b1d49885825f7dd8a500"; + sha512 = "ed28830ab1af7482115e53b0a4486d74d2b87b98f8c12a45f6a54c2221de5fae7b7450f1cf07a095d68638bf9f8b25778784606d857067b2ddb142079b411fc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/lt/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/lt/thunderbird-60.3.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "33c16ff80c9cea364bf2d4a501d3d7f04eb6a04c70785d99e0d8d5fa2272acfdaeeb09b45e618ea1c08b9da083f7fdbbfd571eb84699d0d93718e103810983aa"; + sha512 = "52d36def8bf79c58002e42d7912598630140646cfd23254821524c42faeba3782d2d9f16db4ecb432457298bad342648e2271ff71a2d1e6fcfd386134da2265f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ms/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ms/thunderbird-60.3.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "92368bcdf6157b7fbcaad6f5abd40a6dfea2c12d3aaa6eb58a2cc118621ee8df50f34f506aa124413264a44cedadd1755e5dd827f4ad6df069fab9d6cf3b08ec"; + sha512 = "d368bd578add39df284174dbf1eb97e5e3eda26b141af1c729db98f93782fb8da7dc44fdae0ce9a3c070c5905a73dd0dd25fd665144e7af33f975867997437b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nb-NO/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nb-NO/thunderbird-60.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d06ccb94bbe15947b8cc1d685e6ab8f8001e717e104cd1af6799a02c47ac79ce8e1b5315feb6ea3683f9d89b72202e1e2e41a0226f994931304880535a25e2dc"; + sha512 = "ef795c45d7ccf4b8c89abf804d5e758e14534b9d12a1424ae0fc58bb5681dc24e49d6972c128855f886b996dbeaa8a7af0a1af6f4959fbcacf575307332e528a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nl/thunderbird-60.3.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2650806011a205cf6dfb1756c270a6a8ec33dc36cfa67d85bbf70264bd306a2b98edf973eac001ac79657fc624f2c56d39c24e7ada9b53b6aaf5825d701c4df5"; + sha512 = "c4d62cdbc421c08d1fd4d8579d58993d51f6cca207d1619240d95b2d9f0484e7e93f4dc6e103d09918fefa384349e5d676973b43a6113f807c28879d829a6d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nn-NO/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nn-NO/thunderbird-60.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "bd58db3533496758873a273d988f9b53f2d201a176b936b549ca543bd3e612e0898c83a42f761885a9b9ac58f5a3dfd38e93e9f807afed02717dc6b47f574c5c"; + sha512 = "f06459d02dc5d0be311d06c62cdb2a11199722d635411fd63773b01c9103ed232070b3cd9c6c3984e658a54007f8fbf728c51346cdd3a1eee243ecc3bda8bd9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pl/thunderbird-60.3.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3d2961721fb1d70b4a40b447ff4364039159115b096eb75aff418db20709e102bbf3f752e04bbbc735506b2b4d45554d38b1d217459efa7405676908831fe4f0"; + sha512 = "77b27ba6c8bc519aae04f1576d278690f24a165a53bee7f1341aa81d2441fe86bc02115a3ec6e3dd3f40d466d6a39bcca615d70e9504945355e706b69d9e68d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-BR/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pt-BR/thunderbird-60.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3610306eeb52cc29ea739b1d5140bf0e4cec8536aed99278a82ea0847a592975e5a9fd23d4763032d3a178a9a830e5a8c87bbe6b0be7765a4f961c00fab05f6a"; + sha512 = "a480dae9a78d473a1614047d2e973f4706ab5a2b754fdecd83cb1eea988f78c53760fbaeea3e98206400a3809e419a5615aa745bd759d652d6f7ce8680d096db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-PT/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pt-PT/thunderbird-60.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "30ad1102cd1abdf091cee8971ecd537ee7727e0ff3ef31bc535f830c3c50f8598330b98ab5acd5b1c22d9b4a245f9952b7f6ea0e8ca373c58aaf57f4ae78d554"; + sha512 = "af3fb38963879e99e2c3344ebeca0d300f87b96c4dc031f50dfb5c75e04e1189c930b2df46aa4a343ad93b9461ac38439936ca9a3bc83948668b662f6be69599"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/rm/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/rm/thunderbird-60.3.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8581718d7ef1b0e3c6ffbc2dd38f9a183577d80613a79bfdeed4aefdaddb6fe060429c76ac0ecf4c18a4a445499a444f5b0315ec32f3da00ebdd2d1a3e70d262"; + sha512 = "454264f5629854bdc037c4d826ef31a5fb4857f14aee5780669832e298b788ca98d22c521360dfa5d4f3ff25a18ecc267120a8455423785c801b1a51115ad90c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ro/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ro/thunderbird-60.3.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e9393e95ef620474fa40188bcc3deb110b21c58eedeb2791cd7d17d0621f45f345fe219eaeaf4a5d71d80e303ad23b5d8ab93c8b5f7d085c3eead902ce239e5c"; + sha512 = "5c23f69b167807abd0823f2b0e81e58695fe7cc53f6edd5ed5f67da77ab3b461637cc3d84dc0c77680421cf70dcaae1190f653aeec82cd6e2e89d429a30f0f1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ru/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ru/thunderbird-60.3.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "dfa9aba3a85bc6f3264849b54d8f6ef14a5cbfcab2eec6f71b5130eaad6b7d8dfdfa2b9572f965fc19b51f80868183008e441961ee0072a1500eef183111f1c4"; + sha512 = "2a2cd091d81da62e24fe7b454fd28477f6089b0982a21973d2e68d78548d90d33eea34c324fe7389100a7938dad226be6f4a3095eed0587b047a9a0691d2f190"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/si/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/si/thunderbird-60.3.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b669455b70def2b7a8e08cf8f7c77db857ef0062b4f791a91ad636e7fcd0eba0aaa5199bbe49d7895a6872370e8cd442e142d017ec6855327d0f555129fa2d68"; + sha512 = "75ca936cc8f3f17803e2e4f086da82598f6f78c4977c239bac929b950b388c61bf675d904638dd4b801afc7a9b58bd9ab0b04b2cecf5f2487e64ef0a599c2ad4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sk/thunderbird-60.3.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "0719f9073db07793a4f061cf430b3aff539ec3e124ae2a7b6596ca5505e0d0ba96d1af1a3e1dfeebc55601be1ea7a173c5c89657036606b0fdf92c07a35efc7d"; + sha512 = "cd34d310fd49a8c7fa47731ac8972c25b2d32a4000ccbc8ff0dc4c7b2d0c5905942176b6f85d777683204c9d35f4c49c5195740afa8971e4782441a1ea38a0a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sl/thunderbird-60.3.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "66d8ab801f86a5a6a68d5fb48ebb255c3348fe7a0e9eee975fee7c939712cf5cc3bcec084c853600235f8f9774c4bfe66507fae856bc4c9a88d170bc3d6d4e6a"; + sha512 = "cacdb9aa0d01f9641863b52b0c2ec2c61e3c60c03fb7fc1da1fa42cbcedb94797543fe6984538d3ff75594726dc61a1676a2644abd6595902bcafad36d4d370a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sq/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sq/thunderbird-60.3.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "eeb3d2396f8de38cbd9495a82c766183e1640bb05c48dcb4accf770c4c00fb4823be55c5cab6561dbd2dc413316f383265cdae9e0809da1150b9afde678bf4aa"; + sha512 = "6930f66acf54dd47e2cfcb50d2b451a90a4533f54c895d16a872dfb28266d33596929cfa81fbc21536ab1ab7f933d4fb9853979c8be9a621c416817ada423fd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sr/thunderbird-60.3.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e251e7c1970e68849bfaa6bd9a34894e9b710c7adba1cd54ea063274e7f07735795879a01b4dde2256eb612539d3fd433507fc9c586a28ec803cd636194ca12f"; + sha512 = "ac987c431c719e2c4a61a421a0b2d03bde011579782b29f589efa7f5361879762c0df5d57e809b9386072004e2c85f5aeb770185c6ad3978ce1de0fdc6b6346c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sv-SE/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sv-SE/thunderbird-60.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c6d2d165eaa2e46adc9131cbc4aa203308852ee80ccbdc226def37be9505c4e2649e70b668ce38d061dbfebc284e0d604db1094418a02092f189ddd3e7317419"; + sha512 = "078765f08b2f6f53f319037f1237bc68ffeebfa1437fd921051a1f804f8f6e4fdcf7faa377c0fc066f8adf49a0bd6429981708ac3e0dfaffee3f196c9f97c8e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/tr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/tr/thunderbird-60.3.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "d23cb1cac7becb82cedb768376e200108e08814e55c8308492cc65a687d5d9aa5fd38ae742c39572ead41b2d2c3e03dbf2222f88fb0b94ceba6183d6b8a4d0e0"; + sha512 = "4ac98caac0d51467059c90ef0867b78847c7260b4fa36187ccd670f7275ebc1cdd93fbfb934575f82d2cc7f0b0cae6b781842a883e5a8242b3f8d6295d18ae33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/uk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/uk/thunderbird-60.3.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "7385c719fb86a3c6d64c5d6ed8bea81cb7366cf1cdc97858dd177fb1435f24f3d3d257c60a319dd2db82da1274b9a2e14b73d3eaf20684ca955a0bd7b7b7e3a5"; + sha512 = "9a187b5a401eec58a0c15dceb0ad0e894036f4d2af3e3d129444e31169c1fafff7228093ebb0acf37b9896d72eb88d02d04f8bf16be14092bb27086816a06a65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/vi/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/vi/thunderbird-60.3.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "369be97c79232b58ce2a096814d63c3ee805e2fca8ba40566ddace637c5d9d3686c06e8e0a158ce38395d7056dcc85416251b73ae7b50bdeb79c26fd65044200"; + sha512 = "53388ca676a3c15b41c8ac68a75de4aa10cec3953ff30bec1f67008a26d64a16af8e996b9196e1a23db0f00d835ec5bd22e3bf7e411fa6f8e4d276256afc2a69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-CN/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/zh-CN/thunderbird-60.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "934d49874ab0811ad2959de1c43c94e5c94ac52e45dca2e8a6c91ca32c033bbf7c076ab46fbaff5c1f508301d0635b3ada957f09d9f591647d202d09484940c8"; + sha512 = "05de7f60510764ddb49b81b907b2b0f3047b38da361a3ac655266b2ecd90320721b3023d943a5fa8fb20ae632625b7dba394bfa85e54434718d392c035abf29f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-TW/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/zh-TW/thunderbird-60.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "50253f13fe918a1f9b066fc9c8b3245aea8fc79502ff7b5130150cf207da080b569fe0aabc5c19cfd77fb79eebe9a9d48f103d6748ea2070bd06476c0bb90e4d"; + sha512 = "f2aeb51217083f284af5150179f4173212d9837e4b85225610db78524fad92ca5c29bf6461543e5ca6cdd2c31f11886837651912682d5e07a82f1bce9a82e879"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ar/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ar/thunderbird-60.3.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "3f0da183490797d4046272a85c9584e95f5b0c66edb94ec4e84906f78f009f8558e4e2c4fcf03f83e8d857aebc13febea3305eb02c6c63ac32474749bd28046b"; + sha512 = "ccd98be198eeaa462e60815fd23a64b854294a63965302477006eb0650dacbf0a9b84d2252bf93a7203410ffece84da42170450303d8e398253f1675e870102d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ast/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ast/thunderbird-60.3.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "e3e0e9d7b30b7a790c681c650e4da123246bb9fc5005dd382f5eb85f3bee9b2e3f79f5a9688f4b5e25da1c1bcb09721ae8c7cce32309e0c554a992fbf1b418ef"; + sha512 = "95e3737727be104753390535d4b963316d95f80ebaf3e323d791287a12e3b3c137f991e4752dd1d6a7a9e9683d945c047963f7c2f7dc9041abf367a2e85741e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/be/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/be/thunderbird-60.3.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ad8c3794452cf734234421b2e7b0e90553f2012e62c1d7ea887610f74aec4af5d60b1ef37765d9cdef93c23367135fdfee800df0f7bcb59cac1761356877e3e0"; + sha512 = "4d20ea0dfdf556b10d5a47795739aeccb992f5d5970d30c5d90040ec759dd269ec2a146d47074c19d5bae8f8add2bba37b8dfc9b5f16d1eeef88f0dadcd85543"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/bg/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/bg/thunderbird-60.3.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "30076e64f51084059186998f36014047ec53f0ec9d9ea2589808c20793403b777f484569eed31d4ecbfd5dec890e1cd219bf071102140d1b4f5ed401225a411d"; + sha512 = "085f87242fe9416d6078c1c921bee327772eceaf84787d8ab407fb836c70ef8cd955ef98ca5532952d6ff085005d197f240a92d71cda6f36c0cd171c840ec937"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/br/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/br/thunderbird-60.3.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "9bf11610fdac1278c66bbe7123269e3ebe4e24b619f8b1ee89769460656825c3a170ad730f5297ca5dc1181833ce833b3a812306d5a6339fb80408992eb9f89e"; + sha512 = "4f95501c6fbfb6c24ae126f7d9e9244c76a84be001f97b0f052f4fd447fa2f8a9357838abb058839072ca5b77409ddf0ff3dde908a4fab884bf120d86c22483c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ca/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ca/thunderbird-60.3.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "95a643963817f5105c76d195c1b3ce4def01e0e5262c730a9cf1ee247512e562d16d56e53968d0078cef12514b9294f30ab59f93e4e25c068553d8ed9633dc59"; + sha512 = "31329841c564aa4bf488d324b19d62cce15397e2c7bda7714c218907a404447187612b353ce712c647a8a5251ce41b7b07a9dc79e9c9991275e09276216c41fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cs/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/cs/thunderbird-60.3.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a20498a81b5f3a70a0995552875eb8eb2635b1d8d3508540368f6ec9938493927050a17cdbc944e9f0712622666d13ca6e15088cacdfd687de21b83bad7d7b48"; + sha512 = "f0daaad120fc7a8958f45193151307b386f703c745835c069db7627bd74a8be594d30e4706463468b6ca861c0e628176325bfcff02e3b24ee9e7ebc35ceb76f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cy/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/cy/thunderbird-60.3.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "9a7ffb9eb9c3d561ba328e43daf232ca2261a30430a17d49010e283f7ae1e190475e3b0c87ab931e26ba6713eb1cd079a1f6f6ac1cd5cf5e991dcee940eae041"; + sha512 = "e44f4003847e7c72c681f9cb8e8b02c05420a88d99a0f2831fe02e256410ed4a2d41070d3674227a436a9045fc3ccdd242532cd5aec8c31a93d7bac2f85e3308"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/da/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/da/thunderbird-60.3.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "186a96ba0ade51ac1ef53aeb02b2c140f0b1da048d24dc41f97497ec1b37afeba5226cebcd1b1f0226391f20f972aa385f41220844897bf1cf8ed8f64fd895b8"; + sha512 = "7462c01d3b9e7ea07047115983985b8d9bf7e71f75ac091248b41bd1e50813971843dcf6da71dfbc5f7f74a5d5fdc50c1b464cec90c4c3e649c9efe3f045e5e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/de/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/de/thunderbird-60.3.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "68aaa7c30f119407f5a7adfcde55865f06841ca60b7819bc4966b16df12af87e32f24d631e483341a171e712979e90d9086fe43a1b1cdd92a512e178d6374ae8"; + sha512 = "0c6e1fa83a9a886062ca3123671091b9001c2f54d1b0988a7b68e4e5900c036f436d3686bb0cf346a92e7426b9153f6f58a992766f0df215dca33317b81d04bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/dsb/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/dsb/thunderbird-60.3.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0bb90eec8123035e1833b746ac3ad1558ef01fe4647c94706a4988d1c8ed53b01f8621f3ac2aeffda640a8e6fd05cb71b3edca369a7b445608a8eae5dc12dc9d"; + sha512 = "de2ae2d5e7abf26e021671d4cc8b1ed69817b4ef2361416405f60737d6eb117b10fbf3fcac7d75a204ce483ac6d0623e0b78a27c8229d11214cb6ce02fa70756"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/el/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/el/thunderbird-60.3.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8f2072017f5edf494c091e712e26b253ae4809fbb81d1ee22063ad02f2cbde06f04d9873c61691245ddd249c489c4b3f58230ca12cb390abee8375114331121d"; + sha512 = "b52519e5a0040b92c59eefd9a6b6908711b9685fbdd46b9c26149a83c37e0b31aaa591259e6ec40088443a7c9ca2fbe5fc4a4ee046a226a6493eb17c12d1bab5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-GB/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/en-GB/thunderbird-60.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "8a91106d035033e9a358f99d1b28cebad978586bf2e363b0856333583e6b1fbee191f3a8518efab85c188fa60c8c5d3d4452fffdd8b5f3a7998e213d5e6eaf05"; + sha512 = "9c0bb3da4f47a6541b8d4d2db5eaf37f04a0190f6761f6dd09aa67a58de66b81321b9985470c09cb6887c660939615971bdae6626c49fbc77365bbb93434449c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-US/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/en-US/thunderbird-60.3.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e104e90333fd9ad786cd59cb323a2a87a532b242aa7e6127ba38df00b9d747278cafda32b359258c9e6ade5a945c4a227ad81595e30717b1a06e314c511e975b"; + sha512 = "da73b44eb926b981ba6855b9b1e79a030740499ce6d374922a47e311e4b6bbe8c9f39da19bfa705392edd0c0c3e0de1ae86d76a81cd1508ecee50c69bc69e43d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-AR/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/es-AR/thunderbird-60.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a7cfeb77ce146102b8583fa086536c58760ff30b69c8f9373be2277815ed57c1132ffdd04edf782ab8224f2ef231ae4c2c581dc13c174db6ff382a72975279b2"; + sha512 = "fd66717fb818610199eb628e22c5067892740c04924b406ce951afb5ee2a6e7a872224c6419c185b327a4e59f984bdf144628903f8a7bed10d4ea9247afc188f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-ES/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/es-ES/thunderbird-60.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "7700206c19f5b8a434e323cd3f64df90696b04790620e6e20d23519dc92a8f3abcdcd8799d7d3843968e78cd8a6cf282924f3ebe442eebd40282fc035e096c0c"; + sha512 = "078d8eb9a7f1373ec90f0e3a1f22881546489fbfaec1fc4c26c6b85867233194c595d417221f6bd801338798bcf46506390d43d835604f8e188a4010a4610500"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/et/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/et/thunderbird-60.3.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "14768d992308cee0fcb30d8c676d89f8e30bebc86f4fb4087c06d38afc41df418666446c65e995e74c67a6a6214c05338fd9471e02d5d5101e438b414c9873e3"; + sha512 = "c10994ebbe72d3dc4fa27b8dab56baf1625f6d128f961bc935139d224874959f3fe7f6b0d30ec7e72a8c6d49fc81761da1231170cac8d0d74da4354b59e1a407"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/eu/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/eu/thunderbird-60.3.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b8a33488d452443ee7393d77db68760b96d3f868050f49521a76b522fcddb7f4a573be06810c091e8b02d76b681c393554c01fc6800e420f9adf4c3e42bdb436"; + sha512 = "0ca85492207350ad85731606bc298765b594a33db3c7889771cd92676e1e04240b4bf4ed9c540b94e61306c0e581ef656ed05e2dda9e333cb107285dd5fc98d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fi/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fi/thunderbird-60.3.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "670db16b381e68e2f6faa353d91120a787ce360143d72c4a9041a4684688314e3dc466b2beb9166b76a822f8d96348b41bb32410678d711e39947c932424f295"; + sha512 = "9d5082cd17e1975152daca9247f103f0a6ddf09cad6c017f3d0ff9f185af58d88f6802e2bcc48206c97c40828335580584dd4ad62b322829169b509a48c353ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fr/thunderbird-60.3.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b3474043fb1b3a6fd1d396d6b0490d8db71c135846e4ef74d22e80abf41ab4ca1faf346c9928424e13ef9c12d6cad19f389b4cd38c45385688b5b4587bcc0a0d"; + sha512 = "33d0496886cd0ada4f944a409d5cef5294d5dd7a3a10874558538a1b5a31e212ae9b3d5661c9e719a64419859e9b1d2945f475b91106b3f30aecf617ee6dab18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fy-NL/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fy-NL/thunderbird-60.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "41b9f80ae6e8ce765d8fb057bd49af032532cee9d5f2c4b17a4d3833fbe8ace4c7ed4336433273e59f98a1b4cadef1ed49f77a95eca868a39e76e7454d7bf91a"; + sha512 = "64ad8e580e8b1f8acdbb52245dbeacc22cb15471f9aabd091bfb262669c81e59e2fcaa2b31ce7fbd2d634896a9b0d22884d4151b3d90bc50b75de7f2680be852"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ga-IE/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ga-IE/thunderbird-60.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f89277340c6deb07e73fd7a7227fa216960c89269e9d4ada0f8a6863ee60ba004317beb207a1128930fb8c28477963bb66ffb0a76e86dfcc371579672b0eb26f"; + sha512 = "0fa4eebfc335022de2118a1bf5b27f83969ab26bf2d03d011d732cb8f2614bd75a60629a4f6c410a4fdf8ac8b3043c849aced85d7cf21bcbd263025ee0338234"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gd/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/gd/thunderbird-60.3.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d3ac6c868fb504b71823b5a3139155f6f441839c33f10cf73d8e0bafab5e7d9f7bfae3b884b41fee1ced4c10565321bd13900575855d42f70958e569e7756743"; + sha512 = "7cd1f55355fa2eecc6e6f79bb642800a014de93d80c273b57c9e910111684cd5f59d26ef4fbfa1bf6a6b1aee12f19cb2a0d376a9822fe8230ee9c7f81deef54c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/gl/thunderbird-60.3.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "88f41447654685280aef548951609cb0ce7054a67c632a66892d1707d6d3dad3fe037dcea6ac8222080c0fc2f19d77f622506e82b6ea93114462b131fd4de308"; + sha512 = "b5c1853b7a225116bb0c6cbca7dcac6256c8d46382fba5af5bdbfd7fec0bf6ce01def72ca1fd26c8243c7f1d77de7fabcf691dc956eaa911997915629a03fac9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/he/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/he/thunderbird-60.3.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "faa622a8b7fb3c5ba4156cfb6ab4414c0a56a820a1593b555e817c3edcefc59fede6b681a0c6722cb540c81ccc425bb27d2895ff84f5ce2e61eaa7b37114be42"; + sha512 = "9155a7f37288baccadf31063a9955a1b7f6a9a7172c2650c5fc5ea32f3f473e5a682a6e269efae4429f23dda15a2afe00119594e4a5e9225eb298fd8ab48ae84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hr/thunderbird-60.3.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "74321b6e6833014d60b698d7f83337c846452fc1e2148634150f192425607595795036e13d55ea0366c4d3e7c998c9c3766f50abebd606dd2ce7c3e6fbbf4963"; + sha512 = "7fd14cf6e2844d264c8931e740f0281efd3b205bbd3bef08906628e6a65a703642c0794e85c8f2d56d944b6bc5b0d4590c369c668a13f54379e91d16d124b29c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hsb/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hsb/thunderbird-60.3.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5964563cc323a606dd33019888ac483bda47f0da073e3d64ba329521cb7a192ae9014cdd2d44e48091d2f3f0219dab11a60497842e42e37a7b3be9415843fd76"; + sha512 = "eec8cd8a07f1d044387fd540d7ab848c562f36bebae19ab4b90dee0043f0578b21af9b1894d88db344adbee1127df5822e50caa8563c15fe5f2996c8888c35ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hu/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hu/thunderbird-60.3.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "20ed810d74584d9c79b0dad65c50ab8422f841aa2e4974dcdef249aaf4901315c79ee1f071c4d03cd83fbb973eae35fa730aa0db88fb46617454ad5a4371f107"; + sha512 = "af2a83eb2cdcd184c36c4f190690b50747a7df4e9b962f4858e41657ca1ce589e9e7167192a3a678d60458cf7fca89a3788607c100b96522d58d465b3f84dfc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hy-AM/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hy-AM/thunderbird-60.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "90973c56fb46c3c150efad6cfd48d24916983302dc459f386c5fa11ebeb4b32d7b7d4a35e8b3e0ff7358b4af9c13e112d01eb30abc069dfaa8ef8aa3af043955"; + sha512 = "0647b06bb64dd7f749029d95c242acf3a9c27e75c234198275d8d533d3376d5b26e9c872a75b966d6dcf2ccedc9054d26c56a474286d4108d298b69687be908a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/id/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/id/thunderbird-60.3.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "9838d3e9a9fd30e03885f4195a951e285230a33757672c54c60edeecfedd220e6a8951d9bbfad34688ab0d16fe38507b3f8524d1ff3a987482cf761d67a17dc1"; + sha512 = "3a9a6fc713a8fdd9e28db9f381632ca65f00d78e642922091a6df4386bff2db0f1925118a2362073bab3565cc6741a64804c17e577568e665a3ba2414bd43c87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/is/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/is/thunderbird-60.3.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b951f6db2e2a70a6bf43e5cc7ce203d59b9062aad44bae3634db03dfe202aac723bb8b2283deeace96e8401c772f43aa985b76259de538f62dd970e285b09a42"; + sha512 = "a041121fd514c3af8fca1451992cf15642a5bfbff14336769afb5de56017362e35cbd3c3a9717a1ef861b3b47f5951670f37bac50ed318c60bb932196aaf4798"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/it/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/it/thunderbird-60.3.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "389ec0d921b42e4238ce13546df6bdd1256381e95aea9e9e18e46524feeb4837b2be534fa452a4cae51d3fb060e059dbdffe7f26f017adc4f88aebea19f656ae"; + sha512 = "246dcdba4a29d3ef657edf9850727baccc3c6246a56cdf9b0634faf54ed2b2736cccf6c544fe34ada3efcfcff5ad334ad3a4b1f29e986518dc88816d727b42c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ja/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ja/thunderbird-60.3.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d012b6339c6e18aa49c4f6a4db40aae3315128b89938bbc64fee94a90db8cbd65b27bda9742a7a761c52fa974d9b5ab5e1d98ab485123c33be318d216ea8628e"; + sha512 = "f6ada0506ce125d46721710dae96f086da51abb15c3b20c5d5425946362534d8c99d67e3002131390e774b2ef867f422db215b51f368074b54f1f91e7fece482"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kab/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/kab/thunderbird-60.3.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "06b05f5d4c97008706eca67eb9b513b35122716a3083bdf3f3fb97cf0a6f1606c97a097a5c979657234562e505203f66bba483879fc2070c97514000326cdc23"; + sha512 = "3838eb63f96e916402bd158aacb082ae97a9044cd0a6133206da0f6f8d389c361b55e84295b8c483a4be5920aa12b2eb3961525cb011327efcd720856fff41ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/kk/thunderbird-60.3.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0ea99590b068925f137a63bfad3a0cce2e380f80388a94910836e7f517f0375d43f6f1325c6660eab13a97d1b9685102cef921f99135504abe70650ba7de9697"; + sha512 = "a3d010da794cf16d8ddfc14ca50f8504c8063091dc2770eb673281bf52c47faca96f5fce87bba5a691294117e23c46edf5a54b8c8b56d9a57902c088e247142c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ko/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ko/thunderbird-60.3.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "e89d27c4cae745c902f61d9534b6582e2af3806714e596dffac1a0d49416a0ab4eca76d9810853c759312c192679b2aae4a6cdb289c5b5d1f472450757c71ccb"; + sha512 = "8243d3ae0cb32d8805887d41764f5bc06dab1d2777c32e5d3b3a95dc52755f79e5d11fad4f93553262749a2cc6151462091a3a1228d83c4bda7ab04a6c427b1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/lt/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/lt/thunderbird-60.3.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "3f86701c031aa174ffaacb532f198f7911045a855f8526e8a47ed26695e86bd40d1d83140cdab123e40a9759317724296f4ec7d788781b767590f0135b0c79c5"; + sha512 = "8c9456bf6add79ef4cfc46b0400a7de4e6ff37e45788e524565bddbbc31152072ed6f10a033d5c77bfcbf46809132e87722dc5b77ac063a63cec6086d630e8d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ms/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ms/thunderbird-60.3.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d44ddf44d0c0b5190f3b282be2e3f98dbd28a584727970ceb8b3569672634ae476b85c4dda4659d1a58d8ae36adb9db1c5a4d341f9f1f7d861af64287e546316"; + sha512 = "a0df7d3fc076370728909e32f9205c98b5c0f14b829148348f02c4f10a20ff21bd3e37ba54784b93f6b577c5710f0c021181146f50119789fbecbf7afd86285f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nb-NO/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nb-NO/thunderbird-60.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d0455dbd94fddabbd474037325c792e3e30fc4aba419d04f0425bdd33db17a1532c955a992b1bf3ffe2c16f440c6ed5c15a5ca6e259c74a5ee1e3f84f457de5e"; + sha512 = "b363b84cec28b80b80a89ad0aa91d81952a7503aa985b705cd0f6045f309287d0a3671c96fc871cbc1dc51d62f30d00532914f1e06255e240593dfcf9b7f8ef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nl/thunderbird-60.3.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b4c24a1b73078a9196178d5ff0f386502afc451f0108321bb45641b30bbbe8225ffd54e00b883515b4849bc76ad8c4dfce525ae5e2aea378ffc31ffa5867dca1"; + sha512 = "1f9184da2d2b28649f7051f00e68491694ab19de23a318429ea29dccf9175520dfe1c8fd4ab9040d9b4e8ec2f0b65a884d1c130d3df034193a9c8bb23b23f024"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nn-NO/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nn-NO/thunderbird-60.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "56ee8a0911a7a7034f18f246d1a607733842846f31d9715611b1e3df5aeb5b70f4d13e4af6785be53ba75a79e845066ffc7ce2aaa8d7319dc92d6ff04a2a5901"; + sha512 = "f85bbd7f6a3bebe7485c678318183082dc09ac259316d35874eeab67b77358495c2a8a6e01d09364bf4b9da0608b99541704894b78946ddd3e2833694a1a9fe4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pl/thunderbird-60.3.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "256331ad82a25c162681e4cc79f5f1c1127b09672e8bb663968950fcfbeeeadce26acb9ecbe10322552ec7d11e80612fab8582906380880e90ae6caa84be6cd3"; + sha512 = "ffa67d8f9f8f923341bc8a9235503af0dd20798e65f406d7aefd4fa30a06371ba265b3b8b67f31ca0792cad09033ef46b7f064d6270c76af9191c3122933bd4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-BR/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pt-BR/thunderbird-60.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "67c7d28061ce5d1f2062092c308be8f88f7a718be637d359c400e56a772e5ff3722bbe3388b5673262dd12373b9728e6e58afbf9a713dabce5d3172532a8257e"; + sha512 = "bd92b016722347ae7662e8d44bbe205b8db19a9a3f9c5e537db4e9bf7d84e8bb69ca860d34b2b78219f01c6130ffd8e79aaf842545397766dc1199e1df8af3c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-PT/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pt-PT/thunderbird-60.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ce818347a10f580eaeb7f97d343a73149db571527ab207e3eef9108aca7309222e0ed7bda41d523d6e371abd6518d3cccfdc760d28eab692e23746b30940b556"; + sha512 = "f97d92c60f64380ee35c2eb41cc7c494e09b48a367a14ec1f2cf05f6bedda4bfc5014b41d456e0434a328c663e1adefc104b59c2c6366ccbf51c5a6466bb8e09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/rm/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/rm/thunderbird-60.3.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c2cf9e67ebc7aeeb8642fc2f32d721f4c9656456d9fc7d04df31672b9c6b07352d87f25d58d75267d9a8388dbaca238d605373559dca4bc238b02bc7a27dd837"; + sha512 = "03ab5b1eef8082489471159786027b8fdca8cadedd396c28e5c00bca31554ba4ce14b8e810b055c9852f1d8964c8b1bd83b34e1a79b840146806ad701ff8a4a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ro/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ro/thunderbird-60.3.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "f567baa16a96617e01753136f74744cc72c147ef59e40861292048fafb37745e0f8654d355c5e60752a4b86236b378fc15d09f656998a920ab970c6f7ca6e4cd"; + sha512 = "e7fd6217ecb683dd78ababecb4dc17e7705a04c6761f445b34fffdb32527818f5b71361a8613ef54250956462f305faa59267698c89c6ea64eae2c5bb80c1dc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ru/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ru/thunderbird-60.3.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e28699b8884f7859323870987fe425af0a8408152a3d373007b634aea1868ab1de483830c07da7efa1fd49c96b5be6c52f5bef91c21c8de0533216be57644fc6"; + sha512 = "051593bb3f0d0ce571aba9365455d97d392377b482db7fa0efa42a50ae52981c294e84f185abd0dd52a07fcbae852d55f0427ede0f5172632a8dac416ed528a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/si/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/si/thunderbird-60.3.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e8ea29c2b77398611b79cebd674983f9458d07b4866597fa2bc35ce6d78bf81daebe4311e93604e4e5a391e632eaa9f6601eb75d022ef1b2dfc225b9cc61b0c9"; + sha512 = "0e859053b989734e1134c365a28a5fdb628fd61125cd6c4d3b7cf598e861dc8b08330ec017c148eda8fd02df49a7688d6b5d7e057ab75b387362dca884c9a90d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sk/thunderbird-60.3.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "587f54eb86b0d0069433e14dce5f24e07ebc355f35f22eaba3ee0982e257782fe4ce5799ee0f7c733fa5a571935d2404ff950acf25b9be61dced6250d76611bd"; + sha512 = "f7d8191bd1f8b78a1a04d669b5193d1067413f3d1f5600940129cf018e38aae85b2c7d274308ca56b2b871d3ec594703d5dde2d5ae12dafee0332ce37393142f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sl/thunderbird-60.3.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "196a31e47578bcf064b42c3d3ed1ac3b623a54b5694fab72e1177257d68c13013352228a09ec8dd4fc53d91a0e8036b2b7c815432fdd35c624852cd74f98541c"; + sha512 = "c6e9ec49518f19bbfb045b85aec4f11e43645a55892cd3e8570f90b0c4fcc90f4e57848ed5419708c5544aa5df93b1a61786ca1422976938795bc7c5c2743098"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sq/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sq/thunderbird-60.3.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5a2b966e7119853fd98e976e555831058aa0c8cfdc463dcc79ca698aa4bb5d9b43b5fa2e6cb60a51cfee987c360c651de509463002aeb9c4e1fbe58b6fa4dd08"; + sha512 = "e5586b535c014b400535680964c0ec03ef9a4d9cbd3bea4701293f681635faf6218744d8a8cb8781310ad4797143610ce1821de5c24232e990a24a87a57a7f2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sr/thunderbird-60.3.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "62666fe7d94f3486d1d5df1cf479bd21a13b9bdc9a4f24fa1f280a838c008d28a2fd6e78ac445ea6ce126fc54b60151e3c4f9b3820e231c8593fa83aab1076fa"; + sha512 = "7bbd3dd52ed742cc59d474f9235a1370d5cb8d9a805df87fffbc9eb13fa50d3bcba630a720effdfaab42580148a9328ba09869b09d06151eaa5ded55db13cbf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sv-SE/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sv-SE/thunderbird-60.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b8f75bfdb3ad9ffa768a5ef4cdfed93004232d9d4f301b0e5b9ce56fd47d34efc779fafcb67c0b848a83ed59c1fa4bb17dbdb583599a99b78186489099159d92"; + sha512 = "157772822f5f28fbbc4fe2b19b38c1cee3e11d7c62c802620e3b3df17898cf61d3c7ffd1e77e2373ddbfd67452e177eabdd34c3a025f7b4bbcb587dc2fa607b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/tr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/tr/thunderbird-60.3.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b72e4c0d1564248927e1f2d8922651e3f7e37e99de77dc548508d4c0c1951e0e59b461cad18cf0dca0145d7465fe7bac93ecb4841c18db2b57822b0014b2f83e"; + sha512 = "7748d29478930265e632973ccee211d3edef2e5ee5ff363145d57c9bbaf7257e8e963287eb854cce4de16ad976d54305be14bb848e164c9feaf223ad40e1c8e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/uk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/uk/thunderbird-60.3.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7287cb6fce1c1482e0adf00598139b0e9e97371171a14b15ea42652c5890fb1c7de0aa213220444c68c5fe33a43f242f0475b5836deebcfe5fc6b52e21c195e5"; + sha512 = "c8cc86f2c802f05131d2ceb2ab3fb1c3fc72c9253efd40833046c2022de61d581222275d84584938a3720f0d20df6eeee4ca50751554fe53fd7551577db0591b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/vi/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/vi/thunderbird-60.3.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "07886cd20ea43fbac59055d5cf34776fd38616477f8c55f4af78031034f8198ef57d716b365ee7a08f267fef0e3b50ba188dd31b1ba1508545b85fd7001f4326"; + sha512 = "81bd7e3276e2b7ad50456d29fc84260b0cd694acaeea6818b0fdfcda91ed0e04b3c03b8721303c5b3a6cb8a7570c5b925922c9d6725a258c525250ff42c076e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-CN/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/zh-CN/thunderbird-60.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d34dde5c5f063d8d79a0aa032f54602570426bcce920810d1fc3c8e842827fdbb0b8b9dfa3e4049bf37de4c98356f7e87942bfdd3f7483bb6e3dc7ddd2ebd246"; + sha512 = "2d120d666559ce4c0bbb1045d03aaa7c9f851c929b91fd6addc20c3a81ca7accba550f49540e3249ee227caa19aaf24414db995d930f0e02f651d75c230e3429"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-TW/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/zh-TW/thunderbird-60.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e8de34531211a60099e677dd619e9e75883f0d5a935df4807b0075dc3d8c57c97dc364eef629896aa46066d290f7138ed67e002fe0cadf7e86b0c77cf99f080f"; + sha512 = "ad36e3c82d68215765a83cf0098bfc392b2e3f32dbdb7998f54e4b83885f5be53a65cf814990237d7cd35b4695a23f5a4dff363e185b5c75a5aa2248c96ab80e"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 419cc2fd2d84..69540d6092f8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -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.2.1"; + version = "60.3.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "018l9pq03nzlirpaf285qpwvb8s4msam8n91d15lzc1bc1caq9zcy2dnrnvn5av3jlapm9ckz028iar66nhqxi2kkqbmiaq0v4s6kfp"; + sha512 = "39sicxgfzfx4dm50nn2l8mimyjpvfigdpmkbxk6lvvbi8xxl527631xxq0gh1di6iyp590vpwk16z7hvdfbqj2pd3231knjkl991hvc"; }; # from firefox, but without sound libraries @@ -48,14 +48,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; patches = [ - # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540 - # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c - (fetchpatch { - name = "bc651d3d910c.patch"; - url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c"; - sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g"; - }) - # Remove buildconfig.html to prevent a dependency on clang etc. ../../browsers/firefox/no-buildconfig.patch ]; diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 64e2c0b94679..b510fe950a3d 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3, granite, gtk3 +{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3 , gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "aesop"; - version = "1.0.5"; + version = "1.0.7"; name = "${pname}-${version}"; @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee granite gtk3 @@ -34,14 +35,6 @@ stdenv.mkDerivation rec { poppler ]; - # Fix build with vala 0.42 - patches = [ - (fetchpatch { - url = "https://github.com/lainsce/aesop/commit/a90b3c711bd162583533370deb031c2c6254c82d.patch"; - sha256 = "1zf831g6sqq3966q0i00x3jhlbfh9blcky6pnyp5qp59hxyxy169"; - }) - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -49,9 +42,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The simplest PDF viewer around"; - homepage = https://github.com/lainsce/aesop; - license = licenses.gpl2Plus; + homepage = https://github.com/lainsce/aesop; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 45c794c82ea5..bc2f260c7030 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,46 +1,70 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, libxml2, cmake, ninja, gtk3, granite, gnome3 -, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, unzip, unar, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, granite, gnome3 +, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "bookworm"; - version = "1.0.0"; + version = "4f7b118281667d22f1b3205edf0b775341fa49cb"; - name = "${pname}-${version}"; + name = "${pname}-2018-10-21"; src = fetchFromGitHub { owner = "babluboy"; repo = pname; rev = version; - sha256 = "0nv1nxird0s0qfhh8fr82mkj4qimhklw1bwcjwmvjdsvsxxs9520"; + sha256 = "0bcyim87zk4b4xmgfs158lnds3y8jg7ppzw54kjpc9rh66fpn3b9"; }; + # See: https://github.com/babluboy/bookworm/pull/220 + patches = [ + (fetchpatch { + url = "https://github.com/worldofpeace/bookworm/commit/b2faf685c46b95d6a2d4ec3725e4e4122b61e99a.patch"; + sha256 = "14az86cj5j65hngfflrp1rmnrkdrhg2a8pl7www3jgfwasxay975"; + }) + ]; + nativeBuildInputs = [ - cmake + bash gobjectIntrospection libxml2 + meson ninja pkgconfig - vala + python3 + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = with gnome3; [ glib + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged granite gtk3 html2text libgee poppler + python2 sqlite webkitgtk ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + # These programs are expected in PATH from the source code and scripts preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text coreutils curl gnugrep ]}" + --prefix PATH : $out/bin ) ''; + postFixup = '' + patchShebangs $out/share/bookworm/scripts/mobi_lib/*.py + patchShebangs $out/share/bookworm/scripts/tasks/*.sh + ''; + meta = with stdenv.lib; { description = "A simple, focused eBook reader"; longDescription = '' diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 520510698e3c..3141223d7283 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -12,25 +12,27 @@ , ninja , libgudev , libevdev -, vala +, libsoup +, vala_0_40 , wrapGAppsHook }: stdenv.mkDerivation rec { name = "spice-up-${version}"; - version = "1.3.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Spice-up"; rev = version; - sha256 = "087cdi7na93pgz7vf046h94v5ydvpiccpwhllq85ix8g4pa5rp85"; + sha256 = "1qb1hlw7g581dmgg5mh832ixjkcgqm3lqzj6xma2cz8wdncwwjaq"; }; + USER = "nix-build-user"; nativeBuildInputs = [ pkgconfig wrapGAppsHook - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged cmake ninja gettext @@ -38,12 +40,14 @@ stdenv.mkDerivation rec { gobjectIntrospection # For setup hook ]; buildInputs = [ - gtk3 - granite + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee + granite + gtk3 json-glib - libgudev libevdev + libgudev + libsoup ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index cac403b131b8..bba08e3ae291 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -7,49 +7,39 @@ , gnome3 , cmake , ninja -, vala +, vala_0_40 , libqalculate , gobjectIntrospection , wrapGAppsHook }: stdenv.mkDerivation rec { name = "nasc-${version}"; - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { owner = "parnold-x"; repo = "nasc"; rev = version; - sha256 = "0p74953pdgsijvqj3msssqiwm6sc1hzp68dlmjamqrqirwgqv5aa"; + sha256 = "1rrp3djsv7lrgsqjn7x50msv0c5ffhz90lj1v11di0kp05m6q9j9"; }; - patches = [ - # Install libqalculatenasc.so - (fetchpatch { - url = https://github.com/parnold-x/nasc/commit/93a799f9afb3e32f3f1a54e056b59570aae2e437.patch; - sha256 = "1m32w2zaswzxnzbr7p3lf8s6fac4mjvfhm8v9k59b4jyzmvrl631"; - }) - (fetchpatch { - url = https://github.com/parnold-x/nasc/commit/570b49169326de154af2cf43c5f12268fff1dc6d.patch; - sha256 = "1y3w6rxn0453iscx2xg427wy1bd5kv4z1c41hhbjmg614ycp6bka"; - }) - ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged cmake ninja gobjectIntrospection # for setup-hook ]; + buildInputs = [ - libqalculate - gtk3 - granite + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + gnome3.gtksourceview gnome3.libgee gnome3.libsoup - gnome3.gtksourceview + granite + gtk3 + libqalculate ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index ace0df5efdfd..c1c4d20feacb 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -11,29 +11,29 @@ let groups = [ "default" "unicorn" "ed25519" "metrics" ]; }; - version = "11.4.3"; + version = "11.4.4"; sources = if gitlabEnterprise then { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb"; - sha256 = "1cw75qj508z6n00rqgqjzdm2013kyb7c57cypmq0m08nc6f3jspz"; + sha256 = "15lpcdjcw6lpmzlhqnpd6pgaxh7wvx2mldjd1vqr414r4bcnhgy4"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ee"; rev = "v${version}-ee"; - sha256 = "1vqc77whpbsifbm9vgcmpxnw13v8jz1s9q04i8jfv99c59fjlids"; + sha256 = "046hchr7q4jnx3j4yxg3rdixfzlva35al3ci26pf9vxrbbl5y8cg"; }; } else { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb"; - sha256 = "0vk03k42pp92h520wnynl9czcigjhj9m7y68z1x0gwqr9m61r7zm"; + sha256 = "02p7azyjgb984bk491q6f4zk1mikbcd38rif08kl07bjjzzkir81"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ce"; rev = "v${version}"; - sha256 = "1zvjz2gv2vwqqjz52zcvi0ap3d8rdbpgsqk9wv80hqq4v37a5gfx"; + sha256 = "1hq9iyp0xrxwmncn61ja3pdj9h2hmdy1l63d1ic3r1dyacybaf2g"; }; }; @@ -63,17 +63,7 @@ stdenv.mkDerivation rec { --replace "ps -U" "${procps}/bin/ps -U" sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake - - # required for some gems: - cat > config/database.yml <<EOF - production: - adapter: <%= ENV["GITLAB_DATABASE_ADAPTER"] || sqlite %> - database: gitlab - host: <%= ENV["GITLAB_DATABASE_HOST"] || "127.0.0.1" %> - password: <%= ENV["GITLAB_DATABASE_PASSWORD"] || "blerg" %> - username: gitlab - encoding: utf8 - EOF + sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb ''; buildPhase = '' diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 7c165627f72e..d1ae317ff9a4 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -7,7 +7,16 @@ gatherLibraries() { addEnvHooks "$targetOffset" gatherLibraries isExecutable() { - readelf -h "$1" 2> /dev/null | grep -q '^ *Type: *EXEC\>' + # For dynamically linked ELF files it would be enough to check just for the + # INTERP section. However, we won't catch statically linked executables as + # they only have an ELF type of EXEC but no INTERP. + # + # So what we do here is just check whether *either* the ELF type is EXEC + # *or* there is an INTERP section. This also catches position-independent + # executables, as they typically have an INTERP section but their ELF type + # is DYN. + LANG=C readelf -h -l "$1" 2> /dev/null \ + | grep -q '^ *Type: *EXEC\>\|^ *INTERP\>' } # We cache dependencies so that we don't need to search through all of them on @@ -157,7 +166,7 @@ autoPatchelf() { isELF "$file" || continue if isExecutable "$file"; then # Skip if the executable is statically linked. - readelf -l "$file" | grep -q "^ *INTERP\\>" || continue + LANG=C readelf -l "$file" | grep -q "^ *INTERP\\>" || continue fi autoPatchelfFile "$file" done < <(find "$prefix" -type f -print0) diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index 0dd4f727ad25..f7ec6e8b8c87 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchzip}: let - version = "2.004"; + version = "3.001"; in fetchzip rec { name = "comfortaa-${version}"; - url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip"; + 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 = "1gnscf3kw9p5gbc5594a22cc6nmiir9mhp1nl3mkbzd4v1jfbh2h"; + sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h"; meta = with stdenv.lib; { homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949; diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 40a9be3282e0..7fa57463ece3 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchzip}: let - version = "2014-11-11"; + version = "2016-06-23"; in fetchzip { name = "open-dyslexic-${version}"; - url = https://github.com/antijingoist/open-dyslexic/archive/f4b5ba89018b44d633608907e15f93fb3fabbabc.zip; + url = https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -13,7 +13,7 @@ in fetchzip { unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic ''; - sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2"; + sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi"; meta = with stdenv.lib; { homepage = https://opendyslexic.org/; diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index 8bb4e82747ad..c39bb945f48d 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "3.0.2"; + version = "3.0.3"; in fetchzip rec { name = "overpass-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name} ''; - sha256 = "05zv3zcfc9a707sn3hhf46b126k19d9byzvi5ixp5y2548vjvl6s"; + sha256 = "1m6p7rrlyqikjvypp4698sn0lp3a4z0z5al4swblfhg8qaxzv5pg"; meta = with stdenv.lib; { homepage = http://overpassfont.org/; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 0be9abba71d6..5fac16067882 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/420a405e4dbccd78b2a471b632b9fe1a1e04502b.tar.gz"; - sha256 = "01vdbp1yh2s0afijz9ap4590mlpiica7l6k0mpfc0jwzymn9w86n"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/98ec0eee2ddef5d4a00e2ac4a95e8add46d23b69.tar.gz"; + sha256 = "0svcaaflqi5c815z3yrh61bjny1jnwp42sylmsnwryjldqvizc1a"; } diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix index a3e718187c7f..3aba235b3a79 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/desktops/gnustep/libobjc2/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ ashalkhakov matthewbauer ]; platforms = platforms.unix; + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 33f498d922b0..56ffd6ee54ee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,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 = "069w4gdb104lc3vp48k3wywmgql56yc5g2g2i240xrr88in3qvqw"; + sha256 = "0mgmxcr36b86jh56my3vhp9y4cravi0hbppa463q3c21a1cmjc19"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -370,6 +370,7 @@ self: super: { safecopy = dontCheck super.safecopy; sai-shape-syb = dontCheck super.sai-shape-syb; scp-streams = dontCheck super.scp-streams; + sdl2 = dontCheck super.sdl2; # the test suite needs an x server sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention separated = dontCheck super.separated; shadowsocks = dontCheck super.shadowsocks; @@ -1150,4 +1151,7 @@ self: super: { # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; + # https://github.com/DanielG/cabal-helper/issues/59 + cabal-helper = doJailbreak super.cabal-helper; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index b92777276504..bf021956593c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -46,7 +46,7 @@ self: super: { # LTS-12.x versions do not compile. base-orphans = self.base-orphans_0_8; - brick = doJailbreak super.brick_0_41_2; # https://github.com/jtdaugherty/brick/pull/188 + brick = self.brick_0_41_2; cassava-megaparsec = doJailbreak super.cassava-megaparsec; config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18 contravariant = self.contravariant_1_5; @@ -69,6 +69,7 @@ self: super: { megaparsec = dontCheck (doJailbreak super.megaparsec); neat-interpolation = dontCheck super.neat-interpolation; # test suite depends on broken HTF patience = markBrokenVersion "0.1.1" super.patience; + polyparse = self.polyparse_1_12_1; primitive = self.primitive_0_6_4_0; QuickCheck = self.QuickCheck_2_12_6_1; semigroupoids = self.semigroupoids_5_3_1; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1b85a564e31b..aa96bebc21b8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.4.3 +compiler: ghc-8.4.4 core-packages: - array-0.5.2.0 @@ -12,12 +12,12 @@ core-packages: - deepseq-1.4.3.0 - directory-1.3.1.5 - filepath-1.4.2 - - ghc-8.4.3 - - ghc-boot-8.4.3 - - ghc-boot-th-8.4.3 + - ghc-8.4.4 + - ghc-boot-8.4.4 + - ghc-boot-th-8.4.4 - ghc-compact-0.1.0.0 - ghc-prim-0.5.2.0 - - ghci-8.4.3 + - ghci-8.4.4 - haskeline-0.7.4.2 - hpc-0.6.0.3 - integer-gmp-1.0.2.0 @@ -26,10 +26,10 @@ core-packages: - pretty-1.1.3.6 - process-1.6.3.0 - rts-1.0 - - stm-2.4.5.0 + - stm-2.4.5.1 - template-haskell-2.13.0.0 - terminfo-0.4.1.1 - - text-1.2.3.0 + - text-1.2.3.1 - time-1.8.0.2 - transformers-0.5.5.0 - unix-2.7.2.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bb6e6da1e0cb..34c638217563 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -30439,8 +30439,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.3.0"; - sha256 = "0yirmngvkmkxdbhh3r6b1j9385hhwnqpr6mmw9kf50axd7czx421"; + version = "3.2.4.0"; + sha256 = "0pj7zyf38rbi48lh8jhcm54wrflkdyh1583d9h4iy9nj5apa85ip"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -31563,7 +31563,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "avro_0_3_6_1" = callPackage + "avro_0_4_0_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, data-binary-ieee754, directory, entropy , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib @@ -31572,8 +31572,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.3.6.1"; - sha256 = "0b1pj47nfpbqvcp5vzraa1przq1c9ll8n76qbyg05fjfvamycbq3"; + version = "0.4.0.0"; + sha256 = "1cly3x4lmibcjm5sz68s2fncakpx2cfvyimv4ck1mm5v94yfp8pi"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -33786,6 +33786,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bazel-runfiles" = callPackage + ({ mkDerivation, base, directory, filepath }: + mkDerivation { + pname = "bazel-runfiles"; + version = "0.7.0.1"; + sha256 = "000awjykargiirnmb3nfqp8dk1p87f5aqx2d07nxrrgflxs7y8ad"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base filepath ]; + description = "Locate Bazel runfiles location"; + license = stdenv.lib.licenses.asl20; + }) {}; + "bbdb" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -47925,8 +47939,8 @@ self: { }: mkDerivation { pname = "cloben"; - version = "0.1.0.3"; - sha256 = "1nzks0p5p0a76jys5dza6iqp48kd1lgxla3k3dfd8znlg9nd7dy2"; + version = "0.1.1.0"; + sha256 = "14vkga43sm995rg4s4npjca7xslgs33kl1ivknbflfidvgpdlxmb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50289,8 +50303,8 @@ self: { }: mkDerivation { pname = "compdata-fixplate"; - version = "0.1.2"; - sha256 = "1ljnmwgjllpcrgibfxxb4zghfl76g7951i2r9haycpwmikz7dggz"; + version = "0.1.3"; + sha256 = "1b9xmp2lps9k9fvvpqlha0vkncs4pivixyyqs71zl4dxcrsa8ryx"; libraryHaskellDepends = [ base composition containers deriving-compat fixplate tree-view ]; @@ -54868,8 +54882,8 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.25"; - sha256 = "00bhszbjz7in5z1bilb1m3ld5sdd6xk5s95h6cw882qz0i1dmlp5"; + version = "5.9.27"; + sha256 = "016f5rzn2dvd85mdjcdrc7jmy4v75sa4qf98rqyp8qc8cpcqcx4c"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl random @@ -61900,6 +61914,8 @@ self: { pname = "deriving-compat"; version = "0.5.2"; sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9"; + revision = "1"; + editedCabalFile = "1s672vc7w96fmvr1p3fkqi9q80sn860j14545sskpxb8iz9f7sxg"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -85876,19 +85892,20 @@ self: { , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath , free, git, gnupg, hinotify, hslogger, http-client , http-client-tls, http-conduit, http-types, IfElse, lsof, magic - , memory, monad-control, monad-logger, mountpoints, mtl, network - , network-info, network-multicast, network-uri, old-locale, openssh - , optparse-applicative, perl, persistent, persistent-sqlite - , persistent-template, process, QuickCheck, random, regex-tdfa - , resourcet, rsync, SafeSemaphore, sandi, securemem, socks, split - , stm, stm-chans, tagsoup, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, torrent, transformers, unix, unix-compat - , unordered-containers, utf8-string, uuid, vector, wget, which + , memory, microlens, monad-control, monad-logger, mountpoints, mtl + , network, network-info, network-multicast, network-uri, old-locale + , openssh, optparse-applicative, perl, persistent + , persistent-sqlite, persistent-template, process, QuickCheck + , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi + , securemem, socks, split, stm, stm-chans, tagsoup, tasty + , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time, torrent + , transformers, unix, unix-compat, unordered-containers + , utf8-string, uuid, vector, wget, which }: mkDerivation { pname = "git-annex"; - version = "6.20181011"; - sha256 = "0k18vrk5g9fdlhvklg14fyjk7x9css18i82xzl8wsycjbcq9ncgf"; + version = "7.20181031"; + sha256 = "02h3c77mdlr4c6l7c14ai0i2kq8c7pawvsf33my449b1srviazlm"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -85907,7 +85924,7 @@ self: { crypto-api cryptonite data-default DAV dbus directory disk-free-space dlist edit-distance esqueleto exceptions fdo-notify feed filepath free hinotify hslogger http-client http-client-tls - http-conduit http-types IfElse magic memory monad-control + 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 persistent persistent-sqlite persistent-template process QuickCheck random @@ -94388,8 +94405,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.14.0"; - sha256 = "0cypqvl04fd0gdakl2kf087fjy6qw968isx2hmli5z5gza18hl0b"; + version = "1.15.0"; + sha256 = "13xpbwnh6xs3lj6vgqanww3ipz8bsfh3q305rkrb7kgl338nqgsm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100220,8 +100237,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.9.3"; - sha256 = "149k9b11c0dj3qqdbinwqnjxy8bxmc4bk65lfxpic2zy26n46k7q"; + version = "0.9.4"; + sha256 = "1lwlbi5pw9wngmhk6dkyc05ahq1w1a0jxipkf9g5spq7ipfw4v6y"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra data-default hashable haskoin-core monad-logger mtl network nqe random resourcet @@ -100292,8 +100309,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.4.2"; - sha256 = "0fjp566icp76dqhivl9jn3s3k2fvxmjysj4rpmrvwfyzb7snlqvp"; + version = "0.6.0"; + sha256 = "1qzxx1rbwv792f96wcsqmbsshd6qf34fqj6byi17la51s900zr09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100556,6 +100573,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasktorch" = callPackage + ({ mkDerivation, backprop, base, dimensions, generic-lens + , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-ffi-thc + , hasktorch-indef, hasktorch-signatures-partial, hasktorch-types-th + , hasktorch-types-thc, hspec, microlens-platform, monad-loops, mtl + , QuickCheck, safe-exceptions, singletons, text, time, transformers + }: + mkDerivation { + pname = "hasktorch"; + version = "0.0.1.0"; + sha256 = "10lmas8x4nk7z7phxj1a2bhzjz7qhbmy472f9j584mbagvklfkmc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dimensions hasktorch-ffi-th hasktorch-ffi-thc hasktorch-indef + hasktorch-signatures-partial hasktorch-types-th hasktorch-types-thc + safe-exceptions singletons text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + backprop base dimensions generic-lens ghc-typelits-natnormalise + hspec microlens-platform monad-loops mtl QuickCheck singletons time + transformers + ]; + doHaddock = false; + description = "Torch for tensors and neural networks in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hasktorch-codegen" = callPackage ({ mkDerivation, base, containers, directory, hashable, hspec , hspec-discover, megaparsec, optparse-applicative, pretty-show @@ -100563,8 +100609,8 @@ self: { }: mkDerivation { pname = "hasktorch-codegen"; - version = "0.0.1.0"; - sha256 = "0s48myr8k96kb0mwvfcc9h5razp8y5k8dk987hfg101h2nfz5k10"; + version = "0.0.1.1"; + sha256 = "0yygx1w7i9mnyxrqzz94vrni5y7rkn92yycax7rqg2r5cds2xb6g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100583,6 +100629,180 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasktorch-ffi-tests" = callPackage + ({ mkDerivation, base, hasktorch-types-th, hspec, QuickCheck, text + }: + mkDerivation { + pname = "hasktorch-ffi-tests"; + version = "0.0.1.0"; + sha256 = "0850v3wqf0x5hkk5py7k1glh591p59fs1y1kn2jf2giqmy05qzlc"; + libraryHaskellDepends = [ + base hasktorch-types-th hspec QuickCheck text + ]; + description = "Testing library for Hasktorch's FFI bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-ffi-th" = callPackage + ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests + , hasktorch-types-th, hspec, inline-c, QuickCheck, text + }: + mkDerivation { + pname = "hasktorch-ffi-th"; + version = "0.0.1.0"; + sha256 = "10gdvkwcjjzmrvmlz8vf823ja1jpab1nrph5lq46fcz8nqycsjq0"; + libraryHaskellDepends = [ base hasktorch-types-th inline-c text ]; + librarySystemDepends = [ ATen ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base hasktorch-ffi-tests hasktorch-types-th hspec QuickCheck text + ]; + description = "Bindings to Torch"; + license = stdenv.lib.licenses.bsd3; + }) {ATen = null;}; + + "hasktorch-ffi-thc" = callPackage + ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests + , hasktorch-ffi-th, hasktorch-types-th, hasktorch-types-thc, hspec + , inline-c, QuickCheck, text + }: + mkDerivation { + pname = "hasktorch-ffi-thc"; + version = "0.0.1.0"; + sha256 = "0l3xvhdyn2dzw999fbhihl20s3q01r5vp247d0rh27zvyszg7l3y"; + libraryHaskellDepends = [ + base hasktorch-types-th hasktorch-types-thc inline-c text + ]; + librarySystemDepends = [ ATen ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base hasktorch-ffi-tests hasktorch-ffi-th hasktorch-types-th + hasktorch-types-thc hspec QuickCheck text + ]; + description = "Bindings to Cutorch"; + license = stdenv.lib.licenses.bsd3; + }) {ATen = null;}; + + "hasktorch-indef" = callPackage + ({ mkDerivation, backprop, base, containers, deepseq, dimensions + , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-signatures + , hasktorch-signatures-partial, hasktorch-signatures-support + , hasktorch-types-th, hspec, managed, mtl, QuickCheck + , safe-exceptions, singletons, text, transformers, vector + }: + mkDerivation { + pname = "hasktorch-indef"; + version = "0.0.1.0"; + sha256 = "0xmz7jid3sg3d2b4q1051fs7g0fljgvqxqwhzhd4g85fx7zr5nk3"; + libraryHaskellDepends = [ + backprop base containers deepseq dimensions + ghc-typelits-natnormalise hasktorch-ffi-th hasktorch-signatures + hasktorch-signatures-partial hasktorch-signatures-support + hasktorch-types-th managed mtl safe-exceptions singletons text + transformers vector + ]; + testHaskellDepends = [ + backprop base dimensions ghc-typelits-natnormalise hasktorch-ffi-th + hasktorch-types-th hspec mtl QuickCheck singletons text + transformers + ]; + doHaddock = false; + description = "Core Hasktorch abstractions wrapping FFI bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-signatures" = callPackage + ({ mkDerivation, base, hasktorch-ffi-th, hasktorch-ffi-thc + , hasktorch-signatures-partial, hasktorch-signatures-support + , hasktorch-signatures-types, hasktorch-types-th + , hasktorch-types-thc + }: + mkDerivation { + pname = "hasktorch-signatures"; + version = "0.0.1.0"; + sha256 = "1p8c3h0naqcbjxb3jbiss9zgfyg0hj0wcb6qlid6kwy925i4cyk1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base hasktorch-signatures-partial hasktorch-signatures-support + hasktorch-signatures-types hasktorch-types-th hasktorch-types-thc + ]; + executableHaskellDepends = [ + base hasktorch-ffi-th hasktorch-ffi-thc hasktorch-types-th + hasktorch-types-thc + ]; + doHaddock = false; + description = "Backpack signatures for Tensor operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-signatures-partial" = callPackage + ({ mkDerivation, base, hasktorch-signatures-types + , hasktorch-types-th + }: + mkDerivation { + pname = "hasktorch-signatures-partial"; + version = "0.0.1.0"; + sha256 = "12dc5i4818j4q09mdshygz16zq1zyp32k6c1imgp9dl6bl4l05ss"; + libraryHaskellDepends = [ + base hasktorch-signatures-types hasktorch-types-th + ]; + description = "Functions to partially satisfy tensor signatures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-signatures-support" = callPackage + ({ mkDerivation, base, hasktorch-signatures-types + , hasktorch-types-th + }: + mkDerivation { + pname = "hasktorch-signatures-support"; + version = "0.0.1.0"; + sha256 = "1vfmpsmgak4ifhpqh15ycf01p8l3a5qas3m7lkg09y8mqimwq5hh"; + libraryHaskellDepends = [ + base hasktorch-signatures-types hasktorch-types-th + ]; + doHaddock = false; + description = "Signatures for support tensors in hasktorch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-signatures-types" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "hasktorch-signatures-types"; + version = "0.0.1.0"; + sha256 = "0zaa0ihgbsiwqla46dixmxki75miy5dz91agvvd147rmr2khx1j2"; + libraryHaskellDepends = [ base deepseq ]; + doHaddock = false; + description = "Core types for Hasktorch backpack signatures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-types-th" = callPackage + ({ mkDerivation, base, c2hs, inline-c }: + mkDerivation { + pname = "hasktorch-types-th"; + version = "0.0.1.0"; + sha256 = "0irlf1lvadnr3j3zjakvkvrwdw8gpg5smk69w9l54idwsi6yvhdd"; + libraryHaskellDepends = [ base inline-c ]; + libraryToolDepends = [ c2hs ]; + description = "C-types for Torch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-types-thc" = callPackage + ({ mkDerivation, base, c2hs, hasktorch-types-th, inline-c }: + mkDerivation { + pname = "hasktorch-types-thc"; + version = "0.0.1.0"; + sha256 = "06jxjn9s34myy4v8ad42xqmkyad5qraj99a3vpcxfagjxwcn4hbd"; + libraryHaskellDepends = [ base hasktorch-types-th inline-c ]; + libraryToolDepends = [ c2hs ]; + description = "C-types for Cutorch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskus-binary" = callPackage ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils , mtl, QuickCheck, tasty, tasty-quickcheck @@ -107893,8 +108113,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.8.0"; - sha256 = "02pirdgq1l638n126qj6sccfkjc6scxl53m584fxq79gfdwarx2q"; + version = "1.8.1"; + sha256 = "1b2rjqd8q0ybx26pmmsb1am9v6pnbp0xb3fzqvivxppdr5z6kl29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111060,17 +111280,18 @@ self: { "hs2ats" = callPackage ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude - , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream - , language-ats, microlens, optparse-generic, system-filepath + , cpphs, criterion, deepseq, haskell-src-exts, hspec + , hspec-dirstream, language-ats, microlens, optparse-generic + , system-filepath }: mkDerivation { pname = "hs2ats"; - version = "0.4.0.0"; - sha256 = "1564xybdqli5i3096xmccy6z0xgm5yvfmjmz60r9ny3h54ahlj7r"; + version = "0.5.0.0"; + sha256 = "0ga90mkz11iis5knd51dqpqd4qyj6fwl15nbdbwzlynpk0wsdsga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base casing composition-prelude deepseq + ansi-wl-pprint base casing composition-prelude cpphs deepseq haskell-src-exts language-ats microlens ]; executableHaskellDepends = [ base optparse-generic ]; @@ -114182,6 +114403,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {seccomp = null;}; + "hssh" = callPackage + ({ mkDerivation, async, base, bytestring, cereal, containers + , cryptonite, data-default, memory, stm, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "hssh"; + version = "0.1.0.0"; + sha256 = "00g87418fhzcxf1xmrj9s40g6i1cgjx65ki027sqgkss49w1w6ig"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring cereal containers cryptonite data-default + memory stm + ]; + testHaskellDepends = [ + async base bytestring cereal containers cryptonite data-default + memory stm tasty tasty-hunit tasty-quickcheck + ]; + description = "SSH protocol implementation"; + license = stdenv.lib.licenses.mit; + }) {}; + "hsshellscript" = callPackage ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: mkDerivation { @@ -117583,6 +117827,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-prim_0_6_2_18" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups + , transformers, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.18"; + sha256 = "1sm6rji0vv3ddi4sjp1q8nz271a084xpnv86n0adqzvd7b7sihip"; + libraryHaskellDepends = [ + base bytestring mmap semigroups transformers vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -117731,8 +117999,8 @@ self: { }: mkDerivation { pname = "hw-streams"; - version = "0.0.0.4"; - sha256 = "08dmcbvw3z53plzgq5z3pa9ns9rjj0xs9rx70pyfrqrrc2f98hwi"; + version = "0.0.0.5"; + sha256 = "0qhpkgxip9bnx6bcg1cnz9gbnwifkp9vinvp89152h720rsawh4i"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups transformers vector @@ -122172,8 +122440,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.32"; - sha256 = "0xk693yhq2hkilznjzsszamvg7pg1l0qyb2y17ffr2s966i4pfr0"; + version = "0.1.34"; + sha256 = "02yq6rxg50za2lcsf6hvld5f1ab4q91kmw74j6kngm7921fa8fi3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -122437,15 +122705,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "intro_0_5_1_0" = callPackage + "intro_0_5_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, dlist , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers , unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.5.1.0"; - sha256 = "0gsj5l0vgvpbdw2vwlr9r869jwc08lqbypp24g33dlnd338pjxzs"; + version = "0.5.2.1"; + sha256 = "0i5cpa5jx82nb1gi1wdhgnbmxlb7s4nbya46k6byajf7g50i5qp8"; libraryHaskellDepends = [ base bytestring containers deepseq dlist extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -122559,6 +122827,8 @@ self: { pname = "invariant"; version = "0.5.1"; sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b"; + revision = "1"; + editedCabalFile = "100gsacbpal53khj94m5qs4aq70hbsp4dz4065czfm49ysd4yqq4"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell @@ -130164,13 +130434,17 @@ self: { }) {}; "language-elm" = callPackage - ({ mkDerivation, base, hspec, MissingH, mtl, pretty, protolude }: + ({ mkDerivation, base, doctest, hspec, MissingH, mtl, pretty + , protolude + }: mkDerivation { pname = "language-elm"; - version = "0.1.0.3"; - sha256 = "07pyj3ibrpa3mrqn6skjpk0w44hi32mm0c08yqpnql3qv2xy4wcz"; + version = "0.1.1.0"; + sha256 = "0hg9b8cyw08gwbsdmqhadnx0clj3rvjavrd3hw597bh2iss3rafl"; libraryHaskellDepends = [ base MissingH mtl pretty protolude ]; + libraryToolDepends = [ doctest ]; testHaskellDepends = [ base hspec mtl pretty protolude ]; + testToolDepends = [ doctest ]; description = "Generate elm code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -132529,8 +132803,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.1.0.0"; - sha256 = "0qw6nvhlczqywwzinsj0x5p2xw8490bbizl2lmj48dr71mndxdz0"; + version = "1.1.0.1"; + sha256 = "1psb3ywbzg6k0cir5bxphjqmbzd0n1l2w3skkr31px79haa4wbm7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141302,7 +141576,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_7_0_2" = callPackage + "megaparsec_7_0_3" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -141310,8 +141584,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "7.0.2"; - sha256 = "1ny54saxiz0md50mp24gz267gmqjbl8d8b1zi74hi6bcxyhzd278"; + version = "7.0.3"; + sha256 = "1zngs6x7d1yp192pg8b0j5banq4y1vr1fwh1mxrxx0834bmqrll0"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -145988,12 +146262,17 @@ self: { }) {}; "monopati" = callPackage - ({ mkDerivation, base, directory, free, split }: + ({ mkDerivation, base, directory, free, hedgehog, split + , transformers + }: mkDerivation { pname = "monopati"; - version = "0.1.2"; - sha256 = "1bimppfh14754a8dra6cjd2ricdyry5fmm0shryf974h9l6wbrp8"; + version = "0.1.3"; + sha256 = "1g7n1m6df2c9rl99fii7x4a7z3xwv2mcvxd96gg1maji9709chqb"; libraryHaskellDepends = [ base directory free split ]; + testHaskellDepends = [ + base directory free hedgehog split transformers + ]; description = "Well-typed paths"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -147415,6 +147694,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multilinear" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, mwc-random + , primitive, statistics, vector + }: + mkDerivation { + pname = "multilinear"; + version = "0.2.2.1"; + sha256 = "0clqjf37gsgkc2lghrvdqjpzxxx1ly4zymkcflaph5x3klqlv4xy"; + libraryHaskellDepends = [ + base containers deepseq mwc-random primitive statistics vector + ]; + testHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Comprehensive and efficient (multi)linear algebra implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "multilinear-io" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, cereal-vector + , criterion, csv-enumerator, deepseq, either, multilinear + , transformers, vector, zlib + }: + mkDerivation { + pname = "multilinear-io"; + version = "0.2.1.2"; + sha256 = "12kydrh8rzvwlgd634x6swd1yv9pyxa23yh2yxj86mnisb467llj"; + libraryHaskellDepends = [ + aeson base bytestring cereal cereal-vector csv-enumerator either + multilinear transformers vector zlib + ]; + testHaskellDepends = [ base either multilinear transformers ]; + benchmarkHaskellDepends = [ + base criterion deepseq either multilinear transformers + ]; + description = "Input/output capability for multilinear package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multimap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -148958,6 +149275,68 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "n2o" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec, text + }: + mkDerivation { + pname = "n2o"; + version = "0.11.1"; + sha256 = "0yvgis2v2jgdny50py8xmc9b1p2zi5kjgf45xsgsyyhzjyr30kb7"; + libraryHaskellDepends = [ base binary bytestring containers text ]; + testHaskellDepends = [ base hspec ]; + description = "Abstract Protocol Loop"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "n2o-nitro" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , containers, n2o, text + }: + mkDerivation { + pname = "n2o-nitro"; + version = "0.11.2"; + sha256 = "1vh0r03h0k60z4q722pw4h5q0l7l56fmyp57im0nankci8vj0s38"; + libraryHaskellDepends = [ + base base64-bytestring binary bytestring containers n2o text + ]; + description = "Nitro Elements, Events and Actions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "n2o-protocols" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , containers, n2o, n2o-nitro, time + }: + mkDerivation { + pname = "n2o-protocols"; + version = "0.11.2"; + sha256 = "1w5r99k9wvhbwvx0hzgpn1aahhnb84ib0n7xgq1ybpgy3s9cggzk"; + libraryHaskellDepends = [ + base base64-bytestring binary bytestring containers n2o n2o-nitro + time + ]; + description = "N2O Protocols Starter Pack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "n2o-web" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, case-insensitive, containers, n2o, n2o-protocols + , network, text, websockets + }: + mkDerivation { + pname = "n2o-web"; + version = "0.11.2"; + sha256 = "0d01lsfd2rwavzm01bkk3020r0wpfqyyqjbdf1pc8hw1im3843p6"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + case-insensitive containers n2o n2o-protocols network text + websockets + ]; + description = "N2O adapter for WebSockets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nagios-check" = callPackage ({ mkDerivation, base, bifunctors, exceptions, hspec, mtl , QuickCheck, text @@ -151891,8 +152270,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.2.1.0"; - sha256 = "1xavggdab7khi8isvrcf85xlrxhy852fb2ccj7jhmdnfmqzbzyyq"; + version = "0.2.1.1"; + sha256 = "0z406bmfk9b1b6knpxwzkwh8n2cpfwgxdh52vghpgjf69c0yrjq1"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -153703,17 +154082,19 @@ self: { }) {}; "nuxeo" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, conduit - , conduit-extra, optparse-applicative, text, time + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , conduit-extra, http-conduit, http-types, optparse-applicative + , text, time, url }: mkDerivation { pname = "nuxeo"; - version = "0.3.0.2"; - sha256 = "1h0asiqlffy0wy76q2dz7id6nzsid5nqkmsy1mxdl77zm3d9id4f"; + version = "0.3.2"; + sha256 = "0m0rnrcay92vi47dd6cbba5vdjzdrmwb9s7wic95cbsb7wmajc72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring conduit conduit-extra text time + aeson attoparsec base bytestring conduit conduit-extra http-conduit + http-types text time url ]; executableHaskellDepends = [ base optparse-applicative text ]; license = stdenv.lib.licenses.bsd3; @@ -156279,8 +156660,8 @@ self: { }: mkDerivation { pname = "order-statistic-tree"; - version = "0.1.1.0"; - sha256 = "1gcjlvb0wbjkb3vg1bsiqip3wmacpvbc3s96f0vcm67dssdaws80"; + version = "0.1.1.1"; + sha256 = "13fhnbsx95w79r7lb1mfah8hj3cp6cqpphy31ajc6gcnzbiaqgk5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ @@ -156323,8 +156704,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "ordered-containers"; - version = "0.1.0"; - sha256 = "11smyc3z6xhb8j23wlgvvs8dvr82xmzpx2nhvkzazmgzrx3rf26b"; + version = "0.1.1"; + sha256 = "0m86imawwvr0bl18bbv9np8hlhs8ssn4l2dvxswa8f83fm61ai5a"; libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = stdenv.lib.licenses.bsd3; @@ -156411,8 +156792,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.2.2"; - sha256 = "1f6wcxkln5ddaa2z7wbkp6wndgq38qv9h1wnn27gqcms02758v2r"; + version = "0.3.0"; + sha256 = "0p1lb3ba060nnr3msqzqy0ymbm4i0nkmwix8xx5zz6hir74ix3y9"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable old-locale semigroups text thyme unordered-containers @@ -157629,10 +158010,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "1.0.2.0"; - sha256 = "0q6qj45g8d95z86lqkwpxw7c929x7q68611602mp2ip31dib11xc"; - revision = "1"; - editedCabalFile = "0zmvgzqhb4cggsr3m5xw1lhcns586jq5b0s9fhpwq1c3c6k5nq96"; + version = "1.0.3.0"; + sha256 = "0nzpww21j79s1ww2q26856m6zq325pz32jjd4hanki7ch0ni2kg2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158995,8 +159374,8 @@ self: { }: mkDerivation { pname = "parsers-megaparsec"; - version = "0.1.0.0"; - sha256 = "1xn12jbxv72hgkp9xarm9nr9rpqcijlyma47y31jz985r32nhaxj"; + version = "0.1.0.1"; + sha256 = "1fgxnxv5ispf7zg40fa35f1n7x7mk1pc8r96sbqpjbzasga79rx8"; libraryHaskellDepends = [ base fail megaparsec mtl parsers semigroups text transformers ]; @@ -161604,6 +161983,26 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template-classy" = callPackage + ({ mkDerivation, base, lens, persistent, persistent-sqlite + , persistent-template, template-haskell, text + }: + mkDerivation { + pname = "persistent-template-classy"; + version = "0.1.0.1"; + sha256 = "0ph5cfm5gj6qydv70s9bmb5ynymqnrhqiwcqpd0s87xj2iv9v46a"; + libraryHaskellDepends = [ + base lens persistent persistent-sqlite persistent-template + template-haskell text + ]; + testHaskellDepends = [ + base lens persistent persistent-sqlite persistent-template + template-haskell text + ]; + description = "Generate classy lens field accessors for persistent models"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-test" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base , base64-bytestring, blaze-builder, blaze-html, blaze-markup @@ -163959,6 +164358,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pixela" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, http-client + , http-client-tls, http-types, split, text, unordered-containers + , uri-encode, vector + }: + mkDerivation { + pname = "pixela"; + version = "0.1.0.0"; + sha256 = "02ab3n56j3y93wrwdj8rd3ff9zw9kskily1s9j2yq49zwpjnilpj"; + revision = "3"; + editedCabalFile = "0kndzh00saxdinyz5hbqkir9n578fz8db291nqynqpymw6lwkyc3"; + libraryHaskellDepends = [ + aeson base bytestring data-default http-client http-client-tls + http-types split text unordered-containers uri-encode vector + ]; + testHaskellDepends = [ + aeson base bytestring data-default http-client http-client-tls + http-types split text unordered-containers uri-encode vector + ]; + description = "Pixela client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pixelated-avatar-generator" = callPackage ({ mkDerivation, async, base, bytestring, cli, hspec, JuicyPixels , pureMD5, QuickCheck, random, split @@ -165677,6 +166099,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "port-utils" = callPackage + ({ mkDerivation, async, base, hspec, network, stm }: + mkDerivation { + pname = "port-utils"; + version = "0.1.0.2"; + sha256 = "0a27xsz4agm4bf1i8nrsmlz509yv65fvf3a8pzaqm6qxj7ir7g8i"; + libraryHaskellDepends = [ base network ]; + testHaskellDepends = [ async base hspec network stm ]; + description = "Utilities for creating and waiting on ports"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "portable-lines" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -175656,8 +176090,8 @@ self: { pname = "recursion-schemes"; version = "5.0.3"; sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v"; - revision = "2"; - editedCabalFile = "13n38bchrkkijvy6jvhjskqn1b2kahfa9rvjvjcdn4bih4ylivk7"; + revision = "3"; + editedCabalFile = "05fvpi3dc44h2a097fb9cq1jqdjq2b3sdf5hzfn9g00bid37bb5q"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers @@ -181028,15 +181462,15 @@ self: { }: mkDerivation { pname = "rounded"; - version = "0.1"; - sha256 = "02xlc369yi8wvf41z4d3291i63rcryl0yjp0k5lkn3c2f0k5w244"; + version = "0.1.0.1"; + sha256 = "04abl192vq1xq7kf9fackcb17wjyxw4068fsks3pxm9dd4iymgls"; libraryHaskellDepends = [ base ghc-prim hgmp long-double reflection singletons ]; librarySystemDepends = [ gmp mpfr ]; testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; - license = "LGPL"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; "rounding" = callPackage @@ -181490,6 +181924,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rstream" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "rstream"; + version = "0.1.0.0"; + sha256 = "14l2jww91w993b61xn1m9y9wh27dvy1l1x2fh7g9f0l8mc5a9dpv"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "stream-fusion framework from vector"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rtcm" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-bits, binary-conduit, bytestring @@ -188261,7 +188706,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "serverless-haskell_0_8_1" = callPackage + "serverless-haskell_0_8_2" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq @@ -188269,8 +188714,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.1"; - sha256 = "1s5i2l57s0crpk3lysdw0v7kvfx567bhl0v5i18mdsa331bifcpd"; + version = "0.8.2"; + sha256 = "1ia1vjiw71qkqdpbna2jgxznwlhbh184fr5m95dcyl5kwwlb3nb8"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -189198,8 +189643,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.10.1.0"; - sha256 = "1b5mbb3azjn2wwagciayd5lyb6jd2siwn1l9ispnqrkrh1bqgzb5"; + version = "1.10.2.0"; + sha256 = "0kc7yy2qv4d2n3j0qwsg37ga9yyb380d6zni08l1jabrl84maly8"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -190004,6 +190449,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shh" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath, mtl + , process, split, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, unix + }: + mkDerivation { + pname = "shh"; + version = "0.1.0.0"; + sha256 = "0ixvfwrz1bsj1c2ln7fhvf6wawf75nzqfb784xgral33hmflm518"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base deepseq directory filepath mtl process split + template-haskell unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + description = "Simple shell scripting from Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shift" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , composition-prelude, data-default, microlens @@ -194872,8 +195338,8 @@ self: { }: mkDerivation { pname = "socket"; - version = "0.8.1.0"; - sha256 = "1sbxcs1fmd7x95yk7sqv3q6gg2azn77l6sngiiv692966a0bxba0"; + version = "0.8.2.0"; + sha256 = "176px9n2f8mnxi3r2sqshrpbp7i11fskch1nkjhgqzq917sz0zgb"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -201243,8 +201709,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "2.2.0.0"; - sha256 = "1ia9xbbshzx0p69i8gq3y88qbg60cks52kb6hxm2ylkm7jnzgxzj"; + version = "2.2.1.0"; + sha256 = "1b75wnmprbb4sfnwyn5arc205ad5rlyz4hv63ai35i9iryax875s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205919,6 +206385,8 @@ self: { pname = "tdigest"; version = "0.2.1"; sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl"; + revision = "1"; + editedCabalFile = "1jrq22j9jbvx31pspwjvyb539gix7vfb8cinqkkb2abmr0jrhibn"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers @@ -208393,6 +208861,8 @@ self: { pname = "text-show"; version = "3.7.5"; sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r"; + revision = "1"; + editedCabalFile = "1v8czpi9mn54850k0pilqh1f3yfr5n5vykmg5k57wmrdpx25vkws"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -211983,8 +212453,8 @@ self: { }: mkDerivation { pname = "toodles"; - version = "0.1.0.16"; - sha256 = "1xr9cl69v5m08d44xgprlpk9j5j2lby84lzcp3fjzlvfdnnx0q72"; + version = "0.1.1"; + sha256 = "1g806bdm6l52yg6q3jni94iacp7sfdacfx6rddnsdzqb0cj6ym0w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -217582,7 +218052,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_4_0" = callPackage + "universum_1_5_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -217590,8 +218060,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.4.0"; - sha256 = "1qhpz4wlvhrdjb1pvs0lgm0pghrciqasb3378zw32lqh3pv2pnrk"; + version = "1.5.0"; + sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -218444,8 +218914,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { pname = "uri-bytestring-aeson"; - version = "0.1.0.6"; - sha256 = "02pgzkgmcam06qy1lqbmmjbah95b08hl5d5q61smmx78f83mzgfq"; + version = "0.1.0.7"; + sha256 = "16zg0fsxzdii72119jyhn2g2gy7j6pk7r8i7w5hk9a353kmvb43y"; libraryHaskellDepends = [ aeson base bytestring text uri-bytestring ]; @@ -221760,23 +222230,24 @@ self: { "voicebase" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL - , http-client, http-client-openssl, json-autotype, lens, mime-types - , optparse-applicative, text, wreq + , hspec, http-client, http-client-openssl, lens, lens-aeson + , mime-types, mtl, optparse-applicative, roundtrip, roundtrip-aeson + , text, wreq }: mkDerivation { pname = "voicebase"; - version = "0.1.1.4"; - sha256 = "17yrdrvvd3kyd6qnkfhqdwjxc5ripmzwa056rvn38ny3cxcfkd78"; + version = "0.2.0.0"; + sha256 = "0ih0z27vz7767gr11lz227vb84i2kwc6wn9z1yd0zma5nj8x73hw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-client http-client-openssl - json-autotype lens mime-types text wreq + lens lens-aeson mime-types mtl roundtrip roundtrip-aeson text wreq ]; executableHaskellDepends = [ aeson base bytestring filepath mime-types optparse-applicative text ]; - testHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base hspec roundtrip-aeson ]; description = "Upload audio files to voicebase to get a transcription"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -222062,6 +222533,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "waargonaut" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, Cabal + , cabal-doctest, containers, contravariant, digit, directory + , distributive, doctest, errors, filepath, generics-sop, hedgehog + , hoist-error, hw-balancedparens, hw-bits, hw-json, hw-prim + , hw-rankselect, lens, mmorph, mtl, nats, parsers, scientific + , semigroups, tagged, tasty, tasty-expected-failure, tasty-hedgehog + , tasty-hunit, template-haskell, text, transformers, vector + , witherable, wl-pprint-annotated, zippers + }: + mkDerivation { + pname = "waargonaut"; + version = "0.1.0.0"; + sha256 = "0y3h1kgh7n639h714ji4fycj6b8vcsa79jfv36w995p9gbjxxdjc"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors bytestring containers contravariant digit + distributive errors generics-sop hoist-error hw-balancedparens + hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats parsers + scientific semigroups tagged text transformers vector witherable + wl-pprint-annotated zippers + ]; + testHaskellDepends = [ + attoparsec base bytestring digit directory distributive doctest + filepath generics-sop hedgehog lens scientific semigroups tagged + tasty tasty-expected-failure tasty-hedgehog tasty-hunit + template-haskell text vector zippers + ]; + description = "JSON wrangling"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wacom-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, Glob, libnotify, process, select, text, udev diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 1ee0970ffad2..6892ea6364d7 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, gnome3, gtk3, glib, gettext }: stdenv.mkDerivation rec { - name = "granite-${version}"; - version = "5.1.0"; + pname = "granite"; + version = "5.2.0"; + + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "elementary"; - repo = "granite"; + repo = pname; rev = version; sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40"; }; @@ -21,10 +23,10 @@ stdenv.mkDerivation rec { gettext gobjectIntrospection ninja - perl pkgconfig - vala_0_40 + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged ]; + buildInputs = [ glib gnome3.libgee @@ -33,9 +35,12 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extension to GTK+ used by elementary OS"; - longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; + longDescription = '' + Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions + designed for use in apps built for elementary OS. + ''; homepage = https://github.com/elementary/granite; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ vozz worldofpeace ]; }; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index a21e2aacde2a..e568ea9eb650 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { rm -vf BUILD ''; + NIX_CFLAGS_COMPILE = "-Wno-error=unknown-warning-option"; + enableParallelBuilds = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 71da2c716f84..a1df933149fd 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gssapi-impl=mit" ]; - doCheck = true; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "GNU SASL, Simple Authentication and Security Layer library"; diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch new file mode 100644 index 000000000000..b1f9d0978cec --- /dev/null +++ b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch @@ -0,0 +1,13 @@ +Common subdirectories: libid3tag-0.15.1b/msvc++ and libid3tag-0.15.1b-patched/msvc++ +diff -uwp libid3tag-0.15.1b/utf16.c libid3tag-0.15.1b-patched/utf16.c +--- libid3tag-0.15.1b/utf16.c 2004-01-23 10:41:32.000000000 +0100 ++++ libid3tag-0.15.1b-patched/utf16.c 2018-11-01 13:12:00.866050641 +0100 +@@ -250,6 +250,8 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by + id3_ucs4_t *ucs4; + + end = *ptr + (length & ~1); ++ if (end == *ptr) ++ return 0; + + utf16 = malloc((length / 2 + 1) * sizeof(*utf16)); + if (utf16 == 0) diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 0289a5331f89..4b7d9bdc2e32 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib gperf ]; - patches = [ ./debian-patches.patch ]; + patches = [ + ./debian-patches.patch + ./CVE-2017-11550-and-CVE-2017-11551.patch + ]; preConfigure = '' configureFlagsArray+=( diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index afe30e4b5eef..ab9a696afb00 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "a C runtime library for AVR microcontrollers"; homepage = http://savannah.nongnu.org/projects/avr-libc/; license = licenses.bsd3; - platforms = platforms.all; + platforms = [ "avr-none" ]; maintainers = with maintainers; [ mguentner ]; }; } diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 21230464e747..fbe48803f2db 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -32,6 +32,9 @@ in stdenv.mkDerivation rec { postPatch = '' sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + + substitutateInPlace Makefile \ + --replace "--specs=nano.specs" "" ''; enableParallelBuilding = true; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 9c35ac2ffce1..102b1eb8048d 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -26,6 +26,9 @@ in stdenv.mkDerivation rec { sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + + substitutateInPlace Makefile \ + --replace "--specs=nano.specs" "" ''; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 971aac70ad8e..700f5b3d0c52 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -3,12 +3,12 @@ , fetchPypi , pkgs , isPy3k +, python }: buildPythonPackage rec { pname = "bsddb3"; version = "6.2.6"; - disabled = isPy3k; src = fetchPypi { inherit pname version; @@ -17,8 +17,9 @@ buildPythonPackage rec { buildInputs = [ pkgs.db ]; - # Judging from SyntaxError in test - doCheck = false; # test suite breaks python3 compatibility + checkPhase = '' + ${python.interpreter} test.py + ''; # Path to database need to be set. # Somehow the setup.py flag is not propagated. diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f40c0fcb5592..428d6c60546e 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -942,6 +942,10 @@ let PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz"; }); + ps = old.ps.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + rlang = old.rlang.overrideDerivation (attrs: { preConfigure = "patchShebangs configure"; }); diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix new file mode 100644 index 000000000000..d667e49e7cbe --- /dev/null +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "timescaledb-parallel-copy-${version}"; + version = "2018-05-14"; + + owner = "timescale"; + repo = "timescaledb-parallel-copy"; + + goPackagePath = with src; "github.com/${owner}/${repo}"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + inherit owner repo; + rev = "20d3e8f8219329f2f4b0a5aa985f280dd04d10bb"; + sha256 = "0waaccw991cnxaxjdxh9ksb94kiiyx1r7gif6pkd5k58js0kfvdn"; + }; + + meta = with stdenv.lib; { + description = "Bulk, parallel insert of CSV records into PostgreSQL"; + homepage = http://github.com/timescale/timescaledb-parallel-copy; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix new file mode 100644 index 000000000000..c672611e09c1 --- /dev/null +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/jmoiron/sqlx"; + fetch = { + type = "git"; + url = "https://github.com/jmoiron/sqlx"; + rev = "0dae4fefe7c0e190f7b5a78dac28a1c82cc8d849"; + sha256 = "0r8fyj70n0v84byvagw8w8rzz532s94mjr72b9sx018j0b6xglmy"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; + sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; + }; + } +] diff --git a/pkgs/development/tools/jq/darwin-strptime-test.patch b/pkgs/development/tools/jq/darwin-strptime-test.patch deleted file mode 100644 index 4ea83fc164a3..000000000000 --- a/pkgs/development/tools/jq/darwin-strptime-test.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tests/jq.test b/tests/jq.test -index 4a4018b..f5aa7d5 100644 ---- a/src/tests/jq.test -+++ b/src/tests/jq.test -@@ -1144,9 +1144,9 @@ bsearch(4) - [1,2,3] - -4 - --[strptime("%Y-%m-%dT%H:%M:%SZ")|(.,mktime)] -+[strptime("%Y-%m-%dT%H:%M:%SZ")|mktime] - "2015-03-05T23:51:47Z" --[[2015,2,5,23,51,47,4,63],1425599507] -+[1425599507] - - strftime("%Y-%m-%dT%H:%M:%SZ") - [2015,2,5,23,51,47,4,63] diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 712ec64bd416..b7b2b5066b9f 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -2,33 +2,17 @@ stdenv.mkDerivation rec { name = "jq-${version}"; - version="1.5"; + version="1.6"; src = fetchurl { url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"; + sha256="1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn"; }; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; buildInputs = [ oniguruma ]; - patches = [ - (fetchpatch { - name = "CVE-2015-8863.patch"; - url = https://github.com/stedolan/jq/commit/8eb1367ca44e772963e704a700ef72ae2e12babd.diff; - sha256 = "18bjanzvklfzlzzd690y88725l7iwl4f6wnr429na5pfmircbpvh"; - }) - (fetchpatch { - name = "CVE-2016-4074.patch"; - url = https://patch-diff.githubusercontent.com/raw/stedolan/jq/pull/1214.diff; - sha256 = "1w8bapnyp56di6p9casbfczfn8258rw0z16grydavdjddfm280l9"; - }) - ] - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-strptime-test.patch; - - patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released - configureFlags = [ "--bindir=\${bin}/bin" diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index 99e53610c01c..382e733cb98b 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -1,9 +1,15 @@ { stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript -, dune, python3, rsync, fetchpatch }: +, dune, python3, rsync, fetchpatch, buck }: let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. - pyre-version = "0.0.14"; + pyre-version = "0.0.17"; # also change typeshed revision below with $pyre-src/.typeshed-version + pyre-src = fetchFromGitHub { + owner = "facebook"; + repo = "pyre-check"; + rev = "v${pyre-version}"; + sha256 = "0y86a3g5xbgh0byksyx5jw7yq7w840x85dhz9inz6mkg5j06mcis"; + }; versionFile = writeScript "version.ml" '' cat > "./version.ml" <<EOF open Core @@ -20,12 +26,7 @@ let pyre-bin = stdenv.mkDerivation { name = "pyre-${pyre-version}"; - src = fetchFromGitHub { - owner = "facebook"; - repo = "pyre-check"; - rev = "v${pyre-version}"; - sha256 = "0c8xzaa3ljqb6llr041sydw0l4xqn7x21nw9vaymdxh35nx9bp2v"; - }; + src = pyre-src; nativeBuildInputs = [ makeWrapper ]; @@ -49,7 +50,6 @@ let export HOME=. # "external" because https://github.com/facebook/pyre-check/pull/8/files - cp Makefile.template Makefile sed "s/%VERSION%/external/" dune.in > dune cp ${versionFile} ./scripts/generate-version-number.sh @@ -77,20 +77,18 @@ let description = "A performant type-checker for Python 3"; homepage = https://pyre-check.org; license = licenses.mit; - platforms = with platforms; linux; + platforms = ocamlPackages.ocaml.meta.platforms; maintainers = with maintainers; [ teh ]; }; }; typeshed = stdenv.mkDerivation { name = "typeshed"; - # typeshed doesn't have versions, it seems to be synchronized with - # mypy relases. I'm assigning a random version here (same as pyre). version = pyre-version; src = fetchFromGitHub { owner = "python"; repo = "typeshed"; - rev = "a08c6ea"; - sha256 = "0wy8yh43vhyyc4g7iqnmlj66kz5in02y5qc0c4jdckhpa3mchaqk"; + rev = "bc3f9fe1d3c43b00c04cedb23e0eeebc9e1734b6"; + sha256 = "06b2kj4n49h4sgi8hn5kalmir8llhanfdc7f1924cxvrkj5ry94b"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = "cp -r $src $out"; @@ -98,19 +96,8 @@ typeshed = stdenv.mkDerivation { in python3.pkgs.buildPythonApplication rec { pname = "pyre-check"; version = pyre-version; - src = fetchFromGitHub { - owner = "facebook"; - repo = "pyre-check"; - rev = "v${pyre-version}"; - sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l"; - }; - patches = [ - (fetchpatch { - url = "https://github.com/facebook/pyre-check/commit/b473d2ed9fc11e7c1cd0c7b8c42f521e5cdc2003.patch"; - sha256 = "05xvyp7j4n6z92bxf64rxfq5pvaadxgx1c8c5qziy75vdz72lkcy"; - }) - ./pyre-bdist-wheel.patch - ]; + src = pyre-src; + patches = [ ./pyre-bdist-wheel.patch ]; # The build-pypi-package script does some funky stuff with build # directories - easier to patch it a bit than to replace it @@ -119,15 +106,21 @@ in python3.pkgs.buildPythonApplication rec { mkdir ./build substituteInPlace scripts/build-pypi-package.sh \ --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \ - --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$(pwd)/build" + --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$PWD/build" + substituteInPlace client/buck.py \ + --replace '"buck"' '"${buck}/bin/buck"' + substituteInPlace client/tests/buck_test.py \ + --replace '"buck"' '"${buck}/bin/buck"' ''; - buildInputs = [ pyre-bin rsync ]; + buildInputs = [ pyre-bin ]; + nativeBuildInputs = [ rsync ]; # only required for build-pypi-package.sh propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ]; buildPhase = '' bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed} cp -r build/dist dist ''; - - doCheck = false; # can't open file 'nix_run_setup': + checkPhase = '' + bash scripts/run-python-tests.sh + ''; } diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index ca793bf49080..246f5b18843c 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { name = "cargo-asm-${version}"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1m2j6i8hc8isdlj77gv9m6sk6q0x3bvzpva2k16g27i1ngy1989b"; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + # Test checks against machine code output, which fails with some # LLVM/compiler versions. doCheck = false; diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 0e9025259224..fc7bf7168ddf 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake -, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis }: +, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis +, libiconv }: stdenv.mkDerivation rec { name = "gemrb-${version}"; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { }; # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional - buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis ]; + buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b81b4340d767..f8bf08b55b7d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -89,11 +89,11 @@ let }; meta = with lib; { - homepage = https://www.postgresql.org; + homepage = https://www.postgresql.org; description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = [ maintainers.ocharles ]; - platforms = platforms.unix; + license = licenses.postgresql; + maintainers = with maintainers; [ ocharles thoughtpolice ]; + platforms = platforms.unix; }; }); diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/pgjwt/default.nix index 3e01d9bfe2ca..ab7ba8943a7b 100644 --- a/pkgs/servers/sql/postgresql/pgjwt/default.nix +++ b/pkgs/servers/sql/postgresql/pgjwt/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, postgresql }: + stdenv.mkDerivation rec { - name = "pgjwt-${version}"; + name = "pgjwt-${version}"; version = "unstable-2017-04-24"; + src = fetchFromGitHub { - owner = "michelp"; - repo = "pgjwt"; - rev = "546a2911027b716586e241be7fd4c6f1785237cd"; + owner = "michelp"; + repo = "pgjwt"; + rev = "546a2911027b716586e241be7fd4c6f1785237cd"; sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf"; }; - dontBuild = true; + + buildPhase = ":"; installPhase = '' mkdir -p $out/bin # current postgresql extension mechanism in nixos requires bin directory mkdir -p $out/share/extension cp pg*sql *.control $out/share/extension ''; + meta = with stdenv.lib; { description = "PostgreSQL implementation of JSON Web Tokens"; longDescription = '' diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix new file mode 100644 index 000000000000..be616c1bf9e0 --- /dev/null +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -0,0 +1,83 @@ +{ stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp }: +let + versionMajor = "6.3"; + versionMinor = "6_1"; +in + stdenv.mkDerivation rec { + name = "nomachine-client-${version}"; + version = "${versionMajor}.${versionMinor}"; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_x86_64.tar.gz"; + sha256 = "1035j2z2rqmdfb8cfm1pakd05c575640604b8lkljmilpky9mw5d"; + } + else if stdenv.hostPlatform.system == "i686-linux" then + fetchurl { + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_i686.tar.gz"; + sha256 = "07j9f6mlq9m01ch8ik5dybi283vrp5dlv156jr5n7n2chzk34kf3"; + } + else + throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; + + postUnpack = '' + mv $(find . -type f -name nxclient.tar.gz) . + mv $(find . -type f -name nxplayer.tar.gz) . + rm -r NX/ + tar xf nxclient.tar.gz + tar xf nxplayer.tar.gz + rm $(find . -maxdepth 1 -type f) + ''; + + nativeBuildInputs = [ file makeWrapper autoPatchelfHook ]; + buildInputs = [ jsoncpp ]; + + installPhase = '' + rm bin/nxplayer bin/nxclient + + mkdir -p $out/NX + cp -r bin lib share $out/NX/ + + ln -s $out/NX/bin $out/bin + + for i in share/icons/*; do + if [[ -d "$i" ]]; then + mkdir -p "$out/share/icons/hicolor/$(basename $i)/apps" + cp "$i"/* "$out/share/icons/hicolor/$(basename $i)/apps/" + fi + done + + mkdir $out/share/applications + cp share/applnk/player/xdg/*.desktop $out/share/applications/ + cp share/applnk/client/xdg-mime/*.desktop $out/share/applications/ + + mkdir -p $out/share/mime/packages + cp share/applnk/client/xdg-mime/*.xml $out/share/mime/packages/ + + for i in $out/share/applications/*.desktop; do + substituteInPlace "$i" --replace /usr/NX/bin $out/bin + done + ''; + + postFixup = '' + makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX + makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX + ''; + + dontBuild = true; + dontStrip = true; + + meta = with stdenv.lib; { + description = "NoMachine remote desktop client (nxplayer)"; + homepage = https://www.nomachine.com/; + license = { + fullName = "NoMachine 6 End-User License Agreement"; + url = https://www.nomachine.com/licensing-6; + free = false; + }; + maintainers = with maintainers; [ talyz ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; + } + diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 2d54c182349c..1a215d4ca83b 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.06.23"; + version = "2018.10.25"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0487dlw9v4ayb929w8bk71fs4nbcs1liyk59g6sfr4yn6dx2sl2d"; + sha256 = "0q7yrds1hpis1821mdsz31c2cvn7hs73a10fi1mrk1v4hqql8vv3"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 4bd4a02c7a2d..d449b3b82f92 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + # https://github.com/NixOS/nixpkgs/issues/49642 + doCheck = !stdenv.isDarwin; + postInstall = '' install -m 444 -Dt $out/share/man/man1 doc/bat.1 diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 69d73aafff92..46e460db354f 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala, python3, gnome3, gtk3, granite, gobjectIntrospection, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala_0_40, python3, gnome3, gtk3, granite, gobjectIntrospection, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; - version = "0.2.0"; + version = "1.0.0"; name = "${pname}-${version}"; @@ -10,30 +10,37 @@ stdenv.mkDerivation rec { owner = "artemanufrij"; repo = pname; rev = version; - sha256 = "1d2g7cm7hhs354waidak9xkhhcvqlwnsl9d0bar9p82gfnpjdg7v"; + sha256 = "1ba38qmwdk7vkarsxqn89irbymzx52gbks4isx0klg880xm2z4dv"; }; nativeBuildInputs = [ + desktop-file-utils gobjectIntrospection meson ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + gnome3.libgee granite gtk3 - gnome3.libgee ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + meta = with stdenv.lib; { description = "A simple app for checking usual checksums"; - homepage = https://github.com/artemanufrij/hashit; - license = licenses.gpl2Plus; + homepage = https://github.com/artemanufrij/hashit; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 24672296506d..59ec714261b1 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz }: +{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }: rustPlatform.buildRustPackage rec { name = "nix-du-${version}"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; rev = "v${version}"; - sha256 = "1n1qgqjbwbb59xnzgz0dn8h8pckh6yq3crh0w6x2sngijwh678x8"; + sha256 = "1x6qpivxbn94034jfdxb97xi97fhcdv2z7llq2ccfc80mgd0gz8l"; }; - cargoSha256 = "1qidbrkdpf4kliyvy2040qi3a67s8mr2r46rjcblr1v2gar0xgs0"; + cargoSha256 = "0sva4lnhccm6ly7pa6m99s3fqkmh1dzv7r2727nsg2f55prd4kxc"; - # switch to true when nix includes https://github.com/NixOS/nix/pull/2223 and - # https://github.com/NixOS/nix/pull/2234 - doCheck = false; + doCheck = true; checkInputs = [ graphviz ]; buildInputs = [ boost nix - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = with stdenv.lib; { description = "A tool to determine which gc-roots take space in your nix store"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 192d90132298..f214f7043b89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4388,6 +4388,8 @@ with pkgs; nms = callPackage ../tools/misc/nms { }; + nomachine-client = callPackage ../tools/admin/nomachine-client { }; + notify-desktop = callPackage ../tools/misc/notify-desktop {}; nkf = callPackage ../tools/text/nkf {}; @@ -6861,7 +6863,7 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc843.override { + haskellPackages = haskell.packages.ghc844.override { overrides = config.haskellPackageOverrides or haskell.packageOverrides; }; @@ -7355,7 +7357,9 @@ with pkgs; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-update = callPackage ../tools/package-management/cargo-update { }; - cargo-asm = callPackage ../development/tools/rust/cargo-asm { }; + cargo-asm = callPackage ../development/tools/rust/cargo-asm { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; @@ -13594,6 +13598,8 @@ with pkgs; libmemcached = null; # Detection is broken upstream }; + timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; + postgresql = postgresql_9_6; inherit (callPackages ../servers/sql/postgresql { }) @@ -16048,6 +16054,8 @@ with pkgs; pulseaudioSupport = config.pulseaudio or false; }; + cmusfm = callPackage ../applications/audio/cmusfm { }; + cni = callPackage ../applications/networking/cluster/cni {}; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e654b35d258d..dea3ba954253 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -103,7 +103,7 @@ in { stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; }; ghcjs84 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc843; + bootPkgs = packages.ghc844; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49bc322d4798..381cdea938e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4454,21 +4454,21 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-2.0.3"; + name = "PyICU-2.2"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "0pzss3l0b0vcsyr7wlqdd6pkcqldspajfgd9k2iijf6r152d2ln4"; + sha256 = "0wq9y5fi1ighgf5aws9nr87vi1w44p7q1k83rx2y3qj5d2xyhspa"; }; patches = [ (pkgs.fetchpatch { - url = https://sources.debian.org/data/main/p/pyicu/2.0.3-1/debian/patches/icu_test.patch; + url = https://sources.debian.org/data/main/p/pyicu/2.2-1/debian/patches/icu_test.patch; sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9"; }) ]; - buildInputs = [ pkgs.icu self.pytest ]; + buildInputs = [ pkgs.icu60 self.pytest ]; propagatedBuildInputs = [ self.six ]; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 456bacb106b1..6cf0cb57be4f 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -142,7 +142,7 @@ in avr = mapTestOnCross lib.systems.examples.avr embedded; arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded; - powerpc-embedded = mapTestOnCross lib.systems.examples.powerpc-embedded embedded; + powerpc-embedded = mapTestOnCross lib.systems.examples.ppc-embedded embedded; aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded; i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; |