forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
commit
a9efb8b792
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.158.2";
|
||||
version = "1.159.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-YrRG+LaG39q/6Ry3cXo9XUwtvokkBl96XuQfE22QxZI=";
|
||||
sha256 = "sha256-DRVJLzAdhw+ke+B2KFlkgLXgU4+Mq3LQ0PRYg52Aq/o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.03.17",
|
||||
"sha256": "sha256-aJZGHodydkqfe2BJLKWUzIX6vbdiGKs4z5ZqtteM6NU="
|
||||
"rev": "2022.03.23",
|
||||
"sha256": "sha256-D/pQ4TSWUaL97Nau3bGi7rc8MxnvuoDcD7HDNEDwmsk="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
@ -26,13 +26,13 @@
|
|||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.03.17",
|
||||
"sha256": "sha256-sWRKRhUYf07TIrVWRqtpsYPZu0dPm0EhSIqoDLmkG0Y="
|
||||
"rev": "2022.03.23",
|
||||
"sha256": "sha256-QXq75VoAnYqAhe3Fvsz1szZyBz4dHEpYJZqTSCR80v8="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.03.17",
|
||||
"sha256": "sha256-FndLHJuCOyFr0IGUL4zFRjkEvTyNF3tHUO/Wx5IaV2Y="
|
||||
"rev": "2022.03.23",
|
||||
"sha256": "sha256-m1rkWvRC1i1nLPIhiG6g8LGU96vTuGGqLFrSzw9A9x0="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20220201175515";
|
||||
version = "20220324104603";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
sha256 = "sha256-vgw6i8djBQDV+fmkVe5CuKMwES/PXGoVe8cTgB5tflo=";
|
||||
sha256 = "sha256-Bd/jwHZ+6cg/cgVggyFI+Nc0FZ9qxI5Rk+y7SmGB08M=";
|
||||
};
|
||||
vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78=";
|
||||
meta = with lib; {
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gtk";
|
||||
version = "20220310";
|
||||
version = "20220321";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-fKkqMGb1UopjM7hTTury1I3oD5AlHqKP+WLmgAZIQxo=";
|
||||
sha256 = "sha256-QFG/jh3tPO0eflyDQaC1PJL/SavYD/W6rYp26Rxe/2E=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, openssl
|
||||
, libGL
|
||||
, vulkan-loader
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
|
@ -49,14 +50,14 @@ rustPlatform.buildRustPackage rec {
|
|||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons"
|
||||
cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications"
|
||||
cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico"
|
||||
install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop"
|
||||
install -Dm444 "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico"
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libGL
|
||||
vulkan-loader
|
||||
wayland
|
||||
wayland-protocols
|
||||
|
|
Loading…
Reference in a new issue