Unverified Commit a893fcf2 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 915c0fab 490601e1

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -6270,6 +6270,12 @@ 
    githubId = 53281855;

    name = "hqurve";

  };

  hraban = {

    email = "hraban@0brg.net";

    github = "hraban";

    githubId = 137852;

    name = "Hraban Luyat";

  };

  hrdinka = {

    email = "c.nix@hrdinka.at";

    github = "hrdinka";

maintainers/scripts/haskell/merge-and-open-pr.sh

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ The short version is this: 
* We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.

* If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)



More information about Haskell packages in nixpkgs can be found [in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#haskell).



---



This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions.

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ with lib.maintainers; { 
      lukego

      nagy

      uthar

      hraban

    ];

    githubTeams = [

      "lisp"

pkgs/applications/audio/xmp/default.nix

+11 −9
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }:

{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp, AudioUnit, CoreAudio }:



stdenv.mkDerivation rec {

  pname = "xmp";

  version = "4.1.0";



  meta = with lib; {

    description = "Extended module player";

    homepage    = "https://xmp.sourceforge.net/";

    license     = licenses.gpl2Plus;

    platforms   = platforms.linux;

  };



  src = fetchurl {

    url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz";

    sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x";

  };



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ alsa-lib libxmp ];

  buildInputs = [ libxmp ]

    ++ lib.optionals stdenv.isLinux [ alsa-lib ]

    ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ];



  meta = with lib; {

    description = "Extended module player";

    homepage    = "https://xmp.sourceforge.net/";

    license     = licenses.gpl2Plus;

    platforms   = platforms.unix;

  };

}

pkgs/applications/science/logic/opensmt/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 


stdenv.mkDerivation rec {

  pname = "opensmt";

  version = "2.4.3";

  version = "2.5.0";



  src = fetchFromGitHub {

    owner = "usi-verification-and-security";

    repo = "opensmt";

    rev = "v${version}";

    sha256 = "sha256-v0CyVMi7Hb4Kdw8v/ZcKXpVHabq4m2cOhsNGXXVI4dw=";

    sha256 = "sha256-+u0Go+QU56mmV1G+m+sDOhi3QaWveZILS9fWv8THoWc=";

  };



  nativeBuildInputs = [ cmake bison flex ];