commit 2c6ca9ac8acc3fdc99fb22d7152da09c6e321cc0 · pyrox.dev/nixpkgs

+1 -1

.github/workflows/pending-set.yml

···

       16
       16
        
                 -X POST \

     

       17
       17
        
                 -H "Accept: application/vnd.github.v3+json" \

     

       18
       18
        
                 -H "Authorization: token $GITHUB_TOKEN" \

     

       19
       19
       -
                 -d '{"state": "failure", "target_url": " ", "description": "This failed status will be cleared when ofborg finishes eval.", "context": "Wait for ofborg"}' \

     

       19
       19
       +
                 -d '{"state": "pending", "target_url": " ", "description": "This pending status will be cleared when ofborg starts eval.", "context": "Wait for ofborg"}' \

     

       20
       20
        
                 "https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.pull_request.head.sha }}"

+6

maintainers/maintainer-list.nix

···

       3473
       3473
        
             fingerprint = "7FC7 98AB 390E 1646 ED4D  8F1F 797F 6238 68CD 00C2";

     

       3474
       3474
        
           }];

     

       3475
       3475
        
         };

     

       3476
       3476
       +
         greizgh = {

     

       3477
       3477
       +
           email = "greizgh@ephax.org";

     

       3478
       3478
       +
           github = "greizgh";

     

       3479
       3479
       +
           githubId = 1313624;

     

       3480
       3480
       +
           name = "greizgh";

     

       3481
       3481
       +
         };

     

       3476
       3482
        
         greydot = {

     

       3477
       3483
        
           email = "lanablack@amok.cc";

     

       3478
       3484
        
           github = "greydot";

+2

nixos/modules/services/continuous-integration/gocd-agent/default.nix

···

       90
       90
        
             };

     

       91
       91
        
       

     

       92
       92
        
             startupOptions = mkOption {

     

       93
       93
       +
               type = types.listOf types.str;

     

       93
       94
        
               default = [

     

       94
       95
        
                 "-Xms${cfg.initialJavaHeapSize}"

     

       95
       96
        
                 "-Xmx${cfg.maxJavaHeapMemory}"

     
···

       105
       106
        
       

     

       106
       107
        
             extraOptions = mkOption {

     

       107
       108
        
               default = [ ];

     

       109
       109
       +
               type = types.listOf types.str;

     

       108
       110
        
               example = [

     

       109
       111
        
                 "-X debug"

     

       110
       112
        
                 "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006"

+3

nixos/modules/services/continuous-integration/gocd-server/default.nix

···

       27
       27
        
       

     

       28
       28
        
             extraGroups = mkOption {

     

       29
       29
        
               default = [ ];

     

       30
       30
       +
               type = types.listOf types.str;

     

       30
       31
        
               example = [ "wheel" "docker" ];

     

       31
       32
        
               description = ''

     

       32
       33
        
                 List of extra groups that the "gocd-server" user should be a part of.

     
···

       92
       93
        
             };

     

       93
       94
        
       

     

       94
       95
        
             startupOptions = mkOption {

     

       96
       96
       +
               type = types.listOf types.str;

     

       95
       97
        
               default = [

     

       96
       98
        
                 "-Xms${cfg.initialJavaHeapSize}"

     

       97
       99
        
                 "-Xmx${cfg.maxJavaHeapMemory}"

     
···

       113
       115
        
       

     

       114
       116
        
             extraOptions = mkOption {

     

       115
       117
        
               default = [ ];

     

       118
       118
       +
               type = types.listOf types.str;

     

       116
       119
        
               example = [

     

       117
       120
        
                 "-X debug"

     

       118
       121
        
                 "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"

+28 -13

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

···

       6
       6
        
         cfg = config.services.nextcloud;

     

       7
       7
        
         fpm = config.services.phpfpm.pools.nextcloud;

     

       8
       8
        
       

     

       9
       9
       -
         phpPackage =

     

       10
       10
       -
           let

     

       11
       11
       -
             base = pkgs.php74;

     

       12
       12
       -
           in

     

       13
       13
       -
             base.buildEnv {

     

       14
       14
       -
               extensions = { enabled, all }: with all;

     

       15
       15
       -
                 enabled ++ [

     

       16
       16
       -
                   apcu redis memcached imagick

     

       17
       17
       -
                 ];

     

       18
       18
       -
               extraConfig = phpOptionsStr;

     

       19
       19
       -
             };

     

       9
       9
       +
         phpPackage = pkgs.php74.buildEnv {

     

       10
       10
       +
           extensions = { enabled, all }:

     

       11
       11
       +
             (with all;

     

       12
       12
       +
               enabled

     

       13
       13
       +
               ++ [ imagick ] # Always enabled

     

       14
       14
       +
               # Optionally enabled depending on caching settings

     

       15
       15
       +
               ++ optional cfg.caching.apcu apcu

     

       16
       16
       +
               ++ optional cfg.caching.redis redis

     

       17
       17
       +
               ++ optional cfg.caching.memcached memcached

     

       18
       18
       +
             )

     

       19
       19
       +
             ++ cfg.phpExtraExtensions all; # Enabled by user

     

       20
       20
       +
           extraConfig = toKeyValue phpOptions;

     

       21
       21
       +
         };

     

       20
       22
        
       

     

       21
       23
        
         toKeyValue = generators.toKeyValue {

     

       22
       24
        
           mkKeyValue = generators.mkKeyValueDefault {} " = ";

     
···

       27
       29
        
           post_max_size = cfg.maxUploadSize;

     

       28
       30
        
           memory_limit = cfg.maxUploadSize;

     

       29
       31
        
         } // cfg.phpOptions;

     

       30
       30
       -
         phpOptionsStr = toKeyValue phpOptions;

     

       31
       32
        
       

     

       32
       33
        
         occ = pkgs.writeScriptBin "nextcloud-occ" ''

     

       33
       34
        
           #! ${pkgs.runtimeShell}

     
···

       113
       114
        
             description = ''

     

       114
       115
        
               Enable this option if you plan on using the webfinger plugin.

     

       115
       116
        
               The appropriate nginx rewrite rules will be added to your configuration.

     

       117
       117
       +
             '';

     

       118
       118
       +
           };

     

       119
       119
       +
       

     

       120
       120
       +
           phpExtraExtensions = mkOption {

     

       121
       121
       +
             type = with types; functionTo (listOf package);

     

       122
       122
       +
             default = all: [];

     

       123
       123
       +
             defaultText = "all: []";

     

       124
       124
       +
             description = ''

     

       125
       125
       +
               Additional PHP extensions to use for nextcloud.

     

       126
       126
       +
               By default, only extensions necessary for a vanilla nextcloud installation are enabled,

     

       127
       127
       +
               but you may choose from the list of available extensions and add further ones.

     

       128
       128
       +
               This is sometimes necessary to be able to install a certain nextcloud app that has additional requirements.

     

       129
       129
       +
             '';

     

       130
       130
       +
             example = literalExample ''

     

       131
       131
       +
               all: [ all.pdlib all.bz2 ]

     

       116
       132
        
             '';

     

       117
       133
        
           };

     

       118
       134
        
       

     
···

       511
       527
        
               pools.nextcloud = {

     

       512
       528
        
                 user = "nextcloud";

     

       513
       529
        
                 group = "nextcloud";

     

       514
       514
       -
                 phpOptions = phpOptionsStr;

     

       515
       530
        
                 phpPackage = phpPackage;

     

       516
       531
        
                 phpEnv = {

     

       517
       532
        
                   NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";

+11

nixos/modules/services/web-apps/nextcloud.xml

···

       182
       182
        
         </para>

     

       183
       183
        
        </section>

     

       184
       184
        
       

     

       185
       185
       +
        <section xml:id="installing-apps-php-extensions-nextcloud">

     

       186
       186
       +
         <title>Installing Apps and PHP extensions</title>

     

       187
       187
       +
       

     

       188
       188
       +
         <para>

     

       189
       189
       +
          Nextcloud apps are installed statefully through the web interface.

     

       190
       190
       +
       

     

       191
       191
       +
          Some apps may require extra PHP extensions to be installed.

     

       192
       192
       +
          This can be configured with the <xref linkend="opt-services.nextcloud.phpExtraExtensions" /> setting.

     

       193
       193
       +
         </para>

     

       194
       194
       +
        </section>

     

       195
       195
       +
       

     

       185
       196
        
        <section xml:id="module-services-nextcloud-maintainer-info">

     

       186
       197
        
         <title>Maintainer information</title>

     

       187
       198

+1

nixos/tests/nextcloud/basic.nix

···

       42
       42
        
                 enable = true;

     

       43
       43
        
                 startAt = "20:00";

     

       44
       44
        
               };

     

       45
       45
       +
               phpExtraExtensions = all: [ all.bz2 ];

     

       45
       46
        
             };

     

       46
       47
        
       

     

       47
       48
        
             environment.systemPackages = [ cfg.services.nextcloud.occ ];

+2 -2

pkgs/applications/misc/koreader/default.nix

···

       11
       11
        
       let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };

     

       12
       12
        
       in stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "koreader";

     

       14
       14
       -
         version = "2021.01";

     

       14
       14
       +
         version = "2021.01.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url =

     

       18
       18
        
             "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";

     

       19
       19
       -
           sha256 = "0cc7pk27wlvziihggzlrb3wsjmndafa13cy1snqr5x71bb81fv6r";

     

       19
       19
       +
           sha256 = "0kignyia2xrg84bqzsp8rid4c79zg11lhw52z1854jw9v9324pja";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         sourceRoot = ".";

+2 -2

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

···

       1
       1
        
       { lib, buildGoPackage, fetchFromGitHub, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "0.16.0"; in

     

       3
       3
       +
       let version = "0.17.0"; in

     

       4
       4
        
       

     

       5
       5
        
       buildGoPackage {

     

       6
       6
        
         pname = "kubecfg";

     
···

       10
       10
        
           owner = "bitnami";

     

       11
       11
        
           repo = "kubecfg";

     

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

     

       13
       13
       -
           sha256 = "1ipw7r9fyqbh1bjvk7ifmj3skh799ly90y4ph37r8mqk1wb92rz4";

     

       13
       13
       +
           sha256 = "sha256-/91im204vBS3NjrMOvwTVO6tEBgdpirqJFqCnbIB+iQ=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         goPackagePath = "github.com/bitnami/kubecfg";

+3 -3

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

···

       11
       11
        
       

     

       12
       12
        
       buildGoModule rec {

     

       13
       13
        
         pname = "minikube";

     

       14
       14
       -
         version = "1.17.0";

     

       14
       14
       +
         version = "1.17.1";

     

       15
       15
        
       

     

       16
       16
       -
         vendorSha256 = "sha256-cA0sgH00XawwaOAGCDbabmBE/+5Y87kThXgPe5zwlro=";

     

       16
       16
       +
         vendorSha256 = "1flny2f7n3vqhl9vkwsqxvzl8q3fv8v0h1p0d0qaqp9lgn02q3bh";

     

       17
       17
        
       

     

       18
       18
        
         doCheck = false;

     

       19
       19
        
       

     
···

       21
       21
        
           owner = "kubernetes";

     

       22
       22
        
           repo = "minikube";

     

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

     

       24
       24
       -
           sha256 = "sha256-IQ/AAr5b8ZOaQKkSrU8JsPxjqAwVmT4Kt3hf3e1dMeA=";

     

       24
       24
       +
           sha256 = "1m4kw77j4swwg3vqwmwrys7cq790w4g6y4gvdg33z9n1y9xzqys3";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];

+3 -3

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       342
       342
        
           "owner": "gitlabhq",

     

       343
       343
        
           "provider-source-address": "registry.terraform.io/gitlabhq/gitlab",

     

       344
       344
        
           "repo": "terraform-provider-gitlab",

     

       345
       345
       -
           "rev": "v3.1.0",

     

       346
       346
       -
           "sha256": "1an34ckz7lz1k25lkjpbmls55zp9pacr46vjnjjpqx6bx5s95f5g",

     

       347
       347
       -
           "version": "3.1.0"

     

       345
       345
       +
           "rev": "v3.4.0",

     

       346
       346
       +
           "sha256": "03k3xjhxw70n00dvwd0fkdshff9hnicrah6rm6zqmksb4mb7wji3",

     

       347
       347
       +
           "version": "3.4.0"

     

       348
       348
        
         },

     

       349
       349
        
         "google": {

     

       350
       350
        
           "owner": "hashicorp",

+3 -5

pkgs/development/compilers/flutter/default.nix

···

       1
       1
        
       { callPackage, fetchurl, dart }:

     

       2
       2
       -
       

     

       3
       2
        
       let

     

       4
       3
        
         mkFlutter = opts: callPackage (import ./flutter.nix opts) { };

     

       5
       4
        
         getPatches = dir:

     

       6
       5
        
           let files = builtins.attrNames (builtins.readDir dir);

     

       7
       6
        
           in map (f: dir + ("/" + f)) files;

     

       8
       8
       -
         version = "1.22.5";

     

       7
       7
       +
         version = "1.22.4";

     

       9
       8
        
         channel = "stable";

     

       10
       9
        
         filename = "flutter_linux_${version}-${channel}.tar.xz";

     

       11
       10
        
       in

     
···

       14
       13
        
         stable = mkFlutter rec {

     

       15
       14
        
           inherit dart version;

     

       16
       15
        
           pname = "flutter";

     

       17
       17
       -
           patches = getPatches ./patches;

     

       18
       16
        
           src = fetchurl {

     

       19
       17
        
             url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}";

     

       20
       20
       -
             sha256 = "1dv5kczcj9npf7xxlanmpc9ijnxa3ap46521cxn14c0i3y9295ja";

     

       18
       18
       +
             sha256 = "0qalgav9drqddcj8lfvl9ddf3325n953pvkmgha47lslg9sa88zw";

     

       21
       19
        
           };

     

       22
       22
       -
           depsSha256 = "0d7vhk6axgqajy2d9ia9lc6awcnz6cc3n04r7hnh7bx4hb0jv0l1";

     

       20
       20
       +
           patches = getPatches ./patches;

     

       23
       21
        
         };

     

       24
       22
        
       }

+9 -11

pkgs/development/compilers/flutter/flutter.nix

···

       3
       3
        
       , patches

     

       4
       4
        
       , dart

     

       5
       5
        
       , src

     

       6
       6
       -
       , depsSha256

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       { bash

     
···

       30
       29
        
       , nspr

     

       31
       30
        
       , nss

     

       32
       31
        
       , systemd

     

       33
       33
       -
       , callPackage

     

       34
       32
        
       }:

     

       35
       33
        
       let

     

       36
       36
       -
         repository = callPackage ./repository.nix {

     

       37
       37
       -
           inherit src pname version dart depsSha256;

     

       38
       38
       -
         };

     

       39
       34
        
         drvName = "flutter-${version}";

     

       40
       40
       -
       

     

       41
       35
        
         flutter = stdenv.mkDerivation {

     

       42
       36
        
           name = "${drvName}-unwrapped";

     

       43
       37
        
       

     

       44
       44
       -
           buildInputs = [ git repository ];

     

       38
       38
       +
           buildInputs = [ git ];

     

       45
       39
        
       

     

       46
       40
        
           inherit src patches;

     

       47
       41
        
       

     
···

       55
       49
        
             export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"

     

       56
       50
        
             export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"

     

       57
       51
        
       

     

       58
       58
       -
             mkdir -p "$out/bin/cache"

     

       59
       59
       -
             export SNAPSHOT_PATH="$out/bin/cache/flutter_tools.snapshot"

     

       60
       60
       -
             export STAMP_PATH="$out/bin/cache/flutter_tools.stamp"

     

       52
       52
       +
             export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"

     

       53
       53
       +
             export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"

     

       61
       54
        
       

     

       62
       55
        
             export DART_SDK_PATH="${dart}"

     

       63
       63
       -
             export PUB_CACHE="${repository}"

     

       56
       56
       +
       

     

       57
       57
       +
             HOME=../.. # required for pub upgrade --offline, ~/.pub-cache

     

       58
       58
       +
                        # path is relative otherwise it's replaced by /build/flutter

     

       64
       59
        
       

     

       65
       60
        
             pushd "$FLUTTER_TOOLS_DIR"

     

       66
       61
        
             ${dart}/bin/pub get --offline

     
···

       70
       65
        
             ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"

     

       71
       66
        
             echo "$revision" > "$STAMP_PATH"

     

       72
       67
        
             echo -n "${version}" > version

     

       68
       68
       +
       

     

       69
       69
       +
             rm -r bin/cache/{artifacts,dart-sdk,downloads}

     

       70
       70
       +
             rm bin/cache/*.stamp

     

       73
       71
        
           '';

     

       74
       72
        
       

     

       75
       73
        
           installPhase = ''

-24

pkgs/development/compilers/flutter/repository.nix

···

       1
       1
       -
       { lib, stdenv, dart, fetchurl, src, pname, version, depsSha256 }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       4
       4
       -
         inherit src version;

     

       5
       5
       -
       

     

       6
       6
       -
         pname = "${pname}-deps";

     

       7
       7
       -
         buildInputs = [ dart ];

     

       8
       8
       -
       

     

       9
       9
       -
         buildPhase = ''

     

       10
       10
       -
           export PUB_CACHE="$out"

     

       11
       11
       -
           export FLUTTER_ROOT="$(pwd)"

     

       12
       12
       -
           export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"

     

       13
       13
       -
       

     

       14
       14
       -
           pushd "$FLUTTER_TOOLS_DIR"

     

       15
       15
       -
           ${dart}/bin/pub get

     

       16
       16
       -
         '';

     

       17
       17
       -
       

     

       18
       18
       -
         dontInstall = true;

     

       19
       19
       -
         dontFixup = true;

     

       20
       20
       -
       

     

       21
       21
       -
         outputHashAlgo = "sha256";

     

       22
       22
       -
         outputHashMode = "recursive";

     

       23
       23
       -
         outputHash = depsSha256;

     

       24
       24
       -
       }

+11

pkgs/development/libraries/libgcrypt/1.5.nix

···

       38
       38
        
           license = licenses.lgpl2Plus;

     

       39
       39
        
           platforms = platforms.all;

     

       40
       40
        
           repositories.git = "git://git.gnupg.org/libgcrypt.git";

     

       41
       41
       +
           knownVulnerabilities = [

     

       42
       42
       +
             "CVE-2014-3591"

     

       43
       43
       +
             "CVE-2015-0837"

     

       44
       44
       +
             "CVE-2015-7511"

     

       45
       45
       +
             "CVE-2017-0379"

     

       46
       46
       +
             "CVE-2017-7526"

     

       47
       47
       +
             "CVE-2017-9526"

     

       48
       48
       +
             "CVE-2018-0495"

     

       49
       49
       +
             "CVE-2018-6829"

     

       50
       50
       +
             "CVE-2018-12437"

     

       51
       51
       +
           ];

     

       41
       52
        
         };

     

       42
       53
        
       }

+2 -2

pkgs/development/tools/flyway/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, jre_headless, makeWrapper }:

     

       2
       2
        
         let

     

       3
       3
       -
           version = "7.3.1";

     

       3
       3
       +
           version = "7.5.2";

     

       4
       4
        
         in

     

       5
       5
        
           stdenv.mkDerivation {

     

       6
       6
        
             pname = "flyway";

     

       7
       7
        
             inherit version;

     

       8
       8
        
             src = fetchurl {

     

       9
       9
        
               url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";

     

       10
       10
       -
               sha256 = "1qridl42jldwv6wka7l54g354aj9f3vbgzhyz5gdz5vdzs9x93w8";

     

       10
       10
       +
               sha256 = "sha256-oO7k6JOKUm11OYNN+tH/zqF9ucgrsnF4PcphT8+xnS8=";

     

       11
       11
        
             };

     

       12
       12
        
             nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
             dontBuild = true;

+29

pkgs/development/tools/rust/sqlx-cli/default.nix

···

       1
       1
       +
       { lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:

     

       2
       2
       +
       

     

       3
       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       4
       +
         pname = "sqlx-cli";

     

       5
       5
       +
         version = "0.4.2";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "launchbadge";

     

       9
       9
       +
           repo = "sqlx";

     

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

     

       11
       11
       +
           sha256 = "1q6p4qly9qjn333nj72sar6nbyclfdw9i9l6rnimswylj0rr9n27";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         cargoSha256 = "1393mwx6iccnqrry4ia4prcnnjxhp4zjq1s3gzwzfyzsrqyad54g";

     

       15
       15
       +
       

     

       16
       16
       +
         doCheck = false;

     

       17
       17
       +
         cargoBuildFlags = [ "-p sqlx-cli" ];

     

       18
       18
       +
       

     

       19
       19
       +
         nativeBuildInputs = [ pkg-config ];

     

       20
       20
       +
         buildInputs = [ openssl ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description =

     

       24
       24
       +
             "SQLx's associated command-line utility for managing databases, migrations, and enabling offline mode with sqlx::query!() and friends.";

     

       25
       25
       +
           homepage = "https://github.com/launchbadge/sqlx";

     

       26
       26
       +
           license = licenses.asl20;

     

       27
       27
       +
           maintainers = with maintainers; [ greizgh ];

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+3 -3

pkgs/servers/keycloak/default.nix

···

       18
       18
        
       in

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname   = "keycloak";

     

       21
       21
       -
         version = "11.0.3";

     

       21
       21
       +
         version = "12.0.2";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchzip {

     

       24
       24
       -
           url    = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip";

     

       25
       25
       -
           sha256 = "15fw49rhnjky108hh71dkdlafd0ajr1n13vhivqcw6c18zvyan35";

     

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

     

       25
       25
       +
           sha256 = "006k6ac00iz61s6hi3wzj6w71mhhv7n00vh82ak4yhwr97jffqbz";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/tools/text/shfmt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "shfmt";

     

       5
       5
       -
         version = "3.2.1";

     

       5
       5
       +
         version = "3.2.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "mvdan";

     

       9
       9
        
           repo = "sh";

     

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

     

       11
       11
       -
           sha256 = "1kp4ib0a64cc9qylny48ff5q9ciklzx93yhv7fgqhl1v2c7fm1jp";

     

       11
       11
       +
           sha256 = "sha256-ZeyHidw8iHboo/LHTR9E3Sqj8euaRvDaYbPQMdecsrk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29";

+2

pkgs/top-level/all-packages.nix

···

       10839
       10839
        
           jdk = oraclejdk;

     

       10840
       10840
        
         };

     

       10841
       10841
        
       

     

       10842
       10842
       +
         sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { };

     

       10843
       10843
       +
       

     

       10842
       10844
        
         squeak = callPackage ../development/compilers/squeak { };

     

       10843
       10845
        
       

     

       10844
       10846
        
         squirrel-sql = callPackage ../development/tools/database/squirrel-sql {

+3

pkgs/top-level/release-cross.nix

···

       150
       150
        
       

     

       151
       151
        
         x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon;

     

       152
       152
        
       

     

       153
       153
       +
         ppc64le = mapTestOnCross lib.systems.examples.powernv linuxCommon;

     

       154
       154
       +
         ppc64le-musl = mapTestOnCross lib.systems.examples.musl-power linuxCommon;

     

       155
       155
       +
       

     

       153
       156
        
         android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt linuxCommon;

     

       154
       157
        
         android32 = mapTestOnCross lib.systems.examples.armv7a-android-prebuilt linuxCommon;

     

       155
       158