Unverified Commit 0d24f164 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #194845: Update socket2 in packages for Rust 1.64 compat 

...into staging-next
parents 6565abc2 425ccd7c

pkgs/applications/audio/spotify-tui/default.nix

+33 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, fetchCrate, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }:

{ lib

, stdenv

, fetchFromGitHub

, fetchCrate

, fetchpatch

, rustPlatform

, installShellFiles

, pkg-config

, openssl

, python3

, libxcb

, AppKit

, Security

}:



rustPlatform.buildRustPackage rec {

  pname = "spotify-tui";
@@ -8,14 +21,30 @@ rustPlatform.buildRustPackage rec { 
    owner = "Rigellute";

    repo = "spotify-tui";

    rev = "v${version}";

    sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";

    hash = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";

  };



  # Use patched rspotify

  cargoPatches = [

    # Use patched rspotify

    ./Cargo.lock.patch



    # Needed so that the patch below it applies.

    (fetchpatch {

      name = "update-dirs.patch";

      url = "https://github.com/Rigellute/spotify-tui/commit/3881defc1ed0bcf79df1aef4836b857f64be657c.patch";

      hash = "sha256-OGqiYLFojMwR3RgKbddXxPDiAdzPySnscVVsVmTT7t4=";

    })



    # https://github.com/Rigellute/spotify-tui/pull/990

    (fetchpatch {

      name = "update-socket2-for-rust-1.64.patch";

      url = "https://github.com/Rigellute/spotify-tui/commit/14df9419cf72da13f3b55654686a95647ea9dfea.patch";

      hash = "sha256-craY6UwmHDdxih3nZBdPkNJtQ6wvVgf09Ovqdxi0JZo=";

    })

  ];



  patches = [

    # Use patched rspotify

    ./Cargo.toml.patch

  ];
@@ -44,7 +73,7 @@ rustPlatform.buildRustPackage rec { 
    ln -s ${rspotify} ./rspotify-${rspotify.version}

  '';



  cargoSha256 = "sha256-S8zuVYcyYvrwggIvlpxNydhoN9kx6xLBwYJSHcbEK40=";

  cargoHash = "sha256-aZJ6Q/rvqrv+wvQw2eKFPnSROhI5vXPvr5pu1hwtZKA=";



  nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ];

  buildInputs = [ ]

pkgs/applications/networking/instant-messengers/fractal/default.nix

+7 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec { 
    owner = "GNOME";

    repo = "fractal";

    rev = version;

    sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";

    hash = "sha256-To6lr2I+JVrxvuK++2gLWntFGnEBm+B6KTRuOvjASek=";

  };



  patches = [
@@ -40,14 +40,17 @@ stdenv.mkDerivation rec { 
    # fractal-gtk/res/meson.build:5:0: ERROR: Function does not take positional arguments.

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch";

      sha256 = "3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc=";

      hash = "sha256-3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc=";

    })



    # This is in fractal v4.4.1b1+ so can be removed when fractal is updated.

    ./update-socket2-for-rust-1.64.diff

  ];



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    inherit src patches;

    name = "${pname}-${version}";

    hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";

    hash = "sha256-d99zSaxp22YyLP3Wckgcm7wlz7nFrLJDHq2xPJmZFf0=";

  };



  nativeBuildInputs = [

pkgs/applications/networking/instant-messengers/fractal/update-socket2-for-rust-1.64.diff

0 → 100644
+195 −0
Original line number Diff line number Diff line 
diff --git a/Cargo.lock b/Cargo.lock

index c0b5e5e2..3009f183 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -1,5 +1,7 @@

 # This file is automatically @generated by Cargo.

 # It is not intended for manual editing.

+version = 3

+

 [[package]]

 name = "addr2line"

 version = "0.13.0"

@@ -169,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"

 dependencies = [

  "addr2line",

- "cfg-if",

+ "cfg-if 0.1.10",

  "libc",

  "miniz_oxide",

  "object",

@@ -326,6 +328,12 @@ version = "0.1.10"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"

 

+[[package]]

+name = "cfg-if"

+version = "1.0.0"

+source = "registry+https://github.com/rust-lang/crates.io-index"

+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

+

 [[package]]

 name = "chrono"

 version = "0.4.13"

@@ -407,7 +415,7 @@ version = "1.2.0"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

 ]

 

 [[package]]

@@ -417,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"

 dependencies = [

  "autocfg 1.0.0",

- "cfg-if",

+ "cfg-if 0.1.10",

  "lazy_static",

 ]

 

@@ -455,7 +463,7 @@ version = "2.0.2"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "dirs-sys",

 ]

 

@@ -465,7 +473,7 @@ version = "2.0.2"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "dirs-sys",

 ]

 

@@ -506,7 +514,7 @@ version = "0.8.23"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

 ]

 

 [[package]]

@@ -549,7 +557,7 @@ version = "1.0.16"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "crc32fast",

  "libc",

  "miniz_oxide",

@@ -842,7 +850,7 @@ version = "0.1.14"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "libc",

  "wasi",

 ]

@@ -979,7 +987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163"

 dependencies = [

  "bitflags",

- "cfg-if",

+ "cfg-if 0.1.10",

  "futures-channel",

  "futures-core",

  "futures-util",

@@ -1543,7 +1551,7 @@ version = "0.4.11"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

 ]

 

 [[package]]

@@ -1648,7 +1656,7 @@ version = "0.6.22"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "fuchsia-zircon",

  "fuchsia-zircon-sys",

  "iovec",

@@ -1703,7 +1711,7 @@ version = "0.2.34"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "libc",

  "winapi 0.3.9",

 ]

@@ -1826,7 +1834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"

 dependencies = [

  "bitflags",

- "cfg-if",

+ "cfg-if 0.1.10",

  "foreign-types",

  "lazy_static",

  "libc",

@@ -2523,13 +2531,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"

 

 [[package]]

 name = "socket2"

-version = "0.3.12"

+version = "0.3.19"

 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"

+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"

 dependencies = [

- "cfg-if",

+ "cfg-if 1.0.0",

  "libc",

- "redox_syscall",

  "winapi 0.3.9",

 ]

 

@@ -2678,7 +2685,7 @@ version = "3.1.0"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "libc",

  "rand 0.7.3",

  "redox_syscall",

@@ -2818,7 +2825,7 @@ version = "0.1.18"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "log",

  "tracing-core",

 ]

@@ -2998,7 +3005,7 @@ version = "0.2.67"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "serde",

  "serde_json",

  "wasm-bindgen-macro",

@@ -3025,7 +3032,7 @@ version = "0.4.17"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"

 dependencies = [

- "cfg-if",

+ "cfg-if 0.1.10",

  "js-sys",

  "wasm-bindgen",

  "web-sys",

pkgs/development/tools/fundoc/default.nix

+12 −3
Original line number Diff line number Diff line 
{ lib, rustPlatform, fetchFromGitHub }:

{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:



rustPlatform.buildRustPackage rec {

  pname = "fundoc";
@@ -8,10 +8,19 @@ rustPlatform.buildRustPackage rec { 
    owner = "csssr";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-qmsr4bhErpMzS71NhLep0EWimZb/S3aEhMbeBNa5y8E=";

    hash = "sha256-qmsr4bhErpMzS71NhLep0EWimZb/S3aEhMbeBNa5y8E=";

  };



  cargoSha256 = "sha256-G2KRjkccS/rfrb7BtotbG6L4WaVnfwY1UEXLnVBLSzM=";

  cargoPatches = [

    # https://github.com/CSSSR/fundoc/pull/36

    (fetchpatch {

      name = "update-dependencies-for-rust-1.64.patch";

      url = "https://github.com/CSSSR/fundoc/commit/9e0c5f747088467b70bd385fcb8888950351143f.patch";

      hash = "sha256-JUTwMdxxt+2jst9DyqgkblZodBSYJzaDtjiLRQ8mJFU=";

    })

  ];



  cargoHash = "sha256-1gKxFznoGYGme0UicP73FQt8CnI9IeyHJxLgRcLffm0=";



  meta = with lib; {

    description = "Language agnostic documentation generator";

pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch

+10 −10
Original line number Diff line number Diff line 
diff --git a/src/toolchains.rs b/src/toolchains.rs

index 4d85e7c..b1353c6 100644

index 53a7ddb..795a711 100644

--- a/src/toolchains.rs

+++ b/src/toolchains.rs

@@ -259,6 +259,8 @@ impl Toolchain {

             .map_err(InstallError::Download)?;

@@ -206,6 +206,8 @@ impl Toolchain {

             })?;

         }

 

+        nix_patchelf(tmpdir.path().to_path_buf())

+            .expect("failed to patch toolchain for NixOS");

         fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)?;

         fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)

     }

 

         Ok(())

@@ -557,3 +559,42 @@ pub(crate) fn download_tarball(

@@ -533,3 +535,42 @@ fn download_tarball(

         res => res,

     }

     download_tar_gz(client, name, &format!("{}.gz", url,), strip_prefix, dest)

 }

+

+fn nix_patchelf(mut toolchain_path: PathBuf) -> Result<(), Error> {

+fn nix_patchelf(mut toolchain_path: PathBuf) -> io::Result<()> {

+    toolchain_path.push("bin");

+

+    for entry in toolchain_path.read_dir()? {