diff options
Diffstat (limited to 'nixpkgs/pkgs/applications')
252 files changed, 2333 insertions, 2324 deletions
diff --git a/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix b/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix index f597d6b6527c..d67ac0a7055c 100644 --- a/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix +++ b/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.14.0.0"; + version = "0.14.1.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8"; + sha256 = "0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch index ae733151622d..260c6d9d00f2 100644 --- a/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -1,11 +1,12 @@ diff --git a/main.cpp b/main.cpp -index 79223c0..e80b317 100644 +index a51568d..5a9f683 100644 --- a/main.cpp +++ b/main.cpp -@@ -115,6 +115,9 @@ int main(int argc, char *argv[]) +@@ -152,7 +152,9 @@ int main(int argc, char *argv[]) QCommandLineOption logPathOption(QStringList() << "l" << "log-file", QCoreApplication::translate("main", "Log to specified file"), QCoreApplication::translate("main", "file")); +- + logPathOption.setDefaultValue( + QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + + "/monero-wallet-gui.log"); diff --git a/nixpkgs/pkgs/applications/altcoins/monero/default.nix b/nixpkgs/pkgs/applications/altcoins/monero/default.nix index 94c277f63eb0..9a4aa2e0a28a 100644 --- a/nixpkgs/pkgs/applications/altcoins/monero/default.nix +++ b/nixpkgs/pkgs/applications/altcoins/monero/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.14.0.2"; + version = "0.14.1.0"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k"; + sha256 = "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh"; }; nativeBuildInputs = [ cmake pkgconfig git ]; diff --git a/nixpkgs/pkgs/applications/altcoins/parity/beta.nix b/nixpkgs/pkgs/applications/altcoins/parity/beta.nix index ed3f691122ce..cce0b1c64883 100644 --- a/nixpkgs/pkgs/applications/altcoins/parity/beta.nix +++ b/nixpkgs/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.5.1"; - sha256 = "0nnrgc2qyqqld3znjigryqpg5jaqh3jnmin4a334dbr4jw50dz3d"; - cargoSha256 = "184vfhsalk5dims3k13zrsv4lmm45a7nm3r0b84g72q7hhbl8pkf"; + version = "2.5.4"; + sha256 = "103kg0lrijf6d0mc1nk4pdgwgkmp9ga51rwfqrkkm133lylrr0lf"; + cargoSha256 = "1w9p43v76igb62mbjk2rl7fynk13l4hpz25jd4f4hk5b2y2wf3r7"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/nixpkgs/pkgs/applications/altcoins/parity/default.nix b/nixpkgs/pkgs/applications/altcoins/parity/default.nix index 18e3dd4129e4..57b1faf71f70 100644 --- a/nixpkgs/pkgs/applications/altcoins/parity/default.nix +++ b/nixpkgs/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.4.6"; - sha256 = "0vfq1pyd92n60h9gimn4d5j56xanvl43sgxk9h2kb16amy0mmh3z"; - cargoSha256 = "04gi9vddahq1q207f83n3wriwdjnmmnby6mq4crdh7yx1p4b26m9"; + version = "2.4.9"; + sha256 = "0pj3yyjzc3fq0r7g8j22anzqxvm377pbcy27np1g7ygkzapzb2v6"; + cargoSha256 = "1dxn00zxivmgk4a61nxwhjlv7fjsy2ngadyw0br1ssrkgz9k7af2"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/nixpkgs/pkgs/applications/altcoins/parity/parity.nix b/nixpkgs/pkgs/applications/altcoins/parity/parity.nix index 9eb189f014e2..011a44fe1709 100644 --- a/nixpkgs/pkgs/applications/altcoins/parity/parity.nix +++ b/nixpkgs/pkgs/applications/altcoins/parity/parity.nix @@ -5,7 +5,7 @@ { stdenv , fetchFromGitHub -, rustPlatform +, rustPlatform , pkgconfig , openssl , systemd @@ -29,12 +29,14 @@ rustPlatform.buildRustPackage rec { systemd.lib systemd.dev openssl openssl.dev ]; + cargoBuildFlags = [ "--features final" ]; + # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out doCheck = false; meta = with stdenv.lib; { description = "Fast, light, robust Ethereum implementation"; - homepage = http://parity.io; + homepage = "http://parity.io"; license = licenses.gpl3; maintainers = [ maintainers.akru ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix b/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix index 8865743de7f1..f9a53f59e4d4 100644 --- a/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -22,6 +22,11 @@ python3Packages.buildPythonApplication rec { pname = "cozy"; version = "0.6.7"; + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/57029 + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + src = fetchFromGitHub { owner = "geigi"; repo = pname; diff --git a/nixpkgs/pkgs/applications/audio/ecasound/default.nix b/nixpkgs/pkgs/applications/audio/ecasound/default.nix index a9d84eb6e6c5..1013b8a560ca 100644 --- a/nixpkgs/pkgs/applications/audio/ecasound/default.nix +++ b/nixpkgs/pkgs/applications/audio/ecasound/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { name = "ecasound-${version}"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "https://ecasound.seul.org/download/ecasound-${version}.tar.gz"; - sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r"; + sha256 = "15rcs28fq2wfvfs66p5na7adq88b55qszbhshpizgdbyqzgr2jf1"; }; buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ]; diff --git a/nixpkgs/pkgs/applications/audio/elisa/default.nix b/nixpkgs/pkgs/applications/audio/elisa/default.nix index 00e10a2ff1e2..37c95430627f 100644 --- a/nixpkgs/pkgs/applications/audio/elisa/default.nix +++ b/nixpkgs/pkgs/applications/audio/elisa/default.nix @@ -1,26 +1,28 @@ { mkDerivation, fetchFromGitHub, lib , extra-cmake-modules, kdoctools, wrapGAppsHook , qtmultimedia, qtquickcontrols2, qtwebsockets -, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit -, baloo +, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit, kirigami2 +, baloo, vlc }: mkDerivation rec { - name = "elisa-${version}"; - version = "0.3.0"; + pname = "elisa"; + version = "0.4.2"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = "v${version}"; - sha256 = "0bpkr5rp9nfa2wzm6w3xkhsfgf5dbgxbmhckjh9wkxal3mncpkg4"; + sha256 = "0q098zaajwbpkrarrsdzpjhpsq2nxkqaxwzhr2gjlg08j9vqkpfm"; }; + buildInputs = [ vlc ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ qtmultimedia qtquickcontrols2 qtwebsockets - kconfig kcmutils kcrash kdeclarative kfilemetadata kinit + kconfig kcmutils kcrash kdeclarative kfilemetadata kinit kirigami2 baloo ]; diff --git a/nixpkgs/pkgs/applications/audio/jalv/default.nix b/nixpkgs/pkgs/applications/audio/jalv/default.nix index e2f0c7ea7af4..0f1ed143dddd 100644 --- a/nixpkgs/pkgs/applications/audio/jalv/default.nix +++ b/nixpkgs/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jalv-${version}"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { url = "https://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili"; + sha256 = "13al2hb9s3m7jgbg051x704bmzmcg4wb56cfh8z588kiyh0mxpaa"; }; nativeBuildInputs = [ pkgconfig wafHook ]; diff --git a/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 45fc05623372..9a406a994ccc 100644 --- a/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.0.12"; + version = "1.1.3.1"; format = "other"; doCheck = false; @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0jc40p2yw3zp035c87crav2lq0iraf35ag9w26vzmbjvgpvwzb86"; + sha256 = "1mini63ngmi62g3xq0bvq316k2vv3ck7q5qn3mfqph38na605waj"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/nixpkgs/pkgs/applications/audio/padthv1/default.nix index b2e5fb11ac31..93aacae47aee 100644 --- a/nixpkgs/pkgs/applications/audio/padthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "0ddvlpjlg6zr9ckanqhisw0sgm8rxibvj1aj5dxzs9xb2wlwd8rr"; + sha256 = "1jd4bf6a1ipvg4yhb3xf3maqg68bx97ic9l57djmkirlrkh2a3wp"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 8a0762d5176b..f63b828a0a89 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -35,6 +35,7 @@ in stdenv.mkDerivation rec { patches = [ ./fix-install-path.patch + ./fix-aac-defaults.patch ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch new file mode 100644 index 000000000000..c94c5dd61f26 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch @@ -0,0 +1,15 @@ +diff --git a/src/modules/bluetooth/a2dp/a2dp_aac.c b/src/modules/bluetooth/a2dp/a2dp_aac.c +index 394a7a0..cf5abaf 100644 +--- a/src/modules/bluetooth/a2dp/a2dp_aac.c ++++ b/src/modules/bluetooth/a2dp/a2dp_aac.c +@@ -90,8 +90,8 @@ pa_aac_encoder_init(pa_a2dp_source_read_cb_t read_cb, pa_a2dp_source_read_buf_fr + info->read_pcm = read_cb; + info->read_buf_free = free_cb; + info->aacenc_handle_opened = false; +- info->aac_enc_bitrate_mode = 5; +- info->aac_afterburner = false; ++ info->aac_enc_bitrate_mode = 0; ++ info->aac_afterburner = true; + info->force_pa_fmt = PA_SAMPLE_INVALID; + return true; + } diff --git a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index b2fd3a52a2d9..0a4c9bebde7c 100644 --- a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -47,13 +47,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.6.3"; + version = "4.6.5"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1gp23hpsnbiymbbhn6hp8sg1pnysgf04bj9k4h9dfinbgshlq6m7"; + sha256 = "11ihr29szpqlk9wkscns00ijihyvn5659bj1p7r1ixwgfv708apq"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/nixpkgs/pkgs/applications/audio/qmmp/default.nix index 490f8639d389..03f6bb1b7936 100644 --- a/nixpkgs/pkgs/applications/audio/qmmp/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.3.2"; + name = "qmmp-1.3.3"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "1rh063kcyg7gs9yj2r4v5irpnq4pjaxaxsgrw30mdr21xhhc15cz"; + sha256 = "1777kqgvbkshqlawy00gbgwflxflwmjjidqdq29mhqszs76r6727"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/nixpkgs/pkgs/applications/audio/qtractor/default.nix index 6c1f561ad74e..b83804e16be9 100644 --- a/nixpkgs/pkgs/applications/audio/qtractor/default.nix +++ b/nixpkgs/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0z97c8h0m7070bfq0qsbf8hwzwcqjs7dln7na4mngyhc6vqkg63s"; + sha256 = "1llajl450yh7bka32ngm4xdva6a2nnxzjc497ydh07rwkap16smx"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index 356078fde228..95a08b59b00e 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.978"; + version = "5.979"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0na7364zxxcic5mq4vaaj4va0g6rhwnwn9fg5gb421iba29ylmhg"; + sha256 = "0v9i7wgl68clwlw5k6rwligk3b3bl6c8xxabklglbxnx5i6iw5ia"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/audio/samplv1/default.nix b/nixpkgs/pkgs/applications/audio/samplv1/default.nix index 5d2b1645473b..cf429bf98d4c 100644 --- a/nixpkgs/pkgs/applications/audio/samplv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1vgmcjccpgqqlmmwfg6m91nph81p2xaxydjx82n4l1yrr9lidn9h"; + sha256 = "138kd9szgn3b97s7crhsyj8pgwb0bn4l9knd4zliqjgj2f1bs9x0"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/nixpkgs/pkgs/applications/audio/snd/default.nix b/nixpkgs/pkgs/applications/audio/snd/default.nix index ac69e63979b5..9627e35454ee 100644 --- a/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-19.3"; + name = "snd-19.4"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "16j3fqyw361wdsr1076f0p3va2y7wdzq1lvr4ijz1ajmbxdlc723"; + sha256 = "1g96r1js9rfxxczpaa1ggrz7i1zsj4px4fyz64kbqawzsn9xapg9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/synthv1/default.nix b/nixpkgs/pkgs/applications/audio/synthv1/default.nix index 170045704efd..837a08fa331d 100644 --- a/nixpkgs/pkgs/applications/audio/synthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "0i70wm430fvksi3g985farrkhgb7mwhi7j06dl66cdj1n12jzzk7"; + sha256 = "15kabmxp38wqvavs5hr1dqasjjf1j977kzqggxfmzyi3y5fan3hj"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/nixpkgs/pkgs/applications/editors/amp/default.nix b/nixpkgs/pkgs/applications/editors/amp/default.nix new file mode 100644 index 000000000000..98692de43170 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/amp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2 }: + +rustPlatform.buildRustPackage rec { + pname = "amp"; + # The latest release (0.5.2) does not compile, so we use a git snapshot instead. + version = "unstable-2019-06-09"; + + src = fetchFromGitHub { + owner = "jmacdonald"; + repo = pname; + rev = "2c88e82a88ada8a5fd2620ef225192395a4533a2"; + sha256 = "0ha1xiabq31s687gkrnszf3zc7b3sfdl79iyg5ygbc49mzvarp8c"; + }; + + cargoSha256 = "1bvj2zg19ak4vi47vjkqlybz011kn5zq1j7zznr76zrryacw4lz1"; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ openssl python3 xorg.libxcb libgit2 ]; + + # Tests need to write to the theme directory in HOME. + preCheck = "export HOME=`mktemp -d`"; + + meta = with stdenv.lib; { + description = "A modern text editor inspired by Vim"; + homepage = "https://amp.rs"; + license = [ licenses.gpl3 ]; + maintainers = [ maintainers.sb0 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index db51b3feebe2..abb949bf5fd3 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30"; }; betaVersion = { - version = "3.5.0.16"; # "Android Studio 3.5 Beta 4" - build = "191.5619324"; - sha256Hash = "1rg6v9b8fdnmslpv80khhpx59lvwhj1vwbkyabz2fryfj67wz01z"; + version = "3.5.0.17"; # "Android Studio 3.5 Beta 5" + build = "191.5675373"; + sha256Hash = "0iw9v2rzr32dhs3z4vgz93zvxcv111q4cvwzi2cb83hn8kl050ip"; }; latestVersion = { # canary & dev version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 8f440819afed..a401bbc0be1b 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -83,9 +83,6 @@ self: packageRequires = with self; [ evil highlight ]; }); - # missing OCaml - flycheck-ocaml = markBroken super.flycheck-ocaml; - # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; @@ -175,9 +172,6 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - # missing OCaml - merlin = markBroken super.merlin; - mhc = super.mhc.override { inherit (self.melpaPackages) calfw; }; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/offlineimap/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/offlineimap/default.nix index f61eaa982663..e03b1a42ab1a 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/offlineimap/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/offlineimap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "OfflineIMAP support for Emacs"; homepage = "http://julien.danjou.info/projects/emacs-packages#offlineimap"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = [ ]; broken = true; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix index 6881ccd784ea..c1fad2dc8651 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20181230"; + version = "20190527"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20181230.tar"; - sha256 = "1ydl6cikf4myrz59qvajbdxg1bvbpqjlkxn54qhrhh4755llcfkv"; + url = "http://orgmode.org/elpa/org-20190527.tar"; + sha256 = "1fc2nyylzpikjikyb24xq2mcilridcahmjwmg0s426dqrgqpm9ij"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20181230"; + version = "20190527"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20181230.tar"; - sha256 = "0gibwcjlardjwq19bh0zzszv0dxxlml0rh5iikkcdynbgndk1aa1"; + url = "http://orgmode.org/elpa/org-plus-contrib-20190527.tar"; + sha256 = "16kf47ij25fijf6pbfxzq9xzildj1asdzhnkf5zv5pn4312pvgnq"; }; packageRequires = []; meta = { @@ -30,4 +30,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } diff --git a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index 63568bef6f74..748fbfc42d54 100644 --- a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.32.0"; + version = "3.32.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00l7sshpndk995aw98mjmsc3mxhxzynlp7il551iwwjjdbc70qp4"; + sha256 = "1vlr69sgiv3kg2qa3n7aw3913bmvlcpyhy3w8lls13wjrgif4wny"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/nixpkgs/pkgs/applications/editors/kakoune/default.nix index 16596056c9a0..8dfcc4856680 100644 --- a/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "kakoune-${version}"; + pname = "kakoune-unwrapped"; version = "2019.01.20"; src = fetchFromGitHub { repo = "kakoune"; diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins.nix new file mode 100644 index 000000000000..d2f3607d63cb --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins.nix @@ -0,0 +1,5 @@ +{ parinfer-rust }: + +{ + inherit parinfer-rust; +} diff --git a/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix b/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix new file mode 100644 index 000000000000..b4cc823880e7 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix @@ -0,0 +1,44 @@ +{ stdenv, bash }: +with stdenv.lib; + +kakoune: + +let + getPlugins = { plugins ? [] }: plugins; + + wrapper = { configure ? {} }: + stdenv.mkDerivation rec { + pname = "kakoune"; + version = getVersion kakoune; + + src = ./.; + buildCommand = '' + mkdir -p $out/share/kak + for plugin in ${strings.escapeShellArgs (getPlugins configure)}; do + if [[ -d $plugin/share/kak/autoload ]]; then + find "$plugin/share/kak/autoload" -type f -name '*.kak'| while read rcfile; do + printf 'source "%s"\n' "$rcfile" + done + fi + done >>$out/share/kak/plugins.kak + + mkdir -p $out/bin + substitute ${src}/wrapper.sh $out/bin/kak \ + --subst-var-by bash "${bash}" \ + --subst-var-by kakoune "${kakoune}" \ + --subst-var-by out "$out" + chmod +x $out/bin/kak + ''; + + preferLocalBuild = true; + buildInputs = [ bash kakoune ]; + passthru = { unwrapped = kakoune; }; + + meta = kakoune.meta // { + # prefer wrapper over the package + priority = (kakoune.meta.priority or 0) - 1; + hydraPlatforms = []; + }; + }; +in + makeOverridable wrapper diff --git a/nixpkgs/pkgs/applications/editors/kakoune/wrapper.sh b/nixpkgs/pkgs/applications/editors/kakoune/wrapper.sh new file mode 100644 index 000000000000..48a971a10c6e --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/kakoune/wrapper.sh @@ -0,0 +1,30 @@ +#!@bash@/bin/bash + +# We use the -E option to load plugins. This only makes sense when we are +# starting a new session, so we detect that. Also, Kakoune can only handle +# one -E option, so we prepend loading plugins to an existing one. +args=( "$@" ) +loadPlugins=true +EValueOffset=-1 +pluginScript='@out@/share/kak/plugins.kak' + +for (( i = 0; i < ${#args[@]}; i++ )); do + case "${args[i]}" in + -n|-c|-l|-p|-clear|-version) loadPlugins=false;; + -E) EValueOffset=$(( i + 1 ));; + --) break;; + esac + case "${args[i]}" in + -E|-c|-e|-s|-p|-f|-i|-ui|-debug) i=$(( i + 1 ));; + esac +done + +if [[ $loadPlugins = true ]]; then + if (( EValueOffset >= 0 )); then + args[EValueOffset]="source '$pluginScript'"$'\n'"${args[EValueOffset]}" + else + args=( "-E" "source '$pluginScript'" "${args[@]}" ) + fi +fi + +exec @kakoune@/bin/kak "${args[@]}" diff --git a/nixpkgs/pkgs/applications/editors/neovim/default.nix b/nixpkgs/pkgs/applications/editors/neovim/default.nix index 56f846f0c5f9..0d0877015eee 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "1j6w5jvq5v7kf7diad91qs1acr427nidnk9s24yyrz0hwdd1c2lh"; + sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb"; }; patches = [ @@ -122,7 +122,7 @@ in # those contributions were copied from Vim (identified in the commit logs # by the vim-patch token). See LICENSE for details." license = with licenses; [ asl20 vim ]; - maintainers = with maintainers; [ manveru garbas rvolosatovs ]; + maintainers = with maintainers; [ manveru rvolosatovs ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/editors/sigil/default.nix b/nixpkgs/pkgs/applications/editors/sigil/default.nix index bae3c58b8e1d..871ca1c671dc 100644 --- a/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.13"; + version = "0.9.14"; src = fetchFromGitHub { - sha256 = "05wnq7av7fgqgcqd88qjwgn55vr4ciy4f0rgi722f52vy97bw9bj"; + sha256 = "0fmfbfpnmhclbbv9cbr1xnv97si6ls7331kk3ix114iqkngqwgl1"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/nixpkgs/pkgs/applications/editors/sublime/3/common.nix b/nixpkgs/pkgs/applications/editors/sublime/3/common.nix index 214e53262b5c..8e52237d949d 100644 --- a/nixpkgs/pkgs/applications/editors/sublime/3/common.nix +++ b/nixpkgs/pkgs/applications/editors/sublime/3/common.nix @@ -1,13 +1,11 @@ { buildVersion, x32sha256, x64sha256, dev ? false }: -{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook -, pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu +{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook +, pkexecPath ? "/run/wrappers/bin/pkexec" , writeScript, common-updater-scripts, curl, gnugrep , openssl, bzip2, bash, unzip, zip }: -assert gksuSupport -> gksu != null; - let pname = "sublimetext3"; packageAttribute = "sublime3${stdenv.lib.optionalString dev "-dev"}"; @@ -15,10 +13,8 @@ let primaryBinary = "sublime_text"; primaryBinaryAliases = [ "subl" "sublime" "sublime3" ]; downloadUrl = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; - downloadArchiveType = "tar.bz2"; versionUrl = "https://www.sublimetext.com/${if dev then "3dev" else "3"}"; - versionFile = "pkgs/applications/editors/sublime/3/packages.nix"; - usesGtk2 = stdenv.lib.versionOlder buildVersion "3181"; + versionFile = builtins.toString ./packages.nix; archSha256 = if stdenv.hostPlatform.system == "i686-linux" then x32sha256 @@ -30,24 +26,22 @@ let else "x64"; - libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ]; - redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] - ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; + libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; in let binaryPackage = stdenv.mkDerivation { pname = "${pname}-bin"; version = buildVersion; src = fetchurl { - name = "${pname}-bin-${buildVersion}.${downloadArchiveType}"; url = downloadUrl; sha256 = archSha256; }; dontStrip = true; dontPatchELF = true; - buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH - nativeBuildInputs = [ zip unzip makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook; + buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH + nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook ]; # make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash" patchPhase = '' @@ -76,7 +70,7 @@ in let $binary done - # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary. + # Rewrite pkexec argument. Note that we cannot delete bytes in binary. sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary} runHook postBuild @@ -105,7 +99,7 @@ in let --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ - ${stdenv.lib.optionalString (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''} + "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so @@ -152,7 +146,7 @@ in stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Sophisticated text editor for code, markup and prose"; homepage = https://www.sublimetext.com/; - maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ]; + maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/nixpkgs/pkgs/applications/editors/typora/default.nix b/nixpkgs/pkgs/applications/editors/typora/default.nix index 03a8a55c780f..157204ce1ca3 100644 --- a/nixpkgs/pkgs/applications/editors/typora/default.nix +++ b/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.70"; + version = "0.9.72"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "08bgllbvgrpdkk9bryj4s16n274ps4igwrzdvsdbyw8wpp44vcy2"; + sha256 = "0q7fj77pr3ykpwgip87h12qxvpvlzs15mi9w3phqm3p9mmm9rlrs"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 39c3f735d2f0..c8db515e47df 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -4,7 +4,6 @@ let inherit (stdenv.hostPlatform) system; plat = { - "i686-linux" = "linux-ia32"; "x86_64-linux" = "linux-x64"; "x86_64-darwin" = "darwin"; }.${system}; @@ -12,14 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "i686-linux" = "0345pxad3fkcmn5z2r55fnvx8ybvfpwydxv2h21rd99grhwh8dk4"; - "x86_64-linux" = "1g6cib1c9mikg8cv940xk5g8dh0q5v6vlrgj78rr161hz1lrrv09"; - "x86_64-darwin" = "0krihhr57hnsc9qc1l2ncg70vz7nmrvlqrjbgdnihlrpf71d09hp"; + "x86_64-linux" = "02h71b9m9w4nc8g9iy2kafg041brli4zwv7pv6i1qg6p5cf2jdfx"; + "x86_64-darwin" = "1awq0rwiizwbjqf7crv59qr7m7rmgpfba0b4qx2bpx1mn25fmq56"; }.${system}; in callPackage ./generic.nix rec { - version = "1.35.1"; + version = "1.36.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -50,6 +48,6 @@ in downloadPage = https://code.visualstudio.com/Updates; license = licenses.unfree; maintainers = with maintainers; [ eadwu synthetica ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 0d13318efeb3..f651ee0653d5 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -4,7 +4,6 @@ let inherit (stdenv.hostPlatform) system; plat = { - "i686-linux" = "linux-ia32"; "x86_64-linux" = "linux-x64"; "x86_64-darwin" = "darwin"; }.${system}; @@ -12,14 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "i686-linux" = "0i572kxc7h63jxl6mw5k3gv08m9padqkky5k1f3w0d638hxhfl23"; - "x86_64-linux" = "0577lqpfrjgwbj27hm59kflb558mkl2nx00ys0hwndayqv0bfnvg"; - "x86_64-darwin" = "047sj0j9k74fvw9fc1ripqk2vy4v17jw488m7r95nf0cyyk08xg0"; + "x86_64-linux" = "09vmq87az0f91xwyfby85pnn4mg0rlf7pyvs5bkrxv0r8jxxfpq7"; + "x86_64-darwin" = "16yzzmlf3v9aj7dyglqjxdksabv0cc98w6kdv5rbfw865hj4bbck"; }.${system}; in callPackage ./generic.nix rec { - version = "1.35.1"; + version = "1.36.0"; pname = "vscodium"; executableName = "codium"; @@ -49,6 +47,6 @@ in downloadPage = https://github.com/VSCodium/vscodium/releases; license = licenses.mit; maintainers = with maintainers; []; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix b/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix index c6ba528c3584..074e6b8b12d5 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix @@ -68,6 +68,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png" ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" + ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) '' --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" ''} diff --git a/nixpkgs/pkgs/applications/gis/saga/default.nix b/nixpkgs/pkgs/applications/gis/saga/default.nix index 4738bfba14a8..34bb8c9f55ad 100644 --- a/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/nixpkgs/pkgs/applications/gis/saga/default.nix @@ -3,7 +3,7 @@ unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: stdenv.mkDerivation rec { - name = "saga-6.3.0"; + name = "saga-7.2.0"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin @@ -14,13 +14,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./finite-6.3.0.patch]; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; src = fetchurl { - url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.3.0/saga-6.3.0.tar.gz"; - sha256 = "0hyjim8fcp3mna1hig22nnn4ki3j6b7096am2amcs99sdr09jjxv"; + url = "mirror://sourceforge/project/saga-gis/SAGA%20-%207/SAGA%20-%207.2.0/saga-7.2.0.tar.gz"; + sha256 = "10gjc5mc5kwg2c2la22hgwx6s5q60z9xxffjpjw0zrlhksijl5an"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/gis/saga/finite-6.3.0.patch b/nixpkgs/pkgs/applications/gis/saga/finite-6.3.0.patch deleted file mode 100644 index 91c9543edfda..000000000000 --- a/nixpkgs/pkgs/applications/gis/saga/finite-6.3.0.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/src/tools/imagery/imagery_maxent/me.cpp b/src/tools/imagery/imagery_maxent/me.cpp -index c5da854..d3e9cff 100755 ---- a/src/tools/imagery/imagery_maxent/me.cpp -+++ b/src/tools/imagery/imagery_maxent/me.cpp -@@ -21,7 +21,7 @@ - #ifdef _SAGA_MSW - #define isinf(x) (!_finite(x)) - #else --#define isinf(x) (!finite(x)) -+#define isinf(x) (!isfinite(x)) - #endif - - /** The input array contains a set of log probabilities lp1, lp2, lp3 -@@ -47,7 +47,7 @@ double sumLogProb(vector<double>& logprobs) - /** returns log (e^logprob1 + e^logprob2). */ - double sumLogProb(double logprob1, double logprob2) - { -- if (isinf(logprob1) && isinf(logprob2)) -+ if (isinf(logprob1) && isinf(logprob2)) - return logprob1; // both prob1 and prob2 are 0, return log 0. - if (logprob1>logprob2) - return logprob1+log(1+exp(logprob2-logprob1)); -@@ -70,8 +70,8 @@ void MaxEntModel::print(ostream& ostrm, MaxEntTrainer& trainer) - for (FtMap::iterator it = _index.begin(); it!=_index.end(); it++) { - unsigned long i = it->second; - for (unsigned long c = 0; c<_classes; c++) { -- ostrm << "lambda(" << trainer.className(c) << ", " -- << trainer.getStr(it->first) << ")=" -+ ostrm << "lambda(" << trainer.className(c) << ", " -+ << trainer.getStr(it->first) << ")=" - << _lambda[i+c] << endl; - } - } -@@ -86,7 +86,7 @@ int MaxEntModel::getProbs(MaxEntEvent& event, vector<double>& probs) - double s = 0; - for (unsigned int f = 0; f<event.size(); f++) { - FtMap::iterator it = _index.find(event[f]); -- if (it!=_index.end()) -+ if (it!=_index.end()) - s += _lambda[it->second+c]; - } - probs[c] = s; -@@ -142,10 +142,10 @@ double MaxEntModel::getObsCounts(EventSet& events, vector<double>& obsCounts) - double ftSum = 0; - for (unsigned long j=0; j<e.size(); j++) { - FtMap::iterator it = _index.find(e[j]); -- if (it!=_index.end()) -+ if (it!=_index.end()) - obsCounts[it->second+c] += count; - else { // new feature, need to expand obsCounts and _lambda -- for (unsigned int k = 0; k<_classes; k++) -+ for (unsigned int k = 0; k<_classes; k++) - obsCounts.push_back(0); - obsCounts[_lambda.size()+c] += count; - addFeature(e[j]); diff --git a/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/nixpkgs/pkgs/applications/graphics/avocode/default.nix index e4a33edfb8b1..57631037cd0e 100644 --- a/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1m5shx4xnjrf5lfxivh3ns0a08wdrkhfyk6hbmkv65j9pwc1sr8n"; + sha256 = "1akrrnv0ajzvbhflbpmh4ckcqfqrgdjqfp6d4jqvspqi56zmsr83"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index 31a9fa57b500..eca3740f9758 100644 --- a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -59,11 +59,11 @@ let in stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.10"; + version = "2.1.11"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "074lp5z5kh6qwar3y4ik7gma5mdgafdsb50q425xcd3pv00gy0hm"; + sha256 = "00r5vzracvjk369rri2jxzgfaa1ll4qj5gdmzgflvidz8420bcvm"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/fbida/default.nix b/nixpkgs/pkgs/applications/graphics/fbida/default.nix index 33d65a860764..f5560a9b2032 100644 --- a/nixpkgs/pkgs/applications/graphics/fbida/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fbida/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler, mesa_noglu, lirc }: +, epoxy, poppler, mesa, lirc }: stdenv.mkDerivation rec { name = "fbida-2.14"; - + src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc - mesa_noglu + mesa ]; - + makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ]; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/nixpkgs/pkgs/applications/graphics/fondo/default.nix index f7d5f099f84c..920b529d61c3 100644 --- a/nixpkgs/pkgs/applications/graphics/fondo/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fondo/default.nix @@ -1,14 +1,31 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, glib, gsettings-desktop-schemas, gtk3, libgee, json-glib, glib-networking, libsoup, libunity, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, pantheon +, pkgconfig +, meson +, ninja +, python3 +, glib +, gsettings-desktop-schemas +, gtk3 +, libgee +, json-glib +, glib-networking +, libsoup +, libunity +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "fondo"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "1xflkqzdbyvdjybarvb13vw6p8f2xjlvpr155yaxgjjzjcr1j86y"; + sha256 = "0w7qai261l9m7ckzxc2gj3ywa55wm6p5br1xdk7607ql44lfpgba"; }; nativeBuildInputs = [ @@ -32,6 +49,14 @@ stdenv.mkDerivation rec { pantheon.granite ]; + patches = [ + # Fix hardcoded FHS gsettings path + (fetchpatch { + url = "https://github.com/calo001/fondo/commit/98afdd834201321a3242f0b53bfba4b2ffa04a4c.patch"; + sha256 = "0vvgbgjja6vyrk6in3sgv8jbl4bwxkm6fhllgjzq7r65gkj4jg79"; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix index 4e1e7138e775..08b2757dd6e8 100644 --- a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix +++ b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida -, wrapGAppsHook +, wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -12,8 +12,20 @@ stdenv.mkDerivation rec { sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; }; - # Do not build the changelog as this requires markdown. - patches = [ ./geeqie-no-changelog.patch ]; + patches = [ + # Do not build the changelog as this requires markdown. + (fetchpatch { + name = "geeqie-1.4-goodbye-changelog.patch"; + url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch"; + sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn"; + }) + # Fixes build with exiv2 0.27.1 + (fetchpatch { + name = "geeqie-exiv2-0.27.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/geeqie-exiv2-0.27.patch?h=packages/geeqie&id=dee28a8b3e9039b9cd6927b5a93ef2a07cd8271d"; + sha256 = "05skpbyp8pcq92psgijyccc8liwfy2cpwprw6m186pf454yb5y9p"; + }) + ]; preConfigure = "./autogen.sh"; diff --git a/nixpkgs/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch b/nixpkgs/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch deleted file mode 100644 index 1b8833b135f3..000000000000 --- a/nixpkgs/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500 -+++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500 -@@ -10,9 +10,9 @@ - readmedir = @readmedir@ - - if HAVE_MARKDOWN --readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html -+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html - else --readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html -+readme_DATA = README.md COPYING TODO README.lirc AUTHORS - endif - - desktopdir = $(datadir)/applications diff --git a/nixpkgs/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch b/nixpkgs/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch new file mode 100644 index 000000000000..91eacecbf8c6 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch @@ -0,0 +1,42 @@ +# reduced version of commit f30492f40f78d867b43422215057dd21de4ba447 +# from upstream hg repository: +RegisterPNGImage(): Pass correct size value to strlcat(). + +diff -r 95c4711e8bee -r f30492f40f78 coders/png.c +--- a/coders/png.c Mon Jun 17 07:24:30 2019 -0500 ++++ b/coders/png.c Mon Jun 17 18:54:43 2019 -0500 +@@ -6427,26 +6427,26 @@ + + *version='\0'; + #if defined(PNG_LIBPNG_VER_STRING) +- (void) strlcat(version,"libpng ",MaxTextExtent); +- (void) strlcat(version,PNG_LIBPNG_VER_STRING,MaxTextExtent); ++ (void) strlcat(version,"libpng ",sizeof(version)); ++ (void) strlcat(version,PNG_LIBPNG_VER_STRING,sizeof(version)); + #if (PNG_LIBPNG_VER > 10005) + if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0) + { +- (void) strlcat(version,",",MaxTextExtent); +- (void) strlcat(version,png_get_libpng_ver(NULL),MaxTextExtent); ++ (void) strlcat(version,",",sizeof(version)); ++ (void) strlcat(version,png_get_libpng_ver(NULL),sizeof(version)); + } + #endif + #endif + + #if defined(ZLIB_VERSION) + if (*version != '\0') +- (void) strlcat(version,", ",MaxTextExtent); +- (void) strlcat(version,"zlib ",MaxTextExtent); +- (void) strlcat(version,ZLIB_VERSION,MaxTextExtent); ++ (void) strlcat(version,", ",sizeof(version)); ++ (void) strlcat(version,"zlib ",sizeof(version)); ++ (void) strlcat(version,ZLIB_VERSION,sizeof(version)); + if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0) + { +- (void) strlcat(version,",",MaxTextExtent); +- (void) strlcat(version,zlib_version,MaxTextExtent); ++ (void) strlcat(version,",",sizeof(version)); ++ (void) strlcat(version,zlib_version,sizeof(version)); + } + #endif diff --git a/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix b/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix index c93b4fe958d5..84d1450da823 100644 --- a/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,15 +4,16 @@ stdenv.mkDerivation rec { name = "graphicsmagick-${version}"; - version = "1.3.31"; + version = "1.3.32"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9"; + sha256 = "1qclp9i31idpcbbqswmnq2q11lmv0a7cvdb1y72xcky8sshaahmq"; }; patches = [ ./disable-popen.patch + ./1.3.32-darwin-png-strlcat-fix.patch ]; configureFlags = [ diff --git a/nixpkgs/pkgs/applications/graphics/hugin/default.nix b/nixpkgs/pkgs/applications/graphics/hugin/default.nix index 6be43cffea54..d7888da15ef6 100644 --- a/nixpkgs/pkgs/applications/graphics/hugin/default.nix +++ b/nixpkgs/pkgs/applications/graphics/hugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig +{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi , libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr"; }; + patches = [ + # Fixes build with exiv2 0.27.1 + (fetchpatch { + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/hugin-exiv2-0.27.1.patch?h=packages/hugin"; + sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r"; + }) + ]; + buildInputs = [ boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra diff --git a/nixpkgs/pkgs/applications/graphics/imgcat/default.nix b/nixpkgs/pkgs/applications/graphics/imgcat/default.nix index 862d3a9dff5e..1fa3ec8ccc68 100644 --- a/nixpkgs/pkgs/applications/graphics/imgcat/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imgcat/default.nix @@ -1,25 +1,24 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, ncurses }: stdenv.mkDerivation rec { - name = "imgcat-${version}"; - version = "2.3.0"; + pname = "imgcat"; + version = "2.3.1"; - buildInputs = [ autoconf automake libtool ncurses ]; + nativeBuildInputs = [ autoconf automake libtool ]; + buildInputs = [ ncurses ]; preConfigure = '' ${autoconf}/bin/autoconf sed -i -e "s|-ltermcap|-L ${ncurses}/lib -lncurses|" Makefile ''; - preInstall = '' - makeFlagsArray=(PREFIX="$out"); - ''; + makeFlags = [ "PREFIX=$(out)" ]; src = fetchFromGitHub { owner = "eddieantonio"; - repo = "imgcat"; - rev = "3d854c72f785dce0eecd9485767a7f972d54890c"; - sha256 = "0m83c33rzxvs0w214njql2c7q3fg06wnyijch3l2s88i7frl121f"; + repo = pname; + rev = "v${version}"; + sha256 = "0frz40rjwi73nx2dlqvmnn56zwr29bmnngfb11hhwr7v58yfajdi"; }; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix b/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix index 867c0a558382..94899c937a86 100644 --- a/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,23 +1,25 @@ -{ stdenv, cmake, fetchurl, pkgconfig, boost, exiv2, fftwFloat, gsl +{ stdenv, cmake, fetchFromGitHub, pkgconfig, boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr -, qtbase, qtdeclarative, qttools, qtwebengine +, qtbase, qtdeclarative, qttools, qtwebengine, eigen }: stdenv.mkDerivation rec { - name = "luminance-hdr-2.5.1"; + pname = "luminance-hdr"; + version = "2.6.0"; - src = fetchurl { - url = "mirror://sourceforge/qtpfsgui/${name}.tar.bz2"; - sha256 = "15hnyk9yjkkc97dmnrg2ipfgwqxprlcyv2kyvbls4d54zc56x658"; + src = fetchFromGitHub { + owner = "LuminanceHDR"; + repo = "LuminanceHDR"; + rev = "v.${version}"; + sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn"; }; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - buildInputs = - [ - qtbase qtdeclarative qttools qtwebengine - boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr - ]; + buildInputs = [ + qtbase qtdeclarative qttools qtwebengine eigen + boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr + ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/graphics/nomacs/default.nix b/nixpkgs/pkgs/applications/graphics/nomacs/default.nix index 14a28fc55b7f..d0838070262a 100644 --- a/nixpkgs/pkgs/applications/graphics/nomacs/default.nix +++ b/nixpkgs/pkgs/applications/graphics/nomacs/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i"; }; + patches = [ + ./nomacs-iostream.patch + ]; + enableParallelBuilding = true; setSourceRoot = '' diff --git a/nixpkgs/pkgs/applications/graphics/nomacs/nomacs-iostream.patch b/nixpkgs/pkgs/applications/graphics/nomacs/nomacs-iostream.patch new file mode 100644 index 000000000000..53224e0260eb --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/nomacs/nomacs-iostream.patch @@ -0,0 +1,26 @@ +diff --git a/src/DkCore/DkMetaData.cpp b/src/DkCore/DkMetaData.cpp +index d195757e..affec7be 100644 +--- a/src/DkCore/DkMetaData.cpp ++++ b/src/DkCore/DkMetaData.cpp +@@ -42,6 +42,8 @@ + #include <QApplication> + #pragma warning(pop) // no warnings from includes - end + ++#include <iostream> ++ + namespace nmc { + + // DkMetaDataT -------------------------------------------------------------------- +diff --git a/src/DkGui/DkNoMacs.cpp b/src/DkGui/DkNoMacs.cpp +index 6a412f70..bbfba233 100644 +--- a/src/DkGui/DkNoMacs.cpp ++++ b/src/DkGui/DkNoMacs.cpp +@@ -96,6 +96,8 @@ + #include <QWinTaskbarButton> + #endif + ++#include <iostream> ++ + namespace nmc { + + DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) { diff --git a/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix new file mode 100644 index 000000000000..f13e36ce99e7 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pdfcpu"; + version = "0.1.25"; + + src = fetchFromGitHub { + owner = "hhrutter"; + repo = pname; + rev = "v${version}"; + sha256 = "0vmmc7nnvpvsf92yi69rvqif1irkpya2shqyz49sa3s42jh1446b"; + }; + + modSha256 = "0cz4gs88s9z2yv1gc9ap92vv2j93ab6kr25zjgl2r7z6clbl5fzp"; + + subPackages = [ "cmd/pdfcpu" ]; + + meta = with stdenv.lib; { + description = "A PDF processor written in Go"; + homepage = https://pdfcpu.io; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +} + diff --git a/nixpkgs/pkgs/applications/graphics/photivo/default.nix b/nixpkgs/pkgs/applications/graphics/photivo/default.nix index 4843898eb645..6bd2fa98b1bb 100644 --- a/nixpkgs/pkgs/applications/graphics/photivo/default.nix +++ b/nixpkgs/pkgs/applications/graphics/photivo/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; license = licenses.gpl3; + broken = true; # exiv2 0.27.1 FTBFS }; } diff --git a/nixpkgs/pkgs/applications/graphics/photoqt/default.nix b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix index 7571bb29bec9..68afdd8694b1 100644 --- a/nixpkgs/pkgs/applications/graphics/photoqt/default.nix +++ b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix @@ -1,23 +1,36 @@ -{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw +{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects +, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil }: stdenv.mkDerivation rec { - name = "photoqt-${version}"; - version = "1.5.1"; + pname = "photoqt"; + version = "1.7.1"; src = fetchurl { - url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1"; + url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz"; + sha256 = "1qvxdh3cbjcywqx0da2qp8z092660qyzv5yknqbps2zr12qqb103"; }; - patches = [ ./photoqt-1.5.1-qt-5.9.patch ]; + patches = [ + # Fixes build with exiv2 0.27.1 + (fetchpatch { + url = "https://gitlab.com/luspi/photoqt/commit/c6fd41478e818f3a651d40f96cab3d790e1c09a4.patch"; + sha256 = "1j2pdr7hm3js7lswhb4qkf9sj9viclhjqz50qxpyd7pqrl1gf2va"; + }) + ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; buildInputs = [ - qtbase qtquickcontrols qttools exiv2 graphicsmagick + qtbase qtquickcontrols exiv2 graphicsmagick poppler qtmultimedia qtdeclarative libraw qtgraphicaleffects + kimageformats libarchive + ]; + + cmakeFlags = [ + "-DFREEIMAGE=OFF" + "-DDEVIL=OFF" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch b/nixpkgs/pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch deleted file mode 100644 index daa982b5f3aa..000000000000 --- a/nixpkgs/pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 97abcb5..fd4877a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -50,7 +50,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall") - #### FIND REQUIRED PACKAGES #### - ################################ - --FIND_PACKAGE(Qt5 COMPONENTS LinguistTools Quick Widgets Core Svg REQUIRED) -+FIND_PACKAGE(Qt5 COMPONENTS LinguistTools Quick Widgets Core Svg Sql Xml REQUIRED) - SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH}) - FIND_PACKAGE(Magick) - FIND_PACKAGE(Exiv2) diff --git a/nixpkgs/pkgs/applications/graphics/qtpfsgui/default.nix b/nixpkgs/pkgs/applications/graphics/qtpfsgui/default.nix deleted file mode 100644 index 4be7d230b5f4..000000000000 --- a/nixpkgs/pkgs/applications/graphics/qtpfsgui/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{stdenv, fetchurl, qt4, qmake4Hook, exiv2, openexr, fftwSinglePrec, libtiff, ilmbase }: - -stdenv.mkDerivation rec { - name = "qtpfsgui-1.9.3"; - - src = fetchurl { - url = "mirror://sourceforge/qtpfsgui/${name}.tar.gz"; - sha256 = "1mlg9dry4mfnnjlnwsw375hzsiagssdhccfmapx5nh6ykqrslsh1"; - }; - - buildInputs = [ qt4 exiv2 openexr fftwSinglePrec libtiff ]; - nativeBuildInputs = [ qmake4Hook ]; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - export CPATH="${ilmbase.dev}/include/OpenEXR:$CPATH" - ''; - - qmakeFlags = [ - "EXIV2PATH=${exiv2.dev}/include/exiv2" - "OPENEXRDIR=${openexr.dev}/include/OpenEXR" - "FFTW3DIR=${fftwSinglePrec.dev}/include" - "LIBTIFFDIR=${libtiff.dev}/include" - ]; - - meta = { - homepage = http://qtpfsgui.sourceforge.net/; - description = "Qtpfsqui, a graphical application for high dynamic range (HDR) imaging"; - - longDescription = - '' Qtpfsgui is an open source graphical user interface application that - aims to provide a workflow for high dynamic range (HDR) imaging. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index 30a8907275b0..2487b093148a 100644 --- a/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , gettext @@ -14,39 +13,26 @@ , hicolor-icon-theme , libsndfile , libxml2 +, libzip , pcre , poppler , portaudio , zlib - -# Plugins don't appear to be working in this version, so disable them by not -# building with Lua support by default. In a future version, try switching this -# to 'true' and seeing if the top-level Plugin menu appears. -, withLua ? false, lua +# plugins +, withLua ? true, lua }: stdenv.mkDerivation rec { name = "xournalpp-${version}"; - version = "1.0.8"; + version = "1.0.12"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; rev = version; - sha256 = "01q84xjp9z1krna10gjj562km6i3wdq8cg7paxax1k6bh52ryvf6"; + sha256 = "0yg70hsx58s3wb5kzccivrqa7kvmdapygxmif1j64hddah2rqcn9"; }; - patches = [ - # This patch removes the unused 'xopp-recording.sh' file which breaks the - # cmake build; this patch isn't in a release yet, and should be removed at - # or after 1.0.9 is released. - (fetchpatch { - name = "remove-xopp-recording.sh.patch"; - url = "https://github.com/xournalpp/xournalpp/commit/a17a3f2c80c607a22d0fdeb66d38358bea7e4d85.patch"; - sha256 = "10pcpvklm6kr0lv2xrsbpg2037ni9j6dmxgjf56p466l3gz60iwy"; - }) - ]; - nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; buildInputs = [ glib @@ -55,6 +41,7 @@ stdenv.mkDerivation rec { hicolor-icon-theme libsndfile libxml2 + libzip pcre poppler portaudio @@ -62,6 +49,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional withLua lua; + hardeningDisable = [ "format" ]; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/kde/gwenview.nix b/nixpkgs/pkgs/applications/kde/gwenview.nix index 3d03d1dea3e7..ceb928acdf2f 100644 --- a/nixpkgs/pkgs/applications/kde/gwenview.nix +++ b/nixpkgs/pkgs/applications/kde/gwenview.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, exiv2, lcms2, baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi, - phonon, qtimageformats, qtsvg, qtx11extras, kinit + phonon, qtimageformats, qtsvg, qtx11extras, kinit, fetchpatch }: mkDerivation { @@ -18,4 +18,12 @@ mkDerivation { qtimageformats qtsvg qtx11extras ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ]; + + # Fixes build with exiv2-0.27.1. Drop in 19.04.2 + patches = [ + (fetchpatch { + url = "https://github.com/KDE/gwenview/commit/172560b845460b6121154f88221c855542219943.patch"; + sha256 = "0y1l34h2s7rhfknvg6ggcc389jfzhpq69wf0s3xd5ccwfw7c0ycq"; + }) + ]; } diff --git a/nixpkgs/pkgs/applications/misc/1password/default.nix b/nixpkgs/pkgs/applications/misc/1password/default.nix index 607ef2eaf10d..79c3a6d7302f 100644 --- a/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.5.6-003"; + version = "0.5.7"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "11smnx8fh32qm3b82x2ps4y46q29h77x1j1dj3d5vs0vha9b8frj"; + sha256 = "1193lq6cvqkv2cy07l6wzb25gb5vb3s3pxm534q3izhzrrz6lisz"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "1qwxga6qmb3n76h2fl1lxhnz676cqbx8gic1b5c9hw88gnqwykb9"; + sha256 = "0hlw1jasxzg31293d2n3ydzj62q7ji7nig7aaighcvzi3c9j7v51"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "0gzmwc20liqx2cqply06yarwp228ydfgfb26bmpxbvlp0cq7d07g"; + sha256 = "05z5k63fza6v0vhydyiq4sh9xhxnd9rcfxyym7jihv6b3fv3fnx3"; stripRoot = false; } else throw "Architecture not supported"; diff --git a/nixpkgs/pkgs/applications/misc/alacritty/default.nix b/nixpkgs/pkgs/applications/misc/alacritty/default.nix index c69a523691f2..490c83bed078 100644 --- a/nixpkgs/pkgs/applications/misc/alacritty/default.nix +++ b/nixpkgs/pkgs/applications/misc/alacritty/default.nix @@ -120,6 +120,6 @@ in buildRustPackage rec { homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ mic92 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/calcurse/default.nix b/nixpkgs/pkgs/applications/misc/calcurse/default.nix index dc0460c2a233..a15814082014 100644 --- a/nixpkgs/pkgs/applications/misc/calcurse/default.nix +++ b/nixpkgs/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "calcurse-${version}"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "https://calcurse.org/files/${name}.tar.gz"; - sha256 = "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd"; + sha256 = "1vjwcmp51h7dsvwn0qx93w9chp3wp970v7d9mjhk7jyamcbfywn3"; }; buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ]; diff --git a/nixpkgs/pkgs/applications/misc/copyq/default.nix b/nixpkgs/pkgs/applications/misc/copyq/default.nix index c77e47df34ce..3ee357ce151b 100644 --- a/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0kbhgg0j6iqfrpixvwl1mk3m0bz5s8bd6npk5xqcgzp1giywdc4i"; + sha256 = "1l9f0hg2ggy944sjlyiyglln5mjm9fvgmvwp3pnvmmc6mfbmslq3"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/cum/default.nix b/nixpkgs/pkgs/applications/misc/cum/default.nix new file mode 100644 index 000000000000..2675a5f4fc5d --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/cum/default.nix @@ -0,0 +1,36 @@ +{ stdenv, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + pname = "cum"; + version = "0.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15qc6agka2g3kcnpnz0hbjic1s3260cr9bda0rlcyninxs1vndq0"; + }; + + propagatedBuildInputs = [ + alembic beautifulsoup4 click natsort requests sqlalchemy + ]; + + # tests seem to fail for `config` not being defined, + # but it works once installed + doCheck = false; + + # remove the top-level `tests` and `LICENSE` file + # they should not be installed, and there can be issues if another package + # has a collision (especially with the license file) + postInstall = '' + rm -rf $out/tests $out/LICENSE + ''; + + meta = with stdenv.lib; { + description = "comic updater, mangafied"; + homepage = "https://github.com/Hamuko/cum"; + license = licenses.asl20; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/electron-cash/default.nix b/nixpkgs/pkgs/applications/misc/electron-cash/default.nix index 788ff9b638b9..cc7b9cf27c2a 100644 --- a/nixpkgs/pkgs/applications/misc/electron-cash/default.nix +++ b/nixpkgs/pkgs/applications/misc/electron-cash/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.0.2"; + version = "4.0.7"; src = fetchurl { url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz"; # Verified using official SHA-1 and signature from # https://github.com/fyookball/keys-n-hashes - sha256 = "6255cd0493442ec57c10ae70ca2e84c6a29497f90a1393e6ac5772afe7572acf"; + sha256 = "d63ef2d52cff0b821b745067d752fd0c7f2902fa23eaf8e9392c54864cae5c77"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index eba26695b919..cb04be4b6ea9 100644 --- a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.8.5"; + version = "1.8.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "ee5b14e83080b6390f9bf8d9bbfab03f628aebe863efd16a4b2f8536b149cc4f"; + sha256 = "0in47v6c82a6mqg4wzxrji7wd8a9qh5386rsr77s3a8613am1n2x"; }; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/girara/default.nix b/nixpkgs/pkgs/applications/misc/girara/default.nix index 919f20f13983..a5531df131b4 100644 --- a/nixpkgs/pkgs/applications/misc/girara/default.nix +++ b/nixpkgs/pkgs/applications/misc/girara/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.garbas ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/gphoto2/default.nix b/nixpkgs/pkgs/applications/misc/gphoto2/default.nix index 9313199efb82..d06970e8d07c 100644 --- a/nixpkgs/pkgs/applications/misc/gphoto2/default.nix +++ b/nixpkgs/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.20"; + name = "gphoto2-2.5.23"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1xj80abkzvqrd6g1j1q946lhbp03gyapyxdwbhc0y14g1ash6vx3"; + sha256 = "1laqwhxr0xhbykmp0dhd3j4rr2lhj5y228s31afnqxp700hhk1yz"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; diff --git a/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix index e691c79d85c0..5bcaccb43bcf 100644 --- a/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,28 +1,41 @@ -{ fetchFromGitHub, stdenv, pkgconfig, exiv2, libxml2, gtk2 -, libxslt, docbook_xsl, docbook_xml_dtd_42 }: +{ fetchFromGitHub, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3 +, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gpscorrelate-${version}"; - version = "1.6.1"; + pname = "gpscorrelate"; + version = "unstable-2019-06-05"; src = fetchFromGitHub { - owner = "freefoote"; - repo = "gpscorrelate"; - rev = version; - sha256 = "1z0fc75rx7dl6nnydksa578qv116j2c2xs1czfiijzxjghx8njdj"; + owner = "dfandrich"; + repo = pname; + rev = "80b14fe7c10c1cc8f62c13f517c062577ce88c85"; + sha256 = "1gaan0nd7ai0bwilfnkza7lg5mz87804mvlygj0gjc672izr37r6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - exiv2 libxml2 gtk2 - libxslt docbook_xsl + nativeBuildInputs = [ + desktop-file-utils docbook_xml_dtd_42 + docbook_xsl + libxslt + pkgconfig + ]; + + buildInputs = [ + exiv2 + gtk3 + libxml2 ]; - patchPhase = '' - sed -i "Makefile" \ - -es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g" - ''; + makeFlags = [ + "prefix=${placeholder ''out''}" + "GTK=3" + "CC=cc" + "CXX=c++" + ]; + + doCheck = true; + + installTargets = [ "install" "install-desktop-file" ]; meta = with stdenv.lib; { description = "A GPS photo correlation tool, to add EXIF geotags"; @@ -44,7 +57,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; - homepage = https://github.com/freefoote/gpscorrelate; + homepage = "https://github.com/dfandrich/gpscorrelate"; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix index f24951624c58..c20fa4ed9d9b 100644 --- a/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, dmenu }: stdenv.mkDerivation rec { - name = "j4-dmenu-desktop-${version}"; - version = "2.16"; + pname = "j4-dmenu-desktop"; + version = "2.17"; src = fetchFromGitHub { - owner = "enkore"; - repo = "j4-dmenu-desktop"; - rev = "r${version}"; - sha256 = "0714cri8bwpimmiirhzrkbri4xi24k0za6i1aw94d3fnblk2dg9f"; + owner = "enkore"; + repo = pname; + rev = "r${version}"; + sha256 = "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc"; }; postPatch = '' @@ -18,13 +18,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; # tests are fetching an external git repository - cmakeFlags = [ "-DNO_TESTS:BOOL=ON" ]; + cmakeFlags = [ + "-DWITH_TESTS=OFF" + "-DWITH_GIT_CATCH=OFF" + ]; meta = with stdenv.lib; { description = "A wrapper for dmenu that recognize .desktop files"; - homepage = "https://github.com/enkore/j4-dmenu-desktop"; - license = licenses.gpl3; + homepage = "https://github.com/enkore/j4-dmenu-desktop"; + license = licenses.gpl3; maintainers = with maintainers; [ ericsagnes ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock index f4c1aceb4f00..7954b6dc03ed 100644 --- a/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -14,16 +14,16 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.10.0) + ffi (1.11.1) forwardable-extended (2.6.0) - gemoji (3.0.0) + gemoji (3.0.1) html-pipeline (2.11.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.8.6) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -43,8 +43,8 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.6.0) - jekyll (~> 3.3) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) jekyll-sitemap (1.3.1) jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) @@ -66,11 +66,11 @@ GEM mini_portile2 (~> 2.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.3) + public_suffix (3.1.1) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rouge (3.3.0) + rouge (3.5.1) ruby_dep (1.5.0) safe_yaml (1.0.5) sass (3.7.4) diff --git a/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix b/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix index 0c71fbe653dd..741b5e2a0691 100644 --- a/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; forwardable-extended = { groups = ["default"]; @@ -87,10 +87,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d"; + sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3"; + sha256 = "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz"; type = "gem"; }; - version = "3.8.5"; + version = "3.8.6"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104v01vh7frgyra3s32wap1ag9fxcm8pgb8v957khzskqy2jh7am"; + sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.1"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -300,10 +300,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.1"; }; rb-fsevent = { groups = ["default"]; @@ -331,10 +331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.1"; }; ruby_dep = { groups = ["default"]; diff --git a/nixpkgs/pkgs/applications/misc/jekyll/default.nix b/nixpkgs/pkgs/applications/misc/jekyll/default.nix index 34cf0e21db7b..9ae9ab254e80 100644 --- a/nixpkgs/pkgs/applications/misc/jekyll/default.nix +++ b/nixpkgs/pkgs/applications/misc/jekyll/default.nix @@ -1,8 +1,27 @@ { lib, bundlerApp, ruby +, writeShellScriptBin, makeWrapper , withOptionalDependencies ? false }: -bundlerApp rec { +let + rubyWrapper = writeShellScriptBin "ruby" '' + if [[ "$#" -eq 2 ]]; then + if [[ "''${1##*/}" == "bundle" && "$2" == "install" ]]; then + # See https://github.com/NixOS/nixpkgs/issues/58126 for more details. + echo 'Skipping "bundle install" as it fails due to the Nix wrapper.' + echo 'Please enter the new directory and run the following commands to serve the page:' + echo 'nix-shell -p bundler --run "bundle install --gemfile=Gemfile --path vendor/cache"' + echo 'nix-shell -p bundler --run "bundle exec jekyll serve"' + exit 0 + # The following nearly works: + unset BUNDLE_FROZEN + exec ${ruby}/bin/ruby "$@" --gemfile=Gemfile --path=vendor/cache + fi + fi + # Else: Don't modify the arguments: + exec ${ruby}/bin/ruby "$@" + ''; +in bundlerApp rec { pname = "jekyll"; exes = [ "jekyll" ]; @@ -11,6 +30,12 @@ bundlerApp rec { then ./full else ./basic; + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/jekyll --prefix PATH : ${rubyWrapper}/bin + ''; + meta = with lib; { description = "A blog-aware, static site generator, written in Ruby"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock b/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock index f61e985cbf76..7baf6a45fc54 100644 --- a/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -6,7 +6,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) classifier-reborn (2.2.0) fast-stemmer (~> 1.0) @@ -25,16 +25,16 @@ GEM faraday (0.15.4) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) - ffi (1.10.0) + ffi (1.11.1) forwardable-extended (2.6.0) - gemoji (3.0.0) + gemoji (3.0.1) html-pipeline (2.11.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.8.6) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -64,8 +64,8 @@ GEM jekyll (>= 3.3, < 5.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.6.0) - jekyll (~> 3.3) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) jekyll-sitemap (1.3.1) jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) @@ -89,14 +89,14 @@ GEM mini_portile2 (2.4.0) minitest (5.11.3) multi_json (1.13.1) - multipart-post (2.0.0) + multipart-post (2.1.1) nokogiri (1.10.3) mini_portile2 (~> 2.4.0) octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.3) + public_suffix (3.1.1) pygments.rb (1.2.1) multi_json (>= 1.0.0) rb-fsevent (0.10.3) @@ -105,7 +105,7 @@ GEM rdiscount (2.2.0.1) rdoc (6.1.1) redcarpet (3.4.0) - rouge (3.3.0) + rouge (3.5.1) ruby_dep (1.5.0) safe_yaml (1.0.5) sass (3.7.4) @@ -113,9 +113,9 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) thread_safe (0.3.6) tomlrb (1.2.8) tzinfo (1.2.5) diff --git a/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix b/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix index de3de298fd34..63209d4ff45a 100644 --- a/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; classifier-reborn = { dependencies = ["fast-stemmer"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; forwardable-extended = { groups = ["default"]; @@ -184,10 +184,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d"; + sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -227,10 +227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3"; + sha256 = "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz"; type = "gem"; }; - version = "3.8.5"; + version = "3.8.6"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -325,10 +325,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104v01vh7frgyra3s32wap1ag9fxcm8pgb8v957khzskqy2jh7am"; + sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.1"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -507,10 +507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -550,10 +550,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.1"; }; "pygments.rb" = { dependencies = ["multi_json"]; @@ -658,10 +658,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.1"; }; ruby_dep = { groups = ["default"]; @@ -711,10 +711,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; thread_safe = { groups = ["default"]; diff --git a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix index e560fa302940..bdbdef45fe7b 100644 --- a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix +++ b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.8"; + version = "0.8.9"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "137s7rx35a5qrfww3q8bllj4zyjfa7l709snvdfj34y7jbq7p6cd"; + sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj"; name = "${name}.tar.xz"; }; diff --git a/nixpkgs/pkgs/applications/misc/lutris/default.nix b/nixpkgs/pkgs/applications/misc/lutris/default.nix index 070d293a183f..5a74bd931c0b 100644 --- a/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -54,7 +54,7 @@ let # Higan // TODO: "higan is not available for the x86_64 architecture" # Libretro - fluidsynth hidapi mesa_noglu libdrm + fluidsynth hidapi mesa libdrm # MAME qt48 fontconfig SDL2_ttf @@ -103,7 +103,7 @@ let perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap opencl-headers ocl-icd utillinux - (wine.override { wineBuild = "wineWow"; }) + wineWowPackages.staging # ZDOOM soundfont-fluid bzip2 game-music-emu diff --git a/nixpkgs/pkgs/applications/misc/megasync/default.nix b/nixpkgs/pkgs/applications/misc/megasync/default.nix new file mode 100644 index 000000000000..b3e739864171 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/megasync/default.nix @@ -0,0 +1,125 @@ +{ stdenv +, autoconf +, automake +, c-ares +, cryptopp +, curl +, doxygen +, fetchFromGitHub +, ffmpeg +, hicolor-icon-theme +, libmediainfo +, libraw +, libsodium +, libtool +, libuv +, libzen +, lsb-release +, pkgconfig +, qt5 +, sqlite +, swig +, unzip +, wget +}: + +stdenv.mkDerivation rec { + name = "megasync-${version}"; + version = "4.1.1.0"; + + src = fetchFromGitHub { + owner = "meganz"; + repo = "MEGAsync"; + rev = "v${version}_Linux"; + sha256 = "0lc228q3s9xp78dxjn22g6anqlsy1hi7a6yfs4q3l6gyfc3qcxl2"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoconf + automake + doxygen + lsb-release + pkgconfig + qt5.qmake + qt5.qttools + swig + ]; + buildInputs = [ + c-ares + cryptopp + curl + ffmpeg + hicolor-icon-theme + libmediainfo + libraw + libsodium + libtool + libuv + libzen + qt5.qtbase + qt5.qtsvg + sqlite + unzip + wget + ]; + + patches = [ + # Distro and version targets attempt to use lsb_release which is broken + # (see issue: https://github.com/NixOS/nixpkgs/issues/22729) + ./noinstall-distro-version.patch + # megasync target is not part of the install rule thanks to a commented block + ./install-megasync.patch + ]; + + postPatch = '' + for file in $(find src/ -type f \( -iname configure -o -iname \*.sh \) ); do + substituteInPlace "$file" --replace "/bin/bash" "${stdenv.shell}" + done + ''; + + dontUseQmakeConfigure = true; + enableParallelBuilding = true; + + preConfigure = '' + cd src/MEGASync/mega + ./autogen.sh + ''; + + configureFlags = [ + "--disable-examples" + "--disable-java" + "--disable-php" + "--enable-chat" + "--with-cares" + "--with-cryptopp" + "--with-curl" + "--with-ffmpeg" + "--without-freeimage" # unreferenced even when found + "--without-readline" + "--without-termcap" + "--with-sodium" + "--with-sqlite" + "--with-zlib" + ]; + + postConfigure = '' + cd ../.. + ''; + + preBuild = '' + qmake CONFIG+="release" MEGA.pro + pushd MEGASync + lrelease MEGASync.pro + DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+=release + popd + ''; + + meta = with stdenv.lib; { + description = "Easy automated syncing between your computers and your MEGA Cloud Drive"; + homepage = https://mega.nz/; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ maintainers.michojel ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/megasync/install-megasync.patch b/nixpkgs/pkgs/applications/misc/megasync/install-megasync.patch new file mode 100644 index 000000000000..7d8748528e7f --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/megasync/install-megasync.patch @@ -0,0 +1,21 @@ +Index: source/src/MEGASync/MEGASync.pro +=================================================================== +--- source.orig/src/MEGASync/MEGASync.pro ++++ source/src/MEGASync/MEGASync.pro +@@ -28,11 +28,11 @@ unix:!macx { + TARGET = megasync + + # Uncomment the following if "make install" doesn't copy megasync in /usr/bin directory +-# isEmpty(PREFIX) { +-# PREFIX = /usr +-# } +-# target.path = $$PREFIX/bin +-# INSTALLS += target ++ isEmpty(PREFIX) { ++ PREFIX = /usr ++ } ++ target.path = $$PREFIX/bin ++ INSTALLS += target + } + else { + TARGET = MEGAsync diff --git a/nixpkgs/pkgs/applications/misc/megasync/noinstall-distro-version.patch b/nixpkgs/pkgs/applications/misc/megasync/noinstall-distro-version.patch new file mode 100644 index 000000000000..bbf100737bc4 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/megasync/noinstall-distro-version.patch @@ -0,0 +1,13 @@ +Index: source/src/MEGASync/platform/platform.pri +=================================================================== +--- source.orig/src/MEGASync/platform/platform.pri ++++ source/src/MEGASync/platform/platform.pri +@@ -37,7 +37,7 @@ unix:!macx { + system(command -v lsb_release): version.commands = lsb_release -rs > $$version.target + version.files = $$version.target + +- INSTALLS += distro version ++ # INSTALLS += distro version + + QT += dbus + SOURCES += $$PWD/linux/LinuxPlatform.cpp \ diff --git a/nixpkgs/pkgs/applications/misc/merkaartor/default.nix b/nixpkgs/pkgs/applications/misc/merkaartor/default.nix index 70a6efb90ddc..0833464f2c25 100644 --- a/nixpkgs/pkgs/applications/misc/merkaartor/default.nix +++ b/nixpkgs/pkgs/applications/misc/merkaartor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj +{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj , qtbase, qtsvg, qtwebkit }: stdenv.mkDerivation rec { @@ -12,12 +12,17 @@ stdenv.mkDerivation rec { sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; enableParallelBuilding = true; + postInstall = '' + wrapProgram $out/bin/merkaartor \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms + ''; + meta = with stdenv.lib; { description = "OpenStreetMap editor"; homepage = http://merkaartor.be/; diff --git a/nixpkgs/pkgs/applications/misc/pdfpc/default.nix b/nixpkgs/pkgs/applications/misc/pdfpc/default.nix index 0e424a97d8dd..c0dca0564768 100644 --- a/nixpkgs/pkgs/applications/misc/pdfpc/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.3.2"; + version = "4.3.4"; src = fetchFromGitHub { repo = product; owner = product; rev = "v${version}"; - sha256 = "15y6g92fp6x6dwwhrhkfny5z20w7pq9c8w19fh2vzff9aa6m2h9z"; + sha256 = "07aafsm4jzdgpahz83p0ajv40hry7gviyadqi13ahr8xdhhwy2sd"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/qmapshack/default.nix b/nixpkgs/pkgs/applications/misc/qmapshack/default.nix index f4983ad94428..b38369babe8c 100644 --- a/nixpkgs/pkgs/applications/misc/qmapshack/default.nix +++ b/nixpkgs/pkgs/applications/misc/qmapshack/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }: +{ stdenv, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }: stdenv.mkDerivation rec { name = "qmapshack-${version}"; - version = "1.12.3"; + version = "1.13.0"; src = fetchurl { url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; - sha256 = "1yp5gw4q4gwiwr9w4dz19am0bhsla9n2l3bdlk98a7f46kxgnkrx"; + sha256 = "1cv1f718r8vqyk2l6w3alz2aqjvb4msz8705pm9yr5ndi28qyrba"; }; nativeBuildInputs = [ cmake ]; @@ -15,12 +15,23 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DROUTINO_XML_PATH=${routino}/share/routino" - "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip" + "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5" "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so" ]; enableParallelBuilding = true; + patches = [ + (fetchpatch { + url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindPROJ4.patch"; + sha256 = "1nx4ax233bnnj478cmjpm5c1qqmyn1navlihf10q6hhbanay9n99"; + }) + (fetchpatch { + url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindQuaZip5.patch"; + sha256 = "0z1b2dz2zlz685mxgn8bmh1fyhxpf6dzd6jvkkjyk2kvnrdxv3b9"; + }) + ]; + meta = with stdenv.lib; { homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home; description = "Plan your next outdoor trip"; diff --git a/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix b/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix index 9b1b01577697..2255089ab7e2 100644 --- a/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix +++ b/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generates menu based applications using rofi"; homepage = https://github.com/octotep/menugen; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/misc/rofi/default.nix b/nixpkgs/pkgs/applications/misc/rofi/default.nix index a8e82998c306..0cf297b1b5d9 100644 --- a/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.5.3"; name = "rofi-unwrapped-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "1rczxz6l32vnclarzga1sm1d5iq9rfscb9j7f8ih185n59hf0517"; + sha256 = "1mskknfnpgmaghplwcyc44qc8swb1f9qiyi67fz9i77jijjpj1lx"; }; preConfigure = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = https://github.com/davatorium/rofi; license = licenses.mit; - maintainers = with maintainers; [ mbakke garbas ma27 ]; + maintainers = with maintainers; [ mbakke ma27 ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix index f4a41a89e1c4..ba8ec3a6e72a 100644 --- a/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix +++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "urxvt plugin that allows to switch color themes during runtime"; homepage = https://github.com/felixr/urxvt-theme-switch; license = "CCBYNC"; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/applications/misc/styx/default.nix b/nixpkgs/pkgs/applications/misc/styx/default.nix index f9779beec0f4..d545447cb130 100644 --- a/nixpkgs/pkgs/applications/misc/styx/default.nix +++ b/nixpkgs/pkgs/applications/misc/styx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl"; }; - server = "${caddy.bin}/bin/caddy"; + server = "${caddy}/bin/caddy"; linkcheck = "${linkchecker}/bin/linkchecker"; nativeBuildInputs = [ asciidoctor ]; diff --git a/nixpkgs/pkgs/applications/misc/termdown/default.nix b/nixpkgs/pkgs/applications/misc/termdown/default.nix index 65963f9aa34f..dc23443489ff 100644 --- a/nixpkgs/pkgs/applications/misc/termdown/default.nix +++ b/nixpkgs/pkgs/applications/misc/termdown/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; buildPythonApplication rec { name = "termdown-${version}"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { rev = version; - sha256 = "0jgjzglna0gwp0j31l48pny69szslczl13aahwjfjypkv9lx8w2a"; + sha256 = "08l03yk5jc1g0gps789q1s2knnaqzlidy4s5q5nhwg9g25la19nr"; repo = "termdown"; owner = "trehn"; }; diff --git a/nixpkgs/pkgs/applications/misc/termite/default.nix b/nixpkgs/pkgs/applications/misc/termite/default.nix index 674b228746d4..d4191a875bdd 100644 --- a/nixpkgs/pkgs/applications/misc/termite/default.nix +++ b/nixpkgs/pkgs/applications/misc/termite/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A simple VTE-based terminal"; license = licenses.lgpl2Plus; homepage = https://github.com/thestinger/termite/; - maintainers = with maintainers; [ koral garbas ]; + maintainers = with maintainers; [ koral ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/misc/vifm/default.nix b/nixpkgs/pkgs/applications/misc/vifm/default.nix index b61864e026a6..9696ebac98bc 100644 --- a/nixpkgs/pkgs/applications/misc/vifm/default.nix +++ b/nixpkgs/pkgs/applications/misc/vifm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vi-like file manager"; - maintainers = with maintainers; [ raskin garbas ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; diff --git a/nixpkgs/pkgs/applications/misc/viking/default.nix b/nixpkgs/pkgs/applications/misc/viking/default.nix index b7d0b330e85b..50f2012d34ab 100644 --- a/nixpkgs/pkgs/applications/misc/viking/default.nix +++ b/nixpkgs/pkgs/applications/misc/viking/default.nix @@ -1,19 +1,21 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper -, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme }: +, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme +, geoclue2, liboauth }: stdenv.mkDerivation rec { name = "viking-${version}"; - version = "1.6.2"; + version = "1.7"; src = fetchurl { url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2"; - sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz"; + sha256 = "092q2dv0rcz12nh2js1z1ralib1553dmzy9pdrvz9nv2vf61wybw"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme + geoclue2 liboauth ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; diff --git a/nixpkgs/pkgs/applications/misc/waybar/default.nix b/nixpkgs/pkgs/applications/misc/waybar/default.nix index 045b78b92c5a..0be04c895e35 100644 --- a/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -8,14 +8,14 @@ , mpdSupport ? true, mpd_clientlib }: stdenv.mkDerivation rec { - name = "waybar-${version}"; - version = "0.6.7"; + pname = "waybar"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1rkqxszay2fns8c2q0b668mjacr4wb7drlbfi55z9w5f9cfxgifw"; + sha256 = "0fylq8sz00zv7jvjp7pgckabvmhanpcsqfvpw8c84vy4d8dvqbkx"; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ meta = with stdenv.lib; { description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; license = licenses.mit; - maintainers = with maintainers; [ FlorianFranzen minijackson ]; + maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/misc/worker/default.nix b/nixpkgs/pkgs/applications/misc/worker/default.nix index 9657dd99e211..69421e288d34 100644 --- a/nixpkgs/pkgs/applications/misc/worker/default.nix +++ b/nixpkgs/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.15.4"; + version = "4.0.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "03zixi4yqcl05blyn09mlgk102yjbir8bp0yi4czd1sng0rhfc9x"; + sha256 = "0cs1sq7zpp787r1irhqk5pmxa26rjz55mbgda4823z9zkzwfxy19"; }; buildInputs = [ libX11 ]; diff --git a/nixpkgs/pkgs/applications/misc/xastir/default.nix b/nixpkgs/pkgs/applications/misc/xastir/default.nix index 969661ea7b4e..987b676034f6 100644 --- a/nixpkgs/pkgs/applications/misc/xastir/default.nix +++ b/nixpkgs/pkgs/applications/misc/xastir/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchFromGitHub, autoreconfHook -, curl, db, gdal, libgeotiff +, curl, db, libgeotiff , libXpm, libXt, motif, pcre , perl, proj, rastermagick, shapelib }: stdenv.mkDerivation rec { pname = "xastir"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Release-${version}"; - sha256 = "16zsgy3589snawr8f1fa22ymvpnjy6njvxmsck7q8p2xmmz2ry7r"; + sha256 = "1xfzd2m4l0zbb96ak2pniffxdrs9lax0amkxfgdsnyg8x5j0xcxm"; }; buildInputs = [ autoreconfHook - curl db gdal libgeotiff + curl db libgeotiff libXpm libXt motif pcre perl proj rastermagick shapelib ]; diff --git a/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix b/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix index 8b6ea4c86c52..fcd4ebfbeed2 100644 --- a/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.10.4"; + version = "2.10.5"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "0f3cs0jw0yn8lbcm43m34dnvvgr4qpb8wa176vh4whk7bbjkw7lz"; + sha256 = "16b6bj0rsr3cq9x3gxm54j197827d8lnfk7ghfjmaf7qa3q08adx"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/nixpkgs/pkgs/applications/misc/xmrig/default.nix index ff0555eb9657..9afe3cae07bf 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.14.1"; + version = "2.14.4"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "0pc3ssmnn36xs3jgznx36q4z3qh06fkbz8md3p3rk6rpvly929pn"; + sha256 = "0hmla9ys9gmmcrmkidw05ygiz734rs7skb9w86jnwxi5nlpxqrhj"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index 2e7c3f5c14dd..4922d3c6aed1 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.14.1"; + version = "2.14.4"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1sw00qz4yg8cwmm3s64bqr3lki6bxmlsi4ankyy2l4dx1vs9kf6r"; + sha256 = "11q4w5ncyyf2vgrb64zlr01n3adyaxja2pcqm5id9if0nvwwn4ga"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index 3a53f7174ac8..032b06db48a9 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { description = "A core component for zathura PDF viewer"; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix b/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix index 58985dced425..54f68969d4f7 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 663e798ee0b4..98cfb4c6687a 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan garbas ]; + maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix b/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix index 07e4c5d715b7..48d42b5e9399 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan garbas ]; + maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix index b81d12947e41..3059c3f725b1 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix @@ -27,6 +27,6 @@ in symlinkJoin { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers;[ garbas smironov ]; + maintainers = with maintainers;[ smironov ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/zola/default.nix b/nixpkgs/pkgs/applications/misc/zola/default.nix index f945da612748..48f5b216ea1b 100644 --- a/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "02lr1n3gf0agj8x451ndyvv16lq7rccazp4nz9zy0pzwxwrlwhra"; + sha256 = "166kmlkzd1qyw9yq2jqs58z8b3d956jjhw9r15jzw98md949psr5"; }; - cargoSha256 = "003dhh41fh337k3djibpj6hyd16xprbgws3lbp7x37p4lx7qlnfy"; + cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 85785d285db7..4a6af3f96b44 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -16,6 +16,7 @@ , gnome3 , gsettings-desktop-schemas , gtk3 +, libpulseaudio , libuuid , libX11 , libXcomposite @@ -55,6 +56,7 @@ rpath = lib.makeLibraryPath [ glib gnome2.GConf gtk3 + libpulseaudio libX11 libXScrnSaver libXcomposite diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 436c6d7e7682..89d969587a1c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns"; - sha256bin64 = "02zq7gy51nclfh8806yqv4713cpb4yamy0h7x1zgcd2rxvqm4v53"; - version = "75.0.3770.80"; + sha256 = "0pq7q7plbmfg2f6m74wl2l19k15ik2mvw56bfzk4c9cdns8w6b8a"; + sha256bin64 = "09zf3kldvi8zh7arvl94vjmbvgsghwa51b5j0ic8ncdn880dlq0j"; + version = "76.0.3809.25"; }; dev = { - sha256 = "0h0dbmk8l45c61g8iiylfnw45rqyqwc40brphwksi6gsvwn2yw8h"; - sha256bin64 = "0vrwsllnrcgdvsflncqhwyfbjiqcj0n3mxyyyalr8arvkpz5r5ai"; - version = "76.0.3806.1"; + sha256 = "19v1i4ks5rpwdcwmfj8qqni4afyhnddb5hbbisabnjif3b8xrvjw"; + sha256bin64 = "0vsbxvqidrvw797h0and67pdb4maijsiv6jkpj3kqaxakiwnadxj"; + version = "76.0.3809.21"; }; stable = { - sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns"; - sha256bin64 = "03agz2bl22cmwgdcni8lbzjrwpikg5caimh8ynmhnpy7q9r3zy2w"; - version = "75.0.3770.80"; + sha256 = "0f9qjhxvk8sajj7qa061crfmln65q7sniylrgp0qijwyw6xrmddi"; + sha256bin64 = "1xvqfrq119iwgvd2d4z2v2ladi2kl52kji55yxdmyi377dpk5rfa"; + version = "75.0.3770.90"; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 50eae97ae7c0..c52bf0ba95e1 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -205,6 +205,6 @@ stdenv.mkDerivation { url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; platforms = builtins.attrNames mozillaPlatforms; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/firefox.key b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/firefox.key deleted file mode 100644 index bd27ce85c94f..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/firefox.key +++ /dev/null @@ -1,254 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.5 -Comment: Hostname: keyserver.mozilla.org - -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 -MuTo71rAVDLtxerc+GNq0GI= -=YjV6 ------END PGP PUBLIC KEY BLOCK----- diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix index 1bfc211d8507..d6593be8890c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -23,8 +23,8 @@ in writeScript "update-${name}" '' set -eux pushd ${basePath} - HOME=`mktemp -d` - cat ${./firefox.key} | gpg --import + export GNUPGHOME=`mktemp -d` + gpg --keyserver hkps://gpg.mozilla.org --recv-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353 tmpfile=`mktemp` url=${baseUrl} @@ -49,7 +49,7 @@ in writeScript "update-${name}" '' curl --silent -o $HOME/shasums "$url$version/SHA512SUMS" curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc" - gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums + gpgv --keyring=$GNUPGHOME/pubring.kbx $HOME/shasums.asc $HOME/shasums # this is a list of sha512 and tarballs for both arches shasums=`cat $HOME/shasums` diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 256f9cbd61cf..455ed10b214b 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,7 +94,14 @@ let browserPatches = [ ./env_var_for_system_dir.patch - ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [ + ] + ++ lib.optional (lib.versionAtLeast ffversion "63" && lib.versionOlder ffversion "69") + (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29 + name = "write_error-parallel_make.diff"; + url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py"; + sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y"; + }) + ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [ (fetchpatch { url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 7dae1d99d956..dff15da4e8cb 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - ffversion = "67.0.3"; + ffversion = "67.0.4"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "218d699mpnb8h6h24l79ar9b2gg0scqj4xwbk7p45x2arhjbhn3wq4pkzq434gcn3a1ybfkqpyifnnpv787kj4mqbdfq3cminj7al67"; + sha512 = "3krwkc90m320a74vjyzlrxs4jc63cykbmpgisac9kv8m9n0bis5i1yf0dl9n14d9p4p541wvzhqygx7byj6mnvkhbk5b2l0nlvwias2"; }; patches = [ @@ -269,15 +269,15 @@ in rec { tor-browser-8-5 = tbcommon rec { ffversion = "60.7.0esr"; - tbversion = "8.5.0"; # TODO: update to match binary bundle (8.5.1 currently) + tbversion = "8.5.2"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.7.0esr-8.5-1-slnos" - rev = "8c69066856962116205c5c7508a0991dfb8ccd11"; - sha256 = "1dshn7g9y6233vdqidrkg886ad6qjnl13vz2382ymbx180r2j73k"; + # branch "tor-browser-60.7.0esr-8.5-2-slnos" + rev = "b8216328bf6bf1996fcd794d4531689a7c373a2f"; + sha256 = "0zmqam3c91iww33jpfyl6q6wacj20nqkfzyqryalfvnvx3zi0i1q"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix b/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix index 60e9c603e29e..69beeb167590 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,17 +1,9 @@ { stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook -, help2man, lua5, luafilesystem, luajit, sqlite +, help2man, luafilesystem, luajit, sqlite , webkitgtk, gtk3, gst_all_1, glib-networking }: -let - lualibs = [luafilesystem]; - getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; - getLuaPath = lib : getPath lib "lua"; - getLuaCPath = lib : getPath lib "so"; - luaPath = stdenv.lib.concatStringsSep ";" (map getLuaPath lualibs); - luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs); - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "luakit"; version = "2.1"; @@ -27,7 +19,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - webkitgtk lua5 luafilesystem luajit sqlite gtk3 + webkitgtk luafilesystem luajit sqlite gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav @@ -36,8 +28,11 @@ in stdenv.mkDerivation rec { preBuild = '' # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found - # TODO: why is not this the default? - LUA_PATH=?.lua + # TODO: why is not this the default? The test runner adds + # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils + # scripts don't add an equivalent + export LUA_PATH="$NIX_LUA_PATH;./?.lua;./?/init.lua" + export LUA_CPATH="$NIX_LUA_CPATH" ''; makeFlags = [ @@ -54,8 +49,8 @@ in stdenv.mkDerivation rec { in '' gappsWrapperArgs+=( --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" - --set LUA_PATH '${luaKitPath};${luaPath};' - --set LUA_CPATH '${luaCPath};' + --prefix LUA_PATH ';' "${luaKitPath};$NIX_LUA_PATH" + --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" ) ''; diff --git a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index e55e939dd4aa..215bf07d4d52 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -40,7 +40,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "60.0.3255.109"; + version = "60.0.3255.170"; rpath = stdenv.lib.makeLibraryPath [ @@ -96,7 +96,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "0y3cjjzp41pa15sw8bp7n5ab8j8b1kk5h11b4pl6w8spsyk2cpqh"; + sha256 = "04bcy9qhrhps3712k229yn58ak2j93wcp613zd6l2zxb8a286991"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4eeef72a4e12..03a5aa7bfe21 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.6.2"; + version = "1.6.3"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1yzwrpqpghlpy2d7pbjgcb73dbngw835l4xbimz5aa90mvqkbwg1"; + sha256 = "0z9an14vlv0r48x7fk0mk7465gnhh19dx1w63lyhsgnfqy5pzlhy"; }; # Needs tox diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 5401b66f27cd..6bfe31a803ba 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.5.1"; + version = "8.5.3"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1mi587rh63ylhww0l8rr58qwbh9h7sk0c666mf84xk5b10s77hjb"; + sha256 = "15ml0azc7imlfc2h88yxpxsyrf6pxxcd1si33bfbsjh17zw1282g"; }; "i686-linux" = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "160k5qdys6zy5cpsad2rm24ghfc2bd9b9gj3l0159di6hg21rk9k"; + sha256 = "1zvcy44qx353qa5h90g0qigbp9xgaiq8s7a5wmhnfrfd2iw4ph7d"; }; }; in diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 9afd46b700d5..ee477af8d492 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -9,6 +9,7 @@ , patchelf, makeWrapper , isSnapshot ? false , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null +, enableWidevine ? false, vivaldi-widevine ? null }: let @@ -16,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.5.1525.48-1"; + version = "2.6.1566.44-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "19izljczg22cvymfim97x48fnxbdfql9ik5ixrs990zxq65hznzn"; + sha256 = "0bqx78bikcgrpg7qg10jylxa582fcxiwah7g2151hadvy8xl15ab"; }; unpackPhase = '' @@ -50,8 +51,8 @@ in stdenv.mkDerivation rec { --set-rpath "${libPath}" \ opt/${vivaldiName}/vivaldi-bin '' + stdenv.lib.optionalString proprietaryCodecs '' - sed -i '/^VIVALDI_FFMPEG_FOUND/ a \ - checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/${vivaldiName}/vivaldi + sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \ + VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/${vivaldiName} '' + '' echo "Finished patching Vivaldi binaries" ''; @@ -76,7 +77,11 @@ in stdenv.mkDerivation rec { "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png done wrapProgram "$out/bin/vivaldi" \ - --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ + --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ + ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} + '' + stdenv.lib.optionalString enableWidevine '' + rm $out/opt/${vivaldiName}/libwidevinecdm.so + ln -s ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index ec2646440b31..3207409a6ba5 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,53 +1,32 @@ { stdenv, fetchurl -, dbus-glib, gtk3, libexif, libXScrnSaver, ninja, nss -, pciutils, pkgconfig, python2, xdg_utils, gn, at-spi2-core +, dpkg }: stdenv.mkDerivation rec { - name = "${product}-${version}"; - product = "vivaldi-ffmpeg-codecs"; - version = "72.0.3626.122"; + name = "chromium-codecs-ffmpeg"; + version = "74.0.3729.169"; src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "1477g5dgi4m0zbiqwm9w6jqkmjfmgjlbl3qs9ljldx8bif8my1jbz4hzws954aqxyxdbf5rjpvmrrqqppk5347prvsyl37rbsndaaqf"; + url = "https://launchpadlibrarian.net/424938057/${name}-extra_${version}-0ubuntu0.16.04.1_amd64.deb"; + sha256 = "1ls2fshfk08hqsfvbd7p6rp2gv3n0xdy86rdh00wiz5qgl3skfzc"; }; - buildInputs = [ ]; + buildInputs = [ dpkg ]; - nativeBuildInputs = [ - gtk3 libexif libXScrnSaver ninja nss pciutils python2 xdg_utils gn - pkgconfig dbus-glib at-spi2-core.dev - ]; - - patches = [ - ]; - - configurePhase = '' - runHook preConfigure - - local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=false clang_use_chrome_plugins=false is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false" - gn gen out/Release -v --args="$args" - - runHook postConfigure + unpackPhase = '' + dpkg-deb -x $src . + find . ''; - buildPhase = '' - ninja -C out/Release -v libffmpeg.so - ''; - - dontStrip = true; - installPhase = '' - mkdir -p "$out/lib" - cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so" + install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so ''; meta = with stdenv.lib; { description = "Additional support for proprietary codecs for Vivaldi"; homepage = "https://ffmpeg.org/"; license = licenses.lgpl21; - maintainers = with maintainers; [ lluchs ]; + maintainers = with maintainers; [ betaboon lluchs ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix new file mode 100644 index 000000000000..a21de1acad28 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl +, unzip +}: + +stdenv.mkDerivation rec { + name = "widevine"; + version = "4.10.1196.0"; + + src = fetchurl { + url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; + sha256 = "01c7nr7d2xs718jymicbk4ipzfx6q253109qv3lk4lryrrhvw14y"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = '' + unzip $src libwidevinecdm.so + find . + ''; + + installPhase = '' + install -vD libwidevinecdm.so $out/lib/libwidevinecdm.so + ''; + + meta = with stdenv.lib; { + description = "Widevine support for Vivaldi"; + homepage = "https://www.widevine.com"; + license = licenses.unfree; + maintainers = with maintainers; [ betaboon ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 6c5c281d0395..1faa0988a66d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.77.0"; in +let version = "0.79.3"; in buildGoModule { pname = "helmfile"; @@ -10,7 +10,7 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0nj8gs7aqkxpj6bd80ks7g34qqa4y53a8sim1znbxs6mb678c2x2"; + sha256 = "0wgfpidpqyvh41dnw351v91z4szi1s6lqak9li2pmddz1rdkx66v"; }; goPackagePath = "github.com/roboll/helmfile"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index a521f394ebfb..96f3354023cf 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.11.1"; + version = "1.12.1"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "0jia8dhawh786grnbpn64hvsdm6wz5p7hqir01q5xxpd1psnzygj"; + sha256 = "09rmgazdrmnh1lqaayzfbn0ld7mbj9whihs9ijv5gf6si9p0ml9y"; }; buildInputs = [go-bindata]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/ksonnet/default.nix b/nixpkgs/pkgs/applications/networking/cluster/ksonnet/default.nix deleted file mode 100644 index b8bce9315237..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/ksonnet/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, ... }: - -buildGoPackage rec { - version = "0.11.0"; - name = "ksonnet-${version}"; - - src = fetchFromGitHub { - owner = "ksonnet"; - repo = "ksonnet"; - rev = "v${version}"; - sha256 = "0z7gkgcsiclm72bznmzv5jcgx5rblndcsiqc0r2mwhxhmv19bs04"; - }; - - goPackagePath = "github.com/ksonnet/ksonnet"; - - meta = { - description = "A CLI-supported framework that streamlines writing and deployment of Kubernetes configurations to multiple clusters"; - homepage = https://github.com/ksonnet/ksonnet; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ flokli ]; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix new file mode 100644 index 000000000000..bc01055244c8 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "kube3d"; + version = "1.1.0"; + + goPackagePath = "github.com/rancher/k3d"; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "k3d"; + rev = "v${version}"; + sha256 = "180q7a95znpkhfqcaw3asqrq22r6ppw98qsggp2wfm746mllg5pc"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = "https://github.com/rancher/k3d"; + description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kuznero ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/kube3d/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/kube3d/deps.nix new file mode 100644 index 000000000000..4fb2936a40b0 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/kube3d/deps.nix @@ -0,0 +1,174 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.12"; + sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.0"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "v2.7.1"; + sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "v1.13.1"; + sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "v0.4.0"; + sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "v0.3.3"; + sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "v0.0.1"; + sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj"; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "v1.0.0-rc1"; + sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "b630fd6fe46b"; + sha256 = "0m84kwckmmc0z05kjb4dd43g1g61al32a4z593flpcbaqx8di5sd"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } +] diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix index 1e16cf1afca1..cf0116ba8569 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,22 +1,22 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.9.1"; in +let version = "0.12.0"; in buildGoPackage { name = "kubecfg-${version}"; src = fetchFromGitHub { - owner = "ksonnet"; + owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "010k33arxa4spaq923iazsisxgsaj8c7w4z250y9yrch8xxd74bi"; + sha256 = "118p1fy6cihswwz03vp62cz8395hgfqd82nmfkw88fx7av23rfhb"; }; - goPackagePath = "github.com/ksonnet/kubecfg"; + goPackagePath = "github.com/bitnami/kubecfg"; meta = { description = "A tool for managing Kubernetes resources as code"; - homepage = https://github.com/ksonnet/kubecfg; + homepage = https://github.com/bitnami/kubecfg; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ benley ]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix index 9e55c2f8a0f3..63a127def7f5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.8.7"; + version = "0.9.3"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,9 +12,13 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "0nkqiqkrccfmn7qkbhd48m9m56ix4xb0a3ar0z0pl4sbm25rlj0b"; + sha256 = "0hn9rr5v2y2pw0pmn27gz8dx5n964dsaf48sh0jhwc95b5q1rjwr"; }; + # We disable Nvidia GPU scheduling on Linux, as it doesn't work there: + # Ref: https://github.com/hashicorp/nomad/issues/5535 + buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia"; + meta = with stdenv.lib; { homepage = https://www.nomadproject.io/; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix index c382ab9d3cfb..b0a1d91ce6e0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -4,15 +4,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-acme"; - version = "1.1.2"; - sha256 = "1l77pckiwa72lwbwbqkjzy6m9xsgp13spmzc80gfl4q0gd3d46an"; + version = "1.3.4"; + sha256 = "1kam9mwgqh31f1m8kn86bkdi4ccfj5h38f80g3frrla4p2zw9l55"; }; alicloud = { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.41.0"; - sha256 = "0bl24mgk0rangwwbz43ybymcivn3kjjg35rrvv7ashvhmx58qcf8"; + version = "1.47.0"; + sha256 = "0w2shy850lp63y036xzhznr94dpyf5b369cddz7laycapknyzd39"; }; archive = { @@ -39,36 +39,36 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "2.9.0"; - sha256 = "1gkw60ihc2b3qhb110m0mckfvb21lqgx4vc4x249mfxxk25i26s7"; + version = "2.15.0"; + sha256 = "0ms4x6ri4zi25jnp47f5vg6xj9xmz7jya0y0gbc4kdmy0nwdw8f9"; }; azuread = { owner = "terraform-providers"; repo = "terraform-provider-azuread"; - version = "0.3.1"; - sha256 = "1bs4m9hwdag58by49zsjpys3xvxg98nq8qims17mc82pbsz6mpag"; + version = "0.4.0"; + sha256 = "01s2qrabmydgnilkwis76ccx1sv8bkna3nbxn6ra75jvgh3q7d5d"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.27.1"; - sha256 = "0lxa84j9kzinblz7zp4gizizj0sy0vidkjvgnb99sr3861rak1x5"; + version = "1.30.1"; + sha256 = "0zxvj6k1xs151dik8yhjl31r563dsc7iykv32g10w5szyigvxqfd"; }; azurestack = { owner = "terraform-providers"; repo = "terraform-provider-azurestack"; - version = "0.6.0"; - sha256 = "0lh0an3bz3kh2s6ncadikivr08fj8cvq7zm20csmjbgwgicq4gl8"; + version = "0.7.0"; + sha256 = "0vlppfnwl0r4xf2fl405d93s0kxanh52h1chz04a95x2dcclvx69"; }; bigip = { owner = "terraform-providers"; repo = "terraform-provider-bigip"; - version = "0.12.2"; - sha256 = "0pplv5hi1kjli0jpya12crb5dkc6bkzvm8094rwhjbxb4f65ca5d"; + version = "0.12.3"; + sha256 = "1zlwk7jp5r45b3rwkxsq9mqf4nym3ifx56vhcvyc9a3w25s0ss8p"; }; bitbucket = { @@ -109,8 +109,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.13.0"; - sha256 = "01fgcycn5g53cx32xcgrpcpvjxwb8w11hs0f7s2bhg6cq0v9higj"; + version = "1.15.0"; + sha256 = "0mb771dw5fw2s6jd63sybwza49axyj9967fl454m3sznhpl96y8z"; }; cloudscale = { @@ -123,22 +123,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudstack"; - version = "0.2.0"; - sha256 = "1v46da55a8a0hnw319swz3pkd62afy7hdwzybxmp48hxh1i6af74"; + version = "0.3.0"; + sha256 = "0zmyww6z3j839ydlmv254hr8gcsixng4lcvmiwkhxb3hj1nw8hcw"; }; cobbler = { owner = "terraform-providers"; repo = "terraform-provider-cobbler"; - version = "1.0.1"; - sha256 = "1z0iijfrbbdrgszvc7jlcr4105zragbc0iq8x48vi24yipqgf5a8"; + version = "1.1.0"; + sha256 = "08ljqibfi6alpvv8f7pzvjl2k4w6br6g6ac755x4xw4ycrr24xw9"; }; consul = { owner = "terraform-providers"; repo = "terraform-provider-consul"; - version = "2.3.0"; - sha256 = "06b6yjmaq7sq26kfsqxlxmz5mnr1xsn1vywndh14grqwg6zmsrl6"; + version = "2.5.0"; + sha256 = "1nmldxn4y87fyb308dajjzcyvxrr6ka5nicyw84a8s7pixzbqh6q"; }; datadog = { @@ -151,8 +151,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - version = "1.3.0"; - sha256 = "1bi482s6s3v7sqknwwchscwwncwrhr4jl4gl4l25bngp1kd7cp7i"; + version = "1.4.0"; + sha256 = "0a01768ncgmk1vrh2ir86s9iab1s5x8ciaz3fysgcgp9snh8yz4w"; }; dme = { @@ -179,8 +179,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "1.1.1"; - sha256 = "0bqwdx8hb7bym4hh01a0n1zrgb1081rvn0qawck712wz0jkzv1r3"; + version = "1.2.0"; + sha256 = "1w69kjlrgy4397c9nz3llqsqcjzchwqw1ksw4wg34xnnq20pd4ql"; }; dyn = { @@ -200,78 +200,78 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.6.0"; - sha256 = "1z9qrqcib2rxy8s4glb4ggdkqcq7rwphiclsr1zncyly2n6887yj"; + version = "0.6.1"; + sha256 = "1p4j1n2x2y0n1kslfx62fx60v8b1acqv78gns1a5i0vgnnmmqcaj"; }; flexibleengine = { owner = "terraform-providers"; repo = "terraform-provider-flexibleengine"; - version = "1.5.0"; - sha256 = "17dksrqkh35wf0clqcd4v6ggmzc7xmrw8q7q0qa9n9zqyg1zibqk"; + version = "1.6.0"; + sha256 = "0vz68nhpy93zsdssxzr41flrwhjqh7wcjrc4nklg6kmr99n6jcc6"; }; github = { owner = "terraform-providers"; repo = "terraform-provider-github"; - version = "2.0.0"; - sha256 = "1lvizak27qxgggp5xb15s8f504cjgr633889cv2jsr2rn64z4jv5"; + version = "2.1.0"; + sha256 = "05ca0vw6s7q40zcs50mr6k2swwx3a3njd4dxdz00qki58hgb87y6"; }; gitlab = { owner = "terraform-providers"; repo = "terraform-provider-gitlab"; - version = "1.3.0"; - sha256 = "0lh1v20msahcfjc22v7yf1cwinaq0zy2m8f7sl5jfn294j9nbam8"; + version = "2.2.0"; + sha256 = "0iz5ggjkcip86cz2zmsryad34hly542grwzlm5rvpcmfw5csjadw"; }; google = { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "2.6.0"; - sha256 = "0y93hfwhzbk7dl7cw5lw2gwf5hdbc7rs9gh10b39vxgv9jrj4kqv"; + version = "2.8.0"; + sha256 = "1r4x7l20w8wb6a356vx71lra466p7hfww1jyv0bg7z1f015qs91l"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - version = "2.6.0"; - sha256 = "1bm3nrv2pa6mf6l4vn5b0hads7bhp67bnhc5y72yingfky7kva5h"; + version = "2.8.0"; + sha256 = "16ml6sd3g4wzcgm5qaphfyq3lcy33p8nmcahxrhrcvwnwl0kw5bs"; }; grafana = { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "1.3.0"; - sha256 = "1gyma31iv05nfy9jrd8zlkls35fbrxx4nrh56gdgwchv054rxzff"; + version = "1.4.0"; + sha256 = "1y41yhp82phgw83frkgrjzpymsys2abvdwa1n905rz7i15ybasqc"; }; hcloud = { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.9.0"; - sha256 = "08ag1xwn6vj4w8kz37z8hsi8lkvfwkw5n8wjb5c03g9yva1j85yx"; + version = "1.10.0"; + sha256 = "18m2smpwcjp49wnylplrnlhfjrmim1qpvn1z70lwvb49liv8ldwf"; }; hedvig = { owner = "terraform-providers"; repo = "terraform-provider-hedvig"; - version = "1.0.3"; - sha256 = "0kqnbd78m4r97b5w7skkpcnhc0bqh2cky7q0inhdhsb7gvivz1b1"; + version = "1.0.4"; + sha256 = "0y6brzznxp8khdfbnpmnbjqf140411z0pvnp88p8mj2kmbk7kkjd"; }; helm = { owner = "terraform-providers"; repo = "terraform-provider-helm"; - version = "0.9.1"; - sha256 = "189w8zz2fv0qfggzxmppaw8814c7kylgb11m1r9mqii3phsgnlz1"; + version = "0.10.0"; + sha256 = "09qxpgdljkfbyn1ihki2pp2m9wxmrxvp91d1myinml466jylxjar"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "1.9.0"; - sha256 = "1qabhf2qm7ba5jw6hclkcp2pw8c39ggrqkhhqg0bh03h220rl22x"; + version = "2.0.0"; + sha256 = "161pc6s4ifzi58cx32sdk9nan4kz6gn3mch1pnmp03f6390s2pcm"; }; http = { @@ -284,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - version = "1.4.0"; - sha256 = "018b57cndl72vjlijwvjx64rxjgimcqq1f6dxdny3wj1j4i0h4fi"; + version = "1.6.0"; + sha256 = "03f92mq4ydfwnxh0v4sm6brllxw6m7kh8j19md9aq0wxcwr5wp6q"; }; icinga2 = { @@ -298,22 +298,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-ignition"; - version = "1.0.1"; - sha256 = "1j9rgwrb4bnm8a44rg3d9fry46wlpfkwxxpkpw9y6l24php0qxh8"; + version = "1.1.0"; + sha256 = "0vpjbb70wnlrvw7z2zc92fbisgjk49ivdmv10ahyqlgvc23js5va"; }; influxdb = { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "1.1.0"; - sha256 = "1mxvc3pwzgj7r79a5vz8n489xny12wa75zpppgh7948fy8m8b23f"; + version = "1.2.0"; + sha256 = "1nldywbwg5lgzhlq8hmisv63riipd0aaa4p5ya6qvx5cnj5yhsx8"; }; kubernetes = { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - version = "1.6.2"; - sha256 = "14jql78a1rw1wl97myry29lgmqkcdn44qgmzjrfky958afnkgiig"; + version = "1.7.0"; + sha256 = "0chr6v47398a3cvff9lwx4ffahcwv7fmzs6kjjqaidb1cv60d039"; }; librato = { @@ -361,15 +361,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-mysql"; - version = "1.5.1"; - sha256 = "0i5s62z3cdg3mhahf09nyw8l2hcx6d7jp3hr3n8rcjwj3ajj8qis"; + version = "1.6.0"; + sha256 = "1kgldnrdz0mr99arxf85n8xbbxm96b5mg732c6zs38dgcq63mypx"; }; netlify = { owner = "terraform-providers"; repo = "terraform-provider-netlify"; - version = "0.1.0"; - sha256 = "1lf66nzqcgzjwvh1lv2jp8gcj6apdanlinci5pri8mgv5r1pv40l"; + version = "0.3.0"; + sha256 = "0mmbli6d3fbpyvvdfsg32f1w83g8ga3x21b36rgmx3mn156r7yij"; }; newrelic = { @@ -382,15 +382,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - version = "1.3.0"; - sha256 = "06kq0qkrgnj7z13xrgb9shid356m55mz0hkdbm4vfz3fx863mvl3"; + version = "1.4.0"; + sha256 = "04dh7gas6viny6bkx89fkwmxrw101b8bmw14m2mzfkxn70cl2na4"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - version = "1.3.1"; - sha256 = "04ibq5dgxqb5lpnvqxg4xkb498w77p2sbjfyy9zj7m5i62xrwg79"; + version = "1.4.0"; + sha256 = "1zkmc6flmy48qawaf0l5r72xfwp46c842gd7kg35r06cihc9gavy"; }; nsxt = { @@ -417,8 +417,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.24.1"; - sha256 = "1yhcxwg3ivrgzasdsf5yq8v6h4j1lprnm881xfm4h1rpq465y1mj"; + version = "3.29.0-rc1"; + sha256 = "1rz61qndrrgknkd7bjbgvy28znllipr1v92cn1im43rzsmnz64y3"; }; oneandone = { @@ -438,15 +438,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.18.0"; - sha256 = "05sr6vra4fsrysrz7a77vaa5zklhxf4hl8g029y9l1fln7vdpssg"; + version = "1.19.0"; + sha256 = "1y9b9h523zflq4z9cwjgfa0l92j4ac5pc1r6vja1aw3gg2ln80x9"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.8.0"; - sha256 = "068ap0sw17xmrfvri1yx70qdi8i5h0qhsm9bakm532xjxlgmaxpv"; + version = "1.9.0"; + sha256 = "1nq6h6ds2fvxrmyf2v7w8prprl7pp6va8568jf0f775sag51wpl8"; }; opsgenie = { @@ -466,36 +466,36 @@ { owner = "terraform-providers"; repo = "terraform-provider-ovh"; - version = "0.3.0"; - sha256 = "05bzkwa50alh8mpslh64dddp815m8df240w1mmphdmp9rsi6hqp8"; + version = "0.5.0"; + sha256 = "07n8ismxbv0gngh4kibqhr4ndqkrg6gxbpj3zl764rrwp54gwgbw"; }; packet = { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "2.1.0"; - sha256 = "0hj8av0yry0wsi8fwgs0z9x9jxcnxz8imsanbdsrhb8lsj70n25v"; + version = "2.2.1"; + sha256 = "05zhrpynn2yrimlg553f0567b284x51g5yafz29g647vvsqd1rpn"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.2.1"; - sha256 = "1b0fbzqalcxngnxk51afxkhs82bj68sjakvb28p0im0x1lblxj0n"; + version = "1.3.0"; + sha256 = "1l3rk7c31qafadpg2b0mzvfx7lwwk82vcn489fr35rvmv99zfkh8"; }; panos = { owner = "terraform-providers"; repo = "terraform-provider-panos"; - version = "1.5.1"; - sha256 = "17w4zkc445bpfq6pqx575y5njsak18yca1y2by4chg9d05inphqd"; + version = "1.5.2"; + sha256 = "0sycgr4k4dlhxj5klmgg2xcw3xha06332ij8cfzz4xvgdq0xky3j"; }; postgresql = { owner = "terraform-providers"; repo = "terraform-provider-postgresql"; - version = "0.3.0"; - sha256 = "0z1xdzl5mn6dxgkgmysq06g3fg9cdlwa59ng42r6kffcbl0mwgfh"; + version = "0.4.0"; + sha256 = "0fywq1vzm8fcd0jcvzx1n3jilrk0r6ylqz9r4dwsyc64iqvmrpps"; }; powerdns = { @@ -522,8 +522,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "1.2.1"; - sha256 = "1z0gqchb268w5mw0519fbx4126nkxb9kvvay8vjj287yxdpi5grj"; + version = "1.3.0"; + sha256 = "0b62hhb87xqmc1izl5lyk2kvkrkgrjil5z1xwprfdl6yz4fnin0w"; }; random = { @@ -543,8 +543,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-rundeck"; - version = "0.1.0"; - sha256 = "0rp8cgnp8in52g7zkl2lj42hns0g27m8f7l42lhfnv6n2vv5qxcg"; + version = "0.3.0"; + sha256 = "10xhj3xxdhbdxq14linqabn8cm0gnnswfwr0r20s1yp7pn36lgkj"; }; runscope = { @@ -557,22 +557,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.9.2"; - sha256 = "0wjkjf4sc3rfxiz3lfw6cfhdn8a7pzmyfw1f2dsp3a6fpa2srbph"; + version = "1.10.0"; + sha256 = "0sbcvcd413f53b25piymmh4rfmlmqsxdscpar8gf2dx6mrsacgf0"; }; selectel = { owner = "terraform-providers"; repo = "terraform-provider-selectel"; - version = "2.1.0"; - sha256 = "078pyml9nwv7347yni1h7mjdp8sd4zyccv80mgjn8xh2q208fqpg"; + version = "2.2.0"; + sha256 = "1vw49ckcavzq8igc3091mzsqv9garzh1npwdwsyqb9367z5ib39m"; }; skytap = { owner = "terraform-providers"; repo = "terraform-provider-skytap"; - version = "0.9.0"; - sha256 = "15p2rfaqw5iab8fkxcxigp7nxvs4gmgr2v8ysfyjz01mgwidd0rq"; + version = "0.10.0"; + sha256 = "1rfyaf8zhcr74mhcjdsm659rzlncyaxvqqqrc1630a3bk4h8p3i1"; }; softlayer = { @@ -585,8 +585,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - version = "1.13.2"; - sha256 = "1v3vgnspg3g0hvwzfplyvl37jxpc9m6hcsnmw6lkfqr57dy4dhlc"; + version = "1.13.3"; + sha256 = "0s75xlw8y3rz1ik11dnh3dzkk1jfklvq3wsf2fam0789z2j1zr1m"; }; statuscake = { @@ -613,8 +613,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - version = "1.5.0"; - sha256 = "04psgirl78klbpzllcvzl510j66jcavxmi9zxnwmmmw128a3dig2"; + version = "1.9.0"; + sha256 = "0zgn3ndbcs6dgmz2y8qcns08rbwbfq633rbk6zgfck8pzqw2d2lr"; }; terraform = { @@ -627,8 +627,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - version = "0.8.2"; - sha256 = "0apxf197g4mrxybbx1vrk2i3fnw4cf23aq1wjhks5fkvm4wshgl7"; + version = "0.9.1"; + sha256 = "0ww3fm8mgpqmv0ra0zbv560avcla76dkj2qxz9bdwzg7iz8vsj4s"; }; tls = { @@ -648,8 +648,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-ucloud"; - version = "1.6.0"; - sha256 = "0ijksfjqc91gxf45w9h2r024zgyqpr4s7z6snyzxcdbnf8ahs9q0"; + version = "1.10.1"; + sha256 = "1c5w2816rf55khs534z780j0r8i6n8gqhkda21i32n9rj8y5clv1"; }; ultradns = { diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 2c09a29a377c..34d4858bf4fa 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.2"; - sha256 = "0azgxy31r9jdjj5x2n0sc1n1wjvq9q9zyrgl0rx631ppmjmsz31w"; + version = "0.12.3"; + sha256 = "190bvd1q6h2hgi6s2ca6wnaib4k90rjq5g5l93vcbfjcczcgbv5q"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix index dbd490144933..2795ac4e46e4 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,14 +3,14 @@ rustPlatform.buildRustPackage rec { name = "newsboat-${version}"; - version = "2.15"; + version = "2.16.1"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "1dqdcp34jmphqf3d8ik0xdhg0s66nd5rky0y8y591nidq29wws6s"; + sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0"; }; - cargoSha256 = "06r682vvr8m7gl443qx9ncmq8dpmdxcls68f29d0mmf7llddy5sa"; + cargoSha256 = "0ck2dgfk4fay4cjl66wqkbnq4rqrd717jl63l1mvqmvad9i19igm"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { ''; nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ] - ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ] ++ stdenv.lib.optional stdenv.isDarwin Security; @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { make ''; - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" ] + ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error=format-security"; doCheck = true; @@ -48,7 +49,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { homepage = https://newsboat.org/; - description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console."; + description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console"; maintainers = with maintainers; [ dotlambda nicknovitski ]; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/networking/flexget/default.nix b/nixpkgs/pkgs/applications/networking/flexget/default.nix index 0f54e4ef6884..1833e641a075 100644 --- a/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -24,11 +24,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.21.2"; + version = "2.21.8"; src = fetchPypi { inherit pname version; - sha256 = "3c11fd7c4bb7e1e9203acd4d452ae51d34843e65066a18c7c72445d7db28122a"; + sha256 = "0a3dz013xxlwxz94i243bahw15k5y45mgk0z1zgkp1xrbiwglwvc"; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix index 8d9df407cdd3..75e1791644b8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -3,11 +3,11 @@ , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.6.3"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "1qi8im5sc3jbpic1sn46mmd98y0pckpnngf4n8dqdp76m4gf3yp1"; + sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [zlib openssl libre librem cairo mpg123 diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix new file mode 100644 index 000000000000..63149d3d54b9 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -0,0 +1,61 @@ +{ pname, version, src, binaryName, desktopName +, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook +, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype +, gdk_pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid +, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb +, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: + +let + inherit binaryName; +in stdenv.mkDerivation rec { + inherit pname version src; + + nativeBuildInputs = [ wrapGAppsHook ]; + + dontWrapGApps = true; + + libPath = stdenv.lib.makeLibraryPath [ + libcxx systemd libpulseaudio + stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid + libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender + libXtst nspr nss libxcb pango systemd libXScrnSaver + ]; + + installPhase = '' + mkdir -p $out/{bin,opt/${binaryName},share/pixmaps} + mv * $out/opt/${binaryName} + + chmod +x $out/opt/${binaryName}/${binaryName} + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + $out/opt/${binaryName}/${binaryName} + + wrapProgram $out/opt/${binaryName}/${binaryName} \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix LD_LIBRARY_PATH : ${libPath} + + ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ + ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${binaryName}.png + + ln -s "${desktopItem}/share/applications" $out/share/ + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = binaryName; + icon = pname; + inherit desktopName; + genericName = meta.description; + categories = "Network;InstantMessaging;"; + }; + + meta = with stdenv.lib; { + description = "All-in-one cross-platform voice and text chat for gamers"; + homepage = "https://discordapp.com/"; + downloadPage = "https://discordapp.com/download"; + license = licenses.unfree; + maintainers = with maintainers; [ ldesgoui MP2E tadeokondrak ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 1eba34423426..c9dfc79d2672 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,65 +1,36 @@ -{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook -, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf -, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid -, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb -, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: - -stdenv.mkDerivation rec { +{ branch ? "stable", pkgs }: +let + inherit (pkgs) callPackage fetchurl; +in { + stable = callPackage ./base.nix { pname = "discord"; + binaryName = "Discord"; + desktopName = "Discord"; version = "0.0.9"; - src = fetchurl { - url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf"; + url = "https://dl.discordapp.net/apps/linux/0.0.9/discord-0.0.9.tar.gz"; + sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf"; }; - - nativeBuildInputs = [ wrapGAppsHook ]; - - dontWrapGApps = true; - - libPath = stdenv.lib.makeLibraryPath [ - libcxx systemd libpulseaudio - stdenv.cc.cc alsaLib atk at-spi2-atk cairo cups dbus expat fontconfig freetype - gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango systemd libXScrnSaver - ]; - - installPhase = '' - mkdir -p $out/{bin,opt/discord,share/pixmaps} - mv * $out/opt/discord - - chmod +x $out/opt/discord/Discord - patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - $out/opt/discord/Discord - - wrapProgram $out/opt/discord/Discord \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --prefix LD_LIBRARY_PATH : ${libPath} - - ln -s $out/opt/discord/Discord $out/bin/ - ln -s $out/opt/discord/discord.png $out/share/pixmaps - - ln -s "${desktopItem}/share/applications" $out/share/ - ''; - - desktopItem = makeDesktopItem { - name = pname; - exec = "Discord"; - icon = pname; - desktopName = "Discord"; - genericName = meta.description; - categories = "Network;InstantMessaging;"; + }; + ptb = callPackage ./base.nix { + pname = "discord-ptb"; + binaryName = "DiscordPTB"; + desktopName = "Discord PTB"; + version = "0.0.15"; + src = fetchurl { + url = "https://dl-ptb.discordapp.net/apps/linux/0.0.15/discord-ptb-0.0.15.tar.gz"; + sha256 = "0znqb0a3yglgx7a9ypkb81jcm8kqgc6559zi7vfqn02zh15gqv6a"; }; - - meta = with stdenv.lib; { - description = "All-in-one cross-platform voice and text chat for gamers"; - homepage = https://discordapp.com/; - downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; - license = licenses.unfree; - maintainers = [ maintainers.ldesgoui maintainers.MP2E ]; - platforms = [ "x86_64-linux" ]; + }; + canary = callPackage ./base.nix { + pname = "discord-canary"; + binaryName = "DiscordCanary"; + desktopName = "Discord Canary"; + version = "0.0.85"; + src = fetchurl { + url = "https://dl-canary.discordapp.net/apps/linux/0.0.85/discord-canary-0.0.85.tar.gz"; + sha256 = "0kr2mxpghqbj856l09fgw3cmlbdv9h2cd5gxwaymnnywif7czp4j"; }; -} + }; +}.${branch} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix index 69580245fa94..bb8b721a8ac0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gtksourceview -, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }: +, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook, fetchpatch }: rustPlatform.buildRustPackage rec { version = "4.0.0"; @@ -21,6 +21,14 @@ rustPlatform.buildRustPackage rec { gtksourceview hicolor-icon-theme libsecret ]; + patches = [ + # Fixes build with >= gstreamer 1.15.1 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/fractal/commit/e78f36c25c095ea09c9c421187593706ad7c4065.patch"; + sha256 = "1qv7ayhkhgrrldag2lzs9ql17nbc1d72j375ljhhf6cms89r19ir"; + }) + ]; + postPatch = '' patchShebangs scripts/meson_post_install.py ''; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix index 2c692055f9ae..63624146aeb8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, dpkg +{ stdenv, fetchurl, makeWrapper, wrapGAppsHook, autoPatchelfHook, dpkg , xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper dpkg ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ]; buildInputs = (with xorg; [ libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver @@ -37,8 +37,12 @@ in stdenv.mkDerivation rec { --replace Exec=\"/opt/Franz/franz\" Exec=franz ''; + dontWrapGApps = true; + postFixup = '' - wrapProgram $out/opt/Franz/franz --prefix PATH : ${xdg_utils}/bin + wrapProgram $out/opt/Franz/franz \ + --prefix PATH : ${xdg_utils}/bin \ + "''${gappsWrapperArgs[@]}" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 8e85be831a01..5e6e2f9b8d8d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,20 +1,22 @@ -{ stdenv, buildGo110Package, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGo110Package rec { - name = "gomuks-${version}"; - version = "2018-07-10"; +buildGoModule rec { + pname = "gomuks"; + version = "2019-06-28"; goPackagePath = "maunium.net/go/gomuks"; src = fetchFromGitHub { owner = "tulir"; - repo = "gomuks"; - rev = "68db26bcace31297471641fe95f8882e301f5699"; - sha256 = "0dagdvsvn8nwqsvjbqk1c6gg2q1m40869nayrkwm3ndg2xkfdpm6"; + repo = pname; + rev = "37df8eb454088e61db7a14f382851205bc1806ad"; + sha256 = "1hr15d9sbq6mddaxv3pwz86qp1hhzssgrvakfpc49xl4h04dq33g"; }; + modSha256 = "1qrqgzzsxqvmy4m9shypa94bzw34mc941jhmyccip9grk9fzsxws"; + meta = with stdenv.lib; { - homepage = https://maunium.net/go/gomuks/; + homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; license = licenses.gpl3; maintainers = with maintainers; [ tilpner ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index defec82b9169..9b1939f00516 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,8 +1,10 @@ { lib, stdenv, fetchFromGitHub , cmake, cmark, lmdb, qt5, qtmacextras, mtxclient -, boost, spdlog, olm, pkgconfig +, boost, spdlog, olm, pkgconfig, nlohmann_json }: +# These hashes and revisions are based on those from here: +# https://github.com/Nheko-Reborn/nheko/blob/v0.6.4/deps/CMakeLists.txt#L52 let tweeny = fetchFromGitHub { owner = "mobius3"; @@ -20,13 +22,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "1h95lixciiq904dnfpwxhyf545yfsrphhwqyvs4yrzdfr9k0cf98"; + sha256 = "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm"; }; # If, on Darwin, you encounter the error @@ -54,6 +56,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DTWEENY_INCLUDE_DIR=.deps/include" "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" + "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 259242606ad9..a9ee4dd6aea2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "rambox-bare-${version}"; - version = "0.6.7"; + version = "0.6.9"; src = fetchFromGitHub { owner = "ramboxapp"; repo = "community-edition"; rev = version; - sha256 = "1fsp4jxiypl6zkh5wgf9amyiyx9dqv6h8rsjn5xjp9bna27s0d3b"; + sha256 = "1h44srl2gzkhjaazpwz1pwy4dp5x776fc685kahlvjlsfls0fvy9"; }; nativeBuildInputs = [ nodejs-8_x ruby sencha ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index 84ea02f7cb38..db488c2f670e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,6 +1,5 @@ { stdenv, newScope, makeWrapper -, wrapGAppsHook, gnome3, glib -, electron_3, xdg_utils, makeDesktopItem +, electron, xdg_utils, makeDesktopItem , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" , auth0Domain ? "nixpkgs.auth0.com" }: @@ -28,9 +27,8 @@ with self; stdenv.mkDerivation { name = "rambox-${rambox-bare.version}"; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ glib gnome3.gsettings_desktop_schemas ]; unpackPhase = ":"; dontWrapGApps = true; # we only want $gappsWrapperArgs here @@ -43,9 +41,8 @@ stdenv.mkDerivation { ''; postFixup = '' - makeWrapper ${electron_3}/bin/electron $out/bin/rambox \ + makeWrapper ${electron}/bin/electron $out/bin/rambox \ --add-flags "${rambox-bare} --without-update" \ - "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${xdg_utils}/bin ''; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index b6107559e7bd..7c348b88c8a0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.2.1", + "version": "1.2.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index f7a7615171fb..d6dcd0ee2ef8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.2.1"; + version = "1.2.2"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "0l50swqzdzbzbnrlkvwi133d54jgj15cj3awmlc1qdhnfdc3wxbb"; + sha256 = "0ak1icl3apqn1b210jqj9ysnn40808lzrdwibdmv47c30hhq10fb"; }; in mkYarnPackage rec { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ed6cc7abfa33..61a581e834c1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -6,11 +6,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1h96c4yy06ag5lmsbm5h2ws1l7sp4qm5dcchw25k3937fdhwq840"; + sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index e1ba29007852..e0cb977d5c2b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.25.1"; + version = "1.25.3"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1185psv93amqj0s7rgm8bhl3y4jcxc1945paslvjbmw01vi3p1lp"; + sha256 = "0f7pip4d97xixwf667xpi50r0r65givvmry862zhp2cq24bs0693"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index d7c8db81d63a..fe1903af5880 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.7.1"; + version = "3.8.0"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "1w60241zsvr8d1qlkca6a1sfxa1jz4w1z9kjd0wd2wkgzp4x91v7" + then "1bzmqqqpwn6q2pvkrkkxq0ggs8crxbkwaxlggcdxjlyg95cyq8k1" else "0s835dnaw662sb2v5ahqiwry0qjcpl7ff9krnhbw2iblsbqis3fj"; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5d35da365734..14289a66e259 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.7.7"; - sha256Hash = "0w3jq02qzpx58xlmwaj0lgav5lx6s9hdidnq9v1npp4qmpdnsn75"; + version = "1.7.10"; + sha256Hash = "04if7siv0ib5sbdkdc7vwmxyjy3fnijrshgc8i8m79marfkn3wac"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "480743"; archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 8276e839940f..ef9367553ff3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -147,6 +147,6 @@ mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; homepage = https://desktop.telegram.org/; - maintainers = with maintainers; [ primeos abbradar garbas ]; + maintainers = with maintainers; [ primeos abbradar ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix index 24529d83e04c..a3f32bc82956 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { homepage = https://github.com/louipc/turses; description = "A Twitter client for the console"; license = licenses.gpl3; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 2ce42fd9f835..1904b959c8e0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.8.222599.0519"; + version = "2.8.252201.0616"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0bmrqxz41pxcz41dcdbwd2b0hjv8fvix09jwxrnca4d50jq9fx7j"; + sha256 = "1w7pwn6pvyacbz6s795r1qp5qaszr5yn9anq63zz6cgmzy8d1366"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix index 8aa599c09c40..347b7b28ca93 100644 --- a/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.2.1"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "1sp3fc5fkdx0mmllvag94xaifnqbj1k09nl235pix26vv1gzq39m"; + sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 6d2951472273..d9a5ef6602df 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -79,7 +79,7 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ma27 ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 the-kenny lheckemann ma27 ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 137a32f9364f..233fe418df3a 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -42,5 +42,9 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ma27 ]; license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53 platforms = platforms.unix; + + # As of 2019-06-30, all of the dependencies are available on macOS but the + # package itself does not build. + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/applications/networking/jmeter/default.nix b/nixpkgs/pkgs/applications/networking/jmeter/default.nix index 374e4c7d4c86..34f332b003cf 100644 --- a/nixpkgs/pkgs/applications/networking/jmeter/default.nix +++ b/nixpkgs/pkgs/applications/networking/jmeter/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { Applications but has since expanded to other test functions. ''; license = licenses.asl20; - maintainers = [ maintainers.garbas ]; + maintainers = [ ]; priority = 1; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix index 29f44e53333a..cd512e776130 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix @@ -36,6 +36,6 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/afewmail/afew; description = "An initial tagging script for notmuch mail"; license = licenses.isc; - maintainers = with maintainers; [ garbas andir flokli ]; + maintainers = with maintainers; [ andir flokli ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index 0da451ed51e2..f4b0846b98f0 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -3,19 +3,7 @@ , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell }: -let - muttWrapper = writeScript "mutt" '' - #!${runtimeShell} -eu - - echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.' - echo "" - echo 'This wrapper is provided for compatibility purposes only. You should start calling `neomutt` instead.' - echo "" - read -p 'Press any key to launch NeoMutt...' -n1 -s - exec neomutt "$@" - ''; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "20180716"; name = "neomutt-${version}"; @@ -80,7 +68,6 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "-lidn"; postInstall = '' - cp ${muttWrapper} $out/bin/mutt wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" ''; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index c2cce227576a..126e2854574e 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Address lookup tool for Notmuch in C"; homepage = https://github.com/aperezdc/notmuch-addrlookup-c; - maintainers = with maintainers; [ mog garbas ]; + maintainers = with maintainers; [ mog ]; platforms = platforms.unix; license = licenses.mit; }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index 02e49290a687..9ddedac09747 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; - maintainers = with maintainers; [ flokli garbas the-kenny ]; + maintainers = with maintainers; [ flokli the-kenny ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 337f26a84053..2c31684c36ce 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,585 +1,585 @@ { - version = "60.7.1"; + version = "60.7.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ar/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ar/thunderbird-60.7.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2e7e68ee9dadae963416d8a3915a77dab88c7d6bc27669b424bc47a7be8862849a45d95f94903fdfcc83009bd30b4051779c8115f39c94823e5599cd33f444f2"; + sha512 = "87653b0f127300984bd126ad1a1f0c23b0ca68637a10d87c9029e88c1a2eb58b1d1a22528dc74f601956f803042b0a98161df31b41436e193c95a76dfd201d71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ast/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ast/thunderbird-60.7.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "1f5b8030913202d1625bd3afa3b98c81be8ab2fedc76beac094b6be06c65be05c20aa3065e7b16ea7921e5684fe2fdb50c1b5f983d0db6e95dc7b515bc197e9f"; + sha512 = "fbfa10c306bcc9d70a0721c537265d3644494352cf5ad94a5f9fd1e7cff0fdc33b2c86adeaf37bac2fbfc36074ea797d72a1cbfaf23b3cc0ae6e331452410c9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/be/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/be/thunderbird-60.7.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "60a6e42f125dc41bc534993330900ed7f95fb7857e3d84e2bf7d824dd510086cc64b2e1adca739f78a3a057ab2469edde97887f80bb98849ea9d3b9302884146"; + sha512 = "29f7c6e7e846680704e29c8d160fe24163849d30e8844e78f1923ef34cdc7313911b5715b03f4d03f8bfd65649beb81353a890df8af942ec66186ac0c7df6e48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/bg/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/bg/thunderbird-60.7.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "27421dbe6ed43c2b4ff4b8ae71f801a2c7480043d524fcebf5590b71d173f04b7ddb2bfb8a44d591b33329e67628287efa9f8e80f576fd278991de0837aa93c8"; + sha512 = "c5946b44517751a4cde090b7c1928f58ea6f9761a62abc2cc23536003139395b92266eaa65800e674bd48bff20fe2a0bedab4b9c9265ca8cd0d2f21fd07316f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/br/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/br/thunderbird-60.7.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5765f2c836a10dbbf95f4223caefadf6e2053a606a5e686499780b29bc2c831f8418254721403bdaff037f79290835d76ebcea3f8a0dc2a6ddfc07985a44b3ad"; + sha512 = "7ed69a9006ca44ce7f8463af5de88702b8bee3afc9902e608f76751e039d0e6cd7e19083d7d641cd9314b0fd6ff33faabc0574bfe87c0d28cb4682b71d82e3a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ca/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ca/thunderbird-60.7.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "e4d81a7d84b56cab1ecfeb65907cbeff592b05aea4693bd6ca926261017c5af51c66c6fb20e8e241433b7e93467652ce9b778045a6be33e5c2960c820430ce69"; + sha512 = "e498d19f0c36f49b84d6ad5b82b3cb5c32942d941da9013457a544775f18f1aac815ec4b44d3755eee3e652a5a7a6f1d24aa4bc3efe1ca6ce3ca48ad65186023"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/cs/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/cs/thunderbird-60.7.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "3e4385dba45439216c18959305ce9f624b1b70a7d45c9213a40f27a47b049bd2074955f92c79a831afaa26a550975bada6f100511fbdbd34ac10b1fffbcafb71"; + sha512 = "b0b4dc1c92375b7b8591d228911e66959b07cf43ea7bd6a1eaff2c5c419fe49d444ae7c8535074379aa76d1cd335d3c90c322e3d84427c7c33ceb91dfc228c16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/cy/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/cy/thunderbird-60.7.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "44f1d34d3ae6ab32c1b3bd1996caa829a1bcbadeff269d0a4d6fd8e3c07aaa3fd8d83505301bdbfe583e67f6432f4898746bec4f7173a6b84319d7f71ad4d87a"; + sha512 = "5a7e93c146631e72e6fbfe127b372c56a68cb3b1840330c8a7b65c84696e13062da82666e618a9080c04b59f44997356b6a5f8c8819cb67d25535d6c4f69c842"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/da/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/da/thunderbird-60.7.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "36cf0afc3ac6473454dae00d0e474fdcd3a3bb68c5d52ce5c325fad4bf1209b85d9a8052f92ec5499df670e3fc8661a69edb3763c8e1b581be951b78c4d4bc82"; + sha512 = "407b72041e63945a87e7da272d4218f6ca695ca2ea4e45992742db74faf14139f6cef6a1357dae0e8836ad757acadb73ff499f48cd17545bb4eac5cce721eaf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/de/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/de/thunderbird-60.7.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b84ea8f5f0e382971db974ae6946c962c1ca1a208de420386a77b4bde6537ac943705299257540f51360fe6b1386873814fc5fc091cdbc3125f811748840f777"; + sha512 = "1d446c9a97cb2279b2c202dc8023760ee6a1efd70fa5d2242df883cd23d0532c6815e2ae0fe65c04c62885ca2d145f77617faf137e727d6d711546cf119caa11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/dsb/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/dsb/thunderbird-60.7.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4a02fd4a5c462189ab8ffe4b20164cec70bf996ab7a1e91e6920d18b8c44acb82dc6e4cdd8771e852e4f9a1bb07006dca2905175b2dc658a29c61cdebb5c2d17"; + sha512 = "de925e98ac4748ebe65706eba961ac5cda68b76a5e3fac23123016de9b433b54d61855e73bd782c7ad97833d12b260151621cc385a1fcb111f9ba09fa06dd30e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/el/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/el/thunderbird-60.7.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6ed1cdb0a0f46639b532956b646781e4004d2f8ae5cdfb1ec5e73fa184396ff315ffb776025f769445f569dd5a7c3f6adb5bc9985204bab780003b36a7388d3d"; + sha512 = "9f2b2acaf717caf22f2b1e76185f40d172fc2c4debd507238aae13776cf67d40ca55916f2db168751e5f304ed3df38c6aadcc009f33369dbe9644a0bc06fe903"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/en-GB/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/en-GB/thunderbird-60.7.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "76360b7252ddf0a869142af52dfb7c8dfa9706bf950396b1443cdfca7fa53d754b3e9bfb1192645eec5c59c53df4ec386aa64e1db88f8739aff9394c18c50abe"; + sha512 = "e0ce0a41088b9ba5123b80a4da180fce73fbf3eed587829f27d5b0af60ffd7e2e11cb640dd07a05fdadc728d37daac95c754a6d4d2c6b678c081564b72568501"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/en-US/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/en-US/thunderbird-60.7.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "6006ea1defd1b8cd6e99c66d51f7b598cd700804243f8f7ecb8ae1e611f9a6fbc5b2edc2c5672ac3547b0f9d88083eeae619a2b2ed68afa74742550c5c399576"; + sha512 = "1bb2e0449a0bc4021c46d0ca1f291d926b57277db4ecd89e6712eed9fbc6b2aed84e5bfe54885ab08f796e6909288b8159f7e843ba7183d2cc3f67cddda45f57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/es-AR/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/es-AR/thunderbird-60.7.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b9884c2cf73c87294b9ddbaf327eb0d5ecd6e37c6d43382b5df957354563d82737b4eafb1611d39e7226c3633a9df099f465ad58d956c006390ac8950090daf8"; + sha512 = "833bb73d258e0c4829c5bb55c78919ce458de3e40f26c22ff51573921840bb83885c626bcb823151aab56be20fbda945044ee1bcc0f590d2ba7bcee269a489a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/es-ES/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/es-ES/thunderbird-60.7.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "cf341748e26d3769fcba61ad56a31c27afedcad2c800cbfbee10670f1286ff2b280313aac0d6a2fd60912df6e2679825ca09f0e84fa5f3aec1816cd839f5f7de"; + sha512 = "b0fa09cf09c373963cf028e96f05d71ebb4673d1bf328721fa59147201fd188e5addf4c150c6323f00abaec098f2ff723f9367310d44d9d5509d849224dc37b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/et/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/et/thunderbird-60.7.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "cd3a63ce48ea634f107da110a9d934296f79e225921df7f675abc1b58af6b04a387fc31db08ab5ea23b0a33bc2c557ebd5ca8eb20f11146458bfee64221ad90d"; + sha512 = "1697c46bb4e3ef4d9ed864f86d374632f8cbcbe7baf6344c47d91127cb4d200d9e54e06fc87be0be155f46855fb6c4963ca301d9a6b2db20f4716c6aed53fc14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/eu/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/eu/thunderbird-60.7.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "8897270f4d27435a1f0722e896159da7c83f1fa1f47332ac8af8ec0446a194bb84ecee39f1a32305e84db04e98ca1c035df52ea24d15faf2ec44a8b84732ad8a"; + sha512 = "d3c769bc9c7825536e7850e294f309a32193686b75aa708c9530a792ae923a11b04792789a51dd477acc40818398c7c75b030e024d7be9004cbe1158a2c63704"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/fi/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/fi/thunderbird-60.7.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "826f0be321eb2ea3bd9d95ccf2142a4e34d1d54ef352d25493649d12b15bfd158bcebf92a8563e8fb5601e4bca77db8c58522df09c7f5f521e5fa756aa776e24"; + sha512 = "310abbbfcf11020c7aca618e6143b7561eee762af4ab33d530b628d0ad79787d7f9b8d224995389b770e63d7532e0a7bb7a7e55c0e7e5ab98d006d71f2e2ec50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/fr/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/fr/thunderbird-60.7.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "0f0f3baff25d35d06575b18baa11ccabe10cc6103d765410b901009d91bba2258c03a5de94f2a128e563ea6ca97cb2525841ffabc2331119a88e62145a913978"; + sha512 = "3ca827ce0f48f803d7bccbdd642af848ba77c64e94d67fb8c8f3fde8dc2f61fbf1e43c2c209aca480648ae21b96d7a043d70fd7649b5fc67c048c3b4c15eddc5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/fy-NL/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/fy-NL/thunderbird-60.7.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b817f3997a5aa64b3ad0ca3d7a8e4f7a18af133a6f3ccd3d45bde0f4013521cdb331700526ce79e0f68db5c19c3f1f6b6e38ba935caf95a77a4d65938d64c200"; + sha512 = "a2f1ba15c669cc937fb094077176d65663ad75281554263dd24bd4b0a484259c59bc90638674cf4848f129e1462ed13e6b2951d01bc037a648be11c40b55a801"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ga-IE/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ga-IE/thunderbird-60.7.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "64235f4ac1b5352e7e4edf424966027656f899d96c078249d14ef16d4b30434511d3ff68d00433ea773e89c70b4dc6e4ba02f8ac5e4a670a8dfe5cd0b5c16dfe"; + sha512 = "6548fd716f8870c6c5e6cc58e8572a0d72a25a896d96d05a6c8686f23efe914c809bb005a8ae0fa856148361659b8953a6e25bf46a7cb1588e26061b5621b89b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/gd/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/gd/thunderbird-60.7.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "5c3758a83f17e0cce2bc527b3b4e6755de2b129618b9088ebef0aaded1aec90f411a4aafcd6a054937d5d568f587715dbb431bac5930828247ab9fa886ec6d74"; + sha512 = "63a225e8651bd2f4e40eb3393521f5c73316618e2bedb2543965a5aedac336bbe00bb606a331fe16d0e4c3cf39d97cad719d63c468217b70909ab743b95be3ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/gl/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/gl/thunderbird-60.7.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "41ebbef4d3f3648c733f29df7d9a0d70201d7d519f3a3773384d4eec4e837b0c90590587e87535eff3bda773dcbeed7f3bb184229d142b7ff732595be370625d"; + sha512 = "59bbb5c8356060e787555b8e235b64d4fa3936de579a4d0bb8cec47cf073050ea681b6f5be0eaec1335b14ddb6f08bd6e583f166081c57e85189b5d14d9da6a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/he/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/he/thunderbird-60.7.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "59811ce89c58526bf2f55156028bce6f2d62a99bb634615444b05632e2c72857fcb65e2dafd9c308191c525130b7d2f261e0fe3767a1b3549c6c5cbbb78ce303"; + sha512 = "6b9d3a84f78a75c2179f23e1a70e9f0a665b5cff7f27f9e4fd35704ab5719bb9c1f0ab920130975500bd80bd6fe870da68dfaed6a41ebb629ca21f4438f9087d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hr/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/hr/thunderbird-60.7.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c35202e12965bd8fb66d6aa5f97817a0977a0093879a661fda854beb68657945b1798bab8a2a357ed6d8c9f0322992d2f79e25cdba15cd3aa584a7069ae7639b"; + sha512 = "6bb5bf395a37b7d398096787a3bc13eded00a0bddb9a854bca9c4f69b8aa0b352531b70cd493be6f8eeb5cbf57c34ad16f59a039542446a600bc9b95c7836da1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hsb/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/hsb/thunderbird-60.7.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ff85e93741a03b17482084e00539893bffd910ea9036616cea193cb86d5c4f9a7e55a8cd7c8de74b55d05236e9e061a06a3a6d5a0adc0df44f79f230baea7e19"; + sha512 = "531a6b5ff4bccdad45394e9db3d1fccf07a7aef8c436c5975b82deba0d772a308923ecdab3fc019280b695816e590b6500ea1f6b97bbc321b6054272105a72fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hu/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/hu/thunderbird-60.7.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "2a6da2d7b7c8504ad90753d874738ef2306fd422b6a7540159e703babbf7d953a427acb51ccf556d54de42c816402ec7e41d1e2452b663822333837e0217558d"; + sha512 = "b59b1148862f4e2a800ca4e6b92065ac129507a390cecfaf926e34b44b401ad54e419c87778a1acbd560276ea9afe9f65f2d2a286f06138849c717b1f409aadf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hy-AM/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/hy-AM/thunderbird-60.7.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "43fb0ebf562034c21baa1f1f9712bc1bf0f9908215cee4666cdaf48dec3030d0c93f45954d42e1ce6dea9afb29d913f2f0a082f48aab7a66f747c95fe33784e9"; + sha512 = "7026cbe16233f305ecbb9a4dc51a5a76827aba20e6a3cf39946b79b117f3b1246d8c7556c62027ac5f414435302f026e2f227011769f2aa6ff5bfbee99531f26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/id/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/id/thunderbird-60.7.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "054035a6faf23cf27b8a926971f87534b31c08dcae1d09e7508481077019d6e7899a7276f31728e3d6912a0050e5e014b09fcdcf236cee544d57851a4b27528c"; + sha512 = "72578c5f46a6e225357218ade7c4f424ed889cb9b01077a3179ec69464a4778ea023df3bf577a63040e912ba993430c9e57815fcb84b9fc679756c5557c9e76e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/is/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/is/thunderbird-60.7.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "3d411dbcb9b8f9532c6fff06324fdc2a7a7a139adb3c6c50938ee7c75ec4eadb757e9717d2b12a60147c85b1a8741d8e7114c3d74ba700be317a5537fb603081"; + sha512 = "633373ec74bdab8ab4c42d77673508a1e9be4924550958e0f8a3c4385e3b0b07402a448674f2e5ff39cf08786ec3b90e6a801b993edb868d73a009874b00384b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/it/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/it/thunderbird-60.7.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "07bfb76c346551d50b2dfefa12bf82425b52216c76b18477096b4fbebc5aee01f521d2c3f4cae7495a6db22dc4fa6d7b63fe2e1c061e9d011421dc7132073a23"; + sha512 = "e0fea4beb6fb5c3d4a62f42f8022a33e24f136972c8ab6781c033b30183716290bdec3857aaab08c31b2ab1a0799d4c6689e75d2b7d5f405e3632ee64979a21f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ja/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ja/thunderbird-60.7.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1a53ce62a0211f4589bfec9cced50ca527216a8ee0566a5cd4f18ec234428ad1a51e64a4af0ca32e38f2b69d506c24c63b28f0ce0f169277dc801376c459a4a0"; + sha512 = "5d4f9de52486cceaa492020715b40b83877e449c9c70227f4d99bf80ff1075ae3cc2c006e87bde842e24877b2585059577e27a5ec84656c2a0d5f1f7699d62ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/kab/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/kab/thunderbird-60.7.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a43d9e81775d3a3ef2de8e5a1e0d2009821421db7b3c80b0f37d2cc2ca760e6eec6895cb4719e92eb4962ac23616a750e2f57d03b6ba3e43a031a3539dd02733"; + sha512 = "f166551fe49f889a6793589a39724fdcbab3c5704b20707a1b531217f99c75aac37e9d7cedd2c0c06b5753b1b3aa7f3167d645afbd2fc74976ce072238ee9a42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/kk/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/kk/thunderbird-60.7.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "e373785cf2baa36d8425c5c3eb9dc0d432d47e603864d3c7593594f78cde2284b7a9dcddb69413b9d41a410252f461fa79c56c5c138e29b3b946ac6c3b70d3c1"; + sha512 = "2a7074f395e3f2b3544ccce74464e7f281cbbe3538c1b1a67c061688520f03c31be77b00158e2bb4c2f096e48ba28d50fe0d99b840b656c3aa40adb46ffe46bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ko/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ko/thunderbird-60.7.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e14b3486c7c96f3ea228c74d666ff8af8f1960341b6ecc565369696635439ad4aec16e023584a89a063a87ead625acf69131d739760e3733c1ba1d390d6d8d09"; + sha512 = "3b0317c808294dc9e745dffe2e1fa45a99f06cf0ecf890593252e90dafdfee46dc87c20e53515eda9c7f39947035fcb96738db92f8fce5deb3c840d9772b3d07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/lt/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/lt/thunderbird-60.7.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "aa8da2ad1da3b7249e5e2a93bfd2c3816c1dd0a1c34dbe462e9d8a1b4dd15f817eb9bbe9a50f20c106e40c60e79713c1ebc83416ed4c317e73fb7a98063a5b20"; + sha512 = "67cc7d2bff4548d3aaa0cc59d1318ffb3f8437bdbb53a2919996afc2430c27000eadbbb509729f85908dc88b46914bf4ae11d97a2958eee83a0e54ff578a59d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ms/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ms/thunderbird-60.7.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "d44b4b966c88a13af94193b0927648dd212209b91295a44fcb61515104e0336b0e3c3ecdb38e533b3e105349d20d766e78bb98f296e4a324885201e73c3c4555"; + sha512 = "5c136b101f4dd6f71735f9c518cd287a42f2e7255961a784c3e9351a6039011bff345ee1de9466c651539f2e938cd1deb8d97ba56722a8b2d8e6fd2c25cc7660"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/nb-NO/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/nb-NO/thunderbird-60.7.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c3b934f025651525d1df9e3bcccdf3df18ea6975ff6e162f4d2782bf9f0654621df2be5d9e98011f3c3af48299f0cb943674305e9cb6b0a46926568ae76e981b"; + sha512 = "e9cb187813252fb812c950dc7b435e98874a915a07e30ee565369fa08a6529544cc09b06a65f9312b18a3db334871e9cd2e0362387694c31eef07642d0ea3ab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/nl/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/nl/thunderbird-60.7.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "4187e7382e3aef4a0e4769fad1cef5e314cf5fef9f8e89ad1448dc41aa26dfb96f4dbe4578b05b437d1c4c21478e151a165463e4bbc6743990113d3458e30673"; + sha512 = "62c0e58c0ee81a2ff674de97eb98cb30908d238de4dddb845557b5d86f0c27353b4cb057c3244e57dc99932b9f004c0a04e8a82bbf5fd539824f86915f1761c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/nn-NO/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/nn-NO/thunderbird-60.7.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9743ad8576c6f648d03911d6c4c7b9abd945ed4d3114e70669adf1849a338eac4f9794f87111a66b58c84cce8135c5e00b55f157abe73aaf7e26e8aa3e957789"; + sha512 = "dd9fa519b243de01e34ec61d44af07fdcf9667260b49955a0f72eea73860514dafee0d449791b74c0dc25b41d8fa55d1285ad66ccf66f60c85e8dbddd1a58813"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/pl/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/pl/thunderbird-60.7.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "57178babba87a9cee46763e30131221011ede4ba8ad449c6a5f6a7930dbd73d01fc65480de012da0290732f22d970177440dc591d5101340ad8cc9d404b1ab24"; + sha512 = "8f0b3c0a9c8b2f0c75eca0a3ddf820b4d70ed7ef35903065d97b421296575d037fb5d2cbbeba2b27c4c0e9df63d87a1701f8b4049443defcd760f4ab1b09a66d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/pt-BR/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/pt-BR/thunderbird-60.7.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3a7914fbce5b9365da8d74162cae4dd5fdc061094f0cec1b603650277314900b90f3e07d0a5cfbdf35f0005072eaa6857b5b0bf6fe6beb9da527fb450c829861"; + sha512 = "d72d3fdcf51cb412169cef19724d84a4da29ecca39516fc137650af2216abc127f249f0018618f4c4bbd584235248d894fd32dbd2035bb86eb42155bdb1d6157"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/pt-PT/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/pt-PT/thunderbird-60.7.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "b04b8be13234512967451a31b922c3ec67264f6c6e127c0f364038a9e4ba216fc38e4df4acee03a486c820ab56bcdc1fce983f95f21d82ebf3757b6de523fa86"; + sha512 = "7ef0d38d40c7b4d024fc46c05ff9122d487ddf8d3a254372bbeefc82943b8a96a56d4b4be9a74789d5f37606d6b098d58862393757f6b49cc43382a14180482f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/rm/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/rm/thunderbird-60.7.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "aae5046694a3739988cbe230bce4114f79f2c0e7904a84ad623018e24663ac83978a41a41a5a1bc0095efdc532c9db07498c91a95ff03613f27d95a29a1697fd"; + sha512 = "68f3dda06c4d5cddf4a0cd4b5f7ee06975c7d491562b1138f61fb149f256fcdb5a2d1d9c4192c8b9c0c876bd72a2e55c93cd7d1e984c02e12d1d72be23b32e05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ro/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ro/thunderbird-60.7.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "ae9eff34d48fd101406fd0ebc33f2d76f1b9b460a5b28527819aded93a35aa1f2b3c8f9fe853c50e7afb3d555ef86fa7882b39ab99935077c46bd8b702ea279d"; + sha512 = "981a1b64e8ba9b5715cf736064dbf65dc57ebf60446ddeaba37d6e652cf197afe903f79b831e4ee86814ca8425a3f24897987a1ec05c534788529138b97520b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ru/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/ru/thunderbird-60.7.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9ce34ff4bb8537824d4704c4a4b6be5f1e4a37f0397e93f8ba818ba7e2940ca0e6e5cc624bcf9dbe3107177b20c488e4a2f2a05436cf6895635903ae3f5259e7"; + sha512 = "4396134b1d5e6debd319f9dd94b9262f6be5d5f545fc6f2535f42f1b1c94ad18773cf06cc0191274c2636125d339af7552995cabcdf88abe8c3d8f5a11160b2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/si/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/si/thunderbird-60.7.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "894e09e0b5fca60b8719f9823f101176f7ba711d155594e897ec792a4d61bb3081a7cd579db83b04415d2355e01494de7295b4ede78e8de34a6b24e1de01c527"; + sha512 = "ab5aedf3ce246b6b230a915b813743ebcfffe9db7da8e521b2d058a86166ad4bb05a1c2a31f1fe13efc05f4c7650055881939151644087e97ca558ff9249a623"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sk/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sk/thunderbird-60.7.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a14777a08a8ed419d95a8d7f55f3b06b854a8eefa356a2231e83d0890342ba001795788e73823da1a138670d56eab5aae62d5380e37e24778df43b93d1377fa5"; + sha512 = "579073269dd14b6566ad2c7104db1c2075387aef05bae9e28bd6d2a5052aed9368549345901c5a893f443c7ed589e4272890f78683cff018133a0fd60cafe052"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sl/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sl/thunderbird-60.7.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "9b1f7de6a1968658fa53812aec1f0eb0d6b447b8d1319d9bce97df4f8b0f816f39304362ef65db6e21fe439e7ce6d055e319fba538ccf052a19930b9ded1106c"; + sha512 = "b561469e195b5d1ac52b8851e4f7b64605af0c316eb05952e344755ce78c0a1205066d0c0a5530809f29d988698db502ad1ca74db63fea52d0323edd94017426"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sq/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sq/thunderbird-60.7.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "db248c15d017d2cd54cd0703c8a927ad135870bc2eb5006f04c03460ec9b3887278561da0682f8e2760195ce41b51dc337609d17b2ed1bb2871e62025e58645d"; + sha512 = "1a20760dbc3ed1efd2fa1032679df86b6e0f660da54bc1c20463e7c158a98939c89bbd316fa82a90a33464ea075613529e8a68750468bea1287cf7492fb1016c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sr/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sr/thunderbird-60.7.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "dadcb57443931d18e8f109a17e6e43f9c87232d16b92f5cdf5f9965ec5fa3625cb10d7d499a03b9aab8c882fb23a7dd444a187d6469c82d7912fd012a701e8bf"; + sha512 = "9cb1cdcecfa8e1830172bc4a5bf926d73ee3d7aab32232a0063d1ac63dde316de57310b60c2a7102ebe76d9754ad042e8abe2745dfebc4a7af761ec014692dff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sv-SE/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/sv-SE/thunderbird-60.7.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "31b53c38b7c1c5b101c67aa8e387febde4dc6c1a1760875fab77e284873a653fe6e0548a2057673a7aad270158542b501c10599adf4ae415907e973d256bd806"; + sha512 = "524944a758153d216c7db81eb2c03f0186f8fd3575b5be4498aeed438910ad7e85de4657457f2fae01783e966a3c6c75b318231ce59307da57c4fa805bb84569"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/tr/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/tr/thunderbird-60.7.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9c7c48ddde7254252b4ee6b423e8d171fa3cb08a2f3d5adff122f49769f24145f33fe6714a109b15f62a8c06381ba6e4fe1bafee27b6c79ab7b5fdb4deee5f5a"; + sha512 = "153d0d8bff8df4915271f255402f937c1ba838826b84d9bdcb60da4d74597f598aa66c90efbee7e1c823cdb74f7ca0c51b6876c38d2adceae7316e6c3c2fd82b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/uk/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/uk/thunderbird-60.7.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "a603f3be6439172027afdb3d31ddae7e7a61f9d1553f553d06e34fefec981afbdd889ed9a4083719a98b9e212ac14b5d2188c6e5846f9d05e9b2761a80d88254"; + sha512 = "b357f3fa44988267fb757bb2e9ca63312f92d2e36d8bb014c6b92efc12fffb0d9ef86ef87ea5850c241d78e95504c6e539e2b62fee96fb0151ceab6841bc7f85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/vi/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/vi/thunderbird-60.7.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "1a7a0b2372b2fbdf45f60d2b9ad1a3fabda76c94ebbca83a9ff4935c18bc932fdff7b556d9716845ad8905d10a14e97bda4f9ade8668abd8b1a3d37416e55b2f"; + sha512 = "96f1e9b40a1d689af3340febcaa4774b19c71bd9c2e7cfe5d1866472cfb65d60a590503c598a2ff9f74378a7af23f06853d9b4faabef7b54f7900fa501ac5f4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/zh-CN/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/zh-CN/thunderbird-60.7.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "0e7afce0ad5e9553a93aec222b8731552fffe8fd104a172e8255d9e5158a8addadfc2ba3654ac34f1946b71645ca72e993009a87e422bf47d8e4c2cf6e77927a"; + sha512 = "edde4d0199ee89652a9aab6e5af77b5a61a2b58be4763513689d3276b43611b9b5bdaf37ac78f7f92ce015e779d845e3c66d001e341e63a53b22dfe5d45a2eb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/zh-TW/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-x86_64/zh-TW/thunderbird-60.7.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "42dccbd9e10c817e220209e6a0feb53133f6eb6de3c3412d4b638f6e7ee13aedbe155b131164454f78b7080bc6eefba5cf9dd06124e05e60355c3a6e01d1c920"; + sha512 = "f2ef157cbd94d59df50ee999a15d0dff5ee1b9bcc7bdc515d74105f5c9fdfe671ced0d51bfbe1a464e66037fa6b6c8738a2fdefdbf43c391595b4774d1a98d09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ar/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ar/thunderbird-60.7.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "782798baa1f2028ad4a4fd9b635177792594a950e70298b6d669429ff9065fb7b10a1fd8f41de95ecc00e2d187d711b7b7a4913ce24229c0a74e37c8edcff5c9"; + sha512 = "34966e3398b537782da2df24fe9c6651b71af93f1a4cf48a910c75c65c96d83e21b73ccfe5729277a3a18fae51f7c7d5c61525cdf92942f3456032d6c19fd6f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ast/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ast/thunderbird-60.7.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "9b60ad7ae495d2ab1d80750f6f0d5b76833c1c1d761be4704727967ac98e86877252f620a2f9e350aeeb44448b8f239df40bbc23e25ba2c9002249fd4f940d89"; + sha512 = "eac5b32afeea7c15be37ab3cb1443cf0f08b3144d71c83ceb35b4145ea5e217d2d680404115a66c549532f018dfc43babf70ce19b5ea60602442c0803a9100e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/be/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/be/thunderbird-60.7.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ba8737f9a5315964186c132380fb0189149ec6291e5eef8c2e775bda5ecf3a8fd1f3ae8e42ede3dab52790d54e99da283397213df7bbe09147a22c97b4d53217"; + sha512 = "4e6085353b787ab1a518b8e8bda7deaf4cd5b54e5a3d9e8c74d98ea7dd0d927d9f836be41b4d5e5e06f0e2cf137b3a02b477cb734acc7b82880e04ecb055e795"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/bg/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/bg/thunderbird-60.7.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "23177755d75ff8c3bf485f983065d2fa6ca2a05f13d61c85aff6713462cc547bcd9db5713c8344ea29033cc628cba95779787850f43f0a1ecb77273e64020535"; + sha512 = "75d0dffcd68d495932c68cae67e876b5d73066258051638c8c324cb513bd7d5e83bbb658745cd29fdd5a0e7da280bea1ae1cb984d0530cb3fbb9ff41560c3867"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/br/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/br/thunderbird-60.7.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c0c28eef08437fa044145cedb79b225836ec2084038d40f0e011a6fc26ebc432d36de98c8572b4c9b03cafd8968f9e0b255dcbc75236e39029e496352880de2e"; + sha512 = "7dc116897e0a43f464f36975a7ef1dd9de3eee9bde1eba0620afcf5f5855775020c347e2656e5e5467284fb2709e823032053bf7e79144f7a47804ac1b99603c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ca/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ca/thunderbird-60.7.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "016cb59f63fcf89b9501d625d1b923caca67ec0619ce7e00ceb023e11ab2ccf2d14cbbf9b9b02899d1b3815c74a1168cce3e16f3ce8cf96d71e6ec09c0f7873d"; + sha512 = "5cd9211dee38ac338379d3e3484bed46d84022bc57bcc4795cdba17292be635ca9849a7597f7adf4eba311ad01f78f589b9bf2a59b8f9db8f59e3115b08edaf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/cs/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/cs/thunderbird-60.7.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ff1c10f07a4dd7ec757ea7256796f0a8e2dc8e9d75107d6fda76a773cd15094fef28786208bfe2aa8ca8a2ac1bb889ccd55953309b2d870a706d4595f189ebfb"; + sha512 = "f2f6a57a215cb896ed0a947446296e6afd5b5b2e7b5e260e2d041fcf2eed1933c4a6ae88c1a669f97899177ce2704565219f64cab33412d501339439a91a89aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/cy/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/cy/thunderbird-60.7.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "75fee7596cf3cb44fcb38f071e258991acb63d15ea7460e36feec80b0a73cca882748c71b9e4b6b064beb4f23f608f1369e47cbf28cc2e511dcef32b1e429ceb"; + sha512 = "0cbdcea225c7d3a50ffbbf9644cf3182e5775e6d54383d3190cfcb4396ffbf7ed1c390cf100ea08b3cba7c2cb225684780f969ed5180bcacf34f840aaf4c1671"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/da/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/da/thunderbird-60.7.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "90ba57c2fd2c03556d895050797de75149d63ce13379e5a9d616962e5af61e859d460abe3f2519b26d4b60e0b7d91545b206cd91b928fc96df0c3714b407ca5e"; + sha512 = "bc002637f863487725c4bfdcbd4d14979dd343163eb2eb35e570479d6ee0b1f470ca8b84e0443da1ae17ef0b0cf3f2f0fbe6c402b100b56dbb0a3da8b1e739c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/de/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/de/thunderbird-60.7.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c61dfc96c0e1152c58a897648ca2030bc0a9a9d0112b9b2bab955583251650cb38b9c6a19b7095f4b855c5d1e8257500d13b2605c71629ad22a184bdd8fd6b80"; + sha512 = "ac4b84b9e1309bf010f3211b027da68607dbf2b068bf73667f3c92696c4a7a3148f5c6064d0b17d4518052755dcc3a3497aba64a5ccaa8875374f7343cab93bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/dsb/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/dsb/thunderbird-60.7.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "58645095374ed4f20fd9c78874a48a30c512d501ab8207e8228e0af9a1f187ae54a93631e02f6349e7da9e7b530c9dac31fd395a65ae93fa17d44e28a643471a"; + sha512 = "b59c62d54bbf57c27a4c2385ad03de664346a28f5e0ac4c009805c8a81f5c0b7225fcf6418f2b7c25140474bb3b6ce248850bcfcd4854280942d85c75d36b025"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/el/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/el/thunderbird-60.7.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "4ccddcfb3968fccc67be15e2c7364b5977e1dce72c8fc6111e95f2deb04d9ae5f00e3f0ae744d8ece9166701fc3c0774e3df4538883e320b0a5346c8a5d798f9"; + sha512 = "a09b524c67265aaf9925c8325eac0301c275f0daf3eeb7695a2b143d2969754003d48833ce6b420de1374938fe08fd80a884f70c869d4327cd08b19857ac90d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/en-GB/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/en-GB/thunderbird-60.7.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "18ec0528569863e997bb65d88411448bc592991dcdad7cc0f20feec1cd054fde83e756149edca994f1a6de8c74a837a778d943af7bd75e26067965b3dabc729c"; + sha512 = "9f4079ae7f4b7a1fccaf0777b2eccf2078926a2f69037f8248ce43b3008fab666b927f4011413b3fd6025ec29dd11c81a9758e2682eff95aa85af47707692b3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/en-US/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/en-US/thunderbird-60.7.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "7525d96dfa29f001491bfae13cba51a70de91980df8d2e7eed3d869f36a32a34dde76e7ef9bcee544090505f9918c7c6062b863e1f4d76875eb9fb3ff9c1f4f6"; + sha512 = "82a20230237ff8e1997dced5a704f2ddcb2d08bd9dc8615a324a75179287c0bb7fb8a56a07feed62c36b6e5845fbfc6a70d0f8b70ed2cfa9f7769fc01a5e5546"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/es-AR/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/es-AR/thunderbird-60.7.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "565bf893dc422e46f7ffd2442aba9fec77cec284b3fb18ae5ad26e33d82d576aa0308453f29f8eed06b482038d4a663076809abbee03bb5ed7e63efb889be550"; + sha512 = "62740e66ad12e3919e18e1db3c6f1a86d957225e0c188bc288ef12f1e657ffb82b1cdc79d71bb4ed297c222ba0cdc56a454cecfcf146e2451d30768e3f797a58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/es-ES/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/es-ES/thunderbird-60.7.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "1c76bc4a8830ca332e768bdfdba5eb8f45919ca87fe278e7ed488f537633ac3e89f5759adef0ff53c48dae6e09174ae92828ade1645f75fd3e60f188a64c6b56"; + sha512 = "6c54311c0c9a7b85b244645dedd73c0c30bf21620a81d9acd54889b75ad26f2d5c39c3e2a53309592b08ad645359e4d436e2cc33e7ce2f414b140000f72631cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/et/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/et/thunderbird-60.7.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "fae17d629afc4c5db4fc5cf33bb52119424de6daba00834894c5619f430d23f520bf115a471e22efe6aef2d3d66e0a9c5d5a6bbd369fc9a8e7e6dd65777082f5"; + sha512 = "3501ef96ecee9410be5dafcfb416ae1523a1a2dda3d2ec5022b1edc935a5a91708e1e2da33cbe677a3df8707c04b5fc1abd6094ed34bc2aed2c792033f9aec42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/eu/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/eu/thunderbird-60.7.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "1ed16b53bb56893620b8a8294d7d03396845b051cc2883b3fa54f0b2bca138e49bb9f91668b8656805a139521536a7138074e73a4ebc02ff2b47ce653994a6c1"; + sha512 = "18065e7cda2d94c2bc9b93e96329e4883c87106dc5e721a1622fb1e8598059f4019804ede7738ca10dc5d494ee94e9b9e6f56738a343094ad159439cf37ae6f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/fi/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/fi/thunderbird-60.7.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b1dc117410aa600c14f3a163c6f08424ec7fe82b63d82469f5b59badf70cf954240dbec6b016d7446ff7465738279594e70fbcfc97410382db29ec4a09fadeb8"; + sha512 = "40f1c228d4f301657c580f0810748807c6dc227189ef0665ba2fcf094b4d7b5560db20b795ecc6a7cfae8811f46387e6fb63897d7e1515cb4c1c3e3c56a52720"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/fr/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/fr/thunderbird-60.7.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a0b4448fbbf9d35756167d939c3125913edbd42ddb250716bb335fe50101af2edb6e60c344c3d730c5f4030b1849f89e12b0da27d910fd7891cebab36c1c8511"; + sha512 = "7a1974b6fb379bb4802f35d86e2851f493bb39237127304f55edc5786d70a1cac9576ef97182b80d10191f90144fc2aaf16be4590c85457fc08058dbbe771732"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/fy-NL/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/fy-NL/thunderbird-60.7.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "afd95c42ffe67293ff9953751ab56cba121bf2db6acca45a9cd46cfd3c3b06e0a81c6938afb6ca5583d199b7572bd62008e64a8a38bf54f19fc34bcffa55b356"; + sha512 = "0b6e189fa5180aa29ad0bcea5be06916e570d8c46a83032188f511e661aa79cf4af8a51d85a2265c664ac7e76429bca4435bda098a001eae46cfda426bffea32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ga-IE/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ga-IE/thunderbird-60.7.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "6e8cd471fbf8d835496907bdc8d48aa244457d87ffedfd40c8780d23ea15a04279165b1c17940eed6333d6a77c8f6e379ba0b2d3486ce2a5b05d5d0694196234"; + sha512 = "690d8399580eb4614718745d536fa5d1d235bca7fec8d38695b71f4bf89fecd9fcc1aa4e712e6771836667a20fa28cef2a4a729604ce2267ae274c4862e34753"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/gd/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/gd/thunderbird-60.7.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a657fb0427d39e136391ebf529a6f068165c352ece5fb5a6e4da083aa3992a706bfcd2ec2b6c2ee4a7b2a97d9bc8341b15b710239d9c9120ce5cd4bd8fe64641"; + sha512 = "c5adaa232b394c59ef3c759da8911edd85fd2c21ba1987284f8a636eb75545e7f48008797a288b184690e456b8ed229b3dff6cbe4c122e4ea14dfae0058e2611"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/gl/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/gl/thunderbird-60.7.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "cc18bc97e42f65a1e4eed02f10272f437cbd93362217932be4a8c3d2dd2fde5244e0e702f0c595b4a5bf6f4761643011f00b5c01bc8f25026f1e7d59abeff26a"; + sha512 = "e36b11242ce8c19f4b8f8ec20f4231593c9fce36d0ed06d0254f02d77aad8f7e6d060ce79c9e3bcd7d8fa810c29ce5292b3326bd566b6f505ace4dfab952a2ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/he/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/he/thunderbird-60.7.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6971b2f28d4ae587b0b7e1762722ba9792f1c706bea7f762c678368e909fd945aa3727dbf31aab200050bc8e34c9e3d2acee07da69e8a9236b85f7f204033bda"; + sha512 = "6443a40d8b6b12b625626f3d81f4ed7e5df70a98d36891a12bc66f3ab55e6be15182fdb43a1f93b4627e09bae65a8216db489c2ae6ab405c4853a12abf017106"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hr/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/hr/thunderbird-60.7.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1aecf1633bc2624ce52a628a45c990f9be954cf8f4716570357e954644b8511ca1fa71f122e8e721aa534d0c9ea5f781b4888120945a363336c34bfde3c4fd52"; + sha512 = "0094ddcb782cea193001c84ae9b19d2508f31d096b5dd94b3b9f6d8ff669f36cc46bc512c0d77e3271cfd4fdf442faa29753956894ebeb6c641ac2a410fbaf8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hsb/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/hsb/thunderbird-60.7.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4322855b3336866b25ad3ddcc89d7c1639d7ede55453d125a6d12b8c8ac182ddb1ec6848d82ecb0e97ae364de19f8a4035a19dd61bd24a8569bde6f550edb098"; + sha512 = "ed41408453c785634a66820746eb6ed7d668e1ddda3f6ccce2481454b0975aad5bf56c1f92721ff8088050697c2a6c604fc898c8762d06ffee390ac7bfb747cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hu/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/hu/thunderbird-60.7.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "10465d78a56c97f40e33c20ac8ee5d8da36ec24499b19a0f0fc1562f6e8d1e9a5044fe973faf3dfb535d8ade8aef6c0c04a8fe4506cd611fd7fcd385e8d44a40"; + sha512 = "fdaf322033e4f9fcc6cb9754c50bdb7cd50ad4200aa529b4b88c583e6e35deed494e86796caca82da92c3daae8f26494d1a285d48e09309af19c8217cf000d86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hy-AM/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/hy-AM/thunderbird-60.7.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4f12139618373a3880c3e74757f176dbdf7b6ade765fe7f6fdb607408742522a7552f4d56b5a8bf675cde0846d5b5966b16a3a5a119a68378ad480f3aa660610"; + sha512 = "a9332d15c72a07a85774a4ca5559e0cf506eeb94eade4be38c7f9165909b17968f82c3e6e341c99287805002a2a6862f1ff3c9719b34cdd91510e5c3e4dbb25a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/id/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/id/thunderbird-60.7.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a791e693a38bd4d6b50f1701a63f2ca4916d17d65929753cee484adc63308907076024baac55f11cd38cf8d2eac4bc74fda8f557e71b2538b5b3cd8c24b90212"; + sha512 = "ef6f4411236967a4913a9ae99dec743c66ded26ce30b396daed1a7e05f17b05dd59bf38943922ca4358cbed8ee2542eb5d5e21dd95931f6e0be59f0ddc591102"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/is/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/is/thunderbird-60.7.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "46b4ea38c84392143f08aa7a3d6cb82faf405afbecc8fbd4b1483499b8367a9c84b8f27d9e491537b07c73bfd39f3db716b06549bc7d655ba15e2e9f5b13ad96"; + sha512 = "586418b182ecb4feefa08a5aa4e2b28351f4286f1853ebd3a94ca99b58fe4480dea261fd22bd43b9ddfe60d965c70acd70ab290c5f73dc39cda79702c7136955"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/it/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/it/thunderbird-60.7.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "93f6b101dbaf46712c258efe2a7840c4c751bfa04610b80d010e75fe803e49fad3429168aba284a437273596db03da034da0fdf9a8356ce71e918def88f3ae49"; + sha512 = "775e34d20f36e5a0d5c2214f85560a419c257f87aedd96906b0d5b27cc90d094ad41b0dd1c510dca98d48ab9754b4dfaec5efd67bff0db01c37401a9848b47ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ja/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ja/thunderbird-60.7.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "4c9378f96da151fd45c030e7cd0a4ad0107776be947db1a75e105c30f360e4a81500e7c4da00d45bc11d2f7991d2542949e6cd6f62e54eaace90a4e1bfe283a2"; + sha512 = "fb5300330ab2f3a436086ba6896eed84710cb17bbd4fedb38241b15bd9683e6ac9e0ac179c6e14db332467d6ce35f6f70cb3046232b24c2fee6b99c8a8ffaaa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/kab/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/kab/thunderbird-60.7.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "53fff9c63884aa8995d2b7ab5235efc318402f67735e7e2b5eb7be0f1a6a0164325deceb677c9d71cd1cdbd90831c7cf848ec92425d4879bf68d157580a07043"; + sha512 = "6df96615387ad1e9ed2b56c8a10aea6b657171189a10b9173e6d3137efcfa248c8583689adf4913534b37746389893c62ed155422432a19e8ed51ab7b9a91cb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/kk/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/kk/thunderbird-60.7.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "e319c8e8bcb93463de43c7d0ecd9014b71054669d17fe4f4a28fb1a7459a81fc538345a4780c652ec5fbf253fa6ac07dd9470fdce9898fca9bf6d77c9265db4d"; + sha512 = "0f65220fa1e926315048b0a9250fdf14a0039f0989ac4f5cd6c6d5a2a249e9d26bc75dc3e034bc4d952625c05e74c02690621abcb99d4ad922567e7b8a4e738d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ko/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ko/thunderbird-60.7.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "d59888bd895c5cf1805ad6357d2a3d4379fc003102bc32ad60f1c7afa88f1522652e606dfc337ae70e2bcb37697c743202ffcf61e7f0e5ed5f3fb64f4e7ba06e"; + sha512 = "902a7e7a0bb1da2ecc70be16d229af7cb1c7ae0405fecba7628d48cee487aea08ef7fd248c699ac6090095119defa9169c94bdea7016d6bdb4ae33adc5af2aa8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/lt/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/lt/thunderbird-60.7.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "8c5fcfb2b5eef2f9e7b108113254fb1f8cd9283f43756b29360d371ecb99f2064203b499aaa7cc74f2fee925bbeca9d7ac04b68a24ed1c88cab8df28f6a9ef5b"; + sha512 = "98c18cad772d7456ead477ff48be5e25a5b704ffc498d2d92dcb71a5a083c945f567a396e9005273855c723d6ccc70a5755333a403728edc076a37f50f01625e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ms/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ms/thunderbird-60.7.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "130ccc3359cb5fb77c8c02b9cfd0b7f61b02ff413eb4df303e4f956b844ff5320e465fac7d71a7f88b3f184f13f1d0ee68f46c1eddfca5278281a6e85c1ccb53"; + sha512 = "870cd984adcc562223fd0ce21146880b088cc1d858775a1679ad9ec44b4ebc80795f429b2f3873fb00cb80bdc495e40899701888ff446fa45ae4ff0a23e2d026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/nb-NO/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/nb-NO/thunderbird-60.7.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "3b022f593bd9e00caa09577a244b629704f0a3e9f95153f7562c6a03c20dae0a0d0fad799a45f7aad0f231da4622815019f48f7ca2144c7926db78b2a010789a"; + sha512 = "13967e29de286b5726e260e47fd479e0be5bad943f6f47298f4453ebe7be4d60925408a0398b5e99c57cf486fcf3361c885b6c84a01d6c27b55d5b4dda7704bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/nl/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/nl/thunderbird-60.7.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "35f3359afefdccb7099fd04a244818fbb33ba9d43bc537be4e72b4a2e41ec2da91536dded43fd2536fdca09d47755954cd79e2cd8bd1b4c3022748ed1502e8f2"; + sha512 = "b5c8b15c33e4c8d7800c924433fc0c79ac83cbef571c96dd25c5aa699eae18fd605544c1a3348f29213e903efc2cc2a5245158ef941ed30855b444ca6fe5d7c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/nn-NO/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/nn-NO/thunderbird-60.7.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "85fac4e963e10e436b8302b1c27caf9c0cf2b34cf09d5e9341b03c69a49f0ab6166180c4646922d428203d99ee30002ff7120298b08ea2178f760c84ebd283c7"; + sha512 = "58e3171178c89d1381faa779d52142968f55ff06f1e06902be078480604acf44a1814f76f0826079df08b29a6aaef97732ccc44d6dd094b6e894f2977085154c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/pl/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/pl/thunderbird-60.7.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b839166bb3a8e40acbccd405ebb3c86908c853cbc65e78bb1378dbbc32505893101a9bbc338104325a50bcaea2febd6fdb1fb17f8be400278dfff4fd431c0abf"; + sha512 = "c2eb8367aa82c7bbbcde0d9f99f9bf6160c5c0f8c5f103c71f8013d711f2cb1e9100bfcb8c633e6055076d40f77f469b126955f4696b4fe1b856bf7227335343"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/pt-BR/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/pt-BR/thunderbird-60.7.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6c7857c76085493ea7763f655c9c4f65a055e2209f61bd572f87cc316fb71841b52073333c8d755a3afd73f584516ee11a82787363ea90ab58721a18b3cb1cc0"; + sha512 = "2fc8045e6ccd7d42805dbd95c2228f4fba076869f1c574266779ca231e479bfa7408b0d19ee97eed633250e0bae45d21021225e872d2a5bd1435ec9c9edd6f42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/pt-PT/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/pt-PT/thunderbird-60.7.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b87fc704c9c9997fb98cb1197e0796c8cef6303b0b33074966c5f6a6d2a134dee1e72e295c4f3b53cbaeaf7ccb9013f9fa5fbe1492785b7a98163d570d9628b5"; + sha512 = "5d1d1cb05743821a72cb696a3521cc957e1c122afcb1c6681c8e9f683492960b67593984ff6016803cbc3a82f5aebd4144cd171fbdbe9be9d45098c1b97a8d51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/rm/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/rm/thunderbird-60.7.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "184e1b99163c93a41fc7d7776c6ff8b3becb9e2d81caff173bf423833766af5c6894035826baf6f3cbe3c001cbc004ce4c3eae3b854b42e24ecc5e1efcb17451"; + sha512 = "5b37fa18341493fe5c88f151d2b59fcc19bd238ffb6c08b5c23469c1a1138453c3c1c6a15e61a90b41ccd5678a5a7c04d7cce5a9754723ed27777a33d26627b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ro/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ro/thunderbird-60.7.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "ba590d9dce8868f0e12be8c5988d5449531447cd19dc79222f54c697d7b2c1d8074abbd77c959cf16105e831e2f52df8bf8092c2580ad16e86e094da11c7501a"; + sha512 = "920cd81ee9b5d47c560ba43cc712fb2efe7e57b87407f67315687a36a1814a871821aa9d39e1e0e6fdfb3aad9d27b2cc8f9a2db7fced63439bd74c7cab9e1949"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ru/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/ru/thunderbird-60.7.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "26631ffe2bd843bb6a70c04235e337faeef6b8282ab019b237813d7c49f867029ff7315aed2df68966c37cd49d8f3531c32c4527774efe91c97f7fa40b1dc054"; + sha512 = "302c9118eda3770faa307f658a1b621e167bbf641293c5b838a24346d2ec27b9a4f301d5cdae4b8d30efd815d3567d802b0b0c64788cc4f305514cbd33990cd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/si/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/si/thunderbird-60.7.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "74c89177b532300875d4c092fa97dca0b529cb30215a1c8afc1036b1dacba4bc053fe4bcbff7d58cbc5989b76731e2bc6bd8cda6af6a563c19ada4214b6c26ae"; + sha512 = "c601b8a00f1b637034d4d64ef9e9c97ffa34aa268ecf90bb92b1afd937590a1fe6c4413bd25171d339e85c26840784ba2a4247664978c3223c213e4d8340dbdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sk/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sk/thunderbird-60.7.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "66bfa099cbddf76150e61464600111e9541e9310e11527604c60ae727d69fb954398aafee73602c215a8f27b5be601d0e5433cb5ccf9680259fafa86d142824a"; + sha512 = "2d214b1f408550dd86a0fae6027e1044613d4d6c847e44653dffbd4abf1d679a45b061529fd4bced124572d32a12170890fac2d9fee3ece2531c7700de9caf32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sl/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sl/thunderbird-60.7.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "de71ae24a9cff67566029a86c1c36e0091e206cd360282d8b2658794a333834a32a37f047592e9db918e8e6ed98c5e16851ecaac083de4e4fbfc07d5ff1d6f5e"; + sha512 = "dd18aa54feb2603a729e704158271165d54baf6d12e8b39b4df9f58f15076e8dc945756385aea1ae0261ce94938377778ed02163b7d42b78dfcbf93ca8d1c176"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sq/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sq/thunderbird-60.7.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b865dffab78f42f979e1177f7a784929a34e5e3d564b37dd20eccc99d3bc09141205d239f8a39780eba96959ef225af25b06badbb251543b8b718c9d98ccf2f5"; + sha512 = "62ae0c34120bbfeae9f968bf78924b5fbfdec99832be7ab5d9d00027914ca4d214d445fb0a129573c2d46e4a3e0ff4c2f6fb4d283d491e88109725eff306b698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sr/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sr/thunderbird-60.7.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "69e530bfe403a982f7fbde5518fc42dae6328f6f4296562c15461af69cdadce29744acc403b8246f974f5a2d2261f525cd2d3f6ad3eef98ccac474798fd7b80e"; + sha512 = "bb8e3d418e66dda50e58b54671cb55d4cd45786f248b0bc9b9c63fe6fdfebcfdc674bdbe2adb7b265ce2a3414074b7490f82aa083451d3d77ff16875670d9d6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sv-SE/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/sv-SE/thunderbird-60.7.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "51dd55f015a206d4de382a320833900860b040d687516f07a2f40562d426cda9e6ac8ffe966bd59ea034ad0a97a1b60ac4ae150496c587bcb717e0813f31f5ae"; + sha512 = "e060e7dca802c02acd054e97c4d3dffd8b4a3ee36f63d114ec2066c3cd6e86356070f6fe2459a62c0e29cd0a94458ef148dd33162f5f72b8fc29097bf1fbb0da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/tr/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/tr/thunderbird-60.7.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "37e449b319ce21de7ab51db81f4ce21daa35d3c778ef4fed2c621f257175e20808e8b08027efa52221144f9467fd6b22873bc752dd253f75e2fc598eb4f2a842"; + sha512 = "00669af188fffbcd4746860f39a2b11b86d0081b7bec3d333ad399943f637b59414c225c8d4408ad404975ca8c356d2da3e6b22faef3b7f4fdb2a99d4ed3c002"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/uk/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/uk/thunderbird-60.7.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a9924015e3bfcb1429066411b51f7c698fd572d6280ba69485514fbf51b4c7c5c6be5a7fc96c1c3645cf84dd25ecbac805754805f6e8c7c62df103177cf11d54"; + sha512 = "687ca54bee2f6f05ce02c9f50bd1056d6076d7cac82e273c07cde8f2ddc7538ad5f19cde7e09e5317102a182b7325d7509adbd98864ebc53d61eb394aac17fdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/vi/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/vi/thunderbird-60.7.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "47652f46d7d7f47278d9d5bde0939059832da321d14021c68d7d5b2d1610aef12adb162415e49246d76b8d19cfc51b3ce5c5d357c047aa2479790b260463935b"; + sha512 = "9fd6ae344725f75ea15db931f383fe30434baf490d538c96b8a906ff4faf58c2495a6b22aaf4dcefac86d6c35fe1b014c95faf4fd0f5b90579f23eb32635f13c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/zh-CN/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/zh-CN/thunderbird-60.7.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "a6865c12d8fce0d76f32be09109244cc28d6ec3f72a1f95f1438b2d2622ef0b2ee0b6723904ea71078baea3e2571a047ef6852f49b146450a8e95a9ce72421de"; + sha512 = "f28745941f9236d14d802d21d88f98a9b5620e854106b38fb6d49ddcef0cea34b3d47e366e8a136e7338ca8965000d62eb2bf80daf9e0a138375852293161c8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/zh-TW/thunderbird-60.7.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.2/linux-i686/zh-TW/thunderbird-60.7.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "8caf6f74208bcbdef69f74fb766ffad582da65fc5304d42f2f67d1d91d167960d4fc83443c1de3e8ff19ae1e085b8ddda791925a71f6e173f10aa4b4e2b01e76"; + sha512 = "4cf5fcd7b32ef5ed550b31bd712eef182183e039a820c247801b9108ccefc06f461e404082803e1a0a68daebc27a07e4fd58b3c543913f1d0ee342f56d8e7bd9"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 7fc94d43457a..36eb46e5ef72 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/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.7.1"; + version = "60.7.2"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "25dgbshgfmalxyah9rrgrxi4n0bmj0agcllz2hzv37w7makkl7qpf4wr859ykymmmvawcs8n747ppq9x73gn32bw88bjyxv2bn4l78q"; + sha512 = "09fg8rzbg0nl5b7p3s6pnai3xgsnga1wcxii2rjnky4p96di94jby9whrjidnj2ixxmjqwysnaif6lj5mq9pr7l48qhd9vjbb3vp2g8"; }; # from firefox, but without sound libraries diff --git a/nixpkgs/pkgs/applications/networking/msmtp/default.nix b/nixpkgs/pkgs/applications/networking/msmtp/default.nix index 940e2d74be49..1e1f0b4941fb 100644 --- a/nixpkgs/pkgs/applications/networking/msmtp/default.nix +++ b/nixpkgs/pkgs/applications/networking/msmtp/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; homepage = https://marlam.de/msmtp/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ garbas peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix new file mode 100644 index 000000000000..2d5f47ee9826 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -0,0 +1,93 @@ +{ stdenv, makeWrapper, fetchurl, dpkg +, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype +, gdk_pixbuf, glib, gnome2, pango, nspr, nss, gtk3 +, xorg, autoPatchelfHook, systemd, libnotify +}: + +let deps = [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + pango + gtk3 + libnotify + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + nspr + nss + systemd + ]; + +in + +stdenv.mkDerivation rec { + pname = "mullvad-vpn"; + version = "2019.5"; + + src = fetchurl { + url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; + sha256 = "542a93521906cd5e97075c9f3e9088c19562b127556a3de151e25bc66b11fe0b"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + buildInputs = deps; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = "dpkg-deb -x $src ."; + + runtimeDependencies = [ systemd.lib libnotify ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/mullvad $out/bin + + mv usr/share/* $out/share + mv usr/bin/* $out/bin + mv opt/Mullvad\ VPN/* $out/share/mullvad + + sed -i 's|\/opt\/Mullvad.*VPN|'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop + sed -i 's|\/opt\/Mullvad.*VPN/resources|'$out'/bin|g' $out/share/mullvad/resources/mullvad-daemon.service + + ln -s $out/share/mullvad/mullvad-vpn $out/bin/mullvad-vpn + ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon + + mkdir -p $out/etc/systemd/system + ln -s $out/share/mullvad/resources/mullvad-daemon.service $out/etc/systemd/system/mullvad-daemon.service + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/mullvad/mullvadvpn-app"; + description = "Client for Mullvad VPN"; + changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + }; + +} diff --git a/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix b/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix index ed29a34f99c8..7f229be1b543 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdc-${version}"; - version = "1.22"; + version = "1.22.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; - sha256 = "0n9sn4rh4zhmzjknsvyp4bfh925abz93ln43gl8a1v63rs2yyhgx"; + sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix index f047b630ec40..d4823988526e 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchsvn, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, +{ stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { - name = "transgui-5.0.1-svn-r${revision}"; - revision = "988"; + pname = "transgui"; + version = "5.17.0"; - src = fetchsvn { - url = "https://svn.code.sf.net/p/transgui/code/trunk/"; - rev = revision; - sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf"; + src = fetchFromGitHub { + owner = "transmission-remote-gui"; + repo = "transgui"; + rev = "v${version}"; + sha256 = "0p76vavny5asi5naa4jn67raxlarsmrkbchfn96y6gh5p2vzwpl7"; }; nativeBuildInputs = [ pkgconfig ]; @@ -27,9 +28,9 @@ stdenv.mkDerivation rec { substituteInPlace restranslator.pas --replace /usr/ $out/ ''; - patches = [ - ./r988-compile-fix.patch - ]; + preBuild = '' + lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus + ''; makeFlags = [ "FPC=fpc" diff --git a/nixpkgs/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch b/nixpkgs/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch deleted file mode 100644 index 4b070d0cbe8a..000000000000 --- a/nixpkgs/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/utils.pas b/utils.pas -index eb8b828..1ff2440 100644 ---- a/utils.pas -+++ b/utils.pas -@@ -100,7 +100,7 @@ uses - {$ifdef CALLSTACK} - lineinfo2, - {$endif CALLSTACK} -- LazFileUtils, LazUtf8, StdCtrls, Graphics; -+ LazFileUtils, LazUtf8, StdCtrls, Graphics, FileUtil; - - {$ifdef windows} - function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle; -@@ -235,7 +235,7 @@ end; - - function ParamStrUTF8(Param: Integer): utf8string; - begin -- Result:=FileUtil.ParamStrUTF8(Param); -+ Result:=LazUtf8.ParamStrUTF8(Param); - end; - - function ParamCount: integer; diff --git a/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix b/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix index 9cd6083f40cc..5f737cacb465 100644 --- a/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,18 +1,20 @@ -{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig +{stdenv, fetchFromGitHub, openssl, libX11, libgssglue, pkgconfig, autoreconfHook , enableCredssp ? (!stdenv.isDarwin) } : stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.3"; + version = "1.8.6"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "02sbhnqbasa54c75c86qw9w9h9sxxbnldj7bjv2gvn18lmq5rm20"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig autoreconfHook]; buildInputs = [openssl libX11] ++ stdenv.lib.optional enableCredssp libgssglue; diff --git a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index b624f02c42ab..d97f376b9a2a 100644 --- a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "14.2.8352"; + version = "14.3.4730"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "132fh3lg6g4b0yfkhvbm9zg8s3lcljmbk6gfaavi4b1h8ndq92ay"; + sha256 = "1k3vrkgkdh5wvws7xajgjvsqnmig64gnmf75sy7qq6lrpgp5l3nf"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix b/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix index 55d473bc104b..69ae40b76180 100644 --- a/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix +++ b/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sieve-connect-${version}"; - version = "0.89"; + version = "0.90"; src = fetchFromGitHub { owner = "philpennock"; repo = "sieve-connect"; rev = "v${version}"; - sha256 = "0g7cv29wd5673inl4c87xb802k86bj6gcwh131xrbbg0a0g1c8fp"; + sha256 = "1ghvfa5ifa68b6imh85bkmy00r93c5f9hs6d039axb73gmma580p"; }; buildInputs = [ perlPackages.perl ]; diff --git a/nixpkgs/pkgs/applications/networking/ssb/patchwork/default.nix b/nixpkgs/pkgs/applications/networking/ssb/patchwork/default.nix index c8b8b5ef333c..40026275a1e3 100644 --- a/nixpkgs/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/nixpkgs/pkgs/applications/networking/ssb/patchwork/default.nix @@ -1,46 +1,53 @@ -{ - stdenv, - appimage-run, - fetchurl, - runtimeShell, - gsettings-desktop-schemas, - gtk3, - gobject-introspection, - wrapGAppsHook, -}: +{ appimageTools, symlinkJoin, lib, fetchurl, makeDesktopItem }: -stdenv.mkDerivation rec { - # latest version that runs without errors - # https://github.com/ssbc/patchwork/issues/972 - version = "3.11.4"; +let pname = "patchwork"; + version = "3.14.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/ssbc/patchwork/releases/download/v${version}/Patchwork-${version}-linux-x86_64.AppImage"; - sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; + url = "https://github.com/ssbc/patchwork/releases/download/v${version}/ssb-${pname}-${version}-x86_64.AppImage"; + sha256 = "01vsldabv9nmbx8kzlgw275zykm72s1dxglnaq4jz5vbysbyn0qd"; }; - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ appimage-run gtk3 gsettings-desktop-schemas gobject-introspection ]; + binary = appimageTools.wrapType2 { + name = "${pname}"; + inherit src; + }; + # we only use this to extract the icon + appimage-contents = appimageTools.extractType2 { + inherit name src; + }; - unpackPhase = ":"; + desktopItem = makeDesktopItem { + name = "patchwork"; + exec = "${binary}/bin/patchwork"; + icon = "ssb-patchwork.png"; + comment = "Decentralized messaging and sharing app"; + desktopName = "Patchwork"; + genericName = "Patchwork"; + categories = "Network;"; + }; - installPhase = '' - mkdir -p $out/{bin,share} - cp $src $out/share/${pname} - echo "#!${runtimeShell}" > $out/bin/${pname} - echo "${appimage-run}/bin/appimage-run $out/share/${pname}" >> $out/bin/${pname} - chmod +x $out/bin/${pname} $out/share/${pname} - ''; +in + symlinkJoin { + inherit name; + paths = [ binary ]; + + postBuild = '' + mkdir -p $out/share/pixmaps/ $out/share/applications + cp ${appimage-contents}/ssb-patchwork.png $out/share/pixmaps + cp ${desktopItem}/share/applications/* $out/share/applications/ + ''; - meta = with stdenv.lib; { - description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)."; + meta = with lib; { + description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)"; longDescription = '' sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. ''; homepage = https://www.scuttlebutt.nz/; license = licenses.agpl3; - maintainers = with maintainers; [ thedavidmeister ]; + maintainers = with maintainers; [ thedavidmeister ninjatrappeur flokli ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index 66ce9bc7b17c..13d55bcf476d 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.47.0"; + version = "1.48.0"; src = fetchFromGitHub { owner = "ncw"; repo = pname; rev = "v${version}"; - sha256 = "1nxwjr9jly6wh1ixr6a7zhlg4b3298v940040fsm0n3lcljd37zx"; + sha256 = "0wxsn3ynkwh2np12sxdmy435nclg2ry7cw26brz11xc0ri4x9azg"; }; - modSha256 = "02p5dd450bbfyq80nd0w8f9kpv25k1855mf0gcv0cy9zq3f3r7q7"; + modSha256 = "0bbpny7xcwsvhmdypgbbr0gqc5pa40m71qhbps6k0v09rsgqhpn3"; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/znc/default.nix b/nixpkgs/pkgs/applications/networking/znc/default.nix index deb768e6feb6..08fa53a6e388 100644 --- a/nixpkgs/pkgs/applications/networking/znc/default.nix +++ b/nixpkgs/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { url = "https://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "0g8i5hsl4kinpz1wp0a2zniidv3w2sd6awq8676fds516wcc6k0y"; + sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/office/gnucash/default.nix b/nixpkgs/pkgs/applications/office/gnucash/default.nix index a9578e6525d4..e4a89b513e9c 100644 --- a/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { name = "gnucash-${version}"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "0ibp7g6aknvnkwkin97kv04ipksy3l18dsz9qysjb7h2nr8hnvbp"; + sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; diff --git a/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/nixpkgs/pkgs/applications/office/gnumeric/default.nix index 5845536e72ed..70d1e3d79ba5 100644 --- a/nixpkgs/pkgs/applications/office/gnumeric/default.nix +++ b/nixpkgs/pkgs/applications/office/gnumeric/default.nix @@ -1,22 +1,31 @@ { stdenv, fetchurl, pkgconfig, intltool, perlPackages , goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages -, itstool +, itstool, autoreconfHook }: let inherit (pythonPackages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.45"; + version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h"; }; + patches = stdenv.lib.optional stdenv.isDarwin + # https://gitlab.gnome.org/GNOME/gnumeric/issues/402 + (fetchurl { + name = "math-gamma.patch"; + url = "https://gitlab.gnome.org/GNOME/gnumeric/uploads/cf8d162bc719de92e97d01cb0ba5b637/ppp"; + sha256 = "17wiigs06qc86a1nghwcg3pcnpa28123jblgsxpy3j7drardgnlp"; + }); + configureFlags = [ "--disable-component" ]; - nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ] + ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook; # ToDo: optional libgda, introspection? buildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix b/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix index d0d26d469273..fbf6047af605 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "2"; - patch = "3"; + patch = "4"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1bvdvhk1jw16wc0fd7vvvjyn7ydwy9i3xa3d8kn1bdmsn97vkpgi"; + sha256 = "1drq59lc6p4s8mil2syz93l97phsbk9dcrd5gikqi2dwlzkli0gz"; }; } diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 2429f2dc8b50..a82999366627 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0gnx596sr498n3frz1wgcnq9kqqaqksxfyjm145235pvrv2ymgvp"; + sha256 = "0ahyrkg1sa4a0igvvd98spjlm5k34cddpwpxl7qhir8ldgighk2c"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0chips6h2ymaqwvjlxzjn7jm64y6r4lcr7z7rppan436nqz95dn1"; + sha256 = "0zrfm8kw6m60wz6mn4y5jhlng90ya045nxyh46sib9nl4nd4d98s"; }; }; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 7170982688cd..bfb74d1bb507 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -119,11 +119,11 @@ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { - name = "libepoxy-1.5.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.2.tar.xz"; - sha256 = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8"; + name = "libepoxy-1.5.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; + sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; md5 = ""; - md5name = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8-libepoxy-1.5.2.tar.xz"; + md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; } { name = "epm-3.7.tar.gz"; @@ -462,11 +462,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2018-04-23.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2"; - sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878"; + name = "language-subtag-registry-2019-04-03.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; + sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; md5 = ""; - md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2"; + md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -700,11 +700,11 @@ md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { - name = "libpng-1.6.34.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"; - sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"; + name = "libpng-1.6.37.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; + sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; md5 = ""; - md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; + md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { name = "poppler-0.74.0.tar.xz"; diff --git a/nixpkgs/pkgs/applications/office/skrooge/default.nix b/nixpkgs/pkgs/applications/office/skrooge/default.nix index eee6c7de4e5f..ecd38627ac5f 100644 --- a/nixpkgs/pkgs/applications/office/skrooge/default.nix +++ b/nixpkgs/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { name = "skrooge-${version}"; - version = "2.19.1"; + version = "2.20.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "04pajy540vwff1y84ndrnscvlggiwfkr6w65g4hpa75cg7m169ya"; + sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/timetable/default.nix b/nixpkgs/pkgs/applications/office/timetable/default.nix new file mode 100644 index 000000000000..bbf252d28923 --- /dev/null +++ b/nixpkgs/pkgs/applications/office/timetable/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, fetchFromGitHub +, glib +, gtk3 +, hicolor-icon-theme +, json-glib +, libgee +, meson +, ninja +, pkgconfig +, pantheon +, python3 +, wrapGAppsHook +}: + + +stdenv.mkDerivation rec { + pname = "timetable"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "lainsce"; + repo = pname; + rev = version; + sha256 = "080xgp917v6j40qxy0y1iycz01yylbcr8pahx6zd6mpi022ccfv0"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + pantheon.vala + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + hicolor-icon-theme + json-glib + libgee + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Plot out your own timetable for the week and organize it"; + homepage = "https://github.com/lainsce/timetable"; + maintainers = [ maintainers.kjuvi ] ++ pantheon.maintainers; + license = licenses.gpl2Plus; + }; +} diff --git a/nixpkgs/pkgs/applications/office/watson/default.nix b/nixpkgs/pkgs/applications/office/watson/default.nix index e0f0c58b4506..16df0b294c16 100644 --- a/nixpkgs/pkgs/applications/office/watson/default.nix +++ b/nixpkgs/pkgs/applications/office/watson/default.nix @@ -3,27 +3,19 @@ with pythonPackages; buildPythonApplication rec { - pname = "td-watson"; - version = "1.5.2"; + pname = "watson"; + version = "1.7.0"; src = fetchPypi { - inherit version pname; - sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8"; + inherit version; + pname = "td-watson"; + sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d"; }; - # uses tox, test invocation fails - doCheck = true; checkPhase = '' - py.test -vs tests + pytest -vs tests ''; - patches = [ - (fetchpatch { - url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch; - sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g"; - }) - ]; - checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; propagatedBuildInputs = [ requests click arrow ]; @@ -31,6 +23,6 @@ buildPythonApplication rec { homepage = https://tailordev.github.io/Watson/; description = "A wonderful CLI to track your time!"; license = licenses.mit; - maintainers = with maintainers; [ mguentner ] ; + maintainers = with maintainers; [ mguentner nathyong ] ; }; } diff --git a/nixpkgs/pkgs/applications/office/zotero/default.nix b/nixpkgs/pkgs/applications/office/zotero/default.nix index b8b2f96a502a..3540fce9173a 100644 --- a/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { name = "zotero-${version}"; - version = "5.0.66"; + version = "5.0.67"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "1dpcwpag95a4r46z03a3gqklis0q7nzqgjg34qfxxxb2lr7s1lsm"; + sha256 = "1b06875qr8dy2lhf4h9z7gcc5pcqdyq92c11b3brsbgbq2n48g40"; }; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; diff --git a/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/nixpkgs/pkgs/applications/radio/fldigi/default.nix index 8472e7f5c53a..fd8c542fb42e 100644 --- a/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.03"; + version = "4.1.04"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1d3m4xj237z89y691kmzh8ghwcznwjnp7av9ndzlkl1as1641n9p"; + sha256 = "0idv6yr5l5z1icziv1shpjqxhjlxmb6qkpwlmcxws15gkqs9rhc9"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix index f7c0f27160d2..6ed88e0431e3 100644 --- a/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix @@ -3,7 +3,7 @@ } : let - version = "0.3.5"; + version = "0.3.6"; in stdenv.mkDerivation { name = "soapyuhd-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapyUHD"; rev = "soapy-uhd-${version}"; - sha256 = "07cr4zk42d0l5g03wm7dzl5lmqr104hmzp1fdjqa1z7xq4v9c9b1"; + sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/radio/urh/default.nix b/nixpkgs/pkgs/applications/radio/urh/default.nix index 11a132ba06f7..58a0b8048b56 100644 --- a/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.7.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0yxv38p8a2srk9c55jj96vcib6m6pb6m485ysfg2ilwjzipx2ab0"; + sha256 = "14027dcq0ag2qjpxcmsb9n1c64ypmi4rycwxzm2hajj7hk2736hv"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite ]; diff --git a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix index e5a9fca33374..9f65c63f7a6f 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "jun19b"; - version = "20190601_b"; + srcVersion = "jul19a"; + version = "20190701_a"; name = "gildas-${version}"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "363d191afdb1fda12ec19d6b9c3ab4189e7c3b036e78f7359d17671d846118ce"; + sha256 = "97eaa0d0a0f53f0616462642a9bfaddb0305a8a0948e60531d8a524a13a370b6"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index fb7963416167..2480b80316eb 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { name = "stellarium-${version}"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "1x9s9v9ann93nyqd8n8adwhx66xgq5vp0liyzl1h1ji6qk8jla3c"; + sha256 = "0hf1wv2bb5j7ny2xh29mj9m4hjblhn02zylay8gl85w7xlqs7s5r"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix b/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix index 781ceb3df59e..0e2b5d8b25fe 100644 --- a/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix @@ -2,21 +2,22 @@ , fetchFromGitHub , cmake , libyamlcpp +, git }: stdenv.mkDerivation rec { - version = "1.0.20170130"; + version = "1.0.20190410"; name = "dcm2niix-${version}"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532"; + sha256 = "1prwpvbi76xlpkhc4kadjhyyx0s71cs30hi6anknhfm6hdyd26ms"; }; enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake git ]; buildInputs = [ libyamlcpp ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix index 3cd83a5cdd27..1bdb31616e4d 100644 --- a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix @@ -4,26 +4,26 @@ let hts-nim = fetchFromGitHub { owner = "brentp"; repo = "hts-nim"; - rev = "v0.2.5"; - sha256 = "1fma99rjqxgg9dihkd10hm1jjp5amsk5wsxnvq1lk4mcsjix5xqb"; + rev = "v0.2.14"; + sha256 = "0d1z4b6mrppmz3hgkxd4wcy79w68icvhi7q7n3m2k17n8f3xbdx3"; }; docopt = fetchFromGitHub { owner = "docopt"; repo = "docopt.nim"; - rev = "v0.6.5"; - sha256 = "0yx79m4jkdcazwlky55nwf39zj5kdhymrrdrjq29mahiwx83x5zr"; + rev = "v0.6.7"; + sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37"; }; in stdenv.mkDerivation rec { name = "mosdepth-${version}"; - version = "0.2.3"; + version = "0.2.6"; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "1b9frrwhcvay3alhn0d02jccc2qlbij1732hzq9nhwnr4kvsvxx7"; + sha256 = "0i9pl9lsli3y84ygxanrr525gfg8fs9h481944cbzsmqmbldwvgk"; }; buildInputs = [ nim ]; diff --git a/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/nixpkgs/pkgs/applications/science/biology/octopus/default.nix new file mode 100644 index 000000000000..0a2074a06e97 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/octopus/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}: + +stdenv.mkDerivation rec { + pname = "octopus"; + version = "0.6.3-beta"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "luntergroup"; + repo = "octopus"; + rev = "v${version}"; + sha256 = "042fycg8ppld7iajpzq2d8h8wr0nw43zbl57y125sfihryvr373n"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost gmp htslib zlib lzma ]; + + postInstall = '' + mkdir $out/bin + mv $out/octopus $out/bin + ''; + + meta = with stdenv.lib; { + description = "Bayesian haplotype-based mutation calling"; + license = licenses.mit; + homepage = "https://github.com/luntergroup/octopus"; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.x86_64; + }; +} diff --git a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix index 444638db8e9f..90b7db4b545c 100644 --- a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "eagle-${version}"; - version = "9.3.2"; + version = "9.4.1"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "0xrrd2d86gxrkbqvssbg8zki40hk05h48w73b0hv7wnc7wg1msir"; + sha256 = "0p3kxryvk853rx24phcadvmqn6f37rnnql8sf6cqn9cqhrrkbvlq"; }; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index 36a504e86faf..b531563c5c1c 100644 --- a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "4.014"; + version = "4.016"; src = fetchurl { url = "https://www.veripool.org/ftp/${name}.tgz"; - sha256 = "1srk9a03hbq8rdp4mma817aiq61c2hbrs66qv25zj3dfnfqigxgd"; + sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix b/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix new file mode 100644 index 000000000000..21ce6be3e6c1 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }: + +stdenv.mkDerivation rec { + name = "fast-downward-2019-05-13"; + + src = fetchhg { + url = "http://hg.fast-downward.org/"; + rev = "090f5df5d84a"; + sha256 = "14pcjz0jfzx5269axg66iq8js7lm2w3cnqrrhhwmz833prjp945g"; + }; + + nativeBuildInputs = [ cmake which ]; + buildInputs = [ python3 python3.pkgs.wrapPython osi ]; + + cmakeFlags = + lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; + + enableParallelBuilding = true; + + postPatch = '' + cd src + # Needed because the package tries to be too smart. + export CC="$(which $CC)" + export CXX="$(which $CXX)" + ''; + + installPhase = '' + install -Dm755 bin/downward $out/libexec/fast-downward/downward + cp -r ../translate $out/libexec/fast-downward/ + install -Dm755 ../../fast-downward.py $out/bin/fast-downward + mkdir -p $out/${python3.sitePackages} + cp -r ../../driver $out/${python3.sitePackages} + + wrapPythonProgramsIn $out/bin "$out $pythonPath" + wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $pythonPath" + # Because fast-downward calls `python translate.py` we need to return wrapped scripts back. + for i in $out/libexec/fast-downward/translate/.*-wrapped; do + name="$(basename "$i")" + name1="''${name#.}" + name2="''${name1%-wrapped}" + dir="$(dirname "$i")" + dest="$dir/$name2" + echo "Moving $i to $dest" + mv "$i" "$dest" + done + ''; + + meta = with stdenv.lib; { + description = "A domain-independent planning system"; + homepage = "http://www.fast-downward.org/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/logic/gappa/default.nix b/nixpkgs/pkgs/applications/science/logic/gappa/default.nix index 71114d2f9e12..7522eb4790ed 100644 --- a/nixpkgs/pkgs/applications/science/logic/gappa/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/gappa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp, mpfr, boost }: stdenv.mkDerivation { - name = "gappa-1.2"; + name = "gappa-1.3.5"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/34787/gappa-1.2.0.tar.gz; - sha256 = "03hfzmaf5jm54sjpbks20q7qixpmagrfbnyyc276vgmiyslk4dkh"; + url = https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz; + sha256 = "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w"; }; buildInputs = [ gmp mpfr boost.dev ]; diff --git a/nixpkgs/pkgs/applications/science/math/R/default.nix b/nixpkgs/pkgs/applications/science/math/R/default.nix index ed107765b467..a791f9a57727 100644 --- a/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -8,11 +8,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.6.0"; + name = "R-3.6.1"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "02bmylmzrm9sdidirmwy233lghmd2346z725ca71ari68lzarz1n"; + sha256 = "128kifbq0w25y8aq77w289ddax5i5w2djcfsqgffrb3i7syrxajv"; }; dontUseImakeConfigure = true; @@ -27,10 +27,6 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch - (fetchpatch { - url = "https://github.com/wch/r-source/commit/aeb75e12863019be06fe6c762ab705bf5ed8b38c.patch"; - sha256 = "03xv1g1yw1dbhx4paw6pn6hkawj8sny86km3748l1vnasbham82g"; - }) ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/applications/science/math/cplex/default.nix b/nixpkgs/pkgs/applications/science/math/cplex/default.nix index dc0e9ea1aa5d..a14839d3eccc 100644 --- a/nixpkgs/pkgs/applications/science/math/cplex/default.nix +++ b/nixpkgs/pkgs/applications/science/math/cplex/default.nix @@ -71,6 +71,11 @@ stdenv.mkDerivation rec { fi done ''; + + passthru = { + libArch = "x86-64_linux"; + libSuffix = "${version}0"; + }; meta = with stdenv.lib; { description = "Optimization solver for mathematical programming"; diff --git a/nixpkgs/pkgs/applications/science/math/gap/default.nix b/nixpkgs/pkgs/applications/science/math/gap/default.nix index 9b42bcd9f13a..7eb10d1f9525 100644 --- a/nixpkgs/pkgs/applications/science/math/gap/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gap/default.nix @@ -61,11 +61,11 @@ in stdenv.mkDerivation rec { pname = "gap"; # https://www.gap-system.org/Releases/ - version = "4.10.1"; + version = "4.10.2"; src = fetchurl { url = "https://www.gap-system.org/pub/gap/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2"; - sha256 = "136s0zvhcw41fshj5zgsrjcy2kd58cdh2m3ddp5rdizi4rx54f10"; + sha256 = "0cp6ddk0469zzv1m1vair6gm27ic6c5m77ri8rn0znq3gaps6x94"; }; # remove all non-essential packages (which take up a lot of space) diff --git a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix index 80b2764cdc0a..1a3ba8096e29 100644 --- a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.3.0"; in +let version = "4.4.0"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0ab4p2dilk4rfw1qc817rmy56qkhxaajpnqdnvahbhcbf3skd8jl"; + sha256 = "0b0h15cmi6zy31cii7r9jmfm9xksljff255dn6l9frhdjymkmx7l"; }; buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined diff --git a/nixpkgs/pkgs/applications/science/math/gurobi/default.nix b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix index be14d1411285..ee9bdcc6f1b0 100644 --- a/nixpkgs/pkgs/applications/science/math/gurobi/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, autoPatchelfHook, python }: +{ stdenv, lib, fetchurl, autoPatchelfHook, python }: -stdenv.mkDerivation rec { +let + majorVersion = "8.1"; +in stdenv.mkDerivation rec { name = "gurobi-${version}"; - version = "8.1.0"; + version = "${majorVersion}.0"; src = with stdenv.lib; fetchurl { url = "http://packages.gurobi.com/${versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; @@ -44,6 +46,8 @@ stdenv.mkDerivation rec { ln -s $out/lib/gurobi-javadoc.jar $out/share/java/ ''; + passthru.libSuffix = lib.replaceStrings ["."] [""] majorVersion; + meta = with stdenv.lib; { description = "Optimization solver for mathematical programming"; homepage = https://www.gurobi.com; diff --git a/nixpkgs/pkgs/applications/science/math/sage/default.nix b/nixpkgs/pkgs/applications/science/math/sage/default.nix index 061b3beeb3f2..caf51c3da251 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/default.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/default.nix @@ -130,7 +130,7 @@ let singular = pkgs.singular.override { inherit flint; }; # https://trac.sagemath.org/ticket/26625 - maxima-ecl = pkgs.maxima-ecl-5_41; + maxima-ecl = pkgs.maxima-ecl; # *not* to confuse with the python package "pynac" pynac = pkgs.pynac.override { inherit singular flint; }; diff --git a/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch deleted file mode 100644 index 9e3f0f5ae880..000000000000 --- a/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py -index 3bca15d53b..7cf04ff8d1 100644 ---- a/src/sage/misc/package.py -+++ b/src/sage/misc/package.py -@@ -478,16 +478,16 @@ def package_manifest(package): - - EXAMPLES:: - -- sage: from sage.misc.package import package_manifest -- sage: sagetex_manifest = package_manifest('sagetex') -- sage: sagetex_manifest['package_name'] == 'sagetex' -+ sage: from sage.misc.package import package_manifest # optional - buildsystem -+ sage: sagetex_manifest = package_manifest('sagetex') # optional - buildsystem -+ sage: sagetex_manifest['package_name'] == 'sagetex' # optional - buildsystem - True -- sage: 'files' in sagetex_manifest -+ sage: 'files' in sagetex_manifest # optional - buildsystem - True - - Test a nonexistent package:: - -- sage: package_manifest('dummy-package') -+ sage: package_manifest('dummy-package') # optional - buildsystem - Traceback (most recent call last): - ... - KeyError: 'dummy-package' diff --git a/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch new file mode 100644 index 000000000000..933344aa5591 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -0,0 +1,57 @@ +diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py +index 0f2700168a..60f71357d2 100644 +--- a/src/sage_setup/docbuild/__init__.py ++++ b/src/sage_setup/docbuild/__init__.py +@@ -86,26 +86,6 @@ def builder_helper(type): + """ + Returns a function which builds the documentation for + output type ``type``. +- +- TESTS: +- +- Check that :trac:`25161` has been resolved:: +- +- sage: from sage_setup.docbuild import DocBuilder, setup_parser +- sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set +- +- sage: import sage_setup.docbuild.sphinxbuild +- sage: def raiseBaseException(): +- ....: raise BaseException("abort pool operation") +- sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException +- +- sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc +- sage: helper = builder_helper("html") +- sage: try: +- ....: build_many(build_ref_doc, [("docname", "en", "html", {})]) +- ....: except Exception as E: +- ....: "Non-exception during docbuild: abort pool operation" in str(E) +- True + """ + def f(self, *args, **kwds): + output_dir = self._output_dir(type) +@@ -127,10 +107,9 @@ def builder_helper(type): + logger.debug(build_command) + + # Run Sphinx with Sage's special logger +- sys.argv = ["sphinx-build"] + build_command.split() +- from .sphinxbuild import runsphinx ++ args = "python -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split() + try: +- runsphinx() ++ subprocess.check_call(args) + except Exception: + if ABORT_ON_ERROR: + raise +diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py +index 9a2fba79bc..77c8ed3592 100644 +--- a/src/sage_setup/docbuild/sphinxbuild.py ++++ b/src/sage_setup/docbuild/sphinxbuild.py +@@ -318,3 +318,8 @@ def runsphinx(): + sys.stderr = saved_stderr + sys.stdout.flush() + sys.stderr.flush() ++ ++if __name__ == '__main__': ++ import sys ++ sys.argv[0] = "sphinx-build" ++ runsphinx() diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index e0050efe6bdd..51460154c5de 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.7"; + version = "8.8"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "05vvrd6syh0hlmrk6kzjrwd0hpmvxp8vr8p3mkjb0jh5p2kjdd27"; + sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x"; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -45,46 +45,23 @@ stdenv.mkDerivation rec { # Fixes a potential race condition which can lead to transient doctest failures. ./patches/fix-ecl-race.patch - # Parallelize docubuild using subprocesses, fixing an isolation issue. See - # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE - (fetchpatch { - name = "sphinx-docbuild-subprocesses.patch"; - url = "https://salsa.debian.org/science-team/sagemath/raw/8a215b17e6f791ddfae6df8ce6d01dfb89acb434/debian/patches/df-subprocess-sphinx.patch"; - sha256 = "07p9i0fwjgapmfvmi436yn6v60p8pvmxqjc93wsssqgh5kd8qw3n"; - stripLen = 1; - }) - - # Part of the build system. Should become unnecessary with sage 8.8. - # Upstream discussion here: https://trac.sagemath.org/ticket/27124#comment:33 - ./patches/do-not-test-package-manifests.patch - # Not necessary since library location is set explicitly # https://trac.sagemath.org/ticket/27660#ticket ./patches/do-not-test-find-library.patch - # https://trac.sagemath.org/ticket/27697#ticket - (fetchpatch { - name = "pplpy-doc-location-configurable.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=c4d966e7cb0c7b87c55d52dc6f46518433a2a0a2"; - sha256 = "0pqbbsx8mriwny422s9mp3z5d095cnam32sm62q4mxk8g8jb9vm9"; - }) # https://trac.sagemath.org/ticket/28007 ./patches/threejs-offline.patch + + # Parallelize docubuild using subprocesses, fixing an isolation issue. See + # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE + ./patches/sphinx-docbuild-subprocesses.patch ]; # Since sage unfortunately does not release bugfix releases, packagers must # fix those bugs themselves. This is for critical bugfixes, where "critical" # == "causes (transient) doctest failures / somebody complained". - bugfixPatches = [ - # Transient doctest failure in src/sage/modular/abvar/torsion_subgroup.py - # https://trac.sagemath.org/ticket/27477 - (fetchpatch { - name = "sig_on_in_matrix_sparce.patch"; - url = "https://git.sagemath.org/sage.git/patch?id2=10407524b18659e14e184114b61c043fb816f3c2&id=c9b0cc9d0b8748ab85e568f8f57f316c5e8cbe54"; - sha256 = "0wgp7yvn9sm1ynlhcr4l0hzmvr2n28llg4xc01p6k1zz4im64c17"; - }) - ]; + bugfixPatches = [ ]; # Patches needed because of package updates. We could just pin the versions of # dependencies, but that would lead to rebuilds, confusion and the burdons of @@ -116,35 +93,6 @@ stdenv.mkDerivation rec { stripLen = 1; }) - # https://trac.sagemath.org/ticket/26451 - (fetchSageDiff { - name = "sphinx-1.8.patch"; - base = "8.7"; - rev = "737afd8f314bd1e16feaec562bb4b5efa2effa8b"; - sha256 = "0n56ss88ds662bp49j23z5c2i6hsn3jynxw13wv76hyl0h7l1hjh"; - }) - - # https://trac.sagemath.org/ticket/27653 - (fetchpatch { - name = "sympy-1.4.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=3277ba76d0ba7174608a31a0c6623e9210c63e3d"; - sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir"; - }) - - # https://trac.sagemath.org/ticket/27094 - (fetchpatch { - name = "gap-4.10.1.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=d3483110474591ea6cc8e3210cd884f3e0018b3e"; - sha256 = "028i6h8l8npwzx5z0ax0rcywl85gc83qw1jf93zf523msdfcsk0n"; - }) - - # https://trac.sagemath.org/ticket/27738 - (fetchpatch { - name = "R-3.6.0.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=8b7dbd0805d02d0e8674a272e161ceb24a637966"; - sha256 = "1c81f13z1w62s06yvp43gz6vkp8mxcs289n6l4gj9xj10slimzff"; - }) - # https://trac.sagemath.org/ticket/26932 (fetchSageDiff { name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch"; diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix index 5bb7eda47d5d..e4b1aeae016a 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix @@ -99,6 +99,13 @@ stdenv.mkDerivation rec { for pkg in ${lib.concatStringsSep " " input_names}; do touch "installed/$pkg" done + + # threejs version is in format 0.<version>.minor, but sage currently still + # relies on installed_packages for the online version of threejs to work + # and expects the format r<version>. This is a hotfix for now. + # upstream: https://trac.sagemath.org/ticket/26434 + rm "installed/threejs"* + touch "installed/threejs-r${lib.versions.minor three.version}" ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 7583f8c00104..d00b59307c52 100644 --- a/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { - name = "gromacs-2019.2"; + name = "gromacs-2019.3"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.2.tar.gz"; - sha256 = "0zlzzg27yzfbmmgy2wqmgq82nslqy02gprjvm9xwcswjf705rgxw"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.3.tar.gz"; + sha256 = "0wvm6lj4hbasl2qkjcpicqjh7abxji4196dd2hmwlyivpycaa4a2"; }; buildInputs = [cmake fftw] diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 90b83348ef14..1af2170e1699 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "1jqq7zd75aypxchrq0vjcw5gyn3wyjqy6w79mq2lzky8m6mqn8vr"; + sha256 = "1w8x2d83zdhrnydiqq1qjf3j1y4cawdg8p1isj8zqwblnc47ygjm"; }; # Perl is needed here for patchShebangs diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 3020e7d64aa8..060de50f9b79 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { name = "git-cola-${version}"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "0gfbzcmaqg6hdy2cfpshgcwh8zgj1ia1vd95i5xdrsvksgb8fq2j"; + sha256 = "0754d56dprhb1nhb8fwp4my5pyqcgarwzba1l6zx7il87d7vyi5m"; }; buildInputs = [ git gettext ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index c52a78ff0076..628c7dbac7f3 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - name = "git-recent-${version}"; - version = "1.1.0"; + pname = "git-recent"; + version = "1.1.1"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-recent"; rev = "v${version}"; - sha256 = "06r1jzmzdv3d4vxdh5qyf5g5rgavxfmh2rpbs7a7byg3k7d77hpn"; + sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index a93682f0c2e8..7d6b620e2239 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/mnauw/git-remote-hg; description = "Semi-official Mercurial bridge from Git project"; license = licenses.gpl2; - maintainers = [ maintainers.garbas ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 1ade31fd6835..62fbab02292d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: let - version = "0.2.5"; + version = "0.2.6"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "1caxdx1ps662vfa79f7l1bwgwgwf974ahzii0hzaqfnkxy45i520"; + sha256 = "09p4h8mdmk0nzcd1jh1i6n29klz38n5vqqwdyzjkygmr2xqka55b"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index f8aae5da0473..22f35e22fb54 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -1,6 +1,6 @@ -{fetchFromGitHub, libgit2_0_27, ...}: +{fetchFromGitHub, libgit2, ...}: -libgit2_0_27.overrideAttrs (oldAttrs: rec { +libgit2.overrideAttrs (oldAttrs: rec { cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_ICONV=OFF" diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix index 32c163c45c41..b7828418db07 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }: +{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }: let version = "0.3.1"; in buildGoPackage { name = "grv-${version}"; - buildInputs = [ ncurses readline curl libgit2_0_27 ]; + buildInputs = [ ncurses readline curl libgit2 ]; nativeBuildInputs = [ pkgconfig ]; goPackagePath = "github.com/rgburke/grv"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index 86ead4fea425..44e4b5de9569 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.12.0"; + version = "2.12.1"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0wv0s0bhl7akyshzcsqlk8ws84cjdjizfpn6m9674lw9vs9rj2sj"; + sha256 = "0i9bqcgdidl5zawkpq2fjrimzbb37i1m2fisvj32d27fsp1824bk"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index 496354971ee7..ed44043eb9a9 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,12 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "1.16.1"; + version = "1.17.0"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "6ca409d1f22d444af427fb023a33ca8b69625d508a50e1b7eaabd59247c93043"; + sha256 = "1qswk30w2cq8xvj16mhszsi3npp0z08s8lki1w67nif23c2kkk6c"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix index a407f6e7ab12..e9862cb48975 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://jonas.github.io/tig/; description = "Text-mode interface for git"; - maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ]; + maintainers = with maintainers; [ bjornfor domenkozar qknight ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 5b46228a116f..748e473be3dd 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1fs3cbs3zd1cj076w4nfn3dbgx529z0h4c0mghxcg2flxr3jm71a"; + sha256 = "1q3wslf9s4dg7h1f41rh9rb7qlbsqz8k3xffmlzdbbgfdrm7sym1"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json index a9da7e30036a..5afb8c8ee5d2 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.10.5", - "repo_hash": "00bkdylcnz171jf8di05ygviplqzssazrfaqpwmbqwdjab2ax4yr", - "deb_hash": "1zsg4fhpl07pz76i4yynk38xs7cp9w4jcryxk7larbr25m48q4rb", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.5-ce.0_amd64.deb/download.deb", + "version": "11.10.8", + "repo_hash": "1ygwkajkwhr2vzkzljfj6l1ypvmmzj9ps8ijha5m9qglkzjz0gsn", + "deb_hash": "1b66yw0i795pahainx3rpqaliffmn5py0ws8is8f5hr7cghchln0", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.8-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.10.5", + "rev": "v11.10.8", "passthru": { - "GITALY_SERVER_VERSION": "1.34.1", + "GITALY_SERVER_VERSION": "1.34.3", "GITLAB_PAGES_VERSION": "1.5.0", "GITLAB_SHELL_VERSION": "9.0.0", "GITLAB_WORKHORSE_VERSION": "8.5.2" } }, "ee": { - "version": "11.10.5", - "repo_hash": "0nla908l3513r87i3x2fa87j48wgykzpf7cqxddnahk98m0wgxvi", - "deb_hash": "02ri9b4xd77wqjnd49h5n77aylrb5xlq6xa26xn39kl326isaj41", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.5-ee.0_amd64.deb/download.deb", + "version": "11.10.8", + "repo_hash": "1vw0d99w5bvagbl9xia5ik3754s7jgkh01b3wm77snfkcg31psb6", + "deb_hash": "05fsjxlr56zv4wc90r6ns81n5h1ykafjsi8vq6h22gzxjjvaay7m", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.8-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.10.5-ee", + "rev": "v11.10.8-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.34.1", + "GITALY_SERVER_VERSION": "1.34.3", "GITLAB_PAGES_VERSION": "1.5.0", "GITLAB_SHELL_VERSION": "9.0.0", "GITLAB_WORKHORSE_VERSION": "8.5.2" } } -} +} \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index 584006db1007..6ac1a9d68616 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv -, ruby, tzdata, git, procps, nettools, nixosTests +, ruby, tzdata, git, nettools, nixosTests , gitlabEnterprise ? false }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = sources.gitlab; buildInputs = [ - rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools ]; patches = [ ./remove-hardcoded-locations.patch ]; @@ -49,9 +49,6 @@ stdenv.mkDerivation rec { rm config/initializers/gitlab_shell_secret_token.rb - substituteInPlace app/controllers/admin/background_jobs_controller.rb \ - --replace "ps -U" "${procps}/bin/ps -U" - sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb ''; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 0ea3ce0f779b..fc10c59df94f 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "1.34.1"; + version = "1.34.3"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1nj1vw3qzfg5azx70ssbjicwqjxd6ka2fkk4rj5bby53755ywl7b"; + sha256 = "0lv3czkxcan2zv9asd79nn8z1bihyxszi1d5hazmb299v23cppzm"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index 1c7ad5abcb56..00f90bdf7e3a 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -419,7 +419,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.22.1', require: 'gitaly' gem 'grpc', '~> 1.15.0' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 3314a769949a..d498172b02d3 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -281,7 +281,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.19.0) + gitaly-proto (1.22.1) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -1020,7 +1020,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.19.0) + gitaly-proto (~> 1.22.1) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.7.0) diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index ea96e4e4d936..c24dc185be7a 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -1129,10 +1129,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173769xdvqqmbiz3qlybdlg023vz2kxxmzwxql1wqczf0j57vmv1"; + sha256 = "03h59n89nngna6rxs81rigf1bzhhqbvmpzb0fqaks7sskqp70f2s"; type = "gem"; }; - version = "1.19.0"; + version = "1.22.1"; }; github-markup = { source = { diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 88b787ea9da3..52e802ef524d 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -437,7 +437,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.22.1', require: 'gitaly' gem 'grpc', '~> 1.15.0' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index b41584d53124..72bc2c473405 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -306,7 +306,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.19.0) + gitaly-proto (1.22.1) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -1058,7 +1058,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.19.0) + gitaly-proto (~> 1.22.1) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-license (~> 1.0) diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index 1d355ef8e873..bbf769314a3f 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -1227,10 +1227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173769xdvqqmbiz3qlybdlg023vz2kxxmzwxql1wqczf0j57vmv1"; + sha256 = "03h59n89nngna6rxs81rigf1bzhhqbvmpzb0fqaks7sskqp70f2s"; type = "gem"; }; - version = "1.19.0"; + version = "1.22.1"; }; github-markup = { source = { diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix index 1f3c4a832fbe..1fbc22f87761 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix @@ -37,7 +37,7 @@ in meta = with stdenv.lib; { homepage = http://www.redmine.org/; platforms = platforms.linux; - maintainers = [ maintainers.garbas maintainers.aanderse ]; + maintainers = [ maintainers.aanderse ]; license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/default.nix index c97bf5127dc8..ba1980c3d142 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -37,7 +37,7 @@ in meta = with stdenv.lib; { homepage = http://www.redmine.org/; platforms = platforms.linux; - maintainers = [ maintainers.garbas maintainers.aanderse ]; + maintainers = [ maintainers.aanderse ]; license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/applications/version-management/sit/default.nix b/nixpkgs/pkgs/applications/version-management/sit/default.nix index 97b6b5139c1a..7d655bfc5d3b 100644 --- a/nixpkgs/pkgs/applications/version-management/sit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/sit/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sit-fyi"; repo = "sit"; rev = "v${version}"; - sha256 = "10ycs6vc7mfzxnxrki09xn974pcwh196h1pfnsds98x6r87hxkpn"; + sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf"; }; buildInputs = [ cmake libzip gnupg ] ++ diff --git a/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix b/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix index a232b78aacfd..f69fdbefe184 100644 --- a/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix +++ b/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix @@ -1,12 +1,10 @@ { buildVersion, sha256, dev ? false }: -{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk2, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook -, pkexecPath ? "/run/wrappers/bin/pkexec", gksuSupport ? false, gksu +{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook +, pkexecPath ? "/run/wrappers/bin/pkexec" , writeScript, common-updater-scripts, curl, gnugrep }: -assert gksuSupport -> gksu != null; - let pname = "sublime-merge"; packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}"; @@ -14,31 +12,27 @@ let primaryBinary = "sublime_merge"; primaryBinaryAliases = [ "smerge" ]; downloadUrl = "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz"; - downloadArchiveType = "tar.xz"; versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}"; - versionFile = "pkgs/applications/version-management/sublime-merge/default.nix"; - usesGtk2 = false; + versionFile = builtins.toString ./default.nix; archSha256 = sha256; arch = "x64"; - libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib (if usesGtk2 then gtk2 else gtk3) cairo pango ]; - redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] - ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; + libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; in let binaryPackage = stdenv.mkDerivation { pname = "${pname}-bin"; version = buildVersion; src = fetchurl { - name = "${pname}-bin-${buildVersion}.${downloadArchiveType}"; url = downloadUrl; sha256 = archSha256; }; dontStrip = true; dontPatchELF = true; - buildInputs = stdenv.lib.optionals (!usesGtk2) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH - nativeBuildInputs = [ makeWrapper ] ++ stdenv.lib.optional (!usesGtk2) wrapGAppsHook; + buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildPhase = '' runHook preBuild @@ -50,7 +44,7 @@ in let $binary done - # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary. + # Rewrite pkexec argument. Note that we cannot delete bytes in binary. sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary} runHook postBuild @@ -72,7 +66,7 @@ in let --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ - ${stdenv.lib.optionalString (!usesGtk2) ''"''${gappsWrapperArgs[@]}"''} + "''${gappsWrapperArgs[@]}" ''; }; in stdenv.mkDerivation (rec { diff --git a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix index a90eb531fe59..4089e68d85dc 100644 --- a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Version Control System for $HOME"; homepage = https://github.com/RichiH/vcsh; license = licenses.gpl2Plus; - maintainers = with maintainers; [ garbas ttuegel ]; + maintainers = with maintainers; [ ttuegel ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/nixpkgs/pkgs/applications/video/clipgrab/default.nix index a94bb7ade33e..9b29e18d0bc4 100644 --- a/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - sha256 = "0dhiv1mldp5f555im6mkjxdh6iivn1hnx2xdaqa6wxzsrwrvv5dd"; + sha256 = "1v8vvlqgjqy3gyzwaz9iq0m4fwlkimy5gzg6z3bqwp61p9zzw0zf"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index a3d7512a2f6e..c13bf3480d25 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "34.0.0"; + version = "35.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "189d23zqrk12w778x0cxp2mmc6gj9psb556ihkgs3r48jvs89sm6"; + sha256 = "163msz6l1d5vwirr1c6cm820kwxcjinwh91svf8ddg5181nwhmrx"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/mythtv/default.nix b/nixpkgs/pkgs/applications/video/mythtv/default.nix index 1be4fc252fd0..74167a67bd2b 100644 --- a/nixpkgs/pkgs/applications/video/mythtv/default.nix +++ b/nixpkgs/pkgs/applications/video/mythtv/default.nix @@ -2,7 +2,7 @@ , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype , perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2 -, linuxHeaders +, linuxHeaders, fetchpatch }: stdenv.mkDerivation rec { @@ -16,6 +16,15 @@ stdenv.mkDerivation rec { sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x"; }; + patches = [ + # Fixes build with exiv2 0.27.1. + (fetchpatch { + name = "004-exiv2.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946"; + sha256 = "0mh542f53qgky0w3s2bv0gmcxzvmb10834z3cfff40fby2ffr6k8"; + }) + ]; + setSourceRoot = ''sourceRoot=$(echo */mythtv)''; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix index 20684354d095..9f5401fc69c3 100644 --- a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix +++ b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix @@ -9,41 +9,41 @@ let # plex-media-player is updated, the versions for these files are changed, # so the build IDs (and SHAs) below will need to be updated! depSrcs = rec { - webClientBuildId = "85-88b3ac67015f76"; - webClientDesktopBuildId = "3.77.2-7015f76"; - webClientTvBuildId = "3.78.0-88b3ac6"; + webClientBuildId = "129-669a5eed7ae231"; + webClientDesktopBuildId = "3.100.1-d7ae231"; + webClientTvBuildId = "3.105.0-669a5ee"; webClient = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "0j7i4yr95ljw9cwyaygld41j7yvndj3dza3cbydv4x8mh2hn05v1"; + sha256 = "0gd7x0rf7sf696zd24y6pji9iam851vjjqbpm4xkqwpadwrwzhwk"; }; webClientDesktopHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "106kx9ahz7jgskpjraff2g235n1whwvf18yw0nmp5dwr9ys9h8jp"; + sha256 = "136hk7p6gxxmhq1d09jfjljkv76b5h2p16s5jwf28xixkp0ab2jg"; }; webClientDesktop = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "0h23h3fd3w43glvnhrg9qiajs0ql490kb00g3i4cpi29hy1ky45r"; + sha256 = "0yvjqar72jq58jllsp51b8ybiv6kad8w51bfzss87m1cv3qdbzpa"; }; webClientTvHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "05zk2zpmcdf276ys5zyirsmvhvyvz99fa6hlgymma8ql6w67133r"; + sha256 = "0kkw9dd0kr5n4ip1pwfs2dkfjwrph88i0dlw64dca9i885gyjvhd"; }; webClientTv = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "1cflpgaf4kyj6ccqa11j28rkp8s7zlbnid7s00m5n2c907dihmw2"; + sha256 = "0yssii01nx6ixg3mikqjn8hz34dalma0rfr8spj115xwr7aq8ixk"; }; }; in stdenv.mkDerivation rec { name = "plex-media-player-${version}"; - version = "2.23.0.920"; - vsnHash = "5bc1a2e5"; + version = "2.36.0.988"; + vsnHash = "0150ae52"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "1jzlyj32gr3ar89qnk8slazrbchqkjfx9dchzkzfvpi6742v9igm"; + sha256 = "104arb0afv3jz0bvj8ij5s7av289ms9n91b4y4077la2wd6r1bq0"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; diff --git a/nixpkgs/pkgs/applications/video/smtube/default.nix b/nixpkgs/pkgs/applications/video/smtube/default.nix index c5dcec387236..41f82a8bdd5c 100644 --- a/nixpkgs/pkgs/applications/video/smtube/default.nix +++ b/nixpkgs/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "18.11.0"; + version = "19.6.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "0rda7mdsr0awhra9yrmsdzp2c4s6xx5nax107d1fydnk084pygqp"; + sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm"; }; makeFlags = [ diff --git a/nixpkgs/pkgs/applications/video/vdr/default.nix b/nixpkgs/pkgs/applications/video/vdr/default.nix index 21c2404f4ee7..e81002193589 100644 --- a/nixpkgs/pkgs/applications/video/vdr/default.nix +++ b/nixpkgs/pkgs/applications/video/vdr/default.nix @@ -4,12 +4,12 @@ , enableBidi ? true }: stdenv.mkDerivation rec { - name = "vdr-${version}"; - version = "2.4.0"; + pname = "vdr"; + version = "2.4.1"; src = fetchurl { - url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2"; - sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk"; + url = "ftp://ftp.tvdr.de/vdr/${pname}-${version}.tar.bz2"; + sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/video/vdr/plugins.nix b/nixpkgs/pkgs/applications/video/vdr/plugins.nix index 589c0144647e..022f4382a492 100644 --- a/nixpkgs/pkgs/applications/video/vdr/plugins.nix +++ b/nixpkgs/pkgs/applications/video/vdr/plugins.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg -, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses }: -let +, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses +, callPackage +}: let mkPlugin = name: stdenv.mkDerivation { name = "vdr-${vdr.version}-${name}"; inherit (vdr) src; @@ -11,6 +12,8 @@ let }; in { + xineliboutput = callPackage ./xineliboutput {}; + skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; }); diff --git a/nixpkgs/pkgs/applications/video/vdr/wrapper.nix b/nixpkgs/pkgs/applications/video/vdr/wrapper.nix index 2272d1605fd0..497ad7c77a08 100644 --- a/nixpkgs/pkgs/applications/video/vdr/wrapper.nix +++ b/nixpkgs/pkgs/applications/video/vdr/wrapper.nix @@ -1,5 +1,12 @@ -{ symlinkJoin, lib, makeWrapper, vdr, plugins ? [] }: -symlinkJoin { +{ symlinkJoin, lib, makeWrapper, vdr +, plugins ? [] +}: let + + makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l); + + requiredXinePlugins = lib.flatten (map (p: p.passthru.requiredXinePlugins or []) plugins); + +in symlinkJoin { name = "vdr-with-plugins-${(builtins.parseDrvName vdr.name).version}"; @@ -8,7 +15,9 @@ symlinkJoin { nativeBuildInputs = [ makeWrapper ]; postBuild = '' - wrapProgram $out/bin/vdr --add-flags "-L $out/lib/vdr --localedir=$out/share/locale" + wrapProgram $out/bin/vdr \ + --add-flags "-L $out/lib/vdr --localedir=$out/share/locale" \ + --prefix XINE_PLUGIN_PATH ":" ${makeXinePluginPath requiredXinePlugins} ''; meta = with vdr.meta; { diff --git a/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix b/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix new file mode 100644 index 000000000000..98fcd2b5d408 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, lib, vdr +, libav, libcap, libvdpau +, xineLib, libjpeg, libextractor, mesa, libGLU +, libX11, libXext, libXrender, libXrandr +, makeWrapper +}: let + name = "vdr-xineliboutput-2.1.0"; + + makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l); + + self = stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${name}/${name}.tgz"; + sha256 = "1phrxpaz8li7z0qy241spawalhcmwkv5hh3gdijbv4h7mm899yba"; + }; + + # configure don't accept argument --prefix + dontAddPrefix = true; + + postConfigure = '' + sed -i config.mak \ + -e 's,XINEPLUGINDIR=/[^/]*/[^/]*/[^/]*/,XINEPLUGINDIR=/,' + ''; + + makeFlags = [ "DESTDIR=$(out)" ]; + + postFixup = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix XINE_PLUGIN_PATH ":" "${makeXinePluginPath [ "$out" xineLib ]}" + done + ''; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + libav + libcap + libextractor + libjpeg + libGLU + libvdpau + libXext + libXrandr + libXrender + libX11 + mesa + vdr + xineLib + ]; + + passthru.requiredXinePlugins = [ xineLib self ]; + + meta = with lib;{ + homepage = "https://sourceforge.net/projects/xineliboutput/"; + description = "Xine-lib based software output device for VDR"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + inherit (vdr.meta) platforms; + }; + }; +in self diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index 4ef02af106e3..eb143412bd40 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { project = "conmon"; name = "${project}-${version}"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "containers"; repo = project; rev = "v${version}"; - sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb"; + sha256 = "0s23gm0cq4mylv882dr1n8bqql42674vny3z58yy77lwzmifc6id"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 2e7b476443fd..8070e1423fe8 100644 --- a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { project = "cri-o"; - version = "1.14.2"; + version = "1.15.0"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -26,7 +26,7 @@ buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1p3yzcjljbpwhnsa512rc3zgbrnibh2bflfg4bdjhnfpqzg18376"; + sha256 = "08m84rlar25w6dwv76rab4vdlavacn7kb5ravzqnb8ngx68csbp3"; }; outputs = [ "bin" "out" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index d8327c99dbb2..2d983d009f1d 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, paramiko }: buildPythonApplication rec { - version = "1.24.0"; + version = "1.24.1"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "0sd3bwmz80a2rffviq9vvyxic41ya08yj41k8x1m4vv74wcab0jm"; + sha256 = "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5"; }; # lots of networking and other fails diff --git a/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/nixpkgs/pkgs/applications/virtualization/docker/default.nix index d2e42740d0fc..384ab8f30473 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -201,13 +201,13 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_09 = makeOverridable dockerGen { - version = "18.09.6"; - rev = "481bc7715621adba10752357e0d537c8dc86507d"; - sha256 = "15l77g7f7zhn33b0a5k56nk2722yl0nm1fl6cmlgcv4ih7q7cl6c"; - runcRev = "2b18fe1d885ee5083ef9f0838fee39b62d653e30"; - runcSha256 = "0g0d9mh5fcvsjgddiyw98ph5zpz5ivlwy89m45jxwbzkxb21gy7w"; - containerdRev = "bb71b10fd8f58240ca47fbb579b9d1028eea7c84"; - containerdSha256 = "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0"; + version = "18.09.7"; + rev = "2d0083d657f82c47044c8d3948ba434b622fe2fd"; + sha256 = "1f7q99pay7mmy925ap95p935y9xslxpmgha397db7x2w008rfl9k"; + runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; + runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; + containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; + containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; diff --git a/nixpkgs/pkgs/applications/virtualization/lkl/default.nix b/nixpkgs/pkgs/applications/virtualization/lkl/default.nix index 40503ab89d70..318929eb2253 100644 --- a/nixpkgs/pkgs/applications/virtualization/lkl/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/lkl/default.nix @@ -2,8 +2,9 @@ , buildPackages }: stdenv.mkDerivation rec { - name = "lkl-2018-08-22"; - rev = "5221c547af3d29582703f01049617a6bf9f6232a"; + pname = "lkl"; + version = "2019-06-20"; + rev = "0a4ebeadad12b94db665b8daf30e44e949a02d90"; outputs = [ "dev" "lib" "out" ]; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "1k2plyx40xaphm8zsk2dd1lyv6dhsp7kj6hfmdgiamvl80bjajqy"; + sha256 = "09y9ci3j0lp3z74h577ng2s9a4n4glqpqndyc9iy6wdqaj764gm6"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { overhead ''; homepage = https://github.com/lkl/linux/; - platforms = [ "x86_64-linux" "aarch64-linux" ]; # Darwin probably works too but I haven't tested it + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ copumpkin ]; }; diff --git a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 459d1a396b3a..d64baca2cc7e 100644 --- a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib +{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib , ncurses, perl, pixman, vde2, alsaLib, texinfo, flex , bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper @@ -15,7 +15,7 @@ , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , cephSupport ? false, ceph -, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm +, openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , smbdSupport ? false, samba , hostCpuOnly ? false @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd"; }; - nativeBuildInputs = [ python2 pkgconfig flex bison ]; + nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ]; buildInputs = [ zlib glib ncurses perl pixman vde2 texinfo makeWrapper lzo snappy @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] ++ optionals cephSupport [ ceph ] - ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] + ++ optionals openGLSupport [ mesa epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] ++ optionals smbdSupport [ samba ]; @@ -112,6 +112,7 @@ stdenv.mkDerivation rec { [ "--audio-drv-list=${audio}" "--sysconfdir=/etc" "--localstatedir=/var" + "--enable-docs" ] # disable sysctl check on darwin. ++ optional stdenv.isDarwin "--cpu=x86_64" diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index 12057c221e8f..8ec9ec6c8b49 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -15,13 +15,13 @@ with lib; buildGoPackage rec { name = "singularity-${version}"; - version = "3.0.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "sylabs"; repo = "singularity"; rev = "v${version}"; - sha256 = "1wpsd0il2ipa2n5cnbj8dzs095jycdryq2rx62kikbq7ahzz4fsi"; + sha256 = "14lhxwy21s7q081x7kbnvkjsbxgsg2f181qlzmlxcn6n7gfav3kj"; }; goPackagePath = "github.com/sylabs/singularity"; @@ -32,22 +32,16 @@ buildGoPackage rec { propagatedBuildInputs = [ coreutils squashfsTools ]; postConfigure = '' - find . -name vendor -type d -print0 | xargs -0 rm -rf - cd go/src/github.com/sylabs/singularity patchShebangs . - sed -i 's|defaultEnv := "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"|defaultEnv := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' src/cmd/singularity/cli/singularity.go + sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go ./mconfig -V ${version} -p $bin --localstatedir=/var - touch builddir/.dep-done - touch builddir/vendors-done # Don't install SUID binaries sed -i 's/-m 4755/-m 755/g' builddir/Makefile - # Point to base gopath - sed -i "s|^cni_vendor_GOPATH :=.*\$|cni_vendor_GOPATH := $NIX_BUILD_TOP/go/src/github.com/containernetworking/plugins/plugins|" builddir/Makefile ''; buildPhase = '' @@ -57,6 +51,7 @@ buildGoPackage rec { installPhase = '' make -C builddir install LOCALSTATEDIR=$bin/var chmod 755 $bin/libexec/singularity/bin/starter-suid + wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} ''; postFixup = '' diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix b/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix index 526202e75ae5..fe51488c7066 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix @@ -1,669 +1 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "7da180ee92d8bd8bb8c37fc560e673e6557c392f"; - sha256 = "19gjjhmzswhm11wzj38r5alxypmflmy0z42flhc3czhmmwv7b1av"; - }; - } - { - goPackagePath = "github.com/alexflint/go-filemutex"; - fetch = { - type = "git"; - url = "https://github.com/alexflint/go-filemutex"; - rev = "d358565f3c3f5334209f1e80693e4f621650c489"; - sha256 = "19fzbm0x8821awsmqj9ig49dxxkd72p1yfqbijmdwwszvw2r0ggz"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "2ee87856327ba09384cabd113bc6b5d174e9ec0f"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; - }; - } - { - goPackagePath = "github.com/containerd/cgroups"; - fetch = { - type = "git"; - url = "https://github.com/containerd/cgroups"; - rev = "5017d4e9a9cf2d4381db99eacd9baf84b95bfb14"; - sha256 = "02pvcmj91j3maa9j1v91m2z9kpa6p822h06r007b3pl7h0paiqnj"; - }; - } - { - goPackagePath = "github.com/containerd/continuity"; - fetch = { - type = "git"; - url = "https://github.com/containerd/continuity"; - rev = "246e49050efdf45e8f17fbbcf1547ee376f9939e"; - sha256 = "1zc1f0yixf32lprp5r77z2j9xq7fk0hijq8xzl08j4zrk0fcy8aq"; - }; - } - { - goPackagePath = "github.com/containernetworking/cni"; - fetch = { - type = "git"; - url = "https://github.com/containernetworking/cni"; - rev = "a7885cb6f8ab03fba07852ded351e4f5e7a112bf"; - sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y"; - }; - } - { - goPackagePath = "github.com/containernetworking/plugins"; - fetch = { - type = "git"; - url = "https://github.com/containernetworking/plugins"; - rev = "2b8b1ac0af4568e928d96ccc5f47b075416eeabd"; - sha256 = "1yl9m8pwjmqxj3hf0w9s6rykszhcww54z07yjgxzabmqf2dhchxv"; - }; - } - { - goPackagePath = "github.com/containers/image"; - fetch = { - type = "git"; - url = "https://github.com/containers/image"; - rev = "2e4f799f5eba49a2498d2793cfb2a4bc823ca3f6"; - sha256 = "0b9symgbkd2vgvp7mfpz1l03i2zivwbc5ycccwv78b1ikk9m6b75"; - }; - } - { - goPackagePath = "github.com/containers/storage"; - fetch = { - type = "git"; - url = "https://github.com/containers/storage"; - rev = "88d80428f9b146f8f9fe7e2e8cc8688a5aae1a4e"; - sha256 = "13fagjisbg55dhgjd72h0hiy6jfg8ggkcnjl5haqj13c2gkf6sam"; - }; - } - { - goPackagePath = "github.com/coreos/go-iptables"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-iptables"; - rev = "b5b1876b170881a8259f036445ee89c8669db386"; - sha256 = "1s1c04x47pk3168606x4vkg4avs8a7m407hpha8py1xni08cgb6m"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "39ca1b05acc7ad1220e09f133283b8859a8b71ab"; - sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1"; - sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; - }; - } - { - goPackagePath = "github.com/d2g/dhcp4"; - fetch = { - type = "git"; - url = "https://github.com/d2g/dhcp4"; - rev = "a1d1b6c41b1ce8a71a5121a9cee31809c4707d9c"; - sha256 = "191hzw6yqzkm042h6miyycq3g0zrhqjhhpl27f8vhwzp4wanasiz"; - }; - } - { - goPackagePath = "github.com/d2g/dhcp4client"; - fetch = { - type = "git"; - url = "https://github.com/d2g/dhcp4client"; - rev = "e612998962035b93ba16cfd1ad2f3221985c1b8c"; - sha256 = "1612wh99fblc9ashmm6mjc9110fhal95z0mn9qn7av3px13yd9fs"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "749f6afb4572201e3c37325d0ffedb6f32be8950"; - sha256 = "05jn2wvikyw0pbmi74w5axr0zgxn5y3ynn9rhsq87rmwqj7raxhd"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "da99009bbb1165d1ac5688b5c81d2f589d418341"; - sha256 = "02hhx7s8vm45rcl2mx9xamkncl2pb6qhsmz35mffbg4n6l5rn5x5"; - }; - } - { - goPackagePath = "github.com/docker/docker-credential-helpers"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker-credential-helpers"; - rev = "d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1"; - sha256 = "1ff829h5p1j6qiivjvnwyiybrff3dddv1ij71nz5whmgavdqgd49"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; - sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; - }; - } - { - goPackagePath = "github.com/docker/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-metrics"; - rev = "399ea8c73916000c64c2c76e8da00ca82f8387ab"; - sha256 = "0najfy92fq05b330cnjk5b326yi7dnnmvzfk6g5lsa1fci78yzw4"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - { - goPackagePath = "github.com/docker/libtrust"; - fetch = { - type = "git"; - url = "https://github.com/docker/libtrust"; - rev = "aabc10ec26b754e797f9028f4589c5b7bd90dc20"; - sha256 = "1lwslbggzc2b0c4wxl5pn6i2nfgz5jz8f7s7vnid9mrlsk59h7s1"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/globalsign/mgo"; - fetch = { - type = "git"; - url = "https://github.com/globalsign/mgo"; - rev = "113d3961e7311526535a1ef7042196563d442761"; - sha256 = "0m05ay993vv2jkc46bbdnq371s5jc0an2cycsj7p3b6lmv84jk9f"; - }; - } - { - goPackagePath = "github.com/godbus/dbus"; - fetch = { - type = "git"; - url = "https://github.com/godbus/dbus"; - rev = "a389bdde4dd695d414e47b755e95e72b7826432c"; - sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; - sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; - sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55"; - sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "b7773ae218740a7be65057fc60b366a49b538a44"; - sha256 = "09904bk7ac6qs9dgiv23rziq9h3makb9qg4jvxr71rlydsd7psfd"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/j-keck/arping"; - fetch = { - type = "git"; - url = "https://github.com/j-keck/arping"; - rev = "2cf9dc699c5640a7e2c81403a44127bf28033600"; - sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c"; - }; - } - { - goPackagePath = "github.com/kubernetes-sigs/cri-o"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-sigs/cri-o"; - rev = "8afc34092907d146906fcc31af112b2b46e7b5cd"; - sha256 = "0ghcjvk7grdcwb1936mnj56a7rla804glfknid9kmr3kgny3yi43"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; - }; - } - { - goPackagePath = "github.com/mattn/go-shellwords"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-shellwords"; - rev = "02e3cf038dcea8290e44424da473dd12be796a8a"; - sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mtrmac/gpgme"; - fetch = { - type = "git"; - url = "https://github.com/mtrmac/gpgme"; - rev = "b2432428689ca58c2b8e8dea9449d3295cf96fc9"; - sha256 = "0hs9gfwf3cmnvmmxb485icwlv8h8xnny3p52bj7qwv251pvwsnaf"; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - }; - } - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "e562b04403929d582d449ae5386ff79dd7961a11"; - sha256 = "0j24nk975di8hcv6ycn2p2hhw1xdiy4bpxamr6wn12k21kadlp7s"; - }; - } - { - goPackagePath = "github.com/opencontainers/image-tools"; - fetch = { - type = "git"; - url = "https://github.com/sylabs/image-tools"; - rev = "2814f498056809a9d5baaf76d1d82312180a5888"; - sha256 = "0q3ljb51df5hc58rhp5xni2gsy3gkxn47d9dwyfcffnq8kpf9d8a"; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "baf6536d6259209c3edfa2b22237af82942d3dfa"; - sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7"; - }; - } - { - goPackagePath = "github.com/opencontainers/runtime-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runtime-spec"; - rev = "5806c35637336642129d03657419829569abc5aa"; - sha256 = "13vw1b3j9sx7d5fr3w3jdg137nnqcr50fqchq8z8nf6s18lkhj93"; - }; - } - { - goPackagePath = "github.com/opencontainers/runtime-tools"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runtime-tools"; - rev = "1c243a8a8eb44d491790798afc9b634c6f6a6380"; - sha256 = "1ll5wrbn84yb2l7k6hpwwj06wywib7ar4z1bhh1rc5h9xajng7jq"; - }; - } - { - goPackagePath = "github.com/opencontainers/selinux"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/selinux"; - rev = "ba1aefe8057f1d0cfb8e88d0ec1dc85925ef987d"; - sha256 = "1n283j7rsim7gysm91x99c41d7vnsjsgfm4dy11fnzpkpzfiksq5"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pquerna/ffjson"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/ffjson"; - rev = "d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac"; - sha256 = "069w276lch2hhkvz26wdla8d4s0cg842bhqmih4sa33dsinlgs8g"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "faf4ec335fe01ae5a6a0eaa34a5a9333bfbd1a30"; - sha256 = "08xgqgx7vc27zc30chgi09lwrnvxr338dn624xnw4ysfm9r6lxrz"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "7600349dcfe1abd18d72d3a1770870d9800a7801"; - sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "7d6f385de8bea29190f15ba9931442a0eaef9af7"; - sha256 = "18cish8yas5r6xhgp8p8n7lg4wh3d4szzirszxra8m7rwy3swxxq"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5"; - sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; - }; - } - { - goPackagePath = "github.com/safchain/ethtool"; - fetch = { - type = "git"; - url = "https://github.com/safchain/ethtool"; - rev = "6e3f4faa84e1d8d48afec75ed064cf3611d3f8bf"; - sha256 = "15xjvny8bfhhjvvv654pimxxw5cd02q8skp1siwbfvrlw598j4lm"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - { - goPackagePath = "github.com/seccomp/libseccomp-golang"; - fetch = { - type = "git"; - url = "https://github.com/seccomp/libseccomp-golang"; - rev = "e3496e3a417d1dc9ecdceca5af2513271fed37a0"; - sha256 = "0z8v90nk22h8r5licav1a8cbn6k7bs47l0j1crw7bjl9hv1bmr71"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"; - sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "1e58aa3361fd650121dceeedc399e7189c05674a"; - sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/sylabs/sif"; - fetch = { - type = "git"; - url = "https://github.com/sylabs/sif"; - rev = "177b9338f1ab9123be5b6217740be1f0ce924206"; - sha256 = "1dwpml36n06hglp2km1wsfzdiw1yva6a0h00f1y2933m3i8r3k2w"; - }; - } - { - goPackagePath = "github.com/syndtr/gocapability"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/gocapability"; - rev = "33e07d32887e1e06b7c025f27ce52f62c7990bc0"; - sha256 = "1x88c0b320b13w7samicf19dqx9rr4dnrh3yglk3cba21nwsp57i"; - }; - } - { - goPackagePath = "github.com/vishvananda/netlink"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netlink"; - rev = "a2ad57a690f3caf3015351d2d6e1c0b95c349752"; - sha256 = "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0"; - }; - } - { - goPackagePath = "github.com/vishvananda/netns"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netns"; - rev = "be1fbeda19366dea804f00efff2dd73a1642fdcc"; - sha256 = "0j0xin37zp34ajmhsgfbxr8l7vrljf1lc6z3j3miidlmfwcl2s0m"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonpointer"; - rev = "4e3ac2762d5f479393488629ee9370b50873b3a6"; - sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonreference"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonreference"; - rev = "bd5ef7bd5415a7ac448318e64f11a24cd21e594b"; - sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonschema"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonschema"; - rev = "1d523034197ff1f222f6429836dd36a2457a1874"; - sha256 = "1z8c6x8sfh6d1ib2lm2jps7r139qip6h3zik3fxhy1yr1380qbzp"; - }; - } - { - goPackagePath = "go4.org"; - fetch = { - type = "git"; - url = "https://github.com/go4org/go4"; - rev = "9599cf28b011184741f249bd9f9330756b506cbc"; - sha256 = "0hssb6jmpjxvdx2k1zx0l2dbwpx52zxcq5n2bhqivr670r4wdrkq"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://github.com/sylabs/golang-x-crypto"; - rev = "4bce89e8e9a9f84a4cf02b9842c3eaff2af0a856"; - sha256 = "11wi2zd055ym9m36ba007rdg4ghrwaiqxc77qyqc37ln7l7accr9"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"; - sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "6c888cc515d3ed83fc103cf1d84468aad274b0a7"; - sha256 = "18anqrdajp4p015v3f5y641k3lmgp2jr0lfyx0pb3ia0qvn93mrp"; - }; - } - { - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://github.com/cheggaaa/pb"; - rev = "2af8bbdea9e99e83b3ac400d8f6b6d1b8cbbf338"; - sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] \ No newline at end of file +[] diff --git a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index bb16660db87e..392517e3ab26 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "2.1.0"; + version = "2.2.0"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil"; + sha256 = "0186c2fjqm3wdr3wik4fcyl5l3gv5j6sxn18d0vclw83w4yrhjz9"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 63957eab9741..b36d918a803f 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,7 +4,7 @@ , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus , makeself, perl -, javaBindings ? false, jdk ? null +, javaBindings ? true, jdk ? null # Almost doesn't affect closure size , pythonBindings ? false, python3 ? null , extensionPack ? null, fakeroot ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null diff --git a/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/nixpkgs/pkgs/applications/window-managers/i3/default.nix index 755d1cbf2df8..bef38e7a72ab 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "https://i3wm.org"; - maintainers = with maintainers; [ garbas modulistic fpletz ]; + maintainers = with maintainers; [ modulistic fpletz ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix index 8c775833c28a..fa88a7e26bef 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { - keyboard-layout ''; homepage = https://github.com/PandorasFox/i3lock-color; - maintainers = with maintainers; [ garbas malyn ]; + maintainers = with maintainers; [ malyn ]; license = licenses.bsd3; # Needs the SSE2 instruction set. See upstream issue diff --git a/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix index a0e46c108b7d..f6d797c98e1e 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; homepage = https://github.com/meskarune/i3lock-fancy; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/lock.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock.nix index d4bb3cdc1c2e..27d568ae9ede 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/lock.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/lock.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { for every keystroke. After entering your password, the screen is unlocked again. ''; homepage = https://i3wm.org/i3lock/; - maintainers = with maintainers; [ garbas malyn domenkozar ]; + maintainers = with maintainers; [ malyn domenkozar ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix b/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix index b44aa73bc5ae..20ea0dd03cc3 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/pystatus.nix @@ -3,19 +3,18 @@ python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2019-02-10"; + version = "unstable-2019-06-10"; pname = "i3pystatus"; - disabled = !python3Packages.isPy3k; src = fetchFromGitHub { owner = "enkore"; repo = "i3pystatus"; - rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e"; - sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720"; + rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2"; + sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg"; }; - propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ + propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++ [ libpulseaudio ] ++ extraLibs; libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ]; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/status.nix b/nixpkgs/pkgs/applications/window-managers/i3/status.nix index 65180846c649..17b147da1b2f 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/status.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/status.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A tiling window manager"; homepage = https://i3wm.org; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = [ ]; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix index 8f35cb620cae..24320ff0073b 100644 --- a/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/default.nix @@ -105,7 +105,7 @@ in symlinkJoin rec { homepage = http://way-cooler.org/; license = with licenses; [ mit ]; maintainers = [ maintainers.miltador ]; - broken = stdenv.hostPlatform.isAarch64; # fails to build wc-bg (on aarch64) platforms = platforms.all; + broken = true; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/nixpkgs/pkgs/applications/window-managers/weston/default.nix index 22b6fc30007a..9b6c0103a7c4 100644 --- a/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb +{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null @@ -9,16 +9,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "weston-${version}"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "04p6hal5kalmdp5dxwh2h5qhkkb4dvbsk7l091zvvcq70slj6qsl"; + sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva libwebp wayland-protocols colord lcms2 |