Commit 4bcffa6d authored by Alyssa Ross's avatar Alyssa Ross
Browse files

psst: unstable-2024-05-26 -> unstable-2024-07-29 

Required to build with Rust 1.80.0.

Link: https://github.com/rust-lang/rust/issues/127343
parent 176846ae

pkgs/applications/audio/psst/Cargo.lock

+1722 −617

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/audio/psst/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -16,19 +16,19 @@ let 
in

rustPlatform.buildRustPackage rec {

  pname = "psst";

  version = "unstable-2024-05-26";

  version = "unstable-2024-07-29";



  src = fetchFromGitHub {

    owner = "jpochyla";

    repo = pname;

    rev = "6c9cd3f91653764b832ea5136cda04c9e0f8fe50";

    hash = "sha256-bttF+yX1BT4t1TUmJBs0OZuPD+6uPxHlb8YzRIVNKTQ=";

    rev = "d895cb94623d320f79b364a8f63ab518fddf697b";

    hash = "sha256-LsveuaDmRvC9TUON847QdzqQDUW1zd37++MbtXrfJjk=";

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "cubeb-0.10.3" = "sha256-gV1KHOhq678E/Rj+u8jX9Fw+TepPwuZdV5y/D+Iby+o=";

      "cubeb-0.13.0" = "sha256-l1JkKlq2qvvLwNLJ2DrIpAFYcRQyd6F8pAflmtnaXhU=";

      "druid-0.8.3" = "sha256-hTB9PQf2TAhcLr64VjjQIr18mczwcNogDSRSN5dQULA=";

      "druid-enums-0.1.0" = "sha256-KJvAgKxicx/g+4QRZq3iHt6MGVQbfOpyN+EhS6CyDZk=";

    };

pkgs/applications/audio/psst/make-build-reproducible.patch

+9 −6
Original line number Diff line number Diff line 
diff --git a/psst-core/build.rs b/psst-core/build.rs

deleted file mode 100644

index 1057827..0000000

index e05191d..0000000

--- a/psst-core/build.rs

+++ /dev/null

@@ -1,37 +0,0 @@

@@ -1,39 +0,0 @@

-use std::{env, fs, io::Write};

-

-fn main() {
@@ -36,22 +36,25 @@ index 1057827..0000000 
-        // And construct the http-style url

-        remote_url = format!("https://{domain}/{path}");

-    }

-    remote_url = remote_url.trim_end_matches(".git").to_owned();

-    let trimmed_url = remote_url.trim_end_matches(".git");

-    remote_url.clone_from(&String::from(trimmed_url));

-

-    let outfile = format!("{}/remote-url.txt", outdir);

-    let mut file = fs::File::create(outfile).unwrap();

-    write!(file, r#""{}""#, remote_url).ok();

-}

diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs

index fcbd491..2d71ee3 100644

index fcbd491..8f6e6f0 100644

--- a/psst-core/src/lib.rs

+++ b/psst-core/src/lib.rs

@@ -3,8 +3,8 @@

@@ -2,9 +2,9 @@

 

 use git_version::git_version;

 

-pub const GIT_VERSION: &str = git_version!();

-pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt"));

-pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt"));

+pub const GIT_VERSION: &str = "6c9cd3f91653764b832ea5136cda04c9e0f8fe50";

+pub const GIT_VERSION: &str = "d895cb94623d320f79b364a8f63ab518fddf697b";

+pub const BUILD_TIME: &str = "1970-01-01 00:00:00";

+pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst";