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

bitwarden: 1.23.0 -> 1.23.1 #105850

Merged
merged 1 commit into from Jan 21, 2021

Conversation

r-ryantm
Copy link
Contributor

@r-ryantm r-ryantm commented Dec 4, 2020

Automatic update generated by nixpkgs-update tools. This update was made based on information from https://github.com/bitwarden/desktop/releases.

meta.description for bitwarden is: "A secure and free password manager for all of your devices"

meta.homepage for bitwarden is: "https://bitwarden.com"

meta.changelog for bitwarden is: ""

Updates performed
  • Version update
To inspect upstream changes
Impact
Checks done (click to expand)

Rebuild report (if merged into master) (click to expand)
4521 total rebuild path(s)

1223 package rebuild(s)

1177 x86_64-linux rebuild(s)
1130 i686-linux rebuild(s)
1067 x86_64-darwin rebuild(s)
1147 aarch64-linux rebuild(s)


First fifty rebuilds by attrpath
_3mux
act
aerc
age
alertmanager-bot
amass
amazon-ecr-credential-helper
amfora
aminal
antibody
aptly
arachne-pnr
archiver
arduino-cli
argo
argocd
asciigraph
asmfmt
assh
atlantis
audacious
audaciousQt5
autospotting
avrdude
avrdudess
awless
aws-env
aws-iam-authenticator
aws-okta
aws-rotate-key
aws-vault
awsweeper
azure-storage-azcopy
azure-vhd-utils
bat-extras.prettybat
bazel-buildtools
bazel-gazelle
bazel-kazel
bazel-remote
bazel-watcher
bazelisk
berglas
bettercap
bitwarden
blackmagic
blockbook
bmon
bombadillo
boohu
boringssl
Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/lmhqr7dhzlb9ycprpa9fgs67g74z9qiw-bitwarden-1.23.1 \
  --option binary-caches 'https://cache.nixos.org/ https://nix-community.cachix.org/' \
  --option trusted-public-keys '
  nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(The Cachix cache is only trusted for this store-path realization.)
For the Cachix download to work, your user must be in the trusted-users list or you can use sudo since root is effectively trusted.

Or, build yourself:

nix-build -A bitwarden https://github.com/r-ryantm/nixpkgs/archive/a199759150d8425634555a74a73181b7f0347132.tar.gz

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/lmhqr7dhzlb9ycprpa9fgs67g74z9qiw-bitwarden-1.23.1
ls -la /nix/store/lmhqr7dhzlb9ycprpa9fgs67g74z9qiw-bitwarden-1.23.1/bin


Pre-merge build results

NixPkgs review skipped


Maintainer pings

cc @Kiwi for testing.

@RaghavSood
Copy link
Member

Result of nixpkgs-review pr 105850 run on x86_64-linux 1

1 package failed to build:
  • bitwarden

@ryantm
Copy link
Member

ryantm commented Dec 5, 2020

error: --- Error --- nix-daemon
builder for '/nix/store/97p23vk8rnm4lrv07p6ni3ipj9hqk2n3-tracker-3.0.1.drv' failed with exit code 1; last 10 log lines:
    File "/nix/store/i9lzacdfrwlj1ayw551c016s0fq71p7j-python3-3.8.6/lib/python3.8/os.py", line 213, in makedirs
      makedirs(head, exist_ok=exist_ok)
    File "/nix/store/i9lzacdfrwlj1ayw551c016s0fq71p7j-python3-3.8.6/lib/python3.8/os.py", line 213, in makedirs
      makedirs(head, exist_ok=exist_ok)
    File "/nix/store/i9lzacdfrwlj1ayw551c016s0fq71p7j-python3-3.8.6/lib/python3.8/os.py", line 223, in makedirs
      mkdir(name, mode)
  PermissionError: [Errno 13] Permission denied: '/usr'
  FAILED: meson-install 
  /nix/store/kmnciwbf7m4kcdy6fjdqaamdpy54f41f-meson-0.56.0/bin/meson install --no-rebuild
  ninja: build stopped: subcommand failed.

Copy link
Member

@Kiwi Kiwi left a comment

Choose a reason for hiding this comment

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

it works on master and staging-next, but fails on staging. 😠

@jtojnar
Copy link
Contributor

jtojnar commented Dec 5, 2020

Hmm, both main suspects (tracker wrapper changes and meson bump) are already on master so it must be something else.

@jtojnar
Copy link
Contributor

jtojnar commented Dec 5, 2020

Looks like there is a regression in systemd pkg-config variables, this will break many packages:

--- /nix/store/6fkka81sc5w9ip4y5mnlw56w73jhzs5f-systemd-246.6-dev/share/pkgconfig/systemd.pc
+++ /nix/store/9dr7dzc4lywln6swpma98gwppx688mr0-systemd-247-dev/share/pkgconfig/systemd.pc
@@ -1,4 +1,4 @@
-#  SPDX-License-Identifier: LGPL-2.1+
+#  SPDX-License-Identifier: LGPL-2.1-or-later
 #
 #  This file is part of systemd.
 #
@@ -11,8 +11,8 @@
 # considered deprecated (though there is no plan to remove them). New names
 # shall have underscores.
 
-prefix=/nix/store/iyayrhagfqccsrfzw2fqs2q8n4b6h2lg-systemd-246.6
-root_prefix=/nix/store/iyayrhagfqccsrfzw2fqs2q8n4b6h2lg-systemd-246.6
+prefix=/usr
+root_prefix=/nix/store/n9lzlyhq8d9gv9hdi0gay1plmzlz70j9-systemd-247
 rootprefix=${root_prefix}
 sysconf_dir=/etc
 sysconfdir=${sysconf_dir}
@@ -26,10 +26,10 @@
 systemd_system_preset_dir=${rootprefix}/lib/systemd/system-preset
 systemdsystempresetdir=${systemd_system_preset_dir}
 
-systemd_user_unit_dir=${prefix}/lib/systemd/user
+systemd_user_unit_dir=/usr/lib/systemd/user
 systemduserunitdir=${systemd_user_unit_dir}
 
-systemd_user_preset_dir=${prefix}/lib/systemd/user-preset
+systemd_user_preset_dir=/usr/lib/systemd/user-preset
 systemduserpresetdir=${systemd_user_preset_dir}
 
 systemd_system_conf_dir=${sysconfdir}/systemd/system
@@ -48,7 +48,7 @@
 systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators
 systemdsystemgeneratordir=${systemd_system_generator_dir}
 
-systemd_user_generator_dir=${prefix}/lib/systemd/user-generators
+systemd_user_generator_dir=/usr/lib/systemd/user-generators
 systemdusergeneratordir=${systemd_user_generator_dir}
 
 systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemd_system_generator_dir}
@@ -63,7 +63,7 @@
 systemd_shutdown_dir=${root_prefix}/lib/systemd/system-shutdown
 systemdshutdowndir=${systemd_shutdown_dir}
 
-tmpfiles_dir=${prefix}/lib/tmpfiles.d
+tmpfiles_dir=/usr/lib/tmpfiles.d
 tmpfilesdir=${tmpfiles_dir}
 
 sysusers_dir=${rootprefix}/lib/sysusers.d
@@ -78,7 +78,7 @@
 modules_load_dir=${rootprefix}/lib/modules-load.d
 modulesloaddir=${modules_load_dir}
 
-catalog_dir=${prefix}/lib/systemd/catalog
+catalog_dir=/usr/lib/systemd/catalog
 catalogdir=${catalog_dir}
 
 system_uid_max=999
@@ -99,4 +99,4 @@
 Name: systemd
 Description: systemd System and Service Manager
 URL: https://www.freedesktop.org/wiki/Software/systemd
-Version: 246
+Version: 247

cc @flokli @FRidh

@TredwellGit TredwellGit mentioned this pull request Dec 5, 2020
10 tasks
@arianvp
Copy link
Member

arianvp commented Dec 5, 2020

I don't think that will break anything. Those PKG config variables are there to install Systemd units to the right place. Which doesn't make any sense in NixOS as it points to a path that is immutable and in NixOS instead we use the module system to install Systemd units.

Edit: ah but the prefix might matter. I see. As that isn't interpolated anymore Does NixOS modify that in third-party pkg-configs?

@arianvp
Copy link
Member

arianvp commented Dec 5, 2020

Edit: ah but the prefix might matter. I see. As that isn't interpolated anymore Does NixOS modify that in third-party pkg-configs?

@jtojnar
Copy link
Contributor

jtojnar commented Dec 5, 2020

Normally, projects are expected to override prefix to their own prefix in the pkg-config variables, see https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/. Of course that is not possible when the prefix is hardcoded.

@flokli
Copy link
Contributor

flokli commented Dec 5, 2020

systemd's pkgconfig has changed in systemd/systemd@6e65df8, which was part of systemd/systemd#17009. If I read https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ and pick

If you are defining a path inside your project’s pkg-config file, always make sure you’re using a relative path!

out of this… Should we open an upstream issue?

@jtojnar
Copy link
Contributor

jtojnar commented Dec 5, 2020

Yes, we should consider this an upstream regression.

This is important for two reasons:

  • Installing to non-FHS package-specific prefixes for distros with immutable roots like NixOS. Those cannot use /usr and it is their responsibility to ensure systemd can find the service files.
  • Installing to local path for development purposes. This is a compromise between running program from a build directory and running a program fully installed to system prefix. You will not want to write to your system prefix in that use case.

In either case you want to support overridable prefix so a project can be successfully installed as per https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/. Hardcoding the prefix means projects will no longer have reason (or a sensible way) to install the data relative to prexix (which will be /usr anyway on modern FHS distros) and it will force users wanting to use one of the aforementioned use cases to patch each project’s build system.

@Mic92 Mic92 mentioned this pull request Dec 6, 2020
10 tasks
@Mic92
Copy link
Member

Mic92 commented Dec 6, 2020

I reverted the said commit for now. And upstream solution might take more time than I would want to block staging for: #106044

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 105850 run on x86_64-linux 1

1 package built:
  • bitwarden

@SuperSandro2000
Copy link
Member

@Kiwi the pkg-config build issue is resolved

@Kiwi
Copy link
Member

Kiwi commented Jan 20, 2021

oh yeah I built it on staging/staging-next/and master last night but forgot to comment

@ofborg ofborg bot requested a review from Kiwi January 20, 2021 23:37
Copy link
Member

@Kiwi Kiwi left a comment

Choose a reason for hiding this comment

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

LGTM

@SuperSandro2000 SuperSandro2000 merged commit 3837209 into NixOS:master Jan 21, 2021
@r-ryantm r-ryantm deleted the auto-update/bitwarden branch January 21, 2021 07:24
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

9 participants