Unverified Commit 3f1cd1cb authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #280477 from msfjarvis/hs/psst-bump 

psst: unstable-2023-05-13 -> unstable-2024-01-12
parents 04fa9d90 2d36a09d

pkgs/applications/audio/psst/Cargo.lock

+424 −567

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-2023-05-13";

  version = "unstable-2024-01-12";



  src = fetchFromGitHub {

    owner = "jpochyla";

    repo = pname;

    rev = "f94af14aa9fdd3d59cd92849fa7f076103b37a70";

    hash = "sha256-Cmpdyec1xe7j10LDm+iCaKlBICHkmmbhKz2nDeOFOF8=";

    rev = "c70ace50e8c50c38dc6c4ea1156de2b50e6e76b5";

    hash = "sha256-WCtD06fZHdn0kT5SDE7aTUZvQlX9OBSAqHu+qopBzTM=";

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "cubeb-0.10.3" = "sha256-3eHW+kIJydF6nF0EkB/vglOvksfol+xIKoqFsKg3omI=";

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

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

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

    };

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

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ index 1057827..0000000 
-    let mut fh = fs::File::create(outfile).unwrap();

-    write!(fh, r#""{}""#, chrono::Local::now()).ok();

-

-    let git_config = gix_config::File::from_git_dir("../.git/").expect("Git Config not found!");

-    let git_config = gix_config::File::from_git_dir("../.git/".into()).expect("Git Config not found!");

-    // Get Git's 'Origin' URL

-    let mut remote_url = git_config

-        .raw_value("remote", Some("origin".as_ref()), "url")
@@ -51,7 +51,7 @@ index fcbd491..2d71ee3 100644 
-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 = "f94af14aa9fdd3d59cd92849fa7f076103b37a70";

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

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

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

pkgs/applications/audio/psst/update.sh

+1 −1
Original line number Diff line number Diff line
@@ -38,4 +38,4 @@ sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" default.nix 
sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" default.nix



# Also update the git hash shown in the UI

sed -i -E -e "s#GIT_VERSION = \".*\"#GIT_VERSION = \"$rev\"#" make-build-reproducible.patch
 
sed -i -E -e "s#GIT_VERSION: \&str = \".*\"#GIT_VERSION: \&str = \"$rev\"#" make-build-reproducible.patch