commit a47ace80e56f3398a957d6c1c510ce8aa7c4e5a8 · pyrox.dev/nixpkgs

+110

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

···

       339
       339
        
                 release instead of the old 2.31.0 version.

     

       340
       340
        
               </para>

     

       341
       341
        
             </listitem>

     

       342
       342
       +
             <listitem>

     

       343
       343
       +
               <para>

     

       344
       344
       +
                 The <literal>bitwarden_rs</literal> packages and modules were

     

       345
       345
       +
                 renamed to <literal>vaultwarden</literal>

     

       346
       346
       +
                 <link xlink:href="https://github.com/dani-garcia/vaultwarden/discussions/1642">following

     

       347
       347
       +
                 upstream</link>. More specifically,

     

       348
       348
       +
               </para>

     

       349
       349
       +
               <itemizedlist>

     

       350
       350
       +
                 <listitem>

     

       351
       351
       +
                   <para>

     

       352
       352
       +
                     <literal>pkgs.bitwarden_rs</literal>,

     

       353
       353
       +
                     <literal>pkgs.bitwarden_rs-sqlite</literal>,

     

       354
       354
       +
                     <literal>pkgs.bitwarden_rs-mysql</literal> and

     

       355
       355
       +
                     <literal>pkgs.bitwarden_rs-postgresql</literal> were

     

       356
       356
       +
                     renamed to <literal>pkgs.vaultwarden</literal>,

     

       357
       357
       +
                     <literal>pkgs.vaultwarden-sqlite</literal>,

     

       358
       358
       +
                     <literal>pkgs.vaultwarden-mysql</literal> and

     

       359
       359
       +
                     <literal>pkgs.vaultwarden-postgresql</literal>,

     

       360
       360
       +
                     respectively.

     

       361
       361
       +
                   </para>

     

       362
       362
       +
                   <itemizedlist spacing="compact">

     

       363
       363
       +
                     <listitem>

     

       364
       364
       +
                       <para>

     

       365
       365
       +
                         Old names are preserved as aliases for backwards

     

       366
       366
       +
                         compatibility, but may be removed in the future.

     

       367
       367
       +
                       </para>

     

       368
       368
       +
                     </listitem>

     

       369
       369
       +
                     <listitem>

     

       370
       370
       +
                       <para>

     

       371
       371
       +
                         The <literal>bitwarden_rs</literal> executable was

     

       372
       372
       +
                         also renamed to <literal>vaultwarden</literal> in all

     

       373
       373
       +
                         packages.

     

       374
       374
       +
                       </para>

     

       375
       375
       +
                     </listitem>

     

       376
       376
       +
                   </itemizedlist>

     

       377
       377
       +
                 </listitem>

     

       378
       378
       +
                 <listitem>

     

       379
       379
       +
                   <para>

     

       380
       380
       +
                     <literal>pkgs.bitwarden_rs-vault</literal> was renamed to

     

       381
       381
       +
                     <literal>pkgs.vaultwarden-vault</literal>.

     

       382
       382
       +
                   </para>

     

       383
       383
       +
                   <itemizedlist spacing="compact">

     

       384
       384
       +
                     <listitem>

     

       385
       385
       +
                       <para>

     

       386
       386
       +
                         <literal>pkgs.bitwarden_rs-vault</literal> is

     

       387
       387
       +
                         preserved as an alias for backwards compatibility, but

     

       388
       388
       +
                         may be removed in the future.

     

       389
       389
       +
                       </para>

     

       390
       390
       +
                     </listitem>

     

       391
       391
       +
                     <listitem>

     

       392
       392
       +
                       <para>

     

       393
       393
       +
                         The static files were moved from

     

       394
       394
       +
                         <literal>/usr/share/bitwarden_rs</literal> to

     

       395
       395
       +
                         <literal>/usr/share/vaultwarden</literal>.

     

       396
       396
       +
                       </para>

     

       397
       397
       +
                     </listitem>

     

       398
       398
       +
                   </itemizedlist>

     

       399
       399
       +
                 </listitem>

     

       400
       400
       +
                 <listitem>

     

       401
       401
       +
                   <para>

     

       402
       402
       +
                     The <literal>services.bitwarden_rs</literal> config module

     

       403
       403
       +
                     was renamed to <literal>services.vaultwarden</literal>.

     

       404
       404
       +
                   </para>

     

       405
       405
       +
                   <itemizedlist spacing="compact">

     

       406
       406
       +
                     <listitem>

     

       407
       407
       +
                       <para>

     

       408
       408
       +
                         <literal>services.bitwarden_rs</literal> is preserved

     

       409
       409
       +
                         as an alias for backwards compatibility, but may be

     

       410
       410
       +
                         removed in the future.

     

       411
       411
       +
                       </para>

     

       412
       412
       +
                     </listitem>

     

       413
       413
       +
                   </itemizedlist>

     

       414
       414
       +
                 </listitem>

     

       415
       415
       +
                 <listitem>

     

       416
       416
       +
                   <para>

     

       417
       417
       +
                     <literal>systemd.services.bitwarden_rs</literal>,

     

       418
       418
       +
                     <literal>systemd.services.backup-bitwarden_rs</literal>

     

       419
       419
       +
                     and <literal>systemd.timers.backup-bitwarden_rs</literal>

     

       420
       420
       +
                     were renamed to

     

       421
       421
       +
                     <literal>systemd.services.vaultwarden</literal>,

     

       422
       422
       +
                     <literal>systemd.services.backup-vaultwarden</literal> and

     

       423
       423
       +
                     <literal>systemd.timers.backup-vaultwarden</literal>,

     

       424
       424
       +
                     respectively.

     

       425
       425
       +
                   </para>

     

       426
       426
       +
                   <itemizedlist spacing="compact">

     

       427
       427
       +
                     <listitem>

     

       428
       428
       +
                       <para>

     

       429
       429
       +
                         Old names are preserved as aliases for backwards

     

       430
       430
       +
                         compatibility, but may be removed in the future.

     

       431
       431
       +
                       </para>

     

       432
       432
       +
                     </listitem>

     

       433
       433
       +
                   </itemizedlist>

     

       434
       434
       +
                 </listitem>

     

       435
       435
       +
                 <listitem>

     

       436
       436
       +
                   <para>

     

       437
       437
       +
                     <literal>users.users.bitwarden_rs</literal> and

     

       438
       438
       +
                     <literal>users.groups.bitwarden_rs</literal> were renamed

     

       439
       439
       +
                     to <literal>users.users.vaultwarden</literal> and

     

       440
       440
       +
                     <literal>users.groups.vaultwarden</literal>, respectively.

     

       441
       441
       +
                   </para>

     

       442
       442
       +
                 </listitem>

     

       443
       443
       +
                 <listitem>

     

       444
       444
       +
                   <para>

     

       445
       445
       +
                     The data directory remains located at

     

       446
       446
       +
                     <literal>/var/lib/bitwarden_rs</literal>, for backwards

     

       447
       447
       +
                     compatibility.

     

       448
       448
       +
                   </para>

     

       449
       449
       +
                 </listitem>

     

       450
       450
       +
               </itemizedlist>

     

       451
       451
       +
             </listitem>

     

       342
       452
        
           </itemizedlist>

     

       343
       453
        
         </section>

     

       344
       454
        
         <section xml:id="sec-release-21.11-notable-changes">

+26

nixos/doc/manual/release-notes/rl-2111.section.md

···

       85
       85
        
       * The `libwnck` package now defaults to the 3.x release instead of the

     

       86
       86
        
         old 2.31.0 version.

     

       87
       87
        
       

     

       88
       88
       +
       * The `bitwarden_rs` packages and modules were renamed to `vaultwarden`

     

       89
       89
       +
         [following upstream](https://github.com/dani-garcia/vaultwarden/discussions/1642). More specifically,

     

       90
       90
       +
       

     

       91
       91
       +
         * `pkgs.bitwarden_rs`, `pkgs.bitwarden_rs-sqlite`, `pkgs.bitwarden_rs-mysql` and

     

       92
       92
       +
           `pkgs.bitwarden_rs-postgresql` were renamed to `pkgs.vaultwarden`, `pkgs.vaultwarden-sqlite`,

     

       93
       93
       +
           `pkgs.vaultwarden-mysql` and `pkgs.vaultwarden-postgresql`, respectively.

     

       94
       94
       +
           * Old names are preserved as aliases for backwards compatibility, but may be removed in the future.

     

       95
       95
       +
           * The `bitwarden_rs` executable was also renamed to `vaultwarden` in all packages.

     

       96
       96
       +
       

     

       97
       97
       +
         * `pkgs.bitwarden_rs-vault` was renamed to `pkgs.vaultwarden-vault`.

     

       98
       98
       +
           * `pkgs.bitwarden_rs-vault` is preserved as an alias for backwards compatibility, but may be removed in the future.

     

       99
       99
       +
           * The static files were moved from `/usr/share/bitwarden_rs` to `/usr/share/vaultwarden`.

     

       100
       100
       +
       

     

       101
       101
       +
         * The `services.bitwarden_rs` config module was renamed to `services.vaultwarden`.

     

       102
       102
       +
           * `services.bitwarden_rs` is preserved as an alias for backwards compatibility, but may be removed in the future.

     

       103
       103
       +
       

     

       104
       104
       +
         * `systemd.services.bitwarden_rs`, `systemd.services.backup-bitwarden_rs` and `systemd.timers.backup-bitwarden_rs`

     

       105
       105
       +
           were renamed to `systemd.services.vaultwarden`, `systemd.services.backup-vaultwarden` and

     

       106
       106
       +
           `systemd.timers.backup-vaultwarden`, respectively.

     

       107
       107
       +
           * Old names are preserved as aliases for backwards compatibility, but may be removed in the future.

     

       108
       108
       +
       

     

       109
       109
       +
         * `users.users.bitwarden_rs` and `users.groups.bitwarden_rs` were renamed to `users.users.vaultwarden` and

     

       110
       110
       +
           `users.groups.vaultwarden`, respectively.

     

       111
       111
       +
       

     

       112
       112
       +
         * The data directory remains located at `/var/lib/bitwarden_rs`, for backwards compatibility.

     

       113
       113
       +
       

     

       88
       114
        
       ## Other Notable Changes {#sec-release-21.11-notable-changes}

     

       89
       115
        
       

     

       90
       116
        
       - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.

+1 -1

nixos/modules/module-list.nix

···

       874
       874
        
         ./services/search/hound.nix

     

       875
       875
        
         ./services/search/kibana.nix

     

       876
       876
        
         ./services/search/solr.nix

     

       877
       877
       -
         ./services/security/bitwarden_rs/default.nix

     

       878
       877
        
         ./services/security/certmgr.nix

     

       879
       878
        
         ./services/security/cfssl.nix

     

       880
       879
        
         ./services/security/clamav.nix

     
···

       900
       899
        
         ./services/security/torsocks.nix

     

       901
       900
        
         ./services/security/usbguard.nix

     

       902
       901
        
         ./services/security/vault.nix

     

       902
       902
       +
         ./services/security/vaultwarden/default.nix

     

       903
       903
        
         ./services/security/yubikey-agent.nix

     

       904
       904
        
         ./services/system/cloud-init.nix

     

       905
       905
        
         ./services/system/dbus.nix

+1 -1

nixos/modules/services/security/bitwarden_rs/backup.sh nixos/modules/services/security/vaultwarden/backup.sh

···

       1
       1
        
       #!/usr/bin/env bash

     

       2
       2
        
       

     

       3
       3
       -
       # Based on: https://github.com/dani-garcia/bitwarden_rs/wiki/Backing-up-your-vault

     

       3
       3
       +
       # Based on: https://github.com/dani-garcia/vaultwarden/wiki/Backing-up-your-vault

     

       4
       4
        
       if ! mkdir -p "$BACKUP_FOLDER"; then

     

       5
       5
        
         echo "Could not create backup folder '$BACKUP_FOLDER'" >&2

     

       6
       6
        
         exit 1

+32 -25

nixos/modules/services/security/bitwarden_rs/default.nix nixos/modules/services/security/vaultwarden/default.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         cfg = config.services.bitwarden_rs;

     

       7
       7
       -
         user = config.users.users.bitwarden_rs.name;

     

       8
       8
       -
         group = config.users.groups.bitwarden_rs.name;

     

       6
       6
       +
         cfg = config.services.vaultwarden;

     

       7
       7
       +
         user = config.users.users.vaultwarden.name;

     

       8
       8
       +
         group = config.users.groups.vaultwarden.name;

     

       9
       9
        
       

     

       10
       10
        
         # Convert name from camel case (e.g. disable2FARemember) to upper case snake case (e.g. DISABLE_2FA_REMEMBER).

     

       11
       11
        
         nameToEnvVar = name:

     
···

       26
       26
        
               if value != null then [ (nameValuePair (nameToEnvVar name) (if isBool value then boolToString value else toString value)) ] else []

     

       27
       27
        
             ) cfg.config));

     

       28
       28
        
           in { DATA_FOLDER = "/var/lib/bitwarden_rs"; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") {

     

       29
       29
       -
             WEB_VAULT_FOLDER = "${pkgs.bitwarden_rs-vault}/share/bitwarden_rs/vault";

     

       29
       29
       +
             WEB_VAULT_FOLDER = "${pkgs.vaultwarden-vault}/share/vaultwarden/vault";

     

       30
       30
        
           } // configEnv;

     

       31
       31
        
       

     

       32
       32
       -
         configFile = pkgs.writeText "bitwarden_rs.env" (concatStrings (mapAttrsToList (name: value: "${name}=${value}\n") configEnv));

     

       32
       32
       +
         configFile = pkgs.writeText "vaultwarden.env" (concatStrings (mapAttrsToList (name: value: "${name}=${value}\n") configEnv));

     

       33
       33
        
       

     

       34
       34
       -
         bitwarden_rs = pkgs.bitwarden_rs.override { inherit (cfg) dbBackend; };

     

       34
       34
       +
         vaultwarden = pkgs.vaultwarden.override { inherit (cfg) dbBackend; };

     

       35
       35
        
       

     

       36
       36
        
       in {

     

       37
       37
       -
         options.services.bitwarden_rs = with types; {

     

       38
       38
       -
           enable = mkEnableOption "bitwarden_rs";

     

       37
       37
       +
         imports = [

     

       38
       38
       +
           (mkRenamedOptionModule [ "services" "bitwarden_rs" ] [ "services" "vaultwarden" ])

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         options.services.vaultwarden = with types; {

     

       42
       42
       +
           enable = mkEnableOption "vaultwarden";

     

       39
       43
        
       

     

       40
       44
        
           dbBackend = mkOption {

     

       41
       45
        
             type = enum [ "sqlite" "mysql" "postgresql" ];

     

       42
       46
        
             default = "sqlite";

     

       43
       47
        
             description = ''

     

       44
       44
       -
               Which database backend bitwarden_rs will be using.

     

       48
       48
       +
               Which database backend vaultwarden will be using.

     

       45
       49
        
             '';

     

       46
       50
        
           };

     

       47
       51
        
       

     
···

       49
       53
        
             type = nullOr str;

     

       50
       54
        
             default = null;

     

       51
       55
        
             description = ''

     

       52
       52
       -
               The directory under which bitwarden_rs will backup its persistent data.

     

       56
       56
       +
               The directory under which vaultwarden will backup its persistent data.

     

       53
       57
        
             '';

     

       54
       58
        
           };

     

       55
       59
        
       

     
···

       65
       69
        
               }

     

       66
       70
        
             '';

     

       67
       71
        
             description = ''

     

       68
       68
       -
               The configuration of bitwarden_rs is done through environment variables,

     

       72
       72
       +
               The configuration of vaultwarden is done through environment variables,

     

       69
       73
        
               therefore the names are converted from camel case (e.g. disable2FARemember)

     

       70
       74
        
               to upper case snake case (e.g. DISABLE_2FA_REMEMBER).

     

       71
       75
        
               In this conversion digits (0-9) are handled just like upper case characters,

     
···

       75
       79
        
               This allows working around any potential future conflicting naming conventions.

     

       76
       80
        
       

     

       77
       81
        
               Based on the attributes passed to this config option an environment file will be generated

     

       78
       78
       -
               that is passed to bitwarden_rs's systemd service.

     

       82
       82
       +
               that is passed to vaultwarden's systemd service.

     

       79
       83
        
       

     

       80
       84
        
               The available configuration options can be found in

     

       81
       81
       -
               <link xlink:href="https://github.com/dani-garcia/bitwarden_rs/blob/${bitwarden_rs.version}/.env.template">the environment template file</link>.

     

       85
       85
       +
               <link xlink:href="https://github.com/dani-garcia/vaultwarden/blob/${vaultwarden.version}/.env.template">the environment template file</link>.

     

       82
       86
        
             '';

     

       83
       87
        
           };

     

       84
       88
        
       

     

       85
       89
        
           environmentFile = mkOption {

     

       86
       90
        
             type = with types; nullOr path;

     

       87
       91
        
             default = null;

     

       88
       88
       -
             example = "/root/bitwarden_rs.env";

     

       92
       92
       +
             example = "/root/vaultwarden.env";

     

       89
       93
        
             description = ''

     

       90
       94
        
               Additional environment file as defined in <citerefentry>

     

       91
       95
        
               <refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum>

     
···

       95
       99
        
               may be passed to the service without adding them to the world-readable Nix store.

     

       96
       100
        
       

     

       97
       101
        
               Note that this file needs to be available on the host on which

     

       98
       98
       -
               <literal>bitwarden_rs</literal> is running.

     

       102
       102
       +
               <literal>vaultwarden</literal> is running.

     

       99
       103
        
             '';

     

       100
       104
        
           };

     

       101
       105
        
         };

     
···

       106
       110
        
             message = "Backups for database backends other than sqlite will need customization";

     

       107
       111
        
           } ];

     

       108
       112
        
       

     

       109
       109
       -
           users.users.bitwarden_rs = {

     

       113
       113
       +
           users.users.vaultwarden = {

     

       110
       114
        
             inherit group;

     

       111
       115
        
             isSystemUser = true;

     

       112
       116
        
           };

     

       113
       113
       -
           users.groups.bitwarden_rs = { };

     

       117
       117
       +
           users.groups.vaultwarden = { };

     

       114
       118
        
       

     

       115
       115
       -
           systemd.services.bitwarden_rs = {

     

       119
       119
       +
           systemd.services.vaultwarden = {

     

       120
       120
       +
             aliases = [ "bitwarden_rs" ];

     

       116
       121
        
             after = [ "network.target" ];

     

       117
       122
        
             path = with pkgs; [ openssl ];

     

       118
       123
        
             serviceConfig = {

     

       119
       124
        
               User = user;

     

       120
       125
        
               Group = group;

     

       121
       126
        
               EnvironmentFile = [ configFile ] ++ optional (cfg.environmentFile != null) cfg.environmentFile;

     

       122
       122
       -
               ExecStart = "${bitwarden_rs}/bin/bitwarden_rs";

     

       127
       127
       +
               ExecStart = "${vaultwarden}/bin/vaultwarden";

     

       123
       128
        
               LimitNOFILE = "1048576";

     

       124
       129
        
               PrivateTmp = "true";

     

       125
       130
        
               PrivateDevices = "true";

     
···

       131
       136
        
             wantedBy = [ "multi-user.target" ];

     

       132
       137
        
           };

     

       133
       138
        
       

     

       134
       134
       -
           systemd.services.backup-bitwarden_rs = mkIf (cfg.backupDir != null) {

     

       135
       135
       -
             description = "Backup bitwarden_rs";

     

       139
       139
       +
           systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) {

     

       140
       140
       +
             aliases = [ "backup-bitwarden_rs" ];

     

       141
       141
       +
             description = "Backup vaultwarden";

     

       136
       142
        
             environment = {

     

       137
       143
        
               DATA_FOLDER = "/var/lib/bitwarden_rs";

     

       138
       144
        
               BACKUP_FOLDER = cfg.backupDir;

     

       139
       145
        
             };

     

       140
       146
        
             path = with pkgs; [ sqlite ];

     

       141
       147
        
             serviceConfig = {

     

       142
       142
       -
               SyslogIdentifier = "backup-bitwarden_rs";

     

       148
       148
       +
               SyslogIdentifier = "backup-vaultwarden";

     

       143
       149
        
               Type = "oneshot";

     

       144
       150
        
               User = mkDefault user;

     

       145
       151
        
               Group = mkDefault group;

     
···

       148
       154
        
             wantedBy = [ "multi-user.target" ];

     

       149
       155
        
           };

     

       150
       156
        
       

     

       151
       151
       -
           systemd.timers.backup-bitwarden_rs = mkIf (cfg.backupDir != null) {

     

       152
       152
       -
             description = "Backup bitwarden_rs on time";

     

       157
       157
       +
           systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) {

     

       158
       158
       +
             aliases = [ "backup-bitwarden_rs" ];

     

       159
       159
       +
             description = "Backup vaultwarden on time";

     

       153
       160
        
             timerConfig = {

     

       154
       161
        
               OnCalendar = mkDefault "23:00";

     

       155
       162
        
               Persistent = "true";

     

       156
       156
       -
               Unit = "backup-bitwarden_rs.service";

     

       163
       163
       +
               Unit = "backup-vaultwarden.service";

     

       157
       164
        
             };

     

       158
       165
        
             wantedBy = [ "multi-user.target" ];

     

       159
       166
        
           };

+1 -1

nixos/tests/all-tests.nix

···

       42
       42
        
         bind = handleTest ./bind.nix {};

     

       43
       43
        
         bitcoind = handleTest ./bitcoind.nix {};

     

       44
       44
        
         bittorrent = handleTest ./bittorrent.nix {};

     

       45
       45
       -
         bitwarden = handleTest ./bitwarden.nix {};

     

       46
       45
        
         blockbook-frontend = handleTest ./blockbook-frontend.nix {};

     

       47
       46
        
         boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64

     

       48
       47
        
         boot-stage1 = handleTest ./boot-stage1.nix {};

     
···

       447
       446
        
         v2ray = handleTest ./v2ray.nix {};

     

       448
       447
        
         vault = handleTest ./vault.nix {};

     

       449
       448
        
         vault-postgresql = handleTest ./vault-postgresql.nix {};

     

       449
       449
       +
         vaultwarden = handleTest ./vaultwarden.nix {};

     

       450
       450
        
         vector = handleTest ./vector.nix {};

     

       451
       451
        
         victoriametrics = handleTest ./victoriametrics.nix {};

     

       452
       452
        
         virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};

+10 -10

nixos/tests/bitwarden.nix nixos/tests/vaultwarden.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       # These tests will:

     

       7
       7
       -
       #  * Set up a bitwarden-rs server

     

       7
       7
       +
       #  * Set up a vaultwarden server

     

       8
       8
        
       #  * Have Firefox use the web vault to create an account, log in, and save a password to the valut

     

       9
       9
        
       #  * Have the bw cli log in and read that password from the vault

     

       10
       10
        
       #

     
···

       24
       24
        
       

     

       25
       25
        
         storedPassword = "seeeecret";

     

       26
       26
        
       

     

       27
       27
       -
         makeBitwardenTest = backend: makeTest {

     

       28
       28
       -
           name = "bitwarden_rs-${backend}";

     

       27
       27
       +
         makeVaultwardenTest = backend: makeTest {

     

       28
       28
       +
           name = "vaultwarden-${backend}";

     

       29
       29
        
           meta = {

     

       30
       30
        
             maintainers = with pkgs.lib.maintainers; [ jjjollyjim ];

     

       31
       31
        
           };

     
···

       45
       45
        
                     package = pkgs.mariadb;

     

       46
       46
        
                   };

     

       47
       47
        
       

     

       48
       48
       -
                   services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";

     

       48
       48
       +
                   services.vaultwarden.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";

     

       49
       49
        
       

     

       50
       50
       -
                   systemd.services.bitwarden_rs.after = [ "mysql.service" ];

     

       50
       50
       +
                   systemd.services.vaultwarden.after = [ "mysql.service" ];

     

       51
       51
        
                 };

     

       52
       52
        
       

     

       53
       53
        
                 postgresql = {

     
···

       60
       60
        
                     '';

     

       61
       61
        
                   };

     

       62
       62
        
       

     

       63
       63
       -
                   services.bitwarden_rs.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden";

     

       63
       63
       +
                   services.vaultwarden.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden";

     

       64
       64
        
       

     

       65
       65
       -
                   systemd.services.bitwarden_rs.after = [ "postgresql.service" ];

     

       65
       65
       +
                   systemd.services.vaultwarden.after = [ "postgresql.service" ];

     

       66
       66
        
                 };

     

       67
       67
        
       

     

       68
       68
        
                 sqlite = { };

     
···

       71
       71
        
               mkMerge [

     

       72
       72
        
                 backendConfig.${backend}

     

       73
       73
        
                 {

     

       74
       74
       -
                   services.bitwarden_rs = {

     

       74
       74
       +
                   services.vaultwarden = {

     

       75
       75
        
                     enable = true;

     

       76
       76
        
                     dbBackend = backend;

     

       77
       77
        
                     config.rocketPort = 80;

     
···

       152
       152
        
       

     

       153
       153
        
           testScript = ''

     

       154
       154
        
             start_all()

     

       155
       155
       -
             server.wait_for_unit("bitwarden_rs.service")

     

       155
       155
       +
             server.wait_for_unit("vaultwarden.service")

     

       156
       156
        
             server.wait_for_open_port(80)

     

       157
       157
        
       

     

       158
       158
        
             with subtest("configure the cli"):

     
···

       184
       184
        
       in

     

       185
       185
        
       builtins.listToAttrs (

     

       186
       186
        
         map

     

       187
       187
       -
           (backend: { name = backend; value = makeBitwardenTest backend; })

     

       187
       187
       +
           (backend: { name = backend; value = makeVaultwardenTest backend; })

     

       188
       188
        
           backends

     

       189
       189
        
       )

+1 -1

pkgs/development/python-modules/selenium/default.nix

···

       49
       49
        
         '';

     

       50
       50
        
       

     

       51
       51
        
         passthru.tests = {

     

       52
       52
       -
           testing-bitwarden = nixosTests.bitwarden;

     

       52
       52
       +
           testing-vaultwarden = nixosTests.vaultwarden;

     

       53
       53
        
         };

     

       54
       54
        
       

     

       55
       55
        
         meta = with lib; {

+8 -7

pkgs/tools/security/bitwarden_rs/default.nix pkgs/tools/security/vaultwarden/default.nix

···

       1
       1
       -
       { lib, stdenv, rustPlatform, fetchFromGitHub, nixosTests

     

       1
       1
       +
       { lib, stdenv, rustPlatform, fetchFromGitHub, fetchurl, nixosTests

     

       2
       2
        
       , pkg-config, openssl

     

       3
       3
        
       , libiconv, Security, CoreServices

     

       4
       4
        
       , dbBackend ? "sqlite", libmysqlclient, postgresql }:

     
···

       7
       7
        
         featuresFlag = "--features ${dbBackend}";

     

       8
       8
        
       

     

       9
       9
        
       in rustPlatform.buildRustPackage rec {

     

       10
       10
       -
         pname = "bitwarden_rs";

     

       11
       11
       -
         version = "1.20.0";

     

       10
       10
       +
         pname = "vaultwarden";

     

       11
       11
       +
         version = "1.22.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "dani-garcia";

     

       15
       15
        
           repo = pname;

     

       16
       16
        
           rev = version;

     

       17
       17
       -
           sha256 = "1ncy4iwmdzdp8rv1gc5i4s1rp97d94n4l4bh08v6w4zdpx0zn8b9";

     

       17
       17
       +
           sha256 = "sha256-aXbnNO3mTAgE1yNx7YVDo1vPpO8ACZpBGHQ633fNZ3k=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       +
         cargoSha256 = "sha256-SFzq3OU0a0s3zlEzUkqGdZb/knYafqDamLy4ghH4i8I=";

     

       21
       21
       +
       

     

       20
       22
        
         nativeBuildInputs = [ pkg-config ];

     

       21
       23
        
         buildInputs = with lib; [ openssl ]

     

       22
       24
        
           ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ]

     
···

       25
       27
        
       

     

       26
       28
        
         RUSTC_BOOTSTRAP = 1;

     

       27
       29
        
       

     

       28
       28
       -
         cargoSha256 = "0vdi792bzqxj8g215r9r5anzs4qhqsm6sjzwpj1l9861bn7j4xsz";

     

       29
       30
        
         cargoBuildFlags = [ featuresFlag ];

     

       30
       31
        
       

     

       31
       32
        
         checkPhase = ''

     
···

       35
       36
        
           runHook postCheck

     

       36
       37
        
         '';

     

       37
       38
        
       

     

       38
       38
       -
         passthru.tests = nixosTests.bitwarden;

     

       39
       39
       +
         passthru.tests = nixosTests.vaultwarden;

     

       39
       40
        
       

     

       40
       41
        
         meta = with lib; {

     

       41
       42
        
           description = "Unofficial Bitwarden compatible server written in Rust";

     

       42
       42
       -
           homepage = "https://github.com/dani-garcia/bitwarden_rs";

     

       43
       43
       +
           homepage = "https://github.com/dani-garcia/vaultwarden";

     

       43
       44
        
           license = licenses.gpl3Only;

     

       44
       45
        
           maintainers = with maintainers; [ msteen ];

     

       45
       46
        
         };

+5 -5

pkgs/tools/security/bitwarden_rs/vault.nix pkgs/tools/security/vaultwarden/vault.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, nixosTests }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         pname = "bitwarden_rs-vault";

     

       4
       4
       +
         pname = "vaultwarden-vault";

     

       5
       5
        
         version = "2.19.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildCommand = ''

     

       13
       13
       -
           mkdir -p $out/share/bitwarden_rs/

     

       14
       14
       -
           cd $out/share/bitwarden_rs/

     

       13
       13
       +
           mkdir -p $out/share/vaultwarden/

     

       14
       14
       +
           cd $out/share/vaultwarden/

     

       15
       15
        
           tar xf $src

     

       16
       16
        
           mv web-vault vault

     

       17
       17
        
         '';

     

       18
       18
        
       

     

       19
       19
       -
         passthru.tests = nixosTests.bitwarden;

     

       19
       19
       +
         passthru.tests = nixosTests.vaultwarden;

     

       20
       20
        
       

     

       21
       21
        
         meta = with lib; {

     

       22
       22
       -
           description = "Integrates the web vault into bitwarden_rs";

     

       22
       22
       +
           description = "Integrates the web vault into vaultwarden";

     

       23
       23
        
           homepage = "https://github.com/dani-garcia/bw_web_builds";

     

       24
       24
        
           platforms = platforms.all;

     

       25
       25
        
           license = licenses.gpl3Plus;

pkgs/top-level/aliases.nix

···

       88
       88
        
         bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03

     

       89
       89
        
         bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03

     

       90
       90
        
         bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03

     

       91
       91
       +
       

     

       92
       92
       +
         # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30)

     

       93
       93
       +
         bitwarden_rs = vaultwarden;

     

       94
       94
       +
         bitwarden_rs-sqlite = vaultwarden-sqlite;

     

       95
       95
       +
         bitwarden_rs-mysql = vaultwarden-mysql;

     

       96
       96
       +
         bitwarden_rs-postgresql = vaultwarden-postgresql;

     

       97
       97
       +
         bitwarden_rs-vault = vaultwarden-vault;

     

       98
       98
       +
       

     

       91
       99
        
         bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02

     

       92
       100
        
         btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03

     

       93
       101
        
         buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12

+9 -9

pkgs/top-level/all-packages.nix

···

       1312
       1312
        
       

     

       1313
       1313
        
         inherit (nodePackages) bitwarden-cli;

     

       1314
       1314
        
       

     

       1315
       1315
       -
         bitwarden_rs = callPackage ../tools/security/bitwarden_rs {

     

       1316
       1316
       -
           inherit (darwin.apple_sdk.frameworks) Security CoreServices;

     

       1317
       1317
       -
         };

     

       1318
       1318
       -
         bitwarden_rs-sqlite = bitwarden_rs;

     

       1319
       1319
       -
         bitwarden_rs-mysql = bitwarden_rs.override { dbBackend = "mysql"; };

     

       1320
       1320
       -
         bitwarden_rs-postgresql = bitwarden_rs.override { dbBackend = "postgresql"; };

     

       1321
       1321
       -
       

     

       1322
       1322
       -
         bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { };

     

       1323
       1323
       -
       

     

       1324
       1315
        
         bkyml = callPackage ../tools/misc/bkyml { };

     

       1325
       1316
        
       

     

       1326
       1317
        
         blockbench-electron = callPackage ../applications/graphics/blockbench-electron { };

     
···

       31584
       31575
        
         vaultenv = haskellPackages.vaultenv;

     

       31585
       31576
        
       

     

       31586
       31577
        
         vazir-code-font = callPackage ../data/fonts/vazir-code-font { };

     

       31578
       31578
       +
       

     

       31579
       31579
       +
         vaultwarden = callPackage ../tools/security/vaultwarden {

     

       31580
       31580
       +
           inherit (darwin.apple_sdk.frameworks) Security CoreServices;

     

       31581
       31581
       +
         };

     

       31582
       31582
       +
         vaultwarden-sqlite = vaultwarden;

     

       31583
       31583
       +
         vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; };

     

       31584
       31584
       +
         vaultwarden-postgresql = vaultwarden.override { dbBackend = "postgresql"; };

     

       31585
       31585
       +
       

     

       31586
       31586
       +
         vaultwarden-vault = callPackage ../tools/security/vaultwarden/vault.nix { };

     

       31587
       31587
        
       

     

       31588
       31588
        
         vazir-fonts = callPackage ../data/fonts/vazir-fonts { };

     

       31589
       31589