Merge release-21.05 into staging-next-21.05

This commit is contained in:
github-actions[bot] 2021-07-19 00:02:56 +00:00 committed by GitHub
commit 06b06a16b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 3 deletions

View File

@ -54,6 +54,8 @@ in stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName}
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
# Without || true the install would fail on case-insensitive filesystems
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true
ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png
ln -s "${desktopItem}/share/applications" $out/share/

View File

@ -0,0 +1,28 @@
{ stdenv, lib, fetchurl, makeWrapper, python3, gettext
, pyqt5, setuptools, requests
}:
stdenv.mkDerivation rec {
pname = "fs-uae-launcher";
version = "3.0.5";
src = fetchurl {
url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz";
sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97";
};
makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ makeWrapper python3 gettext ];
buildInputs = [ pyqt5 setuptools requests ];
postInstall = ''
wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH"
'';
meta = {
description = "Graphical front-end for the FS-UAE emulator";
license = lib.licenses.gpl2Plus;
homepage = "https://fs-uae.net";
maintainers = with lib; [ maintainers.sander ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "7.5.9";
version = "7.5.10";
excludedPackages = [ "release_publisher" ];
@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-khk2K4V/FnvZ5/DHu/0dRBgkUipJ0vzVujyqpkttft8=";
sha256 = "sha256-e+Nkw9TLQoJfJUSXEGvqqWJMcwjNoN0JoB/zfIPHxYw=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-QMWcmedMOB7EBAWOl4t/kZ6G4Q7D9XxMzTh4BkW+pPI=";
sha256 = "sha256-xwbd5Qu+btRSqowXCVhmceOGiXiSHeBamJi0Tx79zsc=";
};
vendorSha256 = "sha256-FdotpFi1ee92mCX59bBuqzCyjIq6yujWixReYxmKbS8=";

View File

@ -30785,6 +30785,10 @@ in
fsuae = callPackage ../misc/emulators/fs-uae { };
fsuae-launcher = callPackage ../misc/emulators/fs-uae-launcher {
inherit (python3Packages) pyqt5 setuptools requests;
};
putty = callPackage ../applications/networking/remote/putty {
gtk2 = gtk2-x11;
};