Unverified Commit e5d09551 authored by Janik's avatar Janik Committed by GitHub
Browse files

Merge pull request #238303 from BenediktBroich/blueprint-compiler

parents 58c5dfbd 4ba86107

pkgs/development/compilers/blueprint/default.nix

+33 −6
Original line number Diff line number Diff line 
{ fetchFromGitLab

{ dbus

, fetchFromGitLab

, gobject-introspection

, gtk4

, lib

, libadwaita

, makeFontsConf

, meson

, ninja

, python3

, stdenv

, testers

, xvfb-run

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "blueprint-compiler";

  version = "0.6.0";

  version = "0.8.1";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "jwestman";

    repo = "blueprint-compiler";

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

    hash = "sha256-L6EGterkZ8EB6xSnJDZ3IMuOumpTpEGnU74X3UgC7k0=";

    hash = "sha256-3lj9BMN5aNujbhhZjObdTOCQfH5ERQCgGqIAw5eZIQc=";

  };



  nativeBuildInputs = [
@@ -26,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  buildInputs = [

    libadwaita

    (python3.withPackages (ps: with ps; [

      pygobject3

    ]))
@@ -36,12 +41,34 @@ stdenv.mkDerivation (finalAttrs: { 
    gobject-introspection

  ];



  doCheck = true;



  nativeCheckInputs = [

    xvfb-run

    dbus

    gtk4

  ];



  env = {

    # Fontconfig error: Cannot load default config file: No such file: (null)

    FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };

  };



  doCheck = true;



  preBuild = ''

    # Fontconfig error: No writable cache directories

    export XDG_CACHE_HOME="$(mktemp -d)"

  '';



  checkPhase = ''

    runHook preCheck



    xvfb-run dbus-run-session \

      --config-file=${dbus}/share/dbus-1/session.conf \

      meson test --no-rebuild --print-errorlogs



    runHook postCheck

  '';



  passthru.tests.version = testers.testVersion {

    package = finalAttrs.finalPackage;

  };
@@ -51,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler";

    license = licenses.lgpl3Plus;

    maintainers = with maintainers; [ benediktbroich ranfdev ];

    platforms = platforms.unix;

    platforms = platforms.linux;

  };

})

pkgs/tools/text/textpieces/default.nix

+10 −7
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
, gtk4

, libgee

, libadwaita

, libportal-gtk4

, json-glib

, blueprint-compiler

, gtksourceview5
@@ -22,15 +23,15 @@ 
let

  pythonEnv = python3.withPackages (ps: with ps; [ pyyaml ]);

in

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "textpieces";

  version = "3.4.0";

  version = "3.4.1";



  src = fetchFromGitHub {

    owner = "liferooter";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-LQq6pjue72a4kIHhWtoxJi/eKxPa4du5sBQY97SG1gY=";

    repo = "textpieces";

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

    hash = "sha256-3ZUHzt3oXYgsnJVDf83JUDhcF+0DLgFfOMtpKI/FTcE=";

  };



  nativeBuildInputs = [
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec { 
    glib

    gtk4

    libadwaita

    libportal-gtk4

    libgee

    json-glib

    gtksourceview5
@@ -72,5 +74,6 @@ stdenv.mkDerivation rec { 
    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ zendo ];

    broken = true; # https://github.com/liferooter/textpieces/issues/130

  };

}
 
})