diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 82872597a8b1..8891e9861f82 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -558,6 +558,12 @@
githubId = 43479487;
name = "Titouan Biteau";
};
+ alekseysidorov = {
+ email = "sauron1987@gmail.com";
+ github = "alekseysidorov";
+ githubId = 83360;
+ name = "Aleksey Sidorov";
+ };
alerque = {
email = "caleb@alerque.com";
github = "alerque";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index 4837b29c585a..b1c4745a3f59 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -37,6 +37,15 @@
programs.bash.blesh.
+
+
+ cups-pdf-to-pdf,
+ a pdf-generating cups backend based on
+ cups-pdf.
+ Available as
+ services.printing.cups-pdf.
+
+
fzf,
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index b3354eec65fb..630157901674 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -18,6 +18,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [blesh](https://github.com/akinomyoga/ble.sh), a line editor written in pure bash. Available as [programs.bash.blesh](#opt-programs.bash.blesh.enable).
+- [cups-pdf-to-pdf](https://github.com/alexivkin/CUPS-PDF-to-PDF), a pdf-generating cups backend based on [cups-pdf](https://www.cups-pdf.de/). Available as [services.printing.cups-pdf](#opt-services.printing.cups-pdf.enable).
+
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
- [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable).
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index d5ec420f3044..bc6583442edf 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -42,7 +42,7 @@ in
strings. The latter is concatenated, interspersed with colon
characters.
'';
- type = with types; attrsOf (oneOf [ str path (listOf str) ]);
+ type = with types; attrsOf (oneOf [ (listOf str) str path ]);
apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else "${v}");
};
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index b3cdaf5568d4..1067b21a22b0 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -89,6 +89,12 @@ in
stateVersion = mkOption {
type = types.str;
+ # TODO Remove this and drop the default of the option so people are forced to set it.
+ # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix
+ apply = v:
+ lib.warnIf (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority)
+ "system.stateVersion is not set, defaulting to ${v}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion."
+ v;
default = cfg.release;
defaultText = literalExpression "config.${opt.release}";
description = lib.mdDoc ''
@@ -149,14 +155,6 @@ in
"os-release".text = attrsToText osReleaseContents;
};
- # We have to use `warnings` because when warning in the default of the option
- # the warning would also be shown when building the manual since the manual
- # has to evaluate the default.
- #
- # TODO Remove this and drop the default of the option so people are forced to set it.
- # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix
- warnings = lib.optional (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority)
- "system.stateVersion is not set, defaulting to ${config.system.stateVersion}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion.";
};
# uses version info nixpkgs, which requires a full nixpkgs path
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a1e7cf01882e..a41cae9f8775 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1028,6 +1028,7 @@
./services/networking/znc/default.nix
./services/printing/cupsd.nix
./services/printing/ipp-usb.nix
+ ./services/printing/cups-pdf.nix
./services/scheduling/atd.nix
./services/scheduling/cron.nix
./services/scheduling/fcron.nix
diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix
index 15fad007bd3e..a981814730a1 100644
--- a/nixos/modules/profiles/macos-builder.nix
+++ b/nixos/modules/profiles/macos-builder.nix
@@ -11,6 +11,17 @@ in
{ imports = [
../virtualisation/qemu-vm.nix
+
+ # Avoid a dependency on stateVersion
+ {
+ disabledModules = [
+ ../virtualisation/nixos-containers.nix
+ ../services/x11/desktop-managers/xterm.nix
+ ];
+ config = {
+ };
+ options.boot.isContainer = lib.mkOption { default = false; internal = true; };
+ }
];
# The builder is not intended to be used interactively
@@ -97,7 +108,14 @@ in
# To prevent gratuitous rebuilds on each change to Nixpkgs
nixos.revision = null;
- stateVersion = "22.05";
+ stateVersion = lib.mkDefault (throw ''
+ The macOS linux builder should not need a stateVersion to be set, but a module
+ has accessed stateVersion nonetheless.
+ Please inspect the trace of the following command to figure out which module
+ has a dependency on stateVersion.
+
+ nix-instantiate --attr darwin.builder --show-trace
+ '');
};
users.users."${user}"= {
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index ae8e1dd8463b..c5fc09dcea02 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -150,8 +150,9 @@ let
# Ensure that the home directory already exists
# We can't assert createHome == true because that's not the case for root
cd "${config.users.users.${cfg.user}.home}"
- ${install} -d .config/borg
- ${install} -d .cache/borg
+ # Create each directory separately to prevent root owned parent dirs
+ ${install} -d .config .config/borg
+ ${install} -d .cache .cache/borg
'' + optionalString (isLocalPath cfg.repo && !cfg.removableDevice) ''
${install} -d ${escapeShellArg cfg.repo}
''));
diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index b9b581acb34a..3087d879b9d2 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -507,6 +507,12 @@ in {
sqlite3 = null;
psycopg2 = "matrix-synapse";
}.${cfg.settings.database.name};
+ defaultText = lib.literalExpression ''
+ {
+ sqlite3 = null;
+ psycopg2 = "matrix-synapse";
+ }.''${cfg.settings.database.name};
+ '';
description = lib.mdDoc ''
Username to connect with psycopg2, set to null
when using sqlite3.
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index b13706f641cf..10db7cdfb33c 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -819,7 +819,7 @@ in
optionals (pkgs.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}
+ map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} or [])
)
);
}
diff --git a/nixos/modules/services/printing/cups-pdf.nix b/nixos/modules/services/printing/cups-pdf.nix
new file mode 100644
index 000000000000..07f24367132f
--- /dev/null
+++ b/nixos/modules/services/printing/cups-pdf.nix
@@ -0,0 +1,185 @@
+{ config, lib, pkgs, ... }:
+
+let
+
+ # cups calls its backends as user `lp` (which is good!),
+ # but cups-pdf wants to be called as `root`, so it can change ownership of files.
+ # We add a suid wrapper and a wrapper script to trick cups into calling the suid wrapper.
+ # Note that a symlink to the suid wrapper alone wouldn't suffice, cups would complain
+ # > File "/nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-cups-progs/lib/cups/backend/cups-pdf" has insecure permissions (0104554/uid=0/gid=20)
+
+ # wrapper script that redirects calls to the suid wrapper
+ cups-pdf-wrapper = pkgs.writeTextFile {
+ name = "${pkgs.cups-pdf-to-pdf.name}-wrapper.sh";
+ executable = true;
+ destination = "/lib/cups/backend/cups-pdf";
+ checkPhase = ''
+ ${pkgs.stdenv.shellDryRun} "$target"
+ ${lib.getExe pkgs.shellcheck} "$target"
+ '';
+ text = ''
+ #! ${pkgs.runtimeShell}
+ exec "${config.security.wrapperDir}/cups-pdf" "$@"
+ '';
+ };
+
+ # wrapped cups-pdf package that uses the suid wrapper
+ cups-pdf-wrapped = pkgs.buildEnv {
+ name = "${pkgs.cups-pdf-to-pdf.name}-wrapped";
+ # using the wrapper as first path ensures it is used
+ paths = [ cups-pdf-wrapper pkgs.cups-pdf-to-pdf ];
+ ignoreCollisions = true;
+ };
+
+ instanceSettings = name: {
+ freeformType = with lib.types; nullOr (oneOf [ int str path package ]);
+ # override defaults:
+ # inject instance name into paths,
+ # also avoid conflicts between user names and special dirs
+ options.Out = lib.mkOption {
+ type = with lib.types; nullOr singleLineStr;
+ default = "/var/spool/cups-pdf-${name}/users/\${USER}";
+ defaultText = "/var/spool/cups-pdf-{instance-name}/users/\${USER}";
+ example = "\${HOME}/cups-pdf";
+ description = lib.mdDoc ''
+ output directory;
+ `''${HOME}` will be expanded to the user's home directory,
+ `''${USER}` will be expanded to the user name.
+ '';
+ };
+ options.AnonDirName = lib.mkOption {
+ type = with lib.types; nullOr singleLineStr;
+ default = "/var/spool/cups-pdf-${name}/anonymous";
+ defaultText = "/var/spool/cups-pdf-{instance-name}/anonymous";
+ example = "/var/lib/cups-pdf";
+ description = lib.mdDoc "path for anonymously created PDF files";
+ };
+ options.Spool = lib.mkOption {
+ type = with lib.types; nullOr singleLineStr;
+ default = "/var/spool/cups-pdf-${name}/spool";
+ defaultText = "/var/spool/cups-pdf-{instance-name}/spool";
+ example = "/var/lib/cups-pdf";
+ description = lib.mdDoc "spool directory";
+ };
+ options.Anonuser = lib.mkOption {
+ type = lib.types.singleLineStr;
+ default = "root";
+ description = lib.mdDoc ''
+ User for anonymous PDF creation.
+ An empty string disables this feature.
+ '';
+ };
+ options.GhostScript = lib.mkOption {
+ type = with lib.types; nullOr path;
+ default = lib.getExe pkgs.ghostscript;
+ defaultText = lib.literalExpression "lib.getExe pkgs.ghostscript";
+ example = lib.literalExpression ''''${pkgs.ghostscript}/bin/ps2pdf'';
+ description = lib.mdDoc "location of GhostScript binary";
+ };
+ };
+
+ instanceConfig = { name, config, ... }: {
+ options = {
+ enable = (lib.mkEnableOption (lib.mdDoc "this cups-pdf instance")) // { default = true; };
+ installPrinter = (lib.mkEnableOption (lib.mdDoc ''
+ a CUPS printer queue for this instance.
+ The queue will be named after the instance and will use the {file}`CUPS-PDF_opt.ppd` ppd file.
+ If this is disabled, you need to add the queue yourself to use the instance
+ '')) // { default = true; };
+ confFileText = lib.mkOption {
+ type = lib.types.lines;
+ description = lib.mdDoc ''
+ This will contain the contents of {file}`cups-pdf.conf` for this instance, derived from {option}`settings`.
+ You can use this option to append text to the file.
+ '';
+ };
+ settings = lib.mkOption {
+ type = lib.types.submodule (instanceSettings name);
+ default = {};
+ example = {
+ Out = "\${HOME}/cups-pdf";
+ UserUMask = "0033";
+ };
+ description = lib.mdDoc ''
+ Settings for a cups-pdf instance, see the descriptions in the template config file in the cups-pdf package.
+ The key value pairs declared here will be translated into proper key value pairs for {file}`cups-pdf.conf`.
+ Setting a value to `null` disables the option and removes it from the file.
+ '';
+ };
+ };
+ config.confFileText = lib.pipe config.settings [
+ (lib.filterAttrs (key: value: value != null))
+ (lib.mapAttrs (key: builtins.toString))
+ (lib.mapAttrsToList (key: value: "${key} ${value}\n"))
+ lib.concatStrings
+ ];
+ };
+
+ cupsPdfCfg = config.services.printing.cups-pdf;
+
+ copyConfigFileCmds = lib.pipe cupsPdfCfg.instances [
+ (lib.filterAttrs (name: lib.getAttr "enable"))
+ (lib.mapAttrs (name: lib.getAttr "confFileText"))
+ (lib.mapAttrs (name: pkgs.writeText "cups-pdf-${name}.conf"))
+ (lib.mapAttrsToList (name: confFile: "ln --symbolic --no-target-directory ${confFile} /var/lib/cups/cups-pdf-${name}.conf\n"))
+ lib.concatStrings
+ ];
+
+ printerSettings = lib.pipe cupsPdfCfg.instances [
+ (lib.filterAttrs (name: lib.getAttr "enable"))
+ (lib.filterAttrs (name: lib.getAttr "installPrinter"))
+ (lib.mapAttrsToList (name: instance: (lib.mapAttrs (key: lib.mkDefault) {
+ inherit name;
+ model = "CUPS-PDF_opt.ppd";
+ deviceUri = "cups-pdf:/${name}";
+ description = "virtual printer for cups-pdf instance ${name}";
+ location = instance.settings.Out;
+ })))
+ ];
+
+in
+
+{
+
+ options.services.printing.cups-pdf = {
+ enable = lib.mkEnableOption (lib.mdDoc ''
+ the cups-pdf virtual pdf printer backend.
+ By default, this will install a single printer `pdf`.
+ but this can be changed/extended with {option}`services.printing.cups-pdf.instances`
+ '');
+ instances = lib.mkOption {
+ type = lib.types.attrsOf (lib.types.submodule instanceConfig);
+ default.pdf = {};
+ example.pdf.settings = {
+ Out = "\${HOME}/cups-pdf";
+ UserUMask = "0033";
+ };
+ description = lib.mdDoc ''
+ Permits to raise one or more cups-pdf instances.
+ Each instance is named by an attribute name, and the attribute's values control the instance' configuration.
+ '';
+ };
+ };
+
+ config = lib.mkIf cupsPdfCfg.enable {
+ services.printing.enable = true;
+ services.printing.drivers = [ cups-pdf-wrapped ];
+ hardware.printers.ensurePrinters = printerSettings;
+ # the cups module will install the default config file,
+ # but we don't need it and it would confuse cups-pdf
+ systemd.services.cups.preStart = lib.mkAfter ''
+ rm -f /var/lib/cups/cups-pdf.conf
+ ${copyConfigFileCmds}
+ '';
+ security.wrappers.cups-pdf = {
+ group = "lp";
+ owner = "root";
+ permissions = "+r,ug+x";
+ setuid = true;
+ source = "${pkgs.cups-pdf-to-pdf}/lib/cups/backend/cups-pdf";
+ };
+ };
+
+ meta.maintainers = [ lib.maintainers.yarny ];
+
+}
diff --git a/nixos/modules/system/boot/initrd-openvpn.nix b/nixos/modules/system/boot/initrd-openvpn.nix
index b41e7524320e..cbc61d55d6bb 100644
--- a/nixos/modules/system/boot/initrd-openvpn.nix
+++ b/nixos/modules/system/boot/initrd-openvpn.nix
@@ -68,11 +68,8 @@ in
$out/bin/openvpn --show-gateway
'';
- # Add `iproute /bin/ip` to the config, to ensure that openvpn
- # is able to set the routes
boot.initrd.network.postCommands = ''
- (cat /etc/initrd.ovpn; echo -e '\niproute /bin/ip') | \
- openvpn /dev/stdin &
+ openvpn /etc/initrd.ovpn &
'';
};
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 31702499b0f1..196f44ccd783 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -148,6 +148,16 @@ in {
visible = false;
};
+ extraConfig = mkOption {
+ default = "";
+ type = types.lines;
+ example = "DefaultLimitCORE=infinity";
+ description = lib.mdDoc ''
+ Extra config options for systemd. See systemd-system.conf(5) man page
+ for available options.
+ '';
+ };
+
contents = mkOption {
description = lib.mdDoc "Set of files that have to be linked into the initrd";
example = literalExpression ''
@@ -352,6 +362,7 @@ in {
"/etc/systemd/system.conf".text = ''
[Manager]
DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"}
+ ${cfg.extraConfig}
'';
"/lib/modules".source = "${modulesClosure}/lib/modules";
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 4ab2578eb81e..028099c64643 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -96,6 +96,12 @@ in
MaxLevelConsole=debug
'';
+ boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = ''
+ [Journal]
+ ForwardToConsole=yes
+ MaxLevelConsole=debug
+ '';
+
systemd.extraConfig = ''
# Don't clobber the console with duplicate systemd messages.
ShowStatus=no
@@ -107,6 +113,8 @@ in
DefaultTimeoutStartSec=300
'';
+ boot.initrd.systemd.extraConfig = config.systemd.extraConfig;
+
boot.consoleLogLevel = 7;
# Prevent tests from accessing the Internet.
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e385dfebebf3..0a5144072e04 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -155,6 +155,7 @@ in {
coturn = handleTest ./coturn.nix {};
couchdb = handleTest ./couchdb.nix {};
cri-o = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cri-o.nix {};
+ cups-pdf = handleTest ./cups-pdf.nix {};
custom-ca = handleTest ./custom-ca.nix {};
croc = handleTest ./croc.nix {};
deluge = handleTest ./deluge.nix {};
diff --git a/nixos/tests/cups-pdf.nix b/nixos/tests/cups-pdf.nix
new file mode 100644
index 000000000000..70d14f29e2e5
--- /dev/null
+++ b/nixos/tests/cups-pdf.nix
@@ -0,0 +1,40 @@
+import ./make-test-python.nix ({ lib, pkgs, ... }: {
+ name = "cups-pdf";
+
+ nodes.machine = { pkgs, ... }: {
+ imports = [ ./common/user-account.nix ];
+ environment.systemPackages = [ pkgs.poppler_utils ];
+ fonts.fonts = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf
+ services.printing.cups-pdf.enable = true;
+ services.printing.cups-pdf.instances = {
+ opt = {};
+ noopt.installPrinter = false;
+ };
+ hardware.printers.ensurePrinters = [{
+ name = "noopt";
+ model = "CUPS-PDF_noopt.ppd";
+ deviceUri = "cups-pdf:/noopt";
+ }];
+ };
+
+ # we cannot check the files with pdftotext, due to
+ # https://github.com/alexivkin/CUPS-PDF-to-PDF/issues/7
+ # we need `imagemagickBig` as it has ghostscript support
+
+ testScript = ''
+ from subprocess import run
+ machine.wait_for_unit("cups.service")
+ for name in ("opt", "noopt"):
+ text = f"test text {name}".upper()
+ machine.wait_until_succeeds(f"lpstat -v {name}")
+ machine.succeed(f"su - alice -c 'echo -e \"\n {text}\" | lp -d {name}'")
+ # wait until the pdf files are completely produced and readable by alice
+ machine.wait_until_succeeds(f"su - alice -c 'pdfinfo /var/spool/cups-pdf-{name}/users/alice/*.pdf'")
+ machine.succeed(f"cp /var/spool/cups-pdf-{name}/users/alice/*.pdf /tmp/{name}.pdf")
+ machine.copy_from_vm(f"/tmp/{name}.pdf", "")
+ run(f"${pkgs.imagemagickBig}/bin/convert -density 300 $out/{name}.pdf $out/{name}.jpeg", shell=True, check=True)
+ assert text.encode() in run(f"${lib.getExe pkgs.tesseract} $out/{name}.jpeg stdout", shell=True, check=True, capture_output=True).stdout
+ '';
+
+ meta.maintainers = [ lib.maintainers.yarny ];
+})
diff --git a/nixos/tests/initrd-network-openvpn/default.nix b/nixos/tests/initrd-network-openvpn/default.nix
index bb4c41e6d709..dbb34c28eea7 100644
--- a/nixos/tests/initrd-network-openvpn/default.nix
+++ b/nixos/tests/initrd-network-openvpn/default.nix
@@ -91,6 +91,7 @@ import ../make-test-python.nix ({ lib, ...}:
config = ''
dev tun0
ifconfig 10.8.0.1 10.8.0.2
+ cipher AES-256-CBC
${secretblock}
'';
};
diff --git a/nixos/tests/initrd-network-openvpn/initrd.ovpn b/nixos/tests/initrd-network-openvpn/initrd.ovpn
index 5926a48af00f..3ada4130e868 100644
--- a/nixos/tests/initrd-network-openvpn/initrd.ovpn
+++ b/nixos/tests/initrd-network-openvpn/initrd.ovpn
@@ -3,6 +3,7 @@ dev tun
ifconfig 10.8.0.2 10.8.0.1
# Only force VLAN 2 through the VPN
route 192.168.2.0 255.255.255.0 10.8.0.1
+cipher AES-256-CBC
secret [inline]
#
@@ -26,4 +27,4 @@ be5a69522a8e60ccb217f8521681b45d
e7811584363597599cce2040a68ac00e
f2125540e0f7f4adc37cb3f0d922eeb7
-----END OpenVPN Static key V1-----
-
\ No newline at end of file
+
diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix
index 4077f5be2107..73bee279803b 100644
--- a/pkgs/applications/audio/ocenaudio/default.nix
+++ b/pkgs/applications/audio/ocenaudio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
- version = "3.11.15";
+ version = "3.11.20";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
- sha256 = "sha256-l3Fv0gKKGYrbxpGHH6MXflK5fCrGoq3Qu+XkqFqMJJk=";
+ sha256 = "sha256-ifzth9qd2YX9WeF6QeXSWkMqRyTGBxPyTm5tkanPiFQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix
index 74394418fd53..eaa2b0d9959c 100644
--- a/pkgs/applications/editors/cpeditor/default.nix
+++ b/pkgs/applications/editors/cpeditor/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cpeditor";
- version = "6.10.1";
+ version = "6.11.1";
src = fetchFromGitHub {
owner = "cpeditor";
repo = "cpeditor";
rev = version;
- sha256 = "sha256-SIREoOapaZTLtqi0Z07lKmNqF9a9qIpgGxuhqaY3yfU=";
+ sha256 = "sha256-Uwo7ZE+9yrHV/+D6rvfew2d3ZJbpFOjgek38iYkPppw=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch b/pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch
new file mode 100644
index 000000000000..4c2259d63a33
--- /dev/null
+++ b/pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch
@@ -0,0 +1,39 @@
+diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile
+index 4515610d3..916c8fcd8 100644
+--- a/desktop-ui/GNUmakefile
++++ b/desktop-ui/GNUmakefile
+@@ -91,7 +91,7 @@ endif
+ cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
+ cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/
+ cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/
+- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns
++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
+ codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app
+ else ifeq ($(platform),windows)
+ $(call mkdir,$(output.path)/Shaders/)
+diff --git a/genius/GNUmakefile b/genius/GNUmakefile
+index 5287309a8..8d80f9306 100644
+--- a/genius/GNUmakefile
++++ b/genius/GNUmakefile
+@@ -24,7 +24,7 @@ ifeq ($(platform),macos)
+ mkdir -p $(output.path)/$(name).app/Contents/Resources/
+ mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name)
+ cp data/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
+- sips -s format icns data/$(name).png --$(output.path) $(output.path)/$(name).app/Contents/Resources/$(name).icns
++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns data/$(name).png
+ endif
+
+ verbose: hiro.verbose nall.verbose all;
+diff --git a/mia/GNUmakefile b/mia/GNUmakefile
+index b6930b6df..7a51b5028 100644
+--- a/mia/GNUmakefile
++++ b/mia/GNUmakefile
+@@ -32,7 +32,7 @@ ifeq ($(platform),macos)
+ mkdir -p $(output.path)/$(name).app/Contents/Resources/
+ mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name)
+ cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist
+- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns
++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
+ endif
+
+ verbose: hiro.verbose nall.verbose all;
diff --git a/pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch b/pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch
new file mode 100644
index 000000000000..5b216ac267e2
--- /dev/null
+++ b/pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch
@@ -0,0 +1,23 @@
+diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile
+index 916c8fcd8..b767c1335 100644
+--- a/desktop-ui/GNUmakefile
++++ b/desktop-ui/GNUmakefile
+@@ -92,7 +92,6 @@ endif
+ cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/
+ cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/
+ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png
+- codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app
+ else ifeq ($(platform),windows)
+ $(call mkdir,$(output.path)/Shaders/)
+ $(call mkdir,$(output.path)/Database/)
+@@ -115,8 +114,8 @@ ifeq ($(platform),windows)
+ else ifeq ($(shell id -un),root)
+ $(error "make install should not be run as root")
+ else ifeq ($(platform),macos)
+- mkdir -p ~/Library/Application\ Support/$(name)/
+- cp -R $(output.path)/$(name).app /Applications/$(name).app
++ mkdir -p $(prefix)/Applications/
++ cp -R $(output.path)/$(name).app $(prefix)/Applications/$(name).app
+ else ifneq ($(filter $(platform),linux bsd),)
+ mkdir -p $(prefix)/bin/
+ mkdir -p $(prefix)/share/applications/
diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix
index 7a6dae5784ce..78afd4db3835 100644
--- a/pkgs/applications/emulators/bsnes/ares/default.nix
+++ b/pkgs/applications/emulators/bsnes/ares/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, pkg-config
, wrapGAppsHook
+, libicns
, SDL2
, alsa-lib
, gtk3
@@ -15,8 +16,12 @@
, libpulseaudio
, openal
, udev
+, darwin
}:
+let
+ inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL;
+in
stdenv.mkDerivation (finalAttrs: {
pname = "ares";
version = "130.1";
@@ -31,15 +36,21 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./000-dont-rebuild-on-install.patch
./001-fix-ruby.patch
+ ./002-sips-to-png2icns.patch
+ ./003-fix-darwin-install.patch
];
nativeBuildInputs = [
pkg-config
wrapGAppsHook
+ ] ++ lib.optionals stdenv.isDarwin [
+ libicns
];
buildInputs = [
SDL2
+ libao
+ ] ++ lib.optionals stdenv.isLinux [
alsa-lib
gtk3
gtksourceview3
@@ -47,29 +58,36 @@ stdenv.mkDerivation (finalAttrs: {
libGLU
libX11
libXv
- libao
libpulseaudio
openal
udev
+ ] ++ lib.optionals stdenv.isDarwin [
+ Cocoa
+ OpenAL
];
enableParallelBuilding = true;
- makeFlags = [
+ makeFlags = lib.optionals stdenv.isLinux [
"hiro=gtk3"
+ ] ++ lib.optionals stdenv.isDarwin [
+ "hiro=cocoa"
+ "vulkan=false"
+ ] ++ [
"local=false"
"openmp=true"
"prefix=$(out)"
"-C desktop-ui"
];
+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14";
+
meta = with lib; {
homepage = "https://ares-emu.net";
description = "Open-source multi-system emulator with a focus on accuracy and preservation";
license = licenses.isc;
maintainers = with maintainers; [ Madouura AndersonTorres ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
})
# TODO: select between Qt, GTK2 and GTK3
-# TODO: support Darwin
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index de091aec53d4..6c7aed47c271 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -6,7 +6,7 @@
};
signal-desktop-beta = {
dir = "Signal Beta";
- version = "6.2.0-beta.1";
- hash = "sha256-OA7DHe/sfW8xpqJPEu7BWotpnaJYj5SatPB21byZHrY=";
+ version = "6.2.0-beta.2";
+ hash = "sha256-NVwX2xG8QGVjENy6fSA13WQyTlYuF5frcS3asDDg4Ik=";
};
}
diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix
index c7877f96e843..d6b4794e97d8 100644
--- a/pkgs/applications/radio/freedv/default.nix
+++ b/pkgs/applications/radio/freedv/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "freedv";
- version = "1.8.5";
+ version = "1.8.6";
src = fetchFromGitHub {
owner = "drowe67";
repo = "freedv-gui";
rev = "v${version}";
- hash = "sha256-BkxEg4vQ943QyDo9V1hG2XimguGn8XpO9aIz5si0PKU=";
+ hash = "sha256-zzzRePBc09fK1ILoDto3EVz7IxJKePi39E18BrQedE0=";
};
postPatch = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index 73354644b5e4..ddec8efb6a41 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "motion";
- version = "4.5.0";
+ version = "4.5.1";
src = fetchFromGitHub {
owner = "Motion-Project";
repo = "motion";
rev = "release-${version}";
- sha256 = "sha256-uKEgTQhpslOCfNj8z95/DK4M1Gx4SMRjl1/KPh5KHuc=";
+ sha256 = "sha256-3TmmLAU/muiI90hrYrctzgVbWS4rXjxzAa0ctVYKSSY=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/applications/video/netflix/default.nix b/pkgs/applications/video/netflix/default.nix
index 4f44ddebaef4..8c50e027c0e2 100644
--- a/pkgs/applications/video/netflix/default.nix
+++ b/pkgs/applications/video/netflix/default.nix
@@ -5,6 +5,9 @@
, runtimeShell
, symlinkJoin
, writeScriptBin
+
+ # command line arguments which are always set e.g "--disable-gpu"
+, commandLineArgs ? [ ]
}:
let
@@ -43,9 +46,12 @@ let
script = writeScriptBin name ''
#!${runtimeShell}
- exec ${google-chrome}/bin/${google-chrome.meta.mainProgram} \
+ exec ${google-chrome}/bin/${google-chrome.meta.mainProgram} ${lib.escapeShellArgs commandLineArgs} \
--app=https://netflix.com \
- --no-first-run --no-default-browser-check --no-crash-upload
+ --no-first-run \
+ --no-default-browser-check \
+ --no-crash-upload \
+ "$@"
'';
in
diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix
index 7794cd81de2c..d13cfbd7f177 100644
--- a/pkgs/applications/virtualization/colima/default.nix
+++ b/pkgs/applications/virtualization/colima/default.nix
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "colima";
- version = "0.5.0";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "abiosoft";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Ey/h9W1WFMJdO5U9IeHhVTYDEJi8w18h2PY0lB0S/BU=";
+ sha256 = "sha256-xw+Yy9KejVkunOLJdmfXstP7aDrl3j0OZjCaf6pyL1U=";
# We need the git revision
leaveDotGit = true;
postFetch = ''
@@ -28,7 +28,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles makeWrapper ];
- vendorSha256 = "sha256-v0U7TorUwOtBzBQ/OQQSAX6faDI1IX/IDIJnY8UFsu8=";
+ vendorSha256 = "sha256-Iz1LYL25NpkztTM86zrLwehub8FzO1IlwZqCPW7wDN4=";
CGO_ENABLED = 1;
diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix
index 4880a9312954..7c63248dfee4 100644
--- a/pkgs/desktops/gnome/extensions/paperwm/default.nix
+++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix
@@ -3,15 +3,15 @@
, fetchFromGitHub
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "gnome-shell-extension-paperwm";
- version = "38.2";
+ version = "unstable-2022-12-14";
src = fetchFromGitHub {
owner = "paperwm";
repo = "PaperWM";
- rev = finalAttrs.version;
- hash = "sha256-Unhz2+MOygOog6B5sOLtYTpdeodQH+/CMI93gC5nDvI=";
+ rev = "7c0863c944a02d4e8095034403bff6ade3579091";
+ hash = "sha256-EN0sWW/NymRNKrApeFnqg8ax7Et4hr0gKZuvMF4kJYU=";
};
dontConfigure = true;
@@ -33,4 +33,4 @@ stdenv.mkDerivation (finalAttrs: {
};
passthru.extensionUuid = "paperwm@hedning:matrix.org";
-})
+}
diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix
index f0edb4815d6a..16e1cb00202d 100644
--- a/pkgs/development/compilers/ligo/default.nix
+++ b/pkgs/development/compilers/ligo/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, fetchFromGitLab
, git
, coq
@@ -9,12 +10,12 @@
ocamlPackages.buildDunePackage rec {
pname = "ligo";
- version = "0.55.0";
+ version = "0.58.0";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = version;
- sha256 = "sha256-GEw9OEHXdTxBvb5ATIcL71wdUCLD+X/A7CYQxwTUQWw=";
+ sha256 = "sha256-WhqCkPkXHjWS8BDh13ODrHg2AHJ8CBfksTH4Fxx4xek=";
fetchSubmodules = true;
};
@@ -108,6 +109,7 @@ ocamlPackages.buildDunePackage rec {
description = "A friendly Smart Contract Language for Tezos";
license = licenses.mit;
platforms = ocamlPackages.ocaml.meta.platforms;
+ broken = stdenv.isLinux && stdenv.isAarch64;
maintainers = with maintainers; [ ulrikstrid ];
};
}
diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix
index dc572a2023cd..2f1a548c88bb 100644
--- a/pkgs/development/interpreters/erlang/R24.nix
+++ b/pkgs/development/interpreters/erlang/R24.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
- version = "24.3.4.6";
- sha256 = "sha256-mQbWiHWz4sz4H1cqkhYM8GHe278ylI7VC5zuLBxUsJc=";
+ version = "24.3.4.7";
+ sha256 = "sha256-cOtoSlK3S2irPX8vQ81rPXBH3aWriyoUmidUyaFs11E=";
}
diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
index 396366324d3a..3568bbfed481 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -1,5 +1,5 @@
{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
-, gdk-pixbuf, xlibsWrapper, gobject-introspection
+, gdk-pixbuf, gobject-introspection
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
++ optionals (stdenv.isLinux || stdenv.isDarwin) [
libXrandr libXrender libXcomposite libXi libXcursor
]
- ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ]
+ ++ optionals stdenv.isDarwin [ libXdamage ]
++ optional xineramaSupport libXinerama
++ optionals cupsSupport [ cups ]
++ optionals stdenv.isDarwin [ AppKit Cocoa ];
diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix
index 28c15f0ef45e..f7cf765e150d 100644
--- a/pkgs/development/libraries/protobufc/default.nix
+++ b/pkgs/development/libraries/protobufc/default.nix
@@ -1,5 +1,11 @@
-{ lib, stdenv, fetchFromGitHub
-, autoreconfHook, pkg-config, protobuf, zlib
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, protobuf
+, zlib
+, buildPackages
}:
stdenv.mkDerivation rec {
@@ -17,11 +23,13 @@ stdenv.mkDerivation rec {
buildInputs = [ protobuf zlib ];
+ PROTOC = lib.getExe buildPackages.protobuf;
+
meta = with lib; {
homepage = "https://github.com/protobuf-c/protobuf-c/";
description = "C bindings for Google's Protocol Buffers";
license = licenses.bsd2;
platforms = platforms.all;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ nickcao ];
};
}
diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix
index 215b1ebc4f01..571e4e717d8f 100644
--- a/pkgs/development/libraries/simdjson/default.nix
+++ b/pkgs/development/libraries/simdjson/default.nix
@@ -15,7 +15,13 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DSIMDJSON_DEVELOPER_MODE=OFF"
- ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF";
+ ] ++ lib.optionals stdenv.hostPlatform.isStatic [
+ "-DBUILD_SHARED_LIBS=OFF"
+ ] ++ lib.optionals (with stdenv.hostPlatform; isPower && isBigEndian) [
+ # Assume required CPU features are available, since otherwise we
+ # just get a failed build.
+ "-DCMAKE_CXX_FLAGS=-mpower8-vector"
+ ];
meta = with lib; {
homepage = "https://simdjson.org/";
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index 6a54c2a80755..b3e91bd3fd13 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sofia-sip";
- version = "1.13.9";
+ version = "1.13.10";
src = fetchFromGitHub {
owner = "freeswitch";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xF2LFbxGhA/gF7Z2LX3WYq3nXOLi0ARGGR4Dd3PCftk=";
+ sha256 = "sha256-UVyjeIIS0WwnY3GoZLIYTgf7R+C8SCuykDozaxCpog0=";
};
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;
diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix
index 181228e28a0a..cbfaeaf3c42e 100644
--- a/pkgs/development/ocaml-modules/class_group_vdf/default.nix
+++ b/pkgs/development/ocaml-modules/class_group_vdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitLab, buildDunePackage
+{ stdenv, lib, fetchFromGitLab, buildDunePackage
, gmp, pkg-config, dune-configurator
, zarith, integers
, alcotest, bisect_ppx }:
@@ -38,6 +38,7 @@ buildDunePackage rec {
meta = {
description = "Verifiable Delay Functions bindings to Chia's VDF";
homepage = "https://gitlab.com/nomadic-labs/tezos";
+ broken = stdenv.isDarwin && stdenv.isx86_64;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix
index 3950c13d3fcf..745f86dff52b 100644
--- a/pkgs/development/ocaml-modules/jwto/default.nix
+++ b/pkgs/development/ocaml-modules/jwto/default.nix
@@ -1,26 +1,26 @@
-{ lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson
+{ lib, buildDunePackage, fetchFromGitHub, alcotest, digestif, fmt, yojson
, ppxlib
, base64, re, ppx_deriving }:
buildDunePackage rec {
pname = "jwto";
- version = "0.3.0";
+ version = "0.4.0";
- useDune2 = true;
+ duneVersion = "3";
- minimumOCamlVersion = "4.05";
+ minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "sporto";
repo = "jwto";
rev = version;
- sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s";
+ hash = "sha256-TOWwNyrOqboCm8Y4mM6GgtmxGO3NmyDdAX7m8CifA7Y=";
};
buildInputs = [ ppxlib ];
propagatedBuildInputs =
- [ cryptokit fmt yojson base64 re ppx_deriving ];
+ [ digestif fmt yojson base64 re ppx_deriving ];
checkInputs = [ alcotest ];
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 23a13707b9b2..13be1fcc1a67 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.2.30";
+ version = "9.2.31";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-zl4qk/cDRISzTNK+fapxGr5yzugueAD3erzzUA51BJI=";
+ hash = "sha256-jG7lZet15mp1ltbdcv1ZMHHa+ydFXQiNS+dl70tmluE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 356d4d8bee42..82355e75be92 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "angr";
- version = "9.2.30";
+ version = "9.2.31";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-UCXxKCvxzGr/c4WuAAFLfEp2QOlKD3n8tqSGI4fjEDo=";
+ hash = "sha256-i7kIHDg1iCtEeigS2+4MTS2fmUYYEbruL7q0s1skR9k=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
index 1ab91cacbcc3..4f5f25d0159b 100644
--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
# in 4.9, test was renamed to tests
checkPhase = ''
cd test*
- ${python.interpreter} ctest.py
+ ${python.interpreter} run.py
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index aa283b601e5e..4bdc1c5585c9 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.2.30";
+ version = "9.2.31";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-IJr5Xk/0n5AfoUAQfI6DrMJ3ulCttKZkVgFZ42C3poE=";
+ hash = "sha256-mrsEdVUp13XqVwrbLYbR8vAsu5wPHQcIOBBSmSPJQYY=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index 24e189cb55b5..acb82fa8d640 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -6,12 +6,11 @@
, requests
, requests-oauthlib
, responses
-, six
}:
buildPythonPackage rec {
pname = "asana";
- version = "2.0.0";
+ version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,13 +19,12 @@ buildPythonPackage rec {
owner = "asana";
repo = "python-asana";
rev = "refs/tags/v${version}";
- sha256 = "sha256-sY7M446krFIcyWkN2pk9FTa+VTXEOZ6xnHePx35e8IY=";
+ hash = "sha256-+lktPFCL2c79dNGgbsaFJRELmV6sJ2kiBSb8kd9XPIQ=";
};
propagatedBuildInputs = [
requests
requests-oauthlib
- six
];
checkInputs = [
@@ -41,6 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python client library for Asana";
homepage = "https://github.com/asana/python-asana";
+ changelog = "https://github.com/Asana/python-asana/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 7cb8a96dc240..3190cb6f7190 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.2.30";
+ version = "9.2.31";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-cN9Mfi572JFH3lfgLp9nnkO+wOUmDfiEtqZUA0U2JEw=";
+ hash = "sha256-hIzB6E1z3ufbHFoe2IfBTuF4uuJibaFTqDjTf5ubHDU=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 24d6ede50306..02d7d9e5390b 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
- version = "9.2.30";
+ version = "9.2.31";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-ZLMbV4H1JWfnMlSsN1nZhQVmsEyJF2sIii0sSOxe+2E=";
+ hash = "sha256-ZgM1GEsmp6LOoFf33l6cZY6cyCoitPDEpFbAVuAd0p8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix
index a77c31e26a63..4a79dc31c195 100644
--- a/pkgs/development/python-modules/explorerscript/default.nix
+++ b/pkgs/development/python-modules/explorerscript/default.nix
@@ -2,9 +2,11 @@
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
+, antlr4
, antlr4-python3-runtime
, igraph
, pygments
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -18,6 +20,10 @@ buildPythonPackage rec {
sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1";
};
+ nativeBuildInputs = [
+ antlr4
+ ];
+
patches = [
# https://github.com/SkyTemple/ExplorerScript/pull/17
(fetchpatch {
@@ -26,8 +32,27 @@ buildPythonPackage rec {
})
];
- propagatedBuildInputs = [ antlr4-python3-runtime igraph ];
- checkInputs = [ pygments ];
+ postPatch = ''
+ sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py
+ antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4
+ '';
+
+ propagatedBuildInputs = [
+ antlr4-python3-runtime
+ igraph
+ ];
+
+ passthru.optional-dependencies.pygments = [
+ pygments
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ] ++ passthru.optional-dependencies.pygments;
+
+ pythonImportsCheck = [
+ "explorerscript"
+ ];
meta = with lib; {
homepage = "https://github.com/SkyTemple/explorerscript";
diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix
index 0552dbbf62dc..154700e89af2 100644
--- a/pkgs/development/python-modules/ghrepo-stats/default.nix
+++ b/pkgs/development/python-modules/ghrepo-stats/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ghrepo-stats";
- version = "0.3.1";
+ version = "0.4.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "mrbean-bremen";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-W6RhVnMuOgB4GNxczx3UlSeq0RWIM7yISKEvpnrE9uk=";
+ hash = "sha256-KFjqHrN0prcqu3wEPZpa7rLfuD0X/DN7BMo4zcHNmYo=";
};
propagatedBuildInputs = [
@@ -35,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module and CLI tool for GitHub repo statistics";
homepage = "https://github.com/mrbean-bremen/ghrepo-stats";
+ changelog = "https://github.com/mrbean-bremen/ghrepo-stats/blob/v${version}/CHANGES.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix
index eefb4d85f90d..2b832aa7cf39 100644
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
- version = "2.1.0";
+ version = "2.1.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = "refs/tags/${version}";
- hash = "sha256-gT8Zrjzzunm5nt0GHYY0z2ZxtKBSc6FXndlrStbwo64=";
+ hash = "sha256-TuAqd9r/iExBa9uxU3386C12ZD+LEJai7DkJtcoupEs=";
};
propagatedBuildInputs = [
@@ -56,6 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module for Google Nest Device Access using the Smart Device Management API";
homepage = "https://github.com/allenporter/python-google-nest-sdm";
+ changelog = "https://github.com/allenporter/python-google-nest-sdm/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix
new file mode 100644
index 000000000000..bbbe26faccb9
--- /dev/null
+++ b/pkgs/development/python-modules/hassil/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+
+# propagates
+, antlr4-python3-runtime
+, dataclasses-json
+, pyyaml
+
+# tests
+, pytestCheckHook
+}:
+
+let
+ pname = "hassil";
+ version = "0.1.3";
+in
+buildPythonPackage {
+ inherit pname version;
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-KWkzHWMo50OIrZ2kwFhhqDSleFFkAD7/JugjvSyCkww=";
+ };
+
+ postPatch = ''
+ sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements.txt
+ '';
+
+ propagatedBuildInputs = [
+ antlr4-python3-runtime
+ dataclasses-json
+ pyyaml
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ changelog = "https://github.com/home-assistant/hassil/releases/tag/v${version}";
+ description = "Intent parsing for Home Assistant";
+ homepage = "https://github.com/home-assistant/hassil";
+ license = licenses.asl20;
+ maintainers = teams.home-assistant.members;
+ };
+}
diff --git a/pkgs/development/python-modules/hydra-core/antlr4.patch b/pkgs/development/python-modules/hydra-core/antlr4.patch
new file mode 100644
index 000000000000..958e128998d1
--- /dev/null
+++ b/pkgs/development/python-modules/hydra-core/antlr4.patch
@@ -0,0 +1,13 @@
+diff --git a/build_helpers/build_helpers.py b/build_helpers/build_helpers.py
+index 7159d22615..73db312bbe 100644
+--- a/build_helpers/build_helpers.py
++++ b/build_helpers/build_helpers.py
+@@ -185,7 +185,7 @@ class ANTLRCommand(Command): # type: ignore
+ command = [
+ "java",
+ "-jar",
+- join(root_dir, "bin/antlr-4.9.3-complete.jar"),
++ "@antlr_jar@",
+ "-Dlanguage=Python3",
+ "-o",
+ join(project_root, "hydra/grammar/gen/"),
diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra-core/default.nix
similarity index 65%
rename from pkgs/development/python-modules/hydra/default.nix
rename to pkgs/development/python-modules/hydra-core/default.nix
index cbd2502305bd..17dda8404b4a 100644
--- a/pkgs/development/python-modules/hydra/default.nix
+++ b/pkgs/development/python-modules/hydra-core/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
-, antlr4_9-python3-runtime
+, antlr4
+, antlr4-python3-runtime
, buildPythonPackage
, fetchFromGitHub
, importlib-resources
@@ -8,10 +9,11 @@
, omegaconf
, pytestCheckHook
, pythonOlder
+, substituteAll
}:
buildPythonPackage rec {
- pname = "hydra";
+ pname = "hydra-core";
version = "1.3.1";
format = "setuptools";
@@ -19,17 +21,32 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "facebookresearch";
- repo = pname;
+ repo = "hydra";
rev = "refs/tags/v${version}";
hash = "sha256-4FOh1Jr+LM8ffh/xcAqMqKudKbXb2DZdxU+czq2xwxs=";
};
+ patches = [
+ (substituteAll {
+ src = ./antlr4.patch;
+ antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar";
+ })
+ ];
+
+ postPatch = ''
+ # We substitute the path to the jar with the one from our antlr4
+ # package, so this file becomes unused
+ rm -v build_helpers/bin/antlr*-complete.jar
+
+ sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/requirements.txt
+ '';
+
nativeBuildInputs = [
jre_headless
];
propagatedBuildInputs = [
- antlr4_9-python3-runtime
+ antlr4-python3-runtime
omegaconf
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
@@ -55,7 +72,7 @@ buildPythonPackage rec {
];
meta = with lib; {
- broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
+ broken = stdenv.isDarwin;
description = "A framework for configuring complex applications";
homepage = "https://hydra.cc";
license = licenses.mit;
diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix
new file mode 100644
index 000000000000..6b1c353c23d7
--- /dev/null
+++ b/pkgs/development/python-modules/mip/default.nix
@@ -0,0 +1,78 @@
+{ lib
+, buildPythonPackage
+, cffi
+, dos2unix
+, fetchPypi
+, matplotlib
+, networkx
+, numpy
+, pytestCheckHook
+, pythonOlder
+, gurobi
+, gurobipy
+# Enable support for the commercial Gurobi solver (requires a license)
+, gurobiSupport ? false
+# If Gurobi has already been installed outside of the Nix store, specify its
+# installation directory here
+, gurobiHome ? null
+}:
+
+buildPythonPackage rec {
+ pname = "mip";
+ version = "1.14.1";
+
+ disabled = pythonOlder "3.7";
+ format = "pyproject";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-bvpm5vUp15fbv/Sw1Lx70ihA7VHsSUzwFzoFDG+Ow1M=";
+ };
+
+ checkInputs = [ matplotlib networkx numpy pytestCheckHook ];
+ nativeBuildInputs = [ dos2unix ];
+ propagatedBuildInputs = [
+ cffi
+ ] ++ lib.optionals gurobiSupport ([
+ gurobipy
+ ] ++ lib.optional (builtins.isNull gurobiHome) gurobi);
+
+ # Source files have CRLF terminators, which make patch error out when supplied
+ # with diffs made on *nix machines
+ prePatch = ''
+ find . -type f -exec ${dos2unix}/bin/dos2unix {} \;
+ '';
+
+ patches = [
+ # Some tests try to be smart and dynamically construct a path to their test
+ # inputs. Unfortunately, since the test phase is run after installation,
+ # those paths point to the Nix store, which no longer contains the test
+ # data. This patch hardcodes the data path to point to the source directory.
+ ./test-data-path.patch
+ ];
+
+ postPatch = ''
+ # Allow cffi versions with a different patch level to be used
+ substituteInPlace pyproject.toml --replace "cffi==1.15.0" "cffi==1.15.*"
+ '';
+
+ # Make MIP use the Gurobi solver, if configured to do so
+ makeWrapperArgs = lib.optional gurobiSupport
+ "--set GUROBI_HOME ${if builtins.isNull gurobiHome then gurobi.outPath else gurobiHome}";
+
+ # Tests that rely on Gurobi are activated only when Gurobi support is enabled
+ disabledTests = lib.optional (!gurobiSupport) "gurobi";
+
+ passthru.optional-dependencies = {
+ inherit gurobipy numpy;
+ };
+
+ meta = with lib; {
+ homepage = "http://python-mip.com/";
+ description = "A collection of Python tools for the modeling and solution of Mixed-Integer Linear programs (MIPs)";
+ downloadPage = "https://github.com/coin-or/python-mip/releases";
+ changelog = "https://github.com/coin-or/python-mip/releases/tag/${version}";
+ license = licenses.epl20;
+ maintainers = with maintainers; [ nessdoor ];
+ };
+}
diff --git a/pkgs/development/python-modules/mip/test-data-path.patch b/pkgs/development/python-modules/mip/test-data-path.patch
new file mode 100644
index 000000000000..d96f34254951
--- /dev/null
+++ b/pkgs/development/python-modules/mip/test-data-path.patch
@@ -0,0 +1,30 @@
+diff --git a/examples/extract_features_mip.py b/examples/extract_features_mip.py
+index cdc109f..90e79fa 100644
+--- a/examples/extract_features_mip.py
++++ b/examples/extract_features_mip.py
+@@ -9,9 +9,7 @@ import mip
+ lp_path = ""
+
+ # using test data, replace with your instance
+-lp_path = mip.__file__.replace("mip/__init__.py", "test/data/1443_0-9.lp").replace(
+- "mip\\__init__.py", "test\\data\\1443_0-9.lp"
+-)
++lp_path = "test/data/1443_0-9.lp"
+
+ m = Model()
+ if m.solver_name.upper() in ["GRB", "GUROBI"]:
+diff --git a/examples/gen_cuts_mip.py b/examples/gen_cuts_mip.py
+index f71edae..2799734 100644
+--- a/examples/gen_cuts_mip.py
++++ b/examples/gen_cuts_mip.py
+@@ -11,9 +11,7 @@ import mip
+ lp_path = ""
+
+ # using test data
+-lp_path = mip.__file__.replace("mip/__init__.py", "test/data/1443_0-9.lp").replace(
+- "mip\\__init__.py", "test\\data\\1443_0-9.lp"
+-)
++lp_path = "test/data/1443_0-9.lp"
+
+ m = Model()
+ if m.solver_name.upper() in ["GRB", "GUROBI"]:
diff --git a/pkgs/development/python-modules/omegaconf/antlr4.patch b/pkgs/development/python-modules/omegaconf/antlr4.patch
new file mode 100644
index 000000000000..8b9ed34d313e
--- /dev/null
+++ b/pkgs/development/python-modules/omegaconf/antlr4.patch
@@ -0,0 +1,13 @@
+diff --git a/build_helpers/build_helpers.py b/build_helpers/build_helpers.py
+index 6419e26..9e6c21c 100644
+--- a/build_helpers/build_helpers.py
++++ b/build_helpers/build_helpers.py
+@@ -30,7 +30,7 @@ class ANTLRCommand(Command): # type: ignore # pragma: no cover
+ command = [
+ "java",
+ "-jar",
+- str(build_dir / "bin" / "antlr-4.9.3-complete.jar"),
++ "@antlr_jar@",
+ "-Dlanguage=Python3",
+ "-o",
+ str(project_root / "omegaconf" / "grammar" / "gen"),
diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix
index 5aa772310bd9..7046e6ab1741 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/pkgs/development/python-modules/omegaconf/default.nix
@@ -1,5 +1,6 @@
{ lib
-, antlr4_9-python3-runtime
+, antlr4
+, antlr4-python3-runtime
, buildPythonPackage
, fetchFromGitHub
, jre_minimal
@@ -8,6 +9,7 @@
, pytestCheckHook
, pythonOlder
, pyyaml
+, substituteAll
}:
buildPythonPackage rec {
@@ -24,12 +26,27 @@ buildPythonPackage rec {
hash = "sha256-Qxa4uIiX5TAyQ5rFkizdev60S4iVAJ08ES6FpNqf8zI=";
};
+ patches = [
+ (substituteAll {
+ src = ./antlr4.patch;
+ antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar";
+ })
+ ];
+
+ postPatch = ''
+ # We substitute the path to the jar with the one from our antlr4
+ # package, so this file becomes unused
+ rm -v build_helpers/bin/antlr*-complete.jar
+
+ sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/base.txt
+ '';
+
nativeBuildInputs = [
jre_minimal
];
propagatedBuildInputs = [
- antlr4_9-python3-runtime
+ antlr4-python3-runtime
pyyaml
];
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 59980857560f..13641179513d 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -7,15 +7,16 @@
, packaging
, poetry-core
, pytestCheckHook
-, typing-extensions
+, python-dateutil
, pythonOlder
, rich
, tomlkit
+, typing-extensions
}:
buildPythonPackage rec {
pname = "pontos";
- version = "22.12.0";
+ version = "22.12.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -24,7 +25,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-8enSKOVEkYPI/2d2nzDkf1GO15kpMI6xDktroK9Ti2s=";
+ hash = "sha256-8exFNjZWbnz6B1f7YepitIMyKdQ1KIYqthlWQr32irk=";
};
nativeBuildInputs = [
@@ -35,6 +36,7 @@ buildPythonPackage rec {
colorful
httpx
packaging
+ python-dateutil
rich
typing-extensions
tomlkit
diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix
index 9cf53fb9e210..9d5a28994986 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.2";
+ version = "4.5.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "briis";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-xYDt/vvzI7qIK/8XE6mhcI5GPDKyHRj73Lagn0QOOz0=";
+ hash = "sha256-FZXnJorY7WNgDVajULZyFwJ13RBbClXK38CCyF7ASmI=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 0e609c59d2a6..2f82837c5cf4 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.2.30";
+ version = "9.2.31";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-lSjO8GLJN5pAOEusw0Uak7DsEE11MVexyRvkiLbkAjA=";
+ hash = "sha256-Te0wFz+3/HVKlMXW5WJ6mRGh8wWiMXR6Ypi/4hvnz/8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix
index bb67d36974da..9cfae34b5ad6 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.18";
+ version = "0.9.19";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "DannyCork";
repo = "python-whois";
rev = "refs/tags/${version}";
- sha256 = "sha256-15oa7E33VQMPtI2LJ0XVKd42m9BY9jZLL3XGXpAhv/A=";
+ hash = "sha256-b8OZppynDT0MCwH4ic+wMJzWqyUzsigzxD0yYGfgJmI=";
};
propagatedBuildInputs = [
@@ -34,6 +34,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module/library for retrieving WHOIS information";
homepage = "https://github.com/DannyCork/python-whois/";
+ changelog = "https://github.com/DannyCork/python-whois/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch b/pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch
deleted file mode 100644
index a26f41d71974..000000000000
--- a/pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit e9219b88de5ed37af337ee2d2e71e7ec7c0aad1b
-Author: Robbert van Ginkel
-Date: Thu Oct 20 16:43:28 2022 -0400
-
- Fix git unit test by using fake git server rather than file:// (#1518)
-
- More recent versions of git fix a CVE by disabling some usage of the
- `file://` transport, see
- https://github.blog/2022-10-18-git-security-vulnerabilities-announced/#cve-2022-39253.
- We were using this transport in tests.
-
- Instead, use https://git-scm.com/docs/git-http-backend to serve up this
- repository locally so we don't have to use the file protocol. This
- should be a more accurate tests, since we mostly expect submodules to
- come from servers.
-
-diff --git a/private/pkg/git/git_test.go b/private/pkg/git/git_test.go
-index 7b77b6cd..7132054e 100644
---- a/private/pkg/git/git_test.go
-+++ b/private/pkg/git/git_test.go
-@@ -17,6 +17,8 @@ package git
- import (
- "context"
- "errors"
-+ "net/http/cgi"
-+ "net/http/httptest"
- "os"
- "os/exec"
- "path/filepath"
-@@ -213,6 +215,21 @@ func createGitDirs(
- runCommand(ctx, t, container, runner, "git", "-C", submodulePath, "add", "test.proto")
- runCommand(ctx, t, container, runner, "git", "-C", submodulePath, "commit", "-m", "commit 0")
-
-+ gitExecPath, err := command.RunStdout(ctx, container, runner, "git", "--exec-path")
-+ require.NoError(t, err)
-+ t.Log(filepath.Join(string(gitExecPath), "git-http-backend"))
-+ // https://git-scm.com/docs/git-http-backend#_description
-+ f, err := os.Create(filepath.Join(submodulePath, ".git", "git-daemon-export-ok"))
-+ require.NoError(t, err)
-+ require.NoError(t, f.Close())
-+ server := httptest.NewServer(&cgi.Handler{
-+ Path: filepath.Join(strings.TrimSpace(string(gitExecPath)), "git-http-backend"),
-+ Dir: submodulePath,
-+ Env: []string{"GIT_PROJECT_ROOT=" + submodulePath},
-+ })
-+ t.Cleanup(server.Close)
-+ submodulePath = server.URL
-+
- originPath := filepath.Join(tmpDir, "origin")
- require.NoError(t, os.MkdirAll(originPath, 0777))
- runCommand(ctx, t, container, runner, "git", "-C", originPath, "init")
diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix
index 5acd05013faf..75b75c0158eb 100644
--- a/pkgs/development/tools/buf/default.nix
+++ b/pkgs/development/tools/buf/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildGoModule
, fetchFromGitHub
-, fetchpatch
, protobuf
, git
, testers
@@ -11,35 +10,22 @@
buildGoModule rec {
pname = "buf";
- version = "1.9.0";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KnG1FUdC8xpW/wI4E8+RzO0StKF+N7Wx1jTWNm4302M=";
+ hash = "sha256-h32G6skJ2vWay2iwoqkvBFlzafwHVilYKHVtZES3RvE=";
};
- vendorSha256 = "sha256-e/hkJoQ1GkSl4mhhgYVB4POult87DzWOXRLGyDVP+M0=";
+ vendorHash = "sha256-Hjr/SZK9dVID+VP7KFZkFmJn+te7cmI2ARu2l7wTzLg=";
patches = [
# Skip a test that requires networking to be available to work.
./skip_test_requiring_network.patch
# Skip TestWorkspaceGit which requires .git and commits.
./skip_test_requiring_dotgit.patch
- # Remove reliance of tests on file protocol which is disabled in git by default now
- # Rebased upstream change https://github.com/bufbuild/buf/commit/bcaa77f8bbb8f6c198154c7c8d53596da4506dab
- ./buf-tests-dont-use-file-transport.patch
- # Make TestCyclicImport tests deterministic (see https://github.com/bufbuild/buf/pull/1551)
- (fetchpatch {
- url = "https://github.com/bufbuild/buf/commit/75b5ef4c84f5953002dff95a1c66cb82b0e3b06f.patch";
- sha256 = "sha256-pKF3VXkzttsTTT2r/Z37ug9nnu8gRdkfmv/aTOhAJpw=";
- })
- # Make TestDuplicateSyntheticOneofs check deterministic (see https://github.com/bufbuild/buf/pull/1579)
- (fetchpatch {
- url = "https://github.com/bufbuild/buf/commit/9e72aa314e6f02b36793caa5f6068394cbdcb98c.patch";
- sha256 = "sha256-6NEF3sP1EQ6cQxkH2xRyHxAD0OrXBlQQa05rLK998wo=";
- })
];
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix
index 62f9be12575a..82255b249ec7 100644
--- a/pkgs/development/tools/k6/default.nix
+++ b/pkgs/development/tools/k6/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k6";
- version = "0.41.0";
+ version = "0.42.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-kMWheOf6lR2Fdb77NvjQYB/PHILs6ZIfQORh72ojc8c=";
+ sha256 = "sha256-DlB1oTE5RkxSyNupZ2U+dmr7qNPq8xJU3R0pAjm5EFQ=";
};
subPackages = [ "./" ];
diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix
index 00d96a687a63..b2d719267a62 100644
--- a/pkgs/development/tools/luaformatter/default.nix
+++ b/pkgs/development/tools/luaformatter/default.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, libyamlcpp }:
+
+let
+ antlr4 = antlr4_9;
+in
stdenv.mkDerivation rec {
pname = "luaformatter";
diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix
index 73aff70db333..c02fa4a9fa25 100644
--- a/pkgs/development/tools/mold/default.nix
+++ b/pkgs/development/tools/mold/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mold";
- version = "1.7.1";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "rui314";
repo = pname;
rev = "v${version}";
- hash = "sha256-sC8rJOyQB8mDCCmfpk2lVDPTWxBj7tZxVXQw8agl7t0=";
+ hash = "sha256-VykBOXeU3I6ZSmRIlngLdoLF4V2nb5QW/f8tr9Wn9o8=";
};
nativeBuildInputs = [ cmake ninja ];
diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix
index e62442c05f0d..a42da5f105c6 100644
--- a/pkgs/development/tools/pulumictl/default.nix
+++ b/pkgs/development/tools/pulumictl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pulumictl";
- version = "0.0.32";
+ version = "0.0.38";
src = fetchFromGitHub {
owner = "pulumi";
repo = "pulumictl";
rev = "v${version}";
- sha256 = "sha256-CZ0DnQUnyj8aoesFymc+Uhv+3vdQhdxb2YHElAyqGWE=";
+ sha256 = "sha256-j7wuzyGko3agDO7L8MUaAegjE4yj4KzQEcxWLY39BhQ=";
};
- vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s=";
+ vendorSha256 = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk=";
ldflags = [
"-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}"
diff --git a/pkgs/development/tools/rust/cargo2junit/default.nix b/pkgs/development/tools/rust/cargo2junit/default.nix
new file mode 100644
index 000000000000..17427e336c0b
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo2junit/default.nix
@@ -0,0 +1,20 @@
+{ fetchCrate, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo2junit";
+ version = "0.1.12";
+
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "sha256-wF1vDUVEume6aWzI5smTNlwc9WyZeTtUX416tYYrZPU=";
+ };
+
+ cargoSha256 = "sha256-GUCHWV+uPHZwhU4UhdXE2GHpeVnqbUTpfivA9Nh9MoY=";
+
+ meta = with lib; {
+ description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout).";
+ homepage = "https://github.com/johnterickson/cargo2junit";
+ license = licenses.mit;
+ maintainers = with maintainers; [ alekseysidorov ];
+ };
+}
diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix
index 332db4a7a0fe..6d05cc48270f 100644
--- a/pkgs/games/jumpy/default.nix
+++ b/pkgs/games/jumpy/default.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
xorg.libX11
xorg.libXcursor
xorg.libXi
- xorg.libXi
xorg.libXrandr
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Cocoa
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 9b989ac70e05..440b30664d13 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -1,15 +1,17 @@
-{ lib, stdenv, fetchurl, nasm
-, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib
+{ lib, stdenv, fetchFromGitHub, nasm
+, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libtheora, libvorbis, libGLU, libGL, SDL2, zlib
, Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools
}:
stdenv.mkDerivation rec {
pname = "scummvm";
- version = "2.5.1";
+ version = "2.6.1";
- src = fetchurl {
- url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-n9jbOORFYUS/jDTazffyBOdfGOjkSOwBzgjOgmoDXwE=";
+ src = fetchFromGitHub {
+ owner = "scummvm";
+ repo = "scummvm";
+ rev = "v${version}";
+ hash = "sha256-fqMMdHBVcXLsBDWxXH9UKXwfvlyIVbRsIPmrYqPGQ+g=";
};
nativeBuildInputs = [ nasm ];
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [
Cocoa AudioToolbox Carbon CoreMIDI AudioUnit
] ++ [
- curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU libGL SDL2 zlib
+ curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis libGLU libGL SDL2 zlib
];
dontDisableStatic = true;
@@ -28,7 +30,6 @@ stdenv.mkDerivation rec {
configurePlatforms = [ "host" ];
configureFlags = [
- "--enable-c++11"
"--enable-release"
];
diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix
index 860c5a49ef86..9ce9ad3ffc5e 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/pkgs/games/trackballs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "trackballs";
- version = "1.3.3";
+ version = "1.3.4";
src = fetchFromGitHub {
owner = "trackballs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-fCoQqGXwcpcq/gl67XXY5/wEvCM0ZZTV8LhjC+tnRuo=";
+ sha256 = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix
index d16f3870d828..f38053a65a1d 100644
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/games/vcmi/default.nix
@@ -24,14 +24,14 @@
stdenv.mkDerivation rec {
pname = "vcmi";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "vcmi";
repo = "vcmi";
rev = version;
fetchSubmodules = true;
- hash = "sha256-5PuFq6wDSj5Ye2fUjqcr/VRU0ocus6h2nn+myQTOrhU=";
+ hash = "sha256-Ah+aAuU2ioUfvtxfcSb4GNqriqY71ee5RhW2L9UMYFY=";
};
postPatch = ''
diff --git a/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix b/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix
new file mode 100644
index 000000000000..a26216cbc727
--- /dev/null
+++ b/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cups
+, coreutils
+, nixosTests
+}:
+
+stdenv.mkDerivation rec {
+ pname = "cups-pdf-to-pdf";
+ version = "unstable-2021-12-22";
+
+ src = fetchFromGitHub {
+ owner = "alexivkin";
+ repo = "CUPS-PDF-to-PDF";
+ rev = "c14428c2ca8e95371daad7db6d11c84046b1a2d4";
+ hash = "sha256-pa4PFf8OAFSra0hSazmKUfbMYL/cVWvYA1lBf7c7jmY=";
+ };
+
+ buildInputs = [ cups ];
+
+ postPatch = ''
+ sed -r 's|(gscall, size, ")cp |\1${coreutils}/bin/cp |' cups-pdf.c -i
+ '';
+
+ # gcc command line is taken from original cups-pdf's README file
+ # https://fossies.org/linux/cups-pdf/README
+ # however, we replace gcc with $CC following
+ # https://nixos.org/manual/nixpkgs/stable/#sec-darwin
+ buildPhase = ''
+ runHook preBuild
+ $CC -O9 -s cups-pdf.c -o cups-pdf -lcups
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -Dt $out/lib/cups/backend cups-pdf
+ install -Dm 0644 -t $out/etc/cups cups-pdf.conf
+ install -Dm 0644 -t $out/share/cups/model *.ppd
+ runHook postInstall
+ '';
+
+ passthru.tests.vmtest = nixosTests.cups-pdf;
+
+ meta = with lib; {
+ description = "A CUPS backend that turns print jobs into searchable PDF files";
+ homepage = "https://github.com/alexivkin/CUPS-PDF-to-PDF";
+ license = licenses.gpl2Only;
+ maintainers = [ maintainers.yarny ];
+ longDescription = ''
+ cups-pdf is a CUPS backend that generates a PDF file for each print job and puts this file
+ into a folder on the local machine such that the print job's owner can access the file.
+
+ https://www.cups-pdf.de/
+
+ cups-pdf-to-pdf is a fork of cups-pdf which tries hard to preserve the original text of the print job by avoiding rasterization.
+
+ Note that in order to use this package, you have to make sure that the cups-pdf program is called with root privileges.
+ '';
+ };
+}
diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix
index 222d24252ebf..a0470f0d275c 100644
--- a/pkgs/servers/baserow/default.nix
+++ b/pkgs/servers/baserow/default.nix
@@ -2,30 +2,38 @@
, fetchFromGitLab
, makeWrapper
, python3
+, antlr4_9
}:
let
- baserow_premium = with python3.pkgs; ( buildPythonPackage rec {
- pname = "baserow_premium";
- version = "1.12.1";
- foramt = "setuptools";
+ python = python3.override {
+ packageOverrides = self: super: {
+ antlr4-python3-runtime = super.antlr4-python3-runtime.override {
+ antlr4 = antlr4_9;
+ };
- src = fetchFromGitLab {
- owner = "bramw";
- repo = pname;
- rev = "refs/tags/${version}";
- hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q=";
+ baserow_premium = self.buildPythonPackage rec {
+ pname = "baserow_premium";
+ version = "1.12.1";
+ foramt = "setuptools";
+
+ src = fetchFromGitLab {
+ owner = "bramw";
+ repo = pname;
+ rev = "refs/tags/${version}";
+ hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q=";
+ };
+
+ sourceRoot = "source/premium/backend";
+
+ doCheck = false;
+ };
};
-
- sourceRoot = "source/premium/backend";
-
- doCheck = false;
- });
-
+ };
in
-with python3.pkgs; buildPythonPackage rec {
+with python.pkgs; buildPythonApplication rec {
pname = "baserow";
version = "1.12.1";
format = "setuptools";
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index beaa3ccd9624..80a9aec563fe 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -7,16 +7,16 @@
}:
buildGoModule rec {
pname = "aws-vault";
- version = "6.6.0";
+ version = "6.6.1";
src = fetchFromGitHub {
owner = "99designs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-wJVbB1MPSKX8/gTX29ThPDxJJRW79+PDwhGDGODtRko=";
+ sha256 = "sha256-oItDA7PWI6EzEyG9QYb8N1Zttm8yHwMSgpUDV2C5ae0=";
};
- vendorSha256 = "sha256-h9qGrb2UxtdKewBsWNcir4YfjUNczYP+WiNoWx45w30=";
+ vendorSha256 = "sha256-zC4v9TlKHGCYRWX0ZWAVdCM7yw9eaAZ/4ZIZ38sM4S0=";
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index 9e934ff6035c..32a3c1d346e2 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -25,14 +25,14 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
- version = "2.9.8"; # N.B: if you change this, check if overrides are still up-to-date
+ version = "2.9.10"; # N.B: if you change this, check if overrides are still up-to-date
format = "pyproject";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
- hash = "sha256-Q1iHGwkFg0rkunwEgWQIqLEPAGfOLfqA1UpjmCe2x8M=";
+ hash = "sha256-rRtC1OApm9fEd79I3ZD0kVbvqwsSNog46zHfdqTw5Pk=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/filesystems/httm/cargo-lock.patch b/pkgs/tools/filesystems/httm/cargo-lock.patch
deleted file mode 100644
index ce5a691c60f4..000000000000
--- a/pkgs/tools/filesystems/httm/cargo-lock.patch
+++ /dev/null
@@ -1,725 +0,0 @@
-diff --git i/Cargo.lock w/Cargo.lock
-index d59e8af..2409033 100644
---- i/Cargo.lock
-+++ w/Cargo.lock
-@@ -8,16 +8,16 @@ version = "0.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "once_cell",
- "version_check",
- ]
-
- [[package]]
- name = "aho-corasick"
--version = "0.7.18"
-+version = "0.7.20"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
- dependencies = [
- "memchr",
- ]
-@@ -77,21 +77,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
- [[package]]
- name = "bumpalo"
--version = "3.10.0"
-+version = "3.11.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
-+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
-
- [[package]]
- name = "cc"
--version = "1.0.73"
-+version = "1.0.77"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
--
--[[package]]
--name = "cfg-if"
--version = "0.1.10"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
-
- [[package]]
- name = "cfg-if"
-@@ -101,13 +95,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
- [[package]]
- name = "chrono"
--version = "0.4.22"
-+version = "0.4.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
-+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
- dependencies = [
- "iana-time-zone",
-+ "js-sys",
- "num-integer",
- "num-traits",
-+ "time 0.1.45",
-+ "wasm-bindgen",
- "winapi",
- ]
-
-@@ -129,9 +126,9 @@ dependencies = [
-
- [[package]]
- name = "clap_lex"
--version = "0.2.2"
-+version = "0.2.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
-+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
- dependencies = [
- "os_str_bytes",
- ]
-@@ -148,14 +145,13 @@ dependencies = [
-
- [[package]]
- name = "console"
--version = "0.15.0"
-+version = "0.15.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
-+checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c"
- dependencies = [
- "encode_unicode",
-+ "lazy_static",
- "libc",
-- "once_cell",
-- "regex",
- "terminal_size 0.1.17",
- "winapi",
- ]
-@@ -172,95 +168,72 @@ version = "0.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
- dependencies = [
-- "cfg-if 1.0.0",
-- "crossbeam-channel 0.5.5",
-+ "cfg-if",
-+ "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
-- "crossbeam-utils 0.8.9",
-+ "crossbeam-utils",
- ]
-
- [[package]]
- name = "crossbeam-channel"
--version = "0.4.4"
-+version = "0.5.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
-+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
- dependencies = [
-- "crossbeam-utils 0.7.2",
-- "maybe-uninit",
--]
--
--[[package]]
--name = "crossbeam-channel"
--version = "0.5.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
--dependencies = [
-- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.9",
-+ "cfg-if",
-+ "crossbeam-utils",
- ]
-
- [[package]]
- name = "crossbeam-deque"
--version = "0.8.1"
-+version = "0.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
-+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "crossbeam-epoch",
-- "crossbeam-utils 0.8.9",
-+ "crossbeam-utils",
- ]
-
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.9"
-+version = "0.9.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
-+checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
- dependencies = [
- "autocfg",
-- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.9",
-- "memoffset",
-- "once_cell",
-+ "cfg-if",
-+ "crossbeam-utils",
-+ "memoffset 0.7.1",
- "scopeguard",
- ]
-
- [[package]]
- name = "crossbeam-queue"
--version = "0.3.5"
-+version = "0.3.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
-+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
- dependencies = [
-- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.9",
-+ "cfg-if",
-+ "crossbeam-utils",
- ]
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.7.2"
-+version = "0.8.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
- dependencies = [
-- "autocfg",
-- "cfg-if 0.1.10",
-- "lazy_static",
--]
--
--[[package]]
--name = "crossbeam-utils"
--version = "0.8.9"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978"
--dependencies = [
-- "cfg-if 1.0.0",
-- "once_cell",
-+ "cfg-if",
- ]
-
- [[package]]
- name = "cxx"
--version = "1.0.80"
-+version = "1.0.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a"
-+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
- dependencies = [
- "cc",
- "cxxbridge-flags",
-@@ -270,9 +243,9 @@ dependencies = [
-
- [[package]]
- name = "cxx-build"
--version = "1.0.80"
-+version = "1.0.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827"
-+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
- dependencies = [
- "cc",
- "codespan-reporting",
-@@ -285,15 +258,15 @@ dependencies = [
-
- [[package]]
- name = "cxxbridge-flags"
--version = "1.0.80"
-+version = "1.0.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a"
-+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
-
- [[package]]
- name = "cxxbridge-macro"
--version = "1.0.80"
-+version = "1.0.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7"
-+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
- dependencies = [
- "proc-macro2",
- "quote",
-@@ -337,11 +310,11 @@ dependencies = [
-
- [[package]]
- name = "defer-drop"
--version = "1.2.0"
-+version = "1.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "828aca0e5e4341b0320a319209cbc6255b8b06254849ce8a5f33d33f7f2fa0f0"
-+checksum = "f613ec9fa66a6b28cdb1842b27f9adf24f39f9afc4dcdd9fdecee4aca7945c57"
- dependencies = [
-- "crossbeam-channel 0.4.4",
-+ "crossbeam-channel",
- "once_cell",
- ]
-
-@@ -382,7 +355,7 @@ version = "2.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "dirs-sys-next",
- ]
-
-@@ -399,9 +372,9 @@ dependencies = [
-
- [[package]]
- name = "either"
--version = "1.6.1"
-+version = "1.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
-
- [[package]]
- name = "encode_unicode"
-@@ -447,20 +420,20 @@ dependencies = [
-
- [[package]]
- name = "getrandom"
--version = "0.2.7"
-+version = "0.2.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
-+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "libc",
-- "wasi",
-+ "wasi 0.11.0+wasi-snapshot-preview1",
- ]
-
- [[package]]
- name = "hashbrown"
--version = "0.11.2"
-+version = "0.12.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
- [[package]]
- name = "hashbrown"
-@@ -482,7 +455,7 @@ dependencies = [
-
- [[package]]
- name = "httm"
--version = "0.17.9"
-+version = "0.17.10"
- dependencies = [
- "clap",
- "crossbeam",
-@@ -495,8 +468,8 @@ dependencies = [
- "proc-mounts",
- "rayon",
- "skim",
-- "terminal_size 0.2.2",
-- "time",
-+ "terminal_size 0.2.3",
-+ "time 0.3.17",
- "which",
- ]
-
-@@ -532,12 +505,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
- [[package]]
- name = "indexmap"
--version = "1.8.2"
-+version = "1.9.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
-+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
- dependencies = [
- "autocfg",
-- "hashbrown 0.11.2",
-+ "hashbrown 0.12.3",
- ]
-
- [[package]]
-@@ -553,15 +526,19 @@ dependencies = [
-
- [[package]]
- name = "io-lifetimes"
--version = "0.7.5"
-+version = "1.0.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
-+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
-+dependencies = [
-+ "libc",
-+ "windows-sys",
-+]
-
- [[package]]
- name = "itoa"
--version = "1.0.2"
-+version = "1.0.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
-+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
-
- [[package]]
- name = "js-sys"
-@@ -580,9 +557,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
- [[package]]
- name = "libc"
--version = "0.2.137"
-+version = "0.2.138"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
-+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
-
- [[package]]
- name = "link-cplusplus"
-@@ -595,9 +572,9 @@ dependencies = [
-
- [[package]]
- name = "linux-raw-sys"
--version = "0.0.46"
-+version = "0.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
-+checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
-
- [[package]]
- name = "log"
-@@ -605,7 +582,7 @@ version = "0.4.17"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- ]
-
- [[package]]
-@@ -618,12 +595,6 @@ dependencies = [
- "nu-ansi-term",
- ]
-
--[[package]]
--name = "maybe-uninit"
--version = "2.0.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
--
- [[package]]
- name = "memchr"
- version = "2.5.0"
-@@ -639,28 +610,37 @@ dependencies = [
- "autocfg",
- ]
-
-+[[package]]
-+name = "memoffset"
-+version = "0.7.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-+dependencies = [
-+ "autocfg",
-+]
-+
- [[package]]
- name = "nix"
--version = "0.24.1"
-+version = "0.24.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
-+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
- dependencies = [
- "bitflags",
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "libc",
- ]
-
- [[package]]
- name = "nix"
--version = "0.25.0"
-+version = "0.25.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
-+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
- dependencies = [
- "autocfg",
- "bitflags",
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "libc",
-- "memoffset",
-+ "memoffset 0.6.5",
- "pin-utils",
- ]
-
-@@ -726,9 +706,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
-
- [[package]]
- name = "os_str_bytes"
--version = "6.1.0"
-+version = "6.4.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
-+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
- [[package]]
- name = "overload"
-@@ -759,9 +739,9 @@ checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16"
-
- [[package]]
- name = "proc-macro2"
--version = "1.0.39"
-+version = "1.0.47"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
-+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
- dependencies = [
- "unicode-ident",
- ]
-@@ -777,9 +757,9 @@ dependencies = [
-
- [[package]]
- name = "quote"
--version = "1.0.18"
-+version = "1.0.21"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
-+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
- dependencies = [
- "proc-macro2",
- ]
-@@ -801,17 +781,17 @@ version = "1.10.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
- dependencies = [
-- "crossbeam-channel 0.5.5",
-+ "crossbeam-channel",
- "crossbeam-deque",
-- "crossbeam-utils 0.8.9",
-+ "crossbeam-utils",
- "num_cpus",
- ]
-
- [[package]]
- name = "redox_syscall"
--version = "0.2.13"
-+version = "0.2.16"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
- dependencies = [
- "bitflags",
- ]
-@@ -829,9 +809,9 @@ dependencies = [
-
- [[package]]
- name = "regex"
--version = "1.6.0"
-+version = "1.7.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
-+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
- dependencies = [
- "aho-corasick",
- "memchr",
-@@ -840,15 +820,15 @@ dependencies = [
-
- [[package]]
- name = "regex-syntax"
--version = "0.6.27"
-+version = "0.6.28"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-
- [[package]]
- name = "rustix"
--version = "0.35.13"
-+version = "0.36.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
-+checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
- dependencies = [
- "bitflags",
- "errno",
-@@ -860,9 +840,9 @@ dependencies = [
-
- [[package]]
- name = "rustversion"
--version = "1.0.6"
-+version = "1.0.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
-+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
-
- [[package]]
- name = "scopeguard"
-@@ -878,14 +858,14 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
-
- [[package]]
- name = "serde"
--version = "1.0.137"
-+version = "1.0.148"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
-+checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
-
- [[package]]
- name = "skim"
- version = "0.10.2"
--source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#bf2b007ae7371a7cff4d93194033bd6c90cbf96c"
-+source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#bca6554ebf09803fc429a59c89eb96428e920cc5"
- dependencies = [
- "beef",
- "bitflags",
-@@ -896,10 +876,11 @@ dependencies = [
- "fuzzy-matcher",
- "lazy_static",
- "log",
-- "nix 0.25.0",
-+ "nix 0.25.1",
-+ "once_cell",
- "rayon",
- "regex",
-- "time",
-+ "time 0.3.17",
- "timer",
- "tuikit",
- "unicode-width",
-@@ -914,9 +895,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
- [[package]]
- name = "syn"
--version = "1.0.96"
-+version = "1.0.105"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
-+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
- dependencies = [
- "proc-macro2",
- "quote",
-@@ -955,9 +936,9 @@ dependencies = [
-
- [[package]]
- name = "terminal_size"
--version = "0.2.2"
-+version = "0.2.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a"
-+checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
- dependencies = [
- "rustix",
- "windows-sys",
-@@ -971,18 +952,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
- [[package]]
- name = "thiserror"
--version = "1.0.31"
-+version = "1.0.37"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
-+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
- dependencies = [
- "thiserror-impl",
- ]
-
- [[package]]
- name = "thiserror-impl"
--version = "1.0.31"
-+version = "1.0.37"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
-+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
- dependencies = [
- "proc-macro2",
- "quote",
-@@ -998,6 +979,17 @@ dependencies = [
- "once_cell",
- ]
-
-+[[package]]
-+name = "time"
-+version = "0.1.45"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-+dependencies = [
-+ "libc",
-+ "wasi 0.10.0+wasi-snapshot-preview1",
-+ "winapi",
-+]
-+
- [[package]]
- name = "time"
- version = "0.3.17"
-@@ -1030,7 +1022,8 @@ dependencies = [
- [[package]]
- name = "timer"
- version = "0.2.0"
--source = "git+https://github.com/kimono-koans/timer.rs#85c9e56ab20ea530c934433636406f8b585bef59"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b"
- dependencies = [
- "chrono",
- ]
-@@ -1044,22 +1037,22 @@ dependencies = [
- "bitflags",
- "lazy_static",
- "log",
-- "nix 0.24.1",
-+ "nix 0.24.3",
- "term",
- "unicode-width",
- ]
-
- [[package]]
- name = "unicode-ident"
--version = "1.0.1"
-+version = "1.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
-+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
-
- [[package]]
- name = "unicode-width"
--version = "0.1.9"
-+version = "0.1.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
- [[package]]
- name = "utf8parse"
-@@ -1094,6 +1087,12 @@ dependencies = [
- "quote",
- ]
-
-+[[package]]
-+name = "wasi"
-+version = "0.10.0+wasi-snapshot-preview1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-+
- [[package]]
- name = "wasi"
- version = "0.11.0+wasi-snapshot-preview1"
-@@ -1106,7 +1105,7 @@ version = "0.2.83"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "wasm-bindgen-macro",
- ]
-
diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix
index 66418201a0bd..1138ecb7f997 100644
--- a/pkgs/tools/filesystems/httm/default.nix
+++ b/pkgs/tools/filesystems/httm/default.nix
@@ -1,23 +1,21 @@
{ lib
-, fetchFromGitHub
, rustPlatform
+, fetchFromGitHub
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "httm";
- version = "0.17.10";
+ version = "0.18.3";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = pname;
rev = version;
- sha256 = "sha256-xhsZaOsEYmtx3EcKbc7cIPvrUdXl3gyl5InZ1Va0U6E=";
+ sha256 = "sha256-LJFBridWS7YYO9Bw3mzRdRnh2gGUxAtuoNq2T1wuAcY=";
};
- cargoPatches = [ ./cargo-lock.patch ];
-
- cargoSha256 = "sha256-H8LOpNKsc9CxURB+ZcQT6Uhv4aw2sx8sNdDGDCkz2SU=";
+ cargoSha256 = "sha256-/v0QQ3EnmL1EKEjJ4O0t52SOrCz+CVBpunogEfVMpBw=";
nativeBuildInputs = [ installShellFiles ];
@@ -31,8 +29,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Interactive, file-level Time Machine-like tool for ZFS/btrfs";
homepage = "https://github.com/kimono-koans/httm";
+ changelog = "https://github.com/kimono-koans/httm/releases/tag/${version}";
license = licenses.mpl20;
- platforms = platforms.unix;
maintainers = with maintainers; [ wyndon ];
};
}
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 057ba28ff061..e3f75693803c 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitHub
, boost
, catch2
-, clasp
, cmake
, clingo
, re2c
@@ -25,12 +24,12 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost clasp clingo re2c ];
+ buildInputs = [ boost clingo re2c ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DASPCUD_GRINGO_PATH=${clingo}/bin/gringo"
- "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp"
+ "-DASPCUD_CLASP_PATH=${clingo}/bin/clasp"
];
doCheck = true;
diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix
deleted file mode 100644
index 401a2006c6f9..000000000000
--- a/pkgs/tools/misc/clasp/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "clasp";
- version = "3.1.4";
-
- src = fetchurl {
- url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz";
- sha256 = "1zkjqc4gp4n9p2kf3k3z8x82g42any4p3shhhivny89z1jlxi9zn";
- };
-
- preConfigure = "patchShebangs ./configure.sh";
- configureScript = "./configure.sh";
-
- preBuild = "cd build/release";
-
- installPhase = ''
- mkdir -p $out/bin
- cp bin/clasp $out/bin/clasp
- '';
-
- meta = with lib; {
- description = "Answer set solver for (extended) normal and disjunctive logic programs";
- homepage = "http://potassco.sourceforge.net/";
- platforms = platforms.all;
- maintainers = [ maintainers.hakuch ];
- license = licenses.gpl2Plus;
- };
-}
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index b3d412b8fda0..1d264926fd7c 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -1,6 +1,6 @@
-{ mkDerivation, lib, fetchFromGitLab, qtbase, qtserialport, cmake }:
+{ stdenv, lib, fetchFromGitLab, qtserialport, cmake, wrapQtAppsHook }:
-mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "cutecom";
version = "0.51.0+patch";
@@ -11,10 +11,17 @@ mkDerivation rec {
sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE=";
};
- buildInputs = [ qtbase qtserialport ];
- nativeBuildInputs = [ cmake ];
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "/Applications" "$out/Applications"
+ '';
- postInstall = ''
+ buildInputs = [ qtserialport ];
+ nativeBuildInputs = [ cmake wrapQtAppsHook ];
+
+ postInstall = if stdenv.isDarwin then ''
+ mkdir -p $out/Applications
+ '' else ''
cd ..
mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps,man/man1}
cp cutecom.desktop "$out/share/applications"
@@ -25,8 +32,8 @@ mkDerivation rec {
meta = with lib; {
description = "A graphical serial terminal";
homepage = "https://gitlab.com/cutecom/cutecom/";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ bennofs ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index d364af728bb0..d8fce4bb58ab 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "1.13.1";
+ version = "1.14.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KItiCVb1H/XgVZT6f0g/VvvXhhHf6MvMEqQsr62c6d0=";
+ sha256 = "sha256-Vp0oB5DVhYXIk45pDGADEes+OQApE7XFsIk0enSFMqo=";
};
- vendorSha256 = "sha256-UpQ2yFprWdwE67MR5voPjgY7wqrtw/ZQbt05Tbo50XY=";
+ vendorSha256 = "sha256-LxQxO5hr+w04UZKqCh4dGteBA08GmXfCtpI8glKajkU=";
ldflags = [
"-s"
diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix
index 2fffa2ee8cc3..0a8a446b908c 100644
--- a/pkgs/tools/misc/tfk8s/default.nix
+++ b/pkgs/tools/misc/tfk8s/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "tfk8s";
- version = "0.1.8";
+ version = "0.1.10";
tag = "v${version}";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
rev = tag;
- sha256 = "sha256-9k/1PZch5qUlCmD7Y1chw2NL6hKV6mUYAHgR7Sbv/qs=";
+ sha256 = "sha256-VLpXL5ABnCxc+7dV3sZ6wsY2nKn2yfu7eTjtn881/XQ=";
};
vendorSha256 = "sha256-eTADcUW9b6l47BkWF9YLxdcgvMbCzWTjLF28FneJHg8=";
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 3b8677273d7b..44029fb5d4ef 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -10,22 +10,31 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "10.2.2";
+ version = "10.2.4";
src = fetchFromGitHub {
owner = "topgrade-rs";
repo = "topgrade";
rev = "v${version}";
- sha256 = "sha256-TDuTrtVqEy0g13zdWHz2+cQhMEMSbvameBkJUcyTfGw=";
+ hash = "sha256-b1nWTQ+m4b6XzDTR36ubf5nTdUuWK94F2P4Q3tUvHAw=";
};
- cargoSha256 = "sha256-4uq4lksfgTI+x7E/p27gs0Zh0NQq3kIBB9KVD2tvmtQ=";
+ cargoHash = "sha256-7GSkFh0Fefl9VlCdPdVZ9IsyN0IKUob5c43v84PtrcI=";
- nativeBuildInputs = [ installShellFiles ];
+ nativeBuildInputs = [
+ installShellFiles
+ ];
- buildInputs = lib.optionals stdenv.isDarwin [ AppKit Cocoa Foundation ];
+ buildInputs = lib.optionals stdenv.isDarwin [
+ AppKit
+ Cocoa
+ Foundation
+ ];
- NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-framework" "AppKit" ];
+ NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
+ "-framework"
+ "AppKit"
+ ];
postInstall = ''
installShellCompletion --cmd topgrade \
@@ -40,6 +49,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Upgrade all the things";
homepage = "https://github.com/topgrade-rs/topgrade";
+ changelog = "https://github.com/topgrade-rs/topgrade/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ SuperSandro2000 xyenon ];
};
diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix
index e7f931d59245..9ad1d2bd77b0 100644
--- a/pkgs/tools/networking/q/default.nix
+++ b/pkgs/tools/networking/q/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "q";
- version = "0.8.2";
+ version = "0.8.4";
src = fetchFromGitHub {
owner = "natesales";
repo = "q";
rev = "v${version}";
- sha256 = "sha256-Esg2i8UNT+SuW9+jsnVEOt1ot822CamZ3JoR8ReY0+4=";
+ sha256 = "sha256-M2TgDha+F4hY7f9sabzZEdsxdp8rdXDZB4ktmpDF5D8=";
};
- vendorHash = "sha256-oarXbxROTd7knHr9GKlrPnnS6ehkps2ZYYsUS9cn6ek=";
+ vendorHash = "sha256-216NwRlU7mmr+ebiBwq9DVtFb2SpPgkGUrVZMUAY9rI=";
doCheck = false; # tries to resolve DNS
diff --git a/pkgs/tools/text/diffsitter/default.nix b/pkgs/tools/text/diffsitter/default.nix
index 5ed1d84daffb..199d0664a704 100644
--- a/pkgs/tools/text/diffsitter/default.nix
+++ b/pkgs/tools/text/diffsitter/default.nix
@@ -32,17 +32,17 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "diffsitter";
- version = "0.7.2";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "afnanenayet";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oHG2vw981r9FZSwbJ+xcLemfQSMDrk6PAr/qtyImM04=";
+ sha256 = "sha256-AJjgn+qFfy6/gjb8tQOJDmevZy1ZfpF0nTxAgunSabE=";
fetchSubmodules = false;
};
- cargoSha256 = "sha256-Cj9jdeeJNR/7mquEfaQCsFgiCjyJbZaaSkOzbU64T3U=";
+ cargoSha256 = "sha256-U/XvllkzEVt4TpDPA5gSRKpIIQagATGdHh7YPFOo4CY=";
buildNoDefaultFeatures = true;
buildFeatures = [
diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/tools/wayland/kanshi/default.nix
index f372ee5dae78..5e12e77374fe 100644
--- a/pkgs/tools/wayland/kanshi/default.nix
+++ b/pkgs/tools/wayland/kanshi/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "kanshi";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromSourcehut {
owner = "~emersion";
repo = "kanshi";
rev = "v${version}";
- sha256 = "kqTRJhLd9vLGAPO5U5cWeZgzWzne+0Cr4TIS0ciZSGk=";
+ sha256 = "sha256-eGcgqj214fcfOrKqrAsxLG9LiNlAsWu0sgjxBB01u6Q=";
};
strictDeps = true;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3102d08edf13..61448e77e798 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -217,6 +217,7 @@ mapAliases ({
clang13Stdenv = lowPrio llvmPackages_13.stdenv;
clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22
+ clasp = clingo; # added 2022-12-22
claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05
claws-mail-gtk3 = claws-mail; # Added 2021-07-10
clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b81d61fd6f6b..6c3b977a9061 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2173,7 +2173,7 @@ with pkgs;
### APPLICATIONS/EMULATORS/BSNES
- ares = callPackage ../applications/emulators/bsnes/ares { };
+ ares = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/ares { };
bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
@@ -3877,8 +3877,6 @@ with pkgs;
clash-geoip = callPackage ../data/misc/clash-geoip { };
- clasp = callPackage ../tools/misc/clasp { };
-
clevercsv = with python3Packages; toPythonApplication clevercsv;
clevis = callPackage ../tools/security/clevis {
@@ -15297,6 +15295,8 @@ with pkgs;
buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
+ cargo2junit = callPackage ../development/tools/rust/cargo2junit { };
+
cargo-espflash = callPackage ../development/tools/rust/cargo-espflash {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -16652,7 +16652,7 @@ with pkgs;
antlr4_10
antlr4_11;
- antlr4 = antlr4_8;
+ antlr4 = antlr4_11;
antlr = antlr4;
@@ -36716,6 +36716,8 @@ with pkgs;
cups-dymo = callPackage ../misc/cups/drivers/dymo {};
+ cups-pdf-to-pdf = callPackage ../misc/cups/drivers/cups-pdf-to-pdf {};
+
cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {};
cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ca17accf532..d47835b1568e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -488,13 +488,9 @@ self: super: with self; {
ansiwrap = callPackage ../development/python-modules/ansiwrap { };
- antlr4_8-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
- antlr4 = pkgs.antlr4_8;
+ antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
+ inherit (pkgs) antlr4;
};
- antlr4_9-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
- antlr4 = pkgs.antlr4_9;
- };
- antlr4-python3-runtime = self.antlr4_8-python3-runtime;
anyascii = callPackage ../development/python-modules/anyascii { };
@@ -4173,6 +4169,8 @@ self: super: with self; {
hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
+ hassil = callPackage ../development/python-modules/hassil { };
+
hatasmota = callPackage ../development/python-modules/hatasmota { };
hatchling = callPackage ../development/python-modules/hatchling { };
@@ -4389,7 +4387,7 @@ self: super: with self; {
hy = callPackage ../development/python-modules/hy { };
- hydra = callPackage ../development/python-modules/hydra { };
+ hydra-core = callPackage ../development/python-modules/hydra-core { };
hydra-check = callPackage ../development/python-modules/hydra-check { };
@@ -5798,6 +5796,8 @@ self: super: with self; {
inherit (pkgs.darwin) cctools;
};
+ mip = callPackage ../development/python-modules/mip { };
+
misaka = callPackage ../development/python-modules/misaka { };
misoc = callPackage ../development/python-modules/misoc { };