diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2020-01-03 20:14:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-03 20:14:07 +0100 |
| commit | 3604ae8394483d6a5e68a026cec0032aa91e592c (patch) | |
| tree | 0c66aa67b117ec1ab4dc30085b1fd8d2fbb53999 /pkgs/top-level | |
| parent | f4adb7c4d897485559c4f8b35f1be653e28e6893 (diff) | |
| parent | e4786f3a1c75b6e2cc9b77063d0937801ce43b11 (diff) | |
| download | nixpkgs-3604ae8394483d6a5e68a026cec0032aa91e592c.tar nixpkgs-3604ae8394483d6a5e68a026cec0032aa91e592c.tar.gz nixpkgs-3604ae8394483d6a5e68a026cec0032aa91e592c.tar.bz2 nixpkgs-3604ae8394483d6a5e68a026cec0032aa91e592c.tar.lz nixpkgs-3604ae8394483d6a5e68a026cec0032aa91e592c.tar.xz nixpkgs-3604ae8394483d6a5e68a026cec0032aa91e592c.tar.zst nixpkgs-3604ae8394483d6a5e68a026cec0032aa91e592c.zip | |
Merge pull request #74259 from Evils-Devils/kicad-unstable
kicad: cleanup, fix and update
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c4bfcbc0983..541ccb2b3c5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -193,6 +193,7 @@ mapAliases ({ keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx2-http = keepassx-reboot; # added 2016-10-17 keybase-go = keybase; # added 2016-08-24 + kicad-with-packages3d = kicad; # added 2019-11-25 krename-qt5 = krename; # added 2017-02-18 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3159ce1038..0bdb858161e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24209,16 +24209,9 @@ in fped = callPackage ../applications/science/electronics/fped { }; - kicad = callPackage ../applications/science/electronics/kicad { - wxGTK = wxGTK30; - boost = boost160; - }; - kicad-with-packages3d = kicad.overrideAttrs (old: { modules = old.modules ++ [ old.passthru.packages3d ]; }); - - kicad-unstable = python.pkgs.callPackage ../applications/science/electronics/kicad/unstable.nix { - wxGTK = wxGTK30; - boost = boost160; - }; + kicad = callPackage ../applications/science/electronics/kicad { }; + kicad-small = kicad.override { pname = "kicad-small"; with3d = false; }; + kicad-unstable = kicad.override { pname = "kicad-unstable"; debug = true; }; librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; |