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

Update keepass238 #34360

Merged
merged 1 commit into from Feb 10, 2018
Merged

Update keepass238 #34360

merged 1 commit into from Feb 10, 2018

Conversation

joncojonathan
Copy link
Member

@joncojonathan joncojonathan commented Jan 28, 2018

keepass: from 2.37 to 2.38

Deletion of unnecessary patch files.

Apologies, changes to all-packages.nix are also in PR #34358. I'm not sure why it's in this PR given it's not in this commit (into a now branch). I am not experienced enough with Git, so I don't know why this occurred or how to resolve.

Motivation for this change

Update to Keepass latest version.

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.

@grahamc
Copy link
Member

grahamc commented Jan 28, 2018

@GrahamcOfBorg build keepass

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: aarch64-linux

Full log

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.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

Full log

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

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

Full log

'Build/KeePassLib/Release/KeePassLib.pdb' -> '/nix/store/lgi5ca6y1767gbjgj9chhhy1wprmf14h-keepass-2.38/lib/dotnet/keepass/KeePassLib.pdb'
'Build/KeePassLib/Release/KeePassLib.xml' -> '/nix/store/lgi5ca6y1767gbjgj9chhhy1wprmf14h-keepass-2.38/lib/dotnet/keepass/KeePassLib.xml'
/nix/store/lgi5ca6y1767gbjgj9chhhy1wprmf14h-keepass-2.38 /private/tmp/nix-build-keepass-2.38.drv-0
/private/tmp/nix-build-keepass-2.38.drv-0
Created /nix/store/lgi5ca6y1767gbjgj9chhhy1wprmf14h-keepass-2.38/lib/pkgconfig/KeePassLib.pc
rscFileExt=ico
glibPreFixupPhase
post-installation fixup
patching script interpreter paths in /nix/store/lgi5ca6y1767gbjgj9chhhy1wprmf14h-keepass-2.38
/nix/store/lgi5ca6y1767gbjgj9chhhy1wprmf14h-keepass-2.38

@disassembler
Copy link
Member

You can run git rebase -i master and delete the line with the commit you don't want and save/quit the editor, then git push -f <remote> <branch>

Motivation for change:
Update to software.
@joncojonathan
Copy link
Member Author

@disassembler thanks for the advice. I've sorted that and this should now only include the 3 files I was after.

@joncojonathan
Copy link
Member Author

@GrahamcOfBorg build keepass

joncojonathan added a commit to joncojonathan/nixpkgs that referenced this pull request Jan 29, 2018
Issue NixOS#31859 (NixOS#31859) highlighted TLSv1.1 / TLSv1.2
support isn't available with older versions of Mono 4.  This change moves to use Mono 5.4.  Tested as working with Keepass v2.38 for which PR NixOS#34360 is already open.
@Mic92
Copy link
Member

Mic92 commented Feb 10, 2018

Thanks!

@Mic92 Mic92 merged commit e43aded into NixOS:master Feb 10, 2018
@svsdep
Copy link
Contributor

svsdep commented Feb 24, 2018

Why that deleted patches are considered unnecessary? In the comments in package definition file it is clearly stated that without them Keepass won't find any installed plugins defined by plugins option.

@joncojonathan
Copy link
Member Author

@svsdep - I received an error during build and asked what the error meant. I was advised it meant the patch was no longer valid, so I removed the patch. I'll confess to not being experienced at the language in question, or at NixOS derivations. Clearly my actions caused a problem and for that I apologise.

@joncojonathan joncojonathan deleted the update-keepass238 branch February 24, 2018 20:23
@svsdep
Copy link
Contributor

svsdep commented Feb 25, 2018

@joncojonathan no problem, I fixed it as I know C#. Just asked you about it cause I wanted to know the reason behind it. Patches became outdated as in 2.38 the code for loading plugins was changed a bit. Thank you for explanation! We all here learn something new every day and I am not versed in making patches too :)

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

6 participants