diff options
Diffstat (limited to 'nixpkgs/pkgs/by-name/po')
| -rw-r--r-- | nixpkgs/pkgs/by-name/po/poethepoet/package.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/po/popcorntime/package.nix | 11 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/po/portablemc/package.nix | 97 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/po/portablemc/use-builtin-java.patch | 47 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/po/pot/package.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/po/powerpipe/package.nix | 71 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/po/powersupply/package.nix | 4 |
7 files changed, 227 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/by-name/po/poethepoet/package.nix b/nixpkgs/pkgs/by-name/po/poethepoet/package.nix index b186b8866e1f..08237d2b8a72 100644 --- a/nixpkgs/pkgs/by-name/po/poethepoet/package.nix +++ b/nixpkgs/pkgs/by-name/po/poethepoet/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "poethepoet"; - version = "0.25.1"; + version = "0.26.1"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; rev = "refs/tags/v${version}"; - hash = "sha256-x57/7Qw2cLSmB01uiIAIu0dBhFqol+ewO1fRs45U0qE="; + hash = "sha256-7mRzWxMhDNUc+eY9uEszt/qQUUJhlgJqadCL+Z7QzWo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/by-name/po/popcorntime/package.nix b/nixpkgs/pkgs/by-name/po/popcorntime/package.nix index 240836d60049..28fd5b60e689 100644 --- a/nixpkgs/pkgs/by-name/po/popcorntime/package.nix +++ b/nixpkgs/pkgs/by-name/po/popcorntime/package.nix @@ -4,30 +4,31 @@ , gsettings-desktop-schemas , gtk3 , lib +, libGL , makeDesktopItem , makeWrapper , nwjs , stdenv , unzip , udev -, wrapGAppsHook +, wrapGAppsHook3 , copyDesktopItems }: stdenv.mkDerivation rec { pname = "popcorntime"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/popcorn-official/popcorn-desktop/releases/download/v${version}/Popcorn-Time-${version}-linux64.zip"; - hash = "sha256-A5G66KkCQ1AiOOO02dZFAVz6dqvComrd5lXQ4Wc1S0s="; + hash = "sha256-lCsIioR252GWP/+wNwkTw5PLSal/M9x6mlR/EKOd/hs="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { dontUnpack = true; makeWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev libGL ]}" "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" ]; diff --git a/nixpkgs/pkgs/by-name/po/portablemc/package.nix b/nixpkgs/pkgs/by-name/po/portablemc/package.nix new file mode 100644 index 000000000000..444dd9d20550 --- /dev/null +++ b/nixpkgs/pkgs/by-name/po/portablemc/package.nix @@ -0,0 +1,97 @@ +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, + installShellFiles, + jre, + + libX11, + libXext, + libXcursor, + libXrandr, + libXxf86vm, + libpulseaudio, + libGL, + glfw, + openal, + udev, + + textToSpeechSupport ? stdenv.isLinux, + flite, +}: + +let + # Copied from the `prismlauncher` package + runtimeLibs = [ + libX11 + libXext + libXcursor + libXrandr + libXxf86vm + + # lwjgl + libpulseaudio + libGL + glfw + openal + stdenv.cc.cc.lib + + # oshi + udev + ] ++ lib.optional textToSpeechSupport flite; +in +python3Packages.buildPythonApplication rec { + pname = "portablemc"; + version = "4.3.0"; + pyproject = true; + + disabled = python3Packages.pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "mindstorm38"; + repo = "portablemc"; + rev = "v${version}"; + hash = "sha256-jCv4ncXUWbkWlBZr3P1hNeVpdQzY9HtrFz+pmKknL0I="; + }; + + patches = [ + # Use the jre package provided by nixpkgs by default + ./use-builtin-java.patch + ]; + + nativeBuildInputs = [ installShellFiles ]; + + build-system = [ python3Packages.poetry-core ]; + + dependencies = [ python3Packages.certifi ]; + + # Note: Tests use networking, so we don't run them + + postInstall = '' + installShellCompletion --cmd portablemc \ + --bash <($out/bin/portablemc show completion bash) \ + --zsh <($out/bin/portablemc show completion zsh) + ''; + + preFixup = '' + makeWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runtimeLibs} + --prefix PATH : ${lib.makeBinPath [ jre ]} + ) + ''; + + meta = { + homepage = "https://github.com/mindstorm38/portablemc"; + description = "A fast, reliable and cross-platform command-line Minecraft launcher and API for developers"; + longDescription = '' + A fast, reliable and cross-platform command-line Minecraft launcher and API for developers. + Including fast and easy installation of common mod loaders such as Fabric, Forge, NeoForge and Quilt. + This launcher is compatible with the standard Minecraft directories. + ''; + changelog = "https://github.com/mindstorm38/portablemc/releases/tag/${src.rev}"; + license = lib.licenses.gpl3Only; + mainProgram = "portablemc"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/nixpkgs/pkgs/by-name/po/portablemc/use-builtin-java.patch b/nixpkgs/pkgs/by-name/po/portablemc/use-builtin-java.patch new file mode 100644 index 000000000000..a88d97bae9b5 --- /dev/null +++ b/nixpkgs/pkgs/by-name/po/portablemc/use-builtin-java.patch @@ -0,0 +1,47 @@ +diff --git a/portablemc/standard.py b/portablemc/standard.py +index f59c55d..0f017e1 100644 +--- a/portablemc/standard.py ++++ b/portablemc/standard.py +@@ -843,6 +843,8 @@ class Version: + if jvm_major_version is not None and not isinstance(jvm_major_version, int): + raise ValueError("metadata: /javaVersion/majorVersion must be an integer") + ++ return self._resolve_builtin_jvm(watcher, JvmNotFoundError.UNSUPPORTED_ARCH, jvm_major_version) ++ + if platform.system() == "Linux" and platform.libc_ver()[0] != "glibc": + return self._resolve_builtin_jvm(watcher, JvmNotFoundError.UNSUPPORTED_LIBC, jvm_major_version) + +@@ -926,31 +928,10 @@ class Version: + builtin_path = shutil.which(jvm_bin_filename) + if builtin_path is None: + raise JvmNotFoundError(reason) +- +- try: +- +- # Get version of the JVM. +- process = Popen([builtin_path, "-version"], bufsize=1, stdout=PIPE, stderr=STDOUT, universal_newlines=True) +- stdout, _stderr = process.communicate(timeout=1) +- +- version_start = stdout.index(f"1.{major_version}" if major_version <= 8 else str(major_version)) +- version = None +- +- # Parse version by getting all character that are numeric or '.'. +- for i, ch in enumerate(stdout[version_start:]): +- if not ch.isnumeric() and ch not in (".", "_"): +- version = stdout[version_start:i] +- break +- +- if version is None: +- raise ValueError() +- +- except (TimeoutExpired, ValueError): +- raise JvmNotFoundError(JvmNotFoundError.BUILTIN_INVALID_VERSION) + + self._jvm_path = Path(builtin_path) +- self._jvm_version = version +- watcher.handle(JvmLoadedEvent(version, JvmLoadedEvent.BUILTIN)) ++ self._jvm_version = "nixpkgs" ++ watcher.handle(JvmLoadedEvent("nixpkgs", JvmLoadedEvent.BUILTIN)) + + def _download(self, watcher: Watcher) -> None: + diff --git a/nixpkgs/pkgs/by-name/po/pot/package.nix b/nixpkgs/pkgs/by-name/po/pot/package.nix index aac04e5a0bcc..0547e72f4819 100644 --- a/nixpkgs/pkgs/by-name/po/pot/package.nix +++ b/nixpkgs/pkgs/by-name/po/pot/package.nix @@ -3,7 +3,7 @@ , stdenvNoCC , rustPlatform , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , cargo , rustc , cargo-tauri @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cargo rustc cargo-tauri - wrapGAppsHook + wrapGAppsHook3 nodePackages.pnpm pkg-config ]; diff --git a/nixpkgs/pkgs/by-name/po/powerpipe/package.nix b/nixpkgs/pkgs/by-name/po/powerpipe/package.nix new file mode 100644 index 000000000000..007ded352267 --- /dev/null +++ b/nixpkgs/pkgs/by-name/po/powerpipe/package.nix @@ -0,0 +1,71 @@ +{ + buildGoModule, + fetchFromGitHub, + installShellFiles, + lib, + makeWrapper, + nix-update-script, + powerpipe, + testers, +}: + +buildGoModule rec { + pname = "powerpipe"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "turbot"; + repo = "powerpipe"; + rev = "refs/tags/v${version}"; + hash = "sha256-lG2MYLb/8bv8SOLPZvZNtf5WM1qOJWEBTpLU2MzPbLs="; + }; + + vendorHash = "sha256-K8SfPWn4IGQNPdax0Qe4KD+XttvDe2xj361zz55u6tA="; + proxyVendor = true; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + doCheck = true; + + checkFlags = + let + skippedTests = [ + # test fails in the original github.com/turbot/powerpipe project as well + "TestGetAsSnapshotPropertyMap/card" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + postInstall = '' + wrapProgram $out/bin/powerpipe \ + --set-default POWERPIPE_UPDATE_CHECK false \ + --set-default POWERPIPE_TELEMETRY none + ''; + + passthru = { + tests.version = testers.testVersion { + command = "${lib.getExe powerpipe} --version"; + package = powerpipe; + version = "v${version}"; + }; + updateScript = nix-update-script { }; + }; + + meta = { + changelog = "https://github.com/turbot/powerpipe/blob/v${version}/CHANGELOG.md"; + description = "Dynamically query your cloud, code, logs & more with SQL"; + homepage = "https://powerpipe.io/"; + license = lib.licenses.agpl3Only; + mainProgram = "powerpipe"; + maintainers = with lib.maintainers; [ weitzj ]; + }; +} diff --git a/nixpkgs/pkgs/by-name/po/powersupply/package.nix b/nixpkgs/pkgs/by-name/po/powersupply/package.nix index ce86cf2da7d0..31216d84675a 100644 --- a/nixpkgs/pkgs/by-name/po/powersupply/package.nix +++ b/nixpkgs/pkgs/by-name/po/powersupply/package.nix @@ -8,7 +8,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ |