Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ec0923f9830b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 20fb1ce97c0d
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 17, 2020

  1. kicad: don't build versions with 3d on Hydra 

    The hydraPlatforms have to be set on the kicad package itself, that can be
checked using:

  echo ":p { inherit kicad kicad-small kicad-unstable; }" | nix repl ./pkgs/top-level/release.nix

This commit disables build of all kicad variants that require downloading
packages3d, which currently fail on hydra with the "Output limit exceeded"
status. This leaves Hydra with only building the kicad-small, which will allow
us to cache the build of kicad-base as well as all libraries except of
packages3d.

(cherry picked from commit ebe5f10)
    @veprbl
    veprbl committed Mar 17, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    GPG key ID: 06AF1D3C38F04E0E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    20fb1ce View commit details
Showing with 11 additions and 10 deletions.
  1. +4 −0 pkgs/applications/science/electronics/kicad/default.nix
  2. +7 −10 pkgs/applications/science/electronics/kicad/libraries.nix
4 changes: 4 additions & 0 deletions pkgs/applications/science/electronics/kicad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -137,5 +137,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ evils kiwi berce ];
# kicad's cross-platform, not sure what to fill in here
platforms = with platforms; linux;
} // optionalAttrs with3d {
# We can't download the 3d models on Hydra - they are a ~1 GiB download and
# they occupy ~5 GiB in store.
hydraPlatforms = [];
};
}
17 changes: 7 additions & 10 deletions pkgs/applications/science/electronics/kicad/libraries.nix
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@
# };
with lib;
let
mkLib = name: attrs:
stdenv.mkDerivation (
mkLib = name:
stdenv.mkDerivation
{
pname = "kicad-${name}";
version = "${version}";
@@ -27,16 +27,13 @@ let
);
nativeBuildInputs = [ cmake ];
meta.license = licenses.cc-by-sa-40;
} // attrs
);
};
in
{
symbols = mkLib "symbols" { };
templates = mkLib "templates" { };
footprints = mkLib "footprints" { };
packages3d = mkLib "packages3d" {
hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store
};
symbols = mkLib "symbols";
templates = mkLib "templates";
footprints = mkLib "footprints";
packages3d = mkLib "packages3d";

# i18n is a special case, not actually a library
# more a part of kicad proper, but also optional and separate