diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 28fee5b61a438..1a1840a2702e3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -48,11 +48,11 @@ "vendorHash": "sha256-byReViTX0KRFVgWMkte00CDB/3Mw8Ov5GyD48sENmIA=" }, "alicloud": { - "hash": "sha256-4f29+7irL+6uNTEFnUu46LGz4aBDwortClCZ0+EDZ4Q=", + "hash": "sha256-VGrMkgX7WmIz7v0+D1OPYerslVueGw5XRBtWebLrkQk=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.193.1", + "rev": "v1.194.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -75,13 +75,13 @@ "vendorHash": null }, "argocd": { - "hash": "sha256-yWhq2WolfL7PQVuWr5P7EH0cM78wGyL2+yezh2WzL2c=", + "hash": "sha256-8gyNJrRmrLev53dmMMjpZ3COTwPg5FYaxYBgkrdAWXo=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v4.1.0", + "rev": "v4.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=" + "vendorHash": "sha256-U88K2CZcN7xh1rPmkZpbRWgj3+lPKN7hkB9T60jR1JQ=" }, "auth0": { "hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=", @@ -442,24 +442,24 @@ "vendorHash": "sha256-QAFx/Ew86T4LWJ6ZtJTUWwR5rGunWj0E5Vzt++BN9ks=" }, "google": { - "hash": "sha256-VqQK6NifhilmnJL5L4EHmmeFWZPBmQhoUl3mz8igSck=", + "hash": "sha256-EKPXlEpZVcQ0r97Um3kX8YZneaoKJrY76414hC5+1iA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.45.0", + "rev": "v4.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nwA+OD0gtnV5di43wgH1OZp/RngLvnVRAuKQxsxnlLw=" + "vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA=" }, "google-beta": { - "hash": "sha256-/fdgwdIIFHLEMeqsWashkQJlIoFU86ZmsbA4pX18FhE=", + "hash": "sha256-4ksd2LPAG6GeEexeThy4FnzTcDwDo753FP+02pCoyFU=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.45.0", + "rev": "v4.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nwA+OD0gtnV5di43wgH1OZp/RngLvnVRAuKQxsxnlLw=" + "vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -471,13 +471,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-DAuG1VYLYr3cz+PR5wNlPBKuUcnbYAO0d9tNxnBiGuU=", + "hash": "sha256-eDrLyLlK/6zigBW7IW+w4FtHP5eW82zo2+Ow55H0SKc=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.31.1", + "rev": "v1.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4PrQW8h8EtX7hvSh2nzvA4EHwb2AhZqSLhrXlRrq8Lo=" + "vendorHash": "sha256-s6VwvxHXny5gCrbxiRI3F7w3HR3lq2NeiHZgTiU37m0=" }, "gridscale": { "hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=", @@ -888,11 +888,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=", + "hash": "sha256-2qOFrNwBFp30gLR9pFEaByx1vD8TZUayISaKZ7fytZo=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.4", + "rev": "v2.7.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 05eff6e82e592..7f2e9ccf0062e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.21"; + stable = "0.0.22"; ptb = "0.0.38"; canary = "0.0.145"; } else { @@ -14,7 +14,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "KDKUssPRrs/D10s5GhJ23hctatQmyqd27xS9nU7iNaM="; + sha256 = "sha256-F1xzdx4Em6Ref7HTe9EH7whx49iFc0DFpaQKdFquq6c="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 0b246125ffe74..6d955128cb124 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,7 +1,7 @@ { pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook , makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf -, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 +, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib gtk3 + libglvnd libnotify libX11 libXcomposite @@ -96,7 +97,7 @@ stdenv.mkDerivation rec { wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ --run "${lib.getExe disableBreakingUpdates}" diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 2c8d36a4df6b5..22d9ada544c85 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-P9LwgEUz8QgUVQYISIx3Sa8ibFxNTGNNO5Vn014UB88="; + sha256 = "sha256-1wtpbwTO8MdEvcdo5ImNuiNOtyPfaKFpr2Rezac4ofU="; }; doCheck = false; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 7547d6d4051e5..699103b98f5d8 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,28 +1,31 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, webfs }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-2eEuKAMxxTwjDInpYcOlFJha5DTe0IrxT5rI6ymN0hc="; + sha256 = "sha256-XslMwA1DhztK9DPNCucUpzjCQXz6PN8ml8JBvKtJeqg="; }; - cargoSha256 = "sha256-nJM7/w4awbCZQysUOSTO6bfsBXO3agJRdp1RyRZhtUY="; - - # remove timeouts in tests to make them less flaky - patches = [ ./tests-no-timeout.patch ]; + cargoSha256 = "sha256-KxwBF5t8lcaH8ZD4SorIBiq7p6r9LGHfEOyNXtB9HJw="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + checkInputs = [ webfs ]; + + # remove timeouts in tests to make them less flaky + TEST_SRVC_DISABLE_TIMEOUT = 1; + meta = with lib; { description = "Sysrev version control"; homepage = "https://github.com/insilica/rs-srvc"; + changelog = "https://github.com/insilica/rs-srvc/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ john-shaffer ]; mainProgram = "sr"; diff --git a/pkgs/applications/version-management/srvc/tests-no-timeout.patch b/pkgs/applications/version-management/srvc/tests-no-timeout.patch deleted file mode 100644 index d353b9e5f44b1..0000000000000 --- a/pkgs/applications/version-management/srvc/tests-no-timeout.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/tests/common/mod.rs -+++ b/tests/common/mod.rs -@@ -1,15 +1,13 @@ - #![allow(dead_code)] - - use std::path::PathBuf; --use std::time::Duration; - - use assert_cmd::Command; - #[cfg(unix)] - use rexpect::session::PtySession; - --pub fn cmd(timeout_millis: u64) -> Command { -+pub fn cmd(_: u64) -> Command { - let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap(); -- cmd.timeout(Duration::from_millis(timeout_millis)); - cmd.env_remove("RUST_BACKTRACE"); - cmd - } -@@ -19,14 +17,14 @@ pub fn spawn( - dir: &str, - args: Vec<&str>, - timestamp_override: u64, -- timeout_millis: u64, -+ _: u64, - ) -> Result { - let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_sr")); - cmd.args(args); - cmd.current_dir(dir); - cmd.env("SR_TIMESTAMP_OVERRIDE", timestamp_override.to_string()); - cmd.env_remove("RUST_BACKTRACE"); -- Ok(rexpect::session::spawn_command(cmd, Some(timeout_millis))?) -+ rexpect::session::spawn_command(cmd, None) - } - - pub fn remove_sink(dir: &str) -> Result<(), std::io::Error> { diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index e77fe067670f8..6c267aad77eb8 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -28,13 +28,6 @@ , wxGTK , zlib -, CoreText -, CoreFoundation -, AppKit -, Carbon -, IOKit -, Cocoa - , spellcheckSupport ? true , hunspell ? null @@ -51,6 +44,7 @@ , portaudio ? null , useBundledLuaJIT ? false +, darwin }: assert spellcheckSupport -> (hunspell != null); @@ -62,6 +56,7 @@ assert portaudioSupport -> (portaudio != null); let luajit52 = luajit.override { enable52Compat = true; }; inherit (lib) optional; + inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa; in stdenv.mkDerivation rec { pname = "aegisub"; diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index ee09ee4322940..fe6ac234cc140 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "6.8.22+matrix.1"; + version = "6.8.23+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "V1ALhD0zLm6Rq2KFpZXULPiB7sAPaNDhCpxScr+apDE="; + sha256 = "GIPgw1exAgw/D5vNpQQkUnTye66jfLLI5/asrthEDPQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index da5e6366fb61e..88204a47365a2 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -17,7 +17,6 @@ , lua , libuchardet , libiconv -, CoreFoundation, Cocoa, CoreAudio, MediaPlayer , xcbuild , waylandSupport ? stdenv.isLinux @@ -75,11 +74,12 @@ , xineramaSupport ? stdenv.isLinux, libXinerama , xvSupport ? stdenv.isLinux, libXv , zimgSupport ? true, zimg +, darwin }: let + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); - in stdenv.mkDerivation rec { pname = "mpv"; version = "0.35.0"; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index c3bb4c7ff016d..acd889ce85b89 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.6"; + version = "0.15.7"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -26,12 +26,12 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "14l4m9xgp9slg4hfaqkwvzdvmg26qj2livldni3lmivvcagjgb2x"; + sha256 = "0aq5sr93z6c5l76sqbj3g48z6yrhxfqxri0x1ajmjwhcwjg79d6v"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1vw3igxv4zr5gf1ml5ls17w9cc9shdn8fvbk6dkfnxrs93cwrq0k"; + sha256 = "032jqrk46k9zbq058ms8rnrq0209rd8vkxwj73vqrlgqvpzlfl5k"; }; diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 46d6180eb1dcc..b6554979c7ee4 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -5,13 +5,15 @@ , doxygen , freeglut , freetype -, GLUT , libGL , libGLU -, OpenGL , pkg-config +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; +in stdenv.mkDerivation rec { pname = "ftgl"; version = "2.4.0"; diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index 72d21ed0d2c45..b09e7dcb739ac 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -1,4 +1,5 @@ { stdenv +, fetchpatch , fetchFromGitLab , cmake , ninja @@ -25,6 +26,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc="; }; + patches = [ + # Fixed upstream, remove when the new version releases: + # https://gitlab.com/inkscape/lib2geom/-/issues/49 + (fetchpatch { + name = "expect-double-eq-in-choose-test.patch"; + url = "https://gitlab.com/inkscape/lib2geom/-/commit/5b7c75dd3841cb415f163f0a81f556c57d3e0a83.patch"; + sha256 = "RMgwJkylrGFTTrqBzqs5j2LMSLsHhcE/UT1pKBZnU50="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index f5672167336ec..52f6d679b99fd 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,10 +7,12 @@ , pango , pkg-config , wxGTK -# darwin deps -, Cocoa +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "wxSVG"; version = "1.5.24"; diff --git a/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch b/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch new file mode 100644 index 0000000000000..7da8ab1b2e9b0 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch @@ -0,0 +1,15 @@ +diff -ru a/absl/base/config.h b/absl/base/config.h +--- a/absl/base/config.h ++++ b/absl/base/config.h +@@ -558,9 +558,9 @@ + __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 50000) || \ + (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && \ + __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 120000)))) +-#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1 ++// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1 + #else +-#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0 ++// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0 + #endif + + // ABSL_HAVE_STD_ANY diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 1fb3d070beb07..39461fd7953db 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -168,7 +168,7 @@ let ''; }; bazel-build = if stdenv.isDarwin then _bazel-build.overrideAttrs (prev: { - bazelBuildFlags = prev.bazelBuildFlags ++ [ + bazelFlags = prev.bazelFlags ++ [ "--override_repository=rules_cc=${rules_cc_darwin_patched}" "--override_repository=llvm-raw=${llvm-raw_darwin_patched}" ]; @@ -311,6 +311,8 @@ let # bazel 3.3 should work just as well as bazel 3.1 rm -f .bazelversion patchShebangs . + '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' + cat ${./com_google_absl_fix_macos.patch} >> third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch '' + lib.optionalString (!withTensorboard) '' # Tensorboard pulls in a bunch of dependencies, some of which may # include security vulnerabilities. So we make it optional. @@ -375,7 +377,7 @@ let then "sha256-SudzMTxfifKJJso6haCgOD2dXeAhYSXHA2nzq1ErTHg=" else "sha256-bwZwK24DlUevN5gIdKmBkq1dJpn0i2H4hq+IN77BzjE="; aarch64-linux = "sha256-ZbCNZSHF9of+KGTNEqFdKQ44MVNto/rTyo2XEsKXISg="; - x86_64-darwin = "sha256-/qPUDgfKsWCZh/pgZM4wm9+4U9U5kxxv7q3Uh7zKSO4="; + x86_64-darwin = "sha256-ZfZQjLdqo8VVlfKfkdolvSHQvKe4IbQSLc/4cNzHr3E="; aarch64-darwin = "sha256-u+ODHAZDlGe06PUWId4sNKyl60vhAPMd01jMm2EvN8E="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; @@ -424,7 +426,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; - broken = !(xlaSupport -> cudaSupport) || (stdenv.hostPlatform.system == "x86_64-darwin"); + broken = !(xlaSupport -> cudaSupport); } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7f0d94a9f30ee..0a1e191ba360c 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,37 +1,40 @@ { lib , stdenv +, fetchurl , buildPackages , bzip2 , curlMinimal , expat -, fetchurl , libarchive , libuv , ncurses , openssl , pkg-config -, qtbase +, ps , rhash , sphinx , texinfo -, wrapQtAppsHook , xz , zlib -, SystemConfiguration -, ps , isBootstrap ? false , useOpenSSL ? !isBootstrap , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , uiToolkits ? [] # can contain "ncurses" and/or "qt5" , buildDocs ? !(isBootstrap || (uiToolkits == [])) +, darwin +, libsForQt5 }: let + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + inherit (libsForQt5) qtbase wrapQtAppsHook; cursesUI = lib.elem "ncurses" uiToolkits; qt5UI = lib.elem "qt5" uiToolkits; in # Accepts only "ncurses" and "qt5" as possible uiToolkits assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == []; +# Minimal, bootstrap cmake does not have toolkits +assert isBootstrap -> (uiToolkits == []); stdenv.mkDerivation rec { pname = "cmake" + lib.optionalString isBootstrap "-boot" diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm-cmake/default.nix similarity index 62% rename from pkgs/development/tools/cpm/default.nix rename to pkgs/development/tools/cpm-cmake/default.nix index 1d5bdc3b694ff..9689df362aa87 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm-cmake/default.nix @@ -1,25 +1,28 @@ { lib , stdenvNoCC -, fetchurl +, fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { - pname = "cpm"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cpm-cmake"; version = "0.36.0"; - src = fetchurl { - url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; - sha256 = "sha256-F5YA1Z8OdSihipjo7QhqIZMKBcvm9WyfJ5l4WZwW9Cc="; + src = fetchFromGitHub { + owner = "cpm-cmake"; + repo = "cpm.cmake"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XI3yDBhmglQnIe/t6sfL9WxaclqtOgE1kDmocQL+xnA="; }; - dontUnpack = true; dontConfigure = true; dontBuild = true; installPhase = '' runHook preInstall - install -Dm644 $src $out/share/cpm/CPM.cmake + mkdir -p $out/share/{,doc/}cpm + install -Dm644 cmake/CPM.cmake $out/share/cpm/CPM.cmake + install -Dm644 README.md CONTRIBUTING.md $out/share/doc/cpm/ runHook postInstall ''; @@ -37,4 +40,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ ken-matsui ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 203178eed8d87..1171700ff99ed 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.31.0"; + version = "0.32.0"; pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; repo = "geckodriver"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sUu1D3HAxUTQFas4ylQ9LYC0dcKPyljoU+keENg17os="; + sha256 = "sha256-gYDfCPA2zsscZ4r4FcNgCvIMMm13/HACTvNoiK/c+LA="; }; - cargoSha256 = "sha256-alwsxC1xDAAhqMTkgmUO4iDDUAK0lisXn3Yxgo7ZBhg="; + cargoSha256 = "sha256-FlttmNHh0UVQ6xbo1eID+Ys34xp6zvKab4eoKIGujCU="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 5ab050d5de5b6..067aedf9882ab 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-xoZVo+JEOXaME7gE9PuTfNmAyVTgczNuSzA4zYAfUmc="; + sha256 = "sha256-uL6GPi+dcPkSAaGt1Fv2cJT3Q8nJaxqs8b5w9PFJm9g="; }; vendorSha256 = "sha256-a8NZ9Uws6OKfXWUL6oTZKoAG8pTYxxSNkefZtbqwyf4="; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 99d3eb61e43f6..69f0c4b814daf 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-IBvSuyr3ERfPIivw6sEJSRta07Awmwd47cV1iKmvt8A="; + sha256 = "sha256-vMmbed2UOe/N8V7LbvYm7BbOOHD69qaizkYf66VCZMs="; }; - cargoSha256 = "sha256-zX3lBNQVWBrVQh+02TDUqU7Xmbd7hBOzJxD7cSNTNR0="; + cargoSha256 = "sha256-xo3EUDWoE1OFTaA9y3ymGA/l2fwNqnPBLpNc8xyjasY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 4d3aec01439f9..d7a2e5d1f5fec 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, wxGTK32, Cocoa }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, SDL2 +, wxGTK32 +, darwin +}: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation { pname = "sound-of-sorting"; version = "unstable-2022-10-12"; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 4431283f40d58..c6ee509df3581 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -34,14 +34,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.4"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.6"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-zmyn9hotkePRap9qVzAZi1u4YuiT+Qt+IDh7TD0Yq9A="; + hash = "sha256-3zB0Uy2pmkrOLb+/mXZGs/pnzo6zi2zVPyeNPGPVQJM="; }; nativeBuildInputs = [ @@ -61,7 +61,6 @@ with py.pkgs; buildPythonApplication rec { pyyaml rsa ruamel-yaml - wcwidth python-dateutil jmespath urllib3 @@ -77,8 +76,6 @@ with py.pkgs; buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace "colorama>=0.2.5,<0.4.4" "colorama" \ --replace "distro>=1.5.0,<1.6.0" "distro" \ - --replace "docutils>=0.10,<0.16" "docutils" \ - --replace "wcwidth<0.2.0" "wcwidth" \ --replace "cryptography>=3.3.2,<=38.0.1" "cryptography>=3.3.2,<=38.0.3" ''; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index b4a277eeec4e5..b1f963e807f05 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,10 +1,14 @@ { lib, stdenv, fetchFromGitHub , fontconfig, freetype, libX11, libXext, libXt, xorgproto -, Carbon, Cocoa, IOKit, Metal, QuartzCore, DarwinTools , perl # For building web manuals , which, ed +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore; + inherit (darwin) DarwinTools; +in stdenv.mkDerivation rec { pname = "plan9port"; version = "2022-09-12"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ba455414e695..198f7deed5c03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -434,7 +434,7 @@ with pkgs; cp437 = callPackage ../tools/misc/cp437 { }; - cpm = callPackage ../development/tools/cpm { }; + cpm-cmake = callPackage ../development/tools/cpm-cmake { }; cpu-x = callPackage ../applications/misc/cpu-x { }; @@ -1201,7 +1201,6 @@ with pkgs; aegisub = callPackage ../applications/video/aegisub ({ wxGTK = wxGTK32; - inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa; } // (config.aegisub or {})); aerc = callPackage ../applications/networking/mailreaders/aerc { }; @@ -7247,9 +7246,7 @@ with pkgs; frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; - ftgl = callPackage ../development/libraries/ftgl { - inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; - }; + ftgl = callPackage ../development/libraries/ftgl { }; ftop = callPackage ../os-specific/linux/ftop { }; @@ -10631,10 +10628,7 @@ with pkgs; plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = callPackage ../tools/system/plan9port { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore; - inherit (darwin) DarwinTools; - }; + plan9port = callPackage ../tools/system/plan9port { }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv; @@ -16953,18 +16947,11 @@ with pkgs; ctmg = callPackage ../tools/security/ctmg { }; - cmake = callPackage ../development/tools/build-managers/cmake { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - inherit (libsForQt5) qtbase wrapQtAppsHook; - }; + cmake = callPackage ../development/tools/build-managers/cmake { }; + # can't use override - it triggers infinite recursion cmakeMinimal = callPackage ../development/tools/build-managers/cmake { isBootstrap = true; - qtbase = null; - wrapQtAppsHook = null; - # There is no SystemConfiguration in bootstrapTools, so this version gets - # patched to remove that dependency. - SystemConfiguration = null; }; cmakeCurses = cmake.override { @@ -23180,7 +23167,6 @@ with pkgs; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30; - inherit (darwin.apple_sdk.frameworks) Cocoa; }; wtk = callPackage ../development/libraries/wtk { }; @@ -30720,7 +30706,6 @@ with pkgs; mpv-unwrapped = callPackage ../applications/video/mpv { inherit lua; - inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; }; # Wraps without trigerring a rebuild @@ -37367,9 +37352,7 @@ with pkgs; soundmodem = callPackage ../applications/radio/soundmodem {}; - soundOfSorting = callPackage ../misc/sound-of-sorting { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + soundOfSorting = callPackage ../misc/sound-of-sorting { }; sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags;