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

Get rid of 2 unneeded packages #43088

Merged
merged 88 commits into from Jul 6, 2018
Merged

Get rid of 2 unneeded packages #43088

merged 88 commits into from Jul 6, 2018

Conversation

matthewbauer
Copy link
Member

Motivation for this change

This gets rid of two packages we have that we can do in other places:

  • lessc - is available in nodePackages
  • xxd - move it to unixtools

gnidorah and others added 30 commits June 24, 2018 16:49
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/redo/versions.

These checks were done:

- built on NixOS
- /nix/store/vn68xm8zhynjkr2fwy9kqsl6018gdpxx-redo-1.3/bin/redo passed the binary check.
- /nix/store/vn68xm8zhynjkr2fwy9kqsl6018gdpxx-redo-1.3/bin/redo-ifcreate passed the binary check.
- /nix/store/vn68xm8zhynjkr2fwy9kqsl6018gdpxx-redo-1.3/bin/redo-ifchange passed the binary check.
- /nix/store/vn68xm8zhynjkr2fwy9kqsl6018gdpxx-redo-1.3/bin/cubehash passed the binary check.
- 4 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 1.3 with grep in /nix/store/vn68xm8zhynjkr2fwy9kqsl6018gdpxx-redo-1.3
- directory tree listing: https://gist.github.com/84977503f6853a878440094f1cbc80bf
- du listing: https://gist.github.com/d612673ea44c5055de7d93cbb8e63acc
The order of sudoers entries is significant. The man page for sudoers(5)
notes:

  Where there are multiple matches, the last match is used (which is not
  necessarily the most specific match).

This module adds a rule for group "wheel" matching all commands. If you
wanted to add a more specific rule allowing members of the "wheel" group
to run command `foo` without a password, you'd need to use mkAfter to
ensure your rule comes after the more general rule.

  extraRules = lib.mkAfter [
    {
      groups = [ "wheel" ];
      commands = [
        {
          command = "${pkgs.foo}/bin/foo";
          options = [ "NOPASSWD" "SETENV" ];
        }
      ]
    }
  ];

Otherwise, when configuration options are merged, if the general rule
ends up after the specific rule, it will dictate the behavior even when
running the `foo` command.
As it works fine with it.
- Update to version 5.4.0
- Build with meson
- Remove explicitly building of the icon cache, as it is built
automatically now
I upgrade these all at once because they depend on one another and
often dislike being upgraded individually. So let's make a single
atomic commit!
This prevents future rebuilds on Darwin if this Linux-only postFixup changes.
There are two symlinks pointing to the same library, libSDL2.so and
libSDL2-2.0.so.0.  patchelf should run on non-symlinks instead.
Fixes NixOS#41620 by adding libGL directory to libSDL2 runpath
 SDL2: do not propagate private dependencies
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: lessc, xxd

Partial log (click to expand)

bcrypt-pbkdf@1.0.2 /nix/store/q3mvg7m03vd8v8pn92wd4cwlpmhiv715-node-less-3.0.4/lib/node_modules/less/node_modules/bcrypt-pbkdf
tweetnacl@0.14.5 /nix/store/q3mvg7m03vd8v8pn92wd4cwlpmhiv715-node-less-3.0.4/lib/node_modules/less/node_modules/tweetnacl
ecc-jsbn@0.1.1 /nix/store/q3mvg7m03vd8v8pn92wd4cwlpmhiv715-node-less-3.0.4/lib/node_modules/less/node_modules/ecc-jsbn
jsbn@0.1.1 /nix/store/q3mvg7m03vd8v8pn92wd4cwlpmhiv715-node-less-3.0.4/lib/node_modules/less/node_modules/jsbn
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/q3mvg7m03vd8v8pn92wd4cwlpmhiv715-node-less-3.0.4
patching script interpreter paths in /nix/store/q3mvg7m03vd8v8pn92wd4cwlpmhiv715-node-less-3.0.4
checking for references to /build in /nix/store/q3mvg7m03vd8v8pn92wd4cwlpmhiv715-node-less-3.0.4...
/nix/store/q3mvg7m03vd8v8pn92wd4cwlpmhiv715-node-less-3.0.4
/nix/store/7ws1p06mgwdwizgclm1pfh3mnjq5r36n-xxd-1003.1-2008

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: lessc, xxd

Partial log (click to expand)

cannot build derivation '/nix/store/x3v9haiwhq3l0qskll2kdnnvznpr6zdc-nodejs-6.14.3.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/dqjgndji7krblc0ybkjw5hn2x61vxvch-apple-framework-Carbon.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/dq1bpip5znnc74k7dvr8m9in5408h1yl-node-less-3.0.4.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/1z1mi4d2y9js3nilkyfzq0b681a6jdxm-apple-framework-AudioUnit.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/lscd7a24n94bw1nh9s5i6lgadk15vzdv-apple-framework-AudioToolbox.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/x8vd5bqx9zb7kzihyvraxbiw62g700s3-apple-framework-AppKit.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/srywqb015r9pqs6fa1hsl6qax4kmr046-apple-framework-Cocoa.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/7kvx68dw97r5q9q6cx223pnv2633v4bl-vim-8.1.0146.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/b3kr8zdbwfh13ypbjc1plrb4r4kdqd26-xxd-1003.1-2008.drv': 3 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/b3kr8zdbwfh13ypbjc1plrb4r4kdqd26-xxd-1003.1-2008.drv', '/nix/store/dq1bpip5znnc74k7dvr8m9in5408h1yl-node-less-3.0.4.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: lessc, xxd

Partial log (click to expand)

bcrypt-pbkdf@1.0.2 /nix/store/q9934lgw66qzkwq823fca98pb67d71m9-node-less-3.0.4/lib/node_modules/less/node_modules/bcrypt-pbkdf
tweetnacl@0.14.5 /nix/store/q9934lgw66qzkwq823fca98pb67d71m9-node-less-3.0.4/lib/node_modules/less/node_modules/tweetnacl
ecc-jsbn@0.1.1 /nix/store/q9934lgw66qzkwq823fca98pb67d71m9-node-less-3.0.4/lib/node_modules/less/node_modules/ecc-jsbn
jsbn@0.1.1 /nix/store/q9934lgw66qzkwq823fca98pb67d71m9-node-less-3.0.4/lib/node_modules/less/node_modules/jsbn
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/q9934lgw66qzkwq823fca98pb67d71m9-node-less-3.0.4
patching script interpreter paths in /nix/store/q9934lgw66qzkwq823fca98pb67d71m9-node-less-3.0.4
checking for references to /build in /nix/store/q9934lgw66qzkwq823fca98pb67d71m9-node-less-3.0.4...
/nix/store/q9934lgw66qzkwq823fca98pb67d71m9-node-less-3.0.4
/nix/store/ikfmk7045gf5p056g2kx3ldrg1yjc93i-xxd-1003.1-2008

@@ -18590,8 +18590,6 @@ with pkgs;
flags = [ "python" "X11" ]; # only flag "X11" by now
});

xxd = callPackage ../tools/misc/xxd { };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Erm, what about tools/misc/xxd?

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

Successfully merging this pull request may close these issues.

None yet