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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-10-26 12:01:52 +00:00 committed by GitHub
commit abfd2fe8a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 1091 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maintainers/maintainer-list.nix
View File

@ -10755,6 +10755,15 @@
fingerprint = "B00F E582 FD3F 0732 EA48 3937 F558 14E4 D687 4375";
}];
};
PlayerNameHere = {
name = "Dixon Sean Low Yan Feng";
email = "dixonseanlow@protonmail.com";
github = "PlayerNameHere";
githubId = 56017218;
keys = [{
fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8";
}];
};
plchldr = {
email = "mail@oddco.de";
github = "plchldr";

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

@ -885,6 +885,15 @@
<literal>~/.local/share/PrismLauncher/prismlauncher.cfg</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>bloat</literal> package has been updated from
unstable-2022-03-31 to unstable-2022-10-25, which brings a
breaking change. See
<link xlink:href="https://git.freesoftwareextremist.com/bloat/commit/?id=887ed241d64ba5db3fd3d87194fb5595e5ad7d73">this
upstream commit message</link> for details.
</para>
</listitem>
<listitem>
<para>
The <literal>services.matrix-synapse</literal> systemd unit

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

@ -283,6 +283,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
from `~/.local/share/polymc/polymc.cfg` to
`~/.local/share/PrismLauncher/prismlauncher.cfg`.
- The `bloat` package has been updated from unstable-2022-03-31 to unstable-2022-10-25, which brings a breaking change. See [this upstream commit message](https://git.freesoftwareextremist.com/bloat/commit/?id=887ed241d64ba5db3fd3d87194fb5595e5ad7d73) for details.
- The `services.matrix-synapse` systemd unit has been hardened.
- The `services.grafana` options were converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.

6
pkgs/applications/misc/mangal/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "mangal";
version = "3.14.0";
version = "3.14.2";
src = fetchFromGitHub {
owner = "metafates";
repo = pname;
rev = "v${version}";
hash = "sha256-IQSRPjtMaxwJuiKGjOYQ7jp0mAPS/V6fA1/Ek/K5yqk=";
hash = "sha256-W3oToI7frUfd3zwtr3UpbwAWzCVxDaZY9zhn8dO/4wA=";
};
proxyVendor = true;
vendorSha256 = "sha256-XslNMrFCI+dGaSw7ro1vBMamFukbMA3m0I3hOl9QccM=";
vendorSha256 = null;
ldflags = [ "-s" "-w" ];

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
version = "6.18.0";
version = "6.18.1";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
sha256 = "sha256-vYXDQSEhPi/jxCO6pxOJ1q0AoBVVRU9vErtJLq90ltk=";
sha256 = "sha256-aTyJhPVqq3jGNVozD39RJ4n0FmAKAtPttW9ecoanEzg=";
};
nativeBuildInputs = [ cmake ];

20
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -1,21 +1,21 @@
{
"stable": {
"version": "106.0.5249.119",
"sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g",
"sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd",
"version": "107.0.5304.68",
"sha256": "0k5qrmby1k2gw3lj96x3qag20kka61my578pv0zyrqqj5sdz3i5a",
"sha256bin64": "1x9svz5s8fm2zhnpzjpqckzfp37hjni3nf3pm63rwnvbd06y48ja",
"deps": {
"gn": {
"version": "2022-08-11",
"version": "2022-09-14",
"url": "https://gn.googlesource.com/gn",
"rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a",
"sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
"rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5",
"sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp"
}
},
"chromedriver": {
"version": "106.0.5249.61",
"sha256_linux": "0l2270d5az46pc6icpn3zx7yr8ilkszsrfy3qmwrx3cyc4xnmznj",
"sha256_darwin": "07k76i9m3j34h6ybn1wafy39d2ngf06bhp24qzwvv45rks714hqa",
"sha256_darwin_aarch64": "1nvid0s44nlzy46cgxzsyyb3jfpyl3xy7aqafwskmbxdczx7bdap"
"version": "107.0.5304.62",
"sha256_linux": "13s0kl0k8c6q6h548ay2qssv8j4bmm5b4p3h8bgby30nj9014bsh",
"sha256_darwin": "0awd59xz4cllkbd9r5hhk6sinf291ii81chi361nw67aj5vmj7is",
"sha256_darwin_aarch64": "01fr6518qycwsn6js64k7727jmp3hxmj70jcghmw1cgxam59nh7w"
}
},
"beta": {

4
pkgs/applications/networking/cluster/civo/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "civo";
version = "1.0.40";
version = "1.0.41";
src = fetchFromGitHub {
owner = "civo";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-rsO7vGPr80/ChoNtRGuJDnVDzxwBgLD//iMZEfvxvHc=";
sha256 = "sha256-dvbxxW+UyTA+EzBV6g9JRao8D6ZE5hhXLX4q/mmPIQg=";
};
vendorSha256 = "sha256-gBVSpjoAfbxlJnlrFrsBupJgVQ59sh1ipOry0Mgppig=";

4
pkgs/applications/networking/flexget/default.nix
View File

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.39";
version = "3.4.0";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-UJOV/KRJgy4r7iKWdlA8k51OLzMcfMHgFSvII/D5erA=";
hash = "sha256-Q6VXGkNs5x/B4xGc0ugaVtFOfTukoUNrbUzBbdyPk6A=";
};
postPatch = ''

4
pkgs/applications/networking/freefilesync/default.nix
View File

@ -13,13 +13,13 @@
gcc12Stdenv.mkDerivation rec {
pname = "freefilesync";
version = "11.26";
version = "11.27";
src = fetchFromGitHub {
owner = "hkneptune";
repo = "FreeFileSync";
rev = "v${version}";
sha256 = "sha256-MKs9PfxKVxfDYYB8Dqop9dUd757ajjgvIdMtKJX5dNw=";
sha256 = "sha256-ZIWqCR5/8qaK9Qcb0Uzi/wu3Do8nZ5DGAw8sfwUhCZg=";
};
# Patches from ROSA Linux

4
pkgs/applications/version-management/git-repo/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.29.3";
version = "2.29.4";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-hZoiljARTEhsuaM7QEFl+XqLq4RksLfxDpht5V1aC2M=";
sha256 = "sha256-oUPY10B6JHixdfgi5BHzrg9nZ1DlFUhQyuXJj2fCSM4=";
};
# Fix 'NameError: name 'ssl' is not defined'

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

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "got";
version = "0.76";
version = "0.77";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
sha256 = "sha256-05VUIHUqXnES4CmgopzQ2LQ0uldSffsGF5ExedEO+yA=";
sha256 = "sha256-/O9u7Ei6f0rGr7LRWcG9FUQd7Z+qpq2/6H01jNR1C7o=";
};
nativeBuildInputs = [ pkg-config bison ];

81
pkgs/data/icons/catppuccin-cursors/default.nix Normal file
View File

@ -0,0 +1,81 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, inkscape
, xcursorgen
, makeFontsConf
}:
let
dimensions = {
palette = [ "Frappe" "Latte" "Macchiato" "Mocha" ];
color = [ "Blue" "Dark" "Flamingo" "Green" "Lavender" "Light" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow" ];
};
product = lib.attrsets.cartesianProductOfSets dimensions;
variantName = { palette, color }: (lib.strings.toLower palette) + color;
variants = map variantName product;
in
stdenvNoCC.mkDerivation {
pname = "catppuccin-cursors";
version = "unstable-2022-08-23";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "cursors";
rev = "3d3023606939471c45cff7b643bffc5d5d4ff29c";
sha256 = "1z9cjxxsj3vrmhsw1k05b31zmncz1ksaswc4r1k3vd2mmpigq1nk";
};
outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage
outputsToInstall = [];
nativeBuildInputs = [
inkscape
xcursorgen
];
postPatch = ''
patchShebangs ./build.sh
'';
# Make fontconfig stop warning about being unable to load config
FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
# Make inkscape stop warning about being unable to create profile directory
preBuild = ''
export HOME="$NIX_BUILD_ROOT"
'';
installPhase = ''
runHook preInstall
for output in $outputs; do
if [ "$output" != "out" ]; then
local outputDir="''${!output}"
local iconsDir="$outputDir"/share/icons
mkdir -p "$iconsDir"
# Convert to kebab case with the first letter of each word capitalized
local variant=$(sed 's/\([A-Z]\)/-\1/g' <<< "$output")
local variant=''${variant^}
cp -r dist/Catppuccin-"$variant"-Cursors "$iconsDir"
fi
done
# Needed to prevent breakage
mkdir -p "$out"
runHook postInstall
'';
meta = with lib; {
description = "Catppuccin cursor theme based on Volantes";
homepage = "https://github.com/catppuccin/cursors";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ PlayerNameHere ];
};
}

43
pkgs/desktops/gnome/extensions/extensions.json
View File

File diff suppressed because one or more lines are too long

2
pkgs/development/compilers/chicken/4/chicken.nix
View File

@ -41,6 +41,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [
makeWrapper
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
darwin.autoSignDarwinBinariesHook
];
buildInputs = lib.optionals (bootstrap-chicken != null) [

2
pkgs/development/compilers/chicken/5/chicken.nix
View File

@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
makeWrapper
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
darwin.autoSignDarwinBinariesHook
];
buildInputs = lib.optionals (bootstrap-chicken != null) [

44
pkgs/development/guile-modules/guile-sqlite3/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, stdenv
, fetchFromGitea
, guile
, autoreconfHook
, pkg-config
, texinfo
, sqlite
}:
stdenv.mkDerivation rec {
pname = "guile-sqlite3";
version = "0.1.3";
src = fetchFromGitea {
domain = "notabug.org";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-C1a6lMK4O49043coh8EQkTWALrPolitig3eYf+l+HmM=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
texinfo
];
buildInputs = [
guile
sqlite
];
doCheck = true;
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
enableParallelBuilding = true;
meta = with lib; {
description = "Guile bindings for the SQLite3 database engine";
homepage = "https://notabug.org/guile-sqlite3/guile-sqlite3";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ miangraham ];
platforms = guile.meta.platforms;
};
}

4
pkgs/development/guile-modules/guile-ssh/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "guile-ssh";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "artyom-poptsov";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+BhyaBieqMwTgsSLci3HJdCrNQmfPN/jK2Od5DQs9n8=";
sha256 = "sha256-3h4U/h6cVgHTJOyliw1gTYtgzQcatRLX6NrP87JXRc0=";
};
configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ];

4
pkgs/development/interpreters/clojure/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.11.1.1177";
version = "1.11.1.1182";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-Axutyw+f7TPObxcw8llbu3r0zxYIKxFnBuUp+trR9eI=";
sha256 = "sha256-u6qTQwtoN47UedSsxsyV0ej3C6Ta5ncbP3lZzTmvPr8=";
};
nativeBuildInputs = [

43
pkgs/development/interpreters/luau/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "luau";
version = "0.550";
src = fetchFromGitHub {
owner = "Roblox";
repo = "luau";
rev = version;
sha256 = "sha256-bCZ1V3ygN6+6IHWxT8VPi7vWVk711fki9aIPUUsjiQA=";
};
nativeBuildInputs = [ cmake ];
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin luau
install -Dm755 -t $out/bin luau-analyze
runHook postInstall
'';
doCheck = true;
checkPhase = ''
runHook preCheck
./Luau.UnitTest
./Luau.Conformance
runHook postCheck
'';
meta = with lib; {
homepage = "https://luau-lang.org/";
description = "A fast, small, safe, gradually typed embeddable scripting language derived from Lua";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.marsam ];
};
}

5
pkgs/development/libraries/libfido2/default.nix
View File

@ -8,6 +8,7 @@
, openssl
, udev
, zlib
, withPcsclite ? true
, pcsclite
}:
@ -25,7 +26,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libcbor zlib ]
++ lib.optionals stdenv.isDarwin [ hidapi ]
++ lib.optionals stdenv.isLinux [ udev pcsclite ];
++ lib.optionals stdenv.isLinux [ udev ]
++ lib.optionals (stdenv.isLinux && withPcsclite) [ pcsclite ];
propagatedBuildInputs = [ openssl ];
@ -38,6 +40,7 @@ stdenv.mkDerivation rec {
"-DUSE_HIDAPI=1"
] ++ lib.optionals stdenv.isLinux [
"-DNFC_LINUX=1"
] ++ lib.optionals (stdenv.isLinux && withPcsclite) [
"-DUSE_PCSC=1"
];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qpdf";
version = "11.1.0";
version = "11.1.1";
src = fetchFromGitHub {
owner = "qpdf";
repo = "qpdf";
rev = "v${version}";
hash = "sha256-T06BLtDZN6ulJ9Po3LN1RlI6q8ddAfo95RAhyfrn+qg=";
hash = "sha256-m0yMOaWX9LqSCrUdx62zXZ73xXH/iW6x7bXkz1Fm8zA=";
};
nativeBuildInputs = [ cmake perl ];

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "rubberband";
version = "3.0.0";
version = "3.1.0";
src = fetchurl {
url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2";
sha256 = "sha256-32UwtAPIMAojlz3yLzbzwmPwENU3kgY+QR9jPOu57YU=";
sha256 = "sha256-uVp22lzbOWZ3DGARXs2Dj4QGESD4hMO/3JBPdZMeyao=";
};
nativeBuildInputs = [ pkg-config meson ninja ];

10
pkgs/development/misc/avr/libc/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "avr-libc";
version = "2.0.0";
version = "2.1.0";
src = fetchurl {
url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2";
sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj";
url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-${version}.tar.bz2";
sha256 = "1s2lnqsbr1zs7dvsbyyckay52lm8mbjjaqf3cyx5qpcbq3jwx10b";
};
nativeBuildInputs = [ automake autoconf ];
@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "a C runtime library for AVR microcontrollers";
homepage = "https://savannah.nongnu.org/projects/avr-libc/";
homepage = "https://github.com/avrdudes/avr-libc";
license = licenses.bsd3;
platforms = [ "avr-none" ];
maintainers = with maintainers; [ mguentner ];
maintainers = with maintainers; [ mguentner emilytrau ];
};
}

4
pkgs/development/misc/brev-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.130";
version = "0.6.138";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sMtMLuf/tpCrMLImrDMvOyk7x3bK3K3flrfrvRnbLmw=";
sha256 = "sha256-hGFY+8OgHEQW0uVqobSv27HEA9noVVzOKJs0LHNZ+rM=";
};
vendorSha256 = "sha256-cNwfK1LpguRfM/ORebU6v+JLIxDJdT5y+zM3KmEamEw=";

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiogithubapi";
version = "22.3.1";
version = "22.10.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
hash = "sha256-5gKANZtDhIoyfyLdS15JDWTxHBFkaHDUlbVVhRs7MSE=";
hash = "sha256-ceBuqaMqqL6qwN52765MG4sLt+08hx2G9rUVNC7x6ik=";
};
postPatch = ''

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "azure-identity";
version = "1.10.0";
version = "1.11.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-ZW5QNNnO8pfPmzU3btYgCFJzwYz6Us6kpiW/DV0tZAk=";
hash = "sha256-w/yACvWLhX5/rw4xA3bl7xD12tUJCRTMQv+m19I7Zyk=";
};
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "ciscoconfparse";
version = "1.6.40";
version = "1.6.50";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mpenning";
repo = pname;
rev = version;
hash = "sha256-2j1AlCIwTxIjotZ0fSt1zhsgPfJTqJukZ6KQvh74NJ8=";
hash = "sha256-OKPw7P2hhk8yzqjOcf2NYEueJR1ecC/D93ULfkM88Xg=";
};
postPatch = ''

28
pkgs/development/python-modules/cpyparsing/default.nix
View File

@ -1,25 +1,41 @@
{ lib, buildPythonPackage, fetchFromGitHub, cython, pexpect, python }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, cython
, pexpect
, python
, pythonOlder
}:
buildPythonPackage rec {
pname = "cpyparsing";
version = "2.4.7.1.1.0";
version = "2.4.7.1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "evhub";
repo = pname;
rev = "v${version}";
sha256 = "1rqj89mb4dz0xk8djh506nrlqfqqdva9qgb5llrvvwjqv3vqnrj4";
rev = "refs/tags/v${version}";
hash = "sha256-cb0Lx+S9WnPa9veHJaYEU7pFCtB6pG/GKf4HK/UbmtU=";
};
nativeBuildInputs = [ cython ];
checkInputs = [ pexpect ];
checkPhase = "${python.interpreter} tests/cPyparsing_test.py";
checkPhase = ''
${python.interpreter} tests/cPyparsing_test.py
'';
pythonImportsCheck = [
"cPyparsing"
];
meta = with lib; {
homepage = "https://github.com/evhub/cpyparsing";
description = "Cython PyParsing implementation";
homepage = "https://github.com/evhub/cpyparsing";
license = licenses.asl20;
maintainers = with maintainers; [ fabianhjr ];
};

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "1.9.4";
version = "1.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc";
repo = "fakeredis-py";
rev = "refs/tags/v${version}";
hash = "sha256-E0GS3nHtkG50gEWo2oPzcSo7IqExnGG64XA8H4d22h8=";
hash = "sha256-yf/rj2c481lIFJJ8t+yqZe74MN+y7HikBTnRo3lkPeQ=";
};
nativeBuildInputs = [

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

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "hcloud";
version = "1.18.0";
version = "1.18.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-oh2UDN6PDB/RCgWBsGGOuECm9ZJAT6r9tgcBAfRSX/Y=";
hash = "sha256-nhz9fJEcYyt7rhIe0AkYPgG/mV0r87KUj/mM2A70rPE=";
};
propagatedBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.5.6";
version = "2.5.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-DAVCQQmL6ABMjygKm48knZL+smovES5CWv149GoDp34=";
sha256 = "sha256-n1ejYP3mfJgXc6x1eiqxg73+JCR7kjrzWmvFz0XwN+I=";
};
checkInputs = [

10
pkgs/development/python-modules/moto/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
@ -103,7 +104,7 @@ buildPythonPackage rec {
"--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning"
"--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header"
# Disalbe test that require docker daemon
# Disable tests that require docker daemon
"--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda"
"--deselect=tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda"
@ -119,6 +120,13 @@ buildPythonPackage rec {
# Blocks test execution
"--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_load_data_from_inmemory_client"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
"--deselect=tests/test_utilities/test_threaded_server.py::test_threaded_moto_server__different_port"
"--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services"
"--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable"
# AssertionError: expected `{0}` to be greater than `{1}`
"--deselect=tests/test_databrew/test_databrew_recipes.py::test_publish_recipe"
];
disabledTestPaths = [

4
pkgs/development/python-modules/mypy-boto3-s3/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
version = "1.24.94";
version = "1.25.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-CQffewwDqMFY19CPyzwlVQXvyog0ciRCWo/Gh+RZb6E=";
hash = "sha256-aJd/dEzjucQgiEZ/9m4z55HKPyew3FXztVApjwPqGm8=";
};
propagatedBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "22.9.6";
version = "22.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-CZ2Y3ePRfwj9VbdoQjdQMs9+/cdixkRovGISv9T+pYU=";
hash = "sha256-z+oJakeZARnyZrkkNjLlyFcOB73u9+G0tXhbI13neyc=";
};
nativeBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyskyqremote";
version = "0.3.16";
version = "0.3.17";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "RogerSelwyn";
repo = "skyq_remote";
rev = "refs/tags/${version}";
sha256 = "sha256-zzVUXjpFCeyoYcerKJuK12nCf7tVJ7WdDvMDruGgAhc=";
sha256 = "sha256-jOeJXl/0LUozwKoE3R67tts6v283Li7zHIatr0nadCk=";
};
propagatedBuildInputs = [

14
pkgs/development/python-modules/pytest-qt/default.nix
View File

@ -4,15 +4,19 @@
, setuptools-scm
, pytest
, pyqt5
, pythonOlder
}:
buildPythonPackage rec {
pname = "pytest-qt";
version = "4.1.0";
version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-An89P13QSvBTDYRs9Q+4WPcZ9+h8LkocaGq9Tg9yFyo=";
hash = "sha256-AKF7WG3VMLbXqTmZI6QEicpKmjCXGQERdfVdxrXcj0E=";
};
nativeBuildInputs = [
@ -27,7 +31,11 @@ buildPythonPackage rec {
pyqt5
];
# tests require X server
pythonImportsCheck = [
"pytestqt"
];
# Tests require X server
doCheck = false;
meta = with lib; {

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

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pytest-testmon";
version = "1.3.7";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-tjdu4mEslRl7QGnNGg7ATaQCipwF5/XSpFPq3E3A/Vo=";
hash = "sha256-PVLXOBTo2xnMBM4wyvrmGgyztW0ajGxMU+oIhrjZiw8=";
};
buildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pytibber";
version = "0.25.4";
version = "0.25.6";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyTibber";
rev = "refs/tags/${version}";
hash = "sha256-K8QIs5N5dTZmVYS0QbwsSVl5yObhjrNwka4y6SCE8Wc=";
hash = "sha256-aGl43gxrnKwo3ZhN+EpSBMZw0wKWf5aIPFx3goo8Nog=";
};
propagatedBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "regenmaschine";
version = "2022.09.2";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-lpmytE2WkZuLcONm/kvtmXnHaimzaKOre9S5hIqDNVE=";
sha256 = "sha256-HJgAQnBhoGo7PDwDl0XNXpSVRM8L9SFHM90kycCK0rE=";
};
nativeBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "snapcast";
version = "2.3.0";
version = "2.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "happyleavesaoc";
repo = "python-snapcast";
rev = "refs/tags/${version}";
hash = "sha256-De/dxZLNTJT6DuTa/piavNsLhr6lsPKqR5rQNrvwXGQ=";
hash = "sha256-5SnjAkIrsgyEQ9nrBfe1jL+y4cxFzRVao2PM3VPIz8c=";
};
propagatedBuildInputs = [

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

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "sqlite-utils";
version = "3.29";
version = "3.30";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-2eoQJqnAB6iVzdBKvcvjzSrANRXCouu62SM5OaoRH1s=";
hash = "sha256-MABcEtXxNEVln3kXZr62qZAMJfRCvqH5gPIdOLdfbjM=";
};
postPatch = ''

9
pkgs/development/python-modules/starkbank-ecdsa/default.nix
View File

@ -2,18 +2,21 @@
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "starkbank-ecdsa";
version = "2.1.0";
version = "2.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "starkbank";
repo = "ecdsa-python";
rev = "v${version}";
sha256 = "sha256-N7TV4o7u4YRymFrRNtSPbjobEu+X2QtnkPHcnZW3zTY=";
rev = "refs/tags/v${version}";
hash = "sha256-HarlCDE2qOLbyhMLOE++bTC+7srJqwmohM6vrJkJ/gc=";
};
checkInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "tweepy";
version = "4.10.1";
version = "4.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-S8lF40ioarnR1ZDSy6/9arANDYvy0NpYlVi65LQlPA8=";
hash = "sha256-sUjML+5mLgJ79YeF6eIRiXHeKEpyjpbtcgmzzeA4Ayk=";
};
propagatedBuildInputs = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-redis";
version = "4.3.21.2";
version = "4.3.21.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-q1QiSaR9OQO5QWLmOVrmvgzA9WL9GE7VGgo02KcCGjk=";
sha256 = "sha256-Lh8YQFYYjIdU3tC1Fz3AGCTSv+QZdf4xgGimi+7ftiw=";
};
# Module doesn't have tests

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "urlextract";
version = "1.6.0";
version = "1.7.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-V08NjFYtN3M2pRVIQMfk7s9UwQKlOJcciX9zEwdaiIc=";
hash = "sha256-DYg7Wd5Th4c+o4JeYrNDWDMTE1rGZMP1wNVfF7Kzv30=";
};
propagatedBuildInputs = [

6
pkgs/development/tools/analysis/tfsec/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
version = "1.28.0";
version = "1.28.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
hash = "sha256-j+Q92DUqb06w1aDBX4T+4btN5YrizbIWln8fqRrk1hw=";
hash = "sha256-44DN3lV9BLBFr6kkD3IcamQg+t+xUqqao83f0nBKZvI=";
};
ldflags = [
@ -22,7 +22,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
vendorSha256 = "sha256-Avwr7A2X68sZgXUGl+Pgci+QtG9tsZMsyYkVeC4p2oQ=";
vendorSha256 = "sha256-NQUDeNAWSWcIoSZjdbaFQTB3nMFGbLZLUDNFHMk6Enw=";
subPackages = [
"cmd/tfsec"

4
pkgs/development/tools/database/clickhouse-backup/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "clickhouse-backup";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "AlexAkulov";
repo = pname;
rev = "v${version}";
sha256 = "sha256-P1jJQtXxTiobYQJDxPqUImSEf5aR9/hIr/Og0fYa3Vc=";
sha256 = "sha256-Vc9zPERRF6AWSOGSiOe6n33Ioc3uOtHQEehfMhPkSFk=";
};
vendorSha256 = "sha256-kbIztD0g+92gxxBYhWILudgFRFCshagmAUs8bY/Z8yg=";

4
pkgs/development/tools/database/timescaledb-tune/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "timescaledb-tune";
version = "0.14.1";
version = "0.14.2";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Met+bFvTlbn7JAE2A2IFBD4f6qVtS/4gXffwV71xvZI=";
sha256 = "sha256-vbFfqGWYpw0ppon/0oQMRixQStk+YSi/QFMi0AQoUpQ=";
};
vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E=";

435
pkgs/development/tools/misc/binutils/avr-size.patch Normal file
View File

@ -0,0 +1,435 @@
diff --git a/binutils/size.c b/binutils/size.c
index 3697087714..f99d45a6bf 100644
--- a/binutils/size.c
+++ b/binutils/size.c
@@ -51,7 +51,8 @@ enum output_format
{
FORMAT_BERKLEY,
FORMAT_SYSV,
- FORMAT_GNU
+ FORMAT_GNU,
+ FORMAT_AVR
};
static enum output_format selected_output_format =
#if BSD_DEFAULT
@@ -74,6 +75,246 @@ static bfd_size_type total_textsize;
/* Program exit status. */
static int return_code = 0;
+
+/* AVR Size specific stuff */
+
+#define AVR64 64UL
+#define AVR128 128UL
+#define AVR256 256UL
+#define AVR512 512UL
+#define AVR1K 1024UL
+#define AVR2K 2048UL
+#define AVR4K 4096UL
+#define AVR8K 8192UL
+#define AVR16K 16384UL
+#define AVR20K 20480UL
+#define AVR24K 24576UL
+#define AVR32K 32768UL
+#define AVR36K 36864UL
+#define AVR40K 40960UL
+#define AVR64K 65536UL
+#define AVR68K 69632UL
+#define AVR128K 131072UL
+#define AVR136K 139264UL
+#define AVR200K 204800UL
+#define AVR256K 262144UL
+#define AVR264K 270336UL
+
+typedef struct
+{
+ char *name;
+ long flash;
+ long ram;
+ long eeprom;
+} avr_device_t;
+
+avr_device_t avr[] =
+{
+ {"atxmega256a3", AVR264K, AVR16K, AVR4K},
+ {"atxmega256a3b", AVR264K, AVR16K, AVR4K},
+ {"atxmega256d3", AVR264K, AVR16K, AVR4K},
+
+ {"atmega2560", AVR256K, AVR8K, AVR4K},
+ {"atmega2561", AVR256K, AVR8K, AVR4K},
+
+ {"atxmega192a3", AVR200K, AVR16K, AVR2K},
+ {"atxmega192d3", AVR200K, AVR16K, AVR2K},
+
+ {"atxmega128a1", AVR136K, AVR8K, AVR2K},
+ {"atxmega128a1u", AVR136K, AVR8K, AVR2K},
+ {"atxmega128a3", AVR136K, AVR8K, AVR2K},
+ {"atxmega128d3", AVR136K, AVR8K, AVR2K},
+
+ {"at43usb320", AVR128K, 608UL, 0UL},
+ {"at90can128", AVR128K, AVR4K, AVR4K},
+ {"at90usb1286", AVR128K, AVR8K, AVR4K},
+ {"at90usb1287", AVR128K, AVR8K, AVR4K},
+ {"atmega128", AVR128K, AVR4K, AVR4K},
+ {"atmega1280", AVR128K, AVR8K, AVR4K},
+ {"atmega1281", AVR128K, AVR8K, AVR4K},
+ {"atmega1284p", AVR128K, AVR16K, AVR4K},
+ {"atmega128rfa1", AVR128K, AVR16K, AVR4K},
+ {"atmega103", AVR128K, 4000UL, AVR4K},
+
+ {"atxmega64a1", AVR68K, AVR4K, AVR2K},
+ {"atxmega64a1u", AVR68K, AVR4K, AVR2K},
+ {"atxmega64a3", AVR68K, AVR4K, AVR2K},
+ {"atxmega64d3", AVR68K, AVR4K, AVR2K},
+
+ {"at90can64", AVR64K, AVR4K, AVR2K},
+ {"at90scr100", AVR64K, AVR4K, AVR2K},
+ {"at90usb646", AVR64K, AVR4K, AVR2K},
+ {"at90usb647", AVR64K, AVR4K, AVR2K},
+ {"atmega64", AVR64K, AVR4K, AVR2K},
+ {"atmega640", AVR64K, AVR8K, AVR4K},
+ {"atmega644", AVR64K, AVR4K, AVR2K},
+ {"atmega644a", AVR64K, AVR4K, AVR2K},
+ {"atmega644p", AVR64K, AVR4K, AVR2K},
+ {"atmega644pa", AVR64K, AVR4K, AVR2K},
+ {"atmega645", AVR64K, AVR4K, AVR2K},
+ {"atmega645a", AVR64K, AVR4K, AVR2K},
+ {"atmega645p", AVR64K, AVR4K, AVR2K},
+ {"atmega6450", AVR64K, AVR4K, AVR2K},
+ {"atmega6450a", AVR64K, AVR4K, AVR2K},
+ {"atmega6450p", AVR64K, AVR4K, AVR2K},
+ {"atmega649", AVR64K, AVR4K, AVR2K},
+ {"atmega649a", AVR64K, AVR4K, AVR2K},
+ {"atmega649p", AVR64K, AVR4K, AVR2K},
+ {"atmega6490", AVR64K, AVR4K, AVR2K},
+ {"atmega6490a", AVR64K, AVR4K, AVR2K},
+ {"atmega6490p", AVR64K, AVR4K, AVR2K},
+ {"atmega64c1", AVR64K, AVR4K, AVR2K},
+ {"atmega64hve", AVR64K, AVR4K, AVR1K},
+ {"atmega64m1", AVR64K, AVR4K, AVR2K},
+ {"m3000", AVR64K, AVR4K, 0UL},
+
+ {"atmega406", AVR40K, AVR2K, AVR512},
+
+ {"atxmega32a4", AVR36K, AVR4K, AVR1K},
+ {"atxmega32d4", AVR36K, AVR4K, AVR1K},
+
+ {"at90can32", AVR32K, AVR2K, AVR1K},
+ {"at94k", AVR32K, AVR4K, 0UL},
+ {"atmega32", AVR32K, AVR2K, AVR1K},
+ {"atmega323", AVR32K, AVR2K, AVR1K},
+ {"atmega324a", AVR32K, AVR2K, AVR1K},
+ {"atmega324p", AVR32K, AVR2K, AVR1K},
+ {"atmega324pa", AVR32K, AVR2K, AVR1K},
+ {"atmega325", AVR32K, AVR2K, AVR1K},
+ {"atmega325a", AVR32K, AVR2K, AVR1K},
+ {"atmega325p", AVR32K, AVR2K, AVR1K},
+ {"atmega3250", AVR32K, AVR2K, AVR1K},
+ {"atmega3250a", AVR32K, AVR2K, AVR1K},
+ {"atmega3250p", AVR32K, AVR2K, AVR1K},
+ {"atmega328", AVR32K, AVR2K, AVR1K},
+ {"atmega328p", AVR32K, AVR2K, AVR1K},
+ {"atmega329", AVR32K, AVR2K, AVR1K},
+ {"atmega329a", AVR32K, AVR2K, AVR1K},
+ {"atmega329p", AVR32K, AVR2K, AVR1K},
+ {"atmega329pa", AVR32K, AVR2K, AVR1K},
+ {"atmega3290", AVR32K, AVR2K, AVR1K},
+ {"atmega3290a", AVR32K, AVR2K, AVR1K},
+ {"atmega3290p", AVR32K, AVR2K, AVR1K},
+ {"atmega32hvb", AVR32K, AVR2K, AVR1K},
+ {"atmega32c1", AVR32K, AVR2K, AVR1K},
+ {"atmega32hvb", AVR32K, AVR2K, AVR1K},
+ {"atmega32m1", AVR32K, AVR2K, AVR1K},
+ {"atmega32u2", AVR32K, AVR1K, AVR1K},
+ {"atmega32u4", AVR32K, 2560UL, AVR1K},
+ {"atmega32u6", AVR32K, 2560UL, AVR1K},
+
+ {"at43usb355", AVR24K, 1120UL, 0UL},
+
+ {"atxmega16a4", AVR20K, AVR2K, AVR1K},
+ {"atxmega16d4", AVR20K, AVR2K, AVR1K},
+
+ {"at76c711", AVR16K, AVR2K, 0UL},
+ {"at90pwm216", AVR16K, AVR1K, AVR512},
+ {"at90pwm316", AVR16K, AVR1K, AVR512},
+ {"at90usb162", AVR16K, AVR512, AVR512},
+ {"atmega16", AVR16K, AVR1K, AVR512},
+ {"atmega16a", AVR16K, AVR1K, AVR512},
+ {"atmega161", AVR16K, AVR1K, AVR512},
+ {"atmega162", AVR16K, AVR1K, AVR512},
+ {"atmega163", AVR16K, AVR1K, AVR512},
+ {"atmega164", AVR16K, AVR1K, AVR512},
+ {"atmega164a", AVR16K, AVR1K, AVR512},
+ {"atmega164p", AVR16K, AVR1K, AVR512},
+ {"atmega165a", AVR16K, AVR1K, AVR512},
+ {"atmega165", AVR16K, AVR1K, AVR512},
+ {"atmega165p", AVR16K, AVR1K, AVR512},
+ {"atmega168", AVR16K, AVR1K, AVR512},
+ {"atmega168a", AVR16K, AVR1K, AVR512},
+ {"atmega168p", AVR16K, AVR1K, AVR512},
+ {"atmega169", AVR16K, AVR1K, AVR512},
+ {"atmega169a", AVR16K, AVR1K, AVR512},
+ {"atmega169p", AVR16K, AVR1K, AVR512},
+ {"atmega169pa", AVR16K, AVR1K, AVR512},
+ {"atmega16hva", AVR16K, 768UL, AVR256},
+ {"atmega16hva2", AVR16K, AVR1K, AVR256},
+ {"atmega16hvb", AVR16K, AVR1K, AVR512},
+ {"atmega16m1", AVR16K, AVR1K, AVR512},
+ {"atmega16u2", AVR16K, AVR512, AVR512},
+ {"atmega16u4", AVR16K, 1280UL, AVR512},
+ {"attiny167", AVR16K, AVR512, AVR512},
+
+ {"at90c8534", AVR8K, 352UL, AVR512},
+ {"at90pwm1", AVR8K, AVR512, AVR512},
+ {"at90pwm2", AVR8K, AVR512, AVR512},
+ {"at90pwm2b", AVR8K, AVR512, AVR512},
+ {"at90pwm3", AVR8K, AVR512, AVR512},
+ {"at90pwm3b", AVR8K, AVR512, AVR512},
+ {"at90pwm81", AVR8K, AVR256, AVR512},
+ {"at90s8515", AVR8K, AVR512, AVR512},
+ {"at90s8535", AVR8K, AVR512, AVR512},
+ {"at90usb82", AVR8K, AVR512, AVR512},
+ {"ata6289", AVR8K, AVR512, 320UL},
+ {"atmega8", AVR8K, AVR1K, AVR512},
+ {"atmega8515", AVR8K, AVR512, AVR512},
+ {"atmega8535", AVR8K, AVR512, AVR512},
+ {"atmega88", AVR8K, AVR1K, AVR512},
+ {"atmega88a", AVR8K, AVR1K, AVR512},
+ {"atmega88p", AVR8K, AVR1K, AVR512},
+ {"atmega88pa", AVR8K, AVR1K, AVR512},
+ {"atmega8hva", AVR8K, 768UL, AVR256},
+ {"atmega8u2", AVR8K, AVR512, AVR512},
+ {"attiny84", AVR8K, AVR512, AVR512},
+ {"attiny84a", AVR8K, AVR512, AVR512},
+ {"attiny85", AVR8K, AVR512, AVR512},
+ {"attiny861", AVR8K, AVR512, AVR512},
+ {"attiny861a", AVR8K, AVR512, AVR512},
+ {"attiny87", AVR8K, AVR512, AVR512},
+ {"attiny88", AVR8K, AVR512, AVR64},
+
+ {"at90s4414", AVR4K, 352UL, AVR256},
+ {"at90s4433", AVR4K, AVR128, AVR256},
+ {"at90s4434", AVR4K, 352UL, AVR256},
+ {"atmega48", AVR4K, AVR512, AVR256},
+ {"atmega48a", AVR4K, AVR512, AVR256},
+ {"atmega48p", AVR4K, AVR512, AVR256},
+ {"attiny4313", AVR4K, AVR256, AVR256},
+ {"attiny43u", AVR4K, AVR256, AVR64},
+ {"attiny44", AVR4K, AVR256, AVR256},
+ {"attiny44a", AVR4K, AVR256, AVR256},
+ {"attiny45", AVR4K, AVR256, AVR256},
+ {"attiny461", AVR4K, AVR256, AVR256},
+ {"attiny461a", AVR4K, AVR256, AVR256},
+ {"attiny48", AVR4K, AVR256, AVR64},
+
+ {"at86rf401", AVR2K, 224UL, AVR128},
+ {"at90s2313", AVR2K, AVR128, AVR128},
+ {"at90s2323", AVR2K, AVR128, AVR128},
+ {"at90s2333", AVR2K, 224UL, AVR128},
+ {"at90s2343", AVR2K, AVR128, AVR128},
+ {"attiny20", AVR2K, AVR128, 0UL},
+ {"attiny22", AVR2K, 224UL, AVR128},
+ {"attiny2313", AVR2K, AVR128, AVR128},
+ {"attiny2313a", AVR2K, AVR128, AVR128},
+ {"attiny24", AVR2K, AVR128, AVR128},
+ {"attiny24a", AVR2K, AVR128, AVR128},
+ {"attiny25", AVR2K, AVR128, AVR128},
+ {"attiny26", AVR2K, AVR128, AVR128},
+ {"attiny261", AVR2K, AVR128, AVR128},
+ {"attiny261a", AVR2K, AVR128, AVR128},
+ {"attiny28", AVR2K, 0UL, 0UL},
+ {"attiny40", AVR2K, AVR256, 0UL},
+
+ {"at90s1200", AVR1K, 0UL, AVR64},
+ {"attiny9", AVR1K, 32UL, 0UL},
+ {"attiny10", AVR1K, 32UL, 0UL},
+ {"attiny11", AVR1K, 0UL, AVR64},
+ {"attiny12", AVR1K, 0UL, AVR64},
+ {"attiny13", AVR1K, AVR64, AVR64},
+ {"attiny13a", AVR1K, AVR64, AVR64},
+ {"attiny15", AVR1K, 0UL, AVR64},
+
+ {"attiny4", AVR512, 32UL, 0UL},
+ {"attiny5", AVR512, 32UL, 0UL},
+};
+
+static char *avrmcu = NULL;
+
+
static char *target = NULL;
/* Forward declarations. */
@@ -89,7 +330,8 @@ usage (FILE *stream, int status)
fprintf (stream, _(" Displays the sizes of sections inside binary files\n"));
fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n"));
fprintf (stream, _(" The options are:\n\
- -A|-B|-G --format={sysv|berkeley|gnu} Select output style (default is %s)\n\
+ -A|-B|-G|-C --format={sysv|berkeley|gnu|avr} Select output style (default is %s)\n\
+ --mcu=<avrmcu> MCU name for AVR format only\n\
-o|-d|-x --radix={8|10|16} Display numbers in octal, decimal or hex\n\
-t --totals Display the total sizes (Berkeley only)\n\
--common Display total size for *COM* syms\n\
@@ -113,6 +355,7 @@ usage (FILE *stream, int status)
#define OPTION_FORMAT (200)
#define OPTION_RADIX (OPTION_FORMAT + 1)
#define OPTION_TARGET (OPTION_RADIX + 1)
+#define OPTION_MCU (OPTION_TARGET + 1)
static struct option long_options[] =
{
@@ -120,6 +363,7 @@ static struct option long_options[] =
{"format", required_argument, 0, OPTION_FORMAT},
{"radix", required_argument, 0, OPTION_RADIX},
{"target", required_argument, 0, OPTION_TARGET},
+ {"mcu", required_argument, 0, 203},
{"totals", no_argument, &show_totals, 1},
{"version", no_argument, &show_version, 1},
{"help", no_argument, &show_help, 1},
@@ -153,7 +397,7 @@ main (int argc, char **argv)
fatal (_("fatal error: libbfd ABI mismatch"));
set_default_bfd_target ();
- while ((c = getopt_long (argc, argv, "ABGHhVvdfotx", long_options,
+ while ((c = getopt_long (argc, argv, "ABCGHhVvdfotx", long_options,
(int *) 0)) != EOF)
switch (c)
{
@@ -172,12 +416,20 @@ main (int argc, char **argv)
case 'g':
selected_output_format = FORMAT_GNU;
break;
+ case 'A':
+ case 'a':
+ selected_output_format = FORMAT_AVR;
+ break;
default:
non_fatal (_("invalid argument to --format: %s"), optarg);
usage (stderr, 1);
}
break;
+ case OPTION_MCU:
+ avrmcu = optarg;
+ break;
+
case OPTION_TARGET:
target = optarg;
break;
@@ -214,6 +466,9 @@ main (int argc, char **argv)
case 'G':
selected_output_format = FORMAT_GNU;
break;
+ case 'C':
+ selected_output_format = FORMAT_AVR;
+ break;
case 'v':
case 'V':
show_version = 1;
@@ -656,6 +911,98 @@ print_sysv_format (bfd *file)
printf ("\n\n");
}
+static avr_device_t *
+avr_find_device (void)
+{
+ unsigned int i;
+ if (avrmcu != NULL)
+ {
+ for (i = 0; i < sizeof(avr) / sizeof(avr[0]); i++)
+ {
+ if (strcmp(avr[i].name, avrmcu) == 0)
+ {
+ /* Match found */
+ return (&avr[i]);
+ }
+ }
+ }
+ return (NULL);
+}
+
+static void
+print_avr_format (bfd *file)
+{
+ char *avr_name = "Unknown";
+ int flashmax = 0;
+ int rammax = 0;
+ int eeprommax = 0;
+ asection *section;
+ bfd_size_type my_datasize = 0;
+ bfd_size_type my_textsize = 0;
+ bfd_size_type my_bsssize = 0;
+ bfd_size_type bootloadersize = 0;
+ bfd_size_type noinitsize = 0;
+ bfd_size_type eepromsize = 0;
+
+ avr_device_t *avrdevice = avr_find_device();
+ if (avrdevice != NULL)
+ {
+ avr_name = avrdevice->name;
+ flashmax = avrdevice->flash;
+ rammax = avrdevice->ram;
+ eeprommax = avrdevice->eeprom;
+ }
+
+ if ((section = bfd_get_section_by_name (file, ".data")) != NULL)
+ my_datasize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".text")) != NULL)
+ my_textsize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".bss")) != NULL)
+ my_bsssize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL)
+ bootloadersize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL)
+ noinitsize = bfd_section_size (section);
+ if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL)
+ eepromsize = bfd_section_size (section);
+
+ bfd_size_type text = my_textsize + my_datasize + bootloadersize;
+ bfd_size_type data = my_datasize + my_bsssize + noinitsize;
+ bfd_size_type eeprom = eepromsize;
+
+ printf ("AVR Memory Usage\n"
+ "----------------\n"
+ "Device: %s\n\n", avr_name);
+
+ /* Text size */
+ printf ("Program:%8ld bytes", text);
+ if (flashmax > 0)
+ {
+ printf (" (%2.1f%% Full)", ((float)text / flashmax) * 100);
+ }
+ printf ("\n(.text + .data + .bootloader)\n\n");
+
+ /* Data size */
+ printf ("Data: %8ld bytes", data);
+ if (rammax > 0)
+ {
+ printf (" (%2.1f%% Full)", ((float)data / rammax) * 100);
+ }
+ printf ("\n(.data + .bss + .noinit)\n\n");
+
+ /* EEPROM size */
+ if (eeprom > 0)
+ {
+ printf ("EEPROM: %8ld bytes", eeprom);
+ if (eeprommax > 0)
+ {
+ printf (" (%2.1f%% Full)", ((float)eeprom / eeprommax) * 100);
+ }
+ printf ("\n(.eeprom)\n\n");
+ }
+}
+
+
static void
print_sizes (bfd *file)
{
@@ -663,6 +1010,8 @@ print_sizes (bfd *file)
calculate_common_size (file);
if (selected_output_format == FORMAT_SYSV)
print_sysv_format (file);
+ else if (selected_output_format == FORMAT_AVR)
+ print_avr_format (file);
else
print_berkeley_or_gnu_format (file);
}

4
pkgs/development/tools/misc/binutils/default.nix
View File

@ -93,6 +93,10 @@ stdenv.mkDerivation {
./gas-dwarf-zero-PR29451.patch
]
++ lib.optional targetPlatform.isiOS ./support-ios.patch
# Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution
# Patch from arch-community
# https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch
++ lib.optional targetPlatform.isAvr ./avr-size.patch
++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch
++ lib.optional stdenv.targetPlatform.isMips64n64
# this patch is from debian:

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.21812";
version = "0.1.22322";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pIgZcJ0QVckTfzdsT2pSdw9Z/3AhashjWpwRXzmevbQ=";
sha256 = "sha256-HhQ2KZDu4X/extycQ9CZQYs8GjR5e93M0qw2cJsqj9E=";
};
vendorSha256 = "sha256-vydx3ZaVSpIn5nncuQhRVQqZ7920n1NAoZIHFvzrQgo=";

6
pkgs/development/tools/pscale/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "pscale";
version = "0.115.0";
version = "0.122.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-XiTH3Ep7dTvAdE3AAjPJztEcnvWqX+qf/zED8xpC9N0=";
sha256 = "sha256-gvz05VquRLKXMf45pxFAZCtyGWpn/DgOjRCHU6jTI/E=";
};
vendorSha256 = "sha256-arTp77VocH5isIoq3B55G/6sQjVbmoduCywiJYJaAws=";
vendorSha256 = "sha256-HPlzro95wIYLwG1Sq5cgVFmUpEfKlhfWLfQTDS5c3bg=";
ldflags = [
"-s" "-w"

6
pkgs/development/tools/ruff/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.82";
version = "0.0.83";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BBk6mmsSd4SuvLMA/HvvVqGrxheGWJdx0luj5IRg7AI=";
sha256 = "sha256-oBeshV3VYhkHa53xjbFSSVPfPhEP0orBbW7Qlkpp8hw=";
};
cargoSha256 = "sha256-w848QIVq+604DtT8di1IJqdlFSX7f9y19kAM3cGPtkA=";
cargoSha256 = "sha256-8Qx5P7NQB1gL48fii2iMr9Fr4zOQRfINdGUmHoqiP28=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

6
pkgs/development/tools/sentry-cli/default.nix
View File

@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "sentry-cli";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-cli";
rev = version;
sha256 = "sha256-ua8U1sYQoSi4xYmJ34icJyblu2VPoVtJMXdZWbhbIF0=";
sha256 = "sha256-4LbIzH+pFTKZWKY0QCd20V1ppJe4EIiGP0KD9VGlCtE=";
};
doCheck = false;
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-bwggklnaT1x/jhz4v7po0uNi65V+u1Jbqk6Ij07DAUU=";
cargoSha256 = "sha256-U4Rpfiw/4pq9G+V/XUews+7Dt/7kqq/vYZ2t2ZO8/tM=";
meta = with lib; {
homepage = "https://docs.sentry.io/cli/";

6
pkgs/games/0ad/game.nix
View File

@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = toString [
"-I${xorgproto}/include/X11"
"-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11"
"-I${xorgproto}/include"
"-I${libX11.dev}/include"
"-I${libXcursor.dev}/include"
"-I${SDL2}/include/SDL2"
"-I${fmt.dev}/include"
"-I${nvidia-texture-tools.dev}/include"

201
pkgs/os-specific/darwin/yabai/default.nix
View File

@ -1,39 +1,180 @@
{ lib, stdenv, fetchFromGitHub, darwin, xxd }:
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, fetchzip
, writeShellScript
, installShellFiles
, testers
, yabai
, xxd
, xcodebuild
, Carbon
, Cocoa
, ScriptingBridge
# This needs to be from SDK 10.13 or higher, SLS APIs introduced in that version get used
, SkyLight
}:
stdenv.mkDerivation rec {
let
pname = "yabai";
version = "3.3.10";
version = "4.0.4";
src = fetchFromGitHub {
owner = "koekeishiya";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8O6//T894C32Pba3F2Z84Z6VWeCXlwml3xsXoIZGqL0=";
test-version = testers.testVersion {
package = yabai;
version = "yabai-v${version}";
};
nativeBuildInputs = [ xxd ];
buildInputs = with darwin.apple_sdk.frameworks; [
Carbon
Cocoa
ScriptingBridge
SkyLight
];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/man/man1/
cp ./bin/yabai $out/bin/yabai
cp ./doc/yabai.1 $out/share/man/man1/yabai.1
'';
meta = with lib; {
description = ''
A tiling window manager for macOS based on binary space partitioning
_meta = with lib; {
description = "A tiling window manager for macOS based on binary space partitioning";
longDescription = ''
yabai is a window management utility that is designed to work as an extension to the built-in
window manager of macOS. yabai allows you to control your windows, spaces and displays freely
using an intuitive command line interface and optionally set user-defined keyboard shortcuts
using skhd and other third-party software.
'';
homepage = "https://github.com/koekeishiya/yabai";
platforms = platforms.darwin;
maintainers = with maintainers; [ cmacrae shardy ];
changelog = "https://github.com/koekeishiya/yabai/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
platforms = platforms.darwin;
maintainers = with maintainers; [
cmacrae
shardy
ivar
];
};
}
in
{
# Unfortunately compiling yabai from source on aarch64-darwin is a bit complicated. We use the precompiled binary instead for now.
# See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
aarch64-darwin = stdenvNoCC.mkDerivation {
inherit pname version;
src = fetchzip {
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
sha256 = "sha256-NS8tMUgovhWqc6WdkNI4wKee411i/e/OE++JVc86kFE=";
};
nativeBuildInputs = [
installShellFiles
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r ./bin $out
installManPage ./doc/yabai.1
runHook postInstall
'';
passthru.tests.version = test-version;
meta = _meta // {
sourceProvenance = with lib.sourceTypes; [
binaryNativeCode
];
};
};
x86_64-darwin = stdenv.mkDerivation rec {
inherit pname version;
src = fetchFromGitHub {
owner = "koekeishiya";
repo = "yabai";
rev = "v${version}";
sha256 = "sha256-TeT+8UAV2jR60XvTs4phkp611Gi0nzLmQnezLA0xb44=";
};
nativeBuildInputs = [
installShellFiles
xcodebuild
xxd
];
buildInputs = [
Carbon
Cocoa
ScriptingBridge
SkyLight
];
dontConfigure = true;
enableParallelBuilding = true;
postPatch = ''
# aarch64 code is compiled on all targets, which causes our Apple SDK headers to error out.
# Since multilib doesnt work on darwin i dont know of a better way of handling this.
substituteInPlace makefile \
--replace "-arch arm64e" "" \
--replace "-arch arm64" "" \
--replace "clang" "${stdenv.cc.targetPrefix}clang"
# `NSScreen::safeAreaInsets` is only available on macOS 12.0 and above, which frameworks arent packaged.
# When a lower OS version is detected upstream just returns 0, so we can hardcode that at compiletime.
# https://github.com/koekeishiya/yabai/blob/v4.0.2/src/workspace.m#L109
substituteInPlace src/workspace.m \
--replace 'return screen.safeAreaInsets.top;' 'return 0;'
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/icons/hicolor/scalable/apps}
cp ./bin/yabai $out/bin/yabai
ln -s ${loadScriptingAddition} $out/bin/yabai-load-sa
cp ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/yabai.svg
installManPage ./doc/yabai.1
runHook postInstall
'';
# Defining this here exposes it as a passthru attribute, which is useful because it allows us to run `builtins.hashFile` on it in pure-eval mode.
# With that we can programatically generate an `/etc/sudoers.d` entry which disables the password requirement, so that a user-agent can run it at login.
loadScriptingAddition = writeShellScript "yabai-load-sa" ''
# For whatever reason the regular commands to load the scripting addition do not work, yabai will throw an error.
# The installation command mutably installs binaries to '/System', but then fails to start them. Manually running
# the bins as root does start the scripting addition, so this serves as a more user-friendly way to do that.
set -euo pipefail
if [[ "$EUID" != 0 ]]; then
echo "error: the scripting-addition loader must ran as root. try 'sudo $0'"
exit 1
fi
loaderPath="/Library/ScriptingAdditions/yabai.osax/Contents/MacOS/mach_loader";
if ! test -x "$loaderPath"; then
echo "could not locate the scripting-addition loader at '$loaderPath', installing it..."
echo "note: this may display an error"
eval "$(dirname "''${BASH_SOURCE[0]}")/yabai --install-sa" || true
sleep 1
fi
echo "executing loader..."
eval "$loaderPath"
echo "scripting-addition started"
'';
passthru.tests.version = test-version;
meta = _meta // {
longDescription = _meta.longDescription + ''
Note that due to a nix-only bug the scripting addition cannot be launched using the regular
procedure. Instead, you can use the provided `yabai-load-sa` script.
'';
sourceProvenance = with lib.sourceTypes; [
fromSource
];
};
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}")

6
pkgs/servers/bloat/default.nix
View File

@ -6,12 +6,12 @@
buildGoModule {
pname = "bloat";
version = "unstable-2022-09-23";
version = "unstable-2022-10-25";
src = fetchgit {
url = "git://git.freesoftwareextremist.com/bloat";
rev = "68698a9e1afce43ef807d6b5f892ca1c0f905b8a";
sha256 = "sha256-gxSHxMdiIWsJb/qM3W7Eon/ST15l2wkJqyjxEU8RlCQ=";
rev = "887ed241d64ba5db3fd3d87194fb5595e5ad7d73";
sha256 = "sha256-2G7DcK21GBICdQYWRTTMzHmkrgstrEelVlLcYgKlUGM=";
};
vendorSha256 = null;

4
pkgs/servers/geospatial/geoserver/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "geoserver";
version = "2.21.1";
version = "2.21.2";
src = fetchurl {
url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
sha256 = "sha256-Ln7vHU/J80edOJbL3lAezXrk+jJQ2mGWY9+61GyiLXk=";
sha256 = "sha256-RL9a6AO6ZXD8NXWh49wwcNd+W5Nu2Ppl8daESR4mUoA=";
};
sourceRoot = ".";

4
pkgs/servers/jackett/default.nix
View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.1853";
version = "0.20.2167";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "JsqUgp5o5mYByX6ALTbzMrfjDz035vNGBOjQZCseXKY=";
sha256 = "119VBstPmcXaNRxwv2w6yn1oiR6VIcHccLhLFtlyCFM=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

34
pkgs/servers/jackett/deps.nix generated
View File

@ -1,3 +1,6 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "AngleSharp"; version = "0.16.1"; sha256 = "11r5fpm8009pwdlr0vblqbvngpm5mb7jc565sqb3rnwbd5yyrrnk"; })
(fetchNuGet { pname = "AngleSharp.Xml"; version = "0.16.0"; sha256 = "1skj9x9njypd4hyajkadsavp3m1vv7l8jb4jhczixa22p8p0cfrq"; })
@ -189,6 +192,23 @@
(fetchNuGet { pname = "NUnit.ConsoleRunner"; version = "3.12.0"; sha256 = "00ihk6i3wzqndrn6yyh1csh4b3h226x5kwdp3716p75p4nljs1ik"; })
(fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; })
(fetchNuGet { pname = "Polly"; version = "7.2.2"; sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; })
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
(fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
(fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; })
(fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
(fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; })
(fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; })
(fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; })
(fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; })
(fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
(fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; })
(fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; })
(fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
(fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; })
(fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
(fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; })
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; })
@ -205,6 +225,14 @@
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
(fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; })
(fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; })
(fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
(fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; })
(fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; })
(fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
(fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; })
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
@ -261,12 +289,14 @@
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; })
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
(fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })
@ -309,6 +339,7 @@
(fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; })
(fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; })
(fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; })
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; })
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; })
@ -323,6 +354,8 @@
(fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "4.5.0"; sha256 = "1rk40x0msf9k7sxnjyizagjns1z25dh3cf22bx6hsx6vhf0sk08l"; })
(fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.0"; sha256 = "0aybd4mp9f8d4kgdnrnad7bmdg872044p75nk37f8a4lvkh2sywd"; })
(fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; })
(fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
(fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "6.0.0"; sha256 = "1x4i8jlpfvca3bmsm0fjzq3zswpd2cszjq93v2nxaq3d57vv5npa"; })
@ -347,6 +380,7 @@
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
(fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; })
(fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; })
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
(fetchNuGet { pname = "System.ValueTuple"; version = "4.3.0"; sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; })
(fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })

6
pkgs/servers/klipper/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "klipper";
version = "unstable-2022-10-17";
version = "unstable-2022-10-25";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "0d9b2cc1fa297b9adedb14be31a8d5c8d7868681";
sha256 = "sha256-Yiqmi4/TrxpXzVVOEEyUVqKb3Gm6/tp+S4JeajujTjc=";
rev = "96ea871b355d69ae00220d14c3a9f9c4b8754337";
sha256 = "sha256-40rWK47XDbwOujTiRMrKDXLj0ifCGDiccJEt1RyKzQE=";
};
sourceRoot = "source/klippy";

4
pkgs/servers/mail/postfix/default.nix
View File

@ -25,11 +25,11 @@ let
in stdenv.mkDerivation rec {
pname = "postfix";
version = "3.6.6";
version = "3.7.3";
src = fetchurl {
url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz";
hash = "sha256-CYpxT0EEaO/ibiGR3I8xy6RQfVv0iPVvnrVUXjaG8NY=";
hash = "sha256-0i89N+91YT1dVztW/FHvCX8sDQsOQHkjcR9xwftykRs=";
};
nativeBuildInputs = [ makeWrapper m4 ];

6
pkgs/servers/minio/default.nix
View File

@ -15,16 +15,16 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2022-10-21T22-37-48Z";
version = "2022-10-24T18-35-07Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-kdf1V7qg/UwVASYYSAY2kfT8m+cmOnAb69FVzdzvZ5Y=";
sha256 = "sha256-sABNzhyfBNU5pWyE/VWHUzuSyKsx0glj01ectJPakV8=";
};
vendorSha256 = "sha256-m2U2VfUBAmPMFOXhSCQCxtwWI1eFh5TLAp8Izqi8HLQ=";
vendorSha256 = "sha256-wB3UiuptT6D0CIUlHC1d5k0rjIxNeh5yAWOmYpyLGmA=";
doCheck = false;

6
pkgs/servers/rtsp-simple-server/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "rtsp-simple-server";
version = "0.20.0";
version = "0.20.1";
src = fetchFromGitHub {
owner = "aler9";
repo = pname;
rev = "v${version}";
hash = "sha256-egmTcEhfBxUw8fOpcft0Sna7zXxAfI264yZECDpWYQE=";
hash = "sha256-9tstGrl+5OzHUtoY1OREPT0zTDmUg8JkyzUzraLdAFA=";
};
vendorSha256 = "sha256-C8+PVFLpFsowjnwMXwyC9TnNcsb8FEPBcWRgtExO7mw=";
vendorSha256 = "sha256-tmIM7X6sdeA6h4wAGb1RRgkqIjpcgVNq4oMwHZIB4W8=";
# Tests need docker
doCheck = false;

6
pkgs/shells/nushell/default.nix
View File

@ -24,16 +24,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.69.1";
version = "0.70.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-aEEuzl3HRWNk2zJq+Vh5ZLyT26Qk7oI3bQKUr4SlDr8=";
sha256 = "sha256-krsycaqT+MmpWEVNVqQQO2zrO9ymZIskgGgrzEMFP1s=";
};
cargoSha256 = "sha256-qaBiTZUe4RSYdXAEWPVv0ATWDN/+aOYiEpq+oztwNEc=";
cargoSha256 = "sha256-Etw8F5alUNMlH0cvREPk2LdBQKl70dj6JklFZWInvow=";
# enable pkg-config feature of zstd
cargoPatches = [ ./zstd-pkg-config.patch ];

20
pkgs/shells/nushell/zstd-pkg-config.patch
View File

@ -1,31 +1,31 @@
diff --git a/Cargo.lock b/Cargo.lock
index d4c2ebe3a..bc78478c3 100644
index 7376ffe6a..a7d3335cc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2641,6 +2641,7 @@ dependencies = [
"wax",
@@ -2751,6 +2751,7 @@ dependencies = [
"which",
"windows",
"winreg",
+ "zstd",
]
[[package]]
@@ -5604,4 +5605,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
@@ -5881,4 +5882,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
dependencies = [
"cc",
"libc",
+ "pkg-config",
]
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 8a9d29562..374ffa153 100644
index d293f3e39..a462d67dc 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -89,6 +89,8 @@ wax = { version = "0.5.0", features = ["diagnostics"] }
@@ -93,6 +93,8 @@ wax = { version = "0.5.0", features = ["diagnostics"] }
rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
sqlparser = { version = "0.16.0", features = ["serde"], optional = true }
sqlparser = { version = "0.23.0", features = ["serde"], optional = true }
+zstd = { version = "*", features = [ "pkg-config" ] }
+
[target.'cfg(unix)'.dependencies]
umask = "2.0.0"
users = "0.11.0"
[target.'cfg(windows)'.dependencies]
winreg = "0.10.1"

8
pkgs/tools/admin/scaleway-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-wWyykSNSv6Fp+/f54LhYeArXXzRreHdqso28cM1/fl0=";
sha256 = "sha256-RygMrhXU36pjjlYVZLj5jryf2dzsg+o7QIcsmQN3dlw=";
};
vendorSha256 = "sha256-awq4rObflJbKjZ2tJrZZMJklXBDwTjuRE8sS3iZBefk=";
vendorSha256 = "sha256-7GslyeUz3S3yhki64DMOw1ixQUWstu/wAz9P2tQahA8=";
ldflags = [
"-w"
@ -30,6 +30,6 @@ buildGoModule rec {
description = "Interact with Scaleway API from the command line";
homepage = "https://github.com/scaleway/scaleway-cli";
license = licenses.mit;
maintainers = with maintainers; [ nickhu ];
maintainers = with maintainers; [ nickhu techknowlogick ];
};
}

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

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "trivy";
version = "0.32.1";
version = "0.33.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PF3YYiQkvp85Rrcs0Lg/xshFVInKK52jxaoxDzH8Cps=";
sha256 = "sha256-Df81rXRPJ0wDQLVwEtk9mR9dHXqhLvkxhIfMdr5FTCE=";
};
# hash missmatch on across linux and darwin
proxyVendor = true;
vendorSha256 = "sha256-h9GydAVW2mIFNMlz9aEW6hUioD9noQwnueatkoQDkpY=";
vendorSha256 = "sha256-I2myL1A3SrI4oBpIPWC0UItCvfslhIktD1ixVPDd3pA=";
excludedPackages = "misc";

11
pkgs/tools/audio/kaldi/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, openblas
, blas
, lapack
@ -9,6 +10,7 @@
, fetchFromGitHub
, git
, python3
, Accelerate
}:
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
@ -35,6 +37,9 @@ stdenv.mkDerivation {
cmakeFlags = [
"-DKALDI_BUILD_TEST=off"
"-DBUILD_SHARED_LIBS=on"
] ++ lib.optionals stdenv.isDarwin [
"-DBLAS_LIBRARIES=-lblas"
"-DLAPACK_LIBRARIES=-llapack"
];
enableParallelBuilding = true;
@ -70,6 +75,8 @@ stdenv.mkDerivation {
openblas
openfst
icu
] ++ lib.optionals stdenv.isDarwin [
Accelerate
];
nativeBuildInputs = [
@ -88,6 +95,6 @@ stdenv.mkDerivation {
homepage = "https://kaldi-asr.org";
license = licenses.mit;
maintainers = with maintainers; [ mic92 ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

1
pkgs/tools/backup/ugarit-manifest-maker/default.nix
View File

@ -27,5 +27,6 @@ in with pkgs; eggDerivation rec {
license = licenses.bsd3;
maintainers = [ maintainers.ebzzry ];
platforms = platforms.unix;
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

1
pkgs/tools/backup/ugarit/default.nix
View File

@ -37,5 +37,6 @@ in with pkgs; eggDerivation rec {
license = licenses.bsd3;
maintainers = [ maintainers.ebzzry ];
platforms = platforms.unix;
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

6
pkgs/tools/filesystems/fwanalyzer/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "fwanalyzer";
version = "1.4.3";
version = "1.4.4";
src = fetchFromGitHub {
owner = "cruise-automation";
repo = pname;
rev = version;
sha256 = "1pj6s7lzw7490488a30pzvqy2riprfnhb4nzxm6sh2nsp51xalzv";
sha256 = "sha256-fcqtyfpxdjD+1GsYl05RSJaFDoLSYQDdWcQV6a+vNGA=";
};
vendorSha256 = "1cjbqx75cspnkx7fgc665q920dsxnsdhqgyiawkvx0i8akczbflw";
vendorSha256 = "sha256-nLr12VQogr4nV9E/DJu2XTcgEi7GsOdOn/ZqVk7HS7I=";
subPackages = [ "cmd/${pname}" ];

3
pkgs/tools/misc/ncdu/default.nix
View File

@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
PREFIX = placeholder "out";
# Avoid CPU feature impurity, see https://github.com/NixOS/nixpkgs/issues/169461
ZIG_FLAGS = "-Drelease-safe -Dcpu=baseline";
meta = with lib; {
description = "Disk usage analyzer with an ncurses interface";
homepage = "https://dev.yorhel.nl/ncdu";

4
pkgs/tools/networking/openapi-generator-cli/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:
let this = stdenv.mkDerivation rec {
version = "6.1.0";
version = "6.2.0";
pname = "openapi-generator-cli";
jarfilename = "${pname}-${version}.jar";
@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
sha256 = "sha256-O8v/d2By5OUWEwf4N9NKtHE6E+2e3CDkmDwjIXkeoDc=";
sha256 = "sha256-YHB+LIk4qUJ49iFggdcGfQ8b7O2MjrEnfmJemlnM0to=";
};
dontUnpack = true;

6
pkgs/tools/networking/sish/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "sish";
version = "2.8.0";
version = "2.8.1";
src = fetchFromGitHub {
owner = "antoniomika";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IWVBIuqqtySfHhe78YKZ3HfZdcmNiVklSCuYg8XjG6I=";
sha256 = "sha256-BzWpEkhLhTNt5C/1G0Hnkli2kMvRwGbRc1bCgsWdRUo=";
};
vendorSha256 = "sha256-Cky4ggZoNbIZK7w4tL00XqqyDDe0fmYk/+xZvtG/Nmg=";
vendorSha256 = "sha256-SQKkhyUYuOuPb8SOtjgRTsGKg6T75Zcot5ufHSUaiCM=";
meta = with lib; {
description = "HTTP(S)/WS(S)/TCP Tunnels to localhost";

6
pkgs/tools/security/urlhunter/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "urlhunter";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "utkusen";
repo = pname;
rev = "v${version}";
sha256 = "0ph0pwfd8bb5499bsx3bd8sqhn69y00zk32ayc3n61gpcc6rmvn7";
sha256 = "sha256-lX5zh+fYVSyWPUOnfRNMGZPsiuxjKBSpluPUMN9mZ+k=";
};
vendorSha256 = "165kplaqigis0anafvzfqzwc3jjhsn2mwgf4phb4ck75n3yf85ys";
vendorSha256 = "sha256-JDDxarFROBhdi76mY6udn++lReKLdju/JBpj3JhGdQA=";
meta = with lib; {
description = "Recon tool that allows searching shortened URLs";

11
pkgs/tools/typesetting/soupault/default.nix
View File

@ -1,11 +1,13 @@
{ lib
, fetchFromGitea
, ocamlPackages
, soupault
, testers
}:
ocamlPackages.buildDunePackage rec {
pname = "soupault";
version = "4.1.0";
version = "4.3.0";
minimalOCamlVersion = "4.08";
@ -14,7 +16,7 @@ ocamlPackages.buildDunePackage rec {
owner = "PataphysicalSociety";
repo = pname;
rev = version;
sha256 = "sha256-fYobjkruzuUEVuIoH8mkaFdJvYp/I/aRQzgJXnQwX4U=";
sha256 = "sha256-K5JlMf9hCUI3BTDRP6wIgNYu+MM3tanHAgnAYw4oXag=";
};
buildInputs = with ocamlPackages; [
@ -37,6 +39,11 @@ ocamlPackages.buildDunePackage rec {
yaml
];
passthru.tests.version = testers.testVersion {
package = soupault;
command = "soupault --version-number";
};
meta = {
description = "A tool that helps you create and manage static websites";
homepage = "https://soupault.app/";

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

@ -4322,7 +4322,9 @@ with pkgs;
karma = callPackage ../servers/monitoring/karma { };
kaldi = callPackage ../tools/audio/kaldi { };
kaldi = callPackage ../tools/audio/kaldi {
inherit (darwin.apple_sdk.frameworks) Accelerate;
};
kalker = callPackage ../tools/misc/kalker { };
@ -15541,6 +15543,8 @@ with pkgs;
luarocks = luaPackages.luarocks;
luarocks-nix = luaPackages.luarocks-nix;
luau = callPackage ../development/interpreters/luau { };
toluapp = callPackage ../development/tools/toluapp {
lua = lua5_1; # doesn't work with any other :(
};
@ -15973,6 +15977,8 @@ with pkgs;
guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };
guile-sqlite3 = callPackage ../development/guile-modules/guile-sqlite3 { };
guile-ssh = callPackage ../development/guile-modules/guile-ssh { };
guile-xcb = callPackage ../development/guile-modules/guile-xcb {
@ -25936,6 +25942,8 @@ with pkgs;
cascadia-code = callPackage ../data/fonts/cascadia-code { };
catppuccin-cursors = callPackage ../data/icons/catppuccin-cursors { };
ccsymbols = callPackage ../data/fonts/ccsymbols { };
charis-sil = callPackage ../data/fonts/charis-sil { };
@ -37388,7 +37396,10 @@ with pkgs;
xzoom = callPackage ../tools/X11/xzoom {};
yabai = callPackage ../os-specific/darwin/yabai { };
yabai = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/yabai {
inherit (darwin.apple_sdk.frameworks) Cocoa Carbon ScriptingBridge;
inherit (darwin.apple_sdk_11_0.frameworks) SkyLight;
};
yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { };