JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-09-05 12:01:11 +00:00 committed by GitHub
commit c7aba64ba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
67 changed files with 807 additions and 655 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@ -94,6 +94,8 @@
- `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides
- `gitlab` installations created or updated between versions \[15.11.0, 15.11.2] have an incorrect database schema. This will become a problem when upgrading to `gitlab` >=16.2.0. A workaround for affected users can be found in the [GitLab docs](https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#undefined-column-error-upgrading-to-162-or-later).
- `consul` has been updated to `1.16.0`. See the [release note](https://github.com/hashicorp/consul/releases/tag/v1.16.0) for more details. Once a new Consul version has started and upgraded its data directory, it generally cannot be downgraded to the previous version.
- `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details.

2
nixos/modules/services/misc/atuin.nix
View File

@ -6,7 +6,7 @@ in
{
options = {
services.atuin = {
enable = lib.mkEnableOption (mdDoc "Enable server for shell history sync with atuin");
enable = lib.mkEnableOption (mdDoc "Atuin server for shell history sync");
openRegistration = mkOption {
type = types.bool;

7
nixos/modules/services/misc/gitlab.nix
View File

@ -1088,6 +1088,11 @@ in {
''Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.
Please back up your data and migrate to the gitlab-container-registry package.''
)
(mkIf
(versionAtLeast (getVersion cfg.packages.gitlab) "16.2.0" && versionOlder (getVersion cfg.packages.gitlab) "16.5.0")
''GitLab instances created or updated between versions [15.11.0, 15.11.2] have an incorrect database schema.
Check the upstream documentation for a workaround: https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#undefined-column-error-upgrading-to-162-or-later''
)
];
assertions = [
@ -1655,7 +1660,7 @@ in {
Restart = "on-failure";
WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
ExecStart = concatStringsSep " " [
"${cfg.packages.gitlab.rubyEnv}/bin/puma"
"${cfg.packages.gitlab.rubyEnv}/bin/bundle" "exec" "puma"
"-e production"
"-C ${cfg.statePath}/config/puma.rb"
"-w ${cfg.puma.workers}"

4
pkgs/applications/audio/ocenaudio/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
version = "3.12.5";
version = "3.12.6";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "sha256-+edswdSwuEiGpSNP7FW6xvZy/rH53KcSSGAFXSb0DIM=";
sha256 = "sha256-kQR0FaZbcdKf1yKHwTA525qzyFldSESQq6NRSZipUQw=";
};
nativeBuildInputs = [

4
pkgs/applications/audio/praat/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "praat";
version = "6.3.15";
version = "6.3.16";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${finalAttrs.version}";
hash = "sha256-Lo0aJ3BbFkZxAJZyOTzso9esYnkTkeKAFNUi7Q2d/hI=";
hash = "sha256-0g16EblefuUU99RgcwtGrPWniGGlOt6GjVjyNdzN3GY=";
};
nativeBuildInputs = [

6
pkgs/applications/blockchains/optimism/geth.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "op-geth";
version = "1.101106.0";
version = "1.101200.0";
src = fetchFromGitHub {
owner = "ethereum-optimism";
repo = "op-geth";
rev = "v${version}";
hash = "sha256-hLng9DMzRN43m0+GAc6Bn0c9heuekghn4ZdDKgQcSKY=";
hash = "sha256-KUq2BSl+9FU7xX0BLWlOEolIgx0VFDXBK6o1YIo9QDQ=";
fetchSubmodules = true;
};
@ -33,7 +33,7 @@ buildGoModule rec {
"cmd/utils"
];
vendorHash = "sha256-bGEvBXG6q9m5go+4mAlOu424ReTbfwVhkohN+FikBMg=";
vendorHash = "sha256-oGMvazo3X9tOmy/o4xUYRlHsQBR0teBj3kF0TlI7mdg=";
# Fix for usb-related segmentation faults on darwin
propagatedBuildInputs =

4
pkgs/applications/editors/ox/default.nix
View File

@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec {
owner = "curlpipe";
repo = pname;
rev = version;
sha256 = "18iffnmvax6mbnhypf7yma98y5q2zlsyp9q18f92fdwz426r33p0";
hash = "sha256-4I6RjSCfNyeSQwGn6zX9AhePkqr+uOuhXdV0tat1LqI=";
};
cargoSha256 = "0m5vglm58myf50vbb7m6gd3srk3n93afg70lz63i2kciqkkwsnjl";
cargoHash = "sha256-VFrN58SRTRGH+RSc59RIdsysR3umnrU2KM5XVCp9u1Q=";
meta = with lib; {
description = "An independent Rust text editor that runs in your terminal";

4
pkgs/applications/editors/sigil/default.nix
View File

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "sigil";
version = "1.9.30";
version = "2.0.1";
src = fetchFromGitHub {
repo = "Sigil";
owner = "Sigil-Ebook";
rev = version;
sha256 = "sha256-07JK3xHpNDs6CU8je8PNyTugNBi2mQ7G109R3JX4eyg=";
sha256 = "sha256-d54N6Kb+xLMxlRwqxqWXnFGQCvUmSy9z6j86aV+VioU=";
};
pythonPath = with python3Packages; [ lxml ];

4
pkgs/applications/misc/birdtray/default.nix
View File

@ -11,13 +11,13 @@
mkDerivation rec {
pname = "birdtray";
version = "1.9.0";
version = "1.11.3";
src = fetchFromGitHub {
owner = "gyunaev";
repo = pname;
rev = "v${version}";
sha256 = "1469ng6zk0qx0qfsihrnlz1j9i1wk0hx4vqdaplz9mdpyxvmlryk";
sha256 = "sha256-3SZf0ZK4AV/kuFttaHnPJuOJ9rn7CqFfv28d8ancPKw=";
};
nativeBuildInputs = [ cmake pkg-config ];

6
pkgs/applications/networking/cluster/kubefirst/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubefirst";
version = "2.2.9";
version = "2.2.17";
src = fetchFromGitHub {
owner = "kubefirst";
repo = pname;
rev = "v${version}";
hash = "sha256-QxIbBxNTVONf4x06nuYhY38+pYDwsT3C6yToq7/dHIk=";
hash = "sha256-cqKnoGRW+IquuZ7wvCRipRJ6mO18w/yhf5nS094vs7c=";
};
vendorHash = "sha256-F+kzj2lBSFawfc8OyPf6V2XVB1418uhv+cv3CHpXUk0=";
vendorHash = "sha256-0J27JSewc0DCcc3xvl2DBZE/b0qKuozuP7tFdbrRX7I=";
ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"];

6
pkgs/applications/networking/protonmail-bridge/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protonmail-bridge";
version = "3.3.2";
version = "3.4.1";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-bridge";
rev = "v${version}";
hash = "sha256-crYxrjfo0fss9uOl7k2C2ZCpbQExxnAX4520k4iPhuo=";
hash = "sha256-EDUjKHqaHZA/jvPBeAAqIJHEt8eTHmg9D5lE5JGAAAU=";
};
vendorHash = "sha256-PgUj7MxGeDA7hYXzN/WWwZrUthkxyQL+MnSx9ZpzHms=";
vendorHash = "sha256-gwRyr4zQLgZqyqxsh0wGABbuGKvZhG/yTfy/CqOiaBA=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -76,13 +76,13 @@ let
in
stdenv.mkDerivation rec {
pname = "freerdp";
version = "2.10.0";
version = "2.11.0";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
sha256 = "sha256-4sq3LblFRWCBREudtzg+o9wjstm58gPzBq7QAwlWvEg=";
sha256 = "sha256-yyJs6J2R2L2YtNKzHFW6X6I1aJTHipBA1+yuT7bR9Zg=";
};
postPatch = ''

4
pkgs/applications/radio/fldigi/default.nix
View File

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "fldigi";
version = "4.1.26";
version = "4.1.27";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-RIrTWjQPnn0I8bzV3kMQEesNaAkIQnhikLMaYivrWRc=";
sha256 = "sha256-siLBJTp+Dvk7GlNYHO8kZlD3St3TvojaW76tkcNNFfA=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/science/geometry/gama/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:
stdenv.mkDerivation rec {
pname = "gama";
version = "2.24";
version = "2.25";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-AIRqBSO71c26TeQwxjfAGIy8YQddF4tq+ZnWztroyRM=";
sha256 = "sha256-1j4fsPQEaftqmrdk6ZPWKSl7ywA/UPN8bdddGVlPxDQ=";
};
buildInputs = [ expat ];

4
pkgs/applications/science/logic/kissat/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "kissat";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "arminbiere";
repo = "kissat";
rev = "rel-${version}";
sha256 = "sha256-C1lvkyYgFNhV7jGVLlrpJ5zZ8SFHg8g+iW1lDczhpBM=";
sha256 = "sha256-AFUVkkD+toOfVEvIKfz3ncEdABLRxs9yQ8aJx6Q0ETM=";
};
outputs = [ "out" "dev" "lib" ];

18
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,15 +1,15 @@
{
"version": "16.1.4",
"repo_hash": "sha256-GVUQBAuLBajKXpZOxaP+QnAVj32XTYDtTfInNFQRRCY=",
"yarn_hash": "0wykn0vq16n8mz4jfh7dfyp9javzhqlfwmc5i1zm07gld91nirlm",
"version": "16.3.1",
"repo_hash": "sha256-E0aa+sUoc8CxQ4ucHOPJL3+A1Al23xWT0TpYSSpZxgc=",
"yarn_hash": "0lks2s0g7x7psdfmcq353z7gjp9lw1wm72hvkvw26fy21yglml6s",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.1.4-ee",
"rev": "v16.3.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.1.4",
"GITLAB_PAGES_VERSION": "16.1.4",
"GITLAB_SHELL_VERSION": "14.23.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.5",
"GITLAB_WORKHORSE_VERSION": "16.1.4"
"GITALY_SERVER_VERSION": "16.3.1",
"GITLAB_PAGES_VERSION": "16.3.1",
"GITLAB_SHELL_VERSION": "14.26.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8",
"GITLAB_WORKHORSE_VERSION": "16.3.1"
}
}

11
pkgs/applications/version-management/gitlab/default.nix
View File

@ -33,15 +33,6 @@ let
buildInputs = [ file ];
buildFlags = [ "--enable-system-libraries" ];
};
# the included yarn rake task attaches the yarn:install task
# to assets:precompile, which is both unnecessary (since we
# run `yarn install` ourselves) and undoes the shebang patches
# in node_modules
railties = x.railties // {
dontBuild = false;
patches = [ ./railties-remove-yarn-install-enhancement.patch ];
patchFlags = [ "-p2" ];
};
};
groups = [
"default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"
@ -50,7 +41,7 @@ let
# `console` executable.
ignoreCollisions = true;
extraConfigPaths = [ "${src}/vendor" ];
extraConfigPaths = [ "${src}/vendor" "${src}/gems" ];
};
assets = stdenv.mkDerivation {

8
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -13,7 +13,7 @@
}:
let
version = "16.1.4";
version = "16.3.1";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -24,10 +24,10 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-BgupN+fhUxhvMvqmrJTpLt1gPTHC3SO3HTb1ezJokYQ=";
sha256 = "sha256-Tc7JsGuTF+JK5SLmaQwVbmdSy/Wvm3VNoZqHTyZFd6k=";
};
vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA=";
vendorSha256 = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
@ -42,7 +42,7 @@ let
auxBins = buildGoModule ({
pname = "gitaly-aux";
subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" ];
subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" "cmd/gitaly-gpg" ];
} // commonOpts);
in
buildGoModule ({

6
pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "3.79.0";
version = "3.82.0";
rev = "v${version}-gitlab";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
sha256 = "sha256-JOXJ8HSTf7yW78SlYzbdn7IAbSwv/UE/W3oSJRyGrAQ=";
sha256 = "sha256-umlpGpeN7sWe8524+wjdYYJegLdc+eQqlgySLWL0a+k=";
};
vendorHash = "sha256-4cxfyG1uhqgIheAVDQbIDb4MRSqAUtLgxGYt5MuNfKw=";
vendorHash = "sha256-hFGuzTM9+Zb8BmUoFG059eqM53AzOmi1DeBnF68WSoc=";
patches = [
./Disable-inmemory-storage-driver-test.patch

7
pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix
View File

@ -2,16 +2,17 @@
buildGoModule rec {
pname = "gitlab-elasticsearch-indexer";
version = "4.3.5";
version = "4.3.8";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-elasticsearch-indexer";
rev = "v${version}";
sha256 = "sha256-2idvN92H4Cc1W71gADrsuUl3+f2weAvL2MOP19NO/3I=";
sha256 = "sha256-CePFRk+Dpndv4BtINUn8/Y4fhuO4sCyh4+erjfIHZvI=";
};
vendorHash = "sha256-7LqzuBVYqpPI2thIJu4kQgCZGMlBlKI8L+j7AdUYrgQ=";
vendorHash = "sha256-SEYHROFFaR7m7K6l4+zipX0QNYWpbf8qI4pAp1pKAsY=";
buildInputs = [ icu ];
nativeBuildInputs = [ pkg-config ];

6
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.1.4";
version = "16.3.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
sha256 = "sha256-9hqPeyabnAzmgj8rtmSgPG4QCnnSKc9wpAyFFa3uZpY=";
sha256 = "sha256-gUUmUVBk6Ox4oKOef8RDqmW2Hs2wQL/lpbIEbwbzgHY=";
};
vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0=";
vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM=";
subPackages = [ "." ];
meta = with lib; {

6
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View File

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.23.0";
version = "14.26.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-nQJq9aPC5YtTbyiwtzKwDG95PnBr6XdNpSIJkfgvnzU=";
sha256 = "sha256-nDnPldBQy4Zg0uZshxSmcEl0ggmqg6CyNWc/I3szonI=";
};
buildInputs = [ ruby libkrb5 ];
patches = [ ./remove-hardcoded-locations.patch ];
vendorSha256 = "sha256-JEWgOuWvtuaipF8fFTsFbB+sYfaHEYUl9Z8Q1XAuJuE=";
vendorSha256 = "sha256-Lqo0fdrYEHOKjF/XT3c1VjVQc1YxeBy6yW69IxXZAow=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

4
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.1.4";
version = "16.3.1";
src = fetchFromGitLab {
owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "${src.name}/workhorse";
vendorSha256 = "sha256-lKl/V2fti0eqrEoeJNNwvJbZO7z7v+5HlES+dyxxcP4=";
vendorSha256 = "sha256-Gitap0cWRubtWLJcT8oVg9FKcN9FhXbVy/t2tgaZ93Q=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

13
pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch
View File

@ -1,13 +0,0 @@
diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake
index 0226da721a..365cdeb0f9 100644
--- a/railties/lib/rails/tasks/yarn.rake
+++ b/railties/lib/rails/tasks/yarn.rake
@@ -27,8 +27,3 @@ namespace :yarn do
exit 1
end
end
-
-# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
-if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn"))
- Rake::Task["assets:precompile"].enhance [ "yarn:install" ]
-end

99
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View File

@ -13,13 +13,24 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
# NOTE: When incrementing the major or minor version here, also increment activerecord_version
# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
# https://gitlab.com/gitlab-org/gitlab/-/issues/375713
gem 'rails', '~> 6.1.7.2'
#
# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails
gem 'rails', '~> 7.0.6'
gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab'
gem 'bootsnap', '~> 1.16.0', require: false
gem 'openssl', '~> 3.0'
gem 'ipaddr', '~> 1.2.5'
gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store'
# GitLab Monorepo Gems
group :monorepo do
gem 'gitlab-utils', path: 'gems/gitlab-utils'
end
# Responders respond_to and respond_with
gem 'responders', '~> 3.0'
@ -32,7 +43,7 @@ gem 'pg', '~> 1.5.3'
gem 'neighbor', '~> 0.2.3'
gem 'rugged', '~> 1.5'
gem 'rugged', '~> 1.6'
gem 'grape-path-helpers', '~> 1.7.1'
gem 'faraday', '~> 1.0'
@ -61,7 +72,7 @@ gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See ven
gem 'omniauth-google-oauth2', '~> 1.1'
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 2.1.0'
gem 'omniauth-shibboleth-redux', '~> 2.0'
gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
gem 'omniauth_openid_connect', '~> 0.6.1'
@ -106,10 +117,10 @@ gem 'gpgme', '~> 2.0.22'
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap'
gem 'net-ldap', '~> 0.18.0'
gem 'net-ldap', '~> 0.17.1'
# API
gem 'grape', '~> 1.7.0'
gem 'grape', '~> 1.7.1'
gem 'grape-entity', '~> 0.10.0'
gem 'rack-cors', '~> 1.1.1', require: 'rack/cors'
gem 'grape-swagger', '~> 1.6.1', group: [:development, :test]
@ -122,6 +133,9 @@ gem 'apollo_upload_server', '~> 2.1.0'
gem 'graphql-docs', '~> 2.1.0', group: [:development, :test]
gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
# Generate Fake data
gem 'ffaker', '~> 2.10'
gem 'hashie', '~> 5.0.0'
# Pagination
@ -148,7 +162,7 @@ gem 'fog-local', '~> 0.8'
# We may want to update this dependency if this is ever addressed upstream, e.g. via
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
gem 'fog-aliyun', '~> 0.4'
gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/azurerm'
gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/azurerm'
# for Google storage
gem 'google-cloud-storage', '~> 1.44.0'
@ -173,9 +187,9 @@ gem 'seed-fu', '~> 2.3.7'
gem 'elasticsearch-model', '~> 7.2'
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '7.13.3'
gem 'aws-sdk-core', '~> 3.175.0'
gem 'aws-sdk-core', '~> 3.180.3'
gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1.126.0'
gem 'aws-sdk-s3', '~> 1.132.1'
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
@ -183,7 +197,7 @@ gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive
gem 'html-pipeline', '~> 2.14.3'
gem 'deckar01-task_list', '2.3.2'
gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup'
gem 'commonmarker', '~> 0.23.9'
gem 'commonmarker', '~> 0.23.10'
gem 'kramdown', '~> 2.3.1'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.3.2'
@ -194,9 +208,9 @@ gem 'asciidoctor', '~> 2.0.18'
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
gem 'asciidoctor-plantuml', '~> 0.0.16'
gem 'asciidoctor-kroki', '~> 0.8.0', require: false
gem 'rouge', '~> 4.1.2'
gem 'rouge', '~> 4.1.3'
gem 'truncato', '~> 0.7.12'
gem 'nokogiri', '~> 1.15', '>= 1.15.2'
gem 'nokogiri', '~> 1.15', '>= 1.15.4'
# Calendar rendering
gem 'icalendar'
@ -206,7 +220,7 @@ gem 'diffy', '~> 3.4'
gem 'diff_match_patch', '~> 0.1.0'
# Application server
gem 'rack', '~> 2.2.7'
gem 'rack', '~> 2.2.8'
# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base'
@ -240,12 +254,13 @@ gem 'rainbow', '~> 3.0'
gem 'ruby-progressbar', '~> 1.10'
# Linear-time regex library for untrusted regular expressions
gem 're2', '~> 1.6.0'
gem 're2', '~> 1.7.0'
# Misc
gem 'semver_dialects', '~> 1.2.1'
gem 'version_sorter', '~> 2.3'
gem 'csv_builder', path: 'gems/csv_builder'
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.8'
@ -317,6 +332,7 @@ gem 'sassc-rails', '~> 2.1.0'
gem 'autoprefixer-rails', '10.2.5.1'
gem 'terser', '1.0.2'
gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client'
gem 'addressable', '~> 2.8'
gem 'tanuki_emoji', '~> 0.6'
gem 'gon', '~> 6.4.0'
@ -326,7 +342,7 @@ gem 'base32', '~> 0.3.0'
gem 'gitlab-license', '~> 2.3'
# Protect against bruteforcing
gem 'rack-attack', '~> 6.6.1'
gem 'rack-attack', '~> 6.7.0'
# Sentry integration
gem 'sentry-raven', '~> 3.1'
@ -336,17 +352,19 @@ gem 'sentry-sidekiq', '~> 5.8.0'
# PostgreSQL query parsing
#
gem 'pg_query', '~> 4.2.1'
gem 'pg_query', '~> 4.2.3'
gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation'
gem 'premailer-rails', '~> 1.10.3'
gem 'gitlab-labkit', '~> 0.33.0'
gem 'gitlab-labkit', '~> 0.34.0'
gem 'thrift', '>= 0.16.0'
# I18n
gem 'ruby_parser', '~> 3.20', require: false
gem 'rails-i18n', '~> 7.0'
gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails', '~> 1.11.0'
gem 'gettext_i18n_rails_js', '~> 1.3'
gem 'gettext', '~> 3.3', require: false, group: :development
@ -363,12 +381,12 @@ gem 'snowplow-tracker', '~> 0.8.0'
# Metrics
gem 'webrick', '~> 1.8.1', require: false
gem 'prometheus-client-mmap', '~> 0.25', require: 'prometheus/client'
gem 'prometheus-client-mmap', '~> 0.27', require: 'prometheus/client'
gem 'warning', '~> 1.3.0'
group :development do
gem 'lefthook', '~> 1.4.2', require: false
gem 'lefthook', '~> 1.4.7', require: false
gem 'rubocop'
gem 'solargraph', '~> 0.47.2', require: false
@ -389,24 +407,21 @@ group :development, :test do
gem 'parser', '~> 3.2', '>= 3.2.2.3'
gem 'pry-byebug'
gem 'pry-rails', '~> 0.3.9'
gem 'pry-shell', '~> 0.6.1'
gem 'pry-shell', '~> 0.6.4'
gem 'awesome_print', require: false
gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 6.2.0'
gem 'rspec-rails', '~> 6.0.1'
gem 'rspec-rails', '~> 6.0.3'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.11.0'
# Generate Fake data
gem 'ffaker', '~> 2.10'
gem 'spring', '~> 4.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 10.0.0', require: false
gem 'gitlab-styles', '~> 10.1.0', require: false
gem 'haml_lint', '~> 0.40.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -432,13 +447,13 @@ group :development, :test do
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 3.10.0', require: false
gem 'gitlab-dangerfiles', '~> 3.13.0', require: false
end
group :development, :test, :coverage do
gem 'simplecov', '~> 0.21', require: false
gem 'simplecov-lcov', '~> 0.8.0', require: false
gem 'simplecov-cobertura', '~> 1.3.1', require: false
gem 'simplecov-cobertura', '~> 2.1.0', require: false
gem 'undercover', '~> 0.4.4', require: false
end
@ -447,6 +462,12 @@ group :development, :test, :omnibus do
gem 'license_finder', '~> 7.0', require: false
end
# Gems required in various pipelines
group :development, :test, :monorepo do
gem 'gitlab-rspec', path: 'gems/gitlab-rspec'
gem 'rspec_flaky', path: 'gems/rspec_flaky'
end
group :test do
gem 'fuubar', '~> 2.2.0'
gem 'rspec-retry', '~> 0.6.2'
@ -454,10 +475,9 @@ group :test do
gem 'rspec-benchmark', '~> 0.6.0'
gem 'rspec-parameterized', '~> 1.0', require: false
gem 'capybara', '~> 3.39', '>= 3.39.1'
gem 'capybara', '~> 3.39', '>= 3.39.2'
gem 'capybara-screenshot', '~> 1.0.26'
# 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support.
gem 'selenium-webdriver', '= 4.9.0'
gem 'selenium-webdriver', '= 4.11.0'
gem 'graphlyte', '~> 1.0.0'
@ -466,7 +486,7 @@ group :test do
gem 'webmock', '~> 3.18.1'
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.2.1'
gem 'test-prof', '~> 1.2.2'
gem 'rspec_junit_formatter'
gem 'guard-rspec'
gem 'axe-core-rspec'
@ -474,7 +494,7 @@ group :test do
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
gem 'derailed_benchmarks', require: false
gem 'gitlab_quality-test_tooling', '~> 0.8.1', require: false
gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false
end
gem 'octokit', '~> 4.15'
@ -509,14 +529,14 @@ gem 'ssh_data', '~> 1.3'
gem 'spamcheck', '~> 1.3.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 16.1.0-rc2'
gem 'gitaly', '~> 16.2.0-rc4'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.1.0'
gem 'kas-grpc', '~> 0.2.0'
gem 'grpc', '~> 1.42.0'
gem 'grpc', '~> 1.55.0'
gem 'google-protobuf', '~> 3.23', '>= 3.23.3'
gem 'google-protobuf', '~> 3.23', '>= 3.23.4'
gem 'toml-rb', '~> 2.2.0'
@ -561,6 +581,7 @@ gem 'lockbox', '~> 1.1.1'
gem 'valid_email', '~> 0.1'
# JSON
gem 'jsonb_accessor', '~> 1.3.10'
gem 'json', '~> 2.6.3'
gem 'json_schemer', '~> 0.2.18'
gem 'oj', '~> 3.13.21'
@ -575,13 +596,13 @@ gem 'ipaddress', '~> 0.8.3'
gem 'parslet', '~> 1.8'
gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'
gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff'
gem 'ed25519', '~> 1.3.0'
# Error Tracking OpenAPI client
# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api'
gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api'
# Vulnerability advisories
gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite'
@ -590,7 +611,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite'
gem 'arr-pm', '~> 0.0.12'
# Remote Development
gem 'devfile', '~> 0.0.19.pre.alpha1'
gem 'devfile', '~> 0.0.22.pre.alpha1'
# Apple plist parsing
gem 'CFPropertyList', '~> 3.0.0'

431
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -1,3 +1,72 @@
PATH
remote: gems/activerecord-gitlab
specs:
activerecord-gitlab (0.2.0)
activerecord (>= 7)
PATH
remote: gems/click_house-client
specs:
click_house-client (0.1.0)
activesupport (< 8)
addressable (~> 2.8)
json (~> 2.6.3)
PATH
remote: gems/csv_builder
specs:
csv_builder (0.1.0)
PATH
remote: gems/error_tracking_open_api
specs:
error_tracking_open_api (1.0.0)
typhoeus (~> 1.0, >= 1.0.1)
PATH
remote: gems/gitlab-rspec
specs:
gitlab-rspec (0.1.0)
activesupport (>= 6.1, < 7.1)
rspec (~> 3.0)
PATH
remote: gems/gitlab-safe_request_store
specs:
gitlab-safe_request_store (0.1.0)
request_store
PATH
remote: gems/gitlab-schema-validation
specs:
gitlab-schema-validation (0.1.0)
diffy
pg_query
PATH
remote: gems/gitlab-utils
specs:
gitlab-utils (0.1.0)
actionview (>= 6.1.7.2)
activesupport (>= 6.1.7.2)
addressable (~> 2.8)
nokogiri (~> 1.15.2)
rake (~> 13.0)
PATH
remote: gems/ipynbdiff
specs:
ipynbdiff (0.4.7)
diffy (~> 3.4)
oj (~> 3.13.16)
PATH
remote: gems/rspec_flaky
specs:
rspec_flaky (0.1.0)
activesupport (>= 6.1, < 7.1)
rspec (~> 3.0)
PATH
remote: vendor/gems/attr_encrypted
specs:
@ -26,19 +95,6 @@ PATH
devise (~> 4.0)
devise-two-factor (~> 4.0)
PATH
remote: vendor/gems/error_tracking_open_api
specs:
error_tracking_open_api (1.0.0)
typhoeus (~> 1.0, >= 1.0.1)
PATH
remote: vendor/gems/ipynbdiff
specs:
ipynbdiff (0.4.7)
diffy (~> 3.4)
oj (~> 3.13.16)
PATH
remote: vendor/gems/mail-smtp_pool
specs:
@ -99,69 +155,75 @@ GEM
acme-client (2.0.11)
faraday (>= 1.0, < 3.0.0)
faraday-retry (~> 1.0)
actioncable (6.1.7.2)
actionpack (= 6.1.7.2)
activesupport (= 6.1.7.2)
actioncable (7.0.6)
actionpack (= 7.0.6)
activesupport (= 7.0.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.2)
actionpack (= 6.1.7.2)
activejob (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
actionmailbox (7.0.6)
actionpack (= 7.0.6)
activejob (= 7.0.6)
activerecord (= 7.0.6)
activestorage (= 7.0.6)
activesupport (= 7.0.6)
mail (>= 2.7.1)
actionmailer (6.1.7.2)
actionpack (= 6.1.7.2)
actionview (= 6.1.7.2)
activejob (= 6.1.7.2)
activesupport (= 6.1.7.2)
net-imap
net-pop
net-smtp
actionmailer (7.0.6)
actionpack (= 7.0.6)
actionview (= 7.0.6)
activejob (= 7.0.6)
activesupport (= 7.0.6)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (6.1.7.2)
actionview (= 6.1.7.2)
activesupport (= 6.1.7.2)
rack (~> 2.0, >= 2.0.9)
actionpack (7.0.6)
actionview (= 7.0.6)
activesupport (= 7.0.6)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.2)
actionpack (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
actiontext (7.0.6)
actionpack (= 7.0.6)
activerecord (= 7.0.6)
activestorage (= 7.0.6)
activesupport (= 7.0.6)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (6.1.7.2)
activesupport (= 6.1.7.2)
actionview (7.0.6)
activesupport (= 7.0.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.2)
activesupport (= 6.1.7.2)
activejob (7.0.6)
activesupport (= 7.0.6)
globalid (>= 0.3.6)
activemodel (6.1.7.2)
activesupport (= 6.1.7.2)
activerecord (6.1.7.2)
activemodel (= 6.1.7.2)
activesupport (= 6.1.7.2)
activemodel (7.0.6)
activesupport (= 7.0.6)
activerecord (7.0.6)
activemodel (= 7.0.6)
activesupport (= 7.0.6)
activerecord-explain-analyze (0.1.0)
activerecord (>= 4)
pg
activestorage (6.1.7.2)
actionpack (= 6.1.7.2)
activejob (= 6.1.7.2)
activerecord (= 6.1.7.2)
activesupport (= 6.1.7.2)
activestorage (7.0.6)
actionpack (= 7.0.6)
activejob (= 7.0.6)
activerecord (= 7.0.6)
activesupport (= 7.0.6)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.2)
activesupport (7.0.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
acts-as-taggable-on (9.0.0)
acts-as-taggable-on (9.0.1)
activerecord (>= 6.0, < 7.1)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
@ -203,7 +265,7 @@ GEM
aws-sdk-cloudformation (1.41.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.175.0)
aws-sdk-core (3.180.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
@ -211,11 +273,11 @@ GEM
aws-sdk-kms (1.64.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.126.0)
aws-sdk-core (~> 3, >= 3.174.0)
aws-sdk-s3 (1.132.1)
aws-sdk-core (~> 3, >= 3.179.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.1)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
axe-core-api (4.6.0)
dumb_delegator
@ -240,7 +302,7 @@ GEM
backport (1.2.0)
base32 (0.3.2)
batch-loader (2.0.1)
bcrypt (3.1.16)
bcrypt (3.1.18)
benchmark (0.2.0)
benchmark-ips (2.11.0)
benchmark-malloc (0.2.0)
@ -266,7 +328,7 @@ GEM
bundler (>= 1.2.0, < 3)
thor (>= 0.18, < 2)
byebug (11.1.3)
capybara (3.39.1)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
@ -307,7 +369,7 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
colored2 (3.1.2)
commonmarker (0.23.9)
commonmarker (0.23.10)
concurrent-ruby (1.2.2)
connection_pool (2.3.0)
cork (0.3.0)
@ -367,7 +429,7 @@ GEM
thor (>= 0.19, < 2)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devfile (0.0.19.pre.alpha1)
devfile (0.0.22.pre.alpha1)
device_detector (1.0.0)
devise (4.8.1)
bcrypt (~> 3.0)
@ -466,9 +528,6 @@ GEM
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
@ -497,8 +556,8 @@ GEM
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
ffi-yajl (2.3.4)
libyajl2 (~> 1.2)
ffi-yajl (2.6.0)
libyajl2 (>= 1.2)
filelock (1.1.1)
find_a_port (1.0.1)
flipper (0.25.0)
@ -566,7 +625,7 @@ GEM
gettext (3.3.6)
locale (>= 2.0.5)
text (>= 1.3.0)
gettext_i18n_rails (1.8.0)
gettext_i18n_rails (1.11.0)
fast_gettext (>= 0.9.0)
gettext_i18n_rails_js (1.3.0)
gettext (>= 3.0.2)
@ -575,34 +634,33 @@ GEM
rails (>= 3.2.0)
git (1.11.0)
rchardet (~> 1.8)
gitaly (16.1.0.pre.rc2)
gitaly (16.2.0.pre.rc4)
grpc (~> 1.0)
gitlab (4.19.0)
httparty (~> 0.20)
terminal-table (>= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (3.10.0)
gitlab-dangerfiles (3.13.0)
danger (>= 8.4.5)
danger-gitlab (>= 8.0.0)
rake
gitlab-experiment (0.7.1)
activesupport (>= 3.0)
request_store (>= 1.0)
gitlab-fog-azure-rm (1.7.0)
gitlab-fog-azure-rm (1.8.0)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
fog-core (= 2.1.0)
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.33.0)
gitlab-labkit (0.34.0)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
jaeger-client (~> 1.1.0)
opentracing (~> 0.4)
pg_query (~> 4.2.1)
pg_query (~> 4.2.3)
redis (> 3.0.0, < 6.0.0)
gitlab-license (2.3.0)
gitlab-mail_room (0.0.23)
@ -611,12 +669,12 @@ GEM
oauth2 (>= 1.4.4, < 3)
gitlab-markup (1.9.0)
gitlab-net-dns (0.9.2)
gitlab-styles (10.0.0)
rubocop (~> 1.43.0)
gitlab-styles (10.1.0)
rubocop (~> 1.50.2)
rubocop-graphql (~> 0.18)
rubocop-performance (~> 1.15)
rubocop-rails (~> 2.17)
rubocop-rspec (~> 2.18)
rubocop-rspec (~> 2.22)
gitlab_chronic_duration (0.10.6.2)
numerizer (~> 0.2)
gitlab_omniauth-ldap (2.2.0)
@ -624,7 +682,7 @@ GEM
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
gitlab_quality-test_tooling (0.8.1)
gitlab_quality-test_tooling (0.9.3)
activesupport (>= 6.1, < 7.1)
gitlab (~> 4.19)
http (~> 5.0)
@ -694,7 +752,7 @@ GEM
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
google-protobuf (3.23.3)
google-protobuf (3.23.4)
googleapis-common-protos (1.4.0)
google-protobuf (~> 3.14)
googleapis-common-protos-types (~> 1.2)
@ -710,12 +768,12 @@ GEM
signet (>= 0.16, < 2.a)
gpgme (2.0.22)
mini_portile2 (~> 2.7)
grape (1.7.0)
grape (1.7.1)
activesupport
builder
dry-types (>= 1.1)
mustermann-grape (~> 1.0.0)
rack (>= 1.3.0)
rack (>= 1.3.0, < 3)
rack-accept
grape-entity (0.10.0)
activesupport (>= 3.0.0)
@ -753,8 +811,8 @@ GEM
graphql (~> 1.12)
html-pipeline (~> 2.9)
sass (~> 3.4)
grpc (1.42.0)
google-protobuf (~> 3.18)
grpc (1.55.0)
google-protobuf (~> 3.23)
googleapis-common-protos-types (~> 1.0)
gssapi (1.3.1)
ffi (>= 1.0.1)
@ -851,6 +909,10 @@ GEM
hana (~> 1.3)
regexp_parser (~> 2.0)
uri_template (~> 0.7)
jsonb_accessor (1.3.10)
activerecord (>= 5.0)
activesupport (>= 5.0)
pg (>= 0.18.1)
jsonpath (1.1.2)
multi_json
jwt (2.5.0)
@ -866,7 +928,7 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
kas-grpc (0.1.0)
kas-grpc (0.2.0)
grpc (~> 1.0)
knapsack (1.21.1)
rake
@ -881,7 +943,7 @@ GEM
rest-client (~> 2.0)
launchy (2.5.0)
addressable (~> 2.7)
lefthook (1.4.2)
lefthook (1.4.7)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (2.0.0)
@ -960,15 +1022,6 @@ GEM
mixlib-log (3.0.9)
mixlib-shellout (3.2.5)
chef-utils
ms_rest (0.7.6)
concurrent-ruby (~> 1.0)
faraday (>= 0.9, < 2.0.0)
timeliness (~> 0.3.10)
ms_rest_azure (0.12.0)
concurrent-ruby (~> 1.0)
faraday (>= 0.9, < 2.0.0)
faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.7.6)
msgpack (1.5.4)
multi_json (1.14.1)
multi_xml (0.6.0)
@ -990,7 +1043,7 @@ GEM
net-imap (0.3.4)
date
net-protocol
net-ldap (0.18.0)
net-ldap (0.17.1)
net-ntp (2.1.3)
net-pop (0.1.2)
net-protocol
@ -1004,7 +1057,7 @@ GEM
netrc (0.11.0)
nio4r (2.5.8)
no_proxy_fix (0.1.2)
nokogiri (1.15.2)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
notiffany (0.1.3)
@ -1137,7 +1190,7 @@ GEM
peek (1.1.0)
railties (>= 4.0.0)
pg (1.5.3)
pg_query (4.2.1)
pg_query (4.2.3)
google-protobuf (>= 3.22.3)
plist (3.6.0)
png_quantizator (0.2.1)
@ -1154,7 +1207,7 @@ GEM
coderay
parser
unparser
prometheus-client-mmap (0.25.0)
prometheus-client-mmap (0.27.0)
rb_sys (~> 0.9)
pry (0.14.2)
coderay (~> 1.1)
@ -1164,7 +1217,7 @@ GEM
pry (>= 0.13, < 0.15)
pry-rails (0.3.9)
pry (>= 0.10.4)
pry-shell (0.6.1)
pry-shell (0.6.4)
pry (>= 0.13.0)
tty-markdown
tty-prompt
@ -1174,11 +1227,11 @@ GEM
pyu-ruby-sasl (0.0.3.3)
raabro (1.4.0)
racc (1.6.2)
rack (2.2.7)
rack (2.2.8)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (6.6.1)
rack (>= 1.0, < 3)
rack-attack (6.7.0)
rack (>= 1.0, < 4)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-oauth2 (1.21.3)
@ -1191,24 +1244,23 @@ GEM
rack
rack-proxy (0.7.6)
rack
rack-test (2.0.2)
rack-test (2.1.0)
rack (>= 1.3)
rack-timeout (0.6.3)
rails (6.1.7.2)
actioncable (= 6.1.7.2)
actionmailbox (= 6.1.7.2)
actionmailer (= 6.1.7.2)
actionpack (= 6.1.7.2)
actiontext (= 6.1.7.2)
actionview (= 6.1.7.2)
activejob (= 6.1.7.2)
activemodel (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
rails (7.0.6)
actioncable (= 7.0.6)
actionmailbox (= 7.0.6)
actionmailer (= 7.0.6)
actionpack (= 7.0.6)
actiontext (= 7.0.6)
actionview (= 7.0.6)
activejob (= 7.0.6)
activemodel (= 7.0.6)
activerecord (= 7.0.6)
activestorage (= 7.0.6)
activesupport (= 7.0.6)
bundler (>= 1.15.0)
railties (= 6.1.7.2)
sprockets-rails (>= 2.0.0)
railties (= 7.0.6)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@ -1221,12 +1273,13 @@ GEM
rails-i18n (7.0.3)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (6.1.7.2)
actionpack (= 6.1.7.2)
activesupport (= 6.1.7.2)
railties (7.0.6)
actionpack (= 7.0.6)
activesupport (= 7.0.6)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.2)
@ -1240,7 +1293,7 @@ GEM
rbtree (0.4.6)
rchardet (1.8.0)
rdoc (6.3.2)
re2 (1.6.0)
re2 (1.7.0)
recaptcha (5.12.3)
json
recursive-open-struct (1.1.3)
@ -1265,7 +1318,7 @@ GEM
uber (< 0.2.0)
request_store (1.5.1)
rack (>= 1.4)
responders (3.0.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rest-client (2.1.0)
@ -1279,7 +1332,7 @@ GEM
rexml (3.2.5)
rinku (2.0.0)
rotp (6.2.0)
rouge (4.1.2)
rouge (4.1.3)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@ -1293,12 +1346,12 @@ GEM
benchmark-perf (~> 0.6)
benchmark-trend (~> 0.4)
rspec (>= 3.0)
rspec-core (3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-parameterized (1.0.0)
@ -1312,14 +1365,14 @@ GEM
rspec-parameterized-table_syntax (1.0.0)
binding_of_caller
rspec-parameterized-core (< 2)
rspec-rails (6.0.1)
rspec-rails (6.0.3)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.11)
rspec-expectations (~> 3.11)
rspec-mocks (~> 3.11)
rspec-support (~> 3.11)
rspec-core (~> 3.12)
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.12.0)
@ -1330,32 +1383,35 @@ GEM
pg
rails
sqlite3
rubocop (1.43.0)
rubocop (1.50.2)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0)
rubocop-ast (>= 1.28.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
rubocop-capybara (2.17.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.18.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.23.1)
rubocop (~> 1.33)
rubocop-graphql (0.19.0)
rubocop (>= 0.87, < 2)
rubocop-performance (1.16.0)
rubocop-performance (1.18.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.17.4)
rubocop-rails (2.20.2)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.18.1)
rubocop-rspec (2.22.0)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
ruby-fogbugz (0.3.0)
crack (~> 0.4)
multipart-post (~> 2.0)
@ -1374,7 +1430,7 @@ GEM
rubyntlm (0.6.3)
rubypants (0.2.0)
rubyzip (2.3.2)
rugged (1.5.1)
rugged (1.6.3)
safe_yaml (1.0.4)
safety_net_attestation (0.4.0)
jwt (~> 2.0)
@ -1401,7 +1457,7 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
selenium-webdriver (4.9.0)
selenium-webdriver (4.11.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
@ -1419,7 +1475,7 @@ GEM
sentry-sidekiq (5.8.0)
sentry-ruby (~> 5.8.0)
sidekiq (>= 3.0)
set (1.0.1)
set (1.0.2)
sexp_processor (4.16.1)
shellany (0.0.1)
shoulda-matchers (5.1.0)
@ -1438,12 +1494,13 @@ GEM
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simple_po_parser (1.1.6)
simplecov (0.21.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-cobertura (1.3.1)
simplecov (~> 0.8)
simplecov-cobertura (2.1.0)
rexml
simplecov (~> 0.19)
simplecov-html (0.12.3)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
@ -1522,7 +1579,7 @@ GEM
unicode-display_width (>= 1.1.1, < 3)
terser (1.0.2)
execjs (>= 0.3.0, < 3)
test-prof (1.2.1)
test-prof (1.2.2)
test_file_finder (0.1.4)
faraday (~> 1.0)
text (1.3.1)
@ -1530,7 +1587,6 @@ GEM
thread_safe (0.3.6)
thrift (0.16.0)
tilt (2.0.11)
timeliness (0.3.10)
timeout (0.3.2)
timfel-krb5-auth (0.8.3)
tins (1.31.1)
@ -1577,10 +1633,10 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
undercover (0.4.5)
undercover (0.4.6)
imagen (>= 0.1.8)
rainbow (>= 2.1, < 4.0)
rugged (>= 0.27, < 1.6)
rugged (>= 0.27, < 1.7)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
@ -1654,7 +1710,7 @@ GEM
nokogiri (~> 1.8)
yajl-ruby (1.4.3)
yard (0.9.26)
zeitwerk (2.6.6)
zeitwerk (2.6.7)
PLATFORMS
ruby
@ -1664,6 +1720,7 @@ DEPENDENCIES
RedCloth (~> 4.3.2)
acme-client (~> 2.0)
activerecord-explain-analyze (~> 0.1)
activerecord-gitlab!
acts-as-taggable-on (~> 9.0)
addressable (~> 2.8)
akismet (~> 3.0)
@ -1680,8 +1737,8 @@ DEPENDENCIES
autoprefixer-rails (= 10.2.5.1)
awesome_print
aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3.175.0)
aws-sdk-s3 (~> 1.126.0)
aws-sdk-core (~> 3.180.3)
aws-sdk-s3 (~> 1.132.1)
axe-core-rspec
babosa (~> 2.0)
base32 (~> 0.3.0)
@ -1695,25 +1752,27 @@ DEPENDENCIES
bullet (~> 7.0.2)
bundler-audit (~> 0.7.0.1)
bundler-checksum (~> 0.1.0)!
capybara (~> 3.39, >= 3.39.1)
capybara (~> 3.39, >= 3.39.2)
capybara-screenshot (~> 1.0.26)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7)
circuitbox (= 2.0.0)
click_house-client!
cloud_profiler_agent (~> 0.0.0)!
commonmarker (~> 0.23.9)
commonmarker (~> 0.23.10)
concurrent-ruby (~> 1.1)
connection_pool (~> 2.0)
countries (~> 4.0.0)
creole (~> 0.5.0)
crystalball (~> 0.7.0)
csv_builder!
cvss-suite (~> 3.0.1)
database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.2)
declarative_policy (~> 1.1.0)
deprecation_toolkit (~> 1.5.1)
derailed_benchmarks
devfile (~> 0.0.19.pre.alpha1)
devfile (~> 0.0.22.pre.alpha1)
device_detector
devise (~> 4.8.1)
devise-pbkdf2-encryptable (~> 0.0.0)!
@ -1747,23 +1806,27 @@ DEPENDENCIES
fugit (~> 1.8.1)
fuubar (~> 2.2.0)
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails (~> 1.11.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 16.1.0.pre.rc2)
gitaly (~> 16.2.0.pre.rc4)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 3.10.0)
gitlab-dangerfiles (~> 3.13.0)
gitlab-experiment (~> 0.7.1)
gitlab-fog-azure-rm (~> 1.7.0)
gitlab-labkit (~> 0.33.0)
gitlab-fog-azure-rm (~> 1.8.0)
gitlab-labkit (~> 0.34.0)
gitlab-license (~> 2.3)
gitlab-mail_room (~> 0.0.23)
gitlab-markup (~> 1.9.0)
gitlab-net-dns (~> 0.9.2)
gitlab-rspec!
gitlab-safe_request_store!
gitlab-schema-validation!
gitlab-sidekiq-fetcher!
gitlab-styles (~> 10.0.0)
gitlab-styles (~> 10.1.0)
gitlab-utils!
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.2.0)
gitlab_quality-test_tooling (~> 0.8.1)
gitlab_quality-test_tooling (~> 0.9.3)
gon (~> 6.4.0)
google-apis-androidpublisher_v3 (~> 0.34.0)
google-apis-cloudbilling_v1 (~> 0.21.0)
@ -1776,9 +1839,9 @@ DEPENDENCIES
google-apis-serviceusage_v1 (~> 0.28.0)
google-apis-sqladmin_v1beta4 (~> 0.41.0)
google-cloud-storage (~> 1.44.0)
google-protobuf (~> 3.23, >= 3.23.3)
google-protobuf (~> 3.23, >= 3.23.4)
gpgme (~> 2.0.22)
grape (~> 1.7.0)
grape (~> 1.7.1)
grape-entity (~> 0.10.0)
grape-path-helpers (~> 1.7.1)
grape-swagger (~> 1.6.1)
@ -1789,7 +1852,7 @@ DEPENDENCIES
graphlyte (~> 1.0.0)
graphql (~> 1.13.12)
graphql-docs (~> 2.1.0)
grpc (~> 1.42.0)
grpc (~> 1.55.0)
gssapi (~> 1.3.1)
guard-rspec
haml_lint (~> 0.40.0)
@ -1809,13 +1872,14 @@ DEPENDENCIES
js_regex (~> 3.8)
json (~> 2.6.3)
json_schemer (~> 0.2.18)
jsonb_accessor (~> 1.3.10)
jwt (~> 2.5)
kaminari (~> 1.2.2)
kas-grpc (~> 0.1.0)
kas-grpc (~> 0.2.0)
knapsack (~> 1.21.1)
kramdown (~> 2.3.1)
kubeclient (~> 4.11.0)
lefthook (~> 1.4.2)
lefthook (~> 1.4.7)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
licensee (~> 9.15)
@ -1835,10 +1899,10 @@ DEPENDENCIES
multi_json (~> 1.14.1)
neighbor (~> 0.2.3)
net-http (= 0.1.1)
net-ldap (~> 0.18.0)
net-ldap (~> 0.17.1)
net-ntp
net-protocol (~> 0.1.3)
nokogiri (~> 1.15, >= 1.15.2)
nokogiri (~> 1.15, >= 1.15.4)
oauth2 (~> 2.0)
octokit (~> 4.15)
ohai (~> 17.9)
@ -1871,27 +1935,27 @@ DEPENDENCIES
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.5.3)
pg_query (~> 4.2.1)
pg_query (~> 4.2.3)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.25)
prometheus-client-mmap (~> 0.27)
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.6.1)
pry-shell (~> 0.6.4)
puma (~> 6.3)
rack (~> 2.2.7)
rack-attack (~> 6.6.1)
rack (~> 2.2.8)
rack-attack (~> 6.7.0)
rack-cors (~> 1.1.1)
rack-oauth2 (~> 1.21.3)
rack-proxy (~> 0.7.6)
rack-timeout (~> 0.6.3)
rails (~> 6.1.7.2)
rails (~> 7.0.6)
rails-controller-testing
rails-i18n (~> 7.0)
rainbow (~> 3.0)
rbtrace (~> 0.4)
rdoc (~> 6.3.2)
re2 (~> 1.6.0)
re2 (~> 1.7.0)
recaptcha (~> 5.12)
redis (~> 4.8.0)
redis-actionpack (~> 5.3.0)
@ -1900,12 +1964,13 @@ DEPENDENCIES
responders (~> 3.0)
retriable (~> 3.1.2)
rexml (~> 3.2.5)
rouge (~> 4.1.2)
rouge (~> 4.1.3)
rqrcode-rails3 (~> 0.1.7)
rspec-benchmark (~> 0.6.0)
rspec-parameterized (~> 1.0)
rspec-rails (~> 6.0.1)
rspec-rails (~> 6.0.3)
rspec-retry (~> 0.6.2)
rspec_flaky!
rspec_junit_formatter
rspec_profiling (~> 0.0.6)
rubocop
@ -1916,12 +1981,12 @@ DEPENDENCIES
ruby-saml (~> 1.15.0)
ruby_parser (~> 3.20)
rubyzip (~> 2.3.2)
rugged (~> 1.5)
rugged (~> 1.6)
sanitize (~> 6.0)
sassc-rails (~> 2.1.0)
sd_notify (~> 0.1.0)
seed-fu (~> 2.3.7)
selenium-webdriver (= 4.9.0)
selenium-webdriver (= 4.11.0)
semver_dialects (~> 1.2.1)
sentry-rails (~> 5.8.0)
sentry-raven (~> 3.1)
@ -1933,7 +1998,7 @@ DEPENDENCIES
sigdump (~> 0.2.4)
simple_po_parser (~> 1.1.6)
simplecov (~> 0.21)
simplecov-cobertura (~> 1.3.1)
simplecov-cobertura (~> 2.1.0)
simplecov-lcov (~> 0.8.0)
slack-messenger (~> 2.3.4)
snowplow-tracker (~> 0.8.0)
@ -1950,7 +2015,7 @@ DEPENDENCIES
tanuki_emoji (~> 0.6)
telesignenterprise (~> 2.2)
terser (= 1.0.2)
test-prof (~> 1.2.1)
test-prof (~> 1.2.2)
test_file_finder (~> 0.1.3)
thrift (>= 0.16.0)
timfel-krb5-auth (~> 0.8)
@ -1973,4 +2038,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)
BUNDLED WITH
2.4.14
2.4.18

462
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

File diff suppressed because it is too large Load Diff

14
pkgs/applications/version-management/gitlab/update.py
View File

@ -187,7 +187,7 @@ def update_rubyenv():
)
# Fetch vendored dependencies temporarily in order to build the gemset.nix
subprocess.check_output(["mkdir", "-p", "vendor/gems"], cwd=rubyenv_dir)
subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir)
subprocess.check_output(
[
"sh",
@ -196,6 +196,14 @@ def update_rubyenv():
],
cwd=f"{rubyenv_dir}/vendor/gems",
)
subprocess.check_output(
[
"sh",
"-c",
f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=3",
],
cwd=f"{rubyenv_dir}/gems",
)
# Undo our gemset.nix patches so that bundix runs through
subprocess.check_output(
@ -213,11 +221,13 @@ def update_rubyenv():
"1i\\src:",
"-e",
's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g',
"-e",
's:path = \\(gems/[^;]*\\);:path = "${src}/\\1";:g',
"gemset.nix",
],
cwd=rubyenv_dir,
)
subprocess.check_output(["rm", "-rf", "vendor"], cwd=rubyenv_dir)
subprocess.check_output(["rm", "-rf", "vendor", "gems"], cwd=rubyenv_dir)
@cli.command("update-gitaly")

9
pkgs/applications/video/wf-recorder/default.nix
View File

@ -1,22 +1,23 @@
{ lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, scdoc, wayland-scanner
, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers
, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio
, mesa # for libgbm
}:
stdenv.mkDerivation rec {
pname = "wf-recorder";
version = "0.3.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "ammen99";
repo = pname;
rev = "v${version}";
sha256 = "sha256-othFp97rUrdUoAXkup8VvpcyPHs5iYNFyRE3h3rcmqE=";
hash = "sha256-SXPXvKXn236oO1WakkMNql3lj2flYYlmArVHGomH0/k=";
};
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ];
buildInputs = [
wayland wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers
wayland wayland-protocols ffmpeg x264 libpulseaudio mesa
];
meta = with lib; {

7
pkgs/applications/window-managers/herbstluftwm/default.nix
View File

@ -51,6 +51,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/herbstluftwm/herbstluftwm/commit/8678168c7a3307b1271e94974e062799e745ab40.patch";
hash = "sha256-uI6ErfDitT2Tw0txx4lMSBn/jjiiyL4Qw6AJa/CTh1E=";
})
# Fix tests with recent Xorg, can be removed with the next release (<0.9.5)
# Details here: https://github.com/herbstluftwm/herbstluftwm/issues/1560
(fetchpatch {
url = "https://github.com/herbstluftwm/herbstluftwm/commit/1a6e8ee24eac671569f54bfec22ab47ff285a52c.patch";
hash = "sha256-srulWJQ9zTR4Kdxo40AdHND4nexDe2PDSR69yWsOpVA=";
})
];
postPatch = ''

4
pkgs/development/libraries/libblockdev/default.nix
View File

@ -31,13 +31,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libblockdev";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "storaged-project";
repo = "libblockdev";
rev = "${finalAttrs.version}-1";
hash = "sha256-tqF96yeBPilF0zQ53RNN7IZ2wVgWQOwbGkvoywN/i+0=";
hash = "sha256-vQ+JHMhfCNb5PALGL9FchRYPHGj+6oQpRfmmGS0ZczI=";
};
outputs = [ "out" "dev" "devdoc" ];

17
pkgs/development/libraries/libredwg/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, writeShellScript
, pkg-config
@ -18,25 +17,16 @@ let
in
stdenv.mkDerivation rec {
pname = "libredwg";
version = "0.12.5.6248";
version = "0.12.5.6313";
src = fetchFromGitHub {
owner = "LibreDWG";
repo = pname;
rev = version;
hash = "sha256-EHfqj+FeZZpQzF9/LFWg+onTMz2/9tvXNcdpZrdjry0=";
hash = "sha256-TM+cZ7N5PD6UG9cvy0XFa0sNYc3apbAJvEMh3husjRk=";
fetchSubmodules = true;
};
patches = [
(fetchpatch {
name = "dwg2svg-strcasestr-musl-fix.patch";
# https://github.com/LibreDWG/libredwg/pull/822
url = "https://github.com/LibreDWG/libredwg/commit/eec0b7aac6d2f695b7b258f47c3bde3f71f963ee.patch";
hash = "sha256-TjpJuhRl9t0b9NOJ1FEOO0/y586WwaJcNzTM0cTwmYI=";
})
];
postPatch = let
printVersion = writeShellScript "print-version" ''
echo -n ${lib.escapeShellArg version}
@ -63,7 +53,8 @@ stdenv.mkDerivation rec {
# prevent python tests from running when not building with python
configureFlags = lib.optional (!enablePython) "--disable-python";
doCheck = true;
# example_r13.dxf roundtrip fail: expect 5286, got 5285 entities
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
# the "xmlsuite" test requires the libxml2 c library as well as the python module
nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ];

30
pkgs/development/libraries/libunarr/default.nix
View File

@ -1,31 +1,33 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake }:
{ lib
, stdenv
, fetchurl
, cmake
}:
stdenv.mkDerivation rec {
pname = "libunarr";
version = "1.0.1";
version = "1.1.0";
src = fetchurl {
url = "https://github.com/selmf/unarr/releases/download/v${version}/unarr-${version}.tar.xz";
sha256 = "1db500k6w90qn6qb4j3zcczailmmv81q9lv4bwq516hbncg5p4sl";
hash = "sha256-5wCnhjoj+GTmaeDTCrUnm1Wt9SsWAbQcPSYM//FNeOA=";
};
nativeBuildInputs = [ cmake ];
# https://github.com/selmf/unarr/issues/23
postPatch = ''
substituteInPlace pkg-config.pc.cmake \
--replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
--replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
''
# ld: unknown option: --no-undefined
+ lib.optionalString stdenv.isDarwin ''
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace '-Wl,--no-undefined -Wl,--as-needed' '-Wl,-undefined,error'
--replace "-flto" "" \
--replace "AppleClang" "Clang"
'';
nativeBuildInputs = [
cmake
];
meta = with lib; {
homepage = "https://github.com/selmf/unarr";
description = "A lightweight decompression library with support for rar, tar and zip archives";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ wegank ];
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/mongoc/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mongoc";
version = "1.24.2";
version = "1.24.3";
src = fetchFromGitHub {
owner = "mongodb";
repo = "mongo-c-driver";
rev = "refs/tags/${version}";
hash = "sha256-gey+/DAfAK69f5q568giLNL4R1UqGD6eiImkjyvnZys=";
hash = "sha256-zEIdK994aebLeKe4g6/ByWvaoGNBB0ODXRpczrCEkB8=";
};
postPatch = ''

4
pkgs/development/libraries/restinio/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "restinio";
version = "0.6.18";
version = "0.6.19";
src = fetchurl {
url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2";
hash = "sha256-4OksmaW6NBpZ8npqLiZGn6zmCB7KxXlU5NKfKmA7Zr8=";
hash = "sha256-fyHuvrlm4XDWq1TpsZiskn1DkJASFzngN8D6O7NnskA=";
};
sourceRoot = ".";

1
pkgs/development/node-packages/aliases.nix
View File

@ -93,6 +93,7 @@ mapAliases {
musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
inherit (pkgs) npm-check-updates; # added 2023-08-22
ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04
inherit (pkgs) react-static; # added 2023-08-21
readability-cli = pkgs.readability-cli; # Added 2023-06-12
reveal-md = pkgs.reveal-md; # added 2023-07-31

1
pkgs/development/node-packages/node-packages.json
View File

@ -193,7 +193,6 @@
, "npm"
, "npm-merge-driver"
, "nrm"
, "ocaml-language-server"
, "orval"
, "parcel-bundler"
, "parcel"

42
pkgs/development/node-packages/node-packages.nix generated
View File

@ -100616,48 +100616,6 @@ in
bypassCache = true;
reconstructLock = true;
};
ocaml-language-server = nodeEnv.buildNodePackage {
name = "ocaml-language-server";
packageName = "ocaml-language-server";
version = "1.0.35";
src = fetchurl {
url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.35.tgz";
sha512 = "9RS7+KyrmFFL2BZLjIBjLToqbDTKDTAoCGrQDm8eYgKie/ep6UnodGuvZgRaM9HOQ8RDzBh4rE3CfGdNsggD4g==";
};
dependencies = [
sources."async-2.6.0"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."concat-map-0.0.1"
sources."deepmerge-2.1.0"
sources."fs.realpath-1.0.0"
sources."glob-7.1.2"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."lodash-4.17.5"
sources."lokijs-1.5.3"
sources."minimatch-3.1.2"
sources."once-1.4.0"
sources."path-is-absolute-1.0.1"
sources."pegjs-0.10.0"
sources."vscode-jsonrpc-3.6.0"
sources."vscode-languageclient-4.0.1"
sources."vscode-languageserver-4.0.0"
sources."vscode-languageserver-protocol-3.6.0"
sources."vscode-languageserver-types-3.17.3"
sources."vscode-uri-1.0.3"
sources."wrappy-1.0.2"
];
buildInputs = globalBuildInputs;
meta = {
description = "OCaml language server";
homepage = "https://github.com/freebroccolo/ocaml-language-server";
license = "Apache-2.0";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
orval = nodeEnv.buildNodePackage {
name = "orval";
packageName = "orval";

4
pkgs/development/python-modules/ansible/core.nix
View File

@ -28,11 +28,11 @@
buildPythonPackage rec {
pname = "ansible-core";
version = "2.15.2";
version = "2.15.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-hCUbAB8vnAkUvu3/zxlSnnRaExCBWdH+J96eOmpjrFo=";
hash = "sha256-JhvAGhUnT8WmlQ1bkrmqG318bo91Q8kUUF5b/ZdEeTo=";
};
# ansible_connection is already wrapped, so don't pass it through

4
pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "appthreat-vulnerability-db";
version = "5.2.5";
version = "5.4.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "AppThreat";
repo = "vulnerability-db";
rev = "refs/tags/v${version}";
hash = "sha256-h1xpP3fFr8+twa5jXQrZfKFjNAlCvXv7sFvhgJZ88H0=";
hash = "sha256-sfhcAEJn+9uTPZLjgurfpuWNEdefzQZSXZdw7IeuqZw=";
};
postPatch = ''

6
pkgs/development/python-modules/bracex/default.nix
View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "bracex";
version = "2.3.post1";
version = "2.4";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-57I/yLLNBtPewGkrqr7LJJ3alOBqYXkB/wOmxW/XFpM=";
hash = "sha256-on6vHfQs9WH+1Yt6jz/fEp0eoWqB4frdHReYm8Y4S+s=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/gitpython/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "gitpython";
version = "3.1.32";
version = "3.1.33";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gitpython-developers";
repo = "GitPython";
rev = "refs/tags/${version}";
hash = "sha256-Bhgu57w5QYfq5hlTh5gCJhbdwUMU+u0nrova/2V2ed0=";
hash = "sha256-SqpoI8QnynHRHUdenMrOAGib/SDpix4rSXfEes4xt/Y=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/idasen/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "idasen";
version = "0.10.0";
version = "0.10.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "newAM";
repo = "idasen";
rev = "refs/tags/v${version}";
hash = "sha256-aCVKnKWJlrlKD+74KL9JKlNpMGOzg/iWmB+1IMn0V/E=";
hash = "sha256-1ZOnEPB3RJ6i3RwvpP3rG/i1M+Oa9fdfVhc3R+iFndQ=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/ilua/default.nix
View File

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, jupyter_console
, jupyter-console
, jupyter-core
, pygments
, termcolor
@ -19,7 +19,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
jupyter_console
jupyter-console
jupyter-core
pygments
termcolor

10
pkgs/development/python-modules/jupyter_console/default.nix → pkgs/development/python-modules/jupyter-console/default.nix
View File

@ -18,15 +18,16 @@
}:
buildPythonPackage rec {
pname = "jupyter_console";
version = "6.6.1";
pname = "jupyter-console";
version = "6.6.3";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-WTEhLVy8H5Vvb9YVdVteFfOJqOqmlyiNu+Q3cBdhXsw=";
pname = "jupyter_console";
inherit version;
hash = "sha256-VmpL8xyHrb+t8izfhG4wabWace1dpx1rpNiqrRSlNTk=";
};
nativeBuildInputs = [
@ -71,5 +72,6 @@ buildPythonPackage rec {
homepage = "https://github.com/jupyter/jupyter_console";
changelog = "https://github.com/jupyter/jupyter_console/releases/tag/v${version}";
license = lib.licenses.bsd3;
maintainers = lib.teams.jupyter.members;
};
}

4
pkgs/development/python-modules/jupyter/default.nix
View File

@ -3,7 +3,7 @@
, fetchPypi
, notebook
, qtconsole
, jupyter_console
, jupyter-console
, nbconvert
, ipykernel
, ipywidgets
@ -18,7 +18,7 @@ buildPythonPackage rec {
sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f";
};
propagatedBuildInputs = [ notebook qtconsole jupyter_console nbconvert ipykernel ipywidgets ];
propagatedBuildInputs = [ notebook qtconsole jupyter-console nbconvert ipykernel ipywidgets ];
# Meta-package, no tests
doCheck = false;

4
pkgs/development/python-modules/metakernel/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "metakernel";
version = "0.29.5";
version = "0.30.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-tGp8CHQ1Ekn/2KiGZGd/8V6NdWMseDSETZ/Z3T3P91U=";
hash = "sha256-O5BAfb+6fCbETaJmWsVSayTId/57VjA7U3FGCeNe28Y=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pyaml/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pyaml";
version = "23.7.0";
version = "23.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-DFELu4k4MJQA4LHkesFv2Q5W1lKAWpNBcSh4ZxjzNUY=";
sha256 = "sha256-TiAw9fwNO1eEo6eFO6eLGujelDxtulUHh2VQxb0Y84c=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/python-manilaclient/default.nix
View File

@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "python-manilaclient";
version = "4.5.1";
version = "4.6.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-jtcY0yPD6eBcTFNVgANY4brQkrAscADeY8hbfw6M/tI=";
hash = "sha256-JFdpPX2lVSGN/jVsKMOOKrPm51fwpD476TnQo/0AYWQ=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pytorch-lightning/default.nix
View File

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "pytorch-lightning";
version = "2.0.7";
version = "2.0.8";
format = "pyproject";
src = fetchFromGitHub {
owner = "Lightning-AI";
repo = "pytorch-lightning";
rev = "refs/tags/${version}";
hash = "sha256-R1uX5kPRnLWqqpEYbzJp7aOSK6e5mfyQ14CkbBCDszw=";
hash = "sha256-Z/5d7aUO9UO7c9PoekxP8PMajKlh//hk/YIp+BJMcho=";
};
preConfigure = ''

4
pkgs/development/python-modules/s3fs/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "s3fs";
version = "2023.6.0";
version = "2023.9.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Y/2N3wXrci3nhLe1AxlhB/KlGAYSmM8AWopHFbTUkRc=";
hash = "sha256-NQV9TVlyLKuf6RyaMBR+Plvd/FXsFP3od2xRIXnII90=";
};
postPatch = ''

4
pkgs/development/python-modules/setuptools-gettext/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "setuptools-gettext";
version = "0.1.3";
version = "0.1.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "breezy-team";
repo = "setuptools-gettext";
rev = "refs/tags/v${version}";
hash = "sha256-pTjYdezNBFeLCh6cbC+YtHxQB4zrZAFTCjjNQffbHhc=";
hash = "sha256-16kzKB0xq3ApQlGQYp12oB7K99QCQMUwqpP54QiI3gg=";
};
propagatedBuildInputs = [

40
pkgs/development/python-modules/sklearn-deap/default.nix
View File

@ -1,38 +1,52 @@
{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikit-learn, python }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, deap
, numpy
, scikit-learn
, scipy
, unittestCheckHook
}:
buildPythonPackage rec {
pname = "sklearn-deap";
version = "0.2.3";
version = "0.3.0";
format = "setuptools";
# No tests in Pypi
src = fetchFromGitHub {
owner = "rsteca";
repo = pname;
repo = "sklearn-deap";
rev = version;
sha256 = "1yqnmy8h08i2y6bb2s0a5nx9cwvyg45293whqh420c195gpzg1x3";
hash = "sha256-bXBHlv1pIOyDLKCBeffyHaTZ7gNiZNl0soa73e8E4/M=";
};
patches = [
# Fix for scikit-learn v0.21.1. See: https://github.com/rsteca/sklearn-deap/pull/62
# Fix for scikit-learn v1.1. See: https://github.com/rsteca/sklearn-deap/pull/80
(fetchpatch {
url = "https://github.com/rsteca/sklearn-deap/commit/3ae62990fc87f36b59382e7c4db3c74cf99ec3bf.patch";
sha256 = "1na6wf4v0dcmyz3pz8aiqkmv76d1iz3hi4iyfq9kfnycgzpv1kxk";
url = "https://github.com/rsteca/sklearn-deap/commit/3b84bd905796378dd845f99e083da17284c9ff6f.patch";
hash = "sha256-YYLw0uzecyIbdNAy/CxxWDV67zJbZZhUMypnDm/zNGs=";
})
(fetchpatch {
url = "https://github.com/rsteca/sklearn-deap/commit/2f60e215c834f60966b4e51df25e91939a72b952.patch";
hash = "sha256-vn5nLPwwkjsQrp3q7C7Z230lkgRiyJN0TQxO8Apizg8=";
})
];
propagatedBuildInputs = [ numpy scipy deap scikit-learn ];
checkPhase = ''
${python.interpreter} test.py
'';
nativeCheckInputs = [
unittestCheckHook
];
pythonImportsCheck = [ "evolutionary_search" ];
meta = with lib; {
description = "Use evolutionary algorithms instead of gridsearch in scikit-learn";
homepage = "https://github.com/rsteca/sklearn-deap";
license = licenses.lgpl3;
license = licenses.mit;
maintainers = with maintainers; [ psyanticy ];
# broken by scikit-learn 0.24.1
broken = true;
};
}

6
pkgs/development/tools/build-managers/sbt-extras/default.nix
View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "474915ff832c29944399fe1823d755dfcd587a5e";
version = "2023-07-25";
rev = "6918a7d323874cbc8d59d353f1ac8f105bb79b81";
version = "2023-08-28";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "+hrS2Hyh1mLEQBxZHpf6+uIb5cTYhq8odgvmVms2+G8=";
sha256 = "awRkk9mir/lcpPUEDnNeDSe+aynYKwKQd066cws5nhU=";
};
dontBuild = true;

4
pkgs/development/tools/misc/inotify-tools/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "inotify-tools";
version = "3.22.6.0";
version = "4.23.8.0";
src = fetchFromGitHub {
repo = "inotify-tools";
owner = "inotify-tools";
rev = finalAttrs.version;
hash = "sha256-EYWVSgwoMjAlc/V5kv+2jfxEqWVW/lEoIxVd+ctEMsk=";
hash = "sha256-aD5jzUbDfB57wE1PSA3a+79owspSn7rcoRe5HsPDSXI=";
};
configureFlags = [

6
pkgs/development/tools/rust/cargo-deny/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
version = "0.14.1";
version = "0.14.2";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-deny";
rev = version;
hash = "sha256-3k8UPA4zf2WfEZ8fnBhqpYH269nfecBv+68+7IDkuY4=";
hash = "sha256-IA5LaagNsAkSP7ut5iqUUI8DJMr7U+nwqVsCWR8mOnY=";
};
cargoHash = "sha256-w72T2MGtf6+YePscCHBWMzHXnB7+kdguZDuB7Hqs4rI=";
cargoHash = "sha256-xiVZNBIdnRorMZDabpfE6Pans3Nh56VA29fYRu7N5cE=";
nativeBuildInputs = [
pkg-config

6
pkgs/games/harmonist/default.nix
View File

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "harmonist";
version = "0.4.1";
version = "0.5.1";
src = fetchurl {
url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz";
hash = "sha256-mtvvdim0CNtdM+/VU2j+FE2oLpt0Tz1/tNTa9H/FS6U=";
hash = "sha256-NkUrBvOOs6yctW4CVRpJNcdfdPvUJZp9HaWLS7eO4yE=";
};
vendorHash = "sha256-SrvJXTyLtPZ2PyhSZz/gJvuso9r7e5NbGe7EJRf2XlI=";
vendorHash = "sha256-0DV32a2LYnfYzg/tqwear9uaaahNUIi0M8uWlXOQ5Ic=";
ldflags = [ "-s" "-w" ];

4
pkgs/os-specific/linux/fwts/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "fwts";
version = "23.05.00";
version = "23.07.00";
src = fetchzip {
url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
sha256 = "sha256-LRsxgvo7XQ62gPjdH4F+03MQyRZ1VxEwokI9RvVkpKI=";
sha256 = "sha256-Fo5qdb0eT8taYfPAf5LQu0toNXcoVjNoDgeeAlUfbs4=";
stripRoot = false;
};

6
pkgs/tools/admin/granted/default.nix
View File

@ -12,16 +12,16 @@
buildGoModule rec {
pname = "granted";
version = "0.14.2";
version = "0.14.4";
src = fetchFromGitHub {
owner = "common-fate";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BxtEMIWJaZaCtd5auGRq+F3VkRTZXGBa6GdLWgvC+ZE=";
sha256 = "sha256-haeFDAm44b4JgNbl983MjG3HQMvqrkiGSboCcf3uYmI=";
};
vendorHash = "sha256-tPWdzPJyjxcjDM5UgIeQek60Df/7dSaKedZF04tfu6Q=";
vendorHash = "sha256-B+d15b8ei1wn3F8L1Hgce2wRPoisoFwG6YgrbPikeOo=";
nativeBuildInputs = [ makeWrapper ];

6
pkgs/tools/bluetooth/bluetuith/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bluetuith";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "darkhz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9fhgld0jhljvDMsRlU+jXsJla2oNjdsFm8TbmmvcoL4=";
sha256 = "sha256-8FVXVawmaCgnsexnNRw53tVR2a2fRyDK+h959Ezw7Zg=";
};
vendorHash = "sha256-eSgjIZmD5HL8S1XY0LK2IeWDchjFWBlRq5qriBg7l2U=";
vendorHash = "sha256-mudJN7rYWpdv2X4hrYjPBtEILyrdext4q+maDK1dC44=";
ldflags = [ "-s" "-w" ];

4
pkgs/tools/misc/riemann-c-client/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "riemann-c-client";
version = "1.10.5";
version = "2.1.1";
src = fetchFromGitea {
domain = "git.madhouse-project.org";
owner = "algernon";
repo = "riemann-c-client";
rev = "riemann-c-client-${version}";
sha256 = "1w4wi5mr0vgbsx8pv9s08i409qqlfivsa979zyq4miyga1f3vqif";
sha256 = "sha256-FIhTT57g2uZBaH3EPNxNUNJn9n+0ZOhI6WMyF+xIr/Q=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

35
pkgs/tools/security/weggli/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, rustPlatform
, fetchFromGitHub
, testers
, weggli
}:
rustPlatform.buildRustPackage rec {
pname = "weggli";
version = "0.2.4";
src = fetchFromGitHub {
owner = "weggli-rs";
repo = "weggli";
rev = "v${version}";
hash = "sha256-6XSedsTUjcZzFXaNitsXlUBpxC6TYVMCB+AfH3x7c5E=";
};
cargoSha256 = "sha256-Cj/m4GRaqI/lHYFruj047B7FdGoVl/wC8I2o1dzhOTs=";
passthru.tests.version = testers.testVersion {
package = weggli;
command = "weggli -V";
version = "weggli ${version}";
};
meta = with lib; {
description = "Weggli is a fast and robust semantic search tool for C and C++ codebases";
homepage = "https://github.com/weggli-rs/weggli";
changelog = "https://github.com/weggli-rs/weggli/releases/tag/v${version}";
mainProgram = "weggli";
license = licenses.asl20;
maintainers = with maintainers; [ arturcygan mfrw ];
};
}

4
pkgs/tools/typesetting/sile/default.nix
View File

@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.14.10";
version = "0.14.11";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "05jqr9lqy33zgi1wb0gn3j9w78sswznwbpaaz8i3jvrs1l1wd2i0";
sha256 = "sha256-JXlgiK1XyZZSe5QXz06zwEAnVYhiIZhhIaBmfxAgRS4=";
};
configureFlags = [

3
pkgs/top-level/aliases.nix
View File

@ -1966,8 +1966,7 @@ mapAliases ({
zinc = zincsearch; # Added 2023-05-28
zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
# branch-off
### UNSORTED ###
ocamlPackages_latest = throw "'ocamlPackages_latest' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_latest'"; # Converted to throw 2022-02-22

2
pkgs/top-level/all-packages.nix
View File

@ -42199,6 +42199,8 @@ with pkgs;
wpm = callPackage ../applications/misc/wpm { };
weggli = callPackage ../tools/security/weggli { };
yazi = callPackage ../applications/file-managers/yazi { inherit (darwin.apple_sdk.frameworks) Foundation; };
ssl-proxy = callPackage ../tools/networking/ssl-proxy { };

1
pkgs/top-level/python-aliases.nix
View File

@ -193,6 +193,7 @@ mapAliases ({
JPype1 = jpype1; # added 2023-02-19
jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28
jupyter_client = jupyter-client; # added 2021-10-15
jupyter_console = jupyter-console; # added 2023-07-31
jupyter_core = jupyter-core; # added 2023-01-05
jupyter_server = jupyter-server; # added 2023-01-05
jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18

2
pkgs/top-level/python-packages.nix
View File

@ -5607,7 +5607,7 @@ self: super: with self; {
jupyter-contrib-nbextensions = callPackage ../development/python-modules/jupyter-contrib-nbextensions { };
jupyter_console = callPackage ../development/python-modules/jupyter_console { };
jupyter-console = callPackage ../development/python-modules/jupyter-console { };
jupyter-core = callPackage ../development/python-modules/jupyter-core { };