commit c942cd7b2eac6e2851b7b603f46e1347bf681e10 · pyrox.dev/nixpkgs

+9

nixos/tests/installed-tests/appstream.nix

···

       1
       +
       { pkgs, makeInstalledTest, ... }:

     

       2
       +
       

     

       3
       +
       makeInstalledTest {

     

       4
       +
         tested = pkgs.appstream;

     

       5
       +
       

     

       6
       +
         testConfig = {

     

       7
       +
           appstream.enable = true;

     

       8
       +
         };

     

       9
       +
       }

+1

nixos/tests/installed-tests/default.nix

···

       84
        
       in

     

       85
        
       

     

       86
        
       {

     

       0
        
       
     

       87
        
         colord = callInstalledTest ./colord.nix {};

     

       88
        
         flatpak = callInstalledTest ./flatpak.nix {};

     

       89
        
         flatpak-builder = callInstalledTest ./flatpak-builder.nix {};

···

       84
        
       in

     

       85
        
       

     

       86
        
       {

     

       87
       +
         appstream = callInstalledTest ./appstream.nix {};

     

       88
        
         colord = callInstalledTest ./colord.nix {};

     

       89
        
         flatpak = callInstalledTest ./flatpak.nix {};

     

       90
        
         flatpak-builder = callInstalledTest ./flatpak-builder.nix {};

+12 -1

pkgs/development/libraries/appstream/default.nix

···

       22
        
       , gperf

     

       23
        
       , vala

     

       24
        
       , curl

     

       0
        
       
     

       25
        
       }:

     

       26
        
       

     

       27
        
       stdenv.mkDerivation rec {

     

       28
        
         pname = "appstream";

     

       29
        
         version = "0.15.2";

     

       30
        
       

     

       31
       -
         outputs = [ "out" "dev" ];

     

       32
        
       

     

       33
        
         src = fetchFromGitHub {

     

       34
        
           owner = "ximion";

     
···

       43
        
             src = ./fix-paths.patch;

     

       44
        
             libstemmer_includedir = "${lib.getDev libstemmer}/include";

     

       45
        
           })

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       46
        
         ];

     

       47
        
       

     

       48
        
         nativeBuildInputs = [

     
···

       75
        
           "-Dapidocs=false"

     

       76
        
           "-Ddocs=false"

     

       77
        
           "-Dvapi=true"

     

       0
        
       
     

       78
        
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       79
        
       

     

       80
        
         meta = with lib; {

     

       81
        
           description = "Software metadata handling library";

···

       22
        
       , gperf

     

       23
        
       , vala

     

       24
        
       , curl

     

       25
       +
       , nixosTests

     

       26
        
       }:

     

       27
        
       

     

       28
        
       stdenv.mkDerivation rec {

     

       29
        
         pname = "appstream";

     

       30
        
         version = "0.15.2";

     

       31
        
       

     

       32
       +
         outputs = [ "out" "dev" "installedTests" ];

     

       33
        
       

     

       34
        
         src = fetchFromGitHub {

     

       35
        
           owner = "ximion";

     
···

       44
        
             src = ./fix-paths.patch;

     

       45
        
             libstemmer_includedir = "${lib.getDev libstemmer}/include";

     

       46
        
           })

     

       47
       +
       

     

       48
       +
           # Allow installing installed tests to a separate output.

     

       49
       +
           ./installed-tests-path.patch

     

       50
        
         ];

     

       51
        
       

     

       52
        
         nativeBuildInputs = [

     
···

       79
        
           "-Dapidocs=false"

     

       80
        
           "-Ddocs=false"

     

       81
        
           "-Dvapi=true"

     

       82
       +
           "-Dinstalled_test_prefix=${placeholder "installedTests"}"

     

       83
        
         ];

     

       84
       +
       

     

       85
       +
         passthru = {

     

       86
       +
           tests = {

     

       87
       +
             installed-tests = nixosTests.installed-tests.appstream;

     

       88
       +
           };

     

       89
       +
         };

     

       90
        
       

     

       91
        
         meta = with lib; {

     

       92
        
           description = "Software metadata handling library";

+27

pkgs/development/libraries/appstream/installed-tests-path.patch

···

       1
       +
       diff --git a/meson_options.txt b/meson_options.txt

     

       2
       +
       index 8dd8e0c7..e2a30b06 100644

     

       3
       +
       --- a/meson_options.txt

     

       4
       +
       +++ b/meson_options.txt

     

       5
       +
       @@ -44,6 +44,11 @@ option('install-docs',

     

       6
       +
               value : true,

     

       7
       +
               description : 'Install documentation for API and specification'

     

       8
       +
        )

     

       9
       +
       +option('installed_test_prefix',

     

       10
       +
       +       type : 'string',

     

       11
       +
       +       value : '',

     

       12
       +
       +       description : 'Prefix for installed tests'

     

       13
       +
       +)

     

       14
       +
        

     

       15
       +
        #

     

       16
       +
        # For development

     

       17
       +
       diff --git a/tests/installed-tests/meson.build b/tests/installed-tests/meson.build

     

       18
       +
       index 405820ce..f592a753 100644

     

       19
       +
       --- a/tests/installed-tests/meson.build

     

       20
       +
       +++ b/tests/installed-tests/meson.build

     

       21
       +
       @@ -10,5 +10,5 @@ configure_file(

     

       22
       +
            output : 'metainfo-validate.test',

     

       23
       +
            configuration : itconf,

     

       24
       +
            install: true,

     

       25
       +
       -    install_dir: join_paths('share', 'installed-tests', 'appstream'),

     

       26
       +
       +    install_dir: join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'appstream'),

     

       27
       +
        )