From 60fb1207fcc521a7b5f4c714b262498af6a3a83a Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 26 May 2025 20:04:05 +0530 Subject: [PATCH] fix: disable use of aliases in nixpkgs This enables compatibility with users who also disable aliases The utillinux alias was added in 2020[1], which is older than the previous Nixpkgs pin, which means we can safely switch to the non-aliased version. 1: https://github.com/NixOS/nixpkgs/blob/3896a0c0e22c8834e8caa297b6e508805c89d1b4/pkgs/top-level/aliases.nix#L1967 --- contrib/package/nix/copyparty/default.nix | 4 ++-- flake.nix | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/package/nix/copyparty/default.nix b/contrib/package/nix/copyparty/default.nix index bafa4e66..d34f9ae7 100644 --- a/contrib/package/nix/copyparty/default.nix +++ b/contrib/package/nix/copyparty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchurl, utillinux, python, jinja2, impacket, pyftpdlib, pyopenssl, argon2-cffi, pillow, pyvips, pyzmq, ffmpeg, mutagen, +{ lib, stdenv, makeWrapper, fetchurl, util-linux, python, jinja2, impacket, pyftpdlib, pyopenssl, argon2-cffi, pillow, pyvips, pyzmq, ffmpeg, mutagen, # use argon2id-hashed passwords in config files (sha2 is always available) withHashedPasswords ? true, @@ -61,7 +61,7 @@ in stdenv.mkDerivation { installPhase = '' install -Dm755 $src $out/share/copyparty-sfx.py makeWrapper ${pyEnv.interpreter} $out/bin/copyparty \ - --set PATH '${lib.makeBinPath ([ utillinux ] ++ lib.optional withMediaProcessing ffmpeg)}:$PATH' \ + --set PATH '${lib.makeBinPath ([ util-linux ] ++ lib.optional withMediaProcessing ffmpeg)}:$PATH' \ --add-flags "$out/share/copyparty-sfx.py" ''; meta.mainProgram = "copyparty"; diff --git a/flake.nix b/flake.nix index 6be00148..be9d0678 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,9 @@ let pkgs = import nixpkgs { inherit system; + config = { + allowAliases = false; + }; overlays = [ self.overlays.default ]; }; in {