From b72ee72a80dd4c7e93b508ab64daf9de4ab8cbb0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 29 Feb 2024 20:17:44 +0100 Subject: unrar: move to pkgs/by-name --- pkgs/by-name/un/unrar/package.nix | 61 ++++++++++++++++++++++++++++++++ pkgs/by-name/un/unrar/setup-hook.sh | 5 +++ pkgs/tools/archivers/unrar/default.nix | 61 -------------------------------- pkgs/tools/archivers/unrar/setup-hook.sh | 5 --- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 66 insertions(+), 68 deletions(-) create mode 100644 pkgs/by-name/un/unrar/package.nix create mode 100644 pkgs/by-name/un/unrar/setup-hook.sh delete mode 100644 pkgs/tools/archivers/unrar/default.nix delete mode 100644 pkgs/tools/archivers/unrar/setup-hook.sh diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix new file mode 100644 index 0000000000000..8b4f46088b2d5 --- /dev/null +++ b/pkgs/by-name/un/unrar/package.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchzip +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "unrar"; + version = "6.2.12"; + + src = fetchzip { + url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; + stripRoot = false; + hash = "sha256-VAL3o9JGmkAcEssa/P/SL9nyxnigb7dX9YZBHrG9f0A="; + }; + + sourceRoot = finalAttrs.src.name; + + postPatch = '' + substituteInPlace unrar/makefile \ + --replace "CXX=" "#CXX=" \ + --replace "STRIP=" "#STRIP=" \ + --replace "AR=" "#AR=" + ''; + + outputs = [ "out" "dev" ]; + + # `make {unrar,lib}` call `make clean` implicitly + # separate build into different dirs to avoid deleting them + buildPhase = '' + runHook preBuild + + cp -a unrar libunrar + make -C libunrar lib + make -C unrar -j1 + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 unrar/unrar -t $out/bin/ + install -Dm644 unrar/{acknow.txt,license.txt} -t $out/share/doc/unrar/ + + install -Dm755 libunrar/libunrar.so -t $out/lib/ + install -Dm644 libunrar/dll.hpp -t $dev/include/unrar/ + + runHook postInstall + ''; + + setupHook = ./setup-hook.sh; + + meta = with lib; { + description = "Utility for RAR archives"; + homepage = "https://www.rarlab.com/"; + license = licenses.unfreeRedistributable; + mainProgram = "unrar"; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/un/unrar/setup-hook.sh b/pkgs/by-name/un/unrar/setup-hook.sh new file mode 100644 index 0000000000000..41d6a5cd217bc --- /dev/null +++ b/pkgs/by-name/un/unrar/setup-hook.sh @@ -0,0 +1,5 @@ +unpackCmdHooks+=(_tryUnrar) +_tryUnrar() { + if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi + unrar x "$curSrc" >/dev/null +} diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix deleted file mode 100644 index 8b4f46088b2d5..0000000000000 --- a/pkgs/tools/archivers/unrar/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchzip -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "unrar"; - version = "6.2.12"; - - src = fetchzip { - url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; - stripRoot = false; - hash = "sha256-VAL3o9JGmkAcEssa/P/SL9nyxnigb7dX9YZBHrG9f0A="; - }; - - sourceRoot = finalAttrs.src.name; - - postPatch = '' - substituteInPlace unrar/makefile \ - --replace "CXX=" "#CXX=" \ - --replace "STRIP=" "#STRIP=" \ - --replace "AR=" "#AR=" - ''; - - outputs = [ "out" "dev" ]; - - # `make {unrar,lib}` call `make clean` implicitly - # separate build into different dirs to avoid deleting them - buildPhase = '' - runHook preBuild - - cp -a unrar libunrar - make -C libunrar lib - make -C unrar -j1 - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm755 unrar/unrar -t $out/bin/ - install -Dm644 unrar/{acknow.txt,license.txt} -t $out/share/doc/unrar/ - - install -Dm755 libunrar/libunrar.so -t $out/lib/ - install -Dm644 libunrar/dll.hpp -t $dev/include/unrar/ - - runHook postInstall - ''; - - setupHook = ./setup-hook.sh; - - meta = with lib; { - description = "Utility for RAR archives"; - homepage = "https://www.rarlab.com/"; - license = licenses.unfreeRedistributable; - mainProgram = "unrar"; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/tools/archivers/unrar/setup-hook.sh b/pkgs/tools/archivers/unrar/setup-hook.sh deleted file mode 100644 index 41d6a5cd217bc..0000000000000 --- a/pkgs/tools/archivers/unrar/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -unpackCmdHooks+=(_tryUnrar) -_tryUnrar() { - if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi - unrar x "$curSrc" >/dev/null -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f95cc9b1f3933..18d2056f9bd87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14660,8 +14660,6 @@ with pkgs; unnaturalscrollwheels = callPackage ../tools/inputmethods/unnaturalscrollwheels { }; - unrar = callPackage ../tools/archivers/unrar { }; - unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; uptime-kuma = callPackage ../servers/monitoring/uptime-kuma { }; -- cgit 1.4.1 From 9dd105625df95dec54cdb3dc561d866764e9f9d0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 29 Feb 2024 20:23:57 +0100 Subject: unrar: 6.2.12 -> 7.0.7 --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ pkgs/by-name/un/unrar/package.nix | 4 ++-- pkgs/by-name/un/unrar_6/package.nix | 15 +++++++++++++++ pkgs/tools/filesystems/rar2fs/default.nix | 6 +++--- 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/un/unrar_6/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index b60a2eb1c868b..1811db25643c2 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -121,6 +121,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS. +- `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information. + - `k3s` was updated to [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2). See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information. - `k9s` was updated to v0.31. There have been various breaking changes in the config file format, diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix index 8b4f46088b2d5..ea97195c2ae36 100644 --- a/pkgs/by-name/un/unrar/package.nix +++ b/pkgs/by-name/un/unrar/package.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "6.2.12"; + version = "7.0.7"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; - hash = "sha256-VAL3o9JGmkAcEssa/P/SL9nyxnigb7dX9YZBHrG9f0A="; + hash = "sha256-S7BMywydetDh1GINcK3k3fN9ciDoKTCAe/1tkgykoAQ="; }; sourceRoot = finalAttrs.src.name; diff --git a/pkgs/by-name/un/unrar_6/package.nix b/pkgs/by-name/un/unrar_6/package.nix new file mode 100644 index 0000000000000..5f2248ce847e0 --- /dev/null +++ b/pkgs/by-name/un/unrar_6/package.nix @@ -0,0 +1,15 @@ +{ unrar +, fetchzip +}: + +unrar.overrideAttrs (finalAttrs: _: { + version = "6.2.12"; + + src = fetchzip { + url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; + stripRoot = false; + hash = "sha256-VAL3o9JGmkAcEssa/P/SL9nyxnigb7dX9YZBHrG9f0A="; + }; + + sourceRoot = finalAttrs.src.name; +}) diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix index 3b42a7890fbdf..0c752e7114534 100644 --- a/pkgs/tools/filesystems/rar2fs/default.nix +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , fuse -, unrar +, unrar_6 }: stdenv.mkDerivation rec { @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ fuse unrar ]; + buildInputs = [ fuse unrar_6 ]; configureFlags = [ - "--with-unrar=${unrar.src}/unrar" + "--with-unrar=${unrar_6.src}/unrar" "--disable-static-unrar" ]; -- cgit 1.4.1