b12f/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] 2022-03-25 12:01:27 +00:00 committed by GitHub
parent 8685cea963 1d425aeca2
commit a9efb8b792
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/cudatext/default.nix
View file

@ -38,13 +38,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cudatext"; pname = "cudatext";
version = "1.158.2"; version = "1.159.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexey-T"; owner = "Alexey-T";
repo = "CudaText"; repo = "CudaText";
rev = version; rev = version;
sha256 = "sha256-YrRG+LaG39q/6Ry3cXo9XUwtvokkBl96XuQfE22QxZI="; sha256 = "sha256-DRVJLzAdhw+ke+B2KFlkgLXgU4+Mq3LQ0PRYg52Aq/o=";
}; };
postPatch = '' postPatch = ''

12
pkgs/applications/editors/cudatext/deps.json
View file

@ -16,8 +16,8 @@
}, },
"ATSynEdit": { "ATSynEdit": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2022.03.17", "rev": "2022.03.23",
"sha256": "sha256-aJZGHodydkqfe2BJLKWUzIX6vbdiGKs4z5ZqtteM6NU=" "sha256": "sha256-D/pQ4TSWUaL97Nau3bGi7rc8MxnvuoDcD7HDNEDwmsk="
}, },
"ATSynEdit_Cmp": { "ATSynEdit_Cmp": {
"owner": "Alexey-T", "owner": "Alexey-T",
@ -26,13 +26,13 @@
}, },
"EControl": { "EControl": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2022.03.17", "rev": "2022.03.23",
"sha256": "sha256-sWRKRhUYf07TIrVWRqtpsYPZu0dPm0EhSIqoDLmkG0Y=" "sha256": "sha256-QXq75VoAnYqAhe3Fvsz1szZyBz4dHEpYJZqTSCR80v8="
}, },
"ATSynEdit_Ex": { "ATSynEdit_Ex": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2022.03.17", "rev": "2022.03.23",
"sha256": "sha256-FndLHJuCOyFr0IGUL4zFRjkEvTyNF3tHUO/Wx5IaV2Y=" "sha256": "sha256-m1rkWvRC1i1nLPIhiG6g8LGU96vTuGGqLFrSzw9A9x0="
}, },
"Python-for-Lazarus": { "Python-for-Lazarus": {
"owner": "Alexey-T", "owner": "Alexey-T",

4
pkgs/data/misc/v2ray-domain-list-community/default.nix
View file

@ -3,12 +3,12 @@
let let
generator = pkgsBuildBuild.buildGoModule rec { generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community"; pname = "v2ray-domain-list-community";
version = "20220201175515"; version = "20220324104603";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "domain-list-community"; repo = "domain-list-community";
rev = version; rev = version;
sha256 = "sha256-vgw6i8djBQDV+fmkVe5CuKMwES/PXGoVe8cTgB5tflo="; sha256 = "sha256-Bd/jwHZ+6cg/cgVggyFI+Nc0FZ9qxI5Rk+y7SmGB08M=";
}; };
vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78="; vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78=";
meta = with lib; { meta = with lib; {

4
pkgs/data/themes/flat-remix-gtk/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flat-remix-gtk"; pname = "flat-remix-gtk";
version = "20220310"; version = "20220321";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "daniruiz"; owner = "daniruiz";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-fKkqMGb1UopjM7hTTury1I3oD5AlHqKP+WLmgAZIQxo="; sha256 = "sha256-QFG/jh3tPO0eflyDQaC1PJL/SavYD/W6rYp26Rxe/2E=";
}; };
dontBuild = true; dontBuild = true;

7
pkgs/games/airshipper/default.nix
View file

@ -3,6 +3,7 @@
, fetchFromGitLab , fetchFromGitLab
, fetchpatch , fetchpatch
, openssl , openssl
, libGL
, vulkan-loader , vulkan-loader
, wayland , wayland
, wayland-protocols , wayland-protocols
@ -49,14 +50,14 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
postInstall = '' postInstall = ''
mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop"
cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" install -Dm444 "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico"
cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico"
''; '';
postFixup = postFixup =
let let
libPath = lib.makeLibraryPath [ libPath = lib.makeLibraryPath [
libGL
vulkan-loader vulkan-loader
wayland wayland
wayland-protocols wayland-protocols