nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

treewide: fix lints and remove a unneeded cmake input

Artturin c55b9316 e600ef05

+42 -39
+1 -1
pkgs/applications/networking/remote/freerdp/default.nix
··· 156 156 WITH_X11 = true; 157 157 }; 158 158 159 - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ 159 + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ 160 160 "-DTARGET_OS_IPHONE=0" 161 161 "-DTARGET_OS_WATCH=0" 162 162 "-include AudioToolbox/AudioToolbox.h"
+13 -11
pkgs/applications/networking/sniffers/kismet/default.nix
··· 71 71 ] ++ lib.optionals withNetworkManager [ 72 72 networkmanager 73 73 glib 74 - ] ++ lib.optional withSensors [ 74 + ] ++ lib.optionals withSensors [ 75 75 lm_sensors 76 76 ]; 77 77 78 78 propagatedBuildInputs = [ 79 - ] ++ lib.optional withPython (python3.withPackages (ps: [ 80 - ps.numpy 81 - ps.protobuf 82 - ps.pyserial 83 - ps.setuptools 84 - ps.websockets 85 - ])); 79 + ] ++ lib.optionals withPython [ 80 + (python3.withPackages (ps: [ 81 + ps.numpy 82 + ps.protobuf 83 + ps.pyserial 84 + ps.setuptools 85 + ps.websockets 86 + ])) 87 + ]; 86 88 87 89 configureFlags = [ 88 - ] ++ lib.optional (!withNetworkManager) [ 90 + ] ++ lib.optionals (!withNetworkManager) [ 89 91 "--disable-libnm" 90 - ] ++ lib.optional (!withPython) [ 92 + ] ++ lib.optionals (!withPython) [ 91 93 "--disable-python-tools" 92 - ] ++ lib.optional (!withSensors) [ 94 + ] ++ lib.optionals (!withSensors) [ 93 95 "--disable-lmsensors" 94 96 ]; 95 97
+2 -2
pkgs/applications/office/libreoffice/default.nix
··· 119 119 flatten flip 120 120 concatMapStrings concatStringsSep 121 121 getDev getLib 122 - optional optionals optionalString; 122 + optionals optionalString; 123 123 124 124 jre' = jre17_minimal.override { 125 125 modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; ··· 195 195 tar -xf ${srcs.translations} 196 196 ''; 197 197 198 - patches = optional (variant == "still") [ ./skip-failed-test-with-icu70.patch ./gpgme-1.18.patch ] 198 + patches = optionals (variant == "still") [ ./skip-failed-test-with-icu70.patch ./gpgme-1.18.patch ] 199 199 ; 200 200 201 201 ### QT/KDE
+1 -1
pkgs/applications/virtualization/docker/default.nix
··· 48 48 }; 49 49 50 50 buildInputs = oldAttrs.buildInputs 51 - ++ lib.optional withSeccomp [ libseccomp ]; 51 + ++ lib.optionals withSeccomp [ libseccomp ]; 52 52 }); 53 53 54 54 docker-tini = tini.overrideAttrs (oldAttrs: {
+1 -1
pkgs/development/libraries/gtk-frdp/default.nix
··· 44 44 }; 45 45 }; 46 46 47 - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ 47 + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ 48 48 "-DTARGET_OS_IPHONE=0" 49 49 "-DTARGET_OS_WATCH=0" 50 50 ];
+1 -1
pkgs/development/ocaml-modules/lambda-term/default.nix
··· 26 26 }; 27 27 28 28 propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ] 29 - ++ lib.optional (lib.versionAtLeast version "3.3.1") [ uucp logs ] ; 29 + ++ lib.optionals (lib.versionAtLeast version "3.3.1") [ uucp logs ] ; 30 30 31 31 meta = { 32 32 description = "Terminal manipulation library for OCaml";
+1 -1
pkgs/development/python-modules/bundlewrap/default.nix
··· 32 32 nativeBuildInputs = [ setuptools ]; 33 33 propagatedBuildInputs = [ 34 34 cryptography jinja2 Mako passlib pyyaml requests tomlkit librouteros 35 - ] ++ lib.optional (pythonOlder "3.11") [ rtoml ]; 35 + ] ++ lib.optionals (pythonOlder "3.11") [ rtoml ]; 36 36 37 37 pythonImportsCheck = [ "bundlewrap" ]; 38 38
+1 -1
pkgs/development/python-modules/jupyterlab_server/default.nix
··· 40 40 babel 41 41 jupyter_server 42 42 tomli 43 - ] ++ lib.optional (pythonOlder "3.10") [ 43 + ] ++ lib.optionals (pythonOlder "3.10") [ 44 44 importlib-metadata 45 45 ]; 46 46
+1 -1
pkgs/development/python-modules/protobuf/default.nix
··· 37 37 buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" 38 38 ]; 39 39 40 - setupPyGlobalFlags = "--cpp_implementation"; 40 + setupPyGlobalFlags = [ "--cpp_implementation" ]; 41 41 42 42 pythonImportsCheck = [ 43 43 "google.protobuf"
+1 -1
pkgs/development/python-modules/pyshark/default.nix
··· 35 35 ]; 36 36 37 37 # `stripLen` does not seem to work here 38 - patchFlags = "-p2"; 38 + patchFlags = [ "-p2" ]; 39 39 40 40 sourceRoot = "${src.name}/src"; 41 41
+1 -1
pkgs/development/python-modules/python-lsp-server/default.nix
··· 133 133 # https://github.com/python-lsp/python-lsp-server/issues/243 134 134 "test_numpy_completions" 135 135 "test_workspace_loads_pycodestyle_config" 136 - ] ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ 136 + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ 137 137 # pyqt5 is broken on aarch64-darwin 138 138 "test_pyqt_completion" 139 139 ];
+1 -1
pkgs/development/tools/godot/4/default.nix
··· 91 91 92 92 enableParallelBuilding = true; 93 93 94 - sconsFlags = "platform=linuxbsd target=editor production=true"; 94 + sconsFlags = [ "platform=linuxbsd target=editor production=true" ]; 95 95 preConfigure = '' 96 96 sconsFlags+=" ${ 97 97 lib.concatStringsSep " "
+6 -6
pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
··· 397 397 ( 398 398 old: { 399 399 nativeBuildInputs = (old.nativeBuildInputs or [ ]) 400 - ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] 400 + ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] 401 401 ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi 402 402 ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) 403 403 (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); ··· 1078 1078 1079 1079 buildInputs = old.buildInputs or [ ] ++ [ 1080 1080 pkgs.which 1081 - ] ++ lib.optional enableGhostscript [ 1081 + ] ++ lib.optionals enableGhostscript [ 1082 1082 pkgs.ghostscript 1083 - ] ++ lib.optional stdenv.isDarwin [ 1083 + ] ++ lib.optionals stdenv.isDarwin [ 1084 1084 Cocoa 1085 1085 ]; 1086 1086 ··· 1097 1097 1098 1098 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ 1099 1099 pkg-config 1100 - ] ++ lib.optional (lib.versionAtLeast super.matplotlib.version "3.5.0") [ 1100 + ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.5.0") [ 1101 1101 self.setuptools-scm 1102 1102 self.setuptools-scm-git-archive 1103 1103 ]; ··· 2111 2111 if old.format != "wheel" then { 2112 2112 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ 2113 2113 [ pkgs.gfortran ] ++ 2114 - lib.optional (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ 2115 - lib.optional (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; 2114 + lib.optionals (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ 2115 + lib.optionals (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; 2116 2116 propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ]; 2117 2117 setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; 2118 2118 enableParallelBuilding = true;
+1 -1
pkgs/os-specific/linux/wireguard/default.nix
··· 22 22 buildFlags = [ "module" ]; 23 23 makeFlags = [ 24 24 "ARCH=${stdenv.hostPlatform.linuxArch}" 25 - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ 25 + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 26 26 "CROSS_COMPILE=${stdenv.cc.targetPrefix}" 27 27 ]; 28 28
+1 -1
pkgs/servers/libreddit/default.nix
··· 19 19 20 20 cargoSha256 = "sha256-uIr8aUDErHVUKML2l6nITSBpOxqg3h1Md0948BxvutI="; 21 21 22 - buildInputs = lib.optional stdenv.isDarwin [ 22 + buildInputs = lib.optionals stdenv.isDarwin [ 23 23 Security 24 24 ]; 25 25
+3 -3
pkgs/servers/monitoring/uptime-kuma/default.nix
··· 1 - { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, substituteAll, nixosTests, iputils }: 1 + { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, nixosTests, iputils, nodejs, makeWrapper }: 2 2 let 3 3 deps = import ./composition.nix { inherit pkgs; }; 4 4 in ··· 28 28 --replace "/sbin/ping" "${iputils}/bin/ping" 29 29 ''; 30 30 31 - buildInputs = [ pkgs.makeWrapper ]; 31 + nativeBuildInputs = [ makeWrapper ]; 32 32 33 33 installPhase = '' 34 34 mkdir -p $out/share/ ··· 41 41 ''; 42 42 43 43 postFixup = '' 44 - makeWrapper ${pkgs.nodejs}/bin/node $out/bin/uptime-kuma-server \ 44 + makeWrapper ${nodejs}/bin/node $out/bin/uptime-kuma-server \ 45 45 --add-flags $out/share/server/server.js \ 46 46 --chdir $out/share/ 47 47 '';
+1 -1
pkgs/servers/photoprism/default.nix
··· 42 42 stdenv.mkDerivation { 43 43 inherit pname version; 44 44 45 - buildInputs = [ 45 + nativeBuildInputs = [ 46 46 makeWrapper 47 47 ]; 48 48
+1 -1
pkgs/servers/search/elasticsearch/6.x.nix
··· 38 38 39 39 nativeBuildInputs = [ makeWrapper ]; 40 40 buildInputs = [ jre_headless util-linux ] 41 - ++ optional enableUnfree [ zlib libxcrypt ]; 41 + ++ optionals enableUnfree [ zlib libxcrypt ]; 42 42 43 43 installPhase = '' 44 44 mkdir -p $out
+1 -1
pkgs/shells/zsh/default.nix
··· 44 44 "--enable-pcre" 45 45 "--enable-zprofile=${placeholder "out"}/etc/zprofile" 46 46 "--disable-site-fndir" 47 - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [ 47 + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [ 48 48 # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba 49 49 "zsh_cv_shared_environ=yes" 50 50 "zsh_cv_shared_tgetent=yes"
+2 -1
pkgs/tools/misc/wwcd/default.nix
··· 17 17 sha256 = "sha256-laf1DEtdEs7q+rtp5Y5rb+7AGsKUv5T413CFWJiURWw="; 18 18 }; 19 19 20 - autoreconfFlags = "-if"; 21 20 nativeBuildInputs = [ 22 21 autoreconfHook pkg-config check 23 22 ]; 23 + 24 + autoreconfFlags = [ "-if" ]; 24 25 25 26 meta = with lib; { 26 27 description = "What would cron do? Read crontab entries from stdin and print time of next execution(s)";
+1 -1
pkgs/tools/wayland/waynergy/default.nix
··· 25 25 }; 26 26 27 27 depsBuildBuild = [ pkg-config ]; 28 - buildInputs = [ libdrm wayland wayland-protocols wl-clipboard libxkbcommon cmake libressl ]; 29 28 nativeBuildInputs = [ meson ninja ]; 29 + buildInputs = [ libdrm wayland wayland-protocols wl-clipboard libxkbcommon libressl ]; 30 30 31 31 postPatch = '' 32 32 substituteInPlace waynergy.desktop --replace "Exec=/usr/bin/waynergy" "Exec=$out/bin/waynergy"