Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kicad-unstable-small: init to build kicad-unstable's base on hydra #82634

Merged
merged 4 commits into from May 11, 2020

Conversation

@evils
Copy link
Contributor

evils commented Mar 15, 2020

Motivation for this change

kicad-unstable does not get built by hydra

Things done
  • add kicad-unstable-small so the components of kicad-unstable that hydra can build, get build
  • make the CLI utilities available by linking to them them in the wrapper
  • move libraries and base out of the let block so they can be addressed directly
  • bump kicad-unstable to latest versions
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@veprbl
Copy link
Member

veprbl commented Mar 15, 2020

@GrahamcOfBorg build kicad-unstable

Copy link
Member

veprbl left a comment

This is three different changes. Please split them into separate commits.

@evils evils force-pushed the evils:kicad branch from 1588ac9 to b382d3b Mar 15, 2020
@veprbl
Copy link
Member

veprbl commented Mar 15, 2020

mkLib needs to be updated to use recursiveUpdate[1] so that meta.license doesn't get overwritten.

[1]

nixpkgs/lib/attrsets.nix

Lines 405 to 427 in fbafe7c

/* A recursive variant of the update operator ‘//’. The recursion
stops when one of the attribute values is not an attribute set,
in which case the right hand side value takes precedence over the
left hand side value.
Example:
recursiveUpdate {
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/hda";
} {
boot.loader.grub.device = "";
}
returns: {
boot.loader.grub.enable = true;
boot.loader.grub.device = "";
}
*/
recursiveUpdate = lhs: rhs:
recursiveUpdateUntil (path: lhs: rhs:
!(isAttrs lhs && isAttrs rhs)
) lhs rhs;

@evils evils force-pushed the evils:kicad branch from b382d3b to 33a93b5 Mar 15, 2020
@evils
Copy link
Contributor Author

evils commented Mar 15, 2020

@veprbl i've changed it to use recursiveUpdate, it didn't affect the build output, i assume the metadata is stored separately, the libraries aren't directly addressable so i couldn't use nix repl to check if this worked...

@veprbl veprbl mentioned this pull request Mar 16, 2020
1 of 10 tasks complete
@evils evils force-pushed the evils:kicad branch from 33a93b5 to dc33339 Mar 17, 2020
@evils evils changed the title kicad: hydraPlatforms -> meta.hydraPlatforms [ZHF] kicad: don't build with 3d on hydra; update unstable Mar 17, 2020
@evils evils changed the title [ZHF] kicad: don't build with 3d on hydra; update unstable kicad-unstable: bump to latest sources; fix update.sh Mar 17, 2020
@evils evils force-pushed the evils:kicad branch from dc33339 to 83ca65e Mar 17, 2020
@evils evils changed the title kicad-unstable: bump to latest sources; fix update.sh kicad-unstable: 2020-02-10 -> 2020-03-16; fix update.sh Mar 17, 2020
@evils evils force-pushed the evils:kicad branch from 83ca65e to e05d336 Mar 17, 2020
@evils evils changed the title kicad-unstable: 2020-02-10 -> 2020-03-16; fix update.sh kicad-unstable: 2020-02-10 -> 2020-03-17; fix update.sh Mar 17, 2020
@evils evils changed the title kicad-unstable: 2020-02-10 -> 2020-03-17; fix update.sh [WIP] kicad-unstable: 2020-02-10 -> 2020-03-17; fix update.sh Mar 18, 2020
@evils evils force-pushed the evils:kicad branch from e05d336 to abcda63 Mar 19, 2020
@evils evils changed the title [WIP] kicad-unstable: 2020-02-10 -> 2020-03-17; fix update.sh kicad-unstable: 2020-02-10 -> 2020-03-17; fix update.sh Mar 19, 2020
@evils evils changed the title kicad-unstable: 2020-02-10 -> 2020-03-17; fix update.sh kicad-unstable: 2020-02-10 -> 2020-03-19; fix update.sh Mar 19, 2020
@evils evils force-pushed the evils:kicad branch from abcda63 to b818804 Mar 19, 2020
@evils evils changed the title kicad-unstable: 2020-02-10 -> 2020-03-19; fix update.sh [WIP] kicad-unstable: build base on hydra; fix update.sh Mar 27, 2020
@evils evils changed the title kicad-unstable: build base on hydra; fix update.sh [WIP] kicad-unstable: build base on hydra; fix update.sh Apr 2, 2020
@evils evils force-pushed the evils:kicad branch from 78588c4 to 022ccfb Apr 3, 2020
@evils evils changed the title [WIP] kicad-unstable: build base on hydra; fix update.sh kicad-unstable: build base on hydra; fix update.sh Apr 3, 2020
@evils evils force-pushed the evils:kicad branch from 022ccfb to 63f8edd Apr 5, 2020
@evils evils changed the title kicad-unstable: build base on hydra; fix update.sh [WIP] kicad-unstable: build base on hydra; fix update.sh Apr 6, 2020
@evils evils force-pushed the evils:kicad branch from 63f8edd to a76db90 Apr 6, 2020
@evils evils changed the title [WIP] kicad-unstable: build base on hydra; fix update.sh kicad-unstable: build base on hydra; fix update.sh Apr 6, 2020
@evils evils force-pushed the evils:kicad branch 2 times, most recently from dffdab6 to 32e3bd1 Apr 6, 2020
@evils evils force-pushed the evils:kicad branch 2 times, most recently from 9840c4b to 189f66f Apr 15, 2020
@evils evils force-pushed the evils:kicad branch 2 times, most recently from 6189d40 to 6bd32c2 Apr 25, 2020
veprbl added a commit that referenced this pull request Apr 26, 2020
and some more suggestions from veprbl

warn if an empty item gets through anyway

and use UTC time

cc #82634
veprbl added a commit that referenced this pull request Apr 26, 2020
cc #82634
evils added 4 commits Mar 30, 2020
the -small packages depend on all hydra buildable dependencies
the non-small ones depend on packages3d which exceeds hydra's limit

set platforms to all (kicad is cross-platform)
clarify package differences in the description

set maintainers on just the top level derivation

switch -unstable to not save debug symbols

indicate patch in version string

note broken dependencies
@evils evils force-pushed the evils:kicad branch from 6bd32c2 to 2d3d8c4 May 7, 2020
@evils evils changed the title kicad-unstable: build base on hydra; fix update.sh kicad-unstable-small: init to build kicad-unstable's base on hydra May 9, 2020
@Mic92
Copy link
Contributor

Mic92 commented May 11, 2020

Result of nixpkgs-review pr 82634 1

2 packages built:
- kicad-small
- kicad-unstable-small
@Mic92 Mic92 merged commit 3a9543b into NixOS:master May 11, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2d3d8c4"; rev="2d3d8c4d6676e353d73d0028ec52217a01070e88"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2d3d8c4"; rev="2d3d8c4d6676e353d73d0028ec52217a01070e88"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2d3d8c4"; rev="2d3d8c4d6676e353d73d0028ec52217a01070e88"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2d3d8c4"; rev="2d3d8c4d6676e353d73d0028ec52217a01070e88"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2d3d8c4"; rev="2d3d8c4d6676e353d73d0028ec52217a01070e88"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2d3d8c4"; rev="2d3d8c4d6676e353d73d0028ec52217a01070e88"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2d3d8c4"; rev="2d3d8c4d6676e353d73d0028ec52217a01070e88"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
kicad-unstable-small, kicad-unstable-small.passthru.tests on aarch64-linux Success
Details
kicad-unstable-small, kicad-unstable-small.passthru.tests on x86_64-linux Success
Details
postPatch = ''
substituteInPlace CMakeModules/KiCadVersion.cmake \
--replace "unknown" ${builtins.substring 0 10 src.rev}
--replace "unknown" "${builtins.substring 0 10 src.rev}-1" \
--replace "${version}" "${version}-1"

This comment has been minimized.

Copy link
@veprbl

veprbl May 11, 2020

Member

We don't use patchlevels in nixpkgs because the build process of a package can be amended in many different ways, and all those changes can be tracked by looking at the store paths hashes and inside drv files. Patchlevels can't keep up with they, they will quickly become outdated.

This comment has been minimized.

Copy link
@evils

evils May 12, 2020

Author Contributor

my goal with this was to make it clear in a kicad bug report (which contains that string) which commit the package was based on, while still making it clear a patch was added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.