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

Merge staging-next into staging

parents b679a615 805ffdec

doc/languages-frameworks/ocaml.section.md

+6 −9
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ Here is a simple package example. 


- It uses the `fetchFromGitHub` fetcher to get its source.



- `duneVersion = "2"` ensures that Dune version 2 is used for the

  build (this is the default; valid values are `"1"`, `"2"`, and `"3"`);

  note that there is also a legacy `useDune2` boolean attribute:

  set to `false` it corresponds to `duneVersion = "1"`; set to `true` it

  corresponds to `duneVersion = "2"`. If both arguments (`duneVersion` and

  `useDune2`) are given, the second one (`useDune2`) is silently ignored.

- It also accept `duneVersion` parameter (valid value are `"1"`, `"2"`, and

  `"3"`). The recommended practice it to set only if you don't want the default

  value and/or it depends on something else like package version. You might see

  a not-supported argument `useDune2`. The behavior was `useDune2 = true;` =>

  `duneVersion = "2";` and `useDune2 = false;` => `duneVersion = "1";`. It was

  used at the time when dune3 didn't existed.



- It sets the optional `doCheck` attribute such that tests will be run with

  `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is
@@ -71,7 +71,6 @@ Here is a simple package example. 
buildDunePackage rec {

  pname = "angstrom";

  version = "0.15.0";

  duneVersion = "2";



  minimalOCamlVersion = "4.04";
@@ -104,8 +103,6 @@ buildDunePackage rec { 
  pname = "wtf8";

  version = "1.0.2";



  useDune2 = true;



  minimalOCamlVersion = "4.02";



  src = fetchurl {

pkgs/applications/audio/butt/default.nix

0 → 100644
+47 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, fltk13, portaudio, lame, libvorbis, libogg

, flac, libopus, libsamplerate, fdk_aac, dbus, openssl, curl }:



stdenv.mkDerivation rec {

  pname = "butt";

  version = "0.1.37";



  src = fetchurl {

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

    hash = "sha256-FI8xRCaGSMC6KEf5v87Q4syO3kVPWXYXgnL24+myRKo=";

  };



  postPatch = ''

    # remove advertising

    substituteInPlace src/FLTK/flgui.cpp \

      --replace 'idata_radio_co_badge, 124, 61, 4,' 'nullptr, 0, 0, 0,'

  '';



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [

    fltk13

    portaudio

    lame

    libvorbis

    libogg

    flac

    libopus

    libsamplerate

    fdk_aac

    dbus

    openssl

    curl

  ];



  postInstall = ''

    cp -r usr/share $out/

  '';



  meta = {

    description =

      "butt (broadcast using this tool) is an easy to use, multi OS streaming tool";

    homepage = "https://danielnoethen.de/butt/";

    license = lib.licenses.gpl2;

    maintainers = with lib.maintainers; [ ehmry ];

  };

}

pkgs/applications/blockchains/stellar-core/default.nix

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


stdenv.mkDerivation rec {

  pname = "stellar-core";

  version = "19.9.0";

  version = "19.10.0";



  src = fetchFromGitHub {

    owner = "stellar";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-00bTqc3YDl/o03Y7NBsgGFwUzb2zYe/A3ccpHPIann8=";

    sha256 = "sha256-BcZsj2TbeJW91aiZ2I7NbDa+rgjfs6lQUsWOnhFQXtw=";

    fetchSubmodules = true;

  };

pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix

+7 −0
Original line number Diff line number Diff line
@@ -522,6 +522,13 @@ let 
          '';

        });



        tokei = super.tokei.overrideAttrs (attrs: {

          postPatch = attrs.postPatch or "" + ''

            substituteInPlace tokei.el \

              --replace 'tokei-program "tokei"' 'tokei-program "${lib.getExe pkgs.tokei}"'

          '';

        });



        treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {

          # searches for Git at build time

          nativeBuildInputs =

pkgs/applications/misc/mob/default.nix

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


buildGoModule rec {

  pname = "mob";

  version = "4.4.0";

  version = "4.4.1";



  src = fetchFromGitHub {

    owner = "remotemobprogramming";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-g2l/XeSyFem2Xi/lVgfbWW+nWHxAcQV/v+2AIqB0apM=";

    sha256 = "sha256-Ovp+JsNqFcOMk054khSdvPebFsv/fQD1Ghox8J3YcgA=";

  };



  vendorHash = null;