b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-02-28 12:01:10 +00:00 committed by GitHub
parent 1bdff1c212 f49aa165fb
commit e71c1249e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 505 additions and 550 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -7904,12 +7904,6 @@
github = "kira-bruneau";
githubId = 382041;
};
meutraa = {
email = "paul+nixpkgs@lost.host";
name = "Paul Meredith";
github = "meutraa";
githubId = 68550871;
};
mephistophiles = {
email = "mussitantesmortem@gmail.com";
name = "Maxim Zhukov";

5
nixos/lib/utils.nix
View file

@ -150,7 +150,8 @@ rec {
rm '${output}'
fi
inherit_errexit_restore=$(shopt -p inherit_errexit)
inherit_errexit_enabled=0
shopt -pq inherit_errexit && inherit_errexit_enabled=1
shopt -s inherit_errexit
''
+ concatStringsSep
@ -170,7 +171,7 @@ rec {
' <<'EOF'
${builtins.toJSON set}
EOF
$inherit_errexit_restore
(( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit
'';
systemdUtils = {

1
nixos/modules/services/logging/logrotate.nix
View file

@ -167,7 +167,6 @@ in
systemd.services.logrotate = {
description = "Logrotate Service";
wantedBy = [ "multi-user.target" ];
startAt = "hourly";
serviceConfig = {

17
nixos/tests/logrotate.nix
View file

@ -15,20 +15,21 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
with subtest("whether logrotate works"):
machine.succeed(
# we must rotate once first to create logrotate stamp
"systemctl start --wait logrotate.service",
"systemctl start logrotate.service")
# we need to wait for console text once here to
# clear console buffer up to this point for next wait
machine.wait_for_console_text('logrotate.service: Deactivated successfully')
machine.succeed(
# wtmp is present in default config.
"rm -f /var/log/wtmp*",
# we need to give it at least 1MB
"dd if=/dev/zero of=/var/log/wtmp bs=2M count=1",
# move into the future and rotate
"date -s 'now + 1 month + 1 day'",
# systemd will run logrotate from logrotate.timer automatically
# on date change, but if we want to wait for it to terminate
# it's easier to run again...
"systemctl start --wait logrotate.service",
# move into the future and check rotation.
"date -s 'now + 1 month + 1 day'")
machine.wait_for_console_text('logrotate.service: Deactivated successfully')
machine.succeed(
# check rotate worked
"[ -e /var/log/wtmp.1 ]",
)

2
nixos/tests/switch-test.nix
View file

@ -283,6 +283,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
systemd.services.test-watch = {
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "${pkgs.coreutils}/bin/touch /testpath-modified";
};
};
@ -723,6 +724,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
machine.succeed("touch /testpath")
machine.wait_until_succeeds("test -f /testpath-modified")
machine.succeed("rm /testpath /testpath-modified")
machine.systemctl("stop test-watch.service")
switch_to_specialisation("${machine}", "pathModified")
machine.succeed("touch /testpath")
machine.fail("test -f /testpath-modified")

6
pkgs/applications/editors/android-studio/common.nix
View file

@ -216,9 +216,9 @@ in runCommand
# source-code itself).
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; rec {
stable = [ meutraa fabianhjr ];
beta = [ meutraa fabianhjr ];
canary = [ meutraa fabianhjr ];
stable = [ fabianhjr ];
beta = [ fabianhjr ];
canary = [ fabianhjr ];
dev = canary;
}."${channel}";
};

4
pkgs/applications/editors/okteta/default.nix
View file

@ -4,11 +4,11 @@
mkDerivation rec {
pname = "okteta";
version = "0.26.6";
version = "0.26.7";
src = fetchurl {
url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
sha256 = "sha256-xWnNW1VQPkbfGltckWKwiIjEJqpSxvPy+SbGWL7gFEw=";
sha256 = "sha256-8SO1VpDWz19UfppdtziiZymoLnvQLMAAIjjOTZ/VMOM=";
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

4
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -1879,8 +1879,8 @@ let
mktplcRef = {
publisher = "takayama";
name = "vscode-qq";
version = "1.4.0";
sha256 = "sha256-DYjNWSKOrDYvdiV7G24uKz6w4ggeYUMkQIiOGZAbMSI=";
version = "1.4.2";
sha256 = "sha256-koeiFXUFI/i8EGCRDTym62m7JER18J9MKZpbAozr0Ng=";
};
meta = {
license = lib.licenses.mpl20;

3
pkgs/applications/kde/default.nix
View file

@ -186,6 +186,7 @@ let
kteatime = callPackage ./kteatime.nix {};
ktimer = callPackage ./ktimer.nix {};
ktnef = callPackage ./ktnef.nix {};
ktorrent = callPackage ./ktorrent.nix {};
ktouch = callPackage ./ktouch.nix {};
kturtle = callPackage ./kturtle.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
@ -203,6 +204,7 @@ let
libkomparediff2 = callPackage ./libkomparediff2.nix {};
libksane = callPackage ./libksane.nix {};
libksieve = callPackage ./libksieve.nix {};
libktorrent = callPackage ./libktorrent.nix {};
mailcommon = callPackage ./mailcommon.nix {};
mailimporter = callPackage ./mailimporter.nix {};
marble = callPackage ./marble.nix {};
@ -216,6 +218,7 @@ let
pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
print-manager = callPackage ./print-manager.nix {};
rocs = callPackage ./rocs.nix {};
skanlite = callPackage ./skanlite.nix {};
spectacle = callPackage ./spectacle.nix {};
yakuake = callPackage ./yakuake.nix {};
};

22
pkgs/applications/kde/ktorrent.nix Normal file
View file

@ -0,0 +1,22 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
karchive, kcmutils, kcrash, kdnssd, ki18n, knotifications, knotifyconfig,
kplotting, kross, libgcrypt, libktorrent, taglib
}:
mkDerivation {
pname = "ktorrent";
meta = with lib; {
description = "KDE integrated BtTorrent client";
homepage = "https://apps.kde.org/ktorrent/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ eelco ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
karchive kcmutils kcrash kdnssd ki18n knotifications knotifyconfig kplotting
kross libgcrypt libktorrent taglib
];
}

22
pkgs/applications/kde/libktorrent.nix Normal file
View file

@ -0,0 +1,22 @@
{
mkDerivation, lib,
extra-cmake-modules,
karchive, kcrash, ki18n, kio, libgcrypt, qca-qt5, solid,
boost, gmp
}:
mkDerivation {
pname = "libktorrent";
meta = with lib; {
description = "A BitTorrent library used by KTorrent";
homepage = "https://apps.kde.org/ktorrent/";
maintainers = with maintainers; [ eelco ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive kcrash ki18n kio libgcrypt qca-qt5 solid ];
propagatedBuildInputs = [ boost gmp ];
outputs = [ "out" "dev" ];
dontWrapQtApps = true;
}

18
pkgs/applications/kde/skanlite.nix Normal file
View file

@ -0,0 +1,18 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kio, libksane
}:
mkDerivation {
pname = "skanlite";
meta = with lib; {
description = "KDE simple image scanning application";
homepage = "https://apps.kde.org/skanlite";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ polendri ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kio libksane ];
}

2
pkgs/applications/networking/instant-messengers/mm/default.nix
View file

@ -16,6 +16,6 @@ buildGoModule {
description = "A file system based matrix client";
homepage = "https://git.lost.host/meutraa/mm";
license = licenses.isc;
maintainers = with maintainers; [ meutraa ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file

@ -70,7 +70,7 @@ let
in
env.mkDerivation rec {
pname = "telegram-desktop";
version = "3.4.8";
version = "3.5.2";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -79,7 +79,7 @@ env.mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "11h2w82i10zn55iz9xda8ihsnv6s8rxm3wkmmmkpa4zfzinryqb4";
sha256 = "05324xvb00yz2jfigyy7izk8wnq8phm3sidw62kf7xqyh63qnrzh";
};
postPatch = ''

8
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View file

@ -4,17 +4,18 @@
, openh264, usrsctp, libevent, libvpx
, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
, mesa, valgrind, libepoxy, libglvnd
}:
stdenv.mkDerivation {
pname = "tg_owt";
version = "unstable-2021-12-22";
version = "unstable-2022-02-09";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "6708e0d31a73e64fe12f54829bf4060c41b2658e";
sha256 = "081ylw8vp8c84x3f1xx1kia6k1sds2iza9fm5dvn3ccgjwxdm5ny";
rev = "4cba1acdd718b700bb33945c0258283689d4eac7";
sha256 = "0j201x9k38mvcyhf1wlyghyvdpv1l75xwgj9rl2l7r55afrpw4ca";
fetchSubmodules = true;
};
@ -27,6 +28,7 @@ stdenv.mkDerivation {
openh264 usrsctp libevent libvpx
libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi
glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire
mesa libepoxy libglvnd
];
cmakeFlags = [

6
pkgs/applications/networking/maestral-qt/default.nix
View file

@ -6,16 +6,18 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
version = "1.5.2";
version = "1.5.3";
disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "v${version}";
sha256 = "sha256-/wleUwTPkm5l8GgtBM2J0jsdc1A54WRYJPmHqSsdz4c=";
sha256 = "sha256-zaG9Zwz9S/SVb7xDa7eXkjLNt1BhA1cQ3I18rVt+8uQ=";
};
format = "pyproject";
propagatedBuildInputs = with python3.pkgs; [
click
markdown2

32
pkgs/applications/networking/p2p/ktorrent/default.nix
View file

@ -1,32 +0,0 @@
{ mkDerivation, lib, fetchurl, fetchpatch, cmake
, extra-cmake-modules, qtbase, qtscript
, karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig
, kdoctools, kross, kcmutils, kwindowsystem
, libktorrent, taglib, libgcrypt, kplotting
}:
mkDerivation rec {
pname = "ktorrent";
version = "${libktorrent.mainVersion}";
src = fetchurl {
url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz";
sha256 = "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534";
};
nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ];
buildInputs = [
qtbase qtscript
karchive kcrash kdnssd ki18n kio knotifications knotifyconfig kross kcmutils kwindowsystem
libktorrent taglib libgcrypt kplotting
];
meta = with lib; {
description = "KDE integrated BtTorrent client";
homepage = "https://www.kde.org/applications/internet/ktorrent/";
license = licenses.gpl2;
maintainers = with maintainers; [ eelco ];
platforms = platforms.linux;
};
}

30
pkgs/applications/office/skanlite/default.nix
View file

@ -1,30 +0,0 @@
{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase,
kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets,
libksane
}:
mkDerivation rec {
pname = "skanlite";
version = "2.2.0";
src = fetchurl {
url = "mirror://kde/stable/skanlite/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "VP7MOZdUe64XIVr3r0aKIl1IPds3vjBTZzOS3N3VhOQ=";
};
nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ];
buildInputs = [
qtbase
kcoreaddons kdoctools ki18n kio kxmlgui ktextwidgets
libksane
];
meta = with lib; {
description = "KDE simple image scanning application";
homepage = "https://apps.kde.org/skanlite";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ polendri ];
platforms = platforms.linux;
};
}

8
pkgs/applications/science/logic/tlaplus/tlaps.nix
View file

@ -11,10 +11,10 @@
stdenv.mkDerivation rec {
pname = "tlaps";
version = "1.4.3";
version = "1.4.5";
src = fetchurl {
url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz";
sha256 = "1w5z3ns5xxmhmp8r4x2kjmy3clqam935gmvx82imyxrr1bamx6gf";
url = "https://tla.msr-inria.inria.fr/tlaps/dist/${version}/tlaps-${version}.tar.gz";
sha256 = "c296998acd14d5b93a8d5be7ee178007ef179957465966576bda26944b1b7fca";
};
buildInputs = [ ocaml isabelle cvc3 perl wget which ];
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html";
license = lib.licenses.bsd2;
platforms = lib.platforms.unix;
maintainers = [ ];
maintainers = with lib.maintainers; [ florentc ];
};
}

16
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,14 +1,14 @@
{
"version": "14.7.4",
"repo_hash": "0z62p2c24h7icdqar2l3nwlq7z4pan6n80ril8j1y6k03z1cs0nq",
"yarn_hash": "12k2r1y7kw95kfsmy0s8rbsf0vldr8c2liah0rkc7pihr19gq3w7",
"version": "14.8.2",
"repo_hash": "1pl528qxsbg75l5nny7cw8hcsd0zs50hhn0ngdrf3gjpd6y7pzcc",
"yarn_hash": "0dlhslkhiha4jyfzm0k8i9cgwdk12r5m67i2rznxbrkl38gk9c1x",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.7.4-ee",
"rev": "v14.8.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "14.7.4",
"GITLAB_PAGES_VERSION": "1.51.0",
"GITLAB_SHELL_VERSION": "13.22.2",
"GITLAB_WORKHORSE_VERSION": "14.7.4"
"GITALY_SERVER_VERSION": "14.8.2",
"GITLAB_PAGES_VERSION": "1.54.0",
"GITLAB_SHELL_VERSION": "13.23.2",
"GITLAB_WORKHORSE_VERSION": "14.8.2"
}
}

7
pkgs/applications/version-management/gitlab/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
, gitlabEnterprise ? false, callPackage, yarn
, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps
, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper
}:
let
@ -120,7 +120,7 @@ stdenv.mkDerivation {
inherit src;
buildInputs = [
rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools
rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools makeWrapper
];
patches = [
@ -174,6 +174,9 @@ stdenv.mkDerivation {
# rake tasks to mitigate CVE-2017-0882
# see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/
cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake
# manually patch the shebang line in generate-loose-foreign-key
wrapProgram $out/share/gitlab/scripts/decomposition/generate-loose-foreign-key --set ENABLE_SPRING 0 --add-flags 'runner -e test'
'';
passthru = {

2
pkgs/applications/version-management/gitlab/gitaly/Gemfile
View file

@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem 'rugged', '~> 1.2'
gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.1.4.4'
gem 'activesupport', '~> 6.1.4.6'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false

20
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View file

@ -2,20 +2,20 @@ GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
actionpack (6.1.4.4)
actionview (= 6.1.4.4)
activesupport (= 6.1.4.4)
actionpack (6.1.4.6)
actionview (= 6.1.4.6)
activesupport (= 6.1.4.6)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.4.4)
activesupport (= 6.1.4.4)
actionview (6.1.4.6)
activesupport (= 6.1.4.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.1.4.4)
activesupport (6.1.4.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -88,7 +88,7 @@ GEM
google-protobuf (~> 3.18)
googleapis-common-protos-types (~> 1.0)
grpc-tools (1.42.0)
i18n (1.8.11)
i18n (1.9.1)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaeger-client (1.1.0)
@ -101,7 +101,7 @@ GEM
reverse_markdown (~> 1.0)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
loofah (2.13.0)
loofah (2.14.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
@ -219,13 +219,13 @@ GEM
with_env (1.1.0)
xml-simple (1.1.9)
rexml
zeitwerk (2.5.3)
zeitwerk (2.5.4)
PLATFORMS
ruby
DEPENDENCIES
activesupport (~> 6.1.4.4)
activesupport (~> 6.1.4.6)
factory_bot
faraday (~> 1.0)
github-linguist (~> 7.12)

26
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -1,23 +1,9 @@
{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby
, bundlerEnv, pkg-config
# libgit2 + dependencies
, libgit2, openssl, zlib, pcre, http-parser }:
, libgit2_1_3_0, openssl, zlib, pcre, http-parser }:
let
# git2go 32.0.5 does not support libgit2 1.2.0 or 1.3.0.
# It needs a specific commit in between those two releases.
libgit2_custom = libgit2.overrideAttrs (oldAttrs: rec {
version = "1.2.0";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e";
sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI=";
};
patches = [];
});
rubyEnv = bundlerEnv rec {
name = "gitaly-env";
inherit ruby;
@ -25,7 +11,7 @@ let
gemdir = ./.;
};
version = "14.7.4";
version = "14.8.2";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
@ -37,10 +23,10 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-sNSRYqGIi/PzegHYe04WUaLegPEeX79NjuqSVul21Ak=";
sha256 = "sha256-GgQscKxxYpvzU2M99gmvGj0HM/oD+2Ke24FRzUxv6HM=";
};
vendorSha256 = "sha256-eapqtSstc7d3R7A/5krKV0uVr9GhGkHHMrmsBOpWAbo=";
vendorSha256 = "sha256-Qw9/nlo1eB5dPcldXe9doy4QA4DDVUDad3o4kbdNu34=";
passthru = {
inherit rubyEnv;
@ -50,7 +36,7 @@ buildGoModule {
tags = [ "static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit2_custom openssl zlib pcre http-parser ];
buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ];
doCheck = false;
postInstall = ''
@ -65,7 +51,7 @@ buildGoModule {
homepage = "https://gitlab.com/gitlab-org/gitaly";
description = "A Git RPC service for handling all the git calls made by GitLab";
platforms = platforms.linux ++ [ "x86_64-darwin" ];
maintainers = with maintainers; [ roblabla globin fpletz talyz ];
maintainers = with maintainers; [ roblabla globin fpletz talyz yayayayaka ];
license = licenses.mit;
};
}

24
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View file

@ -13,10 +13,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9";
sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -24,10 +24,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm";
sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -35,10 +35,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98";
sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@ -343,10 +343,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8";
type = "gem";
};
version = "1.8.11";
version = "1.9.1";
};
ice_nine = {
source = {
@ -394,10 +394,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg";
sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w";
type = "gem";
};
version = "2.13.0";
version = "2.14.0";
};
memoizable = {
dependencies = ["thread_safe"];
@ -994,9 +994,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx";
sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem";
};
version = "2.5.3";
version = "2.5.4";
};
}

8
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View file

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "13.22.2";
version = "13.23.2";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-jAH/MKmCIybLXsypHehQJaKf+mK9ko5XqWoDH/XKE5w=";
sha256 = "sha256-aee+Tn81o1iK1Xm5et6lKUN8//lyGh3NGs96Mwg4nFc=";
};
buildInputs = [ ruby ];
patches = [ ./remove-hardcoded-locations.patch ];
vendorSha256 = "sha256-cE6phpVYcZNCEk6bElEksIf4GOr/5vJPRdlGCubRafE=";
vendorSha256 = "sha256-RLV01CM5O0K4R8XDDcas2LjIig0S7GoyAo/S8+Vx2bY=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
@ -26,7 +26,7 @@ buildGoModule rec {
description = "SSH access and repository management app for GitLab";
homepage = "http://www.gitlab.com/";
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin talyz ];
maintainers = with maintainers; [ fpletz globin talyz yayayayaka ];
license = licenses.mit;
};
}

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

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "14.7.4";
version = "14.8.2";
src = fetchFromGitLab {
owner = data.owner;
@ -24,7 +24,7 @@ buildGoModule rec {
meta = with lib; {
homepage = "http://www.gitlab.com/";
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin talyz ];
maintainers = with maintainers; [ fpletz globin talyz yayayayaka ];
license = licenses.mit;
};
}

10
pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
View file

@ -207,3 +207,13 @@ index 567c7540777..29906b1c132 100644
end
end
end
diff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-key
index 35f84c64ce1..c2fecf3404c 100755
--- a/scripts/decomposition/generate-loose-foreign-key
+++ b/scripts/decomposition/generate-loose-foreign-key
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S ENABLE_SPRING=0 bin/rails runner -e test
+#!/usr/bin/env rails
# This is helper script to swap foreign key to loose foreign key
# using DB schema

29
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View file

@ -2,7 +2,7 @@
source 'https://rubygems.org'
gem 'rails', '~> 6.1.4.4'
gem 'rails', '~> 6.1.4.6'
gem 'bootsnap', '~> 1.9.1', require: false
@ -72,7 +72,7 @@ gem 'u2f', '~> 0.2.1'
# GitLab Pages
gem 'validates_hostname', '~> 1.0.11'
gem 'rubyzip', '~> 2.0.0', require: 'zip'
gem 'rubyzip', '~> 2.3.2', require: 'zip'
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.9'
@ -183,7 +183,7 @@ gem 'rack', '~> 2.2.3'
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
group :puma do
gem 'puma', '~> 5.5.2', require: false
gem 'puma', '~> 5.6.2', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false
end
@ -195,7 +195,7 @@ gem 'state_machines-activerecord', '~> 0.8.0'
gem 'acts-as-taggable-on', '~> 9.0'
# Background jobs
gem 'sidekiq', '~> 6.3'
gem 'sidekiq', '~> 6.4'
gem 'sidekiq-cron', '~> 1.2'
gem 'redis-namespace', '~> 1.8.1'
gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
@ -295,7 +295,7 @@ gem 'gon', '~> 6.4.0'
gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0'
gem 'gitlab-license', '~> 2.0'
gem 'gitlab-license', '~> 2.1.0'
# Protect against bruteforcing
gem 'rack-attack', '~> 6.3.0'
@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.21.3'
gem 'gitlab-labkit', '~> 0.22.0'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0'
@ -396,7 +396,7 @@ group :development, :test do
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 2.6.1', require: false
gem 'gitlab-dangerfiles', '~> 2.8.0', require: false
end
group :development, :test, :coverage do
@ -466,21 +466,14 @@ gem 'sys-filesystem', '~> 1.4.3'
# NTP client
gem 'net-ntp'
# SSH host key support
gem 'net-ssh', '~> 6.0'
gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support
group :ed25519 do
gem 'ed25519', '~> 1.2'
gem 'bcrypt_pbkdf', '~> 1.1'
end
# SSH keys support
gem 'ssh_data', '~> 1.2'
# Spamcheck GRPC protocol definitions
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 14.6.0.pre.rc1'
gem 'gitaly', '~> 14.8.0.pre.rc1'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
@ -496,7 +489,7 @@ gem 'flipper', '~> 0.21.0'
gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0'
gem 'unleash', '~> 3.2.2'
gem 'gitlab-experiment', '~> 0.6.5'
gem 'gitlab-experiment', '~> 0.7.0'
# Structured logging
gem 'lograge', '~> 0.5'

172
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View file

@ -4,63 +4,63 @@ GEM
RedCloth (4.3.2)
acme-client (2.0.9)
faraday (>= 0.17, < 2.0.0)
actioncable (6.1.4.4)
actionpack (= 6.1.4.4)
activesupport (= 6.1.4.4)
actioncable (6.1.4.6)
actionpack (= 6.1.4.6)
activesupport (= 6.1.4.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.4.4)
actionpack (= 6.1.4.4)
activejob (= 6.1.4.4)
activerecord (= 6.1.4.4)
activestorage (= 6.1.4.4)
activesupport (= 6.1.4.4)
actionmailbox (6.1.4.6)
actionpack (= 6.1.4.6)
activejob (= 6.1.4.6)
activerecord (= 6.1.4.6)
activestorage (= 6.1.4.6)
activesupport (= 6.1.4.6)
mail (>= 2.7.1)
actionmailer (6.1.4.4)
actionpack (= 6.1.4.4)
actionview (= 6.1.4.4)
activejob (= 6.1.4.4)
activesupport (= 6.1.4.4)
actionmailer (6.1.4.6)
actionpack (= 6.1.4.6)
actionview (= 6.1.4.6)
activejob (= 6.1.4.6)
activesupport (= 6.1.4.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.4.4)
actionview (= 6.1.4.4)
activesupport (= 6.1.4.4)
actionpack (6.1.4.6)
actionview (= 6.1.4.6)
activesupport (= 6.1.4.6)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.4.4)
actionpack (= 6.1.4.4)
activerecord (= 6.1.4.4)
activestorage (= 6.1.4.4)
activesupport (= 6.1.4.4)
actiontext (6.1.4.6)
actionpack (= 6.1.4.6)
activerecord (= 6.1.4.6)
activestorage (= 6.1.4.6)
activesupport (= 6.1.4.6)
nokogiri (>= 1.8.5)
actionview (6.1.4.4)
activesupport (= 6.1.4.4)
actionview (6.1.4.6)
activesupport (= 6.1.4.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.4.4)
activesupport (= 6.1.4.4)
activejob (6.1.4.6)
activesupport (= 6.1.4.6)
globalid (>= 0.3.6)
activemodel (6.1.4.4)
activesupport (= 6.1.4.4)
activerecord (6.1.4.4)
activemodel (= 6.1.4.4)
activesupport (= 6.1.4.4)
activemodel (6.1.4.6)
activesupport (= 6.1.4.6)
activerecord (6.1.4.6)
activemodel (= 6.1.4.6)
activesupport (= 6.1.4.6)
activerecord-explain-analyze (0.1.0)
activerecord (>= 4)
pg
activestorage (6.1.4.4)
actionpack (= 6.1.4.4)
activejob (= 6.1.4.4)
activerecord (= 6.1.4.4)
activesupport (= 6.1.4.4)
activestorage (6.1.4.6)
actionpack (= 6.1.4.6)
activejob (= 6.1.4.6)
activerecord (= 6.1.4.6)
activesupport (= 6.1.4.6)
marcel (~> 1.0.0)
mini_mime (>= 1.1.0)
activesupport (6.1.4.4)
activesupport (6.1.4.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -130,7 +130,6 @@ GEM
base32 (0.3.2)
batch-loader (2.0.1)
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
benchmark (0.1.1)
benchmark-ips (2.3.0)
benchmark-memory (0.1.2)
@ -186,7 +185,7 @@ GEM
childprocess (3.0.0)
chunky_png (1.3.5)
citrus (3.0.2)
claide (1.0.3)
claide (1.1.0)
claide-plugins (0.9.2)
cork
nap
@ -195,7 +194,7 @@ GEM
colored2 (3.1.2)
commonmarker (0.23.2)
concurrent-ruby (1.1.9)
connection_pool (2.2.2)
connection_pool (2.2.5)
contracts (0.11.0)
cork (0.3.0)
colored2 (~> 3.1)
@ -301,7 +300,6 @@ GEM
e2mmap (0.1.0)
ecma-re-validator (0.3.0)
regexp_parser (~> 2.0)
ed25519 (1.2.4)
elasticsearch (6.8.2)
elasticsearch-api (= 6.8.2)
elasticsearch-transport (= 6.8.2)
@ -444,7 +442,7 @@ GEM
rails (>= 3.2.0)
git (1.7.0)
rchardet (~> 1.8)
gitaly (14.6.0.pre.rc1)
gitaly (14.8.0.pre.rc1)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab (4.16.1)
@ -452,13 +450,12 @@ GEM
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (2.6.1)
gitlab-dangerfiles (2.8.0)
danger (>= 8.3.1)
danger-gitlab (>= 8.0.0)
gitlab-experiment (0.6.5)
gitlab-experiment (0.7.0)
activesupport (>= 3.0)
request_store (>= 1.0)
scientist (~> 1.6, >= 1.6.0)
gitlab-fog-azure-rm (1.2.0)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
@ -466,15 +463,15 @@ GEM
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.21.3)
gitlab-labkit (0.22.0)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
grpc (>= 1.37)
jaeger-client (~> 1.1)
jaeger-client (~> 1.1.0)
opentracing (~> 0.4)
pg_query (~> 2.1)
redis (> 3.0.0, < 5.0.0)
gitlab-license (2.0.0)
gitlab-license (2.1.0)
gitlab-license_finder (6.14.2.1)
bundler
rubyzip (>= 1, < 3)
@ -626,7 +623,7 @@ GEM
http-form_data (~> 2.2)
http-parser (~> 1.2.0)
http-accept (1.7.0)
http-cookie (1.0.3)
http-cookie (1.0.4)
domain_name (~> 0.5)
http-form_data (2.3.0)
http-parser (1.2.3)
@ -635,7 +632,7 @@ GEM
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.8.11)
i18n (1.9.1)
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
icalendar (2.4.1)
@ -937,7 +934,7 @@ GEM
tty-markdown
tty-prompt
public_suffix (4.0.6)
puma (5.5.2)
puma (5.6.2)
nio4r (~> 2.0)
puma_worker_killer (0.3.1)
get_process_mem (~> 0.2)
@ -963,20 +960,20 @@ GEM
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.5.2)
rails (6.1.4.4)
actioncable (= 6.1.4.4)
actionmailbox (= 6.1.4.4)
actionmailer (= 6.1.4.4)
actionpack (= 6.1.4.4)
actiontext (= 6.1.4.4)
actionview (= 6.1.4.4)
activejob (= 6.1.4.4)
activemodel (= 6.1.4.4)
activerecord (= 6.1.4.4)
activestorage (= 6.1.4.4)
activesupport (= 6.1.4.4)
rails (6.1.4.6)
actioncable (= 6.1.4.6)
actionmailbox (= 6.1.4.6)
actionmailer (= 6.1.4.6)
actionpack (= 6.1.4.6)
actiontext (= 6.1.4.6)
actionview (= 6.1.4.6)
activejob (= 6.1.4.6)
activemodel (= 6.1.4.6)
activerecord (= 6.1.4.6)
activestorage (= 6.1.4.6)
activesupport (= 6.1.4.6)
bundler (>= 1.15.0)
railties (= 6.1.4.4)
railties (= 6.1.4.6)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
@ -990,9 +987,9 @@ GEM
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
railties (6.1.4.4)
actionpack (= 6.1.4.4)
activesupport (= 6.1.4.4)
railties (6.1.4.6)
actionpack (= 6.1.4.6)
activesupport (= 6.1.4.6)
method_source
rake (>= 0.13)
thor (~> 1.0)
@ -1024,13 +1021,13 @@ GEM
redis-store (>= 1.2, < 2)
redis-store (1.9.0)
redis (>= 4, < 5)
regexp_parser (2.1.1)
regexp_parser (2.2.1)
regexp_property_values (1.0.0)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
request_store (1.5.0)
request_store (1.5.1)
rack (>= 1.4)
responders (3.0.0)
actionpack (>= 5.0)
@ -1127,7 +1124,7 @@ GEM
sexp_processor (~> 4.9)
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (2.0.0)
rubyzip (2.3.2)
rugged (1.2.0)
safe_yaml (1.0.4)
safety_net_attestation (0.4.0)
@ -1140,9 +1137,8 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.0.1)
sassc (2.4.0)
ffi (~> 1.9)
rake
sassc-rails (2.1.0)
railties (>= 4.0.0)
sassc (>= 2.0)
@ -1152,7 +1148,6 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
scientist (1.6.2)
sd_notify (0.1.0)
securecompare (1.0.0)
seed-fu (2.3.7)
@ -1169,7 +1164,7 @@ GEM
shellany (0.0.1)
shoulda-matchers (4.0.1)
activesupport (>= 4.2.0)
sidekiq (6.3.1)
sidekiq (6.4.0)
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
@ -1225,7 +1220,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
sshkey (2.0.0)
ssh_data (1.2.0)
ssrf_filter (1.0.7)
stackprof (0.2.15)
state_machines (0.5.0)
@ -1312,7 +1307,7 @@ GEM
rugged (>= 0.27, < 1.3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unf_ext (0.0.8)
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uniform_notifier (1.13.0)
@ -1372,7 +1367,7 @@ GEM
nokogiri (~> 1.8)
yajl-ruby (1.4.1)
yard (0.9.26)
zeitwerk (2.5.3)
zeitwerk (2.5.4)
PLATFORMS
ruby
@ -1401,7 +1396,6 @@ DEPENDENCIES
base32 (~> 0.3.0)
batch-loader (~> 2.0.1)
bcrypt (~> 3.1, >= 3.1.14)
bcrypt_pbkdf (~> 1.1)
benchmark-ips (~> 2.3.0)
benchmark-memory (~> 0.1)
better_errors (~> 2.9.0)
@ -1434,7 +1428,6 @@ DEPENDENCIES
discordrb-webhooks (~> 3.4)
doorkeeper (~> 5.5.0.rc2)
doorkeeper-openid_connect (~> 1.7.5)
ed25519 (~> 1.2)
elasticsearch-api (~> 6.8.2)
elasticsearch-model (~> 6.1)
elasticsearch-rails (~> 6.1)
@ -1463,14 +1456,14 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 14.6.0.pre.rc1)
gitaly (~> 14.8.0.pre.rc1)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 2.6.1)
gitlab-experiment (~> 0.6.5)
gitlab-dangerfiles (~> 2.8.0)
gitlab-experiment (~> 0.7.0)
gitlab-fog-azure-rm (~> 1.2.0)
gitlab-labkit (~> 0.21.3)
gitlab-license (~> 2.0)
gitlab-labkit (~> 0.22.0)
gitlab-license (~> 2.1.0)
gitlab-license_finder (~> 6.0)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.8.0)
@ -1534,7 +1527,6 @@ DEPENDENCIES
multi_json (~> 1.14.1)
net-ldap (~> 0.16.3)
net-ntp
net-ssh (~> 6.0)
nokogiri (~> 1.12)
oauth2 (~> 1.4)
octokit (~> 4.15)
@ -1571,7 +1563,7 @@ DEPENDENCIES
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.5.0)
puma (~> 5.5.2)
puma (~> 5.6.2)
puma_worker_killer (~> 0.3.1)
rack (~> 2.2.3)
rack-attack (~> 6.3.0)
@ -1579,7 +1571,7 @@ DEPENDENCIES
rack-oauth2 (~> 1.16.0)
rack-proxy (~> 0.6.0)
rack-timeout (~> 0.5.1)
rails (~> 6.1.4.4)
rails (~> 6.1.4.6)
rails-controller-testing
rails-i18n (~> 6.0)
rainbow (~> 3.0)
@ -1607,7 +1599,7 @@ DEPENDENCIES
ruby-progressbar (~> 1.10)
ruby-saml (~> 1.13.0)
ruby_parser (~> 3.15)
rubyzip (~> 2.0.0)
rubyzip (~> 2.3.2)
rugged (~> 1.2)
sanitize (~> 6.0)
sassc-rails (~> 2.1.0)
@ -1617,7 +1609,7 @@ DEPENDENCIES
sentry-raven (~> 3.1)
settingslogic (~> 2.0.9)
shoulda-matchers (~> 4.0.1)
sidekiq (~> 6.3)
sidekiq (~> 6.4)
sidekiq-cron (~> 1.2)
simple_po_parser (~> 1.1.2)
simplecov (~> 0.18.5)
@ -1631,7 +1623,7 @@ DEPENDENCIES
spring-commands-rspec (~> 1.0.4)
sprite-factory (~> 1.7)
sprockets (~> 3.7.0)
sshkey (~> 2.0)
ssh_data (~> 1.2)
stackprof (~> 0.2.15)
state_machines-activerecord (~> 0.8.0)
sys-filesystem (~> 1.4.3)

162
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View file

@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z3ab9n901craqd3p1yl87kawci0vfw1xlh4d0zkj7lx8hpk10sn";
sha256 = "0abclh3rd7s2k88bj40jn9wcmal8dcybvn5xrnl80xknmxh3zigp";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q94js7ifm0a76xcwxin98bhr8nz0zqcsqi4y7j2mfwm3hq3bh0i";
sha256 = "0qhnkz4fs45zid30lnc77m4rw7an6pp2pdmkwkn6cczikqz5sklw";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gncnc5xl1ff70mfnqcys2qy65201yjrkwxx0hb5hl7jlamgvz9h";
sha256 = "0mqcmxv28wy2jrpk9vghq7njjr03drw0ab3hw64j2d9kbpnpb8w8";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9";
sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j9591z8lsp9lx3l75699prw6rgkhhlrfaj4lh5klcdffvxzkvi3";
sha256 = "1n2n52m5j6h370r5j18w76kgqzzkcv8x72p040l16ax40ysglq7p";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm";
sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sf0nfjcj1na4v6zaxz6hjglax99yznaymjzpk1fi7mk71qf5hx4";
sha256 = "02dnr16mgwp98n9q733nprfx7dn09z6pa11cfk0pivj8daad5x1l";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
activemodel = {
dependencies = ["activesupport"];
@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm";
sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik";
sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
activerecord-explain-analyze = {
dependencies = ["activerecord" "pg"];
@ -126,10 +126,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a6mmm1s8abv11ycqs6cq55kr6j89jpclkcnra9w2k47rl047vk4";
sha256 = "1kngq1555jphy5yhmz4yfigpk3ms4b65ynzy5yssrlhbmdf8r430";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -137,10 +137,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98";
sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
@ -479,16 +479,6 @@
};
version = "3.1.16";
};
bcrypt_pbkdf = {
groups = ["ed25519"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445";
type = "gem";
};
version = "1.1.0";
};
benchmark = {
groups = ["default" "development"];
platforms = [];
@ -745,14 +735,14 @@
version = "3.0.2";
};
claide = {
groups = ["default" "development"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d";
type = "gem";
};
version = "1.0.3";
version = "1.1.0";
};
claide-plugins = {
dependencies = ["cork" "nap" "open4"];
@ -814,10 +804,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68";
sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k";
type = "gem";
};
version = "2.2.2";
version = "2.2.5";
};
contracts = {
groups = ["default"];
@ -1253,16 +1243,6 @@
};
version = "0.3.0";
};
ed25519 = {
groups = ["ed25519"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
type = "gem";
};
version = "1.2.4";
};
elasticsearch = {
dependencies = ["elasticsearch-api" "elasticsearch-transport"];
groups = ["default"];
@ -1896,10 +1876,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "175whfk08jrmvssh5lgk0zgsaksbnhv6p5fg3picknrw4v05vw85";
sha256 = "0dl80qvyl1jbcc1iabpja3pnsrfag92h25c2r3vqn3bd0x9q4iwc";
type = "gem";
};
version = "14.6.0.pre.rc1";
version = "14.8.0.pre.rc1";
};
github-markup = {
groups = ["default"];
@ -1939,21 +1919,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pgb0v41qn2cnzzn4fizffds07vhz9sf09bpmm0lw86x8lz6vfdq";
sha256 = "0xd7sgl5iwxq2mvx7ql1wpciqrnj2z1ycjxm5ddrdi4kcl9f94z4";
type = "gem";
};
version = "2.6.1";
version = "2.8.0";
};
gitlab-experiment = {
dependencies = ["activesupport" "request_store" "scientist"];
dependencies = ["activesupport" "request_store"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "064iy0pgjfvfcxynclmk70cdi10hwx7xzq1c14p68cilg569vma2";
sha256 = "1ph12qxhml2iq02sad7hybi5yrc5zvz2spav2ahfh3ks2fvs7cbx";
type = "gem";
};
version = "0.6.5";
version = "0.7.0";
};
gitlab-fog-azure-rm = {
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
@ -1972,20 +1952,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05fs11wpqn801dsscs845629hbgwbgs94qhig45jmalw4h9rira4";
sha256 = "1vs5q1lfk5i953gv2xvz6h5x6ycllr8hdzg81zsrz7hy3aygxknj";
type = "gem";
};
version = "0.21.3";
version = "0.22.0";
};
gitlab-license = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01hddqd3167360m1h5lnrgxd0gmwhaisb9qz89rprhi5ckzyx2gz";
sha256 = "1ys98a5qwih4l9zllsysd48d7jl5qcw2ralav0hab3lxalmy5pwf";
type = "gem";
};
version = "2.0.0";
version = "2.1.0";
};
gitlab-license_finder = {
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
@ -2487,10 +2467,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
type = "gem";
};
version = "1.0.3";
version = "1.0.4";
};
http-form_data = {
groups = ["default"];
@ -2540,10 +2520,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8";
type = "gem";
};
version = "1.8.11";
version = "1.9.1";
};
i18n_data = {
groups = ["default"];
@ -3955,10 +3935,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn";
sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56";
type = "gem";
};
version = "5.5.2";
version = "5.6.2";
};
puma_worker_killer = {
dependencies = ["get_process_mem" "puma"];
@ -4093,10 +4073,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10vylypjzfp6c34zx175x7ql7h27llmjdhgjxp5bn2zmrx3lac8l";
sha256 = "01mvxg2rmwiqcw0alfd526axg7y1knj0lhy4i2mmxa3q0v7xb8za";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@ -4148,10 +4128,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nmyds2www6dmqbbd5ggq31gxxb9mwxd5llzmb3iyczssk6l7lla";
sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb";
type = "gem";
};
version = "6.1.4.4";
version = "6.1.4.6";
};
rainbow = {
groups = ["default" "development" "test"];
@ -4335,10 +4315,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr";
sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
type = "gem";
};
version = "2.1.1";
version = "2.2.1";
};
regexp_property_values = {
groups = ["default"];
@ -4367,10 +4347,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi";
sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7";
type = "gem";
};
version = "1.5.0";
version = "1.5.1";
};
responders = {
dependencies = ["actionpack" "railties"];
@ -4772,10 +4752,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz";
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
type = "gem";
};
version = "2.0.0";
version = "2.3.2";
};
rugged = {
groups = ["default"];
@ -4842,15 +4822,15 @@
version = "4.0.0";
};
sassc = {
dependencies = ["ffi" "rake"];
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4";
sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c";
type = "gem";
};
version = "2.0.1";
version = "2.4.0";
};
sassc-rails = {
dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"];
@ -4874,16 +4854,6 @@
};
version = "0.8.2";
};
scientist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05xiv6kznhawbkjrz97s6lp2ld0w95x1l2s80gm8m49f273399s2";
type = "gem";
};
version = "1.6.2";
};
sd_notify = {
groups = ["puma"];
platforms = [];
@ -4994,10 +4964,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k38cbwhcj9ncfzlgfmvq2zqfdvldln58w8s8v89m0jqlhnhsqhj";
sha256 = "10pllqwracvy5nmchipg359sq9pnyg08q970xpqmpc3nkmrihxlf";
type = "gem";
};
version = "6.3.1";
version = "6.4.0";
};
sidekiq-cron = {
dependencies = ["fugit" "sidekiq"];
@ -5200,15 +5170,15 @@
};
version = "1.3.13";
};
sshkey = {
ssh_data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
sha256 = "0p3vaq2fbmlphphqr0yjc5cyzzxjizq4zbxbbw3j2vpgdcmpi6bs";
type = "gem";
};
version = "2.0.0";
version = "1.2.0";
};
ssrf_filter = {
groups = ["default"];
@ -5645,10 +5615,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
type = "gem";
};
version = "0.0.7.7";
version = "0.0.8";
};
unicode-display_width = {
groups = ["default" "development" "test"];
@ -5948,9 +5918,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx";
sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem";
};
version = "2.5.3";
version = "2.5.4";
};
}

2
pkgs/applications/version-management/mercurial/default.nix
View file

@ -180,7 +180,7 @@ in
buildInputs = self.buildInputs ++ self.propagatedBuildInputs;
nativeBuildInputs = self.nativeBuildInputs;
phases = [ "installPhase" "installCheckPhase" ];
dontUnpack = true;
installPhase = ''
runHook preInstall

2
pkgs/development/compilers/crystal/build-package.nix
View file

@ -77,7 +77,7 @@ stdenv.mkDerivation (mkDerivationArgs // {
'')
crystalBinaries)
++ lib.optional (format == "shards")
"shards build --local --production ${lib.concatStringsSep " " defaultOptions}"
"shards build --local --production ${lib.concatStringsSep " " (args.options or defaultOptions)}"
++ [ "runHook postBuild" ]));
installPhase = args.installPhase or (lib.concatStringsSep "\n" ([

38
pkgs/development/libraries/libktorrent/default.nix
View file

@ -1,38 +0,0 @@
{ lib, stdenv, fetchurl, cmake, extra-cmake-modules
, karchive, kcrash, ki18n, kio, solid
, boost, gmp, qca-qt5, libgcrypt
}:
let
mainVersion = "5.1.2";
in stdenv.mkDerivation rec {
pname = "libktorrent";
version = "2.1.1";
src = fetchurl {
url = "mirror://kde/stable/ktorrent/${mainVersion}/${pname}-${version}.tar.xz";
sha256 = "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ];
propagatedBuildInputs = [ gmp boost ];
passthru = {
inherit mainVersion;
};
dontWrapQtApps = true;
meta = with lib; {
description = "A BitTorrent library used by KTorrent";
homepage = "https://www.kde.org/applications/internet/ktorrent/";
maintainers = with maintainers; [ eelco ];
platforms = platforms.linux;
};
}

31
pkgs/development/php-packages/phing/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phing";
version = "2.17.1";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://www.phing.info/get/phing-${version}.phar";
sha256 = "sha256-Sf2fdy9b1wmXEDA3S4CRksH/DhAIirIy6oekWE1TNjE=";
};
dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/phing/phing.phar
makeWrapper ${php}/bin/php $out/bin/phing \
--add-flags "$out/libexec/phing/phing.phar"
'';
meta = with lib; {
description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant";
license = licenses.lgpl3;
homepage = "https://github.com/phingofficial/phing";
maintainers = with maintainers; teams.php.members;
};
}

4
pkgs/development/python-modules/fastapi/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "fastapi";
version = "0.74.0";
version = "0.74.1";
format = "flit";
disabled = pythonOlder "3.6";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "tiangolo";
repo = pname;
rev = version;
sha256 = "sha256-pA+oaZpyRDeQ+b9jrzpYdm3LZQ5QWNjvfFRtUe8eDSo=";
sha256 = "sha256-aYSJ30nAS3cG1fVSXuX2m3bxUSnpbWWUxFQy7dzuiTA=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/maestral/default.nix
View file

@ -10,16 +10,18 @@
buildPythonPackage rec {
pname = "maestral";
version = "1.5.2";
version = "1.5.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "v${version}";
sha256 = "sha256-nFXgvFLw6ru/Sw3+LoZ7V09dyn0L21We/Dlwib2gZB8=";
sha256 = "sha256-Uo3vcYez2qSq162SSKjoCkwygwR5awzDceIq8/h3dao=";
};
format = "pyproject";
propagatedBuildInputs = [
click
desktop-notifier

4
pkgs/development/python-modules/oslo-db/default.nix
View file

@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "oslo-db";
version = "11.1.0";
version = "11.2.0";
src = fetchPypi {
pname = "oslo.db";
inherit version;
sha256 = "8469c54544f1c0d7ac0a998477033eab13733b186d159554311c6132b43862e9";
sha256 = "sha256-ezppPrC1BEkUmiJWGMdQtvDhZWyEJoGEe0e4UK1FYL4=";
};
nativeBuildInputs = [ pbr ];

4
pkgs/development/python-modules/slixmpp/default.nix
View file

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "slixmpp";
version = "1.7.1";
version = "1.8.0.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-mvg23FdHJZeIZRcm8GLWmm9DDTBt29jmsUHB/smVSec=";
sha256 = "sha256-J3znZl77jST94KhUBQcCxSK0qnsVWIYTG6u3po5FHh8=";
};
patches = [

4
pkgs/development/tools/analysis/checkov/default.nix
View file

@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.900";
version = "2.0.906";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-uhc09UiEe987pgs+6XPBKcERW5pL2PG3U1LEju4jWaM=";
hash = "sha256-sNwdbKaojDR8q/ugs+ot4ObpIodk2uJVvxcBQEb6d5A=";
};
nativeBuildInputs = with py.pkgs; [

15
pkgs/development/tools/build-managers/samurai/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
pname = "samurai";
@ -13,6 +13,19 @@ stdenv.mkDerivation rec {
makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ];
patches = [
(fetchpatch {
name = "CVE-2021-30218.patch";
url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch";
sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw=";
})
(fetchpatch {
name = "CVE-2021-30219.patch";
url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch";
sha256 = "sha256-rcdwKjHeq5Oaga9wezdHSg/7ljkynfbnkBc2ciMW5so=";
})
];
meta = with lib; {
description = "ninja-compatible build tool written in C";
homepage = "https://github.com/michaelforney/samurai";

24
pkgs/tools/filesystems/irods/common.nix
View file

@ -1,10 +1,13 @@
{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }:
{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq, libarchive
, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt
, nlohmann_json, spdlog }:
# Common attributes of irods packages
{
nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ];
buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost libcxx catch2 ];
buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost
libcxx catch2 nanodbc fmt nlohmann_json spdlog ];
cmakeFlags = [
"-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}"
@ -16,18 +19,23 @@
"-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}"
"-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}"
"-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}"
"-DIRODS_EXTERNALS_FULLPATH_NANODBC=${nanodbc}"
"-DIRODS_EXTERNALS_FULLPATH_FMT=${fmt}"
"-DIRODS_EXTERNALS_FULLPATH_JSON=${nlohmann_json}"
"-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog}"
"-DIRODS_LINUX_DISTRIBUTION_NAME=nix"
"-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0"
"-DCPACK_GENERATOR=TGZ"
"-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1"
];
preConfigure = ''
patchShebangs ./packaging
patchShebangs ./scripts
substituteInPlace CMakeLists.txt --replace "DESTINATION usr/bin" "DESTINATION bin"
substituteInPlace CMakeLists.txt --replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/"
substituteInPlace CMakeLists.txt --replace "DESTINATION usr/lib/" "DESTINATION lib/"
postPatch = ''
patchShebangs ./packaging ./scripts
substituteInPlace CMakeLists.txt \
--replace "DESTINATION usr/bin" "DESTINATION bin" \
--replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/" \
--replace "DESTINATION usr/lib/" "DESTINATION lib/" \
--replace "{IRODS_EXTERNALS_FULLPATH_JSON}/include" "{IRODS_EXTERNALS_FULLPATH_JSON}/include/nlohmann"
export cmakeFlags="$cmakeFlags
-DCMAKE_INSTALL_PREFIX=$out
"

69
pkgs/tools/filesystems/irods/default.nix
View file

@ -1,27 +1,32 @@
{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }:
{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq
, libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2
, nanodbc_llvm, fmt, nlohmann_json, spdlog }:
let
avro-cpp=avro-cpp_llvm;
avro-cpp = avro-cpp_llvm;
nanodbc = nanodbc_llvm;
in
let
common = import ./common.nix {
inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake
help2man texinfo libtool cppzmq libarchive jansson
zeromq openssl pam libiodbc libkrb5 gcc libcxx
boost avro-cpp which catch2;
help2man texinfo libtool cppzmq libarchive jansson
zeromq openssl pam libiodbc libkrb5 gcc libcxx
boost avro-cpp which catch2 nanodbc fmt nlohmann_json
spdlog;
};
in rec {
in
rec {
# irods: libs and server package
irods = stdenv.mkDerivation (common // rec {
version = "4.2.7";
version = "4.2.11";
pname = "irods";
src = fetchFromGitHub {
owner = "irods";
repo = "irods";
rev = version;
sha256 = "1pd4l42z4igzf0l8xbp7yz0nhzsv47ziv5qj8q1hh6pfhmwlzp9s";
sha256 = "0prcsiddk8n3h515jjapgfz1d6hjqywhrkcf6giqd7xc7b0slz44";
fetchSubmodules = true;
};
@ -33,7 +38,7 @@ in rec {
# fix build with recent llvm versions
NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations";
preConfigure = common.preConfigure + ''
postPatch = common.postPatch + ''
patchShebangs ./test
substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
substituteInPlace cmake/server.cmake --replace "DESTINATION usr/sbin" "DESTINATION sbin"
@ -62,36 +67,36 @@ in rec {
# icommands (CLI) package, depends on the irods package
irods-icommands = stdenv.mkDerivation (common // rec {
version = "4.2.7";
pname = "irods-icommands";
version = "4.2.11";
pname = "irods-icommands";
src = fetchFromGitHub {
owner = "irods";
repo = "irods_client_icommands";
rev = version;
sha256 = "08hqrc9iaw0y9rrrcknnl5mzbcrsvqc39pwvm62fipl3vnfqryli";
};
src = fetchFromGitHub {
owner = "irods";
repo = "irods_client_icommands";
rev = version;
sha256 = "0wgs585j2lp820py2pbizsk54xgz5id96fhxwwk9lqhbzxhfjhcg";
};
patches = [ ./zmqcpp-deprecated-send_recv.patch ];
patches = [ ./zmqcpp-deprecated-send_recv.patch ];
buildInputs = common.buildInputs ++ [ irods ];
buildInputs = common.buildInputs ++ [ irods ];
preConfigure = common.preConfigure + ''
patchShebangs ./bin
'';
postPatch = common.postPatch + ''
patchShebangs ./bin
'';
cmakeFlags = common.cmakeFlags ++ [
"-DCMAKE_INSTALL_PREFIX=${stdenv.out}"
"-DIRODS_DIR=${irods}/lib/irods/cmake"
"-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
"-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
"-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
cmakeFlags = common.cmakeFlags ++ [
"-DCMAKE_INSTALL_PREFIX=${stdenv.out}"
"-DIRODS_DIR=${irods}/lib/irods/cmake"
"-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
"-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
"-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
];
meta = common.meta // {
description = common.meta.description + " CLI clients";
longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'.";
};
meta = common.meta // {
description = common.meta.description + " CLI clients";
longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'.";
};
});
}

22
pkgs/tools/filesystems/irods/irods_root_path.patch
View file

@ -1,25 +1,3 @@
diff -r -u irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp irods-4.2.0/lib/core/src/irods_default_paths.cpp
--- irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp 2016-11-15 06:23:55.000000000 +0000
+++ irods-4.2.0/lib/core/src/irods_default_paths.cpp 2016-12-20 18:03:17.156883399 +0000
@@ -18,7 +18,7 @@
try {
boost::filesystem::path path{dl_info.dli_fname};
path = boost::filesystem::canonical(path);
- path.remove_filename().remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install
+ path.remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install
return path;
} catch(const boost::filesystem::filesystem_error& e) {
THROW(-1, e.what());
@@ -27,8 +27,7 @@
boost::filesystem::path
get_irods_config_directory() {
- boost::filesystem::path path{get_irods_root_directory()};
- path.append("etc").append("irods");
+ boost::filesystem::path path("/etc/irods");
return path;
}
diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py
--- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000
+++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000

4
pkgs/tools/misc/remind/default.nix
View file

@ -16,11 +16,11 @@ let
in
tcl.mkTclDerivation rec {
pname = "remind";
version = "03.04.00";
version = "03.04.01";
src = fetchurl {
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
sha256 = "sha256-uIpIygxV5l122FN8sz+OMeQh8iL4Vy87EM1/CjFvLVI=";
sha256 = "sha256-8INtFmftMb1JSotUdDtMXdSm+UE/8zQW/wIOExr8nkI=";
};
propagatedBuildInputs = tclLibraries;

4
pkgs/tools/networking/checkip/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "checkip";
version = "0.18.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "jreisinger";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wbgFJ46zUPmHS2lDJpCaCFqfASbFW5JLAC0XOB8QJhY=";
sha256 = "sha256-cQY77csZ7UPi09vUOdn3AKrLzGMI2BE16gfL1wDXxZA=";
};
vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc=";

6
pkgs/tools/networking/godns/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "godns";
version = "2.6";
version = "2.7";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "v${version}";
sha256 = "sha256-U8fmjcPeTcKlf721UIbA4/JYeM4l+OIyAPGNp8IPvSk=";
sha256 = "sha256-PD/3WIxNPtC7s4+2ogWG5DEm717rYQLMx9XA06Q6ebo=";
};
vendorSha256 = "sha256-OyqkjA90zcfqRL6pfISR/6WXbv5LwVhKDECBtlqords=";
vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850=";
# Some tests require internet access, broken in sandbox
doCheck = false;

4
pkgs/tools/security/certipy/default.nix
View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "certipy";
version = "2.0.7";
version = "2.0.9";
src = fetchFromGitHub {
owner = "ly4k";
repo = "Certipy";
rev = version;
hash = "sha256-/89TO/Dzj53bxndLgMIPCaL3axXJUEpX07+25xtnmws=";
hash = "sha256-84nGRKZ0UlMDAZ1Wo5Hgy9XSAyEh0Tio9+3OZVFZG5k=";
};
propagatedBuildInputs = with python3.pkgs; [

6
pkgs/tools/security/grype/default.nix
View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "grype";
version = "0.33.0";
version = "0.33.1";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RXEeJZeC6hA6DetZnUNWFtNZEy4HJpxviL8pySBLfts=";
sha256 = "sha256-5QjyGIpxnrwTnEmi0D16vPKodg3+SKiINFONwU2OzC0=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -27,7 +27,7 @@ buildGoModule rec {
'';
};
vendorSha256 = "sha256-2T2fw1nOycP1LxUuMSmz1ke2bg4yox/tIAveXCNJG9Y=";
vendorSha256 = "sha256-CPMfQv9oiLbIMkZe/t482LzssoNTcNVJdr2o2wJecSA=";
nativeBuildInputs = [
installShellFiles

2
pkgs/tools/security/metasploit/Gemfile
View file

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.30"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.31"

40
pkgs/tools/security/metasploit/Gemfile.lock
View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: aab66244adaadb275bd780c1301fea51f444426a
ref: refs/tags/6.1.30
revision: 2bed5461f9e43e2608a90c3331045b62e8dba26a
ref: refs/tags/6.1.31
specs:
metasploit-framework (6.1.30)
metasploit-framework (6.1.31)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@ -31,7 +31,7 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
metasploit-payloads (= 2.0.74)
metasploit-payloads (= 2.0.75)
metasploit_data_models
metasploit_payloads-mettle (= 1.0.18)
mqtt
@ -128,23 +128,23 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.555.0)
aws-sdk-core (3.126.2)
aws-partitions (1.559.0)
aws-sdk-core (3.127.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.299.0)
aws-sdk-core (~> 3, >= 3.126.0)
aws-sdk-ec2 (1.300.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.67.0)
aws-sdk-core (~> 3, >= 3.126.0)
aws-sdk-iam (1.68.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.54.0)
aws-sdk-core (~> 3, >= 3.126.0)
aws-sdk-kms (1.55.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.112.0)
aws-sdk-core (~> 3, >= 3.126.0)
aws-sdk-s3 (1.113.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.4.0)
@ -251,7 +251,7 @@ GEM
activemodel (~> 6.0)
activesupport (~> 6.0)
railties (~> 6.0)
metasploit-payloads (2.0.74)
metasploit-payloads (2.0.75)
metasploit_data_models (5.0.4)
activerecord (~> 6.0)
activesupport (~> 6.0)
@ -264,7 +264,7 @@ GEM
webrick
metasploit_payloads-mettle (1.0.18)
method_source (1.0.0)
mini_portile2 (2.7.1)
mini_portile2 (2.8.0)
minitest (5.15.0)
mqtt (0.5.0)
msgpack (1.4.5)
@ -278,8 +278,8 @@ GEM
network_interface (0.0.2)
nexpose (7.3.0)
nio4r (2.5.8)
nokogiri (1.13.1)
mini_portile2 (~> 2.7.0)
nokogiri (1.13.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nori (2.6.0)
octokit (4.22.0)
@ -292,13 +292,13 @@ GEM
pcaprub
patch_finder (1.0.2)
pcaprub (0.13.1)
pdf-reader (2.9.1)
pdf-reader (2.9.2)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
pg (1.3.2)
pg (1.3.3)
public_suffix (4.0.6)
puma (5.6.2)
nio4r (~> 2.0)

4
pkgs/tools/security/metasploit/default.nix
View file

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.1.30";
version = "6.1.31";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-QSKJIcHaWsxbHe2uTW5MnZFMoK1fOa6TejIT2Mq0z7k=";
sha256 = "sha256-WrrpejXhpGu8/d8TBjXBi9qaYZAFTjZr7S2WYz+RTFw=";
};
nativeBuildInputs = [ makeWrapper ];

50
pkgs/tools/security/metasploit/gemset.nix
View file

@ -104,60 +104,60 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r3ihnddcizpf34mcfggyjii8lmjyy1q89mswpbzqa5mxvws85qg";
sha256 = "15pi27wp50h829757xhp22fx57nvlfm5cjy2iz11b7zvdx19j7fw";
type = "gem";
};
version = "1.555.0";
version = "1.559.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19xi4dr675f7x9dmk1fc10jmjdgv45j3dn9k44m5xavd3qnpzx7v";
sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq";
type = "gem";
};
version = "3.126.2";
version = "3.127.0";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13kl993psm21mni2g3llyj6b1nzway8kcabnrblnrjkd4d4fg3v7";
sha256 = "0mi99zacz537wsiks9yb6zy8xkqsbrg9j7c4kzrgd8zk55p247wd";
type = "gem";
};
version = "1.299.0";
version = "1.300.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iv8db2wb3lajcnqx6icn7bdvhrfd7di01c329r95kgw6gzsf7sc";
sha256 = "15rhfl5g49422g8bi90dv0cx3imbza99223pqdi4vsg6gwzhszhy";
type = "gem";
};
version = "1.67.0";
version = "1.68.0";
};
aws-sdk-kms = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h2mn5ywrla2wqsvzvp9m8jhzr93ywqmyi2l0b538hrq6pmdhjq2";
sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi";
type = "gem";
};
version = "1.54.0";
version = "1.55.0";
};
aws-sdk-s3 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09fc16hdvripmpn1bj5bayqvmfz0pj2l1h2w954id9c9ar7vv7f5";
sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax";
type = "gem";
};
version = "1.112.0";
version = "1.113.0";
};
aws-sigv4 = {
groups = ["default"];
@ -684,12 +684,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "aab66244adaadb275bd780c1301fea51f444426a";
sha256 = "1ffgnk5dh4rjga9swfazmnh4r4cx9ip4vbpd3mdwqnnsq4hqj8j1";
rev = "2bed5461f9e43e2608a90c3331045b62e8dba26a";
sha256 = "0p2cj4zn75idxmmkckh5j1hrmnlbq4shc4yzzny6p9716mxfkfjs";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.1.30";
version = "6.1.31";
};
metasploit-model = {
groups = ["default"];
@ -706,10 +706,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03q70mqn38chhm9cmjh6k4ch5jsrgf2id09jv0ylkn3vsrrjfzpg";
sha256 = "1ghwsciyhldpja50f9wv1nd1xnns6ki9hjfhllh1dyja3l1knd9z";
type = "gem";
};
version = "2.0.74";
version = "2.0.75";
};
metasploit_data_models = {
groups = ["default"];
@ -746,10 +746,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z";
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
type = "gem";
};
version = "2.7.1";
version = "2.8.0";
};
minitest = {
groups = ["default"];
@ -877,10 +877,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11";
sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
type = "gem";
};
version = "1.13.1";
version = "1.13.3";
};
nori = {
groups = ["default"];
@ -967,20 +967,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pn5l3ayjfn4mv2079q80q0x3q39q25nxcc5l9cjqz4lf5anhlfi";
sha256 = "1pmb0lhbch06i8br2nkcq3flbfx1s2wqi3vkndqr4vnx3azvyjf6";
type = "gem";
};
version = "2.9.1";
version = "2.9.2";
};
pg = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m776cj2hik15wi730vhgczd5v9s0xmi45q2hgcf5m5cnqvfih35";
sha256 = "0qqky1q9xhji017q1apx9w81qdlwpm6ix3amhikjy416hxxmhcj1";
type = "gem";
};
version = "1.3.2";
version = "1.3.3";
};
public_suffix = {
groups = ["default"];

4
pkgs/top-level/aliases.nix
View file

@ -1426,13 +1426,13 @@ mapAliases ({
kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot
knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact
korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares
ksshaskpass ksystemlog kteatime ktimer ktouch kturtle kwallet-pam
ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch kturtle kwallet-pam
kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet
okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop
plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components
plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace
plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style
sddm-kcm spectacle systemsettings xdg-desktop-portal-kde yakuake
sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake
;
inherit (plasma5Packages.thirdParty)

22
pkgs/top-level/all-packages.nix
View file

@ -6618,13 +6618,15 @@ with pkgs;
};
inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages.libcxxStdenv;
libcxx = llvmPackages.libcxx;
boost = boost160.override { inherit stdenv; };
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
})
irods
irods-icommands;
stdenv = llvmPackages.libcxxStdenv;
libcxx = llvmPackages.libcxx;
boost = boost17x.override { inherit stdenv; };
fmt = fmt_8.override { inherit stdenv; };
nanodbc_llvm = nanodbc.override { inherit stdenv; };
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
})
irods
irods-icommands;
ignite = callPackage ../applications/virtualization/ignite { };
@ -26873,8 +26875,6 @@ with pkgs;
ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { };
ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { };
kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
@ -28909,8 +28909,6 @@ with pkgs;
sipp = callPackage ../development/tools/misc/sipp { };
skanlite = libsForQt5.callPackage ../applications/office/skanlite { };
soci = callPackage ../development/libraries/soci { };
socialscan = with python3.pkgs; toPythonApplication socialscan;
@ -29135,7 +29133,7 @@ with pkgs;
taskopen = callPackage ../applications/misc/taskopen { };
tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
inherit (xorg) libpthreadstubs libXdmcp;
abseil-cpp = abseil-cpp_202111;
};
tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { };

2
pkgs/top-level/php-packages.nix
View file

@ -140,6 +140,8 @@ lib.makeScope pkgs.newScope (self: with self; {
deployer = callPackage ../development/php-packages/deployer { };
phing = callPackage ../development/php-packages/phing { };
php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };
php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };

2
pkgs/top-level/qt5-packages.nix
View file

@ -116,8 +116,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
libktorrent = callPackage ../development/libraries/libktorrent { };
liblastfm = callPackage ../development/libraries/liblastfm { };
libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };