From 418d3f65b619a36416d9be5d33507944f7e45ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 22:59:30 +0000 Subject: [PATCH 1/5] flat-remix-gtk: 20220310 -> 20220321 --- pkgs/data/themes/flat-remix-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index fec900a2d7e7..ec76d48457c5 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -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; From 6139e6c99d44453baac337166511ddca718373c6 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 25 Mar 2022 10:48:12 +0800 Subject: [PATCH 2/5] v2ray-domain-list-community: 20220201175515 -> 20220324104603 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 1115edabcec7..d6fe1a100e7f 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -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; { From 08353710a97da6de25d0a6036cf785da161cdc93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 04:04:09 +0000 Subject: [PATCH 3/5] cudatext: 1.158.2 -> 1.159.0 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 510873f200ea..f22e2407cf26 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -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 = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 5e0f37c78b61..732870b89973 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -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", From 28a3079831a92096b1fd45c18ad55453f14695dd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 21 Mar 2022 14:33:25 +0800 Subject: [PATCH 4/5] airshipper: add libGL to get gfx debug output --- pkgs/games/airshipper/default.nix | 7 ++- pkgs/games/airshipper/default.nix.orig | 84 ++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 pkgs/games/airshipper/default.nix.orig diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 4474d09659e5..4fc37b0ca25c 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -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 diff --git a/pkgs/games/airshipper/default.nix.orig b/pkgs/games/airshipper/default.nix.orig new file mode 100644 index 000000000000..4474d09659e5 --- /dev/null +++ b/pkgs/games/airshipper/default.nix.orig @@ -0,0 +1,84 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, fetchpatch +, openssl +, vulkan-loader +, wayland +, wayland-protocols +, libxkbcommon +, libX11 +, libXrandr +, libXi +, libXcursor +, pkg-config +, makeWrapper +}: + +rustPlatform.buildRustPackage rec { + pname = "airshipper"; + version = "0.7.0"; + + src = fetchFromGitLab { + owner = "Veloren"; + repo = "airshipper"; + rev = "v${version}"; + sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug="; + }; + + patches = [ + # this *should* be merged in time for the release following 0.7.0 + (fetchpatch { + url = "https://github.com/veloren/Airshipper/commit/97fc986ab4cbf59f2c764f647710f19db86031b4.patch"; + hash = "sha256-Sg5et+yP6Z44wV/t9zqKLpg1C0cq6rV+3WrzAH4Za3U="; + }) + ]; + + cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw="; + + buildInputs = [ + openssl + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + 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" + ''; + + postFixup = + let + libPath = lib.makeLibraryPath [ + vulkan-loader + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + in + '' + patchelf --set-rpath "${libPath}" "$out/bin/airshipper" + ''; + + doCheck = false; + cargoBuildFlags = [ "--package" "airshipper" ]; + cargoTestFlags = [ "--package" "airshipper" ]; + + meta = with lib; { + description = "Provides automatic updates for the voxel RPG Veloren."; + homepage = "https://www.veloren.net"; + license = licenses.gpl3; + maintainers = with maintainers; [ yusdacra ]; + }; +} From 8d2df0f499865996db4a8b1819b20afd37d2e7bc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 23 Mar 2022 15:27:39 +0800 Subject: [PATCH 5/5] remove junk --- pkgs/games/airshipper/default.nix.orig | 84 -------------------------- 1 file changed, 84 deletions(-) delete mode 100644 pkgs/games/airshipper/default.nix.orig diff --git a/pkgs/games/airshipper/default.nix.orig b/pkgs/games/airshipper/default.nix.orig deleted file mode 100644 index 4474d09659e5..000000000000 --- a/pkgs/games/airshipper/default.nix.orig +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitLab -, fetchpatch -, openssl -, vulkan-loader -, wayland -, wayland-protocols -, libxkbcommon -, libX11 -, libXrandr -, libXi -, libXcursor -, pkg-config -, makeWrapper -}: - -rustPlatform.buildRustPackage rec { - pname = "airshipper"; - version = "0.7.0"; - - src = fetchFromGitLab { - owner = "Veloren"; - repo = "airshipper"; - rev = "v${version}"; - sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug="; - }; - - patches = [ - # this *should* be merged in time for the release following 0.7.0 - (fetchpatch { - url = "https://github.com/veloren/Airshipper/commit/97fc986ab4cbf59f2c764f647710f19db86031b4.patch"; - hash = "sha256-Sg5et+yP6Z44wV/t9zqKLpg1C0cq6rV+3WrzAH4Za3U="; - }) - ]; - - cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw="; - - buildInputs = [ - openssl - wayland - wayland-protocols - libxkbcommon - libX11 - libXrandr - libXi - libXcursor - ]; - 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" - ''; - - postFixup = - let - libPath = lib.makeLibraryPath [ - vulkan-loader - wayland - wayland-protocols - libxkbcommon - libX11 - libXrandr - libXi - libXcursor - ]; - in - '' - patchelf --set-rpath "${libPath}" "$out/bin/airshipper" - ''; - - doCheck = false; - cargoBuildFlags = [ "--package" "airshipper" ]; - cargoTestFlags = [ "--package" "airshipper" ]; - - meta = with lib; { - description = "Provides automatic updates for the voxel RPG Veloren."; - homepage = "https://www.veloren.net"; - license = licenses.gpl3; - maintainers = with maintainers; [ yusdacra ]; - }; -}