From 9d57599d7d1a439d6920ee9e785a542483a29b81 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 27 Sep 2023 09:31:50 +0200 Subject: unrar: 6.2.5 -> 6.2.11 rar2fs: fix build --- pkgs/tools/archivers/unrar/default.nix | 54 +++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 24 deletions(-) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 74f1bcfe9b8..53b4a4bfa96 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,45 +1,51 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, fetchzip +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "6.2.5"; + version = "6.2.11"; - src = fetchurl { - url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - hash = "sha256-mjl0QQ0dNA45mN0qb5j6776DjK1VYmbnFK37Doz5N3w="; + src = fetchzip { + url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; + stripRoot = false; + hash = "sha256-HFglLjn4UE8dalp2ZIFlqqaE9FahahFrDNsPrKUIQPI="; }; + sourceRoot = finalAttrs.src.name; + postPatch = '' - substituteInPlace makefile \ + 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 = '' - # `make {unrar,lib}` call `make clean` implicitly - # move build results to another dir to avoid deleting them - mkdir -p bin + runHook preBuild - make unrar - mv unrar bin + cp -a unrar libunrar + make -C libunrar lib + make -C unrar -j1 - make lib - mv libunrar.so bin + runHook postBuild ''; - outputs = [ "out" "dev" ]; - installPhase = '' - install -Dt "$out/bin" bin/unrar + runHook preInstall - mkdir -p $out/share/doc/unrar - cp acknow.txt license.txt \ - $out/share/doc/unrar + install -Dm755 unrar/unrar -t $out/bin/ + install -Dm644 unrar/{acknow.txt,license.txt} -t $out/share/doc/unrar/ - install -Dm755 bin/libunrar.so $out/lib/libunrar.so + install -Dm755 libunrar/libunrar.so -t $out/lib/ + install -Dm644 libunrar/dll.hpp -t $dev/include/unrar/ - install -Dt $dev/include/unrar/ *.hpp + runHook postInstall ''; setupHook = ./setup-hook.sh; @@ -48,7 +54,7 @@ stdenv.mkDerivation rec { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; - maintainers = [ maintainers.ehmry ]; + maintainers = with maintainers; [ ehmry wegank ]; platforms = platforms.all; }; -} +}) -- cgit 1.4.1 From 97ca003988e67d3fa9ac5f422eab014b85548d95 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 8 Oct 2023 23:24:01 +0200 Subject: unrar: 6.2.11 -> 6.2.12 --- pkgs/tools/archivers/unrar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 53b4a4bfa96..ef458089e31 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "6.2.11"; + version = "6.2.12"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; - hash = "sha256-HFglLjn4UE8dalp2ZIFlqqaE9FahahFrDNsPrKUIQPI="; + hash = "sha256-VAL3o9JGmkAcEssa/P/SL9nyxnigb7dX9YZBHrG9f0A="; }; sourceRoot = finalAttrs.src.name; -- cgit 1.4.1 From df7dd3a91303b450ecc5cdfa51c3e1ec0485a67d Mon Sep 17 00:00:00 2001 From: Anna Aurora Date: Tue, 10 Oct 2023 22:04:04 +0200 Subject: peazip: 9.9.0 → 9.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tag 9.9.0 was accidentally created and is not an actual release of a new version. --- pkgs/tools/archivers/peazip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/peazip/default.nix b/pkgs/tools/archivers/peazip/default.nix index 3dd74e1e729..b00f7b9d665 100644 --- a/pkgs/tools/archivers/peazip/default.nix +++ b/pkgs/tools/archivers/peazip/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "peazip"; - version = "9.9.0"; + version = "9.4.0"; src = fetchFromGitHub { owner = "peazip"; repo = pname; rev = version; - hash = "sha256-1UavigwVp/Gna2BOUECQrn/VQjov8wDw5EdPWX3mpvM="; + hash = "sha256-to5VhuTomw33WRWrtSIMF/SD+KVXsUKmSrJ84BNatqw="; }; sourceRoot = "${src.name}/peazip-sources"; -- cgit 1.4.1 From 11407849adac68f9ac1ddf63d476a8a74087df6f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 24 Sep 2023 18:53:07 +0100 Subject: tarlz: 0.22 -> 0.24 --- pkgs/tools/archivers/tarlz/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/tarlz/default.nix b/pkgs/tools/archivers/tarlz/default.nix index 7f41a05a9a8..250b0e05c6c 100644 --- a/pkgs/tools/archivers/tarlz/default.nix +++ b/pkgs/tools/archivers/tarlz/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tarlz"; - version = "0.22"; + version = "0.24"; outputs = [ "out" "man" "info" ]; nativeBuildInputs = [ lzip texinfo ]; @@ -10,12 +10,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; - sha256 = "sha256-/M9yJvoktV0ybKsT926jSb7ERsWo33GkbTQwmaBQkdw="; + sha256 = "49838effe95acb29d548b7ef2ddbb4b63face40536df0d9a80a62900c7170576"; }; enableParallelBuilding = true; makeFlags = [ "CXX:=$(CXX)" ]; - doCheck = !stdenv.isDarwin; + + doCheck = false; # system clock issues meta = with lib; { homepage = "https://www.nongnu.org/lzip/${pname}.html"; -- cgit 1.4.1 From e6321d2788254242956443c624a026cba9f9f3d6 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 20 Oct 2023 19:55:39 +0200 Subject: treewide: remove execute bit for non-executable `*.nix` files --- nixos/modules/services/misc/confd.nix | 0 pkgs/applications/audio/soundwireserver/default.nix | 0 pkgs/applications/editors/neovim/neovim-gtk.nix | 0 pkgs/applications/graphics/structorizer/default.nix | 0 pkgs/applications/misc/fluxboxlauncher/default.nix | 0 pkgs/applications/science/biology/poretools/default.nix | 0 pkgs/applications/science/biology/trimal/default.nix | 0 pkgs/applications/science/biology/vcftools/default.nix | 0 pkgs/applications/virtualization/vmware-workstation/default.nix | 0 pkgs/data/fonts/vazir-fonts/default.nix | 0 pkgs/development/python-modules/atlassian-python-api/default.nix | 0 pkgs/development/python-modules/osmnx/default.nix | 0 pkgs/development/python-modules/streamlit/default.nix | 0 pkgs/development/python-modules/zstandard/default.nix | 0 pkgs/misc/uq/default.nix | 0 pkgs/servers/unifi-video/default.nix | 0 pkgs/tools/archivers/payload-dumper-go/default.nix | 0 pkgs/tools/misc/starfetch/default.nix | 0 pkgs/tools/misc/szyszka/default.nix | 0 pkgs/tools/networking/ipfetch/default.nix | 0 20 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 nixos/modules/services/misc/confd.nix mode change 100755 => 100644 pkgs/applications/audio/soundwireserver/default.nix mode change 100755 => 100644 pkgs/applications/editors/neovim/neovim-gtk.nix mode change 100755 => 100644 pkgs/applications/graphics/structorizer/default.nix mode change 100755 => 100644 pkgs/applications/misc/fluxboxlauncher/default.nix mode change 100755 => 100644 pkgs/applications/science/biology/poretools/default.nix mode change 100755 => 100644 pkgs/applications/science/biology/trimal/default.nix mode change 100755 => 100644 pkgs/applications/science/biology/vcftools/default.nix mode change 100755 => 100644 pkgs/applications/virtualization/vmware-workstation/default.nix mode change 100755 => 100644 pkgs/data/fonts/vazir-fonts/default.nix mode change 100755 => 100644 pkgs/development/python-modules/atlassian-python-api/default.nix mode change 100755 => 100644 pkgs/development/python-modules/osmnx/default.nix mode change 100755 => 100644 pkgs/development/python-modules/streamlit/default.nix mode change 100755 => 100644 pkgs/development/python-modules/zstandard/default.nix mode change 100755 => 100644 pkgs/misc/uq/default.nix mode change 100755 => 100644 pkgs/servers/unifi-video/default.nix mode change 100755 => 100644 pkgs/tools/archivers/payload-dumper-go/default.nix mode change 100755 => 100644 pkgs/tools/misc/starfetch/default.nix mode change 100755 => 100644 pkgs/tools/misc/szyszka/default.nix mode change 100755 => 100644 pkgs/tools/networking/ipfetch/default.nix (limited to 'pkgs/tools/archivers') diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix old mode 100755 new mode 100644 diff --git a/pkgs/applications/audio/soundwireserver/default.nix b/pkgs/applications/audio/soundwireserver/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/applications/editors/neovim/neovim-gtk.nix b/pkgs/applications/editors/neovim/neovim-gtk.nix old mode 100755 new mode 100644 diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/applications/science/biology/trimal/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/servers/unifi-video/default.nix b/pkgs/servers/unifi-video/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/tools/archivers/payload-dumper-go/default.nix b/pkgs/tools/archivers/payload-dumper-go/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/tools/misc/starfetch/default.nix b/pkgs/tools/misc/starfetch/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/tools/misc/szyszka/default.nix b/pkgs/tools/misc/szyszka/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/tools/networking/ipfetch/default.nix b/pkgs/tools/networking/ipfetch/default.nix old mode 100755 new mode 100644 -- cgit 1.4.1 From 19fbec8a7fc87e27220d32de13f7d3eb04b90285 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 6 Nov 2023 21:52:13 -0500 Subject: unar: fix build with clang 16 * Set deployment target based on stdenv; and * Work around https://github.com/NixOS/nixpkgs/issues/166205. --- pkgs/tools/archivers/unar/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index ee1693ee18e..07aa89fa5ca 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -50,15 +50,17 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ gnustep.make ] ++ lib.optionals stdenv.isDarwin [ xcbuildHook ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + # xcbuild links with clang instead of clang++. + env = lib.optionalAttrs stdenv.isDarwin { + LD_FLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + xcbuildFlags = lib.optionals stdenv.isDarwin [ "-target unar" "-target lsar" "-configuration Release" - "MACOSX_DEPLOYMENT_TARGET=10.12" - # Fix "ld: file not found: /nix/store/*-clang-7.1.0/lib/arc/libarclite_macosx." error - # Disabling ARC may leak memory, however since this program is generally not used for - # long periods of time, it shouldn't be an issue - "CLANG_LINK_OBJC_RUNTIME=NO" + "MACOSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; makefile = lib.optionalString (!stdenv.isDarwin) "Makefile.linux"; -- cgit 1.4.1 From e77e16b45bc8728345412bd79e441504fdb39895 Mon Sep 17 00:00:00 2001 From: Loke Gustafsson Date: Thu, 9 Nov 2023 14:21:35 +0100 Subject: unrar: explicit `meta.mainProgram` --- pkgs/tools/archivers/unrar/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index ef458089e31..9350a6fd1ee 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; + mainProgram = "unrar"; maintainers = with maintainers; [ ehmry wegank ]; platforms = platforms.all; }; -- cgit 1.4.1