Commit 125ac1c8 authored by KSJ2000's avatar KSJ2000
Browse files

psst: unstable-2024-10-24 -> 0-unstable-2025-02-22

parent fba8638b

pkgs/by-name/ps/psst/Cargo.lock

deleted100644 → 0
+0 −5656

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/ps/psst/make-build-reproducible.patch

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ index 2faa317..b890a2d 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 = "02923198ba0e27b2b6271340cf57dd8ce109049b";

+pub const GIT_VERSION: &str = "";

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

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

pkgs/by-name/ps/psst/package.nix

+9 −16
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
  gtk3,

  lib,

  makeDesktopItem,

  nix-update-script,

  pango,

  pkg-config,

  rustPlatform,
@@ -29,27 +30,21 @@ let 
    terminal = false;

    startupWMClass = "psst-gui";

  };



in

rustPlatform.buildRustPackage rec {

  pname = "psst";

  version = "unstable-2024-10-24";

  version = "0-unstable-2025-02-22";



  src = fetchFromGitHub {

    owner = "jpochyla";

    repo = pname;

    rev = "02923198ba0e27b2b6271340cf57dd8ce109049b";

    hash = "sha256-gEK0yf37eREsI6kCIYTBlkkM6Fnjy0KGnd0XqcawGjU=";

    repo = "psst";

    rev = "dd47c302147677433d70b398b1bcd7f1ade87638";

    hash = "sha256-EMjY8Tu+ssO30dD2qsvi3FAkt/UlXwM/ss2/FcyNNgI=";

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

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

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

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

    };

  };

  useFetchCargoVendor = true;

  cargoHash = "sha256-0UllCmIe6oEl2Ecl4nqSk9ODdgso5ucX8T5nG3dVwbE=";



  # specify the subdirectory of the binary crate to build from the workspace

  buildAndTestSubdir = "psst-gui";
@@ -76,9 +71,7 @@ rustPlatform.buildRustPackage rec { 
    install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*

  '';



  passthru = {

    updateScript = ./update.sh;

  };

  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };



  meta = with lib; {

    description = "Fast and multi-platform Spotify client with native GUI";

pkgs/by-name/ps/psst/update.sh

deleted100755 → 0
+0 −43
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -i bash -p wget nix-prefetch-github jq coreutils



# shellcheck shell=bash



if [ -n "$GITHUB_TOKEN" ]; then

    TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN")

fi



if [[ $# -gt 1 || $1 == -* ]]; then

    echo "Regenerates packaging data for psst."

    echo "Usage: $0 [git commit]"

    exit 1

fi



set -x



cd "$(dirname "$0")"

rev="$1"



set -euo pipefail



if [ -z "$rev" ]; then

    rev="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/jpochyla/psst/commits?per_page=1" | jq -r '.[0].sha')"

fi



date="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/jpochyla/psst/commits/$rev" | jq -r '.commit.author.date' | cut -dT -f1)"



version="unstable-$date"



# Sources

src_hash=$(nix-prefetch-github jpochyla psst --rev "$rev" | jq -r .hash)



# Cargo.lock

src="https://raw.githubusercontent.com/jpochyla/psst/$rev"

wget "${TOKEN_ARGS[@]}" "$src/Cargo.lock" -O Cargo.lock



sed -i -E -e "s#version = \".*\"#version = \"$version\"#" default.nix

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: \&str = \".*\"#GIT_VERSION: \&str = \"$rev\"#" make-build-reproducible.patch