nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 05:57:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-11-25 12:02:07 +00:00 committed by GitHub
commit f8c61f361e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 426 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/web-apps/hedgedoc.nix
View File

@ -999,8 +999,8 @@ in
```
# snippet of HedgeDoc-related config
services.hedgedoc.configuration.dbURL = "postgres://hedgedoc:\''${DB_PASSWORD}@db-host:5432/hedgedocdb";
services.hedgedoc.configuration.minio.secretKey = "$MINIO_SECRET_KEY";
services.hedgedoc.settings.dbURL = "postgres://hedgedoc:\''${DB_PASSWORD}@db-host:5432/hedgedocdb";
services.hedgedoc.settings.minio.secretKey = "$MINIO_SECRET_KEY";
```
```

4
pkgs/applications/blockchains/bitcoin/default.nix
View File

@ -72,10 +72,6 @@ stdenv.mkDerivation rec {
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
];
# fix "Killed: 9 test/test_bitcoin"
# https://github.com/NixOS/nixpkgs/issues/179474
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ];
checkInputs = [ python3 ];
doCheck = true;

34
pkgs/applications/blockchains/wasabiwallet/default.nix
View File

@ -1,8 +1,11 @@
{ lib, stdenv
, autoPatchelfHook
, makeWrapper
, fetchurl
, makeDesktopItem
, curl
, dotnetCorePackages
, lttng-ust_2_12
, fontconfig
, krb5
, openssl
@ -11,29 +14,31 @@
}:
let
dotnet-runtime = dotnetCorePackages.runtime_5_0;
libPath = lib.makeLibraryPath [
dotnet-runtime = dotnetCorePackages.runtime_6_0;
# These libraries are dynamically loaded by the application,
# and need to be present in LD_LIBRARY_PATH
runtimeLibs = [
curl
dotnet-runtime
fontconfig.lib
krb5
openssl
stdenv.cc.cc.lib
xorg.libX11
xorg.libICE
xorg.libSM
zlib
];
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "2.0.1.3";
version = "2.0.2";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
sha256 = "sha256-cATqg/n4/BDQtuCVjHAx3EfMLmlX5EjeQ01gavy/L8o=";
sha256 = "sha256-0DFl+UFxQckRM2qXFqDpKaRQ5sIMUbNj7l3zKPKAOnQ=";
};
dontBuild = true;
dontPatchELF = true;
desktopItem = makeDesktopItem {
name = "wasabi";
@ -44,16 +49,19 @@ stdenv.mkDerivation rec {
categories = [ "Network" "Utility" ];
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
buildInputs = runtimeLibs ++ [
lttng-ust_2_12
];
installPhase = ''
mkdir -p $out/opt/${pname} $out/bin $out/share/applications
cp -Rv . $out/opt/${pname}
cd $out/opt/${pname}
for i in $(find . -type f -name '*.so') wassabee
do
patchelf --set-rpath ${libPath} $i
done
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
ln -s $out/opt/${pname}/wassabee $out/bin/${pname}
makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${pname}" \
--add-flags "$out/opt/${pname}/WalletWasabi.Fluent.Desktop.dll" \
--suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}"
cp -v $desktopItem/share/applications/* $out/share/applications
'';

4
pkgs/applications/editors/notepad-next/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "notepad-next";
version = "0.5.5";
version = "0.5.6";
src = fetchFromGitHub {
owner = "dail8859";
repo = "NotepadNext";
rev = "v${version}";
sha256 = "sha256-ZjDvAN/NNz1GY7/0eKlxogYPg2Ba7Ncg6TXyKQEdWrU=";
sha256 = "sha256-0ZmyEtyVpqQ05FOYdFbnFqfPJKNkrweflSl+irOzcuk=";
# External dependencies - https://github.com/dail8859/NotepadNext/issues/135
fetchSubmodules = true;
};

18
pkgs/applications/version-management/sapling/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, fetchFromGitHub, fetchurl, sd, curl, pkg-config, openssl, rustPlatform, fetchYarnDeps, yarn, nodejs, fixup_yarn_lock }:
{ lib, stdenv, python3Packages, fetchFromGitHub, fetchurl, sd, curl, pkg-config, openssl, rustPlatform, fetchYarnDeps, yarn, nodejs, fixup_yarn_lock, glibcLocales }:
let
inherit (lib.importJSON ./deps.json) links version versionHash;
@ -85,6 +85,11 @@ let
sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py
'';
postFixup = ''
wrapProgram $out/bin/sl \
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
'';
nativeBuildInputs = [
curl
pkg-config
@ -126,11 +131,20 @@ stdenv.mkDerivation {
runHook postInstall
'';
# just a simple check phase, until we have a running test suite. this should
# help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760)
doCheck = true;
checkPhase = ''
echo -n "testing sapling version; should be \"${version}\"... "
${sapling}/bin/sl version | grep -qw "${version}"
echo "OK!"
'';
meta = with lib; {
description = "A Scalable, User-Friendly Source Control System";
homepage = "https://sapling-scm.com";
license = licenses.gpl2Only;
maintainers = with maintainers; [ pbar ];
maintainers = with maintainers; [ pbar thoughtpolice ];
platforms = platforms.linux;
mainProgram = "sl";
};

17
pkgs/desktops/gnome/core/mutter/default.nix
View File

@ -65,6 +65,23 @@ let self = stdenv.mkDerivation rec {
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch";
sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
})
# Revert clutter optimization causing issues on X11
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2667
# Will be replaced with a proper fix in 43.2
# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6054
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/7e7a639cc5132cf3355e861235f325540fe56548.patch";
sha256 = "NYoKCRh5o1Q15c11a79Hk5tGKq/jOa+e6GpgBjPEepo=";
revert = true;
})
# Backport edge resistance fix (should be part of 43.2)
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2687
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/accf532a29ea9a1d70880dfaa1834050aa3ae7be.patch";
sha256 = "XAHcPGQFWfZujlqO/cvUryojPCMBBSxeIG06BesDQQw=";
})
];
mesonFlags = [

19
pkgs/development/compilers/gnatboot/default.nix
View File

@ -1,14 +1,29 @@
{ stdenv, lib, autoPatchelfHook, fetchzip, xz, ncurses5, readline, gmp, mpfr
, expat, libipt, zlib, dejagnu, sourceHighlight, python3, elfutils, guile, glibc
, majorVersion
}:
let
versionMap = {
"11" = {
version = "11.2.0-4";
hash = "sha256-8fMBJp6igH+Md5jE4LMubDmC4GLt4A+bZG/Xcz2LAJQ=";
};
"12" = {
version = "12.1.0-2";
hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY=";
};
};
in with versionMap.${majorVersion};
stdenv.mkDerivation rec {
pname = "gnatboot";
version = "12.1.0-2";
inherit version;
src = fetchzip {
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-${version}/gnat-x86_64-linux-${version}.tar.gz";
hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY=";
inherit hash;
};
nativeBuildInputs = [

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

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
version = "1.0.165";
version = "1.0.166";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-sFLJVNyx0IFfPjxbYzSthRdF77sRHeNGFXHzKH22HfY=";
sha256 = "sha256-MrUs6pXu/+QodQl7eatXwmMMsgarxMy2q4o51cxugBA=";
};
executable = "bb";

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.25";
version = "9.2.26";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-AXMqCNnN63sCi5IlichNQhgXKxONnue//8ECi77Gf8Q=";
hash = "sha256-/M0D252/YaJhmyJv51sOoAUCDbcxbIndF8mw9ATtYMQ=";
};
nativeBuildInputs = [

25
pkgs/development/python-modules/angr/default.nix
View File

@ -22,31 +22,16 @@
, pycparser
, pythonOlder
, pyvex
, sympy
, sqlalchemy
, rpyc
, sortedcontainers
, sqlalchemy
, sympy
, unicorn
}:
let
# Only the pinned release in setup.py works properly
unicorn' = unicorn.overridePythonAttrs (old: rec {
pname = "unicorn";
version = "1.0.2-rc4";
src = fetchFromGitHub {
owner = "unicorn-engine";
repo = pname;
rev = version;
sha256 = "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy";
};
doCheck = false;
});
in
buildPythonPackage rec {
pname = "angr";
version = "9.2.25";
version = "9.2.26";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -55,7 +40,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-BxhCQZl/hsqaKzjieAreiOePUcmWGNn63jD0mZ9vFNE=";
hash = "sha256-6NqxJETKBDUmOOM+RjD3gdvqfsXFqoHhhaL55D+Ajz8=";
};
propagatedBuildInputs = [
@ -82,7 +67,7 @@ buildPythonPackage rec {
sortedcontainers
sqlalchemy
sympy
unicorn'
unicorn
];
setupPyBuildFlags = lib.optionals stdenv.isLinux [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.25";
version = "9.2.26";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-9uOv7h5UUWIZTWB7A+7ikG6ReE1FBHIeNAVY6QBhzmE=";
hash = "sha256-aiOJxdQnpNa4zCHRysyw9JsW9GQTHha8lup8VErgiDA=";
};
nativeBuildInputs = [

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.25";
version = "9.2.26";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-zDc7TlMtheekLHUuZS7gFieaWRrs+iD/9ko6ECdHiks=";
hash = "sha256-niJaHsvIX7NFA+pWufTA6j+Jvj6LcGlC+RaLNFn7yBo=";
};
nativeBuildInputs = [

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

@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.25";
version = "9.2.26";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-4igNQqH3mU8Gyk8vpPKp3a4BCyRezmJ5dfZhR5KwyAo=";
hash = "sha256-o6JGxEiG4HD4leAf1+NOEDQ5gkmRaDXl2SZtcVtH6f0=";
};
nativeBuildInputs = [

66
pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix Normal file
View File

@ -0,0 +1,66 @@
{ lib
, boto
, buildPythonPackage
, fasteners
, fetchFromGitHub
, freezegun
, google-reauth
, httplib2
, oauth2client
, pyopenssl
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, retry_decorator
, rsa
, six
}:
buildPythonPackage rec {
pname = "gcs-oauth2-boto-plugin";
version = "3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-slTxh2j9VhLiSyiTmJIFFakzpzH/+mgilDRxx0VqqKQ=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "rsa==4.7.2" "rsa" \
--replace "version='2.7'" "version='${version}'"
'';
propagatedBuildInputs = [
boto
freezegun
google-reauth
httplib2
oauth2client
pyopenssl
retry_decorator
rsa
six
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"gcs_oauth2_boto_plugin"
];
meta = with lib; {
description = "Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage";
homepage = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin";
changelog = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

70
pkgs/development/python-modules/google-apitools/default.nix Normal file
View File

@ -0,0 +1,70 @@
{ lib
, buildPythonPackage
, fasteners
, fetchFromGitHub
, gflags
, httplib2
, mock
, oauth2client
, pytestCheckHook
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "google-apitools";
version = "0.5.32";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "google";
repo = "apitools";
rev = "refs/tags/v${version}";
hash = "sha256-Z9BTDU6KKCcjspVLi5mJqVZMYEapnMXLPL5BXsIKZAw=";
};
propagatedBuildInputs = [
fasteners
httplib2
oauth2client
six
];
passthru.optional-dependencies = {
cli = [
gflags
];
};
checkInputs = [
mock
pytestCheckHook
];
pythonImportsCheck = [
"apitools"
];
disabledTests = [
# AttributeError: 'FieldList' object has no attribute '_FieldList__field'
"testPickle"
"testDecodeBadBase64BytesField"
"testConvertIdThatNeedsEscaping"
"testGeneration"
];
disabledTestPaths = [
# Samples are partially postfixed with test
"samples"
];
meta = with lib; {
description = "Collection of utilities to make it easier to build client-side tools";
homepage = "https://github.com/google/apitools";
changelog = "https://github.com/google/apitools/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

46
pkgs/development/python-modules/google-reauth/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, oauth2client
, pytestCheckHook
, pythonOlder
, pyu2f
}:
buildPythonPackage rec {
pname = "google-reauth";
version = "0.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Google";
repo = "google-reauth-python";
rev = "refs/tags/${version}";
hash = "sha256-J7GVh+iY+69rFzf4hN/KLFZMZ1/S3CL5TZ7SsP5Oy3g=";
};
propagatedBuildInputs = [
oauth2client
pyu2f
];
checkInputs = [
mock
pytestCheckHook
];
pythonImportsCheck = [
"google_reauth"
];
meta = with lib; {
description = "Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage";
homepage = "https://github.com/Google/google-reauth-python";
changelog = "https://github.com/google/google-reauth-python/releases/tag/${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

11
pkgs/development/python-modules/gradient-utils/default.nix
View File

@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Paperspace";
repo = pname;
rev = "v${version}";
sha256 = "19plkgwwfs6298vjplgsvhirixi3jbngq5y07x9c0fjxk39fa2dk";
rev = "refs/tags/v${version}";
hash = "sha256-swnl0phdOsBSP8AX/OySI/aYI9z60Ss3SsJox/mb9KY=";
};
nativeBuildInputs = [
@ -42,9 +42,12 @@ buildPythonPackage rec {
];
postPatch = ''
# https://github.com/Paperspace/gradient-utils/issues/68
# https://github.com/Paperspace/gradient-utils/issues/72
substituteInPlace pyproject.toml \
--replace 'wheel = "^0.35.1"' 'wheel = "*"' \
--replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"'
--replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"' \
--replace 'pymongo = "^3.11.0"' 'pymongo = ">=3.11.0"'
'';
preCheck = ''
@ -64,7 +67,7 @@ buildPythonPackage rec {
description = "Python utils and helpers library for Gradient";
homepage = "https://github.com/Paperspace/gradient-utils";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ freezeboy ];
platforms = platforms.unix;
};
}

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "lxmf";
version = "0.2.5";
version = "0.2.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "lxmf";
rev = "refs/tags/${version}";
hash = "sha256-2BtnTS4Vb6Nj39YbRYUXXk7F/g15wglpeWV9+ZWNV0c=";
hash = "sha256-3kjg0Q7nXMSjBq2suPtIUvUEGCJr6pTo53ZbjMC5uZ0=";
};
propagatedBuildInputs = [

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

@ -5,11 +5,12 @@
, lxmf
, urwid
, pythonOlder
, qrcode
}:
buildPythonPackage rec {
pname = "nomadnet";
version = "0.2.7";
version = "0.2.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,14 +18,15 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "markqvist";
repo = "NomadNet";
rev = version;
hash = "sha256-ycQWvJnYvuNtXxNWjuLXD+TghscCIuOZMmch02M9C00=";
rev = "refs/tags/${version}";
hash = "sha256-Vzi+v+M0LfptNq/6nc3usnf3YLzBwYcij2hAt835Or8=";
};
propagatedBuildInputs = [
rns
lxmf
urwid
qrcode
];
# Module has no tests
@ -37,6 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Off-grid, resilient mesh communication";
homepage = "https://github.com/markqvist/NomadNet";
changelog = "https://github.com/markqvist/NomadNet/releases/tag/${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};

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

@ -7,6 +7,7 @@
, packaging
, poetry-core
, pytestCheckHook
, typing-extensions
, pythonOlder
, rich
, tomlkit
@ -14,7 +15,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "22.10.0";
version = "22.11.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +24,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-z+oJakeZARnyZrkkNjLlyFcOB73u9+G0tXhbI13neyc=";
hash = "sha256-WGtHMQ+8hACt8SMyO0zO80ASlfykJfHQOtNwyk1fsFE=";
};
nativeBuildInputs = [
@ -35,19 +36,17 @@ buildPythonPackage rec {
httpx
packaging
rich
typing-extensions
tomlkit
];
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
] ++ httpx.optional-dependencies.http2;
checkInputs = [
git
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'packaging = "^20.3"' 'packaging = "*"'
'';
disabledTests = [
"PrepareTestCase"
# Signing fails
@ -69,6 +68,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Collection of Python utilities, tools, classes and functions";
homepage = "https://github.com/greenbone/pontos";
changelog = "https://github.com/greenbone/pontos/releases/tag/v${version}";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ fab ];
};

5
pkgs/development/python-modules/pubnub/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pubnub";
version = "7.0.1";
version = "7.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python";
rev = "refs/tags/${version}";
hash = "sha256-rOpTPj9g9WKc8MLX4HqsZit7yvTtDqha7ImewW/tH7g=";
hash = "sha256-LVkP9og9Xru1Xuw4boI2pLwZ0RE2RvtUx0AHoJa6o9c=";
};
propagatedBuildInputs = [
@ -52,6 +52,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python-based APIs for PubNub";
homepage = "https://github.com/pubnub/python";
changelog = "https://github.com/pubnub/python/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyotgw";
version = "2.1.2";
version = "2.1.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "mvn23";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-qUwpW9C9VqsbDNa9zqa/BZtMuzmPU21Au/q0iGRkBNY=";
hash = "sha256-XIwBGjvIulKLmYZIorKIJwoHTNOIYYX8US2Na8MZ2LA=";
};
propagatedBuildInputs = [

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.25";
version = "9.2.26";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-7AcotD80GlBDiVtNPXlCUSNbZXybHoqWH92CxTfajhE=";
hash = "sha256-stxFT4oM4qLHXFJ2+kTNVgcjQ77239Gg0rp6T76wVBU=";
};
nativeBuildInputs = [

31
pkgs/development/python-modules/retry_decorator/default.nix
View File

@ -1,21 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "retry_decorator";
pname = "retry-decorator";
version = "1.1.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "e1e8ad02e518fe11073f2ea7d80b6b8be19daa27a60a1838aff7c731ddcf2ebe";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pnpnpn";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-0dZq4YbPcH4ItyMnpF7B20YYLtzwniJClBK9gRndU1M=";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"retry_decorator"
];
meta = with lib; {
description = "Decorator for retrying when exceptions occur";
homepage = "https://github.com/pnpnpn/retry-decorator";
description = "Retry Decorator for python functions";
license = licenses.mit;
changelog = "https://github.com/pnpnpn/retry-decorator/releases/tag/v${version}";
license = with licenses; [ asl20 ];
};
}

5
pkgs/development/python-modules/rns/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "rns";
version = "0.4.1";
version = "0.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "Reticulum";
rev = "refs/tags/${version}";
hash = "sha256-bUhVnkFgfwhHe8zFLICOXHluecp0hZlD10I1AtpWO8o=";
hash = "sha256-EvlGi/HlaPq3SYJDtGLwV58BKi7EZDCSAAxlSUqwztk=";
};
propagatedBuildInputs = [
@ -37,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Cryptography-based networking stack for wide-area networks";
homepage = "https://github.com/markqvist/Reticulum";
changelog = "https://github.com/markqvist/Reticulum/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/tools/analysis/cppcheck/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cppcheck";
version = "2.9.2";
version = "2.9.3";
src = fetchFromGitHub {
owner = "danmar";
repo = "cppcheck";
rev = version;
hash = "sha256-76JMC9kjeQO4ZuRQ4Kv7J141xy0M7kDTWWjQtJ/d5r0=";
hash = "sha256-AaZzr5r+tpG5M40HSx45KCUBPhN/nSpXxS5H3FuSx2c=";
};
buildInputs = [ pcre

1
pkgs/development/tools/analysis/frama-c/default.nix
View File

@ -8,6 +8,7 @@ let
mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
runtimeDeps = with ocamlPackages; [
apron.dev
bigarray-compat
biniou
camlzip
easy-format

4
pkgs/development/tools/buildah/default.nix
View File

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.28.0";
version = "1.28.1";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "sha256-Q8IqyI6okTaXKDoYvaTcIv+wy4aiHXOjFkKBxTn4wwk=";
sha256 = "sha256-WAFWLpBr+Lfy3etPgSrdo6iitCawIPCf8UwvnW24LRI=";
};
outputs = [ "out" "man" ];

6
pkgs/development/web/deno/default.nix
View File

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.28.1";
version = "1.28.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pphXLH81xous4C/mTkay9mfk3PgIT7HcY+br9uckJlQ=";
sha256 = "sha256-gmDR8KNpx+M66Rv8fooTQOY42ekYl+KwIQ/5jDvYQho=";
};
cargoSha256 = "sha256-DEWLIGskfvuEZhLvtdPprlmncZRcJBBBjYRuk4oFVkk=";
cargoSha256 = "sha256-emf6Q3WQM8W0yPvuNXPeuRC7FOt8QJ/+b5kMzyd3ZCU=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

6
pkgs/development/web/deno/update/librusty_v8.ts
View File

@ -1,10 +1,8 @@
import * as toml from "https://deno.land/std@0.148.0/encoding/toml.ts";
import {
genValueRegExp,
getExistingVersion,
logger,
run,
versionRegExp,
write,
} from "./common.ts";
@ -25,9 +23,9 @@ const getLibrustyV8Version = async (
repo: string,
version: string,
) =>
fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`)
fetch(`https://github.com/${owner}/${repo}/raw/${version}/Cargo.toml`)
.then((res) => res.text())
.then((txt) => toml.parse(txt).dependencies.v8.version);
.then((txt) => toml.parse(txt).workspace.dependencies.v8.version);
const fetchArchShaTasks = (version: string, arches: Architecture[]) =>
arches.map(

20
pkgs/servers/adguardhome/bins.nix
View File

@ -1,23 +1,23 @@
{ fetchurl, fetchzip }:
{
x86_64-darwin = fetchzip {
sha256 = "sha256-XzM+ZAlpT33AQd7etCXZQos9Ifg7oM9DkzncP+EBvoo=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_darwin_amd64.zip";
sha256 = "sha256-R9Ggjl9Qw1F2n2U7uGcLqgjwrLoUjlO8KUsI4sQf/JU=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.19/AdGuardHome_darwin_amd64.zip";
};
aarch64-darwin = fetchzip {
sha256 = "sha256-9pMZVSqU6Rqet73Lg/JBzX1PWmR9nxUSmKD6E4fAxSw=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_darwin_arm64.zip";
sha256 = "sha256-MStBeDsqHK+m91DBTIAzaleIL0GNhqdslIvPOmtOaDQ=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.19/AdGuardHome_darwin_arm64.zip";
};
i686-linux = fetchurl {
sha256 = "sha256-AVFQpruoScSTFpsK3+7e1hXaJaKlK5dQ+8uga5+dHRY=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_linux_386.tar.gz";
sha256 = "sha256-bkUSxifnSfDZk2kmp23n6KBlqa70CrBIKuCF+EEHTwk=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.19/AdGuardHome_linux_386.tar.gz";
};
x86_64-linux = fetchurl {
sha256 = "sha256-ncVQc8zJy9i8TNmDIjLQh58I3gIfTLgDwctBFD1HR2I=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_linux_amd64.tar.gz";
sha256 = "sha256-dHj91ZYhHTA8XoZ8oUhDQzu6Fpg0n/CBqDZux0QnwXI=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.19/AdGuardHome_linux_amd64.tar.gz";
};
aarch64-linux = fetchurl {
sha256 = "sha256-tzc67MHg6idLW5b69zLZw/76tP6YEMlWNPosrsD4uTA=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_linux_arm64.tar.gz";
sha256 = "sha256-f5nXnLkL6yvkE9kUnHdsD+MQhUjbkQGmVj7Nr/znBrw=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.19/AdGuardHome_linux_arm64.tar.gz";
};
}

2
pkgs/servers/adguardhome/default.nix
View File

@ -7,7 +7,7 @@ in
stdenv.mkDerivation rec {
pname = "adguardhome";
version = "0.107.18";
version = "0.107.19";
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
installPhase = ''

6
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.2.5";
version = "9.2.6";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-9vMGC40iBl21cnKCrUosHQTf7tju1Nj2v4+yoX6jHwo=";
sha256 = "sha256-1ETiJbxVzCWALLtaA5lsCNQPd9x2ayWfUOf4b8pHSLE=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-DfmU3xMVZtWBHrgCbC+tTzDrFWLB2bfJE+fXSkmPgO8=";
sha256 = "sha256-aQ8OvxClSN9fdodxVqnqFhDYRpc38rsx3H8oja2PV4A=";
};
vendorSha256 = "sha256-dPvXVMfTBeCEaxRH3mj0mqBWikE3tcEcQfOMFMfBD6o=";

6
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -31,10 +31,10 @@
}:
let
version = "2.40.2";
version = "2.40.3";
webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
sha256 = "sha256-U8hAtuCx+yi4dlbS07orKJGf/GE4V50nlt3VPyEkznk=";
sha256 = "sha256-dvMts9uJNLSp8Qho+yKMLPTy/1c2RgfeEn3UQLIZNc4=";
};
in
buildGoModule rec {
@ -45,7 +45,7 @@ buildGoModule rec {
rev = "v${version}";
owner = "prometheus";
repo = "prometheus";
sha256 = "sha256-QVPLTJdGaJINFNtq63qVWVkk2cvpbdwRN5H0Y5kf00M=";
sha256 = "sha256-Jg8loH0Sji1MmDXUnMtvLTHjNGmkrzZApxvpe2+OqtU=";
};
vendorSha256 = "sha256-aRVoEgP84ITQ1D0PsFVJUKH/Uin7s80iQCwzgrfpjoM=";

4
pkgs/servers/x11/xorg/xwayland.nix
View File

@ -43,11 +43,11 @@
stdenv.mkDerivation rec {
pname = "xwayland";
version = "22.1.3";
version = "22.1.5";
src = fetchurl {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
sha256 = "sha256-pxLre84yzZNN82gUtd0EaqZwiZwW/pjyr7ADV4+GocU=";
sha256 = "sha256-4xesHxGfgyFlSSF2FCCQHkq9lVhajHY84mrzsEWsFnI=";
};
depsBuildBuild = [

4
pkgs/tools/admin/aliyun-cli/default.nix
View File

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "aliyun-cli";
version = "3.0.136";
version = "3.0.137";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aliyun";
repo = pname;
fetchSubmodules = true;
sha256 = "sha256-W3QWXaVyrCYNqS2WKR4c7vK1gPmfDs+tZORzSHO345o=";
sha256 = "sha256-m+vbLdIpkPLHB8izhOAfpUJ/lTU0VeO/dPdm4cvPD7U=";
};
vendorSha256 = "sha256-aviRsflpS9/o2B7mpYQE7d9ahLclM+jiVz+cJOlegCY=";

4
pkgs/tools/inputmethods/fcitx5/default.nix
View File

@ -40,13 +40,13 @@ let
in
stdenv.mkDerivation rec {
pname = "fcitx5";
version = "5.0.20";
version = "5.0.21";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-NRJbRjD5M2eq2YYEoJNjnn5XVSBGqIjO0cA9YCrfyhA=";
sha256 = "sha256-O2ozMSNo07TWw7Se4CCo95OM/paG7TSVVG6SqHoYiBE=";
};
prePatch = ''

4
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-gtk";
version = "5.0.20";
version = "5.0.21";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-bgjRYL8EWrYIZAhgKSljFJn1u37X53u4u1wOg6sbbkE=";
sha256 = "sha256-LGTAKFeiCoUsjVFUcIG7U7riYyb/AfhiYkmNu3aO56M=";
};
cmakeFlags = [

22
pkgs/tools/misc/dashing/default.nix
View File

@ -1,26 +1,28 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, testers, dashing }:
buildGoPackage rec {
buildGoModule rec {
pname = "dashing";
version = "0.4.0";
goPackagePath = "github.com/technosophos/dashing";
src = fetchFromGitHub {
owner = "technosophos";
repo = pname;
rev = version;
sha256 = "0mhv0w5q5vpynbfi21n5i3yw2165bppdlg0amvbv86n9z4c21h89";
hash = "sha256-CcEgGPnJGrTXrgo82u5dxQTB/YjFBhHdsv7uggsHG1Y=";
};
goDeps = ./deps.nix;
vendorHash = "sha256-XeUFmzf6y0S82gMOzkj4AUNFkVvkVOwauYpqY4jeWLM=";
ldflags = [ "-X main.version=${version}" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
passthru.tests.version = testers.testVersion {
package = dashing;
};
meta = with lib; {
description = "A Dash Generator Script for Any HTML";
homepage = "https://github.com/technosophos/dashing";
license = licenses.mit;
maintainers = [ ];
homepage = "https://github.com/technosophos/dashing";
license = licenses.mit;
maintainers = with maintainers; [ aaronjheng ];
};
}

129
pkgs/tools/misc/dashing/deps.nix generated
View File

@ -1,129 +0,0 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "v0.3.1";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
goPackagePath = "github.com/andybalholm/cascadia";
fetch = {
type = "git";
url = "https://github.com/andybalholm/cascadia";
rev = "903109d295d5";
sha256 = "1zprh6wfyf4f5c6nw1bgyyfx3niydsnbdyvpi18fc378wmh4hlq4";
};
}
{
goPackagePath = "github.com/cpuguy83/go-md2man";
fetch = {
type = "git";
url = "https://github.com/cpuguy83/go-md2man";
rev = "f79a8a8ca69d";
sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv";
};
}
{
goPackagePath = "github.com/mattn/go-sqlite3";
fetch = {
type = "git";
url = "https://github.com/mattn/go-sqlite3";
rev = "v2.0.1";
sha256 = "1i3v0j5144iir1n31nahbq9rs2picraphyh5qx9n9rz1d5w1v8zy";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/russross/blackfriday";
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
rev = "v2.0.1";
sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
};
}
{
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
rev = "v1.0.0";
sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
};
}
{
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "v2.0.0";
sha256 = "0ybpg48s08sm46xsbb42yk14zrsm7pr9808khh6f9fca7s3c7fns";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c2843e01d9a2";
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "e7e4b65ae663";
sha256 = "0phil62b9cqvllhfjqqm1jpyk2dxg1dvd88pq2044nc3sxni7w8b";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "d0b11bdaac8a";
sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "20d25e280405";
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.2";
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]

6
pkgs/tools/misc/direnv/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "direnv";
version = "2.32.1";
version = "2.32.2";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
sha256 = "sha256-xweCJtGp+id2ledK5ddoXoKJp57KUvwHuqhrIo8ch8Q=";
sha256 = "sha256-Ql/Q9SoCNy2JKt/32RIMx08rbGvrthdgTpFIFx4m1p4=";
};
vendorSha256 = "sha256-u/LukIOYRudFYOrrlZTMtDAlM3+WjoSBiueR7aySSVU=";
vendorSha256 = "sha256-eQaQ77pOYC8q+IA26ArEhHQ0DCU093TbzaYhdV3UydE=";
# we have no bash at the moment for windows
BASH_PATH =

5
pkgs/tools/networking/miniupnpc/default.nix
View File

@ -1,8 +1,7 @@
{ lib
, stdenv
, fetchurl
, which
, cctools
, cmake
}:
stdenv.mkDerivation rec {
@ -14,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8";
};
nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ];
nativeBuildInputs = [ cmake ];
patches = lib.optional stdenv.isFreeBSD ./freebsd.patch;

8
pkgs/tools/security/grype/default.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "grype";
version = "0.53.0";
version = "0.53.1";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-um+uyY8kPkouF/9Kms0xZYhgYeZC/pE6w+JCVcKWdpI=";
hash = "sha256-14SkLv/9xydO8uCpKdQSrbr1hY55DMuer91P4YUnkic=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -27,13 +27,15 @@ buildGoModule rec {
'';
};
proxyVendor = true;
vendorSha256 = "sha256-BP5Tvv5s74uxjVcEC0QPaw2tGPmkOjZmyCrPwwoz7o4=";
vendorHash = "sha256-L5ucftMsChGwNoIft8gxg52sNrZyMifuLr0QvSHiCs0=";
nativeBuildInputs = [
installShellFiles
];
subPackages = [ "." ];
excludedPackages = "test/integration";
ldflags = [

26
pkgs/tools/security/threatest/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "threatest";
version = "1.1.0";
src = fetchFromGitHub {
owner = "DataDog";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ehyE19VGSLykJUOXoYMFr2Y82Bwpj2ZK5//VJybVAtk=";
};
vendorHash = "sha256-vTzgxByZ2BC7nuq/+LJV7LR0KsUxh1EbHFe81PwqCJc=";
meta = with lib; {
description = "Framework for end-to-end testing threat detection rules";
homepage = "https://github.com/DataDog/threatest";
changelog = "https://github.com/DataDog/threatest/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

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

@ -9318,9 +9318,7 @@ with pkgs;
minissdpd = callPackage ../tools/networking/minissdpd { };
miniupnpc = callPackage ../tools/networking/miniupnpc {
inherit (darwin) cctools;
};
miniupnpc = callPackage ../tools/networking/miniupnpc { };
miniupnpd = callPackage ../tools/networking/miniupnpd { };
@ -12036,6 +12034,8 @@ with pkgs;
thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { };
threatest = callPackage ../tools/security/threatest { };
threema-desktop = callPackage ../applications/networking/instant-messengers/threema-desktop { };
tidy-viewer = callPackage ../tools/text/tidy-viewer { };
@ -14191,7 +14191,7 @@ with pkgs;
gnatboot =
if stdenv.hostPlatform == stdenv.targetPlatform
&& stdenv.buildPlatform == stdenv.hostPlatform
then buildPackages.gnatboot
then buildPackages.gnatboot11
else buildPackages.gnat11;
});
@ -14207,11 +14207,13 @@ with pkgs;
gnatboot =
if stdenv.hostPlatform == stdenv.targetPlatform
&& stdenv.buildPlatform == stdenv.hostPlatform
then buildPackages.gnatboot
then buildPackages.gnatboot12
else buildPackages.gnat12;
});
gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { });
gnatboot = gnatboot12;
gnatboot11 = wrapCC (callPackage ../development/compilers/gnatboot { majorVersion = "11"; });
gnatboot12 = wrapCC (callPackage ../development/compilers/gnatboot { majorVersion = "12"; });
gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { };
@ -14246,7 +14248,7 @@ with pkgs;
gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {};
gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 {};
gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 {};
gcc-arm-embedded = gcc-arm-embedded-10;
gcc-arm-embedded = gcc-arm-embedded-11;
# Has to match the default gcc so that there are no linking errors when
# using C/C++ libraries in D packages

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

@ -3603,6 +3603,8 @@ self: super: with self; {
gcovr = callPackage ../development/python-modules/gcovr { };
gcs-oauth2-boto-plugin = callPackage ../development/python-modules/gcs-oauth2-boto-plugin { };
gcsfs = callPackage ../development/python-modules/gcsfs { };
gdal = toPythonModule (pkgs.gdal.override { python3 = python; });
@ -3787,6 +3789,8 @@ self: super: with self; {
google-api-python-client = callPackage ../development/python-modules/google-api-python-client { };
google-apitools = callPackage ../development/python-modules/google-apitools { };
googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { };
google-auth = callPackage ../development/python-modules/google-auth { };
@ -3903,6 +3907,8 @@ self: super: with self; {
google-re2 = callPackage ../development/python-modules/google-re2 { };
google-reauth = callPackage ../development/python-modules/google-reauth { };
google-resumable-media = callPackage ../development/python-modules/google-resumable-media { };
googletrans = callPackage ../development/python-modules/googletrans { };