commit 3a9543b778f9c2f16a1ff145163d76cb730652a2 · pyrox.dev/nixpkgs

+10 -10

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

···

       2
       2
        
       , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig

     

       3
       3
        
       , doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages

     

       4
       4
        
       

     

       5
       5
       -
       , pname ? "kicad"

     

       6
       5
        
       , stable ? true

     

       7
       6
        
       , baseName ? "kicad"

     

       8
       7
        
       , versions ? { }

     
···

       20
       19
        
       let

     

       21
       20
        
       

     

       22
       21
        
         versionConfig = versions.${baseName};

     

       23
       23
       -
         baseVersion = "${versions.${baseName}.kicadVersion.version}";

     

       24
       22
        
       

     

       25
       23
        
         # oce on aarch64 fails a test

     

       26
       24
        
         withOCE = oceSupport && !stdenv.isAarch64;

     

       27
       25
        
         withOCC = (withOCCT && !withOCE) || (oceSupport && stdenv.isAarch64);

     

       28
       26
        
       

     

       29
       29
       -
         kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion;

     

       27
       27
       +
         libraries = callPackages ./libraries.nix versionConfig.libVersion;

     

       30
       28
        
       

     

       31
       29
        
       in

     

       32
       30
        
       stdenv.mkDerivation rec {

     

       33
       31
        
       

     

       34
       34
       -
         inherit pname;

     

       35
       35
       -
         version = "base-${baseVersion}";

     

       32
       32
       +
         i18n = libraries.i18n;

     

       33
       33
       +
       

     

       34
       34
       +
         pname = "kicad-base";

     

       35
       35
       +
         version = "${versions.${baseName}.kicadVersion.version}";

     

       36
       36
        
       

     

       37
       37
        
         src = fetchFromGitLab (

     

       38
       38
        
           {

     

       39
       39
        
             group = "kicad";

     

       40
       40
        
             owner = "code";

     

       41
       41
        
             repo = "kicad";

     

       42
       42
       -
             rev = baseVersion;

     

       43
       42
        
           } // versionConfig.kicadVersion.src

     

       44
       43
        
         );

     

       45
       44
        
       

     
···

       57
       56
        
         # tagged releases don't have "unknown"

     

       58
       57
        
         # kicad nightlies use git describe --dirty

     

       59
       58
        
         # nix removes .git, so its approximated here

     

       59
       59
       +
         # "-1" appended to indicate we're adding a patch

     

       60
       60
        
         postPatch = ''

     

       61
       61
        
           substituteInPlace CMakeModules/KiCadVersion.cmake \

     

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

     

       62
       62
       +
             --replace "unknown" "${builtins.substring 0 10 src.rev}-1" \

     

       63
       63
       +
             --replace "${version}" "${version}-1"

     

       63
       64
        
         '';

     

       64
       65
        
       

     

       65
       66
        
         makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];

     
···

       113
       114
        
       

     

       114
       115
        
         postInstall = optional (withI18n) ''

     

       115
       116
        
           mkdir -p $out/share

     

       116
       116
       -
           lndir ${kicad-libraries.i18n}/share $out/share

     

       117
       117
       +
           lndir ${i18n}/share $out/share

     

       117
       118
        
         '';

     

       118
       119
        
       

     

       119
       120
        
         meta = {

     
···

       124
       125
        
           '';

     

       125
       126
        
           homepage = "https://www.kicad-pcb.org/";

     

       126
       127
        
           license = licenses.agpl3;

     

       127
       127
       -
           maintainers = with maintainers; [ evils kiwi berce ];

     

       128
       128
       -
           platforms = with platforms; linux;

     

       128
       128
       +
           platforms = platforms.all;

     

       129
       129
        
         };

     

       130
       130
        
       }

+52 -51

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

···

       4
       4
        
       , librsvg, cups

     

       5
       5
        
       

     

       6
       6
        
       , pname ? "kicad"

     

       7
       7
       +
       , stable ? true

     

       7
       8
        
       , oceSupport ? false, opencascade

     

       8
       9
        
       , withOCCT ? true, opencascade-occt

     

       9
       10
        
       , ngspiceSupport ? true, libngspice

     
···

       18
       19
        
       with lib;

     

       19
       20
        
       let

     

       20
       21
        
       

     

       21
       21
       -
         stable = pname != "kicad-unstable";

     

       22
       22
        
         baseName = if (stable) then "kicad" else "kicad-unstable";

     

       23
       23
        
       

     

       24
       24
        
         versions =  import ./versions.nix;

     
···

       35
       35
        
         python = python3;

     

       36
       36
        
         wxPython = python3Packages.wxPython_4_0;

     

       37
       37
        
       

     

       38
       38
       -
         libraries = callPackages ./libraries.nix versionConfig.libVersion;

     

       38
       38
       +
       in

     

       39
       39
       +
       stdenv.mkDerivation rec {

     

       40
       40
       +
       

     

       41
       41
       +
         passthru.libraries = callPackages ./libraries.nix versionConfig.libVersion;

     

       39
       42
        
         base = callPackage ./base.nix {

     

       40
       40
       -
           pname = baseName;

     

       41
       43
        
           inherit versions stable baseName;

     

       42
       44
        
           inherit wxGTK python wxPython;

     

       43
       45
        
           inherit debug withI18n withOCCT oceSupport ngspiceSupport scriptingSupport;

     

       44
       46
        
         };

     

       45
       45
       -
       

     

       46
       46
       -
       in

     

       47
       47
       -
       stdenv.mkDerivation rec {

     

       48
       47
        
       

     

       49
       48
        
         inherit pname;

     

       50
       49
        
         version = versions.${baseName}.kicadVersion.version;

     
···

       63
       62
        
       

     

       64
       63
        
         # wrapGAppsHook added the equivalent to ${base}/share

     

       65
       64
        
         # though i noticed no difference without it

     

       66
       66
       -
         makeWrapperArgs = [

     

       65
       65
       +
         makeWrapperArgs = with passthru.libraries; [

     

       67
       66
        
           "--prefix XDG_DATA_DIRS : ${base}/share"

     

       68
       67
        
           "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"

     

       69
       68
        
           "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share"

     
···

       73
       72
        
           "--prefix XDG_DATA_DIRS : ${cups}/share"

     

       74
       73
        
           "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules"

     

       75
       74
        
       

     

       76
       76
       -
           "--set KISYSMOD ${libraries.footprints}/share/kicad/modules"

     

       77
       77
       -
           "--set KICAD_SYMBOL_DIR ${libraries.symbols}/share/kicad/library"

     

       78
       78
       -
           "--set KICAD_TEMPLATE_DIR ${libraries.templates}/share/kicad/template"

     

       79
       79
       -
           "--prefix KICAD_TEMPLATE_DIR : ${libraries.symbols}/share/kicad/template"

     

       80
       80
       -
           "--prefix KICAD_TEMPLATE_DIR : ${libraries.footprints}/share/kicad/template"

     

       75
       75
       +
           "--set KISYSMOD ${footprints}/share/kicad/modules"

     

       76
       76
       +
           "--set KICAD_SYMBOL_DIR ${symbols}/share/kicad/library"

     

       77
       77
       +
           "--set KICAD_TEMPLATE_DIR ${templates}/share/kicad/template"

     

       78
       78
       +
           "--prefix KICAD_TEMPLATE_DIR : ${symbols}/share/kicad/template"

     

       79
       79
       +
           "--prefix KICAD_TEMPLATE_DIR : ${footprints}/share/kicad/template"

     

       81
       80
        
         ]

     

       82
       82
       -
         ++ optionals (with3d) [ "--set KISYS3DMOD ${libraries.packages3d}/share/kicad/modules/packages3d" ]

     

       81
       81
       +
         ++ optionals (with3d) [ "--set KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ]

     

       83
       82
        
         ++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ]

     

       84
       83
        
       

     

       85
       84
        
         # infinisil's workaround for #39493

     

       86
       85
        
         ++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ]

     

       87
       86
        
         ;

     

       88
       87
        
       

     

       89
       89
       -
         # dunno why i have to add $makeWrapperArgs manually...

     

       88
       88
       +
         # why does $makeWrapperArgs have to be added explicitly?

     

       90
       89
        
         # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set?

     

       91
       91
       -
         # not sure if anything has to be done with the other stuff in base/bin

     

       92
       92
       -
         # dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest

     

       93
       93
       -
         installPhase =

     

       94
       94
       -
           optionalString (scriptingSupport) '' buildPythonPath "${base} $pythonPath"

     

       95
       95
       -
           '' +

     

       96
       96
       -
           '' makeWrapper ${base}/bin/kicad $out/bin/kicad $makeWrapperArgs ''

     

       97
       97
       -
           + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"

     

       98
       98
       -
           '' +

     

       99
       99
       -
           '' makeWrapper ${base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs ''

     

       100
       100
       -
           + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"

     

       101
       101
       -
           '' +

     

       102
       102
       -
           '' makeWrapper ${base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs ''

     

       103
       103
       -
           + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"

     

       104
       104
       -
           '' +

     

       105
       105
       -
           '' makeWrapper ${base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs ''

     

       106
       106
       -
           + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"

     

       107
       107
       -
           '' +

     

       108
       108
       -
           '' makeWrapper ${base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs ''

     

       109
       109
       -
           + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"

     

       110
       110
       -
           '' +

     

       111
       111
       -
           '' makeWrapper ${base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs ''

     

       112
       112
       -
           + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"

     

       113
       113
       -
           '' +

     

       114
       114
       -
           '' makeWrapper ${base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs ''

     

       115
       115
       -
           + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"

     

       116
       116
       -
           ''

     

       90
       90
       +
         # kicad-ogltest's source seems to indicate that crashing is expected behaviour...

     

       91
       91
       +
         installPhase = with lib;

     

       92
       92
       +
           let

     

       93
       93
       +
             tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ];

     

       94
       94
       +
             utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ];

     

       95
       95
       +
           in

     

       96
       96
       +
           ( concatStringsSep "\n"

     

       97
       97
       +
             ( flatten [

     

       98
       98
       +
               ( optionalString (scriptingSupport) "buildPythonPath \"${base} $pythonPath\" \n" )

     

       99
       99
       +
       

     

       100
       100
       +
               # wrap each of the directly usable tools

     

       101
       101
       +
               ( map ( tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs"

     

       102
       102
       +
                 + optionalString (scriptingSupport) " --set PYTHONPATH \"$program_PYTHONPATH\""

     

       103
       103
       +
                   ) tools )

     

       104
       104
       +
       

     

       105
       105
       +
               # link in the CLI utils

     

       106
       106
       +
               ( map ( util: "ln -s ${base}/bin/${util} $out/bin/${util}" ) utils )

     

       107
       107
       +
             ])

     

       108
       108
       +
           )

     

       117
       109
        
         ;

     

       118
       110
        
       

     

       119
       111
        
         # can't run this for each pname

     
···

       123
       115
        
         # and can't git commit if this could be running in parallel with other scripts

     

       124
       116
        
         passthru.updateScript = [ ./update.sh "all" ];

     

       125
       117
        
       

     

       126
       126
       -
         meta = {

     

       127
       127
       -
           description = if (stable)

     

       128
       128
       -
             then "Open Source Electronics Design Automation Suite"

     

       129
       129
       -
             else "Open Source EDA Suite, Development Build";

     

       118
       118
       +
         meta = rec {

     

       119
       119
       +
           description = (if (stable)

     

       120
       120
       +
             then "Open Source Electronics Design Automation suite"

     

       121
       121
       +
             else "Open Source EDA suite, development build")

     

       122
       122
       +
             + (if (!with3d) then ", without 3D models" else "");

     

       130
       123
        
           homepage = "https://www.kicad-pcb.org/";

     

       131
       124
        
           longDescription = ''

     

       132
       125
        
             KiCad is an open source software suite for Electronic Design Automation.

     
···

       134
       127
        
           '';

     

       135
       128
        
           license = licenses.agpl3;

     

       136
       129
        
           # berce seems inactive...

     

       137
       137
       -
           maintainers = with maintainers; [ evils kiwi berce ];

     

       138
       138
       -
           # kicad's cross-platform, not sure what to fill in here

     

       139
       139
       -
           platforms = with platforms; linux;

     

       140
       140
       -
         } // optionalAttrs with3d {

     

       141
       141
       -
           # We can't download the 3d models on Hydra - they are a ~1 GiB download and

     

       142
       142
       -
           # they occupy ~5 GiB in store.

     

       143
       143
       -
           hydraPlatforms = [];

     

       130
       130
       +
           maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ];

     

       131
       131
       +
           # kicad is cross platform

     

       132
       132
       +
           platforms = stdenv.lib.platforms.all;

     

       133
       133
       +
           # despite that, nipkgs' wxGTK for darwin is "wxmac"

     

       134
       134
       +
           # and wxPython_4_0 does not account for this

     

       135
       135
       +
           # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3),

     

       136
       136
       +
           # seems like more trouble than fixing wxPython_4_0 would be

     

       137
       137
       +
           # additionally, libngspice is marked as linux only, though it should support darwin

     

       138
       138
       +
       

     

       139
       139
       +
           hydraPlatforms = if (with3d) then [ ] else platforms;

     

       140
       140
       +
           # We can't download the 3d models on Hydra,

     

       141
       141
       +
           # they are a ~1 GiB download and they occupy ~5 GiB in store.

     

       142
       142
       +
           # as long as the base and libraries (minus 3d) are build,

     

       143
       143
       +
           # this wrapper does not need to get built

     

       144
       144
       +
           # the kicad-*small "packages" cause this to happen

     

       144
       145
        
         };

     

       145
       146
        
       }

+24 -15

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

···

       13
       13
        
       with lib;

     

       14
       14
        
       let

     

       15
       15
        
         mkLib = name:

     

       16
       16
       -
           stdenv.mkDerivation

     

       17
       17
       -
             {

     

       18
       18
       -
               pname = "kicad-${name}";

     

       19
       19
       -
               version = "${version}";

     

       20
       20
       -
               src = fetchFromGitHub (

     

       21
       21
       -
                 {

     

       22
       22
       -
                   owner = "KiCad";

     

       23
       23
       -
                   repo = "kicad-${name}";

     

       24
       24
       -
                   rev = version;

     

       25
       25
       -
                   inherit name;

     

       26
       26
       -
                 } // (libSources.${name} or { })

     

       27
       27
       -
               );

     

       28
       28
       -
               nativeBuildInputs = [ cmake ];

     

       29
       29
       -
               meta.license = licenses.cc-by-sa-40;

     

       16
       16
       +
           stdenv.mkDerivation {

     

       17
       17
       +
             pname = "kicad-${name}";

     

       18
       18
       +
             version = "${version}";

     

       19
       19
       +
             src = fetchFromGitHub (

     

       20
       20
       +
               {

     

       21
       21
       +
                 owner = "KiCad";

     

       22
       22
       +
                 repo = "kicad-${name}";

     

       23
       23
       +
                 rev = version;

     

       24
       24
       +
                 inherit name;

     

       25
       25
       +
               } // (libSources.${name} or { })

     

       26
       26
       +
             );

     

       27
       27
       +
             nativeBuildInputs = [ cmake ];

     

       28
       28
       +
       

     

       29
       29
       +
             meta = rec {

     

       30
       30
       +
               license = licenses.cc-by-sa-40;

     

       31
       31
       +
               platforms = stdenv.lib.platforms.all;

     

       32
       32
       +
               # the 3d models are a ~1 GiB download and occupy ~5 GiB in store.

     

       33
       33
       +
               # this would exceed the hydra output limit

     

       34
       34
       +
               hydraPlatforms = if (name == "packages3d" ) then [ ] else platforms;

     

       30
       35
        
             };

     

       36
       36
       +
           };

     

       31
       37
        
       in

     

       32
       38
        
       {

     

       33
       39
        
         symbols = mkLib "symbols";

     
···

       56
       62
        
             );

     

       57
       63
        
             buildInputs = [ gettext ];

     

       58
       64
        
             nativeBuildInputs = [ cmake ];

     

       59
       59
       -
             meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3

     

       65
       65
       +
             meta = {

     

       66
       66
       +
               license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3

     

       67
       67
       +
               platforms = stdenv.lib.platforms.all;

     

       68
       68
       +
             };

     

       60
       69
        
           };

     

       61
       70
        
       }

+12 -12

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

···

       27
       27
        
         };

     

       28
       28
        
         "kicad-unstable" = {

     

       29
       29
        
           kicadVersion = {

     

       30
       30
       -
             version =			"2020-04-25";

     

       30
       30
       +
             version =			"2020-05-06";

     

       31
       31
        
             src = {

     

       32
       32
       -
               rev =			"3759799d1e03b2da6a0dcd72273e4978880fc8f1";

     

       33
       33
       -
               sha256 =		"0ba14fla8m5zli68wfjkfc4ymvj4j8z92y3jigxs8hys0450bybi";

     

       32
       32
       +
               rev =			"c92181621e2e51dc8aae1bd9f4483bb3301ffaa5";

     

       33
       33
       +
               sha256 =		"0s50xn5gbjy7yxnp9yiynxvxi2mkcrp6yghgdzclpm40rnfyi0v5";

     

       34
       34
        
             };

     

       35
       35
        
           };

     

       36
       36
        
           libVersion = {

     

       37
       37
       -
             version =			"2020-04-25";

     

       37
       37
       +
             version =			"2020-05-06";

     

       38
       38
        
             libSources = {

     

       39
       39
       -
               i18n.rev =		"fc14baa52ca56a58b0048ab860bf31887d3cf8eb";

     

       40
       40
       -
               i18n.sha256 =		"05nayab7dkjyq7g3i9q7k55hcckpc0cmq4bbklmxx16rx4rbhzc6";

     

       41
       41
       -
               symbols.rev =		"0f9ff2d17237f90bb649bf0a52b6d454f68197e8";

     

       42
       42
       -
               symbols.sha256 =	"1a54428syn2xksc00n2bvh1alrx2vrqmp7cg7d2rn8nlq8yk4qd5";

     

       39
       39
       +
               i18n.rev =		"f29cab831eb823165fa2c5efab5d9c9b443e62e2";

     

       40
       40
       +
               i18n.sha256 =		"0cc0zvpml75yxphay3281f762ls08fzvv538cd5hmkr8xqlj3vbi";

     

       41
       41
       +
               symbols.rev =		"d4245ae8cf633095a0994ab01492bd56cd124112";

     

       42
       42
       +
               symbols.sha256 =	"11pynjgji3skw42q5mryz98f8z418k43jy6s2k90w6jv638z3cb0";

     

       43
       43
        
               templates.rev =		"7db8d4d0ea0711f1961d117853547fb3edbc3857";

     

       44
       44
        
               templates.sha256 =	"1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";

     

       45
       45
       -
               footprints.rev =	"61df6d8853b4c68cca0ac87784c0a33cff9394d3";

     

       46
       46
       -
               footprints.sha256 =	"0blmhk8pwd4mi6rlsr4lf4lq7j01h6xbpbvr3pm8pmw8zylhi54v";

     

       47
       47
       -
               packages3d.rev =	"88bcf2e817fe000bb2c05e14489afc3b1a4e10ed";

     

       48
       48
       -
               packages3d.sha256 =	"0z9p1fn5xbz940kr5jz2ibzf09hpdi1c9izmabkffvrnfy6408x6";

     

       45
       45
       +
               footprints.rev =	"3bff23ee339bc48490bb39deba5d8b2f1f42733e";

     

       46
       46
       +
               footprints.sha256 =	"0430r8k49ib6w1sjr8fx42szbz960yhlzg4w80jl5bwasq67nqwd";

     

       47
       47
       +
               packages3d.rev =	"889a3dd550233ec51baed4a04a01d4cc64a8d747";

     

       48
       48
       +
               packages3d.sha256 =	"152zv4j51v8skqlvrabblpcqpbn5yf3grisjj8vnwf7kdd41chb2";

     

       49
       49
        
             };

     

       50
       50
        
           };

     

       51
       51
        
         };

+8 -1

pkgs/top-level/all-packages.nix

···

       24956
       24956
        
       

     

       24957
       24957
        
         fped = callPackage ../applications/science/electronics/fped { };

     

       24958
       24958
        
       

     

       24959
       24959
       +
         # this is a wrapper for kicad.base and kicad.libraries

     

       24959
       24960
        
         kicad = callPackage ../applications/science/electronics/kicad { };

     

       24960
       24961
        
         kicad-small = kicad.override { pname = "kicad-small"; with3d = false; };

     

       24961
       24961
       -
         kicad-unstable = kicad.override { pname = "kicad-unstable"; debug = true; };

     

       24962
       24962
       +
         kicad-unstable = kicad.override { pname = "kicad-unstable"; stable = false; };

     

       24963
       24963
       +
         # mostly here so the kicad-unstable components (except packages3d) get built

     

       24964
       24964
       +
         kicad-unstable-small = kicad.override {

     

       24965
       24965
       +
           pname = "kicad-unstable-small";

     

       24966
       24966
       +
           stable = false;

     

       24967
       24967
       +
           with3d = false;

     

       24968
       24968
       +
         };

     

       24962
       24969
        
       

     

       24963
       24970
        
         librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { };

     

       24964
       24971