From 040e3e60c54ad8bab9ce98e6e0e0e9566aa4209f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 23:00:49 +0000 Subject: haruna: 1.0.2 -> 1.1.0 --- pkgs/applications/video/haruna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 273b26808af58..7409bb8470741 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "haruna"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-L/mTFPJPHl8A6FqkWUwICh+Yl4uIE5KnTkZVnC4kCZ8="; + hash = "sha256-403ZqllSSaOdTS1GSf8EIQk9gHOxMsWogbK9qh+MhpY="; domain = "invent.kde.org"; }; -- cgit 1.4.1 From 9e3310fdf5d6f4032a8644232f0a5aa9de8c6fe1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 01:27:47 +0000 Subject: coreth: 0.13.2 -> 0.13.3 --- pkgs/applications/networking/coreth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index c1ad822138ab7..e5af4fa397ed9 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-G3Ovu/tF7gCeddmE91nht/yyqJJtgMyIi7YbTtUFyKo="; + hash = "sha256-XVACkk/DUI4AIPRSQgu0g9WHmedjqscZbcz84HIi7jY="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-IJFRtoDd0GO8mIx8mmGixaYK5JDQeSpUfk0MPPX6cX8="; + vendorHash = "sha256-zqvo0hZIOyF5Bzig1hi4KRUDETNiiy1Ll/FFO9hRmYU="; ldflags = [ "-s" -- cgit 1.4.1 From 8d1c177db0cf98ff5404384a72d6c4c473936945 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 01:43:55 +0000 Subject: fluidd: 1.29.1 -> 1.30.0 --- pkgs/applications/misc/fluidd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 150bbd5700371..3694f8e232201 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.29.1"; + version = "1.30.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-Zh/H1XAUcFl20yPLt9uIqBLDvUH8ATL9g6oFwvyhkzw="; + sha256 = "sha256-+nPVnKuZtYGFtqC48XNISSjay3lDAYR3l50kq026H3Q="; }; nativeBuildInputs = [ unzip ]; -- cgit 1.4.1 From 15da9e1379baa5f7ea144c0f0276a5f20491977c Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 May 2024 10:09:19 +0530 Subject: tribler: 7.13.0 -> 7.14.0 remove duplicate libtorrent dependency add update script --- pkgs/applications/networking/p2p/tribler/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index bb009ff0adf0e..d7e4a7b81b50b 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -6,6 +6,7 @@ , makeWrapper , libtorrent-rasterbar-1_2_x , qt5 +, nix-update-script }: let @@ -13,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "tribler"; - version = "7.13.0"; + version = "7.14.0"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-${version}.tar.xz"; - hash = "sha256-j9+Kq6dOqiJCTY3vuRWGnciuwACU7L0pl73l6nkDLN4="; + hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4="; }; nativeBuildInputs = [ @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { yappi yarl bitarray + filelock (pyipv8.overrideAttrs (p: rec { version = "2.10.0"; src = fetchPypi { @@ -68,7 +70,6 @@ stdenv.mkDerivation rec { hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; }; })) - libtorrent file-read-backwards brotli human-readable @@ -106,6 +107,8 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" ''; + passthru.updateScript = nix-update-script {}; + meta = with lib; { description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; mainProgram = "tribler"; -- cgit 1.4.1 From 973251266dcaef09aafa1f0dfaf3fc6fb5bcc170 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 May 2024 10:16:33 +0530 Subject: tribler: migrate to finalAttrs --- pkgs/applications/networking/p2p/tribler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index d7e4a7b81b50b..859c47a3e2873 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -12,12 +12,12 @@ let libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tribler"; version = "7.14.0"; src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-${version}.tar.xz"; + url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz"; hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4="; }; @@ -117,4 +117,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ xvapx viric mkg20001 ]; platforms = platforms.linux; }; -} +}) -- cgit 1.4.1 From f8c1e5bdbb635a904e237e220e61e503694c441e Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 May 2024 10:18:22 +0530 Subject: tribler: migrate to pkgs/by-name --- .../networking/p2p/tribler/default.nix | 120 --------------------- pkgs/by-name/tr/tribler/package.nix | 120 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 120 insertions(+), 122 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/tribler/default.nix create mode 100644 pkgs/by-name/tr/tribler/package.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix deleted file mode 100644 index 859c47a3e2873..0000000000000 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchPypi -, python3 -, makeWrapper -, libtorrent-rasterbar-1_2_x -, qt5 -, nix-update-script -}: - -let - libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; -in -stdenv.mkDerivation (finalAttrs: { - pname = "tribler"; - version = "7.14.0"; - - src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz"; - hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4="; - }; - - nativeBuildInputs = [ - python3.pkgs.wrapPython - makeWrapper - # we had a "copy" of this in tribler's makeWrapper - # but it went out of date and broke, so please just use it directly - qt5.wrapQtAppsHook - ]; - - buildInputs = [ - python3.pkgs.python - ]; - - pythonPath = [ - libtorrent - ] ++ (with python3.pkgs; [ - # requirements-core.txt - aiohttp - aiohttp-apispec - anyio - chardet - configobj - cryptography - decorator - faker - libnacl - lz4 - marshmallow - netifaces - networkx - pony - psutil - pyasn1 - pydantic_1 - pyopenssl - pyyaml - sentry-sdk - service-identity - yappi - yarl - bitarray - filelock - (pyipv8.overrideAttrs (p: rec { - version = "2.10.0"; - src = fetchPypi { - inherit (p) pname; - inherit version; - hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; - }; - })) - file-read-backwards - brotli - human-readable - # requirements.txt - pillow - pyqt5 - #pyqt5-sip - pyqtgraph - pyqtwebengine - ]); - - installPhase = '' - mkdir -pv $out - # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. - wrapPythonPrograms - cp -prvd ./* $out/ - makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ - --set _TRIBLERPATH "$out/src" \ - --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ - --set NO_AT_BRIDGE 1 \ - --chdir "$out/src" \ - --add-flags "-O $out/src/run_tribler.py" - - mkdir -p $out/share/applications $out/share/icons - cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/ - cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm - mkdir -p $out/share/copyright/tribler - mv $out/LICENSE $out/share/copyright/tribler - ''; - - shellHook = '' - wrapPythonPrograms || true - export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms) - export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH - export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" - ''; - - passthru.updateScript = nix-update-script {}; - - meta = with lib; { - description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; - mainProgram = "tribler"; - homepage = "https://www.tribler.org/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ xvapx viric mkg20001 ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/by-name/tr/tribler/package.nix b/pkgs/by-name/tr/tribler/package.nix new file mode 100644 index 0000000000000..859c47a3e2873 --- /dev/null +++ b/pkgs/by-name/tr/tribler/package.nix @@ -0,0 +1,120 @@ +{ lib +, stdenv +, fetchurl +, fetchPypi +, python3 +, makeWrapper +, libtorrent-rasterbar-1_2_x +, qt5 +, nix-update-script +}: + +let + libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; +in +stdenv.mkDerivation (finalAttrs: { + pname = "tribler"; + version = "7.14.0"; + + src = fetchurl { + url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz"; + hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4="; + }; + + nativeBuildInputs = [ + python3.pkgs.wrapPython + makeWrapper + # we had a "copy" of this in tribler's makeWrapper + # but it went out of date and broke, so please just use it directly + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + python3.pkgs.python + ]; + + pythonPath = [ + libtorrent + ] ++ (with python3.pkgs; [ + # requirements-core.txt + aiohttp + aiohttp-apispec + anyio + chardet + configobj + cryptography + decorator + faker + libnacl + lz4 + marshmallow + netifaces + networkx + pony + psutil + pyasn1 + pydantic_1 + pyopenssl + pyyaml + sentry-sdk + service-identity + yappi + yarl + bitarray + filelock + (pyipv8.overrideAttrs (p: rec { + version = "2.10.0"; + src = fetchPypi { + inherit (p) pname; + inherit version; + hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; + }; + })) + file-read-backwards + brotli + human-readable + # requirements.txt + pillow + pyqt5 + #pyqt5-sip + pyqtgraph + pyqtwebengine + ]); + + installPhase = '' + mkdir -pv $out + # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. + wrapPythonPrograms + cp -prvd ./* $out/ + makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ + --set _TRIBLERPATH "$out/src" \ + --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ + --set NO_AT_BRIDGE 1 \ + --chdir "$out/src" \ + --add-flags "-O $out/src/run_tribler.py" + + mkdir -p $out/share/applications $out/share/icons + cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/ + cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm + mkdir -p $out/share/copyright/tribler + mv $out/LICENSE $out/share/copyright/tribler + ''; + + shellHook = '' + wrapPythonPrograms || true + export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms) + export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH + export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" + ''; + + passthru.updateScript = nix-update-script {}; + + meta = with lib; { + description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; + mainProgram = "tribler"; + homepage = "https://www.tribler.org/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ xvapx viric mkg20001 ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7aa15fb1b272..5c0bd97a6d660 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35032,8 +35032,6 @@ with pkgs; tremc = callPackage ../applications/networking/p2p/tremc { }; - tribler = callPackage ../applications/networking/p2p/tribler { }; - trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { }; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; -- cgit 1.4.1 From 9517777efcdad5ed146dbe016988b1cdcd7a39d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 18:45:55 +0000 Subject: libretro.mame: unstable-2024-05-04 -> unstable-2024-05-09 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 4115c489b2e4e..098e317bba8ba 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -408,11 +408,11 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "3272473e69880675756547fc5896d0869ba14255", - "hash": "sha256-DWDPQM4YWuH4oH+03VmFs6yXN2dAKxc5zXSV42YbMyg=", + "rev": "1c6d288bf15705ab93c66a11af40eaf9d2a515a2", + "hash": "sha256-h5hMfCwoECTyH/VU7IheQg5Jx9skpYrZlA9Xh+4lotQ=", "fetchSubmodules": true }, - "version": "unstable-2024-05-04" + "version": "unstable-2024-05-09" }, "mame2000": { "fetcher": "fetchFromGitHub", -- cgit 1.4.1 From 732d18321bd40d3a7e013fe10d9ba4b292828669 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Mon, 29 Apr 2024 20:21:13 +0200 Subject: quartus-prime-lite: name -> pname Modernizing. --- pkgs/applications/editors/quartus-prime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 2b3ee40951755..f0072cf74711d 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -17,7 +17,7 @@ let }; # I think questa_fse/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` in buildFHSEnv rec { - name = "quartus-prime-lite"; # wrapped + pname = "quartus-prime-lite"; # wrapped targetPkgs = pkgs: with pkgs; [ (runCommand "ld-lsb-compat" {} ('' @@ -80,7 +80,7 @@ in buildFHSEnv rec { "${unwrapped}"/questa_fse/linux_x86_64/lmutil ) - wrapper=$out/bin/${name} + wrapper=$out/bin/${pname} progs_wrapped=() for prog in ''${progs_to_wrap[@]}; do relname="''${prog#"${unwrapped}/"}" -- cgit 1.4.1 From 7dfd0a3b5f1b325e83b57e9226915a8b6c4e30bb Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Mon, 29 Apr 2024 20:22:11 +0200 Subject: quartus-prime-lite: add version, meta Reference version and meta from the unwrapped derivation in the wrapped/FHS derivation. --- pkgs/applications/editors/quartus-prime/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index f0072cf74711d..324042be90a77 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -18,6 +18,7 @@ let # I think questa_fse/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` in buildFHSEnv rec { pname = "quartus-prime-lite"; # wrapped + inherit (unwrapped) version; targetPkgs = pkgs: with pkgs; [ (runCommand "ld-lsb-compat" {} ('' @@ -160,4 +161,6 @@ in buildFHSEnv rec { ''; }; }; + + inherit (unwrapped) meta; } -- cgit 1.4.1 From 9f8e5fd53e9538d9eb11bf0e63ed1e6dde82f4ec Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Mon, 29 Apr 2024 20:38:45 +0200 Subject: quartus-prime-lite: use exec to avoid one needless process --- pkgs/applications/editors/quartus-prime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 324042be90a77..dfe977876231b 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -94,7 +94,7 @@ in buildFHSEnv rec { echo "export NIXPKGS_IS_QUESTA_WRAPPER=1" >> "$wrapped" ;; esac - echo "$wrapper $prog \"\$@\"" >> "$wrapped" + echo "exec $wrapper $prog \"\$@\"" >> "$wrapped" done cd $out -- cgit 1.4.1