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

xsecurelock: 1.0 -> 1.1 #47190

Merged
merged 1 commit into from Sep 23, 2018
Merged

xsecurelock: 1.0 -> 1.1 #47190

merged 1 commit into from Sep 23, 2018

Conversation

andrew-d
Copy link
Contributor

Motivation for this change

Upgrade to the latest released version which fixes a couple bugs with compositors and allows switching keyboard layouts.

I'd like to get this into 18.09, if possible!

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

cc @fpletz

@xeji
Copy link
Contributor

xeji commented Sep 22, 2018

@GrahamcOfBorg build xsecurelock

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: xsecurelock

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: xsecurelock

Partial log (click to expand)

shrinking /nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1/bin/xsecurelock
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1/libexec  /nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1/bin
patching script interpreter paths in /nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1
/nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1/libexec/xsecurelock/auth_pamtester: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1/libexec/xsecurelock/auth_htpasswd: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1/libexec/xsecurelock/saver_xscreensaver: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1/libexec/xsecurelock/saver_blank: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1...
/nix/store/g9zmbbg7d4xd2gq2755zqkdd5ymvmiw5-xsecurelock-1.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: xsecurelock

Partial log (click to expand)

shrinking /nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1/bin/xsecurelock
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1/libexec  /nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1/bin
patching script interpreter paths in /nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1
/nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1/libexec/xsecurelock/saver_xscreensaver: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1/libexec/xsecurelock/auth_pamtester: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1/libexec/xsecurelock/auth_htpasswd: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1/libexec/xsecurelock/saver_blank: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1...
/nix/store/bwcs9xj31jvz13gnjmjzi2navwbv572v-xsecurelock-1.1

xeji
xeji approved these changes Sep 22, 2018
View reviewed changes
Copy link
Contributor

@xeji xeji left a comment •
edited

Choose a reason for hiding this comment

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

works fine here, thanks!

@srhb srhb merged commit 3d6fbe8 into NixOS:master Sep 23, 2018
@andrew-d andrew-d deleted the andrew/xsecurelock-1.1 branch September 23, 2018 07:57
@andrew-d
Copy link
Contributor Author

@xeji @srhb - Thanks!

srhb pushed a commit that referenced this pull request Sep 23, 2018
@andrew-d @srhb
xsecurelock: 1.0 -> 1.1
233328c 
(cherry picked from commit da18ffa)
Backport of #47190
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xeji xeji xeji approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@andrew-d @xeji @GrahamcOfBorg @srhb