commit e253d015a187aa51f85f9f1dfb926b7889c5731b · pyrox.dev/nixpkgs

+1

nixos/tests/installed-tests/default.nix

···

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

     

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

     

       69
       69
        
         fwupd = callInstalledTest ./fwupd.nix {};

     

       70
       70
       +
         gcab = callInstalledTest ./gcab.nix {};

     

       70
       71
        
         gdk-pixbuf = callInstalledTest ./gdk-pixbuf.nix {};

     

       71
       72
        
         gjs = callInstalledTest ./gjs.nix {};

     

       72
       73
        
         glib-networking = callInstalledTest ./glib-networking.nix {};

+5

nixos/tests/installed-tests/gcab.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       makeInstalledTest {

     

       4
       4
       +
         tested = pkgs.gcab;

     

       5
       5
       +
       }

+15 -2

pkgs/development/libraries/gcab/default.nix

···

       13
       13
        
       , glib

     

       14
       14
        
       , zlib

     

       15
       15
        
       , gnome3

     

       16
       16
       +
       , nixosTests

     

       16
       17
        
       }:

     

       17
       18
        
       

     

       18
       19
        
       stdenv.mkDerivation rec {

     

       19
       20
        
         pname = "gcab";

     

       20
       21
        
         version = "1.3";

     

       21
       22
        
       

     

       22
       22
       -
         outputs = [ "bin" "out" "dev" "devdoc" ];

     

       23
       23
       +
         outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ];

     

       23
       24
        
       

     

       24
       25
        
         src = fetchurl {

     

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

     

       26
       27
        
           sha256 = "1rv81b37d5ya7xpfdxrfk173jjcwabxyng7vafgwyl5myv44qc0h";

     

       27
       28
        
         };

     

       29
       29
       +
       

     

       30
       30
       +
         patches = [

     

       31
       31
       +
           # allow installing installed tests to a separate output

     

       32
       32
       +
           ./installed-tests-path.patch

     

       33
       33
       +
         ];

     

       28
       34
        
       

     

       29
       35
        
         nativeBuildInputs = [

     

       30
       36
        
           meson

     
···

       45
       51
        
         ];

     

       46
       52
        
       

     

       47
       53
        
         mesonFlags = [

     

       48
       48
       -
           "-Dtests=false"

     

       54
       54
       +
           "-Dinstalled_tests=true"

     

       55
       55
       +
           "-Dinstalled_test_prefix=${placeholder ''installedTests''}"

     

       49
       56
        
         ];

     

       57
       57
       +
       

     

       58
       58
       +
         doCheck = true;

     

       50
       59
        
       

     

       51
       60
        
         passthru = {

     

       52
       61
        
           updateScript = gnome3.updateScript {

     

       53
       62
        
             packageName = pname;

     

       54
       63
        
             versionPolicy = "none";

     

       64
       64
       +
           };

     

       65
       65
       +
       

     

       66
       66
       +
           tests = {

     

       67
       67
       +
             installedTests = nixosTests.installed-tests.gcab;

     

       55
       68
        
           };

     

       56
       69
        
         };

     

       57
       70

+21

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

···

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

     

       2
       2
       +
       index c1b1da1..9b76022 100644

     

       3
       3
       +
       --- a/meson_options.txt

     

       4
       4
       +
       +++ b/meson_options.txt

     

       5
       5
       +
       @@ -4,3 +4,4 @@

     

       6
       6
       +
        option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)')

     

       7
       7
       +
        option('tests', type : 'boolean', value : true, description : 'enable tests')

     

       8
       8
       +
        option('installed_tests', type : 'boolean', value : false, description : 'install tests for "as-installed" testing')

     

       9
       9
       +
       +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')

     

       10
       10
       +
       diff --git a/tests/meson.build b/tests/meson.build

     

       11
       11
       +
       index 1e46e2a..aa780d0 100644

     

       12
       12
       +
       --- a/tests/meson.build

     

       13
       13
       +
       +++ b/tests/meson.build

     

       14
       14
       +
       @@ -1,5 +1,5 @@

     

       15
       15
       +
       -installed_tests_metadir = join_paths(get_option('datadir'), 'installed-tests', 'libgcab-1.0')

     

       16
       16
       +
       -installed_tests_execdir = join_paths(get_option('libexecdir'), 'installed-tests', 'libgcab-1.0')

     

       17
       17
       +
       +installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'libgcab-1.0')

     

       18
       18
       +
       +installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', 'libgcab-1.0')

     

       19
       19
       +
        installed_tests_enabled = get_option('installed_tests')

     

       20
       20
       +
        installed_tests_template_tap = files('template-tap.test.in')

     

       21
       21
       +
        abs_installed_tests_execdir = join_paths(get_option('prefix'), installed_tests_execdir)