Merge release-21.05 into staging-next-21.05
This commit is contained in:
commit
f69d5bc5d0
@ -1,5 +1,5 @@
|
||||
{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv
|
||||
, gtk3, libXtst, glib, zlib
|
||||
, gtk3, libXtst, glib, zlib, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
@ -25,7 +25,11 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ gtk3 ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
@ -36,6 +40,9 @@ in stdenv.mkDerivation rec {
|
||||
cp -r "$src" "$out/toolbox"
|
||||
chmod -R +w "$out/toolbox"
|
||||
|
||||
fixupPhase
|
||||
gappsWrapperArgsHook
|
||||
|
||||
patchelf \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
"$out/toolbox/toolbox"
|
||||
@ -52,7 +59,8 @@ in stdenv.mkDerivation rec {
|
||||
makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \
|
||||
--run "set -x; cd $out/toolbox" \
|
||||
--add-flags "-data ~/.tla-toolbox" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}"
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
|
||||
echo -e "\nCreating TLA Toolbox icons..."
|
||||
pushd "$src"
|
||||
|
@ -11,7 +11,7 @@ let
|
||||
|
||||
inherit (lib) optionals optionalString;
|
||||
|
||||
version = "1.16.4";
|
||||
version = "1.16.5";
|
||||
|
||||
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
|
||||
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "sha256-rk9rbioWd9MYF5hGVadiB0tTVtpQ+1hyK5kQSHDUNQM=";
|
||||
sha256 = "sha256-e/p+WQjHzJ512l3fMGbXy88/2fpRlFhRMl7rwX9QuoA=";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "3.2.4";
|
||||
version = "3.2.5";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15pjwyvrx4n8gi8n51b14wp54bg4jqapr25p52597zn6ikdxijb6";
|
||||
sha256 = "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x";
|
||||
};
|
||||
|
||||
patches = lib.optional withGdal
|
||||
|
@ -2,11 +2,11 @@
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, fetchurl
|
||||
, lib
|
||||
, libsecret
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, lib
|
||||
, udev
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
@ -17,11 +17,11 @@ let
|
||||
pname = "bitwarden";
|
||||
|
||||
version = {
|
||||
x86_64-linux = "1.24.6";
|
||||
x86_64-linux = "1.26.4";
|
||||
}.${system} or "";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-PaquU2CrtIJS1s9TKshmKxfs0L3Jhvs/sgO4ZrlJFzA=";
|
||||
x86_64-linux = "sha256-PYqLf1Y3SwPFjq8JJMxHrKWKuCqbVpmzugi3DjRNWUg=";
|
||||
}.${system} or "";
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -20535,8 +20535,6 @@ in
|
||||
|
||||
dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { };
|
||||
|
||||
dpdk = throw "The dpdk driver has been renamed to dpdk-mods.";
|
||||
|
||||
exfat-nofuse = callPackage ../os-specific/linux/exfat { };
|
||||
|
||||
evdi = callPackage ../os-specific/linux/evdi { };
|
||||
|
Loading…
x
Reference in New Issue
Block a user