diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-19 00:05:46 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-19 00:05:46 +0000 |
commit | 7443e787f65c79d114a7cdeabb8e44f54e40abaa (patch) | |
tree | 26428a5695a1c061d0abe39a72c0665a6a4454e6 /pkgs/applications | |
parent | c2b276292a38b8a038a606a6f37a9cba0dc5cf25 (diff) | |
parent | 3cabedec11f9100fe126dbe7d9e49f94e7c66af1 (diff) | |
download | nixpkgs-7443e787f65c79d114a7cdeabb8e44f54e40abaa.tar nixpkgs-7443e787f65c79d114a7cdeabb8e44f54e40abaa.tar.gz nixpkgs-7443e787f65c79d114a7cdeabb8e44f54e40abaa.tar.bz2 nixpkgs-7443e787f65c79d114a7cdeabb8e44f54e40abaa.tar.lz nixpkgs-7443e787f65c79d114a7cdeabb8e44f54e40abaa.tar.xz nixpkgs-7443e787f65c79d114a7cdeabb8e44f54e40abaa.tar.zst nixpkgs-7443e787f65c79d114a7cdeabb8e44f54e40abaa.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/applications')
18 files changed, 93 insertions, 113 deletions
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 0692f40e35f..1c6c41a0e72 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.29.0"; + version = "2.30.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1y4xvnwh2mqbc39pmnpgjg8mlx208s2pipm7dazq4bgmay7k9zh0"; + sha256 = "0xh28m3slzg6bp0fm183m62ydzqkvj384j4dwsfalgz4ndwvy595"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix b/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix index 3af53cda492..f03aa92c3af 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { buildInputs = [ emacs ]; - buildPhase = ":"; + dontBuild = true; installPhase = '' install -d $out/share/emacs/site-lisp diff --git a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix index f35a175312c..196a1d122d6 100644 --- a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix +++ b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix @@ -27,7 +27,7 @@ rec { }); buildKakounePluginFrom2Nix = attrs: buildKakounePlugin ({ - buildPhase = ":"; - configurePhase = ":"; + dontBuild = true; + dontConfigure = true; } // attrs); } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index dc22a92238e..23af04462ba 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -58,7 +58,7 @@ in homepage = "https://code.visualstudio.com/"; downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica ]; + maintainers = with maintainers; [ eadwu synthetica maxeaubrey ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 0daaad2f265..d341c982199 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.2.3"; + version = "1.2.5"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9"; + sha256 = "0780517gjc97wb2g67pwdv3fz3sqxm2ica1hdbrhqm4rfbnb28xr"; }; buildInputs = [ diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 3bf3dda7ca4..bf53848b5d3 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, runtimeShell }: -stdenv.mkDerivation { - name = "thinkingrock-binary-2.2.1"; +stdenv.mkDerivation rec { + pname = "thinkingrock-binary"; + version = "2.2.1"; src = fetchurl { - url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz"; + url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%20${version}/tr-${version}.tar.gz"; sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm"; }; @@ -30,7 +31,7 @@ stdenv.mkDerivation { chmod +x $out/bin/thinkingrock ''; - installPhase = ":"; + dontInstall = true; meta = with lib; { description = "Task management system"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6860612b888..d7b14cb4ba6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "91.0.4472.114", - "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1", - "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys", + "version": "91.0.4472.164", + "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4", + "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr", "deps": { "gn": { "version": "2021-04-06", @@ -55,8 +55,8 @@ "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" }, "ungoogled-patches": { - "rev": "91.0.4472.114-1", - "sha256": "1xb5g3hybaiwn3y1zw1fxd3g0zwmvplrs06sdqnxzsr1qm8b874h" + "rev": "91.0.4472.164-1", + "sha256": "1vlirqrsliyl1dvm511p5axzvhvqil1m1jlk5zngvl9zfbdjw910" } } } diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index dc22ab41d8b..f4ddc038d2b 100644 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -53,6 +53,6 @@ buildGoPackage rec { description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.unix; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index e4a8c0c0abb..c255ccd1ef8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -62,6 +62,7 @@ let marsam timstott zimbatm + maxeaubrey ]; }; } // attrs'); diff --git a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index 0134fac0e20..ee43e4475d7 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -2,12 +2,12 @@ let pname = "deltachat-electron"; - version = "1.15.5"; + version = "1.20.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; - sha256 = "sha256-BTGwgC0zSr1tq/X4v/fS/12E7/mGVYQ0m+Bt6o7VL4o="; + sha256 = "sha256-u0YjaXb+6BOBWaZANPcaxp7maqlBWAtecSsCGbr67dk="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/applications/science/biology/macse/default.nix index c78e142dcc6..66f4a1671d1 100644 --- a/pkgs/applications/science/biology/macse/default.nix +++ b/pkgs/applications/science/biology/macse/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; + dontUnpack = true; dontBuild = true; - unpackPhase = ":"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index 63aa34c78a1..cbf07135dec 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, fetchgit, bison, flex }: - -with lib; +{ lib, stdenv, fetchFromGitHub, bison, flex }: stdenv.mkDerivation rec { pname = "pcalc"; - version = "20141224"; + version = "20181202"; - src = fetchgit { - url = "git://git.code.sf.net/p/pcalc/code"; - rev = "181d60d3c880da4344fef7138065943eb3b9255f"; - sha256 = "1hd5bh20j5xzvv6qa0fmzmv0h8sf38r7zgi7y0b6nk17pjq33v90"; + src = fetchFromGitHub { + owner = "vapier"; + repo = "pcalc"; + rev = "d93be9e19ecc0b2674cf00ec91cbb79d32ccb01d"; + sha256 = "sha256-m4xdsEJGKxLgp/d5ipxQ+cKG3z7rlvpPL6hELnDu6Hk="; }; makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ]; - buildInputs = [ bison flex ]; + nativeBuildInputs = [ bison flex ]; + + enableParallelBuilding = true; - meta = { - homepage = "http://pcalc.sourceforge.net/"; + meta = with lib; { + homepage = "https://vapier.github.io/pcalc/"; description = "Programmer's calculator"; license = licenses.gpl2; maintainers = with lib.maintainers; [ ftrvxmtrx ]; diff --git a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix index ba1a0241ffe..7cdc5a0c635 100644 --- a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm"; + sha256 = "sha256-mQeeeCOxhUTiUcOJ1OiIiJ+7envAIGO67Bp4EAf4sIE="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index cb2338c0e18..6f701779d4d 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -23,13 +23,13 @@ in { ] mkPlugin); femon = stdenv.mkDerivation rec { - - name = "vdr-femon-2.4.0"; + pname = "vdr-femon"; + version = "2.4.0"; buildInputs = [ vdr ]; src = fetchurl { - url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${name}.tgz"; + url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${pname}-${version}.tgz"; sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp"; }; @@ -48,7 +48,6 @@ in { }; vaapidevice = stdenv.mkDerivation { - pname = "vdr-vaapidevice"; version = "20190525"; @@ -84,7 +83,8 @@ in { markad = stdenv.mkDerivation rec { - name = "vdr-markad-2017-03-13"; + pname = "vdr-markad"; + version = "unstable-2017-03-13"; src = fetchgit { url = "git://projects.vdr-developer.org/vdr-plugin-markad.git"; @@ -176,18 +176,16 @@ in { }; - vnsiserver = let - name = "vnsiserver"; + vnsiserver = stdenv.mkDerivation rec { + pname = "vdr-vnsiserver"; version = "1.8.0"; - in stdenv.mkDerivation { - name = "vdr-${name}-${version}"; buildInputs = [ vdr ]; installFlags = [ "DESTDIR=$(out)" ]; src = fetchFromGitHub { - repo = "vdr-plugin-${name}"; + repo = "vdr-plugin-vnsiserver"; owner = "FernetMenta"; rev = "v${version}"; sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw"; @@ -204,7 +202,8 @@ in { }; text2skin = stdenv.mkDerivation { - name = "vdr-text2skin-1.3.4-20170702"; + pname = "vdr-text2skin"; + version = "1.3.4-20170702"; src = fetchgit { url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git"; @@ -226,7 +225,7 @@ in { mkdir -p $out/lib/vdr ''; - installPhase = ":"; + dontInstall = true; meta = with lib; { homepage = "https://projects.vdr-developer.org/projects/plg-text2skin"; @@ -308,7 +307,6 @@ in { in stdenv.mkDerivation rec { pname = "vdr-fritzbox"; - version = "1.5.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index cc893680674..fd67aa554f0 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -8,12 +8,12 @@ }: buildPythonApplication rec { - version = "1.28.6"; + version = "1.29.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "1d44906f7ab738ba2d1785130ed31b16111eee6dc5a1dbd7252091dae48c5281"; + sha256 = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; }; # lots of networking and other fails diff --git a/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch b/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch deleted file mode 100644 index 82ce050b587..00000000000 --- a/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 95a7293b30ff7b89d615daea00269ed32f4b70a2 Mon Sep 17 00:00:00 2001 -From: Geoffrey McRae <geoff@hostfission.com> -Date: Tue, 23 Feb 2021 20:25:30 +1100 -Subject: [PATCH] [client] all: fix more `maybe-uninitialized` when `-O3` is in - use - -Closes #475 ---- - client/renderers/EGL/egl.c | 3 ++- - client/src/main.c | 5 +++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c -index b7a5644..72ce50d 100644 ---- a/client/renderers/EGL/egl.c -+++ b/client/renderers/EGL/egl.c -@@ -271,7 +271,8 @@ static void egl_calc_mouse_size(struct Inst * this) - if (!this->formatValid) - return; - -- int w, h; -+ int w = 0, h = 0; -+ - switch(this->format.rotate) - { - case LG_ROTATE_0: -diff --git a/client/src/main.c b/client/src/main.c -index f05e929..f5d6fad 100644 ---- a/client/src/main.c -+++ b/client/src/main.c -@@ -186,8 +186,9 @@ static void updatePositionInfo(void) - if (!g_state.haveSrcSize) - goto done; - -- float srcW; -- float srcH; -+ float srcW = 0.0f; -+ float srcH = 0.0f; -+ - switch(params.winRotate) - { - case LG_ROTATE_0: --- -2.30.1 - diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 345018bbe4e..0d158cc3f96 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,40 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol -, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp -, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver -, expat, libbfd + +{ stdenv, lib, fetchFromGitHub, fetchpatch, makeDesktopItem, cmake, pkg-config +, SDL, SDL2_ttf, freefont_ttf, spice-protocol, nettle, libbfd, fontconfig +, libXi, libXScrnSaver, libXinerama +, wayland, wayland-protocols }: +let + desktopItem = makeDesktopItem { + name = "looking-glass-client"; + desktopName = "Looking Glass Client"; + type = "Application"; + exec = "looking-glass-client"; + icon = "lg-logo"; + terminal = true; + }; +in stdenv.mkDerivation rec { pname = "looking-glass-client"; - version = "B3"; + version = "B4"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f"; + sha256 = "0fwmz0l1dcfwklgvxmv0galgj2q3nss90kc3jwgf6n80x27rsnhf"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle - libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols - libffi libGLU libXScrnSaver expat libbfd - ]; - - patches = [ - # error: ‘h’ may be used uninitialized in this function [-Werror=maybe-uninitialized] - # Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3. - # Including our own patch here since upstream commit patch doesnt apply cleanly on B3 - ./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch + SDL SDL2_ttf freefont_ttf spice-protocol + libbfd nettle fontconfig + libXi libXScrnSaver libXinerama + wayland wayland-protocols ]; - patchFlags = "-p2"; - sourceRoot = "source/client"; NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. + postUnpack = '' + echo $version > source/VERSION + export sourceRoot="source/client" + ''; + + postInstall = '' + mkdir -p $out/share/pixmaps + ln -s ${desktopItem}/share/applications $out/share/ + cp $src/resources/lg-logo.png $out/share/pixmaps + ''; + meta = with lib; { description = "A KVM Frame Relay (KVMFR) implementation"; longDescription = '' @@ -46,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://looking-glass.io/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ alexbakker ]; + maintainers = with maintainers; [ alexbakker babbaj ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7fd01a8ffa9..3c9e7ae8c52 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -86,6 +86,16 @@ stdenv.mkDerivation rec { patches = [ ./fix-qemu-ga.patch ./9p-ignore-noatime.patch + (fetchpatch { + name = "CVE-2021-3545.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/121841b25d72d13f8cad554363138c360f1250ea.patch"; + sha256 = "13dgfd8dmxcalh2nvb68iv0kyv4xxrvpdqdxf1h3bjr4451glag1"; + }) + (fetchpatch { + name = "CVE-2021-3546.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/9f22893adcb02580aee5968f32baa2cd109b3ec2.patch"; + sha256 = "1vkhm9vl671y4cra60b6704339qk1h5dyyb3dfvmvpsvfyh2pm7n"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { |