commit 6c112fb5de615adfc2c76b08a923ff61215e2a0b · pyrox.dev/nixpkgs

+17 -4

pkgs/applications/science/electronics/kicad/base.nix

···

       77
       77
        
         postPatch = lib.optionalString (!stable) ''

     

       78
       78
        
           substituteInPlace cmake/KiCadVersion.cmake \

     

       79
       79
        
             --replace "unknown" "${builtins.substring 0 10 src.rev}"

     

       80
       80
       +
       

     

       81
       81
       +
           substituteInPlace cmake/CreateGitVersionHeader.cmake \

     

       82
       82
       +
             --replace "0000000000000000000000000000000000000000" "${src.rev}"

     

       80
       83
        
         '';

     

       81
       84
        
       

     

       82
       85
        
         makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];

     

       83
       83
       -
       

     

       84
       84
       -
         # some ngspice tests attempt to write to $HOME/.cache/

     

       85
       85
       -
         XDG_CACHE_HOME = "$TMP";

     

       86
       86
       -
         # failing tests still attempt to create $HOME though

     

       87
       86
        
       

     

       88
       87
        
         cmakeFlags = [

     

       89
       88
        
           "-DKICAD_USE_EGL=ON"

     
···

       165
       164
        
         ++ optional (withNgspice) libngspice

     

       166
       165
        
         ++ optional (debug) valgrind;

     

       167
       166
        
       

     

       167
       167
       +
         # some ngspice tests attempt to write to $HOME/.cache/

     

       168
       168
       +
         # this could be and was resolved with XDG_CACHE_HOME = "$TMP";

     

       169
       169
       +
         # but failing tests still attempt to create $HOME

     

       170
       170
       +
         # and the newer CLI tests seem to also use $HOME...

     

       171
       171
       +
         HOME = "$TMP";

     

       172
       172
       +
       

     

       168
       173
        
         # debug builds fail all but the python test

     

       169
       174
        
         doInstallCheck = !(debug);

     

       170
       175
        
         installCheckTarget = "test";

     

       176
       176
       +
       

     

       177
       177
       +
         pythonForTests = python.withPackages(ps: with ps; [

     

       178
       178
       +
           numpy

     

       179
       179
       +
           pytest

     

       180
       180
       +
           cairosvg

     

       181
       181
       +
           pytest-image-diff

     

       182
       182
       +
         ]);

     

       183
       183
       +
         nativeInstallCheckInputs = optional (!stable) pythonForTests;

     

       171
       184
        
       

     

       172
       185
        
         dontStrip = debug;

     

       173
       186

+10 -10

pkgs/applications/science/electronics/kicad/versions.nix

···

       25
       25
        
         };

     

       26
       26
        
         "kicad-unstable" = {

     

       27
       27
        
           kicadVersion = {

     

       28
       28
       -
             version =			"2023-04-14";

     

       28
       28
       +
             version =			"2023-06-24";

     

       29
       29
        
             src = {

     

       30
       30
       -
               rev =			"4a3f77cd9dac9dc5921eb9beaa63d0d3c9c051e5";

     

       31
       31
       -
               sha256 =		"06dsiyvr7zn3cp13w0y63d1qmjlhzsqlvajkximg3pw5mmiljxrr";

     

       30
       30
       +
               rev =			"1c1849ec1a6614247abe4c623c086def2b3192e0";

     

       31
       31
       +
               sha256 =		"0faf4fw7nrfwdrl4pjqdyfzqbvb9jd4nk4aq83v1w358yqyk7zg9";

     

       32
       32
        
             };

     

       33
       33
        
           };

     

       34
       34
        
           libVersion = {

     

       35
       35
       -
             version =			"2023-04-14";

     

       35
       35
       +
             version =			"2023-06-24";

     

       36
       36
        
             libSources = {

     

       37
       37
       -
               symbols.rev =		"38d4e7e1ab6a9b5d9eee85f687e60467753b2135";

     

       38
       38
       -
               symbols.sha256 =	"0df6fx9b19v6sxrfyggbisw72y66kiwqi05k8mldsgiw6q55gbkc";

     

       37
       37
       +
               symbols.rev =		"43456780d309682f6da4a6f14710355b06fc4c5d";

     

       38
       38
       +
               symbols.sha256 =	"1ql2w3q3dv13ascw8s0hzwda486763qma7i2m877jw3p78gjhldr";

     

       39
       39
        
               templates.rev =		"867eef383a0f61015cb69677d5c632d78a2ea01a";

     

       40
       40
        
               templates.sha256 =	"1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";

     

       41
       41
       -
               footprints.rev =	"4da055a2d572ff87e7ecea97cf358ed8c1d46dfc";

     

       42
       42
       -
               footprints.sha256 =	"1xb84284dmcb7mbvzlrxb4v4km3ih7gq856h8cglf9jn8wzlnvrk";

     

       43
       43
       -
               packages3d.rev =	"0f43a0962437feb53bd2083e9f39efffb5a5dd90";

     

       44
       44
       -
               packages3d.sha256 =	"1nkk4325jh89vh52ykfnf9pz1k3jk5017gz6r2cia2v4b3jadi31";

     

       41
       41
       +
               footprints.rev =	"6a59a2d3940dbab7b3e8254a5b9bf06cc5330301";

     

       42
       42
       +
               footprints.sha256 =	"0jlz0ln9vzj1av1fmw8ma8kfqlb8w0r9vrfng19bkc3cgh9lvh9x";

     

       43
       43
       +
               packages3d.rev =	"8a2c5c4c85457832f3320902456d066d29561806";

     

       44
       44
       +
               packages3d.sha256 =	"0dmssyhqd94d9wj8w7g7xjan560b2rwcs540sgl0rc77cw2jify8";

     

       45
       45
        
             };

     

       46
       46
        
           };

     

       47
       47
        
         };

+43

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pillow

     

       5
       5
       +
       , unittestCheckHook

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "diffimg";

     

       10
       10
       +
         version = "0.3.0"; # github recognized 0.1.3, there's a v0.1.5 tag and setup.py says 0.3.0

     

       11
       11
       +
         format = "setuptools";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "nicolashahn";

     

       15
       15
       +
           repo = "diffimg";

     

       16
       16
       +
           rev = "b82f0bb416f100f9105ccccf1995872b29302461";

     

       17
       17
       +
           hash = "sha256-H/UQsqyfdnlESBe7yRu6nK/0dakQkAfeFaZNwjCMvdM=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         # it imports the wrong diff,

     

       21
       21
       +
         # fix offered to upstream https://github.com/nicolashahn/diffimg/pull/6

     

       22
       22
       +
         postPatch = ''

     

       23
       23
       +
           substituteInPlace diffimg/test.py \

     

       24
       24
       +
             --replace "from diff import diff" "from diffimg.diff import diff"

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         propagatedBuildInputs = [

     

       28
       28
       +
           pillow

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         pythonImportsCheck = [ "diffimg" ];

     

       32
       32
       +
       

     

       33
       33
       +
         nativeCheckInputs = [

     

       34
       34
       +
           unittestCheckHook

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         meta = with lib; {

     

       38
       38
       +
           description = "Differentiate images in python - get a ratio or percentage difference, and generate a diff image";

     

       39
       39
       +
           homepage = "https://github.com/nicolashahn/diffimg";

     

       40
       40
       +
           license = licenses.mit;

     

       41
       41
       +
           maintainers = with maintainers; [ evils ];

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+39

pkgs/development/python-modules/image-diff/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , python

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , pillow

     

       6
       6
       +
       , click

     

       7
       7
       +
       , click-default-group

     

       8
       8
       +
       , pytestCheckHook

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "image-diff";

     

       13
       13
       +
         version = "0.2.2";

     

       14
       14
       +
         format = "setuptools";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "simonw";

     

       18
       18
       +
           repo = "image-diff";

     

       19
       19
       +
           rev = version;

     

       20
       20
       +
           hash = "sha256-AQykJNvBgVjmPVTwJOX17eKWelqvZZieq/giid8GYAY=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [

     

       24
       24
       +
           pillow

     

       25
       25
       +
           click

     

       26
       26
       +
           click-default-group

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         pythonImportsCheck = [ "image_diff" ];

     

       30
       30
       +
       

     

       31
       31
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           description = "CLI tool for comparing images";

     

       35
       35
       +
           homepage = "https://github.com/simonw/image-diff";

     

       36
       36
       +
           license = licenses.asl20;

     

       37
       37
       +
           maintainers = with maintainers; [ evils ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+39

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pillow

     

       5
       5
       +
       , mock

     

       6
       6
       +
       , unittestCheckHook

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "imgdiff";

     

       11
       11
       +
         version = "1.7.1";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "mgedmin";

     

       16
       16
       +
           repo = "imgdiff";

     

       17
       17
       +
           rev = version;

     

       18
       18
       +
           hash = "sha256-Y5nUnjihRpVVehhP1LUgfuJN5nCxEJu6P1w99Igpxjs=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         propagatedBuildInputs = [

     

       22
       22
       +
           pillow

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         pythonImportsCheck = [ "imgdiff" ];

     

       26
       26
       +
       

     

       27
       27
       +
         nativeCheckInputs = [

     

       28
       28
       +
           mock

     

       29
       29
       +
           unittestCheckHook

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         meta = with lib; {

     

       33
       33
       +
           description = "Compare two images side-by-side";

     

       34
       34
       +
           homepage = "https://github.com/mgedmin/imgdiff";

     

       35
       35
       +
           changelog = "https://github.com/mgedmin/imgdiff/blob/${src.rev}/CHANGES.rst";

     

       36
       36
       +
           license = licenses.mit;

     

       37
       37
       +
           maintainers = with maintainers; [ evils ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+43

pkgs/development/python-modules/pytest-image-diff/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , python3

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , typing-extensions

     

       6
       6
       +
       , diffimg

     

       7
       7
       +
       , imgdiff

     

       8
       8
       +
       , pytestCheckHook

     

       9
       9
       +
       , recommonmark

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         pname = "pytest-image-diff";

     

       14
       14
       +
         version = "0.0.11";

     

       15
       15
       +
         format = "setuptools";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchFromGitHub {

     

       18
       18
       +
           owner = "Apkawa";

     

       19
       19
       +
           repo = "pytest-image-diff";

     

       20
       20
       +
           rev = "v${version}";

     

       21
       21
       +
           hash = "sha256-7GBwxm0YQNN/Gq1yyBIxCEYbM7hmOFa9kUsfbBKQtBQ=";

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         propagatedBuildInputs = [

     

       25
       25
       +
           typing-extensions

     

       26
       26
       +
           diffimg

     

       27
       27
       +
           imgdiff

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         pythonImportsCheck = [ "pytest_image_diff" ];

     

       31
       31
       +
       

     

       32
       32
       +
         nativeCheckInputs = [

     

       33
       33
       +
           pytestCheckHook

     

       34
       34
       +
           recommonmark

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         meta = with lib; {

     

       38
       38
       +
           description = "Pytest helps for compare images and regression";

     

       39
       39
       +
           homepage = "https://github.com/Apkawa/pytest-image-diff";

     

       40
       40
       +
           license = licenses.mit;

     

       41
       41
       +
           maintainers = with maintainers; [ evils ];

     

       42
       42
       +
         };

     

       43
       43
       +
       }

pkgs/top-level/python-packages.nix

···

       2559
       2559
        
       

     

       2560
       2560
        
         diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };

     

       2561
       2561
        
       

     

       2562
       2562
       +
         diffimg = callPackage ../development/python-modules/diffimg { };

     

       2563
       2563
       +
       

     

       2562
       2564
        
         digital-ocean = callPackage ../development/python-modules/digitalocean { };

     

       2563
       2565
        
       

     

       2564
       2566
        
         digi-xbee = callPackage ../development/python-modules/digi-xbee { };

     
···

       4879
       4881
        
       

     

       4880
       4882
        
         imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { };

     

       4881
       4883
        
       

     

       4884
       4884
       +
         image-diff = callPackage ../development/python-modules/image-diff { };

     

       4885
       4885
       +
       

     

       4882
       4886
        
         image-go-nord = callPackage ../development/python-modules/image-go-nord { };

     

       4883
       4887
        
       

     

       4884
       4888
        
         imagesize = callPackage ../development/python-modules/imagesize { };

     
···

       4896
       4900
        
         img2pdf = callPackage ../development/python-modules/img2pdf { };

     

       4897
       4901
        
       

     

       4898
       4902
        
         imgaug = callPackage ../development/python-modules/imgaug { };

     

       4903
       4903
       +
       

     

       4904
       4904
       +
         imgdiff = callPackage ../development/python-modules/imgdiff { };

     

       4899
       4905
        
       

     

       4900
       4906
        
         imgsize = callPackage ../development/python-modules/imgsize { };

     

       4901
       4907
        
       

     
···

       9698
       9704
        
         pytest-httpserver = callPackage ../development/python-modules/pytest-httpserver { };

     

       9699
       9705
        
       

     

       9700
       9706
        
         pytest-httpx = callPackage ../development/python-modules/pytest-httpx { };

     

       9707
       9707
       +
       

     

       9708
       9708
       +
         pytest-image-diff = callPackage ../development/python-modules/pytest-image-diff { };

     

       9701
       9709
        
       

     

       9702
       9710
        
         pytest-instafail = callPackage ../development/python-modules/pytest-instafail { };

     

       9703
       9711