commit 708377a1e3a3eb27e61bafee4cd6f985a7d0e9ab · pyrox.dev/nixpkgs

+38 -1

doc/builders/images/dockertools.section.md

···

       308
       308
        
       

     

       309
       309
        
       The `name` argument is the name of the derivation output, which defaults to `fromImage.name`.

     

       310
       310
        
       

     

       311
       311
       -
       ## shadowSetup {#ssec-pkgs-dockerTools-shadowSetup}

     

       311
       311
       +
       ## Environment Helpers {#ssec-pkgs-dockerTools-helpers}

     

       312
       312
       +
       

     

       313
       313
       +
       Some packages expect certain files to be available globally.

     

       314
       314
       +
       When building an image from scratch (i.e. without `fromImage`), these files are missing.

     

       315
       315
       +
       `pkgs.dockerTools` provides some helpers to set up an environment with the necessary files.

     

       316
       316
       +
       You can include them in `copyToRoot` like this:

     

       317
       317
       +
       

     

       318
       318
       +
       ```nix

     

       319
       319
       +
       buildImage {

     

       320
       320
       +
         name = "environment-example";

     

       321
       321
       +
         copyToRoot = with pkgs.dockerTools; [

     

       322
       322
       +
           usrBinEnv

     

       323
       323
       +
           binSh

     

       324
       324
       +
           caCertificates

     

       325
       325
       +
           fakeNss

     

       326
       326
       +
         ];

     

       327
       327
       +
       }

     

       328
       328
       +
       ```

     

       329
       329
       +
       

     

       330
       330
       +
       ### usrBinEnv {#sssec-pkgs-dockerTools-helpers-usrBinEnv}

     

       331
       331
       +
       

     

       332
       332
       +
       This provides the `env` utility at `/usr/bin/env`.

     

       333
       333
       +
       

     

       334
       334
       +
       ### binSh {#sssec-pkgs-dockerTools-helpers-binSh}

     

       335
       335
       +
       

     

       336
       336
       +
       This provides `bashInteractive` at `/bin/sh`.

     

       337
       337
       +
       

     

       338
       338
       +
       ### caCertificates {#sssec-pkgs-dockerTools-helpers-caCertificates}

     

       339
       339
       +
       

     

       340
       340
       +
       This sets up `/etc/ssl/certs/ca-certificates.crt`.

     

       341
       341
       +
       

     

       342
       342
       +
       ### fakeNss {#sssec-pkgs-dockerTools-helpers-fakeNss}

     

       343
       343
       +
       

     

       344
       344
       +
       Provides `/etc/passwd` and `/etc/group` that contain root and nobody.

     

       345
       345
       +
       Useful when packaging binaries that insist on using nss to look up

     

       346
       346
       +
       username/groups (like nginx).

     

       347
       347
       +
       

     

       348
       348
       +
       ### shadowSetup {#ssec-pkgs-dockerTools-shadowSetup}

     

       312
       349
        
       

     

       313
       350
        
       This constant string is a helper for setting up the base files for managing users and groups, only if such files don't exist already. It is suitable for being used in a [`buildImage` `runAsRoot`](#ex-dockerTools-buildImage-runAsRoot) script for cases like in the example below:

     

       314
       351

+3 -1

lib/modules.nix

···

       433
       433
        
             # modules recursively. It returns the final list of unique-by-key modules

     

       434
       434
        
             filterModules = modulesPath: { disabled, modules }:

     

       435
       435
        
               let

     

       436
       436
       -
                 moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m;

     

       436
       436
       +
                 moduleKey = m: if isString m && (builtins.substring 0 1 m != "/")

     

       437
       437
       +
                   then toString modulesPath + "/" + m

     

       438
       438
       +
                   else toString m;

     

       437
       439
        
                 disabledKeys = map moduleKey disabled;

     

       438
       440
        
                 keyFilter = filter (attrs: ! elem attrs.key disabledKeys);

     

       439
       441
        
               in map (attrs: attrs.module) (builtins.genericClosure {

+1

lib/tests/modules.sh

···

       130
       130
        
       set -- config.enable ./define-enable.nix ./declare-enable.nix

     

       131
       131
        
       checkConfigOutput '^true$' "$@"

     

       132
       132
        
       checkConfigOutput '^false$' "$@" ./disable-define-enable.nix

     

       133
       133
       +
       checkConfigOutput '^false$' "$@" ./disable-define-enable-string-path.nix

     

       133
       134
        
       checkConfigError "The option .*enable.* does not exist. Definition values:\n\s*- In .*: true" "$@" ./disable-declare-enable.nix

     

       134
       135
        
       checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix

     

       135
       136
        
       checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix

+5

lib/tests/modules/disable-define-enable-string-path.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         disabledModules = [ (toString ./define-enable.nix) ];

     

       5
       5
       +
       }

+6

maintainers/maintainer-list.nix

···

       1423
       1423
        
           githubId = 35324;

     

       1424
       1424
        
           name = "Badi' Abdul-Wahid";

     

       1425
       1425
        
         };

     

       1426
       1426
       +
         baitinq = {

     

       1427
       1427
       +
           email = "manuelpalenzuelamerino@gmail.com";

     

       1428
       1428
       +
           name = "Baitinq";

     

       1429
       1429
       +
           github = "Baitinq";

     

       1430
       1430
       +
           githubId = 30861839;

     

       1431
       1431
       +
         };

     

       1426
       1432
        
         balodja = {

     

       1427
       1433
        
           email = "balodja@gmail.com";

     

       1428
       1434
        
           github = "balodja";

+6

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

···

       441
       441
        
                 due to upstream dropping support.

     

       442
       442
        
               </para>

     

       443
       443
        
             </listitem>

     

       444
       444
       +
             <listitem>

     

       445
       445
       +
               <para>

     

       446
       446
       +
                 <literal>k3s</literal> supports <literal>clusterInit</literal>

     

       447
       447
       +
                 option, and it is enabled by default, for servers.

     

       448
       448
       +
               </para>

     

       449
       449
       +
             </listitem>

     

       444
       450
        
           </itemizedlist>

     

       445
       451
        
         </section>

     

       446
       452
        
         <section xml:id="sec-release-22.11-notable-changes">

+2

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

···

       154
       154
        
       

     

       155
       155
        
       - `k3s` no longer supports docker as runtime due to upstream dropping support.

     

       156
       156
        
       

     

       157
       157
       +
       - `k3s` supports `clusterInit` option, and it is enabled by default, for servers.

     

       158
       158
       +
       

     

       157
       159
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

     

       158
       160
        
       

     

       159
       161
        
       ## Other Notable Changes {#sec-release-22.11-notable-changes}

+52 -4

nixos/modules/services/cluster/k3s/default.nix

···

       25
       25
        
           role = mkOption {

     

       26
       26
        
             description = lib.mdDoc ''

     

       27
       27
        
               Whether k3s should run as a server or agent.

     

       28
       28
       -
               Note that the server, by default, also runs as an agent.

     

       28
       28
       +
       

     

       29
       29
       +
               If it's a server:

     

       30
       30
       +
       

     

       31
       31
       +
               - By default it also runs workloads as an agent.

     

       32
       32
       +
               - Starts by default as a standalone server using an embedded sqlite datastore.

     

       33
       33
       +
               - Configure `clusterInit = true` to switch over to embedded etcd datastore and enable HA mode.

     

       34
       34
       +
               - Configure `serverAddr` to join an already-initialized HA cluster.

     

       35
       35
       +
       

     

       36
       36
       +
               If it's an agent:

     

       37
       37
       +
       

     

       38
       38
       +
               - `serverAddr` is required.

     

       29
       39
        
             '';

     

       30
       40
        
             default = "server";

     

       31
       41
        
             type = types.enum [ "server" "agent" ];

     
···

       33
       43
        
       

     

       34
       44
        
           serverAddr = mkOption {

     

       35
       45
        
             type = types.str;

     

       36
       36
       -
             description = lib.mdDoc "The k3s server to connect to. This option only makes sense for an agent.";

     

       46
       46
       +
             description = lib.mdDoc ''

     

       47
       47
       +
               The k3s server to connect to.

     

       48
       48
       +
       

     

       49
       49
       +
               Servers and agents need to communicate each other. Read

     

       50
       50
       +
               [the networking docs](https://rancher.com/docs/k3s/latest/en/installation/installation-requirements/#networking)

     

       51
       51
       +
               to know how to configure the firewall.

     

       52
       52
       +
             '';

     

       37
       53
        
             example = "https://10.0.0.10:6443";

     

       38
       54
        
             default = "";

     

       39
       55
        
           };

     

       40
       56
        
       

     

       57
       57
       +
           clusterInit = mkOption {

     

       58
       58
       +
             type = types.bool;

     

       59
       59
       +
             default = false;

     

       60
       60
       +
             description = lib.mdDoc ''

     

       61
       61
       +
               Initialize HA cluster using an embedded etcd datastore.

     

       62
       62
       +
       

     

       63
       63
       +
               If this option is `false` and `role` is `server`

     

       64
       64
       +
       

     

       65
       65
       +
               On a server that was using the default embedded sqlite backend,

     

       66
       66
       +
               enabling this option will migrate to an embedded etcd DB.

     

       67
       67
       +
       

     

       68
       68
       +
               If an HA cluster using the embedded etcd datastore was already initialized,

     

       69
       69
       +
               this option has no effect.

     

       70
       70
       +
       

     

       71
       71
       +
               This option only makes sense in a server that is not connecting to another server.

     

       72
       72
       +
       

     

       73
       73
       +
               If you are configuring an HA cluster with an embedded etcd,

     

       74
       74
       +
               the 1st server must have `clusterInit = true`

     

       75
       75
       +
               and other servers must connect to it using `serverAddr`.

     

       76
       76
       +
             '';

     

       77
       77
       +
           };

     

       78
       78
       +
       

     

       41
       79
        
           token = mkOption {

     

       42
       80
        
             type = types.str;

     

       43
       81
        
             description = lib.mdDoc ''

     

       44
       44
       -
               The k3s token to use when connecting to the server. This option only makes sense for an agent.

     

       82
       82
       +
               The k3s token to use when connecting to a server.

     

       83
       83
       +
       

     

       45
       84
        
               WARNING: This option will expose store your token unencrypted world-readable in the nix store.

     

       46
       85
        
               If this is undesired use the tokenFile option instead.

     

       47
       86
        
             '';

     
···

       50
       89
        
       

     

       51
       90
        
           tokenFile = mkOption {

     

       52
       91
        
             type = types.nullOr types.path;

     

       53
       53
       -
             description = lib.mdDoc "File path containing k3s token to use when connecting to the server. This option only makes sense for an agent.";

     

       92
       92
       +
             description = lib.mdDoc "File path containing k3s token to use when connecting to the server.";

     

       54
       93
        
             default = null;

     

       55
       94
        
           };

     

       56
       95
        
       

     
···

       86
       125
        
               assertion = cfg.role == "agent" -> cfg.configPath != null || cfg.tokenFile != null || cfg.token != "";

     

       87
       126
        
               message = "token or tokenFile or configPath (with 'token' or 'token-file' keys) should be set if role is 'agent'";

     

       88
       127
        
             }

     

       128
       128
       +
             {

     

       129
       129
       +
               assertion = cfg.role == "agent" -> !cfg.disableAgent;

     

       130
       130
       +
               message = "disableAgent must be false if role is 'agent'";

     

       131
       131
       +
             }

     

       132
       132
       +
             {

     

       133
       133
       +
               assertion = cfg.role == "agent" -> !cfg.clusterInit;

     

       134
       134
       +
               message = "clusterInit must be false if role is 'agent'";

     

       135
       135
       +
             }

     

       89
       136
        
           ];

     

       90
       137
        
       

     

       91
       138
        
           environment.systemPackages = [ config.services.k3s.package ];

     
···

       111
       158
        
                 [

     

       112
       159
        
                   "${cfg.package}/bin/k3s ${cfg.role}"

     

       113
       160
        
                 ]

     

       161
       161
       +
                 ++ (optional cfg.clusterInit "--cluster-init")

     

       114
       162
        
                 ++ (optional cfg.disableAgent "--disable-agent")

     

       115
       163
        
                 ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}")

     

       116
       164
        
                 ++ (optional (cfg.token != "") "--token ${cfg.token}")

+4 -2

nixos/modules/services/web-apps/keycloak.nix

···

       25
       25
        
           catAttrs

     

       26
       26
        
           collect

     

       27
       27
        
           splitString

     

       28
       28
       +
           hasPrefix

     

       28
       29
        
           ;

     

       29
       30
        
       

     

       30
       31
        
         inherit (builtins)

     
···

       312
       313
        
       

     

       313
       314
        
                   http-relative-path = mkOption {

     

       314
       315
        
                     type = str;

     

       315
       315
       -
                     default = "";

     

       316
       316
       +
                     default = "/";

     

       316
       317
        
                     example = "/auth";

     

       318
       318
       +
                     apply = x: if !(hasPrefix "/") x then "/" + x else x;

     

       317
       319
        
                     description = ''

     

       318
       320
        
                       The path relative to <literal>/</literal> for serving

     

       319
       321
        
                       resources.

     
···

       658
       660
        
                   '' + ''

     

       659
       661
        
                     export KEYCLOAK_ADMIN=admin

     

       660
       662
        
                     export KEYCLOAK_ADMIN_PASSWORD=${cfg.initialAdminPassword}

     

       661
       661
       -
                     kc.sh start

     

       663
       663
       +
                     kc.sh start --optimized

     

       662
       664
        
                   '';

     

       663
       665
        
                 };

     

       664
       666

+27 -4

nixos/tests/k3s/multi-node.nix

···

       53
       53
        
                 enable = true;

     

       54
       54
        
                 role = "server";

     

       55
       55
        
                 package = pkgs.k3s;

     

       56
       56
       +
                 clusterInit = true;

     

       56
       57
        
                 extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.1";

     

       57
       58
        
               };

     

       58
       58
       -
               networking.firewall.allowedTCPPorts = [ 6443 ];

     

       59
       59
       +
               networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ];

     

       59
       60
        
               networking.firewall.allowedUDPPorts = [ 8472 ];

     

       60
       61
        
               networking.firewall.trustedInterfaces = [ "flannel.1" ];

     

       61
       62
        
               networking.useDHCP = false;

     
···

       65
       66
        
               ];

     

       66
       67
        
             };

     

       67
       68
        
       

     

       69
       69
       +
             server2 = { pkgs, ... }: {

     

       70
       70
       +
               environment.systemPackages = with pkgs; [ gzip jq ];

     

       71
       71
       +
               virtualisation.memorySize = 1536;

     

       72
       72
       +
               virtualisation.diskSize = 4096;

     

       73
       73
       +
       

     

       74
       74
       +
               services.k3s = {

     

       75
       75
       +
                 inherit tokenFile;

     

       76
       76
       +
                 enable = true;

     

       77
       77
       +
                 serverAddr = "https://192.168.1.1:6443";

     

       78
       78
       +
                 clusterInit = false;

     

       79
       79
       +
                 extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.3";

     

       80
       80
       +
               };

     

       81
       81
       +
               networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ];

     

       82
       82
       +
               networking.firewall.allowedUDPPorts = [ 8472 ];

     

       83
       83
       +
               networking.firewall.trustedInterfaces = [ "flannel.1" ];

     

       84
       84
       +
               networking.useDHCP = false;

     

       85
       85
       +
               networking.defaultGateway = "192.168.1.3";

     

       86
       86
       +
               networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [

     

       87
       87
       +
                 { address = "192.168.1.3"; prefixLength = 24; }

     

       88
       88
       +
               ];

     

       89
       89
       +
             };

     

       90
       90
       +
       

     

       68
       91
        
             agent = { pkgs, ... }: {

     

       69
       92
        
               virtualisation.memorySize = 1024;

     

       70
       93
        
               virtualisation.diskSize = 2048;

     
···

       72
       95
        
                 inherit tokenFile;

     

       73
       96
        
                 enable = true;

     

       74
       97
        
                 role = "agent";

     

       75
       75
       -
                 serverAddr = "https://192.168.1.1:6443";

     

       98
       98
       +
                 serverAddr = "https://192.168.1.3:6443";

     

       76
       99
        
                 extraFlags = "--pause-image test.local/pause:local --node-ip 192.168.1.2";

     

       77
       100
        
               };

     

       78
       101
        
               networking.firewall.allowedTCPPorts = [ 6443 ];

     
···

       91
       114
        
           };

     

       92
       115
        
       

     

       93
       116
        
           testScript = ''

     

       94
       94
       -
             start_all()

     

       95
       95
       -
             machines = [server, agent]

     

       117
       117
       +
             machines = [server, server2, agent]

     

       96
       118
        
             for m in machines:

     

       119
       119
       +
                 m.start()

     

       97
       120
        
                 m.wait_for_unit("k3s")

     

       98
       121
        
       

     

       99
       122
        
             # wait for the agent to show up

+3 -3

pkgs/applications/audio/amberol/default.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "amberol";

     

       22
       22
       -
         version = "0.9.0";

     

       22
       22
       +
         version = "0.9.1";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitLab {

     

       25
       25
        
           domain = "gitlab.gnome.org";

     

       26
       26
        
           owner = "World";

     

       27
       27
        
           repo = pname;

     

       28
       28
        
           rev = version;

     

       29
       29
       -
           hash = "sha256-/kZYzUzycHKre6/dvZgeqXu6mrkblftV51Z7866fZVY=";

     

       29
       29
       +
           hash = "sha256-UZFOQw9eXSyCey4YQ4pWV91BIo+5tFw1N8es5H03+fc=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       33
       33
        
           inherit src;

     

       34
       34
        
           name = "${pname}-${version}";

     

       35
       35
       -
           hash = "sha256-1+RWL9MD6aX+zI2rtQUQCqemCephLKGEAf5xNCb+jo4=";

     

       35
       35
       +
           hash = "sha256-ebo718+HAZFd7Pjy06jAzmaLdjR3o4Hn0xEeO7yiIC0=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         postPatch = ''

+3 -3

pkgs/applications/blockchains/lnd/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "lnd";

     

       9
       9
       -
         version = "0.15.0-beta";

     

       9
       9
       +
         version = "0.15.1-beta";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "lightningnetwork";

     

       13
       13
        
           repo = "lnd";

     

       14
       14
        
           rev = "v${version}";

     

       15
       15
       -
           sha256 = "sha256-v8nLsnd6dus+og75U9VIO1K5IuyNh+VYdQfbfbYeox0=";

     

       15
       15
       +
           sha256 = "sha256-E1RxFy7eRCTnzTg2B0llRt+r41K6V4VQH7Edh1As4cY=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorSha256 = "sha256-fx3WsyLyES+ezJGDe3SjFTeGlPMmqKEtWlYGkWpxODc=";

     

       18
       18
       +
         vendorSha256 = "sha256-e72HIsS1fftJEOvjr1RQMo3+gjlBxXPHq2olGWfurJk=";

     

       19
       19
        
       

     

       20
       20
        
         subPackages = [ "cmd/lncli" "cmd/lnd" ];

     

       21
       21

+2 -2

pkgs/applications/graphics/digikam/default.nix

···

       56
       56
        
       

     

       57
       57
        
       mkDerivation rec {

     

       58
       58
        
         pname   = "digikam";

     

       59
       59
       -
         version = "7.7.0";

     

       59
       59
       +
         version = "7.8.0";

     

       60
       60
        
       

     

       61
       61
        
         src = fetchurl {

     

       62
       62
        
           url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";

     

       63
       63
       -
           sha256 = "sha256-wMbdLqigdRSsvyRi86VFGOfoCZszN/iBM2Foz/Y9dxw=";

     

       63
       63
       +
           sha256 = "sha256-sIV3sLFe+ZhDaVcIqiwOmNVHMD2Fvio7OZBUhPLKts4=";

     

       64
       64
        
         };

     

       65
       65
        
       

     

       66
       66
        
         nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];

+2 -2

pkgs/applications/misc/anytype/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "anytype";

     

       5
       5
       -
         version = "0.27.0";

     

       5
       5
       +
         version = "0.28.0";

     

       6
       6
        
         name = "Anytype-${version}";

     

       7
       7
        
         nameExecutable = pname;

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";

     

       10
       10
        
           name = "Anytype-${version}.AppImage";

     

       11
       11
       -
           sha256 = "sha256-AcnXhilnr5ay45S30eNSDuN+Ed1TDv/Rh523LsUf3iM=";

     

       11
       11
       +
           sha256 = "sha256-tYeVz10saTJBf6DDGIVSd4IkSREDJFi/am/kg/An02E=";

     

       12
       12
        
         };

     

       13
       13
        
         appimageContents = appimageTools.extractType2 { inherit name src; };

     

       14
       14
        
       in

+5 -5

pkgs/applications/misc/styx/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, caddy, asciidoctor

     

       2
       2
        
       , file, lessc, sass, multimarkdown, linkchecker

     

       3
       3
       -
       , perlPackages, python27 }:

     

       3
       3
       +
       , perlPackages, python3Packages }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "styx";

     

       7
       7
       -
         version = "0.7.2";

     

       7
       7
       +
         version = "0.7.5";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner  = "styx-static";

     

       11
       11
        
           repo   = "styx";

     

       12
       12
       -
           rev    = "0f0a878156eac416620a177cc030fa9f2f69b1b8";

     

       13
       13
       -
           sha256 = "0ig456j1s17w4zhhcmkrskpy6n7061v5f2isa3qhipmn0gwb91af";

     

       12
       12
       +
           rev    = "v${version}";

     

       13
       13
       +
           hash = "sha256-f6iA/nHpKnm3BALoQq8SzdcSzJLCFSferEf69SpgD2Y=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         server = "${caddy}/bin/caddy";

     
···

       27
       27
        
           asciidoctor

     

       28
       28
        
           multimarkdown

     

       29
       29
        
           perlPackages.ImageExifTool

     

       30
       30
       -
           (python27.withPackages (ps: [ ps.parsimonious ]))

     

       30
       30
       +
           python3Packages.parsimonious

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
        
         installPhase = ''

+3 -3

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix

···

       87
       87
        
         fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

     

       88
       88
        
       

     

       89
       89
        
         # Upstream source

     

       90
       90
       -
         version = "11.5.1";

     

       90
       90
       +
         version = "11.5.2";

     

       91
       91
        
       

     

       92
       92
        
         lang = "en-US";

     

       93
       93
        
       

     
···

       98
       98
        
               "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

     

       99
       99
        
               "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"

     

       100
       100
        
             ];

     

       101
       101
       -
             sha256 = "sha256-LgzvptQoTHGngW4xDZNfm5teSjpAjcUzMKDbBHRInoo=";

     

       101
       101
       +
             sha256 = "sha256-kM3OOFTpEU7nIyqqdGcqLZ86QLb6isM5cfWG7jo891o=";

     

       102
       102
        
           };

     

       103
       103
        
       

     

       104
       104
        
           i686-linux = fetchurl {

     
···

       107
       107
        
               "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

     

       108
       108
        
               "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"

     

       109
       109
        
             ];

     

       110
       110
       -
             sha256 = "sha256-J/ka/Qvu2UC5KTfatkWq0jc6bHTazA20vL9tz1sK/Rg=";

     

       110
       110
       +
             sha256 = "sha256-62dGoIqaCrSzsDjvt8c5hEAwOSTFst9PCpvMzveBukY=";

     

       111
       111
        
           };

     

       112
       112
        
         };

     

       113
       113
        
       in

+3 -3

pkgs/applications/networking/cluster/fluxctl/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "fluxctl";

     

       5
       5
       -
         version = "1.25.3";

     

       5
       5
       +
         version = "1.25.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "weaveworks";

     

       9
       9
        
           repo = "flux";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-tV6rPpZW3HWxUBUdDkYOP6gIc/ZD+CMmT7FVYXiLp5A=";

     

       11
       11
       +
           sha256 = "sha256-rKZ0fI9UN4oq6gfDMNR2+kCazlDexE1+UVzQ3xgkSA8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-wApm7IXblhQiV7VpBXZndJgFpQmq2WEFjCEG1qd+Nlo=";

     

       14
       14
       +
         vendorSha256 = "sha256-6Trk49Vo3oMjSaHRDm2v+elPDHwdn2D3Z6i4UYcx0IQ=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ installShellFiles ];

     

       17
       17

+2 -2

pkgs/applications/networking/instant-messengers/alfaview/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "alfaview";

     

       8
       8
       -
         version = "8.51.0";

     

       8
       8
       +
         version = "8.52.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";

     

       12
       12
       -
           sha256 = "sha256-rnzYTQpAX1OSBnVfnFsamd9i9Zpab4mZwlxot0CakgY=";

     

       12
       12
       +
           sha256 = "sha256-Taw/qMrqgxFWmRTSed8xINDBGTWx7kteN637Fjrzn44=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/networking/instant-messengers/discord/default.nix

···

       3
       3
        
         versions = if stdenv.isLinux then {

     

       4
       4
        
           stable = "0.0.19";

     

       5
       5
        
           ptb = "0.0.29";

     

       6
       6
       -
           canary = "0.0.136";

     

       6
       6
       +
           canary = "0.0.137";

     

       7
       7
        
         } else {

     

       8
       8
        
           stable = "0.0.264";

     

       9
       9
        
           ptb = "0.0.59";

     
···

       22
       22
        
             };

     

       23
       23
        
             canary = fetchurl {

     

       24
       24
        
               url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     

       25
       25
       -
               sha256 = "sha256-OrGg4jXziesHBhQORxREN/wq776RgNGaTyjJNV4pSAU=";

     

       25
       25
       +
               sha256 = "sha256-dreKO2yBDP547VYuJziBhC2sLdpbM2fcK5bxeds0zUQ=";

     

       26
       26
        
             };

     

       27
       27
        
           };

     

       28
       28
        
           aarch64-darwin = {

+2 -2

pkgs/applications/virtualization/docker-slim/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "docker-slim";

     

       5
       5
       -
         version = "1.37.6";

     

       5
       5
       +
         version = "1.38.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "docker-slim";

     

       9
       9
        
           repo = "docker-slim";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-Jzi6JC6DRklZhNqmFx6eHx6qR8/fb/JuSpgwtPThcc4=";

     

       11
       11
       +
           sha256 = "sha256-UDEM7KCTkx+9GTkC8LSkcf4u6SozI3yYrdDwAdjeiLg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;

+10

pkgs/build-support/docker/default.nix

···

       792
       792
        
           ln -s ${bashInteractive}/bin/bash $out/bin/sh

     

       793
       793
        
         '';

     

       794
       794
        
       

     

       795
       795
       +
         # This provides the ca bundle in common locations

     

       796
       796
       +
         caCertificates = runCommand "ca-certificates" { } ''

     

       797
       797
       +
           # Old NixOS compatibility.

     

       798
       798
       +
           ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/etc/ssl/certs/ca-bundle.crt

     

       799
       799
       +
           # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.

     

       800
       800
       +
           ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/etc/ssl/certs/ca-certificates.crt

     

       801
       801
       +
           # CentOS/Fedora compatibility.

     

       802
       802
       +
           ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/etc/pki/tls/certs/ca-bundle.crt

     

       803
       803
       +
         '';

     

       804
       804
       +
       

     

       795
       805
        
         # Build an image and populate its nix database with the provided

     

       796
       806
        
         # contents. The main purpose is to be able to use nix commands in

     

       797
       807
        
         # the container.

+2 -2

pkgs/development/compilers/fennel/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "fennel";

     

       5
       5
       -
         version = "1.1.0";

     

       5
       5
       +
         version = "1.2.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromSourcehut {

     

       8
       8
        
           owner = "~technomancy";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-3Pfl/KNwuGCkZjG/FlF6K2IQHwJQbWsCBmJpLizr1ng=";

     

       11
       11
       +
           sha256 = "sha256-TXmqvhT7Ab+S0UdLgl4xWrVvE//eCbu6qNnoxB7smE4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ installShellFiles ];

+2 -1

pkgs/development/coq-modules/gaia/default.nix

···

       7
       7
        
         release."1.12".sha256 = "sha256:0c6cim4x6f9944g8v0cp0lxs244lrhb04ms4y2s6y1wh321zj5mi";

     

       8
       8
        
         release."1.13".sha256 = "sha256:0i8ix2rbw10v34bi0yrx0z89ng96ydqbxm8rv2rnfgy4d1b27x6q";

     

       9
       9
        
         release."1.14".sha256 = "sha256-wgeQC0fIN3PSmRY1K6/KTy+rJmqqxdo3Bhsz1vjVAes=";

     

       10
       10
       +
         release."1.15".sha256 = "sha256:04zchnkvaq2mzpcilpspn5l947689gj3m0w20m0nd7w4drvlahnw";

     

       10
       11
        
         releaseRev = (v: "v${v}");

     

       11
       12
        
       

     

       12
       13
        
         inherit version;

     

       13
       14
        
         defaultVersion = with versions; switch [ coq.version mathcomp.version ] [

     

       14
       14
       -
           { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.14"; }

     

       15
       15
       +
           { cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.15"; }

     

       15
       16
        
           { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; }

     

       16
       17
        
         ] null;

     

       17
       18

+2 -1

pkgs/development/coq-modules/hierarchy-builder/default.nix

···

       5
       5
        
         owner = "math-comp";

     

       6
       6
        
         inherit version;

     

       7
       7
        
         defaultVersion = with versions; switch coq.coq-version [

     

       8
       8
       -
           { case = range "8.15" "8.16"; out = "1.2.1"; }

     

       8
       8
       +
           { case = range "8.15" "8.16"; out = "1.3.0"; }

     

       9
       9
        
           { case = range "8.13" "8.14"; out = "1.2.0"; }

     

       10
       10
        
           { case = range "8.12" "8.13"; out = "1.1.0"; }

     

       11
       11
        
           { case = isEq "8.11";         out = "0.10.0"; }

     

       12
       12
        
         ] null;

     

       13
       13
       +
         release."1.3.0".sha256  = "17k7rlxdx43qda6i1yafpgc64na8br285cb0mbxy5wryafcdrkrc";

     

       13
       14
        
         release."1.2.1".sha256  = "sha256-pQYZJ34YzvdlRSGLwsrYgPdz3p/l5f+KhJjkYT08Mj0=";

     

       14
       15
        
         release."1.2.0".sha256  = "0sk01rvvk652d86aibc8rik2m8iz7jn6mw9hh6xkbxlsvh50719d";

     

       15
       16
        
         release."1.1.0".sha256  = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q=";

+11 -7

pkgs/development/coq-modules/mathcomp-analysis/default.nix

···

       9
       9
        
         owner = "math-comp";

     

       10
       10
        
       

     

       11
       11
        
         release."0.5.3".sha256 = "sha256-1NjFsi5TITF8ZWx1NyppRmi8g6YaoUtTdS9bU/sUe5k=";

     

       12
       12
       +
         release."0.5.2".sha256 = "0yx5p9zyl8jv1vg7rgkyq8dqzkdnkqv969mi62whmhkvxbavgzbw";

     

       13
       13
       +
         release."0.5.1".sha256 = "1hnzqb1gxf88wgj2n1b0f2xm6sxg9j0735zdsv6j12hlvx5lwk68";

     

       12
       14
        
         release."0.3.13".sha256 = "sha256-Yaztew79KWRC933kGFOAUIIoqukaZOdNOdw4XszR1Hg=";

     

       13
       15
        
         release."0.3.10".sha256 = "sha256-FBH2c8QRibq5Ycw/ieB8mZl0fDiPrYdIzZ6W/A3pIhI=";

     

       14
       16
        
         release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4=";

     
···

       20
       22
        
       

     

       21
       23
        
         inherit version;

     

       22
       24
        
         defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [

     

       23
       23
       -
             { cases = [ (isGe "8.14") (isGe "1.13.0") ];      out = "0.5.3"; }

     

       24
       24
       -
             { cases = [ (isGe "8.13") (isGe "1.12.0") ];      out = "0.3.13"; }

     

       25
       25
       -
             { cases = [ (range "8.11" "8.14") (isGe "1.12.0") ];      out = "0.3.10"; }

     

       26
       26
       -
             { cases = [ (range "8.11" "8.13") "1.11.0" ];             out = "0.3.4"; }

     

       27
       27
       -
             { cases = [ (range "8.10" "8.12") "1.11.0" ];             out = "0.3.3"; }

     

       28
       28
       -
             { cases = [ (range "8.10" "8.11") "1.11.0" ];             out = "0.3.1"; }

     

       29
       29
       -
             { cases = [ (range "8.8"  "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; }

     

       25
       25
       +
             { cases = [ (isGe "8.14") (isGe "1.13.0") ];               out = "0.5.3"; }

     

       26
       26
       +
             { cases = [ (isGe "8.14") (range "1.13" "1.15") ];         out = "0.5.2"; }

     

       27
       27
       +
             { cases = [ (isGe "8.13") (range "1.13" "1.14") ];         out = "0.5.1"; }

     

       28
       28
       +
             { cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; }

     

       29
       29
       +
             { cases = [ (range "8.11" "8.14") (isGe "1.12.0") ];       out = "0.3.10"; }

     

       30
       30
       +
             { cases = [ (range "8.11" "8.13") "1.11.0" ];              out = "0.3.4"; }

     

       31
       31
       +
             { cases = [ (range "8.10" "8.12") "1.11.0" ];              out = "0.3.3"; }

     

       32
       32
       +
             { cases = [ (range "8.10" "8.11") "1.11.0" ];              out = "0.3.1"; }

     

       33
       33
       +
             { cases = [ (range "8.8"  "8.11") (range "1.8" "1.10") ];  out = "0.2.3"; }

     

       30
       34
        
           ] null;

     

       31
       35
        
       

     

       32
       36
        
         propagatedBuildInputs =

+1 -1

pkgs/development/coq-modules/mathcomp-bigenough/default.nix

···

       12
       12
        
         };

     

       13
       13
        
         inherit version;

     

       14
       14
        
         defaultVersion = with versions; switch coq.version [

     

       15
       15
       -
           { case = range "8.10" "8.15"; out = "1.0.1"; }

     

       15
       15
       +
           { case = isGe "8.10"        ; out = "1.0.1"; }

     

       16
       16
        
           { case = range "8.5"  "8.14"; out = "1.0.0"; }

     

       17
       17
        
         ] null;

     

       18
       18

+1 -1

pkgs/development/coq-modules/mathcomp-finmap/default.nix

···

       7
       7
        
         owner = "math-comp";

     

       8
       8
        
         inherit version;

     

       9
       9
        
         defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [

     

       10
       10
       -
             { cases = [ (range "8.13" "8.15")  (isGe "1.12") ];         out = "1.5.2"; }

     

       10
       10
       +
             { cases = [ (range "8.13" "8.16")  (isGe "1.12") ];         out = "1.5.2"; }

     

       11
       11
        
             { cases = [ (isGe "8.10")          (isGe "1.11") ];         out = "1.5.1"; }

     

       12
       12
        
             { cases = [ (range "8.7" "8.11")   "1.11.0" ];              out = "1.5.0"; }

     

       13
       13
        
             { cases = [ (isEq "8.11")          (range "1.8" "1.10") ];  out = "1.4.0+coq-8.11"; }

+2

pkgs/development/coq-modules/mathcomp-real-closed/default.nix

···

       8
       8
        
         owner = "math-comp";

     

       9
       9
        
         inherit version;

     

       10
       10
        
         release = {

     

       11
       11
       +
           "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7";

     

       11
       12
        
           "1.1.2".sha256 = "0907x4nf7nnvn764q3x9lx41g74rilvq5cki5ziwgpsdgb98pppn";

     

       12
       13
        
           "1.1.1".sha256 = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b";

     

       13
       14
        
           "1.0.5".sha256 = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2";

     
···

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         defaultVersion = with versions; switch [ coq.version mathcomp.version ]  [

     

       21
       21
       +
             { cases = [ (isGe "8.13")  (isGe "1.12.0") ]; out = "1.1.3"; }

     

       20
       22
        
             { cases = [ (isGe "8.10")  (isGe "1.12.0") ]; out = "1.1.2"; }

     

       21
       23
        
             { cases = [ (isGe "8.7")   "1.11.0" ]; out = "1.1.1"; }

     

       22
       24
        
             { cases = [ (isGe "8.7")   (range "1.9.0" "1.10.0") ]; out = "1.0.4"; }

+2

pkgs/development/coq-modules/mathcomp/default.nix

···

       19
       19
        
         owner = "math-comp";

     

       20
       20
        
         withDoc = single && (args.withDoc or false);

     

       21
       21
        
         defaultVersion = with versions; switch coq.coq-version [

     

       22
       22
       +
             { case = range "8.14" "8.16"; out = "1.15.0"; }

     

       22
       23
        
             { case = range "8.11" "8.15"; out = "1.14.0"; }

     

       23
       24
        
             { case = range "8.11" "8.15"; out = "1.13.0"; }

     

       24
       25
        
             { case = range "8.10" "8.13"; out = "1.12.0"; }

     
···

       30
       31
        
             { case = range "8.5" "8.7";   out = "1.6.4";  }

     

       31
       32
        
           ] null;

     

       32
       33
        
         release = {

     

       34
       34
       +
           "1.15.0".sha256 = "1bp0jxl35ms54s0mdqky15w9af03f3i0n06qk12k4gw1xzvwqv21";

     

       33
       35
        
           "1.14.0".sha256 = "07yamlp1c0g5nahkd2gpfhammcca74ga2s6qr7a3wm6y6j5pivk9";

     

       34
       36
        
           "1.13.0".sha256 = "0j4cz2y1r1aw79snkcf1pmicgzf8swbaf9ippz0vg99a572zqzri";

     

       35
       37
        
           "1.12.0".sha256 = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp";

+3 -2

pkgs/development/coq-modules/odd-order/default.nix

···

       5
       5
        
         pname = "odd-order";

     

       6
       6
        
         owner = "math-comp";

     

       7
       7
        
       

     

       8
       8
       -
         release."1.13.0".rev    = "mathcomp-odd-order.1.13.0";

     

       8
       8
       +
         release."1.14.0".sha256 = "0iln70npkvixqyz469l6nry545a15jlaix532i1l7pzfkqqn6v68";

     

       9
       9
        
         release."1.13.0".sha256 = "sha256-EzNKR/JzM8T17sMhPhgZNs14e50X4dY3OwFi133IsT0=";

     

       10
       10
       -
         release."1.12.0".rev    = "mathcomp-odd-order.1.12.0";

     

       11
       10
        
         release."1.12.0".sha256 = "sha256-omsfdc294CxKAHNMMeqJCcVimvyRCHgxcQ4NJOWSfNM=";

     

       11
       11
       +
         releaseRev = v: "mathcomp-odd-order.${v}";

     

       12
       12
        
       

     

       13
       13
        
         inherit version;

     

       14
       14
        
         defaultVersion = with versions; switch mathcomp.character.version [

     

       15
       15
       +
           { case = (range "1.13.0" "1.15.0"); out = "1.14.0"; }

     

       15
       16
        
           { case = (range "1.12.0" "1.14.0"); out = "1.13.0"; }

     

       16
       17
        
           { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; }

     

       17
       18
        
         ] null;

+3

pkgs/development/libraries/qpdf/default.nix

···

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ zlib libjpeg ];

     

       17
       17
        
       

     

       18
       18
       +
         configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

     

       19
       19
       +
                            "--with-random=/dev/urandom";

     

       20
       20
       +
       

     

       18
       21
        
         preCheck = ''

     

       19
       22
        
           patchShebangs qtest/bin/qtest-driver

     

       20
       23
        
         '';

+3 -5

pkgs/development/ocaml-modules/resource-pooling/default.nix

···

       1
       1
        
       { lib, fetchFromGitHub, buildDunePackage, lwt_log }:

     

       2
       2
        
       

     

       3
       3
        
       buildDunePackage rec {

     

       4
       4
       -
         version = "1.1";

     

       4
       4
       +
         version = "1.2";

     

       5
       5
        
         pname = "resource-pooling";

     

       6
       6
        
       

     

       7
       7
       -
         useDune2 = true;

     

       8
       8
       -
       

     

       9
       9
       -
         minimumOCamlVersion = "4.06";

     

       7
       7
       +
         minimalOCamlVersion = "4.06";

     

       10
       8
        
       

     

       11
       9
        
         src = fetchFromGitHub {

     

       12
       10
        
           owner = "ocsigen";

     

       13
       11
        
           repo = pname;

     

       14
       12
        
           rev = version;

     

       15
       15
       -
           sha256 = "0wsbnwszafdv3gsiiaslgf6m6pfx74h7h19i0gp2c4ivdiv3wck9";

     

       13
       13
       +
           sha256 = "sha256-GNYPxjMTo7y40y7aQdseuFyeVF/hSCZKXfEaH/WIO9w=";

     

       16
       14
        
         };

     

       17
       15
        
       

     

       18
       16
        
         propagatedBuildInputs = [ lwt_log ];

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "chex";

     

       15
       15
       -
         version = "0.1.3";

     

       15
       15
       +
         version = "0.1.4";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "deepmind";

     

       20
       20
        
           repo = pname;

     

       21
       21
        
           rev = "refs/tags/v${version}";

     

       22
       22
       -
           hash = "sha256-oIdRh0WKzdvyCfcamKRDiMsV51b6rdmNYcELjDQKGX4=";

     

       22
       22
       +
           hash = "sha256-FiZElESyOVu1VJxUDNiN6HVADiaubDrGdQHYp2CN8f4=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+54

pkgs/development/python-modules/google-cloud-compute/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , google-api-core

     

       6
       6
       +
       , mock

     

       7
       7
       +
       , proto-plus

     

       8
       8
       +
       , protobuf

     

       9
       9
       +
       , pytest-asyncio

     

       10
       10
       +
       , pytestCheckHook

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       buildPythonPackage rec {

     

       14
       14
       +
         pname = "google-cloud-compute";

     

       15
       15
       +
         version = "1.4.0";

     

       16
       16
       +
         disabled = pythonOlder "3.7";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchPypi {

     

       19
       19
       +
           inherit pname version;

     

       20
       20
       +
           sha256 = "0sgp0xa9cfmgyb1dwdy1f4q9dfr3lgsgm7vbiks9xmiaf0fr221m";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [

     

       24
       24
       +
           google-api-core

     

       25
       25
       +
           proto-plus

     

       26
       26
       +
           protobuf

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         checkInputs = [

     

       30
       30
       +
           mock

     

       31
       31
       +
           pytest-asyncio

     

       32
       32
       +
           pytestCheckHook

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         pythonImportsCheck = [

     

       36
       36
       +
           "google.cloud.compute"

     

       37
       37
       +
           "google.cloud.compute_v1"

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         # disable tests that require credentials

     

       41
       41
       +
         disabledTestPaths = [

     

       42
       42
       +
           "tests/system/test_addresses.py"

     

       43
       43
       +
           "tests/system/test_instance_group.py"

     

       44
       44
       +
           "tests/system/test_pagination.py"

     

       45
       45
       +
           "tests/system/test_smoke.py"

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         meta = with lib; {

     

       49
       49
       +
           description = "API Client library for Google Cloud Compute";

     

       50
       50
       +
           homepage = "https://github.com/googleapis/python-compute";

     

       51
       51
       +
           license = licenses.asl20;

     

       52
       52
       +
           maintainers = with maintainers; [ jpetrucciani ];

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "minikerberos";

     

       13
       13
       -
         version = "0.2.20";

     

       13
       13
       +
         version = "0.3.0";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           hash = "sha256-eJ+AImP6GIL3AbEj9u7ASLRc1zG/G1KIcABdrwdAIEc=";

     

       20
       20
       +
           hash = "sha256-3uh0iFBD+WW4DWl1gcwfGERCq21CrF8iggNKULnAhUE=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "peaqevcore";

     

       9
       9
       -
         version = "5.16.7";

     

       9
       9
       +
         version = "5.18.1";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         disabled = pythonOlder "3.7";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-hL07M5lelXmxhSVkY0dmnQWpI6B/9pW7jf00x/nDaJU=";

     

       16
       16
       +
           hash = "sha256-LKb1sTekBbOKdsdxZbiAMAmOTjS21nvq7UWzVxEqJh0=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         postPatch = ''

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "PyPDF2";

     

       13
       13
       -
         version = "2.10.0";

     

       13
       13
       +
         version = "2.10.4";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "sha256-smB4IGIhxkEeyXpaXAiXWuebp+xGdXXRFHepnM5gHrk=";

     

       17
       17
       +
           sha256 = "sha256-8JDF/HmQz1ptY2TOI2KDSXTjITbVIpG6uyNy5dZH0Yg=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         LC_ALL = "en_US.UTF-8";

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "python-gitlab";

     

       13
       13
       -
         version = "3.8.1";

     

       13
       13
       +
         version = "3.9.0";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "sha256-4dslB2Ug4RjHwmvssNB0p6aBJ0OYcNQ7hjY0Igax4JE=";

     

       20
       20
       +
           sha256 = "sha256-X8Xoj4HzZuEYUcuLS5pbgnSRziC6dYVEa3TJsJdya6M=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

+8 -5

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

···

       25
       25
        
           dataclasses

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
       -
         buildInputs = [

     

       29
       29
       -
           libX11

     

       30
       30
       -
           libXinerama

     

       31
       31
       -
           libXrandr

     

       32
       32
       -
         ];

     

       28
       28
       +
         postPatch = ''

     

       29
       29
       +
           substituteInPlace screeninfo/enumerators/xinerama.py \

     

       30
       30
       +
             --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libX11}/lib/libX11.so")' \

     

       31
       31
       +
             --replace 'load_library("Xinerama")' 'ctypes.cdll.LoadLibrary("${libXinerama}/lib/libXinerama.so")'

     

       32
       32
       +
           substituteInPlace screeninfo/enumerators/xrandr.py \

     

       33
       33
       +
             --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libX11}/lib/libX11.so")' \

     

       34
       34
       +
             --replace 'load_library("Xrandr")' 'ctypes.cdll.LoadLibrary("${libXrandr}/lib/libXrandr.so")'

     

       35
       35
       +
         '';

     

       33
       36
        
       

     

       34
       37
        
         checkInputs = [

     

       35
       38
        
           pytestCheckHook

+4

pkgs/development/python-modules/sphinxcontrib-openapi/default.nix

···

       23
       23
        
         # https://github.com/cilium/cilium/commit/b9862461568dd41d4dc8924711d4cc363907270b and

     

       24
       24
        
         # https://github.com/cilium/openapi/commit/cd829a05caebd90b31e325d4c9c2714b459d135f

     

       25
       25
        
         # for details.

     

       26
       26
       +
         # PR to switch upstream sphinx-contrib/openapi from m2r to sphinx-mdinclude:

     

       27
       27
       +
         # https://github.com/sphinx-contrib/openapi/pull/127

     

       28
       28
       +
         # (once merged, we should switch away from that fork again)

     

       26
       29
        
         src = fetchFromGitHub {

     

       27
       30
        
           owner = "cilium";

     

       28
       31
        
           repo = "openapi";

     
···

       48
       51
        
           homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi";

     

       49
       52
        
           description = "OpenAPI (fka Swagger) spec renderer for Sphinx";

     

       50
       53
        
           license = licenses.bsd0;

     

       54
       54
       +
           maintainers = [ maintainers.flokli ];

     

       51
       55
        
         };

     

       52
       56
        
       }

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "versioneer";

     

       9
       9
       -
         version = "0.23";

     

       9
       9
       +
         version = "0.24";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         disabled = pythonOlder "3.7";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-1rbWjCmWU3NqKfGZMJ7kMG6XoPDQp47LceIckM4TIrs=";

     

       16
       16
       +
           hash = "sha256-G426nlHi8OBMfoVFIW7s3qLWPhvVVpRI7mbFSffneC8=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         # Couldn't get tests to work because, for instance, they used virtualenv and

+3 -3

pkgs/development/tools/analysis/cargo-tarpaulin/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-tarpaulin";

     

       5
       5
       -
         version = "0.20.1";

     

       5
       5
       +
         version = "0.21.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "xd009642";

     

       9
       9
        
           repo = "tarpaulin";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-WobKZeO0U54mHj7hlkOH33TcOklWBJRWYSJBEt5sYII=";

     

       11
       11
       +
           sha256 = "sha256-u6HZekrFfL+jqUh7UAo9DbgYxzS/drpt1/WdJqRFFe4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [

     
···

       17
       17
        
         buildInputs = [ openssl ]

     

       18
       18
        
           ++ lib.optionals stdenv.isDarwin [ curl Security ];

     

       19
       19
        
       

     

       20
       20
       -
         cargoSha256 = "sha256-LR4jU7V44f00ry0VEd3qFryZtnn/t0K/OZGnRproksE=";

     

       20
       20
       +
         cargoSha256 = "sha256-g3PrsyGhBiN32wPtdrIPjnQK79gaJtTfZkwv7MzYYrU=";

     

       21
       21
        
         #checkFlags = [ "--test-threads" "1" ];

     

       22
       22
        
         doCheck = false;

     

       23
       23

+3 -3

pkgs/development/tools/cbfmt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cbfmt";

     

       5
       5
       -
         version = "0.1.4";

     

       5
       5
       +
         version = "0.2.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "lukas-reineke";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-MOvTsyfKsBSog/0SpHJO9xiIc6/hmQVN4dqqytiiCgs=";

     

       11
       11
       +
           sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-Vu4bcw5WSwS2MB0sPumoQDhSdjnZyzrYF8eMPeVallA=";

     

       14
       14
       +
         cargoSha256 = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo=";

     

       15
       15
        
       

     

       16
       16
        
         passthru.tests.version = testers.testVersion {

     

       17
       17
        
           package = cbfmt;

+3 -3

pkgs/development/tools/continuous-integration/dagger/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "dagger";

     

       5
       5
       -
         version = "0.2.31";

     

       5
       5
       +
         version = "0.2.32";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "dagger";

     

       9
       9
        
           repo = "dagger";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-G4SittUyh0vqpDWi9vRxTB2Be+gwluYaLCSHDoV8uMg=";

     

       11
       11
       +
           sha256 = "sha256-D/iCHXEwsJ4QbDem9+cCjljMTeZY7HDmyXEcPCKjNck=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-kQ40tydh3CpXupqDE5DRpnj4Xb36jpHAeTRvZf5ZNus=";

     

       14
       14
       +
         vendorSha256 = "sha256-GsBeitFYkjwybyRmC0GfYWGs4rwbFz4o6RlmuJibQDY=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [

     

       17
       17
        
           "cmd/dagger"

+3 -3

pkgs/development/tools/dprint/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "dprint";

     

       5
       5
       -
         version = "0.30.3";

     

       5
       5
       +
         version = "0.31.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchCrate {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "sha256-/lptdZEcnbBQL9hYj0xyI95fMT22tGy8zeQz+8VwMog=";

     

       9
       9
       +
           sha256 = "sha256-NgUc3QrH7y72DS01ypfnifHzQeFCogPa+8+Kzv4i4xE=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         cargoSha256 = "sha256-BJGOaZgY03CYC8fa0wnlDmc9SO72lrLmdafovFD3BBI=";

     

       12
       12
       +
         cargoSha256 = "sha256-0BIkO9sMQbQTONSsNgR5UFPIkA0mzADqHxlEhHlIG0Y=";

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = lib.optionals stdenv.isDarwin [ Security ];

     

       15
       15

+2 -2

pkgs/development/tools/pipenv/default.nix

···

       19
       19
        
       

     

       20
       20
        
       in buildPythonApplication rec {

     

       21
       21
        
         pname = "pipenv";

     

       22
       22
       -
         version = "2022.8.24";

     

       22
       22
       +
         version = "2022.8.30";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchPypi {

     

       25
       25
        
           inherit pname version;

     

       26
       26
       -
           sha256 = "sha256-7b/4F2bUMoEVsoc43w5SQMsimaNP8MYNUkrShV3xjGk=";

     

       26
       26
       +
           sha256 = "sha256-QUda28Wt4XGEZDvP36mWMuf2FROhfsccSDIDG4hiy6s=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         LC_ALL = "en_US.UTF-8";

+85

pkgs/development/tools/verible/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , buildBazelPackage

     

       5
       5
       +
       , bazel_4

     

       6
       6
       +
       , flex

     

       7
       7
       +
       , bison

     

       8
       8
       +
       , python3

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildBazelPackage rec {

     

       12
       12
       +
         pname = "verible";

     

       13
       13
       +
         version = "0.0-2172-g238b6df6";

     

       14
       14
       +
       

     

       15
       15
       +
         # These environment variables are read in bazel/build-version.py to create

     

       16
       16
       +
         # a build string. Otherwise it would attempt to extract it from .git/.

     

       17
       17
       +
         GIT_DATE = "2022-08-08";

     

       18
       18
       +
         GIT_VERSION = version;

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "chipsalliance";

     

       22
       22
       +
           repo = "verible";

     

       23
       23
       +
           rev = "v${version}";

     

       24
       24
       +
           sha256 = "sha256-iOJhdbipuqqBiYGgk95d1c8bEK6Z16l16GuzYCQRc2g=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         patches = [

     

       28
       28
       +
           # Patch WORKSPACE file to not include windows-related dependencies,

     

       29
       29
       +
           # as they are removed by bazel, breaking the fixed output derivation

     

       30
       30
       +
           # TODO: fix upstream

     

       31
       31
       +
           ./remove-unused-deps.patch

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         bazelFlags = [ "--//bazel:use_local_flex_bison" ];

     

       35
       35
       +
       

     

       36
       36
       +
         fetchAttrs = {

     

       37
       37
       +
           # Fixed output derivation hash after bazel fetch

     

       38
       38
       +
           sha256 = "sha256-XoLdlEeoDJlyWlnXZADHOKu06zKHgHJfgey8UhOt+LM=";

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         nativeBuildInputs = [

     

       42
       42
       +
           flex       # We use local flex and bison as WORKSPACE sources fail

     

       43
       43
       +
           bison      # .. to compile with newer glibc

     

       44
       44
       +
           python3

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         postPatch = ''

     

       48
       48
       +
           patchShebangs bazel/build-version.py \

     

       49
       49
       +
             common/util/create_version_header.sh \

     

       50
       50
       +
             common/parser/move_yacc_stack_symbols.sh \

     

       51
       51
       +
             common/parser/record_syntax_error.sh

     

       52
       52
       +
         '';

     

       53
       53
       +
       

     

       54
       54
       +
         removeRulesCC = false;

     

       55
       55
       +
         bazelTarget = ":install-binaries";

     

       56
       56
       +
         bazelBuildFlags = [

     

       57
       57
       +
           "-c opt"

     

       58
       58
       +
         ];

     

       59
       59
       +
         buildAttrs = {

     

       60
       60
       +
           installPhase = ''

     

       61
       61
       +
             mkdir -p "$out/bin"

     

       62
       62
       +
       

     

       63
       63
       +
             install bazel-bin/common/tools/verible-patch-tool "$out/bin"

     

       64
       64
       +
       

     

       65
       65
       +
             V_TOOLS_DIR=bazel-bin/verilog/tools

     

       66
       66
       +
             install $V_TOOLS_DIR/diff/verible-verilog-diff "$out/bin"

     

       67
       67
       +
             install $V_TOOLS_DIR/formatter/verible-verilog-format "$out/bin"

     

       68
       68
       +
             install $V_TOOLS_DIR/kythe/verible-verilog-kythe-extractor "$out/bin"

     

       69
       69
       +
             install $V_TOOLS_DIR/lint/verible-verilog-lint "$out/bin"

     

       70
       70
       +
             install $V_TOOLS_DIR/ls/verible-verilog-ls "$out/bin"

     

       71
       71
       +
             install $V_TOOLS_DIR/obfuscator/verible-verilog-obfuscate "$out/bin"

     

       72
       72
       +
             install $V_TOOLS_DIR/preprocessor/verible-verilog-preprocessor "$out/bin"

     

       73
       73
       +
             install $V_TOOLS_DIR/project/verible-verilog-project "$out/bin"

     

       74
       74
       +
             install $V_TOOLS_DIR/syntax/verible-verilog-syntax "$out/bin"

     

       75
       75
       +
           '';

     

       76
       76
       +
         };

     

       77
       77
       +
       

     

       78
       78
       +
         meta = with lib; {

     

       79
       79
       +
           homepage = "https://github.com/chipsalliance/verible";

     

       80
       80
       +
           description = "Suite of SystemVerilog developer tools. Including a style-linter, indexer, formatter, and language server.";

     

       81
       81
       +
           license = licenses.asl20;

     

       82
       82
       +
           platforms = platforms.linux;

     

       83
       83
       +
           maintainers = with maintainers; [ hzeller ];

     

       84
       84
       +
         };

     

       85
       85
       +
       }

+22

pkgs/development/tools/verible/remove-unused-deps.patch

···

       1
       1
       +
       diff --git a/WORKSPACE b/WORKSPACE

     

       2
       2
       +
       index 696cc7ef..55a5bb8a 100644

     

       3
       3
       +
       --- a/WORKSPACE

     

       4
       4
       +
       +++ b/WORKSPACE

     

       5
       5
       +
       @@ -81,17 +81,6 @@ load("@com_github_google_rules_install//:setup.bzl", "install_rules_setup")

     

       6
       6
       +
        

     

       7
       7
       +
        install_rules_setup()

     

       8
       8
       +
        

     

       9
       9
       +
       -# Need to load before rules_flex/rules_bison to make sure

     

       10
       10
       +
       -# win_flex_bison is the chosen toolchain on Windows

     

       11
       11
       +
       -load("//bazel:win_flex_bison.bzl", "win_flex_configure")

     

       12
       12
       +
       -

     

       13
       13
       +
       -win_flex_configure(

     

       14
       14
       +
       -    name = "win_flex_bison",

     

       15
       15
       +
       -    sha256 = "095cf65cb3f12ee5888022f93109acbe6264e5f18f6ffce0bda77feb31b65bd8",

     

       16
       16
       +
       -    # bison 3.3.2, flex 2.6.4

     

       17
       17
       +
       -    url = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.18/win_flex_bison-2.5.18.zip",

     

       18
       18
       +
       -)

     

       19
       19
       +
       -

     

       20
       20
       +
        http_archive(

     

       21
       21
       +
            name = "rules_m4",

     

       22
       22
       +
            sha256 = "c67fa9891bb19e9e6c1050003ba648d35383b8cb3c9572f397ad24040fb7f0eb",

+2 -2

pkgs/games/purpur/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "purpur";

     

       5
       5
       -
         version = "1.18.1r1522";

     

       5
       5
       +
         version = "1.19.2r1763";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://api.purpurmc.org/v2/purpur/${builtins.replaceStrings [ "r" ] [ "/" ] version}/download";

     

       9
       9
       -
           sha256 = "1060fsfcw6m30d47wla1vsnmc4czyla6m8wf91ws095hbvc22qsm";

     

       9
       9
       +
           sha256 = "sha256-6wcCwVIGV32YQlgB57qthy6uWtuXGN4G8S7uAAgVyDE=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

+7 -10

pkgs/servers/keycloak/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "keycloak";

     

       16
       16
       -
         version = "18.0.0";

     

       16
       16
       +
         version = "19.0.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchzip {

     

       19
       19
        
           url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";

     

       20
       20
       -
           sha256 = "0fxf9m50hpjplj077z2zjp0qibixz5y4lbc8159cnxbd4gzpkaaf";

     

       20
       20
       +
           sha256 = "sha256-3hqnFH0zWvgOgpQHV4eMqTGzUWEoRwxvOcOUL2s8YQk=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ makeWrapper jre ];

     
···

       28
       28
        
           install -m 0600 ${confFile} conf/keycloak.conf

     

       29
       29
        
         '' + ''

     

       30
       30
        
           install_plugin() {

     

       31
       31
       -
           if [ -d "$1" ]; then

     

       32
       32
       -
             find "$1" -type f \( -iname \*.ear -o -iname \*.jar \) -exec install -m 0500 "{}" "providers/" \;

     

       33
       33
       -
           else

     

       34
       34
       -
             install -m 0500 "$1" "providers/"

     

       35
       35
       -
           fi

     

       31
       31
       +
             if [ -d "$1" ]; then

     

       32
       32
       +
               find "$1" -type f \( -iname \*.ear -o -iname \*.jar \) -exec install -m 0500 "{}" "providers/" \;

     

       33
       33
       +
             else

     

       34
       34
       +
               install -m 0500 "$1" "providers/"

     

       35
       35
       +
             fi

     

       36
       36
        
           }

     

       37
       37
        
           ${lib.concatMapStringsSep "\n" (pl: "install_plugin ${lib.escapeShellArg pl}") plugins}

     

       38
       38
        
         '' + ''

     

       39
       39
       -
           export KC_HOME_DIR=$out

     

       40
       40
       -
           export KC_CONF_DIR=$out/conf

     

       41
       41
       -
       

     

       42
       39
        
           patchShebangs bin/kc.sh

     

       43
       40
        
           bin/kc.sh build

     

       44
       41

+3 -2

pkgs/servers/matrix-synapse/default.nix

···

       11
       11
        
       with python3.pkgs;

     

       12
       12
        
       buildPythonApplication rec {

     

       13
       13
        
         pname = "matrix-synapse";

     

       14
       14
       -
         version = "1.65.0";

     

       14
       14
       +
         version = "1.66.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "sha256-Kn5o6RKR3mMHvACPiMvIGKmjkAwdjcw6EY6MJXKKeAE=";

     

       18
       18
       +
           sha256 = "sha256-jrjNl3NlJ9sWNNM/VYrASPnVZ/U9fn1N1P6Yqd+MQ08=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [ openssl ];

     
···

       40
       40
        
           psutil

     

       41
       41
        
           psycopg2

     

       42
       42
        
           pyasn1

     

       43
       43
       +
           pydantic

     

       43
       44
        
           pyjwt

     

       44
       45
        
           pymacaroons

     

       45
       46
        
           pynacl

+3 -3

pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "gitlab-ci-pipelines-exporter";

     

       5
       5
       -
         version = "0.5.3";

     

       5
       5
       +
         version = "0.5.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "mvisonneau";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "1i0ry93w2pk8m7i4fbdn1xvsmvjn83d6lr6l7yywid9d0kmkjz13";

     

       11
       11
       +
           sha256 = "sha256-sVXLcz//1RLYOmKtH6u4tCPS8oqV0vOkmQLpWNBiUQY=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         subPackages = [ "cmd/${pname}" ];

     
···

       17
       17
        
           "-X main.version=v${version}"

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
       -
         vendorSha256 = "UszZaxql5sO4DSDVD/UIjeeDojCQEPF+ATL7O9MaTG8=";

     

       20
       20
       +
         vendorSha256 = "sha256-uyjj0Yh/bIvWvh76TEasgjJg9Dgj/GHgn3BOsO2peT0=";

     

       21
       21
        
         doCheck = true;

     

       22
       22
        
       

     

       23
       23
        
         meta = with lib; {

+19 -4

pkgs/servers/monitoring/prometheus/sql-exporter.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitHub, nixosTests }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, go, prometheus-sql-exporter, testers }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "sql_exporter";

     

       5
       5
       -
         version = "0.4.4";

     

       6
       6
       -
       

     

       7
       7
       -
         vendorSha256 = null;

     

       5
       5
       +
         version = "0.4.5";

     

       8
       6
        
       

     

       9
       7
        
         src = fetchFromGitHub {

     

       10
       8
        
           owner = "justwatchcom";

     

       11
       9
        
           repo = pname;

     

       12
       10
        
           rev = "v${version}";

     

       13
       11
        
           sha256 = "sha256-A3hMSnfxiEgFYueARuldEHT/5ROCIwWjqQj2FdkVYqo=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         vendorSha256 = null;

     

       15
       15
       +
       

     

       16
       16
       +
         ldflags = let t = "github.com/prometheus/common/version"; in

     

       17
       17
       +
           [

     

       18
       18
       +
             "-X ${t}.Version=${version}"

     

       19
       19
       +
             "-X ${t}.Revision=${src.rev}"

     

       20
       20
       +
             "-X ${t}.Branch=unknown"

     

       21
       21
       +
             "-X ${t}.BuildUser=nix@nixpkgs"

     

       22
       22
       +
             "-X ${t}.BuildDate=unknown"

     

       23
       23
       +
             "-X ${t}.GoVersion=${lib.getVersion go}"

     

       24
       24
       +
           ];

     

       25
       25
       +
       

     

       26
       26
       +
         passthru.tests.version = testers.testVersion {

     

       27
       27
       +
           package = prometheus-sql-exporter;

     

       28
       28
       +
           command = "sql_exporter -version";

     

       14
       29
        
         };

     

       15
       30
        
       

     

       16
       31
        
         meta = with lib; {

+3 -3

pkgs/tools/misc/czkawka/default.nix

···

       17
       17
        
       

     

       18
       18
        
       rustPlatform.buildRustPackage rec {

     

       19
       19
        
         pname = "czkawka";

     

       20
       20
       -
         version = "5.0.1";

     

       20
       20
       +
         version = "5.0.2";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "qarmin";

     

       24
       24
        
           repo = "czkawka";

     

       25
       25
        
           rev = version;

     

       26
       26
       -
           sha256 = "sha256-ochHohwCOKCF9kiiMxMIaJXaHUWNbq7pIh+VNRKQlcg=";

     

       26
       26
       +
           sha256 = "sha256-+Z4R6eRYNU0/wmrrTCLabY1zgxGbdSkgrfJd8rI5fZo=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         cargoSha256 = "sha256-ap8OpaLs1jZtEHbXVZyaGj3gvblWtyHmYrHiHvZKhfs=";

     

       29
       29
       +
         cargoSha256 = "sha256-hkqGOl6ew3GBMPem8bPRy0PYphHhXJVv6iQiH6lK0kE=";

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

     

       32
       32
        
           pkg-config

+2 -2

pkgs/tools/misc/goreleaser/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "goreleaser";

     

       5
       5
       -
         version = "1.11.1";

     

       5
       5
       +
         version = "1.11.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "goreleaser";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-3kaoBmq/GXZMSlShgI/ykxnOMn9DrdNAFuUcCGItZW4=";

     

       11
       11
       +
           sha256 = "sha256-Qe2Q7cFu9G0Zj/mHTnxSq57OpeNMX3yZQp8VApVtZDc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-7xySEPmc24yOwUerGoARsKaGIYnIvaJFjcwNvbHG4Ls=";

+39

pkgs/tools/misc/manga-cli/default.nix

···

       1
       1
       +
       { stdenvNoCC

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , makeWrapper

     

       5
       5
       +
       , img2pdf

     

       6
       6
       +
       , zathura

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       stdenvNoCC.mkDerivation {

     

       10
       10
       +
         pname = "manga-cli";

     

       11
       11
       +
         version = "unstable-2022-04-11";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "7USTIN";

     

       15
       15
       +
           repo = "manga-cli";

     

       16
       16
       +
           rev = "a69fe935341eaf96618a6b2064d4dcb36c8690b5";

     

       17
       17
       +
           sha256 = "sha256-AnpOEgOBt2a9jtPNvfBnETGtc5Q1WBmSRFDvQB7uBE4=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
       

     

       22
       22
       +
         installPhase = ''

     

       23
       23
       +
           runHook preInstall

     

       24
       24
       +
       

     

       25
       25
       +
           install -Dm755 manga-cli $out/bin/manga-cli

     

       26
       26
       +
       

     

       27
       27
       +
           wrapProgram $out/bin/manga-cli \

     

       28
       28
       +
             --prefix PATH : ${lib.makeBinPath [ img2pdf zathura ]}

     

       29
       29
       +
       

     

       30
       30
       +
           runHook postInstall

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           homepage = "https://github.com/7USTIN/manga-cli";

     

       35
       35
       +
           description = "Bash script for reading mangas via the terminal by scraping manganato";

     

       36
       36
       +
           license = licenses.gpl3Only;

     

       37
       37
       +
           maintainers = with maintainers; [ baitinq ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+22

pkgs/tools/misc/pandoc-katex/default.nix

···

       1
       1
       +
       { lib, fetchFromGitHub, rustPlatform }:

     

       2
       2
       +
       

     

       3
       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       4
       +
         pname = "pandoc-katex";

     

       5
       5
       +
         version = "0.1.9";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "xu-cheng";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           hash = "sha256-Sd+f1a3Y4XwSj5BupAH35UK6gQxzLy5jJCtc77R9wnM=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         cargoSha256 = "sha256-PVEQTzkkD6V9DqcIHznfnO1wOARSxutLApaO9dlokTQ=";

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with lib; {

     

       17
       17
       +
           description = "Pandoc filter to render math equations using KaTeX";

     

       18
       18
       +
           homepage = "https://github.com/xu-cheng/pandoc-katex";

     

       19
       19
       +
           license = with licenses; [ asl20 /* or */ mit ];

     

       20
       20
       +
           maintainers = with maintainers; [ minijackson pacien ];

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+6

pkgs/top-level/all-packages.nix

···

       9208
       9208
        
       

     

       9209
       9209
        
         pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { };

     

       9210
       9210
        
       

     

       9211
       9211
       +
         pandoc-katex = callPackage ../tools/misc/pandoc-katex { };

     

       9212
       9212
       +
       

     

       9211
       9213
        
         pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { };

     

       9212
       9214
        
       

     

       9213
       9215
        
         # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality

     
···

       11884
       11886
        
         vcstool = callPackage ../development/tools/vcstool { };

     

       11885
       11887
        
       

     

       11886
       11888
        
         verco = callPackage ../applications/version-management/verco { };

     

       11889
       11889
       +
       

     

       11890
       11890
       +
         verible = callPackage ../development/tools/verible { };

     

       11887
       11891
        
       

     

       11888
       11892
        
         verilator = callPackage ../applications/science/electronics/verilator {};

     

       11889
       11893
        
       

     
···

       28140
       28144
        
         hacksaw = callPackage ../tools/misc/hacksaw {};

     

       28141
       28145
        
       

     

       28142
       28146
        
         hakuneko = callPackage ../tools/misc/hakuneko { };

     

       28147
       28147
       +
       

     

       28148
       28148
       +
         manga-cli = callPackage ../tools/misc/manga-cli { };

     

       28143
       28149
        
       

     

       28144
       28150
        
         hamster = callPackage ../applications/misc/hamster { };

     

       28145
       28151

+2

pkgs/top-level/python-packages.nix

···

       3787
       3787
        
       

     

       3788
       3788
        
         google-cloud-bigtable = callPackage ../development/python-modules/google-cloud-bigtable { };

     

       3789
       3789
        
       

     

       3790
       3790
       +
         google-cloud-compute = callPackage ../development/python-modules/google-cloud-compute { };

     

       3791
       3791
       +
       

     

       3790
       3792
        
         google-cloud-container = callPackage ../development/python-modules/google-cloud-container { };

     

       3791
       3793
        
       

     

       3792
       3794
        
         google-cloud-core = callPackage ../development/python-modules/google-cloud-core { };