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.

Sign up for GitHub

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

Jump to bottom

treewide: fix double quoted strings in meta.description #108099

Merged
merged 1 commit into from Jan 16, 2021
Merged

treewide: fix double quoted strings in meta.description #108099

merged 1 commit into from Jan 16, 2021

Conversation

siraben
Copy link
Member

@siraben siraben commented Jan 1, 2021

Motivation for this change

Replace double single quotes '' with single double quotes " in various fields:

  • description
Things done
$  git ls-files | grep pkgs | xargs sed -i -e -E "s#description.*''(.*)''#description = \"\1\"#g"
  • 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.

@siraben siraben force-pushed the double-quotes-fix branch 2 times, most recently from f4aacb5 to 651e4e9 Compare January 1, 2021 06:00
@ofborg ofborg bot added 6.topic: erlang 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python 6.topic: ruby labels Jan 1, 2021
@siraben siraben force-pushed the double-quotes-fix branch 2 times, most recently from 1cfe70c to f054238 Compare January 1, 2021 12:23
@siraben siraben force-pushed the double-quotes-fix branch 2 times, most recently from d2577cb to d5869f3 Compare January 1, 2021 14:04
@siraben siraben changed the title treewide: fix double quoted strings in description treewide: fix double quoted strings in meta.description Jan 16, 2021
@siraben siraben changed the base branch from staging to master January 16, 2021 04:21
@siraben
Copy link
Member Author

siraben commented Jan 16, 2021

@Ericson2314 rebuild 0.

@SuperSandro2000
Copy link
Member 

-       preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';
+       preBuild = "export LD_LIBRARY_PATH=`pwd`/dist/build\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH";

I think the '' in the middle causes the hash change.

@siraben
Copy link
Member Author

siraben commented Jan 16, 2021

I think the '' in the middle causes the hash change.

But these two lines evaluate to the same string, hm.

nix-repl> ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH''
"export LD_LIBRARY_PATH=`pwd`/dist/build${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"

nix-repl> "export LD_LIBRARY_PATH=`pwd`/dist/build\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
"export LD_LIBRARY_PATH=`pwd`/dist/build${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"

@SuperSandro2000
Copy link
Member

But these two lines evaluate to the same string, hm.

Then I have no idea. It would be great if you could do a separate PR with that change so it can be easily reviewed.

@SuperSandro2000 SuperSandro2000 merged commit a9bb543 into NixOS:master Jan 16, 2021
@siraben siraben deleted the double-quotes-fix branch January 16, 2021 10:28
@siraben
Copy link
Member Author

siraben commented Jan 24, 2021

@kvtb due to many treewide PRs, could you re-run your scripts to find more instances of double quoting and open a new PR?

@kvtb
Copy link
Contributor

kvtb commented Jan 24, 2021

@Ericson2314 Looking at some of the hash changes, I'm not sure why they are changing, e.g.

modified   pkgs/development/compilers/stalin/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
-  buildPhase = '' ./build '';
+  buildPhase = " ./build ";

These are not equal

@siraben
Copy link
Member Author

siraben commented Jan 24, 2021

@kvtb I can't seem to checkout that commit, is it on a branch somewhere?

@siraben
Copy link
Member Author

siraben commented Jan 24, 2021

@kvtb nevermind, I was able to get it by adding .patch to the URL and refreshing a few times.

@siraben siraben mentioned this pull request Jan 24, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bbjubjub2494 bbjubjub2494 bbjubjub2494 left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@alyssais alyssais Awaiting requested review from alyssais

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@stigtsp stigtsp Awaiting requested review from stigtsp stigtsp is a code owner

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

@adisbladis adisbladis Awaiting requested review from adisbladis

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@mmahut mmahut Awaiting requested review from mmahut

@RaghavSood RaghavSood Awaiting requested review from RaghavSood

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees
No one assigned
Labels
6.topic: erlang 6.topic: python 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@siraben @SuperSandro2000 @Ericson2314 @kvtb @bbjubjub2494