mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
b48679133a
@ -1480,12 +1480,12 @@
|
||||
}];
|
||||
};
|
||||
babariviere = {
|
||||
email = "babathriviere@gmail.com";
|
||||
email = "me@babariviere.com";
|
||||
github = "babariviere";
|
||||
githubId = 12128029;
|
||||
name = "Bastien Rivière";
|
||||
keys = [{
|
||||
fingerprint = "2F85 B362 B274 0012 37E2 81EE F202 AD3B 6EDF 4BD1";
|
||||
fingerprint = "74AA 9AB4 E6FF 872B 3C5A CB3E 3903 5CC0 B75D 1142";
|
||||
}];
|
||||
};
|
||||
babbaj = {
|
||||
@ -5186,6 +5186,15 @@
|
||||
githubId = 643494;
|
||||
name = "Cillian de Róiste";
|
||||
};
|
||||
GoldsteinE = {
|
||||
email = "root@goldstein.rs";
|
||||
github = "GoldsteinE";
|
||||
githubId = 12019211;
|
||||
name = "Maximilian Siling";
|
||||
keys = [{
|
||||
fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A";
|
||||
}];
|
||||
};
|
||||
Gonzih = {
|
||||
email = "gonzih@gmail.com";
|
||||
github = "Gonzih";
|
||||
|
||||
@ -28,7 +28,7 @@ let
|
||||
};
|
||||
|
||||
env = {
|
||||
SANE_CONFIG_DIR = "/etc/sane.d";
|
||||
SANE_CONFIG_DIR = "/etc/sane-config";
|
||||
LD_LIBRARY_PATH = [ "/etc/sane-libs" ];
|
||||
};
|
||||
|
||||
@ -167,7 +167,7 @@ in
|
||||
|
||||
environment.systemPackages = backends;
|
||||
environment.sessionVariables = env;
|
||||
environment.etc."sane.d".source = config.hardware.sane.configDir;
|
||||
environment.etc."sane-config".source = config.hardware.sane.configDir;
|
||||
environment.etc."sane-libs".source = "${saneConfig}/lib/sane";
|
||||
services.udev.packages = backends;
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ in
|
||||
mode = mkOption {
|
||||
description = lib.mdDoc "Which mode to use";
|
||||
default = "boot";
|
||||
type = types.enum [ "api" "boot" ];
|
||||
type = types.enum [ "api" "boot" "quick" ];
|
||||
};
|
||||
|
||||
debug = mkOption {
|
||||
@ -38,6 +38,12 @@ in
|
||||
description = lib.mdDoc "Handle DHCP traffic without binding to the DHCP server port";
|
||||
};
|
||||
|
||||
quick = mkOption {
|
||||
description = lib.mdDoc "Which quick option to use";
|
||||
default = "xyz";
|
||||
type = types.enum [ "arch" "centos" "coreos" "debian" "fedora" "ubuntu" "xyz" ];
|
||||
};
|
||||
|
||||
kernel = mkOption {
|
||||
type = types.str or types.path;
|
||||
default = "";
|
||||
@ -117,6 +123,8 @@ in
|
||||
then [ "boot" cfg.kernel ]
|
||||
++ optional (cfg.initrd != "") cfg.initrd
|
||||
++ optionals (cfg.cmdLine != "") [ "--cmdline" cfg.cmdLine ]
|
||||
else if cfg.mode == "quick"
|
||||
then [ "quick" cfg.quick ]
|
||||
else [ "api" cfg.apiServer ];
|
||||
in
|
||||
''
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwig-studio";
|
||||
version = "4.4.3";
|
||||
version = "4.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||
sha256 = "sha256-NP9cM1xIHblMdUFKIviPKDi6su6Nc3xsX2pnPeP7hdQ=";
|
||||
sha256 = "sha256-VcK74JrVH81sgNeh1FDvCO1jtgkVeLpx5IqlXuzH27A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
||||
|
||||
@ -19,13 +19,13 @@ let
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "picard";
|
||||
version = "2.8.4";
|
||||
version = "2.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metabrainz";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-ygZkj7hZNm7XyqDEI7l49d36ZgCTwFiAuYZjlF9d5+8=";
|
||||
rev = "refs/tags/release-${version}";
|
||||
sha256 = "sha256-ukqlAXGaqX89U77cM9Ux0RYquT31Ho8ri1Ue7S3+MwQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
|
||||
|
||||
@ -106,7 +106,5 @@ stdenv.mkDerivation rec {
|
||||
license = [ licenses.mit licenses.cc-by-sa-30 ];
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
# Requires SDK 10.14 https://github.com/NixOS/nixpkgs/issues/101229
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "2.8.8";
|
||||
version = "2.9.17";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
@ -16,8 +16,8 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "0ivljlw6kdpg94q9syi11zmk54w06m8j3zicx9nppqg720fw4zv3";
|
||||
x86_64-darwin = "0gpr3zi6z98pkg8hsvcmpck754cph53kmgl3bhp3zmmmfj0kxjhs";
|
||||
x86_64-linux = "sha256-kdmxSXKHIyVdvVNEoZkSIQlOkTt97bpAdrV0sxhL1Ug=";
|
||||
x86_64-darwin = "sha256-o3Q5foEuBi4OTHr6mP0ZXOxkkUw/c/jXaZOtztQf0gM=";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mangal";
|
||||
version = "4.0.4";
|
||||
version = "4.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metafates";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U1NmJsh7OuS0/kktmMcIjEaqc1ABtWG0ilSUw0UL8aU=";
|
||||
hash = "sha256-T0QoHqL07J4Fb95qluYPb0yZYwdr7vDNLlrp7zPhtrA=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k0sctl";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0sproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m0BdmsqmkB3Q6JzzRPS6Tq68a33heUifY2EgTjbAm3M=";
|
||||
sha256 = "sha256-i/XgEPuYNxn10eOXfF+X33oLlkO9r6daeygZcSdcicQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CZ8DmgYXQcpd43qm6YsVHFePuUochHgJG7/ffEK8LL8=";
|
||||
vendorSha256 = "sha256-RTC2AEDzSafvJT/vuPjzs25PhuzBiPb32an/a/wpY04=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubebuilder";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kubebuilder";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nLjmz9OakBLTBWdYA6czgtJmCuP96abNwLcLZo+yZ48=";
|
||||
hash = "sha256-UTzQyr5N8CButeLKYZs9a8hAV/cezVfLLQ7b4YJQzXU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xljLDwubwr6rZ/ZpW9/WithClaMo88ivlBhWFb0iAvo=";
|
||||
vendorHash = "sha256-VvCM0aBk0SnnXVPZRvEGcb1Bl4Uunbc4u1KzukYMGqA=";
|
||||
|
||||
subPackages = ["cmd"];
|
||||
|
||||
@ -61,6 +61,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "SDK for building Kubernetes APIs using CRDs";
|
||||
homepage = "https://github.com/kubernetes-sigs/kubebuilder";
|
||||
changelog = "https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cmars ];
|
||||
};
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pachyderm";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pachyderm";
|
||||
repo = "pachyderm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hU1Li3ZTgCbvyfBQ7TcmmeXOfcb1DHeo/K7iT7vc+vE=";
|
||||
hash = "sha256-IzZBs6g6MQKofhMIdLr7ty7HzwF+SoyzCJ6RDMHt0mo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-j7zg0vIhdYbzyi4owdVEF4XyUNwGds6J01+3k5K90Yg=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.42.4";
|
||||
version = "0.42.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PaCI39Z2WaHZ6IYRxFNZvG9c40pWzNbwoHrJFXLOqMk=";
|
||||
sha256 = "sha256-hF40Tb9NND8az9zOOvh9w/VyjbpVlKqnMT7J9oDJjBM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ByFn2j2m5dON0No6mt1QiYm4vMRSymS5Tezaws9B9c4=";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.12";
|
||||
version = "3.5.13";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nrW6+BhcDvFt7bw0XdiDk2eNnM+ut24xTdPulNDw9X4=";
|
||||
hash = "sha256-0yO4prnYJkD7eiyrEOPHlDTsgGgRhQujsp8k2FsLYKI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -20,20 +20,6 @@ let
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_4;
|
||||
|
||||
# use paperless-ngx version of django-q
|
||||
# see https://github.com/paperless-ngx/paperless-ngx/pull/1014
|
||||
django-q = super.django-q.overridePythonAttrs (oldAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "django-q";
|
||||
hash = "sha256-alu7tZwUn77xhUF9c/aGmwRwO//mR/FucXjvXUl/6ek=";
|
||||
rev = "8b5289d8caf36f67fb99448e76ead20d5b498c1b";
|
||||
};
|
||||
# due to paperless-ngx modification of the pyproject.toml file
|
||||
# the patch is not needed any more
|
||||
patches = [ ];
|
||||
});
|
||||
|
||||
aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.3.1";
|
||||
src = oldAttrs.src.override {
|
||||
@ -93,12 +79,12 @@ let
|
||||
in
|
||||
python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
pname = "paperless-ngx";
|
||||
version = "1.9.2";
|
||||
version = "1.10.2";
|
||||
|
||||
# Fetch the release tarball instead of a git ref because it contains the prebuilt fontend
|
||||
# Fetch the release tarball instead of a git ref because it contains the prebuilt frontend
|
||||
src = fetchurl {
|
||||
url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz";
|
||||
hash = "sha256-fafjVXRfzFrINzI/Ivfm1VY4YpemHkHwThBP54XoXM4=";
|
||||
hash = "sha256-uOrRHHNqIYsDbzKcA7EsYZjadpLyAB4Ks+PU+BNsTWE=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@ -112,6 +98,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
autobahn
|
||||
automat
|
||||
blessed
|
||||
celery
|
||||
certifi
|
||||
cffi
|
||||
channels-redis
|
||||
@ -124,11 +111,11 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
cryptography
|
||||
daphne
|
||||
dateparser
|
||||
django-celery-results
|
||||
django-cors-headers
|
||||
django-extensions
|
||||
django-filter
|
||||
django-picklefield
|
||||
django-q
|
||||
django
|
||||
djangorestframework
|
||||
filelock
|
||||
@ -171,6 +158,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
pytz
|
||||
pyyaml
|
||||
pyzbar
|
||||
rapidfuzz
|
||||
redis
|
||||
regex
|
||||
reportlab
|
||||
@ -199,13 +187,6 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
zope_interface
|
||||
];
|
||||
|
||||
# paperless-ngx includes the bundled django-q version. This will
|
||||
# conflict with the tests and is not needed since we overrode the
|
||||
# django-q version with the paperless-ngx version
|
||||
postPatch = ''
|
||||
rm -rf src/django-q
|
||||
'';
|
||||
|
||||
# Compile manually because `pythonRecompileBytecodeHook` only works for
|
||||
# files in `python.sitePackages`
|
||||
postBuild = ''
|
||||
@ -246,8 +227,19 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
# Disable unneeded code coverage test
|
||||
substituteInPlace src/setup.cfg \
|
||||
--replace "--cov --cov-report=html" ""
|
||||
# OCR on NixOS recognizes the space in the picture, upstream CI doesn't.
|
||||
# See https://github.com/paperless-ngx/paperless-ngx/pull/2216
|
||||
substituteInPlace src/paperless_tesseract/tests/test_parser.py \
|
||||
--replace "this is awebp document" "this is a webp document"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# FileNotFoundError(2, 'No such file or directory'): /build/tmp...
|
||||
"test_script_with_output"
|
||||
# AssertionError: 10 != 4 (timezone/time issue)
|
||||
# Due to getting local time from modification date in test_consumer.py
|
||||
"testNormalOperation"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit python path;
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jftui";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aanok";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UwR4IboLSjD/XXvSw1AhJubSxettvL/URhZ/Je6TWPQ=";
|
||||
sha256 = "sha256-TkSnNZBnmDSMsxTFQx1OcFDLQBUqxIrFXQeeslXKqA0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-activemq";
|
||||
version = "5.17.2";
|
||||
version = "5.17.3";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "sha256-QhY4ckDvOOkS+IFixS4mEo8PctFZEIUtEusKeEWBkZU=";
|
||||
sha256 = "sha256-pMxMOi8TZwfCxpbzuz7iqG2+/xueteI3sU7cDF5aMo8=";
|
||||
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ ffmpeg_5-full
|
||||
, nv-codec-headers-11
|
||||
, chromaprint
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
@ -17,8 +18,12 @@
|
||||
sha256 = "sha256-2mSixlrTgAVD2ZRGoi1+UEbhba7QEVvKmigwC9dLk2g=";
|
||||
};
|
||||
|
||||
buildInputs = old.buildInputs ++ [ chromaprint ];
|
||||
|
||||
configureFlags = old.configureFlags ++ [
|
||||
"--extra-version=Jellyfin"
|
||||
"--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067
|
||||
"--enable-chromaprint"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nghttp3";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LSHhvRTzqpGJcyK3KoZZjbZVggXpgDEEVpp8gMoaE7U=";
|
||||
sha256 = "sha256-Zexcfkf8Br3wduUpM3tcS68fEVO6reNxYSB3X3qUWKg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngtcp2";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u6orYF/VzXpcUdCitPawoet3KAhXlTQ2giR5eTQkrLY=";
|
||||
sha256 = "sha256-OnGzAUfIop/3/0qAAm5rgTlpCdZ/1fwWPJ/KLfGUy8U=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -1,18 +1,33 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, curl, breakpad, pkg-config }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, curl
|
||||
, breakpad
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sentry-native";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-native";
|
||||
rev = version;
|
||||
sha256 = "sha256-zSu6jcls1PtoSZNp6VGnXrXS5ViiY6ZghPYWaVwPVtw=";
|
||||
hash = "sha256-zeJGgtqEITK1fQtqFXwh+kpaS9Ky+RSY/uxZ2as8YyM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ curl breakpad ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
breakpad
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
|
||||
"-DSENTRY_BREAKPAD_SYSTEM=On"
|
||||
@ -20,7 +35,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/getsentry/sentry-native";
|
||||
description = "Sentry SDK for C, C++ and native applications.";
|
||||
description = "Sentry SDK for C, C++ and native applications";
|
||||
changelog = "https://github.com/getsentry/sentry-native/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ wheelsandmetal ];
|
||||
|
||||
@ -100,10 +100,11 @@ stdenv.mkDerivation rec {
|
||||
python3
|
||||
python3.pkgs.pyparsing
|
||||
python3.pkgs.six
|
||||
wayland-scanner
|
||||
vala
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
mesonEmulatorHook
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,19 +1,42 @@
|
||||
{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib, sqlite }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, openssl
|
||||
, tcl
|
||||
, installShellFiles
|
||||
, buildPackages
|
||||
, readline
|
||||
, ncurses
|
||||
, zlib
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlcipher";
|
||||
version = "4.5.2";
|
||||
version = "4.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlcipher";
|
||||
repo = "sqlcipher";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EUm4akVWUiK8U6Je1uWMo8KLQLsk57kOFCCU5Uajjt8=";
|
||||
hash = "sha256-yo7bB6xgF23Hdur25fprSFgbuxNclseUCdq3DFAfIK8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles tcl ];
|
||||
buildInputs = [ readline ncurses openssl zlib ];
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
tcl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
readline
|
||||
ncurses
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
buildPackages.stdenv.cc
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-threadsafe"
|
||||
@ -35,9 +58,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.zetetic.net/sqlcipher/";
|
||||
changelog = "https://github.com/sqlcipher/sqlcipher/blob/v${version}/CHANGELOG.md";
|
||||
description = "SQLite extension that provides 256 bit AES encryption of database files";
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://www.zetetic.net/sqlcipher/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "1.4.7";
|
||||
version = "1.4.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FTDbQ9RZs1XleferFS8BAioWP0iWyHrDbytY68q/0tQ=";
|
||||
hash = "sha256-A4SqDEArnRG9SJTqU/C9TOQO2vjot+hfj2/PKB/JMfw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aocd";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "wimglenn";
|
||||
repo = "advent-of-code-data";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xns//QAAYw9+Md0THUxFUxnqCDoS1qGslX6CFbIALng=";
|
||||
hash = "sha256-yY8ItXZZp0yVs4viJzduMPq8Q8NKd34uvlGaVUE2GjQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,26 +1,48 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, future, configparser, isPy27 }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fonttools
|
||||
, future
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arabic_reshaper";
|
||||
version = "2.1.3";
|
||||
pname = "arabic-reshaper";
|
||||
version = "2.1.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a236fc6e9dde2a61cc6a5ca962b522e42694e1bb2a2d86894ed7a4eba4ce1890";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpcabd";
|
||||
repo = "python-arabic-reshaper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qQGIC/KequOQZoxwm7AEkdPV0QpS7YoBV9v8ZA7AYQM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future ]
|
||||
++ lib.optionals isPy27 [ configparser ];
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
];
|
||||
|
||||
# Tests are not published on pypi
|
||||
doCheck = false;
|
||||
passthru.optional-dependencies = {
|
||||
with-fonttools = [
|
||||
fonttools
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "arabic_reshaper" ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"arabic_reshaper"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mpcabd/python-arabic-reshaper";
|
||||
description = "Reconstruct Arabic sentences to be used in applications that don't support Arabic";
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://github.com/mpcabd/python-arabic-reshaper";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, celery
|
||||
, django
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django_celery_results";
|
||||
version = "2.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dapRlw21aRy/JCxqD/UMjN9BniZc0Om3cjNdBkNsS5k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
celery
|
||||
django
|
||||
];
|
||||
|
||||
# Tests need access to a database.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Celery result back end with django";
|
||||
homepage = "https://github.com/celery/django-celery-results";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ babariviere ];
|
||||
};
|
||||
}
|
||||
@ -1,26 +1,44 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, six, hypothesis, mock
|
||||
, python-Levenshtein, pytest, termcolor, isPy27, enum34 }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, six
|
||||
, hypothesis
|
||||
, mock
|
||||
, python-Levenshtein
|
||||
, pytestCheckHook
|
||||
, termcolor
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fire";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "python-fire";
|
||||
rev = "v${version}";
|
||||
sha256 = "1caz6j2kdhj0kccrnqri6b4g2d6wzkkx8y9vxyvm7axvrwkv2vyn";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cwY1RRNtpAn6LnBASQLTNf4XXSPnfhOa1WgglGEM2/s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six termcolor ] ++ lib.optional isPy27 enum34;
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
termcolor
|
||||
];
|
||||
|
||||
checkInputs = [ hypothesis mock python-Levenshtein pytest ];
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
mock
|
||||
python-Levenshtein
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# ignore test which asserts exact usage statement, default behavior
|
||||
# changed in python3.8. This can likely be remove >=0.3.1
|
||||
checkPhase = ''
|
||||
py.test -k 'not testInitRequiresFlag'
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"fire"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library for automatically generating command line interfaces";
|
||||
@ -42,6 +60,8 @@ buildPythonPackage rec {
|
||||
REPL with the modules and variables you'll need already imported
|
||||
and created.
|
||||
'';
|
||||
homepage = "https://github.com/google/python-fire";
|
||||
changelog = "https://github.com/google/python-fire/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmart";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "truenas";
|
||||
repo = "py-SMART";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-slLk4zoW0ht9hiOxyBt0caekjrPgih9G99pRiD2vIxE=";
|
||||
hash = "sha256-qZJwUxU9LSKXpftBuKFnxI4gygHIuJEwGJqFaBlCudc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,24 +1,43 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, requests, six }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, six
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvmomi";
|
||||
version = "7.0.3";
|
||||
version = "8.0.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07jwlbi3k5kvpmgygvpkhsnbdp9m2ndwqxk9k6kyzfszwcbdx4bk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DVqC5giVMixj9NlGJ2gaH7ybX3hdQsdNTjuTkesao9E=";
|
||||
};
|
||||
|
||||
# requires old version of vcrpy
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
six
|
||||
];
|
||||
|
||||
# Requires old version of vcrpy
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ requests six ];
|
||||
pythonImportsCheck = [
|
||||
"pyVim"
|
||||
"pyVmomi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter";
|
||||
homepage = "https://github.com/vmware/pyvmomi";
|
||||
changelog = "https://github.com/vmware/pyvmomi/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rfcat";
|
||||
version = "1.9.6";
|
||||
version = "1.9.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "atlas0fd00m";
|
||||
repo = "rfcat";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7iYz7YY9zpnJmLfCmp/sF21eZ21HMGq2sLQIENxbr34=";
|
||||
hash = "sha256-VOLA/ZZLazW7u0VYkAHzDh4aaHGr3u09bKVOkhYk6Fk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ropgadget";
|
||||
version = "7.1";
|
||||
version = "7.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "JonathanSalwan";
|
||||
repo = "ROPgadget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eVRQQ8VmjT8wTpiTK2Emr1tEpSwFJPbMc1fa2Zh3mT0=";
|
||||
hash = "sha256-JvGDnMh42CbdsbE8jM3jD/4JMl6XlmkJfojvlBhFWA0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -3,26 +3,33 @@
|
||||
, fetchPypi
|
||||
, sphinx
|
||||
, plantuml
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-plantuml";
|
||||
version = "0.24";
|
||||
version = "0.24.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-z2Xbc1j3haZJjuA+cZi2aAxiXSjlWzNHX8P2yUNRRR0=";
|
||||
hash = "sha256-OdLkvEDV4JMSYSmhRPVrbuFfWM+lBItZSOY6Ea/ztYY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sphinx
|
||||
plantuml
|
||||
];
|
||||
|
||||
# No tests included.
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ sphinx plantuml ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides a Sphinx domain for embedding UML diagram with PlantUML";
|
||||
homepage = "https://github.com/sphinx-contrib/plantuml/";
|
||||
maintainers = with maintainers; [ ];
|
||||
license = with licenses; [ bsd2 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urlextract";
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-DYg7Wd5Th4c+o4JeYrNDWDMTE1rGZMP1wNVfF7Kzv30=";
|
||||
hash = "sha256-NXP2uBKBTv4GykbpHoLZhO2qPNB9qqqilqRnrZiBoDc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -50,6 +50,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Collects and extracts URLs from given text";
|
||||
homepage = "https://github.com/lipoja/URLExtract";
|
||||
changelog = "https://github.com/lipoja/URLExtract/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ilkecan ];
|
||||
};
|
||||
|
||||
@ -79,6 +79,11 @@ buildPythonPackage rec {
|
||||
|
||||
FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
|
||||
# Fontconfig error: Cannot load default config file: No such file: (null)
|
||||
makeWrapperArgs = [
|
||||
"--set FONTCONFIG_FILE ${FONTCONFIG_FILE}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--isort --flake8 --cov --no-cov-on-fail" ""
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zamg";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "killer0071234";
|
||||
repo = "python-zamg";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-P9BvrINsF6OZdNw8L8RXjpDgVWvW5s3qgCFXtEeUChM=";
|
||||
hash = "sha256-pBXt7t7Cs7F0bxvB8N67XaY/uvYhZPw10+bei/3QSfw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -94,7 +94,11 @@ let
|
||||
fi
|
||||
'';
|
||||
};
|
||||
rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ] }:
|
||||
|
||||
# Alias rebar3 so we can use it as default parameter below
|
||||
_rebar3 = rebar3;
|
||||
|
||||
rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ], rebar3 ? _rebar3 }:
|
||||
let
|
||||
pluginLibDirs = map (p: "${p}/lib/erlang/lib") (lib.unique (plugins ++ globalPlugins));
|
||||
globalPluginNames = lib.unique (map (p: p.packageName) globalPlugins);
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bundletool";
|
||||
version = "1.13.1";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||
sha256 = "sha256-owXj7FSR98IPuaWkUGpv4e6c4c6XIYFsxZZH0OWYcu8=";
|
||||
sha256 = "sha256-sbX7IYFcU9gwKzHKC8xtmZKVE2XImeNT4RYOx+cSI2Y=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -5,22 +5,23 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "checkmate";
|
||||
version = "0.8.2";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adedayo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v9xVJFX3YJQU9z9L7dhy0S1FvpWoDad36Lq3w4VW0xA=";
|
||||
hash = "sha256-tgiZDTPIAYirPX6nGPEAt6BoYEC8uUJwT6zuHJqPF1w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8/EGoY3+th34gAACDoEHgwhUFmyyKecnQP/WTe56iCQ=";
|
||||
vendorHash = "sha256-eL1fLJwzVpU9NqaAl5R/fbaqI3AnEkl6EuPkMTuY86w=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pluggable code security analysis tool";
|
||||
homepage = "https://github.com/adedayo/checkmate";
|
||||
changelog = "https://github.com/adedayo/checkmate/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-swag";
|
||||
version = "1.8.8";
|
||||
version = "1.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaggo";
|
||||
repo = "swag";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xERuD15NEmBqosNAUmWEGqWVXc9jLA9HrbZrqmzhLFA=";
|
||||
sha256 = "sha256-8UnDrWZ0gQlhPQLDqA5DLBBeHqQFlNxK7+y4qlUk/fI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ=";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "karate";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar";
|
||||
sha256 = "sha256-uQHE8Mf70t7gtALdxO1tltUkwEKx0emWWliZEzwGW+Q=";
|
||||
sha256 = "sha256-d0MIiMxENBPFM0Kv8vhtn/je1i650Z7+6PoV6ZZCsFY=";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.192";
|
||||
version = "0.0.193";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EhivXOuXeq+x7fozMdof4Sh9jFXYLqyVK4ysWzUbM4s=";
|
||||
sha256 = "sha256-OsK5RUaUTuIvB5DZAbzazbeCqHTZbA2v+xIZHWsls8c=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-7EoYQ0WvlVp1Cbg/1kkMX0SoC3Ae6lDdwHju0CyFkAg=";
|
||||
cargoSha256 = "sha256-GyINYYNcYuTRPrM9W0/09xqFxe5CezBIsprUiEgF2MA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
|
||||
20
pkgs/development/tools/rust/cargo-mommy/default.nix
Normal file
20
pkgs/development/tools/rust/cargo-mommy/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ lib, rustPlatform, fetchCrate }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-mommy";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-p1SAYUQu1HpYJ6TbLJ3lfA9VlKHvB7z5yiFXmTQOCXA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-5RidY+6EF23UNzz1suSdA4LL59FalipaJ+ISSsmiCXM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo wrapper that encourages you after running commands";
|
||||
homepage = "https://github.com/Gankra/cargo-mommy";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ GoldsteinE ];
|
||||
};
|
||||
}
|
||||
@ -49,8 +49,8 @@ buildGoModule rec {
|
||||
];
|
||||
preBuild = let
|
||||
cliConfigToml = fetchurl {
|
||||
url = "https://web.archive.org/web/20221104122906/https://developer.fastly.com/api/internal/cli-config";
|
||||
sha256 = "sha256-BHsUWrMp//X95gcB+WbD/nfyduZUkH8jHXk3CfOBAhg=";
|
||||
url = "https://web.archive.org/web/20221224152051/https://developer.fastly.com/api/internal/cli-config";
|
||||
hash = "sha256-IjakfeqjHshlGoamRJTnhUC8cTVMIY63F3vO6I/ZHO4=";
|
||||
};
|
||||
in ''
|
||||
cp ${cliConfigToml} ./pkg/config/config.toml
|
||||
|
||||
@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pacemaker";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClusterLabs";
|
||||
repo = pname;
|
||||
rev = "Pacemaker-${version}";
|
||||
sha256 = "sha256-b3ljxAuawhqTnURBJMqy4Zzzfi8PCFwie/zC1yeErhQ=";
|
||||
sha256 = "sha256-vsHWNKCrHJIgXlJYyZZEUfuIUBnaejPrPCM1HrYOTKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fnotifystat";
|
||||
version = "0.02.08";
|
||||
version = "0.02.09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-+vNBufCrXfMinEZhXDZJCwoI9zxrcTy0fOEdswoaNkw=";
|
||||
hash = "sha256-YyIk7x0B3JB/iMF9OP767fVEBgcV0duV7xIiHZxpL0w=";
|
||||
};
|
||||
|
||||
installFlags = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bind";
|
||||
version = "9.18.8";
|
||||
version = "9.18.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Djw6uTeNuEug83Bz1nuhJa5PL/ja82bJ2yh+PxssNfA=";
|
||||
sha256 = "sha256-apZlmY1WhgRGDfCRj8jM+tfSk4jU2EJWDAVswhHLskM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ lib, stdenv, glibc }:
|
||||
{ lib, stdenv, glibc, buildPackages }:
|
||||
|
||||
let
|
||||
# Sanitizers are not supported on Darwin.
|
||||
# Sanitizer headers aren't available in older libc++ stdenvs due to a bug
|
||||
sanitizersWorking = !stdenv.hostPlatform.isMusl && (
|
||||
sanitizersWorking = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin && !stdenv.hostPlatform.isMusl && (
|
||||
(stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "5.0.0")
|
||||
|| (stdenv.cc.isGNU && stdenv.isLinux)
|
||||
);
|
||||
staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";
|
||||
emulator = stdenv.hostPlatform.emulator buildPackages;
|
||||
in stdenv.mkDerivation {
|
||||
name = "cc-wrapper-test";
|
||||
|
||||
@ -17,28 +18,28 @@ in stdenv.mkDerivation {
|
||||
|
||||
printf "checking whether compiler builds valid C binaries... " >&2
|
||||
$CC -o cc-check ${./cc-main.c}
|
||||
./cc-check
|
||||
${emulator} ./cc-check
|
||||
|
||||
printf "checking whether compiler builds valid C++ binaries... " >&2
|
||||
$CXX -o cxx-check ${./cxx-main.cc}
|
||||
./cxx-check
|
||||
${emulator} ./cxx-check
|
||||
|
||||
${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) ''
|
||||
printf "checking whether compiler can build with CoreFoundation.framework... " >&2
|
||||
mkdir -p foo/lib
|
||||
$CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c}
|
||||
./core-foundation-check
|
||||
${emulator} ./core-foundation-check
|
||||
''}
|
||||
|
||||
|
||||
${lib.optionalString (!stdenv.isDarwin) ''
|
||||
printf "checking whether compiler builds valid static C binaries... " >&2
|
||||
$CC ${staticLibc} -static -o cc-static ${./cc-main.c}
|
||||
./cc-static
|
||||
${emulator} ./cc-static
|
||||
${lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "8.0.0") ''
|
||||
printf "checking whether compiler builds valid static pie C binaries... " >&2
|
||||
$CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c}
|
||||
./cc-static-pie
|
||||
${emulator} ./cc-static-pie
|
||||
''}
|
||||
''}
|
||||
|
||||
@ -46,7 +47,7 @@ in stdenv.mkDerivation {
|
||||
mkdir -p foo/include
|
||||
cp ${./foo.c} foo/include/foo.h
|
||||
NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" $CC -o cflags-check ${./cflags-main.c}
|
||||
./cflags-check
|
||||
${emulator} ./cflags-check
|
||||
|
||||
printf "checking whether compiler uses NIX_LDFLAGS... " >&2
|
||||
mkdir -p foo/lib
|
||||
@ -57,20 +58,20 @@ in stdenv.mkDerivation {
|
||||
${./foo.c}
|
||||
|
||||
NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
|
||||
./ldflags-check
|
||||
${emulator} ./ldflags-check
|
||||
|
||||
printf "Check whether -nostdinc and -nostdinc++ is handled correctly" >&2
|
||||
mkdir -p std-include
|
||||
cp ${./stdio.h} std-include/stdio.h
|
||||
NIX_DEBUG=1 $CC -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c}
|
||||
./nostdinc-main
|
||||
${emulator} ./nostdinc-main
|
||||
$CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c}
|
||||
./nostdinc-main++
|
||||
${emulator} ./nostdinc-main++
|
||||
|
||||
${lib.optionalString sanitizersWorking ''
|
||||
printf "checking whether sanitizers are fully functional... ">&2
|
||||
$CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
|
||||
./sanitizers
|
||||
ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers
|
||||
''}
|
||||
|
||||
touch $out
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ckbcomp";
|
||||
version = "1.210";
|
||||
version = "1.212";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "installer-team";
|
||||
repo = "console-setup";
|
||||
rev = version;
|
||||
sha256 = "sha256-Np1u8oYIRwWlGpnpp5+VvYkZOkphv225p34og4O+HDE=";
|
||||
sha256 = "sha256-ePWWBbMLXWZABztKeVV0nIfLfyO+9oBiSRNShbmOObw=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fits-cloudctl";
|
||||
version = "0.11.3";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fi-ts";
|
||||
repo = "cloudctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wmkFBzfbMP1kwONpmchI/VQ6ti43pLC3AZfUGPNFzeI=";
|
||||
sha256 = "sha256-rn9F6vCwnz+pweBPYskiAZSfwT9nOyFIJBA3xbmPDhk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Y+RElir4mC6s5I8+mRtYYxYW/m9ihkjSWpG8mSZEjjA=";
|
||||
vendorSha256 = "sha256-aime2pVJw3Bwt4KU2lxpYk0DmRphiZg3M32NWoGeZ+E=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line client for FI-TS Finance Cloud Native services";
|
||||
|
||||
@ -52,6 +52,7 @@ with python.pkgs; buildPythonApplication rec {
|
||||
kconfiglib
|
||||
paho-mqtt
|
||||
pillow
|
||||
platformio
|
||||
protobuf
|
||||
pyserial
|
||||
pyyaml
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nb";
|
||||
version = "6.11.2";
|
||||
version = "7.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xwmx";
|
||||
repo = "nb";
|
||||
rev = version;
|
||||
sha256 = "sha256-FHyI9Bwci2spMz5DiSyVsJ5Vz1t/NJ3gsg13fBbanpc=";
|
||||
sha256 = "sha256-/ibKlmLWmW1Gp95Bd/23CkRs0XVsy6gScmws3gUlszo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipv6calc";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pbiering";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-mfJ6ADjGjECyoW5ELnUzXiJHHiwEDHzeOKCGSmGnLno=";
|
||||
sha256 = "sha256-p/er/Ehyu7PqmikMIKPQBQ0/F81d8iiKdmLXLz+8pus=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwarden";
|
||||
version = "2022.10.0";
|
||||
version = "2022.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bitwarden/clients/releases/download/desktop-v${version}/Bitwarden-${version}-amd64.deb";
|
||||
sha256 = "sha256-KJBRaxrHhoWEMrt4tVg6elVX7Z2AXi9mD1RJDzbRhdI=";
|
||||
sha256 = "sha256-deQG1GEYmnQmO5+jASsiQmDphb+4Jyq9aSn/A4z++uE=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "cve-bin-tool";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "cve-bin-tool";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nz3ax3ldnrzk8694x0p743g5h2zply29ljpn21llbc7ca27zdv9";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-P2GhGQxa6Y8BmMqFHXSfmqN58E1FbXD9Ndwwr+upK8Q=";
|
||||
};
|
||||
|
||||
# Wants to open a sqlite database, access the internet, etc
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "enum4linux-ng";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cddmp";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9J7MiSxfAuzp1M9v4MMWOnK0/lg/X7I4pC6C2yMpMr0=";
|
||||
hash = "sha256-InE0VRk9hK7JEKL202/2RclrJHAHFAol3DxKnVA+lq4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "saml2aws";
|
||||
version = "2.36.1";
|
||||
version = "2.36.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Versent";
|
||||
repo = "saml2aws";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3kBxMC+xXienHOu6YnJNCXd9Tc8rF5WUQF827GkauhQ=";
|
||||
sha256 = "sha256-87s9lcI3URQOfl1zStSVOwmRonC740pZKAqZhDDdMaE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-cxfanKv25U8U6FQ1YfOXghAR8GYQB9PN0TkfLzG4UbI=";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "memtester";
|
||||
version = "4.5.1";
|
||||
version = "4.6.0";
|
||||
|
||||
preConfigure = ''
|
||||
echo "$CC" > conf-cc
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz";
|
||||
sha256 = "sha256-HF/COCV2wISzFM/TNNEnpmwgvWOJLKyfRFvB2LTKWkc=";
|
||||
sha256 = "sha256-yf5Ot+gMjO9SAvkGXEwGgvVhZkfARV6RalcA+Y49uy4=";
|
||||
};
|
||||
|
||||
installFlags = [ "INSTALLPATH=$(out)" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencc";
|
||||
version = "1.1.4";
|
||||
version = "1.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BYVoid";
|
||||
repo = "OpenCC";
|
||||
rev = "ver.${version}";
|
||||
sha256 = "sha256-h/QKXPWHNgWf5Q9UIaNmP85YTUMN7RlRdlNI4NuBrO8=";
|
||||
sha256 = "sha256-0aIYnUuG5XATruxwY6+LZbEdKkHP3X1N1ueVE7R37Qk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
||||
@ -15495,6 +15495,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
cargo-modules = callPackage ../development/tools/rust/cargo-modules { };
|
||||
cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { };
|
||||
cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
@ -32993,8 +32994,8 @@ with pkgs;
|
||||
|
||||
vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
|
||||
|
||||
vengi-tools = callPackage ../applications/graphics/vengi-tools {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon CoreServices OpenCL;
|
||||
vengi-tools = darwin.apple_sdk_11_0.callPackage ../applications/graphics/vengi-tools {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL;
|
||||
};
|
||||
|
||||
verbiste = callPackage ../applications/misc/verbiste {
|
||||
|
||||
@ -2495,6 +2495,8 @@ self: super: with self; {
|
||||
|
||||
django-celery-email = callPackage ../development/python-modules/django-celery-email { };
|
||||
|
||||
django-celery-results = callPackage ../development/python-modules/django-celery-results { };
|
||||
|
||||
django_classytags = callPackage ../development/python-modules/django_classytags { };
|
||||
|
||||
django-cleanup = callPackage ../development/python-modules/django-cleanup { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user