diff options
author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-03-03 19:15:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-03 19:15:35 +0100 |
commit | f09b7dc6a54d00a4f30b6e056cb68a1066dfdadc (patch) | |
tree | c04f1854ac197773a1b5df4b0ad652a5b82610e0 /pkgs | |
parent | 12012f534d291f28d12ba92d5826ecded0669184 (diff) | |
parent | 47b7eb8fd946cd4b8a62fc518147491479b5b925 (diff) |
Merge pull request #289961 from leona-ya/vikunja-0.23.0
vikunja: 0.22.1 -> 0.23.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/vi/vikunja/package.nix | 166 | ||||
-rw-r--r-- | pkgs/servers/web-apps/vikunja/api.nix | 59 | ||||
-rw-r--r-- | pkgs/servers/web-apps/vikunja/frontend.nix | 35 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
5 files changed, 168 insertions, 97 deletions
diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix new file mode 100644 index 0000000000000..cc9891f3ccd15 --- /dev/null +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -0,0 +1,166 @@ +{ lib, fetchFromGitHub, stdenv, stdenvNoCC, nodePackages, buildGoModule, jq, mage, writeShellScriptBin, nixosTests, buildNpmPackage, moreutils, cacert }: + +let + version = "0.23.0"; + src = fetchFromGitHub { + owner = "go-vikunja"; + repo = "vikunja"; + rev = "v${version}"; + hash = "sha256-DGdJ/qO86o4LDB2Soio6/zd5S0su6ffrtT+iOn1eQnA="; + }; + + frontend = stdenv.mkDerivation (finalAttrs: { + pname = "vikunja-frontend"; + inherit version src; + + postPatch = '' + cd frontend + ''; + + pnpmDeps = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-pnpm-deps"; + inherit (finalAttrs) src version; + + nativeBuildInputs = [ + jq + nodePackages.pnpm + moreutils + cacert + ]; + + pnpmPatch = builtins.toJSON { + pnpm.supportedArchitectures = { + os = [ "linux" ]; + cpu = [ "x64" "arm64" ]; + }; + }; + + postPatch = '' + cd frontend + mv package.json package.json.orig + jq --raw-output ". * $pnpmPatch" package.json.orig > package.json + ''; + + # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56 + installPhase = '' + export HOME=$(mktemp -d) + + pnpm config set store-dir $out + pnpm install --frozen-lockfile --ignore-script + + rm -rf $out/v3/tmp + for f in $(find $out -name "*.json"); do + sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f + jq --sort-keys . $f | sponge $f + done + ''; + + dontBuild = true; + dontFixup = true; + outputHashMode = "recursive"; + outputHash = { + x86_64-linux = "sha256-ybAkXe2/VhGZhr59ZQOcQ+SI2a204e8uPjyE40xUVwU="; + aarch64-linux = "sha256-2iURs6JtI/b2+CnLwhog1X5hSFFO6OmmgFRuTbMjH+k="; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + }; + + nativeBuildInputs = [ + nodePackages.pnpm + nodePackages.nodejs + ]; + + doCheck = true; + + preBuild = '' + export HOME=$(mktemp -d) + + pnpm config set store-dir ${finalAttrs.pnpmDeps} + pnpm install --offline --frozen-lockfile --ignore-script + patchShebangs node_modules/{*,.*} + ''; + + postBuild = '' + pnpm run build + ''; + + checkPhase = '' + pnpm run test:unit --run + ''; + + installPhase = '' + cp -r dist/ $out + ''; + }); + + # Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here. + skipTest = lineOffset: testCase: file: + let + jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); + in '' + sed -i -e '/${testCase}/{ + ${jumpAndAppend} t.Skip(); + }' ${file} + ''; +in +buildGoModule { + inherit src version; + pname = "vikunja"; + + nativeBuildInputs = + let + fakeGit = writeShellScriptBin "git" '' + if [[ $@ = "describe --tags --always --abbrev=10" ]]; then + echo "${version}" + else + >&2 echo "Unknown command: $@" + exit 1 + fi + ''; + in + [ fakeGit mage ]; + + vendorHash = "sha256-d4AeQEAtPqMDe5a5aKhCe3i3pDXAMZJkJXxfcAFTx7A="; + + prePatch = '' + cp -r ${frontend} frontend/dist + ''; + + postConfigure = '' + # These tests need internet, so we skip them. + ${skipTest 1 "TestConvertTrelloToVikunja" "pkg/modules/migration/trello/trello_test.go"} + ${skipTest 1 "TestConvertTodoistToVikunja" "pkg/modules/migration/todoist/todoist_test.go"} + ''; + + buildPhase = '' + runHook preBuild + + # Fixes "mkdir /homeless-shelter: permission denied" - "Error: error compiling magefiles" during build + export HOME=$(mktemp -d) + mage build:build + + runHook postBuild + ''; + + checkPhase = '' + mage test:unit + mage test:integration + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin vikunja + runHook postInstall + ''; + + passthru.tests.vikunja = nixosTests.vikunja; + + meta = { + changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md"; + description = "The Todo-app to organize your life."; + homepage = "https://vikunja.io/"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ leona ]; + mainProgram = "vikunja"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix deleted file mode 100644 index f405391cf9636..0000000000000 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, mage, writeShellScriptBin, nixosTests }: - -buildGoModule rec { - pname = "vikunja-api"; - version = "0.22.1"; - - src = fetchFromGitHub { - owner = "go-vikunja"; - repo = "api"; - rev = "v${version}"; - hash = "sha256-tYhlAF1VuM/Xz4HP7DtI0hGsiNyYxzFiNIEbm8n9DC8="; - }; - - nativeBuildInputs = - let - fakeGit = writeShellScriptBin "git" '' - if [[ $@ = "describe --tags --always --abbrev=10" ]]; then - echo "${version}" - else - >&2 echo "Unknown command: $@" - exit 1 - fi - ''; - in - [ fakeGit mage ]; - - vendorHash = "sha256-OD/7RCCrRdlrsRW7CRT01cDUvNnedNdTZ8YgDFGaE4o="; - - # checks need to be disabled because of needed internet for some checks - doCheck = false; - - buildPhase = '' - runHook preBuild - - # Fixes "mkdir /homeless-shelter: permission denied" - "Error: error compiling magefiles" during build - export HOME=$(mktemp -d) - mage build:build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dt $out/bin vikunja - runHook postInstall - ''; - - passthru.tests.vikunja = nixosTests.vikunja; - - meta = { - changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md"; - description = "API of the Vikunja to-do list app"; - homepage = "https://vikunja.io/"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ leona ]; - mainProgram = "vikunja"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix deleted file mode 100644 index bf09d830c8720..0000000000000 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, nixosTests, ... }: - -stdenv.mkDerivation rec { - pname = "vikunja-frontend"; - version = "0.22.1"; - - src = fetchurl { - url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - hash = "sha256-jkFF6sucLZWpWkPcovTdD9MOyJNPRWIBfK9388X5onc="; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - mkdir -p $out/ - cp -r * $out/ - - runHook postInstall - ''; - - passthru.tests.vikunja = nixosTests.vikunja; - - meta = { - changelog = "https://kolaente.dev/vikunja/frontend/src/tag/v${version}/CHANGELOG.md"; - description = "Frontend of the Vikunja to-do list app"; - homepage = "https://vikunja.io/"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ leona ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 48ea377f813de..1d55f600d2f97 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1159,6 +1159,8 @@ mapAliases ({ ventoy-bin = ventoy; # Added 2023-04-12 ventoy-bin-full = ventoy-full; # Added 2023-04-12 ViennaRNA = viennarna; # Added 2023-08-23 + vikunja-api = throw "'vikunja-api' has been replaced by 'vikunja'"; # Added 2024-02-19 + vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed07e5730f850..81556217c4ddc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40972,9 +40972,6 @@ with pkgs; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; - vikunja-api = callPackage ../servers/web-apps/vikunja/api.nix { }; - vikunja-frontend = callPackage ../servers/web-apps/vikunja/frontend.nix { }; - vips = callPackage ../tools/graphics/vips { inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; |