diff options
Diffstat (limited to 'pkgs/by-name/vi')
-rw-r--r-- | pkgs/by-name/vi/vibrantlinux/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/vi/victoriametrics/package.nix | 79 | ||||
-rw-r--r-- | pkgs/by-name/vi/vikunja/package.nix | 72 | ||||
-rw-r--r-- | pkgs/by-name/vi/vim-startuptime/package.nix | 39 | ||||
-rw-r--r-- | pkgs/by-name/vi/vimix-cursors/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/vi/vinegar/package.nix | 66 | ||||
-rw-r--r-- | pkgs/by-name/vi/violet/package.nix | 38 |
7 files changed, 191 insertions, 107 deletions
diff --git a/pkgs/by-name/vi/vibrantlinux/package.nix b/pkgs/by-name/vi/vibrantlinux/package.nix index 362999ad10964..f28b246afdfd0 100644 --- a/pkgs/by-name/vi/vibrantlinux/package.nix +++ b/pkgs/by-name/vi/vibrantlinux/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A tool to automate managing your screen's saturation depending on what programs are running"; + description = "Tool to automate managing your screen's saturation depending on what programs are running"; homepage = "https://github.com/libvibrant/vibrantLinux"; license = licenses.mit; maintainers = with maintainers; [ unclamped ]; diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 2f6d03ddea88b..622d042e73026 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -1,36 +1,55 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, + withServer ? true, # the actual metrics server + withVmAgent ? true, # Agent to collect metrics + withVmAlert ? true, # Alert Manager + withVmAuth ? true, # HTTP proxy for authentication + withBackupTools ? true, # vmbackup, vmrestore + withVmctl ? true, # vmctl is used to migrate time series + withVictoriaLogs ? true, # logs server +}: buildGoModule rec { pname = "VictoriaMetrics"; version = "1.101.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "VictoriaMetrics"; + repo = "VictoriaMetrics"; rev = "v${version}"; hash = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg="; }; vendorHash = null; - subPackages = [ - "app/victoria-logs" - "app/victoria-metrics" - "app/vlinsert" - "app/vlselect" - "app/vlstorage" - "app/vmagent" - "app/vmalert-tool" - "app/vmalert" - "app/vmauth" - "app/vmctl" - "app/vminsert" - "app/vmselect" - "app/vmstorage" - "app/vmbackup" - "app/vmrestore" - "app/vmui" - ]; + subPackages = + lib.optionals withServer [ + "app/victoria-metrics" + "app/vminsert" + "app/vmselect" + "app/vmstorage" + "app/vmui" + ] + ++ lib.optionals withVmAgent [ "app/vmagent" ] + ++ lib.optionals withVmAlert [ + "app/vmalert" + "app/vmalert-tool" + ] + ++ lib.optionals withVmAuth [ "app/vmauth" ] + ++ lib.optionals withVmctl [ "app/vmctl" ] + ++ lib.optionals withBackupTools [ + "app/vmbackup" + "app/vmrestore" + ] + ++ lib.optionals withVictoriaLogs [ + "app/victoria-logs" + "app/vlinsert" + "app/vlselect" + "app/vlstorage" + ]; postPatch = '' # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package @@ -46,7 +65,11 @@ buildGoModule rec { --replace "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \ ''; - ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" + ]; preCheck = '' # `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset @@ -55,13 +78,21 @@ buildGoModule rec { __darwinAllowLocalNetworking = true; - passthru.tests = { inherit (nixosTests) victoriametrics; }; + passthru.tests = { + inherit (nixosTests) victoriametrics; + }; meta = with lib; { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; - maintainers = with maintainers; [ yorickvp ivan ]; + maintainers = with maintainers; [ + yorickvp + ivan + nullx76 + leona + shawn8901 + ]; changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; mainProgram = "victoria-metrics"; }; diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index cc9891f3ccd15..36a443f3625b5 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, stdenvNoCC, nodePackages, buildGoModule, jq, mage, writeShellScriptBin, nixosTests, buildNpmPackage, moreutils, cacert }: +{ lib, fetchFromGitHub, stdenv, nodejs, pnpm, buildGoModule, mage, writeShellScriptBin, nixosTests }: let version = "0.23.0"; @@ -13,72 +13,20 @@ let 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 - ''; + sourceRoot = "${finalAttrs.src.name}/frontend"; - # 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}"); + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src sourceRoot; + hash = "sha256-awQgOLkb46v2aWfw6yv+zGPoOnczalkzg02tBgMTyMY="; }; nativeBuildInputs = [ - nodePackages.pnpm - nodePackages.nodejs + nodejs + pnpm.configHook ]; 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 ''; @@ -121,8 +69,10 @@ buildGoModule { vendorHash = "sha256-d4AeQEAtPqMDe5a5aKhCe3i3pDXAMZJkJXxfcAFTx7A="; + inherit frontend; + prePatch = '' - cp -r ${frontend} frontend/dist + cp -r $frontend frontend/dist ''; postConfigure = '' @@ -156,7 +106,7 @@ buildGoModule { meta = { changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md"; - description = "The Todo-app to organize your life."; + description = "Todo-app to organize your life"; homepage = "https://vikunja.io/"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ leona ]; diff --git a/pkgs/by-name/vi/vim-startuptime/package.nix b/pkgs/by-name/vi/vim-startuptime/package.nix new file mode 100644 index 0000000000000..545cb27e43e2c --- /dev/null +++ b/pkgs/by-name/vi/vim-startuptime/package.nix @@ -0,0 +1,39 @@ +{ + pkgs, + lib, + buildGoModule, + fetchFromGitHub +}: +let + pname = "vim-startuptime"; + version = "1.3.2"; +in +buildGoModule { + inherit pname version; + ldflags = [ + "-s" + "-w" + ]; + + src = fetchFromGitHub { + owner = "rhysd"; + repo = "vim-startuptime"; + rev = "v${version}"; + hash = "sha256-d6AXTWTUawkBCXCvMs3C937qoRUZmy0qCFdSLcWh0BE="; + }; + + nativeCheckInputs = with pkgs; [ + vim + neovim + ]; + + vendorHash = null; + + meta = with lib; { + homepage = "https://github.com/rhysd/vim-startuptime"; + description = "Small Go program for better `vim --startuptime` alternative"; + maintainers = with maintainers; [ _9yokuro ]; + license = licenses.mit; + mainProgram = "vim-startuptime"; + }; +} diff --git a/pkgs/by-name/vi/vimix-cursors/package.nix b/pkgs/by-name/vi/vimix-cursors/package.nix index 33de66e19e548..b42d053be6ae3 100644 --- a/pkgs/by-name/vi/vimix-cursors/package.nix +++ b/pkgs/by-name/vi/vimix-cursors/package.nix @@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation { ''; meta = with lib; { - description = "An X cursor theme inspired by Materia design"; + description = "X cursor theme inspired by Materia design"; homepage = "https://github.com/vinceliuice/Vimix-cursors"; license = licenses.gpl3Only; maintainers = with maintainers; [ ambroisie ]; diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 19dd302094435..f192e13cc4891 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -10,40 +10,66 @@ , vulkan-headers , wine64Packages , fetchpatch +, fetchFromGitLab +, fetchurl +, }: let - # wine-staging doesn't support overrideAttrs for now + stagingPatch = fetchFromGitLab { + sha256 = "sha256-VQ4j4PuXRoXbCUZ16snVO+jRvuKD4Rjn14R7bhwdAco="; + domain = "gitlab.winehq.org"; + owner = "wine"; + repo = "wine-staging"; + rev = "v9.2"; + }; + wine = wine64Packages.staging.overrideDerivation (oldAttrs: { - patches = - (oldAttrs.patches or []) + prePatch = '' + patchShebangs tools + cp -r ${stagingPatch}/patches ${stagingPatch}/staging . + chmod +w patches + patchShebangs ./patches/gitapply.sh + python3 ./staging/patchinstall.py --destdir="$PWD" --all + ''; + patches = (oldAttrs.patches or [ ]) ++ [ - # upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604 - # Here are the currently applied patches for Roblox to run under WINE: - (fetchpatch { - name = "vinegar-wine-segregrevert.patch"; - url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/segregrevert.patch"; - hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c="; - }) - (fetchpatch { - name = "vinegar-wine-mouselock.patch"; - url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/mouselock.patch"; - hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4="; - }) - ]; + (fetchurl { + name = "childwindow.patch"; + hash = "sha256-u3mDvlbhQnfh2tUKb8jNJA0tTcLIaKVLfY8ktJmeRns="; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/childwindow.patch"; + }) + (fetchpatch { + name = "mouselock.patch"; + hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4="; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/mouselock.patch"; + }) + (fetchpatch { + name = "segregrevert.patch"; + hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c="; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/segregrevert.patch"; + }) + ]; + src = fetchFromGitLab rec { + sha256 = "sha256-GlPH34dr9aHx7xvlcbtDMn/wrY//DP58ilXjhQXgihQ="; + domain = "gitlab.winehq.org"; + owner = "wine"; + repo = "wine"; + rev = "wine-9.2"; + }; }); in buildGoModule rec { pname = "vinegar"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; rev = "v${version}"; - hash = "sha256-aKL+4jw/uMbbvLRCBHstCTrcQ1PTYSCwMNgXTvSvMeY="; + hash = "sha256-4tkcrUzW8la5WiDtGUvvsRzFqZM1gqnWWAzXc82hirM="; }; - vendorHash = "sha256-OaMfWecOPQh6quXjYkZLyBDHZ9TINSA7Ue/Y0sz5ZYY="; + vendorHash = "sha256-pi9FjKYXH8cqTx2rTRCyT4+pOM5HnIKosEcmcpbuywQ="; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ]; @@ -66,7 +92,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; + description = "Open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; homepage = "https://github.com/vinegarhq/vinegar"; changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; mainProgram = "vinegar"; diff --git a/pkgs/by-name/vi/violet/package.nix b/pkgs/by-name/vi/violet/package.nix new file mode 100644 index 0000000000000..35e13eea544f8 --- /dev/null +++ b/pkgs/by-name/vi/violet/package.nix @@ -0,0 +1,38 @@ +{ + lib, + cmake, + fetchFromGitHub, + nix-update-script, + stdenv, + violet, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "violet"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "paullouisageneau"; + repo = "violet"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+cAgcGOMlhDdep8VuqP8DeELbMRXydRsD0xTyHqOuYM="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + passthru = { + updateScript = nix-update-script { }; + tests = testers.testVersion { package = violet; }; + }; + + meta = { + description = "Lightweight STUN/TURN server"; + homepage = "https://github.com/paullouisageneau/violet"; + license = lib.licenses.gpl2Only; + mainProgram = "violet"; + maintainers = with lib.maintainers; [ oluceps ]; + platforms = lib.platforms.all; + }; +}) |