diff options
Diffstat (limited to 'pkgs')
102 files changed, 868 insertions, 2938 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json index 746ec60669dfc..1cfa52fed5b58 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json +++ b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json @@ -1,5 +1,4 @@ [ - "tree-sitter-agda", "tree-sitter-bash", "tree-sitter-c", "tree-sitter-c-sharp", @@ -7,11 +6,11 @@ "tree-sitter-css", "tree-sitter-elixir", "tree-sitter-elm", - "tree-sitter-fluent", "tree-sitter-go", "tree-sitter-haskell", "tree-sitter-hcl", "tree-sitter-html", + "tree-sitter-janet-simple", "tree-sitter-java", "tree-sitter-javascript", "tree-sitter-jsdoc", @@ -19,6 +18,8 @@ "tree-sitter-julia", "tree-sitter-nix", "tree-sitter-ocaml", + "tree-sitter-perl", + "tree-sitter-pgn", "tree-sitter-php", "tree-sitter-prisma", "tree-sitter-python", @@ -27,5 +28,6 @@ "tree-sitter-scala", "tree-sitter-typescript", "tree-sitter-verilog", + "tree-sitter-yaml", "tree-sitter-zig" ] diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 0841729026a4b..7306112ce259b 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,22 +46,22 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.17"; + version = "7.20"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-JDa4rFDWKPTKOsUwDBgmY9/PpIuhulVIp3KOtmH7T0E="; + sha256 = "sha256-dRt58itan3LJ7BX3VbALE9PtBz6RaMPvStq9nbN9DVA="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { - version = "7.3.0"; + version = "7.4.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-k54vVmlyDQ0Px+MFQmYioRozt644XE1+WB4p6iZOIv8="; + sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-eC5nYX6Cjutd30rrAn6SavWlQtF8swMHDzsESN4SUmo="; + sha256 = "sha256-yzZE06FBoPL65+m8MrKlmW5cSIcX3dZYAOY9wjEJaJw="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix index c345c052c4589..249cb2730404f 100644 --- a/pkgs/applications/emulators/wine/vkd3d.nix +++ b/pkgs/applications/emulators/wine/vkd3d.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.4"; + version = "1.5"; src = fetchurl { url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "sha256-yLqF9gSCyHPAVs9tuw6veRvIq30W1ipH83uYQbapCr0="; + sha256 = "sha256-47PDVfRvfL/BnnEKR4vLK+4mel82Dn5kBiOM6lLOLPw="; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/misc/semver/default.nix b/pkgs/applications/misc/semver/default.nix new file mode 100644 index 0000000000000..5453467b9ef6d --- /dev/null +++ b/pkgs/applications/misc/semver/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub, git }: + +buildGoModule rec { + pname = "semver"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "catouc"; + repo = "semver-go"; + rev = "v${version}"; + sha256 = "0v3j7rw917wnmp4lyjscqzk4qf4azfiz70ynbq3wl4gwp1m783vv"; + }; + + vendorSha256 = null; + nativeBuildInputs = [ git ]; + + meta = with lib; { + homepage = "https://github.com/catouc/semver-go"; + description = "A small CLI to fish out the current or next semver version from a git repository"; + maintainers = with maintainers; [ catouc ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6fe52ab7b8954..029e88fb29a8b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -112,13 +112,13 @@ "version": "2.24.1" }, "aws": { - "hash": "sha256-TQzVuqUhAfEqzCcxA5l993ww9X1dcBeKvddJKzYsBH8=", + "hash": "sha256-ZVRzWOw0QwRS931UCJf7gYUZ18SiAEvpkxzCHj/fgQc=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.38.0", - "vendorHash": "sha256-6IyBJJV+PRFc8f12fBhtOUjbJdyQYanhsvAxugFf/EE=", - "version": "4.38.0" + "rev": "v4.39.0", + "vendorHash": "sha256-h4J35T9Yl3RfdVIhAFq5lw1eKgvwgg9ir8RuGDFObYQ=", + "version": "4.39.0" }, "azuread": { "hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=", @@ -130,13 +130,13 @@ "version": "2.30.0" }, "azurerm": { - "hash": "sha256-SV5td8GMEpLGLQgbl+1v9F2/hIrXpKsMBfOK+2+jDvk=", + "hash": "sha256-7GqKlFFxcxJBFYhTaWGn1VCgn1DiK4aAoiwjIZsa+zI=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.30.0", + "rev": "v3.31.0", "vendorHash": null, - "version": "3.30.0" + "version": "3.31.0" }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", @@ -194,13 +194,13 @@ "version": "0.11.0" }, "checkly": { - "hash": "sha256-hi6GTToJcKVSpbBBWQN6IREhm8iHFCj+pg71fgZ5rOI=", + "hash": "sha256-OKLmcy0egQ9z/eBsdXzGiswByWQ9fiOq4N7ndTW2nso=", "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", - "rev": "v1.6.2", - "vendorHash": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=", - "version": "1.6.2" + "rev": "v1.6.3", + "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=", + "version": "1.6.3" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -285,13 +285,13 @@ "version": "0.11.0" }, "datadog": { - "hash": "sha256-GSm1SIWEPdQls3FXkRjvcxZDRjpNAoUQK1zUHvU4tZo=", + "hash": "sha256-QKUmbCyB9Xlr+wfEGiCR+xn8xz81FJ77pY90AzMc/Bw=", "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.17.0", - "vendorHash": "sha256-xOXLwSKj48nY0ikh2+c8Ti1eNwnsizgAfWyhGE5ZAXE=", - "version": "3.17.0" + "rev": "v3.18.0", + "vendorHash": "sha256-t3A7ACNbIZ/i5fDhIMDWnKlswT1IHwULejzkfqT5mxQ=", + "version": "3.18.0" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", @@ -832,13 +832,13 @@ "version": "1.7.1" }, "oci": { - "hash": "sha256-7822cLdHruCOYu0UGX5KV0f4+W2lQSb2b5SaLDM8cts=", + "hash": "sha256-ONMY14nbU2j4MrxoJ7AwOlfrqB0Nv5FQyl4ChAe9+z0=", "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.98.0", + "rev": "v4.99.0", "vendorHash": null, - "version": "4.98.0" + "version": "4.99.0" }, "okta": { "hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=", @@ -1275,13 +1275,13 @@ "version": "2.11.4" }, "wavefront": { - "hash": "sha256-6uEEvTX0a+pZ9V+upBZOWH+IemEimVk9Jtfiz2UF5fI=", + "hash": "sha256-goiYeZ2iV9KjacBr/MMkA+t2WNTJGHHmwebr/ci+Ezg=", "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", - "rev": "v3.3.0", + "rev": "v3.4.0", "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=", - "version": "3.3.0" + "version": "3.4.0" }, "yandex": { "hash": "sha256-WdiJD1gt56VDFe2qVKwiYOvneixaGRie6mrxdOCklQY=", diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix new file mode 100644 index 0000000000000..fa80860769e0b --- /dev/null +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "goeland"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "slurdge"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9SxlxRco+eLyyIrMjNCdqAyttDnoc8nuMh+ecCpk3bg="; + }; + + vendorSha256 = "sha256-a29TtT6xSapIiHvC9KHQm4gd1QCK3l0RpKe1ieaKUKA="; + + ldflags = [ + "-s" + "-w" + "-X github.com/slurdge/goeland/version.GitCommit=${version}" + ]; + + meta = with lib; { + description = "An alternative to RSS2Email written in golang with many filters."; + longDescription = '' + Goeland excels at creating beautiful emails from RSS, + tailored for daily or weekly digest. It include a number of + filters that can transform the RSS content along the way. + It can also consume other sources, such as a Imgur tag. + ''; + homepage = "https://github.com/slurdge/goeland"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.sweenu ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index d0d24b1b9173b..871cc33542f4c 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb"; - sha256 = "sha256-19HDEbp+zqd1VjRoT3yaGEDAwElKlhCm31bemdK90VU="; + sha256 = "sha256-lb3dvEaKgOnT5+YAJcYmro71soqkT/jpTjE0YMVMRUA="; }; extraBuildInputs = [ xorg.libxshmfence ]; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 77cedc68b42df..3e5af22c824a5 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,9 +1,9 @@ { - "version": "1.11.8-sc.1", - "rev": "v1.11.8-sc.1", - "srcHash": "1a4flbdc18whphxldk0nxqhw0zddsj7zw5js4fpyrr6h85h8qxcp", - "webYarnHash": "1q05r2shv1c3kghwksjzrh9rl25ins6r2y46ng7smdml4f9vdcc0", - "jsSdkYarnHash": "0z6qqif7kccbvbzr9fw92vs4affm4vw8rgs08rqig8pqpk52lwi2", - "reactSdkYarnHash": "0mx9iaciy965jr6vd0gnmyc3jiila9mmh36rv5vm60rx9aw02dv6", - "desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc" + "version": "1.11.13-sc.1", + "rev": "v1.11.13-sc.1", + "srcHash": "1yvd0mzw4qz03nf6im2msi1lp1v4ca9zknvb3ls6va11nxr01h3g", + "webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn", + "jsSdkYarnHash": "0j0jhbfhq0zabnc4glk2kypn53mi5s09l39i41p0zv7g1riwz7al", + "reactSdkYarnHash": "195ck2k5fhzi1b8grh5c88aiq4i3baqanjx48dam76li2msfxxfn", + "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5" } diff --git a/pkgs/applications/networking/lls/default.nix b/pkgs/applications/networking/lls/default.nix new file mode 100644 index 0000000000000..9935d7ba9efdb --- /dev/null +++ b/pkgs/applications/networking/lls/default.nix @@ -0,0 +1,26 @@ +{ + rustPlatform, + fetchFromGitHub, + lib, +}: +rustPlatform.buildRustPackage rec { + pname = "lls"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jcaesar"; + repo = "lls"; + rev = "v${version}"; + hash = "sha256-Aq0MGhzSoJCkM0Wt/r5JSOz96LyRSgSryD7+m4aFZEA="; + }; + + cargoSha256 = "sha256-WY4MnPNDWFEzFOehm7TqCL05Ea6n93f8VWBTOuqjBAg="; + + meta = with lib; { + description = "Tool to list listening sockets"; + license = licenses.mit; + maintainers = [ maintainers.k900 ]; + platforms = platforms.linux; + homepage = "https://github.com/jcaesar/lls"; + }; +} diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 605a06add3ffb..30376e57da798 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.1"; + version = "3.6.2"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-RCYiUxTZSuZbDocueW0d8PdsRTR9bTjDgx0H53UGDP4="; + sha256 = "sha256-eTcQrbYYY+V87i6PuIEWCFczIqL8oxtdojPY/mZpJBU="; }; patches = [ diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 6ff9b6bd26fd5..cf23d22087396 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.32"; + version = "3.34"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - hash = "sha256-GMOLlkBfY3ShVojdRrmpMYgoea52kq4aXr/oZj5bJWo="; + hash = "sha256-lOCZHkLJCDvaT3CcHUBbsybdy0H6BfKKGpd/73cxcWA="; }; - vendorHash = "sha256-cEzPKx54rssyAytYenIcud3K0f7xuO8WzE8wdMqZipE="; + vendorHash = "sha256-1RUWONkXArXYg8gQogKUhMSGdIYyT3lq5qWuUQBsFig="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 1b4d6bcd04867..14a7d33af7865 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -17,7 +17,7 @@ , libxcrypt , lz4 , xz -, gsl_1 +, gsl , xxHash , Cocoa , OpenGL @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash libxcrypt ] + buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl xxHash libxcrypt ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -144,6 +144,7 @@ stdenv.mkDerivation rec { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; + broken = !stdenv.isx86_64; maintainers = with maintainers; [ veprbl ]; license = licenses.lgpl21; }; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index a3e8d5dc81355..7547d6d4051e5 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,17 +1,20 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-XGZ6Jr/RVDOLDa0sANZIsKtNjY3pEBlOtei+xNGPBBY="; + sha256 = "sha256-2eEuKAMxxTwjDInpYcOlFJha5DTe0IrxT5rI6ymN0hc="; }; - cargoSha256 = "sha256-sjMg5XMnAQZjp6z9prtRq+0pyNQ1oTm0/KWOZPxDW4w="; + cargoSha256 = "sha256-nJM7/w4awbCZQysUOSTO6bfsBXO3agJRdp1RyRZhtUY="; + + # remove timeouts in tests to make them less flaky + patches = [ ./tests-no-timeout.patch ]; buildInputs = lib.optionals stdenv.isDarwin [ Security @@ -22,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/insilica/rs-srvc"; 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 new file mode 100644 index 0000000000000..d353b9e5f44b1 --- /dev/null +++ b/pkgs/applications/version-management/srvc/tests-no-timeout.patch @@ -0,0 +1,36 @@ +--- 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<PtySession, rexpect::errors::Error> { + 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/obs-studio/27.nix b/pkgs/applications/video/obs-studio/27.nix new file mode 100644 index 0000000000000..7be6f46b9d9d1 --- /dev/null +++ b/pkgs/applications/video/obs-studio/27.nix @@ -0,0 +1,7 @@ +{ callPackage, qtx11extras, ... } @ args: + +callPackage ./generic.nix (args // { + version = "27.2.4"; + sha256 = "sha256-OiSejQovSmhItrnrQlcVp9PCDRgAhuxTinSpXbH8bo0="; + extraBuildInputs = [ qtx11extras ]; +}) diff --git a/pkgs/applications/video/obs-studio/28.nix b/pkgs/applications/video/obs-studio/28.nix new file mode 100644 index 0000000000000..edf40b14879c6 --- /dev/null +++ b/pkgs/applications/video/obs-studio/28.nix @@ -0,0 +1,22 @@ +{ callPackage +, libajantv2 +, librist +, srt +, qtwayland +, ... +} @ args: + +callPackage ./generic.nix (args // { + version = "28.0.3"; + sha256 = "sha256-+4H1BjEgxqkAEvRyr2Tg3wXutnMvlYQEdT5jz644fMA="; + extraPatches = [ ./Provide-runtime-plugin-destination-as-relative-path.patch ]; + extraBuildInputs = [ + libajantv2 + librist + srt + qtwayland + ]; + extraCMakeFlags = [ + "-DENABLE_JACK=ON" + ]; +}) diff --git a/pkgs/applications/video/obs-studio/Provide-runtime-plugin-destination-as-relative-path.patch b/pkgs/applications/video/obs-studio/Provide-runtime-plugin-destination-as-relative-path.patch new file mode 100644 index 0000000000000..b39cb04a899c9 --- /dev/null +++ b/pkgs/applications/video/obs-studio/Provide-runtime-plugin-destination-as-relative-path.patch @@ -0,0 +1,26 @@ +diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt +index 790583cd5..763cf3548 100644 +--- a/libobs/CMakeLists.txt ++++ b/libobs/CMakeLists.txt +@@ -455,6 +455,8 @@ elseif(OS_POSIX) + libobs PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:OBS::libobs-opengl>") + endif() + ++string(REGEX REPLACE "^${OBS_INSTALL_PREFIX}" "" OBS_PLUGIN_DESTINATION_RELATIVE ${OBS_PLUGIN_DESTINATION}) ++ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/obsconfig.h.in + ${CMAKE_BINARY_DIR}/config/obsconfig.h) + +diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in +index 4a664285a..5cff2ca53 100644 +--- a/libobs/obsconfig.h.in ++++ b/libobs/obsconfig.h.in +@@ -13,7 +13,7 @@ + #define OBS_VERSION_CANONICAL "@OBS_VERSION_CANONICAL@" + #define OBS_DATA_PATH "@OBS_DATA_PATH@" + #define OBS_INSTALL_PREFIX "@OBS_INSTALL_PREFIX@" +-#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@" ++#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION_RELATIVE@" + #define OBS_QT_VERSION @_QT_VERSION@ + + #cmakedefine LINUX_PORTABLE diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/generic.nix index 044967b2e526b..e638cacd06d97 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/generic.nix @@ -1,7 +1,11 @@ -{ config +{ version +, sha256 +, extraPatches ? [ ] +, extraBuildInputs ? [ ] +, extraCMakeFlags ? [ ] +, config , lib , stdenv -, mkDerivation , fetchFromGitHub , addOpenGLRunpath , cmake @@ -13,7 +17,6 @@ , libpthreadstubs , libXdmcp , qtbase -, qtx11extras , qtsvg , speex , libv4l @@ -38,34 +41,37 @@ , pipewireSupport ? stdenv.isLinux , pipewire , libdrm +, wrapQtAppsHook +, ... }: let inherit (lib) optional optionals; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "obs-studio"; - version = "27.2.4"; + inherit version; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "sha256-OiSejQovSmhItrnrQlcVp9PCDRgAhuxTinSpXbH8bo0="; + inherit sha256; fetchSubmodules = true; }; patches = [ # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch - ]; + ] ++ extraPatches; nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config wrapGAppsHook + wrapQtAppsHook ] ++ optional scriptingSupport swig; @@ -81,7 +87,6 @@ mkDerivation rec { libpthreadstubs libXdmcp qtbase - qtx11extras qtsvg speex wayland @@ -90,6 +95,7 @@ mkDerivation rec { mbedtls pciutils ] + ++ extraBuildInputs ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio @@ -117,7 +123,7 @@ mkDerivation rec { # Add support for browser source "-DBUILD_BROWSER=ON" "-DCEF_ROOT_DIR=../../cef" - ]; + ] ++ extraCMakeFlags; dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 02ce844c07605..846a03897ba95 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -28,7 +28,7 @@ obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture; }; - obs-websocket = libsForQt5.callPackage ./obs-websocket.nix { }; + obs-websocket = throw "obs-websocket has been removed: Functionality has been integrated into obs-studio itself."; wlrobs = callPackage ./wlrobs.nix { }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition-use-FindLibobs.cmake.patch b/pkgs/applications/video/obs-studio/plugins/obs-move-transition-use-FindLibobs.cmake.patch deleted file mode 100644 index bc082de0bd5e3..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition-use-FindLibobs.cmake.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f6d8fa3..5f0657d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,17 @@ -+if (POLICY CMP0048) -+ cmake_policy(SET CMP0048 NEW) -+endif (POLICY CMP0048) -+ - project(move-transition VERSION 2.4.3) - set(PROJECT_FULL_NAME "Move Transition") - -+include(FindLibobs.cmake) -+find_package(LibObs REQUIRED) -+ -+include_directories( -+ "${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions" -+ "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api") -+ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h) - - set(move-transition_HEADERS -@@ -38,4 +49,10 @@ target_link_libraries(move-transition - libobs) - - set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro") --install_obs_plugin_with_data(move-transition data) -+set_target_properties(move-transition PROPERTIES PREFIX "") -+ -+install(TARGETS move-transition -+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins) -+ -+install(DIRECTORY data/locale/ -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/move-transition/locale") diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 80bcb6d41b9de..c7d7c8596ef8f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,35 +7,26 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.4.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-/6PcNLOnBBqLZHVKMg1tdX9OktcllEEqnL93nXpuXL0="; + sha256 = "sha256-+kAdCM5PEFNxKNmJmf2ASTyUKA7xnbMAA7kP/emoaeI="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; - cmakeFlags = with lib; [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" - "-Wno-dev" - ]; - preConfigure = '' - cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake + cp ${obs-studio.src}/cmake/external/ObsPluginHelpers.cmake cmake/ ''; - patches = [ ./obs-move-transition-use-FindLibobs.cmake.patch ]; - - postPatch = '' - substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' - substituteInPlace move-value-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' - substituteInPlace move-transition.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' - substituteInPlace audio-move.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' - ''; + cmakeFlags = [ + "-DBUILD_OUT_OF_TREE=On" + "-Wno-dev" + ]; meta = with lib; { description = "Plugin for OBS Studio to move source to a new position during scene transition"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix index 4d8ffb831a674..ab113065629d9 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "obs-nvfbc"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitLab { owner = "fzwoch"; repo = "obs-nvfbc"; rev = "v${version}"; - sha256 = "sha256-WoqtppgIcjE0n9atsvAZrXvBVi2rWCIIFDXTgblQK9I="; + sha256 = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index 170b179732965..d3fc0e15bda00 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ obs-studio pipewire ]; + cmakeFlags = [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" + "-Wno-dev" + ]; + + preConfigure = '' + cp ${obs-studio.src}/cmake/external/ObsPluginHelpers.cmake cmake/FindLibObs.cmake + ''; + meta = with lib; { description = " Audio device and application capture for OBS Studio using PipeWire "; homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix deleted file mode 100644 index d747268cc5567..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, qtbase -, qtsvg -, obs-studio -, asio_1_10 -, websocketpp -, nlohmann_json -}: - -stdenv.mkDerivation rec { - pname = "obs-websocket"; - - # We have updated to the alpha version when OBS Studio 27.2 was - # released, because this is the only version of obs-websocket that - # builds against the new OBS Studio. - version = "5.0.0-alpha3"; - - src = fetchFromGitHub { - owner = "Palakis"; - repo = "obs-websocket"; - rev = version; - sha256 = "Lr6SBj5rRTAWmn9Tnlu4Sl7SAkOCRCTP6sFWSp4xB+I="; - fetchSubmodules = true; - }; - - patches = [ - # This patch can be dropped when obs-websocket is updated to the - # next version. - (fetchpatch { - url = "https://github.com/obsproject/obs-websocket/commit/13c7b83c34eb67b2ee80af05071d81f10d0d2997.patch"; - sha256 = "TNap/T8+058vhfWzRRr4vmlblFk9tHMUNyG6Ob5PwiM="; - name = "obs-addref-werror-fix.patch"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - qtbase - qtsvg - obs-studio - asio_1_10 - websocketpp - nlohmann_json - ]; - - dontWrapQtApps = true; - - cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" - ]; - - meta = with lib; { - description = "Remote-control OBS Studio through WebSockets"; - homepage = "https://github.com/Palakis/obs-websocket"; - maintainers = with maintainers; [ erdnaxe ]; - license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix index adae03036f81c..5ee226c24827d 100644 --- a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchhg +{ lib, stdenv, fetchFromSourcehut , meson, pkg-config, ninja , wayland, obs-studio, libX11 }: stdenv.mkDerivation { pname = "wlrobs"; - version = "unstable-2021-05-13"; + version = "unstable-2022-10-06"; - src = fetchhg { - url = "https://hg.sr.ht/~scoopta/wlrobs"; - rev = "4184a4a8ea7dc054c993efa16007f3a75b2c6f51"; - sha256 = "146xirzd3nw1sd216y406v1riky9k08b6a0j4kwxrif5zyqa3adc"; + src = fetchFromSourcehut { + vc = "hg"; + owner = "~scoopta"; + repo = "wlrobs"; + rev = "78be323b25e1365f5c8f9dcba6938063ca10f71f"; + sha256 = "sha256-/VemJkk695BdSDsODmYIPdhPwggzIhBi/0m6P+AYfx0="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index ead22a8c9db72..235c328da85e4 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -2,18 +2,18 @@ , stdenv , fetchFromGitHub , cmake -, coreutils +, nix }: stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8RKx3OPb53hCquFcT+AbtX+LDNEvzLHuqtkbvXewqRs="; + sha256 = "sha256-kAwcVB39rcS59I2qJhYc7Xr3mXMWtKfN45jo+8BNHwA="; }; nativeBuildInputs = [ cmake ]; @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "AWS SDK for C common core"; homepage = "https://github.com/awslabs/aws-c-common"; diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix index 8627ea5b8931a..45ab56edae2f2 100644 --- a/pkgs/development/libraries/aws-c-compression/default.nix +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , aws-c-common , cmake +, nix }: stdenv.mkDerivation rec { @@ -27,6 +28,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "C99 implementation of huffman encoding/decoding"; homepage = "https://github.com/awslabs/aws-c-compression"; diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index eddefef02381e..3022cf4627460 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , aws-c-common , cmake +, nix }: stdenv.mkDerivation rec { @@ -29,6 +30,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "AWS SDK utility library"; homepage = "https://github.com/awslabs/aws-c-sdkutils"; diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 4f5c346556720..d820b0c71930f 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, nix }: stdenv.mkDerivation rec { pname = "aws-checksums"; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "HW accelerated CRC32c and CRC32"; homepage = "https://github.com/awslabs/aws-checksums"; diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index c7eac8474cb4c..3d4b31ad57d1b 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -12,6 +12,7 @@ , aws-checksums , cmake , s2n-tls +, nix }: stdenv.mkDerivation rec { @@ -65,6 +66,10 @@ stdenv.mkDerivation rec { moveToOutput lib/aws-crt-cpp/cmake "$dev" ''; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "C++ wrapper around the aws-c-* libraries"; homepage = "https://github.com/awslabs/aws-crt-cpp"; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 9381f1b9ea30a..4220922567db5 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -17,7 +17,6 @@ , plfit , python3 , sourceHighlight -, suitesparse , xmlto }: @@ -27,22 +26,17 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.10"; + version = "0.10.2"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk="; + hash = "sha256-6zX9hyz/8H7r+wzpVwz8jDMfd3nqit3pT+wlP0C40Rg="; }; postPatch = '' echo "${version}" > IGRAPH_VERSION - '' + lib.optionalString stdenv.isAarch64 '' - # https://github.com/igraph/igraph/issues/1694 - substituteInPlace tests/CMakeLists.txt \ - --replace "igraph_scg_grouping3" "" \ - --replace "igraph_scg_semiprojectors2" "" ''; outputs = [ "out" "dev" "doc" ]; @@ -68,7 +62,6 @@ stdenv.mkDerivation rec { lapack libxml2 plfit - suitesparse ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; @@ -78,7 +71,6 @@ stdenv.mkDerivation rec { "-DIGRAPH_USE_INTERNAL_LAPACK=OFF" "-DIGRAPH_USE_INTERNAL_ARPACK=OFF" "-DIGRAPH_USE_INTERNAL_GLPK=OFF" - "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" "-DIGRAPH_USE_INTERNAL_GMP=OFF" "-DIGRAPH_USE_INTERNAL_PLFIT=OFF" "-DIGRAPH_GLPK_SUPPORT=ON" @@ -101,7 +93,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "The network analysis package"; + description = "C library for complex network analysis and graph theory"; homepage = "https://igraph.org/"; changelog = "https://github.com/igraph/igraph/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 24b4ec87df747..a2b17cbb6b7e9 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.97.0"; + version = "1.100.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-njeNlpXSeqKrozN1UfKnnhVJN24ZJh+MuR4Vd3S/gSQ="; + hash = "sha256-p7IqvxV9C3Ej0xNUA9iRtmkXrUgGWx1OR+/SBDzhcZE="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-bf79yqQv516k0xCp0yd1Vid1yf8EppFFvC3HJ4RczoA="; + hash = "sha256-Wfk2cHGTO2ZvhVAvOs6xOSnldyrkiAinMc6ErLy8QpA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 71e89e07d8f7e..a8f612678d042 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -59,6 +59,7 @@ # Darwin , gmp , libiconv +, qemu , Carbon , AppKit @@ -154,6 +155,9 @@ stdenv.mkDerivation rec { '' + optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build sed -i '/vircryptotest/d' tests/meson.build + sed -i '/domaincapstest/d' tests/meson.build + sed -i '/qemufirmwaretest/d' tests/meson.build + sed -i '/qemuvhostusertest/d' tests/meson.build '' + optionalString (isDarwin && isx86_64) '' sed -i '/qemucaps2xmltest/d' tests/meson.build sed -i '/qemuhotplugtest/d' tests/meson.build @@ -267,6 +271,7 @@ stdenv.mkDerivation rec { (cfg "runstatedir" "/run") (cfg "init_script" (if isDarwin then "none" else "systemd")) + (cfg "qemu_datadir" (if isDarwin then "${qemu}/share/qemu" else "")) (feat "apparmor" isLinux) (feat "attr" isLinux) diff --git a/pkgs/development/libraries/smokegen/default.nix b/pkgs/development/libraries/smokegen/default.nix new file mode 100644 index 0000000000000..643ae1064db72 --- /dev/null +++ b/pkgs/development/libraries/smokegen/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, ... }: + +pkgs.stdenv.mkDerivation rec { + pname = "smokegen"; + version = "v4.14.3"; + src = pkgs.fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-finsoruPeJZLawIjNUJ25Pq54eaCByfALVraNQJPk7c="; + }; + buildInputs = [ pkgs.cmake pkgs.qt4 ]; + buildPhase = '' + cmake . + ''; + meta = with lib; { + description = "A general purpose C++ parser with a plugin infrastructure"; + homepage = "https://invent.kde.org/unmaintained/smokegen"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ uthar ]; + }; +} diff --git a/pkgs/development/libraries/smokeqt/default.nix b/pkgs/development/libraries/smokeqt/default.nix new file mode 100644 index 0000000000000..145a9f243bb35 --- /dev/null +++ b/pkgs/development/libraries/smokeqt/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, ... }: + +pkgs.stdenv.mkDerivation rec { + pname = "smokeqt"; + version = "v4.14.3"; + src = pkgs.fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-8FiEGF8gduVw5I/bi2wExGUWmjIjYEhWpjpXKJGBNMg="; + }; + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=98" + ]; + buildInputs = [ pkgs.cmake pkgs.qt4 pkgs.smokegen ]; + meta = with lib; { + description = "Bindings for the Qt libraries"; + homepage = "https://invent.kde.org/unmaintained/smokeqt"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ uthar ]; + }; +} diff --git a/pkgs/development/lisp-modules-new/packages.nix b/pkgs/development/lisp-modules-new/packages.nix index 97c1cf0fca5b6..1ad06f615b56e 100644 --- a/pkgs/development/lisp-modules-new/packages.nix +++ b/pkgs/development/lisp-modules-new/packages.nix @@ -11,6 +11,9 @@ let optionals hasSuffix splitString + remove + optionalString + stringLength ; # Used by builds that would otherwise attempt to write into storeDir. @@ -42,6 +45,11 @@ let # Patches are already applied in `build` patches = []; src = build; + # TODO(kasper): handle this with a setup hook + LD_LIBRARY_PATH = + build.LD_LIBRARY_PATH + + (optionalString (stringLength build.LD_LIBRARY_PATH != 0) ":") + + "${build}"; }); # A little hacky @@ -332,6 +340,89 @@ let version = "f19162e76"; }); + qt = let + rev = "dffff3ee3dbd0686c85c323f579b8bbf4881e60e"; + in build-with-compile-into-pwd rec { + pname = "commonqt"; + version = builtins.substring 0 7 rev; + + src = pkgs.fetchFromGitHub { + inherit rev; + owner = pname; + repo = pname; + hash = "sha256-GAgwT0D9mIkYPTHfCH/KxxIv7b6QGwcxwZE7ehH5xug="; + }; + + buildInputs = [ pkgs.qt4 ]; + nativeBuildInputs = [ pkgs.smokegen pkgs.smokeqt ]; + nativeLibs = [ pkgs.qt4 pkgs.smokegen pkgs.smokeqt ]; + + systems = [ "qt" ]; + + lispLibs = with ql; [ + cffi named-readtables cl-ppcre alexandria + closer-mop iterate trivial-garbage bordeaux-threads + ]; + }; + + qt-libs = build-with-compile-into-pwd { + inherit (ql.qt-libs) pname version src; + patches = [ ./patches/qt-libs-dont-download.patch ]; + prePatch = '' + substituteInPlace systems/*.asd --replace ":qt+libs" ":qt" + echo "LD Path: $LD_LIBRARY_PATH" + ''; + lispLibs = ql.qt-libs.lispLibs ++ [ qt ]; + systems = [ + "qt-libs" + "commonqt" + # "phonon" + # "qimageblitz" + # "qsci" + "qt3support" + "qtcore" + "qtdbus" + "qtdeclarative" + "qtgui" + "qthelp" + "qtnetwork" + "qtopengl" + "qtscript" + "qtsql" + "qtsvg" + "qttest" + "qtuitools" + # "qtwebkit" + "qtxml" + "qtxmlpatterns" + # "qwt" + "smokebase" + ]; + }; + commonqt = qt-libs; + qt3support = qt-libs; + qtcore = qt-libs; + qtdbus = qt-libs; + qtdeclarative = qt-libs; + qtgui = qt-libs; + qthelp = qt-libs; + qtnetwork = qt-libs; + qtopengl = qt-libs; + qtscript = qt-libs; + qtsql = qt-libs; + qtsvg = qt-libs; + qttest = qt-libs; + qtuitools = qt-libs; + qtxml = qt-libs; + qtxmlpatterns = qt-libs; + smokebase = qt-libs; + + qtools = build-with-compile-into-pwd { + inherit (ql.qtools) pname version src nativeLibs; + lispLibs = [ qt ] ++ remove ql.qt_plus_libs ql.qtools.lispLibs ++ [ qt-libs ]; + patches = [ ./patches/qtools-use-nix-libs.patch ]; + }; + }; in packages diff --git a/pkgs/development/lisp-modules-new/patches/qt-libs-dont-download.patch b/pkgs/development/lisp-modules-new/patches/qt-libs-dont-download.patch new file mode 100644 index 0000000000000..e21a44c2a17d1 --- /dev/null +++ b/pkgs/development/lisp-modules-new/patches/qt-libs-dont-download.patch @@ -0,0 +1,36 @@ +--- a/qt-libs.asd ++++ b/qt-libs.asd +@@ -17,5 +17,4 @@ + :components ((:file "qt-libs")) + :depends-on (:qt-lib-generator + :cl-ppcre +- :cffi) +- :perform (asdf:load-op :after (op c) (uiop:symbol-call :qt-libs :ensure-standalone-libs))) ++ :cffi)) +--- a/qt-libs.lisp ++++ b/qt-libs.lisp +@@ -94,16 +94,14 @@ + standalone-dir) + + (defun %ensure-lib-loaded (file) +- (let ((file (etypecase file +- (pathname file) +- (string (installed-library-file file)))) +- (name (intern (string-upcase (pathname-name file)))) +- #+sbcl(sb-ext:*muffled-warnings* 'style-warning)) +- (cffi::register-foreign-library +- name `((T ,file)) +- :search-path (to-directory file)) +- (unless (cffi:foreign-library-loaded-p name) +- (cffi:load-foreign-library name)))) ++ (let ((name (make-pathname :name (format nil "lib~a" file) ++ :type #+unix "so" ++ #+darwin "dylib"))) ++ (or (find-if (lambda (lib) ++ (equal (cffi:foreign-library-pathname lib) ++ (namestring name))) ++ (cffi:list-foreign-libraries)) ++ (cffi:load-foreign-library name)))) + + (defun ensure-lib-loaded (file) + (cond ((pathnamep file) \ No newline at end of file diff --git a/pkgs/development/lisp-modules-new/patches/qtools-use-nix-libs.patch b/pkgs/development/lisp-modules-new/patches/qtools-use-nix-libs.patch new file mode 100644 index 0000000000000..b380894b04a83 --- /dev/null +++ b/pkgs/development/lisp-modules-new/patches/qtools-use-nix-libs.patch @@ -0,0 +1,19 @@ +Dont use the qt+libs system for managing Qt dependencies, because Nix provides +them already. +Don't build the deploy.lisp helper file, because Nix also can handle deployment. +--- a/qtools.asd ++++ b/qtools.asd +@@ -33,10 +33,9 @@ + (:file "generate") + (:file "dynamic") + (:file "precompile") +- (:file "deploy") + (:file "fast-call") + (:file "documentation")) +- :depends-on (:qt+libs ++ :depends-on (:qt + :deploy + :cl-ppcre + :closer-mop + +Diff finished. Sun Oct 2 14:38:06 2022 \ No newline at end of file diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index ac820337af022..9a23a9603b95f 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "2.0.6"; + version = "2.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - sha256 = "sha256-tmvt5jqgfKxCW+/XvmSu7bTsT1Qk902c1qfR4IK66vg="; + sha256 = "sha256-A5mphFJEjOkTG5Rv7tb4hm5eDMSir69gqkbHYn6109I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 72e8ad60e066b..452d9b49edfe6 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2022.8.2"; + version = "2022.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "intake"; + owner = "fsspec"; repo = "filesystem_spec"; rev = version; - hash = "sha256-eT1zqTbU5kfQ7bvzigT9579HfXU6VaOEjRg8VG/DHMI="; + hash = "sha256-+lPt/zqI3Mkt+QRNXq+Dxm3h/ryZJsfrmayVi/BTtbg="; }; propagatedBuildInputs = [ @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "A specification that Python filesystems should adhere to"; - homepage = "https://github.com/intake/filesystem_spec"; + homepage = "https://github.com/fsspec/filesystem_spec"; changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 6ac2d6e23bf77..76847827bdaf0 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2022.8.2"; + version = "2022.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = version; - hash = "sha256-BnnKFrWz47izKc7nS8NR1Vze1x9kJdYBsQT2KEY9ghM="; + hash = "sha256-+S4AziibYWos/hZ1v3883b1Vv3y4xjIDUrQ8c2XJ1MQ="; }; propagatedBuildInputs = [ @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convenient Filesystem interface over GCS"; homepage = "https://github.com/fsspec/gcsfs"; + changelog = "https://github.com/fsspec/gcsfs/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ nbren12 ]; }; diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 6afa32d35bfbf..cc995746f2976 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -5,20 +5,20 @@ , pkg-config , igraph , texttable -, python +, unittestCheckHook }: buildPythonPackage rec { pname = "igraph"; - version = "0.9.11"; + version = "0.10.2"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; rev = version; - hash = "sha256-tvkV5ve9X+LXx3LOdHIPljQKZc1v6yts0juo4SwDmfY="; + hash = "sha256-ro2EkJQxW8aHejAvkaXI9mJC5XgFt31akhzFDAPZ4ow="; }; postPatch = '' @@ -42,9 +42,9 @@ buildPythonPackage rec { # told to do it. ~ C. setupPyGlobalFlags = [ "--use-pkg-config" ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; + checkInputs = [ + unittestCheckHook + ]; pythonImportsCheck = [ "igraph" ]; diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index f1a62b8856d39..8a47fb08404c5 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -3,19 +3,23 @@ , fetchFromGitHub , impacket , netaddr +, pythonOlder , pypykatz , rich }: buildPythonPackage rec { pname = "lsassy"; - version = "3.1.3"; + version = "3.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Hackndo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h99wqgRNy2GkiertDddFJQN4hv2R26bo72zNwLPR3mk="; + hash = "sha256-/YDBzH8Mji6PWBEIbsgZcTvoAWAsBbJV3cHfySY/gGA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 9ebb16b833056..0324d1687ac5a 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.5.9"; + version = "8.5.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "v${version}"; - sha256 = "sha256-gA5GxE2as/P5yT3ymvXmLQfG2GyZE7Fj+zBaT88O4vY="; + sha256 = "sha256-AxUZf1dRe/7Y96DYJnziMqHKW5xyQv4FIrMMwSZTuGQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 1e3dad2c16338..741388f363c14 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-Z2/nzsHRpaykqLRkJoPdNGSLNbJvd4GOUpTYl8MG8mw="; + hash = "sha256-h8OuDmm9I8lElhAGSpPx8sPUTY+EnFp2VXOYrYjiYNk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 4e01e3ed6e8d5..7bb23f3f64103 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - hash = "sha256-6FoadV5QMZCJnF/eD3FXRsyP4MymO5nayJ/54PJXOB4="; + hash = "sha256-3c44ZJIEBhKggtqs77gt2fY3tI00ZGmFGLIGR8LF6aE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix index bc5914be721c9..fced2ae4ceada 100644 --- a/pkgs/development/python-modules/numdifftools/default.nix +++ b/pkgs/development/python-modules/numdifftools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "numdifftools"; - version = "0.9.40"; + version = "0.9.41"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pbrod"; repo = pname; rev = "v${version}"; - hash = "sha256-YLi9cNHcZ/PlhrhvYOMfRTOt4kinQcfxvqInT8/0Qpg="; + hash = "sha256-HYacLaowSDdrwkxL1h3h+lw/8ahzaecpXEnwrCqMCWk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 77dee64bb45fa..f61f94f00c267 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage , coloredlogs +, deprecation , fetchFromGitHub , ghostscript , img2pdf -, importlib-metadata , importlib-resources , jbig2enc +, packaging , pdfminer-six , pikepdf , pillow @@ -16,18 +17,23 @@ , pytestCheckHook , pythonOlder , reportlab +, setuptools , setuptools-scm -, setuptools-scm-git-archive , substituteAll , tesseract , tqdm +, typing-extensions , unpaper , installShellFiles }: buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.7.0"; + version = "14.0.1"; + + disabled = pythonOlder "3.8"; + + format = "pyproject"; src = fetchFromGitHub { owner = "ocrmypdf"; @@ -39,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-cw2wZMPhWzxRpeM90g9NmuYBYpU13R2iDzs7a8SS/CY="; + hash = "sha256-eYn24FkAXj/ESCoC0QaLY+wRhkxZP1KnuY4VU1WiG24="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -56,25 +62,27 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - setuptools-scm-git-archive + setuptools setuptools-scm installShellFiles ]; propagatedBuildInputs = [ coloredlogs + deprecation img2pdf + packaging pdfminer-six pikepdf pillow pluggy reportlab tqdm - ] ++ (lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]) ++ (lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources - ]); + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; checkInputs = [ pytest-xdist diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index cae423cf5a952..d24029f87d0d8 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.14.0"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7EHU/UqKy576FZ1E5bOHHOvH38yoyU+55wC/YO3yt4Y="; + hash = "sha256-Tg2sk8E4+UjgP2PyZH6ZqNJv6Yg/muTl7QPaBlXHUj0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 256c30919a0be..d86e740b28855 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "6.0.2"; + version = "6.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-rwMSmARUrScG2nmiYBSkcq0NuUMhn0pHOPvgdKZbH7w="; + hash = "sha256-194CaN7Ei3/ja55BWsUst4EN/B7/JUmJxtCmnN9Z/bI="; }; patches = [ diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index 165ded03e2ab7..293ab15a37f96 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.17"; + version = "0.3.19"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = "refs/tags/${version}"; - sha256 = "sha256-jOeJXl/0LUozwKoE3R67tts6v283Li7zHIatr0nadCk="; + sha256 = "sha256-yN1d0Q6kbtQ+f+3WgTVZR9NVcV5K7VEZQ44H1bcP5Fk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index d5b3d5d7fa4f7..2bb02397f3a2d 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.6.1"; + version = "1.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-5Mc70yi9Yj+8ye81v9NbKZnNoD5PQmBVAiYF5IM5ix8="; + hash = "sha256-MDutpeHI6MW1VwCRTPJK/y08ee4eidOHluMf6lPQfEk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 343d637db0aba..b1bebfce47c02 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.8.2"; + version = "2022.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PKBwGomp4SWijekIKdGflvQd2x2LQ3kHbCntgsSvhs0="; + hash = "sha256-6N64DyC9CyBZFBuHT9udauuMzjUxLqXywCsiWnigBAY="; }; buildInputs = [ @@ -42,8 +42,9 @@ buildPythonPackage rec { meta = with lib; { broken = stdenv.isDarwin; - homepage = "https://github.com/dask/s3fs/"; description = "A Pythonic file interface for S3"; + homepage = "https://github.com/fsspec/s3fs"; + changelog = "https://github.com/fsspec/s3fs/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index 1ef15fee0af3c..e6e411c1f6e52 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.11.0"; + version = "2.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-znDEdXCWYmzk5xG1sSUyXRUhLGxtoBv46JcSnysu1A4="; + hash = "sha256-u17vtw3yu8ibi/omTriy6s33/243WjxM03Nss3pFAYk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index 79e8395d6d493..034566f90acf5 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "watchfiles"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,13 +24,13 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8="; + hash = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-nmkIKA4EDMOeppOxKwLSh3oREInlDIcFzE7/EYZRGKY="; + hash = "sha256-IWONA3o+2emJ7cKEw5xYSMdWzGuUSwn1B70zUDzj7Cw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index b64d2d5f39c06..676afd2a44dd2 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-qpGw9c7O8MC6AEutRIqCEdZncJSQKesaHFRQjOxpa2U="; + hash = "sha256-qAqXg+skA7FfAjRXljt1UpyOcC3KYghc+5wjiRzlyyg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index 12133f6daa87c..ad9dd660315eb 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.15.0"; + version = "1.16.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "kyleconroy"; repo = "sqlc"; rev = "v${version}"; - sha256 = "sha256-Ufa5A+lsFSyxe7s0DbLhWW298Y1yaSCazMjGBryyMYY="; + sha256 = "sha256-YxGMfGhcPT3Pcyxu1hAkadkJnEBMX26fE/rGfGSTsyc="; }; proxyVendor = true; - vendorSha256 = "sha256-KatF4epCzyQCoAGk1verjAYNrFcmcLiVyDI2542Vm3k="; + vendorSha256 = "sha256-cMYTQ8rATCXOquSxc4iZ2MvxIaMO3RG8PZkpOwwntyc="; subPackages = [ "cmd/sqlc" ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index b3e325ffc9a63..de6ff5f660426 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -1,6 +1,5 @@ { lib }: { - tree-sitter-agda = lib.importJSON ./tree-sitter-agda.json; tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json; tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json; tree-sitter-bibtex = lib.importJSON ./tree-sitter-bibtex.json; @@ -25,7 +24,6 @@ tree-sitter-erlang = lib.importJSON ./tree-sitter-erlang.json; tree-sitter-fennel = lib.importJSON ./tree-sitter-fennel.json; tree-sitter-fish = lib.importJSON ./tree-sitter-fish.json; - tree-sitter-fluent = lib.importJSON ./tree-sitter-fluent.json; tree-sitter-fortran = lib.importJSON ./tree-sitter-fortran.json; tree-sitter-gdscript = lib.importJSON ./tree-sitter-gdscript.json; tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json deleted file mode 100644 index 36dd834d4d0f0..0000000000000 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "url": "https://github.com/tree-sitter/tree-sitter-agda", - "rev": "d710ff14d15ddee3764fd73a0837c6c4c8c913e9", - "date": "2019-09-20T18:06:06+08:00", - "path": "/nix/store/wqz9v9znaiwhhqi19hgig9bn0yvl4i9s-tree-sitter-agda", - "sha256": "1wpfj47l97pxk3i9rzdylqipy849r482fnj3lmx8byhalv7z1vm6", - "fetchLFS": false, - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json deleted file mode 100644 index 6eeb5ccfe0a58..0000000000000 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "url": "https://github.com/tree-sitter/tree-sitter-fluent", - "rev": "858fdd6f1e81992e00d3541bfb31bac9365d7a47", - "date": "2018-06-18T13:00:38-07:00", - "path": "/nix/store/zbj8abdlrqi9swm8qn8rhpqmjwcz145f-tree-sitter-fluent", - "sha256": "0528v9w0cs73p9048xrddb1wpdhr92sn1sw8yyqfrq5sq0danr9k", - "fetchLFS": false, - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index 5b968a05ec6a1..94d548e759198 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-julia", - "rev": "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25", - "date": "2022-11-01T17:30:42-05:00", - "path": "/nix/store/58qk62ilnkwqbqc5y0ah1ky5z4n4d4xr-tree-sitter-julia", - "sha256": "06h5nyxw72z3w5a62y59332w2xg90sm3c2j6na7vvf7nark7vb8v", + "rev": "bedd19f3c3d745c3da8451a35c7bfc5f48d07ee6", + "date": "2022-11-05T17:27:50-05:00", + "path": "/nix/store/ldklarlvv3jlxsfi7gnqmim7csnxp2qf-tree-sitter-julia", + "sha256": "0cnp0rff6igjfz9i8ckffj9r1fr2nzdw82hag6dml331z7nbjjkf", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index aaf8f656bed1e..b70beb42a1f72 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "ff5c3108083af6fcb7575e32a7558b8165a05bcd", - "date": "2022-07-18T20:23:41+05:30", - "path": "/nix/store/29ijys20vg6qyc2999vjiylwi9nrq3y4-tree-sitter-perl", - "sha256": "1zsffd55sldc1148wyjm0kh8knm4849wgwvdvwhchpzn6ji6yf8i", + "rev": "749d26fe13fb131b92e6515416096e572575b981", + "date": "2022-11-05T19:54:52+05:30", + "path": "/nix/store/b2w0s5livx7ysni6jlwwpmkd0f3wvqnh-tree-sitter-perl", + "sha256": "1ldl83nia3ij7ps5nx5fqzz5pzwzcmphajjhjf1vnrbm11zfzqjl", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json index b77bf59251b6e..c417a035d8572 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json @@ -1,9 +1,9 @@ { "url": "https://github.com/6cdh/tree-sitter-scheme", - "rev": "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9", - "date": "2022-09-30T20:37:24+08:00", - "path": "/nix/store/gra9hiqd3rqgvvq10m3z6lzjf0y0lfz0-tree-sitter-scheme", - "sha256": "1pk1q8lmgj2mh7fmyvsr610qdv1c7nmfqdbr1bln1ar356dv6zrb", + "rev": "bdcd2c8496701153506a9e3e1b76dfed852873ba", + "date": "2022-11-06T17:17:49+08:00", + "path": "/nix/store/l096qb2872kab34avgscn9bwizrzail5-tree-sitter-scheme", + "sha256": "12knvhmayck9da3zj2w55al4yjhkkr9gxmfdmrjiz7vn9wc1dxr9", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index c80f1eaddd1e9..5149a66fee351 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/m-novikov/tree-sitter-sql", - "rev": "218b672499729ef71e4d66a949e4a1614488aeaa", - "date": "2022-06-30T19:50:55+02:00", - "path": "/nix/store/rcdcgwb28jblgb65k5zjw5zgmigiqjfl-tree-sitter-sql", - "sha256": "1j68h5jzc0d3a44v5mw005lh3zsrh0salfzydl9br1n8byl1awms", + "url": "https://github.com/derekstride/tree-sitter-sql", + "rev": "70c50264ae022193adb364ffa7a767d765ed9857", + "date": "2022-11-02T09:36:19-04:00", + "path": "/nix/store/f1pg3pf4fyfmls30l1ma1nlwq61fxxqs-tree-sitter-sql", + "sha256": "16s58bvll2r80zga63fjzjbkfxm3zdr3vljjk69cvjwnpy668yfh", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 63f749c890b48..92a755e4da6c6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -31,8 +31,6 @@ let "tree-sitter-scala" "tree-sitter-ocaml" "tree-sitter-julia" - "tree-sitter-agda" - "tree-sitter-fluent" "tree-sitter-html" "tree-sitter-haskell" "tree-sitter-regex" @@ -73,6 +71,10 @@ let "tree-sitter-graph" # abandoned "tree-sitter-swift" + # abandoned + "tree-sitter-agda" + # abandoned + "tree-sitter-fluent" ]; ignoredTreeSitterOrgReposJson = jsonFile "ignored-tree-sitter-org-repos" ignoredTreeSitterOrgRepos; @@ -137,7 +139,7 @@ let repo = "tree-sitter-svelte"; }; "tree-sitter-sql" = { - orga = "m-novikov"; + orga = "derekstride"; repo = "tree-sitter-sql"; }; "tree-sitter-vim" = { diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index f0de0c62687cb..c389bb1f1ac38 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.108"; + version = "0.0.109"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I2F4x4gsmL22j+atfxRQLKmKLdIwbXEEN8EcXV4ZAJA="; + sha256 = "sha256-11vaL8ztWLqhImQ4uzHPAwciHtegz320hDJq6kH8ujI="; }; - cargoSha256 = "sha256-EJm1bfJ9/Jqe0tCQftAz3qR8TBGxcZiqJnJ2QnhyE58="; + cargoSha256 = "sha256-ixjH6gbgrcMtGeLFFyAPTmgF43UAzkhpxNp2S59iwIY="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-wasi/0001-Add-Cargo.lock.patch b/pkgs/development/tools/rust/cargo-wasi/0001-Add-Cargo.lock.patch deleted file mode 100644 index 42db8c85c0b4a..0000000000000 --- a/pkgs/development/tools/rust/cargo-wasi/0001-Add-Cargo.lock.patch +++ /dev/null @@ -1,1513 +0,0 @@ -From ee4ad9b7606cd2b3b1c32b44715a35e852e682a9 Mon Sep 17 00:00:00 2001 -From: Luc Perkins <lucperkins@gmail.com> -Date: Mon, 15 Aug 2022 00:54:23 +0300 -Subject: [PATCH] Add Cargo.lock - ---- - .gitignore | 1 - - Cargo.lock | 1483 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1483 insertions(+), 1 deletion(-) - create mode 100644 Cargo.lock - -diff --git a/.gitignore b/.gitignore -index eff36f1..42a901f 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -1,5 +1,4 @@ - target --Cargo.lock - tmp - bump - bump.exe -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..0110599 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,1483 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "adler" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.61" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "508b352bb5c066aac251f6daf6b36eccd03e8a88e8081cd44959ea277a3af9a8" -+ -+[[package]] -+name = "assemble" -+version = "0.1.0" -+dependencies = [ -+ "anyhow", -+ "toml", -+] -+ -+[[package]] -+name = "assert_cmd" -+version = "1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" -+dependencies = [ -+ "bstr", -+ "doc-comment", -+ "predicates 2.1.1", -+ "predicates-core", -+ "predicates-tree", -+ "wait-timeout", -+] -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "autocfg" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -+ -+[[package]] -+name = "base64" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "bstr" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -+dependencies = [ -+ "lazy_static", -+ "memchr", -+ "regex-automata", -+] -+ -+[[package]] -+name = "bumpalo" -+version = "3.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" -+ -+[[package]] -+name = "bytes" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" -+ -+[[package]] -+name = "cargo-wasi" -+version = "0.1.26" -+dependencies = [ -+ "anyhow", -+ "assert_cmd", -+ "atty", -+ "dirs", -+ "flate2", -+ "fs2", -+ "predicates 1.0.8", -+ "reqwest", -+ "rustc-demangle", -+ "same-file", -+ "semver", -+ "serde", -+ "serde_json", -+ "tar", -+ "tempfile", -+ "termcolor", -+ "toml", -+ "walrus", -+ "wasmparser 0.78.2", -+ "which", -+] -+ -+[[package]] -+name = "cargo-wasi-shim" -+version = "0.0.0" -+dependencies = [ -+ "cfg-if", -+ "tempfile", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "core-foundation" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -+ -+[[package]] -+name = "crc32fast" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "difference" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -+ -+[[package]] -+name = "difflib" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -+ -+[[package]] -+name = "dirs" -+version = "3.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -+dependencies = [ -+ "dirs-sys", -+] -+ -+[[package]] -+name = "dirs-sys" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -+dependencies = [ -+ "libc", -+ "redox_users", -+ "winapi", -+] -+ -+[[package]] -+name = "doc-comment" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -+ -+[[package]] -+name = "either" -+version = "1.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" -+ -+[[package]] -+name = "encoding_rs" -+version = "0.8.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "fastrand" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -+dependencies = [ -+ "instant", -+] -+ -+[[package]] -+name = "filetime" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "windows-sys", -+] -+ -+[[package]] -+name = "flate2" -+version = "1.0.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -+dependencies = [ -+ "crc32fast", -+ "miniz_oxide", -+] -+ -+[[package]] -+name = "float-cmp" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" -+dependencies = [ -+ "num-traits", -+] -+ -+[[package]] -+name = "fnv" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "form_urlencoded" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -+dependencies = [ -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "fs2" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "futures-channel" -+version = "0.3.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" -+dependencies = [ -+ "futures-core", -+] -+ -+[[package]] -+name = "futures-core" -+version = "0.3.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" -+ -+[[package]] -+name = "futures-io" -+version = "0.3.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" -+ -+[[package]] -+name = "futures-sink" -+version = "0.3.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" -+ -+[[package]] -+name = "futures-task" -+version = "0.3.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" -+ -+[[package]] -+name = "futures-util" -+version = "0.3.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" -+dependencies = [ -+ "futures-core", -+ "futures-io", -+ "futures-task", -+ "memchr", -+ "pin-project-lite", -+ "pin-utils", -+ "slab", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.2.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "h2" -+version = "0.3.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" -+dependencies = [ -+ "bytes", -+ "fnv", -+ "futures-core", -+ "futures-sink", -+ "futures-util", -+ "http", -+ "indexmap", -+ "slab", -+ "tokio", -+ "tokio-util", -+ "tracing", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -+ -+[[package]] -+name = "heck" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -+dependencies = [ -+ "unicode-segmentation", -+] -+ -+[[package]] -+name = "hello-world" -+version = "0.1.0" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "http" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -+dependencies = [ -+ "bytes", -+ "fnv", -+ "itoa", -+] -+ -+[[package]] -+name = "http-body" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -+dependencies = [ -+ "bytes", -+ "http", -+ "pin-project-lite", -+] -+ -+[[package]] -+name = "httparse" -+version = "1.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" -+ -+[[package]] -+name = "httpdate" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -+ -+[[package]] -+name = "hyper" -+version = "0.14.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" -+dependencies = [ -+ "bytes", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "h2", -+ "http", -+ "http-body", -+ "httparse", -+ "httpdate", -+ "itoa", -+ "pin-project-lite", -+ "socket2", -+ "tokio", -+ "tower-service", -+ "tracing", -+ "want", -+] -+ -+[[package]] -+name = "hyper-tls" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -+dependencies = [ -+ "bytes", -+ "hyper", -+ "native-tls", -+ "tokio", -+ "tokio-native-tls", -+] -+ -+[[package]] -+name = "id-arena" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" -+ -+[[package]] -+name = "idna" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "indexmap" -+version = "1.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -+dependencies = [ -+ "autocfg", -+ "hashbrown", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "ipnet" -+version = "2.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" -+ -+[[package]] -+name = "itertools" -+version = "0.10.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "itoa" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" -+ -+[[package]] -+name = "js-sys" -+version = "0.3.59" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "leb128" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" -+ -+[[package]] -+name = "libc" -+version = "0.2.131" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04c3b4822ccebfa39c02fc03d1534441b22ead323fa0f48bb7ddd8e6ba076a40" -+ -+[[package]] -+name = "log" -+version = "0.4.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -+ -+[[package]] -+name = "memchr" -+version = "2.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -+ -+[[package]] -+name = "mime" -+version = "0.3.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" -+dependencies = [ -+ "adler", -+] -+ -+[[package]] -+name = "mio" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" -+dependencies = [ -+ "libc", -+ "log", -+ "wasi", -+ "windows-sys", -+] -+ -+[[package]] -+name = "native-tls" -+version = "0.2.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" -+dependencies = [ -+ "lazy_static", -+ "libc", -+ "log", -+ "openssl", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "security-framework", -+ "security-framework-sys", -+ "tempfile", -+] -+ -+[[package]] -+name = "normalize-line-endings" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" -+ -+[[package]] -+name = "num-traits" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.13.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" -+ -+[[package]] -+name = "openssl" -+version = "0.10.41" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" -+dependencies = [ -+ "bitflags", -+ "cfg-if", -+ "foreign-types", -+ "libc", -+ "once_cell", -+ "openssl-macros", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.75" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" -+dependencies = [ -+ "autocfg", -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+ -+[[package]] -+name = "pest" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8" -+dependencies = [ -+ "thiserror", -+ "ucd-trie", -+] -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" -+ -+[[package]] -+name = "pin-utils" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" -+ -+[[package]] -+name = "predicates" -+version = "1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" -+dependencies = [ -+ "difference", -+ "float-cmp", -+ "normalize-line-endings", -+ "predicates-core", -+ "regex", -+] -+ -+[[package]] -+name = "predicates" -+version = "2.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" -+dependencies = [ -+ "difflib", -+ "itertools", -+ "predicates-core", -+] -+ -+[[package]] -+name = "predicates-core" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb" -+ -+[[package]] -+name = "predicates-tree" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032" -+dependencies = [ -+ "predicates-core", -+ "termtree", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "redox_users" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -+dependencies = [ -+ "getrandom", -+ "redox_syscall", -+ "thiserror", -+] -+ -+[[package]] -+name = "regex" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-automata" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.27" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "reqwest" -+version = "0.11.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" -+dependencies = [ -+ "base64", -+ "bytes", -+ "encoding_rs", -+ "futures-core", -+ "futures-util", -+ "h2", -+ "http", -+ "http-body", -+ "hyper", -+ "hyper-tls", -+ "ipnet", -+ "js-sys", -+ "lazy_static", -+ "log", -+ "mime", -+ "native-tls", -+ "percent-encoding", -+ "pin-project-lite", -+ "serde", -+ "serde_json", -+ "serde_urlencoded", -+ "tokio", -+ "tokio-native-tls", -+ "tower-service", -+ "url", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "web-sys", -+ "winreg", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -+ -+[[package]] -+name = "ryu" -+version = "1.0.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -+ -+[[package]] -+name = "same-file" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "schannel" -+version = "0.1.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -+dependencies = [ -+ "lazy_static", -+ "windows-sys", -+] -+ -+[[package]] -+name = "security-framework" -+version = "2.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" -+dependencies = [ -+ "bitflags", -+ "core-foundation", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", -+] -+ -+[[package]] -+name = "security-framework-sys" -+version = "2.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "semver" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -+dependencies = [ -+ "semver-parser", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -+dependencies = [ -+ "pest", -+] -+ -+[[package]] -+name = "serde" -+version = "1.0.143" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.143" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "serde_urlencoded" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -+dependencies = [ -+ "form_urlencoded", -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "slab" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "socket2" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "tar" -+version = "0.4.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -+dependencies = [ -+ "filetime", -+ "libc", -+ "xattr", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -+dependencies = [ -+ "cfg-if", -+ "fastrand", -+ "libc", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "termtree" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" -+ -+[[package]] -+name = "thiserror" -+version = "1.0.32" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.32" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tinyvec" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -+dependencies = [ -+ "tinyvec_macros", -+] -+ -+[[package]] -+name = "tinyvec_macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -+ -+[[package]] -+name = "tokio" -+version = "1.20.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" -+dependencies = [ -+ "autocfg", -+ "bytes", -+ "libc", -+ "memchr", -+ "mio", -+ "num_cpus", -+ "once_cell", -+ "pin-project-lite", -+ "socket2", -+ "winapi", -+] -+ -+[[package]] -+name = "tokio-native-tls" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -+dependencies = [ -+ "native-tls", -+ "tokio", -+] -+ -+[[package]] -+name = "tokio-util" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" -+dependencies = [ -+ "bytes", -+ "futures-core", -+ "futures-sink", -+ "pin-project-lite", -+ "tokio", -+ "tracing", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "tower-service" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" -+ -+[[package]] -+name = "tracing" -+version = "0.1.36" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" -+dependencies = [ -+ "cfg-if", -+ "pin-project-lite", -+ "tracing-core", -+] -+ -+[[package]] -+name = "tracing-core" -+version = "0.1.29" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" -+dependencies = [ -+ "once_cell", -+] -+ -+[[package]] -+name = "try-lock" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -+ -+[[package]] -+name = "ucd-trie" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" -+dependencies = [ -+ "tinyvec", -+] -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" -+ -+[[package]] -+name = "url" -+version = "2.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -+dependencies = [ -+ "form_urlencoded", -+ "idna", -+ "matches", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -+ -+[[package]] -+name = "wait-timeout" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "walrus" -+version = "0.19.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" -+dependencies = [ -+ "anyhow", -+ "id-arena", -+ "leb128", -+ "log", -+ "walrus-macro", -+ "wasmparser 0.77.0", -+] -+ -+[[package]] -+name = "walrus-macro" -+version = "0.19.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" -+dependencies = [ -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "want" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -+dependencies = [ -+ "log", -+ "try-lock", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.11.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -+ -+[[package]] -+name = "wasm-bindgen" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -+dependencies = [ -+ "cfg-if", -+ "wasm-bindgen-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -+dependencies = [ -+ "bumpalo", -+ "log", -+ "once_cell", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-futures" -+version = "0.4.32" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" -+dependencies = [ -+ "cfg-if", -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -+dependencies = [ -+ "quote", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-backend", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" -+ -+[[package]] -+name = "wasmparser" -+version = "0.77.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" -+ -+[[package]] -+name = "wasmparser" -+version = "0.78.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" -+ -+[[package]] -+name = "web-sys" -+version = "0.3.59" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "which" -+version = "4.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" -+dependencies = [ -+ "either", -+ "lazy_static", -+ "libc", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "windows-sys" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -+dependencies = [ -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", -+ "windows_x86_64_msvc", -+] -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" -+ -+[[package]] -+name = "winreg" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "xattr" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -+dependencies = [ -+ "libc", -+] --- -2.37.1 - diff --git a/pkgs/development/tools/rust/cargo-wasi/default.nix b/pkgs/development/tools/rust/cargo-wasi/default.nix index 0acca7837a310..e26474baa1ee3 100644 --- a/pkgs/development/tools/rust/cargo-wasi/default.nix +++ b/pkgs/development/tools/rust/cargo-wasi/default.nix @@ -1,9 +1,9 @@ -{ stdenv -, lib -, fetchFromGitHub -, openssl -, pkg-config +{ lib , rustPlatform +, fetchCrate +, pkg-config +, stdenv +, openssl , Security }: @@ -11,24 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-wasi"; version = "0.1.26"; - src = fetchFromGitHub { - owner = "bytecodealliance"; - repo = pname; - rev = version; - sha256 = "sha256-jugq7A3L+5+YUSyp9WWKBd4BA2pcXKd4CMVg5OVMcEA="; + src = fetchCrate { + inherit version; + pname = "cargo-wasi-src"; + sha256 = "sha256-/u5GKqGwJWS6Gzc1WZ7O5ZSHHGoqBVZ4jQDEIfAyciE="; }; - cargoSha256 = "sha256-L4vRLYm1WaCmA4bGyY7D0yxXuqxGSHMMD/wlY8+MgPk="; + cargoSha256 = "sha256-eF3HrulY7HrKseCYyZyC2EuWboFvmia2qLymBxvopKI="; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoPatches = [ - ./0001-Add-Cargo.lock.patch - ]; - # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: # https://github.com/bytecodealliance/cargo-wasi/blob/0.1.26/tests/tests/support.rs#L13-L18 diff --git a/pkgs/development/tools/rust/humility/default.nix b/pkgs/development/tools/rust/humility/default.nix index 92e3e78077c1e..eb8ce703eae11 100644 --- a/pkgs/development/tools/rust/humility/default.nix +++ b/pkgs/development/tools/rust/humility/default.nix @@ -1,10 +1,12 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub -, libusb +, libusb1 , libftdi , cargo-readme , pkg-config +, AppKit }: rustPlatform.buildRustPackage rec { @@ -12,7 +14,9 @@ rustPlatform.buildRustPackage rec { version = "unstable-2022-09-15"; nativeBuildInputs = [ pkg-config cargo-readme ]; - buildInputs = [ libusb libftdi ]; + buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ]; src = fetchFromGitHub { owner = "oxidecomputer"; @@ -21,7 +25,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-yW7QcxTWbL2YsV2bvfhbqQ2nawlPQbYxBfIGCWo28GY="; }; - cargoSha256 = "sha256-UhO8VO3OCfYc8Xq/P+l9f5ZrhOD/TBzSClAeAXLJLlc="; + cargoSha256 = "sha256-IurLI0ZQNpmiYwfcMZuxi7FWtSX+Ts7GYWFwUfD+Ji8="; meta = with lib; { description = "Debugger for Hubris"; diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 4aa6dd211f702..4e96594fcb3c4 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: buildGoModule rec { pname = "sq"; - version = "0.15.6"; + version = "0.15.11"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QEg80di2DmMfIrvsRFp7nELs7LiJRVa/wENDnf1zQ2Y="; + sha256 = "sha256-sYaQb7MFeTgJ/WPuCuMYjLcgmO/FhMGgOvY1HfGh2ag="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 36ef7748ea18f..714354b0597a9 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "wails"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Vrd6RP/N5Lrh5Ocr2W03m41fJXVXLJZle4C6xeF/jxM="; + sha256 = "sha256-g5tZUVOZ2ywD2vS9B3y3GHaoABr2rSIZGUOsdUJOL8Q="; } + "/v2"; vendorSha256 = "sha256-jRW8SROt0CON17xZ+I3WiQow7yC1ly7pPHgbpEr1kW8="; diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 7e0f6bcefc4eb..fefd7c56d7610 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,6 +1,6 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20221012"; - sourceHash = "sha256-Lm7MHAgybnyYL668KJ2MMFNA4tGAu5NGK+jSkhOj890="; - outputHash = "sha256-xk5n9mQHpM+nNv8WqSaPpcsm9B8Gr4fGJouRWEfM2z0="; + version = "20221109"; + sourceHash = "sha256-77xRUo4g24j5rGWYzVn/DZ1rfY+Ks9cmZ/+GCHELP5E="; + outputHash = "sha256-pPhqbi4PRr+0FQ7K8M/SibgYeI45spcdqgb5garyJo8="; } diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch deleted file mode 100644 index 596718b83c432..0000000000000 --- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch +++ /dev/null @@ -1,784 +0,0 @@ -commit 280858b0bb3384b9ec06b455e196b453888bd6b8 -Author: Tejun Heo <tj@kernel.org> -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Misc preps for cgroup unified hierarchy interface - - Make the following changes in preparation for the cpu controller - interface implementation for the unified hierarchy. This patch - doesn't cause any functional differences. - - * s/cpu_stats_show()/cpu_cfs_stats_show()/ - - * s/cpu_files/cpu_legacy_files/ - - * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While - at it, make the @val array u64 for consistency. - - Signed-off-by: Tejun Heo <tj@kernel.org> - Cc: Ingo Molnar <mingo@redhat.com> - Cc: Peter Zijlstra <peterz@infradead.org> - Cc: Li Zefan <lizefan@huawei.com> - Cc: Johannes Weiner <hannes@cmpxchg.org> - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 154fd689fe02..57472485b79c 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8705,7 +8705,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) - return ret; - } - --static int cpu_stats_show(struct seq_file *sf, void *v) -+static int cpu_cfs_stats_show(struct seq_file *sf, void *v) - { - struct task_group *tg = css_tg(seq_css(sf)); - struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -@@ -8745,7 +8745,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, - } - #endif /* CONFIG_RT_GROUP_SCHED */ - --static struct cftype cpu_files[] = { -+static struct cftype cpu_legacy_files[] = { - #ifdef CONFIG_FAIR_GROUP_SCHED - { - .name = "shares", -@@ -8766,7 +8766,7 @@ static struct cftype cpu_files[] = { - }, - { - .name = "stat", -- .seq_show = cpu_stats_show, -+ .seq_show = cpu_cfs_stats_show, - }, - #endif - #ifdef CONFIG_RT_GROUP_SCHED -@@ -8791,7 +8791,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .fork = cpu_cgroup_fork, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -- .legacy_cftypes = cpu_files, -+ .legacy_cftypes = cpu_legacy_files, - .early_init = true, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index bc0b309c3f19..d1e5dd0b3a64 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -276,26 +276,33 @@ static int cpuacct_all_seq_show(struct seq_file *m, void *V) - return 0; - } - --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, -+ u64 (*val)[CPUACCT_STAT_NSTATS]) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); -- s64 val[CPUACCT_STAT_NSTATS]; - int cpu; -- int stat; - -- memset(val, 0, sizeof(val)); -+ memset(val, 0, sizeof(*val)); -+ - for_each_possible_cpu(cpu) { - u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat; - -- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; -- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; -- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; -- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; -- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; -+ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; -+ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; -+ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; -+ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; -+ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; - } -+} -+ -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ u64 val[CPUACCT_STAT_NSTATS]; -+ int stat; -+ -+ cpuacct_stats_read(css_ca(seq_css(sf)), &val); - - for (stat = 0; stat < CPUACCT_STAT_NSTATS; stat++) { -- seq_printf(sf, "%s %lld\n", -+ seq_printf(sf, "%s %llu\n", - cpuacct_stat_desc[stat], - cputime64_to_clock_t(val[stat])); - } - -commit 015cbdcb90034fd566d00de9d3d405613da3cd26 -Author: Tejun Heo <tj@kernel.org> -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Implement interface for cgroup unified hierarchy - - While the cpu controller doesn't have any functional problems, there - are a couple interface issues which can be addressed in the v2 - interface. - - * cpuacct being a separate controller. This separation is artificial - and rather pointless as demonstrated by most use cases co-mounting - the two controllers. It also forces certain information to be - accounted twice. - - * Use of different time units. Writable control knobs use - microseconds, some stat fields use nanoseconds while other cpuacct - stat fields use centiseconds. - - * Control knobs which can't be used in the root cgroup still show up - in the root. - - * Control knob names and semantics aren't consistent with other - controllers. - - This patchset implements cpu controller's interface on the unified - hierarchy which adheres to the controller file conventions described - in Documentation/cgroups/unified-hierarchy.txt. Overall, the - following changes are made. - - * cpuacct is implictly enabled and disabled by cpu and its information - is reported through "cpu.stat" which now uses microseconds for all - time durations. All time duration fields now have "_usec" appended - to them for clarity. While this doesn't solve the double accounting - immediately, once majority of users switch to v2, cpu can directly - account and report the relevant stats and cpuacct can be disabled on - the unified hierarchy. - - Note that cpuacct.usage_percpu is currently not included in - "cpu.stat". If this information is actually called for, it can be - added later. - - * "cpu.shares" is replaced with "cpu.weight" and operates on the - standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). - The weight is scaled to scheduler weight so that 100 maps to 1024 - and the ratio relationship is preserved - if weight is W and its - scaled value is S, W / 100 == S / 1024. While the mapped range is a - bit smaller than the orignal scheduler weight range, the dead zones - on both sides are relatively small and covers wider range than the - nice value mappings. This file doesn't make sense in the root - cgroup and isn't create on root. - - * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" - which contains both quota and period. - - * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by - "cpu.rt.max" which contains both runtime and period. - - v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for - CFS bandwidth stats and also using raw division for u64. Use - CONFIG_CFS_BANDWITH and do_div() instead. - - The semantics of "cpu.rt.max" is not fully decided yet. Dropped - for now. - - Signed-off-by: Tejun Heo <tj@kernel.org> - Cc: Ingo Molnar <mingo@redhat.com> - Cc: Peter Zijlstra <peterz@infradead.org> - Cc: Li Zefan <lizefan@huawei.com> - Cc: Johannes Weiner <hannes@cmpxchg.org> - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 57472485b79c..c0ae869f51c4 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8784,6 +8784,139 @@ static struct cftype cpu_legacy_files[] = { - { } /* terminate */ - }; - -+static int cpu_stats_show(struct seq_file *sf, void *v) -+{ -+ cpuacct_cpu_stats_show(sf); -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ struct task_group *tg = css_tg(seq_css(sf)); -+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -+ u64 throttled_usec; -+ -+ throttled_usec = cfs_b->throttled_time; -+ do_div(throttled_usec, NSEC_PER_USEC); -+ -+ seq_printf(sf, "nr_periods %d\n" -+ "nr_throttled %d\n" -+ "throttled_usec %llu\n", -+ cfs_b->nr_periods, cfs_b->nr_throttled, -+ throttled_usec); -+ } -+#endif -+ return 0; -+} -+ -+#ifdef CONFIG_FAIR_GROUP_SCHED -+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, -+ struct cftype *cft) -+{ -+ struct task_group *tg = css_tg(css); -+ u64 weight = scale_load_down(tg->shares); -+ -+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); -+} -+ -+static int cpu_weight_write_u64(struct cgroup_subsys_state *css, -+ struct cftype *cftype, u64 weight) -+{ -+ /* -+ * cgroup weight knobs should use the common MIN, DFL and MAX -+ * values which are 1, 100 and 10000 respectively. While it loses -+ * a bit of range on both ends, it maps pretty well onto the shares -+ * value used by scheduler and the round-trip conversions preserve -+ * the original value over the entire range. -+ */ -+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) -+ return -ERANGE; -+ -+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); -+ -+ return sched_group_set_shares(css_tg(css), scale_load(weight)); -+} -+#endif -+ -+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, -+ long period, long quota) -+{ -+ if (quota < 0) -+ seq_puts(sf, "max"); -+ else -+ seq_printf(sf, "%ld", quota); -+ -+ seq_printf(sf, " %ld\n", period); -+} -+ -+/* caller should put the current value in *@periodp before calling */ -+static int __maybe_unused cpu_period_quota_parse(char *buf, -+ u64 *periodp, u64 *quotap) -+{ -+ char tok[21]; /* U64_MAX */ -+ -+ if (!sscanf(buf, "%s %llu", tok, periodp)) -+ return -EINVAL; -+ -+ *periodp *= NSEC_PER_USEC; -+ -+ if (sscanf(tok, "%llu", quotap)) -+ *quotap *= NSEC_PER_USEC; -+ else if (!strcmp(tok, "max")) -+ *quotap = RUNTIME_INF; -+ else -+ return -EINVAL; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+static int cpu_max_show(struct seq_file *sf, void *v) -+{ -+ struct task_group *tg = css_tg(seq_css(sf)); -+ -+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); -+ return 0; -+} -+ -+static ssize_t cpu_max_write(struct kernfs_open_file *of, -+ char *buf, size_t nbytes, loff_t off) -+{ -+ struct task_group *tg = css_tg(of_css(of)); -+ u64 period = tg_get_cfs_period(tg); -+ u64 quota; -+ int ret; -+ -+ ret = cpu_period_quota_parse(buf, &period, "a); -+ if (!ret) -+ ret = tg_set_cfs_bandwidth(tg, period, quota); -+ return ret ?: nbytes; -+} -+#endif -+ -+static struct cftype cpu_files[] = { -+ { -+ .name = "stat", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_stats_show, -+ }, -+#ifdef CONFIG_FAIR_GROUP_SCHED -+ { -+ .name = "weight", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .read_u64 = cpu_weight_read_u64, -+ .write_u64 = cpu_weight_write_u64, -+ }, -+#endif -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ .name = "max", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_max_show, -+ .write = cpu_max_write, -+ }, -+#endif -+ { } /* terminate */ -+}; -+ - struct cgroup_subsys cpu_cgrp_subsys = { - .css_alloc = cpu_cgroup_css_alloc, - .css_released = cpu_cgroup_css_released, -@@ -8792,7 +8925,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, - .legacy_cftypes = cpu_legacy_files, -+ .dfl_cftypes = cpu_files, - .early_init = true, -+#ifdef CONFIG_CGROUP_CPUACCT -+ /* -+ * cpuacct is enabled together with cpu on the unified hierarchy -+ * and its stats are reported through "cpu.stat". -+ */ -+ .depends_on = 1 << cpuacct_cgrp_id, -+#endif - }; - - #endif /* CONFIG_CGROUP_SCHED */ -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index d1e5dd0b3a64..57f390514c39 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -347,6 +347,31 @@ static struct cftype files[] = { - { } /* terminate */ - }; - -+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ -+void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+ struct cgroup_subsys_state *css; -+ u64 usage, val[CPUACCT_STAT_NSTATS]; -+ -+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); -+ -+ usage = cpuusage_read(css, seq_cft(sf)); -+ cpuacct_stats_read(css_ca(css), &val); -+ -+ val[CPUACCT_STAT_USER] *= TICK_NSEC; -+ val[CPUACCT_STAT_SYSTEM] *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(val[CPUACCT_STAT_USER], NSEC_PER_USEC); -+ do_div(val[CPUACCT_STAT_SYSTEM], NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", -+ usage, val[CPUACCT_STAT_USER], val[CPUACCT_STAT_SYSTEM]); -+ -+ css_put(css); -+} -+ - /* - * charge this task's execution time to its accounting group. - * -diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h -index ba72807c73d4..ddf7af466d35 100644 ---- a/kernel/sched/cpuacct.h -+++ b/kernel/sched/cpuacct.h -@@ -2,6 +2,7 @@ - - extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); - extern void cpuacct_account_field(struct task_struct *tsk, int index, u64 val); -+extern void cpuacct_cpu_stats_show(struct seq_file *sf); - - #else - -@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *tsk, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif - -commit 5019fe3d7ec456b58d451ef06fe1f81d7d9f28a9 -Author: Tejun Heo <tj@kernel.org> -Date: Fri Aug 5 12:41:01 2016 -0400 - - cgroup: add documentation regarding CPU controller cgroup v2 support - - Signed-off-by: Tejun Heo <tj@kernel.org> - -diff --git a/Documentation/cgroup-v2-cpu.txt b/Documentation/cgroup-v2-cpu.txt -new file mode 100644 -index 000000000000..1ed7032d4472 ---- /dev/null -+++ b/Documentation/cgroup-v2-cpu.txt -@@ -0,0 +1,368 @@ -+ -+ -+CPU Controller on Control Group v2 -+ -+August, 2016 Tejun Heo <tj@kernel.org> -+ -+ -+While most controllers have support for cgroup v2 now, the CPU -+controller support is not upstream yet due to objections from the -+scheduler maintainers on the basic designs of cgroup v2. This -+document explains the current situation as well as an interim -+solution, and details the disagreements and arguments. The latest -+version of this document can be found at the following URL. -+ -+ https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu -+ -+This document was posted to the linux-kernel and cgroup mailing lists. -+Unfortunately, no consensus was reached as of Oct, 2016. The thread -+can be found at the following URL. -+ -+ http://lkml.kernel.org/r/20160805170752.GK2542@mtj.duckdns.org -+ -+ -+CONTENTS -+ -+1. Current Situation and Interim Solution -+2. Disagreements and Arguments -+ 2-1. Contentious Restrictions -+ 2-1-1. Process Granularity -+ 2-1-2. No Internal Process Constraint -+ 2-2. Impact on CPU Controller -+ 2-2-1. Impact of Process Granularity -+ 2-2-2. Impact of No Internal Process Constraint -+ 2-3. Arguments for cgroup v2 -+3. Way Forward -+4. References -+ -+ -+1. Current Situation and Interim Solution -+ -+All objections from the scheduler maintainers apply to cgroup v2 core -+design, and there are no known objections to the specifics of the CPU -+controller cgroup v2 interface. The only blocked part is changes to -+expose the CPU controller interface on cgroup v2, which comprises the -+following two patches: -+ -+ [1] sched: Misc preps for cgroup unified hierarchy interface -+ [2] sched: Implement interface for cgroup unified hierarchy -+ -+The necessary changes are superficial and implement the interface -+files on cgroup v2. The combined diffstat is as follows. -+ -+ kernel/sched/core.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++-- -+ kernel/sched/cpuacct.c | 57 ++++++++++++------ -+ kernel/sched/cpuacct.h | 5 + -+ 3 files changed, 189 insertions(+), 22 deletions(-) -+ -+The patches are easy to apply and forward-port. The following git -+branch will always carry the two patches on top of the latest release -+of the upstream kernel. -+ -+ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu -+ -+There also are versioned branches going back to v4.4. -+ -+ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu-$KERNEL_VER -+ -+While it's difficult to tell whether the CPU controller support will -+be merged, there are crucial resource control features in cgroup v2 -+that are only possible due to the design choices that are being -+objected to, and every effort will be made to ease enabling the CPU -+controller cgroup v2 support out-of-tree for parties which choose to. -+ -+ -+2. Disagreements and Arguments -+ -+There have been several lengthy discussion threads [3][4] on LKML -+around the structural constraints of cgroup v2. The two that affect -+the CPU controller are process granularity and no internal process -+constraint. Both arise primarily from the need for common resource -+domain definition across different resources. -+ -+The common resource domain is a powerful concept in cgroup v2 that -+allows controllers to make basic assumptions about the structural -+organization of processes and controllers inside the cgroup hierarchy, -+and thus solve problems spanning multiple types of resources. The -+prime example for this is page cache writeback: dirty page cache is -+regulated through throttling buffered writers based on memory -+availability, and initiating batched write outs to the disk based on -+IO capacity. Tracking and controlling writeback inside a cgroup thus -+requires the direct cooperation of the memory and the IO controller. -+ -+This easily extends to other areas, such as CPU cycles consumed while -+performing memory reclaim or IO encryption. -+ -+ -+2-1. Contentious Restrictions -+ -+For controllers of different resources to work together, they must -+agree on a common organization. This uniform model across controllers -+imposes two contentious restrictions on the CPU controller: process -+granularity and the no-internal-process constraint. -+ -+ -+ 2-1-1. Process Granularity -+ -+ For memory, because an address space is shared between all threads -+ of a process, the terminal consumer is a process, not a thread. -+ Separating the threads of a single process into different memory -+ control domains doesn't make semantical sense. cgroup v2 ensures -+ that all controller can agree on the same organization by requiring -+ that threads of the same process belong to the same cgroup. -+ -+ There are other reasons to enforce process granularity. One -+ important one is isolating system-level management operations from -+ in-process application operations. The cgroup interface, being a -+ virtual filesystem, is very unfit for multiple independent -+ operations taking place at the same time as most operations have to -+ be multi-step and there is no way to synchronize multiple accessors. -+ See also [5] Documentation/cgroup-v2.txt, "R-2. Thread Granularity" -+ -+ -+ 2-1-2. No Internal Process Constraint -+ -+ cgroup v2 does not allow processes to belong to any cgroup which has -+ child cgroups when resource controllers are enabled on it (the -+ notable exception being the root cgroup itself). This is because, -+ for some resources, a resource domain (cgroup) is not directly -+ comparable to the terminal consumer (process/task) of said resource, -+ and so putting the two into a sibling relationship isn't meaningful. -+ -+ - Differing Control Parameters and Capabilities -+ -+ A cgroup controller has different resource control parameters and -+ capabilities from a terminal consumer, be that a task or process. -+ There are a couple cases where a cgroup control knob can be mapped -+ to a per-task or per-process API but they are exceptions and the -+ mappings aren't obvious even in those cases. -+ -+ For example, task priorities (also known as nice values) set -+ through setpriority(2) are mapped to the CPU controller -+ "cpu.shares" values. However, how exactly the two ranges map and -+ even the fact that they map to each other at all are not obvious. -+ -+ The situation gets further muddled when considering other resource -+ types and control knobs. IO priorities set through ioprio_set(2) -+ cannot be mapped to IO controller weights and most cgroup resource -+ control knobs including the bandwidth control knobs of the CPU -+ controller don't have counterparts in the terminal consumers. -+ -+ - Anonymous Resource Consumption -+ -+ For CPU, every time slice consumed from inside a cgroup, which -+ comprises most but not all of consumed CPU time for the cgroup, -+ can be clearly attributed to a specific task or process. Because -+ these two types of entities are directly comparable as consumers -+ of CPU time, it's theoretically possible to mix tasks and cgroups -+ on the same tree levels and let them directly compete for the time -+ quota available to their common ancestor. -+ -+ However, the same can't be said for resource types like memory or -+ IO: the memory consumed by the page cache, for example, can be -+ tracked on a per-cgroup level, but due to mismatches in lifetimes -+ of involved objects (page cache can persist long after processes -+ are gone), shared usages and the implementation overhead of -+ tracking persistent state, it can no longer be attributed to -+ individual processes after instantiation. Consequently, any IO -+ incurred by page cache writeback can be attributed to a cgroup, -+ but not to the individual consumers inside the cgroup. -+ -+ For memory and IO, this makes a resource domain (cgroup) an object -+ of a fundamentally different type than a terminal consumer -+ (process). A process can't be a first class object in the resource -+ distribution graph as its total resource consumption can't be -+ described without the containing resource domain. -+ -+ Disallowing processes in internal cgroups avoids competition between -+ cgroups and processes which cannot be meaningfully defined for these -+ resources. All resource control takes place among cgroups and a -+ terminal consumer interacts with the containing cgroup the same way -+ it would with the system without cgroup. -+ -+ Root cgroup is exempt from this constraint, which is in line with -+ how root cgroup is handled in general - it's excluded from cgroup -+ resource accounting and control. -+ -+ -+Enforcing process granularity and no internal process constraint -+allows all controllers to be on the same footing in terms of resource -+distribution hierarchy. -+ -+ -+2-2. Impact on CPU Controller -+ -+As indicated earlier, the CPU controller's resource distribution graph -+is the simplest. Every schedulable resource consumption can be -+attributed to a specific task. In addition, for weight based control, -+the per-task priority set through setpriority(2) can be translated to -+and from a per-cgroup weight. As such, the CPU controller can treat a -+task and a cgroup symmetrically, allowing support for any tree layout -+of cgroups and tasks. Both process granularity and the no internal -+process constraint restrict how the CPU controller can be used. -+ -+ -+ 2-2-1. Impact of Process Granularity -+ -+ Process granularity prevents tasks belonging to the same process to -+ be assigned to different cgroups. It was pointed out [6] that this -+ excludes the valid use case of hierarchical CPU distribution within -+ processes. -+ -+ To address this issue, the rgroup (resource group) [7][8][9] -+ interface, an extension of the existing setpriority(2) API, was -+ proposed, which is in line with other programmable priority -+ mechanisms and eliminates the risk of in-application configuration -+ and system configuration stepping on each other's toes. -+ Unfortunately, the proposal quickly turned into discussions around -+ cgroup v2 design decisions [4] and no consensus could be reached. -+ -+ -+ 2-2-2. Impact of No Internal Process Constraint -+ -+ The no internal process constraint disallows tasks from competing -+ directly against cgroups. Here is an excerpt from Peter Zijlstra -+ pointing out the issue [10] - R, L and A are cgroups; t1, t2, t3 and -+ t4 are tasks: -+ -+ -+ R -+ / | \ -+ t1 t2 A -+ / \ -+ t3 t4 -+ -+ -+ Is fundamentally different from: -+ -+ -+ R -+ / \ -+ L A -+ / \ / \ -+ t1 t2 t3 t4 -+ -+ -+ Because if in the first hierarchy you add a task (t5) to R, all of -+ its A will run at 1/4th of total bandwidth where before it had -+ 1/3rd, whereas with the second example, if you add our t5 to L, A -+ doesn't get any less bandwidth. -+ -+ -+ It is true that the trees are semantically different from each other -+ and the symmetric handling of tasks and cgroups is aesthetically -+ pleasing. However, it isn't clear what the practical usefulness of -+ a layout with direct competition between tasks and cgroups would be, -+ considering that number and behavior of tasks are controlled by each -+ application, and cgroups primarily deal with system level resource -+ distribution; changes in the number of active threads would directly -+ impact resource distribution. Real world use cases of such layouts -+ could not be established during the discussions. -+ -+ -+2-3. Arguments for cgroup v2 -+ -+There are strong demands for comprehensive hierarchical resource -+control across all major resources, and establishing a common resource -+hierarchy is an essential step. As with most engineering decisions, -+common resource hierarchy definition comes with its trade-offs. With -+cgroup v2, the trade-offs are in the form of structural constraints -+which, among others, restrict the CPU controller's space of possible -+configurations. -+ -+However, even with the restrictions, cgroup v2, in combination with -+rgroup, covers most of identified real world use cases while enabling -+new important use cases of resource control across multiple resource -+types that were fundamentally broken previously. -+ -+Furthermore, for resource control, treating resource domains as -+objects of a different type from terminal consumers has important -+advantages - it can account for resource consumptions which are not -+tied to any specific terminal consumer, be that a task or process, and -+allows decoupling resource distribution controls from in-application -+APIs. Even the CPU controller may benefit from it as the kernel can -+consume significant amount of CPU cycles in interrupt context or tasks -+shared across multiple resource domains (e.g. softirq). -+ -+Finally, it's important to note that enabling cgroup v2 support for -+the CPU controller doesn't block use cases which require the features -+which are not available on cgroup v2. Unlikely, but should anybody -+actually rely on the CPU controller's symmetric handling of tasks and -+cgroups, backward compatibility is and will be maintained by being -+able to disconnect the controller from the cgroup v2 hierarchy and use -+it standalone. This also holds for cpuset which is often used in -+highly customized configurations which might be a poor fit for common -+resource domains. -+ -+The required changes are minimal, the benefits for the target use -+cases are critical and obvious, and use cases which have to use v1 can -+continue to do so. -+ -+ -+3. Way Forward -+ -+cgroup v2 primarily aims to solve the problem of comprehensive -+hierarchical resource control across all major computing resources, -+which is one of the core problems of modern server infrastructure -+engineering. The trade-offs that cgroup v2 took are results of -+pursuing that goal and gaining a better understanding of the nature of -+resource control in the process. -+ -+I believe that real world usages will prove cgroup v2's model right, -+considering the crucial pieces of comprehensive resource control that -+cannot be implemented without common resource domains. This is not to -+say that cgroup v2 is fixed in stone and can't be updated; if there is -+an approach which better serves both comprehensive resource control -+and the CPU controller's flexibility, we will surely move towards -+that. It goes without saying that discussions around such approach -+should consider practical aspects of resource control as a whole -+rather than absolutely focusing on a particular controller. -+ -+Until such consensus can be reached, the CPU controller cgroup v2 -+support will be maintained out of the mainline kernel in an easily -+accessible form. If there is anything cgroup developers can do to -+ease the pain, please feel free to contact us on the cgroup mailing -+list at cgroups@vger.kernel.org. -+ -+ -+4. References -+ -+[1] http://lkml.kernel.org/r/20160105164834.GE5995@mtj.duckdns.org -+ [PATCH 1/2] sched: Misc preps for cgroup unified hierarchy interface -+ Tejun Heo <tj@kernel.org> -+ -+[2] http://lkml.kernel.org/r/20160105164852.GF5995@mtj.duckdns.org -+ [PATCH 2/2] sched: Implement interface for cgroup unified hierarchy -+ Tejun Heo <tj@kernel.org> -+ -+[3] http://lkml.kernel.org/r/1438641689-14655-4-git-send-email-tj@kernel.org -+ [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy -+ Tejun Heo <tj@kernel.org> -+ -+[4] http://lkml.kernel.org/r/20160407064549.GH3430@twins.programming.kicks-ass.net -+ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP -+ Peter Zijlstra <peterz@infradead.org> -+ -+[5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt -+ Control Group v2 -+ Tejun Heo <tj@kernel.org> -+ -+[6] http://lkml.kernel.org/r/CAPM31RJNy3jgG=DYe6GO=wyL4BPPxwUm1f2S6YXacQmo7viFZA@mail.gmail.com -+ Re: [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy -+ Paul Turner <pjt@google.com> -+ -+[7] http://lkml.kernel.org/r/20160105154503.GC5995@mtj.duckdns.org -+ [RFD] cgroup: thread granularity support for cpu controller -+ Tejun Heo <tj@kernel.org> -+ -+[8] http://lkml.kernel.org/r/1457710888-31182-1-git-send-email-tj@kernel.org -+ [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP -+ Tejun Heo <tj@kernel.org> -+ -+[9] http://lkml.kernel.org/r/20160311160522.GA24046@htj.duckdns.org -+ Example program for PRIO_RGRP -+ Tejun Heo <tj@kernel.org> -+ -+[10] http://lkml.kernel.org/r/20160407082810.GN3430@twins.programming.kicks-ass.net -+ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource -+ Peter Zijlstra <peterz@infradead.org> diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix deleted file mode 100644 index c58e05b485e5c..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: - -buildLinux (args // rec { - version = "4.9.332"; - extraMeta.branch = "4.9"; - extraMeta.broken = stdenv.isAarch64; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kiqa9kw4932n5qglkyymsrak849wbbszw9rnq1aygmdinjz4c8i"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 8b0c066548f76..d212c65cec72b 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , ngtcp2-gnutls , autoreconfHook @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch ./runtime-deps.patch + # knsupdate: fix segfault due to NULL pointer access when sending an update + (fetchpatch { + url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/8a6645dab63d8fa7932c7d8f747fe33e8cc97e84.patch"; + hash = "sha256-qzhSdRH5GqHqN9eLMWbDXmjO4JagsMRSZh3NWRFprao="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 8a3e91bf0305f..b48df635ef5f2 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -10,6 +10,7 @@ , json_c , linux-pam , libevent +, libxcrypt , nspr , nss , openldap @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { json_c linux-pam libevent + libxcrypt nspr nss cyrus_sasl diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 1ddcf28e93d4c..112a86e19d569 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.38.0"; + version = "2.40.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - sha256 = "sha256-0CcWHJYso9iI1isCa2ZKYtNpfqcUt5sj23xkufxv6rw="; + sha256 = "sha256-1uNwGs/UmwMhST7LyDq4hUEW9Y6xpmvCDDT3f58r3d4="; }; in buildGoModule rec { @@ -45,10 +45,10 @@ buildGoModule rec { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "sha256-5s2Q3xjublHAQSB6MaxZTMOPS0T6/Bn5Ki8NCkBYM2E="; + sha256 = "sha256-QKeZ4N5I4VjTIT5WmEGt+gXt1Nnx3tzecLaSlhvGGuE="; }; - vendorSha256 = "sha256-wfHdfW4D4ESbglUUjAl5a93aJqLuQkqKHMChHGnCmCg="; + vendorSha256 = "sha256-aRVoEgP84ITQ1D0PsFVJUKH/Uin7s80iQCwzgrfpjoM="; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix index c60a176011c8d..a61466470ca5f 100644 --- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fastly-exporter"; - version = "7.2.4"; + version = "7.2.5"; src = fetchFromGitHub { owner = "peterbourgon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dg2JPVZJSjbBirvKvfQHGi06Fah48RHk5vbHgn5Q59M="; + sha256 = "sha256-W/P4jUBNDR3t7FESNyUUnNWfGR0PI/dG03EVKYt8S2Y="; }; - vendorSha256 = "sha256-wsOgZTeErUQkt+yJ7P0Oi8Ks7WBj/e457lZNs+ZwJgY="; + vendorSha256 = "sha256-exoDUxcOXVn7wUqfLLtJpklPYFHjLodEYa3lF+qFD+A="; meta = with lib; { description = "Prometheus exporter for the Fastly Real-time Analytics API"; diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 83140c81f6379..e2e55308d996a 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unifi-poller"; - version = "2.1.3"; + version = "2.1.7"; src = fetchFromGitHub { owner = "unifi-poller"; repo = "unifi-poller"; rev = "v${version}"; - sha256 = "sha256-xh9s1xAhIeEmeDprl7iPdE6pxmxZjzgMvilobiIoJp0="; + sha256 = "sha256-79aBqYS8B+gIqmhu/UIA7g+FvTS/68qsK7qi5MGH10k="; }; - vendorSha256 = "sha256-HoYgBKTl9HIMVzzzNYtRrfmqb7HCpPHVPeR4gUXneWk="; + vendorSha256 = "sha256-WVYQ3cZOO+EyJRTFcMjziDHwqqinm1IvxvSLuHTaqT8="; ldflags = [ "-w" "-s" diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index afb84fe70e321..9b2ac7a5567f2 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -49,7 +49,6 @@ gcc10Stdenv.mkDerivation rec { # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory" dontFixCmake = true; NIX_CFLAGS_COMPILE = "-Wno-error"; - preConfigure = "patchShebangs utils"; postPatch = '' sed -ie 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi @@ -59,6 +58,10 @@ gcc10Stdenv.mkDerivation rec { substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" "" ''; + preConfigure = '' + patchShebangs utils + ''; + cmakeFlags = [ "-DUSE_MAINTAINER_MODE=OFF" "-DUSE_GOOGLE_TESTS=OFF" @@ -76,6 +79,6 @@ gcc10Stdenv.mkDerivation rec { description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.flosse maintainers.jsoo1 ]; + maintainers = with maintainers; [ flosse jsoo1 ]; }; } diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 071d851f0523f..e1493e9528db9 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zQ68PN3CbLx6Z84jFeuAck6mzp9f3sbALgVqssecsUU="; + sha256 = "sha256-anc2nFZXYO0Ab5xwDasXGw8/SluNt15C6pRmQfUJVDs="; }; - cargoSha256 = "sha256-M8JO4E8TwLbPGdwslO2Uw+ooAJkIoyc1t1wgxw8CFF0="; + cargoSha256 = "sha256-EyrQR9gevInCI4kBZvUW5U9FrE0ZHbRUFyLKVZefKEE="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index c5607b4d037ed..27c5282fe285d 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,7 +1,6 @@ { lib, stdenv , buildPackages , fetchurl -, wafHook , pkg-config , bison , flex @@ -46,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.9"; + version = "4.17.2"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-loKixxwv8lOqJ8uwEmDqyJf/YlzznbIO4yBz5Thv4hk="; + hash = "sha256-5V3fTVF4+MhDFqv1PF7dezU5njt9hry4G3UmHIJ7s7g="; }; outputs = [ "out" "dev" "man" ]; @@ -60,17 +59,16 @@ stdenv.mkDerivation rec { ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch ./4.x-fix-makeflags-parsing.patch - ./build-find-pre-built-heimdal-build-tools-in-case-of-.patch ]; nativeBuildInputs = [ python3Packages.python - wafHook pkg-config bison flex perl perl.pkgs.ParseYapp + perl.pkgs.JSON libxslt buildPackages.stdenv.cc heimdal @@ -108,8 +106,6 @@ stdenv.mkDerivation rec { ++ optional enableAcl acl ++ optional enablePam pam; - wafPath = "buildtools/bin/waf"; - postPatch = '' # Removes absolute paths in scripts sed -i 's,/sbin/,,g' ctdb/config/functions @@ -124,7 +120,7 @@ stdenv.mkDerivation rec { export PKGCONFIG="$PKG_CONFIG" ''; - wafConfigureFlags = [ + configureFlags = [ "--with-static-modules=NONE" "--with-shared-modules=ALL" "--enable-fhs" diff --git a/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch deleted file mode 100644 index ff264fe1c0af6..0000000000000 --- a/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ /dev/null @@ -1,95 +0,0 @@ -From f3f98c6ecc6febd8e79696672668e33d11fc19cb Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@nextrem.ch> -Date: Wed, 22 Sep 2021 09:42:42 +0200 -Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded - heimdal - -This patch fixes the case of finding asn1_compile and compile_et for -building embedded heimdal, by setting ---bundled-libraries='!asn1_compile,!compile_et' as configure flags. - -The Heimdal build tools compile_et and asn1_compile are needed *only* -if we use the embedded heimdal (otherwise we don't build heimdal and -use headers that have been generated by those tools elsewhere). - -For cross-compilation with embedded heimdal, it is vital to use host build -tools, and so asn1_compile and compile_et must be supplied and not -built. One way of doing this would be to set the COMPILE_ET and -ASN1_COMPILE env vars to the location of supplied binaries. Another way, -which is more commonly used, is to exclude asn1_compile and compile_et -from bundled packages via the switch --bundled-libraries='!asn1_compile,!compile_et'. When this is done, -the build script searches the path for those tools and sets the -ASN1_COMPILE and COMPILE_ET vars accordingly. (this is admittedly -kind of a round-about way of doing things but this has become the -de-facto standard amongst embedded distro builders). - -In commit 8061983d4882f3ba3f12da71443b035d7b672eec, this process of -finding the binaris has been moved to be carried out only in the -system heimdal case. As explained above, we only need these tools, -and hence the check, in bundled mode. - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 - -Signed-off-by: Uri Simchoni <uri@samba.org> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> -[Bachp: rebased for version 4.15.0] - -# Conflicts: -# wscript_configure_system_heimdal ---- - wscript_configure_embedded_heimdal | 11 +++++++++++ - wscript_configure_system_heimdal | 11 ----------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal -index 1c7801f705e..edcab15a88e 100644 ---- a/wscript_configure_embedded_heimdal -+++ b/wscript_configure_embedded_heimdal -@@ -6,3 +6,14 @@ if not conf.env['BISON']: - - conf.define('USING_EMBEDDED_HEIMDAL', 1) - conf.RECURSE('source4/heimdal_build') -+ -+def check_system_heimdal_binary(name): -+ if conf.LIB_MAY_BE_BUNDLED(name): -+ return False -+ if not conf.find_program(name, var=name.upper()): -+ return False -+ conf.define('USING_SYSTEM_%s' % name.upper(), 1) -+ return True -+ -+check_system_heimdal_binary("compile_et") -+check_system_heimdal_binary("asn1_compile") -diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal -index 67d8804d0ff..20aee31aac7 100644 ---- a/wscript_configure_system_heimdal -+++ b/wscript_configure_system_heimdal -@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): - conf.define('USING_SYSTEM_%s' % name.upper(), 1) - return True - --def check_system_heimdal_binary(name): -- if conf.LIB_MAY_BE_BUNDLED(name): -- return False -- if not conf.find_program(name, var=name.upper()): -- return False -- conf.define('USING_SYSTEM_%s' % name.upper(), 1) -- return True -- - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - - if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -96,9 +88,6 @@ finally: - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -- - conf.env.KRB5_VENDOR = 'heimdal' - conf.define('USING_SYSTEM_KRB5', 1) - conf.define('USING_SYSTEM_HEIMDAL', 1) --- -2.33.0 - diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2449ca6c245a2..179b50fb1ab72 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,7 +1,7 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! -{ lib, newScope, pixman }: +{ lib, pixman }: -lib.makeScope newScope (self: with self; { +self: with self; { inherit pixman; @@ -70,7 +70,7 @@ lib.makeScope newScope (self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - encodings = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + encodings = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { pname = "encodings"; version = "1.0.5"; builder = ./builder.sh; @@ -80,7 +80,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; @@ -99,6 +99,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -116,6 +117,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -133,6 +135,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -150,6 +153,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -167,6 +171,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -200,6 +205,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -217,6 +223,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -234,6 +241,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -251,6 +259,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -268,6 +277,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -285,6 +295,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -302,6 +313,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -319,6 +331,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -336,6 +349,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -353,6 +367,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -370,6 +385,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -387,6 +403,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -404,6 +421,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -421,6 +439,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -438,6 +457,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -455,6 +475,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -472,6 +493,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -489,6 +511,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -506,6 +529,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -523,6 +547,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -540,6 +565,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -557,6 +583,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -574,6 +601,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -591,6 +619,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -608,6 +637,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -625,6 +655,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -642,6 +673,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -691,6 +723,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -708,6 +741,7 @@ lib.makeScope newScope (self: with self; { nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; meta.platforms = lib.platforms.unix; }) {}; @@ -1976,7 +2010,7 @@ lib.makeScope newScope (self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libxcrypt, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { pname = "xdm"; version = "1.1.12"; builder = ./builder.sh; @@ -1987,7 +2021,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt libxcrypt ]; + buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -3559,4 +3593,4 @@ lib.makeScope newScope (self: with self; { meta.platforms = lib.platforms.unix; }) {}; -}) +} diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index d236eb3cbc414..987895ab6e1dc 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -154,7 +154,7 @@ while (<>) { push @nativeRequires, "bdftopcf"; } - if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/) { + if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/ || $file =~ /XORG_FONT_REQUIRED_PROG\(MKFONTSCALE/) { push @nativeRequires, "mkfontscale"; } @@ -192,6 +192,7 @@ while (<>) { if ($isFont) { push @requires, "fontutil"; push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ];"; + push @{$extraAttrs{$pkg}}, "postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`\$PKG_CONFIG' '';"; } sub process { @@ -250,9 +251,9 @@ open OUT, ">default.nix"; print OUT ""; print OUT <<EOF; # THIS IS A GENERATED FILE. DO NOT EDIT! -{ lib, newScope, pixman }: +{ lib, pixman }: -lib.makeScope newScope (self: with self; { +self: with self; { inherit pixman; @@ -336,6 +337,6 @@ foreach my $pkg (sort (keys %pkgURLs)) { EOF } -print OUT "})\n"; +print OUT "}\n"; close OUT; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 5ac7967c60f74..baf968fe309fd 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -4,8 +4,9 @@ freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, - ApplicationServices, Carbon, Cocoa, Xplugin + mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt, + ApplicationServices, Carbon, Cocoa, Xplugin, + xorg }: let @@ -23,7 +24,7 @@ in self: super: { bdftopcf = super.bdftopcf.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.xorgproto ]; + buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ]; }); bitmap = super.bitmap.overrideAttrs (attrs: { @@ -32,7 +33,7 @@ self: super: paths=( "$out/share/X11/%T/%N" "$out/include/X11/%T/%N" - "${self.xbitmaps}/include/X11/%T/%N" + "${xorg.xbitmaps}/include/X11/%T/%N" ) wrapProgram "$out/bin/bitmap" \ --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}") @@ -41,10 +42,6 @@ self: super: ''; }); - encodings = super.encodings.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.mkfontscale ]; - }); - editres = super.editres.overrideAttrs (attrs: { hardeningDisable = [ "format" ]; }); @@ -52,7 +49,7 @@ self: super: fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: { postInstall = '' - ALIASFILE=${self.fontalias}/share/fonts/X11/misc/fonts.alias + ALIASFILE=${xorg.fontalias}/share/fonts/X11/misc/fonts.alias test -f $ALIASFILE cp $ALIASFILE $out/lib/X11/fonts/misc/fonts.alias ''; @@ -63,7 +60,7 @@ self: super: }); imake = super.imake.overrideAttrs (attrs: { - inherit (self) xorgcffiles; + inherit (xorg) xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch]; setupHook = ./imake-setup-hook.sh; @@ -74,7 +71,7 @@ self: super: inherit tradcpp; }); - mkfontdir = self.mkfontscale; + mkfontdir = xorg.mkfontscale; libxcb = super.libxcb.overrideAttrs (attrs: { configureFlags = [ "--enable-xkb" "--enable-xinput" ] @@ -89,7 +86,7 @@ self: super: depsBuildBuild = [ buildPackages.stdenv.cc ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - (self.buildPackages.stdenv.cc.libc.static or null) + (xorg.buildPackages.stdenv.cc.libc.static or null) ]; preConfigure = '' sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure @@ -99,7 +96,7 @@ self: super: rm -rf $out/share/doc ''; CPP = lib.optionalString stdenv.isDarwin "clang -E -"; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto ]; }); libAppleWM = super.libAppleWM.overrideAttrs (attrs: { @@ -111,7 +108,7 @@ self: super: libXau = super.libXau.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto ]; }); libXdmcp = super.libXdmcp.overrideAttrs (attrs: { @@ -152,6 +149,10 @@ self: super: ''; }); + xdm = super.xdm.overrideAttrs (attrs: { + buildInputs = attrs.buildInputs ++ [ libxcrypt ]; + }); + # Propagate some build inputs because of header file dependencies. # Note: most of these are in Requires.private, so maybe builder.sh # should propagate them automatically. @@ -161,7 +162,7 @@ self: super: ''; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libSM ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libSM ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; outputs = [ "out" "dev" "devdoc" ]; @@ -181,12 +182,12 @@ self: super: libXcomposite = super.libXcomposite.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXfixes ]; }); libXaw = super.libXaw.overrideAttrs (attrs: { outputs = [ "out" "dev" "devdoc" ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXmu ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXmu ]; }); libXcursor = super.libXcursor.overrideAttrs (attrs: { @@ -199,7 +200,7 @@ self: super: libXft = super.libXft.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXrender freetype fontconfig ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXrender freetype fontconfig ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; @@ -214,7 +215,7 @@ self: super: libXext = super.libXext.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto self.libXau ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto xorg.libXau ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); @@ -225,7 +226,7 @@ self: super: libXi = super.libXi.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes self.libXext ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXfixes xorg.libXext ]; configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "xorg_cv_malloc0_returns_null=no" ] ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; @@ -246,30 +247,30 @@ self: super: outputs = [ "out" "dev" ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXrender ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXrender ]; }); libSM = super.libSM.overrideAttrs (attrs: { outputs = [ "out" "dev" "doc" ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libICE ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libICE ]; }); libXrender = super.libXrender.overrideAttrs (attrs: { outputs = [ "out" "dev" "doc" ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto ]; }); libXres = super.libXres.overrideAttrs (attrs: { outputs = [ "out" "dev" "devdoc" ]; - buildInputs = with self; attrs.buildInputs ++ [ utilmacros ]; + buildInputs = with xorg; attrs.buildInputs ++ [ utilmacros ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: { - buildInputs = with self; attrs.buildInputs ++ [ utilmacros ]; + buildInputs = with xorg; attrs.buildInputs ++ [ utilmacros ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); @@ -284,7 +285,7 @@ self: super: outputs = [ "out" "dev" "doc" ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - buildInputs = attrs.buildInputs ++ [self.xorgproto]; + buildInputs = attrs.buildInputs ++ [xorg.xorgproto]; }); libXp = super.libXp.overrideAttrs (attrs: { @@ -297,7 +298,7 @@ self: super: }); libXpresent = super.libXpresent.overrideAttrs (attrs: { - buildInputs = with self; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; + buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; }); libxkbfile = super.libxkbfile.overrideAttrs (attrs: { @@ -321,8 +322,8 @@ self: super: postInstall = '' mkdir -p $out/share/man/man7 - ln -sfn ${self.xkeyboardconfig}/etc/X11 $out/share/X11 - ln -sfn ${self.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7 + ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11 + ln -sfn ${xorg.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7 ''; }); @@ -444,7 +445,7 @@ self: super: xf86videoati = super.xf86videoati.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; - buildInputs = attrs.buildInputs ++ [ self.utilmacros ]; + buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; patches = [ (fetchpatch { url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/e0511968d04b42abf11bc0ffb387f143582bc144.patch"; @@ -455,12 +456,12 @@ self: super: xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; - buildInputs = attrs.buildInputs ++ [ self.utilmacros ]; + buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; }); xf86videoglint = super.xf86videoglint.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; - buildInputs = attrs.buildInputs ++ [ self.utilmacros ]; + buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; # https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1 meta = attrs.meta // { broken = true; }; }); @@ -599,11 +600,11 @@ self: super: }); xvinfo = super.xvinfo.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [self.libXext]; + buildInputs = attrs.buildInputs ++ [xorg.libXext]; }); xkbcomp = super.xkbcomp.overrideAttrs (attrs: { - configureFlags = [ "--with-xkb-config-root=${self.xkeyboardconfig}/share/X11/xkb" ]; + configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ]; }); xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { @@ -693,7 +694,7 @@ self: super: EOF ''; in - self.xkeyboardconfig.overrideAttrs (old: { + xorg.xkeyboardconfig.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ automake ]; postPatch = with lib; concatStrings (mapAttrsToList patchIn layouts); }); @@ -714,7 +715,7 @@ self: super: mesonFlags = [ "-Dlegacy=true" ]; }); - xorgserver = with self; super.xorgserver.overrideAttrs (attrs_passed: + xorgserver = with xorg; super.xorgserver.overrideAttrs (attrs_passed: # exchange attrs if abiCompat is set let version = lib.getVersion attrs_passed; @@ -821,8 +822,8 @@ self: super: "--enable-xcsecurity" # enable SECURITY extension "--with-default-font-path=" # there were only paths containing "${prefix}", # and there are no fonts in this package anyway - "--with-xkb-bin-directory=${self.xkbcomp}/bin" - "--with-xkb-path=${self.xkeyboardconfig}/share/X11/xkb" + "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" + "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" "--with-xkb-output=$out/share/X11/xkb/compiled" "--with-log-dir=/var/log" "--enable-glamor" @@ -842,7 +843,7 @@ self: super: ''; passthru.version = version; # needed by virtualbox guest additions } else { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook self.utilmacros self.fontutil ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook xorg.utilmacros xorg.fontutil ]; buildInputs = commonBuildInputs ++ [ bootstrap_cmds automake autoconf Xplugin Carbon Cocoa @@ -930,8 +931,8 @@ self: super: }); xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.xcursorgen ]; - buildInputs = attrs.buildInputs ++ [ self.xorgproto ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ xorg.xcursorgen ]; + buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ]; configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; }); @@ -941,7 +942,7 @@ self: super: buildInputs = attrs.buildInputs ++ lib.optional isDarwin bootstrap_cmds; depsBuildBuild = [ buildPackages.stdenv.cc ]; configureFlags = [ - "--with-xserver=${self.xorgserver.out}/bin/X" + "--with-xserver=${xorg.xorgserver.out}/bin/X" ] ++ lib.optionals isDarwin [ "--with-bundle-id-prefix=org.nixos.xquartz" "--with-launchdaemons-dir=\${out}/LaunchDaemons" @@ -959,8 +960,8 @@ self: super: # Avoid replacement of word-looking cpp's builtin macros in Nix's cross-compiled paths substituteInPlace Makefile.in --replace "PROGCPPDEFS =" "PROGCPPDEFS = -Dlinux=linux -Dunix=unix" ''; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ] - ++ lib.optionals isDarwin [ self.libX11 self.xorgproto ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xauth ] + ++ lib.optionals isDarwin [ xorg.libX11 xorg.xorgproto ]; postFixup = '' substituteInPlace $out/bin/startx --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc ''; @@ -977,7 +978,7 @@ self: super: rev = "31486f40f8e8f8923ca0799aea84b58799754564"; sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM="; }; - buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman self.utilmacros ]; + buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXfixes xorg.libXv xorg.pixman xorg.utilmacros ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; @@ -987,7 +988,7 @@ self: super: }); xf86videoopenchrome = super.xf86videoopenchrome.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.libXv ]; + buildInputs = attrs.buildInputs ++ [ xorg.libXv ]; patches = [ # Pull upstream fix for -fno-common toolchains. (fetchpatch { diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 6e11417f8f56f..3c496ec300b57 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -217,4 +217,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz +mirror://xorg/individual/xserver/xorg-server-1.20.14.tar.xz diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index 79fc1e481c02a..a9533894a837f 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "oksh"; - version = "7.1"; + version = "7.2"; src = fetchFromGitHub { owner = "ibara"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-cRUL4JwwZ1Nfs9exzleEvJYCZz6knKbjnC9xeRMvClA="; + sha256 = "sha256-3EIWFlL2TJiRfAZ7kWtt2iEB2yAnTWbuf5LlFJjXdgk="; }; strictDeps = true; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 5097b12cfd383..86ce097c1bec4 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.6"; + version = "2.9.8"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-g7LJlMKwV3Cq0LEBPWPgzPJAp9W6bwVuuVVv/ZhuBSM="; + sha256 = "sha256-lhnH4+/fwZKEDN1465T8+elinTkhjYbOX2aj5eRnwZk="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 05d1d2e408eeb..c34414fa706cc 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzip3"; - version = "1.2.0"; + version = "1.2.1"; outputs = [ "bin" "dev" "out" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "kspalaiologos"; repo = "bzip3"; rev = version; - hash = "sha256-Ul4nybQ+Gj3i41AFxk2WzVD+b2dJVyCUBuX4ZGjXwUs="; + hash = "sha256-RzlDubT+nczIlUcwnZ5PsO5s3Op7WLRuiMBRBasuEFI="; }; postPatch = '' diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index b1da8e5ff6d62..3e04a2ae98e94 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-8P28xaFyaU0GrIrO+D+Rp9H4xgOymHtbAbd2mI79vSI="; + sha256 = "sha256-Fn6+hAVGgbsqR6wQc2tGcslyxlX5XIqc1PYLyhjTfh0="; }; nativeBuildInputs = [ cmake flex bison ]; @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://fluentbit.io"; maintainers = with maintainers; [ samrose fpletz ]; license = licenses.asl20; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman/default.nix index bfe609f852684..bfe609f852684 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman/default.nix diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index ccceaa30b0430..4cc9e5e2b3183 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,10 +1,11 @@ -{ callPackage }: +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { -{ # All the defaults - connman = callPackage ./connman.nix { }; + connman = callPackage ./connman { }; - connmanFull = callPackage ./connman.nix { + connmanFull = connman.override { # TODO: Why is this in `connmanFull` and not the default build? See TODO in # nixos/modules/services/networking/connman.nix (near the assertions) enableNetworkManager = true; @@ -14,7 +15,7 @@ enableTist = true; }; - connmanMinimal = callPackage ./connman.nix { + connmanMinimal = connman.override { enableOpenconnect = false; enableOpenvpn = false; enableVpnc = false; @@ -37,4 +38,12 @@ enableClient = false; # enableDatafiles = false; # If disabled, configuration and data files are not installed }; -} + + connman_dmenu = callPackage ./connman_dmenu { }; + + connman-gtk = callPackage ./connman-gtk { }; + + connman-ncurses = callPackage ./connman-ncurses { }; + + connman-notify = callPackage ./connman-notify { }; +}) diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 219d7a4057f57..f806b46b6944f 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -61,6 +61,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ducaale/xh"; changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ payas SuperSandro2000 ]; + maintainers = with maintainers; [ payas ]; }; } diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index 3973ed51343f9..d91b92890a782 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -43,7 +43,9 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - doCheck = true; + # Some tests are expected to fail on ARM64 + # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 (mpw is a predecessor to spectre-cli and this issue is relevant to mpw as well) + doCheck = !(stdenv.isLinux && stdenv.isAarch64); checkPhase = '' runHook preCheck diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index fd7eceede1592..1eda5cbbce553 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,36 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, efivar, popt }: +{ lib, stdenv, fetchFromGitHub, pkg-config, efivar, popt }: stdenv.mkDerivation rec { pname = "efibootmgr"; - version = "17"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ efivar popt ]; + version = "18"; src = fetchFromGitHub { owner = "rhboot"; repo = "efibootmgr"; rev = version; - sha256 = "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03"; + hash = "sha256-DYYQGALEn2+mRHgqCJsA7OQCF7xirIgQlWexZ9uoKcg="; }; - patches = [ - (fetchpatch { - name = "remove-extra-decl.patch"; - url = "https://github.com/rhboot/efibootmgr/commit/99b578501643377e0b1994b2a068b790d189d5ad.patch"; - sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h"; - }) - ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ efivar popt ]; - makeFlags = [ "EFIDIR=nixos" "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" ]; + makeFlags = [ + "EFIDIR=nixos" + "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" + ]; installFlags = [ "prefix=$(out)" ]; meta = with lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; homepage = "https://github.com/rhboot/efibootmgr"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index ed831c5ecf6d4..09394beb39315 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkg-config, popt }: +{ lib, stdenv, buildPackages, fetchFromGitHub, pkg-config, popt, mandoc }: stdenv.mkDerivation rec { pname = "efivar"; - version = "37"; + version = "38"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,42 +10,10 @@ stdenv.mkDerivation rec { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "1z2dw5x74wgvqgd8jvibfff0qhwkc53kxg54v12pzymyibagwf09"; + hash = "sha256-A38BKGMK3Vo+85wzgxmzTjzZXtpcY9OpbZaONWnMYNk="; }; - patches = [ - (fetchurl { - name = "r13y.patch"; - url = "https://patch-diff.githubusercontent.com/raw/rhboot/efivar/pull/133.patch"; - sha256 = "038cwldb8sqnal5l6mhys92cqv8x7j8rgsl8i4fiv9ih9znw26i6"; - }) - (fetchurl { - name = "fix-misaligned-pointer.patch"; - url = "https://github.com/rhboot/efivar/commit/b98ba8921010d03f46704a476c69861515deb1ca.patch"; - sha256 = "0ni9mz7y40a2wf1d1q5n9y5dhcbydxvfdhqic7zsmgnaxs3a0p27"; - }) - (fetchurl { - name = "fix-gcc9-error.patch"; - url = "https://github.com/rhboot/efivar/commit/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch"; - sha256 = "0lc38npydp069nlcga25wzzm204ww9l6mpjfn6wmhdfhn0pgjwky"; - }) - (fetchurl { - name = "remove_unused_variable.patch"; - url = "https://github.com/rhboot/efivar/commit/fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch"; - sha256 = "1xhy8v8ff9lyxb830n9hci2fbh7rfps6rwsqrjh4lw7316gwllsd"; - }) - (fetchurl { - name = "check_string_termination.patch"; - url = "https://github.com/rhboot/efivar/commit/4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch"; - sha256 = "1ajj11wwsvamfspq4naanvw08h63gr0g71q0dfbrrywrhc0jlmdw"; - }) - ]; - - NIX_CFLAGS_COMPILE = [ - "-Wno-error=stringop-truncation" - "-flto-partition=none" - ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config mandoc ]; buildInputs = [ popt ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -62,6 +30,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Tools and library to manipulate EFI variables"; platforms = platforms.linux; - license = licenses.lgpl21; + license = licenses.lgpl21Only; }; } diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 621d51a4a55c8..053437dc3e957 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , gtest , cudatoolkit @@ -10,6 +9,7 @@ , addOpenGLRunpath , amd ? true , nvidia ? true +, udev }: let @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "nvtop" + pname-suffix; - version = "2.0.4"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - sha256 = "sha256-WOXVmKnVNRjWqShbOUZ0Z4hd0m9njLmCGLnV9FBS3Us="; + hash = "sha256-vLvt2sankpQWAVZBPo3OePs4LDy7YfVnMkZLfN6ERAc="; }; cmakeFlags = with lib; [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ++ optional amd "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2" ; nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath; - buildInputs = with lib; [ ncurses ] + buildInputs = with lib; [ ncurses udev ] ++ optional nvidia cudatoolkit ++ optional amd libdrm ; @@ -55,14 +55,15 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A (h)top like task monitor for AMD and NVIDIA GPUs"; + description = "A (h)top like task monitor for AMD, Intel and NVIDIA GPUs"; longDescription = '' - Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. + Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Intel and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. ''; homepage = "https://github.com/Syllo/nvtop"; - license = licenses.gpl3; + changelog = "https://github.com/Syllo/nvtop/releases/tag/${version}"; + license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ willibutz gbtb ]; + maintainers = with maintainers; [ willibutz gbtb anthonyroussel ]; mainProgram = "nvtop"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3ced5f6e26d53..bc5958170ca0f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -802,11 +802,9 @@ mapAliases ({ linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; linuxPackages_4_14 = linuxKernel.packages.linux_4_14; linuxPackages_4_19 = linuxKernel.packages.linux_4_19; - linuxPackages_4_4 = linuxKernel.packages.linux_4_4; linuxPackages_4_9 = linuxKernel.packages.linux_4_9; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; - linuxPackages_5_16 = linuxKernel.packages.linux_5_16; linuxPackages_5_17 = linuxKernel.packages.linux_5_17; linuxPackages_5_18 = linuxKernel.packages.linux_5_18; linuxPackages_5_19 = linuxKernel.packages.linux_5_19; @@ -823,11 +821,9 @@ mapAliases ({ linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; linux_4_14 = linuxKernel.kernels.linux_4_14; linux_4_19 = linuxKernel.kernels.linux_4_19; - linux_4_4 = linuxKernel.kernels.linux_4_4; linux_4_9 = linuxKernel.kernels.linux_4_9; linux_5_10 = linuxKernel.kernels.linux_5_10; linux_5_15 = linuxKernel.kernels.linux_5_15; - linux_5_16 = linuxKernel.kernels.linux_5_16; linux_5_17 = linuxKernel.kernels.linux_5_17; linux_5_18 = linuxKernel.kernels.linux_5_18; linux_5_19 = linuxKernel.kernels.linux_5_19; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0203dd459063f..be8a61010524e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4866,6 +4866,10 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; + smokegen = callPackage ../development/libraries/smokegen {}; + + smokeqt = callPackage ../development/libraries/smokeqt {}; + snazy = callPackage ../development/tools/snazy { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -5366,20 +5370,18 @@ with pkgs; conspy = callPackage ../os-specific/linux/conspy {}; - inherit (callPackage ../tools/networking/connman {}) + connmanPackages = + recurseIntoAttrs (callPackage ../tools/networking/connman { }); + inherit (connmanPackages) connman connmanFull connmanMinimal + connman_dmenu + connman-gtk + connman-ncurses + connman-notify ; - connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; - - connman-ncurses = callPackage ../tools/networking/connman/connman-ncurses { }; - - connman-notify = callPackage ../tools/networking/connman/connman-notify { }; - - connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { }; - convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { @@ -7363,6 +7365,8 @@ with pkgs; godot-server = callPackage ../development/tools/godot/3/server.nix { }; + goeland = callPackage ../applications/networking/feedreaders/goeland { }; + go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; goofys = callPackage ../tools/filesystems/goofys { }; @@ -24624,19 +24628,41 @@ with pkgs; inherit (darwin.apple_sdk.libs) Xplugin; }; - # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` - # so as not to have the newly bound xorg items already in scope, which would - # have created a cycle. - xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { - }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; - inherit (darwin.apple_sdk.libs) Xplugin; - inherit (buildPackages.darwin) bootstrap_cmds; - udev = if stdenv.isLinux then udev else null; - libdrm = if stdenv.isLinux then libdrm else null; - abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` - or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin - })); + xorg = let + otherSplices = { + selfBuildBuild = pkgsBuildBuild.xorg; + selfBuildHost = pkgsBuildHost.xorg; + selfBuildTarget = pkgsBuildTarget.xorg; + selfHostHost = pkgsHostHost.xorg; + selfTargetTarget = pkgsTargetTarget.xorg or { }; + }; + keep = _self: { }; + extra = _spliced0: { }; + + # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` + # so as not to have the newly bound xorg items already in scope, which would + # have created a cycle. + overrides = lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; + inherit (darwin.apple_sdk.libs) Xplugin; + inherit (buildPackages.darwin) bootstrap_cmds; + udev = if stdenv.isLinux then udev else null; + libdrm = if stdenv.isLinux then libdrm else null; + abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` + or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin + }; + + generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix {}; + + xorgPackages = lib.makeScopeWithSplicing + splicePackages + newScope + otherSplices + keep + extra + (lib.extends overrides generatedPackages); + + in recurseIntoAttrs xorgPackages; xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { }; @@ -25012,7 +25038,9 @@ with pkgs; htop-vim = callPackage ../tools/system/htop/htop-vim.nix { }; - humility = callPackage ../development/tools/rust/humility {}; + humility = callPackage ../development/tools/rust/humility { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; btop = callPackage ../tools/system/btop { stdenv = gcc11Stdenv; @@ -30073,6 +30101,8 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_09) ocaml; }; + lls = callPackage ../applications/networking/lls { }; + lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; libsoundio = null; @@ -30954,9 +30984,16 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { + obs-studio27 = libsForQt5.callPackage ../applications/video/obs-studio/27.nix { ffmpeg_4 = ffmpeg-full; }; + + obs-studio28 = qt6Packages.callPackage ../applications/video/obs-studio/28.nix { + ffmpeg_4 = ffmpeg-full; + }; + + obs-studio = obs-studio28; + obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; @@ -31754,6 +31791,8 @@ with pkgs; semiphemeral = callPackage ../tools/misc/semiphemeral { }; + semver = callPackage ../applications/misc/semver { }; + sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index efd71e23ce746..ddf69ea75ad40 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -93,16 +93,7 @@ in { rpiVersion = 4; }; - linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; - - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.9" - kernelPatches.modinst_arg_list_too_long - ]; - }; + linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { kernelPatches = @@ -160,8 +151,6 @@ in { ]; }; - linux_5_16 = throw "linux 5.16 was removed because it has reached its end of life upstream"; - linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream"; linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; @@ -518,14 +507,12 @@ in { vanillaPackages = { # recurse to build modules for the kernels - linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; # Added 2022-02-11 - linux_4_9 = recurseIntoAttrs (packagesFor kernels.linux_4_9); + linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14); linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); - linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6e92eecf83752..a64963af285c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12503,11 +12503,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.49"; + version = "12.50"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-l21p2ak+pe9GSWOatsGQ9YvyZfAFfKV3xB38rzexcVs="; + hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -12529,7 +12529,7 @@ let Reconyx, Ricoh, Samsung, Sanyo, Sigma/Foveon and Sony. ''; homepage = "https://exiftool.org/"; - + changelog = "https://exiftool.org/history.html"; license = with lib.licenses; [ gpl1Plus /* or */ artistic2 ]; maintainers = with maintainers; [ kiloreux anthonyroussel ]; mainProgram = "exiftool"; @@ -26137,13 +26137,13 @@ let Tirex = buildPerlPackage rec { pname = "Tirex"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "tirex"; rev = "v${version}"; - hash = "sha256-8GXhF2v04ZSF0h0WNKPp4bgYcvPYCml6HtCbikFxUzc="; + hash = "sha256-0QbPfCPBdNBbUiZ8Ppg2zao98+Ddl3l+yX6y1/J50rg="; }; buildInputs = [ @@ -26158,6 +26158,7 @@ let ]; installPhase = '' + install -m 755 -d $out/usr/libexec make install DESTDIR=$out INSTALLOPTS="" mv $out/$out/lib $out/$out/share $out rmdir $out/$out $out/nix/store $out/nix |