diff --git a/doc/builders/images/portableservice.section.md b/doc/builders/images/portableservice.section.md index 1d23cafeefcf..5400928b158f 100644 --- a/doc/builders/images/portableservice.section.md +++ b/doc/builders/images/portableservice.section.md @@ -15,7 +15,7 @@ This allows using Nix to build images which can be run on many recent Linux dist The primary tool for interacting with Portable Services is `portablectl`, and they are managed by the `systemd-portabled` system service. -:::{.note} +::: {.note} Portable services are supported starting with systemd 239 (released on 2018-06-22). ::: @@ -37,7 +37,7 @@ dependencies of the two derivations in the `units` list. `units` must be a list of derivations, and their names must be prefixed with the service name (`"demo"` in this case). Otherwise `systemd-portabled` will ignore them. -:::{.Note} +::: {.note} The `.raw` file extension of the image is required by the portable services specification. ::: @@ -76,6 +76,6 @@ portablectl attach demo_1.0.raw systemctl enable --now demo.socket systemctl enable --now demo.service ``` -:::{.Note} +::: {.note} See the [man page](https://www.freedesktop.org/software/systemd/man/portablectl.html) of `portablectl` for more info on its usage. ::: diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index e4e7b5bd3a86..a5f2ae2822f8 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -489,7 +489,7 @@ Preferred source hash type is sha256. There are several ways to get it. in the package expression, attempt build and extract correct hash from error messages. - :::{.warning} + ::: {.warning} You must use one of these four fake hashes and not some arbitrarily-chosen hash. See [](#sec-source-hashes-security). diff --git a/flake.nix b/flake.nix index f9a23c531efe..ba2447364a90 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,7 @@ lib = import ./lib; - forAllSystems = f: lib.genAttrs lib.systems.flakeExposed (system: f system); - + forAllSystems = lib.genAttrs lib.systems.flakeExposed; in { lib = lib.extend (final: prev: { diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 55eda3c7d45d..46788edd236e 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -342,6 +342,7 @@ class Editor: self.default_out = default_out or root.joinpath("generated.nix") self.deprecated = deprecated or root.joinpath("deprecated.json") self.cache_file = cache_file or f"{name}-plugin-cache.json" + self.nixpkgs_repo = None def get_current_plugins(self) -> List[Plugin]: """To fill the cache""" @@ -670,16 +671,15 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit - nixpkgs_repo = None if autocommit: - nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) - commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) + editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) + commit(editor.nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) if redirects: update() if autocommit: commit( - nixpkgs_repo, + editor.nixpkgs_repo, f"{editor.attr_path}: resolve github repository redirects", [args.outfile, args.input_file, editor.deprecated], ) @@ -692,7 +692,7 @@ def update_plugins(editor: Editor, args): plugin, _ = prefetch_plugin(pdesc, ) if autocommit: commit( - nixpkgs_repo, + editor.nixpkgs_repo, "{drv_name}: init at {version}".format( drv_name=editor.get_drv_name(plugin.normalized_name), version=plugin.version diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 3ffb294a9b2b..186602cae925 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -944,6 +944,22 @@ mariadb if possible. + + + signald has been bumped to + 0.23.0. For the upgrade, a migration + process is necessary. It can be done by running a command like + this before starting signald.service: + + +signald -d /var/lib/signald/db \ + --database sqlite:/var/lib/signald/db \ + --migrate-data + + + For further information, please read the upstream changelogs. + + stylua no longer accepts diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index b978eefad459..3e9e3d8f8e1a 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -286,6 +286,17 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - `percona-server56` has been removed. Please migrate to `mysql` or `mariadb` if possible. +- `signald` has been bumped to `0.23.0`. For the upgrade, a migration process is necessary. It can be + done by running a command like this before starting `signald.service`: + + ``` + signald -d /var/lib/signald/db \ + --database sqlite:/var/lib/signald/db \ + --migrate-data + ``` + + For further information, please read the upstream changelogs. + - `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`. - `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 892d8e537ccf..1dc6a65973d7 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -1822,7 +1822,7 @@ in RestrictRealtime = true; RestrictSUIDSGID = true; SystemCallArchitectures = "native"; - SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + SystemCallFilter = [ "@system-service" "~@privileged" ]; }; }; # prometheus-config-reload will activate after prometheus. However, what we diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix index 2acbcea2aa41..971448545616 100644 --- a/nixos/modules/services/networking/blocky.nix +++ b/nixos/modules/services/networking/blocky.nix @@ -10,7 +10,7 @@ let in { options.services.blocky = { - enable = mkEnableOption (lib.mdDoc "Fast and lightweight DNS proxy as ad-blocker for local network with many features"); + enable = mkEnableOption (lib.mdDoc "blocky, a fast and lightweight DNS proxy as ad-blocker for local network with many features"); settings = mkOption { type = format.type; diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index be8f4ebb9f86..1c02076c570d 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -25,13 +25,13 @@ with lib; stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; - version = "22.0"; + version = "22.0.2"; src = fetchFromGitHub { owner = "ElementsProject"; repo = "elements"; rev = "elements-${version}"; - sha256 = "sha256-n98bz1W9hoJ5JDH34LG7R6igEIY1j4mRbO2PKnV8R2U="; + sha256 = "sha256-20Tem6CD7XAt1EDfkl46Nxhb+Vq3sCk/UqnLCAm85FU="; }; nativeBuildInputs = diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 1214e36372a6..7e5c7380597c 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -21,10 +21,13 @@ import inspect import os import sys import logging +import subprocess import textwrap from typing import List, Tuple from pathlib import Path +import git + log = logging.getLogger() sh = logging.StreamHandler() @@ -76,8 +79,11 @@ def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: class VimEditor(pluginupdate.Editor): + nvim_treesitter_updated = False + def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) + nvim_treesitter_rev = pluginupdate.run_nix_expr("(import { }).vimPlugins.nvim-treesitter.src.rev") with open(outfile, "w+") as f: f.write(HEADER) @@ -91,6 +97,8 @@ class VimEditor(pluginupdate.Editor): for pdesc, plugin in sorted_plugins: content = self.plugin2nix(pdesc, plugin) f.write(content) + if plugin.name == "nvim-treesitter" and plugin.commit != nvim_treesitter_rev: + self.nvim_treesitter_updated = True f.write("\n}\n") print(f"updated {outfile}") @@ -123,6 +131,18 @@ def main(): args = parser.parse_args() pluginupdate.update_plugins(editor, args) + if editor.nvim_treesitter_updated: + print("updating nvim-treesitter grammars") + nvim_treesitter_dir = ROOT.joinpath("nvim-treesitter") + subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")]) + + if editor.nixpkgs_repo: + msg = "vimPlugins.nvim-treesitter: update grammars" + print(f"committing to nixpkgs: {msg}") + index = editor.nixpkgs_repo.index + index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) + index.commit(msg) + if __name__ == "__main__": main() diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 4106c922884b..06ca40b7d467 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-NBLkdPtALhlXfbqLB0n5T2RNMSQusYZgr4VkGH7EFIs="; + sha256 = "sha256-Cmff3tIy60BDO3q5hzPqSLwjc6LzUSpoorJD/yxha9c="; }; - vendorSha256 = "sha256-jPIrUW4el8sAO+4j20qMYVXqvov6Ac0cENd7gOrYj+U="; + vendorSha256 = "sha256-jvadtm8NprVwNf4+GaaANK1u4Y4ccbsTCZxQk21GW7c="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index bfa5addefee9..be190366692b 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-SqKjN9Met+NsfaQO3PGTPua/ZVaorYbSJHWeXgEm524="; + sha256 = "sha256-g83JuV+RPtuQJoxcMgMlZbHftqohA9frIk/y89/PucY="; }; - vendorSha256 = "sha256-VWeUVdrAzbS7OmHHZIPlyq6WVj4I39n7ozS7n3ReqJk="; + vendorSha256 = "sha256-FSniCYr3emV9W/BuEkWe0a4aZ5RCoZJc7+K+f2q49ys="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3eb432840f86..a41380380bcc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.12.5"; + version = "3.13.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EC4uI9q/iwX9U/xvyCZ3HAmfGEbKoADLKMx5f30Q9Ys="; + sha256 = "sha256-Ku142NjiDTxiZ50Sm6vZs5ZHJ25oALnLQw8ThWqQ2rE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 08e1b97355d3..0abfe944ee27 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "gvisor"; - version = "20220919.0"; + version = "20221102.1"; # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go) # that can be used to build gvisor without bazel. @@ -18,8 +18,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "4e7fd140e8d0056f8f031950fcace8ff4d48a526"; - sha256 = "sha256-II0lnthabkyCgPum7EBdyOYwB0rWjA2Jd9DVGLJQy6Q="; + rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff"; + sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o="; }; vendorSha256 = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU="; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 7cbf02fef8dd..546681afedf9 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,166 +1,198 @@ -{ config, lib, pkgs }: +{ config +, lib +, pkgs +, splicePackages +, newScope +, pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsHostHost +, pkgsTargetTarget +}: -lib.makeScope pkgs.newScope (self: with self; { - #### NixOS support - - genericUpdater = pkgs.genericUpdater; - - mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; - - automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; - - #### CORE - - exo = callPackage ./core/exo { }; - - garcon = callPackage ./core/garcon { }; - - libxfce4ui = callPackage ./core/libxfce4ui { }; - - libxfce4util = callPackage ./core/libxfce4util { }; - - thunar = callPackage ./core/thunar { - thunarPlugins = []; +let + otherSplices = { + selfBuildBuild = pkgsBuildBuild.xfce; + selfBuildHost = pkgsBuildHost.xfce; + selfBuildTarget = pkgsBuildTarget.xfce; + selfHostHost = pkgsHostHost.xfce; + selfTargetTarget = pkgsTargetTarget.xfce or { }; }; + keep = _self: { }; + extra = _spliced0: { }; - thunar-volman = callPackage ./core/thunar-volman { }; +in +lib.makeScopeWithSplicing + splicePackages + newScope + otherSplices + keep + extra + (self: + let + inherit (self) callPackage; + in + { + #### NixOS support - thunar-archive-plugin = callPackage ./thunar-plugins/archive { }; + genericUpdater = pkgs.genericUpdater; - thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; + mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; - thunar-media-tags-plugin = callPackage ./thunar-plugins/media-tags { }; + automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; - tumbler = callPackage ./core/tumbler { }; + #### CORE - xfce4-panel = callPackage ./core/xfce4-panel { }; + exo = callPackage ./core/exo { }; - xfce4-session = callPackage ./core/xfce4-session { }; + garcon = callPackage ./core/garcon { }; - xfce4-settings = callPackage ./core/xfce4-settings { }; + libxfce4ui = callPackage ./core/libxfce4ui { }; - xfce4-power-manager = callPackage ./core/xfce4-power-manager { }; + libxfce4util = callPackage ./core/libxfce4util { }; - xfconf = callPackage ./core/xfconf { }; + thunar = callPackage ./core/thunar { + thunarPlugins = [ ]; + }; - xfdesktop = callPackage ./core/xfdesktop { }; + thunar-volman = callPackage ./core/thunar-volman { }; - xfwm4 = callPackage ./core/xfwm4 { }; + thunar-archive-plugin = callPackage ./thunar-plugins/archive { }; - xfce4-appfinder = callPackage ./core/xfce4-appfinder { }; + thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; - xfce4-dev-tools = callPackage ./core/xfce4-dev-tools { - mkXfceDerivation = mkXfceDerivation.override { - xfce4-dev-tools = null; - }; - }; + thunar-media-tags-plugin = callPackage ./thunar-plugins/media-tags { }; - #### APPLICATIONS + tumbler = callPackage ./core/tumbler { }; - catfish = callPackage ./applications/catfish { }; + xfce4-panel = callPackage ./core/xfce4-panel { }; - gigolo = callPackage ./applications/gigolo { }; + xfce4-session = callPackage ./core/xfce4-session { }; - mousepad = callPackage ./applications/mousepad { }; + xfce4-settings = callPackage ./core/xfce4-settings { }; - orage = callPackage ./applications/orage { }; + xfce4-power-manager = callPackage ./core/xfce4-power-manager { }; - parole = callPackage ./applications/parole { }; + xfconf = callPackage ./core/xfconf { }; - ristretto = callPackage ./applications/ristretto { }; + xfdesktop = callPackage ./core/xfdesktop { }; - xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { }; + xfwm4 = callPackage ./core/xfwm4 { }; - xfce4-dict = callPackage ./applications/xfce4-dict { }; + xfce4-appfinder = callPackage ./core/xfce4-appfinder { }; - xfce4-terminal = callPackage ./applications/xfce4-terminal { }; + xfce4-dev-tools = callPackage ./core/xfce4-dev-tools { + mkXfceDerivation = self.mkXfceDerivation.override { + xfce4-dev-tools = null; + }; + }; - xfce4-screensaver = callPackage ./applications/xfce4-screensaver { }; + #### APPLICATIONS - xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { - inherit (pkgs.gnome) libsoup; - }; + catfish = callPackage ./applications/catfish { }; - xfdashboard = callPackage ./applications/xfdashboard {}; + gigolo = callPackage ./applications/gigolo { }; - xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { }; + mousepad = callPackage ./applications/mousepad { }; - xfce4-notifyd = callPackage ./applications/xfce4-notifyd { }; + orage = callPackage ./applications/orage { }; - xfburn = callPackage ./applications/xfburn { }; + parole = callPackage ./applications/parole { }; - xfce4-panel-profiles = callPackage ./applications/xfce4-panel-profiles { }; + ristretto = callPackage ./applications/ristretto { }; - #### ART + xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { }; - xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { }; + xfce4-dict = callPackage ./applications/xfce4-dict { }; - xfwm4-themes = callPackage ./art/xfwm4-themes { }; + xfce4-terminal = callPackage ./applications/xfce4-terminal { }; - #### PANEL PLUGINS + xfce4-screensaver = callPackage ./applications/xfce4-screensaver { }; - xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { }; + xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { + inherit (pkgs.gnome) libsoup; + }; - xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { }; + xfdashboard = callPackage ./applications/xfdashboard { }; - xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { }; + xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { }; - xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { }; + xfce4-notifyd = callPackage ./applications/xfce4-notifyd { }; - xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; + xfburn = callPackage ./applications/xfburn { }; - xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { }; + xfce4-panel-profiles = callPackage ./applications/xfce4-panel-profiles { }; - xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; + #### ART - xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; + xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { }; - xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; + xfwm4-themes = callPackage ./art/xfwm4-themes { }; - xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { }; + #### PANEL PLUGINS - xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { }; + xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { }; - xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { }; + xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { }; - xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { }; + xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { }; - xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { }; + xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { }; - xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { }; + xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; - xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { }; + xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { }; - xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { }; + xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; - xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { }; + xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; - xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { }; + xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; - xfce4-time-out-plugin = callPackage ./panel-plugins/xfce4-time-out-plugin { }; + xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { }; - xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { }; + xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { }; - xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { }; + xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { }; - xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { }; + xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { }; - xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { }; + xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { }; - xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { }; + xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { }; - xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { }; + xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { }; - xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { }; + xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { }; -} // lib.optionalAttrs config.allowAliases { - #### ALIASES + xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { }; - xinitrc = xfce4-session.xinitrc; # added 2019-11-04 + xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { }; - thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04 + xfce4-time-out-plugin = callPackage ./panel-plugins/xfce4-time-out-plugin { }; -}) // lib.optionalAttrs config.allowAliases { + xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { }; + + xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { }; + + xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { }; + + xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { }; + + xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { }; + + xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { }; + + xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { }; + + } // lib.optionalAttrs config.allowAliases { + #### ALIASES + + xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04 + + thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04 + + }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24 diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 42023990c9e1..20ec00f4a8fc 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals withCMake [ cmake ]; + cmakeFlags = [] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "-DCARES_SHARED=OFF" + "-DCARES_STATIC=ON" + ]; + enableParallelBuilding = true; passthru.tests = { diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 7b7794d3647a..0145bcf20c5c 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { hash = "sha256-Ws20hKX2iDdke5yBBKXukVUD4OnLf1OmwlhW+jUXL24="; }; + patches = [ + ./nixostrustedprefix.patch + ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ @@ -29,6 +33,8 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/util/CMakeLists.txt \ --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions + substituteInPlace src/backend/corebackend.cpp \ + --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy ''; meta = with lib; { diff --git a/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch b/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch new file mode 100644 index 000000000000..cb1eb68364dd --- /dev/null +++ b/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch @@ -0,0 +1,13 @@ +diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp +index a879c8d..3d7863b 100644 +--- a/src/util/externalcommandhelper.cpp ++++ b/src/util/externalcommandhelper.cpp +@@ -387,7 +387,7 @@ QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStr + if (dirname == QStringLiteral("bin") || dirname == QStringLiteral("sbin")) { + prefix.cdUp(); + } +- if (trustedPrefixes.find(prefix.path()) == trustedPrefixes.end()) { // TODO: C++20: replace with contains ++ if (!prefix.path().startsWith(QStringLiteral("/nix/store")) && !prefix.path().startsWith(QStringLiteral("/run/current-system/sw"))) { // TODO: C++20: replace with contains + qInfo() << prefix.path() << "prefix is not one of the trusted command prefixes"; + reply[QStringLiteral("success")] = false; + return reply; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index c495935e1402..815f23a05278 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -6,7 +6,7 @@ , libxml2 , python , libusb1 -, avahi +, avahiSupport ? true, avahi , libaio , runtimeShell , lib @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { python libxml2 libusb1 - avahi ] ++ lib.optional python.isPy3k python.pkgs.setuptools + ++ lib.optional avahiSupport avahi ++ lib.optional stdenv.isLinux libaio ++ lib.optionals stdenv.isDarwin [ CFNetwork CoreServices ]; @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { # the linux-like directory structure is used for proper output splitting "-DOSX_PACKAGE=off" "-DOSX_FRAMEWORK=off" + ] ++ lib.optionals (!avahiSupport) [ + "-DHAVE_DNS_SD=OFF" ]; postPatch = '' diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 49f5fbe88159..232429b29fec 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }: +{ lib +, stdenv +, fetchurl +, pkg-config +, libpng +, glib /*just passthru*/ + +# for passthru.tests +, cairo +, qemu +, scribus +, tigervnc +, wlroots +, xwayland +}: stdenv.mkDerivation rec { pname = "pixman"; @@ -29,6 +43,10 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; + passthru.tests = { + inherit cairo qemu scribus tigervnc wlroots xwayland; + }; + meta = with lib; { homepage = "http://pixman.org"; description = "A low-level library for pixel manipulation"; diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index bddfa3c30d4e..bb1f7a7c5cf3 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.27"; + version = "0.9.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "newville"; repo = pname; - rev = version; - hash = "sha256-FxWs4l9bqZoqdyhpVRys8Mo9Wdtn1fm5XonisPscWEs="; + rev = "refs/tags/${version}"; + hash = "sha256-J35AqVSFpIsw0XThbLCJjS9NFRFeyYV/YrwdfcOrFhk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index c5517c827c4c..9e8ef3098a9d 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.10.1"; + version = "1.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xjlO0l+xSghtY2IdnYT9wij11CpkWG8hVzGzb94XA0s="; + hash = "sha256-MDvAkZ8JMts+eKklTBf83rEl5L5lzYlLQN+8O/3fwFQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 3658814cae77..dc84a518e8f7 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.11.0"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-w/yACvWLhX5/rw4xA3bl7xD12tUJCRTMQv+m19I7Zyk="; + hash = "sha256-f5sa59l+p68/ON0JMF4Zq4Gh4Wq2bqGGtledhcHKI0c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index 22d8a79ab763..d7089a85cba9 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wPpVVopbvuw7wreZ4f0HLz9/NJgyYYIFttw4rhJC1xo="; + sha256 = "sha256-goLc/4BbVKUkH+csggKm6EKHmRVbv4i0Aq7N+/5WnmU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index db43387df27a..ccfe6bcf3fb5 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.7.3"; + version = "0.7.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-luftdaten"; rev = version; - sha256 = "sha256-+wIouOHIYgjIrObos21vzdKFQLhwutorarVUBDxCsaA="; + sha256 = "sha256-nOhJKlUJ678DJ/ilyRHaiQ2fGfoCl+x6l9lsczVLAGw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 722ee4b85ba2..90e6a1a0204b 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-8qWqnnh6dSjKyvQvUhvId/2DyEUbTHt7iylJeL4Ko8w="; + sha256 = "sha256-VBK+h5K/irI0T0eUaYC1iouzMUo/lJshLTe0h5CtnAQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index f9bddb009dc8..ec65059f54df 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -57,7 +57,6 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools setuptools-scm ]; @@ -66,6 +65,7 @@ buildPythonPackage rec { jedi pluggy python-lsp-jsonrpc + setuptools # `pkg_resources`imported in pylsp/config/config.py ujson ]; @@ -142,6 +142,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pylsp" + "pylsp.python_lsp" ]; meta = with lib; { diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index dfcd6a3e2d4d..f0de0c62687c 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.107"; + version = "0.0.108"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Um93keYzoMx0n/znYkvHVTNt4ov+xa2q5pM5XnJwYeY="; + sha256 = "sha256-I2F4x4gsmL22j+atfxRQLKmKLdIwbXEEN8EcXV4ZAJA="; }; - cargoSha256 = "sha256-UxzVpZHS/hKfmAK4Zbejm9iUaALtbBJi4d1OS7vdRg4="; + cargoSha256 = "sha256-EJm1bfJ9/Jqe0tCQftAz3qR8TBGxcZiqJnJ2QnhyE58="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 869c5efaf643..3d4b82b8edee 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-GmuBWvDy4UfEvR3znj8BQiIHzu5KSY4rgOc+I/GGJZU="; + sha256 = "sha256-fwuAUsqVEL9MCjNoUBPQI78u+c289cbNCB4Kh8VM/vo="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-Mm/IzEAOSDbO9c+C12Y6BNHlxKVVM+gOK1mGLtaJO2A="; + cargoSha256 = "sha256-hnD/xZtQRVABTtdxqNcJYIsGuklNT8dxr5wpAlP/Qqs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index aaec96bfa8a0..0829168dc2c0 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.19"; + version = "0.4.20"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-W8y7HENOmCqlhgD5r0pT4fIzxKkW/yIpLgkx/3PzvZI="; + sha256 = "sha256-+0yMA7ccj9OsEG3aUgxG/RMBAFXHf/sMDHf8c/w5O1g="; }; - cargoSha256 = "sha256-TXwxFrEUVK8caw/MXa7vtb4SSjsYTZN2PAf/T4K7qL4="; + cargoSha256 = "sha256-UWE2spvdD5dmS9RgqMlRQGWr1weU8eMr8gGWAHIyx3s="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index fb6e0d4f5f23..b1ed4322a2aa 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -18,6 +18,13 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; + # TODO: investigate some more why these tests fail in nix + checkFlags = [ + "--skip=tests_integration::test_list" + "--skip=tests_integration::test_relocated_run" + "--skip=tests_integration::test_run" + ]; + meta = with lib; { description = "Next-generation test runner for Rust projects"; homepage = "https://github.com/nextest-rs/nextest"; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 0c0269145f51..8d9c6343f6da 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,20 +11,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.70.1"; + version = "1.71.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-/clEY3sabaDEOAAowQ896vYOvzf5Teevoa7ZkzWw+fY="; + hash = "sha256-fmEQ1YsIB9xZOQZBojmYkFWPDdOLbNXqfn0szgZmtKg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-9wxWxrn+uPcz60710DROhDqNC6FvTtnqzWiWRk8kl6A="; + hash = "sha256-700LPWyhY95sVjB3chbdmr7AmE1Y55vN6Llszv/APL4="; }; postPatch = '' diff --git a/pkgs/servers/roundcube/plugins/carddav/default.nix b/pkgs/servers/roundcube/plugins/carddav/default.nix index 04f7dbbd0bf4..630cfb23d534 100644 --- a/pkgs/servers/roundcube/plugins/carddav/default.nix +++ b/pkgs/servers/roundcube/plugins/carddav/default.nix @@ -2,10 +2,10 @@ roundcubePlugin rec { pname = "carddav"; - version = "4.4.3"; + version = "4.4.4"; src = fetchzip { url = "https://github.com/mstilkerich/rcmcarddav/releases/download/v${version}/carddav-v${version}.tar.gz"; - sha256 = "0xm2x6r0j8dpkybxq28lbwpbmxaa52z8jnw3yaszvmx04zsr5mn8"; + sha256 = "1l35z2k43q8cflhzmk43kifrskhcvygrsvbbzs2s8hhjhsz2b3aq"; }; } diff --git a/pkgs/servers/roundcube/plugins/plugins.nix b/pkgs/servers/roundcube/plugins/plugins.nix index 72738eb4c407..2de2ff736496 100644 --- a/pkgs/servers/roundcube/plugins/plugins.nix +++ b/pkgs/servers/roundcube/plugins/plugins.nix @@ -8,4 +8,5 @@ carddav = callPackage ./carddav { }; contextmenu = callPackage ./contextmenu { }; persistent_login = callPackage ./persistent_login { }; + thunderbird_labels = callPackage ./thunderbird_labels { }; } diff --git a/pkgs/servers/roundcube/plugins/thunderbird_labels/default.nix b/pkgs/servers/roundcube/plugins/thunderbird_labels/default.nix new file mode 100644 index 000000000000..f2087056488d --- /dev/null +++ b/pkgs/servers/roundcube/plugins/thunderbird_labels/default.nix @@ -0,0 +1,11 @@ +{ roundcubePlugin, fetchzip }: + +roundcubePlugin rec { + pname = "thunderbird_labels"; + version = "1.6.0"; + + src = fetchzip { + url = "https://github.com/mike-kfed/roundcube-thunderbird_labels/archive/refs/tags/v${version}.tar.gz"; + sha256 = "09hh3d0n12b8ywkazh8kj3xgn128k35hyjhpa98c883b6b9y8kif"; + }; +} diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index 583192019d34..93eccb74eab0 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "sunshine"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "LizardByte"; repo = "Sunshine"; rev = "v${version}"; - sha256 = "sha256-SB2DAOYf2izIwwRWEw2wt5L5oCDbb6YOqXw/z/PD1pQ="; + sha256 = "sha256-/eekvpjopCivb2FJqh5W1G54GznLwdjk8ANOosdfuxw="; fetchSubmodules = true; }; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index d8e01c339ce7..15ac49c80fff 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-11-07"; + version = "2022-11-08"; pname = "oh-my-zsh"; - rev = "0145d744a9c4c11f00992f7f3ad9555bc8ac6177"; + rev = "1f30c1a079cd10030578e38f8562dc5be53d0fd3"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "F1h+yTYCVS3rz/ADahOQWyee3TKjkNfUc8O7Ug+2z48="; + sha256 = "qwRUzH1R/K5Y3bpzkgJWSyI+aBHRmrycNKlRAjjmv0w="; }; strictDeps = true; diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/tools/misc/discocss/default.nix index c44d37505155..e010541c7182 100644 --- a/pkgs/tools/misc/discocss/default.nix +++ b/pkgs/tools/misc/discocss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "discocss"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mlvzk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-afmQCOOZ1MwQkbZZNHYfq2+IRv2eOtYBrGVHzDEbUHw="; + sha256 = "sha256-Qp1EixARxEnpNM+Yhn00anR0Ll4aFmkeaGtNju/iWlY="; }; dontBuild = true; diff --git a/pkgs/tools/misc/torrenttools/default.nix b/pkgs/tools/misc/torrenttools/default.nix new file mode 100644 index 000000000000..8e9bbba44616 --- /dev/null +++ b/pkgs/tools/misc/torrenttools/default.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchFromGitHub +, bencode +, catch2 +, cli11 +, cmake +, ctre +, expected-lite +, fmt +, gsl-lite +, howard-hinnant-date +, libyamlcpp +, ninja +, nlohmann_json +, openssl +, re2 +, sigslot +}: + +stdenv.mkDerivation rec { + pname = "torrenttools"; + version = "0.6.2"; + + srcs = [ + (fetchFromGitHub rec { + owner = "fbdtemme"; + repo = "torrenttools"; + rev = "v${version}"; + hash = "sha256-3rAxw4JM5ruOn0ccKnpdCnUWUPTQOUvRYz8OKU/FpJ8="; + name = repo; + }) + (fetchFromGitHub rec { + owner = "fbdtemme"; + repo = "cliprogress"; + rev = "a887519e360e44c1ef88ea4ef7df652ea049c502"; + hash = "sha256-nVvzez5GB57qSj2SLaxdYlkSX8rRM06H2NnLQGCDWMg="; + name = repo; + }) + (fetchFromGitHub rec { + owner = "fbdtemme"; + repo = "dottorrent"; + rev = "38ac810d6bb3628fd3ce49150c9fb641bb5e78cd"; + hash = "sha256-0H9h0Hud0Fd64lY0pxQ96coDOEDr5wh8v1sNT1lBxb0="; + name = repo; + }) + (fetchFromGitHub rec { + owner = "fbdtemme"; + repo = "termcontrol"; + rev = "c53eec4efe0e163871d9eb54dc074c25cd01abf0"; + hash = "sha256-0j78QtEkhlssVivPl709o5Pf36TzhOZ6VHaqDiH0L0I="; + name = repo; + }) + ]; + sourceRoot = "torrenttools"; + + postUnpack = '' + cp -pr cliprogress torrenttools/external/cliprogress + cp -pr dottorrent torrenttools/external/dottorrent + cp -pr termcontrol torrenttools/external/termcontrol + chmod -R u+w -- "$sourceRoot" + ''; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + bencode + catch2 + cli11 + ctre + expected-lite + fmt + gsl-lite + howard-hinnant-date + libyamlcpp + nlohmann_json + openssl + re2 + sigslot + ]; + + cmakeFlags = [ + "-DTORRENTTOOLS_BUILD_TESTS:BOOL=ON" + "-DTORRENTTOOLS_TBB:BOOL=OFF" # Our TBB doesn't expose a CMake module. + ]; + + doCheck = true; + + meta = with lib; { + description = "A CLI tool for creating, inspecting and modifying BitTorrent metafiles"; + homepage = "https://github.com/fbdtemme/torrenttools"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 2b9d204772e8..9087e1864bf5 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -10,11 +10,8 @@ , libuuid , curl , gsoap +, Security , enableTools ? true - # Build the bundled libcurl - # and, if defaultToLibCurl, - # use instead of an external one -, useEmbeddedLibcurl ? true # Use libcurl instead of libneon # Note that the libneon used is bundled in the project # See https://github.com/cern-fts/davix/issues/23 @@ -36,8 +33,10 @@ stdenv.mkDerivation rec { openssl libxml2 boost - libuuid - ] ++ lib.optional (defaultToLibcurl && !useEmbeddedLibcurl) curl + curl + ] + ++ lib.optional stdenv.isDarwin Security + ++ lib.optional (!stdenv.isDarwin) libuuid ++ lib.optional (enableThirdPartyCopy) gsoap; # using the url below since the github release page states @@ -56,7 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TOOLS=${boolToUpper enableTools}" - "-DEMBEDDED_LIBCURL=${boolToUpper useEmbeddedLibcurl}" + "-DEMBEDDED_LIBCURL=OFF" "-DLIBCURL_BACKEND_BY_DEFAULT=${boolToUpper defaultToLibcurl}" "-DENABLE_IPV6=${boolToUpper enableIpv6}" "-DENABLE_TCP_NODELAY=${boolToUpper enableTcpNodelay}" @@ -64,7 +63,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Toolkit for Http-based file management"; longDescription = "Davix is a toolkit designed for file diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/tools/networking/dnsmonster/default.nix index eac3f61f30cc..919469065c0b 100644 --- a/pkgs/tools/networking/dnsmonster/default.nix +++ b/pkgs/tools/networking/dnsmonster/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "dnsmonster"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "mosajjal"; repo = pname; rev = "v${version}"; - hash = "sha256-MiFwGVvaShy7dEKixIXdRCBmRc2YnxX49/7R8JugXng="; + hash = "sha256-fpyx2/2P2tMx/n5pCZkUie3uU9jarRU2QVMBs8jEc6Q="; }; - vendorSha256 = "sha256-ZCtxKMD9hESERcsptdhxdV51nxyvrdj+guTodn/Sqao="; + vendorSha256 = "sha256-kZkzTi3i8J6K8x+nSjGeyzEBRPeDEP6qX5KMv/weAXg="; buildInputs = [ libpcap diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix index dab5bee882c1..5d65e110d9c6 100644 --- a/pkgs/tools/networking/goreplay/default.nix +++ b/pkgs/tools/networking/goreplay/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, libpcap }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, libpcap }: buildGoModule rec { pname = "goreplay"; @@ -11,6 +11,14 @@ buildGoModule rec { sha256 = "sha256-FiY9e5FgpPu+K8eoO8TsU3xSaSoPPDxYEu0oi/S8Q1w="; }; + patches = [ + # Fix build on arm64-linux, see https://github.com/buger/goreplay/pull/1140 + (fetchpatch { + url = "https://github.com/buger/goreplay/commit/a01afa1e322ef06f36995abc3fda3297bdaf0140.patch"; + sha256 = "sha256-w3aVe/Fucwd2OuK5Fu2jJTbmMci8ilWaIjYjsWuLRlo="; + }) + ]; + vendorSha256 = "sha256-jDMAtcq3ZowFdky5BdTkVNxq4ltkhklr76nXYJgGALg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 489bf2bb2aa3..ce360d823455 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -32,10 +32,17 @@ stdenv.mkDerivation rec { # Allow doas to discover binaries in /run/current-system/sw/{s,}bin and # /run/wrappers/bin ./0001-add-NixOS-specific-dirs-to-safe-PATH.patch + + # Standard environment supports "dontDisableStatic" knob, but has no + # equivalent for "--disable-shared", so I have to patch "configure" + # script instead. + ./disable-shared.patch ]; postPatch = '' sed -i '/\(chown\|chmod\)/d' GNUmakefile + '' + lib.optionalString (withPAM && stdenv.hostPlatform.isStatic) '' + sed -i 's/-lpam/-lpam -laudit/' configure ''; nativeBuildInputs = [ bison ]; diff --git a/pkgs/tools/security/doas/disable-shared.patch b/pkgs/tools/security/doas/disable-shared.patch new file mode 100644 index 000000000000..2f8869ee6988 --- /dev/null +++ b/pkgs/tools/security/doas/disable-shared.patch @@ -0,0 +1,13 @@ +Accept and ignore "--disable-shared" option passed by pkgsStatic.stdenv. +Without this patch, configure phase fails with "unknown option". + +--- a/configure 1970-01-01 00:00:00.000000000 -0500 ++++ b/configure 1970-01-01 00:00:00.000000000 -0500 +@@ -46,6 +46,7 @@ + opt=${x%%=*} + var=${x#*=} + case "$opt" in ++ --disable-shared) : ;; + --prefix) PREFIX=$var ;; + --exec-prefix) EPREFIX=$var ;; + --bindir) BINDIR=$var ;; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c81b62b31670..c2f1332b9cd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5202,7 +5202,9 @@ with pkgs; cadaver = callPackage ../tools/networking/cadaver { }; - davix = callPackage ../tools/networking/davix { }; + davix = callPackage ../tools/networking/davix { + inherit (darwin.apple_sdk.frameworks) Security; + }; davix-copy = davix.override { enableThirdPartyCopy = true; }; @@ -30611,10 +30613,7 @@ with pkgs; ninjas2 = callPackage ../applications/audio/ninjas2 {}; - nncp = ( - if stdenv.isDarwin - then darwin.apple_sdk_11_0.callPackage - else callPackage) ../tools/misc/nncp { }; + nncp = darwin.apple_sdk_11_0.callPackage ../tools/misc/nncp { }; notion = callPackage ../applications/window-managers/notion { }; @@ -32368,6 +32367,10 @@ with pkgs; torrential = callPackage ../applications/networking/p2p/torrential { }; + torrenttools = callPackage ../tools/misc/torrenttools { + fmt = fmt_8; + }; + tortoisehg = callPackage ../applications/version-management/tortoisehg { }; tonelib-gfx = callPackage ../applications/audio/tonelib-gfx { };