diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 421aa0aac60e..bc5e8c66e2a5 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -111,7 +111,6 @@ in [ "${cfg.package}/bin/k3s ${cfg.role}" ] - ++ (optional (config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd") ++ (optional cfg.disableAgent "--disable-agent") ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") ++ (optional (cfg.token != "") "--token ${cfg.token}") diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 30dd919b81a3..a64d08c36cbb 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -280,7 +280,6 @@ in CapabilityBoundingSet = ""; # ProtectClock= adds DeviceAllow=char-rtc r DeviceAllow = ""; - LockPersonality = true; NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; @@ -300,13 +299,17 @@ in RestrictSUIDSGID = true; UMask = "0066"; ProtectProc = "invisible"; - ProcSubset = "pid"; SystemCallFilter = [ - "~@debug" - "~@mount" - "~@privileged" + "~@capset" + "~@clock" "~@cpu-emulation" + "~@module" + "~@mount" "~@obsolete" + "~@raw-io" + "~@reboot" + "~setdomainname" + "~sethostname" ]; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ]; @@ -314,6 +317,17 @@ in PrivateNetwork = false; # Cannot be true due to Node MemoryDenyWriteExecute = false; + + # The more restrictive "pid" option makes `nix` commands in CI emit + # "GC Warning: Couldn't read /proc/stat" + # You may want to set this to "pid" if not using `nix` commands + ProcSubset = "all"; + # Coverage programs for compiled code such as `cargo-tarpaulin` disable + # ASLR (address space layout randomization) which requires the + # `personality` syscall + # You may want to set this to `true` if not using coverage tooling on + # compiled code + LockPersonality = false; }; }; }; diff --git a/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json b/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json index c7f58fd5799a..0f1ebe5749c6 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json @@ -91,6 +91,7 @@ "adapter.auto-port-config": { "mode": "dsp", "monitor": false, + "control": false, "position": "unknown" } } @@ -109,6 +110,7 @@ "adapter.auto-port-config": { "mode": "dsp", "monitor": false, + "control": false, "position": "unknown" } } diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index c6a3315d4022..03a76cab9f5e 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -201,7 +201,9 @@ in { serviceConfig = { ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf"; ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; - ExecStartPost = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done''; + ExecStartPost = pkgs.writeShellScript "wait-for-netdata-up" '' + while [ "$(${pkgs.netdata}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done + ''; TimeoutStopSec = 60; Restart = "on-failure"; diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index ac84b3d35a3d..4698c1f682c9 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -155,10 +155,11 @@ in { FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile; FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile; FLANNELD_ETCD_CAFILE = cfg.etcd.caFile; - ETCDCTL_CERT_FILE = cfg.etcd.certFile; - ETCDCTL_KEY_FILE = cfg.etcd.keyFile; - ETCDCTL_CA_FILE = cfg.etcd.caFile; - ETCDCTL_PEERS = concatStringsSep "," cfg.etcd.endpoints; + ETCDCTL_CERT = cfg.etcd.certFile; + ETCDCTL_KEY = cfg.etcd.keyFile; + ETCDCTL_CACERT = cfg.etcd.caFile; + ETCDCTL_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints; + ETCDCTL_API = "3"; } // optionalAttrs (cfg.storageBackend == "kubernetes") { FLANNELD_KUBE_SUBNET_MGR = "true"; FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig; @@ -167,7 +168,7 @@ in { path = [ pkgs.iptables ]; preStart = optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" - until ${pkgs.etcd}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' + until ${pkgs.etcd}/bin/etcdctl put /coreos.com/network/config '${builtins.toJSON networkConfig}' do echo "setting network configuration, retry" sleep 1 diff --git a/nixos/tests/airsonic.nix b/nixos/tests/airsonic.nix index 2f60c56f643b..69f979726bce 100644 --- a/nixos/tests/airsonic.nix +++ b/nixos/tests/airsonic.nix @@ -15,7 +15,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = '' def airsonic_is_up(_) -> bool: - return machine.succeed("curl --fail http://localhost:4040/login") + status, _ = machine.execute("curl --fail http://localhost:4040/login") + return status == 0 machine.start() diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 653d5555eb14..953e9887f5a6 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -167,6 +167,9 @@ in stdenv.mkDerivation rec { "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON" "-Daudacity_conan_enabled=Off" "-Daudacity_use_ffmpeg=loaded" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; doCheck = false; # Test fails diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index 7cf0fb8c1454..5fb36b034506 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation rec { cp in-formant $out/bin ''; + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + meta = with lib; { description = "A real-time pitch and formant tracking software"; homepage = "https://github.com/in-formant/in-formant"; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 4abf799d0155..bd524b6d9317 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -24,11 +24,7 @@ , withDebug ? false }: -let - opt = lib.optional; - mkFlag = c: f: if c then "--with-${f}" else "--without-${f}"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "moc"; version = "2.5.2"; @@ -39,56 +35,56 @@ in stdenv.mkDerivation rec { }; patches = [] - ++ opt ffmpegSupport ./moc-ffmpeg4.patch - ++ opt pulseSupport ./pulseaudio.patch; + ++ lib.optional ffmpegSupport ./moc-ffmpeg4.patch + ++ lib.optional pulseSupport ./pulseaudio.patch; nativeBuildInputs = [ pkg-config ] - ++ opt pulseSupport autoreconfHook; + ++ lib.optional pulseSupport autoreconfHook; buildInputs = [ ncurses db popt libtool ] # Sound sub-systems - ++ opt alsaSupport alsa-lib - ++ opt pulseSupport libpulseaudio - ++ opt jackSupport libjack2 + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional jackSupport libjack2 # Audio formats - ++ opt (aacSupport || mp3Support) libid3tag - ++ opt aacSupport faad2 - ++ opt flacSupport flac - ++ opt midiSupport timidity - ++ opt modplugSupport libmodplug - ++ opt mp3Support libmad + ++ lib.optional (aacSupport || mp3Support) libid3tag + ++ lib.optional aacSupport faad2 + ++ lib.optional flacSupport flac + ++ lib.optional midiSupport timidity + ++ lib.optional modplugSupport libmodplug + ++ lib.optional mp3Support libmad ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] - ++ opt vorbisSupport libvorbis - ++ opt speexSupport speex - ++ opt ffmpegSupport ffmpeg - ++ opt sndfileSupport libsndfile - ++ opt wavpackSupport wavpack + ++ lib.optional vorbisSupport libvorbis + ++ lib.optional speexSupport speex + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional sndfileSupport libsndfile + ++ lib.optional wavpackSupport wavpack # Misc - ++ opt curlSupport curl - ++ opt samplerateSupport libsamplerate + ++ lib.optional curlSupport curl + ++ lib.optional samplerateSupport libsamplerate ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; configureFlags = [ # Sound sub-systems - (mkFlag alsaSupport "alsa") - (mkFlag pulseSupport "pulse") - (mkFlag jackSupport "jack") - (mkFlag ossSupport "oss") + (lib.withFeature alsaSupport "alsa") + (lib.withFeature pulseSupport "pulse") + (lib.withFeature jackSupport "jack") + (lib.withFeature ossSupport "oss") # Audio formats - (mkFlag aacSupport "aac") - (mkFlag flacSupport "flac") - (mkFlag midiSupport "timidity") - (mkFlag modplugSupport "modplug") - (mkFlag mp3Support "mp3") - (mkFlag musepackSupport "musepack") - (mkFlag vorbisSupport "vorbis") - (mkFlag speexSupport "speex") - (mkFlag ffmpegSupport "ffmpeg") - (mkFlag sndfileSupport "sndfile") - (mkFlag wavpackSupport "wavpack") + (lib.withFeature aacSupport "aac") + (lib.withFeature flacSupport "flac") + (lib.withFeature midiSupport "timidity") + (lib.withFeature modplugSupport "modplug") + (lib.withFeature mp3Support "mp3") + (lib.withFeature musepackSupport "musepack") + (lib.withFeature vorbisSupport "vorbis") + (lib.withFeature speexSupport "speex") + (lib.withFeature ffmpegSupport "ffmpeg") + (lib.withFeature sndfileSupport "sndfile") + (lib.withFeature wavpackSupport "wavpack") # Misc - (mkFlag curlSupport "curl") - (mkFlag samplerateSupport "samplerate") + (lib.withFeature curlSupport "curl") + (lib.withFeature samplerateSupport "samplerate") ("--enable-debug=" + (if withDebug then "yes" else "no")) "--disable-cache" "--without-rcc" diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index e7e8c73c9c1b..b2faf62b0fe0 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.6.1.0"; + version = "0.6.1.1"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-zkDMZT1kKCLqNvvxZFKVuXFqZptX/LG/R9kRUcNJphw="; + sha256 = "sha256-ydn3qKOK0GwA/mBPbGwSIac09b9cz6YOFbuDFFV8jJs="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 466457c607dc..8bce5c83a691 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ lv2 rnnoise-nu ]; - mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); + mesonFlags = [ "--prefix=${placeholder "out"}/lib/lv2" ]; postPatch = '' substituteInPlace meson.build \ diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index fbf13c1748ff..89051e70b519 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -138,6 +138,11 @@ stdenv.mkDerivation rec { util-linux ]; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Sound editor with graphical UI"; homepage = "https://tenacityaudio.org/"; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index d966db2027aa..a1bcaefb93b9 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.166.5"; + version = "1.167.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-mFSVYC6a9iAiUcWZOlxuVxFwuwIgH8eQmh8YKaMw2Wg="; + sha256 = "sha256-cK96lcncSojEcQrZIPiJ9j9F4cIcaXvWNI9wuR3tVBU="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 89e6a0f79cec..c2fcc2ecab23 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.06.19", - "sha256": "sha256-4pkwgg2U6NAGv+fVFKIli2Qe3fyDMiliFLJSgsh1hsQ=" + "rev": "2022.07.17", + "sha256": "sha256-KMGmimbtUQHa8i5wt4KLA/HotLbb/ISzdznmdqPXkNU=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.07.01", - "sha256": "sha256-Il8NMBoShJtY5itDr9EBJ8NpfiPux/pNzs9LUc/nn30=" + "rev": "2022.07.18", + "sha256": "sha256-3ae1XAGu+4p+EVReH7VZZOTOwOu5juybPXjK7XN16CQ=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 9f85c9f9a150..9514390c0d85 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0rq0bc99hsji4ni5mqw1rhzn2rng9rldm4xbdxlkrjyprc6qvffz"; - x86_64-darwin = "1yjcb65w0anxyjc1nd9kbwr4hwnrlk9c6kp1a2ncy1g181klzarl"; - aarch64-linux = "1fk7887clz9sd7fmz7lkxql7bnsvnbjd9fjixym2746x9if5ds42"; - aarch64-darwin = "1bfgsjnm5r1wpss69ncx310j23mbwhixdxmg07m3kpcfqrmznvgc"; - armv7l-linux = "0131i5cx2737wmngybvlw7d9c4gnilmla33nlrhf74ihic98jwlc"; + x86_64-linux = "0jixjbj1h9l0zrkb8sc3p4x7kjh87dramaz6j8369vv6mc4h8ymr"; + x86_64-darwin = "1lqxjzyzhr3dpvjpmmlvknaxjzryr6yz8rg1mh5p211wfi13rf1c"; + aarch64-linux = "0y4q1kpwhz0hyipsc7hah6xgz9p3sn0ysaqzw32dl91hkr6d52mf"; + aarch64-darwin = "1d89gr4aj0vl05rz9d5iv8kkgb8p5jbfc9b0hjj1cp0d276x6ipy"; + armv7l-linux = "11cawg3ql9iq9z56i68h26cz7ydg0az298cbs2kpsz2lzkw97wbd"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.68.1"; + version = "1.69.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 721cfbabf82b..11a1c5e37fc8 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -14,11 +14,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1gx64ff9sgjqn8vw2hjpn3qlfpfyyhc5ivzc52vqyczaj1fcny65"; - x86_64-darwin = "0sv0iyqfw24k14r28qzvlpdb81b7fqhbgb1lqzb75adhdfpjwz31"; - aarch64-linux = "13mg7nn43k4bs1gl8cx1kly90yxz7iial6a1fpy4grxsk8mna1rj"; - aarch64-darwin = "0mnj3lckpqwb3kmg7x7r34idaxyhy55gpiiyj0gmpqp8hp0ai5sc"; - armv7l-linux = "0cvvigzmqp21jxwdfpkspdj7sva9bj977f9689qgb012kqvy41b2"; + x86_64-linux = "0nsqrhijx5ic467fk2d803x93yazjkybg9cwmkk2l343fdg86kyq"; + x86_64-darwin = "0hxafssjjx4gvbqpra517ar8dik5hkrnzx54v89g8p6s7kzkp1j0"; + aarch64-linux = "1sl3w17a0j4b6rgl3xkna34i24s5ig8fs8kh2ysigb34h2izjdwi"; + aarch64-darwin = "08wqiplyb16s7nvhlik7307jm3jznq7g611bp01q12bkxfa3bpp8"; + armv7l-linux = "0vzl70545dplvd7nkl5g8x7mninjv3bkdp6d2ww6g2hdbdx0hlhr"; }.${system}; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -28,7 +28,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.68.1"; + version = "1.69.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/resim/default.nix b/pkgs/applications/emulators/resim/default.nix index 49d7721174f5..d69aafcec2bd 100644 --- a/pkgs/applications/emulators/resim/default.nix +++ b/pkgs/applications/emulators/resim/default.nix @@ -17,5 +17,10 @@ stdenv.mkDerivation { cp -v vc4emul/vc4emul $out/bin/vc4emul ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta.license = lib.licenses.mit; } diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 8acc917b047f..e079d347181c 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -128,7 +128,6 @@ in mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DWITH_3D=True" "-DWITH_PDAL=TRUE" "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index f0cfbda170d9..fe53f0726b4e 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -128,7 +128,6 @@ in mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DWITH_3D=True" "-DWITH_PDAL=TRUE" "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index cd16fe1de089..1087bba9705e 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -44,13 +44,6 @@ in mkDerivation rec { export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} ''; - # During build, binaries are called that rely on freshly built - # libraries. These reside in build/lib, and are not found by - # default. - preBuild = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib - ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DPARAVIEW_ENABLE_FFMPEG=ON" diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 92d256f47709..b70f4977f587 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -27,8 +27,4 @@ mkDerivation { wayland qtwayland ]; outputs = [ "out" "dev" ]; - # We need the RPATH for linking, because the `libkdeinit5_dolphin.so` links - # private against its dependencies and without the correct RPATH, these - # dependencies are not found. - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; } diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index f7c01ce46494..e90ac480eb19 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -16,13 +16,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; # headers are just two and very small - preConfigure = - if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src - '' else '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src - ''; - nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/applications/misc/break-time/default.nix index 8d9a872a1022..23856ee54165 100644 --- a/pkgs/applications/misc/break-time/default.nix +++ b/pkgs/applications/misc/break-time/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "break-time"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "cdepillabout"; repo = "break-time"; rev = "v${version}"; - sha256 = "18p9gfp0inbnjsc7af38fghyklr7qnl2kkr25isfy9d5m8cpxqc6"; + sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8="; }; - cargoSha256 = "01y1p40vz30h2jkh37zipqvmfybgpq6wdcdglkab85jivmd1lslx"; + cargoSha256 = "sha256-DpX5tcIWt/pPGujufivmAGonVIiHERfa8Yb1JZpu3WA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index c36d98a1b6e5..64193190b5c6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.1.1"; # When updating also update mvnSha256 + version = "22.1.2"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-+MFULieuwfvuAP0HjJ+C0hb/uqhHtnP/nOoIfWwjtoI="; + sha256 = "sha256-iADQls//lgoq+IY4mzy/emyraFAJidHn46dMeAy5k6k="; }; - mvnSha256 = "pSZL+GDSXSm+sLymlSlq2ZIRdYJY1B3PCmCpjtosdGY="; + mvnSha256 = "cTFeH9MxPnF1vaV+Q5/7HfIsO5eEbNDIsyekHsFH9vw="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix index 4dfb5b6422fe..d71c01d4ace9 100644 --- a/pkgs/applications/misc/edgetx/default.nix +++ b/pkgs/applications/misc/edgetx/default.nix @@ -29,6 +29,8 @@ mkDerivation rec { "-DGTEST_ROOT=${gtest.src}/googletest" "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; meta = with lib; { diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index e4e51d78fcab..2f9996988e50 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, git, curl, expat, gcc, openssl, zlib }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, git }: stdenv.mkDerivation rec { pname = "logseq"; @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc curl expat openssl zlib ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -29,6 +28,12 @@ stdenv.mkDerivation rec { cp -a ${appimageContents}/{locales,resources} $out/share/${pname} cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop + # remove the `git` in `dugite` because we want the `git` in `nixpkgs` + chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git + chmod +w $out/share/${pname}/resources/app/node_modules/dugite + rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git + chmod -w $out/share/${pname}/resources/app/node_modules/dugite + substituteInPlace $out/share/applications/${pname}.desktop \ --replace Exec=Logseq Exec=${pname} \ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png @@ -37,8 +42,9 @@ stdenv.mkDerivation rec { ''; postFixup = '' + # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ git ]} \ + --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/${pname}/resources/app ''; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index e0a7b8942444..e9a526a1f65f 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -31,6 +31,9 @@ mkDerivation rec { # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" + + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 7d060c546d59..4aab9ed9f4c1 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.31.3"; - sha256 = "16c6rr0hzlzlfc5xsphp23s3rxavkgfcsblzm15wzd85c2ahm81l"; - manifestsSha256 = "1nr44h5sy97ki2vn2426i2idnnc4pv1n3j6n4p11mf73dy9qzgzp"; + version = "0.31.4"; + sha256 = "182h6is1kq3yc7il1a0xr5mbrsn3z900dkzxb4m79gl5lsrpb1vm"; + manifestsSha256 = "0h37ydgykl5kc50zwqn8xyi89aby75937cqaiw1hkpnw9ilc0akz"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-vHRk6oADEvDmYCeBK/puGSMd4L9K1x/CVPtuYZY9klk="; + vendorSha256 = "sha256-2DeX5si2yVh1C+ikkg9xEpcf2trEBr0qPp+9fgbMfO4="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index b1c00f223b40..3f216213849d 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -46,10 +46,10 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.24.2+k3s2"; # k3s git tag - k3sCommit = "a237260237b549b90dd3aae449de09231caf1351"; # k3s git commit at the above version - k3sRepoSha256 = "1dmlsq7f0z0wq8ypbmdqwk1hl59pcnywvqhz7qblzm3wnbdb62cl"; - k3sVendorSha256 = "sha256-w5dYkewoNnI9GvqCAkmecg7JsKgO+gu1WcyPRItLvWY="; + k3sVersion = "1.24.3+k3s1"; # k3s git tag + k3sCommit = "990ba0e88c90f8ed8b50e0ccd375937b841b176e"; # k3s git commit at the above version + k3sRepoSha256 = "0slw2j7d7ccj7k9z06l5ch3nxi07jbm6xijs774hisyv25jx94rd"; + k3sVendorSha256 = "sha256-8jWpTUE/tJf2qpFjdsV+0i8hRf6JqATwr/YbXrZa/iA="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index e31c9dc4b933..415672fed8e0 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.25.21"; + version = "0.26.0"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-ziIMTMK6G8vXje6GWPvcIWmlubq75XVrJUzZlA+R0Rc="; + sha256 = "sha256-6A6RxvobT0T/Pbd7Zcn8++I/7OVAhXSZI1NhYeDB3iY="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorSha256 = "sha256-wL8Unht/ZRAGDuC/U4SFV5PdExy78F4DMyM8+7CMtOY="; + vendorSha256 = "sha256-1FmhoLfTQSygAScbvABHZJO3611T7cfuCboyu2ShbNo="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 6fb80f9504c9..4439e89d71fd 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.124"; + version = "1.2.128"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-fdCFdsRMdH9xu2YIYt6r7BxqbdzrzUxLxB1k4WEnGIo="; + sha256 = "sha256-H1GzIxj6ZrlcNM4Y0oKYoVBsMFj4wYP9XYicAmIpaik="; }; - vendorSha256 = "sha256-AbTlchqVD3TySrcHcF3/QfMhbkNg4A4oef9Qkn2v6xY="; + vendorSha256 = "sha256-78V+cw0A3Q3Gagl4KrserFXvV17MSqhpaFG38VKwhKg="; proxyVendor = true; diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index ba4b5f0ffd4e..664fe622ac3b 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -1,15 +1,5 @@ { lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages, unzip }: -let - # OpenAsar fails with default unzip, throwing "lchmod (file attributes) error: Operation not supported" - unzipFix = - if stdenv.isLinux then - unzip.overrideAttrs (oldAttrs: { - buildFlags = oldAttrs.buildFlags ++ [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; - }) - else - unzip; -in stdenv.mkDerivation rec { pname = "openasar"; version = "unstable-2022-06-27"; @@ -24,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = '' # Hardcode unzip path substituteInPlace ./src/updater/moduleUpdater.js \ - --replace \'unzip\' \'${unzipFix}/bin/unzip\' + --replace \'unzip\' \'${unzip}/bin/unzip\' # Remove auto-update feature echo "module.exports = async () => log('AsarUpdate', 'Removed');" > ./src/asarUpdate.js ''; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 306a53f0a3c0..71299566dd87 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -83,6 +83,9 @@ mkDerivation rec { cmakeFlags = [ "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include" "-DMINIZIP_LIBRARIES=minizip" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; # The default install phase fails because the paths are somehow messed up in diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 212092d8a1ff..5b7416555ff5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -23,6 +23,7 @@ , libopus , alsa-lib , libpulseaudio +, pipewire , range-v3 , tl-expected , hunspell @@ -35,6 +36,7 @@ , util-linuxMinimal , pcre , libpthreadstubs +, libXdamage , libXdmcp , libselinux , libsepol @@ -127,6 +129,7 @@ env.mkDerivation rec { libopus alsa-lib libpulseaudio + pipewire range-v3 tl-expected hunspell @@ -139,6 +142,7 @@ env.mkDerivation rec { util-linuxMinimal # Required for libmount thus not nativeBuildInputs. pcre libpthreadstubs + libXdamage libXdmcp libselinux libsepol diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 4cb3a43640cc..49905cdbd213 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -26,13 +26,12 @@ let pname = "pcloud"; - version = "1.9.7"; - code = "XZ0FAtXZNxFJbda6KhLejU9tKAg4N0TEqx3V"; - - # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive + version = "1.9.9"; + code = "XZWTVkVZQM0GNXA4hrFGPkefzUUWVLKOpPIX"; + # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-6eMRFuZOLcoZd2hGw7QV+kAmzE5lK8uK6ZpGs4n7/zw="; + hash = "sha256-8566vKrE3/QCm4qW9KxEAO+r+YfMRYOhV2Da7qic48M="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 531c0f965834..da0e03a272b9 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "WSK2b1DYSYEFqmVIOlhjFGyqC9ok/9rWAz2ZgUZejzo="; + sha256 = "WcxRVup7wjA9YNyL6UpFoMfkCmXixfbYatcrmA4OHh4="; }; modRoot = "./agent"; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index b74905586192..2f41d0ec55ff 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -59,10 +59,6 @@ in stdenv.mkDerivation { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; - preBuild = '' - export LD_LIBRARY_PATH="$PWD/run" - ''; - postInstall = '' # to remove "cycle detected in the references" mkdir -p $dev/lib/wireshark diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix index e003c3a0e516..02a69a0fe15c 100644 --- a/pkgs/applications/office/PageEdit/default.nix +++ b/pkgs/applications/office/PageEdit/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttranslations ]; propagatedBuildInputs = [ qtsvg qtwebengine ]; - cmakeFlags = "-DINSTALL_BUNDLED_DICTS=0"; + cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ]; meta = with lib; { description = "ePub XHTML Visual Editor"; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 1c6fe68480d7..e33ef517088a 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -154,8 +154,6 @@ stdenv.mkDerivation rec { test-xml-pricedb \ test-xml-transaction \ test-xml2-is-file - - export LD_LIBRARY_PATH="$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$PWD/lib/gnucash/test/future" ''; preFixup = '' diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index e885270370ec..c98974740667 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -22,10 +22,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals portaudioSupport [ portaudio ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD - ''; meta = with lib; { description = "Digital Speech Decoder"; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 0fbd824008a5..aa5d9a7ade19 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -75,7 +75,11 @@ stdenv.mkDerivation rec { makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; - cmakeFlags = optionals (withScripting) [ + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ] + ++ optionals (withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=ON" ] ++ optionals (!withScripting) [ diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index 992d8b1de58f..0cb9c8037cb2 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/btorsim contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "A generic parser and tool package for the BTOR2 format"; homepage = "https://github.com/Boolector/btor2tools"; diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index e49c80db9d6e..2709b16c5770 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -47,6 +47,9 @@ let "-DBUILD_STATIC=OFF" "-DJAVA=${boolToCmake includeJava}" "-DGPL=${boolToCmake includeGplCode}" + + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; postInstall = optionalString includeJava '' diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index b715c2fc33b3..c7209d00af51 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -134,7 +134,6 @@ stdenv.mkDerivation rec { "-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;TrainedModelSerialization'" # Sporadic segfault "-DENABLE_TESTING=${enableIf doCheck}" "-DDISABLE_META_INTEGRATION_TESTS=ON" diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 4867e6c9ed55..8db9245ed33e 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation rec { "-Denable_compile_warnings=off" "-Denable_compile_optimizations=${optionOnOff optimize}" "-Denable_lto=${optionOnOff optimize}" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; makeFlags = optional debug "VERBOSE=1"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 6e33c013dc92..afd960f0364f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -26,7 +26,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.36.1"; + version = "2.37.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -39,7 +39,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0"; + sha256 = "sha256-n3+hcRvQDE7D3eL+REB9wT8S5HcrXjxypY20wHSVQR8="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index d6b0467fb729..35c628f8a59d 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -66,7 +66,6 @@ stdenv.mkDerivation rec { cd "$sourceRoot" patchPhase - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libXext}/lib" ${stdenv.shell} bootStrap.bash \ --with-core \ ${if withQT then "--with-qt" else "--without-qt"} \ diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 905034091a29..26954375aff5 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isLinux) libiconv ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ]; - cmakeFlags = lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH: + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ] ++ lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; postInstall = lib.optionalString enableOcr '' wrapProgram "$out/bin/ccextractor" \ diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index c6429b093486..3dce0123d1be 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; # Disable warnings that are irrelevant to us as packagers - cmakeFlags = "-Wno-dev"; + cmakeFlags = [ "-Wno-dev" ]; # We run one of the executables we build while the build is # still running (and patchelf hasn't been invoked) which means diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index 24adcf2cb4e2..34aaa8c516a9 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -3,12 +3,14 @@ rec { # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch toTargetArch = platform: - if platform.isAarch32 then "arm" + /**/ if platform ? rustc.platform then platform.rustc.platform.arch + else if platform.isAarch32 then "arm" else platform.parsed.cpu.name; # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os toTargetOs = platform: - if platform.isDarwin then "macos" + /**/ if platform ? rustc.platform then platform.rustc.platform.os or "none" + else if platform.isDarwin then "macos" else platform.parsed.kernel.name; # Returns the name of the rust target, even if it is custom. Adjustments are @@ -31,7 +33,7 @@ rec { # Returns the name of the rust target if it is standard, or the json file # containing the custom target spec. toRustTargetSpec = platform: - if (platform.rustc or {}) ? platform + if platform ? rustc.platform then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) else toRustTarget platform; } diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 88184b585ecf..2950f929912a 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "arc-icon-theme"; version = "2016-11-22"; diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/data/icons/beauty-line-icon-theme/default.nix index 2942315f7da1..3ed92f1965d9 100644 --- a/pkgs/data/icons/beauty-line-icon-theme/default.nix +++ b/pkgs/data/icons/beauty-line-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }: +{ lib, stdenvNoCC, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "BeautyLine"; version = "0.0.1"; diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index 15905bec3a97..b27b96cb5efb 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -1,12 +1,12 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , fetchurl , clickgen , unzip }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "bibata-cursors"; version = "1.1.2"; diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index a6fdaca84277..15a746eabffb 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -1,12 +1,12 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , fetchurl , clickgen , unzip }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "bibata-extra-cursors"; version = "1.0.1"; diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index 74d7c4d7c3f9..efaf25c59f2b 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "bibata-cursors-translucent"; version = "1.1.1"; diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix index 075dbc922bd4..47fbeda10942 100644 --- a/pkgs/data/icons/capitaine-cursors/default.nix +++ b/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeFontsConf +{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, makeFontsConf , inkscape, xcursorgen, bc }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "capitaine-cursors"; version = "4"; diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/data/icons/comixcursors/default.nix index 2b52b703353e..b63877b28209 100644 --- a/pkgs/data/icons/comixcursors/default.nix +++ b/pkgs/data/icons/comixcursors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, bc, librsvg, xcursorgen }: +{ lib, stdenvNoCC, fetchFromGitLab, bc, librsvg, xcursorgen }: let dimensions = { @@ -16,7 +16,7 @@ let # meta.longDescription.) map variantName product; in -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "comixcursors"; version = "0.9.2"; diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index 1119e248522a..921c87774c31 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "faba-icon-theme"; version = "4.3"; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 0627c87bfc5e..47eeab40acb7 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "faba-mono-icons"; version = "2016-04-30"; diff --git a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix index 7b779191b6b2..972b5dfba562 100644 --- a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix +++ b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "gruvbox-dark-icons-gtk"; version = "1.0.0"; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 4a58b8fb89ad..4fb1ada66540 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "hicolor-icon-theme"; version = "0.17"; diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix index 3a5fe541985a..d68e02b838d6 100644 --- a/pkgs/data/icons/iconpack-jade/default.nix +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "iconpack-jade"; version = "1.25"; diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index 13b314e1ae05..40d4d451f3f1 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "iconpack-obsidian"; version = "4.15"; diff --git a/pkgs/data/icons/iso-flags/default.nix b/pkgs/data/icons/iso-flags/default.nix index 57cc1752f187..9deff6bcc77e 100644 --- a/pkgs/data/icons/iso-flags/default.nix +++ b/pkgs/data/icons/iso-flags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib, stdenvNoCC , fetchFromGitHub , perl , inkscape @@ -6,7 +6,7 @@ , targets ? [ "all" ] }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "iso-flags"; version = "unstable-18012020"; diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 4de65c838626..ea321a763591 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "kora-icon-theme"; version = "1.5.2"; diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/data/icons/la-capitaine-icon-theme/default.nix index b7febabacd5f..01e2a3ea4781 100644 --- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix +++ b/pkgs/data/icons/la-capitaine-icon-theme/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , breeze-icons , elementary-icon-theme @@ -7,7 +7,7 @@ , hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "la-capitaine-icon-theme"; version = "0.6.2"; diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 04e1bce12750..d9fef47da0bb 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }: +{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "moka-icon-theme"; version = "unstable-2019-05-29"; diff --git a/pkgs/data/icons/nordzy-cursor-theme/default.nix b/pkgs/data/icons/nordzy-cursor-theme/default.nix index 7648a57474ae..ee18fe287727 100644 --- a/pkgs/data/icons/nordzy-cursor-theme/default.nix +++ b/pkgs/data/icons/nordzy-cursor-theme/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ stdenvNoCC , fetchFromGitHub , lib }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "nordzy-cursor-theme"; version = "0.1.0"; diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index e7f0905ff40e..83961f19caf8 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, inkscape, xcursorgen }: +{ lib, stdenvNoCC, fetchFromGitHub, inkscape, xcursorgen }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "numix-cursor-theme"; version = "1.2"; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 235895d8b039..5da3838596c0 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; version = "22.07.11"; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 1f37dfe1f226..6cb002e7d501 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; version = "22.07.11"; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index c46cc0a6ec9a..576fa405e06f 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme"; version = "21.10.31"; diff --git a/pkgs/data/icons/oranchelo-icon-theme/default.nix b/pkgs/data/icons/oranchelo-icon-theme/default.nix index 9288b9307f55..5c93acbb10af 100644 --- a/pkgs/data/icons/oranchelo-icon-theme/default.nix +++ b/pkgs/data/icons/oranchelo-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "oranchelo-icon-theme"; version = "0.8.0.1"; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index fc541f6e5b72..ae5a43eca0b3 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }: +{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "paper-icon-theme"; version = "unstable-2020-03-12"; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 56ac57e4a5c0..4980f36312c1 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }: +{ lib, stdenvNoCC, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; version = "20220710"; diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index 7254e8bc2139..ddf3d1afe6d5 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , meson , ninja @@ -8,7 +8,7 @@ , hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "pop-icon-theme"; version = "2021-11-17"; diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index 55ba320bc988..0d3f273d5bb2 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/pkgs/data/icons/vanilla-dmz/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ stdenvNoCC , lib , fetchzip , xorg , hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "vanilla-dmz"; version = "0.4.5"; diff --git a/pkgs/data/icons/vimix-icon-theme/default.nix b/pkgs/data/icons/vimix-icon-theme/default.nix index 853b1d209abb..7ef0abb85c22 100644 --- a/pkgs/data/icons/vimix-icon-theme/default.nix +++ b/pkgs/data/icons/vimix-icon-theme/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , gtk3 , hicolor-icon-theme @@ -13,7 +13,7 @@ let in lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { inherit pname; version = "2021-11-09"; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index a2d2849bac1e..197793db6c66 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -13,17 +13,17 @@ }: stdenv.mkDerivation rec { - pname = "shared-mime-info-unstable"; - version = "2021-12-03"; + pname = "shared-mime-info"; + version = "2.2"; outputs = [ "out" "dev" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; - repo = "shared-mime-info"; - rev = "5a406b06792e26a83c7346b3c2443c0bd8d4cdb2"; - sha256 = "1v7dx7mr0m4lcff1aasg9gxn280zn0ffn6fjg9xc44pnllg01n6s"; + repo = pname; + rev = version; + sha256 = "sha256-QrRe/DcjpTMejHXDSOLbjpJywod8qIjP6/leTZ21rhE="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index b447ab4230b6..f6ea2c61aa89 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -1,27 +1,40 @@ { lib , stdenv , fetchFromGitHub +, gitUpdater , gdk-pixbuf , gnome-themes-extra , gtk-engine-murrine +, jdupes , librsvg , sassc , which -, gitUpdater +, themeVariants ? [] # default: blue +, colorVariants ? [] # default: all +, tweaks ? [] }: -stdenv.mkDerivation rec { +let pname = "qogir-theme"; - version = "2022-05-29"; + +in +lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "all" ] themeVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks + +stdenv.mkDerivation rec { + inherit pname; + version = "2022-07-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "z8o/1Qc7XmefX9CuVr0Gq2MmKw2NlkUk+5Lz0Z593do="; + sha256 = "NGgTToaSJBwmHnZjWbJ3dSJg9Mmfchj3W0xgK0CMb9M="; }; nativeBuildInputs = [ + jdupes sassc which ]; @@ -36,13 +49,29 @@ stdenv.mkDerivation rec { gtk-engine-murrine # murrine engine for Gtk2 ]; + postPatch = '' + patchShebangs install.sh clean-old-theme.sh + ''; + installPhase = '' - patchShebangs . + runHook preInstall + mkdir -p $out/share/themes - name= HOME="$TMPDIR" ./install.sh -t all -d $out/share/themes + + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + --dest $out/share/themes + mkdir -p $out/share/doc/${pname} cp -a src/firefox $out/share/doc/${pname} + rm $out/share/themes/*/{AUTHORS,COPYING} + + jdupes --link-soft --recurse $out/share + + runHook postInstall ''; passthru.updateScript = gitUpdater { inherit pname version; }; diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 0a8d46157a6e..c4a12cd5ca86 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -119,7 +119,6 @@ stdenv.mkDerivation rec { "-DENABLE_UOA=OFF" "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" "-DWITH_PHONENUMBER=ON" "-DWITH_GWEATHER4=ON" diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index c88e3a72ea45..1a35169d5a27 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , gettext @@ -12,10 +13,14 @@ , texlive , mate , wrapGAppsHook -, enableEpub ? true, webkitgtk -, enableDjvu ? true, djvulibre -, enablePostScript ? true, libspectre -, enableXps ? true, libgxps +, enableEpub ? true +, webkitgtk +, enableDjvu ? true +, djvulibre +, enablePostScript ? true +, libspectre +, enableXps ? true +, libgxps , enableImages ? false , mateUpdateScript }: @@ -47,7 +52,7 @@ stdenv.mkDerivation rec { mate.caja mate.mate-desktop hicolor-icon-theme - texlive.bin.core # for synctex, used by the pdf back-end + texlive.bin.core # for synctex, used by the pdf back-end ] ++ optionals enableDjvu [ djvulibre ] ++ optionals enableEpub [ webkitgtk ] diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 0d347b39f108..3806d8cf482c 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchurl, substituteAll -, pkg-config, gobject-introspection, gdk-pixbuf -, gtk3, mate, python3, dropbox, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, gobject-introspection +, gdk-pixbuf +, gtk3 +, mate +, python3 +, dropbox +, mateUpdateScript +}: let dropboxd = "${dropbox}/bin/dropbox"; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 25563c5d5a88..cc3a6ce30cab 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript -, glib, substituteAll }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, gupnp +, mate +, imagemagick +, wrapGAppsHook +, mateUpdateScript +, glib +, substituteAll +}: stdenv.mkDerivation rec { pname = "caja-extensions"; diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix index dd9ab9be1d37..4de6d5d6d760 100644 --- a/pkgs/desktops/mate/caja-with-extensions/default.nix +++ b/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ], mateUpdateScript }: +{ stdenv +, lib +, makeWrapper +, caja-extensions +, caja +, extensions ? [ caja-extensions ] +, mateUpdateScript +}: stdenv.mkDerivation { pname = "${caja.pname}-with-extensions"; @@ -6,7 +13,9 @@ stdenv.mkDerivation { dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; inherit caja; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 098182664658..649f6f3c7e46 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libnotify +, libxml2 +, libexif +, exempi +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "caja"; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index b9ce82e345bf..d52066be3f26 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -6,9 +6,10 @@ let self = rec { # Update script tailored to mate packages from git repository - mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }: - pkgs.httpTwoLevelsUpdater { - inherit pname version odd-unstable url; + mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }: + pkgs.gitUpdater { + inherit pname version odd-unstable rev-prefix; + url = if url == null then "https://git.mate-desktop.org/${pname}" else url; attrPath = "mate.${pname}"; }; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 7fde8fb1958d..98e03044ad43 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, gtk3 +, file +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "engrampa"; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 9862c3059d21..45f9a714c23e 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, exempi +, lcms2 +, libexif +, libjpeg +, librsvg +, libxml2 +, libpeas +, shared-mime-info +, gtk3 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "eom"; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index d7969f55efce..4a0e1b604a53 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libxklavier +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ gtk3 libxklavier ]; + buildInputs = [ + gtk3 + libxklavier + ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 2ef34f2ea67d..5021a0f870e7 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,6 +1,14 @@ -{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib -, alsaSupport ? stdenv.isLinux, alsa-lib -, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio +{ config +, lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, alsaSupport ? stdenv.isLinux +, alsa-lib +, pulseaudioSupport ? config.pulseaudio or true +, libpulseaudio , ossSupport ? false , mateUpdateScript }: @@ -14,11 +22,16 @@ stdenv.mkDerivation rec { sha256 = "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ glib ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio; + buildInputs = [ + glib + ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio; configureFlags = lib.optional ossSupport "--enable-oss"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 3d99b0ccd82e..f68d33a4a516 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libsoup +, tzdata +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -9,9 +18,16 @@ stdenv.mkDerivation rec { sha256 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ gtk3 libsoup tzdata ]; + buildInputs = [ + gtk3 + libsoup + tzdata + ]; configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 597538a9f8a1..612a2c22b101 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,5 +1,22 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome, glib, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, libcanberra-gtk3 +, libgtop +, libXdamage +, libXpresent +, libstartup_notification +, gnome +, glib +, gtk3 +, mate-settings-daemon +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "marco"; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 30b51e9ed5bd..8fafe4237d6c 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,14 +1,37 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, dbus-glib, glib, gtk3, gtksourceview3 -, gucharmap, libmateweather, libnl, libwnck, libgtop, libxml2, libnotify, mate-panel, polkit -, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, dbus-glib +, glib +, gtk3 +, gtksourceview3 +, gucharmap +, libmateweather +, libnl +, libwnck +, libgtop +, libxml2 +, libnotify +, mate-panel +, polkit +, upower +, wirelesstools +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xy9dwiqvmimqshbfq80jxq65aznlgx491lqq8rl4x8c9sdl7q5p"; + sha256 = "Orj2HbN23DM85MGHIsY6B/qz6OEnK34OCXrUWXsXwsI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 3076a7170cbf..cb006cf53279 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, gettext +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-backgrounds"; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index b26347f73397..12ea1adf5538 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libmpc, libxml2, mpfr, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, libmpc +, libxml2 +, mpfr +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-calc"; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index c3d2910e8696..e247eef07cc3 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-common"; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 58828aa52b9d..25d8f889d398 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib -, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, glib -, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, dbus-glib +, libxklavier +, libcanberra-gtk3 +, librsvg +, libappindicator-gtk3 +, glib +, desktop-file-utils +, dconf +, gtk3 +, polkit +, mate +, hicolor-icon-theme +, wrapGAppsHook , mateUpdateScript }: diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index e4928ac748b5..85d6ca40532b 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, isocodes +, gnome +, gtk3 +, dconf +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-desktop"; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 69f780f6083f..0b46d092c70f 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gtk3 +, mate +, hicolor-icon-theme +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-icon-theme-faenza"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; - nativeBuildInputs = [ autoreconfHook gtk3 ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; - propagatedBuildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [ + mate.mate-icon-theme + hicolor-icon-theme + ]; dontDropIconThemeCache = true; @@ -23,12 +37,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { + inherit pname version; + url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza"; + }; meta = with lib; { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = teams.mate.members; }; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 001b6e418792..0f4f7a71e281 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, iconnamingutils +, librsvg +, gtk3 +, hicolor-icon-theme +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-icon-theme"; @@ -9,9 +19,15 @@ stdenv.mkDerivation rec { sha256 = "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1"; }; - nativeBuildInputs = [ pkg-config gettext iconnamingutils ]; + nativeBuildInputs = [ + pkg-config + gettext + iconnamingutils + ]; - buildInputs = [ librsvg ]; + buildInputs = [ + librsvg + ]; propagatedBuildInputs = [ hicolor-icon-theme diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 08985608cd61..be5db13e11a5 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libindicator-gtk3 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 839e1dc20341..5663821ab417 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, libtool +, libxml2 +, libcanberra-gtk3 +, gtk3 +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-media"; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 2d384d4687b3..cab4bc0b1605 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, gobject-introspection +, python3 +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -9,9 +18,16 @@ stdenv.mkDerivation rec { sha256 = "1r7zf64aclaplz77hkl9kq0xnz6jk1l49z64i8v56c41pm59c283"; }; - nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; + nativeBuildInputs = [ + pkg-config + gettext + gobject-introspection + ]; - buildInputs = [ glib python3 ]; + buildInputs = [ + glib + python3 + ]; makeFlags = [ "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index f9c4737bab1c..fbbedce99a95 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libwnck +, libfakekey +, libXtst +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-netbook"; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index a66f8de43462..1e79e778699b 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,5 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, - libnotify, libwnck, gtk3, libxml2, mate-desktop, mate-panel, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, libcanberra-gtk3 +, libnotify +, libwnck +, gtk3 +, libxml2 +, mate-desktop +, mate-panel +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 77569e116642..258fe5f68f9f 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, glib +, libwnck +, librsvg +, libxml2 +, dconf +, gtk3 +, mate +, hicolor-icon-theme +, gobject-introspection +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-panel"; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 9b1d77d78240..1c67e62bb800 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, gobject-introspection +, libappindicator-gtk3 +, libindicator-gtk3 +, polkit +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-polkit"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 72f9ba93a437..d77fb6b5b2eb 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, libsecret, dbus-glib, upower, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, itstool +, libxml2 +, mate-panel +, libnotify +, libcanberra-gtk3 +, libsecret +, dbus-glib +, upower +, gtk3 +, libtool +, polkit +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -17,17 +36,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib - itstool - libxml2 - libcanberra-gtk3 - gtk3 - libsecret - libnotify - dbus-glib - upower - polkit - mate-panel + glib + itstool + libxml2 + libcanberra-gtk3 + gtk3 + libsecret + libnotify + dbus-glib + upower + polkit + mate-panel ]; configureFlags = [ "--enable-applets" ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index d80a19e29bb1..e9994e15e637 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, dbus-glib +, libXScrnSaver +, libnotify +, libxml2 +, pam +, systemd +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-screensaver"; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 6faceee002e9..48a16c84d1da 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify -, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, libxml2 +, libxslt +, libatasmart +, libnotify +, lm_sensors +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index dba5c374f94a..03a18008e436 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,6 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, - libSM, libXtst, gtk3, libepoxy, polkit, hicolor-icon-theme, mate, - wrapGAppsHook, fetchpatch, mateUpdateScript +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, xtrans +, dbus-glib +, systemd +, libSM +, libXtst +, gtk3 +, libepoxy +, polkit +, hicolor-icon-theme +, mate +, wrapGAppsHook +, fetchpatch +, mateUpdateScript }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index ff46b339b2fc..20a9a97d2514 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier, - libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, - pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, - wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, dbus-glib +, libxklavier +, libcanberra-gtk3 +, libnotify +, nss +, polkit +, dconf +, gtk3 +, mate +, pulseaudioSupport ? stdenv.config.pulseaudio or true +, libpulseaudio +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-settings-daemon"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix index 8fe7a4cf2b28..1bbe53c44786 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix @@ -1,16 +1,31 @@ -{ stdenv, mate, glib, wrapGAppsHook }: +{ stdenv +, mate +, glib +, wrapGAppsHook +}: stdenv.mkDerivation { pname = "${mate.mate-settings-daemon.pname}-wrapped"; version = mate.mate-settings-daemon.version; - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ glib mate.mate-control-center ]; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + glib + mate.mate-control-center + ]; + dontWrapGApps = true; + dontUnpack = true; + installPhase = '' mkdir -p $out/etc/xdg/autostart cp ${mate.mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart ''; + postFixup = '' mkdir -p $out/libexec makeWrapper ${mate.mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \ @@ -18,5 +33,6 @@ stdenv.mkDerivation { substituteInPlace $out/etc/xdg/autostart/mate-settings-daemon.desktop \ --replace "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon" ''; + meta = mate.mate-settings-daemon.meta // { priority = -10; }; } diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 9b4a510b7286..9da865f2dcfc 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtkmm3 +, libxml2 +, libgtop +, libwnck +, librsvg +, polkit +, systemd +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-system-monitor"; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index fcae87a869ee..9f19d905ca4b 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript, nixosTests }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, mate-desktop +, dconf +, vte +, pcre2 +, wrapGAppsHook +, mateUpdateScript +, nixosTests +}: stdenv.mkDerivation rec { pname = "mate-terminal"; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 274501976235..af186e4c5a2d 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3, - gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, mate-icon-theme +, gtk2 +, gtk3 +, gtk_engines +, gtk-engine-murrine +, gdk-pixbuf +, librsvg +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-themes"; @@ -10,11 +22,23 @@ stdenv.mkDerivation rec { sha256 = "1avgzccdmr7y18rnp3xrhwk82alv2dlig3wh7ivgahcqdiiavrb1"; }; - nativeBuildInputs = [ pkg-config gettext gtk3 ]; + nativeBuildInputs = [ + pkg-config + gettext + gtk3 + ]; - buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; + buildInputs = [ + mate-icon-theme + gtk2 + gtk_engines + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; dontDropIconThemeCache = true; @@ -24,10 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { - inherit pname version; - url = "https://pub.mate-desktop.org/releases/themes"; - }; + passthru.updateScript = mateUpdateScript { inherit pname version; }; meta = with lib; { description = "A set of themes from MATE"; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index ecbe2e667aad..f24b02e79378 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, gettext +, itstool +, libxml2 +, yelp +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-user-guide"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1h620ngryqc4m8ybvc92ba8404djnm0l65f34mlw38g9ad8d9085"; }; - nativeBuildInputs = [ itstool gettext libxml2 ]; + nativeBuildInputs = [ + itstool + gettext + libxml2 + ]; - buildInputs = [ yelp ]; + buildInputs = [ + yelp + ]; postPatch = '' substituteInPlace mate-user-guide.desktop.in.in \ diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 264389a68836..04a09d6f06cd 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2 -, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, dbus-glib +, libnotify +, libxml2 +, libcanberra-gtk3 +, mod_dnssd +, apacheHttpd +, hicolor-icon-theme +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-user-share"; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 48e662f54f71..13e5e5154ca7 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3 -, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, glib +, gtk3 +, libxml2 +, libgtop +, libcanberra-gtk3 +, inkscape +, udisks2 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-utils"; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 6388b2319e8c..a4c08eba6144 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,15 @@ -{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }: +{ lib +, python3 +, fetchurl +, pkg-config +, gettext +, mate +, gtk3 +, glib +, wrapGAppsHook +, gobject-introspection +, mateUpdateScript +}: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -12,11 +23,22 @@ python3.pkgs.buildPythonApplication rec { sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk="; }; - nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ + pkg-config + gettext + gobject-introspection + wrapGAppsHook + ]; - propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; + propagatedBuildInputs = [ + mate.mate-menus + python3.pkgs.pygobject3 + ]; - buildInputs = [ gtk3 glib ]; + buildInputs = [ + gtk3 + glib + ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 53b0251229ac..76ea344a88f9 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, adwaita-icon-theme, gtksourceview4, libpeas, mate-desktop, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, perl +, itstool +, isocodes +, enchant +, libxml2 +, python3 +, adwaita-icon-theme +, gtksourceview4 +, libpeas +, mate-desktop +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "pluma"; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 452a7943d664..0b0a1a833fc0 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, mate +, python3Packages +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "python-caja"; diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 847ef41ee88b..74c6b1b7faa5 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -61,7 +61,6 @@ mkDerivation { CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ]; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; postInstall = '' # Some package(s) refer to these service types by the wrong name. # I would prefer to patch those packages, but I cannot find them! diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 1da88a0104f8..884fffb35fd3 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.9"; + version = "0.5.10"; odd-unstable = false; - sha256 = "sha256-xuSv2H1+/NNUAm+D8f+f5fPVR97iJ5vIDzPa3S0HLM0="; + sha256 = "sha256-AKyFCzQE6OfMzKh5Lk16W01255vPeco1II80oLqT4oM="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 281cc78a0ba2..6a092fce88c6 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "ristretto"; - version = "0.12.2"; + version = "0.12.3"; - sha256 = "sha256-OIt92DpDAZpy/fAOauGnzsufUi+y3Ag7KblZ5EUGuyQ="; + sha256 = "sha256-Tkjl01OD6yDbKAHzZVRG7c7KnP0MURmsc0d0DbcFuFk="; buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ]; diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 91714976f84d..7cedaaca7532 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.16.2"; + version = "4.16.3"; - sha256 = "sha256-DkybMfkgsC8fJuhOWLzKO5f2Y8YtqzUXMH/npTv21yY="; + sha256 = "sha256-Jd1PJrIqzsutParZu8rNMuzHnycjr3eeZGXWIG3PqZY="; postPatch = '' for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index bebf91114d70..910d93d42da1 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -222,9 +222,6 @@ let ++ lib.optionals (langD) [ "--with-target-system-zlib=yes" ] - # Make -fcommon default on gcc10 - # TODO: fix all packages (probably 100+) and remove that - ++ lib.optional (version >= "10.1.0") "--with-specs=%{!fno-common:%{!fcommon:-fcommon}}" ; in configureFlags diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 916d8fa56f75..853cf1a663e9 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -32,12 +32,6 @@ llvmPackages.stdenv.mkDerivation rec { cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" ]; - # To handle the lack of 'local' RPATH; required, as they call one of - # their built binaries requiring their libs, in the build process. - preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/src''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index 128ac5709356..bb1b90b36a92 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -244,12 +244,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 58439f02a5c9..4bcdb3ca78b4 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -50,18 +50,6 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch - # Revert: [Driver] Default to -fno-common for all targets - # https://reviews.llvm.org/D75056 - # - # Maintains compatibility with packages that haven't been fixed yet, and - # matches gcc10's configuration in nixpkgs. - (fetchpatch { - revert = true; - url = "https://github.com/llvm/llvm-project/commit/0a9fc9233e172601e26381810d093e02ef410f65.diff"; - stripLen = 1; - excludes = [ "docs/*" "test/*" ]; - sha256 = "0gxgmi0qbm89mq911dahallhi8m6wa9vpklklqmxafx4rplrr8ph"; - }) (substituteAll { src = ../../clang-11-12-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index f7a504483459..a038795a4df1 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -256,12 +256,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 56a3d01e4b16..435744b073f7 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -244,12 +244,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index b1dce12faccb..6372655b7ed4 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -206,12 +206,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index b18b558d5b8e..3a1ba402ef67 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -18,7 +18,7 @@ }: let - release_version = "14.0.1"; + release_version = "14.0.6"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "14wgrjwj02ivlwb1zgidacspkkcfpsqjmgd7r838qmwpk56yxl9f"; + sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; }; llvm_meta = { diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index c3f3c94f434c..d053f792f7d9 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -203,12 +203,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix index 253aaade6939..cf668cd566a6 100644 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -222,12 +222,6 @@ stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/6/llvm/default.nix b/pkgs/development/compilers/llvm/6/llvm/default.nix index 622b90e58e87..61f9234274d3 100644 --- a/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -215,12 +215,6 @@ stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index 01784baca8ce..b324e1a0e4d6 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -234,12 +234,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 01a052d4042f..efd1707eb337 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -226,12 +226,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index b197e9ab8ba1..1dd1455ed6d6 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -241,12 +241,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 02ec0f3ab119..d2059cc66ba2 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -200,12 +200,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/pkgs/development/compilers/rust/1_61.nix b/pkgs/development/compilers/rust/1_62.nix similarity index 56% rename from pkgs/development/compilers/rust/1_61.nix rename to pkgs/development/compilers/rust/1_62.nix index 7726c2db10ea..779d24c4959c 100644 --- a/pkgs/development/compilers/rust/1_61.nix +++ b/pkgs/development/compilers/rust/1_62.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.61.0"; - rustcSha256 = "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd"; + rustcVersion = "1.62.0"; + rustcSha256 = "09y06qmh7ihi9kgimpp3h4nj3cmgc1zypqyaba10dlk4kf07h23x"; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; @@ -37,25 +37,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.60.0"; + bootstrapVersion = "1.61.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "2a635269dc9ad8f7bbdf168cdf120e1ec803d36adc832c0804f38e0acc3e2357"; - x86_64-unknown-linux-gnu = "b8a4c3959367d053825e31f90a5eb86418eb0d80cacda52bfa80b078e18150d5"; - x86_64-unknown-linux-musl = "f0feefcb1985c5c894ad9b0f44e6f09900b31c0eb5f49827da9f37d332a63894"; - arm-unknown-linux-gnueabihf = "161b2b97d4512080350cc6656b0765ebae870335e86c2896bed08b32c66fbdf4"; - armv7-unknown-linux-gnueabihf = "f2d76e9458949675bab8fcae44f600d30d91f62bf93c127b6b1fe3130e67d5d9"; - aarch64-unknown-linux-gnu = "99c419c2f35d4324446481c39402c7baecd7a8baed7edca9f8d6bbd33c05550c"; - aarch64-unknown-linux-musl = "fe7e9bad8beea84973f7ffa39879929de4ac8afad872650fb0af6b068f05faa6"; - x86_64-apple-darwin = "0b10dc45cddc4d2355e38cac86d71a504327cb41d41d702d4050b9847ad4258c"; - aarch64-apple-darwin = "b532672c278c25683ca63d78e82bae829eea1a32308e844954fb66cfe34ad222"; - powerpc64le-unknown-linux-gnu = "80125e90285b214c2b1f56ab86a09c8509aa17aec9d7127960a86a7008e8f7de"; - riscv64gc-unknown-linux-gnu = "9cc7c6804bcbbecb9c35232035fc488dbcc8487606cc6be3da553cc446bf0fcd"; - mips64el-unknown-linux-gnuabi64 = "d413681c22511259f7cd15414a00050cf151d46ac0f9282e765faeb86688deac"; + i686-unknown-linux-gnu = "b15eb0ad44b7253e0b5b1a8cd285feb10e9fb0402840dba9a13112c3349a4b39"; + x86_64-unknown-linux-gnu = "066b324239d30787ce64142d7e04912f2e1850c07db3b2354d8654e02ff8b23a"; + x86_64-unknown-linux-musl = "0904f6b769ae28c259e0e25a41e99290a4ae2a36bca63ae153790b2ebbc427bf"; + arm-unknown-linux-gnueabihf = "cc32705cd1b583aaac74e6663f71392131dc0355a0f484cb56f0378b71ea7ebc"; + armv7-unknown-linux-gnueabihf = "2782ec75ea4abb402513e2e57becc6c14e67b492d57228cddedef6db0853b165"; + aarch64-unknown-linux-gnu = "261cd47bc3c98c9f97b601d1ad2a7d9b33c9ea63c9a351119c2f6d4e82f5d436"; + aarch64-unknown-linux-musl = "feb79985cb161a10b252236852df8db3bf3593c78905b84c7e94cd4454327e47"; + x86_64-apple-darwin = "d851f1a473926a5d8f111ed08002047a5dc4ad944a5b7f8d5d2f1f266b51e66a"; + aarch64-apple-darwin = "2dbafd13d007543aada47179fa273f9a3865f27e0a07bd69be61801232a0819e"; + powerpc64le-unknown-linux-gnu = "6d5cd579b68a2adc20384406c69a92beaaf4941056e126ff0ed1ec2f3a4e721f"; + riscv64gc-unknown-linux-gnu = "3d0f3b1a8522e09fffdf920a061794ac3107410eb1fe8f5d62a7aae3c6dcb81e"; + mips64el-unknown-linux-gnuabi64 = "6ed5b6492e68f45488108abd06dbcd4b89c46cdbd4715331bb11e88f18500815"; }; - selectRustPackage = pkgs: pkgs.rust_1_61; + selectRustPackage = pkgs: pkgs.rust_1_62; rustcPatches = [ ]; diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index f13ec5174d5a..b07a91599332 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -22,7 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk="; }; - cmakeFlags = [ "-DENABLE_SSE4=OFF" ]; + cmakeFlags = [ + "-DENABLE_SSE4=OFF" + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ]; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 6594872a258f..d00a354be187 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -90,12 +90,6 @@ let doCheck = false; checkPhase = '' - while IFS= read -r -d ''' dir - do - LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir - export LD_LIBRARY_PATH - done < <(find . -type d -print0) - pushd .. # IPC tests need aleth avaliable, so we disable it sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index b0ba8508fc35..ace6c773770a 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { "-DLLVM_DIR=${llvm_11.dev}" "-DBUILD_SHARED_LIBS=YES" "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" + # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index d64c002bf7df..62187827423d 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR; ''; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + doCheck = true; checkPhase = '' runHook preCheck diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index ef22ecbdb953..dea603b5e4f5 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -25,9 +25,11 @@ mkCoqDerivation { repo = "VST"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.14" "8.15"; out = "2.10"; } { case = range "8.13" "8.15"; out = "2.9"; } { case = range "8.12" "8.13"; out = "2.8"; } ] null; + release."2.10".sha256 = "sha256-RIxfPWoHnV1CFkpxCusoGY/LIk07TgC7wWGRP4BSq8w="; release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf"; release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0="; releaseRev = v: "v${v}"; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 166dd037845c..596c059f5018 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -16,7 +16,8 @@ let compcert = mkCoqDerivation rec { releaseRev = v: "v${v}"; defaultVersion = with versions; switch coq.version [ - { case = range "8.13" "8.15"; out = "3.10"; } + { case = range "8.14" "8.15"; out = "3.11"; } + { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } ] null; @@ -25,6 +26,7 @@ let compcert = mkCoqDerivation rec { "3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; "3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6"; + "3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 4b471b55b482..0ccde962fce8 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,6 +7,7 @@ with builtins; with lib; let { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} { case = "8.15"; out = { version = "1.15.0"; };} + { case = "8.16"; out = { version = "1.16.5"; };} ] {} ); in mkCoqDerivation { pname = "elpi"; @@ -14,12 +15,14 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.16"; out = "1.15.1"; } { case = "8.15"; out = "1.14.0"; } { case = "8.14"; out = "1.11.2"; } { case = "8.13"; out = "1.11.1"; } { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.15.1".sha256 = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg="; release."1.14.0".sha256 = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp"; release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n"; release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY="; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index a0f4a3ecae82..ed973996feea 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -7,9 +7,11 @@ with lib; mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.14" "8.16"; out = "4.1.0"; } { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } ] null; + release."4.1.0".sha256 = "sha256:09rak9cha7q11yfqracbcq75mhmir84331h1218xcawza48rbjik"; release."3.4.3".sha256 = "sha256-YTdWlEmFJjCcHkl47jSOgrGqdXoApJY4u618ofCaCZE="; release."3.4.2".sha256 = "1s37hvxyffx8ccc8mg5aba7ivfc39p216iibvd7f2cb9lniqk1pw"; release."3.3.1".sha256 = "1mk8adhi5hrllsr0hamzk91vf2405sjr4lh5brg9201mcw11abkz"; diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index f44ba4e95b8e..8a775b825152 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -148,7 +148,6 @@ with python.pkgs; buildPythonApplication rec { ''; meta = with lib; { - broken = stdenv.isAarch64; description = "An open source ecosystem for IoT development"; homepage = "https://platformio.org"; license = licenses.asl20; diff --git a/pkgs/development/embedded/xc3sprog/default.nix b/pkgs/development/embedded/xc3sprog/default.nix index b9785bac7c5c..ead48a004720 100644 --- a/pkgs/development/embedded/xc3sprog/default.nix +++ b/pkgs/development/embedded/xc3sprog/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libusb-compat-0_1 libftdi ]; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; homepage = "http://xc3sprog.sourceforge.net/"; diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 921e90e3025a..fdb309c634da 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "a52dec"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" + # Define inline as __attribute__ ((__always_inline__)) + "ac_cv_c_inline=yes" ]; makeFlags = [ diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index a69d161c9268..c88afbe6a0fc 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -204,7 +204,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] ++ lib.optionals stdenv.isDarwin [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF" ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h"; diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/development/libraries/audio/libkeyfinder/default.nix index cb34f24ced8d..65e4d0fb15ee 100644 --- a/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -11,9 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg="; }; - # needed for finding libkeyfinder.so to link it into keyfinder-tests executable - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ fftw ]; diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix index dc01027c4693..dccb738a30f4 100644 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ b/pkgs/development/libraries/audio/mbelib/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD - ''; meta = with lib; { description = "P25 Phase 1 and ProVoice vocoder"; diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 5b8590750178..2c70c3e8acba 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 1b8f7e73e822..b20371f5dd29 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ "-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables" ]; diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix index 9d885278ff06..5d13c0653b22 100644 --- a/pkgs/development/libraries/aws-c-compression/default.nix +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 0eee407f989a..86ab4f4230e6 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index 11ba67fe6f5a..6700b4e6a13e 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 398a36019f54..881bec9c2805 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index 6fb04fbb3a23..919b3229d7ea 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 201837eb5363..28bb15f2a745 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_DEPS=OFF" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 8bf009ddacba..889c03676c10 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -85,7 +85,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_DEPS=OFF" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-DENABLE_TESTING=OFF" diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 045595a84fde..8640fb6b5c9c 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - preCheck = '' - export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io - export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io - ''; meta = with lib; { description = "An open source implementation of the actor model in C++"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 8f65bd6c5cd7..9a18d173f1d3 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -52,9 +52,16 @@ in stdenv.mkDerivation rec { url = "https://github.com/freedesktop/cairo/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; sha256 = "048nzfz7rkgqb9xs0dfs56qdw7ckkxr87nbj3p0qziqdq4nb6wki"; }) - ] ++ optionals stdenv.hostPlatform.isDarwin [ + # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 ./skip-configure-stderr-check.patch + + # Fixes cairo crash on macOS Big Sur + # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420 + (fetchpatch { + url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff"; + sha256 = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; + }) ]; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index e360279c6a44..cc0ef008f82b 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "https://www.rowetel.com/codec2.html"; diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 6085a3c849cc..1effce915515 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -19,11 +19,6 @@ stdenv.mkDerivation rec { "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" ]; - # The test driver binary lacks an RPath to the library's libs - preCheck = '' - export LD_LIBRARY_PATH=$PWD/libs/network/src - ''; - # Most tests make network GET requests to various websites doCheck = false; diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index bfd7bee94b65..2ba0c4e65b8b 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -29,8 +29,6 @@ stdenv.mkDerivation rec { "-DCRC32C_BUILD_BENCHMARKS=0" "-DCRC32C_USE_GLOG=0" "-DBUILD_SHARED_LIBS=${if staticOnly then "0" else "1"}" - ] ++ lib.optionals stdenv.isDarwin [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; doCheck = false; diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index a1e7137d92ab..723865ab11d3 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -27,9 +27,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; checkTarget = "criterion_tests test"; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 626606d0526d..c8bc708a2aa9 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sed -ie 's//\n#include /' src/CTPP2FileSourceLoader.cpp ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/ctpp2json contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + doCheck = false; # fails meta = with lib; { diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index d7fe4e92802b..51336a9e1a55 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -31,14 +31,6 @@ stdenv.mkDerivation rec { "-DPLUGIN_VIEW_GRANTLEE=ON" ]; - preBuild = lib.optionalString stdenv.isLinux '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/Cutelyst:`pwd`/EventLoopEPoll" - ''; - - postBuild = lib.optionalString stdenv.isLinux '' - unset LD_LIBRARY_PATH - ''; - meta = with lib; { description = "C++ Web Framework built on top of Qt"; homepage = "https://cutelyst.org/"; diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index 4fae1db9ba3c..2e37e073fb65 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "@CMAKE_INSTALL_LIBDIR@" ''; - checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests"; + checkPhase = "python ./run_tests"; meta = with lib; { description = "C++11 port of docopt"; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index f9259e23c2b6..1a82a9289a61 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost catch2 ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 516c7546f564..9e7dcfd751cb 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,8 +6,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.4.1"; + version = "4.4.2"; branch = version; - sha256 = "0hmck0placn12kd9l0wam70mrpgfs2nlfmi8krd135gdql5g5jcg"; + sha256 = "sha256-+YpIJSDEdQdSGpB5FNqp77wThOBZG1r8PaGKqJfeKUg="; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 4eb614d6e653..682b1aecf1e4 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -238,8 +238,7 @@ stdenv.mkDerivation rec { a corporation. ''; license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ ]; inherit branch knownVulnerabilities; }; } diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix index 6d0f90956b25..426a85e6a220 100644 --- a/pkgs/development/libraries/fltk/common.nix +++ b/pkgs/development/libraries/fltk/common.nix @@ -147,6 +147,9 @@ stdenv.mkDerivation rec { "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}" "-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF" "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) '' diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 3fee016175bc..f22d505e3a50 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -23,7 +23,6 @@ let cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; doCheck = true; diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 7fb93a61a0fe..ac7e4f4255e8 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { ${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""} ''; + cmakeFlags = lib.optionals enablePython [ + # RPATH of binary /nix/store/.../lib/python3.10/site-packages/galario/double/libcommon.so contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + doCheck = true; postInstall = lib.optionalString (stdenv.isDarwin && enablePython) '' diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 98ae294c4802..f49c8b982993 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -17,9 +17,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - # Mak CMake place RPATHs such that tests will find the built libraries. - # See https://github.com/NixOS/nixpkgs/pull/144561#discussion_r742468811 and https://github.com/NixOS/nixpkgs/pull/108496 - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; # TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 0144cec39e93..9ba791e073ca 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.46.3"; # N.B: if you change this, please update: + version = "1.47.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "sha256-RiXtKlRtlbqwrSxI904dgSu3da0A6Fwk+/hWHIG7A5E="; + sha256 = "sha256-fMYAos0gQelFMPkpR0DdKr4wPX+nhZSSqeaU4URqgto="; fetchSubmodules = true; }; @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index b598d846f9e2..e36793debdff 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -87,13 +87,6 @@ stdenv.mkDerivation rec { doCheck = true; - # needed to find libigraph, and liblas on darwin - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [ blas ]}:$PWD/src" - '' else '' - export LD_LIBRARY_PATH="$PWD/src" - ''; - postInstall = '' mkdir -p "$out/share" cp -r doc "$out/share" diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 77d49c700030..d9cf9a6c4346 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -43,14 +43,6 @@ stdenv.mkDerivation rec { sed -i 's/#define JSONCPP_USING_SECURE_MEMORY 0/#define JSONCPP_USING_SECURE_MEMORY 1/' include/json/version.h ''; - # Hack to be able to run the test, broken because we use - # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$PWD/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" - '' else '' - export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - nativeBuildInputs = [ cmake python3 validatePkgConfig ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index bbb11522dee5..7397824f9a76 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds , openssl, openldap, libedit, keyutils +, nixosTests # Extra Arguments , type ? "" @@ -16,56 +17,62 @@ let libOnly = type == "lib"; in -with lib; stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.19.3"; + version = "1.20"; src = fetchurl { - url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "1l6wp58zav37g03n2ig5qr0pslz38gh5cxgigbmxkjfxrxilil2n"; + url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; + sha256 = "sha256-fgIr3TyFGDAXP5+qoAaiMKDg/a1MlT6Fv/S/DaA24S8"; }; outputs = [ "out" "dev" ]; - configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] + configureFlags = [ "--localstatedir=/var/lib" ] # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time. # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737 - ++ optional staticOnly [ "--enable-static" "--disable-shared" ] - ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""'' - ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) + ++ lib.optional staticOnly [ "--enable-static" "--disable-shared" ] + ++ lib.optional stdenv.isFreeBSD ''WARN_CFLAGS=""'' + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "krb5_cv_attr_constructor_destructor=yes,yes" "ac_cv_func_regcomp=yes" "ac_cv_printf_positional=yes" ]; nativeBuildInputs = [ pkg-config perl ] - ++ optional (!libOnly) bison + ++ lib.optional (!libOnly) bison # Provides the mig command used by the build scripts - ++ optional stdenv.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.isDarwin bootstrap_cmds; buildInputs = [ openssl ] - ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] - ++ optionals (!libOnly) [ openldap libedit ]; + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] + ++ lib.optionals (!libOnly) [ openldap libedit ]; - preConfigure = "cd ./src"; + sourceRoot = "krb5-${version}/src"; + + libFolders = [ "util" "include" "lib" "build-tools" ]; + + buildPhase = lib.optionalString libOnly '' + runHook preBuild - buildPhase = optionalString libOnly '' MAKE="make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES" - (cd util; $MAKE) - (cd include; $MAKE) - (cd lib; $MAKE) - (cd build-tools; $MAKE) + for folder in $libFolders; do + $MAKE -C $folder + done + + runHook postBuild ''; - installPhase = optionalString libOnly '' + installPhase = lib.optionalString libOnly '' + runHook preInstall + mkdir -p "$out"/{bin,sbin,lib/pkgconfig,share/{et,man/man1}} \ "$dev"/include/{gssapi,gssrpc,kadm5,krb5} - (cd util; $MAKE install) - (cd include; $MAKE install) - (cd lib; $MAKE install) - (cd build-tools; $MAKE install) - ${postInstall} + for folder in $libFolders; do + $MAKE -C $folder install + done + + runHook postInstall ''; # not via outputBin, due to reference from libkrb5.so @@ -76,12 +83,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; # fails with "No suitable file for testing purposes" - meta = { + meta = with lib; { description = "MIT Kerberos 5"; homepage = "http://web.mit.edu/kerberos/"; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; }; - passthru.implementation = "krb5"; + passthru = { + implementation = "krb5"; + tests = { inherit (nixosTests) kerberos; }; + }; } diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index ec79f8cf6008..94f2ab39b96f 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -11,10 +11,6 @@ , debugSupport ? false # Debugging (disables optimizations) }: -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with lib; stdenv.mkDerivation rec { pname = "lame"; @@ -37,16 +33,16 @@ stdenv.mkDerivation rec { ++ optional sndfileFileIOSupport libsndfile; configureFlags = [ - (mkFlag nasmSupport "nasm") - (mkFlag cpmlSupport "cpml") - #(mkFlag efenceSupport "efence") + (enableFeature nasmSupport "nasm") + (enableFeature cpmlSupport "cpml") + #(enableFeature efenceSupport "efence") (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") - (mkFlag analyzerHooksSupport "analyzer-hooks") - (mkFlag decoderSupport "decoder") - (mkFlag frontendSupport "frontend") - (mkFlag frontendSupport "dynamic-frontends") - #(mkFlag mp3xSupport "mp3x") - (mkFlag mp3rtpSupport "mp3rtp") + (enableFeature analyzerHooksSupport "analyzer-hooks") + (enableFeature decoderSupport "decoder") + (enableFeature frontendSupport "frontend") + (enableFeature frontendSupport "dynamic-frontends") + #(enableFeature mp3xSupport "mp3x") + (enableFeature mp3rtpSupport "mp3rtp") (if debugSupport then "--enable-debug=alot" else "") ]; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index a6f75413c91e..8cac5df55ea2 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { # NOTE: disabling tests due to gtest issue cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DLEVELDB_BUILD_TESTS=OFF" "-DLEVELDB_BUILD_BENCHMARKS=OFF" ]; diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index 755ed6b814e6..92cc1424af9f 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests "-D2GEOM_BUILD_SHARED=ON" ]; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 704dcd2c73d0..15e0396142f4 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -8,10 +8,6 @@ assert fontconfigSupport -> fontconfig != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with lib; stdenv.mkDerivation rec { pname = "libass"; @@ -23,9 +19,9 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag fontconfigSupport "fontconfig") - (mkFlag rasterizerSupport "rasterizer") - (mkFlag largeTilesSupport "large-tiles") + (enableFeature fontconfigSupport "fontconfig") + (enableFeature rasterizerSupport "rasterizer") + (enableFeature largeTilesSupport "large-tiles") ]; nativeBuildInputs = [ pkg-config yasm ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 87471114a87b..96f53a33b1eb 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DPROJECT_ARCH=${platformInfo.projectArch}"; + cmakeFlags = [ "-DPROJECT_ARCH=${platformInfo.projectArch}" ]; makeFlags = [ "libcef_dll_wrapper" ]; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 90963cf516b2..9f7f5fcb1d8f 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.111"; + version = "2.4.112"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1adjg96mz0ghjzsgp9hrdr622shrvqmjcz5sxksfcka2fx7idmqs"; + sha256 = "1zr0hi7k5s7my4q9hyj6ryzg89zyjx24zbqfv3c5rcq9pl87gc00"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 4b379660a84e..f9963ce3e636 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -9,8 +9,6 @@ assert avahiSupport -> avahi != null; assert gtkWidgets -> gtk3 != null; let - mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; - self = stdenv.mkDerivation rec { pname = "libinfinity"; version = "0.7.2"; @@ -29,13 +27,13 @@ let propagatedBuildInputs = [ gnutls ]; configureFlags = [ - "--enable-gtk-doc" - "--enable-introspection" - (mkFlag gtkWidgets "inftextgtk") - (mkFlag gtkWidgets "infgtk") - "--with-infinoted" - "--with-libdaemon" - (mkFlag avahiSupport "avahi") + (lib.enableFeature true "gtk-doc") + (lib.enableFeature true "introspection") + (lib.withFeature gtkWidgets "inftextgtk") + (lib.withFeature gtkWidgets "infgtk") + (lib.withFeature true "infinoted") + (lib.withFeature true "libdaemon") + (lib.withFeature avahiSupport "avahi") ]; passthru = { diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 352c810e81a6..be0a4fb91549 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -129,16 +129,6 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isi686; - # The test driver runs a test `LibraryCLinkageTest` which without - # LD_LIBRARY_PATH setting errors with: - # /build/source/build/tools/tests/libjxl_test: error while loading shared libraries: libjxl.so.0 - # The required file is in the build directory (`$PWD`). - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD - '' else '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - ''; - meta = with lib; { homepage = "https://github.com/libjxl/libjxl"; description = "JPEG XL image format reference implementation."; diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index 2440082cce9d..f1f6dc1b374f 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; checkPhase = '' - export LD_LIBRARY_PATH="$(pwd)" # see #22060 ctest -j1 -E 'ezminc_rw_test' --output-on-failure # -j1: see https://github.com/BIC-MNI/libminc/issues/110 # ezminc_rw_test: can't find libminc_io.so.5.2.0 diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 31fb5cb05ba7..01c3e3e87e43 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - export LD_LIBRARY_PATH=$PWD ./utest/utest --path ../examples/data/ ''; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 090291a120f7..c2d91b1d5b73 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -52,6 +52,11 @@ mkDerivation rec { # the other libraries as `libGL` is part of our `buildInputs`. NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib"; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + preFixup = '' mkdir -p "$out/bin" cp -a "./bin/"* "$out/bin" diff --git a/pkgs/development/libraries/libtiff/aarch64-darwin.nix b/pkgs/development/libraries/libtiff/aarch64-darwin.nix index 5de481066f67..521db8ff7993 100644 --- a/pkgs/development/libraries/libtiff/aarch64-darwin.nix +++ b/pkgs/development/libraries/libtiff/aarch64-darwin.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; }; - cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_SKIP_BUILD_RPATH=OFF"; - # FreeImage needs this patch patches = [ ./headers-cmake.patch ]; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index b7e02a62fa99..b96c02a35bfd 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -30,10 +30,6 @@ stdenv.mkDerivation rec { ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib - ''; checkTarget = "tests test"; meta = with lib; { diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 8bf2e2acff9f..6b39995f39b9 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - ]; - doCheck = !stdenv.isi686; # tests fail on i686 meta = with lib; { diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 98ad4ef7feec..c8af82d04917 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -13,13 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optional stdenv.isDarwin [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests - ]; - - preCheck = '' - export LD_LIBRARY_PATH=/build/source/build/libversion/''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/libraries/libvisio2svg/default.nix b/pkgs/development/libraries/libvisio2svg/default.nix index 0525ba80b4f9..b2a68ed58680 100644 --- a/pkgs/development/libraries/libvisio2svg/default.nix +++ b/pkgs/development/libraries/libvisio2svg/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libxml2 freetype librevenge libvisio libwmf libemf2svg ]; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Library and tools to convert Microsoft Visio documents (VSS and VSD) to SVG"; homepage = "https://github.com/kakwa/libvisio2svg"; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index da75d3a91504..f90de7fc6eff 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -5,7 +5,6 @@ , jpegSupport ? true, libjpeg # JPEG image format , tiffSupport ? true, libtiff # TIFF image format , gifSupport ? true, giflib # GIF image format -#, wicSupport ? true # Windows Imaging Component , alignedSupport ? false # Force aligned memory operations , swap16bitcspSupport ? false # Byte swap for 16bit color spaces , experimentalSupport ? false # Experimental code @@ -14,55 +13,49 @@ , libwebpdecoderSupport ? true # Build libwebpdecoder }: -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - -with lib; stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-KrvB5d3KNmujbfekWaevz2JZrWtK3PjEG9NEzRBYIDw="; + hash = "sha256-WF2HZPS7mbotk+d1oLM/JC5l/FWfkrk+T3Z6EW9oYEI="; }; prePatch = "patchShebangs ."; configureFlags = [ - (mkFlag threadingSupport "threading") - (mkFlag openglSupport "gl") - (mkFlag pngSupport "png") - (mkFlag jpegSupport "jpeg") - (mkFlag tiffSupport "tiff") - (mkFlag gifSupport "gif") - #(mkFlag (wicSupport && stdenv.isCygwin) "wic") - (mkFlag alignedSupport "aligned") - (mkFlag swap16bitcspSupport "swap-16bit-csp") - (mkFlag experimentalSupport "experimental") - (mkFlag libwebpmuxSupport "libwebpmux") - (mkFlag libwebpdemuxSupport "libwebpdemux") - (mkFlag libwebpdecoderSupport "libwebpdecoder") + (lib.enableFeature threadingSupport "threading") + (lib.enableFeature openglSupport "gl") + (lib.enableFeature pngSupport "png") + (lib.enableFeature jpegSupport "jpeg") + (lib.enableFeature tiffSupport "tiff") + (lib.enableFeature gifSupport "gif") + (lib.enableFeature alignedSupport "aligned") + (lib.enableFeature swap16bitcspSupport "swap-16bit-csp") + (lib.enableFeature experimentalSupport "experimental") + (lib.enableFeature libwebpmuxSupport "libwebpmux") + (lib.enableFeature libwebpdemuxSupport "libwebpdemux") + (lib.enableFeature libwebpdecoderSupport "libwebpdecoder") ]; nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] - ++ optionals openglSupport [ freeglut libGL libGLU ] - ++ optional pngSupport libpng - ++ optional jpegSupport libjpeg - ++ optional tiffSupport libtiff - ++ optional gifSupport giflib; + ++ lib.optionals openglSupport [ freeglut libGL libGLU ] + ++ lib.optionals pngSupport [ libpng ] + ++ lib.optionals jpegSupport [ libjpeg ] + ++ lib.optionals tiffSupport [ libtiff ] + ++ lib.optionals gifSupport [ giflib ]; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Tools and library for the WebP image format"; homepage = "https://developers.google.com/speed/webp/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ ajs124 ]; }; } diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index f28420229ab9..5091489ba72a 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" - # needed for tests to link - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # Force compilation of higher derivatives "-DDISABLE_VXC=0" "-DDISABLE_FXC=0" diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 4e5a5fdbcdbc..65e35217f80a 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { checkPhase = '' ( cd unittest - LD_LIBRARY_PATH="$(cd ../src; pwd)" TZ=PST8PDT ./unittestcpp ../../unittest/data + TZ=PST8PDT ./unittestcpp ../../unittest/data ) ''; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 0e10135d3d39..66245951bc6d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -35,7 +35,7 @@ let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule # 22.1 on darwin won't build: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6519 - version = if stdenv.isDarwin then "22.0.4" else "22.1.1"; + version = if stdenv.isDarwin then "22.0.4" else "22.1.3"; branch = versions.major version; self = stdenv.mkDerivation { @@ -50,7 +50,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; sha256 = { - "22.1.1" = "1w8fpki67238l4yc92hsnsh4402py9zspirbmirxp577zxjhi526"; + "22.1.3" = "1qwky31vdqh3y6i0mxqnrbq7jc39kjcyndpv4mbzz8d2gax353xr"; "22.0.4" = "1m0y8wgy48hmcidsr7sbk5hcw3v0qr8359fd2x34fvl2z9c1z5y7"; }.${version}; }; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 11a63a3cd5ce..9cf5da3e395b 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -60,6 +60,11 @@ mkDerivation rec { outputs = [ "out" "dev" ]; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 42f05a656163..a4c4bb057251 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -21,12 +21,6 @@ stdenv.mkDerivation rec { # Tests fail on some Hydra builders, because they do not support SSE4.2. doCheck = false; - # The test driver doesn't add an RPath to the build libdir - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src - ''; - # The cmake install gets tripped up and installs a nix tree into $out, in # addition to the correct install; clean it up. postInstall = '' diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/development/libraries/openhmd/default.nix index a692dcb5e4e3..ce0630bee62f 100644 --- a/pkgs/development/libraries/openhmd/default.nix +++ b/pkgs/development/libraries/openhmd/default.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { "-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}" "-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}" "-DOpenGL_GL_PREFERENCE=GLVND" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; postInstall = lib.optionalString withExamples '' diff --git a/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch b/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch deleted file mode 100644 index e144a7188897..000000000000 --- a/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4d8a88c134df634ba610ff8db1eb8478ac5fd345 Mon Sep 17 00:00:00 2001 -From: Xi Ruoyao -Date: Wed, 22 Jun 2022 18:07:05 +0800 -Subject: [PATCH] rsa: fix bn_reduce_once_in_place call for - rsaz_mod_exp_avx512_x2 - -bn_reduce_once_in_place expects the number of BN_ULONG, but factor_size -is moduli bit size. - -Fixes #18625. - -Signed-off-by: Xi Ruoyao - -Reviewed-by: Tomas Mraz -Reviewed-by: Paul Dale -(Merged from https://github.com/openssl/openssl/pull/18626) ---- - crypto/bn/rsaz_exp_x2.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/crypto/bn/rsaz_exp_x2.c b/crypto/bn/rsaz_exp_x2.c -index 6b04486e3f56..f979cebd6fb7 100644 ---- a/crypto/bn/rsaz_exp_x2.c -+++ b/crypto/bn/rsaz_exp_x2.c -@@ -257,6 +257,9 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1, - from_words52(res1, factor_size, rr1_red); - from_words52(res2, factor_size, rr2_red); - -+ /* bn_reduce_once_in_place expects number of BN_ULONG, not bit size */ -+ factor_size /= sizeof(BN_ULONG) * 8; -+ - bn_reduce_once_in_place(res1, /*carry=*/0, m1, storage, factor_size); - bn_reduce_once_in_place(res2, /*carry=*/0, m2, storage, factor_size); - diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index db6e0101fec7..74e5d318bcb6 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -186,8 +186,8 @@ in { openssl_1_1 = common rec { - version = "1.1.1p"; - sha256 = "sha256-v2G2Kqpmx8djmUKpTeTJroKAwI8X1OrC5EZE2fyKzm8="; + version = "1.1.1q"; + sha256 = "sha256-15Oc5hQCnN/wtsIPDi5XAxWKSJpyslB7i9Ub+Mj9EMo="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -201,8 +201,8 @@ in { }; openssl_3 = common { - version = "3.0.4"; - sha256 = "sha256-KDGEPppmigq0eOcCCtY9LWXlH3KXdHLcc+/O+6/AwA8="; + version = "3.0.5"; + sha256 = "sha256-qn2Nm+9xrWUlxVuhHl9Dl4ic5Jwsk0nc6m0+TwsCSno="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -210,10 +210,6 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch - # https://guidovranken.com/2022/06/27/notes-on-openssl-remote-memory-corruption/ - # https://github.com/openssl/openssl/commit/4d8a88c134df634ba610ff8db1eb8478ac5fd345.patch - 3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch - (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 2c43cfb4cc90..158bc9f405fc 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" - ''; - meta = with lib; { description = "Potluck with different functions for different purposes that can be shared among C programs"; homepage = "https://github.com/babelouest/orcania"; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 2cfd0ab58bd1..7730b30b3967 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,33 +1,53 @@ -{ config, stdenv, lib, fetchFromGitHub -, autoconf, automake, which, libtool, pkg-config -, portaudio, alsa-lib -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: +{ config +, lib +, stdenv +, fetchFromGitHub +, alsa-lib +, autoconf +, automake +, libpulseaudio +, libtool +, pkg-config +, portaudio +, which +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcaudiolib"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "espeak-ng"; - repo = "pcaudiolib"; - rev = version; - sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-ZG/HBk5DHaZP/H3M01vDr3M2nP9awwsPuKpwtalz3EE="; }; - nativeBuildInputs = [ autoconf automake which libtool pkg-config ]; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + which + ]; - buildInputs = [ portaudio ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; + buildInputs = [ + portaudio + ] + ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio; - preConfigure = "./autogen.sh"; + preConfigure = '' + ./autogen.sh + ''; meta = with lib; { - broken = stdenv.isDarwin; - description = "Provides a C API to different audio devices"; homepage = "https://github.com/espeak-ng/pcaudiolib"; - license = licenses.gpl3; + description = "Provides a C API to different audio devices"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ aske ]; - platforms = platforms.all; + platforms = platforms.unix; + badPlatforms = platforms.darwin; }; -} +}) diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix new file mode 100644 index 000000000000..6f648463c854 --- /dev/null +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, cmake +}: + +stdenv.mkDerivation rec { + pname = "clhep"; + version = "2.4.5.3"; + + src = fetchurl { + url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; + hash = "sha256-RfY+6wl/Av5nuGp9rb8Q1Am0AcKKGj4XLbNiUsMJfBM="; + }; + + prePatch = '' + cd CLHEP + ''; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "clhep_ensure_out_of_source_build()" "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Set of HEP-specific foundation and utility classes such as random generators, physics vectors, geometry and linear algebra"; + homepage = "https://cern.ch/clhep"; + license = with licenses; [ gpl3Only lgpl3Only ]; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 3a23d25d8751..65735896d659 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -10,7 +10,7 @@ # Standard build environment with cmake. , lib, stdenv, fetchurl, fetchpatch, cmake -, clhep ? null # not packaged currently +, clhep , expat , xercesc , zlib @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}" "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" - "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_CLHEP=ON" "-DGEANT4_USE_SYSTEM_EXPAT=ON" "-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" @@ -88,11 +88,11 @@ stdenv.mkDerivation rec { ]; dontWrapQtApps = true; # no binaries - buildInputs = [ libGLU xlibsWrapper libXmu ] + buildInputs = [ clhep libGLU xlibsWrapper libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] ++ lib.optionals enablePython [ boost_python python3 ]; - propagatedBuildInputs = [ clhep expat xercesc zlib libGL ] + propagatedBuildInputs = [ expat xercesc zlib libGL ] ++ lib.optionals enableXM [ motif ] ++ lib.optionals enableQt [ qtbase ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c60787d5b622..1f7790294dd1 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -2,7 +2,6 @@ , lib , buildPackages , fetchFromGitLab -, fetchpatch , removeReferencesTo , python3 , meson @@ -70,7 +69,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.52"; + version = "0.3.54"; outputs = [ "out" @@ -88,7 +87,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-JWmO36+OF2O9sLB+Z0znwm3TH+O+pEv3cXnuwP6Wy1E="; + sha256 = "sha256-EFkx/K5v4f7clFguiU1xFt9VacSHeVksRye73rOjPPI="; }; patches = [ @@ -104,12 +103,6 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - # Remove 44.1KHz from allowed rates (multiple regressions reported) - # To be removed when 0.3.53 is released - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/16a7c274989f47b0c0d8ba192a30316b545bd26a.patch"; - sha256 = "sha256-VZ7ChjcR/PGfmH2DmLxfIhd3mj9668l9zLO4k2KBoqg="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index dca1248b8b6b..f3a703ce1878 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -33,7 +33,9 @@ in stdenv.mkDerivation rec { ; }; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_TEST=ON" ]; + cmakeFlags = [ + "-DBUILD_TEST=ON" + ]; doCheck = true; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index c976db882257..73d890e03a41 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -22,14 +22,6 @@ stdenv.mkDerivation rec { checkInputs = [ check ]; - # Hack to be able to run the test, broken because we use - # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" - '' else '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - preConfigure = '' # Enable long long support (required for filezilla) sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch index 3a2900abdd6b..b50913753614 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -30,7 +30,54 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul index 92a9112bca..b80ec1e801 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -68,212 +68,6 @@ qt { +@@ -1,9 +1,5 @@ + load(default_post) + +-# Recompute SDK version in case the user set it explicitly +-sdk_version = $$QMAKE_MAC_SDK_VERSION +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- + contains(TEMPLATE, .*app) { + !macx-xcode:if(isEmpty(BUILDS)|build_pass) { + # Detect changes to the platform SDK +@@ -16,36 +12,6 @@ contains(TEMPLATE, .*app) { + QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) + } + +- # Detect incompatible SDK versions +- +- isEmpty(QT_MAC_SDK_VERSION_MIN): \ +- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION +- +- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ +- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ +- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") +- +- !isEmpty(QT_MAC_SDK_VERSION_MAX) { +- # For Qt developers only +- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ +- CONFIG += sdk_no_version_check +- +- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) +- +- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { +- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ +- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.") +- warning("This is an unsupported configuration. You may experience build issues," \ +- "and by using") +- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ +- "that Qt has not been prepared for.") +- +- warning("Please downgrade the SDK you use to build your app to version" \ +- "$$QT_MAC_SDK_VERSION_MAX, or configure") +- warning("with CONFIG+=sdk_no_version_check when running qmake" \ +- "to silence this warning.") +- } +- } + } + + !no_objective_c:CONFIG += objective_c +@@ -73,212 +39,6 @@ qt { } } @@ -308,35 +355,6 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk ---- a/mkspecs/features/mac/sdk.mk -+++ b/mkspecs/features/mac/sdk.mk -@@ -1,25 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build. Please wipe the build directory completely,) -- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) -- $(error ^) -- endif -- endif --endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf deleted file mode 100644 index 3a9c2778bb..0000000000 @@ -404,6 +422,14 @@ index 3a9c2778bb..0000000000 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} --- -2.25.4 - +diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf +deleted file mode 100644 +index df191eb13c..0000000000 +--- a/mkspecs/features/mac/toolchain.prf ++++ /dev/null +@@ -1,5 +0,0 @@ +-# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, +-# which the default path determination uses. +-sdk: load(sdk) +- +-load(toolchain) diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch index 7b568a91943f..ee9b80ca6ed4 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch @@ -175,14 +175,16 @@ index 978d73f7d9..463e3c5579 100644 QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint(); qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint; -@@ -294,10 +290,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin +@@ -294,12 +294,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin if (!target) return; - QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag(); - Q_ASSERT(nativeDrag); - nativeDrag->exitDragLoop(); -- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); +- // for internal drag'n'drop, don't override the action the drop event accepted +- if (!nativeDrag->currentDrag()) +- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); + QCocoaIntegration::instance()->drag(); // Qt starts drag-and-drop on a mouse button press event. Cococa in diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index b772331fc3db..37685b07d344 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,118 +1,118 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "6d926ec2739f2289c6b0bbfbc325700046e1ceee", - "sha256": "1w2m1rm6mhj9qbanak36rqvc30x495zvj7mh2syy1yd29by0g5i8" + "rev": "3cc801c4ae41ff3f155258c4bf7e21bb5b3f6a3d", + "sha256": "0ia17cn59100n4qkxc1bdn36knqpdqy1dx06la4qlhvm6hzb7wpj" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "2c53a16f431bbb950bfca8ac32ddabf217a0bf04", - "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6" + "rev": "a4211b21b09a1b98020522bc058e0ee2d6ed2e1d", + "sha256": "1gdnqhx75iwja50nhvdb8fxbdcpw18pc6xpd105kj4j62f73j1hq" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "1939eada1cdf00052bba32657d9d975c1e255128", - "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6" + "rev": "45ce7b075b5dd19744b9446aa9e8ceb1d099d8b9", + "sha256": "15b7258mjdxbqpgr9bjhysagznnx97l2948c15xjpb77sc8l0wlh" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "ee7a89b2c4750bc3cabe4aeb466645d6ac2a872b", - "sha256": "10aj4nxfpx34k0if2kl5sxfjpk3sb1r9z7p6haypjpw60cssjbsl" + "rev": "aa0c6db334cf6f0887f42cbd82e4af258126bdc5", + "sha256": "0gxlqkag06fd7jbk7kjcjxxa3wxm27fa9vdd4hzq5gkq5y1hslaw" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "f13988aa1ad9de5d92e7b0ba4d0d947dd019d759", - "sha256": "1l7zmdkakc7bc9c10nzijg86ps9f3jpi1nblkfxr6521g0xjrmb8" + "rev": "9a569795f0c3f41ec093e4aa5842a463e2755edb", + "sha256": "12w48q59xcr0l1s941pnsp5s8xk5knis9c1cry6kvybiq51hl77n" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "aa2def2bdb76f8fd2454dc4515883fd7b5ddb521", - "sha256": "1fy4anhj432fz05kinb67v8ckdp9h7150fhy4dm6hgbjq6y7j16g" + "rev": "42c25efeaa409f711af1bd9a8144b445741ee114", + "sha256": "0bj28j5ksr95bj9vmqcahvx3a5bc8kd9kkd6q8nsg7ak0bm0cm2p" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "19af9584f7b80928ee49950c573c770af68c9519", - "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj" + "rev": "a32c95d27224c6c9e41d6080ea54bc937c5d1455", + "sha256": "105cdvz8y48lhyn1s5w8ckcd0vk2gq7aqnmndiq45k1c8nikn2ry" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "02105099301450c890e1caba977ef44efdc43da7", - "sha256": "0wk8a9fbjwrqwb4gj5s78ipg1svdrhz80cykjd6qgkd26dh1p4kn" + "rev": "c47f3d7b227c9bc86ca1702ae3291a62c2116cfa", + "sha256": "0izk3zxbf1h1k88qvq8p6yaza9pkm19w4f491mbazs87qwfh3dni" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "ed002122ce74b3505ba55262ddbc842a810e8159", - "sha256": "03hb1jgx49rh5gldxq7d85s1ny0yl64nylw7d61dvsgbs422fqn9" + "rev": "a2a7f0f219ccedf1ecb2bc06760ef5439262aacd", + "sha256": "1s2jbwq83zfqg7d0mq4v60nvpg4zfa47xqgh7sglgk1s922jyj76" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "6b7a6303439f83147680723f4d8142d676cdb928", - "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46" + "rev": "5107ddf28177112cdbf505f92bb4191a91e6521a", + "sha256": "1fyyyljhl8h4rgik3i8gi2xg5r05xd2vf4qgn4ybf3yafjsra9am" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "379577925766385991f413a2b0d0d46831381ffa", - "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8" + "rev": "c25898224cd957491d10dbe48f2f0be66f2955de", + "sha256": "1cr3hykl79yr7x06hjfx9g6nq2wmb3q5hszby83hbzpf166h8zjf" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "90038c936763645610fe1e5f05cfc025e4d98631", - "sha256": "1yqfz58p7s92jr8d4lk4n0dv6ij8fslh4sxdz0azd0p6077rim77" + "rev": "0ee52083683c9fcd996118ef62d9e60b5431a520", + "sha256": "0ainvxp2sw13dx44j8waa89bni8ylxkykr6mwncsspi7da9dqxq2" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "e07f35879536640ad784e71e5261c5a597d504f5", - "sha256": "1yhwaz2wyq2hx9bqrcimabj9jbv2kr9h0czxxryh5b9b6aim6ncw" + "rev": "73db91329ae48f685fa3fdae1c3c63b0976dc751", + "sha256": "0l8amd9fsn8agxgvxmij59i12504bmzbvyc1rz6nqhcpib4z5w7l" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "fca3f80f0ce389271e5bd9af864ce56a313d359a", - "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r" + "rev": "4b3d1e824fdde2c835041464a9f85feaed0b313d", + "sha256": "02g7znswwki86723d3p23n0hwdi6brch9whx526l92sfx308z380" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "80bc8d86508579c7a57110c09a44e33f9d8bc0e5", - "sha256": "1n9qixhgz66frsp56cr7zzaxcns3ijip46pa9zcz3m0f438n08z7" + "rev": "166cb4d6166cab60a66a074c848f6ed725e6755c", + "sha256": "09f34v5x4z3y58z6b4hriqclrf9mjncxyl4h9ph0cicam66575ms" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "fa6c3d653682f9fd331d859c7196a291a8a4d8d5", - "sha256": "0x4112b93dryfgy6w49z3jqd8xi8pvc3xqfn2j0n0qhdp4vvz5sl" + "rev": "16d9ea642bf7b9592a6c53321cc7ee9d9a3ed03f", + "sha256": "1xi2shsg0apk7rk7ccrbnjsg9j6p8svgs1pbml48ci57i36dgzfv" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "958db00a2064f77b354b573102ca2c2b2e07529c", - "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2" + "rev": "9e698881cb07ebf04319f5cfa7b065c8bc2c1afb", + "sha256": "0207z0mv6nfgw7vhh43sx7r8z4cmvilh31x1x24d7nxj9rggnm1b" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "255b9e16f286003bbfaff9d48e4548fb0cb3b398", - "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp" + "rev": "87021fd1e50f0aa3589a2412cfa665a6d27cc740", + "sha256": "184mpjc0vnrmxl7z0x2c1xj2adrdx12l5swpzh51q1wb45j1lvna" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "1ede2ac20170357b3e8d7d9810e5474e08170827", - "sha256": "1sxlyv1y6aanln7cv1m8fgjkp72lgx2k4q8a23m79g7xryl0xx2a" + "rev": "1a8736a5834492aa8b7fc2dbc59a1eb4420a7330", + "sha256": "1byn9g46jd4krij0h1x7lfn7ac5v4rican0lppngm065is4c6c7p" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "d054de15b3c9ead0f96655ddfb1a6381ed7a0e2b", - "sha256": "0inym59pnr6pk9y4im2fsq1hzs8b4rwqs3x6cgc61z3kqyv74cb6" + "rev": "4fb4e5942bfa1f92f1c759f182aa504ad52e8e3b", + "sha256": "1qkamv5p97p0lp7968cdjz4ah8mfqmrq23dikqvkwnirl3bffd83" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "26bd7f5414dc592ab5277e2bb4ad0199faa889de", - "sha256": "0d53d1fqcc7ccd9ljr3q1qxd7k7kkn6msqa81592pg6b4ridzdsq" + "rev": "59cc1cc5b3719713598a1f426d82a9d895b5dccb", + "sha256": "0i1k520080h0q85hifs5axnn4dysmvwhrsm0kxq28qgdpqjzkli6" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "98b1ff53458887061b4bcc183efcce899f432394", - "sha256": "1q4d88cym0c5vmw40qjp968x5sp7dx4mq6cr1r6px9i0ifvimdrg" + "rev": "2da3c0efd5016bdba26b80789773238c2886fdf6", + "sha256": "0lmyw4cxgj5kcisd2pbcpl1zynj2rfa3nsfl1n2mcz6ca650ibys" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "581475dfeb44c8b51c0be86e0f2f57df7d117a80", - "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146" + "rev": "89407ff20e4f76314887e2f3625f5126910031ac", + "sha256": "1qimf60hz1962l5wpdh33y6xz3h8zcnf5yj5b1i0gfyzg0c2ki5n" }, "qtscript": { "url": "https://invent.kde.org/qt/qt/qtscript.git", @@ -121,87 +121,87 @@ }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "50d2da3965ed8e85f3f5f5760393c42b12d34a9f", - "sha256": "148qdyw084agpp4n31cfcgk39ppwf9ndifnvihd94c6ksf1ax3ks" + "rev": "bb5d10f926c51aa462a56ffb331afd4f9607855c", + "sha256": "0wkwkzfv5hxkhrpmy0knlxf9c7qkals5s9c0bw71k9dz8n24d7j8" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "975ba788d3d0ee87aa08bb5301cd33dcbf00521b", - "sha256": "13x0d0ky5dybp1lq39yy82xg7hxdvmksam8r85gqargsi0zr5s8x" + "rev": "bce4b6231229e953c3961f3d9858e58555a55d56", + "sha256": "15b2scai53d10c8bv6kv4k9lc3z9bixr4364yw2pkm71mwir90ga" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "22b3cad193232ab379a0c9e16989a7db1fdc9234", - "sha256": "1j084szvdmfxbc9n37phxsd7k4vxd073vwy1hcnjhmpyg9hwrw81" + "rev": "b6e22f07fb529736c9362d81de7f5c632bd1f439", + "sha256": "039kd0yk1am9s1yr39p7gwirjl3126arqf9r01xn5kcs4viizh1k" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "f95e2411d7c978def87846ea7cedf3dc5fd7c8b8", - "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx" + "rev": "112fcd80658a52e6a2822ec79a7d724d0ad003cf", + "sha256": "1px0mm301401ha0qx5blhmcmbb17bd71q1smcdlxnl8a704n4nry" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "08b27c29aadc0cc0303cca97c9a3baa2a690dfe4", - "sha256": "0lm6i85d7zav43lsrxnhdqcq68np32s3widla8z6c208q1pf3qs6" + "rev": "e76b23ad707077647cdb4282cf35a71776efa0f0", + "sha256": "0lnvbcx5rflx50wpbhxy7f15ax7cs4l7h44i8y9bb04njqswh0pa" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "2f42157cabbd1db6249ccb1d14e6eede80451e0c", - "sha256": "1ldizgybl4fp95xlzf103hqmsqdmr3jbx048jyxcb5gjd3pbwh7p" + "rev": "68de925ddc20dfb8900be4fa47fa5a5916836cc8", + "sha256": "0b0d70w2ycxac81dqd1yhswcn37055ra3jfqn5srk8wsbdhpjl1c" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4", - "sha256": "1x7vzqvc80k0fanvahibmglcv4za07hfiamp26wkhmk0g634ms2q" + "rev": "672ba9d902be3634a9fef80be65227aece9e0aed", + "sha256": "05rzr6hlipzcm0vs9k721y25hzhv916hv48gr0pbrfzljyvp2yhx" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "a6d5e7f84a57394db4c8b069f81c56cfeb802e19", - "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7" + "rev": "0e92fc4f19928387c341533ef3d259efaa752c0f", + "sha256": "0vwkf72gpn42g54lhcbgaxbx9awpzi4a0602yhssad0v3a6zrl11" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "bb40dee811333929dd467a480dce24ab7af84ef9", - "sha256": "0w6li1qwm2x4plzixd1dv6s1jvcmyrbaw328sri2cmiswajhywdw" + "rev": "766c1b7acbdc9ff4e35f6eb341fd446b1c20b811", + "sha256": "0bdg98h5z0lwl61860iam6ixcvgis996qj8as739wn9y6k2sv904" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "118674630cdb5933e66a8b4415afe7c716ad4662", - "sha256": "1zvx11z0cfv2avj211zsh79806m6mdkk3kczwhcd98k1qs9r9d3p" + "rev": "64fa557eb30fc1219bec50a45107ea1a983411ed", + "sha256": "14p20mv2dwc3i0qhssl7sqa0bnk14mg0kaq7ai65fqkx5b8qn5xr" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "611016a49f3a9ba7b58bef29bc295323e06373ae", - "sha256": "0mggqa8kixknbm1p5i5lkrmkj1na3b2xflj011dkjbj8wb78i42n" + "rev": "da9b7b0e059447dceb828bc02d40e30d26b012f2", + "sha256": "0kyzzz17d7s9ln6j4ply6hl3y8wky5wslpabbmwsy2952g1y3l99" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1", - "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515" + "rev": "8feafc4b8e9af78175e2814523ef4f11e445fc93", + "sha256": "0ck9091bhgvhnwilfjrk9pjlf184bmhia9b92av0sg0m7yrg5wqd" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "7196d2cc34adf9f45b50a9488f4ff95b36092993", - "sha256": "1a7n5i4s6nsb19z4r3m3w7gadjpp0irm77ysk61axqjda4ypi7fw" + "rev": "e5be9ba432929049da8f4788400c170bf71672da", + "sha256": "1jq11rhd0k880gabh839gs474psfc0j20sy65l1l7w1cffwi1zk2" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "ec4de0cec2299f4ae0228ea2c71011e0520ca40e", - "sha256": "1na9xv2q4wwy10bcr7684i59d9a20n6s91m12n49yjgrhpn4f4jv" + "rev": "429096eb954672d3727a3e8cc83832bc79cf7967", + "sha256": "0c0q3dcxz00y8wml141xk3lx91mzg4mg5qlka2k1j49cn1az6lx3" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "051202df9c553d7c0a384f07bd67fde98f3b02c4", - "sha256": "0d8y4x41slqjr3nflb14ah1wl2hrlir7331ch9k1qfrk3798a760" + "rev": "b41efc2b32a19da9fe369e243dcf3a2a31f7cde6", + "sha256": "1prsv3z51sbq9q8v1xj4v312hai6ampdcfnik28rdh7c9mpnq99m" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "f628d7a60e45d90a439cb0a393a6229ac6892be5", - "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra" + "rev": "0dfaf36ec6f642a0fd583ce1cc33a31eb6b3328e", + "sha256": "13fzpipgvlxs9qw128hpnaxr8j4xi8v2fmyy39y1ghf66sfln1zn" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "af4958af9d628d6124e64abd9743abce42f15a6f", - "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq" + "rev": "a8edba5ad50d669aead4ddb769f171cba892d676", + "sha256": "1342b7qljjqpiq3xjwy0vblq8wqcqyp9s3751ja40n7ishhxd2yj" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 7cba1ae63f96..5ca033816181 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,7 +1,7 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.3"; + version = "5.15.5"; overrides = { qtscript.version = "5.15.4"; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index ba5f959ea441..9978f6114563 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -195,7 +195,10 @@ stdenv.mkDerivation { # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" ] - ++ lib.optionals withGtk3 [ + ++ lib.optionals ((compareVersion "5.15.0" >= 0) && stdenv.isDarwin) [ + # .moc/moc_qprintdialog.cpp:96:31: error: no member named '_q_togglePageSetCombo' in 'QPrintDialogPrivate' + "-DQ_OS_MAC" + ] ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' ] diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 918626d04c9d..3d3193f7e108 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror ] ++ lib.optionals stdenv.hostPlatform.isMips64 [ # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609 diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/development/libraries/science/biology/bpp-core/default.nix index d1eb096e08e6..102cae24adb9 100644 --- a/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/bpp-core/bpp-core-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/pkgs/development/libraries/science/biology/bpp-phyl/default.nix index 8ff6ad433fb5..c11b49aa57eb 100644 --- a/pkgs/development/libraries/science/biology/bpp-phyl/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-phyl/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ bpp-core bpp-seq ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/pkgs/development/libraries/science/biology/bpp-popgen/default.nix index af5d1d00d4d9..4b9a62eb762b 100644 --- a/pkgs/development/libraries/science/biology/bpp-popgen/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-popgen/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ bpp-core bpp-seq ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/pkgs/development/libraries/science/biology/bpp-seq/default.nix index ef3f3d5756e9..7981fb28ac09 100644 --- a/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ bpp-core ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 15465c501b43..84762414fef9 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -24,10 +24,6 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; # usual dynamic linker issues - preCheck = " - export LD_LIBRARY_PATH=$(pwd)/bin - "; - meta = with lib; { homepage = "https://elastix.lumc.nl"; description = "Image registration toolkit based on ITK"; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 88336f21ed27..9d96368a4cda 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -36,11 +36,7 @@ stdenv.mkDerivation rec { "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}" ]; - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib:${blas}/lib:${lapack}/lib - '' else '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib - '' + '' + preCheck = '' # Prevent tests from using all cores export OMP_NUM_THREADS=2 ''; diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index b2acbe761b3b..c3ff2aeebfb4 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -39,8 +39,6 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/itpp - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/itpp ./gtests/itpp_gtests ''; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index 41deec25d454..cd221e86b148 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn"; }; - cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ]; + cmakeFlags = [ + "-DGKLIB_PATH=../GKlib" + # remove once updated past https://github.com/KarypisLab/METIS/commit/521a2c360dc21ace5c4feb6dc0b7992433e3cb0f + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; nativeBuildInputs = [ unzip cmake ]; meta = { diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 7620844f8d1c..ebf167de8d9d 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -67,8 +67,6 @@ stdenv.mkDerivation rec { # Run single threaded export OMP_NUM_THREADS=1 - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib ''; meta = with lib; { diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 9255889c6943..a29706aefc48 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -35,11 +35,6 @@ stdenv.mkDerivation rec { sed -e '/freetype freetype.c/d' -i ../tests/examples/CMakeLists.txt ''; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src/ - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src/ - ''; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 797db5b69b0c..7d70c500dfac 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DSNAPPY_BUILD_TESTS=OFF" "-DSNAPPY_BUILD_BENCHMARKS=OFF" ]; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 5a21af12e33c..523fe798168c 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -36,11 +36,6 @@ let ''; doCheck = true; - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" - '' else '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; meta = with lib; { description = "Very fast, header only, C++ logging library"; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index ec8dab3f90c7..7e3471eefa01 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DUTF8PROC_ENABLE_TESTING=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; doCheck = true; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index eb58e0d54fdb..43c6ded8a5d0 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -53,10 +53,6 @@ in stdenv.mkDerivation rec { patches = map fetchpatch patchesToFetch; - preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/lib"; - ''; - dontWrapQtApps = true; # Shared libraries don't work, because of rpath troubles with the current diff --git a/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch b/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch deleted file mode 100644 index f6745e6f9433..000000000000 --- a/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 378623b0e39b12bb04d3a3a1e08e64b31bd7d99d Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Fri, 27 Nov 2020 10:22:20 +0100 -Subject: [PATCH] add placeholder for @nm@ - ---- - egl/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/egl/meson.build b/egl/meson.build -index dee9b1d..e477546 100644 ---- a/egl/meson.build -+++ b/egl/meson.build -@@ -11,7 +11,7 @@ wayland_egl = library( - - executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c') - --nm_path = find_program('nm').path() -+nm_path = find_program('@nm@').path() - - test( - 'wayland-egl symbols check', --- -2.29.2 - diff --git a/pkgs/development/libraries/wayland/add-placeholder-for-nm.patch b/pkgs/development/libraries/wayland/add-placeholder-for-nm.patch new file mode 100644 index 000000000000..dbc63028b45b --- /dev/null +++ b/pkgs/development/libraries/wayland/add-placeholder-for-nm.patch @@ -0,0 +1,13 @@ +diff --git a/egl/meson.build b/egl/meson.build +index b3cbdf3..cdc15ca 100644 +--- a/egl/meson.build ++++ b/egl/meson.build +@@ -11,7 +11,7 @@ wayland_egl = library( + + executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c') + +-nm_path = find_program('nm').full_path() ++nm_path = find_program('@nm@').full_path() + + test( + 'wayland-egl symbols check', diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index ee897d64142c..ac434b795aef 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , substituteAll , meson , pkg-config @@ -30,16 +29,16 @@ let in stdenv.mkDerivation rec { pname = "wayland"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "09c7rpbwavjg4y16mrfa57gk5ix6rnzpvlnv1wp7fnbh9hak985q"; + url = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; + sha256 = "1b0ixya9bfw5c9jx8mzlr7yqnlyvd3jv5z8wln9scdv8q5zlvikd"; }; patches = [ (substituteAll { - src = ./0001-add-placeholder-for-nm.patch; + src = ./add-placeholder-for-nm.patch; nm = "${stdenv.cc.targetPrefix}nm"; }) ]; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 61696d232f79..5fca71ebf0c1 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.25"; + version = "1.26"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0q0laxdvf8p8b7ks2cbpqf6q0rwrjycqrp8pf8rxm86hk5qhzzzi"; + sha256 = "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"; }; postPatch = lib.optionalString doCheck '' diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index b6064c42b5c9..69fc38c9a74e 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -7,13 +7,6 @@ with lib; let - mkFlag = trueStr: falseStr: cond: name: val: "--" - + (if cond then trueStr else falseStr) - + name - + optionalString (val != null && cond != false) "=${val}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optLz4 = shouldUsePkg lz4; @@ -39,19 +32,19 @@ stdenv.mkDerivation rec { buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ]; configureFlags = [ - (mkWith false "attach" null) - (mkWith true "builtins" "") - (mkEnable (optBzip2 != null) "bzip2" null) - (mkEnable false "diagnostic" null) - (mkEnable false "java" null) - (mkEnable (optLeveldb != null) "leveldb" null) - (mkEnable false "python" null) - (mkEnable (optSnappy != null) "snappy" null) - (mkEnable (optLz4 != null) "lz4" null) - (mkEnable (optGperftools != null) "tcmalloc" null) - (mkEnable (optZlib != null) "zlib" null) - (mkWith (optDb != null) "berkeleydb" optDb) - (mkWith false "helium" null) + (withFeature false "attach") + (withFeatureAs true "builtins" "") + (enableFeature (optBzip2 != null) "bzip2") + (enableFeature false "diagnostic") + (enableFeature false "java") + (enableFeature (optLeveldb != null) "leveldb") + (enableFeature false "python") + (enableFeature (optSnappy != null) "snappy") + (enableFeature (optLz4 != null) "lz4") + (enableFeature (optGperftools != null) "tcmalloc") + (enableFeature (optZlib != null) "zlib") + (withFeatureAs (optDb != null) "berkeleydb" optDb) + (withFeature false "helium") ]; preConfigure = '' diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index 9dd55482300c..b5667f9cfe6a 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -39,11 +39,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" - ''; - meta = with lib; { description = "Logging library for C applications"; homepage = "https://github.com/babelouest/yder"; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 3b133407c30a..b9a81a6c9d9c 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -2,15 +2,18 @@ , buildDunePackage, camlp5 , ocaml , menhir, menhirLib +, atdgen , stdlib-shims , re, perl, ncurses , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" +, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5" + else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" }: with lib; let fetched = coqPackages.metaFetch ({ + release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar"; release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; @@ -31,7 +34,8 @@ buildDunePackage rec { minimalOCamlVersion = "4.04"; buildInputs = [ perl ncurses ] - ++ optional (versionAtLeast version "1.15" || version == "dev") menhir; + ++ optional (versionAtLeast version "1.15" || version == "dev") menhir + ++ optional (versionAtLeast version "1.16" || version == "dev") atdgen; propagatedBuildInputs = [ re stdlib-shims ] ++ (if versionAtLeast version "1.15" || version == "dev" diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 68c06cc4c6f7..3e25ba37fd1a 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -1,25 +1,32 @@ { lib, fetchurl, buildDunePackage, ocaml , astring, cmdliner, cppo, fpath, result, tyxml -, markup, alcotest, yojson, sexplib, jq +, markup, yojson, sexplib0, jq +, odoc-parser, ppx_expect, bash, fmt }: buildDunePackage rec { pname = "odoc"; - version = "1.5.3"; - - minimumOCamlVersion = "4.02"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz"; - sha256 = "0idzidmz7y10xkwcf4aih0mdvkipxk1gzi4anhnbbi2q2s0nzdzj"; + sha256 = "sha256-9XTb0ozQ/DorlVJcS7ld320fZAi7T+EhV/pTeIT5h/0="; }; - useDune2 = true; + # dune 3 is required for tests to pass + duneVersion = if doCheck then "3" else "2"; - buildInputs = [ astring cmdliner cppo fpath result tyxml ]; + buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ]; - checkInputs = [ alcotest markup yojson sexplib jq ]; - doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ markup yojson sexplib0 jq ppx_expect bash ]; + doCheck = lib.versionAtLeast ocaml.version "4.08"; + + preCheck = '' + # some run.t files check the content of patchShebangs-ed scripts, so patch + # them as well + find test \( -name '*.sh' -o -name 'run.t' \) -execdir sed 's@#!/bin/sh@#!${bash}/bin/sh@' -i '{}' \; + patchShebangs test + ''; meta = { description = "A documentation generator for OCaml"; diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index ed902288d0f2..511400ccfc59 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2022.03.2"; + version = "2022.07.0"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-eEvvcj8tHNErU6RrWar5mxG3xbQ5wCEEYJ95hXkdY54="; + rev = "refs/tags/${version}"; + sha256 = "sha256-87MumQ6MuhRRDHrcH1nmOPviKDaT4crYnq5Pd26qsLw="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index bbd39cf619f4..449655c8b75e 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "5.3.0"; + version = "5.3.1"; pname = "approvaltests"; format = "setuptools"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-nKTMWdXnxAf+UBUHkx+LAY29A/QXH+AtPjC296aarjU="; + sha256 = "sha256-9euZpfCxtGJOfkOB+okXUhp9Ow8AOz3cPfC963BO/h4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 815c609428ac..c620761dde25 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.13"; + version = "3.2.14"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - sha256 = "sha256-bZNJegqb9roOCxopzM3EDvv8dilyVbEwmzqISmiOxLY="; + sha256 = "sha256-Z3GCuotbKFpOBy86wXzu5q/xtc53/Rc8xbai09wCL88="; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 8dc627b68790..db81511da99d 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -39,14 +39,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.0.5"; + version = "4.0.6"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-90MaXecneWbzeFVXw5KEMzR9mYweZFkyRQE3iikeWqs="; + hash = "sha256-pnp5P/aCf9NzVVU33KDaKTpjoxb+NMt/Nn+JjMyjw64="; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 0f4ec03f5ff3..16d1dd356861 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.19"; + version = "0.9.20"; src = fetchPypi { inherit pname version; - sha256 = "a6e36ca96c289e2cb4ac6aa05c037cbef318401ba8ff04a8676892ca79749c77"; + sha256 = "sha256-ApCrXQj6vR74XvFD0cM/3NVJyy5Qd57BpCOZiw0LKUU="; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 903a39383b09..9b4b4b83af08 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.0.24"; + version = "0.0.26"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Hy/KLmu5mEIUazRi+XesTbKe+or/fzFL8e0zdV2WtC0="; + hash = "sha256-g2oKxPQogdfS544fYgKBAxvmJgU35A0ewsPQcX1XOJE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index c86dcd79aab5..f3377a5cd7be 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.5"; + version = "1.5.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-q0hdWucmR1qMMWIY8xZ/ccItcwb9EIVQauecJYSsQjc="; + sha256 = "sha256-j0jxyvx4KIqlrUJDqtUwKlahB8jq18FrgQhti15BaTA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index ec355d51fd07..5378243fe1a6 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.2"; + version = "1.1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-undhXBAPB+3akWVu3ht0ZZBwErhmOq18TnXvloeZQjc="; + hash = "sha256-pTakW1aYx5KlU8vgOXwu4kJDI4nEVi2y0YE0pTo3k30="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 84bdaf7afe51..2fae768eb3a3 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-audit-log"; - version = "0.2.2"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bYmQOEiu6YF0d+zjBlRIUbkDpexWHalmu7pajRJQmk0="; + sha256 = "sha256-Yi8baD1TgpLr1zNH2i+CBeY+3gwL7Aq5nnmgZcSSZr0="; }; propagatedBuildInputs = [ googleapis-common-protos protobuf ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index e67b32272e54..8adc7d1b25a3 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.6.2"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-y8W0qwm4rTHlDO8L+/fhIJlfW5PonUhAYBU5wLIZJ94="; + hash = "sha256-WSFulX1aN+mSW3RTukXDe0N/BsLDQX2RKjqzPUsWb2Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 59859e4ccea7..97d3ec13e99a 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hIwKcQNPG6AHudqjy2dotACk51IeivwRbJZZaiFweqs="; + sha256 = "sha256-n8LMhjyZmWnb8ALrOZkKZ8Ctlo70zjyTRF9HxJIudmQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 41b85f50a43e..b7089078ff81 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.8"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cQ5wFAwgqT2NT+jTfsg13wA7OOq8bk/QIRiIsK2ZyJ0="; + hash = "sha256-cmgyWHK3JLXYEJPLAN5M4edWJlv71tfbhu0KNs5H1k4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index f38b604ddb39..a58768417059 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.8.1"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-t7kFCkyH3/MNGFX8S4OzgWnW/NSomAFDbDPCx9hV40g="; + hash = "sha256-1VhEg22JMfUDeMT5/A1uX7jwqND4i0zVScFpMJKyCro="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 279893faf33e..5478fa83934c 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.7.1"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-q2I3ku8f55rSJQE5oiDttQOJFYtGPjmrW7htrZ+BMPU="; + hash = "sha256-xidZ7EteyDUFxxXOXgSg6OUkzlIzEgnAMRledha0s/Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index de0f9c32adfb..922d94c83caa 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.5.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ISPjpV2fjZSMbkJa6YzFGdrwyEC8MauLwS6pohMtFoY="; + sha256 = "sha256-Iq+rOR7gMAfhn5WxfpFQ7s8MlwOxPm868DpgKg/sT/k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index edb73853cace..f03b854abf1f 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.11.1"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tSy0d8kdyDSE+/gcg4B+fplnLJ4ipoa+TZvUoExaYVU="; + hash = "sha256-vlMh7Ww7ZPHWVUJMDqRO58bmn4nfTi3Gj/sBReHOvtQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 7f4c31419839..44ef6afed987 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.9.1"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wIO22BScrDJdbia6oOEuuXptedxrCehqWKLXmxTJmKE="; + sha256 = "sha256-bN5nW/vqDXiSy/gGC/OVxhRQRJl0VLWL/G5BqViueY0="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 92d2272440e9..cc3d35c88599 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4I7zmjZMjXjkxjEtwWNbev0ryTOIyOWsVkC46tgRyqc="; + sha256 = "sha256-HcLY/dpWQzsfCmwtwePidqlDuLHmlEgLUEdGkHOgdsw="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 8665718fb00f..9f5df9bd989e 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.6.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nxyd8zE8PEQupVutLWhLD4I1jNhhJ0ARpTi52f21iBE="; + sha256 = "sha256-4EC6jLcFNF8G0dXvc+cZB6Ok3zeltc6Xon8EGRTkyCs="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index ce4142fa1141..dac5109f6651 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.8.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LOGfvz61Fw6QNH83lFe8TwI3a72fHLeTFFcqM9QL3QY="; + hash = "sha256-YQiqLVa9CVW82eXuzPWvcWFKzXcvX8v7cxazH2hrqAs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 794d504337e2..52a95fd8b65f 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.46.3"; + version = "1.47.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "78442ac7d2813c56f9cc04f713efd7088596b10f88a4ddd09279211cc48402d5"; + sha256 = "c9ce3213e84c6fd8801c31aca3ea4a6b3453eaa40b93a6c0a23ea8999808fa00"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index c80bc6f9bf6a..73a98008739b 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.46.3"; + version = "1.47.0"; src = fetchPypi { inherit pname version; - sha256 = "31fee436ace5b3bd950cc3a8e68d6b84de1d6dc755959db7badc3470cdf22f70"; + sha256 = "f64b5378484be1d6ce59311f86174be29c8ff98d8d90f589e1c56d5acae67d3c"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 197fc18e88d3..74727321bb51 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.7.8"; + version = "2022.7.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Tzl7LH4Wisge3B7d2ChQnNPBAj1SNGmHI94k8fkMuqk="; + sha256 = "sha256-yIzxgZOOra5hiAdrLA9miL50fwg/dCwP/lfAmfzWlaI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index aded4c94b125..2330a356dd89 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hahn-th"; repo = "homematicip-rest-api"; - rev = version; - hash = "sha256-rTTYJ/2R+/FLuL3rTWT7ieixN+Gv9GhwkUaKPfLqUGc="; + rev = "refs/tags/${version}"; + hash = "sha256-pfVjnRO6iKEgLDQz4JMARzab21XLbbUDUMyMWatGlJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index a061f53b6ca3..017069a7dd2d 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , buildPythonPackage , pythonOlder , fetchPypi @@ -13,24 +12,16 @@ import ./generic.nix (rec { pname = "pillow"; - version = "9.1.1"; + version = "9.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Pillow"; inherit version; - sha256 = "sha256-dQJTmTm1PXVl89Edh8eOfskA08cpRdTuDi8lDVmDCaA="; + sha256 = "sha256-deY2/T4PuHJpPyPMuKX/LNV4gBJR86T2hUxqXUN9PAQ="; }; - patches = [ - # Fix failing test with libtiff 4.4.0 - (fetchpatch { - url = "https://github.com/python-pillow/Pillow/commit/40a918d274182b7d7c063d7797fb77d967982c4a.patch"; - sha256 = "sha256-f8m3Xt3V3pHggK1JEc2tnPmrTVPFjfV4YJqwE1KM1pA="; - }) - ]; - passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index f98e4d992a32..4916afc5861a 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -133,6 +133,7 @@ buildPythonPackage rec { "-DBOOST_ROOT=${boost}" "-DBoost_NO_SYSTEM_PATHS=ON" "-DBoost_NO_BOOST_CMAKE=TRUE" + "-DCMAKE_SKIP_BUILD_RPATH=ON" # fails to find libs in pythonImportsCheckPhase otherwise ]; checkPhase = '' diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index b897d6ced4a3..10ee872576d7 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "safety"; - version = "2.0.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d739d00a9e4203cfaba34540c822a73ca1d327159ed7776b3dce09391f81c35d"; + sha256 = "sha256-28Xf+i5H2nbMQ9/oy7v8qZ0pEY0MbFTfz6EcK9NJ3/Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 90caa943ebde..ca137888ce7c 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dieselrabbit"; repo = pname; - rev = "v${version}"; - sha256 = "0r9227s4v17jm5n0j31ssnak9f5p7xfvz4r1fwy61286is3j5gbb"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-1tBr7k7RutCHvea/56J7drl9P+WZ5bQpDeQwhgktc1s="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index a78952b1e493..2bbd7dd532f9 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; homepage = "https://tatsu.readthedocs.io/"; license = licenses.bsd2; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index 9243d3a3edb0..8b56e0fe739d 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, python3 +, python , fetchFromGitHub , mkdocs , twine @@ -53,7 +53,7 @@ let postInstall = '' # FileNotFoundError: [Errno 2] No such file or directory: '$out/lib/python3.10/site-packages/textx/textx.tx - cp "$src/textx/textx.tx" "$out/${python3.sitePackages}/${pname}/" + cp "$src/textx/textx.tx" "$out/lib/${python.libPrefix}/site-packages/${pname}/" # Install tests as the tests output. mkdir $testout diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index fb0a0c7d87c7..85896ac7921f 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'rich = "^11.2.0"' 'rich = "*"' \ - --replace 'treeo = "^0.0.10"' 'treeo = "*"' + --replace 'treeo = "^0.0.10"' 'treeo = "*"' \ + --replace 'certifi = "^2021.10.8"' 'certifi = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index a409f71a4745..90fd0a6bf413 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.1"; + version = "2.28.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rNjteFCdJ73wTN3MBfcGbf3k0w3X26Z7gIzbEUHWL/4="; + sha256 = "sha256-OY+IzZMCx5bLY9ECGvKh+3rlB3QaPVCO344HRtjBagQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typogrify/default.nix b/pkgs/development/python-modules/typogrify/default.nix index 25445d8a7d29..81425b22f181 100644 --- a/pkgs/development/python-modules/typogrify/default.nix +++ b/pkgs/development/python-modules/typogrify/default.nix @@ -1,32 +1,33 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy -, django , smartypants -, jinja2 }: buildPythonPackage rec { pname = "typogrify"; version = "2.0.7"; - disabled = isPyPy; + + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"; }; - propagatedBuildInputs = [ django smartypants jinja2 ]; + propagatedBuildInputs = [ + smartypants + ]; # Wants to set up Django doCheck = false; + pythonImportsCheck = [ "typogrify.filters" ]; + meta = with lib; { description = "Filters to enhance web typography, including support for Django & Jinja templates"; homepage = "https://github.com/mintchaos/typogrify"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; - } diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index ec7f3e47ca73..c3b637da0670 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -6,7 +6,7 @@ , libuv , CoreServices , ApplicationServices -# Check Inputs + # Check Inputs , aiohttp , psutil , pyopenssl @@ -34,7 +34,6 @@ buildPythonPackage rec { checkInputs = [ aiohttp pytestCheckHook - pyopenssl psutil ]; @@ -46,15 +45,18 @@ buildPythonPackage rec { "--assert=plain" "--strict" "--tb=native" + # Depend on pyopenssl + "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" + "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ # test gets stuck in epoll_pwait on hydras aarch64 builders # https://github.com/MagicStack/uvloop/issues/412 - "--deselect" "tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" + "--deselect tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Flaky test: https://github.com/MagicStack/uvloop/issues/412 - "--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" + "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 - "--deselect" "tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" + "--deselect tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" ]; disabledTestPaths = [ @@ -66,7 +68,11 @@ buildPythonPackage rec { # Work around "OSError: AF_UNIX path too long" # https://github.com/MagicStack/uvloop/issues/463 export TMPDIR="/tmp" - '' + '' + '' + '' + # pyopenssl is not well supported by upstream + # https://github.com/NixOS/nixpkgs/issues/175875 + substituteInPlace tests/test_tcp.py \ + --replace "from OpenSSL import SSL as openssl_ssl" "" # force using installed/compiled uvloop vs source by moving tests to temp dir export TEST_DIR=$(mktemp -d) cp -r tests $TEST_DIR diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 7ba8c70a9805..e5f9d045a5b4 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -18,7 +18,7 @@ # Normal gem packages can be used outside of bundler; a binstub is created in # $out/bin. -{ lib, fetchurl, fetchgit, makeWrapper, gitMinimal, darwin +{ lib, fetchurl, fetchgit, makeWrapper, gitMinimal, libobjc , ruby, bundler } @ defs: @@ -35,6 +35,7 @@ lib.makeOverridable ( , namePrefix ? (let rubyName = builtins.parseDrvName ruby.name; in "${rubyName.name}${rubyName.version}-") +, nativeBuildInputs ? [] , buildInputs ? [] , meta ? {} , patches ? [] @@ -87,11 +88,15 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit dontStrip; inherit type; - buildInputs = [ + nativeBuildInputs = [ ruby makeWrapper ] ++ lib.optionals (type == "git") [ gitMinimal ] ++ lib.optionals (type != "gem") [ bundler ] - ++ lib.optional stdenv.isDarwin darwin.libobjc + ++ nativeBuildInputs; + + buildInputs = [ + ruby + ] ++ lib.optionals stdenv.isDarwin [ libobjc ] ++ buildInputs; #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 89e8e0e197a0..50f23f1bb7b1 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -102,9 +102,8 @@ cmakeConfigurePhase() { cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags" fi - # Avoid cmake resetting the rpath of binaries, on make install - # And build always Release, to ensure optimisation flags - cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" + # Always build Release, to ensure optimisation flags + cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} $cmakeFlags" # Disable user package registry to avoid potential side effects # and unecessary attempts to access non-existent home folder diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index dca9df4dc273..7d95607b6188 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.1.14"; + version = "0.2.5"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kz2CwfntAUI33igYJBJQKPAmoW895toe/wS9dGnFB64="; + sha256 = "sha256-HnVvq6Tb0yDvoa0KxZHZG0Tm0CWYWsn9unj0v0zYuTw="; }; - cargoSha256 = "sha256-Rrnt6VEp7jDGLSsDcHuPfKhkm4USstxi/OW5oOVrgqY="; + cargoSha256 = "sha256-cbp4eAcqKuUKKqmlS2Azo5NRHDy+F4LNwcrwbFj+Z5g="; nativeBuildInputs = [ # Required for `syntax-gen` crate https://github.com/azdavis/language-util/blob/8ec2dc509c88951102ad3e751820443059a363af/crates/syntax-gen/src/util.rs#L37 diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 79db7e710b06..b9e32372922f 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + dontFixLibtool = true; meta = { description = "Generic library support script"; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 813cc71938f2..92a230374df6 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + dontFixLibtool = true; # XXX: The GNU ld wrapper does all sorts of nasty things wrt. RPATH, which # leads to the failure of a number of tests. diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index f3f29cc1acd6..9cf752af5b8f 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -4,7 +4,7 @@ let dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { pname = "lsof"; - version = "4.94.0"; + version = "4.95.0"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; @@ -13,18 +13,24 @@ stdenv.mkDerivation rec { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp"; + sha256 = "sha256-HgU7/HxLdUOfLU2E/dpusko6gBOoEKeWPJIFbBQGzFU="; }; patches = [ ./no-build-info.patch # Pull upstream fix for -fno-common toolchains: - # https://github.com/lsof-org/lsof/pull/221 + # https://github.com/lsof-org/lsof/pull/226 + # https://github.com/lsof-org/lsof/pull/233 (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/lsof-org/lsof/commit/80e7c890585deec02c527dbcf42bc0e5d8d7c534.patch"; - sha256 = "17xshi7j7af9nli1zjk1m5f4il2ajvvhw7lii8g8d27rkkgyb8g6"; + name = "add-extern.patch"; + url = "https://github.com/lsof-org/lsof/commit/180ffa29b0544f77cabbc54d7f77d50d33dd27d7.patch"; + sha256 = "sha256-zzcN9HrFYMTBeEekeAwi2RIcVukymgaqtpvFIBV6njU="; + }) + (fetchpatch { + name = "add-declaration.patch"; + url = "https://github.com/lsof-org/lsof/commit/8e47e1491636e8cf41baf834554391be45177b00.patch"; + sha256 = "sha256-kwkDQp7VApLenOLTPMY24Me+/xUhD56skHWRd4ZB1I4="; }) ]; diff --git a/pkgs/development/tools/misc/lsof/no-build-info.patch b/pkgs/development/tools/misc/lsof/no-build-info.patch index cf785e248f2a..c433fd6e08f8 100644 --- a/pkgs/development/tools/misc/lsof/no-build-info.patch +++ b/pkgs/development/tools/misc/lsof/no-build-info.patch @@ -1,12 +1,9 @@ -diff -ru -x '*~' lsof_4.91_src-orig/usage.c lsof_4.91_src/usage.c ---- lsof_4.91_src-orig/usage.c 2018-02-14 15:20:32.000000000 +0100 -+++ lsof_4.91_src/usage.c 2018-10-08 21:57:45.718560869 +0200 -@@ -930,26 +930,6 @@ +--- a/usage.c 2018-02-14 15:20:32.000000000 +0100 ++++ b/usage.c 2018-10-08 21:57:45.718560869 +0200 +@@ -930,24 +930,6 @@ (void) fprintf(stderr, " configuration info: %s\n", cp); #endif /* defined(LSOF_CINFO) */ -- if ((cp = isnullstr(LSOF_CCDATE))) -- (void) fprintf(stderr, " constructed: %s\n", cp); - cp = isnullstr(LSOF_HOST); - if (!(cp1 = isnullstr(LSOF_LOGNAME))) - cp1 = isnullstr(LSOF_USER); diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 0d5ceba12530..297669733c0e 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { "-DUSE_PCAP=1" "-DUSE_SSL=1" "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}" + + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 04557a27f740..cc1baad2bb0e 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -9,6 +9,8 @@ let # Fetch clang from qt vendor, this contains submodules like this: # clang<-clang-tools-extra<-clazy. clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: { + # file RPATH_CHANGE could not write new RPATH + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; src = fetchgit { url = "https://code.qt.io/clang/clang.git"; rev = "c12b012bb7465299490cf93c2ae90499a5c417d5"; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 8bba2d1f94e3..919d22b41dae 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.2.4"; + version = "1.2.5"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -34,8 +34,8 @@ in stdenv.mkDerivation { # There are no tags in the repository. # Look for commits like "new version x.y.z info on website" # or "website update for x.y.z". - rev = "2109"; - sha256 = "sha256-awTaEkv0zUXgrKVKuFzi5sgHgrfiNmAFMODO5U0DL6I="; + rev = "2212"; + sha256 = "sha256-XuPMxGDap8x7I+U7+1C+DlkQkoV/u2FCwYyTZFWmYHM="; }; nativeBuildInputs = [ diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 2064aa0199b4..49e8fabd45e4 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -157,10 +157,6 @@ let touch .git/index .git/modules/library/xml/index ''; - preBuild = '' - export LD_LIBRARY_PATH="$PWD/depends/protobuf''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index a45c4fee05ec..d69ba93aaeb5 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,7 +1,7 @@ -{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut +{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs -, qtbase, qttools +, qtbase, qttools, wrapQtAppsHook , llvm , withServer ? true }: @@ -14,7 +14,7 @@ let ]); in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "hedgewars"; version = "1.0.0"; @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1"; }; - nativeBuildInputs = [ cmake pkg-config qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image @@ -103,10 +103,5 @@ mkDerivation rec { all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; inherit (fpc.meta) platforms; - - # Appears to be some sort of C++ linking error. - # Example: https://hydra.nixos.org/build/174544990/nixlog/6 - broken = true; - hydraPlatforms = platforms.none; }; } diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index f4ca916aa499..b2696d727887 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -62,6 +62,11 @@ stdenv.mkDerivation rec { yajl ]; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + WITH_FONTS = "NO"; WITH_UPDATER = "NO"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index d2d21cc9d6cb..3636b6e3763c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -280,9 +280,11 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { objc4 = applePackage "objc4" "osx-10.12.6" "1cj1vhbcs9pkmag2ms8wslagicnq9bxi2qjkszmp3ys7z7ccrbwz" {}; ppp = applePackage "ppp" "osx-10.12.6" "1kcc2nc4x1kf8sz0a23i6nfpvxg381kipi0qdisrp8x9z2gbkxb8" {}; removefile = applePackage "removefile" "osx-10.12.6" "0jzjxbmxgjzhssqd50z7kq9dlwrv5fsdshh57c0f8mdwcs19bsyx" {}; - xnu = applePackage "xnu" "osx-10.12.6" "1sjb0i7qzz840v2h4z3s4jyjisad4r5yyi6sg8pakv3wd81i5fg5" { + xnu = if stdenv.isx86_64 then + applePackage "xnu" "osx-10.12.6" "1sjb0i7qzz840v2h4z3s4jyjisad4r5yyi6sg8pakv3wd81i5fg5" { python3 = pkgs.buildPackages.buildPackages.python3; # TODO(@Ericson2314) this shouldn't be needed. - }; + } + else macosPackages_11_0_1.xnu; hfs = applePackage "hfs" "osx-10.12.6" "1mj3xvqpq1mgd80b6kl1s04knqnap7hccr0gz8rjphalq14rbl5g" {}; Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; adv_cmds = applePackage "adv_cmds" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 90f572d3940d..8b0d2054d58a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -4,12 +4,15 @@ , headersOnly ? true }: -appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ({ +appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( + let arch = if stdenv.isx86_64 then "x86_64" else "arm64"; + in + { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python3 ]; - patches = [ ./python3.patch ]; + patches = lib.optional stdenv.isx86_64 [ ./python3.patch ]; postPatch = '' substituteInPlace Makefile \ @@ -41,9 +44,16 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ({ --replace " -o 0" "" \ --replace '$SRC/$mig' '-I$DSTROOT/include $SRC/$mig' \ --replace '$SRC/servers/netname.defs' '-I$DSTROOT/include $SRC/servers/netname.defs' \ - --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR' + --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR' \ + --replace 'MACHINE_ARCH=armv7' 'MACHINE_ARCH=arm64' # this might break the comments saying 32-bit is required patchShebangs . + '' + lib.optionalString stdenv.isAarch64 '' + # iig is closed-sourced, we don't have it + # create an empty file to the header instead + # this line becomes: echo "" > $@; echo --header ... + substituteInPlace iokit/DriverKit/Makefile \ + --replace '--def $<' '> $@; echo' ''; PLATFORM = "MacOSX"; @@ -62,18 +72,22 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ({ HOST_BISON = "bison"; HOST_GM4 = "m4"; MIGCC = "cc"; - ARCHS = "x86_64"; + ARCHS = arch; + ARCH_CONFIGS = arch; NIX_CFLAGS_COMPILE = "-Wno-error"; - preBuild = '' + preBuild = let macosVersion = + "10.0 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8 10.9 10.10 10.11" + + lib.optionalString stdenv.isAarch64 " 10.12 10.13 10.14 10.15 11.0"; + in '' # This is a bit of a hack... mkdir -p sdk/usr/local/libexec cat > sdk/usr/local/libexec/availability.pl < { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/pkgs/servers/misc/navidrome/ui/node-env.nix b/pkgs/servers/misc/navidrome/ui/node-env.nix new file mode 100644 index 000000000000..2590dd267a4e --- /dev/null +++ b/pkgs/servers/misc/navidrome/ui/node-env.nix @@ -0,0 +1,598 @@ +# This file originates from node2nix + +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: + +let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 + + local strippedName + + local DIR=$PWD + cd $TMPDIR + + unpackFile $src + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/$packageName")" + + if [ -f "$src" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash $src)" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/$packageName" + fi + + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; + + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.packageName}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version ? null + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , meta ? {} + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; + in + stdenv.mkDerivation ({ + name = "${name}${if version == null then "" else "-${version}"}"; + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + source ${installPackage} + + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + + # Patch the shebang lines of all the executables + ls $out/bin/* | while read i + do + file="$(readlink -f "$i")" + chmod u+rwx "$file" + patchShebangs "$file" + done + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; + } // extraArgs); + + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = + { name + , packageName + , version ? null + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + in + stdenv.mkDerivation ({ + name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + source ${installPackage} + + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + chmod 644 package-lock.json + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version ? null + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node-shell-${name}${if version == null then "" else "-${version}"}"; + + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell <) { } if ($isFont) { + push @requires, "fontutil"; push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ];"; } @@ -293,10 +294,22 @@ foreach my $pkg (sort (keys %pkgURLs)) { my $nativeBuildInputsStr = join "", map { $_ . " " } @nativeBuildInputs; my $buildInputsStr = join "", map { $_ . " " } @buildInputs; + sub uniq { + my %seen; + my @res = (); + foreach my $s (@_) { + if (!defined $seen{$s}) { + $seen{$s} = 1; + push @res, $s; + } + } + return @res; + } + my @arguments = @buildInputs; push @arguments, @nativeBuildInputs; unshift @arguments, "stdenv", "pkg-config", "fetchurl"; - my $argumentsStr = join ", ", @arguments; + my $argumentsStr = join ", ", uniq @arguments; my $extraAttrsStr = ""; if (defined $extraAttrs{$pkg}) { @@ -314,6 +327,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { sha256 = "$pkgHashes{$pkg}"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config $nativeBuildInputsStr]; buildInputs = [ $buildInputsStr];$extraAttrsStr meta.platforms = lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2cfd410a3389..e8c6caa721ba 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -42,7 +42,7 @@ self: super: }); encodings = super.encodings.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.mkfontscale ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.mkfontscale ]; }); editres = super.editres.overrideAttrs (attrs: { @@ -437,9 +437,6 @@ self: super: xf86inputvoid = brokenOnDarwin super.xf86inputvoid; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin - xf86videosuncg6 = brokenOnDarwin super.xf86videosuncg6; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin - xf86videosunffb = brokenOnDarwin super.xf86videosunffb; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin - xf86videosunleo = brokenOnDarwin super.xf86videosunleo; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin # Obsolete drivers that don't compile anymore. xf86videoark = super.xf86videoark.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); @@ -463,8 +460,8 @@ self: super: }); xf86videoati = super.xf86videoati.overrideAttrs (attrs: { - NIX_CFLAGS_COMPILE = "-I${self.xorgserver.dev or self.xorgserver}/include/xorg"; - nativeBuildInputs = with self; attrs.nativeBuildInputs ++ [ autoreconfHook utilmacros ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; + buildInputs = attrs.buildInputs ++ [ self.utilmacros ]; patches = [ (fetchpatch { url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/e0511968d04b42abf11bc0ffb387f143582bc144.patch"; @@ -474,7 +471,117 @@ self: super: }); xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: { - nativeBuildInputs = with self; attrs.nativeBuildInputs ++ [ autoreconfHook utilmacros ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; + buildInputs = attrs.buildInputs ++ [ self.utilmacros ]; + }); + + xf86videoglint = super.xf86videoglint.overrideAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; + buildInputs = attrs.buildInputs ++ [ self.utilmacros ]; + # https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1 + meta = attrs.meta // { broken = true; }; + }); + + xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: { + meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin + # https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/commit/14392504de04841fa2cbb5cdf8d9c9c7c4eb2ed8 + postPatch = '' + patch -p1 < + #include "gcstruct.h" + #include "cg6_regs.h" + EOF + ''; + }); + + xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: { + meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin + # https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/commit/656dd83b489e7bdc72d6c1990025d20dea26dc22 + postPatch = '' + patch -p1 < + #include "gcstruct.h" + #include "leo_regs.h" + EOF + ''; + }); + + xf86videotrident = super.xf86videotrident.overrideAttrs (attrs: { + # https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/commit/07a5c4732f1c28ffcb873ee04500e3cb813c50b4 + postPatch = '' + patch -p1 <= 21.1.4; https://lists.x.org/archives/xorg/2022-July/061035.html + ++ [ + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/f1070c01d616c5f21f939d5ebc533738779451ac.diff"; + sha256 = "5hcreV3ND8Lklvo7QMpB0VWQ2tifIamRlCr6J82qXt8="; + }) + (fetchpatch { + name = "CVE-2022-2319.diff"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/6907b6ea2b4ce949cb07271f5b678d5966d9df42.diff"; + sha256 = "gWXCalWj2SF4U7wSFGIgK396B0Fs3EtA/EL+34m3FWY="; + }) + (fetchpatch { + name = "CVE-2022-2320.diff"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.diff"; + sha256 = "rBiiXQRreMvexW9vOKblcfCYzul+9La01EAhir4FND8="; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ @@ -821,7 +945,8 @@ self: super: }); xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.xcursorgen self.xorgproto ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.xcursorgen ]; + buildInputs = attrs.buildInputs ++ [ self.xorgproto ]; configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; }); @@ -867,8 +992,8 @@ self: super: rev = "31486f40f8e8f8923ca0799aea84b58799754564"; sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM="; }; - buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ]; - nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; + buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman self.utilmacros ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; meta = attrs.meta // { diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index bde8735642d8..871aed59e35e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -330,6 +330,74 @@ else let ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; + cmakeFlags = + let + explicitFlags = + if lib.isString cmakeFlags then lib.warn + "String 'cmakeFlags' is deprecated and will be removed in release 23.05. Please use a list of strings. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" + [cmakeFlags] + else if cmakeFlags == null then + lib.warn + "Null 'cmakeFlags' is deprecated and will be removed in release 23.05. Please use a empty list instead '[]'. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" + [] + else + cmakeFlags; + + crossFlags = [ + "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" (lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}" + ] ++ lib.optionals (stdenv.hostPlatform.uname.processor != null) [ + "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" + ] ++ lib.optionals (stdenv.hostPlatform.uname.release != null) [ + "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" + ] ++ lib.optionals (stdenv.buildPlatform.uname.system != null) [ + "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" + ] ++ lib.optionals (stdenv.buildPlatform.uname.processor != null) [ + "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" + ] ++ lib.optionals (stdenv.buildPlatform.uname.release != null) [ + "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}" + ]; + in + explicitFlags ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) crossFlags; + + mesonFlags = + let + explicitFlags = + if lib.isString mesonFlags then lib.warn + "String 'mesonFlags' is deprecated and will be removed in release 23.05. Please use a list of strings. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" + [mesonFlags] + else if mesonFlags == null then + lib.warn + "Null 'mesonFlags' is deprecated and will be removed in release 23.05. Please use a empty list instead '[]'. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" + [] + else + mesonFlags; + + # See https://mesonbuild.com/Reference-tables.html#cpu-families + cpuFamily = platform: with platform; + /**/ if isAarch32 then "arm" + else if isAarch64 then "aarch64" + else if isx86_32 then "x86" + else if isx86_64 then "x86_64" + else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; + + crossFile = builtins.toFile "cross-file.conf" '' + [properties] + needs_exe_wrapper = true + + [host_machine] + system = '${stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${cpuFamily stdenv.targetPlatform}' + cpu = '${stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + + [binaries] + llvm-config = 'llvm-config-native' + ''; + crossFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; + in crossFlags ++ explicitFlags; + inherit patches; inherit doCheck doInstallCheck; @@ -341,42 +409,6 @@ else let # most people won't care about these anyways outputHashAlgo = attrs.outputHashAlgo or "sha256"; outputHashMode = attrs.outputHashMode or "recursive"; - } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { - cmakeFlags = - (/**/ if lib.isString cmakeFlags then [cmakeFlags] - else if cmakeFlags == null then [] - else cmakeFlags) - ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" ( - lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"] - ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" - ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}" - ++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" - ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" - ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" - ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"; - - mesonFlags = if mesonFlags == null then null else let - # See https://mesonbuild.com/Reference-tables.html#cpu-families - cpuFamily = platform: with platform; - /**/ if isAarch32 then "arm" - else if isAarch64 then "aarch64" - else if isx86_32 then "x86" - else if isx86_64 then "x86_64" - else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; - crossFile = builtins.toFile "cross-file.conf" '' - [properties] - needs_exe_wrapper = true - - [host_machine] - system = '${stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${cpuFamily stdenv.targetPlatform}' - cpu = '${stdenv.targetPlatform.parsed.cpu.name}' - endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - - [binaries] - llvm-config = 'llvm-config-native' - ''; - in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (enableParallelBuilding) { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 3670f8d8c2bc..723ebf24fe52 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -356,9 +356,6 @@ in # stage5.gcc -> stage4.coreutils -> stage3.glibc -> bootstrap gmp = lib.makeOverridable (super.gmp.override { stdenv = self.stdenv; }).overrideAttrs (a: { pname = "${a.pname}-stage4"; }); - # coreutils gets rebuilt both here and also in the final stage; we rename this one to avoid confusion - coreutils = super.coreutils.overrideAttrs (a: { pname = "${a.pname}-stage4"; }); - gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 2f2581f04a59..f84f55583f5d 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -60,7 +60,10 @@ stdenv.mkDerivation rec { "generic" "D_USE_BZ2=-DUSE_BZIP2" "L_BZ2=-lbz2" - ]; + ] + # `lchmod` is not available on Linux, so we remove it to fix "not supported" errors (when the zip file contains symlinks). + # Alpine (musl) and Debian (glibc) also add this flag. + ++ lib.optionals stdenv.isLinux [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; preConfigure = '' sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 85e9ac6f364b..4caafcae679b 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { "-DWITH_ZLIB=system" "-DWITH_VALGRIND=ON" "-DWITH_MAN_PAGES=OFF" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. ]; postInstall = '' diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index db02bedf7f94..73e9dd1f01fa 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -184,8 +184,6 @@ in rec { substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" substituteInPlace src/common/module.c --replace "/bin/grep" "grep" - # for pybind/rgw to find internal dep - export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" # install target needs to be in PYTHONPATH for "*.pth support" check to succeed # set PYTHONPATH, so the build system doesn't silently skip installing ceph-volume and others export PYTHONPATH=${ceph-python-env}/${sitePackages}:$lib/${sitePackages}:$out/${sitePackages} diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 8d8ae6e71e42..d8cb710b2936 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib" ''; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = { description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp"; diff --git a/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix b/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix index 3c2b446a8e1c..6f41f2826b2d 100644 --- a/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix @@ -1,28 +1,80 @@ -{ stdenv, lib, fetchurl, wkhtmltopdf, xar, cpio }: +{ lib +, autoPatchelfHook +, cpio +, freetype +, zlib +, openssl +, dpkg +, fetchurl +, gcc-unwrapped +, libjpeg8 +, libpng +, fontconfig +, stdenv +, wkhtmltopdf +, xar +, xorg +}: -stdenv.mkDerivation rec { +let + darwinAttrs = rec { + version = "0.12.6-2"; + src = fetchurl { + url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.macos-cocoa.pkg"; + sha256 = "sha256-gaZrd7UI/t6NvKpnEnIDdIN2Vos2c6F/ZhG21R6YlPg="; + }; - pname = "wkhtmltopdf-bin"; - version = "0.12.6-1"; - sha256 = "1db59kdprzpmvdj1bg47lmfgi3zlvzvqif11sbym9hw61xy6gp3d"; - src = fetchurl { - url = - "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.macos-cocoa.pkg"; - inherit sha256; + nativeBuildInputs = [ xar cpio ]; + + unpackPhase = '' + xar -xf $src + zcat Payload | cpio -i + tar -xf usr/local/share/wkhtmltox-installer/wkhtmltox.tar.gz + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r bin include lib share $out/ + runHook postInstall + ''; }; - buildInputs = [ xar cpio ]; + linuxAttrs = rec { + version = "0.12.6-3"; + src = fetchurl { + url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.archlinux-x86_64.pkg.tar.xz"; + sha256 = "sha256-6Ewu8sPRbqvYWj27mBlQYpEN+mb+vKT46ljrdEUxckI="; + }; - unpackPhase = '' - xar -xf $src - zcat Payload | cpio -i - tar -xf usr/local/share/wkhtmltox-installer/wkhtmltox.tar.gz - ''; + nativeBuildInputs = [ autoPatchelfHook ]; - installPhase = '' - mkdir -p $out - cp -r bin include lib share $out/ - ''; + buildInputs = [ + xorg.libXext + xorg.libXrender + + freetype + openssl + zlib + + (lib.getLib fontconfig) + (lib.getLib gcc-unwrapped) + (lib.getLib libjpeg8) + (lib.getLib libpng) + ]; + + unpackPhase = "tar -xf $src"; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r usr/bin usr/include usr/lib usr/share $out/ + runHook postInstall + ''; + }; +in +stdenv.mkDerivation ({ + pname = "wkhtmltopdf-bin"; dontStrip = true; @@ -45,7 +97,10 @@ stdenv.mkDerivation rec { There is also a C library, if you're into that kind of thing. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ nbr ]; - platforms = [ "x86_64-darwin" ]; + maintainers = with maintainers; [ nbr kalbasit ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }; } +// lib.optionalAttrs (stdenv.hostPlatform.isDarwin) darwinAttrs +// lib.optionalAttrs (stdenv.hostPlatform.isLinux) linuxAttrs +) diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index f3d7503b9c9d..77d06a6848ac 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -18,7 +18,7 @@ , ninja , vala , libgudev -, wrapGAppsHook +, wrapGAppsNoGuiHook , shared-mime-info , sane-backends , docbook_xsl @@ -26,6 +26,7 @@ , docbook_xml_dtd_412 , gtk-doc , libxslt +, enableDaemon ? !stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { "-Dlibcolordcompat=true" "-Dsane=true" "-Dvapi=true" + "-Ddaemon=${lib.boolToString enableDaemon}" "-Ddaemon_user=colord" ]; @@ -72,7 +74,7 @@ stdenv.mkDerivation rec { pkg-config shared-mime-info vala - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ @@ -83,10 +85,11 @@ stdenv.mkDerivation rec { gusb lcms2 libgudev - polkit sane-backends sqlite systemd + ] ++ lib.optionals enableDaemon [ + polkit ]; postInstall = '' diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 5b8c1c38c505..90fd78ed04c1 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -123,7 +123,12 @@ stdenv.mkDerivation rec { # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I # don't know why it is not properly detected cross building with glibc. "fu_cv_sys_stat_statfs2_bsize=yes" - ]; + ] + # /proc/uptime is available on Linux and produces accurate results even if + # the boot time is set to the epoch because the system has no RTC. We + # explicitly enable it for cases where it can't be detected automatically, + # such as when cross-compiling. + ++ optional stdenv.hostPlatform.isLinux "gl_cv_have_proc_uptime=yes"; # The tests are known broken on Cygwin # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), diff --git a/pkgs/tools/misc/fsrx/default.nix b/pkgs/tools/misc/fsrx/default.nix index 151d1eefa560..ad1ad389f1be 100644 --- a/pkgs/tools/misc/fsrx/default.nix +++ b/pkgs/tools/misc/fsrx/default.nix @@ -1,23 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform, gitUpdater, testers, fsrx }: +{ lib, fetchFromGitHub, rustPlatform, testers, fsrx }: rustPlatform.buildRustPackage rec { pname = "fsrx"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { - owner = "coloradocolby"; + owner = "thatvegandev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pKdxYO8Rhck3UYxqiWHDlrlPS4cAPe5jLUu5Dajop/k="; + sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA="; }; - cargoSha256 = "sha256-5h+ou9FLCG/WWMEQPsCTa1q+PovxUJs+6lzQ0L2bKIs="; + cargoSha256 = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y="; passthru = { - updateScript = gitUpdater { - inherit pname version; - rev-prefix = "v"; - }; tests.version = testers.testVersion { package = fsrx; }; @@ -25,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A flow state reader in the terminal"; - homepage = "https://github.com/coloradocolby/fsrx"; + homepage = "https://github.com/thatvegandev/fsrx"; license = licenses.mit; maintainers = with maintainers; [ MoritzBoehme ]; }; diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 606f06d3405c..051e98862bd2 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -88,12 +88,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/bin - '' + lib.optionalString (stdenv.isDarwin) '' - export DYLD_LIBRARY_PATH=$(pwd)/bin - ''; - excludedTests = lib.optionals stdenv.isDarwin [ "MFHDF_TEST-hdftest" "MFHDF_TEST-hdftest-shared" diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index d34282259026..76efc7667811 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -25,7 +25,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.12.1"; + version = "1.12.2"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/hdf5-${version}/src/hdf5-${version}.tar.bz2"; - sha256 = "sha256-qvn1MrPtqD09Otyfi0Cpt2MVIhj6RTScO8d1Asofjxw="; + sha256 = "sha256-Goi742ITos6gyDlyAaRZZD5xVcnckeBiZ1s/sH7jiv4="; }; passthru = { @@ -74,8 +74,6 @@ stdenv.mkDerivation rec { ++ optionals threadsafe [ "--enable-threadsafe" "--disable-hl" ]; patches = [ - ./bin-mv.patch - # Avoid non-determinism in autoconf build system: # - build time # - build user diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix new file mode 100644 index 000000000000..dcecbc903687 --- /dev/null +++ b/pkgs/tools/misc/mloader/default.nix @@ -0,0 +1,32 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "mloader"; + version = "1.1.8"; + + # PyPI tarball doesn't ship requirements.txt + src = fetchFromGitHub { + owner = "hurlenko"; + repo = "mloader"; + rev = version; + sha256 = "sha256-cZ9jaRrzzc5M7QYGuLxMv1J1mlfp/UEJ4dugTuJIQ/A="; + }; + + propagatedBuildInputs = with python3Packages; [ + click + protobuf + requests + ]; + + # No tests in repository + doCheck = false; + + pythonImportsCheck = [ "mloader" ]; + + meta = with lib; { + description = "Command-line tool to download manga from mangaplus"; + homepage = "https://github.com/hurlenko/mloader"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 9a6d03c6dcaf..806655ffe9f7 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -25,6 +25,12 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-F6Q4dUtfmR28VxLbITiLFJ44FjG4T1Cvuz3a0nLisMs="; name = "update_old_nixos_logo.patch"; }) + # https://github.com/dylanaraps/neofetch/pull/2157 + (fetchpatch { + url = "https://github.com/dylanaraps/neofetch/commit/de253afcf41bab441dc58d34cae654040cab7451.patch"; + sha256 = "sha256-3i7WnCWNfsRjbenTULmKHft5o/o176imzforNmuoJwo="; + name = "improve_detect_nixos_version.patch"; + }) ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix index a72b4e44aa45..78501bbf4827 100644 --- a/pkgs/tools/misc/pls/default.nix +++ b/pkgs/tools/misc/pls/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pls"; - version = "5.2.0"; + version = "5.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dhruvkb"; repo = "pls"; rev = version; - sha256 = "sha256-nmADeOVS5qdWsun36eKmeT4kYml0sTXYNa+YUiyNGQY="; + sha256 = "sha256-MtbOrdMTwnKRGlmiisHuGvQ6ScWbAAV8100ruO0MRvM="; }; nativeBuildInputs = [ python3.pkgs.poetry-core ]; diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index e667c988ca6f..d91f5fa36501 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txr"; - version = "275"; + version = "278"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "sha256-HmykTyh5F49CBa1w7o/HV6Q5Lsx1Qkxe0JBHQdGxVB4="; + sha256 = "sha256-RwPdDQGFL851eegQfMb8xHxC8AP39heSIALXjp/5/cw="; }; buildInputs = [ libffi ]; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; homepage = "http://nongnu.org/txr"; maintainers = with lib.maintainers; [ dtzWill ]; - platforms = platforms.linux; # Darwin fails although it should work AFAIK + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 32d5b5712da8..bc4e6b7a4675 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "you-get"; - version = "0.4.1612"; + version = "0.4.1620"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-lKEztwwn1pnALuwDiA1Ik9+XCVyO+UMobv+hXu0mn5w="; + sha256 = "sha256-wCDaT9Nz1ZiSsqFwX1PXHq6QF6fjLRI9wwvvWxcmYOY="; }; patches = [ @@ -39,6 +39,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A tiny command line utility to download media contents from the web"; homepage = "https://you-get.org"; + changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ryneeverett ]; }; diff --git a/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch b/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch deleted file mode 100644 index c68f9f1d84df..000000000000 --- a/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/lib/vquic/quiche.c b/lib/vquic/quiche.c -index bfdc966a85ea..e4bea4d677be 100644 ---- a/lib/vquic/quiche.c -+++ b/lib/vquic/quiche.c -@@ -201,23 +201,31 @@ static SSL_CTX *quic_ssl_ctx(struct Curl_easy *data) - - { - struct connectdata *conn = data->conn; -- const char * const ssl_cafile = conn->ssl_config.CAfile; -- const char * const ssl_capath = conn->ssl_config.CApath; -- - if(conn->ssl_config.verifypeer) { -- SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); -- /* tell OpenSSL where to find CA certificates that are used to verify -- the server's certificate. */ -- if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { -- /* Fail if we insist on successfully verifying the server. */ -- failf(data, "error setting certificate verify locations:" -- " CAfile: %s CApath: %s", -- ssl_cafile ? ssl_cafile : "none", -- ssl_capath ? ssl_capath : "none"); -- return NULL; -+ const char * const ssl_cafile = conn->ssl_config.CAfile; -+ const char * const ssl_capath = conn->ssl_config.CApath; -+ if(ssl_cafile || ssl_capath) { -+ SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); -+ /* tell OpenSSL where to find CA certificates that are used to verify -+ the server's certificate. */ -+ if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { -+ /* Fail if we insist on successfully verifying the server. */ -+ failf(data, "error setting certificate verify locations:" -+ " CAfile: %s CApath: %s", -+ ssl_cafile ? ssl_cafile : "none", -+ ssl_capath ? ssl_capath : "none"); -+ return NULL; -+ } -+ infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); -+ infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); - } -- infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); -- infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); -+#ifdef CURL_CA_FALLBACK -+ else { -+ /* verifying the peer without any CA certificates won't work so -+ use openssl's built-in default as fallback */ -+ SSL_CTX_set_default_verify_paths(ssl_ctx); -+ } -+#endif - } - } - return ssl_ctx; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index cc7fd0c3a850..44f0918bd209 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -33,6 +33,8 @@ , ocamlPackages , phpExtensions , python3 +, tests +, fetchpatch }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -44,23 +46,20 @@ assert !(gnutlsSupport && opensslSupport); assert !(gnutlsSupport && wolfsslSupport); assert !(opensslSupport && wolfsslSupport); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "7.83.1"; + version = "7.84.0"; src = fetchurl { urls = [ - "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" - "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" + "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" + "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" ]; - sha256 = "sha256-9Tmjb7RKgmDsXZd+Tg290u7intkPztqpvDyfeKETv/A="; + sha256 = "sha256-cC+ybnMZCjvXcHGqFG9Qe5gXzE384hjSq4fwDNO8BZ0="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch - # quiche: support ca-fallback - # https://github.com/curl/curl/commit/fdb5e21b4dd171a96cf7c002ee77bb08f8e58021 - ./7.83.1-quiche-support-ca-fallback.patch ] ++ lib.optional patchNetrcRegression ./netrc-regression.patch; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -135,7 +134,10 @@ stdenv.mkDerivation rec { CXX = "${stdenv.cc.targetPrefix}c++"; CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; - doCheck = true; + # takes 14 minutes on a 24 core and because many other packages depend on curl + # they cannot be run concurrently and are a bottleneck + # tests are available in passthru.tests.withCheck + doCheck = false; preCheck = '' patchShebangs tests/ '' + lib.optionalString stdenv.isDarwin '' @@ -160,16 +162,23 @@ stdenv.mkDerivation rec { ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4.4.0 ''; - passthru = { + passthru = let + useThisCurl = attr: attr.override { curl = finalAttrs.finalPackage; }; + in { inherit opensslSupport openssl; tests = { - inherit curlpp coeurl; - haskell-curl = haskellPackages.curl; - ocaml-curly = ocamlPackages.curly; - php-curl = phpExtensions.curl; - pycurl = python3.pkgs.pycurl; + withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + fetchpatch = tests.fetchpatch.simple.override { fetchpatch = fetchpatch.override { fetchurl = useThisCurl fetchurl; }; }; + curlpp = useThisCurl curlpp; + coeurl = useThisCurl coeurl; + haskell-curl = useThisCurl haskellPackages.curl; + ocaml-curly = useThisCurl ocamlPackages.curly; + pycurl = useThisCurl python3.pkgs.pycurl; + php-curl = useThisCurl phpExtensions.curl; + # error: attribute 'override' missing # Additional checking with support http3 protocol. - inherit (nixosTests) nginx-http3; + # nginx-http3 = useThisCurl nixosTests.nginx-http3; + nginx-http3 = nixosTests.nginx-http3; }; }; @@ -182,4 +191,4 @@ stdenv.mkDerivation rec { # Fails to link against static brotli or gss broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); }; -} +}) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 36623c021f6d..68c3dc6b99cd 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.18.0"; + version = "0.18.1"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-cxdbXhj79xp5jT5xY3cIzt5XYndPC+TWIrxBjAvbP0g="; + sha256 = "sha256-l0W896miwnILQo3VWozV1aMNZoSerydUzWltl7D9y1E="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 0584184a675e..3ad9161c716b 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; - cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; + cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; postInstall = '' cp lib/* $out/lib diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 2de900483f09..68e72171eca4 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -16,18 +16,13 @@ let then mkDerivation else stdenv.mkDerivation; - mkFlag = pfxTrue: pfxFalse: cond: name: - "--${if cond then pfxTrue else pfxFalse}-${name}"; - mkEnable = mkFlag "enable" "disable"; - mkWith = mkFlag "with" "without"; - - mkEnablePinentry = f: + enableFeaturePinentry = f: let info = flavorInfo.${f}; flag = flavorInfo.${f}.flag or null; in optionalString (flag != null) - (mkEnable (elem f enabledFlavors) ("pinentry-" + flag)); + (enableFeature (elem f enabledFlavors) ("pinentry-" + flag)); flavorInfo = { curses = { bin = "curses"; flag = "curses"; buildInputs = [ ncurses ]; }; @@ -68,9 +63,9 @@ pinentryMkDerivation rec { ]; configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkEnable (libsecret != null) "libsecret") - ] ++ (map mkEnablePinentry (attrNames flavorInfo)); + (withFeature (libcap != null) "libcap") + (enableFeature (libsecret != null) "libsecret") + ] ++ (map enableFeaturePinentry (attrNames flavorInfo)); postInstall = concatStrings (flip map enabledFlavors (f: diff --git a/pkgs/tools/security/wafw00f/default.nix b/pkgs/tools/security/wafw00f/default.nix index 0e363b608fd4..55d4b7591e38 100644 --- a/pkgs/tools/security/wafw00f/default.nix +++ b/pkgs/tools/security/wafw00f/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wafw00f"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "EnableSecurity"; repo = pname; - rev = "v${version}"; - sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/tools/security/yubihsm-shell/default.nix index 06a1452400de..2533e0c78709 100644 --- a/pkgs/tools/security/yubihsm-shell/default.nix +++ b/pkgs/tools/security/yubihsm-shell/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { openssl ]; - cmakeFlags = [ - # help2man fails without this - "-DCMAKE_SKIP_BUILD_RPATH=OFF" - ]; - postPatch = '' # Can't find libyubihsm at runtime because of dlopen() in C code substituteInPlace lib/yubihsm.c \ diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index c0894f31a012..6876d441c52e 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -9,9 +9,6 @@ }: with lib; -let - mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; -in stdenv.mkDerivation rec { pname = "rsyslog"; version = "8.2204.1"; @@ -36,72 +33,72 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-systemdsystemunitdir=\${out}/etc/systemd/system" - (mkFlag true "largefile") - (mkFlag true "regexp") - (mkFlag (libkrb5 != null) "gssapi-krb5") - (mkFlag true "klog") - (mkFlag true "kmsg") - (mkFlag (systemd != null) "imjournal") - (mkFlag true "inet") - (mkFlag (jemalloc != null) "jemalloc") - (mkFlag true "unlimited-select") - (mkFlag false "debug") - (mkFlag false "debug-symbols") - (mkFlag true "debugless") - (mkFlag false "valgrind") - (mkFlag false "diagtools") - (mkFlag true "usertools") - (mkFlag (libmysqlclient != null) "mysql") - (mkFlag (postgresql != null) "pgsql") - (mkFlag (libdbi != null) "libdbi") - (mkFlag (net-snmp != null) "snmp") - (mkFlag (libuuid != null) "uuid") - (mkFlag (curl != null) "elasticsearch") - (mkFlag (gnutls != null) "gnutls") - (mkFlag (libgcrypt != null) "libgcrypt") - (mkFlag true "rsyslogrt") - (mkFlag true "rsyslogd") - (mkFlag true "mail") - (mkFlag (liblognorm != null) "mmnormalize") - (mkFlag (libmaxminddb != null) "mmdblookup") - (mkFlag true "mmjsonparse") - (mkFlag true "mmaudit") - (mkFlag true "mmanon") - (mkFlag true "mmutf8fix") - (mkFlag true "mmcount") - (mkFlag true "mmsequence") - (mkFlag true "mmfields") - (mkFlag true "mmpstrucdata") - (mkFlag (openssl != null) "mmrfc5424addhmac") - (mkFlag (librelp != null) "relp") - (mkFlag (libksi != null) "ksi-ls12") - (mkFlag (liblogging != null) "liblogging-stdlog") - (mkFlag (liblogging != null) "rfc3195") - (mkFlag true "imfile") - (mkFlag false "imsolaris") - (mkFlag true "imptcp") - (mkFlag true "impstats") - (mkFlag true "omprog") - (mkFlag (libnet != null) "omudpspoof") - (mkFlag true "omstdout") - (mkFlag (systemd != null) "omjournal") - (mkFlag true "pmlastmsg") - (mkFlag true "pmcisconames") - (mkFlag true "pmciscoios") - (mkFlag true "pmaixforwardedfrom") - (mkFlag true "pmsnare") - (mkFlag true "omruleset") - (mkFlag true "omuxsock") - (mkFlag true "mmsnmptrapd") - (mkFlag (hadoop != null) "omhdfs") - (mkFlag (rdkafka != null) "omkafka") - (mkFlag (libmongo-client != null) "ommongodb") - (mkFlag (czmq != null) "imczmq") - (mkFlag (czmq != null) "omczmq") - (mkFlag (rabbitmq-c != null) "omrabbitmq") - (mkFlag (hiredis != null) "omhiredis") - (mkFlag (curl != null) "omhttpfs") - (mkFlag true "generate-man-pages") + (enableFeature true "largefile") + (enableFeature true "regexp") + (enableFeature (libkrb5 != null) "gssapi-krb5") + (enableFeature true "klog") + (enableFeature true "kmsg") + (enableFeature (systemd != null) "imjournal") + (enableFeature true "inet") + (enableFeature (jemalloc != null) "jemalloc") + (enableFeature true "unlimited-select") + (enableFeature false "debug") + (enableFeature false "debug-symbols") + (enableFeature true "debugless") + (enableFeature false "valgrind") + (enableFeature false "diagtools") + (enableFeature true "usertools") + (enableFeature (libmysqlclient != null) "mysql") + (enableFeature (postgresql != null) "pgsql") + (enableFeature (libdbi != null) "libdbi") + (enableFeature (net-snmp != null) "snmp") + (enableFeature (libuuid != null) "uuid") + (enableFeature (curl != null) "elasticsearch") + (enableFeature (gnutls != null) "gnutls") + (enableFeature (libgcrypt != null) "libgcrypt") + (enableFeature true "rsyslogrt") + (enableFeature true "rsyslogd") + (enableFeature true "mail") + (enableFeature (liblognorm != null) "mmnormalize") + (enableFeature (libmaxminddb != null) "mmdblookup") + (enableFeature true "mmjsonparse") + (enableFeature true "mmaudit") + (enableFeature true "mmanon") + (enableFeature true "mmutf8fix") + (enableFeature true "mmcount") + (enableFeature true "mmsequence") + (enableFeature true "mmfields") + (enableFeature true "mmpstrucdata") + (enableFeature (openssl != null) "mmrfc5424addhmac") + (enableFeature (librelp != null) "relp") + (enableFeature (libksi != null) "ksi-ls12") + (enableFeature (liblogging != null) "liblogging-stdlog") + (enableFeature (liblogging != null) "rfc3195") + (enableFeature true "imfile") + (enableFeature false "imsolaris") + (enableFeature true "imptcp") + (enableFeature true "impstats") + (enableFeature true "omprog") + (enableFeature (libnet != null) "omudpspoof") + (enableFeature true "omstdout") + (enableFeature (systemd != null) "omjournal") + (enableFeature true "pmlastmsg") + (enableFeature true "pmcisconames") + (enableFeature true "pmciscoios") + (enableFeature true "pmaixforwardedfrom") + (enableFeature true "pmsnare") + (enableFeature true "omruleset") + (enableFeature true "omuxsock") + (enableFeature true "mmsnmptrapd") + (enableFeature (hadoop != null) "omhdfs") + (enableFeature (rdkafka != null) "omkafka") + (enableFeature (libmongo-client != null) "ommongodb") + (enableFeature (czmq != null) "imczmq") + (enableFeature (czmq != null) "omczmq") + (enableFeature (rabbitmq-c != null) "omrabbitmq") + (enableFeature (hiredis != null) "omhiredis") + (enableFeature (curl != null) "omhttpfs") + (enableFeature true "generate-man-pages") ]; passthru.tests = { diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index fbff68abb692..193c541cfab0 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -13,13 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; - # let intermediate tools find intermediate library - preBuild = lib.optionalString stdenv.isLinux '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/src - '' + lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$(pwd)/src - ''; - meta = with lib; { homepage = "https://github.com/BYVoid/OpenCC"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c8af61fe2f2..e9445d0f3093 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8621,6 +8621,8 @@ with pkgs; mktorrent = callPackage ../tools/misc/mktorrent { }; + mloader = callPackage ../tools/misc/mloader { }; + mmake = callPackage ../tools/misc/mmake { }; mmixware = callPackage ../development/tools/mmixware { }; @@ -9705,6 +9707,8 @@ with pkgs; pngquant = callPackage ../tools/graphics/pngquant { }; + po4a = perlPackages.Po4a; + podiff = callPackage ../tools/text/podiff { }; podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; @@ -12028,7 +12032,9 @@ with pkgs; wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; - wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { }; + wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { + libjpeg8 = libjpeg.override { enableJpeg8 = true; }; + }; wml = callPackage ../development/web/wml { }; @@ -14010,18 +14016,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_61 = callPackage ../development/compilers/rust/1_61.nix { + rust_1_62 = callPackage ../development/compilers/rust/1_62.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_14 = llvmPackages_14.libllvm; }; - rust = rust_1_61; + rust = rust_1_62; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; }; - rustPackages_1_61 = rust_1_61.packages.stable; - rustPackages = rustPackages_1_61; + rustPackages_1_62 = rust_1_62.packages.stable; + rustPackages = rustPackages_1_62; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -14912,7 +14918,9 @@ with pkgs; inherit (ocamlPackages) reason; - buildRubyGem = callPackage ../development/ruby-modules/gem { }; + buildRubyGem = callPackage ../development/ruby-modules/gem { + inherit (darwin) libobjc; + }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { inherit (darwin) DarwinTools cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -15733,7 +15741,9 @@ with pkgs; binutils = binutils; }; - dive = callPackage ../development/tools/dive { }; + dive = callPackage ../development/tools/dive { + buildGoModule = buildGo117Module; + }; doclifter = callPackage ../development/tools/misc/doclifter { }; @@ -24467,6 +24477,7 @@ with pkgs; nlsSupport = false; ncursesSupport = false; systemdSupport = false; + translateManpages = false; } else util-linux; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; @@ -34371,6 +34382,8 @@ with pkgs; cernlib = callPackage ../development/libraries/physics/cernlib { }; + clhep = callPackage ../development/libraries/physics/clhep { }; + hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; hepmc3 = callPackage ../development/libraries/physics/hepmc3 { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 41c507a1aed6..ce3af252abc7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -66,8 +66,8 @@ lib.makeScope pkgs.newScope (self: with self; { # # Build inputs is used for extra deps that may be needed. And zendExtension # will mark the extension as a zend extension or not. - mkExtension = - { name + mkExtension = lib.makeOverridable + ({ name , configureFlags ? [ "--enable-${name}" ] , internalDeps ? [ ] , postPhpize ? "" @@ -151,7 +151,7 @@ lib.makeScope pkgs.newScope (self: with self; { description = "PHP upstream extension: ${name}"; inherit (php.meta) maintainers homepage license; }; - }); + })); php = phpPackage;