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

Merge branch 'master' into staging-next

parents 068a7415 ec58c18d

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

+5 −4
Original line number Diff line number Diff line
@@ -11,16 +11,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "spotify-player";

  version = "0.12.0";

  version = "0.12.1";



  src = fetchFromGitHub {

    owner = "aome510";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-nWXXaRHTzCXmu4eKw88pKuWXgdG9n7azPeBbXYz+Fio=";

    rev = "refs/tags/v${version}";

    hash = "sha256-KHbeCnsdHP7Zsj9KeVLuumcVOW6m7Tz1GgBBQ25Rbyo=";

  };



  cargoHash = "sha256-y/qHiwZes4nVtjbFN/jL2LFugGpRKnYij7+XXZbqguQ=";

  cargoHash = "sha256-51xKCiGdvJ8k9ArWBCazJGgRljqHxZiyTdes4i7JZH8=";



  nativeBuildInputs = [

    pkg-config
@@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec { 
  meta = with lib; {

    description = "A command driven spotify player";

    homepage = "https://github.com/aome510/spotify-player";

    changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}";

    mainProgram = "spotify_player";

    license = licenses.mit;

    maintainers = with maintainers; [ dit7ya ];

pkgs/applications/graphics/hydrus/default.nix

+13 −3
Original line number Diff line number Diff line
@@ -6,18 +6,20 @@ 
, enableSwftools ? false

, swftools

, python3Packages

, qtbase

, qtcharts

}:



python3Packages.buildPythonPackage rec {

  pname = "hydrus";

  version = "503";

  version = "519";

  format = "other";



  src = fetchFromGitHub {

    owner = "hydrusnetwork";

    repo = "hydrus";

    rev = "refs/tags/v${version}";

    hash = "sha256-nJn5EphbmVYAAOisV3fym/nHlJl/aPZ2Iyp+Z2/N3Jc=";

    hash = "sha256-q5pPRMBuB6hqDGuOl0kMyXjMKze5dw+3kdmA2FPJTPU=";

  };



  nativeBuildInputs = [
@@ -25,6 +27,11 @@ python3Packages.buildPythonPackage rec { 
    python3Packages.mkdocs-material

  ];



  buildInputs = [

    qtbase

    qtcharts

  ];



  propagatedBuildInputs = with python3Packages; [

    beautifulsoup4

    cbor2
@@ -37,8 +44,10 @@ python3Packages.buildPythonPackage rec { 
    opencv4

    pillow

    psutil

    pympler

    pyopenssl

    pyside2

    pyqt6

    pyqt6-charts

    pysocks

    python-dateutil

    python3Packages.mpv
@@ -82,6 +91,7 @@ python3Packages.buildPythonPackage rec { 
    -e TestHydrusServer \

    -e TestHydrusSessions \

    -e TestServer \

    -e TestClientMetadataMigration \

  '';



  outputs = [ "out" "doc" ];

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

+4 −4
Original line number Diff line number Diff line 
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {

  signal-desktop = {

    dir = "Signal";

    version = "6.7.0";

    hash = "sha256-njiVPTkzYdt7QZcpohXUI3hj/o+fO4/O0ZlQrq2oP6Y=";

    version = "6.9.0";

    hash = "sha256-VgEGFt8LvVpIWiqFyYiTXUavYY0YmnJ+CxrNhPP0hCg=";

  };

  signal-desktop-beta = {

    dir = "Signal Beta";

    version = "6.8.0-beta.1";

    hash = "sha256-akQmGxDW6SBQCRLU6TgfODP8ZjEPsvaBvrkdd+6DqKs=";

    version = "6.10.0-beta.1";

    hash = "sha256-A8jpYDWiCCBadRDzmNVxzucKPomgXlqdyeGiYp+1Byo=";

  };

}

pkgs/development/coq-modules/ITree/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ mkCoqDerivation rec { 
  owner = "DeepSpec";

  inherit version;

  defaultVersion = with lib.versions; lib.switch coq.version [

    { case = range "8.13" "8.17";  out = "5.1.0"; }

    { case = range "8.10" "8.16";  out = "4.0.0"; }

  ] null;

  release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo=";

  release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";

  releaseRev = v: "${v}";

  propagatedBuildInputs = [ coq-ext-lib paco ];

pkgs/development/coq-modules/coq-ext-lib/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ mkCoqDerivation rec { 
  owner = "coq-ext-lib";

  inherit version;

  defaultVersion = with lib.versions; lib.switch coq.coq-version [

    { case = range "8.11" "8.16"; out = "0.11.7"; }

    { case = range "8.11" "8.17"; out = "0.11.7"; }

    { case = range "8.8" "8.16"; out = "0.11.6"; }

    { case = range "8.8" "8.14"; out = "0.11.4"; }

    { case = range "8.8" "8.13"; out = "0.11.3"; }