ipe: migrate to by-name

ipe: refactor package definitions

ghostscript: migrate to by-name

+32 -31
+16 -16
pkgs/applications/graphics/ipe/default.nix pkgs/by-name/ip/ipe/package.nix
··· 7 7 copyDesktopItems, 8 8 cairo, 9 9 freetype, 10 - ghostscript, 10 + ghostscriptX, 11 11 gsl, 12 12 libjpeg, 13 13 libpng, 14 14 libspiro, 15 15 lua5, 16 - qtbase, 17 - qtsvg, 16 + qt6Packages, 18 17 texliveSmall, 19 18 qhull, 20 - wrapQtAppsHook, 21 19 zlib, 22 20 withTeXLive ? true, 23 21 withQVoronoi ? false, 24 22 buildPackages, 25 23 }: 26 24 27 - stdenv.mkDerivation rec { 25 + stdenv.mkDerivation (finalAttrs: { 28 26 pname = "ipe"; 29 27 version = "7.2.30"; 30 28 31 29 src = fetchFromGitHub { 32 30 owner = "otfried"; 33 31 repo = "ipe"; 34 - tag = "v${version}"; 32 + tag = "v${finalAttrs.version}"; 35 33 hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE="; 36 34 }; 37 35 38 36 nativeBuildInputs = [ 39 37 pkg-config 40 38 copyDesktopItems 41 - wrapQtAppsHook 39 + qt6Packages.wrapQtAppsHook 42 40 ]; 43 41 44 42 buildInputs = [ 45 43 cairo 46 44 freetype 47 - ghostscript 45 + ghostscriptX 48 46 gsl 49 47 libjpeg 50 48 libpng 51 49 libspiro 52 50 lua5 51 + ] 52 + ++ (with qt6Packages; [ 53 53 qtbase 54 54 qtsvg 55 55 zlib 56 - ] 56 + ]) 57 57 ++ (lib.optionals withTeXLive [ 58 58 texliveSmall 59 59 ]) ··· 79 79 80 80 desktopItems = [ 81 81 (makeDesktopItem { 82 - name = pname; 82 + name = "ipe"; 83 83 desktopName = "Ipe"; 84 84 genericName = "Drawing editor"; 85 85 comment = "A drawing editor for creating figures in PDF format"; ··· 100 100 101 101 postInstall = '' 102 102 mkdir -p $out/share/icons/hicolor/128x128/apps 103 - ln -s $out/share/ipe/${version}/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/ipe.png 103 + ln -s $out/share/ipe/${finalAttrs.version}/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/ipe.png 104 104 ''; 105 105 106 - meta = with lib; { 106 + meta = { 107 107 description = "Editor for drawing figures"; 108 108 homepage = "http://ipe.otfried.org"; # https not available 109 - license = licenses.gpl3Plus; 109 + license = lib.licenses.gpl3Plus; 110 110 longDescription = '' 111 111 Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. 112 112 It supports making small figures for inclusion into LaTeX-documents 113 113 as well as presentations in PDF. 114 114 ''; 115 - maintainers = with maintainers; [ ttuegel ]; 116 - platforms = platforms.linux; 115 + maintainers = with lib.maintainers; [ ttuegel ]; 116 + platforms = lib.platforms.linux; 117 117 }; 118 - } 118 + })
+8
pkgs/by-name/gh/ghostscriptX/package.nix
··· 1 + { 2 + ghostscript, 3 + }: 4 + 5 + ghostscript.override { 6 + cupsSupport = true; 7 + x11Support = true; 8 + }
+8
pkgs/by-name/gh/ghostscript_headless/package.nix
··· 1 + { 2 + ghostscript, 3 + }: 4 + 5 + ghostscript.override { 6 + cupsSupport = false; 7 + x11Support = false; 8 + }
-15
pkgs/top-level/all-packages.nix
··· 12513 12513 lua = lua5_1; 12514 12514 }; 12515 12515 12516 - ipe = qt6Packages.callPackage ../applications/graphics/ipe { 12517 - ghostscript = ghostscriptX; 12518 - lua5 = lua5_3; 12519 - }; 12520 - 12521 12516 ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; 12522 12517 12523 12518 jabcode = callPackage ../development/libraries/jabcode { }; ··· 15562 15557 gajim = callPackage ../applications/networking/instant-messengers/gajim { 15563 15558 inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; 15564 15559 gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; 15565 - }; 15566 - 15567 - ghostscriptX = ghostscript.override { 15568 - cupsSupport = true; 15569 - x11Support = true; 15570 - }; 15571 - 15572 - ghostscript_headless = ghostscript.override { 15573 - cupsSupport = false; 15574 - x11Support = false; 15575 15560 }; 15576 15561 15577 15562 gnuk = callPackage ../misc/gnuk {