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

Merge master into staging-next

parents a1aeb4c4 54392400

doc/packages/index.md

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ ibus.section.md 
kakoune.section.md

krita.section.md

linux.section.md

lhapdf.section.md

locales.section.md

etc-files.section.md

nginx.section.md

doc/packages/lhapdf.section.md

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# LHAPDF {#lhapdf}



[LHAPDF](https://lhapdf.hepforge.org/) is a tool for evaluating parton distribution functions (PDFs) in high-energy physics. LHAPDF is available in the `lhapdf` package.



## PDF sets {#lhapdf-sets}



All of [the PDF sets made available by the LHAPDF project](https://lhapdf.hepforge.org/pdfsets.html) are available through the `lhapdf.pdf_sets` attrset.



### Setup hook {#lhapdf-sets-hook}



Each package provided in the `lhapdf.pdf_sets` attrset contains a setup hook which adds itself to [the `LHAPDF_DATA_PATH` environment variable](https://lhapdf.hepforge.org/#sets).

maintainers/scripts/luarocks-packages.csv

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ luv,,,,1.48.0-2,, 
lush.nvim,,,https://luarocks.org/dev,,,teto

lyaml,,,,,,lblasc

lz.n,,,,,,mrcjkb

lze,,,,,,birdee

lzn-auto-require,,,,,,mrcjkb

magick,,,,,5.1,donovanglover

markdown,,,,,,

pkgs/applications/audio/fmit/default.nix

+1 −11
Original line number Diff line number Diff line
@@ -36,17 +36,6 @@ mkDerivation rec { 
      PREFIXSHORTCUT=$out"

  '';



  postInstall = ''

    mkdir -p $out/share/applications

    ln -s $out/fmit.desktop $out/share/applications/fmit.desktop



    mkdir -p $out/share/icons/hicolor/128x128/apps

    ln -s $out/fmit.png $out/share/icons/hicolor/128x128/apps/fmit.png



    mkdir -p $out/share/icons/hicolor/scalable/apps

    ln -s $out/fmit.svg $out/share/icons/hicolor/scalable/apps/fmit.svg

  '';



  meta = with lib; {

    description = "Free Musical Instrument Tuner";

    longDescription = ''
@@ -55,6 +44,7 @@ mkDerivation rec { 
    '';

    homepage = "http://gillesdegottex.github.io/fmit/";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ orivej ];

    platforms = platforms.linux;

  };

}

pkgs/applications/editors/mg/default.nix

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


stdenv.mkDerivation rec {

  pname = "mg";

  version = "7.3";

  version = "7.3-unstable-2024-06-04";



  src = fetchFromGitHub {

    owner = "ibara";

    repo = "mg";

    rev = "mg-${version}";

    sha256 = "sha256-88FrXN7h5uRLY8YMKSzUjBF4n18DEiiiDyoYr+7qXdQ=";

    rev = "4d4abcfc793554dbd4effdba8a3cc28ce2654c33";

    hash = "sha256-+sp8Edu5UWv73TCNVZTeH5rl2Q5XarYrlTYHuQsroVs=";

  };



  postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''