public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-07 18:24:29 +00:00
committed by GitHub
parent 7b23f8694f 6eef66f4c8
commit 1ae6d3d02f
70 changed files with 870 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/audacity/default.nix
+2
View File
@@ -15,6 +15,7 @@
, lilv
, serd
, sord
, sqlite
, sratom
, suil
, alsaLib
@@ -130,6 +131,7 @@ stdenv.mkDerivation rec {
sord
soundtouch
soxr
sqlite
sratom
suil
twolame
pkgs/applications/blockchains/turbo-geth.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "turbo-geth";
version = "2021.04.05";
version = "2021.05.01";
src = fetchFromGitHub {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RTPNJASNFyZ6tDJj0WOqALyxRsOLJzPy0qA1c2sSxys=";
sha256 = "sha256-zvxtBK0/6fShxAZfU4gTV0XiP6TzhKFNsADSZA9gv0Y=";
};
vendorSha256 = "01c7lb6n00ws60dfybir0z5dbn6h68p5s4hbq0ga2g7drf3l3y0p";
vendorSha256 = "0c8p6djs0zcci8sh4zgzky89155mr4cfqlax025618x8vngrsxf2";
runVend = true;
subPackages = [
pkgs/applications/editors/zile/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "zile";
version = "2.6.1";
version = "2.6.2";
src = fetchurl {
url = "mirror://gnu/zile/${pname}-${version}.tar.gz";
hash = "sha256-v7rN33aOORc6J0Z5JP5AmZCj6XvjYyoCl5hl+7mvAnc=";
hash = "sha256-d+t9r/PJi9yI2qGsBA3MynK4HcMvwxZuB53Xpj5Cx0E=";
};
buildInputs = [
pkgs/applications/graphics/solvespace/default.nix
+2 -2
View File
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
pname = "solvespace";
version = "v3.0.rc2";
version = "v3.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1z0873gwcr0hybrpqy4hwislir6k2zb4s62lbsivq5nbkizy7gjm";
sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9";
fetchSubmodules = true;
};
pkgs/applications/misc/dbeaver/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@
}:
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
pname = "dbeaver";
version = "21.0.4"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub {
pkgs/applications/networking/browsers/brave/default.nix
+6 -2
View File
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.23.71";
version = "1.24.82";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "17ajn1vx5xwlp2yvjf1hr8vw3b7hiribv5gaipyb37zrhkff241h";
sha256 = "iWUJ5yLWWQvg510Atf+Pd9ya/1NnMNW2Sp/RVFn4PCc=";
};
dontConfigure = true;
@@ -109,6 +109,8 @@ stdenv.mkDerivation rec {
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
installPhase = ''
runHook preInstall
mkdir -p $out $out/bin
cp -R usr/share $out
@@ -148,6 +150,8 @@ stdenv.mkDerivation rec {
# Replace xdg-settings and xdg-mime
ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
runHook postInstall
'';
installCheckPhase = ''
pkgs/applications/networking/browsers/chromium/common.nix
+2
View File
@@ -20,6 +20,7 @@
, pipewire
, libva
, libdrm, wayland, mesa, libxkbcommon # Ozone
, curl
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
@@ -155,6 +156,7 @@ let
pipewire
libva
libdrm wayland mesa.drivers libxkbcommon
curl
] ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
pkgs/applications/networking/browsers/lagrange/default.nix
+4 -3
View File
@@ -10,23 +10,24 @@
, pcre
, SDL2
, AppKit
, zlib
}:
stdenv.mkDerivation rec {
pname = "lagrange";
version = "1.3.4";
version = "1.4.0";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
sha256 = "sha256-hPNqyTH2oMPytvYAF9sjEQ9ibaJYDODA33ZrDuWnloU=";
sha256 = "sha256-l8k81w+ilkOk8iQTc46+HK40JQZ0dCYVAvkGTrEpZSQ=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libunistring mpg123 openssl pcre SDL2 ]
buildInputs = [ libunistring mpg123 openssl pcre SDL2 zlib ]
++ lib.optional stdenv.isDarwin AppKit;
hardeningDisable = lib.optional (!stdenv.cc.isClang) "format";
pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
+10 -4
View File
@@ -43,18 +43,18 @@ let
in
stdenv.mkDerivation rec {
pname = "mattermost-desktop";
version = "4.5.2";
version = "4.6.2";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
sha256 = "0r9xmhzif1ia1m53yr59q6p3niyq3jv3vgv4703x68jmd46f91n6";
sha256 = "0i836bc0gx375a9fm2cdxg84k03zhpx1z6jqxndf2m8pkfsblc3x";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";
sha256 = "1h8lw06p3cqz9dkgbhfmzcrzjsir5cfhx28xm4zrmvkj4yfzbcnv";
sha256 = "04jv9hkmkh0jipv0fjdprnp5kmkjvf3c0fah6ysi21wmnmp5ab3m";
}
else
throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";
@@ -63,9 +63,13 @@ in
dontConfigure = true;
dontPatchELF = true;
buildInputs = [ wrapGAppsHook gtk3 hicolor-icon-theme ];
nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = [ gtk3 hicolor-icon-theme ];
installPhase = ''
runHook preInstall
mkdir -p $out/share/mattermost-desktop
cp -R . $out/share/mattermost-desktop
@@ -86,6 +90,8 @@ in
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${rpath}:$out/share/mattermost-desktop" \
$out/share/mattermost-desktop/mattermost-desktop
runHook postInstall
'';
meta = with lib; {
pkgs/applications/office/libreoffice/src-fresh/download.nix
+4 -4
View File
@@ -637,11 +637,11 @@
md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
}
{
name = "neon-0.31.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz";
sha256 = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d";
name = "neon-0.31.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz";
sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678";
md5 = "";
md5name = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d-neon-0.31.1.tar.gz";
md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz";
}
{
name = "nss-3.55-with-nspr-4.27.tar.gz";
pkgs/applications/office/libreoffice/src-fresh/primary.nix
+4 -4
View File
@@ -8,7 +8,7 @@ rec {
major = "7";
minor = "1";
patch = "2";
patch = "3";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1y19p9701msf6jjzp9d5ighvmyjzj68qzhm2bk3l5p16ys8qk9bb";
sha256 = "1gr9c8kv7nc9kaag1sw9r36843pfba1my80afx7p0lxj0k8pzbrm";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "1j5251lbc35d521d92w52lgps0v5pg8mhr8y3r6x2nl9p0gvw957";
sha256 = "09xkr6jmnwq55savw9xjsy8l8zcyflnsg4nfwhknvm3ls8sqj4w6";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
sha256 = "1bsrkmzhhpyrmi7akmdfvz4zb543fc093az9965k14rp8l6rhnvf";
sha256 = "0dc981vmxfdwlyfgq84axkr99d8chm1ypknj39v0cmaqn56lpwg0";
};
}
pkgs/applications/version-management/git-and-tools/stgit/default.nix
+4 -3
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "stgit";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "stacked-git";
repo = "stgit";
rev = "v${version}";
sha256 = "16q8994widg040n1ag4m82kbn3r02n39ah7dvwa7aixhw5y35vlm";
sha256 = "sha256-gfPf1yRmx1Mn1TyCBWmjQJBgXLlZrDcew32C9o6uNYk=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -24,7 +24,8 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "A patch manager implemented on top of Git";
homepage = "https://stacked-git.github.io/";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.unix;
maintainers = with maintainers; [ jshholland ];
};
}
pkgs/applications/video/jellyfin-media-player/default.nix
+5 -4
View File
@@ -26,18 +26,18 @@
mkDerivation rec {
pname = "jellyfin-media-player";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-media-player";
rev = "v${version}";
sha256 = "sha256-A3vo6678XFUV2RN1lcGYbIjCbBjR1oeORcidKZVnImg=";
sha256 = "sha256-u19WJupSqIzA8W0QG9mue8Ticy+HxBAniuKIUFl7ONs=";
};
jmpDist = fetchzip {
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-3/dist.zip";
sha256 = "sha256-Rb0q3NFmnYkueq0JkIWkX0C/oL+gFrNOELCNfh9X/P4=";
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.3/dist.zip";
sha256 = "sha256-P7WEYbVvpaVLwMgqC2e8QtMOaJclg0bX78J1fdGzcCU=";
};
patches = [
@@ -106,5 +106,6 @@ mkDerivation rec {
license = with licenses; [ gpl2Only mit ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ jojosch ];
mainProgram = "jellyfinmediaplayer";
};
}
pkgs/applications/window-managers/dwl/default.nix
+5 -17
View File
@@ -5,6 +5,7 @@
, libinput
, libxcb
, libxkbcommon
, pixman
, wayland
, wayland-protocols
, wlroots
@@ -16,32 +17,18 @@
}:
let
# Add two patches to fix compile errors with wlroots 0.13:
totalPatches = patches ++ [
# Fix the renamed constant WLR_KEY_PRESSED => WL_KEYBOARD_KEY_STATE_PRESSED
# https://github.com/djpohly/dwl/pull/66
(fetchpatch {
url = "https://github.com/djpohly/dwl/commit/a42613db9d9f6debfa4fb2363d75af9457d238ed.patch";
sha256 = "0h76hx1fhazi07gqg7sljh13f91v6bvjy7m9qqmimhvqgfwdcc0j";
})
# Use the new signature for wlr_backend_autocreate, which removes an argument:
# https://github.com/djpohly/dwl/pull/76
(fetchpatch {
url = "https://github.com/djpohly/dwl/commit/0ff13cf216056a36a261f4eed53c6a864989a9fb.patch";
sha256 = "18clpdb4il1vxf1b0cx0qrwild68s9dism8ab66zpmvxs5qag2dm";
})
];
totalPatches = patches ++ [ ];
in
stdenv.mkDerivation rec {
pname = "dwl";
version = "0.2";
version = "0.2.1";
src = fetchFromGitHub {
owner = "djpohly";
repo = pname;
rev = "v${version}";
sha256 = "gUaFTkpIQDswEubllMgvxPfCaEYFO7mODzjPyW7XsGQ=";
sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs=";
};
nativeBuildInputs = [ pkg-config ];
@@ -49,6 +36,7 @@ stdenv.mkDerivation rec {
libinput
libxcb
libxkbcommon
pixman
wayland
wayland-protocols
wlroots