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

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2022-03-01 00:16:48 +00:00 committed by GitHub
parent ace9e69053 6cb23bdec7
commit b2c6123336
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
161 changed files with 2242 additions and 1373 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/default.nix
View file

@ -126,7 +126,7 @@ let
getValues getFiles
optionAttrSetToDocList optionAttrSetToDocList'
scrubOptionValue literalExpression literalExample literalDocBook
showOption showFiles unknownModule mkOption;
showOption showFiles unknownModule mkOption mkPackageOption;
inherit (self.types) isType setType defaultTypeMerge defaultFunctor
isOptionType mkOptionType;
inherit (self.asserts)

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";

1
maintainers/team-list.nix
View file

@ -50,6 +50,7 @@ with lib.maintainers; {
DianaOlympos
gleber
happysalada
minijackson
yurrriq
];
scope = "Maintain BEAM-related packages and modules.";

45
nixos/doc/manual/development/settings-options.section.md
View file

@ -66,6 +66,45 @@ have a predefined type and string generator already declared under
and returning a set with TOML-specific attributes `type` and
`generate` as specified [below](#pkgs-formats-result).
`pkgs.formats.elixirConf { elixir ? pkgs.elixir }`
: A function taking an attribute set with values
`elixir`
: The Elixir package which will be used to format the generated output
It returns a set with Elixir-Config-specific attributes `type`, `lib`, and
`generate` as specified [below](#pkgs-formats-result).
The `lib` attribute contains functions to be used in settings, for
generating special Elixir values:
`mkRaw elixirCode`
: Outputs the given string as raw Elixir code
`mkGetEnv { envVariable, fallback ? null }`
: Makes the configuration fetch an environment variable at runtime
`mkAtom atom`
: Outputs the given string as an Elixir atom, instead of the default
Elixir binary string. Note: lowercase atoms still needs to be prefixed
with `:`
`mkTuple array`
: Outputs the given array as an Elixir tuple, instead of the default
Elixir list
`mkMap attrset`
: Outputs the given attribute set as an Elixir map, instead of the
default Elixir keyword list
::: {#pkgs-formats-result}
These functions all return an attribute set with these values:
:::
@ -74,6 +113,12 @@ These functions all return an attribute set with these values:
: A module system type representing a value of the format
`lib`
: Utility functions for convenience, or special interactions with the format.
This attribute is optional. It may contain inside a `types` attribute
containing types specific to this format.
`generate` *`filename jsonValue`*
: A function that can render a value of the format to a file. Returns

104
nixos/doc/manual/from_md/development/settings-options.section.xml
View file

@ -137,6 +137,97 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>pkgs.formats.elixirConf { elixir ? pkgs.elixir }</literal>
</term>
<listitem>
<para>
A function taking an attribute set with values
</para>
<variablelist>
<varlistentry>
<term>
<literal>elixir</literal>
</term>
<listitem>
<para>
The Elixir package which will be used to format the
generated output
</para>
</listitem>
</varlistentry>
</variablelist>
<para>
It returns a set with Elixir-Config-specific attributes
<literal>type</literal>, <literal>lib</literal>, and
<literal>generate</literal> as specified
<link linkend="pkgs-formats-result">below</link>.
</para>
<para>
The <literal>lib</literal> attribute contains functions to
be used in settings, for generating special Elixir values:
</para>
<variablelist>
<varlistentry>
<term>
<literal>mkRaw elixirCode</literal>
</term>
<listitem>
<para>
Outputs the given string as raw Elixir code
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>mkGetEnv { envVariable, fallback ? null }</literal>
</term>
<listitem>
<para>
Makes the configuration fetch an environment variable
at runtime
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>mkAtom atom</literal>
</term>
<listitem>
<para>
Outputs the given string as an Elixir atom, instead of
the default Elixir binary string. Note: lowercase
atoms still needs to be prefixed with
<literal>:</literal>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>mkTuple array</literal>
</term>
<listitem>
<para>
Outputs the given array as an Elixir tuple, instead of
the default Elixir list
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>mkMap attrset</literal>
</term>
<listitem>
<para>
Outputs the given attribute set as an Elixir map,
instead of the default Elixir keyword list
</para>
</listitem>
</varlistentry>
</variablelist>
</listitem>
</varlistentry>
</variablelist>
<para xml:id="pkgs-formats-result">
These functions all return an attribute set with these values:
@ -152,6 +243,19 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>lib</literal>
</term>
<listitem>
<para>
Utility functions for convenience, or special interactions
with the format. This attribute is optional. It may contain
inside a <literal>types</literal> attribute containing types
specific to this format.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>generate</literal>

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")

2
pkgs/applications/audio/plujain-ramp/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, lv2 }:
stdenv.mkDerivation rec {
version = "v1.1.3";
version = "1.1.3";
pname = "plujain-ramp";
src = fetchFromGitHub {

34
pkgs/applications/audio/rubyripper/default.nix
View file

@ -1,26 +1,38 @@
{ lib, stdenv, fetchurl, ruby, cdparanoia, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, makeWrapper
, cdparanoia, cddiscid, ruby }:
stdenv.mkDerivation rec {
version = "0.6.2";
version = "0.8.0rc3";
pname = "rubyripper";
src = fetchurl {
url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2";
sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1";
src = fetchFromGitHub {
owner = "bleskodev";
repo = pname;
rev = "v${version}";
sha256 = "1qfwv8bgc9pyfh3d40bvyr9n7sjc2na61481693wwww640lm0f9f";
};
preConfigure = "patchShebangs .";
configureFlags = [ "--enable-cli" ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ruby cdparanoia ];
postInstall = ''
wrapProgram "$out/bin/rrip_cli" \
--prefix PATH : "${ruby}/bin" \
--prefix PATH : "${cdparanoia}/bin"
buildInputs = [
cddiscid
cdparanoia
ruby
];
postFixup = ''
wrapProgram $out/bin/rrip_cli \
--prefix PATH : ${lib.makeBinPath [ cddiscid cdparanoia ruby ]}
'';
meta = with lib; {
description = "High quality CD audio ripper";
platforms = platforms.linux;
license = licenses.gpl3;
license = licenses.gpl3Plus;
homepage = "https://github.com/bleskodev/rubyripper";
};
}

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}";
};

24
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View file

@ -951,10 +951,10 @@
elpaBuild {
pname = "devdocs";
ename = "devdocs";
version = "0.3";
version = "0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/devdocs-0.3.tar";
sha256 = "03asw26nsnnx7hmyqhksq165vpii0h8y6qjjn0x4sdkyyns16yp7";
url = "https://elpa.gnu.org/packages/devdocs-0.4.tar";
sha256 = "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm";
};
packageRequires = [ emacs ];
meta = {
@ -1176,10 +1176,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
version = "0.8.10";
version = "0.8.12";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.8.10.tar";
sha256 = "1763zk75a85803wbn68sz4n3yvkhzh3a8571syd1r2npb59b40ad";
url = "https://elpa.gnu.org/packages/ebdb-0.8.12.tar";
sha256 = "1k53crdmaw6lzvprsmpdfvg96ck54bzs4z1d4q9x890anglxq5m6";
};
packageRequires = [ emacs seq ];
meta = {
@ -3220,10 +3220,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.4.16";
version = "0.4.17";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.16.tar";
sha256 = "0k8n2pa20nkqd8w4c86p1f5cgn93favxxhws62i4w16934x6w07j";
url = "https://elpa.gnu.org/packages/phps-mode-0.4.17.tar";
sha256 = "1j3whjxhjawl1i5449yf56ljbazx90272gr8zfr36s8h8rijfjn9";
};
packageRequires = [ emacs ];
meta = {
@ -4309,10 +4309,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.5.2.1";
version = "2.5.2.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.2.1.tar";
sha256 = "1101nb0raiivrv1z4w442688cxj5mpf4h4zxzy6mhirgsbayk91p";
url = "https://elpa.gnu.org/packages/tramp-2.5.2.2.tar";
sha256 = "104nn6xdmcviqqv4cx5llhwj1sh4q04w3h9s8gimmi2kg0z8s36r";
};
packageRequires = [ emacs ];
meta = {

12
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
View file

@ -49,10 +49,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
version = "1.5.0";
version = "1.5.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-1.5.0.tar";
sha256 = "0ba91yy2id5jsl9bg8cfjm2sqbqp9jwwdikwkdj5v6xz6ggh134b";
url = "https://elpa.nongnu.org/nongnu/annotate-1.5.1.tar";
sha256 = "13xf8izl99y1aqwk9k9hgiwggibjycjh2lhwg0wk5hm7zp6gm8mx";
};
packageRequires = [];
meta = {
@ -2210,10 +2210,10 @@
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.0.4";
version = "17.1.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.0.4.tar";
sha256 = "0ji40fcw3y2n4dw0cklbvsybv04wmfqfnqnykgp05aai388rp3j1";
url = "https://elpa.nongnu.org/nongnu/web-mode-17.1.4.tar";
sha256 = "0863p8ikc8yqw0dahswi5s9q7v7rg1hasdxz5jwkd796fh1ih78n";
};
packageRequires = [ emacs ];
meta = {

595
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View file

File diff suppressed because it is too large Load diff

18
pkgs/applications/editors/jetbrains/default.nix
View file

@ -251,12 +251,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
version = "2021.3.2"; /* updated by script */
version = "2021.3.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "029xim3a6ijqdbzwxan189ydcy5b0ry2qqc70fipp8ic5z5iai3b"; /* updated by script */
sha256 = "03gil00srq3jljc13iyb7v1yc6l6yhdhqm9d1ld2j2pympl6p61m"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@ -316,13 +316,13 @@ in
mps = buildMps rec {
name = "mps-${version}";
version = "2021.2.3"; /* updated by script */
versionMajorMinor = "2021.2"; /* updated by script */
version = "2021.3"; /* updated by script */
versionMajorMinor = "2021.3"; /* updated by script */
description = "Create your own domain-specific language";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz";
sha256 = "1j33b48ki1xw7xb1hr8k2jz7d78h0qcr1b5gql7i40d7szq0iy10"; /* updated by script */
sha256 = "0zw5xqdlhjfg0smfjl8xy7drf9spiwqbmqq8z22x4zb61lpvdbp9"; /* updated by script */
};
wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE";
@ -330,12 +330,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2021.3.1"; /* updated by script */
version = "2021.3.2"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "011i3jgfnb2h64ikbm3wi1vfhzm50mwwy9nksl71nzllj3kz111x"; /* updated by script */
sha256 = "1qi0zq3gzcfnikky37g2dqgmzm7r1883k6asris8nph389qk86vn"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@ -395,12 +395,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2021.3.1"; /* updated by script */
version = "2021.3.2"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "1f918cj76b79x0d2hhv78mvmki5d1dps8nsx7i50wn2qzdml4kc6"; /* updated by script */
sha256 = "0q2hn48499hv7licpl84ly0bhiizya8a69dl2vjvgscj3cdkr98q"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";

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 ];

70
pkgs/applications/editors/pinegrow/default.nix Normal file
View file

@ -0,0 +1,70 @@
{ stdenv
, lib
, fetchurl
, unzip
, udev
, nwjs
, gcc-unwrapped
, autoPatchelfHook
, gsettings-desktop-schemas
, gtk3
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "pinegrow";
version = "6.3";
src = fetchurl {
url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip";
sha256 = "0wldj633p67da077nfc67gr9xhq580rkfd0r3904sjq7x01r0kaz";
};
nativeBuildInputs = [
unzip
autoPatchelfHook
wrapGAppsHook
];
buildInputs = [
udev
nwjs
gcc-unwrapped
gsettings-desktop-schemas
gtk3
];
sourceRoot = ".";
dontUnpack = true;
# Extract and copy executable in $out/bin
installPhase = ''
runHook preInstall
mkdir -p $out/share/applications $out/bin $out/opt/bin
# we can't unzip it in $out/lib, because nw.js will start with
# an empty screen. Therefore it will be unzipped in a non-typical
# folder and symlinked.
unzip $src -d $out/opt/pinegrow
substituteInPlace $out/opt/pinegrow/Pinegrow.desktop \
--replace 'Exec=sh -c "$(dirname %k)/PinegrowLibrary"' 'Exec=sh -c "$out/bin/Pinegrow"'
mv $out/opt/pinegrow/Pinegrow.desktop $out/share/applications/Pinegrow.desktop
ln -s $out/opt/pinegrow/PinegrowLibrary $out/bin/Pinegrow
runHook postInstall
'';
preFixup = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
wrapGApp "$out/opt/pinegrow/PinegrowLibrary" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
'';
meta = with lib; {
homepage = "https://pinegrow.com";
description = "UI Web Editor";
platforms = platforms.linux;
license = with licenses; [ unfreeRedistributable ];
maintainers = with maintainers; [ gador ];
};
}

20
pkgs/applications/editors/vscode/extensions/cpptools/default.nix
View file

@ -47,15 +47,27 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "cpptools";
publisher = "ms-vscode";
version = "1.7.1";
version = "1.9.1";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix";
sha256 = "sha256-LqndG/vv8LgVPEX6dGkikDB6M6ISneo2UJ78izXVFbk=";
name = "${mktplcRef.publisher}-${mktplcRef.name}.gz";
url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${mktplcRef.publisher}/vsextensions/${mktplcRef.name}/${mktplcRef.version}/vspackage?targetPlatform=linux-x64";
sha256 = "sha256-BtTl9DR8hnwNpO5k99M4dtqcTQ2hTzVbjR8VZh+tdDI=";
};
unpackPhase = ''
runHook preUnpack
gzip -d $src --stdout &> temporary.zip
unzip temporary.zip
rm temporary.zip
cd extension/
runHook postUnpack
'';
buildInputs = [
jq
];

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;

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

@ -59,13 +59,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "python";
publisher = "ms-python";
version = "2021.11.1422169775";
version = "2022.0.1814523869";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix";
sha256 = "sha256-Y8Wbpuieca/edIWqgq+lGSUMABOGvO/GuujGlEGmoKs=";
sha256 = "sha256-JDaimcOUDo9GuFA3mhbbGLwqZE9ejk8pWYc+9PrRhVk=";
};
buildInputs = [

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

@ -8,8 +8,8 @@ in
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
version = "17.1.0";
sha256 = "177q8angrn702pxrrpk1fzggzlnnaymq32v55qpjgjb74rhg4dzw";
version = "18.0.5";
sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs=";
};
meta = with lib; {

60
pkgs/applications/emulators/ryujinx/default.nix
View file

@ -1,18 +1,31 @@
{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems
, dotnetCorePackages, libX11, libgdiplus, ffmpeg
, SDL2_mixer, openal, libsoundio, sndio, pulseaudio
, gtk3, gdk-pixbuf, wrapGAppsHook
{ lib
, buildDotnetModule
, fetchFromGitHub
, makeDesktopItem
, copyDesktopItems
, dotnetCorePackages
, libX11
, libgdiplus
, ffmpeg
, SDL2_mixer
, openal
, libsoundio
, sndio
, pulseaudio
, gtk3
, gdk-pixbuf
, wrapGAppsHook
}:
buildDotnetModule rec {
pname = "ryujinx";
version = "1.0.7168"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
version = "1.1.54"; # Versioning is based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "6e0799580f0d1b473a79471c5d365c6524d97a86";
sha256 = "145sn9xkjxj79292faypcdmpmbxm1w70q0iprg6pfymf9920gvfv";
rev = "3705c206688c69d3348f5cec84dc480d8d7c578e";
sha256 = "1lhnr11x46yjpka865m0dzkbkdxmrrhjcpvq4ab4wll6j0ipy908";
};
dotnet-sdk = dotnetCorePackages.sdk_6_0;
@ -67,22 +80,31 @@ buildDotnetModule rec {
done
'';
desktopItems = [(makeDesktopItem {
desktopName = "Ryujinx";
name = "ryujinx";
exec = "Ryujinx";
icon = "ryujinx";
comment = meta.description;
type = "Application";
categories = [ "Game" ];
})];
desktopItems = [
(makeDesktopItem {
desktopName = "Ryujinx";
name = "ryujinx";
exec = "Ryujinx";
icon = "ryujinx";
comment = meta.description;
type = "Application";
categories = [ "Game" ];
})
];
meta = with lib; {
description = "Experimental Nintendo Switch Emulator written in C#";
homepage = "https://ryujinx.org/";
license = licenses.mit;
changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog";
maintainers = [ maintainers.ivar ];
description = "Experimental Nintendo Switch Emulator written in C#";
longDescription = ''
Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan,
written in C#. This emulator aims at providing excellent accuracy and
performance, a user-friendly interface and consistent builds. It was
written from scratch and development on the project began in September
2017.
'';
license = licenses.mit;
maintainers = with maintainers; [ ivar jk ];
platforms = [ "x86_64-linux" ];
mainProgram = "Ryujinx";
};

4
pkgs/applications/emulators/ryujinx/deps.nix generated
View file

@ -10,8 +10,8 @@
(fetchNuGet { pname = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; })
(fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; })
(fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; })
(fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; })
(fetchNuGet { pname = "LibHac"; version = "0.14.3"; sha256 = "13pv5dwffj8c2mfibra3hkd1pgg5cj075sf48kgp82y501l25q5m"; })
(fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; })
(fetchNuGet { pname = "LibHac"; version = "0.16.0"; sha256 = "1kivnf4c4km1a8y0sl34z9gfazlivna0x31q0065n0sz13g82spi"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; })

67
pkgs/applications/emulators/ryujinx/updater.sh
View file

@ -1,40 +1,57 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6
set -eo pipefail
set -euxo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
deps_file="$(realpath "./deps.nix")"
DEPS_FILE="$(realpath "./deps.nix")"
nix-prefetch-git https://github.com/ryujinx/ryujinx --quiet > repo_info
new_hash="$(jq -r ".sha256" < repo_info)"
new_rev="$(jq -r ".rev" < repo_info)"
rm repo_info
RELEASE_JOB_DATA=$(
curl -s -H "Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows |
jq -r '.workflows[] | select(.name == "Release job") | { id, path }'
)
RELEASE_JOB_ID=$(echo "$RELEASE_JOB_DATA" | jq -r '.id')
RELEASE_JOB_FILE=$(echo "$RELEASE_JOB_DATA" | jq -r '.path')
new_version="$(
curl -s https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master \
| grep -Po '"version":.*?[^\\]",' \
| sed 's/"version":"\(.*\)",/\1/'
)"
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
BASE_VERSION=$(
curl -s "https://raw.githubusercontent.com/Ryujinx/Ryujinx/master/${RELEASE_JOB_FILE}" |
grep -Po 'RYUJINX_BASE_VERSION:.*?".*"' |
sed 's/RYUJINX_BASE_VERSION: "\(.*\)"/\1/'
)
if [[ "$new_version" == "$old_version" ]]; then
echo "Already up to date! Doing nothing"
exit 0
LATEST_RELEASE_JOB_DATA=$(
curl -s -H "Accept: application/vnd.github.v3+json" \
"https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows/${RELEASE_JOB_ID}/runs" |
jq -r '.workflow_runs[0] | { head_sha, run_number }'
)
COMMIT=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.head_sha')
PATCH_VERSION=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.run_number')
NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}"
OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
echo "comparing versions $OLD_VERSION => $NEW_VERSION"
if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then
echo "Already up to date! Doing nothing"
exit 0
fi
cd ../../../..
update-source-version ryujinx "$new_version" "$new_hash" --rev="$new_rev"
SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')"
store_src="$(nix-build . -A ryujinx.src --no-out-link)"
src="$(mktemp -d /tmp/ryujinx-src.XXX)"
cp -rT "$store_src" "$src"
chmod -R +w "$src"
pushd "$src"
cd ../../../..
update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT"
STORE_SRC="$(nix-build . -A ryujinx.src --no-out-link)"
SRC="$(mktemp -d /tmp/ryujinx-src.XXX)"
cp -rT "$STORE_SRC" "$SRC"
chmod -R +w "$SRC"
pushd "$SRC"
mkdir nuget_tmp.packages
dotnet restore Ryujinx.sln --packages nuget_tmp.packages
DOTNET_CLI_TELEMETRY_OPTOUT=1 dotnet restore Ryujinx.sln --packages nuget_tmp.packages
nuget-to-nix ./nuget_tmp.packages > "$deps_file"
nuget-to-nix ./nuget_tmp.packages >"$DEPS_FILE"
popd
rm -r "$src"
rm -r "$SRC"

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 ];
}

4
pkgs/applications/misc/corectrl/default.nix
View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec{
pname = "corectrl";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitLab {
owner = "corectrl";
repo = "corectrl";
rev = "v${version}";
sha256 = "1zp523cgvmfjc42wx1f1jh5q3jnsnm833m2xnbbwmfrmhrzh5269";
sha256 = "sha256-vMSIo4tfvEO6SVxB5aNBnHEn+PXN6wUfRAgUCwZEHKQ=";
};
nativeBuildInputs = [

71
pkgs/applications/misc/emojipick/default.nix Normal file
View file

@ -0,0 +1,71 @@
{ stdenvNoCC
, fetchFromGitHub
, lib
, python3
, xclip
, libnotify
, dmenu
, rofi
, emojipick-use-rofi ? false
, emojipick-copy-to-clipboard ? true
, emojipick-show-notifications ? true
, emojipick-print-emoji ? true
, emojipick-font-family ? "Noto Color Emoji"
, emojipick-font-size ? "18"
}:
let
boolToInt = b: if b then "1" else "0"; # Convert boolean to integer string
in
stdenvNoCC.mkDerivation {
pname = "emojipick";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "thingsiplay";
repo = "emojipick";
rev = "20210127";
sha256 = "1kib3cyx6z9v9qw6yrfx5sklanpk5jbxjc317wi7i7ljrg0vdazp";
};
dontConfigure = true;
dontBuild = true;
# Patch configuration
# notify-send has to be patched in a bash file
postPatch = ''
substituteInPlace emojipick \
--replace "use_rofi=0" "use_rofi=${boolToInt emojipick-use-rofi}" \
--replace "copy_to_clipboard=1" "copy_to_clipboard=${boolToInt emojipick-copy-to-clipboard}" \
--replace "show_notification=1" "show_notification=${boolToInt emojipick-show-notifications}" \
--replace "print_emoji=1" "print_emoji=${boolToInt emojipick-print-emoji}" \
--replace "font_family='\"Noto Color Emoji\"'" "font_family='\"${emojipick-font-family}\"'" \
--replace 'font_size="18"' 'font_size="${emojipick-font-size}"' \
${lib.optionalString emojipick-use-rofi "--replace 'rofi ' '${rofi}/bin/rofi '"} \
--replace notify-send ${libnotify}/bin/notify-send
'';
buildInputs = [
python3
xclip
libnotify
] ++ (if emojipick-use-rofi then [rofi] else [dmenu]);
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp ./emojipick $out/bin
cp ./emojiget.py $out/bin
runHook postInstall
'';
meta = with lib; {
description = "Get a selection of emojis with dmenu or rofi";
homepage = "https://github.com/thingsiplay/emojipick";
license = licenses.mit;
maintainers = with maintainers; [ alexnortung ];
platforms = platforms.linux;
};
}

47
pkgs/applications/misc/gometer/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }:
stdenv.mkDerivation rec {
pname = "gometer";
version = "5.2.0";
src = fetchurl {
url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm";
sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28=";
};
nativeBuildInputs = [
rpmextract
wrapGAppsHook
];
dontBuild = true;
dontConfigure = true;
unpackPhase = ''
rpmextract ${src}
'';
installPhase = ''
runHook preInstall
mv usr $out
mv opt $out
mkdir $out/share/applications
mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop
substituteInPlace $out/share/applications/gometer.desktop \
--replace '/opt/goMeter/' ""
makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \
--add-flags $out/opt/goMeter/package.nw
runHook postInstall
'';
meta = with lib; {
description = "Analytic-Tracking tool for GoLance";
homepage = "https://golance.com/download-gometer";
license = licenses.unfree;
maintainers = with maintainers; [ wolfangaukang ];
};
}

17
pkgs/applications/misc/nerd-font-patcher/default.nix
View file

@ -4,15 +4,16 @@ python3Packages.buildPythonApplication rec {
pname = "nerd-font-patcher";
version = "2.1.0";
# The size of the nerd fonts repository is bigger than 2GB, because it
# contains a lot of fonts and the patcher.
# until https://github.com/ryanoasis/nerd-fonts/issues/484 is not fixed,
# we download the patcher from an alternative repository
# This uses a sparse checkout because the repo is >2GB without it
src = fetchFromGitHub {
owner = "betaboon";
repo = "nerd-fonts-patcher";
rev = "180684d7a190f75fd2fea7ca1b26c6540db8d3c0";
sha256 = "sha256-FAbdLf0XiUXGltAgmq33Wqv6PFo/5qCv62UxXnj3SgI=";
owner = "ryanoasis";
repo = "nerd-fonts";
rev = "v${version}";
sparseCheckout = ''
font-patcher
/src/glyphs
'';
sha256 = "sha256-ePBlEVjzAJ7g6iAGIqPfgZ8bwtNILmyEVm0zD+xNN6k=";
};
propagatedBuildInputs = with python3Packages; [ fontforge ];

3
pkgs/applications/misc/openlp/default.nix
View file

@ -37,7 +37,8 @@ let
# base pkg/lib
baseLib = python3Packages.callPackage ./lib.nix { };
in mkDerivation {
inherit (baseLib) pname version src;
pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full";
inherit (baseLib) version src;
nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ];
buildInputs = [ qtbase ] ++ optionals gstreamerSupport

4
pkgs/applications/misc/prusa-slicer/default.nix
View file

@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
desktopItems = [
(makeDesktopItem {
name = "PrusaSlicer";
name = "prusa-slicer";
exec = "prusa-slicer";
icon = "PrusaSlicer";
comment = "G-code generator for 3D printers";
@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
categories = [ "Development" ];
})
(makeDesktopItem {
name = "PrusaSlicer G-code Viewer";
name = "prusa-gcodeviewer";
exec = "prusa-gcodeviewer";
icon = "PrusaSlicer-gcodeviewer";
comment = "G-code viewer for 3D printers";

2
pkgs/applications/misc/prusa-slicer/super-slicer.nix
View file

@ -33,7 +33,7 @@ let
desktopItems = [
(makeDesktopItem {
name = appname;
name = "superslicer";
exec = "superslicer";
icon = appname;
comment = description;

2
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -96,7 +96,7 @@ let
"libpng"
"libwebp"
"libxslt"
"opus"
# "opus"
];
opusWithCustomModes = libopus.override {

5
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland
, gcc, nspr, nss, runCommand
@ -54,6 +54,9 @@ let
inherit (upstream-info.deps.gn) url rev sha256;
};
});
} // lib.optionalAttrs (chromiumVersionAtLeast "99") rec {
llvmPackages = llvmPackages_14;
stdenv = llvmPackages_14.stdenv;
});
browser = callPackage ./browser.nix {

132
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -40,10 +40,10 @@
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.157.0",
"sha256": "02zsp7kxvg6i7wzrx6qigjsvxmmz4rhpjb36qz1jwn3dzpx6dyv1",
"vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg",
"version": "1.157.0"
"rev": "v1.158.0",
"sha256": "0q5c9sdpjycrh61khc840l14h5r16kj9vf0nlsqffi9wi8k1i2zr",
"vendorSha256": "05vkn52s0x6kcyxxs0p7w6z1nclmvvla7rjv1ippzw7fgn2s19m0",
"version": "1.158.0"
},
"ansible": {
"owner": "nbering",
@ -112,10 +112,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v2.97.0",
"sha256": "0a95xq2bk6a1yas2kxfq30s41s2jgv2rjvz4y7m34wlldd9qxfhg",
"rev": "v2.98.0",
"sha256": "0cfdw70q1kh6f50gsc94mh1xi7s4z47wfsmskp1ahx7av7wpz1p6",
"vendorSha256": null,
"version": "2.97.0"
"version": "2.98.0"
},
"azurestack": {
"owner": "hashicorp",
@ -157,10 +157,10 @@
"owner": "brightbox",
"provider-source-address": "registry.terraform.io/brightbox/brightbox",
"repo": "terraform-provider-brightbox",
"rev": "v2.1.1",
"sha256": "0gscxy921h8wkr40pi86dfx62z2jl0kkvnkfw7ab7xswz63h1ilm",
"vendorSha256": "1ij21y7lx6599b87vlz31mwykj0qam62w7776d6ar99pc0zl8r8k",
"version": "2.1.1"
"rev": "v2.2.0",
"sha256": "1n0gdfsj8ylmm5pqsjs3dvjvj8larc30x5p9jq546xvi2idvl39n",
"vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71",
"version": "2.2.0"
},
"checkly": {
"owner": "checkly",
@ -176,10 +176,10 @@
"owner": "CheckPointSW",
"provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint",
"repo": "terraform-provider-checkpoint",
"rev": "v1.6.0",
"sha256": "1sfvglyd5giwlfyix4klicli96yz7cp7ry6lbvjziw5xaxs5ramf",
"vendorSha256": "1jsy9ls04rkyl6kl98lp6av8y3clpyskqqhlm9vl5qsv6saqcry7",
"version": "1.6.0"
"rev": "v1.7.0",
"sha256": "1msd3qjrrhl0v3m7n9ybkwxki5wpchzjswd2dcifbif4k8pcs470",
"vendorSha256": "0yaxgyzwja5dl4p7w8q77ash75xwsf05kq88nvmdf94lvspfnwlq",
"version": "1.7.0"
},
"ciscoasa": {
"owner": "CiscoDevNet",
@ -230,10 +230,10 @@
"owner": "Constellix",
"provider-source-address": "registry.terraform.io/Constellix/constellix",
"repo": "terraform-provider-constellix",
"rev": "v0.3.11",
"sha256": "00amvk2d4nb029kjlbljjidmgs7irf7v0ss192csgiyxqi378k2c",
"rev": "v0.4.0",
"sha256": "1z23nri0xk6y1xvrz89hda4ssnbgx6dfzq0fc4nywl6naf2nybyw",
"vendorSha256": null,
"version": "0.3.11"
"version": "0.4.0"
},
"consul": {
"owner": "hashicorp",
@ -248,10 +248,10 @@
"owner": "poseidon",
"provider-source-address": "registry.terraform.io/poseidon/ct",
"repo": "terraform-provider-ct",
"rev": "v0.9.2",
"sha256": "104j34b1m110fdya21k4rz03j1yba4a9cpm7hq13i8hc2diqjqnc",
"rev": "v0.10.0",
"sha256": "1wh5qd4m0wxbgd84mnnv5ghi57721wz1bdw0k7ff7l7d4whb0q1z",
"vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk",
"version": "0.9.2"
"version": "0.10.0"
},
"datadog": {
"owner": "DataDog",
@ -356,10 +356,10 @@
"owner": "fastly",
"provider-source-address": "registry.terraform.io/fastly/fastly",
"repo": "terraform-provider-fastly",
"rev": "v1.0.0",
"sha256": "0rpggjsnxwz3rd93nxqr0w2addscxw498mf1mjp3mvkj1f3r9afi",
"rev": "v1.1.0",
"sha256": "02ymg29fmx23hgsifb8dr28yxl3h2d93cn4k6x8cx763nyfd5aqf",
"vendorSha256": null,
"version": "1.0.0"
"version": "1.1.0"
},
"flexibleengine": {
"owner": "FlexibleEngineCloud",
@ -401,10 +401,10 @@
"owner": "gitlabhq",
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
"repo": "terraform-provider-gitlab",
"rev": "v3.9.1",
"sha256": "1pqwgshjrzdw8prgadwq0hf0q72jjjfaas6kgh2as3yn8q24ynca",
"vendorSha256": "04v5hgq23rpz6h242v0m2zhpsfmx4h97pf396w4v6j0kj1wabf87",
"version": "3.9.1"
"rev": "v3.10.0",
"sha256": "1grmsjnr3af95qiwygmxnyij90bn89kd781s556yiq40qa776nql",
"vendorSha256": "04dqjcxx2z43p8c0z8hwr3xw7g4sggxgclqpk83rapprvbmh33dj",
"version": "3.10.0"
},
"google": {
"owner": "hashicorp",
@ -430,10 +430,10 @@
"owner": "grafana",
"provider-source-address": "registry.terraform.io/grafana/grafana",
"repo": "terraform-provider-grafana",
"rev": "v1.19.0",
"sha256": "1ch4nxva1ixmgm6kjyvbd4ydrl8w39ll0ljpk1m2lrg5pn349mjn",
"vendorSha256": "0z8sd1hq0hhm51fi91ri6dmsq6brba9vd22gxkgzxfdsncq24h2a",
"version": "1.19.0"
"rev": "v1.20.1",
"sha256": "1hl1dplb59hssdlq0j83mix9abfgzkbpqpsfirwd8pv4z47s055j",
"vendorSha256": "157y4fwfd2l822ass7v2sa3vn3kxrfhiapg5rwsm8q3lg1g42f2m",
"version": "1.20.1"
},
"gridscale": {
"owner": "gridscale",
@ -448,10 +448,10 @@
"owner": "hetznercloud",
"provider-source-address": "registry.terraform.io/hetznercloud/hcloud",
"repo": "terraform-provider-hcloud",
"rev": "v1.32.2",
"sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f",
"rev": "v1.33.1",
"sha256": "1mskbr0adhnri72fa3afghxpcfbzq0qnpslhh9gdnymvs3afjbdg",
"vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv",
"version": "1.32.2"
"version": "1.33.1"
},
"helm": {
"owner": "hashicorp",
@ -466,10 +466,10 @@
"owner": "heroku",
"provider-source-address": "registry.terraform.io/heroku/heroku",
"repo": "terraform-provider-heroku",
"rev": "v5.0.0",
"sha256": "1dskbwa10dmj5fdw0wplby6hhcvxri68jlg34966mqx8pas3zsxy",
"rev": "v5.0.1",
"sha256": "13nsqvcbb9ydzsgri090ddw2y5gcxa2a07i1hfzm78mf5hflp4rb",
"vendorSha256": "13f7841i14b5n5iabqky7694mbqg95f0cvaygapczki5lf2j7fqy",
"version": "5.0.0"
"version": "5.0.1"
},
"http": {
"owner": "hashicorp",
@ -674,28 +674,28 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal",
"rev": "v3.2.2",
"sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi",
"vendorSha256": null,
"version": "3.2.2"
"rev": "v3.3.0-alpha.1",
"sha256": "0lihzid312q8qh1bl9x1wqslshq7pb0q4m8dgbww1cszzg6xb5aq",
"vendorSha256": "0aniiiysh6iq20fcqvdgs6a4l3prbxzpqpp2ixpfaxhg4z5l8zrf",
"version": "3.3.0-alpha.1"
},
"minio": {
"owner": "aminueza",
"provider-source-address": "registry.terraform.io/aminueza/minio",
"repo": "terraform-provider-minio",
"rev": "v1.3.0",
"sha256": "0cgjcq5fk4cyxrpvqkg7nk9hjzr28nmhmlnhclx9bw2rm3g7i000",
"vendorSha256": "0p3mg2j89jjkhgv57l5pkpyjdhbh41ilb5az5y2m5zz3kbl4y13b",
"version": "1.3.0"
"rev": "v1.4.0",
"sha256": "0da7dhgs1c4r65fwwbkbz67lphrsl6ia5v8yx5viwfrsgdh0319z",
"vendorSha256": "1yshi8sz99ii9v77hlgkrcxrazjc8f6s79dszxdrnjwhahnz0hac",
"version": "1.4.0"
},
"mongodbatlas": {
"owner": "mongodb",
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
"repo": "terraform-provider-mongodbatlas",
"rev": "v1.2.0",
"sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi",
"vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks",
"version": "1.2.0"
"rev": "v1.3.0",
"sha256": "0lrzbljd8iklyrmplc64lq4v8y7z5fw7l41y27nsfjl4rm0xz5bn",
"vendorSha256": "0kkkrdbapyvfzmnbh5kmhlcz5l8g8gf0mfwbya66iy1bb6f6w4mz",
"version": "1.3.0"
},
"ncloud": {
"owner": "NaverCloudPlatform",
@ -774,10 +774,10 @@
"owner": "terraform-providers",
"provider-source-address": "registry.terraform.io/hashicorp/oci",
"repo": "terraform-provider-oci",
"rev": "v4.64.0",
"sha256": "1x8lhyr356j2gihgfy8563n75aqb2prwvdlnkxmvlbqcp10rnggd",
"rev": "v4.65.0",
"sha256": "19np5x4swc5k8zjg4rjhx85x7xr4jzyvbcpsgfqaqgdg99hjcmjq",
"vendorSha256": null,
"version": "4.64.0"
"version": "4.65.0"
},
"okta": {
"owner": "okta",
@ -829,10 +829,10 @@
"owner": "opentelekomcloud",
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.27.5",
"sha256": "04kr3319xpzabajzav3hl2ibws2lj7x2naqfc9gpdy7j06rhhkaa",
"vendorSha256": "1lyz6lb4ciddr3d2zh5hfdfvhdacs13xynkpsjcjyqqfhayxqavg",
"version": "1.27.5"
"rev": "v1.27.6",
"sha256": "1vq2h4ldvskw874fdnjqh1np5z09dh3q3lrqjmfand8ksrzacjjm",
"vendorSha256": "0bkya9ckh82bacaksqbb6010fwclz9wh1b5k1s9z9d0d6bgvf60m",
"version": "1.27.6"
},
"opsgenie": {
"owner": "opsgenie",
@ -1045,10 +1045,10 @@
"owner": "SumoLogic",
"provider-source-address": "registry.terraform.io/SumoLogic/sumologic",
"repo": "terraform-provider-sumologic",
"rev": "v2.12.0",
"sha256": "04rrs6x9grkqqqrz3l3nqzp3vy03jw24l1grx2nbw8srpgw1pcwl",
"rev": "v2.13.0",
"sha256": "1jg6jdmxi60v8gsqycnq7jy89l2zls37zvl317vhp8f93si2hr2d",
"vendorSha256": "19zhpa47wxkxk2nixd960xz9xh38nq5ml7dwnimr4v1mpvw9hcgc",
"version": "2.12.0"
"version": "2.13.0"
},
"template": {
"owner": "hashicorp",
@ -1063,10 +1063,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.61.8",
"sha256": "1a8p141m3kcr1irl9z3vpjs6zkgqp003z7m52yskapv4df8d6skz",
"rev": "v1.61.13",
"sha256": "1g1y9x9xfhyjksn7wb60vddli9fwga5r7snvrsa7sh8fkwvpfs0s",
"vendorSha256": null,
"version": "1.61.8"
"version": "1.61.13"
},
"tfe": {
"owner": "hashicorp",
@ -1136,10 +1136,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/vault",
"repo": "terraform-provider-vault",
"rev": "v3.3.0",
"sha256": "1b36c2f06fglf6bs6s4ly73vk1cm7zd1ci13df5wp0f2xxib3szk",
"rev": "v3.3.1",
"sha256": "1mxy44dl1wr99v6b0gvzcf9d5nfky0avmx4fq83h9vfnvq7rmrhn",
"vendorSha256": "0x9cyxnaqkfpzx9ml7qqhl98jslpy1v965kd11kgcvqpr9lmc77x",
"version": "3.3.0"
"version": "3.3.1"
},
"vcd": {
"owner": "vmware",

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; [ ];
};
}

35
pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch Normal file
View file

@ -0,0 +1,35 @@
From 232c692240b9c52b95bd38ba7aecb11e7077cf31 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 26 Feb 2022 12:33:13 +0100
Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD
---
build.gradle | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/build.gradle b/build.gradle
index cbb587f..3b06e80 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,6 +82,9 @@ static String getVersion() {
repositories {
maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
+ maven {
+ url "https://plugins.gradle.org/m2/"
+ }
mavenCentral()
}
@@ -102,6 +105,8 @@ dependencies {
implementation 'io.prometheus:simpleclient_httpserver:0.14.1'
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
implementation 'io.sentry:sentry:5.6.1'
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3'
+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31'
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
}
--
2.33.1

60
pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch Normal file
View file

@ -0,0 +1,60 @@
From 80277ce9e24d9efa8dfd6eb775187c823e0e528e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 26 Feb 2022 12:36:15 +0100
Subject: [PATCH 2/2] buildconfig/local deps fixes
---
build.gradle | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index cbb587f..ad836cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,10 +9,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal
import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+buildscript {
+ repositories {
+ maven {
+ url(uri("@deps@"))
+ }
+ }
+ dependencies {
+ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3"
+ }
+}
+
plugins {
- id 'com.github.gmazzo.buildconfig' version '3.0.3'
id 'application'
}
+apply plugin: "com.github.gmazzo.buildconfig"
compileJava.options.encoding = 'UTF-8'
@@ -82,7 +93,10 @@ static String getVersion() {
repositories {
maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
- mavenCentral()
+ mavenLocal()
+ maven {
+ url uri("@deps@")
+ }
}
dependencies {
@@ -102,6 +116,8 @@ dependencies {
implementation 'io.prometheus:simpleclient_httpserver:0.14.1'
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
implementation 'io.sentry:sentry:5.6.1'
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3'
+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31'
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
}
--
2.33.1

39
pkgs/applications/networking/instant-messengers/signald/default.nix
View file

@ -1,34 +1,24 @@
{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl
, makeWrapper, fetchpatch
, makeWrapper, fetchpatch, substituteAll
}:
let
pname = "signald";
version = "0.15.0";
version = "0.17.0";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = version;
sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg=";
};
log4j-update-cve-2021-44228 = fetchpatch {
url = "https://gitlab.com/signald/signald/-/commit/7f668062ab9ffa09a49d171e995f57cf0a0803a7.patch";
sha256 = "sha256-504je6hKciUGelVCGZjxGjHi1qZQaovagXD5PBQP+mM=";
};
buildConfigJar = fetchurl {
url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar";
sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
sha256 = "sha256-eN6lEs6PuRczbzQZmGlNf6Ahp4FbWpA3EArlATEiZHU=";
};
# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit src version;
patches = [ log4j-update-cve-2021-44228 ];
nativeBuildInputs = [ gradle_6 perl ];
patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
gradle --no-daemon build
@ -36,7 +26,7 @@ let
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
installPhase = ''
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \
| sh
'';
# Don't move info to share/
@ -45,8 +35,8 @@ let
outputHashMode = "recursive";
# Downloaded jars differ by platform
outputHash = {
x86_64-linux = "sha256-e2Tehtznc+VsvQzD3lQ50Lg7ipQc7P3ekOnb8XLORO8=";
aarch64-linux = "sha256-P48s3vG5vUNxCCga5FhzpODhlvvc+F2ZZGX/G0FVGWc=";
x86_64-linux = "sha256-kZ25p+lIkOqNoFFBgJRYFcvKJenKICVa1PasaaEHmRA=";
aarch64-linux = "sha256-CbFNigp3R7ETX0uXv6PNuhDpmPc4sowbWmwZ+5txXQs=";
}.${stdenv.system} or (throw "Unsupported platform");
};
@ -54,22 +44,17 @@ in stdenv.mkDerivation rec {
inherit pname src version;
patches = [
./gradle-plugin.patch
log4j-update-cve-2021-44228
(substituteAll {
src = ./0002-buildconfig-local-deps-fixes.patch;
inherit deps;
})
];
postPatch = ''
sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
'';
buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d)
# Use the local packages from -deps
sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle
gradle --offline --no-daemon distTar
runHook postBuild
@ -100,7 +85,7 @@ in stdenv.mkDerivation rec {
'';
homepage = "https://signald.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ expipiplus1 ];
maintainers = with maintainers; [ expipiplus1 ma27 ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

19
pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch
View file

@ -1,19 +0,0 @@
diff --git a/build.gradle b/build.gradle
index 11d7a99..66805bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
import org.xml.sax.SAXParseException
-plugins {
- id 'de.fuerstenau.buildconfig' version '1.1.8'
+buildscript {
+ dependencies {
+ classpath files ("BuildConfig.jar")
+ }
}
+apply plugin: 'de.fuerstenau.buildconfig'
apply plugin: 'java'
apply plugin: 'application'

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

150
pkgs/applications/networking/n8n/node-packages.nix generated
View file

@ -265,13 +265,13 @@ let
sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==";
};
};
"@oclif/parser-3.8.6" = {
"@oclif/parser-3.8.7" = {
name = "_at_oclif_slash_parser";
packageName = "@oclif/parser";
version = "3.8.6";
version = "3.8.7";
src = fetchurl {
url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz";
sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw==";
url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz";
sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q==";
};
};
"@opentelemetry/api-1.1.0" = {
@ -445,13 +445,13 @@ let
sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==";
};
};
"@types/lodash-4.14.178" = {
"@types/lodash-4.14.179" = {
name = "_at_types_slash_lodash";
packageName = "@types/lodash";
version = "4.14.178";
version = "4.14.179";
src = fetchurl {
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz";
sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==";
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz";
sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==";
};
};
"@types/lossless-json-1.0.1" = {
@ -481,13 +481,13 @@ let
sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A==";
};
};
"@types/node-17.0.18" = {
"@types/node-17.0.21" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "17.0.18";
version = "17.0.21";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz";
sha512 = "eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==";
url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz";
sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==";
};
};
"@types/node-fetch-2.6.1" = {
@ -976,13 +976,13 @@ let
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
};
};
"aws-sdk-2.1077.0" = {
"aws-sdk-2.1082.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1077.0";
version = "2.1082.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1077.0.tgz";
sha512 = "orJvJROs8hJaQRfHsX7Zl5PxEgrD/uTXyqXz9Yu9Io5VVxzvnOty9oHmvEMSlgTIf1qd01gnev/vpvP1HgzKtw==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1082.0.tgz";
sha512 = "aDrUZ63O/ocuC827ursDqFQAm3jhqsJu1DvMCCFg73y+FK9pXXNHp2mwdi3UeeHvtfxISCLCjuyO3VFd/tpVfA==";
};
};
"aws-sign2-0.7.0" = {
@ -1894,6 +1894,15 @@ let
sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==";
};
};
"cssfilter-0.0.10" = {
name = "cssfilter";
packageName = "cssfilter";
version = "0.0.10";
src = fetchurl {
url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz";
sha1 = "c6d2672632a2e5c83e013e6864a42ce8defd20ae";
};
};
"dashdash-1.14.1" = {
name = "dashdash";
packageName = "dashdash";
@ -4441,13 +4450,13 @@ let
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
};
};
"mssql-6.4.0" = {
"mssql-6.4.1" = {
name = "mssql";
packageName = "mssql";
version = "6.4.0";
version = "6.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/mssql/-/mssql-6.4.0.tgz";
sha512 = "Mtgu3PXqoaL7aHCMurttvEHibjvz5XKjlR6ZCDyAeKtDBORpxm88JyzEU2EESVf7588GulYKc7Gr+Txf5CICBQ==";
url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz";
sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw==";
};
};
"mute-stream-0.0.8" = {
@ -4477,49 +4486,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
"n8n-core-0.105.0" = {
"n8n-core-0.106.0" = {
name = "n8n-core";
packageName = "n8n-core";
version = "0.105.0";
version = "0.106.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.105.0.tgz";
sha512 = "rYAtchFf7V94M9UP1ZCu9ie9O6OWncNconuzO9I1D/QLjBNVGzu0+SsG8be5bGTrAWO0WiNYdj84qMqqJS4NWg==";
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz";
sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw==";
};
};
"n8n-design-system-0.11.0" = {
"n8n-design-system-0.12.0" = {
name = "n8n-design-system";
packageName = "n8n-design-system";
version = "0.11.0";
version = "0.12.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.11.0.tgz";
sha512 = "KL64XTr9sqqiBEEV7on2cdLooleHPyXClFL+THUy2oXDbGqdlyCGykukU7S4aX+nSjrJEQEDMaMcbw3NCHrumg==";
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz";
sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw==";
};
};
"n8n-editor-ui-0.131.0" = {
"n8n-editor-ui-0.132.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
version = "0.131.0";
version = "0.132.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.131.0.tgz";
sha512 = "Sexo31sn8PdiNjDckNfDCXBs9MBR/hF5NzuFtUCUNaXPR6Z5gql6EhPT+fJfG9Wdsj09L3vV+j3gTAbXqRgPIw==";
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.0.tgz";
sha512 = "WOH1Lh+2VYTqBL75pe+WB0H2K8O/6BSW/Wsl5zXbrI0YXmaC9YEvSTAcmjxvjW+oYnYLfQR3p3j6g3AtNldiJQ==";
};
};
"n8n-nodes-base-0.162.0" = {
"n8n-nodes-base-0.163.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
version = "0.162.0";
version = "0.163.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.162.0.tgz";
sha512 = "bi7vs//5OHrW6RowouusBwUzKutFKnysLWdDrlxlCENGtRDtI+7ELrLMWnKs6PYTRWz0OSBHpEMN64MDEIoEZg==";
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz";
sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw==";
};
};
"n8n-workflow-0.87.0" = {
"n8n-workflow-0.88.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
version = "0.87.0";
version = "0.88.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.87.0.tgz";
sha512 = "ei5fvQK4jM3NotOA36d267o243m2MdlSPlG6cIutqx4lgUd1oXX7mYyCJzF3/kNcWbiI8QjdhUoURgdCOEzn8g==";
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz";
sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ==";
};
};
"named-placeholders-1.1.2" = {
@ -7015,13 +7024,13 @@ let
sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
};
};
"url-parse-1.5.9" = {
"url-parse-1.5.10" = {
name = "url-parse";
packageName = "url-parse";
version = "1.5.9";
version = "1.5.10";
src = fetchurl {
url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.9.tgz";
sha512 = "HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ==";
url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz";
sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==";
};
};
"utf7-1.0.2" = {
@ -7141,13 +7150,13 @@ let
sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
};
};
"vm2-3.9.8" = {
"vm2-3.9.9" = {
name = "vm2";
packageName = "vm2";
version = "3.9.8";
version = "3.9.9";
src = fetchurl {
url = "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz";
sha512 = "/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w==";
url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz";
sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==";
};
};
"vue-fragment-1.5.2" = {
@ -7366,6 +7375,15 @@ let
sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
};
};
"xss-1.0.10" = {
name = "xss";
packageName = "xss";
version = "1.0.10";
src = fetchurl {
url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz";
sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw==";
};
};
"xtend-4.0.2" = {
name = "xtend";
packageName = "xtend";
@ -7462,10 +7480,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.164.1";
version = "0.165.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.164.1.tgz";
sha512 = "8eUhHHikLspebbc1AjatdSQeaQAVgeYMIMFZmiUPMUw8FVtQ67otse6t/RvBE2RXTzxKer54Nr8eA+cF5dHi8g==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.165.0.tgz";
sha512 = "PYg5cXEeH6YzVZaSDD9yOZbPtTM/yfaohbZjijyyzVmlOBnI6teQsaY+aLqK6ST4LfMfpB0ZkXpaiBj6xE9azA==";
};
dependencies = [
(sources."@azure/abort-controller-1.0.5" // {
@ -7551,7 +7569,7 @@ in
];
})
sources."@oclif/linewrap-1.0.0"
(sources."@oclif/parser-3.8.6" // {
(sources."@oclif/parser-3.8.7" // {
dependencies = [
sources."tslib-2.3.1"
];
@ -7574,10 +7592,10 @@ in
sources."@types/ftp-0.3.33"
sources."@types/json-diff-0.5.2"
sources."@types/jsonwebtoken-8.5.8"
sources."@types/lodash-4.14.178"
sources."@types/lodash-4.14.179"
sources."@types/lossless-json-1.0.1"
sources."@types/mime-1.3.2"
sources."@types/node-17.0.18"
sources."@types/node-17.0.21"
(sources."@types/node-fetch-2.6.1" // {
dependencies = [
sources."form-data-3.0.1"
@ -7646,7 +7664,7 @@ in
];
})
sources."avsc-5.7.3"
(sources."aws-sdk-2.1077.0" // {
(sources."aws-sdk-2.1082.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -7839,6 +7857,7 @@ in
sources."csrf-3.1.0"
sources."css-select-4.2.1"
sources."css-what-5.1.0"
sources."cssfilter-0.0.10"
sources."dashdash-1.14.1"
sources."date-utils-1.2.21"
sources."debug-4.3.3"
@ -8196,7 +8215,7 @@ in
];
})
sources."ms-2.1.2"
sources."mssql-6.4.0"
sources."mssql-6.4.1"
sources."mute-stream-0.0.8"
(sources."mysql2-2.3.3" // {
dependencies = [
@ -8205,19 +8224,19 @@ in
];
})
sources."mz-2.7.0"
(sources."n8n-core-0.105.0" // {
(sources."n8n-core-0.106.0" // {
dependencies = [
sources."qs-6.10.3"
];
})
sources."n8n-design-system-0.11.0"
sources."n8n-editor-ui-0.131.0"
(sources."n8n-nodes-base-0.162.0" // {
sources."n8n-design-system-0.12.0"
sources."n8n-editor-ui-0.132.0"
(sources."n8n-nodes-base-0.163.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
sources."n8n-workflow-0.87.0"
sources."n8n-workflow-0.88.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@ -8627,7 +8646,7 @@ in
sources."punycode-1.3.2"
];
})
sources."url-parse-1.5.9"
sources."url-parse-1.5.10"
(sources."utf7-1.0.2" // {
dependencies = [
sources."semver-5.3.0"
@ -8643,7 +8662,7 @@ in
sources."validator-13.7.0"
sources."vary-1.1.2"
sources."verror-1.10.0"
sources."vm2-3.9.8"
sources."vm2-3.9.9"
sources."vue-fragment-1.5.2"
sources."vue-i18n-8.27.0"
sources."webidl-conversions-3.0.1"
@ -8676,6 +8695,11 @@ in
sources."xmlbuilder-11.0.1"
sources."xpath.js-1.1.0"
sources."xregexp-2.0.0"
(sources."xss-1.0.10" // {
dependencies = [
sources."commander-2.20.3"
];
})
sources."xtend-4.0.2"
sources."y18n-5.0.8"
sources."yallist-4.0.0"

4
pkgs/applications/networking/nextcloud-client/default.nix
View file

@ -22,13 +22,13 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.4.2";
version = "3.4.3";
src = fetchFromGitHub {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-cqpdn2STxJtUTBRFrUh1lRIDaFZfrRkJMxcJuTKxgk8=";
sha256 = "sha256-nryoueoqnbBAJaU11OUXKP5PNrYf4515ojBkdMFIEMA=";
};
patches = [

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;
};
}

2
pkgs/applications/science/biology/neuron/default.nix
View file

@ -14,7 +14,7 @@
}:
stdenv.mkDerivation rec {
pname = "neuron";
pname = "neuron${lib.optionalString useMpi "-mpi"}";
version = "7.5";
nativeBuildInputs = [ which pkg-config automake autoconf libtool ];

4
pkgs/applications/science/biology/raxml/default.nix
View file

@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
pname = "RAxML";
pname = "RAxML${lib.optionalString useMpi "-mpi"}";
version = "8.2.12";
src = fetchFromGitHub {
owner = "stamatak";
repo = "standard-${pname}";
repo = "standard-RAxML";
rev = "v${version}";
sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh";
};

4
pkgs/applications/science/chemistry/d-seams/default.nix
View file

@ -2,13 +2,13 @@
, eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }:
clangStdenv.mkDerivation rec {
version = "v1.0.1";
version = "1.0.1";
pname = "d-SEAMS";
src = fetchFromGitHub {
owner = "d-SEAMS";
repo = "seams-core";
rev = "v1.0.1";
rev = "v${version}";
sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i";
};

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";
};
}

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

@ -20,7 +20,7 @@ let
inherit (python3Packages) docutils python fb-re2 pygit2 pygments;
self = python3Packages.buildPythonApplication rec {
pname = "mercurial";
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.0.3";
src = fetchurl {
@ -34,9 +34,9 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
name = "mercurial-${version}";
sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE=";
sourceRoot = "${pname}-${version}/rust";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
@ -180,7 +180,7 @@ in
buildInputs = self.buildInputs ++ self.propagatedBuildInputs;
nativeBuildInputs = self.nativeBuildInputs;
phases = [ "installPhase" "installCheckPhase" ];
dontUnpack = true;
installPhase = ''
runHook preInstall

4
pkgs/applications/video/ffmpeg-normalize/default.nix
View file

@ -7,11 +7,11 @@
buildPythonApplication rec {
pname = "ffmpeg-normalize";
version = "1.22.6";
version = "1.22.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-aPPRzNotm3ATL0lEq+49lrlrHoNp+Dm1Im5jYF4E1vY=";
sha256 = "sha256-yWn9SoVKnj9KtvBdI3k1a7fuKJmYeu9KrNyvPqw9SHU=";
};
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];

4
pkgs/applications/window-managers/jwm/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "jwm";
version = "2.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "joewing";
repo = "jwm";
rev = "v${version}";
sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj";
sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM=";
};
nativeBuildInputs = [ pkg-config gettext which autoreconfHook ];

9
pkgs/build-support/make-desktopitem/default.nix
View file

@ -34,6 +34,11 @@
, extraConfig ? {} # Additional values to be added literally to the final item, e.g. vendor extensions
}:
let
# FIXME: workaround until https://github.com/NixOS/nixpkgs/pull/162246 lands
cleanName = if lib.hasInfix " " name
then throw "Name must not contain spaces!"
else name;
# There are multiple places in the FDO spec that make "boolean" values actually tristate,
# e.g. StartupNotify, where "unset" is literally defined as "do something reasonable".
# So, handle null values separately.
@ -111,8 +116,8 @@ let
content = [ mainSectionRendered ] ++ actionsRendered;
in
writeTextFile {
name = "${name}.desktop";
destination = "/share/applications/${name}.desktop";
name = "${cleanName}.desktop";
destination = "/share/applications/${cleanName}.desktop";
text = builtins.concatStringsSep "\n" content;
checkPhase = "${desktop-file-utils}/bin/desktop-file-validate $target";
}

33
pkgs/data/fonts/agave/default.nix
View file

@ -1,20 +1,31 @@
{ lib, fetchurl }:
{ lib, fetchurl, stdenv }:
let
pname = "agave";
version = "35";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
version = "37";
downloadToTemp = true;
recursiveHash = true;
postFetch = ''
install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
mkAg = name: hash: fetchurl {
url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-${name}.ttf";
sha256 = hash;
name = "Agave-${name}.ttf";
};
# There are slashed variants, but with same name so only bundle the default versions for now:
fonts = [
(mkAg "Regular" "sha256-vX1VhEgqy9rQ7hPmAgBGxKyIs2QSAYqZC/mL/2BIOrA=")
(mkAg "Bold" "sha256-Ax/l/RKyc03law0ThiLac/7HHV4+YxibKzcZnjZs6VI=")
];
in stdenv.mkDerivation {
inherit pname version;
srcs = fonts;
sourceRoot = ".";
dontUnpack = true;
installPhase = ''
install -D $srcs -t $out/share/fonts/truetype/
'';
sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz";
meta = with lib; {
description = "truetype monospaced typeface designed for X environments";
homepage = "https://b.agaric.net/page/agave";

41
pkgs/data/themes/whitesur/default.nix
View file

@ -4,25 +4,47 @@
, glib
, gnome-shell
, gnome-themes-extra
, jdupes
, libxml2
, sassc
, util-linux
, altVariants ? [] # default: normal
, colorVariants ? [] # default: all
, opacityVariants ? [] # default: all
, themeVariants ? [] # default: default (BigSur-like theme)
, nautilusSize ? null # default: 200px
, panelOpacity ? null # default: 15%
, panelSize ? null # default: 32px
}:
let
pname = "whitesur-gtk-theme";
single = x: lib.optional (x != null) x;
in
lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariants
lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants
lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants
lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants
lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize)
lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity)
lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (single panelSize)
stdenv.mkDerivation rec {
pname = "whitesur-gtk-theme";
version = "2021-12-28";
version = "2022-02-21";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "0i81aickccfp8fffilhi335hj5ijz2n38yj3zw2fnbwgm667i0fc";
sha256 = "1bqgbkx7qhpj9vbqcxb69p67m8ix3avxr81pdpdi56g9gqbnkpfc";
};
nativeBuildInputs = [
glib
gnome-shell
jdupes
libxml2
sassc
util-linux
@ -48,8 +70,21 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
./install.sh --dest $out/share/themes --alt all --theme all
./install.sh \
${toString (map (x: "--alt " + x) altVariants)} \
${toString (map (x: "--color " + x) colorVariants)} \
${toString (map (x: "--opacity " + x) opacityVariants)} \
${toString (map (x: "--theme " + x) themeVariants)} \
${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \
${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \
${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \
--dest $out/share/themes
jdupes --link-soft --recurse $out/share
runHook postInstall
'';

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" ([

16
pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch
View file

@ -1,13 +1,13 @@
diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt
index e1a29b884d17..9d542f8fbfc1 100644
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bcc135665d0..d38679ed41e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include")
set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
@@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE)
set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")
set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")
- set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")
+ set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")
find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
NO_DEFAULT_PATH)

32
pkgs/development/libraries/bamf/default.nix
View file

@ -1,8 +1,7 @@
{ lib, stdenv
, pantheon
, autoconf
, automake
, libtool
{ stdenv
, lib
, autoreconfHook
, gitUpdater
, gnome
, which
, fetchgit
@ -23,26 +22,24 @@
stdenv.mkDerivation rec {
pname = "bamf";
version = "0.5.5";
version = "0.5.6";
outputs = [ "out" "dev" "devdoc" ];
src = fetchgit {
url = "https://git.launchpad.net/~unity-team/bamf";
rev = "${version}+21.10.20210710-0ubuntu1";
sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0";
rev = version;
sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ=";
};
nativeBuildInputs = [
(python3.withPackages (ps: with ps; [ lxml ])) # Tests
autoconf
automake
autoreconfHook
dbus
docbook_xsl
gnome.gnome-common
gobject-introspection
gtk-doc
libtool
pkg-config
vala
which
@ -69,22 +66,23 @@ stdenv.mkDerivation rec {
"--enable-headless-tests"
];
# fix paths
# Fix paths
makeFlags = [
"INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/"
"INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
];
preConfigure = ''
./autogen.sh
'';
# TODO: Requires /etc/machine-id
doCheck = false;
# glib-2.62 deprecations
# Ignore deprecation errors
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = ".ubuntu.*";
};
meta = with lib; {
description = "Application matching framework";
longDescription = ''

2
pkgs/development/libraries/highfive/default.nix
View file

@ -11,7 +11,7 @@
assert mpiSupport -> mpi != null;
stdenv.mkDerivation rec {
pname = "highfive";
pname = "highfive${lib.optionalString mpiSupport "-mpi"}";
version = "2.3.1";
src = fetchFromGitHub {

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;
};
}

4
pkgs/development/libraries/netcdf/default.nix
View file

@ -10,11 +10,11 @@
let
inherit (hdf5) mpiSupport mpi;
in stdenv.mkDerivation rec {
pname = "netcdf";
pname = "netcdf" + lib.optionalString mpiSupport "-mpi";
version = "4.8.0"; # Remove patch mentioned below on upgrade
src = fetchurl {
url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz";
url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz";
sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7";
};

2
pkgs/development/libraries/ngt/default.nix
View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "NGT";
version = "v1.12.3-alpha";
version = "1.12.3-alpha";
src = fetchFromGitHub {
owner = "yahoojapan";

4
pkgs/development/libraries/olm/default.nix
View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "olm";
version = "3.2.9";
version = "3.2.10";
src = fetchFromGitLab {
domain = "gitlab.matrix.org";
owner = "matrix-org";
repo = pname;
rev = version;
sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08";
sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km";
};
nativeBuildInputs = [ cmake ];

8
pkgs/development/libraries/rang/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "rang";
version = "v3.1.0";
version = "3.1.0";
src = fetchFromGitHub {
"owner" = "agauniyal";
owner = "agauniyal";
repo = "rang";
"rev" = "cabe04d6d6b05356fa8f9741704924788f0dd762";
"sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s";
rev = "cabe04d6d6b05356fa8f9741704924788f0dd762";
sha256 = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {

2
pkgs/development/libraries/sqlite/default.nix
View file

@ -10,7 +10,7 @@ let
in
stdenv.mkDerivation rec {
pname = "sqlite";
pname = "sqlite${optionalString interactive "-interactive"}";
version = "3.37.2";
# nixpkgs-update: no auto update

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;
};
}

17
pkgs/development/python-modules/aioitertools/default.nix
View file

@ -17,30 +17,21 @@
buildPythonPackage rec {
pname = "aioitertools";
version = "0.8.0";
version = "0.10.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46";
hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA=";
};
patches = lib.optionals (pythonAtLeast "3.10") [
(fetchpatch {
# Fix TypeError: wait() got an unexpected keyword argument 'loop'
# See https://github.com/omnilib/aioitertools/issues/84
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-aioitertools/trunk/python310.patch";
sha256 = "sha256-F10sduGaLBcxEoP83N/lGpZIlzkM2JTnQnhHKFwc7P0=";
})
];
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
typing-extensions
];
@ -53,7 +44,7 @@ buildPythonPackage rec {
'';
meta = with lib; {
description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables.";
description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables";
license = licenses.mit;
homepage = "https://pypi.org/project/aioitertools/";
maintainers = with maintainers; [ teh ];

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

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "bandit";
version = "1.7.2";
version = "1.7.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-bRGt6gIUpDgTiHv+caN3tamVXkyCbI/9NBtJTjqyUmA=";
sha256 = "sha256-WHcsqVG/ESndqKKA01FUfegycgv3tcKfrDEDknmAuKY=";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/binwalk/default.nix
View file

@ -21,7 +21,7 @@
, visualizationSupport ? false }:
buildPythonPackage rec {
pname = "binwalk";
pname = "binwalk${lib.optionalString visualizationSupport "-full"}";
version = "2.3.3";
src = fetchFromGitHub {

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 = [

15
pkgs/development/python-modules/garages-amsterdam/default.nix
View file

@ -1,22 +1,23 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
, aiohttp
, pythonOlder
}:
buildPythonPackage rec {
pname = "garages-amsterdam";
version = "3.2.1";
version = "4.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "klaasnicolaas";
repo = "garages_amsterdam";
rev = "v${version}";
sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9";
sha256 = "sha256-3YSCf5sUnq2+Bt7LA30XeIMg4zsaPF3K5SVzGZ68SbY=";
};
postPatch = ''
@ -35,7 +36,9 @@ buildPythonPackage rec {
# The only test requires network access
doCheck = false;
pythonImportsCheck = [ "garages_amsterdam" ];
pythonImportsCheck = [
"garages_amsterdam"
];
meta = with lib; {
description = "Python client for getting garage occupancy in Amsterdam";

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "glfw";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "FlorianRhiem";
repo = "pyGLFW";
rev = "v${version}";
sha256 = "15kk0zhhja0yqah09wzpg6912zd5bjmk84ab1n5nwryicpg44hqk";
sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM=";
};
# Patch path to GLFW shared object

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

@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
version = "5.1.1";
version = "5.2.0";
pname = "gspread";
src = fetchPypi {
inherit pname version;
sha256 = "d9db8c43d552f541ea072d4727d1e955bc2368b095dd86c5429a845c9d8aed8f";
sha256 = "sha256-JRc6wIFGnPnWIVFMZXbGz0bznIJfF4uMueeDdKY3sL8=";
};
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];

5
pkgs/development/python-modules/ipyparallel/default.nix
View file

@ -9,7 +9,10 @@
, ipython
, jupyter-client
, ipykernel
, packaging
, psutil
, tornado
, tqdm
, isPy3k
, futures ? null
}:
@ -25,7 +28,7 @@ buildPythonPackage rec {
buildInputs = [ nose ];
propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel tornado
propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel packaging psutil tornado tqdm
] ++ lib.optionals (!isPy3k) [ futures ];
# Requires access to cluster

11
pkgs/development/python-modules/jax/default.nix
View file

@ -64,8 +64,15 @@ buildPythonPackage rec {
"tests/"
];
# See https://github.com/google/jax/issues/9705.
disabledTests = lib.optionals usingMKL [ "test_custom_root_with_aux" ];
# See
# * https://github.com/google/jax/issues/9705
# * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921
# * https://github.com/NixOS/nixpkgs/issues/161960
disabledTests = lib.optionals usingMKL [
"test_custom_linear_solve_cholesky"
"test_custom_root_with_aux"
"testEigvalsGrad_shape"
];
pythonImportsCheck = [
"jax"

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/plexapi/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "plexapi";
version = "4.9.2";
version = "4.10.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "sha256-93qMSOnCl18dRZQB8v2Cxv21vsdFzHefQ7zttQAuPKk=";
sha256 = "sha256-paj1QFSHQw7MfOor1yYwb2vkF9b5RPj6R6dRstK24gA=";
};
propagatedBuildInputs = [

26
pkgs/development/python-modules/portpicker/default.nix
View file

@ -1,6 +1,8 @@
{ buildPythonPackage
, lib
{ lib
, buildPythonPackage
, fetchPypi
, psutil
, pythonOlder
}:
buildPythonPackage rec {
@ -8,15 +10,25 @@ buildPythonPackage rec {
version = "1.5.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "e13b148008adeb2793cf8b55bcd20fdcec4f763f2d3bf3c45f5e5e5d1df7d228";
hash = "sha256-4TsUgAit6yeTz4tVvNIP3OxPdj8tO/PEX15eXR330ig=";
};
meta = {
description = "A library to choose unique available network ports.";
propagatedBuildInputs = [
psutil
];
pythonImportsCheck = [
"portpicker"
];
meta = with lib; {
description = "Library to choose unique available network ports";
homepage = "https://github.com/google/python_portpicker";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ danharaj ];
license = licenses.asl20;
maintainers = with maintainers; [ danharaj ];
};
}

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

@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "py3status";
version = "3.40";
version = "3.41";
src = fetchPypi {
inherit pname version;
sha256 = "9eb6f721f94f28a17a8599ca2743a2bedd58c16cfe74e9817ffa948c13dbb79c";
sha256 = "sha256-2G+5lKkLtgZ/2ghU0xVTDqIXbTNykYIKRiwZiagusoc=";
};
doCheck = false;

26
pkgs/development/python-modules/pyface/default.nix
View file

@ -1,21 +1,35 @@
{ lib, fetchPypi, buildPythonPackage
, importlib-metadata, importlib-resources, six, traits
{ lib
, fetchPypi
, buildPythonPackage
, importlib-metadata
, importlib-resources
, traits
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyface";
version = "7.4.0";
version = "7.4.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-r8Awj9dOYPWxh1Ar2JK/nhuY8hAGFO4+6yr9yq7Pb6s=";
sha256 = "sha256-UtzzZ5yj5hCjynxLmQSpbGkWiASNtdflKvjlAZ5HrbY=";
};
propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ];
propagatedBuildInputs = [
importlib-metadata
importlib-resources
traits
];
doCheck = false; # Needs X server
pythonImportsCheck = [ "pyface" ];
pythonImportsCheck = [
"pyface"
];
meta = with lib; {
description = "Traits-capable windowing framework";

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

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "pyisy";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "automicus";
repo = "PyISY";
rev = "v${version}";
hash = "sha256-ad3hVs0B3uBHj/LVWwAXAkUMbjHPtyaeKueRPcmIMFg=";
hash = "sha256-zQ0IBfbWEGv5t+b3EKF+6tEpmwfAWFMndPqSNSQZ5b4=";
};
postPatch = ''

Some files were not shown because too many files have changed in this diff Show more