diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix index 287040197f51..557b21f65d0e 100644 --- a/pkgs/by-name/ca/cargo-c/package.nix +++ b/pkgs/by-name/ca/cargo-c/package.nix @@ -12,19 +12,19 @@ let # this version may need to be updated along with package version - cargoVersion = "0.89.0"; + cargoVersion = "0.90.0"; in rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.10.14"; + version = "0.10.15"; src = fetchCrate { inherit pname; version = "${version}+cargo-${cargoVersion}"; - hash = "sha256-t6cbufPdpyaFzwEFWt19Nid2S5FXCJCS+SHJ0aJICX0="; + hash = "sha256-szqDSHGihE+Oj8L3EBlC5XH4kSBYOptd0Xtk3MhXooQ="; }; - cargoHash = "sha256-nW+akmbpIGZnhJLBdwDAGI4m5eSwdT2Z/iY2RV4zMQY="; + cargoHash = "sha256-36ygs/EhCktG1jmBnP9c7EgnfcWnGrqqcW3qAw+Yfy4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index d1f33e7951d8..983bcc1b197d 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -127,17 +127,6 @@ let ) (lib.attrNames validPlugins); invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins; - - # TODO: figure out what must be done about this upstream - related lu-zero/cargo-c#323 lu-zero/cargo-c#138 - cargo-c' = (cargo-c.__spliced.buildHost or cargo-c).overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or [ ]) ++ [ - (fetchpatch { - name = "cargo-c-test-rlib-fix.patch"; - url = "https://github.com/lu-zero/cargo-c/commit/dd02009d965cbd664785149a90d702251de747b3.diff"; - hash = "sha256-Az0WFF9fc5+igcV8C/QFhq5GE4PAyGEO84D9ECxx3v0="; - }) - ]; - }); in assert lib.assertMsg (invalidPlugins == [ ]) "Invalid gst-plugins-rs plugin${ @@ -205,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config rustc cargo - cargo-c' + cargo-c nasm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [