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

[r20.03] git: use tcl/tk from nixpkgs on darwin #86421

Merged
merged 1 commit into from May 6, 2020

Conversation

@risicle
Copy link
Contributor

risicle commented Apr 30, 2020

Motivation for this change

Backport of #81521 to stable, because the lack of git gui on macos is annoying me. Tested on macos 10.14.

Aimed at staging- due to hugeness of rebuild.

Things done
  • 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.
@ofborg ofborg bot added the 6.topic: darwin label Apr 30, 2020
@risicle
Copy link
Contributor Author

risicle commented Apr 30, 2020

@GrahamcOfBorg build gitFull

@LnL7
Copy link
Member

LnL7 commented May 3, 2020

The staging-* branches for releases are generally only used during the release process, and the rebuild count isn't that bad. This can go straight to release-20.03

(cherry picked from commit bc4264a)
@risicle risicle force-pushed the risicle:ris-git-tcltk-darwin-r20.03 branch from 7ddd7e4 to f98c32e May 3, 2020
@risicle risicle changed the base branch from staging-20.03 to release-20.03 May 3, 2020
@risicle
Copy link
Contributor Author

risicle commented May 3, 2020

Fair enough - rebased.

@GrahamcOfBorg build gitFull

(oh wait that doesn't do darwin anyway :( )

@cdepillabout
Copy link
Member

cdepillabout commented May 3, 2020

@GrahamcOfBorg build gitFull

(@risicle This should hopefully hit darwin for you)

@wmertens
Copy link
Contributor

wmertens commented May 6, 2020

👍

@wmertens wmertens merged commit 788f02c into NixOS:release-20.03 May 6, 2020
21 checks passed
21 checks passed
git, git.passthru.tests, haskellPackages.stylish-haskell, haskellPackages.stylish-haskell.passthru.tests, kbfs, kbfs.passthru.tests, keybase, keybase-gui, keybase-gui.passthru.tests, keybase.passthru.tests, linux, linux.passthru.tests, steam, steam.passthru.tests, stylish-haskell, stylish-haskell.passthru.tests, terminator, terminator.passthru.tests, zoom-us, zoom-us.passthru.tests on aarch64-linux Timed out, unknown build status
Details
gitFull on x86_64-darwin Timed out, unknown build status
Details
Evaluation Performance Report Evaluator Performance Report
Details
git, git.passthru.tests on aarch64-linux Success
Details
git, git.passthru.tests on x86_64-linux Success
Details
git, git.passthru.tests, haskellPackages.stylish-haskell, haskellPackages.stylish-haskell.passthru.tests, kbfs, kbfs.passthru.tests, keybase, keybase-gui, keybase-gui.passthru.tests, keybase.passthru.tests, linux, linux.passthru.tests, steam, steam.passthru.tests, stylish-haskell, stylish-haskell.passthru.tests, terminator, terminator.passthru.tests, zoom-us, zoom-us.passthru.tests on x86_64-linux Success
Details
gitFull on aarch64-linux Success
Details
gitFull on x86_64-linux Success
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="f98c32e"; rev="f98c32e69e0af8e8bc51d2275a7b452c4366ef5c"; } ./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="f98c32e"; rev="f98c32e69e0af8e8bc51d2275a7b452c4366ef5c"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f98c32e"; rev="f98c32e69e0af8e8bc51d2275a7b452c4366ef5c"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f98c32e"; rev="f98c32e69e0af8e8bc51d2275a7b452c4366ef5c"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f98c32e"; rev="f98c32e69e0af8e8bc51d2275a7b452c4366ef5c"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f98c32e"; rev="f98c32e69e0af8e8bc51d2275a7b452c4366ef5c"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f98c32e"; rev="f98c32e69e0af8e8bc51d2275a7b452c4366ef5c"; } ./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
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

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