colin/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-11-04 00:03:34 +00:00 committed by GitHub
commit 08b08d0caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
74 changed files with 654 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/languages-frameworks/python.section.md
View File

@ -1670,9 +1670,9 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
```nix ```nix
nixpkgs.config.packageOverrides = super: { nixpkgs.config.packageOverrides = super: {
python = super.python.override { python3 = super.python3.override {
packageOverrides = python-self: python-super: { packageOverrides = python-self: python-super: {
twisted = python-super.twisted.overrideAttrs (oldAttrs: { twisted = python-super.twisted.overridePythonAttrs (oldAttrs: {
src = super.fetchPypi { src = super.fetchPypi {
pname = "twisted"; pname = "twisted";
version = "19.10.0"; version = "19.10.0";

6
maintainers/maintainer-list.nix
View File

@ -3478,6 +3478,12 @@
githubId = 8852888; githubId = 8852888;
name = "David Izquierdo"; name = "David Izquierdo";
}; };
djacu = {
email = "daniel.n.baker@gmail.com";
github = "djacu";
githubId = 7043297;
name = "Daniel Baker";
};
djanatyn = { djanatyn = {
email = "djanatyn@gmail.com"; email = "djanatyn@gmail.com";
github = "djanatyn"; github = "djanatyn";

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

@ -720,6 +720,13 @@
been removed due to lack of upstream maintenance. been removed due to lack of upstream maintenance.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <literal>trace</literal> binary from
<literal>perf-linux</literal> package has been removed, due to
being a duplicate of the <literal>perf</literal> binary.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The <literal>aws</literal> package has been removed due to The <literal>aws</literal> package has been removed due to
@ -833,6 +840,16 @@
due to upstream dropping support. due to upstream dropping support.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>cassandra_2_1</literal> and
<literal>cassandra_2_2</literal> have been removed. Please
update to <literal>cassandra_3_11</literal> or
<literal>cassandra_3_0</literal>. See the
<link xlink:href="https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt">changelog</link>
for more information about the upgrade process.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
<literal>mysql57</literal> has been removed. Please update to <literal>mysql57</literal> has been removed. Please update to
@ -857,6 +874,13 @@
option, and it is enabled by default, for servers. option, and it is enabled by default, for servers.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>percona-server56</literal> has been removed. Please
migrate to <literal>mysql</literal> or
<literal>mariadb</literal> if possible.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
<literal>stylua</literal> no longer accepts <literal>stylua</literal> no longer accepts
@ -1166,6 +1190,13 @@
<link xlink:href="options.html#opt-systemd.oomd.enableUserServices">systemd.oomd.enableUserServices</link>. <link xlink:href="options.html#opt-systemd.oomd.enableUserServices">systemd.oomd.enableUserServices</link>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <literal>tt-rss</literal> service performs two database
migrations when you first use its web UI after upgrade.
Consider backing up its database before updating.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The <literal>pass-secret-service</literal> package now The <literal>pass-secret-service</literal> package now

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

@ -235,6 +235,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
`python3.pkgs.influxgraph` packages, have been removed due to lack of upstream `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
maintenance. maintenance.
- The `trace` binary from `perf-linux` package has been removed, due to being a duplicate of the `perf` binary.
- The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead. - The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead.
- The [CEmu TI-84 Plus CE emulator](https://ce-programming.github.io/CEmu) package has been renamed to `cemu-ti`. The [Cemu Wii U emulator](https://cemu.info) is now packaged as `cemu`. - The [CEmu TI-84 Plus CE emulator](https://ce-programming.github.io/CEmu) package has been renamed to `cemu-ti`. The [Cemu Wii U emulator](https://cemu.info) is now packaged as `cemu`.
@ -261,11 +263,15 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- `k3s` no longer supports docker as runtime due to upstream dropping support. - `k3s` no longer supports docker as runtime due to upstream dropping support.
- `cassandra_2_1` and `cassandra_2_2` have been removed. Please update to `cassandra_3_11` or `cassandra_3_0`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt) for more information about the upgrade process.
- `mysql57` has been removed. Please update to `mysql80` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information. - `mysql57` has been removed. Please update to `mysql80` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information.
- Consequently, `cqrlog` and `amorok` now use `mariadb` instead of `mysql57` for their embedded databases. Running `mysql_upgrade` may be neccesary. - Consequently, `cqrlog` and `amorok` now use `mariadb` instead of `mysql57` for their embedded databases. Running `mysql_upgrade` may be neccesary.
- `k3s` supports `clusterInit` option, and it is enabled by default, for servers. - `k3s` supports `clusterInit` option, and it is enabled by default, for servers.
- `percona-server56` has been removed. Please migrate to `mysql` or `mariadb` if possible.
- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`. - `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.
- `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to - `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to
@ -361,6 +367,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
[systemd.oomd.enableSystemSlice](options.html#opt-systemd.oomd.enableSystemSlice), [systemd.oomd.enableSystemSlice](options.html#opt-systemd.oomd.enableSystemSlice),
and [systemd.oomd.enableUserServices](options.html#opt-systemd.oomd.enableUserServices). and [systemd.oomd.enableUserServices](options.html#opt-systemd.oomd.enableUserServices).
- The `tt-rss` service performs two database migrations when you first use its web UI after upgrade. Consider backing up its database before updating.
- The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API. - The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API.
- There is a new module for AMD SEV CPU functionality, which grants access to the hardware. - There is a new module for AMD SEV CPU functionality, which grants access to the hardware.

2
nixos/modules/services/networking/jibri/default.nix
View File

@ -378,7 +378,7 @@ in
'') '')
cfg.xmppEnvironments)) cfg.xmppEnvironments))
+ '' + ''
${pkgs.jre8_headless}/bin/java -Djava.util.logging.config.file=${./logging.properties-journal} -Dconfig.file=${configFile} -jar ${pkgs.jibri}/opt/jitsi/jibri/jibri.jar --config /var/lib/jibri/jibri.json ${pkgs.jdk11_headless}/bin/java -Djava.util.logging.config.file=${./logging.properties-journal} -Dconfig.file=${configFile} -jar ${pkgs.jibri}/opt/jitsi/jibri/jibri.jar --config /var/lib/jibri/jibri.json
''; '';
environment.HOME = "/var/lib/jibri"; environment.HOME = "/var/lib/jibri";

2
nixos/tests/all-tests.nix
View File

@ -110,8 +110,6 @@ in {
cage = handleTest ./cage.nix {}; cage = handleTest ./cage.nix {};
cagebreak = handleTest ./cagebreak.nix {}; cagebreak = handleTest ./cagebreak.nix {};
calibre-web = handleTest ./calibre-web.nix {}; calibre-web = handleTest ./calibre-web.nix {};
cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };
cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; };
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};

3
nixos/tests/jibri.nix
View File

@ -34,9 +34,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.wait_for_unit("prosody.service") machine.wait_for_unit("prosody.service")
machine.wait_for_unit("jibri.service") machine.wait_for_unit("jibri.service")
machine.wait_until_succeeds(
"journalctl -b -u jitsi-videobridge2 -o cat | grep -q 'Performed a successful health check'", timeout=30
)
machine.wait_until_succeeds( machine.wait_until_succeeds(
"journalctl -b -u prosody -o cat | grep -q 'Authenticated as focus@auth.machine'", timeout=31 "journalctl -b -u prosody -o cat | grep -q 'Authenticated as focus@auth.machine'", timeout=31
) )

4
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View File

@ -2,11 +2,11 @@
let let
pname = "ledger-live-desktop"; pname = "ledger-live-desktop";
version = "2.49.0"; version = "2.49.2";
src = fetchurl { src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-5HrPeLeMPh6hc1OLZVSPWMSV+ZwjgQyUmFCW+ZyYdCA="; hash = "sha256-8KGZRTJu3uGFyf4vogoC9kDrKegD8Op4Z7gqQK+UFl8=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

12
pkgs/applications/editors/vscode/vscode.nix
View File

@ -18,17 +18,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = { sha256 = {
x86_64-linux = "0cf6zlwslii30877p5vb0varxs6ai5r1g9wxx1b45yrmp7rvda91"; x86_64-linux = "1dcp6r78kaq3wzcw7dfra59kfpdzqy9qnlyp1ywayxh610ryjyfc";
x86_64-darwin = "0j9kb7j2rvrgc2dzxhi1nzs78lzhpkfk3gcqcq84hcsga0n59y03"; x86_64-darwin = "0ypxjh5z0v83y0wb22m942qqlvx5df7k4dk8ip9wqd4p7h8540q8";
aarch64-linux = "1bf2kvnd2pz2sk26bq1wm868bvvmrg338ipysmryilhk0l490vcx"; aarch64-linux = "1qq4zg0j3rpx06cqaic7a1x7ckk5wf8w1gp5y8hwhvkym4s8g4i7";
aarch64-darwin = "1rwwrzabxgw2wryi6rp8sc1jqps54p7a3cjpn4q94kds8rk5j0qn"; aarch64-darwin = "18hrsvr7hgmlpi64dbk581i516my6c5zwz6g8awp4fhxilk0wbrg";
armv7l-linux = "0p2kwfq74lz43vpfh90xfrqsz7nwgcjsvqwkifkchp1m3xnil742"; armv7l-linux = "1y357ci4gllxg26m5qdv9652i5rra5vj972l7kdnxiimfgm6h83b";
}.${system} or throwSystem; }.${system} or throwSystem;
in in
callPackage ./generic.nix rec { callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release. # Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem. # This is important for the extension ecosystem.
version = "1.72.2"; version = "1.73.0";
pname = "vscode"; pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders"; executableName = "code" + lib.optionalString isInsiders "-insiders";

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

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "AusweisApp2"; pname = "AusweisApp2";
version = "1.24.3"; version = "1.24.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Governikus"; owner = "Governikus";
repo = "AusweisApp2"; repo = "AusweisApp2";
rev = version; rev = version;
sha256 = "sha256-zwAmMj9Px27e/xJPAsOUh4saCZNQYBdse0bcZu8M3xA="; sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/applications/networking/resilio-sync/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ... }: { lib, stdenv, fetchurl, libxcrypt, ... }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "resilio-sync"; pname = "resilio-sync";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
install -D rslsync "$out/bin/rslsync" install -D rslsync "$out/bin/rslsync"
patchelf \ patchelf \
--interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc ]} "$out/bin/rslsync" --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc libxcrypt ]} "$out/bin/rslsync"
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/office/zotero/default.nix
View File

@ -41,12 +41,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zotero"; pname = "zotero";
version = "6.0.15"; version = "6.0.16";
src = fetchurl { src = fetchurl {
url = url =
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "sha256-h/hyaRjunVkVoHmVpru481goN73Ano1TDRDDg5AVoTI="; sha256 = "sha256-PqC7PqpRSm/Yt3pK8TuzcrhtfJSeJX6th2xb2n/Bul8=";
}; };
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];

4
pkgs/applications/radio/guglielmo/default.nix
View File

@ -13,13 +13,13 @@
mkDerivation rec { mkDerivation rec {
pname = "guglielmo"; pname = "guglielmo";
version = "0.3"; version = "0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "marcogrecopriolo"; owner = "marcogrecopriolo";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0s1iz9s0k897jayiwl3yr9ylpclw6bzcpmzhxqn0mkd7jhgfl4vx"; sha256 = "sha256-djBQTYbpgPFBtQZ9fZBpECP20RxB49AdxLbq8mUU6rg=";
}; };
postInstall = '' postInstall = ''

4
pkgs/applications/radio/rtl_433/default.nix
View File

@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
name = "CVE-2022-27419"; name = "CVE-2022-27419";
url = "https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904.patch"; url = "https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904.patch";
sha256 = "172jndh8x5nlcbx2jp5y8fgfxsawwfz95037pcjp170gf93ijy88"; sha256 = "172jndh8x5nlcbx2jp5y8fgfxsawwfz95037pcjp170gf93ijy88";
}) ( fetchpatch {
name = "CVE-2022-25051";
url = "https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8.patch";
sha256 = "sha256-IfxwdnuA7WbaVdxMTln069mA5hKNuPz+XYQaNA4YY24=";
})]; })];
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];

6
pkgs/applications/version-management/git-and-tools/gh/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "2.18.1"; version = "2.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-igtbMrm4cgaBWxjvv8UjqvPNFSi1UxNgplWYArqRRi0="; sha256 = "sha256-SqKjN9Met+NsfaQO3PGTPua/ZVaorYbSJHWeXgEm524=";
}; };
vendorSha256 = "sha256-XWquL/+47t467kOYpDgMmT7t3hbdCiPQnatRW+VtaYc="; vendorSha256 = "sha256-VWeUVdrAzbS7OmHHZIPlyq6WVj4I39n7ozS7n3ReqJk=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

9
pkgs/applications/virtualization/libgovirt/default.nix
View File

@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg=";
}; };
patches = lib.optionals stdenv.isDarwin [
# The flag breaks the build on darwin and doesn't seem necessary
./no-version-script-ld-flag.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
gobject-introspection gobject-introspection
@ -46,8 +51,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://gitlab.gnome.org/GNOME/libgovirt"; homepage = "https://gitlab.gnome.org/GNOME/libgovirt";
description = "GObject wrapper for the oVirt REST API"; description = "GObject wrapper for the oVirt REST API";
maintainers = [ maintainers.amarshall ]; maintainers = with maintainers; [ amarshall atemu ];
platforms = platforms.linux; platforms = with platforms; linux ++ darwin;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
}; };
} }

14
pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/govirt/Makefile.in
+++ b/govirt/Makefile.in
@@ -511,8 +511,7 @@
libgovirt_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic \
- -no-undefined \
- -Wl,--version-script=$(srcdir)/govirt.sym
+ -no-undefined
libgovirt_la_CFLAGS = \
$(WARNINGFLAGS_C)
Diff finished. Fri Oct 28 10:36:38 2022

2
pkgs/applications/virtualization/qemu/default.nix
View File

@ -14,7 +14,7 @@
, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook , gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook
, vncSupport ? !nixosTestRunner, libjpeg, libpng , vncSupport ? !nixosTestRunner, libjpeg, libpng
, smartcardSupport ? !nixosTestRunner, libcacard , smartcardSupport ? !nixosTestRunner, libcacard
, spiceSupport ? !stdenv.isDarwin && !nixosTestRunner, spice, spice-protocol , spiceSupport ? true && !nixosTestRunner, spice, spice-protocol
, ncursesSupport ? !nixosTestRunner, ncurses , ncursesSupport ? !nixosTestRunner, ncurses
, usbredirSupport ? spiceSupport, usbredir , usbredirSupport ? spiceSupport, usbredir
, xenSupport ? false, xen , xenSupport ? false, xen

13
pkgs/applications/virtualization/virt-viewer/default.nix
View File

@ -29,7 +29,7 @@
assert spiceSupport -> ( assert spiceSupport -> (
gdbm != null gdbm != null
&& libcap != null && (stdenv.isLinux -> libcap != null)
&& spice-gtk_libsoup2 != null && spice-gtk_libsoup2 != null
&& spice-protocol != null && spice-protocol != null
); );
@ -76,12 +76,13 @@ stdenv.mkDerivation rec {
libvirt-glib libvirt-glib
libxml2 libxml2
vte vte
] ++ optionals spiceSupport [ ] ++ optionals spiceSupport ([
gdbm gdbm
libcap
spice-gtk_libsoup2 spice-gtk_libsoup2
spice-protocol spice-protocol
]; ] ++ optionals stdenv.isLinux [
libcap
]);
# Required for USB redirection PolicyKit rules file # Required for USB redirection PolicyKit rules file
propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2;
@ -94,8 +95,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A viewer for remote virtual machines"; description = "A viewer for remote virtual machines";
maintainers = [ maintainers.raskin ]; maintainers = with maintainers; [ raskin atemu ];
platforms = platforms.linux; platforms = with platforms; linux ++ darwin;
license = licenses.gpl2; license = licenses.gpl2;
}; };
passthru = { passthru = {

13
pkgs/development/libraries/libressl/default.nix
View File

@ -104,16 +104,7 @@ in {
}; };
libressl_3_6 = generic { libressl_3_6 = generic {
version = "3.6.0"; version = "3.6.1";
hash = "sha256-GxLe/Lvb2+2oaSnkIQAK8PQjM63UgX/SbA2aGuxHhAQ="; hash = "sha256-rPrGExbpO5GcKNYtUwN8pzTehcRrTXA/Gf2Dlc8AZ3Q=";
patches = [
# Fix endianness detection on aarch64-darwin, issue #181187
(fetchpatch {
name = "fix-endian-header-detection.patch";
url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch";
sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE=";
})
];
}; };
} }

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libspiro"; pname = "libspiro";
version = "20220722"; version = "20221101";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fontforge"; owner = "fontforge";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-qNff53wyf8YhFVOn169K7smCXrSxdiZWxWOU8VTcjSI="; sha256 = "sha256-/9UCrdq69RO22593qiA8pZ4qfY9UVGqlGYB9zatsOgw=";
}; };
nativeBuildInputs = [ pkg-config autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook ];

13
pkgs/development/libraries/spice/default.nix
View File

@ -22,6 +22,7 @@
, libopus , libopus
, gst_all_1 , gst_all_1
, orc , orc
, gdk-pixbuf
}: }:
let let
@ -43,6 +44,9 @@ stdenv.mkDerivation rec {
sha256 = "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k"; sha256 = "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k";
}; };
patches = [
./remove-rt-on-darwin.patch
];
postPatch = '' postPatch = ''
install ${doxygen_sh} doxygen.sh install ${doxygen_sh} doxygen.sh
patchShebangs build-aux patchShebangs build-aux
@ -65,7 +69,6 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
alsa-lib
cyrus_sasl cyrus_sasl
glib glib
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
@ -84,6 +87,10 @@ stdenv.mkDerivation rec {
python3.pkgs.pyparsing python3.pkgs.pyparsing
spice-protocol spice-protocol
zlib zlib
] ++ lib.optionals stdenv.isLinux [
alsa-lib
] ++ lib.optionals stdenv.isDarwin [
gdk-pixbuf
]; ];
NIX_CFLAGS_COMPILE = "-fno-stack-protector"; NIX_CFLAGS_COMPILE = "-fno-stack-protector";
@ -108,7 +115,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.spice-space.org/"; homepage = "https://www.spice-space.org/";
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = [ maintainers.bluescreen303 ]; maintainers = with maintainers; [ bluescreen303 atemu ];
platforms = platforms.linux; platforms = with platforms; linux ++ darwin;
}; };
} }

18
pkgs/development/libraries/spice/remove-rt-on-darwin.patch Normal file
View File

@ -0,0 +1,18 @@
--- a/meson.build
+++ b/meson.build
@@ -103,11 +103,11 @@
spice_server_deps += dependency(dep)
endforeach
-if host_machine.system() != 'windows'
+if (host_machine.system() != 'windows' and host_machine.system() != 'darwin')
foreach dep : ['rt', 'm']
spice_server_deps += compiler.find_library(dep)
endforeach
-else
+elif host_machine.system() == 'windows'
foreach dep : ['ws2_32', 'shlwapi']
spice_server_deps += compiler.find_library(dep)
endforeach
Diff finished. Sun Oct 16 06:09:35 2022

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

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioaladdinconnect"; pname = "aioaladdinconnect";
version = "0.1.46"; version = "0.1.47";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "AIOAladdinConnect"; pname = "AIOAladdinConnect";
inherit version; inherit version;
hash = "sha256-tSPoumEWdlzyxHhyXd7jD58pdJzfw1CCJM1MYBAdxOk="; hash = "sha256-1q5CX5vtdK+rNDE6GtIobuacv6dkHhRJ+kirbX62us8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

15
pkgs/development/python-modules/bugsnag/default.nix
View File

@ -1,31 +1,40 @@
{ lib { lib
, blinker
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, flask
, pythonOlder , pythonOlder
, webob , webob
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "bugsnag"; pname = "bugsnag";
version = "4.2.1"; version = "4.3.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-PT6XaKz3QFAEhCmS7jXKK7xxscNlpbhGpCKQIRuSt6U="; hash = "sha256-9q6Cp/reUJJ3XGMT9BV+4z5AxJdP8izfzgjOpS84/Tc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
webob webob
]; ];
passthru.optional-dependencies = {
flask = [
blinker
flask
];
};
pythonImportsCheck = [ pythonImportsCheck = [
"bugsnag" "bugsnag"
]; ];
# no tests # Module ha no tests
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {

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

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "casbin"; pname = "casbin";
version = "1.17.3"; version = "1.17.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = "pycasbin"; repo = "pycasbin";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-b/bA1ClBdj25aPoniszqRtNih+qzJuLMiGkNoV1cv7c="; hash = "sha256-idcqNWocy4dDh7zv3gz81wHp+9WX5PptXGHI9uqM69M=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

46
pkgs/development/python-modules/chainer/default.nix
View File

@ -1,33 +1,51 @@
{ config, lib, buildPythonPackage, fetchFromGitHub, isPy3k { lib
, filelock, protobuf, numpy, pytestCheckHook, mock, typing-extensions , buildPythonPackage
, cupy, cudaSupport ? config.cudaSupport or false , config
, cudaSupport ? config.cudaSupport or false
, cupy
, fetchFromGitHub
, filelock
, mock
, numpy
, protobuf
, pytestCheckHook
, pythonOlder
, six
, typing-extensions
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "chainer"; pname = "chainer";
version = "7.8.1.post1"; version = "7.8.1.post1";
disabled = !isPy3k; # python2.7 abandoned upstream format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chainer"; owner = "chainer";
repo = "chainer"; repo = "chainer";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-epwnExmyCWmwaOz+mJnAl1peEeHLBdQGC62BlLfSTQQ="; hash = "sha256-epwnExmyCWmwaOz+mJnAl1peEeHLBdQGC62BlLfSTQQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
filelock filelock
protobuf
numpy numpy
protobuf
six
typing-extensions typing-extensions
] ++ lib.optionals cudaSupport [ cupy ]; ] ++ lib.optionals cudaSupport [
cupy
checkInputs = [
pytestCheckHook
mock
]; ];
pytestFlagsArray = [ "tests/chainer_tests/utils_tests" ]; checkInputs = [
mock
pytestCheckHook
];
pytestFlagsArray = [
"tests/chainer_tests/utils_tests"
];
preCheck = '' preCheck = ''
# cf. https://github.com/chainer/chainer/issues/8621 # cf. https://github.com/chainer/chainer/issues/8621
@ -43,6 +61,10 @@ buildPythonPackage rec {
"ideep" "ideep"
]; ];
pythonImportsCheck = [
"chainer"
];
meta = with lib; { meta = with lib; {
description = "A flexible framework of neural networks for deep learning"; description = "A flexible framework of neural networks for deep learning";
homepage = "https://chainer.org/"; homepage = "https://chainer.org/";

44
pkgs/development/python-modules/deploykit/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, bash
, openssh
, pytestCheckHook
, stdenv
}:
buildPythonPackage rec {
pname = "deploykit";
version = "1.0.1";
src = fetchFromGitHub {
owner = "numtide";
repo = pname;
rev = version;
hash = "sha256-eKyqsGgnJmF2wUYa7HjC1Jwsh03qVTJEP1MtL7JL4Ts=";
};
buildInputs = [
setuptools
];
checkInputs = [
bash
openssh
pytestCheckHook
];
disabledTests = lib.optionals stdenv.isDarwin [ "test_ssh" ];
# don't swallow stdout/stderr
pytestFlagsArray = [ "-s" ];
meta = with lib; {
description = "Execute commands remote via ssh and locally in parallel with python";
homepage = "https://github.com/numtide/deploykit";
license = licenses.mit;
maintainers = with maintainers; [ mic92 zowoq ];
platforms = platforms.unix;
};
}

4
pkgs/development/python-modules/django/4.nix
View File

@ -43,14 +43,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Django"; pname = "Django";
version = "4.1.2"; version = "4.1.3";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-uNhDcUgQq4jVk0RQfURHvoss8SpJAxNjtu7Z8bmyKA8="; hash = "sha256-Z4u/yGBOskbtVOIGPwdl8TsyGlBSa9yMsflD7af6MfE=";
}; };
patches = [ patches = [

47
pkgs/development/python-modules/energyflip-client/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
, yarl
}:
buildPythonPackage rec {
pname = "energyflip-client";
version = "0.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dennisschroer";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-neuZ6pZWW/Rgexu/iCEymjnxi5l/IuLKPFn6S9U4DgU=";
};
propagatedBuildInputs = [
aiohttp
async-timeout
yarl
];
checkInputs = [
pytest-aiohttp
pytestCheckHook
];
pythonImportsCheck = [
"energyflip"
];
meta = with lib; {
description = "Library to communicate with the API behind EnergyFlip";
homepage = "https://github.com/dennisschroer/energyflip-client";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

38
pkgs/development/python-modules/fastrlock/default.nix
View File

@ -1,17 +1,43 @@
{ lib, buildPythonPackage, fetchPypi }: { lib
, buildPythonPackage
, cython
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "fastrlock"; pname = "fastrlock";
version = "0.8"; version = "0.8.1";
format = "setuptools";
src = fetchPypi { disabled = pythonOlder "3.7";
inherit pname version;
sha256 = "9cc100ed0924b32173d7de705a82fdf1257cdf60af1952a13f64759307b40931"; src = fetchFromGitHub {
owner = "scoder";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-KYJd1wGJo+z34cY0YfsRbpC9IsQY/VJqycGpMmLmaVk=";
}; };
nativeBuildInputs = [
cython
];
# Todo: Check why the tests have an import error
doCheck = false;
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"fastrlock"
];
meta = with lib; { meta = with lib; {
description = "RLock implementation for CPython";
homepage = "https://github.com/scoder/fastrlock"; homepage = "https://github.com/scoder/fastrlock";
description = "A fast RLock implementation for CPython";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ hyphon81 ]; maintainers = with maintainers; [ hyphon81 ];
}; };

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

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "filetype"; pname = "filetype";
version = "1.1.0"; version = "1.2.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-r+SgAClgH2bSObcmiAZcx8IZ3sHJJ5lPkLgl6eU9j5M="; hash = "sha256-ZrVs1kdL9B2MVGYDR9N6/MP30ZcGSN42XBAu93VIqts=";
}; };
checkInputs = [ checkInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "gcal-sync"; pname = "gcal-sync";
version = "1.1.0"; version = "2.1.0";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "allenporter"; owner = "allenporter";
repo = "gcal_sync"; repo = "gcal_sync";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-IiBwqpglVC+M1NXSmidSEDjKcGn76aqPZclXK0vKsm8="; hash = "sha256-FKrZPiN4rSk5iFhGAXVuKhEeekOnPxdFslP4SMUrQIE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/python-modules/globus-sdk/default.nix
View File

@ -8,13 +8,12 @@
, pythonOlder , pythonOlder
, requests , requests
, responses , responses
, six
, typing-extensions , typing-extensions
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "globus-sdk"; pname = "globus-sdk";
version = "3.13.0"; version = "3.14.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -23,7 +22,7 @@ buildPythonPackage rec {
owner = "globus"; owner = "globus";
repo = "globus-sdk-python"; repo = "globus-sdk-python";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-d8c/kMfDMz5Z9O7OtAz2hAXQHqTlJ8oKcL9Yk+6MsA4="; hash = "sha256-lCqiBlyf0cUqsmSlCmt+jXTBGsXyCioZ232zd5rVqiA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -38,7 +37,6 @@ buildPythonPackage rec {
mypy mypy
pytestCheckHook pytestCheckHook
responses responses
six
]; ];
postPatch = '' postPatch = ''

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

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "lxmf"; pname = "lxmf";
version = "0.2.2"; version = "0.2.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "markqvist"; owner = "markqvist";
repo = "lxmf"; repo = "lxmf";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-DmJcxbAVaNUTe1ulVmYeI0Kdtm0Lz83akjH4ttZsgZg="; hash = "sha256-A8FKwKyRFFYkT4eEv7JHI/pjKCfJhk8NkUfUrmsxO90=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "meshtastic"; pname = "meshtastic";
version = "2.0.1"; version = "2.0.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic"; owner = "meshtastic";
repo = "Meshtastic-python"; repo = "Meshtastic-python";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-2m63OSVyhZgptBln+b65zX3609Liwq5V2a78UQThHyE="; hash = "sha256-Z2/nzsHRpaykqLRkJoPdNGSLNbJvd4GOUpTYl8MG8mw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nomadnet"; pname = "nomadnet";
version = "0.2.5"; version = "0.2.6";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist"; owner = "markqvist";
repo = "NomadNet"; repo = "NomadNet";
rev = version; rev = version;
hash = "sha256-iPgdXii3SZWxSTpILBLIWY6vpBTnrpGnEosD/ttN/Yk="; hash = "sha256-IcWHqPVfqHYw2k/EtIYruhBC8nz4UgjTz0psaa5Ki4c=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "openai"; pname = "openai";
version = "0.24.0"; version = "0.25.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7.1"; disabled = pythonOlder "3.7.1";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "openai"; owner = "openai";
repo = "openai-python"; repo = "openai-python";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0bXJoEq8FHRNaFMjncIwDbJROtFz/IJ4gD+LfvmtFUg="; hash = "sha256-bwv7lpdDYlk+y3KBjv7cSvaGr3v02riNCUfPFh6yv1I=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -6,14 +6,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "peaqevcore"; pname = "peaqevcore";
version = "7.1.9"; version = "7.2.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-ytW+liDg3H0l6znuosG/b17QJJXai4GG7ca7oUQ2eZI="; hash = "sha256-xkoa9nn/b1cDcbOxT4YT2mx8XqaA/kui/cG8xWf26yc=";
}; };
postPatch = '' postPatch = ''

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

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydmd"; pname = "pydmd";
version = "0.4.0.post2210"; version = "0.4.0.post2211";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mathLab"; owner = "mathLab";
repo = "PyDMD"; repo = "PyDMD";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-2GSmd+OxdGW9XdLGL08Bnrz0WCtTAYQtYHf2gM5CFIE="; sha256 = "sha256-DTKw7Gy2w+zas9u62SN6QDhoeMEjSk/Ej09do38yfNY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

68
pkgs/development/python-modules/pysnooz/default.nix Normal file
View File

@ -0,0 +1,68 @@
{ lib
, bleak
, bleak-retry-connector
, bluetooth-sensor-state-data
, buildPythonPackage
, events
, fetchFromGitHub
, freezegun
, home-assistant-bluetooth
, poetry-core
, pytest-asyncio
, pytest-mock
, pytestCheckHook
, pythonOlder
, transitions
}:
buildPythonPackage rec {
pname = "pysnooz";
version = "0.8.3";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "AustinBrunkhorst";
repo = pname;
rev = "v${version}";
hash = "sha256-K99sE9vxJo6grkp04DmTKOVqdfpQI0kUzJjSR6gnSew=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'transitions = "^0.8.11"' 'transitions = ">0.8.11"' \
--replace " --cov=pysnooz --cov-report=term-missing:skip-covered" ""
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
bleak
bleak-retry-connector
bluetooth-sensor-state-data
events
home-assistant-bluetooth
transitions
];
checkInputs = [
freezegun
pytest-asyncio
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [
"pysnooz"
];
meta = with lib; {
description = "Library to control SNOOZ white noise machines";
homepage = "https://github.com/AustinBrunkhorst/pysnooz";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rns"; pname = "rns";
version = "0.3.18"; version = "0.4.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist"; owner = "markqvist";
repo = "Reticulum"; repo = "Reticulum";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-UKhANqd1QKc1qrN5pjw8GYDJy2UNSKwWJcBYjxMKSKg="; hash = "sha256-tWqXhVpg6hxMrbesLRXjbhtEXOOrGh787+z0tliEmNE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

49
pkgs/development/python-modules/testbook/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, nbformat
, nbclient
, ipykernel
, pandas
, pytestCheckHook
, traitlets
}:
buildPythonPackage rec {
pname = "testbook";
version = "0.4.2";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "nteract";
repo = pname;
rev = version;
sha256 = "sha256-qaDgae/5TRpjmjOf7aom7TC5HLHp0PHM/ds47AKtq8U=";
};
propagatedBuildInputs = [
nbclient
nbformat
];
checkInputs = [
ipykernel
pandas
pytestCheckHook
traitlets
];
pythonImportsCheck = [
"testbook"
];
meta = with lib; {
description = "A unit testing framework extension for testing code in Jupyter Notebooks";
homepage = "https://testbook.readthedocs.io/";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ djacu ];
};
}

50
pkgs/development/python-modules/zamg/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "zamg";
version = "0.1.1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "killer0071234";
repo = "python-zamg";
rev = "refs/tags/v${version}";
hash = "sha256-mVJ1zuh3v803XgynQiUvt6whTmXxGS7SEtr6IDm4kz4=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov" ""
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"zamg"
];
meta = with lib; {
description = "Library to read weather data from ZAMG Austria";
homepage = "https://github.com/killer0071234/python-zamg";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ruff"; pname = "ruff";
version = "0.0.97"; version = "0.0.99";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charliermarsh"; owner = "charliermarsh";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-e/tPGjkg/PXbFoaWhzTzf8XbeLll8H9ru1SpdejQjIA="; sha256 = "sha256-nDquTrdHv7t4XBuO1HUe6ZF+QKy06F2kjzNxlINZcPQ=";
}; };
cargoSha256 = "sha256-iVH9MVv0NYezbWcvVLvgGFMoIhDLnoeGl3pVcDk/M40="; cargoSha256 = "sha256-QG1EXsYuzrUgPCUWz/2NrtOpbFQHZjr9TVIyalnTvCc=";
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
CoreServices CoreServices

8
pkgs/development/tools/rust/cargo-c/default.nix
View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-c"; pname = "cargo-c";
version = "0.9.2"; version = "0.9.13";
src = fetchCrate { src = fetchCrate {
inherit pname; inherit pname;
# this version may need to be updated along with package version # this version may need to be updated along with package version
version = "${version}+cargo-0.55"; version = "${version}+cargo-0.65";
sha256 = "sha256-yh5vAtKlBvoSlJBsW2RSduSK6T8aOssM84WQMNjLZqA="; sha256 = "sha256-f/p+ZIvDe9JQ8GM82SEud7sRTlimNs/ADPevfdkhsfg=";
}; };
cargoSha256 = "sha256-YikTjAeroaHyNe3ygUWRHSXJwdm2BSBV7RgIDN4suZ4="; cargoSha256 = "sha256-JrlEWgKbTqQG/JYFqBR53eB58fa29c/+vIdSNGoS5Y0=";
nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; nativeBuildInputs = [ pkg-config (lib.getDev curl) ];
buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [

4
pkgs/development/web/flyctl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "flyctl"; pname = "flyctl";
version = "0.0.426"; version = "0.0.427";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "superfly"; owner = "superfly";
repo = "flyctl"; repo = "flyctl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yZWQu3+nLcBC3s8QrP0jNWjJRaiGovAbovtSGB5xNCg="; sha256 = "sha256-rY/RrgkT3SjkAw1rQaTNHYecMzLy+go/BSd6/Hbz1qM=";
}; };
vendorSha256 = "sha256-wMVvDB/6ZDY3EwTWRJ1weCIlRZM+Ye24UnRl1YZzAcA="; vendorSha256 = "sha256-wMVvDB/6ZDY3EwTWRJ1weCIlRZM+Ye24UnRl1YZzAcA=";

2
pkgs/misc/cups/default.nix
View File

@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gmp ]; propagatedBuildInputs = [ gmp ];
configurePlatforms = [ "build" "host" ]; configurePlatforms = lib.optionals stdenv.isLinux [ "build" "host" ];
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"

4
pkgs/misc/jitsi-meet-prosody/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jitsi-meet-prosody"; pname = "jitsi-meet-prosody";
version = "1.0.6600"; version = "1.0.6644";
src = fetchurl { src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "SrWkm+dXfBQmI9nownh7fRe6WXrF/x2GP0Guw7GmXOo="; sha256 = "41jlcsJpcFlNdBIOAdzTUF3wOUAOS9upF/uxFQaGULc=";
}; };
dontBuild = true; dontBuild = true;

5
pkgs/os-specific/linux/kernel/perf/default.nix
View File

@ -73,6 +73,11 @@ stdenv.mkDerivation {
separateDebugInfo = true; separateDebugInfo = true;
installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ];
postInstall =''
# Same as perf. Remove.
rm -f $out/bin/trace
'';
preFixup = '' preFixup = ''
# Pull in 'objdump' into PATH to make annotations work. # Pull in 'objdump' into PATH to make annotations work.
# The embeded Python interpreter will search PATH to calculate the Python path configuration(Should be fixed by upstream). # The embeded Python interpreter will search PATH to calculate the Python path configuration(Should be fixed by upstream).

12
pkgs/os-specific/linux/kernel/zen-kernels.nix
View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script # comments with variant added for update script
# ./update-zen.py zen # ./update-zen.py zen
zenVariant = { zenVariant = {
version = "6.0.3"; #zen version = "6.0.6"; #zen
suffix = "zen2"; #zen suffix = "zen1"; #zen
sha256 = "1paywv7y4jizlq092irjcn9r62npzglrf5s008l6129b9q5ib0v8"; #zen sha256 = "11y942camfhwd32zkfyn232acgznp3n18g65kyp8k46hrkbhbxds"; #zen
isLqx = false; isLqx = false;
}; };
# ./update-zen.py lqx # ./update-zen.py lqx
lqxVariant = { lqxVariant = {
version = "5.19.16"; #lqx version = "6.0.6"; #lqx
suffix = "lqx4"; #lqx suffix = "lqx1"; #lqx
sha256 = "0mzrgy2kq0i26vgcdfc7nz7m6rw17s0lr9idwy71iz1f8i1pz82w"; #lqx sha256 = "0f0bz2pmwwmbqdss1diblzn4lis1pw31pb4gkay4a5p61f4rw1mz"; #lqx
isLqx = true; isLqx = true;
}; };
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

6
pkgs/os-specific/linux/libnvme/default.nix
View File

@ -1,7 +1,6 @@
{ fetchFromGitHub { fetchFromGitHub
, json_c , json_c
, lib , lib
, libuuid
, meson , meson
, ninja , ninja
, openssl , openssl
@ -14,7 +13,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libnvme"; pname = "libnvme";
version = "1.1"; version = "1.2";
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "linux-nvme"; owner = "linux-nvme";
repo = "libnvme"; repo = "libnvme";
rev = "v${version}"; rev = "v${version}";
sha256 = "EPAPWY6/Bh8I1eLslKJAofLn0IAizmGn00Q5PJPtdRw="; sha256 = "sha256-U9Fj3OcBe32C0PKhI05eF/6jikHAvdyvXH16IY0rWxI=";
}; };
postPatch = '' postPatch = ''
@ -40,7 +39,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
json_c json_c
libuuid
openssl openssl
python3 python3
systemd systemd

6
pkgs/os-specific/linux/nvme-cli/default.nix
View File

@ -1,7 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config { lib, stdenv, fetchFromGitHub, pkg-config
, meson , meson
, ninja , ninja
, libuuid
, libnvme , libnvme
, json_c , json_c
, zlib , zlib
@ -10,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nvme-cli"; pname = "nvme-cli";
version = "2.1.2"; version = "2.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linux-nvme"; owner = "linux-nvme";
repo = "nvme-cli"; repo = "nvme-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ZjgysgWMmBlN+aalI5u2vQ58XrtEbJlDPCqUN6avv08="; hash = "sha256-okYtGiKUPNO31ntD9j5iAgdcnS5OQ/g1QAY+svhga4c=";
}; };
mesonFlags = [ mesonFlags = [
@ -30,7 +29,6 @@ stdenv.mkDerivation rec {
python3.pkgs.nose2 python3.pkgs.nose2
]; ];
buildInputs = [ buildInputs = [
libuuid
libnvme libnvme
json_c json_c
zlib zlib

8
pkgs/servers/jibri/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, dpkg, jre8_headless, makeWrapper, writeText, xorg }: { lib, stdenv, fetchurl, dpkg, jdk11_headless, makeWrapper, writeText, xorg }:
let let
xorgModulePaths = writeText "module-paths" '' xorgModulePaths = writeText "module-paths" ''
@ -13,10 +13,10 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jibri"; pname = "jibri";
version = "8.0-93-g51fe7a2"; version = "8.0-139-g7ab9aa2";
src = fetchurl { src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "8jBSkFIBi7NYxV41VtFmGfevVp6+emRWdoQ1l4dS6PA="; sha256 = "14V5khp6S9T3SWiNfKyxn2WCzwhcXDCRDtATa15p01M=";
}; };
dontBuild = true; dontBuild = true;
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
cat '${xorgModulePaths}' >> $out/etc/jitsi/jibri/xorg-video-dummy.conf cat '${xorgModulePaths}' >> $out/etc/jitsi/jibri/xorg-video-dummy.conf
makeWrapper ${jre8_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" makeWrapper ${jdk11_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar"
runHook postInstall runHook postInstall
''; '';

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

@ -2,10 +2,10 @@
let let
pname = "jicofo"; pname = "jicofo";
version = "1.0-934"; version = "1.0-940";
src = fetchurl { src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "tT1w1OUcsnyQ5/pkborFkdOq0CEge6qtNLJrJgWIwjo="; sha256 = "vx7aUHfKxG+tZ0sM8eWr1tTKf//bMxdKVhE5I4P4mLo=";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {

4
pkgs/servers/jitsi-videobridge/default.nix
View File

@ -2,10 +2,10 @@
let let
pname = "jitsi-videobridge2"; pname = "jitsi-videobridge2";
version = "2.2-22-g42bc1b99"; version = "2.2-45-ge8b20f06";
src = fetchurl { src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "ZiIeD5NXHMurcoyVnD8RCGuOKRiUDU1AMH57A0s4tAs="; sha256 = "fbSpjLdx9xbLdp7vzHTW9B/cDf3DahpwuI4IcqEqpas=";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {

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

@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rspamd"; pname = "rspamd";
version = "3.3"; version = "3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rspamd"; owner = "rspamd";
repo = "rspamd"; repo = "rspamd";
rev = version; rev = version;
sha256 = "sha256-VBNRdkJxO3OSl6ap0BZl4bxJdu0cUNxiH+TrseyGZ1s="; sha256 = "sha256-KEIOyURdioyqD33K3rRTiysGO/zSEm6k29zqjzmK9Uk=";
}; };
hardeningEnable = [ "pie" ]; hardeningEnable = [ "pie" ];

4
pkgs/servers/misc/oven-media-engine/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oven-media-engine"; pname = "oven-media-engine";
version = "0.14.10"; version = "0.14.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AirenSoft"; owner = "AirenSoft";
repo = "OvenMediaEngine"; repo = "OvenMediaEngine";
rev = "v${version}"; rev = "v${version}";
sha256 = "09diqgv5pbv8igb4x9lzrmaf5ic1fd3m8y7rlpwh4w145qwjxc8y"; sha256 = "sha256-ur3CnkIOtGRJJKfYIrlJ6bqkO06C6unizCUb9Ea9nGI=";
}; };
sourceRoot = "source/src"; sourceRoot = "source/src";

6
pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "prometheus-nextcloud-exporter"; pname = "prometheus-nextcloud-exporter";
version = "0.5.1"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xperimental"; owner = "xperimental";
repo = "nextcloud-exporter"; repo = "nextcloud-exporter";
rev = "v${version}"; rev = "v${version}";
sha256 = "18xvxx0aplkj7xzi0zfsz7a5d45hh8blfqb105360pknvvi6apjv"; sha256 = "sha256-/EwQSxYDaf7B8A48aelf1yYbM7Vw6ntoz1VuYM2HDEc=";
}; };
vendorSha256 = "1wr1ckz0klk9sqpyk96h8bwr1dg6aiirr1l1f23kbib91pfpd08r"; vendorSha256 = "sha256-b05N5TXsRHD8h3q+ckxaVizq+A7VqkDWOSb0LOMGCHM=";
passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; };

4
pkgs/servers/nosql/cassandra/2.1.json
View File

@ -1,4 +0,0 @@
{
"version": "2.1.22",
"sha256": "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3"
}

12
pkgs/servers/nosql/cassandra/2.1.nix
View File

@ -1,12 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (
args
// builtins.fromJSON (builtins.readFile ./2.1.json)
// {
generation = "2_1";
extraMeta.knownVulnerabilities = [
# Fixed in 3.* but 2.* hasn't been released since
"CVE-2020-17516"
];
})

4
pkgs/servers/nosql/cassandra/2.2.json
View File

@ -1,4 +0,0 @@
{
"version": "2.2.14",
"sha256": "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q"
}

12
pkgs/servers/nosql/cassandra/2.2.nix
View File

@ -1,12 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (
args
// builtins.fromJSON (builtins.readFile ./2.2.json)
// {
generation = "2_2";
extraMeta.knownVulnerabilities = [
# Fixed in 3.* but 2.* hasn't been released since
"CVE-2020-17516"
];
})

60
pkgs/servers/sql/percona/5.6.x.nix
View File

@ -1,60 +0,0 @@
{ lib, stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }:
stdenv.mkDerivation rec {
pname = "percona-server";
version = "5.6.49-89.0";
src = fetchurl {
url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz";
sha256 = "09qqk02iny7jvngyk6k2j0kk2sspc6gw8sm3i6nn97njbkihi697";
};
nativeBuildInputs = [ cmake bison perl ];
buildInputs = [ ncurses openssl zlib libaio ];
cmakeFlags = [
"-DFEATURE_SET=community"
"-DBUILD_CONFIG=mysql_release"
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
"-DWITH_SSL=yes"
"-DWITH_READLINE=no"
"-DWITH_EMBEDDED_SERVER=no"
"-DWITH_EDITLINE=bundled"
"-DWITH_ZLIB=yes"
"-DHAVE_IPV6=no"
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DMYSQL_DATADIR=/var/lib/mysql"
"-DINSTALL_SYSCONFDIR=etc/mysql"
"-DINSTALL_INFODIR=share/mysql/docs"
"-DINSTALL_MANDIR=share/man"
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
"-DINSTALL_SCRIPTDIR=bin"
"-DINSTALL_INCLUDEDIR=include/mysql"
"-DINSTALL_DOCREADMEDIR=share/mysql"
"-DINSTALL_SUPPORTFILESDIR=share/mysql"
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
"-DINSTALL_DOCDIR=share/mysql/docs"
"-DINSTALL_SHAREDIR=share/mysql"
];
NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
NIX_LDFLAGS = "-lgcc_s";
prePatch = ''
sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake
'';
postInstall = ''
sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a
'';
passthru.mysqlVersion = "5.6";
meta = with lib; {
homepage = "https://www.percona.com";
description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation";
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ grahamc ];
};
}

17
pkgs/servers/tt-rss/default.nix
View File

@ -1,16 +1,13 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchgit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tt-rss"; pname = "tt-rss";
year = "21"; version = "unstable-2022-10-15";
month = "06";
day = "21";
version = "20${year}-${month}-${day}";
rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270";
src = fetchurl { src = fetchgit {
url = "https://git.tt-rss.org/fox/tt-rss/archive/${rev}.tar.gz"; url = "https://git.tt-rss.org/fox/tt-rss.git";
sha256 = "1dpmzi7hknv5rk2g1iw13r8zcxcwrhkd5hhf292ml0dw3cwki0gm"; rev = "602e8684258062937d7f554ab7889e8e02318c96";
sha256 = "sha256-vgRaxo998Gx9rVeZZl52jppK1v11jpEK0J0NoDMT44I=";
}; };
installPhase = '' installPhase = ''
@ -21,7 +18,7 @@ stdenv.mkDerivation rec {
# see the code of Config::get_version(). you can check that the version in # see the code of Config::get_version(). you can check that the version in
# the footer of the preferences pages is not UNKNOWN # the footer of the preferences pages is not UNKNOWN
echo "${year}.${month}" > $out/version_static.txt echo "22.10" > $out/version_static.txt
runHook postInstall runHook postInstall
''; '';

11
pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
View File

@ -2,19 +2,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tt-rss-plugin-auth-ldap"; pname = "tt-rss-plugin-auth-ldap";
version = "2.0.0"; version = "unstable-2022-10-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hydrian"; owner = "hydrian";
repo = "TTRSS-Auth-LDAP"; repo = "TTRSS-Auth-LDAP";
rev = version; rev = "0cc2a21441f99eef8368cfe0fbdbb78126e28d61";
sha256 = "1mg9jff2m0ajxql1vd1g7hsxfbv9smhrmjg4j2gvvjbii45ry0jh"; sha256 = "sha256-pJWyvRnC38Ov1awVLgFZfp8+haADPniP+/P/C74qpcA=";
}; };
patches = [ patches = [
# https://github.com/hydrian/TTRSS-Auth-LDAP/pull/47
(fetchpatch { (fetchpatch {
url = "https://github.com/Mic92/TTRSS-Auth-LDAP/commit/7534fa54babc377a070e05e326a46a252b5e3884.patch"; url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/003ca55bbd6e0a87fb729383e51eb269d918313d.patch";
sha256 = "1p7zas0n627z0g226dp5m5dg1ai2z3vi69n3xivp517iv3lch70l"; sha256 = "sha256-0YD33JPNOOPH2dpGwA/RbV3Kg4i2oKazBjP3hBcUIes=";
}) })
# https://github.com/hydrian/TTRSS-Auth-LDAP/pull/40 # https://github.com/hydrian/TTRSS-Auth-LDAP/pull/40
(fetchpatch { (fetchpatch {

4
pkgs/servers/web-apps/jitsi-meet/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jitsi-meet"; pname = "jitsi-meet";
version = "1.0.6600"; version = "1.0.6644";
src = fetchurl { src = fetchurl {
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
sha256 = "KrmpEGMLTy9p/MGgFKR+NGhryjwp3W95gIQrOYm3iTI="; sha256 = "y1oI3nxIu7breYNPhdX7PU5GfnCyxdEbAYlyZmif2Uo=";
}; };
dontBuild = true; dontBuild = true;

39
pkgs/tools/filesystems/netatalk/default.nix
View File

@ -4,12 +4,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "netatalk"; pname = "netatalk";
release = "3.1.13"; version = "3.1.13";
patch = "3";
version = "${release}_${patch}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/netatalk/netatalk/netatalk-${release}.tar.bz2"; url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2";
sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9"; sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9";
}; };
@ -18,8 +16,7 @@ stdenv.mkDerivation rec {
./omitLocalstatedirCreation.patch ./omitLocalstatedirCreation.patch
(fetchpatch { (fetchpatch {
name = "make-afpstats-python3-compatible.patch"; name = "make-afpstats-python3-compatible.patch";
url = url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch";
"https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch";
sha256 = "sha256-DAABpYjQPJLsQBhmtP30gA357w0Qn+AsnFgAeyDC/Rg="; sha256 = "sha256-DAABpYjQPJLsQBhmtP30gA357w0Qn+AsnFgAeyDC/Rg=";
}) })
]; ];
@ -28,26 +25,22 @@ stdenv.mkDerivation rec {
# https://bugs.freebsd.org/263123 # https://bugs.freebsd.org/263123
(fetchpatch { (fetchpatch {
name = "patch-etc_afpd_directory.c"; name = "patch-etc_afpd_directory.c";
url = url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_directory.c";
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_directory.c";
sha256 = "sha256-07YAJs+EtqGcFXbYHDLbILved1Ebtd8ukQepvzy6et0="; sha256 = "sha256-07YAJs+EtqGcFXbYHDLbILved1Ebtd8ukQepvzy6et0=";
}) })
(fetchpatch { (fetchpatch {
name = "patch-etc_afpd_file.c"; name = "patch-etc_afpd_file.c";
url = url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_file.c";
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_file.c";
sha256 = "sha256-T1WTNa2G6wxKtvMa/MCX3Vx6XZBHtU6w3enkdGuIWus="; sha256 = "sha256-T1WTNa2G6wxKtvMa/MCX3Vx6XZBHtU6w3enkdGuIWus=";
}) })
(fetchpatch { (fetchpatch {
name = "patch-etc_afpd_volume.c"; name = "patch-etc_afpd_volume.c";
url = url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_volume.c";
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_volume.c";
sha256 = "sha256-NOZNZGzA0hxrNkoLTvN64h40yApPbMH4qIfBTpQoI0s="; sha256 = "sha256-NOZNZGzA0hxrNkoLTvN64h40yApPbMH4qIfBTpQoI0s=";
}) })
(fetchpatch { (fetchpatch {
name = "patch-etc_cnid__dbd_cmd__dbd__scanvol.c"; name = "patch-etc_cnid__dbd_cmd__dbd__scanvol.c";
url = url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_cnid__dbd_cmd__dbd__scanvol.c";
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_cnid__dbd_cmd__dbd__scanvol.c";
sha256 = "sha256-5QV+tQDo8/XeKwH/e5+Ne+kEOl2uvRDbHMaWysIB6YU="; sha256 = "sha256-5QV+tQDo8/XeKwH/e5+Ne+kEOl2uvRDbHMaWysIB6YU=";
}) })
(fetchpatch { (fetchpatch {
@ -58,33 +51,28 @@ stdenv.mkDerivation rec {
}) })
(fetchpatch { (fetchpatch {
name = "patch-libatalk_adouble_ad__conv.c"; name = "patch-libatalk_adouble_ad__conv.c";
url = url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__conv.c";
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__conv.c";
sha256 = "sha256-T27WlKVXosv4bX5Gek2bR2cVDYEee5qrH4mnL9ghbP8="; sha256 = "sha256-T27WlKVXosv4bX5Gek2bR2cVDYEee5qrH4mnL9ghbP8=";
}) })
(fetchpatch { (fetchpatch {
name = "patch-libatalk_adouble_ad__date.c"; name = "patch-libatalk_adouble_ad__date.c";
url = url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__date.c";
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__date.c";
sha256 = "sha256-fkW5A+7R5fT3bukRfZaOwFo7AsyPaYajc1hIlDMZMnc="; sha256 = "sha256-fkW5A+7R5fT3bukRfZaOwFo7AsyPaYajc1hIlDMZMnc=";
}) })
(fetchpatch { (fetchpatch {
name = "patch-libatalk_adouble_ad__flush.c"; name = "patch-libatalk_adouble_ad__flush.c";
url = url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__flush.c";
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__flush.c";
sha256 = "sha256-k2zTx35tAlsFHym83bZGoWXRomwFV9xT3r2fzr3Zvbk="; sha256 = "sha256-k2zTx35tAlsFHym83bZGoWXRomwFV9xT3r2fzr3Zvbk=";
}) })
(fetchpatch { (fetchpatch {
name = "patch-libatalk_adouble_ad__open.c"; name = "patch-libatalk_adouble_ad__open.c";
url = url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__open.c";
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__open.c";
sha256 = "sha256-uV4wwft2IH54+4k5YR+Gz/BpRZBanxX/Ukp8BkohInU="; sha256 = "sha256-uV4wwft2IH54+4k5YR+Gz/BpRZBanxX/Ukp8BkohInU=";
}) })
# https://bugs.freebsd.org/251203 # https://bugs.freebsd.org/251203
(fetchpatch { (fetchpatch {
name = "patch-libatalk_vfs_extattr.c"; name = "patch-libatalk_vfs_extattr.c";
url = url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_vfs_extattr.c";
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_vfs_extattr.c";
sha256 = "sha256-lFWF0Qo8PJv7QKvnMn0Fc9Ruzb+FTEWgOMpxc789jWs="; sha256 = "sha256-lFWF0Qo8PJv7QKvnMn0Fc9Ruzb+FTEWgOMpxc789jWs=";
}) })
]; ];
@ -96,8 +84,7 @@ stdenv.mkDerivation rec {
done done
''; '';
nativeBuildInputs = nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ];
[ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ];
buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ]; buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ];

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

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fd"; pname = "fd";
version = "8.5.1"; version = "8.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sharkdp"; owner = "sharkdp";
repo = "fd"; repo = "fd";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zS0AEGd+4YmwId6zJ08q3xYzXF+9K0XL8XWeXGaEJxA="; sha256 = "sha256-APgC5159U9yMrTiGLE0ngyA5y1bbJUZgoleDAs2ZaDI=";
}; };
cargoSha256 = "sha256-upI/cDtqe+P7PxoWZZddPqaic2pWclpTC/ATjR7sXx8="; cargoSha256 = "sha256-8pkn7FLPWMEwsjdwxKigHDEwBHBlh2W9R7HCUIu94Wg=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

7
pkgs/tools/security/vault/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "vault"; pname = "vault";
version = "1.12.0"; version = "1.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = "vault"; repo = "vault";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-c2MIX4uDbHuiuZr12SkUV6jLsx2PS3Q+NngacT7AQO0="; sha256 = "sha256-qUCJFlnh4NIV0GH+yuOahC3arRWwPoPjVo3h881OtUY=";
}; };
vendorSha256 = "sha256-BPIUIy1xEUzbh1ESldiOhDpYp4EdfUi/QkBNqk3U1UY="; vendorSha256 = "sha256-2JlnSdwXaYG2e1A67c2tt5zg5ZN37m/Wsp6WUpOtR1o=";
subPackages = [ "." ]; subPackages = [ "." ];
@ -44,7 +44,6 @@ buildGoModule rec {
homepage = "https://www.vaultproject.io/"; homepage = "https://www.vaultproject.io/";
description = "A tool for managing secrets"; description = "A tool for managing secrets";
changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man techknowlogick ]; maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man techknowlogick ];
}; };

68
pkgs/tools/wayland/swayimg/default.nix Normal file
View File

@ -0,0 +1,68 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, wayland
, wayland-protocols
, json_c
, libxkbcommon
, fontconfig
, giflib
, libheif
, libjpeg
, libwebp
, libtiff
, librsvg
, libpng
, libjxl
, libexif
, bash-completion
}:
stdenv.mkDerivation rec {
pname = "swayimg";
version = "1.9";
src = fetchFromGitHub {
owner = "artemsen";
repo = pname;
rev = "v${version}";
sha256 = "sha256-864riSvWhWV4X84UeZ+xfQBOAQmwMrX6s90TXMGeruY=";
};
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [
bash-completion
wayland
wayland-protocols
json_c
libxkbcommon
fontconfig
giflib
libheif
libjpeg
libwebp
libtiff
librsvg
libpng
libjxl
libexif
];
meta = with lib; {
homepage = "https://github.com/artemsen/swayimg";
description = "Image viewer for Sway/Wayland";
changelog = "https://github.com/artemsen/swayimg/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
platforms = platforms.unix;
};
}

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

@ -173,6 +173,8 @@ mapAliases ({
cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11 cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11
cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20
casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken";
cassandra_2_1 = throw "cassandra_2_1 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29
cassandra_2_2 = throw "cassandra_2_2 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29
catfish = xfce.catfish; # Added 2019-12-22 catfish = xfce.catfish; # Added 2019-12-22
ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25
cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12 cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12
@ -1067,6 +1069,8 @@ mapAliases ({
pdfstudio = throw "'pdfstudio' has been replaced with 'pdfstudio<year>', where '<year>' is the year from the PDF Studio version number, because each license is specific to a given year"; # Added 2022-09-04 pdfstudio = throw "'pdfstudio' has been replaced with 'pdfstudio<year>', where '<year>' is the year from the PDF Studio version number, because each license is specific to a given year"; # Added 2022-09-04
peach = asouldocs; # Added 2022-08-28 peach = asouldocs; # Added 2022-08-28
pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
percona-server = percona-server56; # Added 2022-11-01
percona-server56 = throw "'percona-server56' has been dropped due to lack of maintenance, no upstream support and security issues"; # Added 2022-11-01
perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22
perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22
pgadmin = pgadmin4; pgadmin = pgadmin4;

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

@ -3527,6 +3527,8 @@ with pkgs;
swaysome = callPackage ../tools/wayland/swaysome { }; swaysome = callPackage ../tools/wayland/swaysome { };
swayimg = callPackage ../tools/wayland/swayimg { };
swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; swaytools = python3Packages.callPackage ../tools/wayland/swaytools { };
wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-utils = callPackage ../tools/wayland/wayland-utils { };
@ -23342,12 +23344,6 @@ with pkgs;
cadvisor = callPackage ../servers/monitoring/cadvisor { }; cadvisor = callPackage ../servers/monitoring/cadvisor { };
cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
@ -24054,12 +24050,6 @@ with pkgs;
nginx-sso = callPackage ../servers/nginx-sso { }; nginx-sso = callPackage ../servers/nginx-sso { };
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix {
stdenv = gcc10StdenvCompat;
openssl = openssl_1_1;
};
percona-server = percona-server56;
immudb = callPackage ../servers/nosql/immudb { }; immudb = callPackage ../servers/nosql/immudb { };
influxdb = callPackage ../servers/nosql/influxdb { }; influxdb = callPackage ../servers/nosql/influxdb { };

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

@ -2287,6 +2287,8 @@ self: super: with self; {
dependency-injector = callPackage ../development/python-modules/dependency-injector { }; dependency-injector = callPackage ../development/python-modules/dependency-injector { };
deploykit = callPackage ../development/python-modules/deploykit { };
deprecated = callPackage ../development/python-modules/deprecated { }; deprecated = callPackage ../development/python-modules/deprecated { };
deprecation = callPackage ../development/python-modules/deprecation { }; deprecation = callPackage ../development/python-modules/deprecation { };
@ -2909,6 +2911,8 @@ self: super: with self; {
enamlx = callPackage ../development/python-modules/enamlx { }; enamlx = callPackage ../development/python-modules/enamlx { };
energyflip-client = callPackage ../development/python-modules/energyflip-client { };
energyflow = callPackage ../development/python-modules/energyflow { }; energyflow = callPackage ../development/python-modules/energyflow { };
enhancements = callPackage ../development/python-modules/enhancements { }; enhancements = callPackage ../development/python-modules/enhancements { };
@ -8570,6 +8574,8 @@ self: super: with self; {
pysnooper = callPackage ../development/python-modules/pysnooper { }; pysnooper = callPackage ../development/python-modules/pysnooper { };
pysnooz = callPackage ../development/python-modules/pysnooz { };
pysnow = callPackage ../development/python-modules/pysnow { }; pysnow = callPackage ../development/python-modules/pysnow { };
pysocks = callPackage ../development/python-modules/pysocks { }; pysocks = callPackage ../development/python-modules/pysocks { };
@ -10954,6 +10960,8 @@ self: super: with self; {
textual = callPackage ../development/python-modules/textual { }; textual = callPackage ../development/python-modules/textual { };
testbook = callPackage ../development/python-modules/testbook { };
testing-common-database = callPackage ../development/python-modules/testing-common-database { }; testing-common-database = callPackage ../development/python-modules/testing-common-database { };
testing-postgresql = callPackage ../development/python-modules/testing-postgresql { }; testing-postgresql = callPackage ../development/python-modules/testing-postgresql { };
@ -12148,6 +12156,8 @@ self: super: with self; {
zake = callPackage ../development/python-modules/zake { }; zake = callPackage ../development/python-modules/zake { };
zamg = callPackage ../development/python-modules/zamg { };
zarr = callPackage ../development/python-modules/zarr { }; zarr = callPackage ../development/python-modules/zarr { };
zc-buildout = callPackage ../development/python-modules/buildout { }; zc-buildout = callPackage ../development/python-modules/buildout { };