diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-29 20:23:57 +0100 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-08 09:57:11 +0100 |
commit | 9dd105625df95dec54cdb3dc561d866764e9f9d0 (patch) | |
tree | 47bd48247e48f4303e0985769ba95d272ca5ebee | |
parent | b72ee72a80dd4c7e93b508ab64daf9de4ab8cbb0 (diff) |
unrar: 6.2.12 -> 7.0.7
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2405.section.md | 2 | ||||
-rw-r--r-- | pkgs/by-name/un/unrar/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/un/unrar_6/package.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/filesystems/rar2fs/default.nix | 6 |
4 files changed, 22 insertions, 5 deletions
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" ]; |