Unverified Commit 8ace65ff authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

treewide: use finalAttrs in all packages I maintain (#255902) 

* mpd-touch-screen-gui: use finalAttrs in mkDerivation; reformat

* musescore: use finalAttrs in mkDerivation

* syncthingtray: use stdenv.mkDerivation with a function; reformat

* ocrfeeder: use finalAttrs in mkDerivation; reformat

* castget: use finalAttrs in mkDerivation

* gnome-network-displays: use finalAttrs in mkDerivation

* mailreaders: use finalAttrs in mkDerivation

* mswatch: use finalAttrs in mkDerivation

* uhd: use finalAttrs in mkDerivation

* maxima: use finalAttrs in mkDerivation

* qalculate-gtk: use finalAttrs in mkDerivation

* qalculate-qt: use finalAttrs in mkDerivation

* wxmaxima: use finalAttrs in mkDerivation

* lammps: use finalAttrs in mkDerivation

* mlterm: use finalAttrs in mkDerivation

* video-trimmer: use finalAttrs in mkDerivation

* nerdfonts: use finalAttrs in mkDerivation

* gnomeExtensions.easyScreenCast: use finalAttrs in mkDerivation

* octave: use finalAttrs in mkDerivation; reformat

* comedilib: use finalAttrs in mkDerivation

* cpp-utilities: use finalAttrs in mkDerivation

* libsForQt5.kpeoplevcard: use finalAttrs in mkDerivation; reformat

* liberio: use finalAttrs in mkDerivation

* libqalculate: use finalAttrs in mkDerivation; reformat

* libwtk-sdl2: use finalAttrs in mkDerivation

* libsForQt5.pulseaudio-qt: use finalAttrs in mkDerivation; reformat

* qrupdate: use finalAttrs in mkDerivation; reformat

* libsForQt5.qtforkawesome: use finalAttrs in mkDerivation; reformat

* libsForQt5.qtutilities: use finalAttrs in mkDerivation; reformat

* sqlitecpp: use finalAttrs in mkDerivation; reformat

* tweeny: use finalAttrs in mkDerivation

* volk: use finalAttrs in mkDerivation

* wiringpi: use finalAttrs in mkDerivation

* snzip: use finalAttrs in mkDerivation; reformat

* bpm-tools: use finalAttrs in mkDerivation; reformat

* sacd: use finalAttrs in mkDerivation

* gtk-gnutella: use finalAttrs in mkDerivation; reformat

* sile: use finalAttrs in mkDerivation

* pplatex: use finalAttrs in mkDerivation; reformat
parent 13526b82

pkgs/applications/audio/mpd-touch-screen-gui/default.nix

+4 −4
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, autoreconfHook

, pkg-config

, autoreconfHook

, SDL2

, SDL2_ttf

, SDL2_image
@@ -14,13 +14,13 @@ 
, dejavu_fonts

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "mpd-touch-screen-gui";

  version = "unstable-2022-12-30";



  src = fetchFromGitHub {

    owner = "muesli4";

    repo = pname;

    repo = "mpd-touch-screen-gui";

    rev = "156eaebede89da2b83a98d8f9dfa46af12282fb4";

    sha256 = "sha256-vr/St4BghrndjUQ0nZI/uJq+F/MjEj6ulc4DYwQ/pgU=";

  };
@@ -60,4 +60,4 @@ stdenv.mkDerivation rec { 
    maintainers = with maintainers; [ doronbehar ];

    platforms = platforms.all;

  };

}
 
})

pkgs/applications/audio/musescore/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@ let 
      Carbon

    ;

  } else portaudio;

in stdenv'.mkDerivation rec {

in stdenv'.mkDerivation (finalAttrs: {

  pname = "musescore";

  version = "4.1.1";



  src = fetchFromGitHub {

    owner = "musescore";

    repo = "MuseScore";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-jXievVIA0tqLdKLy6oPaOHPIbDoFstveEQBri9M0Aoo=";

  };

  patches = [
@@ -168,4 +168,4 @@ in stdenv'.mkDerivation rec { 
    broken = (stdenv.isLinux && stdenv.isAarch64);

    mainProgram = "mscore";

  };

}
 
})

pkgs/applications/graphics/ocrfeeder/default.nix

+10 −10
Original line number Diff line number Diff line 
{ lib, stdenv

, fetchurl

, pkg-config

, gtk3

, gtkspell3

, isocodes

, goocanvas2

, wrapGAppsHook

, intltool

, itstool

, libxml2

, gobject-introspection

, gtk3

, goocanvas2

, gtkspell3

, isocodes

, gnome

, python3

, gobject-introspection

, wrapGAppsHook

, tesseract4

, extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "ocrfeeder";

  version = "0.8.5";



  src = fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";

    sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0=";

  };
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec { 
  ] ++ extraOcrEngines);



  preFixup = ''

    gappsWrapperArgs+=(--prefix PATH : "${enginesPath}")

    gappsWrapperArgs+=(--prefix PATH : "${finalAttrs.enginesPath}")

    gappsWrapperArgs+=(--set ISO_CODES_DIR "${isocodes}/share/xml/iso-codes")

  '';
@@ -70,4 +70,4 @@ stdenv.mkDerivation rec { 
    license = licenses.gpl3Plus;

    platforms = platforms.linux;

  };

}
 
})

pkgs/applications/misc/syncthingtray/default.nix

+6 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
, qtutilities

, qtforkawesome

, boost

, wrapQtAppsHook

, cmake

, kio

, plasma-framework
@@ -29,14 +30,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ 
, autostartExecPath ? "syncthingtray"

}:



mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  version = "1.4.6";

  pname = "syncthingtray";



  src = fetchFromGitHub {

    owner = "Martchus";

    repo = "syncthingtray";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-/HAqO0eVFt4YLGeTbZSZcH2pOojvykukAGTBHZTfKLQ=";

  };
@@ -54,6 +55,7 @@ mkDerivation rec { 
  ;



  nativeBuildInputs = [

    wrapQtAppsHook

    cmake

    qttools

  ]
@@ -64,7 +66,7 @@ mkDerivation rec { 
  # Don't test on Darwin because output is .app

  doInstallCheck = !stdenv.isDarwin;

  installCheckPhase = ''

    $out/bin/syncthingtray --help | grep ${version}

    $out/bin/syncthingtray --help | grep ${finalAttrs.version}

  '';



  cmakeFlags = [
@@ -85,4 +87,4 @@ mkDerivation rec { 
    maintainers = with maintainers; [ doronbehar ];

    platforms = platforms.linux ++ platforms.darwin;

  };

}
 
})

pkgs/applications/networking/feedreaders/castget/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@ 
, glibcLocales

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "castget";

  version = "2.0.1";



  src = fetchurl {

    url = "http://savannah.nongnu.org/download/castget/castget-${version}.tar.bz2";

    url = "http://savannah.nongnu.org/download/castget/castget-${finalAttrs.version}.tar.bz2";

    hash = "sha256-Q4tffsfjGkXtN1ZjD+RH9CAVrNpT7AkgL0hihya16HU=";

  };
@@ -51,4 +51,4 @@ stdenv.mkDerivation rec { 
    license = licenses.gpl2;

    platforms = platforms.linux;

  };

}
 
})