commit 24f129d6fd9cb286f0183d5f6a2338785ea05dc4 · pyrox.dev/nixpkgs

-1

nixos/tests/installed-tests/default.nix

···

       98
       98
        
         gnome-photos = callInstalledTest ./gnome-photos.nix {};

     

       99
       99
        
         graphene = callInstalledTest ./graphene.nix {};

     

       100
       100
        
         gsconnect = callInstalledTest ./gsconnect.nix {};

     

       101
       101
       -
         json-glib = callInstalledTest ./json-glib.nix {};

     

       102
       101
        
         ibus = callInstalledTest ./ibus.nix {};

     

       103
       102
        
         libgdata = callInstalledTest ./libgdata.nix {};

     

       104
       103
        
         librsvg = callInstalledTest ./librsvg.nix {};

-5

nixos/tests/installed-tests/json-glib.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       makeInstalledTest {

     

       4
       4
       -
         tested = pkgs.json-glib;

     

       5
       5
       -
       }

+1 -14

pkgs/development/libraries/json-glib/default.nix

···

       4
       4
        
       , glib

     

       5
       5
        
       , meson

     

       6
       6
        
       , ninja

     

       7
       7
       -
       , nixosTests

     

       8
       7
        
       , pkg-config

     

       9
       8
        
       , gettext

     

       10
       9
        
       , gobject-introspection

     
···

       18
       17
        
         pname = "json-glib";

     

       19
       18
        
         version = "1.6.6";

     

       20
       19
        
       

     

       21
       21
       -
         outputs = [ "out" "dev" "devdoc" "installedTests" ];

     

       20
       20
       +
         outputs = [ "out" "dev" "devdoc" ];

     

       22
       21
        
       

     

       23
       22
        
         src = fetchurl {

     

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

     

       25
       24
        
           sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4=";

     

       26
       25
        
         };

     

       27
       27
       -
       

     

       28
       28
       -
         patches = [

     

       29
       29
       -
           # Add option for changing installation path of installed tests.

     

       30
       30
       -
           ./meson-add-installed-tests-prefix-option.patch

     

       31
       31
       -
         ];

     

       32
       26
        
       

     

       33
       27
        
         strictDeps = true;

     

       34
       28
        
       

     
···

       55
       49
        
           glib

     

       56
       50
        
         ];

     

       57
       51
        
       

     

       58
       58
       -
         mesonFlags = [

     

       59
       59
       -
           "-Dinstalled_test_prefix=${placeholder "installedTests"}"

     

       60
       60
       -
         ];

     

       61
       52
        
       

     

       62
       53
        
         # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)

     

       63
       54
        
         # it should be a build-time dep for build

     
···

       82
       73
        
         '';

     

       83
       74
        
       

     

       84
       75
        
         passthru = {

     

       85
       85
       -
           tests = {

     

       86
       86
       -
             installedTests = nixosTests.installed-tests.json-glib;

     

       87
       87
       -
           };

     

       88
       88
       -
       

     

       89
       76
        
           updateScript = gnome.updateScript {

     

       90
       77
        
             packageName = pname;

     

       91
       78
        
             versionPolicy = "odd-unstable";

-27

pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch

···

       1
       1
       -
       diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build

     

       2
       2
       -
       index 1eb56c8..dca444e 100644

     

       3
       3
       -
       --- a/json-glib/tests/meson.build

     

       4
       4
       -
       +++ b/json-glib/tests/meson.build

     

       5
       5
       -
       @@ -21,8 +21,9 @@ test_data = [

     

       6
       6
       -
          'stream-load.json',

     

       7
       7
       -
        ]

     

       8
       8
       -
        

     

       9
       9
       -
       -installed_test_bindir = join_paths(json_libexecdir, 'installed-tests', json_api_name)

     

       10
       10
       -
       -installed_test_datadir = join_paths(json_datadir, 'installed-tests', json_api_name)

     

       11
       11
       -
       +installed_test_prefix = get_option('installed_test_prefix')

     

       12
       12
       -
       +installed_test_bindir = join_paths(installed_test_prefix, 'libexec', 'installed-tests', json_api_name)

     

       13
       13
       -
       +installed_test_datadir = join_paths(installed_test_prefix, 'share', 'installed-tests', json_api_name)

     

       14
       14
       -
        

     

       15
       15
       -
        install_data(test_data, install_dir: installed_test_bindir)

     

       16
       16
       -
        

     

       17
       17
       -
       diff --git a/meson_options.txt b/meson_options.txt

     

       18
       18
       -
       index 068a03f..03f398a 100644

     

       19
       19
       -
       --- a/meson_options.txt

     

       20
       20
       -
       +++ b/meson_options.txt

     

       21
       21
       -
       @@ -10,3 +10,6 @@ option('man',

     

       22
       22
       -
        option('tests',

     

       23
       23
       -
               type: 'boolean', value: true,

     

       24
       24
       -
               description: 'Build the tests')

     

       25
       25
       -
       +option('installed_test_prefix',

     

       26
       26
       -
       +       description: 'Prefix for installed tests',

     

       27
       27
       -
       +       type: 'string')

+2 -2

pkgs/development/python-modules/approvaltests/default.nix

···

       16
       16
        
       }:

     

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
       -
         version = "5.3.3";

     

       19
       19
       +
         version = "5.4.2";

     

       20
       20
        
         pname = "approvaltests";

     

       21
       21
        
         format = "setuptools";

     

       22
       22
        
       

     
···

       27
       27
        
           owner = "approvals";

     

       28
       28
        
           repo = "ApprovalTests.Python";

     

       29
       29
        
           rev = "refs/tags/v${version}";

     

       30
       30
       -
           sha256 = "sha256-lFGwwe8L9hXlzaxcd9pxXin5/NPhCpvM4vFRbeQxZ9U=";

     

       30
       30
       +
           sha256 = "sha256-ZXtIM3McpfDFCaedlbJ6SU+Er5NyfI8kGnrn7sb1V5M=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/mockito/default.nix

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         version = "1.3.4";

     

       4
       4
       +
         version = "1.3.5";

     

       5
       5
        
         pname = "mockito";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "sha256-RdJibODIxwY8xE8Gox9X1B0kHvLsm9pAMtULOedZXrE=";

     

       9
       9
       +
           sha256 = "sha256-gZko9eR1yM4NWX5wUlj7GQ+A/KflYYVojR595VhmMzc=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ];

+2 -2

pkgs/development/tools/esbuild/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "esbuild";

     

       5
       5
       -
         version = "0.15.3";

     

       5
       5
       +
         version = "0.15.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "evanw";

     

       9
       9
        
           repo = "esbuild";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-UjvVaBeKrZ9T/pFQVdIYFHCsmAO+332Q8Gz0bPEfzgw=";

     

       11
       11
       +
           sha256 = "sha256-vLdj5naUDKVCENqGfQRoxbnHd+nuZu6Ac6HTSPnqoVA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

+3 -3

pkgs/development/tools/go-toml/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "go-toml";

     

       5
       5
       -
         version = "2.0.2";

     

       5
       5
       +
         version = "2.0.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "pelletier";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-lZUM31lA6l35EHEZnw6i+WR7qBo692RvlOBkxxBq6Vs=";

     

       11
       11
       +
           sha256 = "sha256-roEJMaRalvk/XT1f15R4DPnlkxo3hPDHdzOfDtZAa8Y=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-/F/ZbeNkiiO2+QibpoKUi1kC3Wv5Jujx6r468irlea0=";

     

       14
       14
       +
         vendorSha256 = "sha256-yDPCfJtYty4aaoDrn3UWFcs1jHJHMJqzc5f06AWQmRc=";

     

       15
       15
        
       

     

       16
       16
        
         excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ];

     

       17
       17

+2 -2

pkgs/tools/package-management/nfpm/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "nfpm";

     

       5
       5
       -
         version = "2.18.0";

     

       5
       5
       +
         version = "2.18.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "goreleaser";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-hRsqu7r6n89KGHybe2D54OtQWq+hBj05xYgi/KPEA7o=";

     

       11
       11
       +
           sha256 = "sha256-Plw8aN1fhZihPcV7dJrlE5Y1flwous7MvrUCJFmkXuc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-6RB27jFK6HI6CR8D9vAPshsRi3ldoQwTTH6S1gyDqxs=";