diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-23 19:08:51 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-23 19:09:00 +0200 |
commit | 2096642430b4ec87e2c34ff37f1b2f5c9665a38b (patch) | |
tree | 716bd3257d5e9541e67a02bb263480da8bdf9baa /pkgs/by-name/re | |
parent | ce08ce6dacfb2ee4be50e0b96bb37d4b3351f23c (diff) | |
parent | 5005a65bcc90157005b57c25bb92e71f0fd9daf7 (diff) |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: - pkgs/os-specific/windows/mingw-w64/default.nix
Diffstat (limited to 'pkgs/by-name/re')
-rw-r--r-- | pkgs/by-name/re/release-plz/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/re/renode-dts2repl/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/re/renode/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/re/revolt-desktop/package.nix | 85 |
4 files changed, 93 insertions, 8 deletions
diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index f2ea059714da1..966a989d2b136 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.72"; + version = "0.3.73"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-wc/+X/P/FKDpvw0U7ItIgzHbqsEnngHk4wt7Pjzk594="; + hash = "sha256-QRKXg/6hiF7P3yQ6wFZ5JG2aRaGX7rQU0DB2L97LKsg="; }; - cargoHash = "sha256-RB+NXuASfpx6tZJfG18Hj7JOfXK9FIqSD7QaDfGUHi4="; + cargoHash = "sha256-aDm4hWosaeAI21iw2Uo315u01kjXCK+LaBwt9jlwgYw="; nativeBuildInputs = [ installShellFiles pkg-config perl ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 92bf643dc4219..12d84cb6d424a 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-06-11"; + version = "0-unstable-2024-06-21"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "7360c07d2ef1e32661a0efa04323e799d400a58e"; - hash = "sha256-lN3IgLOAeMexWG5zQB9RxRld7Snl3aqNJt3fZV5hdnM="; + rev = "57a24220c5be33b2974c885bbe2f680c3799f3ce"; + hash = "sha256-0KmJujGcsElzsVU0tsXtXLzh3oL8wBwai8gtxUu02H0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index c296d7c85967d..561dfca37aa58 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -23,8 +23,8 @@ let src = fetchFromGitHub { owner = "robotframework"; repo = "robotframework"; - rev = "v6.0.2"; - hash = "sha256-c7pPcDgqyqWQtiMbLQbQd0nAgx4TIFUFHrlBVDNdr8M="; + rev = "v6.1"; + hash = "sha256-l1VupBKi52UWqJMisT2CVnXph3fGxB63mBVvYdM1NWE="; }; })) ]; diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix new file mode 100644 index 0000000000000..6a7461f3b13ea --- /dev/null +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -0,0 +1,85 @@ +{ stdenvNoCC +, lib +, fetchurl +, fetchzip +, appimageTools +, makeWrapper +, electron +}: +(stdenvNoCC.mkDerivation { + pname = "revolt-desktop"; + version = "1.0.6"; + dontConfigure = true; + dontBuild = true; + meta = with lib; { + description = "Open source user-first chat platform"; + homepage = "https://revolt.chat/"; + changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + heyimnova + caralice + ]; + platforms = platforms.linux ++ platforms.darwin; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "revolt-desktop"; + }; + nativeBuildInputs = [ makeWrapper ]; +}).overrideAttrs + ( + final: prev: + let + inherit (prev) pname version; + in + if stdenvNoCC.isLinux then + { + src = fetchurl { + url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage"; + sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY="; + }; + + appimageContents = appimageTools.extractType2 { inherit (final) src pname version; }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/{applications,revolt-desktop} + + cp -a ${final.appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${final.appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop + cp -a ${final.appimageContents}/usr/share/icons $out/share/icons + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + ''; + } + else + assert stdenvNoCC.isDarwin; + { + src = fetchzip { + url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-${version}-mac.zip"; + hash = "sha256-XxmKcIfJtHfi6SahrRHMeTAuyVqiN9Yhayjis10vD2w="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications/" "$out/bin/" + mv Revolt.app "$out/Applications/" + makeWrapper "$out/Applications/Revolt.app/Contents/MacOS/Revolt" "$out/bin/${pname}" + + runHook postInstall + ''; + } + ) |