diff --git a/.github/ISSUE_TEMPLATE/unreproducible_package.md b/.github/ISSUE_TEMPLATE/unreproducible_package.md
index 749976dfbecd..a868c26ca54b 100644
--- a/.github/ISSUE_TEMPLATE/unreproducible_package.md
+++ b/.github/ISSUE_TEMPLATE/unreproducible_package.md
@@ -2,7 +2,7 @@
name: Unreproducible package
about: A package that does not produce a bit-by-bit reproducible result each time it is built
title: ''
-labels: '0.kind: enhancement', '6.topic: reproducible builds'
+labels: [ '0.kind: enhancement', '6.topic: reproducible builds' ]
assignees: ''
---
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 412dff9c06f8..9381ff672269 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -65,6 +65,11 @@
- pkgs/development/lua-modules/**/*
- pkgs/top-level/lua-packages.nix
+"6.topic: mate":
+ - nixos/modules/services/x11/desktop-managers/mate.nix
+ - nixos/tests/mate.nix
+ - pkgs/desktops/mate/**/*
+
"6.topic: nixos":
- nixos/**/*
- pkgs/os-specific/linux/nixos-rebuild/**/*
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index d5e78cda0864..2e7051784640 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -24,7 +24,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs
- uses: korthout/backport-action@v1.0.0
+ uses: korthout/backport-action@v1.0.1
with:
# Config README: https://github.com/korthout/backport-action#backport-action
pull_description: |-
diff --git a/doc/Makefile b/doc/Makefile
index f8d2d7248fab..1e54aef9bd12 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -11,7 +11,7 @@ pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracket
pandoc_flags = --extract-media=$(pandoc_media_dir) \
--lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \
--lua-filter=build-aux/pandoc-filters/myst-reader/roles.lua \
- --lua-filter=build-aux/pandoc-filters/link-unix-man-references.lua \
+ --lua-filter=$(PANDOC_LINK_MANPAGES_FILTER) \
--lua-filter=build-aux/pandoc-filters/docbook-writer/rst-roles.lua \
--lua-filter=build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua \
-f commonmark$(pandoc_commonmark_enabled_extensions)+smart
diff --git a/doc/build-aux/pandoc-filters/link-manpages.nix b/doc/build-aux/pandoc-filters/link-manpages.nix
new file mode 100644
index 000000000000..ee27c5d60812
--- /dev/null
+++ b/doc/build-aux/pandoc-filters/link-manpages.nix
@@ -0,0 +1,28 @@
+{ pkgs ? import ../../.. {} }:
+let
+ inherit (pkgs) lib;
+ manpageURLs = builtins.fromJSON (builtins.readFile (pkgs.path + "/doc/manpage-urls.json"));
+in pkgs.writeText "link-manpages.lua" ''
+ --[[
+ Adds links to known man pages that aren't already in a link.
+ ]]
+
+ local manpage_urls = {
+ ${lib.concatStringsSep "\n" (lib.mapAttrsToList (man: url:
+ " [${builtins.toJSON man}] = ${builtins.toJSON url},") manpageURLs)}
+ }
+
+ traverse = 'topdown'
+
+ -- Returning false as the second value aborts processing of child elements.
+ function Link(elem)
+ return elem, false
+ end
+
+ function Code(elem)
+ local is_man_role = elem.classes:includes('interpreted-text') and elem.attributes['role'] == 'manpage'
+ if is_man_role and manpage_urls[elem.text] ~= nil then
+ return pandoc.Link(elem, manpage_urls[elem.text]), false
+ end
+ end
+''
diff --git a/doc/build-aux/pandoc-filters/link-unix-man-references.lua b/doc/build-aux/pandoc-filters/link-unix-man-references.lua
deleted file mode 100644
index b81d4a0979e7..000000000000
--- a/doc/build-aux/pandoc-filters/link-unix-man-references.lua
+++ /dev/null
@@ -1,38 +0,0 @@
---[[
-Turns a manpage reference into a link, when a mapping is defined below.
-]]
-
-local man_urls = {
- ["nix.conf(5)"] = "https://nixos.org/manual/nix/stable/#sec-conf-file",
-
- ["journald.conf(5)"] = "https://www.freedesktop.org/software/systemd/man/journald.conf.html",
- ["logind.conf(5)"] = "https://www.freedesktop.org/software/systemd/man/logind.conf.html",
- ["networkd.conf(5)"] = "https://www.freedesktop.org/software/systemd/man/networkd.conf.html",
- ["systemd.automount(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.automount.html",
- ["systemd.exec(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.exec.html",
- ["systemd.link(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.link.html",
- ["systemd.mount(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.mount.html",
- ["systemd.netdev(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.netdev.html",
- ["systemd.network(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.network.html",
- ["systemd.nspawn(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.nspawn.html",
- ["systemd.path(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.path.html",
- ["systemd.resource-control(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html",
- ["systemd.scope(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.scope.html",
- ["systemd.service(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.service.html",
- ["systemd.slice(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.slice.html",
- ["systemd.socket(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.socket.html",
- ["systemd.timer(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.timer.html",
- ["systemd.unit(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.unit.html",
- ["timesyncd.conf(5)"] = "https://www.freedesktop.org/software/systemd/man/timesyncd.conf.html",
- ["tmpfiles.d(5)"] = "https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html",
- ["systemd.time(7)"] = "https://www.freedesktop.org/software/systemd/man/systemd.time.html",
- ["systemd-fstab-generator(8)"] = "https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html",
- ["systemd-networkd-wait-online.service(8)"] = "https://www.freedesktop.org/software/systemd/man/systemd-networkd-wait-online.service.html",
-}
-
-function Code(elem)
- local is_man_role = elem.classes:includes('interpreted-text') and elem.attributes['role'] == 'manpage'
- if is_man_role and man_urls[elem.text] ~= nil then
- return pandoc.Link(elem, man_urls[elem.text])
- end
-end
diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md
index 81482523cd0e..889b4114acca 100644
--- a/doc/contributing/contributing-to-documentation.chapter.md
+++ b/doc/contributing/contributing-to-documentation.chapter.md
@@ -53,7 +53,7 @@ Additional syntax extensions are available, though not all extensions can be use
This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing).
- []{#ssec-contributing-markup-inline-roles}
- If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``, which will turn into {manpage}`nix.conf(5)`. The references will turn into links when a mapping exists in {file}`doc/build-aux/pandoc-filters/link-unix-man-references.lua`.
+ If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``, which will turn into {manpage}`nix.conf(5)`. The references will turn into links when a mapping exists in {file}`doc/manpage-urls.json`.
A few markups for other kinds of literals are also available:
diff --git a/doc/default.nix b/doc/default.nix
index ac382ec8519c..1d5fa4811a36 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -36,4 +36,5 @@ in pkgs.stdenv.mkDerivation {
# Environment variables
PANDOC_LUA_FILTERS_DIR = "${pkgs.pandoc-lua-filters}/share/pandoc/filters";
+ PANDOC_LINK_MANPAGES_FILTER = import build-aux/pandoc-filters/link-manpages.nix { inherit pkgs; };
}
diff --git a/doc/manpage-urls.json b/doc/manpage-urls.json
new file mode 100644
index 000000000000..0ff4b762bec7
--- /dev/null
+++ b/doc/manpage-urls.json
@@ -0,0 +1,29 @@
+{
+ "nix.conf(5)": "https://nixos.org/manual/nix/stable/#sec-conf-file",
+
+ "journald.conf(5)": "https://www.freedesktop.org/software/systemd/man/journald.conf.html",
+ "logind.conf(5)": "https://www.freedesktop.org/software/systemd/man/logind.conf.html",
+ "networkd.conf(5)": "https://www.freedesktop.org/software/systemd/man/networkd.conf.html",
+ "systemd.automount(5)": "https://www.freedesktop.org/software/systemd/man/systemd.automount.html",
+ "systemd.exec(5)": "https://www.freedesktop.org/software/systemd/man/systemd.exec.html",
+ "systemd.link(5)": "https://www.freedesktop.org/software/systemd/man/systemd.link.html",
+ "systemd.mount(5)": "https://www.freedesktop.org/software/systemd/man/systemd.mount.html",
+ "systemd.netdev(5)": "https://www.freedesktop.org/software/systemd/man/systemd.netdev.html",
+ "systemd.network(5)": "https://www.freedesktop.org/software/systemd/man/systemd.network.html",
+ "systemd.nspawn(5)": "https://www.freedesktop.org/software/systemd/man/systemd.nspawn.html",
+ "systemd.path(5)": "https://www.freedesktop.org/software/systemd/man/systemd.path.html",
+ "systemd.resource-control(5)": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html",
+ "systemd.scope(5)": "https://www.freedesktop.org/software/systemd/man/systemd.scope.html",
+ "systemd.service(5)": "https://www.freedesktop.org/software/systemd/man/systemd.service.html",
+ "systemd.slice(5)": "https://www.freedesktop.org/software/systemd/man/systemd.slice.html",
+ "systemd.socket(5)": "https://www.freedesktop.org/software/systemd/man/systemd.socket.html",
+ "systemd.timer(5)": "https://www.freedesktop.org/software/systemd/man/systemd.timer.html",
+ "systemd.unit(5)": "https://www.freedesktop.org/software/systemd/man/systemd.unit.html",
+ "systemd-system.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-system.conf.html",
+ "systemd-user.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-user.conf.html",
+ "timesyncd.conf(5)": "https://www.freedesktop.org/software/systemd/man/timesyncd.conf.html",
+ "tmpfiles.d(5)": "https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html",
+ "systemd.time(7)": "https://www.freedesktop.org/software/systemd/man/systemd.time.html",
+ "systemd-fstab-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html",
+ "systemd-networkd-wait-online.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-networkd-wait-online.service.html"
+}
diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md
index 46114dacb458..1fca829aa597 100644
--- a/doc/stdenv/meta.chapter.md
+++ b/doc/stdenv/meta.chapter.md
@@ -66,7 +66,7 @@ For details, see [Licenses](#sec-meta-license).
### `maintainers` {#var-meta-maintainers}
-A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice”, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`.
+A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice” in the same pull request, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`.
### `mainProgram` {#var-meta-mainProgram}
diff --git a/lib/modules.nix b/lib/modules.nix
index c304d5b9afd3..5e6bee6aabe3 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1113,7 +1113,6 @@ rec {
visible = true;
warn = false;
use = id;
- wrapDescription = lib.id;
};
/* Transitional version of mkAliasOptionModule that uses MD docs. */
@@ -1122,6 +1121,7 @@ rec {
visible = true;
warn = false;
use = id;
+ markdown = true;
};
/* mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b
@@ -1144,7 +1144,7 @@ rec {
(opt.highestPrio or defaultOverridePriority)
(f opt.value);
- doRename = { from, to, visible, warn, use, withPriority ? true, wrapDescription ? lib.mdDoc }:
+ doRename = { from, to, visible, warn, use, withPriority ? true, markdown ? false }:
{ config, options, ... }:
let
fromOpt = getAttrFromPath from options;
@@ -1155,7 +1155,9 @@ rec {
{
options = setAttrByPath from (mkOption {
inherit visible;
- description = wrapDescription "Alias of {option}`${showOption to}`.";
+ description = if markdown
+ then lib.mdDoc "Alias of {option}`${showOption to}`."
+ else "Alias of .";
apply = x: use (toOf config);
} // optionalAttrs (toType != null) {
type = toType;
diff --git a/maintainers/scripts/db-to-md.sh b/maintainers/scripts/db-to-md.sh
index 01357d1e2412..aa2a2775b6de 100755
--- a/maintainers/scripts/db-to-md.sh
+++ b/maintainers/scripts/db-to-md.sh
@@ -41,7 +41,7 @@ pandoc_flags=(
# - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies)
# - media extraction (was only required for diagram generator)
# - myst-reader/roles.lua (only relevant for MyST → DocBook)
- # - link-unix-man-references.lua (links should only be added to display output)
+ # - link-manpages.lua (links should only be added to display output)
# - docbook-writer/rst-roles.lua (only relevant for → DocBook)
# - docbook-writer/labelless-link-is-xref.lua (only relevant for → DocBook)
"--lua-filter=$DIR/../../doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua"
diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh
index 6eca9f3b2c3d..4698e94f508b 100755
--- a/nixos/doc/manual/md-to-db.sh
+++ b/nixos/doc/manual/md-to-db.sh
@@ -8,6 +8,8 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
pushd "$DIR"
+link_manpages_filter=$(nix-build --no-out-link "$DIR/../../../doc/build-aux/pandoc-filters/link-manpages.nix")
+
# NOTE: Keep in sync with Nixpkgs manual (/doc/Makefile).
# TODO: Remove raw-attribute when we can get rid of DocBook altogether.
pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute
@@ -17,7 +19,7 @@ pandoc_flags=(
# - media extraction (was only required for diagram generator)
# - docbook-reader/citerefentry-to-rst-role.lua (only relevant for DocBook → MarkDown/rST/MyST)
"--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua"
- "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/link-unix-man-references.lua"
+ "--lua-filter=$link_manpages_filter"
"--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua"
"--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua"
"--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua"
diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix
index a3436caad8f9..e2ed7bb71885 100644
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixos/lib/make-options-doc/default.nix
@@ -41,6 +41,7 @@
# characteristics but (hopefully) indistinguishable output.
, allowDocBook ? true
# whether lib.mdDoc is required for descriptions to be read as markdown.
+# !!! when this is eventually flipped to true, `lib.doRename` should also default to emitting Markdown
, markdownByDefault ? false
}:
@@ -130,6 +131,8 @@ in rec {
if baseOptionsJSON == null
then builtins.toFile "base.json" "{}"
else baseOptionsJSON;
+
+ MANPAGE_URLS = pkgs.path + "/doc/manpage-urls.json";
}
''
# Export list of options in different format.
diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py
index 7b14af40c313..c4f490fc2ad8 100644
--- a/nixos/lib/make-options-doc/mergeJSON.py
+++ b/nixos/lib/make-options-doc/mergeJSON.py
@@ -1,5 +1,6 @@
import collections
import json
+import os
import sys
from typing import Any, Dict, List
@@ -46,6 +47,8 @@ def unpivot(options: Dict[Key, Option]) -> Dict[str, JSON]:
result[opt.name] = opt.value
return result
+manpage_urls = json.load(open(os.getenv('MANPAGE_URLS')))
+
admonitions = {
'.warning': 'warning',
'.important': 'important',
@@ -119,9 +122,14 @@ class Renderer(mistune.renderers.BaseRenderer):
def env(self, text):
return f"{escape(text)}"
def manpage(self, page, section):
+ man = f"{page}({section})"
title = f"{escape(page)}"
vol = f"{escape(section)}"
- return f"{title}{vol}"
+ ref = f"{title}{vol}"
+ if man in manpage_urls:
+ return self.link(manpage_urls[man], text=ref)
+ else:
+ return ref
def finalize(self, data):
return "".join(data)
diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix
index 9c7cb34f14b5..6c53c5e0533d 100644
--- a/nixos/lib/systemd-unit-options.nix
+++ b/nixos/lib/systemd-unit-options.nix
@@ -60,7 +60,7 @@ in rec {
`asDropin` creates a drop-in file named `overrides.conf`.
Mainly needed to define instances for systemd template units (e.g. `systemd-nspawn@mycontainer.service`).
- See also systemd.unit(1).
+ See also {manpage}`systemd.unit(5)`.
'';
};
@@ -86,7 +86,7 @@ in rec {
This option creates a `.wants` symlink in the given target that exists
statelessly without the need for running `systemctl enable`.
- The in systemd.unit(5) manpage described `[Install]` section however is
+ The `[Install]` section described in {manpage}`systemd.unit(5)` however is
not supported because it is a stateful process that does not fit well
into the NixOS design.
'';
diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh
old mode 100644
new mode 100755
index 30113ee00508..60a86d89abb4
--- a/nixos/modules/installer/tools/nixos-enter.sh
+++ b/nixos/modules/installer/tools/nixos-enter.sh
@@ -100,8 +100,9 @@ chroot_add_resolv_conf "$mountPoint" || echo "$0: failed to set up resolv.conf"
# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" IN_NIXOS_ENTER=1 chroot "$mountPoint" "$system/activate" 1>&2 || true
- # Create /tmp
- chroot "$mountPoint" "$system/sw/bin/systemd-tmpfiles" --create --remove --exclude-prefix=/dev 1>&2 || true
+ # Create /tmp. This is needed for nix-build and the NixOS activation script to work.
+ # Hide the unhelpful "failed to replace specifiers" errors caused by missing /etc/machine-id.
+ chroot "$mountPoint" "$system/sw/bin/systemd-tmpfiles" --create --remove -E 2> /dev/null || true
)
unset TMPDIR
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b2e80b10fc24..3092b021bd9a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1141,6 +1141,7 @@
./services/web-apps/isso.nix
./services/web-apps/jirafeau.nix
./services/web-apps/jitsi-meet.nix
+ ./services/web-apps/kasmweb/default.nix
./services/web-apps/keycloak.nix
./services/web-apps/komga.nix
./services/web-apps/lemmy.nix
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index 1b69aac98863..98269f6250db 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -12,14 +12,14 @@ in {
type = types.package;
default = pkgs.steam.override {
extraLibraries = pkgs: with config.hardware.opengl;
- if pkgs.hostPlatform.is64bit
+ if pkgs.stdenv.hostPlatform.is64bit
then [ package ] ++ extraPackages
else [ package32 ] ++ extraPackages32;
};
defaultText = literalExpression ''
pkgs.steam.override {
extraLibraries = pkgs: with config.hardware.opengl;
- if pkgs.hostPlatform.is64bit
+ if pkgs.stdenv.hostPlatform.is64bit
then [ package ] ++ extraPackages
else [ package32 ] ++ extraPackages32;
}
diff --git a/nixos/modules/programs/xastir.nix b/nixos/modules/programs/xastir.nix
index 0977668d8370..6d5fc59aac50 100644
--- a/nixos/modules/programs/xastir.nix
+++ b/nixos/modules/programs/xastir.nix
@@ -8,7 +8,7 @@ in {
meta.maintainers = with maintainers; [ melling ];
options.programs.xastir = {
- enable = mkEnableOption (mdDoc "Enable Xastir Graphical APRS client");
+ enable = mkEnableOption (mdDoc "Xastir Graphical APRS client");
};
config = mkIf cfg.enable {
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 869ed5d9976c..0d21b1e8d66a 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -132,7 +132,7 @@ in
OnCalendar = "daily";
};
description = lib.mdDoc ''
- When to run the backup. See man systemd.timer for details.
+ When to run the backup. See {manpage}`systemd.timer(5)` for details.
'';
example = {
OnCalendar = "00:05";
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 1d115108c30f..f37d197f1621 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -819,10 +819,10 @@ in
system-features = mkDefault (
[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
- optionals (pkgs.hostPlatform ? gcc.arch) (
+ optionals (pkgs.stdenv.hostPlatform ? gcc.arch) (
# a builder can run code for `gcc.arch` and inferior architectures
- [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++
- map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} or [])
+ [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] ++
+ map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [])
)
);
}
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 9cce4c71d964..ba3f89e24dd4 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -56,7 +56,7 @@ let
provisionConfDir = pkgs.runCommand "grafana-provisioning" { nativeBuildInputs = [ pkgs.xorg.lndir ]; } ''
mkdir -p $out/{datasources,dashboards,notifiers,alerting}
${ln { src = datasourceFileOrDir; dir = "datasources"; filename = "datasource"; }}
- ${ln { src = dashboardFileOrDir; dir = "dashboards"; filename = "dashbaord"; }}
+ ${ln { src = dashboardFileOrDir; dir = "dashboards"; filename = "dashboard"; }}
${ln { src = notifierFileOrDir; dir = "notifiers"; filename = "notifier"; }}
${ln { src = rulesFileOrDir; dir = "alerting"; filename = "rules"; }}
${ln { src = contactPointsFileOrDir; dir = "alerting"; filename = "contactPoints"; }}
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 55af6abd5e01..3ad757133a60 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -79,7 +79,7 @@ in {
example = [ "53" ];
description = lib.mdDoc ''
What addresses and ports the server should listen on.
- For detailed syntax see ListenStream in man systemd.socket.
+ For detailed syntax see ListenStream in {manpage}`systemd.socket(5)`.
'';
};
listenTLS = mkOption {
@@ -88,7 +88,7 @@ in {
example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ];
description = lib.mdDoc ''
Addresses and ports on which kresd should provide DNS over TLS (see RFC 7858).
- For detailed syntax see ListenStream in man systemd.socket.
+ For detailed syntax see ListenStream in {manpage}`systemd.socket(5)`.
'';
};
listenDoH = mkOption {
@@ -97,7 +97,7 @@ in {
example = [ "198.51.100.1:443" "[2001:db8::1]:443" "443" ];
description = lib.mdDoc ''
Addresses and ports on which kresd should provide DNS over HTTPS/2 (see RFC 8484).
- For detailed syntax see ListenStream in man systemd.socket.
+ For detailed syntax see ListenStream in {manpage}`systemd.socket(5)`.
'';
};
instances = mkOption {
diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 3b124a4f0e08..8d923187941c 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -62,11 +62,10 @@ in
};
packageFirewall = mkOption {
- default = pkgs.iptables;
- defaultText = literalExpression "pkgs.iptables";
+ default = config.networking.firewall.package;
+ defaultText = literalExpression "config.networking.firewall.package";
type = types.package;
- example = literalExpression "pkgs.nftables";
- description = lib.mdDoc "The firewall package used by fail2ban service.";
+ description = lib.mdDoc "The firewall package used by fail2ban service. Defaults to the package for your firewall (iptables or nftables).";
};
extraPackages = mkOption {
@@ -86,24 +85,24 @@ in
};
banaction = mkOption {
- default = "iptables-multiport";
+ default = if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport";
+ defaultText = literalExpression '' if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport" '';
type = types.str;
- example = "nftables-multiport";
description = lib.mdDoc ''
Default banning action (e.g. iptables, iptables-new, iptables-multiport,
- iptables-ipset-proto6-allports, shorewall, etc) It is used to
+ iptables-ipset-proto6-allports, shorewall, etc). It is used to
define action_* variables. Can be overridden globally or per
section within jail.local file
'';
};
banaction-allports = mkOption {
- default = "iptables-allport";
+ default = if config.networking.nftables.enable then "nftables-allport" else "iptables-allport";
+ defaultText = literalExpression '' if config.networking.nftables.enable then "nftables-allport" else "iptables-allport" '';
type = types.str;
- example = "nftables-allport";
description = lib.mdDoc ''
Default banning action (e.g. iptables, iptables-new, iptables-multiport,
- shorewall, etc) It is used to define action_* variables. Can be overridden
+ shorewall, etc) for "allports" jails. It is used to define action_* variables. Can be overridden
globally or per section within jail.local file
'';
};
diff --git a/nixos/modules/services/web-apps/kasmweb/default.nix b/nixos/modules/services/web-apps/kasmweb/default.nix
new file mode 100644
index 000000000000..0d78025ecf0f
--- /dev/null
+++ b/nixos/modules/services/web-apps/kasmweb/default.nix
@@ -0,0 +1,275 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.services.kasmweb;
+in
+{
+ options.services.kasmweb = {
+ enable = lib.mkEnableOption (lib.mdDoc "kasmweb");
+
+ networkSubnet = lib.mkOption {
+ default = "172.20.0.0/16";
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ The network subnet to use for the containers.
+ '';
+ };
+
+ postgres = {
+ user = lib.mkOption {
+ default = "kasmweb";
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ Username to use for the postgres database.
+ '';
+ };
+ password = lib.mkOption {
+ default = "kasmweb";
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ password to use for the postgres database.
+ '';
+ };
+ };
+
+ redisPassword = lib.mkOption {
+ default = "kasmweb";
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ password to use for the redis cache.
+ '';
+ };
+
+ defaultAdminPassword = lib.mkOption {
+ default = "kasmweb";
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ default admin password to use.
+ '';
+ };
+
+ defaultUserPassword = lib.mkOption {
+ default = "kasmweb";
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ default user password to use.
+ '';
+ };
+
+ defaultManagerToken = lib.mkOption {
+ default = "kasmweb";
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ default manager token to use.
+ '';
+ };
+
+ defaultGuacToken = lib.mkOption {
+ default = "kasmweb";
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ default guac token to use.
+ '';
+ };
+
+ defaultRegistrationToken = lib.mkOption {
+ default = "kasmweb";
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ default registration token to use.
+ '';
+ };
+
+ datastorePath = lib.mkOption {
+ type = lib.types.str;
+ default = "/var/lib/kasmweb";
+ description = lib.mdDoc ''
+ The directory used to store all data for kasmweb.
+ '';
+ };
+
+ listenAddress = lib.mkOption {
+ type = lib.types.str;
+ default = "0.0.0.0";
+ description = lib.mdDoc ''
+ The address on which kasmweb should listen.
+ '';
+ };
+
+ listenPort = lib.mkOption {
+ type = lib.types.int;
+ default = 443;
+ description = lib.mdDoc ''
+ The port on which kasmweb should listen.
+ '';
+ };
+
+ sslCertificate = lib.mkOption {
+ type = lib.types.nullOr lib.types.path;
+ default = null;
+ description = lib.mdDoc ''
+ The SSL certificate to be used for kasmweb.
+ '';
+ };
+
+ sslCertificateKey = lib.mkOption {
+ type = lib.types.nullOr lib.types.path;
+ default = null;
+ description = lib.mdDoc ''
+ The SSL certificate's key to be used for kasmweb. Make sure to specify
+ this as a string and not a literal path, so that it is not accidentally
+ included in your nixstore.
+ '';
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+
+ systemd.services = {
+ "init-kasmweb" = {
+ wantedBy = [
+ "docker-kasm_db.service"
+ ];
+ before = [
+ "docker-kasm_db.service"
+ "docker-kasm_redis.service"
+ "docker-kasm_db_init.service"
+ "docker-kasm_api.service"
+ "docker-kasm_agent.service"
+ "docker-kasm_manager.service"
+ "docker-kasm_share.service"
+ "docker-kasm_guac.service"
+ "docker-kasm_proxy.service"
+ ];
+ serviceConfig = {
+ Type = "oneshot";
+ ExecStart = pkgs.substituteAll {
+ src = ./initialize_kasmweb.sh;
+ isExecutable = true;
+ binPath = lib.makeBinPath [ pkgs.docker pkgs.openssl pkgs.gnused ];
+ runtimeShell = pkgs.runtimeShell;
+ kasmweb = pkgs.kasmweb;
+ postgresUser = cfg.postgres.user;
+ postgresPassword = cfg.postgres.password;
+ inherit (cfg)
+ datastorePath
+ sslCertificate
+ sslCertificateKey
+ redisPassword
+ defaultUserPassword
+ defaultAdminPassword
+ defaultManagerToken
+ defaultRegistrationToken
+ defaultGuacToken;
+ };
+ };
+ };
+ };
+
+ virtualisation = {
+ oci-containers.containers = {
+ kasm_db = {
+ image = "postgres:12-alpine";
+ environment = {
+ POSTGRES_PASSWORD = cfg.postgres.password;
+ POSTGRES_USER = cfg.postgres.user;
+ POSTGRES_DB = "kasm";
+ };
+ volumes = [
+ "${cfg.datastorePath}/conf/database/data.sql:/docker-entrypoint-initdb.d/data.sql"
+ "${cfg.datastorePath}/conf/database/:/tmp/"
+ "kasmweb_db:/var/lib/postgresql/data"
+ ];
+ extraOptions = [ "--network=kasm_default_network" ];
+ };
+ kasm_db_init = {
+ image = "kasmweb/api:${pkgs.kasmweb.version}";
+ user = "root:root";
+ volumes = [
+ "${cfg.datastorePath}/:/opt/kasm/current/"
+ "kasmweb_api_data:/tmp"
+ ];
+ dependsOn = [ "kasm_db" ];
+ entrypoint = "/bin/bash";
+ cmd = [ "/opt/kasm/current/init_seeds.sh" ];
+ extraOptions = [ "--network=kasm_default_network" "--userns=host" ];
+ };
+ kasm_redis = {
+ image = "redis:5-alpine";
+ entrypoint = "/bin/sh";
+ cmd = [
+ "-c"
+ "redis-server --requirepass ${cfg.redisPassword}"
+ ];
+ extraOptions = [ "--network=kasm_default_network" "--userns=host" ];
+ };
+ kasm_api = {
+ image = "kasmweb/api:${pkgs.kasmweb.version}";
+ user = "root:root";
+ volumes = [
+ "${cfg.datastorePath}/:/opt/kasm/current/"
+ "kasmweb_api_data:/tmp"
+ ];
+ dependsOn = [ "kasm_db_init" ];
+ extraOptions = [ "--network=kasm_default_network" "--userns=host" ];
+ };
+ kasm_manager = {
+ image = "kasmweb/manager:${pkgs.kasmweb.version}";
+ user = "root:root";
+ volumes = [
+ "${cfg.datastorePath}/:/opt/kasm/current/"
+ ];
+ dependsOn = [ "kasm_db" "kasm_api" ];
+ extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only"];
+ };
+ kasm_agent = {
+ image = "kasmweb/agent:${pkgs.kasmweb.version}";
+ user = "root:root";
+ volumes = [
+ "${cfg.datastorePath}/:/opt/kasm/current/"
+ "/var/run/docker.sock:/var/run/docker.sock"
+ "${pkgs.docker}/bin/docker:/usr/bin/docker"
+ "${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d"
+ ];
+ dependsOn = [ "kasm_manager" ];
+ extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ];
+ };
+ kasm_share = {
+ image = "kasmweb/share:${pkgs.kasmweb.version}";
+ user = "root:root";
+ volumes = [
+ "${cfg.datastorePath}/:/opt/kasm/current/"
+ ];
+ dependsOn = [ "kasm_db" "kasm_redis" ];
+ extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ];
+ };
+ kasm_guac = {
+ image = "kasmweb/kasm-guac:${pkgs.kasmweb.version}";
+ user = "root:root";
+ volumes = [
+ "${cfg.datastorePath}/:/opt/kasm/current/"
+ ];
+ dependsOn = [ "kasm_db" "kasm_redis" ];
+ extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ];
+ };
+ kasm_proxy = {
+ image = "kasmweb/nginx:latest";
+ ports = [ "${cfg.listenAddress}:${toString cfg.listenPort}:443" ];
+ user = "root:root";
+ volumes = [
+ "${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d:ro"
+ "${cfg.datastorePath}/certs/kasm_nginx.key:/etc/ssl/private/kasm_nginx.key"
+ "${cfg.datastorePath}/certs/kasm_nginx.crt:/etc/ssl/certs/kasm_nginx.crt"
+ "${cfg.datastorePath}/www:/srv/www:ro"
+ "${cfg.datastorePath}/log/nginx:/var/log/external/nginx"
+ "${cfg.datastorePath}/log/logrotate:/var/log/external/logrotate"
+ ];
+ dependsOn = [ "kasm_manager" "kasm_api" "kasm_agent" "kasm_share"
+ "kasm_guac" ];
+ extraOptions = [ "--network=kasm_default_network" "--userns=host"
+ "--network-alias=proxy"];
+ };
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh
new file mode 100644
index 000000000000..dbf043b98693
--- /dev/null
+++ b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh
@@ -0,0 +1,114 @@
+#! @runtimeShell@
+export PATH=@binPath@:$PATH
+
+mkdir -p @datastorePath@/log
+chmod -R a+rw @datastorePath@
+
+ln -sf @kasmweb@/bin @datastorePath@
+rm -r @datastorePath@/conf
+cp -r @kasmweb@/conf @datastorePath@
+mkdir -p @datastorePath@/conf/nginx/containers.d
+chmod -R a+rw @datastorePath@/conf
+ln -sf @kasmweb@/www @datastorePath@
+
+
+docker network inspect kasm_default_network >/dev/null || docker network create kasm_default_network --subnet @networkSubnet@
+if docker volume inspect kasmweb_db >/dev/null; then
+ source @datastorePath@/ids.env
+ echo 'echo "skipping database init"' > @datastorePath@/init_seeds.sh
+ echo 'while true; do sleep 10 ; done' >> @datastorePath@/init_seeds.sh
+else
+ API_SERVER_ID=$(cat /proc/sys/kernel/random/uuid)
+ MANAGER_ID=$(cat /proc/sys/kernel/random/uuid)
+ SHARE_ID=$(cat /proc/sys/kernel/random/uuid)
+ SERVER_ID=$(cat /proc/sys/kernel/random/uuid)
+ echo "export API_SERVER_ID=$API_SERVER_ID" > @datastorePath@/ids.env
+ echo "export MANAGER_ID=$MANAGER_ID" >> @datastorePath@/ids.env
+ echo "export SHARE_ID=$SHARE_ID" >> @datastorePath@/ids.env
+ echo "export SERVER_ID=$SERVER_ID" >> @datastorePath@/ids.env
+
+ mkdir -p @datastorePath@/certs
+ openssl req -x509 -nodes -days 1825 -newkey rsa:2048 -keyout @datastorePath@/certs/kasm_nginx.key -out @datastorePath@/certs/kasm_nginx.crt -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=$(hostname)/emailAddress=none@none.none" 2> /dev/null
+
+ docker volume create kasmweb_db
+ rm @datastorePath@/.done_initing_data
+ cat >@datastorePath@/init_seeds.sh <&1 | grep -v UserWarning
+ /usr/bin/kasm_server.so --cfg \
+ /opt/kasm/current/conf/app/api.app.config.yaml \
+ --populate-production \
+ --seed-file \
+ /opt/kasm/current/conf/database/seed_data/default_agents.yaml \
+ 2>&1 | grep -v UserWarning
+ /usr/bin/kasm_server.so --cfg \
+ /opt/kasm/current/conf/app/api.app.config.yaml \
+ --populate-production \
+ --seed-file \
+ /opt/kasm/current/conf/database/seed_data/default_connection_proxies.yaml \
+ 2>&1 | grep -v UserWarning
+ /usr/bin/kasm_server.so --cfg \
+ /opt/kasm/current/conf/app/api.app.config.yaml \
+ --populate-production \
+ --seed-file \
+ /opt/kasm/current/conf/database/seed_data/default_images_amd64.yaml \
+ 2>&1 | grep -v UserWarning
+ touch /opt/kasm/current/.done_initing_data
+ while true; do sleep 10 ; done
+else
+ echo "skipping database init"
+ while true; do sleep 10 ; done
+fi
+EOF
+fi
+
+chmod +x @datastorePath@/init_seeds.sh
+chmod a+w @datastorePath@/init_seeds.sh
+
+if [ -e @sslCertificate@ ]; then
+ cp @sslCertificate@ @datastorePath@/certs/kasm_nginx.crt
+ cp @sslCertificateKey@ @datastorePath@/certs/kasm_nginx.key
+fi
+
+sed -i -e "s/username.*/username: @postgresUser@/g" \
+ -e "s/password.*/password: @postgresPassword@/g" \
+ -e "s/host.*db/host: kasm_db/g" \
+ -e "s/ssl: true/ssl: false/g" \
+ -e "s/redisPassword.*/redisPassword: @redisPassword@/g" \
+ -e "s/server_hostname.*/server_hostname: kasm_api/g" \
+ -e "s/server_id.*/server_id: $API_SERVER_ID/g" \
+ -e "s/manager_id.*/manager_id: $MANAGER_ID/g" \
+ -e "s/share_id.*/share_id: $SHARE_ID/g" \
+ @datastorePath@/conf/app/api.app.config.yaml
+
+sed -i -e "s/ token:.*/ token: \"@defaultManagerToken@\"/g" \
+ -e "s/hostnames: \['proxy.*/hostnames: \['kasm_proxy'\]/g" \
+ -e "s/server_id.*/server_id: $SERVER_ID/g" \
+ @datastorePath@/conf/app/agent.app.config.yaml
+
+
+sed -i -e "s/password: admin.*/password: \"@defaultAdminPassword@\"/g" \
+ -e "s/password: user.*/password: \"@defaultUserPassword@\"/g" \
+ -e "s/default-manager-token/@defaultManagerToken@/g" \
+ -e "s/default-registration-token/@defaultRegistrationToken@/g" \
+ -e "s/upstream_auth_address:.*/upstream_auth_address: 'proxy'/g" \
+ @datastorePath@/conf/database/seed_data/default_properties.yaml
+
+sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \
+ -e "s/APIHOSTNAME/proxy/g" \
+ @datastorePath@/conf/app/kasmguac.app.config.yaml
+
+sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \
+ -e "s/APIHOSTNAME/proxy/g" \
+ @datastorePath@/conf/database/seed_data/default_connection_proxies.yaml
+
+sed -i "s/00000000-0000-0000-0000-000000000000/$SERVER_ID/g" \
+ @datastorePath@/conf/database/seed_data/default_agents.yaml
+
diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index b6e2309555f2..cc30896c80bd 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -95,7 +95,6 @@ let
) env))));
mastodonTootctl = pkgs.writeShellScriptBin "mastodon-tootctl" ''
- #! ${pkgs.runtimeShell}
set -a
export RAILS_ROOT="${cfg.package}"
source "${envFile}"
diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix
index 46d66fe4e688..d14d0928c53e 100644
--- a/nixos/modules/system/boot/systemd/user.nix
+++ b/nixos/modules/system/boot/systemd/user.nix
@@ -46,7 +46,7 @@ in {
type = types.lines;
example = "DefaultCPUAccounting=yes";
description = lib.mdDoc ''
- Extra config options for systemd user instances. See man systemd-user.conf for
+ Extra config options for systemd user instances. See {manpage}`systemd-user.conf(5)` for
available options.
'';
};
diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl
index a048261a3df1..ea0a38308172 100644
--- a/nixos/modules/system/etc/setup-etc.pl
+++ b/nixos/modules/system/etc/setup-etc.pl
@@ -13,8 +13,12 @@ sub atomicSymlink {
my $tmp = "$target.tmp";
unlink $tmp;
symlink $source, $tmp or return 0;
- rename $tmp, $target or return 0;
- return 1;
+ if (rename $tmp, $target) {
+ return 1;
+ } else {
+ unlink $tmp;
+ return 0;
+ }
}
@@ -87,6 +91,12 @@ my @copied;
sub link {
my $fn = substr $File::Find::name, length($etc) + 1 or next;
+
+ # nixos-enter sets up /etc/resolv.conf as a bind mount, so skip it.
+ if ($fn eq "resolv.conf" and $ENV{'IN_NIXOS_ENTER'}) {
+ return;
+ }
+
my $target = "/etc/$fn";
File::Path::make_path(dirname $target);
$created{$fn} = 1;
@@ -103,7 +113,7 @@ sub link {
if (-e "$_.mode") {
my $mode = read_file("$_.mode"); chomp $mode;
if ($mode eq "direct-symlink") {
- atomicSymlink readlink("$static/$fn"), $target or warn;
+ atomicSymlink readlink("$static/$fn"), $target or warn "could not create symlink $target";
} else {
my $uid = read_file("$_.uid"); chomp $uid;
my $gid = read_file("$_.gid"); chomp $gid;
@@ -112,12 +122,15 @@ sub link {
$gid = getgrnam $gid unless $gid =~ /^\+/;
chown int($uid), int($gid), "$target.tmp" or warn;
chmod oct($mode), "$target.tmp" or warn;
- rename "$target.tmp", $target or warn;
+ unless (rename "$target.tmp", $target) {
+ warn "could not create target $target";
+ unlink "$target.tmp";
+ }
}
push @copied, $fn;
print CLEAN "$fn\n";
} elsif (-l "$_") {
- atomicSymlink "$static/$fn", $target or warn;
+ atomicSymlink "$static/$fn", $target or warn "could not create symlink $target";
}
}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e5dc4a82e1b4..070c19eed92b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -377,6 +377,7 @@ in {
man = handleTest ./man.nix {};
mariadb-galera = handleTest ./mysql/mariadb-galera.nix {};
mastodon = discoverTests (import ./web-apps/mastodon { inherit handleTestOn; });
+ mate = handleTest ./mate.nix {};
matomo = handleTest ./matomo.nix {};
matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {};
matrix-conduit = handleTest ./matrix/conduit.nix {};
diff --git a/nixos/tests/evcc.nix b/nixos/tests/evcc.nix
index c223977a9d82..b445735ede98 100644
--- a/nixos/tests/evcc.nix
+++ b/nixos/tests/evcc.nix
@@ -88,7 +88,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
with subtest("Check journal for errors"):
_, output = machine.execute("journalctl -o cat -u evcc.service")
assert "FATAL" not in output
- assert "ERROR" not in output
with subtest("Check systemd hardening"):
_, output = machine.execute("systemd-analyze security evcc.service | grep -v '✓'")
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 5f3f61632f07..70f5c9fa0092 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -49,6 +49,8 @@ let
boot.loader.systemd-boot.enable = true;
''}
+ boot.initrd.secrets."/etc/secret" = /etc/nixos/secret;
+
users.users.alice = {
isNormalUser = true;
home = "/home/alice";
@@ -124,6 +126,7 @@ let
}",
"/mnt/etc/nixos/configuration.nix",
)
+ machine.copy_from_host("${pkgs.writeText "secret" "secret"}", "/mnt/etc/nixos/secret")
with subtest("Perform the installation"):
machine.succeed("nixos-install < /dev/null >&2")
@@ -131,6 +134,19 @@ let
with subtest("Do it again to make sure it's idempotent"):
machine.succeed("nixos-install < /dev/null >&2")
+ with subtest("Check that we can build things in nixos-enter"):
+ machine.succeed(
+ """
+ nixos-enter -- nix-build --option substitute false -E 'derivation {
+ name = "t";
+ builder = "/bin/sh";
+ args = ["-c" "echo nixos-enter build > $out"];
+ system = builtins.currentSystem;
+ preferLocalBuild = true;
+ }'
+ """
+ )
+
with subtest("Shutdown system after installation"):
machine.succeed("umount /mnt/boot || true")
machine.succeed("umount /mnt")
diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix
index 49258fcb93ea..b6e604075997 100644
--- a/nixos/tests/libvirtd.nix
+++ b/nixos/tests/libvirtd.nix
@@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
};
testScript = let
- nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.hostPlatform.system};
+ nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system};
virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy";
in ''
start_all()
diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix
new file mode 100644
index 000000000000..78ba59c5fc20
--- /dev/null
+++ b/nixos/tests/mate.nix
@@ -0,0 +1,58 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ name = "mate";
+
+ meta = {
+ maintainers = lib.teams.mate.members;
+ };
+
+ nodes.machine = { ... }: {
+ imports = [
+ ./common/user-account.nix
+ ];
+
+ services.xserver.enable = true;
+
+ services.xserver.displayManager = {
+ lightdm.enable = true;
+ autoLogin = {
+ enable = true;
+ user = "alice";
+ };
+ };
+
+ services.xserver.desktopManager.mate.enable = true;
+
+ # Silence log spam due to no sound drivers loaded:
+ # ALSA lib confmisc.c:855:(parse_card) cannot find card '0'
+ hardware.pulseaudio.enable = true;
+ };
+
+ testScript = { nodes, ... }:
+ let
+ user = nodes.machine.users.users.alice;
+ in
+ ''
+ with subtest("Wait for login"):
+ machine.wait_for_x()
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+
+ with subtest("Check that logging in has given the user ownership of devices"):
+ machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+
+ with subtest("Check if MATE session components actually start"):
+ machine.wait_until_succeeds("pgrep marco")
+ machine.wait_for_window("marco")
+ machine.wait_until_succeeds("pgrep mate-panel")
+ machine.wait_for_window("Top Panel")
+ machine.wait_for_window("Bottom Panel")
+ machine.wait_until_succeeds("pgrep caja")
+ machine.wait_for_window("Caja")
+
+ with subtest("Open MATE terminal"):
+ machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 mate-terminal >&2 &'")
+ machine.wait_for_window("Terminal")
+ machine.sleep(20)
+ machine.screenshot("screen")
+ '';
+})
diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix
index eaf3f9013817..8e86b35cf7cc 100644
--- a/pkgs/applications/backup/timeshift/unwrapped.nix
+++ b/pkgs/applications/backup/timeshift/unwrapped.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "timeshift";
- version = "22.11.1";
+ version = "22.11.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "timeshift";
rev = version;
- sha256 = "JYYiqJzLszaCJSl7fDb9Oz8tdIYAnqEbJoRg4zw3wbg=";
+ sha256 = "yZNERRoNZ1K7BRiAu7sqVQyhghsS/AeZSODMVSm46oY=";
};
patches = [
diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix
index 17d6704644fc..fb3912ab4db4 100644
--- a/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/pkgs/applications/blockchains/btcpayserver/default.nix
@@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
- version = "1.7.2";
+ version = "1.7.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EZ8gfpTBmTB/lGtexZYbD9x1F7rFXIEaEhhwS6gOEV4=";
+ sha256 = "sha256-wjtiircPPQgWg1GGQsesEEeOF+h1+tc591YI0l/JlwQ=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";
diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix
index 29bf9844b178..6b67883226fe 100644
--- a/pkgs/applications/blockchains/btcpayserver/deps.nix
+++ b/pkgs/applications/blockchains/btcpayserver/deps.nix
@@ -8,15 +8,15 @@
(fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })
(fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })
(fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.12"; sha256 = "1n7yv6q8fbk02d334a19zyicvlammjhfrg9rf18jyb3szj8g36k7"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.16"; sha256 = "050wh5gw3hgql8191z0yv7sj06wg5da6kvkbcg9hq3ildj0fdj67"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.19"; sha256 = "1jx9233apry0kb54df7k0p7vrsp3hp27f5d0j2802gry04sihrl7"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.14"; sha256 = "1k5m6jc585hnkkl019diz2gycfnsv2kx4g4cfs4awlpr42k8s3ph"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.18"; sha256 = "0zpqi8dpk91sqg7njxbs64m9598fmmalcc1w97v60xlhp9afjmdb"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.21"; sha256 = "0qq6ppr5vw4k8hjnz5xp29fc82z32vh6bc389dnr439gw7hmwkp9"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.17"; sha256 = "1bb8q57lnqnp3wijw41vvbwgz8rgg4g9pw8qhd4iiqi1w94q1bkz"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.16"; sha256 = "1q109kmzj99axk35l68z3gi29ww1xd62zaxj1f39myvlcv9ncb41"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.18"; sha256 = "166v6mhmy47fgny55c4mzqb2x7anqyxnd0g409vfgyg5fq4gc15v"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.9"; sha256 = "0ya365w3i3sjv7wafm6wmasf9mpfsh0fcbhawsv5br7m7lpppwhh"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.12"; sha256 = "1gb61a5mdmyigy7ps2c8n4iig6i32rdsif9kwn35yxx25zbnmbk2"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.19"; sha256 = "046vvlxlg8div4a2v6pnxz4iwji93s688jgnvav3hl6c22b9lvs0"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.18"; sha256 = "04lp90rr61p7n39bfmia6jamgr0jjfns9987py64iazi236dl74g"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.20"; sha256 = "1kwyh71zzfij07r6nvcf7k2gdpjdhh90imwh6s255ws13m1fj3sn"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.11"; sha256 = "0zm0b45npacknir6b6a6v717kp3yz8hxv1qy2v65g2zp3ad2wij4"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.14"; sha256 = "1hhznv07bd1f3rn9d1rpg61ln68vqfjg7ypxif9lx4l3vfcj5j04"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; })
(fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; })
@@ -125,7 +125,6 @@
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; })
- (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.10"; sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.5"; sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; })
@@ -158,7 +157,7 @@
(fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; })
(fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; })
(fetchNuGet { pname = "NBitcoin"; version = "7.0.18"; sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; })
- (fetchNuGet { pname = "NBitcoin"; version = "7.0.20"; sha256 = "0gl39v1mvnhdrqn8dmmslsyj4w4yc4l447zp62bfnwm5ppcwda9z"; })
+ (fetchNuGet { pname = "NBitcoin"; version = "7.0.23"; sha256 = "10dy58gq644561svc67pm37rlb44mymbnlfz409dhclmfhmqmd5s"; })
(fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; })
(fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; })
(fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.2"; sha256 = "0a8zy9iasgmr7mqhjrbxa2shnygpp97pbg5qnk7ix50y01k9blyw"; })
diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh
index 082911b42a3d..9debe6780f23 100755
--- a/pkgs/applications/blockchains/btcpayserver/update.sh
+++ b/pkgs/applications/blockchains/btcpayserver/update.sh
@@ -8,5 +8,4 @@ echo "Updating nbxplorer"
../nbxplorer/update.sh
echo
echo "Updating btcpayserver"
-# Include Razor SDK packages in deps.nix
-../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false'
+../nbxplorer/util/update-common.sh btcpayserver deps.nix
diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh
index caab20c928f8..5db2723ef8e9 100755
--- a/pkgs/applications/blockchains/nbxplorer/update.sh
+++ b/pkgs/applications/blockchains/nbxplorer/update.sh
@@ -3,4 +3,4 @@ set -euo pipefail
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
-getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix ''
+getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix
diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
deleted file mode 100755
index 2a862c31c881..000000000000
--- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p dotnet-sdk_6
-set -euo pipefail
-
-# Writes deps for dotnet package in $pkgSrc to $depsFile.
-# Expects $pkgSrc to contain a single .sln file.
-
-pkgSrc=$1
-depsFile=$(realpath "$2")
-customFlags=$3
-
-sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1)
-[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; }
-
-tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX)
-echo "Using tmp dir: $tmpdir"
-cp -rT "$pkgSrc" "$tmpdir"
-chmod -R +w "$tmpdir"
-
-pushd "$tmpdir" > /dev/null
-mkdir home
-echo "Running dotnet restore for $sln"
-HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \
- dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log
-
-echo "{ fetchNuGet }: [" > "$depsFile"
-while read pkgSpec; do
- { read pname; read version; } < <(
- # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2
- sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkgSpec"
- )
- sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg)
- cat >> "$depsFile" <> "$depsFile"
-
-echo "Created $depsFile"
-
-popd > /dev/null
-rm -r $tmpdir
diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
index ee5238944867..6346c2fa9f40 100755
--- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
+++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
@@ -10,7 +10,6 @@ trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR
pkgName=$1
depsFile=$2
-customFlags=$3
: ${getVersionFromTags:=}
: ${refetch:=}
@@ -75,5 +74,4 @@ fi
echo
# Create deps file
-storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)"
-. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags"
+$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) "$depsFile"
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index 7466ff31d581..04340e75a7a8 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -1,5 +1,5 @@
{ autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
-, hexdump, hostPlatform, lib, libevent, libsodium, makeWrapper, rust, rustPlatform
+, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform
, pkg-config, Security, stdenv, testers, utf8cpp, util-linux, zcash, zeromq
}:
@@ -82,6 +82,6 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
license = licenses.mit;
# https://github.com/zcash/zcash/issues/4405
- broken = hostPlatform.isAarch64 && hostPlatform.isDarwin;
+ broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin;
};
}
diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
index eedfaee00c59..605b5bc286ab 100644
--- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "lightdm-slick-greeter";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "slick-greeter";
rev = version;
- sha256 = "sha256-XoGha0DyrtrGXW72Zvnk1FrvULPMYc0FvQj4JFSKxXo=";
+ sha256 = "sha256-k/E3bR63kesHQ/we+ctC0UEYE5YdZ6Lv5lYuXqCOvKA=";
};
nativeBuildInputs = [
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/slick-greeter.vala \
--replace "/usr/bin/numlockx" "${numlockx}/bin/numlockx" \
--replace "/usr/share/xsessions/" "/run/current-system/sw/share/xsessions/" \
+ --replace "/usr/share/wayland-sessions/" "/run/current-system/sw/share/wayland-sessions/" \
--replace "/usr/bin/slick-greeter" "${placeholder "out"}/bin/slick-greeter"
substituteInPlace src/session-list.vala \
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index d6ce650fb8ad..cd68f0dbf5f3 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -13,7 +13,7 @@
, alsa-lib, cairo, acl, gpm, m17n_lib, libotf
, sigtool, jansson, harfbuzz, sqlite, nixosTests
, recurseIntoAttrs, emacsPackagesFor
-, libgccjit, targetPlatform, makeWrapper # native-comp params
+, libgccjit, makeWrapper # native-comp params
, fetchFromSavannah, fetchFromBitbucket
# macOS dependencies for NS and macPort
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index ef9d49c5d157..1b4f4508fbf0 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem
-, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper
+, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages
, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland
@@ -72,7 +72,8 @@ let
++ lib.optionals stdenv.isLinux [
autoPatchelfHook
nodePackages.asar
- (wrapGAppsHook.override { inherit makeWrapper; })
+ # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
+ (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; })
];
dontBuild = true;
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 389d5d4294b8..f4d424b3fc30 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -36,19 +36,13 @@
stdenv.mkDerivation rec {
pname = "hugin";
- version = "2021.0.0";
+ version = "2022.0.0";
src = fetchurl {
url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2";
- sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk=";
+ sha256 = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac=";
};
- patches = [
- # committed upstream but unreleased:
- # https://sourceforge.net/p/hugin/hugin/ci/edfddc6070ca6d4223d359fb4b38273a5aed2f2d
- ./dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch
- ];
-
buildInputs = [
boost
cairo
diff --git a/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch b/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch
deleted file mode 100644
index d38e07a595e8..000000000000
--- a/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:26.873574924 -0800
-+++ b/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:09.069575641 -0800
-@@ -472,9 +472,9 @@
- #else
- #ifdef USE_XDG_DIRS
- char *xdgDataDir = getenv("XDG_DATA_HOME");
-- if (strlen(xdgDataDir) == 0)
-+ if (xdgDataDir == NULL || strlen(xdgDataDir) == 0)
- {
-- // no XDG_DATA_HOME enviroment variable set
-+ // no XDG_DATA_HOME enviroment variable set or empty variable
- // use $HOME/.local/share instead
- const std::string homeDir = GetHomeDir();
- if (homeDir.empty())
diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix
index 4932379ef02d..4c94fa83485c 100644
--- a/pkgs/applications/misc/HentaiAtHome/default.nix
+++ b/pkgs/applications/misc/HentaiAtHome/default.nix
@@ -1,5 +1,4 @@
{ buildPackages
-, buildPlatform
, fetchzip
, javaOpts ? "-XX:+UseZGC"
, jdk
@@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [ jdk makeWrapper ];
LANG = "en_US.UTF-8";
- LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc")
+ LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc")
"${buildPackages.glibcLocales}/lib/locale/locale-archive";
buildPhase = ''
diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix
index 85579f052196..eb773b3c812e 100644
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
- version = "1.24.4";
+ version = "1.26.1";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
- sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI=";
+ sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 55aba845b0c0..51841f9852a5 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -12,7 +12,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
- version = "1.0.3";
+ version = "1.1.9";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -25,7 +25,7 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
- sha256 = if stdenv.isDarwin then "sha256-DYF9fEpZaP4tD/eeZAegDahR7UZyroqNB9bn2U7sgXs=" else "sha256-MpQk5g4184ZkCAjLU5Ug0ReWgVADskS1QuMcnPdNofs=";
+ sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-dFR7LaDRJwpxrNyPNseGi66gIAHOKf5Au2VXl7SBGSE=";
};
icon = fetchurl {
diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix
index f518acd24a20..3d6e42bd628d 100644
--- a/pkgs/applications/misc/oxker/default.nix
+++ b/pkgs/applications/misc/oxker/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "oxker";
- version = "0.1.10";
+ version = "0.1.11";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-2NX2iW3cT9027j2gUsDTtdIFDmJKIGPfSzrGGwvK/VA=";
+ sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA=";
};
- cargoSha256 = "sha256-//GI+roOsCLkKgMDUDK0YhJWmeIaYCMBt9r14+Rz8UQ=";
+ cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8=";
meta = with lib; {
description = "A simple tui to view & control docker containers";
diff --git a/pkgs/applications/misc/procmail/CVE-2014-3618.patch b/pkgs/applications/misc/procmail/CVE-2014-3618.patch
deleted file mode 100644
index e3aa5600e40e..000000000000
--- a/pkgs/applications/misc/procmail/CVE-2014-3618.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From http://seclists.org/oss-sec/2014/q3/495 (with whitespace corrected).
-
---- a/src/formisc.c 2013-08-04 00:13:33.000000000 -0700
-+++ b/src/formisc.c 2014-09-03 11:42:25.986002396 -0700
-@@ -84,12 +84,11 @@
- case '"':*target++=delim='"';start++;
- }
- ;{ int i;
-- do
-+ while(*start)
- if((i= *target++= *start++)==delim) /* corresponding delimiter? */
- break;
- else if(i=='\\'&&*start) /* skip quoted character */
- *target++= *start++;
-- while(*start); /* anything? */
- }
- hitspc=2;
- }
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index dafc73925b54..ea299d73cbb0 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -2,22 +2,13 @@
stdenv.mkDerivation rec {
pname = "procmail";
- version = "3.22";
+ version = "3.24";
src = fetchurl {
- url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz";
- sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
+ url = "https://github.com/BuGlessRB/procmail/archive/refs/tags/v${version}.tar.gz";
+ sha256 = "UU6kMzOXg+ld+TIeeUdx5Ih7mCOsVf2yRpcCz2m9OYk=";
};
- patches = [
- ./CVE-2014-3618.patch
- (fetchurl {
- url = "https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30";
- sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq";
- name = "CVE-2017-16844";
- })
- ];
-
# getline is defined differently in glibc now. So rename it.
# Without the .PHONY target "make install" won't install anything on Darwin.
postPatch = ''
@@ -33,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Mail processing and filtering utility";
- homepage = "http://www.procmail.org/";
+ homepage = "https://github.com/BuGlessRB/procmail/";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ gebner ];
diff --git a/pkgs/applications/misc/stylish/default.nix b/pkgs/applications/misc/stylish/default.nix
index 43fcc0bb1934..b1fed22b7ffe 100644
--- a/pkgs/applications/misc/stylish/default.nix
+++ b/pkgs/applications/misc/stylish/default.nix
@@ -1,12 +1,21 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
+{
+ lib,
+ stdenvNoCC,
+ fetchFromGitHub,
+ makeWrapper,
+ curl,
+ feh,
+ file,
+ jq,
+ util-linux,
+ wget,
}:
-
stdenvNoCC.mkDerivation rec {
pname = "stylish";
version = "unstable-2022-12-05";
+ nativeBuildInputs = [ makeWrapper ];
+
src = fetchFromGitHub {
owner = "thevinter";
repo = "styli.sh";
@@ -22,6 +31,17 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
+ postInstall = ''
+ wrapProgram $out/bin/styli.sh --prefix PATH : ${lib.makeBinPath [
+ curl
+ feh
+ file
+ jq
+ util-linux
+ wget
+ ]}
+ '';
+
meta = with lib; {
homepage = "https://github.com/thevinter/styli.sh";
description = "A shell script to manage wallpapers";
diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix
index 97677407fc15..b5e23f15b0ba 100644
--- a/pkgs/applications/misc/tut/default.nix
+++ b/pkgs/applications/misc/tut/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tut";
- version = "1.0.30";
+ version = "1.0.34";
src = fetchFromGitHub {
owner = "RasmusLindroth";
repo = pname;
rev = version;
- sha256 = "sha256-Cr9aDfreTDeFV5mws29pYRUkUjHVcLGEZyUvZYAp3B8=";
+ sha256 = "sha256-AnuPTv9W+2yDcM803DZaNIn4S7A78JEv6S8pA18whVA=";
};
- vendorSha256 = "sha256-ECaePGmSaf0vuKbvgdUMOF8oCpc14srFFMmPJPFFqw4=";
+ vendorHash = "sha256-go7eZHhrQ1ZcLOn56a3Azn3eRyAesAkgLabPbwzKtds=";
meta = with lib; {
description = "A TUI for Mastodon with vim inspired keys";
diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix
index 2a29eab29730..9ae1b348e3d4 100644
--- a/pkgs/applications/misc/waylock/default.nix
+++ b/pkgs/applications/misc/waylock/default.nix
@@ -1,28 +1,27 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- zig,
- wayland,
- pkg-config,
- scdoc,
- wayland-protocols,
- libxkbcommon,
- pam,
+{ lib
+, stdenv
+, fetchFromGitHub
+, zig
+, wayland
+, pkg-config
+, scdoc
+, wayland-protocols
+, libxkbcommon
+, pam
}:
stdenv.mkDerivation rec {
pname = "waylock";
- version = "0.4.2";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "ifreund";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-yWjWcnGa4a+Dpc82H65yr8H7v88g/tDq0FSguubhbEI=";
+ hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w=";
fetchSubmodules = true;
};
- nativeBuildInputs = [zig wayland scdoc pkg-config];
+ nativeBuildInputs = [ zig wayland scdoc pkg-config ];
buildInputs = [
wayland-protocols
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
- zig build -Drelease-safe -Dman-pages --prefix $out install
+ zig build -Drelease-safe -Dman-pages -Dcpu=baseline --prefix $out install
runHook postInstall
'';
@@ -47,6 +46,6 @@ stdenv.mkDerivation rec {
description = "A small screenlocker for Wayland compositors";
license = licenses.isc;
platforms = platforms.linux;
- maintainers = with maintainers; [jordanisaacs];
+ maintainers = with maintainers; [ jordanisaacs ];
};
}
diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix
index e2426fc7d56d..877dddfa1e2b 100644
--- a/pkgs/applications/networking/cluster/roxctl/default.nix
+++ b/pkgs/applications/networking/cluster/roxctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "roxctl";
- version = "3.72.2";
+ version = "3.73.1";
src = fetchFromGitHub {
owner = "stackrox";
repo = "stackrox";
rev = version;
- sha256 = "sha256-qw45Ifp8JcJyKaKL1St0HAQGS7JiUestiPGyZcV3gx8=";
+ sha256 = "sha256-A/jEw29c2WbBlPZZACjI3NjM7a0JxCEob8GOoGx13Hs=";
};
- vendorSha256 = "sha256-FmpnRgU3w2zthgUJuAG5AqLl2UxMb0yywN5Sk9WoWBI=";
+ vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix
index b1a772720775..271d82f4d86c 100644
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "werf";
- version = "1.2.193";
+ version = "1.2.195";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
- hash = "sha256-4q+LtPwJa3gioOY90gUfCL4F/8jmtfkBKxBShg2xQas=";
+ hash = "sha256-rNhCZO4Axeuc5jEAndjma7/jnst1kDNdtb/h/jD2rtE=";
};
vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk=";
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 7e06a7595903..a93391bbbb1b 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ];
postBuild = ''
- make prefix="$out"
+ make -j $NIX_BUILD_CORES prefix="$out"
'';
# https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set
@@ -44,11 +44,11 @@ rustPlatform.buildRustPackage rec {
doCheck = true;
preCheck = ''
- make test
+ make -j $NIX_BUILD_CORES test
'';
postInstall = ''
- make prefix="$out" install
+ make -j $NIX_BUILD_CORES prefix="$out" install
'' + lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index eb4be8d98d27..c113618bbb75 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -43,7 +43,7 @@ let
rev = "v${version}";
hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w=";
};
- vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+ vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
};
in buildNpmPackage rec {
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index e8ac07b50cfb..67f294ea6a55 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -22,11 +22,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
- version = "1.5.4";
+ version = "1.6.0";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
- sha256 = "sha256-uIzOKiCbHiSVRlXcpE0B/+Ats3cfw4u7eA+KyPriwhk=";
+ hash = "sha256-gHRB3thDH+CKRXTgrD37e2zf0rVDIVl4Zhxf5lsLjyc=";
};
buildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix
index d7e7a94a511e..241828fdfc3c 100644
--- a/pkgs/applications/networking/instant-messengers/zulip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix
@@ -6,7 +6,6 @@
let
pname = "zulip";
version = "5.9.4";
- name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
@@ -15,14 +14,14 @@ let
};
appimageContents = appimageTools.extractType2 {
- inherit name src;
+ inherit pname version src;
};
in appimageTools.wrapType2 {
- inherit name src;
+ inherit pname version src;
extraInstallCommands = ''
- mv $out/bin/${name} $out/bin/${pname}
+ mv "$out/bin/${pname}-${version}" "$out/bin/${pname}"
install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \
$out/share/icons/hicolor/512x512/apps/zulip.png
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 0739b6f57645..478b28190ae6 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -36,14 +36,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "3.7.1";
+ version = "3.8";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
- hash = "sha256-ZtJi1NhE1agZWnAv6FCUeO1GDtuQnLTraA5nkwWiCqs=";
+ hash = "sha256-objxAUGvBhTkbQl4GshDP3RsCkAW4z917L9WyaVoYj4=";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 96d0c60df146..eae9a8a3d87a 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,4 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, openssl
+, libsamplerate
+, alsa-lib
+, AppKit
+}:
stdenv.mkDerivation rec {
pname = "pjsip";
@@ -13,6 +21,16 @@ stdenv.mkDerivation rec {
patches = [
./fix-aarch64.patch
+ (fetchpatch {
+ name = "CVE-2022-23537.patch";
+ url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch";
+ sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA=";
+ })
+ (fetchpatch {
+ name = "CVE-2022-23547.patch";
+ url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch";
+ sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k=";
+ })
];
buildInputs = [ openssl libsamplerate ]
diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index 3757d57df816..28c6580d8911 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "seaweedfs";
- version = "3.38";
+ version = "3.39";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
- hash = "sha256-LYMGkv1rgUtA/TwulBhgw0w+8kbICtEgr7/K6exalxM=";
+ hash = "sha256-mbeTdrKptPaMw1OA3jFftjJPOmUnJcjbv81yDSlFeaU=";
};
vendorHash = "sha256-mwfs/tdq1Qq2auEwz24emf7pjpIJAncI78oxhAn2WkI=";
diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch
new file mode 100644
index 000000000000..289822365490
--- /dev/null
+++ b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch
@@ -0,0 +1,23 @@
+diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm
+index 8e3ff255f..a6b805fa5 100644
+--- a/gnucash/price-quotes.scm
++++ b/gnucash/price-quotes.scm
+@@ -44,7 +44,7 @@
+ (define (start-program)
+ (set! program
+ (gnc-spawn-process-async
+- (list "perl" "-w" gnc:*finance-quote-check*) #t)))
++ (list gnc:*finance-quote-check*) #t)))
+
+ (define (get-sources)
+ (when program
+@@ -119,7 +119,7 @@
+
+ (define (start-quoter)
+ (set! quoter
+- (gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t)))
++ (gnc-spawn-process-async (list gnc:*finance-quote-helper*) #t)))
+
+ (define (get-quotes)
+ (when quoter
+
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 9e5294c4b00d..700a94429964 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -72,6 +72,8 @@ stdenv.mkDerivation rec {
./0002-disable-gnc-fq-update.patch
# this patch prevents the building of gnucash-valgrind
./0003-remove-valgrind.patch
+ # this patch makes gnucash exec the Finance::Quote helpers directly
+ ./0004-exec-fq-helpers.patch
];
# this needs to be an environment variable and not a cmake flag to suppress
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index bb27f0d4ec90..158c2389a313 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -1,29 +1,66 @@
-{ mkDerivation, lib, stdenv, fetchurl
-, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets
-, qtx11extras, qtwayland
+{ lib
+, stdenv
+, fetchurl
+, qmake
+, qttools
+, qtbase
+, qtdeclarative
+, qtsvg
+, qtwayland
+, qtwebsockets
+, qtx11extras
+, qtxmlpatterns
+, makeWrapper
+, wrapQtAppsHook
}:
-mkDerivation rec {
+let
pname = "qownnotes";
- version = "22.12.3";
+ appname = "QOwnNotes";
+ version = "23.1.0";
+in
+stdenv.mkDerivation {
+ inherit pname appname version;
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
- # Fetch the checksum of current version with curl:
- # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256
- sha256 = "sha256-fpI7RYOGmWwmau6tF8FPmY2/FtN9foWRX8/WgrNU6E8=";
+ sha256 = "sha256-HMs8DTL2BDSDmchadpVvbShjJMPP6W587F38uiixCuQ=";
};
- nativeBuildInputs = [ qmake qttools ];
+ nativeBuildInputs = [
+ qmake
+ qttools
+ wrapQtAppsHook
+ ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ];
- buildInputs = [ qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ]
- ++ lib.optionals stdenv.isLinux [ qtwayland ];
+ buildInputs = [
+ qtbase
+ qtdeclarative
+ qtsvg
+ qtwebsockets
+ qtx11extras
+ qtxmlpatterns
+ ] ++ lib.optionals stdenv.isLinux [ qtwayland ];
+
+ postInstall =
+ # Create a lowercase symlink for Linux
+ lib.optionalString stdenv.isLinux ''
+ ln -s $out/bin/${appname} $out/bin/${pname}
+ ''
+ # Wrap application for macOS as lowercase binary
+ + lib.optionalString stdenv.isDarwin ''
+ mkdir -p $out/Applications
+ mv $out/bin/${appname}.app $out/Applications
+ makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname}
+ '';
meta = with lib; {
description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration";
homepage = "https://www.qownnotes.org/";
+ changelog = "https://www.qownnotes.org/changelog.html";
+ downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ totoroot ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index 8a143d36a29b..e117af03b57d 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ANTs";
- version = "2.4.2";
+ version = "2.4.3";
src = fetchFromGitHub {
owner = "ANTsX";
repo = "ANTs";
rev = "v${version}";
- sha256 = "sha256-edkvTkgBNaC87Q0N/Fsebr9nRLMhDo4mrSGoMICdnwU=";
+ sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g=";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix
index 611bbbe979f8..4d026a2d9c7a 100644
--- a/pkgs/applications/science/logic/cedille/default.nix
+++ b/pkgs/applications/science/logic/cedille/default.nix
@@ -4,7 +4,6 @@
, alex
, happy
, Agda
-, buildPlatform
, buildPackages
, ghcWithPackages
}:
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
LANG = "en_US.UTF-8";
LOCALE_ARCHIVE =
- lib.optionalString (buildPlatform.libc == "glibc")
+ lib.optionalString (stdenv.buildPlatform.libc == "glibc")
"${buildPackages.glibcLocales}/lib/locale/locale-archive";
postPatch = ''
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix
index aa3fba635ffc..4719a69c0128 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/applications/science/logic/cubicle/default.nix
@@ -1,18 +1,40 @@
-{ lib, stdenv, fetchurl, ocamlPackages }:
+{ lib
+, stdenv
+, fetchurl
+, autoreconfHook
+, which
+, ocamlPackages
+}:
stdenv.mkDerivation rec {
pname = "cubicle";
- version = "1.1.2";
+ version = "1.2.0";
src = fetchurl {
- url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz";
- sha256 = "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q";
+ url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz";
+ hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y=";
};
+ # https://github.com/cubicle-model-checker/cubicle/issues/1
postPatch = ''
- substituteInPlace Makefile.in --replace "\\n" ""
+ substituteInPlace Makefile.in \
+ --replace "@OCAMLC@" "ocamlfind ocamlc -package num" \
+ --replace "@OCAMLOPT@" "ocamlfind ocamlopt -package num"
'';
- buildInputs = with ocamlPackages; [ ocaml findlib functory ];
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ autoreconfHook
+ which
+ ] ++ (with ocamlPackages; [
+ findlib
+ ocaml
+ ]);
+
+ buildInputs = with ocamlPackages; [
+ functory
+ num
+ ];
meta = with lib; {
description = "An open source model checker for verifying safety properties of array-based systems";
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 22eee8b305a5..4d9b3afe31ca 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,15 +1,17 @@
{ lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg
-, zlib, libGL, libGLU, xorg, opencascade-occt }:
+, zlib, libGL, libGLU, xorg, opencascade-occt
+, python ? null, enablePython ? false }:
assert (!blas.isILP64) && (!lapack.isILP64);
+assert enablePython -> (python != null);
stdenv.mkDerivation rec {
pname = "gmsh";
- version = "4.11.0";
+ version = "4.11.1";
src = fetchurl {
url = "https://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "sha256-PPLyRFXuCSUsmeZNTmRilW5o8P8fN7rKC3jICdbMVXo=";
+ sha256 = "sha256-xf4bfL1AOIioFJKfL9D11p4nYAIioYx4bbW3boAFs2U=";
};
buildInputs = [
@@ -18,10 +20,31 @@ stdenv.mkDerivation rec {
libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes
xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM
xorg.libICE
+ ] ++ lib.optional enablePython python;
+
+ enableParallelBuilding = true;
+
+ patches = [ ./fix-python.patch ];
+
+ postPatch = ''
+ substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so
+ '';
+
+ # N.B. the shared object is used by bindings
+ cmakeFlags = [
+ "-DENABLE_BUILD_SHARED=ON"
+ "-DENABLE_BUILD_DYNAMIC=ON"
+ "-DENABLE_OPENMP=ON"
];
nativeBuildInputs = [ cmake gfortran ];
+ postFixup = lib.optionalString enablePython ''
+ mkdir -p $out/lib/python${python.pythonVersion}/site-packages
+ mv $out/lib/gmsh.py $out/lib/python${python.pythonVersion}/site-packages
+ mv $out/lib/*.dist-info $out/lib/python${python.pythonVersion}/site-packages
+ '';
+
doCheck = true;
meta = {
diff --git a/pkgs/applications/science/math/gmsh/fix-python.patch b/pkgs/applications/science/math/gmsh/fix-python.patch
new file mode 100644
index 000000000000..ac07c169c99b
--- /dev/null
+++ b/pkgs/applications/science/math/gmsh/fix-python.patch
@@ -0,0 +1,50 @@
+diff --git a/api/gmsh.py b/api/gmsh.py
+index 747acb203..02004da5d 100644
+--- a/api/gmsh.py
++++ b/api/gmsh.py
+@@ -44,44 +44,7 @@ moduledir = os.path.dirname(os.path.realpath(__file__))
+ parentdir1 = os.path.dirname(moduledir)
+ parentdir2 = os.path.dirname(parentdir1)
+
+-if platform.system() == "Windows":
+- libname = "gmsh-4.11.dll"
+-elif platform.system() == "Darwin":
+- libname = "libgmsh.4.11.dylib"
+-else:
+- libname = "libgmsh.so.4.11"
+-
+-# check if the library is in the same directory as the module...
+-libpath = os.path.join(moduledir, libname)
+-
+-# ... or in the parent directory or its lib or Lib subdirectory
+-if not os.path.exists(libpath):
+- libpath = os.path.join(parentdir1, libname)
+-if not os.path.exists(libpath):
+- libpath = os.path.join(parentdir1, "lib", libname)
+-if not os.path.exists(libpath):
+- libpath = os.path.join(parentdir1, "Lib", libname)
+-
+-# ... or in the parent of the parent directory or its lib or Lib subdirectory
+-if not os.path.exists(libpath):
+- libpath = os.path.join(parentdir2, libname)
+-if not os.path.exists(libpath):
+- libpath = os.path.join(parentdir2, "lib", libname)
+-if not os.path.exists(libpath):
+- libpath = os.path.join(parentdir2, "Lib", libname)
+-
+-# if we couldn't find it, use ctype's find_library utility...
+-if not os.path.exists(libpath):
+- if platform.system() == "Windows":
+- libpath = find_library("gmsh-4.11")
+- if not libpath:
+- libpath = find_library("gmsh")
+- else:
+- libpath = find_library("gmsh")
+-
+-# ... and print a warning if everything failed
+-if not os.path.exists(libpath):
+- print("Warning: could not find Gmsh shared library " + libname)
++libpath = "@LIBPATH@"
+
+ lib = CDLL(libpath)
+
diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix
index f55551af3803..dbcacb36be6b 100644
--- a/pkgs/applications/science/math/qalculate-qt/default.nix
+++ b/pkgs/applications/science/math/qalculate-qt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools }:
+{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools, qtsvg, qtwayland }:
stdenv.mkDerivation rec {
pname = "qalculate-qt";
@@ -8,11 +8,16 @@ stdenv.mkDerivation rec {
owner = "qalculate";
repo = "qalculate-qt";
rev = "v${version}";
- sha256 = "sha256-1MU/Wici+NQWbjoNpE9q6jKx8aKt85OAfb+ZsN/oK5w=";
+ hash = "sha256-1MU/Wici+NQWbjoNpE9q6jKx8aKt85OAfb+ZsN/oK5w=";
};
nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ];
- buildInputs = [ libqalculate qtbase qttools ];
+ buildInputs = [ libqalculate qtbase qttools qtsvg qtwayland ];
+
+ postPatch = ''
+ substituteInPlace qalculate-qt.pro\
+ --replace "LRELEASE" "${qttools.dev}/bin/lrelease"
+ '';
meta = with lib; {
description = "The ultimate desktop calculator";
diff --git a/pkgs/applications/version-management/subgit/default.nix b/pkgs/applications/version-management/subgit/default.nix
index 0ec06aeaaa68..a7288aa24e6e 100644
--- a/pkgs/applications/version-management/subgit/default.nix
+++ b/pkgs/applications/version-management/subgit/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "subgit";
- version = "3.3.15";
+ version = "3.3.16";
meta = {
description = "A tool for a smooth, stress-free SVN to Git migration";
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://subgit.com/download/subgit-${version}.zip";
- sha256 = "sha256-2/J/d4GrlLXR/7QBxgIMepzP+xxkeLvrCBwLl7Ke8wI=";
+ sha256 = "sha256-p7uBEG43N4Hed+8HYf3I9lQEvmYLV61oIyRrPHuGmUA=";
};
}
diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix
index f931e905127f..42c1d40b6125 100644
--- a/pkgs/applications/video/davinci-resolve/default.nix
+++ b/pkgs/applications/video/davinci-resolve/default.nix
@@ -3,7 +3,6 @@
, cacert
, curl
, runCommandLocal
-, targetPlatform
, unzip
, appimage-run
, addOpenGLRunpath
@@ -49,7 +48,7 @@ let
SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}";
USERAGENT = builtins.concatStringsSep " " [
- "User-Agent: Mozilla/5.0 (X11; Linux ${targetPlatform.linuxArch})"
+ "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})"
"AppleWebKit/537.36 (KHTML, like Gecko)"
"Chrome/77.0.3865.75"
"Safari/537.36"
diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix
new file mode 100644
index 000000000000..2fdb82869f3b
--- /dev/null
+++ b/pkgs/applications/video/glaxnimate/default.nix
@@ -0,0 +1,81 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, cmake
+, zlib
+, potrace
+, ffmpeg
+, libarchive
+, python3
+, qtbase
+, qttools
+, wrapQtAppsHook
+, testers
+, qtsvg
+, qtimageformats
+# For the tests
+, glaxnimate # Call itself, for the tests
+, xvfb-run
+}:
+let
+ # TODO: try to add a python library, see toPythonModule in doc/languages-frameworks/python.section.md
+ python3WithLibs = python3.withPackages (ps: with ps; [
+ # In data/lib/python-lottie/requirements.txt
+ numpy
+ pillow
+ cairosvg
+ fonttools
+ grapheme
+ opencv4
+ pyqt5
+ qscintilla
+ # Not sure if needed, but appears in some files
+ pyyaml
+ requests
+ pybind11
+ ]);
+in
+stdenv.mkDerivation rec {
+ pname = "glaxnimate";
+ version = "0.5.1";
+
+ src = fetchFromGitLab {
+ owner = "mattbas";
+ repo = "${pname}";
+ rev = "${version}";
+ sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw=";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ cmake
+ wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ zlib
+ potrace
+ # Upstream asks for libav dependency, which is fulfilled by ffmpeg
+ ffmpeg
+ libarchive
+ qtbase
+ qttools
+ qtsvg
+ qtimageformats
+ python3WithLibs
+ ];
+
+ qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ];
+
+ passthru.tests.version = testers.testVersion {
+ package = glaxnimate;
+ command = "${xvfb-run}/bin/xvfb-run glaxnimate --version";
+ };
+
+ meta = with lib; {
+ homepage = "https://gitlab.com/mattbas/glaxnimate";
+ description = "Simple vector animation program.";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ tobiasBora ];
+ };
+}
diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix
index 267393ad0548..02f71a94db5c 100644
--- a/pkgs/applications/video/losslesscut-bin/default.nix
+++ b/pkgs/applications/video/losslesscut-bin/default.nix
@@ -1,7 +1,7 @@
{ lib
+, stdenv
, callPackage
, buildPackages
-, hostPlatform
}:
let
@@ -34,9 +34,9 @@ let
};
in
(
- if hostPlatform.system == "aarch64-darwin" then aarch64-dmg
- else if hostPlatform.isDarwin then x86_64-dmg
- else if hostPlatform.isCygwin then x86_64-windows
+ if stdenv.hostPlatform.system == "aarch64-darwin" then aarch64-dmg
+ else if stdenv.hostPlatform.isDarwin then x86_64-dmg
+ else if stdenv.hostPlatform.isCygwin then x86_64-windows
else x86_64-appimage
).overrideAttrs
(oldAttrs: {
diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix
index 4963949927b5..18472f03d850 100644
--- a/pkgs/applications/virtualization/pods/default.nix
+++ b/pkgs/applications/virtualization/pods/default.nix
@@ -17,19 +17,19 @@
stdenv.mkDerivation rec {
pname = "pods";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "marhkb";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oa7A0RMF7kPQXydysGpzAICgGoIRLWUMRibXdiftYyk=";
+ sha256 = "sha256-Kjonyd0xL0QLjPS+U3xDC6AhOOxQmVAZ3STLXaa8eXc=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- sha256 = "sha256-RMxk7e/z+YneNWI/xsZDmXr7DqB7qHEY8HPvTCeSLjg=";
+ sha256 = "sha256-K5oOpo3xJiNg7F549JLGs83658MYcoGfuIcNoF88Njc=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/applications/virtualization/youki/default.nix
new file mode 100644
index 000000000000..54a88a334f8a
--- /dev/null
+++ b/pkgs/applications/virtualization/youki/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, installShellFiles
+, dbus
+, libseccomp
+, systemd
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "youki";
+ version = "0.0.4";
+
+ src = fetchFromGitHub {
+ owner = "containers";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-XwapCfu6Me0xSe+qFz9BFRYpQvG+ztb6QyhGejYRPb4=";
+ };
+
+ nativeBuildInputs = [ pkg-config installShellFiles ];
+
+ buildInputs = [ dbus libseccomp systemd ];
+
+ postInstall = ''
+ installShellCompletion --cmd youki \
+ --bash <($out/bin/youki completion -s bash) \
+ --fish <($out/bin/youki completion -s fish) \
+ --zsh <($out/bin/youki completion -s zsh)
+ '';
+
+ cargoBuildFlags = [ "-p" "youki" ];
+ cargoTestFlags = [ "-p" "youki" ];
+
+ cargoSha256 = "sha256-PT1kVo4gQFH9sIprEoAioNvDL/soMHcA2utEiQJPS/0=";
+
+ doCheck = false; # test failed
+
+ meta = with lib; {
+ description = "A container runtime written in Rust";
+ homepage = "https://containers.github.io/youki/";
+ changelog = "https://github.com/containers/youki/releases/tag/v${version}";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ candyc1oud ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 7f05a3a4eecc..514255f324ac 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -190,7 +190,13 @@ stdenvNoCC.mkDerivation (args // {
esac
done
- export tmp=$(mktemp -td "${pname}-tmp-XXXXXX")
+ if [[ ''${TMPDIR:-} == /run/user/* ]]; then
+ # /run/user is usually a tmpfs in RAM, which may be too small
+ # to store all downloaded dotnet packages
+ TMPDIR=
+ fi
+
+ export tmp=$(mktemp -td "deps-${pname}-XXXXXX")
HOME=$tmp/home
exitTrap() {
diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix
index 68a6675cf543..a5d6108513ce 100644
--- a/pkgs/build-support/flutter/default.nix
+++ b/pkgs/build-support/flutter/default.nix
@@ -26,7 +26,6 @@
, git
, dart
, nukeReferences
-, targetPlatform
, bash
, curl
, unzip
@@ -57,7 +56,7 @@ let
self =
(self: llvmPackages_13.stdenv.mkDerivation (args // {
deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) {
- name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${targetPlatform.system}.tar.gz";
+ name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${stdenvNoCC.targetPlatform.system}.tar.gz";
nativeBuildInputs = flutterDeps ++ [
nukeReferences
diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
index ab9b0a13ae77..4831c1062715 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
@@ -1,6 +1,6 @@
-{ lib, buildPlatform, buildRustCrate, fetchgit }:
-let kernel = buildPlatform.parsed.kernel.name;
- abi = buildPlatform.parsed.abi.name;
+{ lib, stdenv, buildRustCrate, fetchgit }:
+let kernel = stdenv.buildPlatform.parsed.kernel.name;
+ abi = stdenv.buildPlatform.parsed.abi.name;
include = includedFiles: src: builtins.filterSource (path: type:
lib.lists.any (f:
let p = toString (src + ("/" + f)); in
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index 509a37556cec..4a0612efd3e5 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, unzip
+{ lib, stdenv, fetchzip, fontforge
, bdftopcf, xorg
}:
@@ -8,32 +8,41 @@ stdenv.mkDerivation {
outputs = [ "out" "bdf" ];
- src = fetchurl {
- url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
- sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
+ src = fetchzip {
+ url = "https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61";
+ hash = "sha256-JK+vnOyhAbwT825S+WKbQuWgRrfZZHfyhaMQ/6ljO8s=";
+ extension = "zip";
+ stripRoot = false;
};
nativeBuildInputs =
- [ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ];
-
- postPatch = ''
- sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf
- '';
+ [ fontforge bdftopcf xorg.mkfontscale xorg.fonttosfnt ];
buildPhase = ''
runHook preBuild
newName() {
- test "''${1:5:1}" = i && _it=Italic || _it=
- case ''${1:6:3} in
- 400) test -z $it && _weight=Medium ;;
- 700) _weight=Bold ;;
- esac
- _pt=''${1%.bdf}
- _pt=''${_pt#*-}
- echo "Dina$_weight$_it$_pt"
+ local name=''${1##*/}
+ test "''${name:5:1}" = i && _it=Italic || _it=
+ case ''${name:6:3} in
+ 400) _weight=Medium ;;
+ 700) _weight=Bold ;;
+ esac
+ _pt=''${1%.bdf}
+ _pt=''${_pt#*-}
+ echo "Dina$_weight$_it$_pt"
}
+ # Re-encode the provided BDF files from CP1252 to Unicode as fonttosfnt does
+ # not support the former.
+ # We could generate the PCF and OTB files with fontforge directly, but that
+ # results in incorrect spacing in various places.
+ for f in BDF/*.bdf; do
+ basename=''${f##*/} basename=''${basename%.*}
+ fontforge -lang=ff -c "Open(\"$f\"); Reencode(\"win\", 1); Reencode(\"unicode\"); Generate(\"$basename.bdf\")"
+ mv "$basename"-*.bdf "$basename".bdf # remove the superfluous added size suffix
+ done
+
for f in *.bdf; do
name=$(newName "$f")
bdftopcf -t -o "$name.pcf" "$f"
@@ -62,9 +71,8 @@ stdenv.mkDerivation {
relatively compact to allow a lot of code on screen, while (hopefully)
clear enough to remain readable even at high resolutions.
'';
- homepage = "https://www.donationcoder.com/Software/Jibz/Dina/";
- downloadPage = "https://www.donationcoder.com/Software/Jibz/Dina/";
+ homepage = "https://www.dcmembers.com/jibsen/download/61/";
license = licenses.free;
- maintainers = [ maintainers.prikhi ];
+ maintainers = with maintainers; [ prikhi ncfavier ];
};
}
diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix
index 744db4f3d162..5c0a3817f32f 100644
--- a/pkgs/data/icons/colloid-icon-theme/default.nix
+++ b/pkgs/data/icons/colloid-icon-theme/default.nix
@@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red"
stdenvNoCC.mkDerivation rec {
inherit pname;
- version = "2022-10-26";
+ version = "2023-01-08";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- hash = "sha256-eHLfWrtY69S37OPvQdLwI/PRvoKCheF2MRsHG5+5BR0=";
+ hash = "sha256-n4kMOIp7AD5Ue4qY4G3ja/VTyYF7cqhdI0uuk9b6o5c=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix
index 3d44e34f2b0d..14299bdc522a 100644
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
- version = "20221223102220";
+ version = "20230106031328";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
- sha256 = "sha256-bvTNxJcogF3KxZbC8jW0PMIiJJZnzubWybDcNK7id8s=";
+ sha256 = "sha256-17yAIJQdxZAsNZ8W3HaW+EVKcPYy9fBOsSxU/0GEJuU=";
};
vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk=";
meta = with lib; {
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index 4cb78dcf7c99..f00e67dfdcab 100644
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
- version = "202212220043";
+ version = "202301050046";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
- rev = "4a54320369805321b90c7c5ca4cdda4f12bdd295";
- sha256 = "sha256-PFbjzzjeCKL9aak45B+R5Y+H3fTBzdXpyEvvEEdInbQ=";
+ rev = "6bb07558ac223b3decdff985d5737f4384b34238";
+ sha256 = "sha256-KXLIIs1W+8TC2GtW3m/YA5WQ13Pq5kxC5Zc9jDzW/tU=";
};
installPhase = ''
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index ceee75dd6979..b3a16ed3fc35 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
@@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-control-center";
- version = "5.6.0";
+ version = "5.6.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- hash = "sha256-WK35uDckIYU4HwuYtLj+CFVJD8O78LTQcnOvjp/et2s=";
+ hash = "sha256-rp3K7SqGw8da2U61VjKiqUyT5vCUVk4XZdRYtLwRtfQ=";
};
buildInputs = [
diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
index 0a724023418b..c9c718fb7da9 100644
--- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-desktop";
- version = "5.6.0";
+ version = "5.6.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- hash = "sha256-ajtKvy9CMr+Vsmdn49ZWYtbniZV1dqWJGTou3QY4oPc=";
+ hash = "sha256-h2Jl/4SreniZtxziDwM0iwHXgGBrnHu8NLkIX7VGP18=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
index 981b6a5d4578..e6a615bb12af 100644
--- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
@@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-screensaver";
- version = "5.6.2";
+ version = "5.6.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- hash = "sha256-xsxNGDFiBzVtoCV94iUuia45FRJGyGO522u6p1AIR6g=";
+ hash = "sha256-S4+9ZTpDwwvYTc3gz0YQBYjgygp8KP94azkiJcH6xCk=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
index 47a1e092d15c..1fcc9fb6a29a 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
@@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-settings-daemon";
- version = "5.6.0";
+ version = "5.6.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- hash = "sha256-VUGOBvMInruX1JVk9ECP8++FUrBQwDJhkZT/1pPg2wU=";
+ hash = "sha256-QR77O3rFfY0+6cKoS75xoFRplNo4nvTMtR2rNKZERYE=";
};
patches = [
diff --git a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
index c2190a65308d..31b453b0bea9 100644
--- a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
+++ b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
@@ -5,13 +5,14 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-cursor-themes";
- version = "unstable-2022-11-29";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
- rev = "aa6bb767831ac43d1768c2e639de713a4a1eba8d";
- hash = "sha256-UQnRrylUo9zuDiAwQ1COtXMtq4XTbxtMle41p+pzxJc=";
+ # They don't really do tags, this is just a named commit.
+ rev = "e17f8a4620827235dabbe5221bd0ee8c44dad0d5";
+ hash = "sha256-yLUmIVh884uDVkNil7qxf6t/gykipzBvPgzwmY3zvQk=";
};
installPhase = ''
diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index 7b9957f2392c..58a9008e3387 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
-, fetchpatch
, substituteAll
, cairo
, cinnamon-desktop
@@ -36,7 +35,7 @@
stdenv.mkDerivation rec {
pname = "muffin";
- version = "5.6.2";
+ version = "5.6.3";
outputs = [ "out" "dev" "man" ];
@@ -44,7 +43,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
- hash = "sha256-bHEBzl0aBXsHOhSWJUz428pG5M6L0s/Q6acKO+2oMXo=";
+ hash = "sha256-qcm1CRUMKFx4KDXBnaIVLHuZTzSMEWEBFTWMe85pJDE=";
};
patches = [
@@ -52,13 +51,6 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
zenity = gnome.zenity;
})
-
- # compositor: Fix crash when restarting Cinnamon
- # https://github.com/linuxmint/muffin/pull/655
- (fetchpatch {
- url = "https://github.com/linuxmint/muffin/commit/1a941ec603a1565dbd2f943f7da6e877d1541bcb.patch";
- sha256 = "sha256-6x64rWQ20ZjM9z79Pg6QMDPeFN5VNdDHBueRvy2kA6c=";
- })
];
nativeBuildInputs = [
diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix
index ef5762cd1417..58be1f5b81cb 100644
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@@ -23,24 +23,19 @@
stdenv.mkDerivation rec {
pname = "nemo";
- version = "5.6.1";
+ version = "5.6.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- sha256 = "sha256-ztx3Y+n9Bpzuz06mbkis3kdlM/0JrOaMDbRF5glzkDE=";
+ sha256 = "sha256-JwwSeY+TsbYc2ZXoxR9aja0Hb8AmrWK79cv1ApAgcpQ=";
};
patches = [
# Load extensions from NEMO_EXTENSION_DIR environment variable
# https://github.com/NixOS/nixpkgs/issues/78327
./load-extensions-from-env.patch
-
- # Don't populate nemo actions from /run/current-system/sw/share
- # They should only be loaded exactly once from $out/share
- # https://github.com/NixOS/nixpkgs/issues/190781
- ./fix-nemo-actions-duplicate-menu-items.patch
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch b/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch
deleted file mode 100644
index 3a555774c450..000000000000
--- a/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/libnemo-private/nemo-action-manager.c b/libnemo-private/nemo-action-manager.c
-index 4dac198..b671421 100644
---- a/libnemo-private/nemo-action-manager.c
-+++ b/libnemo-private/nemo-action-manager.c
-@@ -146,6 +146,8 @@ set_up_actions_directories (NemoActionManager *action_manager)
- data_dirs = (gchar **) g_get_system_data_dirs ();
-
- for (i = 0; i < g_strv_length (data_dirs); i++) {
-+ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0)
-+ continue;
- path = g_build_filename (data_dirs[i], "nemo", "actions", NULL);
- uri = g_filename_to_uri (path, NULL, NULL);
-
-diff --git a/src/nemo-action-config-widget.c b/src/nemo-action-config-widget.c
-index fc4075e..6e1c837 100644
---- a/src/nemo-action-config-widget.c
-+++ b/src/nemo-action-config-widget.c
-@@ -221,6 +221,8 @@ refresh_widget (NemoActionConfigWidget *widget)
- data_dirs = (gchar **) g_get_system_data_dirs ();
-
- for (i = 0; i < g_strv_length (data_dirs); i++) {
-+ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0)
-+ continue;
- path = g_build_filename (data_dirs[i], "nemo", "actions", NULL);
- populate_from_directory (widget, path);
- g_clear_pointer (&path, g_free);
-@@ -390,6 +392,8 @@ static void setup_dir_monitors (NemoActionConfigWidget *widget)
-
- guint i;
- for (i = 0; i < g_strv_length (data_dirs); i++) {
-+ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0)
-+ continue;
- gchar *path = g_build_filename (data_dirs[i], "nemo", "actions", NULL);
- try_monitor_path (widget, path);
- g_free (path);
-diff --git a/src/nemo-script-config-widget.c b/src/nemo-script-config-widget.c
-index 3a2d349..b8a85b4 100644
---- a/src/nemo-script-config-widget.c
-+++ b/src/nemo-script-config-widget.c
-@@ -288,6 +288,8 @@ static void setup_dir_monitors (NemoScriptConfigWidget *widget)
-
- guint i;
- for (i = 0; i < g_strv_length (data_dirs); i++) {
-+ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0)
-+ continue;
- gchar *path = g_build_filename (data_dirs[i], "nemo", "actions", NULL);
- try_monitor_path (widget, path);
- g_free (path);
diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/desktops/cinnamon/nemo/wrapper.nix
index 7f7633d19a85..604247566b84 100644
--- a/pkgs/desktops/cinnamon/nemo/wrapper.nix
+++ b/pkgs/desktops/cinnamon/nemo/wrapper.nix
@@ -24,6 +24,10 @@ symlinkJoin {
--set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions"
done
+ # Don't populate the same nemo actions twice when having this globally installed
+ # https://github.com/NixOS/nixpkgs/issues/190781#issuecomment-1365601853
+ rm -r $out/share/nemo/actions
+
# Point to wrapped binary in all service files
for file in "share/dbus-1/services/nemo.FileManager1.service" \
"share/dbus-1/services/nemo.service"
diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix
index 73ba5d99d397..9002c10e6120 100644
--- a/pkgs/desktops/cinnamon/xviewer/default.nix
+++ b/pkgs/desktops/cinnamon/xviewer/default.nix
@@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "xviewer";
- version = "3.2.11";
+ version = "3.2.12";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- sha256 = "sha256-EyrK4mnAHt/Lypuz7XX7+GFGfkfC5VDIit2WYZawI04=";
+ sha256 = "sha256-tiZeC862gHbZt76sbxseUu9vWN+1huftXpE7lQLkGKU=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix
index 6375c513f411..a98e188271cb 100644
--- a/pkgs/development/compilers/cudatoolkit/common.nix
+++ b/pkgs/development/compilers/cudatoolkit/common.nix
@@ -20,7 +20,7 @@ args@
, makeWrapper
, ncurses5
, perl
-, python27
+, python3
, requireFile
, stdenv
, unixODBC
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
runtimeDependencies = [
- ncurses5 expat python27 zlib glibc
+ ncurses5 expat python3 zlib glibc
xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
gtk2 glib fontconfig freetype unixODBC alsa-lib
];
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8792d5d26882..58ff735c5a6b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -448,7 +448,7 @@ self: super: {
#
# # Depends on itself for testing
# doctest-discover = addBuildTool super.doctest-discover
- # (if pkgs.buildPlatform != pkgs.hostPlatform
+ # (if pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform
# then self.buildHaskellPackages.doctest-discover
# else dontCheck super.doctest-discover);
doctest-discover = dontCheck super.doctest-discover;
diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix
index 3f05a546e23b..37277baae814 100644
--- a/pkgs/development/interpreters/php/8.0.nix
+++ b/pkgs/development/interpreters/php/8.0.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.0.26";
- hash = "sha256-bfh6+W8nWnWIns5uP+ShOr2Tp2epmShjvcDpDx6Ifuc=";
+ version = "8.0.27";
+ hash = "sha256-X9iCsUN3wVjBtVzGrOkfuMGbd8WW1YMa0ST7u8kC28g=";
});
in
diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index dc1b8c8581ef..6cfda280d3ef 100644
--- a/pkgs/development/interpreters/php/8.1.nix
+++ b/pkgs/development/interpreters/php/8.1.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.1.13";
- hash = "sha256-k/z9+qo9CUoP2xjOCNIPINUm7j8HoUaoqOyCzgCyN8o=";
+ version = "8.1.14";
+ hash = "sha256-FMqZMz3WBKUEojaJRkhaw103nE2pbSjcUV1+tQLf+jI=";
});
in
diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index 1ac48d7f0575..41627582dc83 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.2.0";
- hash = "sha256-G/T8pmP5PZ4LSQm9bq4Fg6HOOD5/Bd8Sbyjycvof1Ro=";
+ version = "8.2.1";
+ hash = "sha256-ddb482WZPsDR2cYoHUVX5v7sWiYZSkaLiwFFnRd++yk=";
});
in
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index 8f1bc88d7fb9..8d1c19a48ac3 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "fplll";
- version = "5.4.3";
+ version = "5.4.4";
src = fetchFromGitHub {
owner = "fplll";
repo = "fplll";
rev = version;
- sha256 = "sha256-utME3hZ3p2tx7vmp5dlAJ6J9MFEhFm/qbscGu1t9jnc=";
+ sha256 = "sha256-+1EdNdmEk5tQDd1DXklPbEKC/Dr2yV2gwbtwBtZxpNM=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index 0f75c8d1f4e5..c112f0a33485 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -1,25 +1,20 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, qtmultimedia }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, qtmultimedia, qtkeychain }:
mkDerivation rec {
pname = "libquotient";
- version = "0.6.11";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "quotient-im";
repo = "libQuotient";
rev = version;
- sha256 = "sha256-FPtxeZOfChIPi4e/h/eZkByH1QL3Fn0OJxe0dnMcTRw=";
+ sha256 = "sha256-9NAWphpAI7/qWDMjsx26s+hOaQh0hbzjePfESC7PtXc=";
};
- buildInputs = [ qtmultimedia ];
+ buildInputs = [ qtmultimedia qtkeychain ];
nativeBuildInputs = [ cmake ];
- cmakeFlags = [
- # we need libqtolm for this
- "-DQuotient_ENABLE_E2EE=OFF"
- ];
-
# https://github.com/quotient-im/libQuotient/issues/551
postPatch = ''
substituteInPlace Quotient.pc.in \
diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix
index a2f506de0133..5d9b50e7251c 100644
--- a/pkgs/development/libraries/libxlsxwriter/default.nix
+++ b/pkgs/development/libraries/libxlsxwriter/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, minizip
, python3
, zlib
@@ -9,23 +8,15 @@
stdenv.mkDerivation rec {
pname = "libxlsxwriter";
- version = "1.1.4";
+ version = "1.1.5";
src = fetchFromGitHub {
owner = "jmcnamara";
repo = "libxlsxwriter";
rev = "RELEASE_${version}";
- sha256 = "sha256-Ef1CipwUEJW/VYx/q98lN0PSxj8c3DbIuql8qU6mTRs=";
+ hash = "sha256-fC03LwZIUkEsAs9TN0n2z0iSOGPAtVCeuW5rxC7Ek7Q=";
};
- patches = [
- # https://github.com/jmcnamara/libxlsxwriter/pull/357
- (fetchpatch {
- url = "https://github.com/jmcnamara/libxlsxwriter/commit/723629976ede5e6ec9b03ef970381fed06ef95f0.patch";
- sha256 = "14aw698b5svvbhvadc2vr71isck3k02zdv8xjsa7c33n8331h20g";
- })
- ];
-
nativeBuildInputs = [
python3.pkgs.pytest
];
diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix
index a9a2ad64d7ad..1d068a90d3b3 100644
--- a/pkgs/development/libraries/mapbox-gl-qml/default.nix
+++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix
@@ -11,13 +11,13 @@
mkDerivation rec {
pname = "mapbox-gl-qml";
- version = "2.0.1";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "rinigus";
repo = "mapbox-gl-qml";
rev = version;
- hash = "sha256-EVZbQXV8pI0QTqFDTTynVglsqX1O5oK0Pl5Y/wp+/q0=";
+ hash = "sha256-zZcD85nOZZ067FRvSuzE8lr2gyuVxpcZGp44D4ayc3Q=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/maplibre-gl-native/default.nix b/pkgs/development/libraries/maplibre-gl-native/default.nix
index c680f6822b5d..568f3fbe64e2 100644
--- a/pkgs/development/libraries/maplibre-gl-native/default.nix
+++ b/pkgs/development/libraries/maplibre-gl-native/default.nix
@@ -13,14 +13,14 @@
mkDerivation rec {
pname = "maplibre-gl-native";
- version = "unstable-2022-04-07";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "maplibre";
repo = "maplibre-gl-native";
- rev = "225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806";
+ rev = "qt-v${version}";
fetchSubmodules = true;
- hash = "sha256-NLtpi+bDLTHlnzMZ4YFQyF5B1xt9lzHyZPvEQLlBAnY=";
+ hash = "sha256-g5J873U/6mrl27iquPl3BdEGhMxkOdfP15dHr27wa48=";
};
patches = [
@@ -61,6 +61,5 @@ mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ dotlambda ];
platforms = platforms.linux;
- broken = lib.versionOlder qtbase.version "5.15";
};
}
diff --git a/pkgs/development/libraries/protobuf/3.17.nix b/pkgs/development/libraries/protobuf/3.17.nix
index d869b9ce76ef..36198b5d337b 100644
--- a/pkgs/development/libraries/protobuf/3.17.nix
+++ b/pkgs/development/libraries/protobuf/3.17.nix
@@ -1,6 +1,6 @@
-{ callPackage, ... }:
+{ callPackage, ... } @ args:
-callPackage ./generic-v3.nix {
+callPackage ./generic-v3.nix ({
version = "3.17.3";
sha256 = "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d";
-}
+} // args)
diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix
index c62e4d46ce8b..7ee378d8ed3b 100644
--- a/pkgs/development/libraries/protobuf/3.19.nix
+++ b/pkgs/development/libraries/protobuf/3.19.nix
@@ -1,6 +1,6 @@
-{ callPackage, ... }:
+{ callPackage, ... } @ args:
-callPackage ./generic-v3.nix {
+callPackage ./generic-v3.nix ({
version = "3.19.6";
sha256 = "sha256-+ul9F8tyrwk2p25Dd9ragqwpYzdxdeGjpXhLAwKYWfM=";
-}
+} // args)
diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix
index 818e65639e57..bae3550f8f05 100644
--- a/pkgs/development/libraries/protobuf/3.20.nix
+++ b/pkgs/development/libraries/protobuf/3.20.nix
@@ -1,6 +1,6 @@
-{ callPackage, abseil-cpp, ... }:
+{ callPackage, ... } @ args:
-callPackage ./generic-v3.nix {
+callPackage ./generic-v3.nix ({
version = "3.20.3";
sha256 = "sha256-u/1Yb8+mnDzc3OwirpGESuhjkuKPgqDAvlgo3uuzbbk=";
-}
+} // args)
diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix
index 6ba9ca31aba6..1892ac2ea0e7 100644
--- a/pkgs/development/libraries/protobuf/3.21.nix
+++ b/pkgs/development/libraries/protobuf/3.21.nix
@@ -1,6 +1,6 @@
-{ callPackage, abseil-cpp, ... }:
+{ callPackage, ... } @ args:
-callPackage ./generic-v3-cmake.nix {
+callPackage ./generic-v3-cmake.nix ({
version = "3.21.8";
sha256 = "sha256-cSNHX18CvMmydpYWqfe6WWk9rGxIlFfY/85rfSyznU4=";
-}
+} // args)
diff --git a/pkgs/development/libraries/protobuf/3.8.nix b/pkgs/development/libraries/protobuf/3.8.nix
index 2ea03643b3ae..fe5ad4b4e02f 100644
--- a/pkgs/development/libraries/protobuf/3.8.nix
+++ b/pkgs/development/libraries/protobuf/3.8.nix
@@ -1,6 +1,6 @@
-{ callPackage, ... }:
+{ callPackage, ... } @ args:
-callPackage ./generic-v3.nix {
+callPackage ./generic-v3.nix ({
version = "3.8.0";
sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8";
-}
+} // args)
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index b85a3ad8c7a7..d10ebbdd4b77 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -26,8 +26,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ttuegel ];
license = licenses.lgpl21Plus;
platforms = with platforms; unix;
- # until macOS SDK supports Qt 5.15, 2.3.2 is the highest version of qca-qt5
- # that works on darwin
- broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix
index cf2346bad271..a15b3512aec3 100644
--- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix
+++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix
@@ -6,7 +6,6 @@
, fetchpatch
, fetchurl
, flatbuffers
-, hostPlatform
, lib
, zlib
}:
@@ -160,7 +159,7 @@ stdenv.mkDerivation rec {
mkdir "$out"
# copy the static lib and binaries into the output dir
- cp -r ./tensorflow/lite/tools/make/gen/linux_${hostPlatform.uname.processor}/{bin,lib} "$out"
+ cp -r ./tensorflow/lite/tools/make/gen/linux_${stdenv.hostPlatform.uname.processor}/{bin,lib} "$out"
find ./tensorflow/lite -type f -name '*.h' | while read f; do
path="$out/include/''${f/.\//}"
diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index 1994e4ace114..327e848d89ee 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -2,7 +2,7 @@
{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff
, fetchpatch
, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv
-, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
+, enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given."
# Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc
@@ -11,7 +11,7 @@
let
inherit (lib) optionalString optionals optional;
- pythonMajor = lib.substring 0 1 pythonInterpreter.pythonVersion;
+ pythonMajor = lib.substring 0 1 python.pythonVersion;
in stdenv.mkDerivation rec {
pname = "vtk${optionalString enableQt "-qvtk"}";
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
OpenGL
GLUT
] ++ optionals enablePython [
- pythonInterpreter
+ python
];
propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ]
++ optionals stdenv.isLinux [ libX11 libGL ];
@@ -89,6 +89,13 @@ in stdenv.mkDerivation rec {
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
'';
+ postInstall = optionalString enablePython ''
+ substitute \
+ ${./vtk.egg-info} \
+ $out/lib/python${python.pythonVersion}/site-packages/vtk-${version}.egg-info \
+ --subst-var-by VTK_VER "${version}"
+ '';
+
meta = with lib; {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = "https://www.vtk.org/";
diff --git a/pkgs/development/libraries/vtk/vtk.egg-info b/pkgs/development/libraries/vtk/vtk.egg-info
new file mode 100644
index 000000000000..a244450ad767
--- /dev/null
+++ b/pkgs/development/libraries/vtk/vtk.egg-info
@@ -0,0 +1,4 @@
+Metadata-Version: 2.1
+Version: @VTK_VER@
+Summary: VTK is an open-source toolkit for 3D computer graphics, image processing, and visualization
+Platform: UNKNOWN
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 487f854b2ce4..52fbeabf068f 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -2708,10 +2708,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/nvim-lua/plenary.nvim",
- "rev": "4b7e52044bbb84242158d977a50c4cbcd85070c7",
- "date": "2022-10-01T09:05:53+02:00",
- "path": "/nix/store/hkj69cqq4qg3d98irg8wszgl7i1bg6lv-plenary.nvim",
- "sha256": "11815h0h2mf5ym282ghk7xav90635r88qbgaflpgbyk2banl31wl",
+ "rev": "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd",
+ "date": "2023-01-06T19:47:51+01:00",
+ "path": "/nix/store/r6a56xvn5dkrsnswpg7297ihdfc1qsgy-plenary.nvim",
+ "sha256": "0y3qn0rwlwp720517lwg35f09b30b591hprbvb6hgvn1waw2ljzc",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
index ff3b87699356..22d2b643b279 100644
--- a/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -1,29 +1,21 @@
-{ lib, fetchFromGitHub, buildDunePackage, easy-format }:
+{ lib, fetchurl, buildDunePackage, camlp-streams, easy-format }:
buildDunePackage rec {
pname = "biniou";
- version = "1.2.1";
+ version = "1.2.2";
- useDune2 = true;
-
- src = fetchFromGitHub {
- owner = "ocaml-community";
- repo = pname;
- rev = version;
- sha256 = "0x2kiy809n1j0yf32l7hj102y628jp5jdrkbi3z7ld8jq04h1790";
+ src = fetchurl {
+ url = "https://github.com/ocaml-community/biniou/releases/download/${version}/biniou-${version}.tbz";
+ hash = "sha256-i/P/F80Oyy1rbR2UywjvCJ1Eyu+W6brmvmg51Cj6MY8=";
};
- propagatedBuildInputs = [ easy-format ];
+ propagatedBuildInputs = [ camlp-streams easy-format ];
strictDeps = true;
- postPatch = ''
- patchShebangs .
- '';
-
meta = {
description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
- inherit (src.meta) homepage;
+ homepage = "https://github.com/ocaml-community/biniou";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ];
mainProgram = "bdump";
diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/pkgs/development/ocaml-modules/toml/default.nix
index 41c52985cf99..baab042b1bf4 100644
--- a/pkgs/development/ocaml-modules/toml/default.nix
+++ b/pkgs/development/ocaml-modules/toml/default.nix
@@ -1,22 +1,18 @@
-{ lib, fetchFromGitHub, fetchpatch, buildDunePackage
+{ lib, fetchFromGitHub, buildDunePackage
, iso8601, menhir
}:
buildDunePackage rec {
pname = "toml";
- version = "7.0.0";
+ version = "7.1.0";
+ minimalOCamlVersion = "4.08";
+ duneVersion = "3";
src = fetchFromGitHub {
owner = "ocaml-toml";
repo = "to.ml";
rev = version;
- sha256 = "sha256-VEZQTFPwAGShCBGbKUiNOIY1zA/JdTpXU0ZIGNWopnQ=";
- };
-
- # Ensure compatibility with menhir ≥ 20211215
- patches = fetchpatch {
- url = "https://github.com/ocaml-toml/To.ml/commit/41172b739dff43424a12f7c1f0f64939e3660648.patch";
- sha256 = "sha256:1333xkmm9qp5m3pp4y5w17k6rvmb30v62qyra6rfk1km2v28hqqq";
+ hash = "sha256-uk14Py7lEEDJhFsRRtStXqKlJLtx0o8eS9DEIes4SHw=";
};
nativeBuildInputs = [ menhir ];
diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix
index ba2134d1b971..d2b28afd612f 100644
--- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix
+++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix
@@ -1,8 +1,17 @@
-{ lib, stdenv, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio, shortenPerlShebang }:
+{ lib
+, stdenv
+, file
+, fetchFromGitLab
+, buildPerlPackage
+, ArchiveZip
+, ArchiveCpio
+, SubOverride
+, shortenPerlShebang
+}:
buildPerlPackage rec {
pname = "strip-nondeterminism";
- version = "1.0.0";
+ version = "1.13.0";
outputs = [ "out" "dev" ]; # no "devdoc"
@@ -11,30 +20,42 @@ buildPerlPackage rec {
repo = "strip-nondeterminism";
domain = "salsa.debian.org";
rev = version;
- sha256 = "1pwar1fyadqxmvb7x4zyw2iawbi5lsfjcg0ps9n9rdjb6an7vv64";
+ sha256 = "sha256-KZQeoJYBPJzUvz4wlUZbiGODbpCp7/52dsg5OemKDkI=";
};
- # stray test failure
- doCheck = false;
-
+ strictDeps = true;
nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ];
- buildInputs = [ ArchiveZip ArchiveCpio ];
- propagatedNativeBuildInputs = [ file ];
+ buildInputs = [
+ ArchiveZip
+ ArchiveCpio
+ ];
- perlPostHook = ''
+ checkInputs = [ SubOverride ];
+
+ postPatch = ''
+ substituteInPlace lib/File/StripNondeterminism.pm \
+ --replace "exec('file'" "exec('${lib.getExe file}'"
+ '';
+
+
+ postBuild = ''
+ patchShebangs ./bin
+ '' + lib.optionalString stdenv.isDarwin ''
+ shortenPerlShebang bin/strip-nondeterminism
+ '';
+
+ postInstall = ''
# we don’t need the debhelper script
rm $out/bin/dh_strip_nondeterminism
- rm $out/share/man/man1/dh_strip_nondeterminism.1.gz
+ rm $out/share/man/man1/dh_strip_nondeterminism.1
'';
- postInstall = lib.optionalString stdenv.isDarwin ''
- shortenPerlShebang $out/bin/strip-nondeterminism
- '';
+ doCheck = true;
meta = with lib; {
description = "A Perl module for stripping bits of non-deterministic information";
homepage = "https://reproducible-builds.org/";
license = licenses.gpl3Only;
- maintainers = with maintainers; [ pSub ];
+ maintainers = with maintainers; [ pSub artturin ];
};
}
diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix
index 4138be3f0651..8a9447525bba 100644
--- a/pkgs/development/php-packages/datadog_trace/default.nix
+++ b/pkgs/development/php-packages/datadog_trace/default.nix
@@ -2,19 +2,18 @@
buildPecl rec {
pname = "ddtrace";
- version = "0.70.0";
+ version = "0.82.0";
src = fetchFromGitHub {
owner = "DataDog";
repo = "dd-trace-php";
rev = version;
- sha256 = "sha256-AYRBzE0Detg/IHXYutZUfPRMtfthxdkSjqD0M+VcTpY=";
+ sha256 = "sha256-QTqZRHh57mRkg0HT9qQS13emGobB0IRqM+mdImAPgtE=";
};
buildInputs = [ curl pcre2 ];
meta = with lib; {
- broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1.
description = "Datadog Tracing PHP Client";
homepage = "https://github.com/DataDog/dd-trace-php";
license = licenses.apsl20;
diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/PyVirtualDisplay/default.nix
similarity index 100%
rename from pkgs/development/python-modules/virtual-display/default.nix
rename to pkgs/development/python-modules/PyVirtualDisplay/default.nix
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index e98c0f44e0c7..33247ba3fe4f 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "13.0.3";
+ version = "13.0.4";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-gDz0eylyUae8fB+ssMZk8Mot/K9RlIIzn+B0LNdMmPs=";
+ hash = "sha256-pqCg4LAFIr5BEDqRWMaNc3M36bUmou5cZdarQ/0W77Y=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix
index 1f817b54b396..b63c59728cc4 100644
--- a/pkgs/development/python-modules/aioridwell/default.nix
+++ b/pkgs/development/python-modules/aioridwell/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aioridwell";
- version = "2022.11.0";
+ version = "2023.01.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-KxT3Se27b+XoTETXCljOVGVmEuXcpYxOhIBs1xAdtZ8=";
+ hash = "sha256-enNYzU65QBT/ryCUNwB08U+QiFvVb03fbYzZ5Qk6GTk=";
};
nativeBuildInputs = [
@@ -66,6 +66,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for interacting with Ridwell waste recycling";
homepage = "https://github.com/bachya/aioridwell";
+ changelog = "https://github.com/bachya/aioridwell/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index bc6954900ae2..d40c8de96af8 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiorun";
- version = "2021.10.1";
+ version = "2022.11.1";
format = "flit";
disabled = pythonOlder "3.5";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "cjrh";
repo = pname;
- rev = "v${version}";
- hash = "sha256-9e1vUWDBv3BYWuKR/rZUvaIxFFetzBQaygXKnl4PDd8=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-1qXt3HT/0sECOqPRwc0p+5+YZh1kyHSbkZHajcrjvZc=";
};
propagatedBuildInputs = [
@@ -42,6 +42,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Boilerplate for asyncio applications";
homepage = "https://github.com/cjrh/aiorun";
+ changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
};
diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index 041af30ddfd9..a7121a2a18cc 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "bellows";
- version = "0.34.5";
+ version = "0.34.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
- hash = "sha256-GJG3rmJoBxDrqzsNY2r1cEywRfB4tlLn2DDsaDEI3Bo=";
+ hash = "sha256-J6PUVdIs9adRdFbw9yzu1Y9jU9Ge0hGxueXbE1b03og=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 1441dced7158..d5f500cb4058 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "debugpy";
- version = "1.6.4";
+ version = "1.6.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Microsoft";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-THhu6Oa4x2b0chLFrJR7FF1z8X3/dsHzXosBmSqaDeI=";
+ sha256 = "sha256-98hyNer2Xtx6D2R3pFhLC3tb/2DFTawXO36xfwhIfEg=";
};
patches = [
diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix
index 1290aaf05757..34157b639345 100644
--- a/pkgs/development/python-modules/doorbirdpy/default.nix
+++ b/pkgs/development/python-modules/doorbirdpy/default.nix
@@ -2,16 +2,20 @@
, buildPythonPackage
, fetchPypi
, requests
+, pythonOlder
}:
buildPythonPackage rec {
pname = "doorbirdpy";
- version = "2.1.0";
+ version = "2.2.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "DoorBirdPy";
inherit version;
- sha256 = "ed0e94953cdf96111c7f73c5fcf358f65dc0ff5e47f63fc057bf18ca7512e606";
+ hash = "sha256-ZGIIko5Ac0Q4Jhz+z7FREJ4MhPF9ADDWgQFRtcZ+dWY=";
};
propagatedBuildInputs = [
@@ -21,7 +25,9 @@ buildPythonPackage rec {
# no tests on PyPI, no tags on GitLab
doCheck = false;
- pythonImportsCheck = [ "doorbirdpy" ];
+ pythonImportsCheck = [
+ "doorbirdpy"
+ ];
meta = with lib; {
description = "Python wrapper for the DoorBird LAN API";
diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix
index ff995c7ac1e5..04c0c84315fa 100644
--- a/pkgs/development/python-modules/duckdb-engine/default.nix
+++ b/pkgs/development/python-modules/duckdb-engine/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "duckdb-engine";
- version = "0.6.6";
+ version = "0.6.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
repo = "duckdb_engine";
owner = "Mause";
rev = "refs/tags/v${version}";
- hash = "sha256-OpVkMkZt5h4Rp615wx42cR/NFbv6dwsklqM8/xRswtw=";
+ hash = "sha256-ZbdrqR1apeZMnJb2hzvPyCKWl+0A9ROMZJXIshPVGW0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix
index 6a44b758d293..fe719bedb8f7 100644
--- a/pkgs/development/python-modules/gb-io/default.nix
+++ b/pkgs/development/python-modules/gb-io/default.nix
@@ -9,19 +9,19 @@
buildPythonPackage rec {
pname = "gb-io";
- version = "0.1.1";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "althonos";
repo = "gb-io.py";
rev = "v${version}";
- sha256 = "05fpz11rqqjrb8lc8id6ssv7sni9i1h7x1ra5v5flw9ghpf29ncm";
+ sha256 = "sha256-1B7BUJ8H+pTtmDtazfPfYtlXzL/x4rAHtRIFAAsSoWs=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src sourceRoot;
name = "${pname}-${version}";
- sha256 = "1qh31jysg475f2qc70b3bczmzywmg9987kn2vsmk88h8sx4nnwc5";
+ sha256 = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70=";
};
sourceRoot = "source";
diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix
index d2cd8b7740e1..036e62348fc8 100644
--- a/pkgs/development/python-modules/gcal-sync/default.nix
+++ b/pkgs/development/python-modules/gcal-sync/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "gcal-sync";
- version = "4.1.0";
+ version = "4.1.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "gcal_sync";
rev = "refs/tags/${version}";
- hash = "sha256-dmxqN0SE/qAu07ilBnVdV8k3hvpfUPLMtIfqlhSg20U=";
+ hash = "sha256-gRIioR0TrvxTEd572AEuWlamlEaNOoOcXNten5AAAkA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix
index a1bec8f3a1f4..063cece8a386 100644
--- a/pkgs/development/python-modules/graphtage/default.nix
+++ b/pkgs/development/python-modules/graphtage/default.nix
@@ -1,9 +1,8 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchFromGitHub
-, lib
, pytestCheckHook
, pythonOlder
- # Python dependencies
, colorama
, intervaltree
, json5
@@ -15,16 +14,22 @@
buildPythonPackage rec {
pname = "graphtage";
- version = "0.2.6";
+ version = "0.2.7";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "trailofbits";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0=";
+ hash = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw=";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "json5==0.9.5" "json5>=0.9.5"
+ '';
+
propagatedBuildInputs = [
colorama
intervaltree
@@ -35,18 +40,18 @@ buildPythonPackage rec {
typing-extensions
];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "json5==0.9.5" "json5>=0.9.5"
- '';
-
- pythonImportsCheck = [ "graphtage" ];
+ pythonImportsCheck = [
+ "graphtage"
+ ];
meta = with lib; {
- homepage = "https://github.com/trailofbits/graphtage";
description = "A utility to diff tree-like files such as JSON and XML";
+ homepage = "https://github.com/trailofbits/graphtage";
+ changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ veehaitch ];
};
diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix
index 17dda8404b4a..d16b1137312c 100644
--- a/pkgs/development/python-modules/hydra-core/default.nix
+++ b/pkgs/development/python-modules/hydra-core/default.nix
@@ -7,6 +7,7 @@
, importlib-resources
, jre_headless
, omegaconf
+, packaging
, pytestCheckHook
, pythonOlder
, substituteAll
@@ -48,6 +49,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
antlr4-python3-runtime
omegaconf
+ packaging
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
];
@@ -69,6 +71,8 @@ buildPythonPackage rec {
pythonImportsCheck = [
"hydra"
+ # See https://github.com/NixOS/nixpkgs/issues/208843
+ "hydra.version"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix
index 5ec01565e2d1..bcda9af2ec2a 100644
--- a/pkgs/development/python-modules/ical/default.nix
+++ b/pkgs/development/python-modules/ical/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "ical";
- version = "4.2.8";
+ version = "4.2.9";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-vOjsHGB1VJuBEfLAXUkvTbQSFi4mkpf9qROVZo3ZABY=";
+ hash = "sha256-p1cvs+xLin2WK2zyqQFd1vWKzt+LU2mpDSieOgA7Qf8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index 1437b28a06be..efad94b13dfb 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "imageio";
- version = "2.23.0";
+ version = "2.24.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
- sha256 = "sha256-y2NXCXZeUnyUiQtPu2hw5ZIT/hgqHICG0WfrNiYHPL0=";
+ sha256 = "sha256-8kD4Ip9PMpoVRigRlLUtpdZpQUGlJGaP7T+BsNB3gvo=";
inherit pname version;
};
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index 6e2b1a02402d..be6c2912dfeb 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -4,7 +4,6 @@
, unittestCheckHook
, pythonOlder
, fetchFromGitLab
-, fetchpatch
, substituteAll
, bubblewrap
, exiftool
@@ -24,7 +23,7 @@
buildPythonPackage rec {
pname = "mat2";
- version = "0.13.0";
+ version = "0.13.1";
disabled = pythonOlder "3.5";
@@ -33,7 +32,7 @@ buildPythonPackage rec {
owner = "jvoisin";
repo = "mat2";
rev = version;
- hash = "sha256-H3l8w2F+ZcJ1P/Dg0ZVBJPUK0itLocL7a0jeSrG3Ws8=";
+ hash = "sha256-/HcWVXguZf9cCGY0xlC7uMnLkSAqZ0DIAC6JUw2KKDs=";
};
patches = [
@@ -49,16 +48,6 @@ buildPythonPackage rec {
./executable-name.patch
# hardcode path to mat2 executable
./tests.patch
- # fix gobject-introspection typelib path for Nautilus extension
- (substituteAll {
- src = ./fix_poppler.patch;
- poppler_path = "${poppler_gi}/lib/girepository-1.0";
- })
- # https://0xacab.org/jvoisin/mat2/-/issues/178
- (fetchpatch {
- url = "https://0xacab.org/jvoisin/mat2/-/commit/618e0a8e3984fd534b95ef3dbdcb8a76502c90b5.patch";
- hash = "sha256-l9UFim3hGj+d2uKITiDG1OnqGeo2McBIiRSmK0Vidg8=";
- })
] ++ lib.optionals (stdenv.hostPlatform.isLinux) [
(substituteAll {
src = ./bubblewrap-path.patch;
@@ -92,9 +81,6 @@ buildPythonPackage rec {
postInstall = ''
install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps"
install -Dm 444 doc/mat2.1 -t "$out/share/man/man1"
- install -Dm 444 nautilus/mat2.py -t "$out/share/nautilus-python/extensions"
- buildPythonPath "$out $pythonPath $propagatedBuildInputs"
- patchPythonScript "$out/share/nautilus-python/extensions/mat2.py"
'' + lib.optionalString dolphinIntegration ''
install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus"
'';
diff --git a/pkgs/development/python-modules/mat2/fix_poppler.patch b/pkgs/development/python-modules/mat2/fix_poppler.patch
deleted file mode 100644
index 02bdbb6345dc..000000000000
--- a/pkgs/development/python-modules/mat2/fix_poppler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/nautilus/mat2.py b/nautilus/mat2.py
-index 11e6986..5a0e68f 100644
---- a/nautilus/mat2.py
-+++ b/nautilus/mat2.py
-@@ -22,6 +22,9 @@ import gi
- gi.require_version('Nautilus', '3.0')
- gi.require_version('Gtk', '3.0')
- gi.require_version('GdkPixbuf', '2.0')
-+gi.require_version('GIRepository', '2.0')
-+from gi.repository import GIRepository
-+GIRepository.Repository.prepend_search_path('@poppler_path@')
- from gi.repository import Nautilus, GObject, Gtk, Gio, GLib, GdkPixbuf
-
- from libmat2 import parser_factory
diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch
index 784e04cda383..53f72ce94637 100644
--- a/pkgs/development/python-modules/mat2/paths.patch
+++ b/pkgs/development/python-modules/mat2/paths.patch
@@ -13,7 +13,7 @@ index 41c8de4..11df258 100644
+Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U
+Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U
diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py
-index eb65b2a..51a0fa1 100644
+index cdfce3d..1e83520 100644
--- a/libmat2/exiftool.py
+++ b/libmat2/exiftool.py
@@ -1,8 +1,6 @@
@@ -23,13 +23,13 @@ index eb65b2a..51a0fa1 100644
import os
-import shutil
import subprocess
- from typing import Dict, Union, Set
+ from typing import Union
-@@ -70,14 +68,5 @@ class ExiftoolParser(abstract.AbstractParser):
+@@ -67,14 +65,5 @@ class ExiftoolParser(abstract.AbstractParser):
return False
return True
--@functools.lru_cache()
+-@functools.lru_cache
def _get_exiftool_path() -> str: # pragma: no cover
- which_path = shutil.which('exiftool')
- if which_path:
@@ -42,7 +42,7 @@ index eb65b2a..51a0fa1 100644
- raise RuntimeError("Unable to find exiftool")
+ return '@exiftool@'
diff --git a/libmat2/video.py b/libmat2/video.py
-index ae9e463..2acc65c 100644
+index 4d33aa4..6388664 100644
--- a/libmat2/video.py
+++ b/libmat2/video.py
@@ -1,6 +1,4 @@
@@ -51,7 +51,7 @@ index ae9e463..2acc65c 100644
-import shutil
import logging
- from typing import Dict, Union
+ from typing import Union
@@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser):
}
diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix
index 736fc1d87952..b0ddfeeefcf3 100644
--- a/pkgs/development/python-modules/mayavi/default.nix
+++ b/pkgs/development/python-modules/mayavi/default.nix
@@ -27,10 +27,6 @@ buildPythonPackage rec {
};
postPatch = ''
- # Discovery of 'vtk' in setuptools is not working properly, due to a missing
- # .egg-info in the vtk package. It does however import and run just fine.
- substituteInPlace mayavi/__init__.py --replace "'vtk'" ""
-
# building the docs fails with the usual Qt xcb error, so skip:
substituteInPlace setup.py \
--replace "build.build.run(self)" "build.build.run(self); return"
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index b58c6207a967..2c1d7766b2c9 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
- version = "2.0.8";
+ version = "2.0.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = "refs/tags/${version}";
- hash = "sha256-4zhwMCEIVYHrf9gT6Eoiw9huR5D2njDo62L0MvXqrgE=";
+ hash = "sha256-3OA61cuj9u6ejkQJgCjnu8ERjACKXz2hUekbvZqiPJ8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index 9a114514969a..8fb2c749ac40 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "minio";
- version = "7.1.12";
+ version = "7.1.13";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "minio";
repo = "minio-py";
rev = "refs/tags/${version}";
- hash = "sha256-9BjKoBQdkqkNK6StsiP0L3S5Dn8y53K5VghUIpIt46k=";
+ hash = "sha256-Kn/I5q079b4vqi+jL/pcVKMqGgs+PYgMoByX8ZzgZ5M=";
};
propagatedBuildInputs = [
@@ -56,6 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Simple APIs to access any Amazon S3 compatible object storage server";
homepage = "https://github.com/minio/minio-py";
+ changelog = "https://github.com/minio/minio-py/releases/tag/${version}";
maintainers = with maintainers; [ peterromfeldhk ];
license = licenses.asl20;
};
diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix
index f1ba9ee73304..ba635c62f7ad 100644
--- a/pkgs/development/python-modules/motioneye-client/default.nix
+++ b/pkgs/development/python-modules/motioneye-client/default.nix
@@ -1,5 +1,5 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
, aiohttp
, buildPythonPackage
, fetchFromGitHub
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "motioneye-client";
- version = "0.3.12";
+ version = "0.3.14";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -21,9 +21,15 @@ buildPythonPackage rec {
owner = "dermotduffy";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-vEB9ztz0RTGoolFUVQcMV7DUthCEAx1kpwkAS2186OU=";
+ hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8=";
};
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'aiohttp = "^3.8.1,!=3.8.2,!=3.8.3"' 'aiohttp = "*"' \
+ --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" ""
+ '';
+
nativeBuildInputs = [
poetry-core
];
@@ -38,20 +44,15 @@ buildPythonPackage rec {
pytestCheckHook
];
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" ""
- '';
-
pythonImportsCheck = [
"motioneye_client"
];
meta = with lib; {
- broken = stdenv.isDarwin;
description = "Python library for motionEye";
homepage = "https://github.com/dermotduffy/motioneye-client";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 8367074ef6ca..1ce72428c10c 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -4,7 +4,7 @@
, fetchFromGitLab
, gobject-introspection
, idna
-, libsoup
+, libsoup_3
, precis-i18n
, pygobject3
, pyopenssl
@@ -13,16 +13,16 @@
buildPythonPackage rec {
pname = "nbxmpp";
- version = "3.2.5";
+ version = "4.0.0";
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.10";
src = fetchFromGitLab {
domain = "dev.gajim.org";
owner = "gajim";
repo = "python-nbxmpp";
rev = version;
- sha256 = "sha256-HIPvZu8Zj69k1FCbkrlSeGtur5cT0TNIYfdXcRbYLwQ=";
+ hash = "sha256-6PYJGlNOZMwHMXwf05IWekJ+haMfg+ooH5On+aYOWSI=";
};
nativeBuildInputs = [
@@ -37,7 +37,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
gobject-introspection
idna
- libsoup
+ libsoup_3
pygobject3
pyopenssl
];
diff --git a/pkgs/development/python-modules/nocturne/default.nix b/pkgs/development/python-modules/nocturne/default.nix
new file mode 100644
index 000000000000..42424f1dacc9
--- /dev/null
+++ b/pkgs/development/python-modules/nocturne/default.nix
@@ -0,0 +1,61 @@
+{ buildPythonPackage
+, cmake
+, fetchFromGitHub
+, gtest
+, hydra-core
+, lib
+, nlohmann_json
+, pybind11
+, PyVirtualDisplay
+, sfml
+, substituteAll
+}:
+
+buildPythonPackage rec {
+ pname = "nocturne";
+ version = "unstable-2022-10-15";
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ owner = "facebookresearch";
+ repo = pname;
+ rev = "ae0a4e361457caf6b7e397675cc86f46161405ed";
+ hash = "sha256-pFVbl4m7qX1mJgleNabRboS9klDDsbzUa4PYL5+Jupc=";
+ };
+
+ # Simulate the git submodules but with nixpkgs dependencies
+ postUnpack = ''
+ rm -rf $sourceRoot/third_party/*
+ ln -s ${nlohmann_json.src} $sourceRoot/third_party/json
+ ln -s ${pybind11.src} $sourceRoot/third_party/pybind11
+ '';
+
+ patches = [
+ (substituteAll {
+ src = ./dependencies.patch;
+ gtest_src = gtest.src;
+ })
+ ];
+
+ nativeBuildInputs = [ cmake ];
+ dontUseCmakeConfigure = true;
+
+ buildInputs = [ sfml ];
+
+ # hydra-core and PyVirtualDisplay are not declared as dependences but they are requirements
+ propagatedBuildInputs = [ hydra-core PyVirtualDisplay ];
+
+ # Test suite requires hydra-submitit-launcher which is not packaged as of 2022-01-02
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "nocturne"
+ ];
+
+ meta = with lib; {
+ description = "A data-driven, fast driving simulator for multi-agent coordination under partial observability";
+ homepage = "https://github.com/facebookresearch/nocturne";
+ license = licenses.mit;
+ maintainers = with maintainers; [ samuela ];
+ };
+}
diff --git a/pkgs/development/python-modules/nocturne/dependencies.patch b/pkgs/development/python-modules/nocturne/dependencies.patch
new file mode 100644
index 000000000000..18843ff6309f
--- /dev/null
+++ b/pkgs/development/python-modules/nocturne/dependencies.patch
@@ -0,0 +1,27 @@
+diff --git a/nocturne/cpp/CMakeLists.txt b/nocturne/cpp/CMakeLists.txt
+index c67815f..e1f825b 100644
+--- a/nocturne/cpp/CMakeLists.txt
++++ b/nocturne/cpp/CMakeLists.txt
+@@ -62,8 +62,7 @@ include(FetchContent)
+
+ FetchContent_Declare(
+ googletest
+- GIT_REPOSITORY https://github.com/google/googletest.git
+- GIT_TAG main
++ SOURCE_DIR @gtest_src@
+ )
+
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+diff --git a/setup.py b/setup.py
+index 4863ae6..b5d3545 100644
+--- a/setup.py
++++ b/setup.py
+@@ -92,6 +92,8 @@ def main():
+ # with open("./requirements.txt", "r") as f:
+ # requires = f.read().splitlines()
+ setup(
++ # Adding `packages=` is necessary to get `python setup.py install` to work
++ packages=["nocturne", "cfgs"],
+ ext_modules=[CMakeExtension("nocturne", "./nocturne")],
+ cmdclass=dict(build_ext=CMakeBuild),
+ )
diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix
index 9184199c0acb..971a8cd5cc9e 100644
--- a/pkgs/development/python-modules/notify-py/default.nix
+++ b/pkgs/development/python-modules/notify-py/default.nix
@@ -18,17 +18,16 @@
buildPythonPackage rec {
pname = "notify-py";
- version = "0.3.38";
+ version = "0.3.39";
+ format = "pyproject";
disabled = pythonOlder "3.6";
- format = "pyproject";
-
src = fetchFromGitHub {
owner = "ms7m";
repo = pname;
- rev = "v${version}";
- hash = "sha256-wlA7a10f4PYP3dYYwZqMULQ5FMCXpOUOTxXzEEVZCsI=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-QIK5MCCOsD8SStoh7TRw+l9k28SjChwV2J/T7gMKnAs=";
};
patches = lib.optionals stdenv.isLinux [
@@ -89,6 +88,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Cross-platform desktop notification library for Python";
homepage = "https://github.com/ms7m/notify-py";
+ changelog = "https://github.com/ms7m/notify-py/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ austinbutler dotlambda ];
};
diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix
index 47e649ae3f78..256057393e77 100644
--- a/pkgs/development/python-modules/oralb-ble/default.nix
+++ b/pkgs/development/python-modules/oralb-ble/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "oralb-ble";
- version = "0.15.0";
+ version = "0.16.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-c5bsynNozFkY1VtAesKFXpwC81d8iZd48kFBHPRf43M=";
+ hash = "sha256-BbIgsIzvkUlH8JrD42Afy0U5GSk9H3ut48/XPYUZSew=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix
index 65d98db529ee..f9f0883b81d9 100644
--- a/pkgs/development/python-modules/oslo-db/default.nix
+++ b/pkgs/development/python-modules/oslo-db/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "oslo-db";
- version = "12.2.0";
+ version = "12.3.0";
src = fetchPypi {
pname = "oslo.db";
inherit version;
- sha256 = "sha256-wAA/+oqFjUfbFYIxSWWC9jgFpgqvIg4AlKhVM3MwGuc=";
+ sha256 = "sha256-egL5k/Y99DLYhGsvC3t0dluwFJRe21sBWI5qG5Gzuck=";
};
nativeBuildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix
index 244b51f3f844..ab99f7e5852e 100644
--- a/pkgs/development/python-modules/pastescript/default.nix
+++ b/pkgs/development/python-modules/pastescript/default.nix
@@ -7,16 +7,20 @@
, six
, paste
, pastedeploy
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pastescript";
- version = "3.2.1";
+ version = "3.3.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "PasteScript";
inherit version;
- sha256 = "f3ef819785e1b284e6fc108a131bce7e740b18255d96cd2e99ee3f00fd452468";
+ hash = "sha256-3eyAGhOsZn4JTt3ij5AhLN6nvcmhjUNxsI9abvfS66I=";
};
propagatedBuildInputs = [
@@ -27,9 +31,15 @@ buildPythonPackage rec {
# test suite seems to unset PYTHONPATH
doCheck = false;
- checkInputs = [ nose pytestCheckHook ];
- pythonNamespaces = [ "paste" ];
+ checkInputs = [
+ nose
+ pytestCheckHook
+ ];
+
+ pythonNamespaces = [
+ "paste"
+ ];
disabledTestPaths = [
"appsetup/testfiles"
diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 5a1f6af2760a..94479a12141d 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
- version = "10.1.4";
+ version = "10.2.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-h3kNmWa9ZOpI0DG49H3n1MPZu753nrdzSIh8V5N3H6I=";
+ hash = "sha256-uQPz7IB14dFrupZIA87jG5P7USaGKs0WWlgbaLAEPp4=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix
index dd9dbc114b23..583ce81fa409 100644
--- a/pkgs/development/python-modules/polars/default.nix
+++ b/pkgs/development/python-modules/polars/default.nix
@@ -5,13 +5,14 @@
, rustPlatform
, libiconv
, fetchzip
+, typing-extensions
}:
let
pname = "polars";
- version = "0.13.19";
+ version = "0.15.13";
rootSource = fetchzip {
- url = "https://github.com/pola-rs/${pname}/archive/refs/tags/py-polars-v${version}.tar.gz";
- sha256 = "sha256-JOHjxTTPzS9Dd/ODp4r0ebU9hEonxrbjURJoq0BQCyI=";
+ url = "https://github.com/pola-rs/${pname}/archive/refs/tags/py-${version}.tar.gz";
+ sha256 = "sha256-bk2opNLN3L+fkzXVfUU5O37UmA27ijmnAElCHjsuI+o=";
};
in
buildPythonPackage {
@@ -19,8 +20,13 @@ buildPythonPackage {
format = "pyproject";
disabled = pythonOlder "3.6";
src = rootSource;
+
+ # Cargo.lock files is sometimes behind actual release which throws an error,
+ # thus the `sed` command
+ # Make sure to check that the right substitutions are made when updating the package
preBuild = ''
cd py-polars
+ sed -i 's/version = "0.15.11"/version = "${version}"/g' Cargo.lock
'';
cargoDeps = rustPlatform.fetchCargoTarball {
@@ -29,10 +35,15 @@ buildPythonPackage {
cd py-polars
'';
name = "${pname}-${version}";
- sha256 = "sha256-KEt8lITY4El2afuh2cxnrDkXGN3MZgfKQU3Pe2jECF0=";
+ sha256 = "sha256-u7ascftUPz8K+gWwjjxdXXFJf++M+8P9QE/KVJkO5DM=";
};
cargoRoot = "py-polars";
+ # Revisit this whenever package or Rust is upgraded
+ RUSTC_BOOTSTRAP = 1;
+
+ propagatedBuildInputs = if pythonOlder "3.10" then [ typing-extensions ] else [];
+
nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@@ -49,36 +60,7 @@ buildPythonPackage {
# ];
meta = with lib; {
- # Adding cmake to nativeBuildInputs and using `dontUseCmakeConfigure = true;`
- # The following error still happens
-
- # Compiling arrow2 v0.10.1 (https://github.com/ritchie46/arrow2?branch=polars#da703ae3)
- # error[E0554]: `#![feature]` may not be used on the stable release channel
- # --> /build/polars-0.13.19-vendor.tar.gz/arrow2/src/lib.rs:8:39
- # |
- # 8 | #![cfg_attr(feature = "simd", feature(portable_simd))]
- # | ^^^^^^^^^^^^^
- # error: aborting due to previous error
- # For more information about this error, try `rustc --explain E0554`.
- # error: could not compile `arrow2` due to 2 previous errors
- # warning: build failed, waiting for other jobs to finish...
- # maturin failed
- # Caused by: Failed to build a native library through cargo
- # Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s`
- # error: builder for '/nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv' failed with exit code 1;
- # last 10 log lines:
- # > error: aborting due to previous error
- # >
- # >
- # > For more information about this error, try `rustc --explain E0554`.
- # >
- # > error: could not compile `arrow2` due to 2 previous errors
- # > warning: build failed, waiting for other jobs to finish...
- # > maturin failed
- # > Caused by: Failed to build a native library through cargo
- # > Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s`
- # For full logs, run 'nix log /nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv'.
- broken = true;
+ broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js ";
homepage = "https://github.com/pola-rs/polars";
license = licenses.asl20;
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 9fd494ede2f5..74a34ae60b3f 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pontos";
- version = "22.12.3";
+ version = "23.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-RzNc8clL6kqJuC0+KJLtgby/6Bn/CS3QLfx7Ug6TX3M=";
+ hash = "sha256-2ca+VGylu4Km7M2Oz76ljbhSIDehVfviwVXnV+pXFRE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix
index 394ea6e3fb0d..004572279abb 100644
--- a/pkgs/development/python-modules/pybotvac/default.nix
+++ b/pkgs/development/python-modules/pybotvac/default.nix
@@ -1,22 +1,22 @@
{ lib
, buildPythonPackage
, fetchPypi
+, pythonOlder
, requests
, requests-oauthlib
, voluptuous
-, pythonOlder
}:
buildPythonPackage rec {
pname = "pybotvac";
- version = "0.0.23";
+ version = "0.0.24";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-VLT+VlwQAAxU1WRNCB4t4fhQ2u+6w5zqdM6mSbR7+xI=";
+ hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU=";
};
propagatedBuildInputs = [
@@ -25,7 +25,7 @@ buildPythonPackage rec {
voluptuous
];
- # no tests
+ # Module no tests
doCheck = false;
pythonImportsCheck = [
@@ -35,7 +35,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module for interacting with Neato Botvac Connected vacuum robots";
homepage = "https://github.com/stianaske/pybotvac";
+ changelog = "https://github.com/stianaske/pybotvac/releases/tag/v${version}";
license = licenses.mit;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix
index f2263a99dff1..d0f4437cddb3 100644
--- a/pkgs/development/python-modules/pyisy/default.nix
+++ b/pkgs/development/python-modules/pyisy/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyisy";
- version = "3.0.11";
+ version = "3.0.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "automicus";
repo = "PyISY";
rev = "refs/tags/v${version}";
- hash = "sha256-oJ6Y4Bo4OLPVEy8vygU1FeRpZskfkCFBObvzTMuif5M=";
+ hash = "sha256-i9xC1Vijf/pU7WmRaosdEs5tPNos2hq3cGkT8MGM1Ro=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index 704c2526328b..91f09cc531ff 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pylitterbot";
- version = "2022.12.0";
+ version = "2023.1.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "natekspencer";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-uqiSNqM1HKNAipIKKsUHv9mPfdk01ZrNWMXIzhgxxjU=";
+ hash = "sha256-XUiDZW3r8I8Vyx30UhopQ6S0HpSi0VNgvyu2RMNt2Eg=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix
index 596c3a64cd70..726b37946b9e 100644
--- a/pkgs/development/python-modules/pysolcast/default.nix
+++ b/pkgs/development/python-modules/pysolcast/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pysolcast";
- version = "1.0.12";
+ version = "1.0.13";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "mcaulifn";
repo = "solcast";
- rev = "v${version}";
- hash = "sha256-azcEbv/4M3UqRyV30yld+6pWbSxbGXiJJHWMDL4xgOM=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-peoC6NrenfQYqr1hgPth8pqyTRZb+phD6UQhjnZF92U=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -53,6 +53,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for interacting with the Solcast API";
homepage = "https://github.com/mcaulifn/solcast";
+ changelog = "https://github.com/mcaulifn/solcast/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix
index beba51305780..d62afa646860 100644
--- a/pkgs/development/python-modules/pysoma/default.nix
+++ b/pkgs/development/python-modules/pysoma/default.nix
@@ -1,20 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pysoma";
- version = "0.0.11";
+ version = "0.0.12";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-U/kLaO/GBpOa9mHHlYQiWSw7sVNPaMneDURoJBqqojo=";
+ hash = "sha256-me/A3BIAFJ8CxyiF5RvANdC/NbSYGmcjCFbpybkTxKM=";
};
# Project has no test
doCheck = false;
- pythonImportsCheck = [ "api" ];
+
+ pythonImportsCheck = [
+ "api"
+ ];
meta = with lib; {
description = "Python wrapper for the HTTP API provided by SOMA Connect";
diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix
index 47614cffdfdb..4ee6f81ac31f 100644
--- a/pkgs/development/python-modules/pyswitchbee/default.nix
+++ b/pkgs/development/python-modules/pyswitchbee/default.nix
@@ -4,11 +4,12 @@
, fetchFromGitHub
, setuptools
, pythonOlder
+, packaging
}:
buildPythonPackage rec {
pname = "pyswitchbee";
- version = "1.7.3";
+ version = "1.7.18";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -17,21 +18,16 @@ buildPythonPackage rec {
owner = "jafar-atili";
repo = "pySwitchbee";
rev = "refs/tags/${version}";
- hash = "sha256-M3sxxBp4IoqZLX9Lyw35Z0zkV6fDT7AkeDOcdPN5k7w=";
+ hash = "sha256-LQjtePFSMvZdAGH6f8CveaE7ASm/x9GuFj9s3TipYHQ=";
};
- postPatch = ''
- # https://github.com/jafar-atili/pySwitchbee/pull/2
- substituteInPlace pyproject.toml \
- --replace '"asyncio",' ""
- '';
-
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiohttp
+ packaging
];
# Module doesn't have tests
diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 485dec0413fd..49c90630da07 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
- version = "0.36.2";
+ version = "0.36.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
- hash = "sha256-I+OnxSQ/984aoloe/1673JDaVzG6yKOSrDvGuupAnkc=";
+ hash = "sha256-X4Ym+UmAY/O6UB26CVrqLPD03WP/3uzOJdKW/aUCwrc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix
index c3dabe7f6e30..f4038c557797 100644
--- a/pkgs/development/python-modules/pytest-xvfb/default.nix
+++ b/pkgs/development/python-modules/pytest-xvfb/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytest
-, virtual-display
+, PyVirtualDisplay
, isPy27
}:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
buildInputs = [ pytest ];
propagatedBuildInputs = [
- virtual-display
+ PyVirtualDisplay
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 62e6ce951bde..01dc904293e9 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "python-lsp-server";
- version = "1.6.0";
+ version = "1.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "python-lsp";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q=";
+ hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -51,10 +51,10 @@ buildPythonPackage rec {
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
--replace "--cov pylsp --cov test" "" \
--replace "autopep8>=1.6.0,<1.7.0" "autopep8" \
- --replace "flake8>=5.0.0,<5.1.0" "flake8" \
+ --replace "flake8>=5.0.0,<7" "flake8" \
--replace "mccabe>=0.7.0,<0.8.0" "mccabe" \
- --replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \
- --replace "pyflakes>=2.5.0,<2.6.0" "pyflakes"
+ --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \
+ --replace "pyflakes>=2.5.0,<3.1.0" "pyflakes"
'';
nativeBuildInputs = [
@@ -150,6 +150,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python implementation of the Language Server Protocol";
homepage = "https://github.com/python-lsp/python-lsp-server";
+ changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix
new file mode 100644
index 000000000000..a3c50a44d0fc
--- /dev/null
+++ b/pkgs/development/python-modules/pytoolconfig/default.nix
@@ -0,0 +1,79 @@
+{ lib
+, buildPythonPackage
+, docutils
+, fetchFromGitHub
+, packaging
+, pdm-pep517
+, platformdirs
+, pydantic
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, sphinx
+, tabulate
+, tomli
+}:
+
+buildPythonPackage rec {
+ pname = "pytoolconfig";
+ version = "1.2.5";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "bagel897";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ hash = "sha256-b7er/IgXr2j9dSnI87669BXWA5CXNTzwa1DTpl8PBZ4=";
+ };
+
+ postPatch = ''
+ # License file name doesn't match
+ substituteInPlace pyproject.toml \
+ --replace "license = { file = 'LGPL-3.0' }" "" \
+ --replace 'dynamic = ["version"]' 'version = "${version}"' \
+ --replace "packaging>=22.0" "packaging"
+ '';
+
+ nativeBuildInputs = [
+ pdm-pep517
+ ];
+
+ propagatedBuildInputs = [
+ packaging
+ ] ++ lib.optionals (pythonOlder "3.11") [
+ tomli
+ ];
+
+ passthru.optional-dependencies = {
+ validation = [
+ pydantic
+ ];
+ global = [
+ platformdirs
+ ];
+ doc = [
+ sphinx
+ tabulate
+ ];
+ };
+
+ checkInputs = [
+ docutils
+ pytestCheckHook
+ ] ++ passthru.optional-dependencies.global
+ ++ passthru.optional-dependencies.doc;
+
+ pythonImportsCheck = [
+ "pytoolconfig"
+ ];
+
+ meta = with lib; {
+ description = "Module for tool configuration";
+ homepage = "https://github.com/bagel897/pytoolconfig";
+ changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix
index 9d5a28994986..e4fbf8ff3f14 100644
--- a/pkgs/development/python-modules/pyunifiprotect/default.nix
+++ b/pkgs/development/python-modules/pyunifiprotect/default.nix
@@ -29,7 +29,7 @@
buildPythonPackage rec {
pname = "pyunifiprotect";
- version = "4.5.3";
+ version = "4.6.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "briis";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-FZXnJorY7WNgDVajULZyFwJ13RBbClXK38CCyF7ASmI=";
+ hash = "sha256-D7XIq9uwb3SaVa6NW4jDFeK73zsf51EG+5EkqgGlxCo=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index c554f9febf43..f29ecc171b8f 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
- version = "0.1.3";
+ version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
- sha256 = "sha256-4qg43qxrgBSES2ng7DbjgWrsXY+3+olvUe19zW2UXCE=";
+ sha256 = "sha256-AscfyYURP91aDoPo/ii3uEHQL82DAHpBHlGm1MjLx8c=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix
index 6e782b1bd336..e6e31041c2fa 100644
--- a/pkgs/development/python-modules/restrictedpython/default.nix
+++ b/pkgs/development/python-modules/restrictedpython/default.nix
@@ -3,17 +3,20 @@
, fetchPypi
, pytest-mock
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "restrictedpython";
- version = "5.2";
+ version = "6.0";
format = "setuptools";
+ disabled = pythonOlder "3.7";
+
src = fetchPypi {
pname = "RestrictedPython";
inherit version;
- sha256 = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs=";
+ hash = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0=";
};
checkInputs = [
@@ -28,6 +31,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Restricted execution environment for Python to run untrusted code";
homepage = "https://github.com/zopefoundation/RestrictedPython";
+ changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${version}/CHANGES.rst";
license = licenses.zpl21;
maintainers = with maintainers; [ juaningan ];
};
diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix
index da4f3699a761..5648d3efddee 100644
--- a/pkgs/development/python-modules/rfcat/default.nix
+++ b/pkgs/development/python-modules/rfcat/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchFromGitHub
, future
@@ -6,7 +7,6 @@
, numpy
, pyserial
, pyusb
-, hostPlatform
, pytestCheckHook
, pythonOlder
}:
@@ -33,7 +33,7 @@ buildPythonPackage rec {
pyusb
];
- postInstall = lib.optionalString hostPlatform.isLinux ''
+ postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
mkdir -p $out/etc/udev/rules.d
cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d
'';
diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index 21d5886efe21..f831e7af40c0 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -1,33 +1,55 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, setuptools
+, pytoolconfig
+}:
buildPythonPackage rec {
pname = "rope";
- version = "0.18.0";
+ version = "1.6.0";
+ format = "pyproject";
- src = fetchPypi {
- inherit pname version;
- sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "python-rope";
+ repo = pname;
+ rev = "refs/tags/${version}";
+ hash = "sha256-avNCti288dY9pl5AVTmUzZU/vb6WDkXEtELNlEi6L/o=";
};
- patches = [
- # Python 3.9 ast changes
- (fetchpatch {
- url = "https://github.com/python-rope/rope/pull/333.patch";
- excludes = [ ".github/workflows/main.yml" ];
- sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0";
- })
+ nativeBuildInputs = [
+ setuptools
];
- checkInputs = [ nose ];
- checkPhase = ''
- # tracked upstream here https://github.com/python-rope/rope/issues/247
- NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest
- '';
+ propagatedBuildInputs = [
+ pytoolconfig
+ ]++ pytoolconfig.optional-dependencies.global;
+
+ checkInputs = [
+ pytest-timeout
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "rope"
+ ];
+
+ disabledTests = [
+ "test_search_submodule"
+ "test_get_package_source_pytest"
+ "test_get_modname_folder"
+ ];
meta = with lib; {
description = "Python refactoring library";
homepage = "https://github.com/python-rope/rope";
- maintainers = with maintainers; [ goibhniu ];
+ changelog = "https://github.com/python-rope/rope/blob/${version}/CHANGELOG.md";
license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ goibhniu ];
};
}
diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 681ecfaefe3b..bf86e0e71453 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "ropper";
- version = "1.13.7";
+ version = "1.13.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "sashs";
repo = "Ropper";
rev = "v${version}";
- hash = "sha256-3tWWIYqh/G/b7Z6BMua5bRvtSh4SibT6pv/NArhmqPE=";
+ hash = "sha256-agbqP5O9QEP5UKkaWI5HxAlMsCBPKNSLnAAo2WFDXS8=";
};
propagatedBuildInputs = [
@@ -36,10 +36,10 @@ buildPythonPackage rec {
];
meta = with lib; {
- broken = stdenv.isDarwin;
description = "Show information about files in different file formats";
homepage = "https://scoding.de/ropper/";
license = licenses.bsd3;
maintainers = with maintainers; [ bennofs ];
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix
new file mode 100644
index 000000000000..1780d94ded9b
--- /dev/null
+++ b/pkgs/development/python-modules/sfrbox-api/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, click
+, defusedxml
+, fetchFromGitHub
+, httpx
+, poetry-core
+, pydantic
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, respx
+}:
+
+buildPythonPackage rec {
+ pname = "sfrbox-api";
+ version = "0.0.2";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "hacf-fr";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ hash = "sha256-kXM+Y7ZKKczVdKTXqmbgSxlFfHx3hAvT9nkF3Ex7ChY=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'pydantic = ">=1.10.2"' 'pydantic = "*"'
+ '';
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ click
+ defusedxml
+ httpx
+ pydantic
+ ];
+
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ respx
+ ];
+
+ pythonImportsCheck = [
+ "sfrbox_api"
+ ];
+
+ meta = with lib; {
+ description = "Module for the SFR Box API";
+ homepage = "https://github.com/hacf-fr/sfrbox-api";
+ changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/v${version}";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index ed25bdb37ed4..85b8d1ea2e35 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "soco";
- version = "0.28.1";
+ version = "0.29.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
- rev = "v${version}";
- hash = "sha256-Po9ns+XQ8WuILKrinllm/lqZFWEBnylesCoqs+cnKs4=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-6xyJY+qgwMsOgnh+PTVCf4F442hnBwlFnW+bt/cWxGc=";
};
propagatedBuildInputs = [
@@ -52,6 +52,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "CLI and library to control Sonos speakers";
homepage = "http://python-soco.com/";
+ changelog = "https://github.com/SoCo/SoCo/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault ];
};
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index f39b03763c81..837cf0c0a520 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "spyder-kernels";
- version = "2.4.0";
+ version = "2.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-O9MvvjChUKucztvVvrbd04veHZqHeNpS9+30ILv7jlE=";
+ hash = "sha256-eD2N+9cVzZdyjpE5FnebN8+OllZjVevaz+NBHSvrR5Y=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index bb744b2abab4..d6d408b8c686 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -46,14 +46,14 @@
buildPythonPackage rec {
pname = "spyder";
- version = "5.4.0";
+ version = "5.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-nZ+rw5qALSdu+nbaAtGA7PLW6XjcjeZvuPd4a5WtZkw=";
+ hash = "sha256-kQBOYRXhjz+OQk7Vlxb/UKiDi92mA8ialsFQ+QzqhlE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix
index e3210b443252..63858112ced3 100644
--- a/pkgs/development/python-modules/tailscale/default.nix
+++ b/pkgs/development/python-modules/tailscale/default.nix
@@ -21,10 +21,17 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "frenck";
repo = "python-tailscale";
- rev = "v${version}";
- sha256 = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE=";
};
+ postPatch = ''
+ # Upstream doesn't set a version for the pyproject.toml
+ substituteInPlace pyproject.toml \
+ --replace "0.0.0" "${version}" \
+ --replace "--cov" ""
+ '';
+
nativeBuildInputs = [
poetry-core
];
@@ -41,13 +48,6 @@ buildPythonPackage rec {
pytestCheckHook
];
- postPatch = ''
- # Upstream doesn't set a version for the pyproject.toml
- substituteInPlace pyproject.toml \
- --replace "0.0.0" "${version}" \
- --replace "--cov" ""
- '';
-
pythonImportsCheck = [
"tailscale"
];
@@ -55,6 +55,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python client for the Tailscale API";
homepage = "https://github.com/frenck/python-tailscale";
+ changelog = "https://github.com/frenck/python-tailscale/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix
new file mode 100644
index 000000000000..e521182a395a
--- /dev/null
+++ b/pkgs/development/python-modules/thefuzz/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytestCheckHook
+, hypothesis
+, python-Levenshtein
+}:
+
+buildPythonPackage rec {
+ pname = "thefuzz";
+ version = "0.19.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-b3Em2y8silQhKwXjp0DkX0KRxJfXXSB1Fyj2Nbt0qj0=";
+ };
+
+ propagatedBuildInputs = [ python-Levenshtein ];
+
+ # Skip linting
+ postPatch = ''
+ substituteInPlace test_thefuzz.py --replace "import pycodestyle" ""
+ '';
+
+ pythonImportsCheck = [
+ "thefuzz"
+ ];
+
+ checkInputs = [
+ hypothesis
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Skip linting
+ "test_pep8_conformance"
+ ];
+
+ meta = with lib; {
+ description = "Fuzzy string matching for Python";
+ homepage = "https://github.com/seatgeek/thefuzz";
+ changelog = "https://github.com/seatgeek/thefuzz/blob/${version}/CHANGES.rst";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ sumnerevans ];
+ };
+}
diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index 0f67fe231a33..45ac7a9e8772 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "tpm2-pytss";
- version = "2.0.0";
+ version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-iN5ePKMnYh1VzGbKtwdIx1tG74T+8ax/AqDGgermr90=";
+ hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
index 3d1b274d0690..76678539bd9c 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "uritools";
- version = "4.0.0";
+ version = "4.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "420d94c1ff4bf90c678fca9c17b8314243bbcaa992c400a95e327f7f622e1edf";
+ hash = "sha256-78XDpt4FQEhQaFqNPzTahHa1aqNRb7+O/1yHBMeigm8=";
};
pythonImportsCheck = [
@@ -23,6 +23,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse";
homepage = "https://github.com/tkem/uritools/";
+ changelog = "https://github.com/tkem/uritools/blob/v${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ rvolosatovs ];
};
diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix
index 85dc1bcff1d2..793565da6807 100644
--- a/pkgs/development/python-modules/whois/default.nix
+++ b/pkgs/development/python-modules/whois/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "whois";
- version = "0.9.21";
+ version = "0.9.22";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "DannyCork";
repo = "python-whois";
rev = "refs/tags/${version}";
- hash = "sha256-gsWvmAnzlm31UHT//VbXvryKWN8m/+hvLoKxLmQOK5k=";
+ hash = "sha256-k1pvElqZTWJp8PTvQJCFeJqfzHW/QJQXCd4zBAtU0G4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 5fd59516d492..893a59dffaeb 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "zigpy";
- version = "0.52.3";
+ version = "0.53.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = "refs/tags/${version}";
- hash = "sha256-axk6C8RLuoKWUdJ3sOklWqnlYTWKTaQh51eWZm2Dy+0=";
+ hash = "sha256-9KTBzPklQpqzLOQYRz6Kd0wUSHr2sfypvTu0X7om31Y=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 72562d4935bd..94165d992d8d 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, buildPackages
, pkg-config
, meson
@@ -56,6 +57,14 @@ stdenv.mkDerivation rec {
hash = "sha256-9bDwtMNru7tG0L735y+Vrcg7Htk/TV9SVZn7WP4Ap4c=";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2022-4843.patch";
+ url = "https://github.com/radareorg/radare2/commit/842f809d4ec6a12af2906f948657281c9ebc8a24.patch";
+ sha256 = "sha256-asEXW9Ox48w9WQhOA9tleXIvynIjsWb6ItKmFTojgbQ=";
+ })
+ ];
+
preBuild = ''
pushd ../libr/arch/p/arm/v35arm64
cp -r ${arm64} arch-arm64
diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix
index 095055cbedce..50a496d93824 100644
--- a/pkgs/development/tools/icr/default.nix
+++ b/pkgs/development/tools/icr/default.nix
@@ -33,7 +33,7 @@ crystal.buildCrystalPackage rec {
postFixup = ''
wrapProgram $out/bin/icr \
- --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]}
+ --prefix PATH : ${lib.makeBinPath [ crystal shards which ]}
'';
meta = with lib; {
diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix
index 343d41be6f10..0856a8373881 100644
--- a/pkgs/development/tools/mask/default.nix
+++ b/pkgs/development/tools/mask/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mask";
- version = "0.11.2";
+ version = "0.11.3";
src = fetchFromGitHub {
owner = "jacobdeichert";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-mlARZ05xppPvr6Z5uoveYt3Y3LtdMkbFqxW1EkX+ud0=";
+ sha256 = "sha256-mPnykI3scTBzGjDa8nawWYRvZBkq74/t5WMbMbs3zVE=";
};
- cargoSha256 = "sha256-EulRz/IjLLvNT9YxyNjJynFEGyQ/Q2Out984xS9Wp5o=";
+ cargoSha256 = "sha256-h58MA3F4UA4gp64UPnK6Tvlvr4PFvrVKmjp48lZjH68=";
# tests require mask to be installed
doCheck = false;
@@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A CLI task runner defined by a simple markdown file";
homepage = "https://github.com/jacobdeichert/mask";
+ changelog = "https://github.com/jacobdeichert/mask/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix
index 3094937a7e36..45abd9cd83b4 100644
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "oh-my-posh";
- version = "12.26.2";
+ version = "12.35.2";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-WznHvGNpb2iGz+jZFtphkxsGeT0Y25CO5MMjmAl7GV0=";
+ hash = "sha256-6w8m7AuSEFhoYhjAJMXmwpsYuIMCvTiFKasUnBgYYCM=";
};
- vendorHash = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";
+ vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E=";
sourceRoot = "source/src";
@@ -36,6 +36,7 @@ buildGoModule rec {
];
postInstall = ''
+ mv $out/bin/{src,oh-my-posh}
mkdir -p $out/share/oh-my-posh
cp -r ${src}/themes $out/share/oh-my-posh/
installShellCompletion --cmd oh-my-posh \
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index d3a3cd702319..fe30f1b3b190 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "byacc";
- version = "20221106";
+ version = "20221229";
src = fetchurl {
urls = let
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
"ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
];
- hash = "sha256-qJm+Inu8rJz3cA99u1qElGiPH58GF7UQdi2urOR7nRI=";
+ hash = "sha256-ExbG95D6+maIQn8f+RJnth2LeHO0Q8Yg7vaabv8FA7w=";
};
configureFlags = [
diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
index b57f6f29f4c0..df204220b5be 100644
--- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
+++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
@@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-cov";
- version = "0.5.2";
+ version = "0.5.4";
src = fetchzip {
url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz";
- sha256 = "sha256-K6r2YHQq3MEqq9aobJLZBH9COPXpW3TmX1GB1qfnV60=";
+ sha256 = "sha256-xBWp9+Vv1Ho63WWlvbvLU+h0dh5CpUamlRQtmX6rOeY=";
};
- cargoSha256 = "sha256-oMisrS+fDzSdT6JmkAMk8kztOgw2XUOrkhehmd9gxL0=";
+ cargoSha256 = "sha256-GKrqB6BtRbhtOlD2YeEMh6aqblPNEJjkR+tAsSpOFig=";
# skip tests which require llvm-tools-preview
checkFlags = [
diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix
index d5627993e298..4ebb819623f0 100644
--- a/pkgs/development/tools/rust/cargo-public-api/default.nix
+++ b/pkgs/development/tools/rust/cargo-public-api/default.nix
@@ -4,22 +4,24 @@
, pkg-config
, openssl
, stdenv
+, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
- version = "0.24.1";
+ version = "0.26.0";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-xXwJ6MXnSgqIQ5IuqfDm/TUXgkppKCPG3TB7veza/H8=";
+ sha256 = "sha256-BiGVdWgDi+g+mxdM3+z5RN1pGJz9NIKVm8sTZf2ObCc=";
};
- cargoSha256 = "sha256-1sSvK8oZspIxDcMAl2MyAQzuijAxj1kpiZf1QwwyYDs=";
+ cargoSha256 = "sha256-QvZBWo/u+WtIG5zlDVTC2+5bq/mqZftXU5m8oqN25GM=";
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openssl ];
+ buildInputs = [ openssl ]
+ ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
# Tests fail
doCheck = false;
diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix
index 54ba458bbb6b..36658b506a41 100644
--- a/pkgs/development/tools/zed/default.nix
+++ b/pkgs/development/tools/zed/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "zed";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "brimdata";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-DVQoWam5szELJ3OeIKHYF0CBZ0AJlhuIJRrdhqmyhQM=";
+ sha256 = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU=";
};
- vendorSha256 = "sha256-2zSSjAoeb+7Nk/dxpvp5P2/bSJXgkA0TieTQHK4ym1Y=";
+ vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk=";
subPackages = [ "cmd/zed" "cmd/zq" ];
diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix
index ceef75f4585e..614733e549a8 100644
--- a/pkgs/games/BeatSaberModManager/default.nix
+++ b/pkgs/games/BeatSaberModManager/default.nix
@@ -1,7 +1,7 @@
{
lib,
dotnet-sdk,
- targetPlatform,
+ stdenv,
substituteAll,
buildDotnetModule,
@@ -34,7 +34,7 @@ buildDotnetModule rec {
patches = [
(substituteAll {
src = ./add-runtime-identifier.patch;
- runtimeIdentifier = dotnetCorePackages.systemToDotnetRid targetPlatform.system;
+ runtimeIdentifier = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system;
})
];
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index d5656d0d5c3b..a25c6fa9050f 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -18,13 +18,13 @@ let
in stdenv.mkDerivation rec {
pname = "eduke32";
- version = "20221026";
- rev = "10165";
- revExtra = "a9c797dcb";
+ version = "20221225";
+ rev = "10166";
+ revExtra = "122aee012";
src = fetchurl {
url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz";
- sha256 = "sha256-8xvIe+kVOu2VIZACHis04tvyrl1IRrt0tY8D04n6ZjU=";
+ sha256 = "sha256-3pBYZJqoH7XBkJ537wPwBSmNaZprvOlVtAKTo8EOT3Q=";
};
buildInputs = [
@@ -48,7 +48,12 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkg-config ]
++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm;
- postPatch = lib.optionalString stdenv.isLinux ''
+ postPatch = ''
+ substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \
+ --replace '#include ' '#include ' \
+ --replace '#include ' '#include ' \
+ --replace '#include ' '#include '
+ '' + lib.optionalString stdenv.isLinux ''
substituteInPlace source/build/src/glbuild.cpp \
--replace libGLU.so ${libGLU}/lib/libGLU.so
@@ -56,11 +61,6 @@ in stdenv.mkDerivation rec {
substituteInPlace source/glad/src/$f \
--replace libGL.so ${libGL}/lib/libGL.so
done
-
- substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \
- --replace '#include ' '#include ' \
- --replace '#include ' '#include ' \
- --replace '#include ' '#include '
'';
makeFlags = [
diff --git a/pkgs/misc/ananicy-cpp/default.nix b/pkgs/misc/ananicy-cpp/default.nix
index 30e3341294f7..96284ba03ae6 100644
--- a/pkgs/misc/ananicy-cpp/default.nix
+++ b/pkgs/misc/ananicy-cpp/default.nix
@@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
pname = "ananicy-cpp";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitLab {
owner = "ananicy-cpp";
repo = "ananicy-cpp";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "sha256-07LWIC2y6b1iiPCVa8mlBYAnSmahm0oJ2d3/uW4rC94=";
+ sha256 = "sha256-iR7yIIGJbRwu62GIEYi70PjtlKXmkPYqSJtMddspBKA=";
};
nativeBuildInputs = [
diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix
index 7d5af28d8107..b93c46f09100 100644
--- a/pkgs/misc/dxvk/default.nix
+++ b/pkgs/misc/dxvk/default.nix
@@ -1,6 +1,5 @@
{ lib
, pkgs
-, hostPlatform
, stdenvNoCC
, fetchFromGitHub
, pkgsCross
@@ -8,7 +7,7 @@
stdenvNoCC.mkDerivation (finalAttrs:
let
- inherit (hostPlatform.uname) system;
+ inherit (stdenvNoCC.hostPlatform.uname) system;
# DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that
# needs to be built with a cross-compiler.
dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix {
diff --git a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh
index d7c3fc89c525..418a1d625d6a 100755
--- a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh
+++ b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh
@@ -1,8 +1,16 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl
+#!nix-shell -i bash -p curl jq
-# usage:
-# generate-sdk-packages.sh macos 11.0.1
+usage() {
+ cat <>$outfile echo "$pname = applePackage' \"$pname\" \"$version\" \"$sdkName\" \"$sha256\" {};"
fi
}
-readarray -s1 -c1 -C parse_line < <(curl -sS "https://opensource.apple.com/text/${sdkName//./}.txt")
+readarray -s1 -c1 -C parse_line < <(curl -sSL "https://github.com/apple-oss-distributions/distribution-${1//-/_}/raw/${sdkName//./}/release.json" | jq -r ".projects[].tag")
>>$outfile echo '}'
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 2ce607896b5e..6d1929ef982c 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -1,10 +1,10 @@
-{ buildPlatform, requireFile, targetPlatform, lib }:
+{ stdenv, requireFile, lib }:
let requireXcode = version: sha256:
let
xip = "Xcode_" + version + ".xip";
# TODO(alexfmpe): Find out how to validate the .xip signature in Linux
- unxip = if buildPlatform.isDarwin
+ unxip = if stdenv.buildPlatform.isDarwin
then ''
open -W ${xip}
rm -rf ${xip}
@@ -66,6 +66,6 @@ in lib.makeExtensible (self: {
xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp";
xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v";
xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189";
- xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (targetPlatform ? xcodeVer) then targetPlatform.xcodeVer else "12.3")}";
+ xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}";
})
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index 0512d9dd46a1..50eb50ea6b78 100644
--- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
+++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
@@ -1,4 +1,4 @@
-{ targetPlatform
+{ stdenv
, clang-unwrapped
, binutils-unwrapped
, runCommand
@@ -12,7 +12,7 @@
let
-minSdkVersion = targetPlatform.minSdkVersion or "9.0";
+minSdkVersion = stdenv.targetPlatform.minSdkVersion or "9.0";
in
@@ -22,8 +22,8 @@ rec {
type = "derivation";
outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk";
- platform = targetPlatform.xcodePlatform;
- version = targetPlatform.sdkVer;
+ platform = stdenv.targetPlatform.xcodePlatform;
+ version = stdenv.targetPlatform.sdkVer;
};
binutils = wrapBintoolsWith {
@@ -39,7 +39,7 @@ rec {
extraBuildCommands = ''
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
mv cc-cflags.tmp $out/nix-support/cc-cflags
- echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags
${lib.optionalString (lib.versionAtLeast sdk.version "14") "echo -isystem ${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 >> $out/nix-support/cc-cflags"}
'';
diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
index cccdf997dbd4..9823e8c7ad59 100644
--- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
@@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "sof-firmware";
- version = "2.2.3";
+ version = "2.2.4";
src = fetchurl {
url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-v${version}.tar.gz";
- sha256 = "sha256-WR/9ZvHisycDjJHt88hQK0FywdyFDP5EBQ6t+OT620I=";
+ sha256 = "sha256-zoquuhA6pWqCZiVSsPM/M6hZqhAI2L+8LCLwzPyMazo=";
};
dontFixup = true; # binaries must not be stripped or patchelfed
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 332d3ebe9658..00fd11e3be3e 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2023.1.1";
+ version = "2023.1.2";
components = {
"3_day_blinds" = ps: with ps; [
];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 6d54d6087e00..dec3d668bff9 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -195,7 +195,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2023.1.1";
+ hassVersion = "2023.1.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -213,7 +213,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
- hash = "sha256-qgrUVPh/lSOwRm0FIU6kLuj591XdtNCtA2IMOfhKw/0=";
+ hash = "sha256-eryqGO2zGm/Up06sG9/flvqA2pVh4Zylvl6Y8g8IvpU=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index 956fc1cbca72..715ab8dd349c 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -16,20 +16,20 @@
buildGoModule rec {
pname = "evcc";
- version = "0.109.2";
+ version = "0.110.1";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
- hash = "sha256-/Mklf+F9OHq56Qj/kn8JpRAgWwCZqwsH9EwrBFdi/mQ=";
+ hash = "sha256-SIBVvVl1O+vqQug6LTzKEzFAay82ot4e+rXd17Djvqc=";
};
- vendorHash = "sha256-H3ACmang+DPOCnccHLG6YzKvi7Rf5k8RkJDD1CgGBrw=";
+ vendorHash = "sha256-YP6/3+jVbavBE6ZSopryC1SgQc5kzE+gWpNbwptBMG8=";
npmDeps = fetchNpmDeps {
inherit src;
- hash = "sha256-oxoENlZNThW1PrwcGwiNP5Q7BZyhhtuCwXFey0t3Kz8=";
+ hash = "sha256-hc3IkWiafKBGtGPEPWWbj4XQsGh+PrGGnBV2bzEAn0s=";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json
index 615517b0b19d..b41eddff1e46 100644
--- a/pkgs/servers/invidious/versions.json
+++ b/pkgs/servers/invidious/versions.json
@@ -4,9 +4,9 @@
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
},
"invidious": {
- "rev": "5160d8bae39dc5cc5d51abee90571a03c08d0f2b",
- "sha256": "sha256-cM/5xnzO5wyzudXHeud9k3M5BsralRUgO4vSoebYRZ8=",
- "version": "unstable-2022-11-22"
+ "rev": "927c37ce3eb306fe6a02c0fdb9e3ee0a837e84d2",
+ "sha256": "sha256-l5DDSopd4ueA0IoPovIPjGqCm3LZE8802Sh2EduLtuU=",
+ "version": "unstable-2023-01-08"
},
"lsquic": {
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",
diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix
index a64bbd76807c..46942669ac67 100644
--- a/pkgs/servers/isso/default.nix
+++ b/pkgs/servers/isso/default.nix
@@ -63,7 +63,5 @@ with python3Packages; buildPythonApplication rec {
homepage = "https://posativ.org/isso/";
license = licenses.mit;
maintainers = with maintainers; [ fgaz ];
- # never built on aarch64-darwin since first introduction in nixpkgs
- broken = stdenv.isDarwin && stdenv.isAarch64;
};
}
diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index 0ba3df96f303..7c9117f91c18 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "klipper";
- version = "unstable-2022-11-21";
+ version = "unstable-2023-01-07";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
- rev = "c51f169c06921152a2e9c386016660d0bb09f767";
- sha256 = "sha256-l5dOj4cKrKdQ0grmbIdXm5dmkrQv6L+NqCMN1i3z3SE=";
+ rev = "f1203d56f6bc2c84d00605a76525be4c13430324";
+ sha256 = "sha256-7FJ+omzXpj49AThcv0xDilIekCyehtvpvck1+nrMS70=";
};
sourceRoot = "source/klippy";
diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/servers/monitoring/karma/default.nix
index 999f3176815f..1b87942af4ad 100644
--- a/pkgs/servers/monitoring/karma/default.nix
+++ b/pkgs/servers/monitoring/karma/default.nix
@@ -19,16 +19,16 @@ in
buildGoModule rec {
pname = "karma";
- version = "0.108";
+ version = "0.111";
src = fetchFromGitHub {
owner = "prymitive";
repo = "karma";
rev = "v${version}";
- hash = "sha256-Hw+6zBBbVw8uGkZQvmS3gB1opZdg8wQ5LydIAWhXUXY=";
+ hash = "sha256-jcJ8rdggM4kDCVTsEBDtZ9nNnutl+RwABx7zHY39tDs=";
};
- vendorHash = "sha256-gW8q425ZgFL+uJ8UiSVEX7R890LR9jgxfbNIdhNJge4=";
+ vendorHash = "sha256-MYHgLKDSB/g/k4i+deBNeaeZ3BbHRnymwsNTTA7qNdU=";
nativeBuildInputs = [
nodejs-18_x
diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix
index 08e77aaf1527..db2a6da7e5c6 100644
--- a/pkgs/servers/nats-server/default.nix
+++ b/pkgs/servers/nats-server/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "nats-server";
- version = "2.9.10";
+ version = "2.9.11";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
- hash = "sha256-r/hz80XFEOQN7bzQQTIMAeZI8H09WyiUqQl3glJz+RM=";
+ hash = "sha256-iYiQYGwvxW7GF32h+E1vg3x6sml7zGk40jbY8akmOnM=";
};
- vendorHash = "sha256-ASLy0rPuCSYGyy5Pw9fj559nxO4vPPagDKAe8wM29lo=";
+ vendorHash = "sha256-qApohNp//N/eBljpa+D2fR19rqw8Bd8wdmME9fzqDxc=";
doCheck = false;
diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix
index 8d128971a552..789f3ba8d679 100644
--- a/pkgs/servers/uxplay/default.nix
+++ b/pkgs/servers/uxplay/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "uxplay";
- version = "1.60";
+ version = "1.61.1";
src = fetchFromGitHub {
owner = "FDH2";
repo = "UxPlay";
rev = "v${version}";
- sha256 = "sha256-ERHn6kd/ZAo34iums2dudAqh9CdwUv2dLcn2YC7oBM0=";
+ sha256 = "sha256-eLTIpRmKewBghUYFot8I3iTeiI6wlU7WNs8/X3w+U80=";
};
postPatch = ''
diff --git a/pkgs/servers/web-apps/kasmweb/default.nix b/pkgs/servers/web-apps/kasmweb/default.nix
new file mode 100644
index 000000000000..f83db6baddc5
--- /dev/null
+++ b/pkgs/servers/web-apps/kasmweb/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, lib
+, fetchzip
+}:
+
+stdenv.mkDerivation rec {
+ pname = "kasmweb";
+ version = "1.12.0";
+ build = "d4fd8a";
+
+ src = fetchzip {
+ url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_${version}.${build}.tar.gz";
+ sha256 = "sha256-dCjWmI8gYtoMiMHVNgTg2ZROHXvT4ulynNvnKfMxURo=";
+ };
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir $out
+ rm bin/utils/yq*
+ cp -r bin conf www $out/
+
+ runHook postInstall
+ '';
+
+
+ meta = with lib; {
+ homepage = "https://www.kasmweb.com/";
+ description = "Streaming containerized apps and desktops to end-users";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ s1341 ];
+ };
+}
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index f391076900e4..7c9d90aa01a1 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -135,7 +135,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
- version = "3.5.1";
+ version = "3.6.0";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@@ -145,7 +145,7 @@ let
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-ptRbPcWkXdMXcuf439/sq8BjmG6PZ9YL18pgzIHbaSg=";
+ hash = "sha512-oR6nYa2s4C73+IsliTMoAFzvB/ktNi+8eUVA3KJunPyXCHjQMSyuvRnWRIPp88PiStbCffziZNF3+T1lx+9plg==";
};
# Fix FHS paths in tests
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index c5a241437732..beb64df19577 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -8,7 +8,7 @@ let
) lib.systems.examples;
getExecutable = pkgs: pkgFun: exec:
- "${pkgFun pkgs}${exec}${pkgs.hostPlatform.extensions.executable}";
+ "${pkgFun pkgs}${exec}${pkgs.stdenv.hostPlatform.extensions.executable}";
compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let
pkgName = (pkgFun hostPkgs).name;
@@ -55,7 +55,7 @@ let
mapMultiPlatformTest = crossSystemFun: test: lib.mapAttrs (name: system: test rec {
crossPkgs = import pkgs.path {
- localSystem = { inherit (pkgs.hostPlatform) config; };
+ localSystem = { inherit (pkgs.stdenv.hostPlatform) config; };
crossSystem = crossSystemFun system;
};
diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix
index 14e62fa0612e..c162521870ba 100644
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@@ -5,17 +5,17 @@
buildGoModule rec {
pname = "trivy";
- version = "0.36.0";
+ version = "0.36.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5yAfF/iRAbCJFXEcdhg7vqiMTpw7NNixFaQU93uSv6I=";
+ sha256 = "sha256-V6x7xILG2/mg95S3qv8pM6ZVXWmh1iHMvDVEfidHau4=";
};
# hash missmatch on across linux and darwin
proxyVendor = true;
- vendorSha256 = "sha256-9oG6xJ0D6SulN6ErC/F5Ycmly4wp+GCF8lftu+xoagE=";
+ vendorSha256 = "sha256-qTtx8+D288RT3wOdmvUXVeHx4GwIyCyCnO/sQW0blIU=";
excludedPackages = "misc";
diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix
index 1b943b3e41ab..2d3890484e79 100644
--- a/pkgs/tools/compression/zfp/default.nix
+++ b/pkgs/tools/compression/zfp/default.nix
@@ -1,7 +1,7 @@
-{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv, targetPlatform
+{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv
, enableCfp ? true
, enableCuda ? false
-, enableFortran ? builtins.elem targetPlatform.system gfortran.meta.platforms
+, enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms
, enableOpenMP ? true
, enablePython ? true
, enableUtilities ? true }:
diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/tools/graphics/gfxreconstruct/default.nix
index 31ced64c46a1..9dfd0def4a97 100644
--- a/pkgs/tools/graphics/gfxreconstruct/default.nix
+++ b/pkgs/tools/graphics/gfxreconstruct/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "gfxreconstruct";
- version = "0.9.15";
+ version = "0.9.16.1";
src = fetchFromGitHub {
owner = "LunarG";
repo = "gfxreconstruct";
rev = "v${version}";
- hash = "sha256-hIzQ5L0Payj8hlyy5UI7RXgnyhQBPqG7nfbvW2VYvTg=";
+ hash = "sha256-6yUWXIJlfwaPT1SDVjSfO7Sj10DcpOLAbzASC4dLS1E=";
fetchSubmodules = true;
};
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index e8261182ca46..32e45bee9031 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -10,14 +10,14 @@
}:
stdenv.mkDerivation rec {
- version = "1.6.5";
+ version = "1.7";
pname = "goaccess";
src = fetchFromGitHub {
owner = "allinurl";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZXWlFg0h0PvUqX5+kR/TAkH3GvL9pHRrKueBGqx5MCY=";
+ sha256 = "sha256-5lN+57HMxPfCop2sTSldhv1TBEIaowavXvniwqnesOQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix
index 45a23b287070..fb68b5191b2e 100644
--- a/pkgs/tools/misc/vtm/default.nix
+++ b/pkgs/tools/misc/vtm/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "vtm";
- version = "0.9.8g";
+ version = "0.9.8l";
src = fetchFromGitHub {
owner = "netxs-group";
repo = "vtm";
rev = "v${version}";
- sha256 = "sha256-Q+QPRIk7EtcSZBrm9RCxSbz9cgznZQBnPwm9Qm+gH24=";
+ sha256 = "sha256-6hZvnZXnoS97uQKxBbSJmMN1bGp42p0v4kJH7F+3mjU=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index ca06afe7bdbf..bab2ecbe619b 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,12 +1,23 @@
-{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }:
+{ lib
+, stdenv
+, autoreconfHook
+, fetchurl
+, gcc
+, makeWrapper
+, pcre2
+, perl
+, ps
+, readline
+, tcp_wrappers
+}:
stdenv.mkDerivation rec {
pname = "atftp";
- version = "0.7.5";
+ version = "0.8.0";
src = fetchurl {
url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz";
- sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k";
+ hash = "sha256-3yqgicdnD56rQOVZjl0stqWC3FGCkm6lC01pDk438xY=";
};
# fix test script
@@ -14,19 +25,34 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ readline tcp_wrappers pcre gcc ];
+ nativeBuildInputs = [
+ autoreconfHook
+ makeWrapper
+ ];
+
+ buildInputs = [
+ gcc
+ pcre2
+ readline
+ tcp_wrappers
+ ];
+
+ checkInputs = [
+ perl
+ ps
+ ];
# Expects pre-GCC5 inline semantics
NIX_CFLAGS_COMPILE = "-std=gnu89";
doCheck = true;
- checkInputs = [ ps ];
- meta = {
+ meta = with lib; {
description = "Advanced tftp tools";
- maintainers = [ lib.maintainers.raskin ];
- platforms = lib.platforms.linux;
- license = lib.licenses.gpl2Plus;
+ changelog = "https://sourceforge.net/p/atftp/code/ci/v${version}/tree/Changelog";
+ homepage = "https://sourceforge.net/projects/atftp/";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ raskin ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix
index 2da581776d29..22fdbb3e6505 100644
--- a/pkgs/tools/networking/darkstat/default.nix
+++ b/pkgs/tools/networking/darkstat/default.nix
@@ -1,12 +1,21 @@
-{ lib, stdenv, fetchpatch, fetchurl, libpcap, zlib }:
+{ lib
+, stdenv
+, autoreconfHook
+, fetchFromGitHub
+, fetchpatch
+, libpcap
+, zlib
+}:
stdenv.mkDerivation rec {
- version = "3.0.719";
pname = "darkstat";
+ version = "3.0.721";
- src = fetchurl {
- url = "${meta.homepage}/${pname}-${version}.tar.bz2";
- sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf";
+ src = fetchFromGitHub {
+ owner = "emikulic";
+ repo = pname;
+ rev = "refs/tags/${version}";
+ hash = "sha256-kKj4fCgphoe3lojJfARwpITxQh7E6ehUew9FVEW63uQ=";
};
patches = [
@@ -18,7 +27,14 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ libpcap zlib ];
+ nativeBuildInputs = [
+ autoreconfHook
+ ];
+
+ buildInputs = [
+ libpcap
+ zlib
+ ];
enableParallelBuilding = true;
@@ -34,7 +50,8 @@ stdenv.mkDerivation rec {
- Supports IPv6.
'';
homepage = "http://unix4lyfe.org/darkstat";
- license = licenses.gpl2;
+ changelog = "https://github.com/emikulic/darkstat/releases/tag/${version}";
+ license = licenses.gpl2Only;
platforms = with platforms; unix;
};
}
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 1f489b7fbc71..4f077a4bc95e 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -1,47 +1,38 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, fetchpatch
+{ lib
+, stdenv
, autoreconfHook
, cairo
+, fetchFromGitHub
, giflib
, glib
, gtk2-x11
, libjpeg
, libpcap
, libpng
-, libwebsockets
-, pkg-config
, libuv
+, libwebsockets
+, libwebp
, openssl
+, pkg-config
}:
stdenv.mkDerivation rec {
pname = "driftnet";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "deiv";
repo = "driftnet";
- rev = "v${version}";
- sha256 = "0kd22aqb25kf54jjv3ml8wy8xm7lmbf0xz1wfp31m08cbzsbizib";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-szmezYnszlRanq8pMD0CIGA+zTYGSwSHcDaZ2Gx1KCA=";
};
- # https://github.com/deiv/driftnet/pull/33
- # remove on version bump from 1.3.0
- patches = [
- (fetchpatch {
- name = "fix-darwin-build";
- url = "https://github.com/deiv/driftnet/pull/33/commits/bef5f3509ab5710161e9e21ea960a997eada534f.patch";
- sha256 = "1b7p9fkgp7dxv965l7q7y632s80h3nnrkaqnak2h0hakwv0i4pvm";
- })
- # https://github.com/deiv/driftnet/issues/37
- ./libwebsockets-4.3.0.patch
- ];
-
enableParallelBuilding = true;
- nativeBuildInputs = [ pkg-config autoreconfHook ];
+ nativeBuildInputs = [
+ pkg-config
+ autoreconfHook
+ ];
buildInputs = [
cairo
@@ -51,16 +42,18 @@ stdenv.mkDerivation rec {
libjpeg
libpcap
libpng
- libwebsockets
- openssl
libuv
+ libwebsockets
+ libwebp
+ openssl
];
meta = with lib; {
description = "Watches network traffic, and picks out and displays JPEG and GIF images for display";
homepage = "https://github.com/deiv/driftnet";
+ changelog = "https://github.com/deiv/driftnet/releases/tag/v${version}";
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ offline ];
platforms = platforms.linux ++ platforms.darwin;
- license = licenses.gpl2Plus;
};
}
diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix
index 965ef759ff6c..6a8e7abd100e 100644
--- a/pkgs/tools/networking/getmail6/default.nix
+++ b/pkgs/tools/networking/getmail6/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "getmail6";
- version = "6.18.10";
+ version = "6.18.11";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-nRi0HUq8jEugFogerFD7Xu9fgn1njfumbwhChz2t4t8=";
+ hash = "sha256-EJ1lnSeawWezOYZxAHx3QX9kWGoayWZ2vkFY21l+Ijc=";
};
# needs a Docker setup
diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix
index b6c0f0b05cbd..4b39e6cd19dd 100644
--- a/pkgs/tools/networking/pathvector/default.nix
+++ b/pkgs/tools/networking/pathvector/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pathvector";
- version = "6.0.3";
+ version = "6.1.0";
src = fetchFromGitHub {
owner = "natesales";
repo = "pathvector";
rev = "v${version}";
- sha256 = "sha256-WY9208bbJOSDJ9WaV8KIr65GZjqhFjdzwTga0u4oQo4=";
+ sha256 = "sha256-tMcoL+nvvMBCWSVD+l42e6IlOIj8ERP9pgBHcJBtegY=";
};
- vendorSha256 = "sha256-R3o1L34FXbtRzJ1I2Xj4iWsiFJJWexGWYv2TmvhINe0=";
+ vendorHash = "sha256-+GML6a9LzHZfByHv7ODp7fHBauExsZTzUccMEeeOFNg=";
CGO_ENABLED = 0;
diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index b8b70d861e81..6a1ce2f4a028 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "siege";
- version = "4.1.5";
+ version = "4.1.6";
src = fetchurl {
url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz";
- hash = "sha256-B235/Nt/Y8Rtb2YazCzMhAWTeunK5JCrip14qdLnuMs=";
+ hash = "sha256-MJ1Ym/yBm28V0uXoWRs8DG9pNiT1Bg7qwGek2ad1fek=";
};
NIX_LDFLAGS = lib.optionalString stdenv.isLinux [
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "HTTP load tester";
homepage = "https://www.joedog.org/siege-home/";
+ changelog = "https://github.com/JoeDog/siege/blob/v${version}/ChangeLog";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;
diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix
index eeb96936aeab..46a52b11b961 100644
--- a/pkgs/tools/networking/traceroute/default.nix
+++ b/pkgs/tools/networking/traceroute/default.nix
@@ -1,25 +1,33 @@
-{ lib, stdenv, fetchurl }:
+{ lib
+, stdenv
+, fetchurl
+}:
stdenv.mkDerivation rec {
pname = "traceroute";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchurl {
url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz";
- sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6";
+ sha256 = "sha256-j8jVBG6FXXWIYHuzGfW4LjuhPpHV1GNoYyYuY4a7r3Y=";
};
- makeFlags = [ "prefix=$(out)" "LDFLAGS=-lm" "env=yes" ];
+ makeFlags = [
+ "prefix=$(out)"
+ "LDFLAGS=-lm"
+ "env=yes"
+ ];
preConfigure = ''
sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules
'';
meta = with lib; {
- homepage = "http://traceroute.sourceforge.net/";
description = "Tracks the route taken by packets over an IP network";
- license = lib.licenses.gpl2;
- maintainers = [ maintainers.koral ];
+ homepage = "http://traceroute.sourceforge.net/";
+ changelog = "https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-${version}/";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ koral ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index 57ebcfec26d4..200c8510b874 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -4,16 +4,16 @@
rustPlatform.buildRustPackage rec {
pname = "nix-index";
- version = "unstable-2022-03-07";
+ version = "unstable-2023-01-03";
src = fetchFromGitHub {
owner = "bennofs";
repo = "nix-index";
- rev = "f09548f66790d2d7d53f07ad2af62993d7cabb08";
- sha256 = "sha256-xIJCzEHQJ2kHRbT4Ejrb5R5e/VqjKrklV7XneZIiyUg=";
+ rev = "36ff1aac466392fb2d7043fd3e196667a531374b";
+ sha256 = "sha256-QXUqz7SiUBDOBKiALdtWNEPhS/EAM8pEEtazGcTCzvM=";
};
- cargoSha256 = "sha256-2Yhnacsx8EWsfZfcfKhV687cblyFDmsfdqGZoK6Lulo=";
+ cargoSha256 = "sha256-ELlgbE5dR3a6yRTRD88tgEs4gtN1N3M2nBjVFu6GMwc=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl curl ]
diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index 76ccda498b47..39cd2d2f6c6f 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "trufflehog";
- version = "3.21.0";
+ version = "3.23.1";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
- hash = "sha256-rse5uyQ7EUBhs0IyC92B/Z7YCeNIXTlZEqrlcjFekgA=";
+ hash = "sha256-dCjFMcLFOoAiOXRp0jhBTqYembLLsvDWMetGjRF083k=";
};
vendorHash = "sha256-KyyJ7hUWF29L8oB9GkJ918/BQoLMsz+tStT2T9Azunk=";
diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index bf42608411a8..88f39e8a63e4 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -7,11 +7,13 @@
stdenv.mkDerivation rec {
pname = "acpica-tools";
- version = "20220331";
+ version = "20221020";
src = fetchurl {
- url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
- hash = "sha256-rK/2ixTx4IBOu/xLlyaKTMvvz6BTsC7Zkk8rFNipjiE=";
+ # 20221020 has a weird filename published: https://acpica.org/node/201
+ name = "acpica-unix-${version}.tar.gz";
+ url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar_0.gz";
+ hash = "sha256-M6LjlKygylfUAYr+PaNA361etFsbkwDoHdWV/aB88cU=";
};
nativeBuildInputs = [ bison flex ];
diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/tools/system/retry/default.nix
index 2dcd1aa37660..34d4bbb13960 100644
--- a/pkgs/tools/system/retry/default.nix
+++ b/pkgs/tools/system/retry/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "retry";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "minfrin";
repo = "retry";
rev = "${pname}-${version}";
- hash = "sha256-C6PYt5NjDT4w1yuWnw1+Z/L3j1S5zwTGsI44yrMnPUs=";
+ hash = "sha256-5H2MnnThi4rT/o3oTkGDKXStQwob4G9mMsZewItPub4=";
};
nativeBuildInputs = [ autoreconfHook txt2man which ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d518ee2d4534..4295b925f1cd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1773,6 +1773,7 @@ mapAliases ({
zyn-fusion = zynaddsubfx; # Added 2022-08-05
inherit (stdenv.hostPlatform) system; # Added 2021-10-22
+ inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09
# LLVM packages for (integration) testing that should not be used inside Nixpkgs:
llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f9a2e89c5d1..c980e42a9f7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3119,6 +3119,8 @@ with pkgs;
glasstty-ttf = callPackage ../data/fonts/glasstty-ttf { };
+ glaxnimate = libsForQt5.callPackage ../applications/video/glaxnimate { };
+
gmid = callPackage ../servers/gemini/gmid { };
gmni = callPackage ../applications/networking/browsers/gmni { };
@@ -11034,7 +11036,7 @@ with pkgs;
qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
- qalculate-qt = libsForQt5.callPackage ../applications/science/math/qalculate-qt { };
+ qalculate-qt = qt6Packages.callPackage ../applications/science/math/qalculate-qt { };
qastools = libsForQt5.callPackage ../tools/audio/qastools { };
@@ -13384,8 +13386,9 @@ with pkgs;
yarn = callPackage ../development/tools/yarn { };
- yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { };
+ yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; };
yarn2nix-moretea-openssl_1_1 = callPackage ../development/tools/yarn2nix-moretea/yarn2nix {
+ pkgs = pkgs.__splicedPackages;
nodejs = nodejs.override { openssl = openssl_1_1; };
};
@@ -33726,6 +33729,8 @@ with pkgs;
youtube-music = callPackage ../applications/audio/youtube-music { };
+ youki = callPackage ../applications/virtualization/youki { };
+
yt-dlp = with python3Packages; toPythonApplication yt-dlp;
yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light;
@@ -33890,6 +33895,8 @@ with pkgs;
btcpayserver = callPackage ../applications/blockchains/btcpayserver { };
+ btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; };
+
charge-lnd = callPackage ../applications/blockchains/charge-lnd { };
cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
@@ -34847,7 +34854,7 @@ with pkgs;
otto-matic = callPackage ../games/otto-matic { };
- openraPackages = import ../games/openra pkgs;
+ openraPackages = import ../games/openra pkgs.__splicedPackages;
openra = openraPackages.engines.release;
@@ -35665,6 +35672,8 @@ with pkgs;
autoconf = buildPackages.autoconf269;
};
+ kasmweb = callPackage ../servers/web-apps/kasmweb { };
+
kssd = callPackage ../applications/science/biology/kssd { };
last = callPackage ../applications/science/biology/last { };
@@ -36141,9 +36150,7 @@ with pkgs;
crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { };
- cubicle = callPackage ../applications/science/logic/cubicle {
- ocamlPackages = ocaml-ng.ocamlPackages_4_05;
- };
+ cubicle = callPackage ../applications/science/logic/cubicle { };
cvc3 = callPackage ../applications/science/logic/cvc3 {
gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; });
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 8b4463bde3bc..70af04bd96af 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -137,8 +137,7 @@ lib.makeScope pkgs.newScope (self: with self; {
checkPhase = ''
runHook preCheck
- NO_INTERACTON=yes SKIP_PERF_SENSITIVE=yes make test
-
+ NO_INTERACTION=yes SKIP_PERF_SENSITIVE=yes make test
runHook postCheck
'';
@@ -414,6 +413,14 @@ lib.makeScope pkgs.newScope (self: with self; {
valgrind.dev
];
zendExtension = true;
+ patches = [ ] ++ lib.optionals (lib.versionAtLeast php.version "8.1") [
+ (fetchpatch {
+ # See https://github.com/php/php-src/pull/10266
+ name = "avoid-opcache-test-failures.patch";
+ url = "https://github.com/PHP/php-src/commit/9216d14b3abfc727b0668592b48699440137aa74.patch";
+ sha256 = "sha256-/U6LMn/QGM8BXlh+Etl1z97v3qZFiWL2G3ZopNYShGU=";
+ })
+ ];
# Tests launch the builtin webserver.
__darwinAllowLocalNetworking = true;
}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 4d842aa556c7..18d921f2e01c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -224,6 +224,7 @@ mapAliases ({
unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01
uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13
+ virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07
Wand = wand; # added 2022-11-13
WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ebe6312d91b..de54351e3816 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3811,6 +3811,10 @@ self: super: with self; {
gmpy = callPackage ../development/python-modules/gmpy { };
+ gmsh = toPythonModule (callPackage ../applications/science/math/gmsh {
+ enablePython = true;
+ });
+
gntp = callPackage ../development/python-modules/gntp { };
gnureadline = callPackage ../development/python-modules/gnureadline { };
@@ -5147,8 +5151,6 @@ self: super: with self; {
lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { };
- ld2410-ble = callPackage ../development/python-modules/ld2410-ble { };
-
ldap3 = callPackage ../development/python-modules/ldap3 { };
ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { };
@@ -6289,6 +6291,8 @@ self: super: with self; {
nocaselist = callPackage ../development/python-modules/nocaselist { };
+ nocturne = callPackage ../development/python-modules/nocturne { };
+
nodeenv = callPackage ../development/python-modules/nodeenv { };
nodepy-runtime = callPackage ../development/python-modules/nodepy-runtime { };
@@ -9365,6 +9369,8 @@ self: super: with self; {
pytomlpp = callPackage ../development/python-modules/pytomlpp { };
+ pytoolconfig = callPackage ../development/python-modules/pytoolconfig { };
+
pytools = callPackage ../development/python-modules/pytools { };
pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { };
@@ -9460,6 +9466,8 @@ self: super: with self; {
pyvicare = callPackage ../development/python-modules/pyvicare { };
+ PyVirtualDisplay = callPackage ../development/python-modules/PyVirtualDisplay { };
+
pyvis = callPackage ../development/python-modules/pyvis { };
pyvisa = callPackage ../development/python-modules/pyvisa { };
@@ -10298,6 +10306,8 @@ self: super: with self; {
sfepy = callPackage ../development/python-modules/sfepy { };
+ sfrbox-api = callPackage ../development/python-modules/sfrbox-api { };
+
sgmllib3k = callPackage ../development/python-modules/sgmllib3k { };
sgp4 = callPackage ../development/python-modules/sgp4 { };
@@ -11205,6 +11215,8 @@ self: super: with self; {
cudnnSupport = false;
};
+ thefuzz = callPackage ../development/python-modules/thefuzz { };
+
thermobeacon-ble = callPackage ../development/python-modules/thermobeacon-ble { };
thermopro-ble = callPackage ../development/python-modules/thermopro-ble { };
@@ -11858,8 +11870,6 @@ self: super: with self; {
virtkey = callPackage ../development/python-modules/virtkey { };
- virtual-display = callPackage ../development/python-modules/virtual-display { };
-
virtualenv = callPackage ../development/python-modules/virtualenv { };
virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { };
@@ -11905,7 +11915,7 @@ self: super: with self; {
vt-py = callPackage ../development/python-modules/vt-py { };
vtk = toPythonModule (pkgs.vtk_9.override {
- pythonInterpreter = python;
+ inherit python;
enablePython = true;
});
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 3669b622e715..e5412c409ed5 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -138,14 +138,6 @@ let
inherit stdenv;
};
- # The old identifiers for cross-compiling. These should eventually be removed,
- # and the packages that rely on them refactored accordingly.
- platformCompat = self: super: let
- inherit (super.stdenv) buildPlatform hostPlatform targetPlatform;
- in {
- inherit buildPlatform hostPlatform targetPlatform;
- };
-
splice = self: super: import ./splice.nix lib self (adjacentPackages != null);
allPackages = self: super:
@@ -282,7 +274,6 @@ let
# previous bootstrapping phases which have already been overlayed.
toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([
stdenvBootstappingAndPlatforms
- platformCompat
stdenvAdapters
trivialBuilders
splice