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

keepass: bring back and update plugins load patches #35447

Merged
merged 1 commit into from Feb 24, 2018

Conversation

svsdep
Copy link
Contributor

@svsdep svsdep commented Feb 24, 2018

Motivation for this change

Plugins loading was broken as those patches were removed
in latest release. I brought patches back and updated them
onto 2.38 release code base.

This closes #35446.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Member

Mic92 commented Feb 24, 2018

@GrahamcOfBorg build keepass

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

Package ‘mono-4.0.4.1’ in /var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/pkgs/development/compilers/mono/generic.nix:90 is not supported on ‘aarch64-linux’, refusing to evaluate.

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

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

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘xdotool-3.20160805.1’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/tools/X11/xdotool/default.nix:23 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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

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

@Mic92
Copy link
Member

Mic92 commented Feb 24, 2018

I tried:

       (pkgs.keepass.override {
          plugins = with pkgs; [
            keepass-keepassrpc
          ];
        })

and the build failed with the following error:

these derivations will be built:
  /nix/store/ig95qbl30lqdrgci9hqs842idgyyggdq-keepass-2.38.drv
  /nix/store/vnlli1nn61g57giql0z5ilxf7iyx16c0-staging.drv
these paths will be fetched (0.24 MiB download, 0.26 MiB unpacked):
  /nix/store/82fw1wqj109n8qv2fggnhqbqq287a302-keepassrpc-1.7.3.1
  /nix/store/pbs43gw4fkn4mz8ip1a97kdr7w526ysi-keepassrpc-1.7.3.1
copying path '/nix/store/82fw1wqj109n8qv2fggnhqbqq287a302-keepassrpc-1.7.3.1' from 'https://cache.nixos.org'...
copying path '/nix/store/pbs43gw4fkn4mz8ip1a97kdr7w526ysi-keepassrpc-1.7.3.1' from 'https://cache.nixos.org'...
building '/nix/store/ig95qbl30lqdrgci9hqs842idgyyggdq-keepass-2.38.drv'...
unpacking sources
unpacking source archive /nix/store/5cxnr3yfmi23bl0w6mk7cfrmjawx5dr0-KeePass-2.38-Source.zip
source root is .
setting SOURCE_DATE_EPOCH to timestamp 1519461770 of file ./.attr-0
warning: file ./.attr-0 may be generated; SOURCE_DATE_EPOCH may be non-deterministic
patching sources
applying patch /nix/store/b3ri3isia4pgqjiqw919ssdhhrsmiryp-fix-paths.patch
patching file KeePass/Native/NativeMethods.Unix.cs
patching file KeePass/Util/ClipboardUtil.Unix.cs
patching file KeePassLib/Native/ClipboardU.cs
patching file KeePassLib/Utility/MonoWorkarounds.cs
patching file KeePass/Forms/MainForm.cs
patch: **** malformed patch at line 14:                         // of loaded plugins have been updated already)
builder for '/nix/store/ig95qbl30lqdrgci9hqs842idgyyggdq-keepass-2.38.drv' failed with exit code 2
cannot build derivation '/nix/store/vnlli1nn61g57giql0z5ilxf7iyx16c0-staging.drv': 1 dependencies couldn't be built
error: build of '/nix/store/vnlli1nn61g57giql0z5ilxf7iyx16c0-staging.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/ily135iv59svkfyv297r10035icd3mdw-keepass-2.38 /tmp/nix-build-keepass-2.38.drv-0
/tmp/nix-build-keepass-2.38.drv-0
Created /nix/store/ily135iv59svkfyv297r10035icd3mdw-keepass-2.38/lib/pkgconfig/KeePassLib.pc
rscFileExt=ico
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ily135iv59svkfyv297r10035icd3mdw-keepass-2.38
patching script interpreter paths in /nix/store/ily135iv59svkfyv297r10035icd3mdw-keepass-2.38
checking for references to /tmp/nix-build-keepass-2.38.drv-0 in /nix/store/ily135iv59svkfyv297r10035icd3mdw-keepass-2.38...
/nix/store/ily135iv59svkfyv297r10035icd3mdw-keepass-2.38

@svsdep svsdep force-pushed the keepass-plugins-patch-back branch 4 times, most recently from 7388262 to 8c802dc Compare February 24, 2018 10:44
Plugins loading was broken as those patches were removed
in latest release. I brought patches back and updated them
onto 2.38 release code base.

This closes NixOS#35446.
@svsdep
Copy link
Contributor Author

svsdep commented Feb 24, 2018

@Mic92 thanks for testing! Should be fixed now.

@Mic92 Mic92 merged commit 9c06562 into NixOS:master Feb 24, 2018
@Mic92
Copy link
Member

Mic92 commented Feb 24, 2018

Thanks! Plugin was listed now.

@svsdep svsdep deleted the keepass-plugins-patch-back branch February 25, 2018 16:05
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.

Keepass plugins don't work since 2.38
3 participants