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

gitstatus: patch fewer lines #76744

Merged
merged 1 commit into from Jan 1, 2020
Merged

Conversation

@bdesham
Copy link
Contributor

@bdesham bdesham commented Dec 31, 2019

Motivation for this change

The sed invocation was changing all lines matching local daemon.*. This changed the line it was supposed to, but two other lines that also matched that pattern were being modified, which meant that the "daemon_pid_var" and "daemon_pid" variables were not defined when they should have been. As a result, the gitstatus.plugin.zsh script did not work properly.

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.
Notify maintainers

cc @mmlb

The sed invocation was changing all lines matching "local daemon.*".
This changed the line it was supposed to, but two other lines that also
matched that pattern were being modified, which meant that the
"daemon_pid_var" and "daemon_pid" variables were not defined when they
should have been.
@bdesham
Copy link
Contributor Author

@bdesham bdesham commented Dec 31, 2019

@GrahamcOfBorg build gitstatus

@Infinisil Infinisil merged commit 59207c0 into NixOS:master Jan 1, 2020
15 checks passed
15 checks passed
gitstatus on aarch64-linux No attempt
Details
gitstatus on x86_64-linux No attempt
Details
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="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
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
ryneeverett added a commit to ryneeverett/nixpkgs that referenced this pull request Jan 12, 2020
This is a followup to NixOS#76744.

The patch is still too aggressive because it captures additional local
variables declared in the same line. It should stop when it hits
whitespace.

See romkatv/gitstatus#92.
@ryneeverett ryneeverett mentioned this pull request Jan 12, 2020
4 of 10 tasks complete
ryneeverett added a commit to ryneeverett/nixpkgs that referenced this pull request Jan 12, 2020
This is a followup to NixOS#76744.

The patch is still too aggressive because it captures additional local
variables declared in the same line. It should stop when it hits
whitespace.

See romkatv/gitstatus#92.
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Mar 12, 2020
This is a followup to NixOS#76744.

The patch is still too aggressive because it captures additional local
variables declared in the same line. It should stop when it hits
whitespace.

See romkatv/gitstatus#92.

(cherry picked from commit be4efc8)
@bdesham bdesham deleted the bdesham:fix-gitstatus-patch branch May 13, 2020
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

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