From 96b4a609ec6317004a2fa5e1acb9eb99b0009076 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 29 Apr 2024 22:17:54 +0200 Subject: [PATCH 1/6] openasar: move out of discord --- .../networking/instant-messengers/discord/default.nix | 4 +--- .../discord/openasar.nix => by-name/op/openasar/package.nix} | 0 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/networking/instant-messengers/discord/openasar.nix => by-name/op/openasar/package.nix} (100%) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index b4e0aca9cc58..f236f4df4ff8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -69,14 +69,12 @@ let then ./linux.nix else ./darwin.nix; - openasar = callPackage ./openasar.nix { }; - packages = ( builtins.mapAttrs (_: value: callPackage package (value // { - inherit src version openasar branch; + inherit src version branch; meta = meta // { mainProgram = value.binaryName; }; })) { diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/by-name/op/openasar/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/openasar.nix rename to pkgs/by-name/op/openasar/package.nix From 64a2421703149e007ab672de27c43a1c40c8e993 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 29 Apr 2024 22:21:01 +0200 Subject: [PATCH 2/6] openasar: add update script --- pkgs/by-name/op/openasar/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index dbb05162f12a..444ffa39da91 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nodejs, bash, asar, unzip }: +{ lib, stdenv, fetchFromGitHub, unstableGitUpdater, nodejs, bash, asar, unzip }: stdenv.mkDerivation rec { pname = "openasar"; @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { doCheck = false; + passthru.updateScript = unstableGitUpdater { + # Only has a "nightly" tag (untaged version 0.2 is latest) see https://github.com/GooseMod/OpenAsar/commit/8f79dcef9b1f7732421235a392f06e5bd7382659 + hardcodeZeroVersion = true; + }; + meta = with lib; { description = "Open-source alternative of Discord desktop's \"app.asar\"."; homepage = "https://openasar.dev"; From 4f31386c2b66ecb834b702810dede6d9a92687d2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 29 Apr 2024 22:22:55 +0200 Subject: [PATCH 3/6] openasar: unstable-2023-10-24 -> 0-unstable-2024-01-13 --- pkgs/by-name/op/openasar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index 444ffa39da91..8ab0f4a61650 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2023-10-24"; + version = "0-unstable-2024-01-13"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "eee9bab822e3dbd97a735d0050ddd41ba27917f2"; - hash = "sha256-SSWQSqGgTZjowgrzF6qHZDTw/Y9xFHNTZvetxqZubYI="; + rev = "4f264d860a5a6a32e1862ce26178b9cf6402335d"; + hash = "sha256-NPUUDqntsMxnT/RN5M9DtLDwJXDyjOED4GlXa1oU8l8="; }; postPatch = '' From 50455b866f01d44aec1ae2a21ce094ba5a4f2e58 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 29 Apr 2024 22:23:36 +0200 Subject: [PATCH 4/6] openasar: add jopejoe1 and Scrumplex as maintainer --- pkgs/by-name/op/openasar/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index 8ab0f4a61650..219b7809dcb9 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Open-source alternative of Discord desktop's \"app.asar\"."; homepage = "https://openasar.dev"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ Scrumplex jopejoe1 ]; platforms = nodejs.meta.platforms; }; } From 8f03eec5015bad2885a5c95932dd2dfae781fb79 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 29 Apr 2024 22:26:02 +0200 Subject: [PATCH 5/6] openasar: change license to agpl3Only --- pkgs/by-name/op/openasar/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index 219b7809dcb9..4a17deed4e3d 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-source alternative of Discord desktop's \"app.asar\"."; homepage = "https://openasar.dev"; - license = licenses.mit; + license = licenses.agpl3Only; maintainers = with maintainers; [ Scrumplex jopejoe1 ]; platforms = nodejs.meta.platforms; }; From 8852469565ce138e072b3325902bf446e3f3c6b0 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 30 Apr 2024 18:06:13 +0200 Subject: [PATCH 6/6] openasar: clean up --- pkgs/by-name/op/openasar/package.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index 4a17deed4e3d..a03e3205ffc3 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -1,6 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, unstableGitUpdater, nodejs, bash, asar, unzip }: +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + nodejs, + bash, + asar, + unzip, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openasar"; version = "0-unstable-2024-01-13"; @@ -23,7 +32,7 @@ stdenv.mkDerivation rec { runHook preBuild bash scripts/injectPolyfills.sh - substituteInPlace src/index.js --replace 'nightly' '${version}' + substituteInPlace src/index.js --replace 'nightly' '${finalAttrs.version}' ${nodejs}/bin/node scripts/strip.js ${asar}/bin/asar pack src app.asar @@ -49,7 +58,10 @@ stdenv.mkDerivation rec { description = "Open-source alternative of Discord desktop's \"app.asar\"."; homepage = "https://openasar.dev"; license = licenses.agpl3Only; - maintainers = with maintainers; [ Scrumplex jopejoe1 ]; + maintainers = with maintainers; [ + Scrumplex + jopejoe1 + ]; platforms = nodejs.meta.platforms; }; -} +})