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

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-04-08 12:02:01 +00:00 committed by GitHub
parent 6d49a35080 65cadc389f
commit a36cec68d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 345 additions and 305 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/basic-eval.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
# we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: cachix/install-nix-action@v16 - uses: cachix/install-nix-action@v17
- uses: cachix/cachix-action@v10 - uses: cachix/cachix-action@v10
with: with:
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.

2
.github/workflows/editorconfig.yml vendored
View file

@ -28,7 +28,7 @@ jobs:
with: with:
# pull_request_target checks out the base branch by default # pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@v16 - uses: cachix/install-nix-action@v17
with: with:
# nixpkgs commit is pinned so that it doesn't break # nixpkgs commit is pinned so that it doesn't break
# editorconfig-checker 2.4.0 # editorconfig-checker 2.4.0

2
.github/workflows/manual-nixos.yml vendored
View file

@ -18,7 +18,7 @@ jobs:
with: with:
# pull_request_target checks out the base branch by default # pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@v16 - uses: cachix/install-nix-action@v17
with: with:
# explicitly enable sandbox # explicitly enable sandbox
extra_nix_config: sandbox = true extra_nix_config: sandbox = true

2
.github/workflows/manual-nixpkgs.yml vendored
View file

@ -18,7 +18,7 @@ jobs:
with: with:
# pull_request_target checks out the base branch by default # pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@v16 - uses: cachix/install-nix-action@v17
with: with:
# explicitly enable sandbox # explicitly enable sandbox
extra_nix_config: sandbox = true extra_nix_config: sandbox = true

2
.github/workflows/nixos-manual.yml vendored
View file

@ -19,7 +19,7 @@ jobs:
with: with:
# pull_request_target checks out the base branch by default # pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@v16 - uses: cachix/install-nix-action@v17
- name: Check DocBook files generated from Markdown are consistent - name: Check DocBook files generated from Markdown are consistent
run: | run: |
nixos/doc/manual/md-to-db.sh nixos/doc/manual/md-to-db.sh

2
.github/workflows/update-terraform-providers.yml vendored
View file

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: cachix/install-nix-action@v16 - uses: cachix/install-nix-action@v17
- name: setup - name: setup
id: setup id: setup
run: | run: |

6
maintainers/maintainer-list.nix
View file

@ -8091,6 +8091,12 @@
githubId = 20536514; githubId = 20536514;
name = "Magdalena Haselsteiner"; name = "Magdalena Haselsteiner";
}; };
mh182 = {
email = "mh182@chello.at";
github = "mh182";
githubId = 9980864;
name = "Max Hofer";
};
mic92 = { mic92 = {
email = "joerg@thalheim.io"; email = "joerg@thalheim.io";
matrix = "@mic92:nixos.dev"; matrix = "@mic92:nixos.dev";

15
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View file

@ -432,6 +432,12 @@
new versions will release. new versions will release.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>security.klogd</literal> was removed. Logging of
kernel messages is handled by systemd since Linux 3.5.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
<literal>services.kubernetes.addons.dashboard</literal> was <literal>services.kubernetes.addons.dashboard</literal> was
@ -1465,6 +1471,15 @@
takes a list of strings instead of a string. takes a list of strings instead of a string.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <literal>asterisk</literal> and
<literal>asterisk-stable</literal> packages were switched from
<literal>asterisk_18</literal> to the newly-packaged
<literal>asterisk_19</literal>. Asterisk 13 and 17 have been
removed as they have reached their end of life.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The <literal>services.unifi.openPorts</literal> option default The <literal>services.unifi.openPorts</literal> option default

5
nixos/doc/manual/release-notes/rl-2205.section.md
View file

@ -141,6 +141,9 @@ In addition to numerous new and upgraded packages, this release has the followin
org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
`pkgs.emacsPackages.nongnuPackages` where the new versions will release. `pkgs.emacsPackages.nongnuPackages` where the new versions will release.
- `security.klogd` was removed. Logging of kernel messages is handled
by systemd since Linux 3.5.
- `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. - `services.kubernetes.addons.dashboard` was removed due to it being an outdated version.
- `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading. - `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading.
@ -517,6 +520,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string. - `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string.
- The `asterisk` and `asterisk-stable` packages were switched from `asterisk_18` to the newly-packaged `asterisk_19`. Asterisk 13 and 17 have been removed as they have reached their end of life.
- The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
Configurations using this default will print a warning when rebuilt. Configurations using this default will print a warning when rebuilt.

5
nixos/modules/hardware/video/webcam/facetimehd.nix
View file

@ -16,11 +16,6 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = singleton {
assertion = versionAtLeast kernelPackages.kernel.version "3.19";
message = "facetimehd is not supported for kernels older than 3.19";
};
boot.kernelModules = [ "facetimehd" ]; boot.kernelModules = [ "facetimehd" ];
boot.blacklistedKernelModules = [ "bdc_pci" ]; boot.blacklistedKernelModules = [ "bdc_pci" ];

41
nixos/modules/services/logging/klogd.nix
View file

@ -1,38 +1,9 @@
{ config, lib, pkgs, ... }: { lib, ... }:
with lib;
{ {
###### interface imports = [
(lib.mkRemovedOptionModule [ "security" "klogd" "enable" ] ''
options = { Logging of kernel messages is now handled by systemd.
'')
services.klogd.enable = mkOption { ];
type = types.bool;
default = versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5";
defaultText = literalExpression ''versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5"'';
description = ''
Whether to enable klogd, the kernel log message processing
daemon. Since systemd handles logging of kernel messages on
Linux 3.5 and later, this is only useful if you're running an
older kernel.
'';
};
};
###### implementation
config = mkIf config.services.klogd.enable {
systemd.services.klogd = {
description = "Kernel Log Daemon";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.sysklogd ];
unitConfig.ConditionVirtualization = "!systemd-nspawn";
script =
"klogd -c 1 -2 -n " +
"-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map";
};
};
} }

4
pkgs/applications/audio/callaudiod/default.nix
View file

@ -11,14 +11,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "callaudiod"; pname = "callaudiod";
version = "0.1.3"; version = "0.1.4";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.com"; domain = "gitlab.com";
owner = "mobian1"; owner = "mobian1";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-WZ23jacCsZiNeMJfnYMaGdHXY9OCIBbeU9dWGDroaHE="; sha256 = "sha256-71+9ALz55aqxXRBRwOcs9fwiQK31pJ9E72pGRmt0OkE=";
}; };
strictDeps = true; strictDeps = true;

10
pkgs/applications/blockchains/stellar-core/default.nix
View file

@ -1,22 +1,26 @@
{ lib, stdenv, fetchFromGitHub, autoconf, libtool, automake, pkg-config, git { lib, stdenv, fetchFromGitHub, autoconf, libtool, automake, pkg-config, git
, bison, flex, postgresql, ripgrep }: , bison, flex, postgresql, ripgrep, libunwind }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stellar-core"; pname = "stellar-core";
version = "17.0.0"; version = "18.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stellar"; owner = "stellar";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1ngl8yjqb8xzhdwzlxzzxf14q2hgwy2ysb17sn5380rrn0jswin1"; sha256 = "sha256-wEi22R4zb8d5CJV5eWb776Yob8B6Ok4FrbYI0SGM0H8=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep ]; nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep ];
buildInputs = [ libunwind ];
propagatedBuildInputs = [ bison flex postgresql ]; propagatedBuildInputs = [ bison flex postgresql ];
enableParallelBuilding = true;
preConfigure = '' preConfigure = ''
# Due to https://github.com/NixOS/nixpkgs/issues/8567 we cannot rely on # Due to https://github.com/NixOS/nixpkgs/issues/8567 we cannot rely on
# having the .git directory present, so directly provide the version # having the .git directory present, so directly provide the version

10
pkgs/applications/graphics/mypaint/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, gtk3 , gtk3
, gettext , gettext
, json_c , json_c
@ -31,6 +32,15 @@ in buildPythonApplication rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
# Fix build due to setuptools issue.
# https://github.com/mypaint/mypaint/pull/1183
(fetchpatch {
url = "https://github.com/mypaint/mypaint/commit/423950bec96d6057eac70442de577364d784a847.patch";
sha256 = "OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
gettext gettext
pkg-config pkg-config

40
pkgs/applications/misc/obsidian/default.nix
View file

@ -13,6 +13,7 @@ let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
pname = "obsidian"; pname = "obsidian";
version = "0.14.2"; version = "0.14.2";
appname = "Obsidian";
meta = with lib; { meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
homepage = "https://obsidian.md"; homepage = "https://obsidian.md";
@ -27,24 +28,24 @@ let
sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3"; sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3";
}; };
linux = stdenv.mkDerivation rec { icon = fetchurl {
icon = fetchurl { url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";
url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2";
sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; };
};
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "obsidian"; name = "obsidian";
desktopName = "Obsidian"; desktopName = "Obsidian";
comment = "Knowledge base"; comment = "Knowledge base";
icon = "obsidian"; icon = "obsidian";
exec = "obsidian %u"; exec = "obsidian %u";
categories = [ "Office" ]; categories = [ "Office" ];
mimeTypes = [ "x-scheme-handler/obsidian" ]; mimeTypes = [ "x-scheme-handler/obsidian" ];
}; };
inherit pname version src; linux = stdenv.mkDerivation {
meta.platforms = [ "x86_64-linux" ]; inherit pname version src desktopItem icon;
meta = meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; };
nativeBuildInputs = [ makeWrapper graphicsmagick ]; nativeBuildInputs = [ makeWrapper graphicsmagick ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -71,10 +72,9 @@ let
''; '';
}; };
darwin = stdenv.mkDerivation rec { darwin = stdenv.mkDerivation {
appname = "Obsidian"; inherit pname version src appname;
inherit pname version src; meta = meta // { platforms = [ "x86_64-darwin" "aarch64-darwin" ]; };
meta.platforms = [ "x86_64-darwin" "aarch64-darwin" ];
sourceRoot = "${appname}.app"; sourceRoot = "${appname}.app";
nativeBuildInputs = [ makeWrapper undmg unzip ]; nativeBuildInputs = [ makeWrapper undmg unzip ];
installPhase = '' installPhase = ''

10
pkgs/applications/networking/cluster/talosctl/default.nix
View file

@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
let let
# look for GO_LDFLAGS getting set in the Makefile # look for GO_LDFLAGS getting set in the Makefile
version = "0.14.3"; version = "1.0.1";
sha256 = "sha256-toEbWUZxnJkUe9jkZRdJrcPXu+CIh62fUKyX38OkXxU="; sha256 = "sha256-IqFnVOnmYqf2K3TX+gwFPmBBksYz+56Oy/t8xWhi7fc=";
vendorSha256 = "sha256-Pj1918TIOGfhkRiFEKkURL4xMFgWroiNsNU6yWzT8yk="; vendorSha256 = "sha256-GKdAMmU4HiOFYR0SFeFvwFGTXc2lmzO/fAlR1vCDfX4=";
pkgsVersion = "v0.9.0-6-gbfcc795"; pkgsVersion = "v1.0.0-6-g7c293d5";
extrasVersion = "v0.7.0-2-gb4c9d21"; extrasVersion = "v1.0.0";
in in
buildGoModule rec { buildGoModule rec {
pname = "talosctl"; pname = "talosctl";

4
pkgs/data/icons/elementary-xfce-icon-theme/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-xfce-icon-theme"; pname = "elementary-xfce-icon-theme";
version = "0.15.2"; version = "0.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shimmerproject"; owner = "shimmerproject";
repo = "elementary-xfce"; repo = "elementary-xfce";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-E8f6UU/4Y9Nfk7LjDcdyV+TdeVj/zl3oFCyEu3Gz27w="; sha256 = "sha256-p6HQhYf+rw3obrc6e5lYqC02i4dK+5eXGwnTJj0+D+k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/data/themes/arc/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "arc-theme"; pname = "arc-theme";
version = "20220223"; version = "20220405";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jnsh"; owner = "jnsh";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-qsZdXDNxT1/gIlkUsC1cfVrULApC+dHreBXXjVTJQiA="; sha256 = "sha256-CBj/SpBWH5xdNCQSJquqIntcmfARI7Cud76Tp8txXL4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/xfce/core/thunar/default.nix
View file

@ -21,9 +21,9 @@
let unwrapped = mkXfceDerivation { let unwrapped = mkXfceDerivation {
category = "xfce"; category = "xfce";
pname = "thunar"; pname = "thunar";
version = "4.16.10"; version = "4.16.11";
sha256 = "sha256-BeEy8+zEsJ5fJAbvP37tfekqF5LTHil0RDcE5RY0f64="; sha256 = "sha256-xan0HuHYLVArx3dGzzxsCjQ8eWsXNk0LtZGAejA2iGI=";
nativeBuildInputs = [ nativeBuildInputs = [
docbook_xsl docbook_xsl

4
pkgs/development/interpreters/spidermonkey/91.nix
View file

@ -19,11 +19,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spidermonkey"; pname = "spidermonkey";
version = "91.7.0"; version = "91.8.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301"; sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

27
pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch
View file

@ -1,27 +0,0 @@
From a66b58d61caaae452785a2d69f5de9259ab27138 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Sun, 16 Jan 2022 00:32:52 -0300
Subject: [PATCH] fate/ffmpeg: add missing samples dependency to fate-shortest
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit b1ef5882e35d1a95e9c4838d0933084773055345)
---
tests/fate/ffmpeg.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
index 0b00bb5b23..b80467d02e 100644
--- a/tests/fate/ffmpeg.mak
+++ b/tests/fate/ffmpeg.mak
@@ -86,7 +86,7 @@ fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \
-guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \
-f ac3 -flags +bitexact -c ac3_fixed
-FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \
+FATE_SAMPLES_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \
SINE_FILTER PCM_S16LE_DECODER RAWVIDEO_DECODER \
ARESAMPLE_FILTER AMIX_FILTER MPEG4_ENCODER \
AC3_FIXED_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \
--
2.33.1

6
pkgs/development/libraries/ffmpeg/5.nix
View file

@ -5,10 +5,8 @@
}@args: }@args:
callPackage ./generic.nix (rec { callPackage ./generic.nix (rec {
version = "5.0"; version = "5.0.1";
branch = version; branch = version;
sha256 = "1ndy6a2bhl6nvz9grmcaakh4xi0vss455466s47l6qy7na6hn4y0"; sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY=";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
patches = [ ./0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch ];
} // args) } // args)

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

@ -323,7 +323,9 @@ stdenv.mkDerivation rec {
gettext() { "${gettext}/bin/gettext" "$@"; } gettext() { "${gettext}/bin/gettext" "$@"; }
' '
'' + optionalString isLinux '' '' + optionalString isLinux ''
substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill for f in $out/lib/systemd/system/*.service ; do
substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill
done
rm $out/lib/systemd/system/{virtlockd,virtlogd}.* rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
wrapProgram $out/sbin/libvirtd \ wrapProgram $out/sbin/libvirtd \
--prefix PATH : /run/libvirt/nix-emulators:${binPath} --prefix PATH : /run/libvirt/nix-emulators:${binPath}

22
pkgs/development/php-packages/datadog_trace/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ buildPecl, curl, fetchFromGitHub, lib, pcre2 }:
buildPecl rec {
pname = "ddtrace";
version = "0.70.0";
src = fetchFromGitHub {
owner = "DataDog";
repo = "dd-trace-php";
rev = "${version}";
sha256 = "sha256-AYRBzE0Detg/IHXYutZUfPRMtfthxdkSjqD0M+VcTpY=";
};
buildInputs = [ curl pcre2 ];
meta = with lib; {
description = "Datadog Tracing PHP Client";
homepage = "https://github.com/DataDog/dd-trace-php";
license = licenses.apsl20;
maintainers = teams.php.members;
};
}

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

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "databricks-connect"; pname = "databricks-connect";
version = "9.1.12"; version = "9.1.13";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-o3r2qZbSAAzyxfPdf9JNDhd/WKRhDdJFfnjCI8eTEE0="; sha256 = "sha256-TpE15UOwbuAvp+ffC9JUnR8yQb0DWvBMkSieMhQGjao=";
}; };
sourceRoot = "."; sourceRoot = ".";

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

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "elkm1-lib"; pname = "elkm1-lib";
version = "1.2.1"; version = "1.2.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gwww"; owner = "gwww";
repo = "elkm1"; repo = "elkm1";
rev = version; rev = version;
hash = "sha256-Jr9f+essHB1FkzD6zM0G6jgE9C9lfDJuFIPrKRhVt+g="; hash = "sha256-JZohQ0xLFfLVMGlw89uC9OQF6SMddcCOsotshavynCk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "furo"; pname = "furo";
version = "2022.3.4"; version = "2022.4.7";
format = "wheel"; format = "wheel";
disable = pythonOlder "3.6"; disable = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
inherit pname version format; inherit pname version format;
dist = "py3"; dist = "py3";
python = "py3"; python = "py3";
sha256 = "sha256-bHGCk+v4d1XwufFIseaXyeOqvXr5VWRNS8ruXOddt4E="; sha256 = "sha256-fz49L7l3SDWQ+Oyyws1RG9gmYbecGO+yTelVi8nN8tc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hahomematic"; pname = "hahomematic";
version = "1.0.5"; version = "1.0.6";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -22,8 +22,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "danielperna84"; owner = "danielperna84";
repo = pname; repo = pname;
rev = version; rev = "refs/tags/${version}";
sha256 = "sha256-8iLQpNax0xgjf+vUo6OcXMF1aZuaRFZBos8EC1gJEPA="; sha256 = "sha256-mqB6Sal+gt2i9h9HHZNVJ/HXPrF7Fe4MC7EKpJR3JMY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

14
pkgs/development/python-modules/myjwt/default.nix
View file

@ -10,6 +10,7 @@
, pyperclip , pyperclip
, pytest-mock , pytest-mock
, pytestCheckHook , pytestCheckHook
, pythonOlder
, questionary , questionary
, requests , requests
, requests-mock , requests-mock
@ -17,13 +18,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "myjwt"; pname = "myjwt";
version = "1.5.0"; version = "1.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mBouamama"; owner = "mBouamama";
repo = "MyJWT"; repo = "MyJWT";
rev = version; rev = "refs/tags/${version}";
sha256 = "sha256-kZkqFeaQPd56BVaYmCWAbVu1xwbPAIlQC3u5/x3dh7A="; sha256 = "sha256-A9tsQ6L+y3doL5pJbau3yKnmQtX2IPXWyW/YCLhS7nc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -48,7 +52,9 @@ buildPythonPackage rec {
sed -i -e "s/==[0-9.]*//" requirements.txt sed -i -e "s/==[0-9.]*//" requirements.txt
''; '';
pythonImportsCheck = [ "myjwt" ]; pythonImportsCheck = [
"myjwt"
];
meta = with lib; { meta = with lib; {
description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)"; description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)";

20
pkgs/development/python-modules/pyplaato/default.nix
View file

@ -3,22 +3,32 @@
, fetchPypi , fetchPypi
, aiohttp , aiohttp
, python-dateutil , python-dateutil
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyplaato"; pname = "pyplaato";
version = "0.0.16"; version = "0.0.17";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-0hbdwgkQhcjD9YbpG+bczAAi9u1QfrJdMn1g14EBPac="; hash = "sha256-fd7gHDah5yoqpH5d3bwEDsIfeflXzXevJLMD7lvz180=";
}; };
propagatedBuildInputs = [ aiohttp python-dateutil ]; propagatedBuildInputs = [
aiohttp
python-dateutil
];
# Project has no tests # Module has no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "pyplaato" ];
pythonImportsCheck = [
"pyplaato"
];
meta = with lib; { meta = with lib; {
description = "Python API client for fetching Plaato data"; description = "Python API client for fetching Plaato data";

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

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-smarttub"; pname = "python-smarttub";
version = "0.0.30"; version = "0.0.31";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mdz"; owner = "mdz";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-PzmE0j/sas1Dc/U022dS3krROm292xJlL37+EWPEs+g="; sha256 = "sha256-tyE50HzwnrxXGWJ0+YRxCmSxtqrPnYmJzBH2ZDFJDZ4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "scmrepo"; pname = "scmrepo";
version = "0.0.17"; version = "0.0.18";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative"; owner = "iterative";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-OMmVEBbb3BQcxpAg6+goGITu8iuHzg+ZzVs+8UdRFrg="; hash = "sha256-eMtYVdKLiIaagDB1OEdYge6+McchOZPBcuIKGMzyvQQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -2,20 +2,21 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, python , python
, six , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.0.0";
pname = "slicerator"; pname = "slicerator";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "18e60393e6765ca96986f801bbae62a617a1eba6ed57784e61b165ffc7dc1848"; hash = "sha256-RAEKf1zYdoDAchO1yr6B0ftxJSlilD5Tc+59FGBdYEY=";
}; };
propagatedBuildInputs = [ six ];
checkPhase = '' checkPhase = ''
${python.interpreter} run_tests.py ${python.interpreter} run_tests.py
''; '';
@ -24,9 +25,9 @@ buildPythonPackage rec {
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {
homepage = "https://github.com/soft-matter/slicerator";
description = "A lazy-loading, fancy-sliceable iterable"; description = "A lazy-loading, fancy-sliceable iterable";
homepage = "https://github.com/soft-matter/slicerator";
license = licenses.bsdOriginal; license = licenses.bsdOriginal;
maintainers = [ maintainers.costrouc ]; maintainers = with maintainers; [ costrouc ];
}; };
} }

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

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "trimesh"; pname = "trimesh";
version = "3.10.7"; version = "3.10.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-OYor+DQJkkQx8C5E0pmeGaymiYEyKkuKBLp12jkrhS8="; sha256 = "sha256-SFG3wGGFxzZKfNyIQrpDGblL2vC0pQguWIYdwF0Mg5A=";
}; };
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];

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

@ -2,23 +2,34 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pytestCheckHook , pytestCheckHook
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "wasabi"; pname = "wasabi";
version = "0.9.0"; version = "0.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "152245d892030a3a7b511038e9472acff6d0e237cfe4123fef0d147f2d3274fc"; sha256 = "sha256-rabxPptw7ya/lfrQ/r396+IAXimgitWPS7rjg6lymM8=";
}; };
checkInputs = [ pytestCheckHook ]; checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"wasabi"
];
meta = with lib; { meta = with lib; {
description = "A lightweight console printing and formatting toolkit"; description = "A lightweight console printing and formatting toolkit";
homepage = "https://github.com/ines/wasabi"; homepage = "https://github.com/ines/wasabi";
changelog = "https://github.com/ines/wasabi/releases/tag/v${version}"; changelog = "https://github.com/ines/wasabi/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ];
}; };
} }

6
pkgs/development/tools/build-managers/scala-cli/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:
let let
version = "0.1.2"; version = "0.1.3";
assets = { assets = {
x86_64-darwin = { x86_64-darwin = {
asset = "scala-cli-x86_64-apple-darwin.gz"; asset = "scala-cli-x86_64-apple-darwin.gz";
sha256 = "10453af2kz10k9vmcgdwpk10z36cnblnj6l09wkqngxwx9vxbf9q"; sha256 = "UlDF2Eaaet62zZV0z6XOZvg/YeB//AXPDni8h3Wc6rw=";
}; };
x86_64-linux = { x86_64-linux = {
asset = "scala-cli-x86_64-pc-linux.gz"; asset = "scala-cli-x86_64-pc-linux.gz";
sha256 = "0720c4s717hcssp4b3x295rhgac4ifjr95zn45bm1n70jr3xqzyj"; sha256 = "086fi7ma4j9xy6gs0k7i06ql8ranjkjlrir2860q74kinfisk79a";
}; };
}; };
in in

6
pkgs/development/tools/database/sqlfluff/default.nix
View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff"; pname = "sqlfluff";
version = "0.11.2"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = "refs/tags/${version}";
hash = "sha256-iEjfp6QXMIk/ehq0Ypa8JXv3/u40w39NHz7HhC1KBms="; hash = "sha256-WL9bp77Q1cQakxaptw6ZHCq2+IAscMIDKkbQAHSCo1s=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

2
pkgs/os-specific/linux/anbox/kmod.nix
View file

@ -36,7 +36,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/anbox/anbox-modules"; homepage = "https://github.com/anbox/anbox-modules";
license = licenses.gpl2Only; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;
broken = kernel.kernelOlder "4.4" || kernel.kernelAtLeast "5.5"; broken = kernel.kernelAtLeast "5.5";
maintainers = with maintainers; [ edwtjo ]; maintainers = with maintainers; [ edwtjo ];
}; };
} }

2
pkgs/os-specific/linux/digimend/default.nix
View file

@ -1,7 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: { lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:
assert lib.versionAtLeast kernel.version "3.5";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "digimend"; pname = "digimend";
version = "unstable-2019-06-18"; version = "unstable-2019-06-18";

2
pkgs/os-specific/linux/ena/default.nix
View file

@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only; license = licenses.gpl2Only;
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
platforms = platforms.linux; platforms = platforms.linux;
broken = kernel.kernelOlder "4.5" || kernel.kernelAtLeast "5.15"; broken = kernel.kernelAtLeast "5.15";
}; };
} }

28
pkgs/os-specific/linux/facetimehd/default.nix
View file

@ -1,9 +1,9 @@
{ stdenv, lib, fetchFromGitHub, kernel }: { stdenv, lib, fetchFromGitHub, kernel }:
# facetimehd is not supported for kernels older than 3.19"; stdenv.mkDerivation rec {
assert lib.versionAtLeast kernel.version "3.19"; name = "facetimehd-${version}-${kernel.version}";
version = "unstable-2020-04-16";
let
# Note: When updating this revision: # Note: When updating this revision:
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/ # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
# 2. Test the module and firmware change via: # 2. Test the module and firmware change via:
@ -14,29 +14,11 @@ let
# e. see if the module loads back (apps using the camera won't # e. see if the module loads back (apps using the camera won't
# recover and will have to be restarted) and the camera # recover and will have to be restarted) and the camera
# still works. # still works.
srcParams = if (lib.versionAtLeast kernel.version "4.8") then
{ # Use mainline branch
version = "unstable-2020-04-16";
rev = "82626d4892eeb9eb704538bf0dc49a00725ff451";
sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx";
}
else
{ # Use master branch (broken on 4.8)
version = "unstable-2016-05-02";
rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
}
;
in
stdenv.mkDerivation rec {
name = "facetimehd-${version}-${kernel.version}";
version = srcParams.version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "patjak"; owner = "patjak";
repo = "bcwc_pcie"; repo = "bcwc_pcie";
inherit (srcParams) rev sha256; rev = "82626d4892eeb9eb704538bf0dc49a00725ff451";
sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx";
}; };
preConfigure = '' preConfigure = ''

4
pkgs/os-specific/linux/iwd/default.nix
View file

@ -12,12 +12,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iwd"; pname = "iwd";
version = "1.25"; version = "1.26";
src = fetchgit { src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version; rev = version;
sha256 = "sha256-3IiRuILU2FKzXAQ0Q79DX2+nlNMcHNanS8m9GqjBBnU="; sha256 = "sha256-+BciYfb9++u9Ux4AdvPFFIFVq8j+TVoTLKqxzmn5p3o=";
}; };
outputs = [ "out" "man" "doc" ] outputs = [ "out" "man" "doc" ]

2
pkgs/os-specific/linux/kernel/gpio-utils.nix
View file

@ -2,8 +2,6 @@
with lib; with lib;
assert versionAtLeast linux.version "4.6";
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "gpio-utils"; pname = "gpio-utils";
version = linux.version; version = linux.version;

2
pkgs/os-specific/linux/kernel/perf.nix
View file

@ -9,8 +9,6 @@
with lib; with lib;
assert versionAtLeast kernel.version "3.12";
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "perf-linux"; pname = "perf-linux";
version = kernel.version; version = kernel.version;

1
pkgs/os-specific/linux/ply/default.nix
View file

@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
homepage = "https://wkz.github.io/ply/"; homepage = "https://wkz.github.io/ply/";
license = [ licenses.gpl2Only ]; license = [ licenses.gpl2Only ];
maintainers = with maintainers; [ mic92 mbbx6spp ]; maintainers = with maintainers; [ mic92 mbbx6spp ];
broken = lib.versionOlder kernel.version "4.0";
}; };
} }

2
pkgs/os-specific/linux/sch_cake/default.nix
View file

@ -1,7 +1,5 @@
{ stdenv, lib, fetchFromGitHub, kernel }: { stdenv, lib, fetchFromGitHub, kernel }:
assert lib.versionAtLeast kernel.version "4.4";
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "sch_cake"; pname = "sch_cake";
version = "unstable-2017-07-16"; version = "unstable-2017-07-16";

2
pkgs/os-specific/linux/wireguard/default.nix
View file

@ -1,7 +1,5 @@
{ lib, stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: { lib, stdenv, fetchzip, kernel, perl, wireguard-tools, bc }:
# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert lib.versionAtLeast kernel.version "3.10";
# wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html # wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html
assert lib.versionOlder kernel.version "5.6"; assert lib.versionOlder kernel.version "5.6";

4
pkgs/os-specific/linux/zfs/default.nix
View file

@ -216,7 +216,7 @@ in {
# to be adapted # to be adapted
zfsStable = common { zfsStable = common {
# check the release notes for compatible kernels # check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18"; kernelCompatible = kernel.kernelOlder "5.18";
latestCompatibleLinuxPackages = linuxPackages_5_17; latestCompatibleLinuxPackages = linuxPackages_5_17;
# this package should point to the latest release. # this package should point to the latest release.
@ -227,7 +227,7 @@ in {
zfsUnstable = common { zfsUnstable = common {
# check the release notes for compatible kernels # check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18"; kernelCompatible = kernel.kernelOlder "5.18";
latestCompatibleLinuxPackages = linuxPackages_5_17; latestCompatibleLinuxPackages = linuxPackages_5_17;
# this package should point to a version / git revision compatible with the latest kernel release # this package should point to a version / git revision compatible with the latest kernel release

9
pkgs/servers/asterisk/default.nix
View file

@ -100,17 +100,16 @@ let
}) (lib.importJSON ./versions.json); }) (lib.importJSON ./versions.json);
in { in {
# Supported releases (as of 2020-10-26). # Supported releases (as of 2022-04-05).
# Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
# Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/ # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/
# #
# Series Type Rel. Date Sec. Fixes EOL # Series Type Rel. Date Sec. Fixes EOL
# 13.x LTS 2014-10-24 2020-10-24 2021-10-24
# 16.x LTS 2018-10-09 2022-10-09 2023-10-09 # 16.x LTS 2018-10-09 2022-10-09 2023-10-09
# 17.x Standard 2019-10-28 2020-10-28 2021-10-28
# 18.x LTS 2020-10-20 2024-10-20 2025-10-20 # 18.x LTS 2020-10-20 2024-10-20 2025-10-20
# 19.x Standard 2021-11-02 2022-11-02 2023-11-02
asterisk-lts = versions.asterisk_18; asterisk-lts = versions.asterisk_18;
asterisk-stable = versions.asterisk_18; asterisk-stable = versions.asterisk_19;
asterisk = versions.asterisk_18; asterisk = versions.asterisk_19;
} // versions } // versions

20
pkgs/servers/asterisk/versions.json
View file

@ -1,18 +1,14 @@
{ {
"asterisk_13": {
"sha256": "478040705f5819259bb1d22cb4e27970092a5bfdb691d27d321c26235eea4bb3",
"version": "13.38.3"
},
"asterisk_16": { "asterisk_16": {
"sha256": "c34fc38287cea533c0d0a34959112119e47d12d8ea6ac11bdddf9265afda6d11", "sha256": "379c5529b9957c28734192999543486a0b0b24f6671b2e02e77cc809774e7ba9",
"version": "16.19.1" "version": "16.25.1"
},
"asterisk_17": {
"sha256": "cc0d6b9ef1512d4e279b80ca8bf78032d69fe6e92492c95c22c44023d6c111fa",
"version": "17.9.4"
}, },
"asterisk_18": { "asterisk_18": {
"sha256": "e7d78716a0deeadf24b7d537cd24c11c2d9a096265eefc9470565c4da0fc54c7", "sha256": "9db0e94e005a91a5433fc11173247065a5c40c9a7ca946577908f65d130b888e",
"version": "18.5.1" "version": "18.11.1"
},
"asterisk_19": {
"sha256": "3e1fa31ef1de7813365dd8b98ef93744ff87902255472814d0232b955c794706",
"version": "19.3.1"
} }
} }

2
pkgs/servers/openafs/1.8/module.nix
View file

@ -70,6 +70,6 @@ stdenv.mkDerivation {
license = licenses.ipl10; license = licenses.ipl10;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ maggesi spacefrogg ]; maintainers = with maintainers; [ maggesi spacefrogg ];
broken = kernel.kernelOlder "3.18" || kernel.kernelAtLeast "5.17" || kernel.isHardened; broken = kernel.kernelAtLeast "5.17" || kernel.isHardened;
}; };
} }

2
pkgs/servers/openafs/1.9/module.nix
View file

@ -59,6 +59,6 @@ in stdenv.mkDerivation {
license = licenses.ipl10; license = licenses.ipl10;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
broken = versionOlder kernel.version "3.18" || kernel.kernelAtLeast "5.15" || kernel.isHardened; broken = kernel.kernelAtLeast "5.15" || kernel.isHardened;
}; };
} }

6
pkgs/servers/plex/raw.nix
View file

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should # server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes. # automatically pick up the changes.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.25.8.5663-e071c3d62"; version = "1.25.9.5721-965587f64";
pname = "plexmediaserver"; pname = "plexmediaserver";
# Fetch the source # Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
hash = "sha256-w9k8phyiA/sK+zRlK8PAciebt5UJvmVFA+cfx4r78Gs="; hash = "sha256-qD4VZ0ksR+VyBVVjeSCC2EG+uUHh5RE2fihHrIJUItY=";
} else fetchurl { } else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
hash = "sha256-baOofe+7PZfLhwIXrB1ibKkkEJRVivgGHDN4phlg57Q="; hash = "sha256-NPfpQ8JwXDaq8xpvSabyqdDqMWjoqbeoJdu41nhdsI0=";
}; };
outputs = [ "out" "basedb" ]; outputs = [ "out" "basedb" ];

4
pkgs/tools/admin/exoscale-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "exoscale-cli"; pname = "exoscale-cli";
version = "1.52.0"; version = "1.52.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exoscale"; owner = "exoscale";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-uaJt1QS4nDVliIFo11OhQYvOxJMeda0QGuaGZCPRoWk="; sha256 = "sha256-CSltvSdKLAH711ubT6ROgkmq2EcFJplPmavsJa9xupM=";
}; };
goPackagePath = "github.com/exoscale/cli"; goPackagePath = "github.com/exoscale/cli";

6
pkgs/tools/admin/syft/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "syft"; pname = "syft";
version = "0.43.0"; version = "0.43.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anchore"; owner = "anchore";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gUdlVwXqi58X6O1arfniNsKKNR+bU1qwzVvY0PAzwfk="; sha256 = "sha256-vGzS5Tpg+3f+ydsNbYza4FnCLBv6hMT3RGdlHrKjtfE=";
# populate values that require us to use git. By doing this in postFetch we # 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. # can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true; leaveDotGit = true;
@ -20,7 +20,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf find "$out" -name .git -print0 | xargs -0 rm -rf
''; '';
}; };
vendorSha256 = "sha256-nIVVwFISDkbO+USpJsHMrYDGQbf4jSGkRLS3Oq9HaBA="; vendorSha256 = "sha256-ZWJzMDfCop5IT6mOvCWdtjGjVrZJxyM0z7iK3TiO+PI=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

13
pkgs/tools/misc/cod/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoModule }: { lib, fetchFromGitHub, buildGoModule, python3 }:
buildGoModule rec { buildGoModule rec {
pname = "cod"; pname = "cod";
@ -15,7 +15,16 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ]; ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ];
doCheck = false; checkInputs = [ python3 ];
preCheck = ''
pushd test/binaries/
for f in *.py; do
patchShebangs ''$f
done
popd
export COD_TEST_BINARY="''${NIX_BUILD_TOP}/go/bin/cod"
'';
meta = with lib; { meta = with lib; {
description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output"; description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output";

2
pkgs/tools/networking/cassowary/default.nix
View file

@ -13,8 +13,6 @@ buildGoModule rec {
vendorSha256 = "sha256-hGpiL88x2roFEjJJM4CKyt3k66VK1pEnpOwvhDPDp6M="; vendorSha256 = "sha256-hGpiL88x2roFEjJJM4CKyt3k66VK1pEnpOwvhDPDp6M=";
doCheck = false;
ldflags = [ "-s" "-w" "-X main.version=${version}" ]; ldflags = [ "-s" "-w" "-X main.version=${version}" ];
meta = with lib; { meta = with lib; {

15
pkgs/tools/networking/curlie/default.nix
View file

@ -1,20 +1,27 @@
{ buildGoModule, fetchFromGitHub, lib }: { buildGoModule, fetchFromGitHub, lib, curlie, testVersion }:
buildGoModule rec { buildGoModule rec {
pname = "curlie"; pname = "curlie";
version = "1.6.7"; version = "1.6.9";
src= fetchFromGitHub { src = fetchFromGitHub {
owner = "rs"; owner = "rs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-uWLJWhsqJaLji2JSuVX8Vu929AdozhtAPwsqXdpEt84="; hash = "sha256-3EKxuEpFm+lp2myMfymYYY9boSXGOF2iAdjtGKnjJK0=";
}; };
vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI=";
doCheck = false; doCheck = false;
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
passthru.tests.version = testVersion {
package = curlie;
command = "curlie version";
};
meta = with lib; { meta = with lib; {
description = "Frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; description = "Frontend to curl that adds the ease of use of httpie, without compromising on features and performance";
homepage = "https://curlie.io/"; homepage = "https://curlie.io/";

21
pkgs/tools/networking/mutt-ics/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ lib, python3 }:
with python3.pkgs; buildPythonApplication rec {
pname = "mutt-ics";
version = "0.9.2";
src = fetchPypi {
inherit version;
pname = "mutt_ics";
sha256 = "d44d4bec4e71c7f14df01b90fdb9563cdc784ece4250abfea5b0b675cfe85a50";
};
propagatedBuildInputs = [ icalendar ];
meta = with lib; {
homepage = "https://github.com/dmedvinsky/mutt-ics";
description = "A tool to show calendar event details in Mutt";
license = licenses.mit;
maintainers = with maintainers; [ mh182 ];
};
}

43
pkgs/tools/networking/openconnect/common.nix Normal file
View file

@ -0,0 +1,43 @@
{ version
, src
}:
{ lib
, stdenv
, pkg-config
, gnutls
, openssl
, useOpenSSL ? false
, gmp
, libxml2
, stoken
, zlib
, vpnc-scripts
, PCSC
, autoreconfHook
}:
stdenv.mkDerivation rec {
pname = "openconnect";
inherit version src;
outputs = [ "out" "dev" ];
configureFlags = [
"--with-vpnc-script=${vpnc-scripts}/bin/vpnc-script"
"--disable-nls"
"--without-openssl-version-check"
];
buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ]
++ lib.optional stdenv.isDarwin PCSC;
nativeBuildInputs = [ pkg-config autoreconfHook ];
meta = with lib; {
description = "VPN Client for Cisco's AnyConnect SSL VPN";
homepage = "https://www.infradead.org/openconnect/";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ pradeepchhetri tricktron alyaeanyx ];
platforms = lib.platforms.unix;
};
}

75
pkgs/tools/networking/openconnect/default.nix
View file

@ -1,58 +1,31 @@
{ lib { callPackage, fetchFromGitLab, fetchurl, darwin }:
, stdenv let
, fetchurl common = opts: callPackage (import ./common.nix opts) {
, pkg-config inherit (darwin.apple_sdk.frameworks) PCSC;
, openssl ? null };
, gnutls ? null in rec {
, p11-kit openconnect = common rec {
, gmp version = "8.20";
, libxml2 src = fetchurl {
, stoken url = "ftp://ftp.infradead.org/pub/openconnect/openconnect-${version}.tar.gz";
, zlib sha256 = "sha256-wUUjhMb3lrruRdTpGa4b/CgdbIiGLh9kaizFE/xE5Ys=";
, vpnc-scripts };
, PCSC };
, head ? false
, fetchFromGitLab
, autoreconfHook
}:
assert (openssl != null) == (gnutls == null); openconnect_unstable = common {
version = "unstable-2022-03-14";
stdenv.mkDerivation rec { src = fetchFromGitLab {
pname = "openconnect${lib.optionalString head "-head"}";
version = if head then "2021-05-05" else "8.10";
src =
if head then fetchFromGitLab {
owner = "openconnect"; owner = "openconnect";
repo = "openconnect"; repo = "openconnect";
rev = "684f6db1aef78e61e01f511c728bf658c30b9114"; rev = "a27a46f1362978db9723c8730f2533516b4b31b1";
sha256 = "0waclawcymgd8sq9xbkn2q8mnqp4pd0gpyv5wrnb7i0nsv860wz8"; sha256 = "sha256-Kz98GHCyEcx7vUF+AXMLR7886+iKGKNwx1iRaYcH8ps=";
}
else fetchurl {
url = "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz";
sha256 = "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih";
}; };
};
outputs = [ "out" "dev" ]; openconnect_openssl = openconnect.override {
useOpenSSL = true;
configureFlags = [
"--with-vpnc-script=${vpnc-scripts}/bin/vpnc-script"
"--disable-nls"
"--without-openssl-version-check"
];
buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ]
++ lib.optional stdenv.isDarwin PCSC
++ lib.optional stdenv.isLinux p11-kit;
nativeBuildInputs = [ pkg-config ]
++ lib.optional head autoreconfHook;
meta = with lib; {
description = "VPN Client for Cisco's AnyConnect SSL VPN";
homepage = "https://www.infradead.org/openconnect/";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ pradeepchhetri tricktron ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

4
pkgs/tools/package-management/apt/default.nix
View file

@ -28,11 +28,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apt"; pname = "apt";
version = "2.3.15"; version = "2.4.4";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz";
hash = "sha256-JWIAfREJk91+eobdgeplDmEhAXm1nqxytu3/Y2TAu6Y="; hash = "sha256-1tg9Ei3dfMg7LC+DmlWUDBOrk+XPYCSgENamtBENzw4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/tools/text/languagetool/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "LanguageTool"; pname = "LanguageTool";
version = "5.6"; version = "5.7";
src = fetchzip { src = fetchzip {
url = "https://www.languagetool.org/download/${pname}-${version}.zip"; url = "https://www.languagetool.org/download/${pname}-${version}.zip";
sha256 = "sha256-HsRAu8exGXCGF0P7wZaDtuAKRDmNjMF9P2hFliZ1RXo="; sha256 = "sha256-UR8OodT2H+YKmal+9kYsiwqM0dZhUHaUGEWZMzT+3dA=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ]; buildInputs = [ jre ];

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

@ -81,7 +81,9 @@ mapAliases ({
arora = throw "arora has been removed"; # Added 2020-09-09 arora = throw "arora has been removed"; # Added 2020-09-09
asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22
asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07
asterisk_13 = throw "asterisk_13: Asterisk 13 is end of life and has been removed"; # Added 2022-04-06
asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07
asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06
at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22
at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22
aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26
@ -832,6 +834,8 @@ mapAliases ({
openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22
opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22 opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22
openconnect_head = openconnect_unstable; # Added 2022-03-29
openconnect_gnutls = openconnect; # Added 2022-03-29
openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21
openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10
openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22 openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22

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

@ -10997,23 +10997,9 @@ with pkgs;
witness = callPackage ../tools/security/witness { }; witness = callPackage ../tools/security/witness { };
openconnect = openconnect_gnutls; openconnectPackages = callPackage ../tools/networking/openconnect { };
openconnect_openssl = callPackage ../tools/networking/openconnect { inherit (openconnectPackages) openconnect openconnect_unstable openconnect_openssl;
inherit (darwin.apple_sdk.frameworks) PCSC;
gnutls = null;
};
openconnect_gnutls = callPackage ../tools/networking/openconnect {
inherit (darwin.apple_sdk.frameworks) PCSC;
openssl = null;
};
openconnect_head = callPackage ../tools/networking/openconnect {
inherit (darwin.apple_sdk.frameworks) PCSC;
head = true;
openssl = null;
};
globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { }; globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { };
@ -21212,7 +21198,7 @@ with pkgs;
inherit (callPackages ../servers/asterisk { }) inherit (callPackages ../servers/asterisk { })
asterisk asterisk-stable asterisk-lts asterisk asterisk-stable asterisk-lts
asterisk_13 asterisk_16 asterisk_17 asterisk_18; asterisk_16 asterisk_18 asterisk_19;
asterisk-module-sccp = callPackage ../servers/asterisk/sccp { }; asterisk-module-sccp = callPackage ../servers/asterisk/sccp { };
@ -27856,6 +27842,8 @@ with pkgs;
}; };
mutt-wizard = callPackage ../tools/misc/mutt-wizard { }; mutt-wizard = callPackage ../tools/misc/mutt-wizard { };
mutt-ics = callPackage ../tools/networking/mutt-ics { };
mwic = callPackage ../applications/misc/mwic { mwic = callPackage ../applications/misc/mwic {
pythonPackages = python3Packages; pythonPackages = python3Packages;
}; };

2
pkgs/top-level/linux-kernels.nix
View file

@ -404,7 +404,7 @@ in {
oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null;
perf = if lib.versionAtLeast kernel.version "3.12" then callPackage ../os-specific/linux/kernel/perf.nix { } else null; perf = callPackage ../os-specific/linux/kernel/perf.nix { };
phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null;

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

@ -181,6 +181,8 @@ lib.makeScope pkgs.newScope (self: with self; {
couchbase = callPackage ../development/php-packages/couchbase { }; couchbase = callPackage ../development/php-packages/couchbase { };
datadog_trace = callPackage ../development/php-packages/datadog_trace { };
ds = callPackage ../development/php-packages/ds { }; ds = callPackage ../development/php-packages/ds { };
event = callPackage ../development/php-packages/event { }; event = callPackage ../development/php-packages/event { };