diff --git a/lib/types.nix b/lib/types.nix
index d7655bc1a6a2..f235e3419926 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -227,11 +227,11 @@ rec {
};
int = mkOptionType {
- name = "int";
- description = "signed integer";
- check = isInt;
- merge = mergeEqualOption;
- };
+ name = "int";
+ description = "signed integer";
+ check = isInt;
+ merge = mergeEqualOption;
+ };
# Specialized subdomains of int
ints =
@@ -292,10 +292,34 @@ rec {
port = ints.u16;
float = mkOptionType {
- name = "float";
- description = "floating point number";
- check = isFloat;
- merge = mergeEqualOption;
+ name = "float";
+ description = "floating point number";
+ check = isFloat;
+ merge = mergeEqualOption;
+ };
+
+ number = either int float;
+
+ numbers = let
+ betweenDesc = lowest: highest:
+ "${builtins.toJSON lowest} and ${builtins.toJSON highest} (both inclusive)";
+ in {
+ between = lowest: highest:
+ assert lib.assertMsg (lowest <= highest)
+ "numbers.between: lowest must be smaller than highest";
+ addCheck number (x: x >= lowest && x <= highest) // {
+ name = "numberBetween";
+ description = "integer or floating point number between ${betweenDesc lowest highest}";
+ };
+
+ nonnegative = addCheck number (x: x >= 0) // {
+ name = "numberNonnegative";
+ description = "nonnegative integer or floating point number, meaning >=0";
+ };
+ positive = addCheck number (x: x > 0) // {
+ name = "numberPositive";
+ description = "positive integer or floating point number, meaning >0";
+ };
};
str = mkOptionType {
diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md
index 9b35e6630144..40b4d78b250e 100644
--- a/nixos/doc/manual/development/option-types.section.md
+++ b/nixos/doc/manual/development/option-types.section.md
@@ -4,7 +4,7 @@ Option types are a way to put constraints on the values a module option
can take. Types are also responsible of how values are merged in case of
multiple value definitions.
-## Basic Types {#sec-option-types-basic}
+## Basic types {#sec-option-types-basic}
Basic types are the simplest available types in the module system. Basic
types include multiple string types that mainly differ in how definition
@@ -25,6 +25,11 @@ merging is handled.
: A top-level store path. This can be an attribute set pointing
to a store path, like a derivation or a flake input.
+`types.enum` *`l`*
+
+: One element of the list *`l`*, e.g. `types.enum [ "left" "right" ]`.
+ Multiple definitions cannot be merged.
+
`types.anything`
: A type that accepts any value and recursively merges attribute sets
@@ -95,7 +100,7 @@ merging is handled.
problems.
:::
-Integer-related types:
+### Numeric types {#sec-option-types-numeric}
`types.int`
@@ -118,6 +123,10 @@ Integer-related types:
from 0 to 2^n−1 respectively (e.g. `0`
to `255` for 8 bits).
+`types.ints.between` *`lowest highest`*
+
+: An integer between *`lowest`* and *`highest`* (both inclusive).
+
`types.ints.positive`
: A positive integer (that is > 0).
@@ -127,12 +136,44 @@ Integer-related types:
: A port number. This type is an alias to
`types.ints.u16`.
-String-related types:
+`types.float`
+
+: A floating point number.
+
+ ::: {.warning}
+ Converting a floating point number to a string with `toString` or `toJSON`
+ may result in [precision loss](https://github.com/NixOS/nix/issues/5733).
+ :::
+
+`types.number`
+
+: Either a signed integer or a floating point number. No implicit conversion
+ is done between the two types, and multiple equal definitions will only be
+ merged if they have the same type.
+
+`types.numbers.between` *`lowest highest`*
+
+: An integer or floating point number between *`lowest`* and *`highest`* (both inclusive).
+
+`types.numbers.nonnegative`
+
+: A nonnegative integer or floating point number (that is >= 0).
+
+`types.numbers.positive`
+
+: A positive integer or floating point number (that is > 0).
+
+### String types {#sec-option-types-string}
`types.str`
: A string. Multiple definitions cannot be merged.
+`types.separatedString` *`sep`*
+
+: A string. Multiple definitions are concatenated with *`sep`*, e.g.
+ `types.separatedString "|"`.
+
`types.lines`
: A string. Multiple definitions are concatenated with a new line
@@ -144,7 +185,7 @@ String-related types:
`types.envVar`
-: A string. Multiple definitions are concatenated with a collon `":"`.
+: A string. Multiple definitions are concatenated with a colon `":"`.
`types.strMatching`
@@ -152,24 +193,9 @@ String-related types:
definitions cannot be merged. The regular expression is processed
using `builtins.match`.
-## Value Types {#sec-option-types-value}
+## Submodule types {#sec-option-types-submodule}
-Value types are types that take a value parameter.
-
-`types.enum` *`l`*
-
-: One element of the list *`l`*, e.g. `types.enum [ "left" "right" ]`.
- Multiple definitions cannot be merged.
-
-`types.separatedString` *`sep`*
-
-: A string with a custom separator *`sep`*, e.g.
- `types.separatedString "|"`.
-
-`types.ints.between` *`lowest highest`*
-
-: An integer between *`lowest`* and *`highest`* (both inclusive). Useful
- for creating types like `types.port`.
+Submodules are detailed in [Submodule](#section-option-types-submodule).
`types.submodule` *`o`*
@@ -178,7 +204,6 @@ Value types are types that take a value parameter.
value. Submodules are used in composed types to create modular
options. This is equivalent to
`types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }`.
- Submodules are detailed in [Submodule](#section-option-types-submodule).
`types.submoduleWith` { *`modules`*, *`specialArgs`* ? {}, *`shorthandOnlyDefinesConfig`* ? false }
@@ -239,7 +264,7 @@ Value types are types that take a value parameter.
more convenient and discoverable than expecting the module user to
type-merge with the `attrsOf submodule` option.
-## Composed Types {#sec-option-types-composed}
+## Composed types {#sec-option-types-composed}
Composed types are types that take a type as parameter. `listOf
int` and `either int str` are examples of composed types.
@@ -496,7 +521,7 @@ Types are mainly characterized by their `check` and `merge` functions.
of strings, and `defs` the list of defined values as a list. It is
possible to override a type merge function for custom needs.
-## Custom Types {#sec-option-types-custom}
+## Custom types {#sec-option-types-custom}
Custom types can be created with the `mkOptionType` function. As type
creation includes some more complex topics such as submodule handling,
diff --git a/nixos/doc/manual/from_md/development/option-types.section.xml b/nixos/doc/manual/from_md/development/option-types.section.xml
index 929d5302ed41..4036bc0ba743 100644
--- a/nixos/doc/manual/from_md/development/option-types.section.xml
+++ b/nixos/doc/manual/from_md/development/option-types.section.xml
@@ -6,7 +6,7 @@
in case of multiple value definitions.
- Basic Types
+ Basic types
Basic types are the simplest available types in the module system.
Basic types include multiple string types that mainly differ in
@@ -49,6 +49,20 @@
+
+
+ types.enum
+ l
+
+
+
+ One element of the list
+ l, e.g.
+ types.enum [ "left" "right" ].
+ Multiple definitions cannot be merged.
+
+
+
types.anything
@@ -150,186 +164,241 @@
-
- Integer-related types:
-
-
-
-
- types.int
-
-
-
- A signed integer.
-
-
-
-
-
- types.ints.{s8, s16, s32}
-
-
-
- Signed integers with a fixed length (8, 16 or 32 bits). They
- go from −2^n/2 to 2^n/2−1 respectively (e.g.
- −128 to 127 for 8
- bits).
-
-
-
-
-
- types.ints.unsigned
-
-
-
- An unsigned integer (that is >= 0).
-
-
-
-
-
- types.ints.{u8, u16, u32}
-
-
-
- Unsigned integers with a fixed length (8, 16 or 32 bits).
- They go from 0 to 2^n−1 respectively (e.g.
- 0 to 255 for 8 bits).
-
-
-
-
-
- types.ints.positive
-
-
-
- A positive integer (that is > 0).
-
-
-
-
-
- types.port
-
-
-
- A port number. This type is an alias to
- types.ints.u16.
-
-
-
-
-
- String-related types:
-
-
-
-
- types.str
-
-
-
- A string. Multiple definitions cannot be merged.
-
-
-
-
-
- types.lines
-
-
-
- A string. Multiple definitions are concatenated with a new
- line "\n".
-
-
-
-
-
- types.commas
-
-
-
- A string. Multiple definitions are concatenated with a comma
- ",".
-
-
-
-
-
- types.envVar
-
-
-
- A string. Multiple definitions are concatenated with a
- collon ":".
-
-
-
-
-
- types.strMatching
-
-
-
- A string matching a specific regular expression. Multiple
- definitions cannot be merged. The regular expression is
- processed using builtins.match.
-
-
-
-
+
+ Numeric types
+
+
+
+ types.int
+
+
+
+ A signed integer.
+
+
+
+
+
+ types.ints.{s8, s16, s32}
+
+
+
+ Signed integers with a fixed length (8, 16 or 32 bits).
+ They go from −2^n/2 to 2^n/2−1 respectively (e.g.
+ −128 to 127 for 8
+ bits).
+
+
+
+
+
+ types.ints.unsigned
+
+
+
+ An unsigned integer (that is >= 0).
+
+
+
+
+
+ types.ints.{u8, u16, u32}
+
+
+
+ Unsigned integers with a fixed length (8, 16 or 32 bits).
+ They go from 0 to 2^n−1 respectively (e.g.
+ 0 to 255 for 8
+ bits).
+
+
+
+
+
+ types.ints.between
+ lowest highest
+
+
+
+ An integer between
+ lowest and
+ highest (both
+ inclusive).
+
+
+
+
+
+ types.ints.positive
+
+
+
+ A positive integer (that is > 0).
+
+
+
+
+
+ types.port
+
+
+
+ A port number. This type is an alias to
+ types.ints.u16.
+
+
+
+
+
+ types.float
+
+
+
+ A floating point number.
+
+
+
+ Converting a floating point number to a string with
+ toString or toJSON
+ may result in
+ precision
+ loss.
+
+
+
+
+
+
+ types.number
+
+
+
+ Either a signed integer or a floating point number. No
+ implicit conversion is done between the two types, and
+ multiple equal definitions will only be merged if they
+ have the same type.
+
+
+
+
+
+ types.numbers.between
+ lowest highest
+
+
+
+ An integer or floating point number between
+ lowest and
+ highest (both
+ inclusive).
+
+
+
+
+
+ types.numbers.nonnegative
+
+
+
+ A nonnegative integer or floating point number (that is
+ >= 0).
+
+
+
+
+
+ types.numbers.positive
+
+
+
+ A positive integer or floating point number (that is >
+ 0).
+
+
+
+
+
+
+ String types
+
+
+
+ types.str
+
+
+
+ A string. Multiple definitions cannot be merged.
+
+
+
+
+
+ types.separatedString
+ sep
+
+
+
+ A string. Multiple definitions are concatenated with
+ sep, e.g.
+ types.separatedString "|".
+
+
+
+
+
+ types.lines
+
+
+
+ A string. Multiple definitions are concatenated with a new
+ line "\n".
+
+
+
+
+
+ types.commas
+
+
+
+ A string. Multiple definitions are concatenated with a
+ comma ",".
+
+
+
+
+
+ types.envVar
+
+
+
+ A string. Multiple definitions are concatenated with a
+ colon ":".
+
+
+
+
+
+ types.strMatching
+
+
+
+ A string matching a specific regular expression. Multiple
+ definitions cannot be merged. The regular expression is
+ processed using builtins.match.
+
+
+
+
+
-
- Value Types
+
+ Submodule types
- Value types are types that take a value parameter.
+ Submodules are detailed in
+ Submodule.
-
-
- types.enum
- l
-
-
-
- One element of the list
- l, e.g.
- types.enum [ "left" "right" ].
- Multiple definitions cannot be merged.
-
-
-
-
-
- types.separatedString
- sep
-
-
-
- A string with a custom separator
- sep, e.g.
- types.separatedString "|".
-
-
-
-
-
- types.ints.between
- lowest highest
-
-
-
- An integer between
- lowest and
- highest (both
- inclusive). Useful for creating types like
- types.port.
-
-
-
types.submodule
@@ -345,8 +414,6 @@
in composed types to create modular options. This is
equivalent to
types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }.
- Submodules are detailed in
- Submodule.
@@ -467,7 +534,7 @@
- Composed Types
+ Composed types
Composed types are types that take a type as parameter.
listOf int and
@@ -850,7 +917,7 @@ nixThings = mkOption {
- Custom Types
+ Custom types
Custom types can be created with the
mkOptionType function. As type creation
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
index 8c7bac6f6cc1..c5976166fb31 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -26,7 +26,7 @@ with lib;
# Provide networkmanager for easy wireless configuration.
networking.networkmanager.enable = true;
- networking.wireless.enable = mkForce false;
+ networking.wireless.enable = mkImageMediaOverride false;
# KDE complains if power management is disabled (to be precise, if
# there is no power management backend such as upower).
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index a8601a9e2c06..ae9be08c8d85 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -22,10 +22,10 @@ with lib;
config = {
# Enable in installer, even if the minimal profile disables it.
- documentation.enable = mkForce true;
+ documentation.enable = mkImageMediaOverride true;
# Show the manual.
- documentation.nixos.enable = mkForce true;
+ documentation.nixos.enable = mkImageMediaOverride true;
# Use less privileged nixos user
users.users.nixos = {
@@ -41,7 +41,7 @@ with lib;
# Allow passwordless sudo from nixos user
security.sudo = {
enable = mkDefault true;
- wheelNeedsPassword = mkForce false;
+ wheelNeedsPassword = mkImageMediaOverride false;
};
# Automatically log in at the virtual consoles.
diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix
index c4bd4fe809e4..ab5ea887acba 100644
--- a/nixos/modules/services/logging/vector.nix
+++ b/nixos/modules/services/logging/vector.nix
@@ -43,8 +43,10 @@ in
format = pkgs.formats.toml { };
conf = format.generate "vector.toml" cfg.settings;
validateConfig = file:
- pkgs.runCommand "validate-vector-conf" { } ''
- ${pkgs.vector}/bin/vector validate --no-environment "${file}"
+ pkgs.runCommand "validate-vector-conf" {
+ nativeBuildInputs = [ pkgs.buildPackages.vector ];
+ } ''
+ vector validate --no-environment "${file}"
ln -s "${file}" "$out"
'';
in
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index dd99fa3ddccd..fd3418b8f6bd 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -628,18 +628,18 @@ in {
};
allowedDomains = mkOption {
description = lib.mdDoc ''
- To limit access to authenticated users who are members of one or more groups,
- set allowedGroups to a comma- or space-separated list of group object IDs.
- You can find object IDs for a specific group on the Azure portal.
+ Limits access to users who belong to specific domains.
+ Separate domains with space or comma.
'';
default = "";
type = types.str;
};
allowedGroups = mkOption {
description = lib.mdDoc ''
- Limits access to users who belong to specific domains.
- Separate domains with space or comma.
- '';
+ To limit access to authenticated users who are members of one or more groups,
+ set allowedGroups to a comma- or space-separated list of group object IDs.
+ You can find object IDs for a specific group on the Azure portal.
+ '';
default = "";
type = types.str;
};
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 0b6b4bf9e5c7..16ed34515c67 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -325,11 +325,12 @@ in {
};
type = mkOption {
- type = types.enum [ "sendreceive" "sendonly" "receiveonly" ];
+ type = types.enum [ "sendreceive" "sendonly" "receiveonly" "receiveencrypted" ];
default = "sendreceive";
description = lib.mdDoc ''
Whether to only send changes for this folder, only receive them
- or both.
+ or both. `receiveencrypted` can be used for untrusted devices. See
+ for reference.
'';
};
diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix
index c6889e2f4041..1f2168b2a4c6 100644
--- a/nixos/modules/services/web-apps/lemmy.nix
+++ b/nixos/modules/services/web-apps/lemmy.nix
@@ -117,7 +117,7 @@ in
file_server
}
@for_backend {
- path /api/* /pictrs/* feeds/* nodeinfo/*
+ path /api/* /pictrs/* /feeds/* /nodeinfo/*
}
handle @for_backend {
reverse_proxy 127.0.0.1:${toString cfg.settings.port}
diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix
index 99bde5e1f0ce..d42cf1d7412f 100644
--- a/nixos/modules/services/x11/picom.nix
+++ b/nixos/modules/services/x11/picom.nix
@@ -11,15 +11,6 @@ let
addCheck (listOf x) (y: length y == 2)
// { description = "pair of ${x.description}"; };
- floatBetween = a: b: with types;
- let
- # toString prints floats with hardcoded high precision
- floatToString = f: builtins.toJSON f;
- in
- addCheck float (x: x <= b && x >= a)
- // { description = "a floating point number in " +
- "range [${floatToString a}, ${floatToString b}]"; };
-
mkDefaultAttrs = mapAttrs (n: v: mkDefault v);
# Basically a tinkered lib.generators.mkKeyValueDefault
@@ -93,7 +84,7 @@ in {
};
fadeSteps = mkOption {
- type = pairOf (floatBetween 0.01 1);
+ type = pairOf (types.numbers.between 0.01 1);
default = [ 0.028 0.03 ];
example = [ 0.04 0.04 ];
description = lib.mdDoc ''
@@ -133,7 +124,7 @@ in {
};
shadowOpacity = mkOption {
- type = floatBetween 0 1;
+ type = types.numbers.between 0 1;
default = 0.75;
example = 0.8;
description = lib.mdDoc ''
@@ -156,7 +147,7 @@ in {
};
activeOpacity = mkOption {
- type = floatBetween 0 1;
+ type = types.numbers.between 0 1;
default = 1.0;
example = 0.8;
description = lib.mdDoc ''
@@ -165,7 +156,7 @@ in {
};
inactiveOpacity = mkOption {
- type = floatBetween 0.1 1;
+ type = types.numbers.between 0.1 1;
default = 1.0;
example = 0.8;
description = lib.mdDoc ''
@@ -174,7 +165,7 @@ in {
};
menuOpacity = mkOption {
- type = floatBetween 0 1;
+ type = types.numbers.between 0 1;
default = 1.0;
example = 0.8;
description = lib.mdDoc ''
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 0b38a94c25fd..25e30c9303bd 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -1411,7 +1411,7 @@ let
ipv6RoutePrefixes = mkOption {
default = [];
- example = [ { Route = "fd00::/64"; LifetimeSec = 3600; } ];
+ example = [ { ipv6RoutePrefixConfig = { Route = "fd00::/64"; LifetimeSec = 3600; }; } ];
type = with types; listOf (submodule ipv6RoutePrefixOptions);
description = ''
A list of ipv6RoutePrefix sections to be added to the unit. See
diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix
index 7a6bfef44d28..4fca8ce9e7eb 100644
--- a/nixos/modules/virtualisation/proxmox-image.nix
+++ b/nixos/modules/virtualisation/proxmox-image.nix
@@ -127,8 +127,28 @@ with lib;
name = "proxmox-${cfg.filenameSuffix}";
postVM = let
# Build qemu with PVE's patch that adds support for the VMA format
- vma = pkgs.qemu_kvm.overrideAttrs ( super: rec {
+ vma = (pkgs.qemu_kvm.override {
+ alsaSupport = false;
+ pulseSupport = false;
+ sdlSupport = false;
+ jackSupport = false;
+ gtkSupport = false;
+ vncSupport = false;
+ smartcardSupport = false;
+ spiceSupport = false;
+ ncursesSupport = false;
+ libiscsiSupport = false;
+ tpmSupport = false;
+ numaSupport = false;
+ seccompSupport = false;
+ guestAgentSupport = false;
+ }).overrideAttrs ( super: rec {
+ version = "7.0.0";
+ src = pkgs.fetchurl {
+ url= "https://download.qemu.org/qemu-${version}.tar.xz";
+ sha256 = "sha256-9rN1x5UfcoQCeYsLqrsthkeMpT1Eztvvq74cRr9G+Dk=";
+ };
patches = [
(pkgs.fetchpatch {
url =
diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix
index 037fc7b31bfa..68a2566c1191 100644
--- a/nixos/tests/gitea.nix
+++ b/nixos/tests/gitea.nix
@@ -18,7 +18,7 @@ let
services.gitea = {
enable = true;
database = { inherit type; };
- disableRegistration = true;
+ settings.service.DISABLE_REGISTRATION = true;
};
environment.systemPackages = [ pkgs.gitea pkgs.jq ];
services.openssh.enable = true;
diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix
index 5436d0b300cc..543bd2ce57a5 100644
--- a/nixos/tests/lemmy.nix
+++ b/nixos/tests/lemmy.nix
@@ -23,6 +23,13 @@ in
hostname = "http://${lemmyNodeName}";
port = backendPort;
database.createLocally = true;
+ # Without setup, the /feeds/* and /nodeinfo/* API endpoints won't return 200
+ setup = {
+ admin_username = "mightyiam";
+ admin_password = "ThisIsWhatIUseEverywhereTryIt";
+ site_name = "Lemmy FTW";
+ admin_email = "mightyiam@example.com";
+ };
};
caddy.enable = true;
};
@@ -76,7 +83,8 @@ in
# No path can return 200 until after we upload an image to pict-rs
assert_http_code("${lemmyNodeName}/pictrs/", 404)
- # The paths `/feeds/*` and `/nodeinfo/*` are not tested because they seem to be misconfigured
+ assert_http_code("${lemmyNodeName}/feeds/all.xml", 200)
+ assert_http_code("${lemmyNodeName}/nodeinfo/2.0.json", 200)
assert_http_code("${lemmyNodeName}/some-other-made-up-path/", 404, "-X POST")
assert_http_code("${lemmyNodeName}/some-other-path", 404, "-H 'Accept: application/activity+json'")
diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix
index 3c7b603d62cd..6e096c2bf3d4 100644
--- a/pkgs/applications/audio/pyradio/default.nix
+++ b/pkgs/applications/audio/pyradio/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
- version = "0.8.9.25";
+ version = "0.8.9.26";
src = fetchFromGitHub {
owner = "coderholic";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-bkZ+zgFtENQUjks9HwVcqHIREcKQ5XCt3AEh3QAyiEc=";
+ sha256 = "sha256-RuQAbmzB8s+YmJLSbzJTQtpiYLr1oFtrxKF8P+MlHeU=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 19016b700fdc..f0e5dc9cbb9a 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -1,40 +1,11 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
, alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr
+, aixlog, popl
, pulseaudioSupport ? false, libpulseaudio
, nixosTests }:
assert pulseaudioSupport -> libpulseaudio != null;
-let
-
- dependency = { name, version, sha256 }:
- stdenv.mkDerivation {
- name = "${name}-${version}";
-
- src = fetchFromGitHub {
- owner = "badaix";
- repo = name;
- rev = "v${version}";
- inherit sha256;
- };
-
- nativeBuildInputs = [ cmake ];
- };
-
- aixlog = dependency {
- name = "aixlog";
- version = "1.5.0";
- sha256 = "09mnkrans9zmwfxsiwgkm0rba66c11kg5zby9x3rjic34gnmw6ay";
- };
-
- popl = dependency {
- name = "popl";
- version = "1.2.0";
- sha256 = "1z6z7fwffs3d9h56mc2m24d5gp4fc5bi8836zyfb276s6fjyfcai";
- };
-
-in
-
stdenv.mkDerivation rec {
pname = "snapcast";
version = "0.26.0";
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index fa9ff0394fa7..19fd08a4d59f 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -113,12 +113,12 @@ final: prev:
Ionide-vim = buildVimPluginFrom2Nix {
pname = "Ionide-vim";
- version = "2022-05-13";
+ version = "2022-09-02";
src = fetchFromGitHub {
owner = "ionide";
repo = "Ionide-vim";
- rev = "3092ca0fed470c01457d0cecbe5e108e2b008f0d";
- sha256 = "0fbkmsqpnwrh8skv5yiva8y4aj4d7zm2z5vxbzl0hl6k728dwxvz";
+ rev = "a0685e9184c75beb6c608d783389d95446775c93";
+ sha256 = "0y3amhzsnzanibq4i6im1p7ha8li115mjscfywc91v3zk9zim22i";
};
meta.homepage = "https://github.com/ionide/Ionide-vim/";
};
@@ -281,12 +281,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
- version = "2022-08-31";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
- rev = "18f46aca5cb6265e1468353cf782c1fda28fb9ea";
- sha256 = "0w5xj8qzs9m057ms6q70h8r44lbdvag9q6ldr8xy0a8fnpd5ickl";
+ rev = "0c2d8387ca73bd3f9b8884f387b0f592796cbfa0";
+ sha256 = "0zrdgyg8xcl14lgykh18x8ihs4f9kh9agq7c9w9imqq7zz0sbr41";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@@ -442,7 +442,7 @@ final: prev:
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "d4343e8384ffb25d70a9ebc966bbf1277735567c";
- sha256 = "0gmc9mnbi4g0vzw911ybkw5q2ph2jhv8hs4a126q1jk2swbc5wkk";
+ sha256 = "12pgal13zxdmdb6vqbnllxjdk68p9p1c9wvwhqrrwa1jriwijap0";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -486,12 +486,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
- version = "2022-08-29";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
- rev = "ed78d4bbb778a66827430c2022f5a64c91443751";
- sha256 = "1jgbyny9hinnhi1zzy1swa2yrqifky9qzbwxb1f58d1w41k7bbw3";
+ rev = "a0e497ed94e5f3692475e4e84abec18514d968df";
+ sha256 = "0yr4qby12b17fh137avyzdilf1gcdwqmb7q9n1bnhagbch59lajb";
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
};
@@ -534,12 +534,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2022-08-23";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "6996d1c14dd109cc5112d1a60c86683e5308d14c";
- sha256 = "1vbqcc98a2cpq1ymv68djp0bxj7mm3lk4i2cc22r9wdmg5qw8ng8";
+ rev = "477ad3fdd2df80a9dc479f974caeca1aa6ae640b";
+ sha256 = "0x5j9dcng80cwfqlf4nm3gj6s2b59l67vsdw7ihljqwy548ydgg6";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -558,12 +558,12 @@ final: prev:
alpha-nvim = buildVimPluginFrom2Nix {
pname = "alpha-nvim";
- version = "2022-08-29";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "goolord";
repo = "alpha-nvim";
- rev = "09e5374465810d71c33e9b097214adcdebeee49a";
- sha256 = "16a55mjc78yiv9a66cckxhdqbabk4k4sim3rcyvs2h7m54rwgj31";
+ rev = "d2336550abec27c6af8be4ed5045fb4fa82a9c93";
+ sha256 = "05y8iddcb2214kqh8b3v14qgzgdkcbfykzqhyw3p4r81a3ipld5y";
};
meta.homepage = "https://github.com/goolord/alpha-nvim/";
};
@@ -666,12 +666,12 @@ final: prev:
asyncrun-vim = buildVimPluginFrom2Nix {
pname = "asyncrun.vim";
- version = "2022-06-14";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "asyncrun.vim";
- rev = "aa8a99e87e64276d52556f4d9d4f4a19afd37556";
- sha256 = "0r79iq6fl4rcpadwvwma70gxk57lri15bqb5p12xad67fxd40320";
+ rev = "c37c2305ddfc7324e3ad8f2b111bd875d5b57ba8";
+ sha256 = "1s5x5p6vmbx3irsldgf4l3qvzrakqhk9hdff7r8sgsnvqcx1rrlb";
};
meta.homepage = "https://github.com/skywind3000/asyncrun.vim/";
};
@@ -702,12 +702,12 @@ final: prev:
aurora = buildVimPluginFrom2Nix {
pname = "aurora";
- version = "2022-09-01";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "ray-x";
repo = "aurora";
- rev = "9595471ec75ac26c575e46b3d93e1812df393ee9";
- sha256 = "09nizsrc1wakwxaxwhjbg1qz7wxps2d111v0ldr3m05nkb8h8nrm";
+ rev = "298394e61d57b6cc0a050c91e30475f0aeb421ef";
+ sha256 = "001l0m5z2vg5kpnbvikj033x3qg52yn3b2lsb8fpyqbnjs2r8nma";
};
meta.homepage = "https://github.com/ray-x/aurora/";
};
@@ -918,24 +918,24 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
- version = "2022-09-01";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
- rev = "938908fc8db120d907bda23f6744202f534f63e4";
- sha256 = "1wvd7k7xn3lb7fzqhag0mgyjjg50v31qfcdlmbn54dwbf684ra98";
+ rev = "4548b8618c667f61989825dae703207dcb43d1e3";
+ sha256 = "0vnk5s8dniq0nbnwb8jk1zq2av43rnazj6k22jzp1i078zji8zya";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
bullets-vim = buildVimPluginFrom2Nix {
pname = "bullets.vim";
- version = "2022-08-13";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "dkarter";
repo = "bullets.vim";
- rev = "5b38374ead59c84ecc1013d3267af14b624f4469";
- sha256 = "1zk06c72lqyppm3y8iipb9q0lap56qmbsdrqp7s9spvpf5bcj1hz";
+ rev = "770a93c1770491ad45e47678a9cd7c581f3f24ee";
+ sha256 = "05wn0v6vi51iq5rsxfz6vnsfiz5w2xnsii7d32gk0vhbm9f83cb3";
};
meta.homepage = "https://github.com/dkarter/bullets.vim/";
};
@@ -1038,12 +1038,12 @@ final: prev:
clangd_extensions-nvim = buildVimPluginFrom2Nix {
pname = "clangd_extensions.nvim";
- version = "2022-07-19";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "p00f";
repo = "clangd_extensions.nvim";
- rev = "2390bf75e25daf738d2cc04aac8f83f62b7f037d";
- sha256 = "0hj0cazy5mzwswjrdhi8sn2p9v72k35z7cap67crqn321fp4hp0z";
+ rev = "8fd2d8a11bb9b7610b3caedd3601843ceafc119f";
+ sha256 = "16blllwprqi52797bbmvkcfyh43i8yjd6k4kjkh77gx2nwqr7f6v";
};
meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/";
};
@@ -1458,12 +1458,12 @@ final: prev:
cmp-rg = buildVimPluginFrom2Nix {
pname = "cmp-rg";
- version = "2022-07-27";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "cmp-rg";
- rev = "7cf6ddc0046591b8a95c737826edf683489c3a66";
- sha256 = "1xi3vygr5czjx904314ny2pgyxz9s8s7m27cl74ii05np7i27nnz";
+ rev = "1cad8eb315643d0df13c37401c03d7986f891011";
+ sha256 = "02ij7isp6hzcfkd5zw9inymmpgcmhiz0asjra45w8jkzqlxd322j";
};
meta.homepage = "https://github.com/lukas-reineke/cmp-rg/";
};
@@ -1494,12 +1494,12 @@ final: prev:
cmp-tabnine = buildVimPluginFrom2Nix {
pname = "cmp-tabnine";
- version = "2022-08-30";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "tzachar";
repo = "cmp-tabnine";
- rev = "f2ea9c0824d389d588966c64c146d324138a443c";
- sha256 = "0d80lyjpsxn3cny66l280q20pkljh9h92wpa3iyyhj8g49zcihmw";
+ rev = "cfd93698c1ada2c0f493e48f0df19930d6cdc218";
+ sha256 = "19xc1ypah2ql4cspbj6c3y9hhfjcx5iwjb6c34cfdqzlaynfar9s";
};
meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
};
@@ -1638,12 +1638,12 @@ final: prev:
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2022-08-13";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "183214d6c56f45a5d74a4d8b6387404e9634f113";
- sha256 = "0970yda1ilqfwz38yg2r40h1rbjnda67sjlbn131566dybpdl648";
+ rev = "d5cae4cdff02f5e839ac7ec051bc477b5eb299cb";
+ sha256 = "0dx9x8bv65d4pgm2p3fggh167g3d7hjfic1ykpfxyqvrabrkppn2";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -1698,12 +1698,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc.nvim";
- version = "2022-09-01";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "19c0fbd07ec559fd7bfacb7b6d99aa04b984e4da";
- sha256 = "0kicvgz75178mcy5922ggrfrfdkyyjpwzcx6k5mlvw38fvccazf0";
+ rev = "f63823713515d872e19f79c0b92258625738008a";
+ sha256 = "0kqhxl6hyhfrxrd7ym77kmnf0128g8ljx7l6any32mxlj66jlx0y";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -1770,24 +1770,24 @@ final: prev:
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
- version = "2022-08-31";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
- rev = "a61574dabc9076bac869b56c1819fa47e4d64cf0";
- sha256 = "0lsimnn8ppaxq0w0sypzj20jrsfxb984q2mdxycclczp8p0hsawc";
+ rev = "29a6a305012c0d39cd88d11e15df62ee3aa99091";
+ sha256 = "160j5fv9fr4vwxjh3gvfj4h56l9gav2zc568k3171vyk2bwj7phs";
};
meta.homepage = "https://github.com/wincent/command-t/";
};
comment-nvim = buildVimPluginFrom2Nix {
pname = "comment.nvim";
- version = "2022-08-27";
+ version = "2022-09-04";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
- rev = "80e7746e42fa685077a7941e9022308c7ad6adf8";
- sha256 = "0sanlafz217l83cwv6qy10712civddadp5vagcdl9nghg9zkm5wy";
+ rev = "30d23aa2e1ba204a74d5dfb99777e9acbe9dd2d6";
+ sha256 = "1nr66wjb4y1m5dp4vr9c1x4ygm45f4j3c2dy7cvin1abaj0bz06y";
};
meta.homepage = "https://github.com/numtostr/comment.nvim/";
};
@@ -1852,6 +1852,18 @@ final: prev:
meta.homepage = "https://github.com/tamago324/compe-zsh/";
};
+ compiler-explorer-nvim = buildVimPluginFrom2Nix {
+ pname = "compiler-explorer.nvim";
+ version = "2022-09-08";
+ src = fetchFromGitHub {
+ owner = "krady21";
+ repo = "compiler-explorer.nvim";
+ rev = "5fe1bdd9ff255d7ad2cc952b844c59fd71bd58a9";
+ sha256 = "06klr4mgqr30p33pcm74h7isajkq4rj0wk7ibl5h9jg7l0d4jiqh";
+ };
+ meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
+ };
+
completion-buffers = buildVimPluginFrom2Nix {
pname = "completion-buffers";
version = "2021-01-17";
@@ -1974,24 +1986,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
- version = "2022-09-01";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
- rev = "446f10b15a3df79d0dd2e03af9aa51efa5202db1";
- sha256 = "03wcdjar3g8ajf0bsp24fg6qnqpxqw87djg9bjc6q811kk2y9rqi";
+ rev = "1df675a2938efe5c8bf561c7953326f1cc337a0a";
+ sha256 = "00vrx7ah5b8bfp281858k4464ribfpqq1xkfg9djxnc4nhdpgiy3";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
- version = "2022-09-01";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
- rev = "6e91fceca1addcbda590eaefe79b40dae3390f60";
- sha256 = "1yaxnnyywm0770sj6vm3ffbqyyqq9lfmfkwnn37ldjrnd1a4nb0z";
+ rev = "e2425780c53966647627531c9e61677336736bd7";
+ sha256 = "17fag6vrg8qpm0myfbn56r66rnci8v1m9d59nvn7wrsfs22as8n6";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@@ -2010,12 +2022,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
- version = "2022-09-01";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
- rev = "ba5e0b14fa29e1eadcd527638d68231f25cd0c6a";
- sha256 = "0lg6a0h4k94ipy3da5h1pfckdsw99fmc5fdddzg1wxvbbs6vfsvz";
+ rev = "9ef107562e6392c26fe04a6f96617aace95515e2";
+ sha256 = "0rzwiw3jv2vb6m11lhmfvabkj5z22dy8wjq5vna3kjhwhvmxiwfm";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@@ -2046,12 +2058,12 @@ final: prev:
crates-nvim = buildVimPluginFrom2Nix {
pname = "crates.nvim";
- version = "2022-08-15";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "saecki";
repo = "crates.nvim";
- rev = "75ee7231a2d29f80b14c42300ec96235518638db";
- sha256 = "0v86kxc063h5b3gn8imix0r8xikqx36xw8x36rdbyi8vi73y74ar";
+ rev = "49808e2c03516d7f6290f033b004d57494c824d2";
+ sha256 = "0bi4w37lfakxgkdfxij62a716wvkf4s44rj3527wfpnd27s04qac";
};
meta.homepage = "https://github.com/saecki/crates.nvim/";
};
@@ -2528,12 +2540,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
- version = "2022-09-01";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "adc3250d65a5a12c3ebf8f85ff483a4cb8609c41";
- sha256 = "10lsi4ms24zhhx9dfxfihz656fkjjkrxj77h9nnhggsxsjpqp9nb";
+ rev = "be476758db1126632a62c8ef64113c931d763fbc";
+ sha256 = "1qs10jwdrc6mpgwqlvjca7gcivlpgmxphklffcnq6qnx6gs57rpg";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -2564,12 +2576,12 @@ final: prev:
dressing-nvim = buildVimPluginFrom2Nix {
pname = "dressing.nvim";
- version = "2022-08-31";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "stevearc";
repo = "dressing.nvim";
- rev = "9cdb3e0f0973447b940b35d3175dc780301de427";
- sha256 = "159kh9g6hm51blqi5g23w463jz2hnnskppm352s8ic9h239dm3ak";
+ rev = "b188b7750c78c0dbe0c61d79d824673a53ff82db";
+ sha256 = "1098vj0fgz1zazbw1a4nk5zsgq5gf38nc2xck0nlqwankrzasl2d";
};
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
};
@@ -2588,12 +2600,12 @@ final: prev:
edge = buildVimPluginFrom2Nix {
pname = "edge";
- version = "2022-08-28";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
- rev = "9706ff0b86152aefe932cf77902be1a8bdba0b70";
- sha256 = "00hq87zz83pl82w8d0r6zsv22vjm71vldfbmvspw3a904fw80dgk";
+ rev = "27c3d5da4f3e1f08dbe754d3458182b7b18ae059";
+ sha256 = "0fiag3ma9a5hjhxk8h93hcqzgmkjgyjrfmmdgw5rdyzhzszji81i";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@@ -2605,7 +2617,7 @@ final: prev:
owner = "editorconfig";
repo = "editorconfig-vim";
rev = "d354117b72b3b43b75a29b8e816c0f91af10efe9";
- sha256 = "1kgxz82lkssxflylylk9z10aq6qps45z27k24i8kf29wzpf5b3lr";
+ sha256 = "12qvximadgb9z2i0hgvj4p4nxaqk0aqbnaqpafpma73xyb23hx5v";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@@ -2674,12 +2686,12 @@ final: prev:
everforest = buildVimPluginFrom2Nix {
pname = "everforest";
- version = "2022-09-01";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "everforest";
- rev = "c60a594cc4adbfb863d3186f730765b0e1cb85eb";
- sha256 = "1b2jhm9yksmkri894sfzrqhsms06vhg3acr98qaqs9y30mabcb88";
+ rev = "ec0b9676203a84500984da5e162a129128c99a9c";
+ sha256 = "1a3bshd370m755xslf67ig7nfzjybdzn9jgv18dk9igy6szxa16x";
};
meta.homepage = "https://github.com/sainnhe/everforest/";
};
@@ -2734,12 +2746,12 @@ final: prev:
feline-nvim = buildVimPluginFrom2Nix {
pname = "feline.nvim";
- version = "2022-08-08";
+ version = "2022-09-02";
src = fetchFromGitHub {
owner = "feline-nvim";
repo = "feline.nvim";
- rev = "b7391bbfcb9cf6acf28e8015d9e41a9c9b6c91f5";
- sha256 = "0cjwp7c99xhdc0s40k7s5j1yn47yzib07zzhlj6wp3jmm5lnhjj5";
+ rev = "331a79449d86668618a4e00fced153bce3ce2780";
+ sha256 = "0ph2aljg8i6nqnd2l9bbvcd96b2c46xm45d5n8fq92y0rp8k54dq";
};
meta.homepage = "https://github.com/feline-nvim/feline.nvim/";
};
@@ -2811,7 +2823,7 @@ final: prev:
owner = "andviro";
repo = "flake8-vim";
rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994";
- sha256 = "1s7rb2ygky1jjjqpwhzp5lsf7js1g0yhnbf6x5lfwygz6646xpy3";
+ sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/andviro/flake8-vim/";
@@ -2855,12 +2867,12 @@ final: prev:
flutter-tools-nvim = buildVimPluginFrom2Nix {
pname = "flutter-tools.nvim";
- version = "2022-08-16";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "akinsho";
repo = "flutter-tools.nvim";
- rev = "78551498310e25055ec26d0f8dec2b5297043676";
- sha256 = "0lihim61vp59ffdk86gwqpb41n79grjhbs71s9m51b6pnljnda29";
+ rev = "45e1091deaf185e26347b75b1bff6963f5fb1c4a";
+ sha256 = "1h07la516gwg1x78alwnw5yn9lk4dj9g5dly7pgjwlp8sr5r0yq0";
};
meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
};
@@ -2891,12 +2903,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
- version = "2022-08-29";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
- rev = "e5a16f9346e1fa24147d6d23460ca9b41528ab7e";
- sha256 = "13syv5p0fhyyhv3djfn9zxlnqmw8h38caml0lxb1y3205xw4awwp";
+ rev = "22a99756492a340c161ab122b0ded90ab115a1b3";
+ sha256 = "1ldm4sabp9wvq1mww8rzzmkd9axlnm86hid6sr3prva9xqmwxq5d";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@@ -3239,11 +3251,11 @@ final: prev:
goyo-vim = buildVimPluginFrom2Nix {
pname = "goyo.vim";
- version = "2022-08-03";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "junegunn";
repo = "goyo.vim";
- rev = "d0bb582dd478011cfdba18ac3b2d52a7f1659aeb";
+ rev = "7f5d35a65510083ea5c2d0941797244b9963d4a9";
sha256 = "1gb34x4djv34z3s1v6c1kcngwzfyx9vslhjx5vm73lbxyxs2nkjl";
};
meta.homepage = "https://github.com/junegunn/goyo.vim/";
@@ -3299,12 +3311,12 @@ final: prev:
gruvbox-material = buildVimPluginFrom2Nix {
pname = "gruvbox-material";
- version = "2022-08-28";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "gruvbox-material";
- rev = "9e30f2095e8ab80c68901e7aaee186cd3aa97168";
- sha256 = "16xpwcx658nh9ws6ijlxmyxsdhz0bxd0w10vn69kf07gns6kd0zb";
+ rev = "ac48c0b6017407e9fa9c607e14ab0aef250f2ae6";
+ sha256 = "0ggilhkhwg29mg8zlyvsmfp84ls2m3r63yfwfnsz0ga73ikkszv8";
};
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
};
@@ -3418,12 +3430,12 @@ final: prev:
hologram-nvim = buildVimPluginFrom2Nix {
pname = "hologram.nvim";
- version = "2022-08-23";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "edluffy";
repo = "hologram.nvim";
- rev = "25535e9af26bb9231fdf951570674c99cbffce92";
- sha256 = "0sfg8yxdlqifap7xp5x6kcgmmmp7di9k7j5wmigvw970ns5b785f";
+ rev = "338969044a5d6f9f56f728c8efeeced7408d580a";
+ sha256 = "0q493i7fsws9q2wrmddbvxwr968qkkz8nlgm0nynb13m5qxpdzvh";
};
meta.homepage = "https://github.com/edluffy/hologram.nvim/";
};
@@ -3562,24 +3574,24 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline.nvim";
- version = "2022-07-27";
+ version = "2022-09-02";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
- rev = "c15bbe9f23d88b5c0b4ca45a446e01a0a3913707";
- sha256 = "03l28ja345vz4hrbj9ha864vfyagid116mqi4z8ka2g2nk7s1brd";
+ rev = "db7cbcb40cc00fc5d6074d7569fb37197705e7f6";
+ sha256 = "1r9y6zqar0gv8kvqqxlh07ifa16h5yqa24fj22qw63vgnysbxqbp";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
indentLine = buildVimPluginFrom2Nix {
pname = "indentLine";
- version = "2022-02-15";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "indentLine";
- rev = "7753505f3c500ec88d11e9373d05250f49c1d900";
- sha256 = "1lh6d3ljz1rmj3xa4f0n687fyxxc30dnmsq8mgd77v27f7lj62p5";
+ rev = "d15d63bf9c4a74a02470d4bc8ecce53df13e3a75";
+ sha256 = "079r951hg2z2cjlb4sh8iz4pvivlinbvidpgq66ddlv4v5q5yg34";
};
meta.homepage = "https://github.com/Yggdroot/indentLine/";
};
@@ -3743,12 +3755,12 @@ final: prev:
kanagawa-nvim = buildVimPluginFrom2Nix {
pname = "kanagawa.nvim";
- version = "2022-08-31";
+ version = "2022-09-01";
src = fetchFromGitHub {
owner = "rebelot";
repo = "kanagawa.nvim";
- rev = "5f1203f4606e3208f6dd156c03f498d9fadcf1a8";
- sha256 = "07jl5vf9mbz2bi1w6xm4kvxd18g3diq5ay2yrcc1m5nfki82r3si";
+ rev = "dda1b8c13e0e7588c014064e5e8baf7f2953dd29";
+ sha256 = "0wnww29p1a4vqga50az5ml244kk8n1jsvm7hfw2225x52fwma8in";
};
meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
};
@@ -3827,12 +3839,12 @@ final: prev:
lean-nvim = buildVimPluginFrom2Nix {
pname = "lean.nvim";
- version = "2022-08-29";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
- rev = "d2a0e46e0c9adb396423fb06ca4285f4d9168cf0";
- sha256 = "0yxrydz1xsamc413qzwlmdryxlw9gr25dxcjgxafyclzpdxd701m";
+ rev = "1940d8746157cc4c7cc12f540db8ed4506408773";
+ sha256 = "1f00ajmm6x9jj6anqyd6lpq59c3zgni0n8a4vvfbgi7c6shdhnqc";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@@ -3947,12 +3959,12 @@ final: prev:
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
- version = "2022-08-16";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
- rev = "f838276ce0a29518b8c7fdecf6d6e61c53eb73ef";
- sha256 = "0d346kbdyziawzhdxszwlvmii4s1cbcxphihrwwjrnma37xz2byg";
+ rev = "8b6e29e65e9711b75df289879186ff3888feed00";
+ sha256 = "0lmrqv20qxiiipljkybpv3m1jsskddks6h92i6hrfldvpn1a8vx3";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@@ -4103,24 +4115,24 @@ final: prev:
lsp-colors-nvim = buildVimPluginFrom2Nix {
pname = "lsp-colors.nvim";
- version = "2021-10-22";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "folke";
repo = "lsp-colors.nvim";
- rev = "517fe3ab6b63f9907b093bc9443ef06b56f804f3";
- sha256 = "15q3hiwh0zpyhadapjk3wabnn71kafcljj2gq11qk53fk3zzsxdx";
+ rev = "4e6da1984d23da88a947805866580c48fc3cc8d7";
+ sha256 = "1mckrs0rfbrz86wrvachdklfcl0c55a8h7mp5jlk7nc9cbvn280m";
};
meta.homepage = "https://github.com/folke/lsp-colors.nvim/";
};
lsp-format-nvim = buildVimPluginFrom2Nix {
pname = "lsp-format.nvim";
- version = "2022-05-21";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "lsp-format.nvim";
- rev = "a5a54eeb36d7001b4a6f0874dde6afd167319ac9";
- sha256 = "0lj40p9ykj5f0d3sl4g0g0gjbfwx1vm6y5q613zphimpjgs3wl64";
+ rev = "b611bd6cea82ccc127cf8fd781a1cb784b0d6d3c";
+ sha256 = "1sx09l5c8xi9n4nbnmwn7hx0wzsih3kdavgdygjckknjl1261bm1";
};
meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/";
};
@@ -4222,12 +4234,12 @@ final: prev:
lua-dev-nvim = buildVimPluginFrom2Nix {
pname = "lua-dev.nvim";
- version = "2022-09-01";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "folke";
repo = "lua-dev.nvim";
- rev = "d8b800ee7376c9299f14544325a1e76f220fce3d";
- sha256 = "05m6zr4v6xr6pbwigcb7lfxx1167d7nailf8w04sscjr8w2mpv8l";
+ rev = "f511470a61816d0f1347fabfaf10d68d5528e13f";
+ sha256 = "0v5pixghca4n6x7l6aykblc3h6bgys7cwspa3y3yggzhawx2s1p8";
};
meta.homepage = "https://github.com/folke/lua-dev.nvim/";
};
@@ -4258,12 +4270,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2022-08-30";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "18439321965ed6deb849b9a438bd95a16184430d";
- sha256 = "08ndv1dxdng20zp9q18ym82m39rl0f9g26jy63vdvv89hi8mrn30";
+ rev = "4073f821e1c02c7deb50235b4b68ecc5cf0b95e9";
+ sha256 = "0zc4f2ibynp2q9qdaxjw015d1af32fxsm17p78zj9c703c810f23";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -4367,12 +4379,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
- version = "2022-08-28";
+ version = "2022-09-04";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "085baefa6aca44526be621b15e7b688f996c2daf";
- sha256 = "1p7an177rzv7655rw7mkmblrp1vnx983pnlqbcxciz9308b1ys74";
+ rev = "02e22656f1b78aa9f9a678e0ff31b62bbaf0dee6";
+ sha256 = "10zsypp2rbiwhambk6zsfsp0k4c6zzc3cbxvfjvp10da3lqi52na";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@@ -4799,12 +4811,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2022-09-01";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "d4e771d574af2633a59496440161c0196e1c71d7";
- sha256 = "0d3jki67bybyccmpb73f0m660wav69g9xzaxqzskaycmg7x4jrbn";
+ rev = "23c2420a8cbf98414594b9f4a2991d7bf25b5dc9";
+ sha256 = "1hr9aiyy3xsj6amxjb69s2mspdvkwiia3mpb7jsyzq7h5mchm924";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -4835,12 +4847,12 @@ final: prev:
neosnippet-vim = buildVimPluginFrom2Nix {
pname = "neosnippet.vim";
- version = "2022-02-18";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet.vim";
- rev = "5973e801e7ad38a01e888cb794d74e076a35ea9b";
- sha256 = "1mbx2iw4s0ny89siic156y7lwypw55abkvskmzzjjf7y4h8g9rsv";
+ rev = "af18dc963b706568bf28f7dd2facea2ca2784299";
+ sha256 = "130x7nfygwqgwmaly77zp37z3gh16jyjvrb7sk4pg19d5ax8ysbr";
};
meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
};
@@ -4979,12 +4991,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
- version = "2022-08-09";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
- rev = "e2f961859cbfb2ba38147dc59fdd2314992c8b62";
- sha256 = "10m27rm3bcrq38h08p0sxvwxgl0mdjs231rn0bk0mn5myvqq44ja";
+ rev = "83f6ee9e646c803aa14c7293ad7775900f24ea1a";
+ sha256 = "07fi55ilkqmb7xqwk1vd6nkmpfwrpqjnjz8wv8z84h1s3dpcslzx";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@@ -5087,12 +5099,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
- version = "2022-08-30";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "de751688c991216f0d17ced7d5076e0c37fa383f";
- sha256 = "0pqhaai1zrq76la1ys21w89yjfpbb3w5b987jx50j4ip78nk572r";
+ rev = "bb19d790e139713eaddbcd8fd8ee58a23d290bda";
+ sha256 = "0zhfjwrwy6y1wlrv6i8kzvx9w5wq3s1bpm33j63yd0g03havsdll";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -5183,12 +5195,12 @@ final: prev:
nvim-bufdel = buildVimPluginFrom2Nix {
pname = "nvim-bufdel";
- version = "2022-01-07";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "ojroques";
repo = "nvim-bufdel";
- rev = "af537a915b8c60c6dcb6416e0e9382a5bed94bb3";
- sha256 = "1k242j2gzpv82cpccmiai6k50rfmnhxx6kyxbs1h1zwzyb0s2gxz";
+ rev = "1386685ab7ac4f2fe3196ce62e41957d4ffb2ded";
+ sha256 = "1rg3rqkmpzlrwz8g4fwbi86dxhlm4ilm9lp392hadrfkcvhc8cri";
};
meta.homepage = "https://github.com/ojroques/nvim-bufdel/";
};
@@ -5207,12 +5219,12 @@ final: prev:
nvim-cmp = buildVimPluginFrom2Nix {
pname = "nvim-cmp";
- version = "2022-08-31";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
- rev = "b5885696b1f2cbdc9f523cc09c2a786919de07d5";
- sha256 = "15v6b49h0mvn7a12pqpa08knlhjwy69pjl7ksi3qbp4n0bm5zgy8";
+ rev = "913eb8599816b0b71fe959693080917d8063b26a";
+ sha256 = "1jzjp97ggx31wsyvda1h21z74yjd3d58savacnlx4mvkli3zqgm1";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@@ -5303,24 +5315,24 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2022-08-29";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "ea25d6d7877558132e11ee9bcf099bf911cb25ac";
- sha256 = "060k1w95mbk1iz7rh1aczdwy59ms5awq484ssx9r4qkz92v8xldj";
+ rev = "d9b315a81622457cddf6875c6ac7134baa9932ce";
+ sha256 = "1mlvh0p5zhl903drk58pibq58z76s0nw7bnv8an5dlzw2svnbzc4";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
- version = "2022-08-02";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
- rev = "225115ae986b39fdaffaf715e571dd43b3ac9670";
- sha256 = "1ww4hsjbylgi3520rn717pqrpbrwb2p052wpsmdl05104zny2zmj";
+ rev = "ce8894c586e904ce0d00fcae1a7124132810a206";
+ sha256 = "154l60q9p65cxwjx8wmp55waa39f86pn5cbqxm5cnjxjpwgh0gv9";
};
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
};
@@ -5411,12 +5423,12 @@ final: prev:
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
- version = "2022-07-07";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
- rev = "75b20ce89908bc56eeab5c7b4d0a77e9e054d2e4";
- sha256 = "0hyz660mlffgwgmnrxp5h11b121dxszjmsaagnxp5qibnn1gjpll";
+ rev = "9955998345d26459dffb587bbade1ad99a17d216";
+ sha256 = "18nbdq62i7cfsh6k5551ga8711zi67l3bjk7x3byf6ai7ldzsas4";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@@ -5435,12 +5447,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2022-08-18";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "782867324475c451427b7d972f886620da9c5167";
- sha256 = "1rdmd7x9c13dhbvgrbsqn6rzr76xb2dsk3hg35kl0njx1npfp2vr";
+ rev = "774a7714f9dcdfaa8d6d86831809ab941b2b7f26";
+ sha256 = "0qlcn2sdrkwbkjz2kg7rhll830iardlqn8m2w21qq6kfpkyhv4gk";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -5519,12 +5531,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2022-08-30";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "df17834baeba1b8425c15a31cbf52e6b23115c37";
- sha256 = "1jc9grkiwczx0p4yyckjbcsz5kg3qldgi1g3fw8zlbpa2zspajb0";
+ rev = "079581281dc49b8f5cb4880954e646580cb23d5f";
+ sha256 = "1si0piql6sk4fiwqmgyhl8qs0hx252pq8f6y6psvdvq5d7w4g3rg";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -5555,24 +5567,24 @@ final: prev:
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
- version = "2022-08-27";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
- rev = "d7acc07244a5cd4b934083fd91929a47ad69c19e";
- sha256 = "0hhixq3y2sahkz7171wa7i9a8gvjkknfl7k60axfmcv81hnxw621";
+ rev = "b7587a9155d22761f1b28c18f7927e6df0d08387";
+ sha256 = "03jym28bk49609m5k0lw18xir6ia23df4m4av5046zqm9dmvhkj0";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
nvim-neoclip-lua = buildVimPluginFrom2Nix {
pname = "nvim-neoclip.lua";
- version = "2022-07-24";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "AckslD";
repo = "nvim-neoclip.lua";
- rev = "74af02e289b3ea465bc8a4d7b9b83adc4e4b8c06";
- sha256 = "1mh93h1bp4r4w7bm1m3g7758bmsdznna5smid64mry2x4ni002dg";
+ rev = "fbbe56a196bf8409df8cc41ea028210dc8694464";
+ sha256 = "1qr89p677grvr4hfgbhdnsm450p0yw17kji4jsz9qvqf8vjbfln8";
};
meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
};
@@ -5591,12 +5603,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify";
- version = "2022-08-27";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
- rev = "cf5dc4f7095673b8402c51bf80448596d7b97fc6";
- sha256 = "1npkq30720qsz2fgpxdbgwwrpxrrbglvv87yz0mfw442sxfchly9";
+ rev = "7076ce8e8f042e193668b7ac67f776858df5206b";
+ sha256 = "0403zcnwlarh3ixdznmiw9w236cdlf5ycna5606s1rxpqa29604n";
};
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
@@ -5615,12 +5627,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2022-08-18";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "14ce355d357c4b10e7dbf4ecc9c6b3533fa69f9f";
- sha256 = "021psm85gqkdr1ayiqyj85pyhwsrdbcg0jim8pi7ldz5fhai19rl";
+ rev = "c31bfc0effc828191fca7e0bf33bfb97ec856a80";
+ sha256 = "1hdymggdjdb3np2mr1j54hv6w5ys9971pdq655l6a6cd16mn20bp";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -5651,24 +5663,24 @@ final: prev:
nvim-spectre = buildVimPluginFrom2Nix {
pname = "nvim-spectre";
- version = "2022-08-02";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
- rev = "c553eb47ad9d82f8452119ceb6eb209c930640ec";
- sha256 = "0ppzcwv1gywaxi0h81h4rldnbkcjx5lkai3v80x6c199asv0jyc6";
+ rev = "766e3667c49c498afa0821dfcc758cfa6f581f44";
+ sha256 = "0bld77f8xm6fpmv33a17bhzvn8xh5fya6946p7sdlmbsy9125qci";
};
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
nvim-surround = buildVimPluginFrom2Nix {
pname = "nvim-surround";
- version = "2022-08-29";
+ version = "2022-09-04";
src = fetchFromGitHub {
owner = "kylechui";
repo = "nvim-surround";
- rev = "01e17311bddffd65cc191bbefb845dba46780859";
- sha256 = "0hhfmxmcqi0bmrv19jr9qs8751gwg6bpxljjyyasbgd37hp3vgqb";
+ rev = "d91787d5a716623be7cec3be23c06c0856dc21b8";
+ sha256 = "054kpdx7s0pj49yqf5111f1dsfh80js6fxlma1r0mds5q7vw5mav";
};
meta.homepage = "https://github.com/kylechui/nvim-surround/";
};
@@ -5687,36 +5699,36 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
- version = "2022-08-30";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "011a7816b8ea1b3697687a26804535f24ece70ec";
- sha256 = "1rb9ikqc25vy2ivprp98ks3f52s557bpfp93vs3w7ymqqrvc6ag4";
+ rev = "3e49d9b7484e21f0b24ebdf21b8b7af227ea97a6";
+ sha256 = "0vc3yds9ad5rxrc35yi21ax8pw7svbxslyp5pdwn2w0wpjvykad6";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2022-09-01";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "7845f31839b844653736eed6dd284c862156d679";
- sha256 = "11biavpv32xh3ziw5wifav7imibq2m149fsrmhgg4l3ymspkyl0q";
+ rev = "9b13872f19aa97916ba0ae92bac6fb9e2c1dd06d";
+ sha256 = "0ivcnm7vwx1j4rv1bcd6llc7nmrd7k90q72zgahxjjhprsn0v88k";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2022-08-05";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
- rev = "8e88b67d0dc386d6ba1b3d09c206f19a50bc0625";
- sha256 = "1h74h4a69mxyc40nmg4mkaw6gja4hf6mvhrrh3vbh92lfb6k49sc";
+ rev = "82631f666f186dbccb8190bc37a65d7cfab45d16";
+ sha256 = "1niq0wg47gk8lsgsw90sq7kdh35p3f63mwkvwlsa3h4jy5dy9rcy";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@@ -5747,12 +5759,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2022-09-01";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "b2ba68ee777fc1926fc66d533f61071ddba05ee2";
- sha256 = "15bgqk8nqdb69jvccmnlhdyqzhzv46zg2y267qx55as0mcf8pxgn";
+ rev = "e63c2ff8e38fad77299dd74e14c7c9360e1b3181";
+ sha256 = "1f3lkjfb7nh68yd2466fglz5xvzplghq522irfndq8ik5jpwcwbn";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -5783,12 +5795,12 @@ final: prev:
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2022-08-27";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "20cc17b4d2d8a9e3d3fc5db3e5dfe27c73ec016d";
- sha256 = "0adivnmra71jil23k2wd5z9vd0ksr01rj5mqk1ga91mrzh4dqwhs";
+ rev = "c641e224731180371e6a4705762af0c6a882d95e";
+ sha256 = "0lx55j1bz373iqsq77vhhrzjn5l0ilyh7b67y67836y797jigi23";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@@ -5843,12 +5855,12 @@ final: prev:
nvimdev-nvim = buildVimPluginFrom2Nix {
pname = "nvimdev.nvim";
- version = "2022-08-31";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvimdev.nvim";
- rev = "23bfd686ccc71c0b0082c06be90e4513c21f6488";
- sha256 = "1fffdyy9ypfipy7n9mab8bc7ndal145m02a664smi853zkxwh2k7";
+ rev = "6d8f8b756ae22122926476f8f79fdbc19a860333";
+ sha256 = "0y6qvm959qy4cb5hb6zbgd26v3r0z4y7dk2hinhkcxl09jchcwwy";
};
meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
};
@@ -5879,12 +5891,12 @@ final: prev:
octo-nvim = buildVimPluginFrom2Nix {
pname = "octo.nvim";
- version = "2022-08-16";
+ version = "2022-09-02";
src = fetchFromGitHub {
owner = "pwntester";
repo = "octo.nvim";
- rev = "ec869fdf14c9ea7f8ef192f2924e9b30c19f6dae";
- sha256 = "0q6n0g8xyacx3nw1jz1zqgldar9kkc4pj89cfyyjim1nsy83mrvi";
+ rev = "9980b7ddb0b6a11866c539bb63ec511a552a0a43";
+ sha256 = "0v7scsj3qhb9blgimhh59y0g1pgkrpda2r4402q5d26lwgc4vvdf";
};
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
@@ -5915,12 +5927,12 @@ final: prev:
onedark-nvim = buildVimPluginFrom2Nix {
pname = "onedark.nvim";
- version = "2022-08-19";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "navarasu";
repo = "onedark.nvim";
- rev = "551f299d9ab2fd557247aa1995b2831a1237e4ae";
- sha256 = "0pchrlc52jfixy0yya11hv3hmkm818h6siawgy0g4icrh8lan7a7";
+ rev = "7db03a134b392c8fc9e5b8fea85767fc5f7be78f";
+ sha256 = "14b6mc4fdyvyq5fd4j1cmkbgw804dh8zx7k1zkasrip0kvlyv6j8";
};
meta.homepage = "https://github.com/navarasu/onedark.nvim/";
};
@@ -5939,12 +5951,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
- version = "2022-08-28";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
- rev = "74400951f2ef72b1f976ccf037b0c2e38a4ea60e";
- sha256 = "07mysz3il5d18ba7yx0js4drf22qx688mclk4ww057wn9zw697m2";
+ rev = "8f317d97d22322d2461a2be4685ce0cf6bb3901f";
+ sha256 = "11j58pchcw0wq4xhkcbzjnb21f10n24griibi1g2rd79yvchbhhg";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@@ -5999,12 +6011,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
- version = "2022-08-29";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
- rev = "6eee4798d5c3ac4dac5c1c98df254ac3b4058003";
- sha256 = "1zm6fb1gq9pln3lri1bbdba3cx6rz2alwkcx6ns5c6x7rxcp0w8y";
+ rev = "1f103a9b5aa15e420d249afe1a3e086a61570563";
+ sha256 = "0x7595bi4m2v7mchl0mnbx32ly6abz78dby85bnqf1bdlms9s58a";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@@ -6023,12 +6035,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer.nvim";
- version = "2022-09-01";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "b356e3836cfaf27e19874f1b5b81eb227ef161f4";
- sha256 = "0fkx8gc2h9fh172if4x7cq0baizr098g1yzyygf462wfr5ds2anf";
+ rev = "50aeb9060cf64c3c27e6d7b11d7af9e209ed6c3b";
+ sha256 = "1q220ic50m4yfcng7ilgjpx1p3bk0nnc7pkfcb0m692jlwgizch9";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -6131,24 +6143,24 @@ final: prev:
playground = buildVimPluginFrom2Nix {
pname = "playground";
- version = "2022-08-28";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "playground";
- rev = "90d2b3e1729363f96ce2c23f16129534df893bbf";
- sha256 = "1c7i902dzn0adjmf836vrkb89vy748rifwfyjf5mwxgnfhva4vrd";
+ rev = "bcfab84f98a33f2ad34dda6c842046dca70aabf6";
+ sha256 = "0w7ixzq3i3pa0kmf6h9acmmpcb9baq9jh8h1a669b6z6yv2px6qw";
};
meta.homepage = "https://github.com/nvim-treesitter/playground/";
};
plenary-nvim = buildNeovimPluginFrom2Nix {
pname = "plenary.nvim";
- version = "2022-08-26";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "a3dafaa937921a4eb2ae65820c3479ab561e9ba3";
- sha256 = "0n90xnxi6nrwqkkay94j2h3mcbayscmdrxa3qzpiygfsq5dqbjz5";
+ rev = "4b66054e75356ac0b909bbfee9c682e703f535c2";
+ sha256 = "1yl5m7is35bk30swr5m1pcl2i0wf8gjcnas6bpahlxqa4x0yr1x8";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -6269,7 +6281,7 @@ final: prev:
owner = "python-mode";
repo = "python-mode";
rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603";
- sha256 = "0gr4ag5qymdpx0mlfvx743y4s8bjd7v4a0yzd02jvmz3dyylvavw";
+ sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/python-mode/python-mode/";
@@ -6421,12 +6433,12 @@ final: prev:
refactoring-nvim = buildVimPluginFrom2Nix {
pname = "refactoring.nvim";
- version = "2022-08-14";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "theprimeagen";
repo = "refactoring.nvim";
- rev = "e5da743f34340f446761846593a504d162dc0b95";
- sha256 = "1nlyzhg4yw60m9ryjl2lm4mba11c47hhqbdi3wmxff90h91f65jv";
+ rev = "c9ca8e3bbf7218101f16e6a03b15bf72b99b2cae";
+ sha256 = "10b7235ia2klad1vdriw24g4vvjb8lcbw8z878h5hd1q9nryn7bs";
};
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
};
@@ -6541,12 +6553,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools.nvim";
- version = "2022-08-18";
+ version = "2022-09-02";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
- rev = "b696e6dee1e79a53159f1c0472289f5486ac31bc";
- sha256 = "1g049mxwhpa8hl4m1ijnsrjh40y3f0nc4yg6pyy2h5w7mgwx4rs3";
+ rev = "86a2b4e31f504c00715d0dd082a6b8b5d4afbf03";
+ sha256 = "1623d6s05wx2qfcrsfg0avx9cwp0ahz4sbpnp2b3miq7r0nbl7yd";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@@ -6782,12 +6794,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2022-08-28";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "17b5a8e085c13b650dc34c3b81b27374b5ea1439";
- sha256 = "0ssmn8lr4mgi8wcckaym3qnjg3m3l67a5avbsc3yj6igavv7c7mb";
+ rev = "cc3c4b19a58b267492a9bd1b32f7c1af0c4e1c1e";
+ sha256 = "1sgxk31cbiqwmqlxckxsbd69icjw9cwzvbb823imnpvlfp7lbyb6";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@@ -6842,24 +6854,24 @@ final: prev:
specs-nvim = buildVimPluginFrom2Nix {
pname = "specs.nvim";
- version = "2021-11-12";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "edluffy";
repo = "specs.nvim";
- rev = "e043580a65409ea071dfe34e94284959fd24e3be";
- sha256 = "1sg2i99ncx5j7al3mhwpnwyx1hila5gars0ak7q3n9yr4013i7dx";
+ rev = "6fbdb0fe1f57315ffb1ff65ec5293473051431fd";
+ sha256 = "09mw9jz3abgwmk0gqmzrqcp7h602436902jqbfzg74zqs7ap9xgj";
};
meta.homepage = "https://github.com/edluffy/specs.nvim/";
};
spellsitter-nvim = buildVimPluginFrom2Nix {
pname = "spellsitter.nvim";
- version = "2022-07-09";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "spellsitter.nvim";
- rev = "eb74c4b1f4240cf1a7860877423195cec6311bd5";
- sha256 = "0qajg4kjwlwbxjjms580v5aisg1vjid4vbmvzwk6nsfms8nrzn18";
+ rev = "4af8640d9d706447e78c13150ef7475ea2c16b30";
+ sha256 = "1m4y1gfg17gwkq5wwv9n3zv7dqdl7yqvhysgyllg60rzi0g6pwqs";
};
meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/";
};
@@ -6902,12 +6914,12 @@ final: prev:
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin.vim";
- version = "2022-08-01";
+ version = "2022-09-04";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
- rev = "ab9d5cd1fba6d3f1acaf25a1b31d4f6ff961c839";
- sha256 = "1fxx01hwiv5r7z9qv1z162wyq3nnh3dnip8811hvss8baqqz4vy7";
+ rev = "956d67c88512b91c2938da3a9e0aeeea2b82cd0b";
+ sha256 = "0dlsdb42j4d9q1fcw7jfwks6w516xi8ap1v7kip831bh4p6jyl1w";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -7149,7 +7161,7 @@ final: prev:
owner = "codota";
repo = "tabnine-vim";
rev = "e27face391a4d9a3e43ff251010f77deddf0c88d";
- sha256 = "1204ibnsdksihyvnql22sarn2xgqajwvr0d975bnp35n593chymq";
+ sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/codota/tabnine-vim/";
@@ -7325,24 +7337,24 @@ final: prev:
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency.nvim";
- version = "2022-08-13";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
- rev = "6d2db0ee0ca6487bf3fc9eda581e83eaea25cb07";
- sha256 = "0q6kcig52dd2wg6jnv1wajg4dmc6zscv7xdgl8agnilaz8xw92z9";
+ rev = "d51c7631dcc0f598692676f554c4e79d7596d541";
+ sha256 = "03mjzlk28igjjwln61r8g4xz972ps7yfhdxgs4fh3b2m08gqkdnd";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
telescope-fzf-native-nvim = buildVimPluginFrom2Nix {
pname = "telescope-fzf-native.nvim";
- version = "2022-08-10";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-fzf-native.nvim";
- rev = "6791f74e9f08a9412c43dcba805ecf2f8888bdde";
- sha256 = "1fl4k6r71zgqx57hilf92zfjvqdb9znnxd0ymx68b9kqr66bwidx";
+ rev = "65c0ee3d4bb9cb696e262bca1ea5e9af3938fc90";
+ sha256 = "0nyvhlalrgg6n793lp3yrxgszv5j0ln9sjbh45pxxg0wn15jxm45";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";
};
@@ -7494,12 +7506,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim";
- version = "2022-08-27";
+ version = "2022-09-04";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "b923665e64380e97294af09117e50266c20c71c7";
- sha256 = "0iwlmr94kdr1xwsn2l7ryxx7x1cicpbk86flxzza6877dmig226w";
+ rev = "2584ff391b528d01bf5e8c04206d5902a79ebdde";
+ sha256 = "1z06vp94xc4ircpkv71s5zq1ck3azgc17p3ys34jxw67nnfmhqr5";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -7638,12 +7650,12 @@ final: prev:
todo-comments-nvim = buildVimPluginFrom2Nix {
pname = "todo-comments.nvim";
- version = "2022-01-19";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "folke";
repo = "todo-comments.nvim";
- rev = "98b1ebf198836bdc226c0562b9f906584e6c400e";
- sha256 = "02qjn45qpvxhw7zifw0a86alika5r8b5a98y1199jpdx2d7zks7j";
+ rev = "a57b18c8b3fe9340d48585371df2c793fff417a7";
+ sha256 = "0f48kzxib63v9m8i95acx7r6hvfc0b2rmdpp87dv3lmpq1gkhcay";
};
meta.homepage = "https://github.com/folke/todo-comments.nvim/";
};
@@ -7675,24 +7687,24 @@ final: prev:
toggleterm-nvim = buildVimPluginFrom2Nix {
pname = "toggleterm.nvim";
- version = "2022-09-01";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "akinsho";
repo = "toggleterm.nvim";
- rev = "b402342665ee06e127c304e245f03143357a58c4";
- sha256 = "1q9pw0sp5qg596571yfcbq4mfrylrsrr968s35yvbgnsw4fw1d2w";
+ rev = "5e393e558f7c41d132542c8e9626aa824a1caa59";
+ sha256 = "0scbyj1z48c35a194h5v1q1z3l6j9zsl3izflynanajdbjzxgxny";
};
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
};
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
- version = "2022-09-01";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
- rev = "791c2a219a9425a5817fafc2dd2dcf65c4a0abde";
- sha256 = "0hp95fsh0ld6icw5dmj45w1a9f1j39z64bzshw3vqj7w2d86q87m";
+ rev = "54cf70dbd19acd7c32cc12bb743fec17eaf6fef5";
+ sha256 = "08fzm5xwb4wdawyqpy3fl1l40rv4gkj0xnqablm525170fnfbb30";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@@ -7747,12 +7759,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble.nvim";
- version = "2022-05-09";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
- rev = "da61737d860ddc12f78e638152834487eabf0ee5";
- sha256 = "1aa45r9z8mghak8f5gymhm875rssi1afs92h0mpnn43y0j76xy31";
+ rev = "929315ea5f146f1ce0e784c76c943ece6f36d786";
+ sha256 = "07nyhg5mmy1fhf6v4480wb8gq3dh7g9fz9l5ksv4v94sdp5pgzvz";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@@ -7795,12 +7807,12 @@ final: prev:
twilight-nvim = buildVimPluginFrom2Nix {
pname = "twilight.nvim";
- version = "2021-08-06";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "folke";
repo = "twilight.nvim";
- rev = "8ab43c0fdc246fdd82382d7ef4ec383f8f755ef9";
- sha256 = "0fh752l53yk3bnas07kds7vhmdnxrbslq126qdyqb6f1xgzb9gjj";
+ rev = "1ffa6a4d89fb2fbb784c6674044bf54f1fca936f";
+ sha256 = "1aw1my5a2xz35j4v7kgq78mgh3g6clkxwahcyzqj9355zryxha5g";
};
meta.homepage = "https://github.com/folke/twilight.nvim/";
};
@@ -7939,12 +7951,12 @@ final: prev:
vifm-vim = buildVimPluginFrom2Nix {
pname = "vifm.vim";
- version = "2022-08-29";
+ version = "2022-09-04";
src = fetchFromGitHub {
owner = "vifm";
repo = "vifm.vim";
- rev = "9f1e597cefaba008474a03b57595eb895b5f0095";
- sha256 = "0vb2l7sh9zjhny7vrg453b6msm50v2cs1l76qqpf5kdfzqcnglcm";
+ rev = "2c553b3e75393c1c7fed833106c7cbe4d744a24d";
+ sha256 = "1b8z6y2g946d2v9w1f7wxssf0yi25fz6m2s55ag1kx52jfld02ld";
};
meta.homepage = "https://github.com/vifm/vifm.vim/";
};
@@ -8275,12 +8287,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2022-08-25";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "f5a6597496506da19d8177f4efc569e4971d0b74";
- sha256 = "1dhw68hjwnsaim598rjn7zcqmihc8zasskmgll94gh8w9qj2p61q";
+ rev = "2cea8346cfaf0d92da079c27708bec7c092cef84";
+ sha256 = "01lrymsr65yc2565frgnysdi7qq0320zd5klkjsvz8kp5p5mj57v";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -9211,12 +9223,12 @@ final: prev:
vim-erlang-runtime = buildVimPluginFrom2Nix {
pname = "vim-erlang-runtime";
- version = "2021-11-25";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "vim-erlang";
repo = "vim-erlang-runtime";
- rev = "abb5ff4de17aa0add2afedaa478e06ede6ba2baf";
- sha256 = "1zspw3p00b31x97if1hmmgvxmv6yzky4q4y16qckwn838yjarlhn";
+ rev = "5f576e08a4a9cd54e4b11a3c240d4b7fae05d380";
+ sha256 = "0rm3r7llaqr8w6kd4kr52pl2g32i608z25w925f38sfr5b8acc53";
};
meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/";
};
@@ -9355,12 +9367,12 @@ final: prev:
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2022-06-11";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "e3f2d94d722603f8b65088ea1d7e0329951985bd";
- sha256 = "0d7r5g1wrcbq6ahd3hbwpjw54qk8k471wm704cmpdlgfjbjxdfqf";
+ rev = "d3ac089c66c728ffcd2ed55a71f80dfa314d2632";
+ sha256 = "1x46y782q1nb9sa6y4n687pgjhwbv88k6c5yv536bd6dz1s4jmhr";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -9427,12 +9439,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2022-08-17";
+ version = "2022-09-04";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "b411b753f805b969cca856e2ae51fdbab49880df";
- sha256 = "0bcq71hfy08q4lq83rcrwpg7jkq0aszcbaqnjhphvg8wja5q30dm";
+ rev = "dd8107cabf5fe85df94d5eedcae52415e543f208";
+ sha256 = "19xrmyrqfxsx7damlbl0dd5dsr75jinmssvpvnamixzjzq6jyfr3";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -9571,12 +9583,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2022-08-12";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "4d6962d8e0792617f87b37b938996f44e2a54645";
- sha256 = "09jn9hvklhj8q83sxdrkbj5vdfyshh6268vxhm2kbdg5885jkjqw";
+ rev = "22b2273cfe562ac1c1af976ce77f18a3b1776f3c";
+ sha256 = "0vhyz67shgl8bpp07q4r808fas83xa86kl4jh5qkyfvxd95nrrm9";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -9872,12 +9884,12 @@ final: prev:
vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate";
- version = "2022-08-25";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-illuminate";
- rev = "9179f9cb3d7a97c5724d215c671b6eb578e63520";
- sha256 = "07jknq7siz3wpw0lccp05z1is640v0cqkbx7wdx6sgfnyxpq9pfh";
+ rev = "1c8132dc81078fc1ec7a4a1492352b8f541ee84b";
+ sha256 = "01h8z0d0dkj7bgdvd4xymix2hgj7z5963nynafgb3prq94j0njbv";
};
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
};
@@ -10245,12 +10257,12 @@ final: prev:
vim-llvm = buildVimPluginFrom2Nix {
pname = "vim-llvm";
- version = "2022-05-03";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "rhysd";
repo = "vim-llvm";
- rev = "ac3fbdd79b0f5bd68049d38a4901e43a93d4cfd0";
- sha256 = "1nzmyd2fh2rfxqi87pgdx40xxq7b16izgi57fib8fpywcw26s2ga";
+ rev = "acad2bd168778545972d6eef58560376869da373";
+ sha256 = "0cjg5dpv68k6cji3k1qjwg24ghadbxzkcfq8i2a3cs18pchmr18x";
};
meta.homepage = "https://github.com/rhysd/vim-llvm/";
};
@@ -10414,12 +10426,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2022-08-27";
+ version = "2022-09-02";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "5aa3e58db430bf158f7bd0f64387a1f66c43fa7c";
- sha256 = "015a8a81nfzi178sqcdy4593n7baz18dynndypknq1h46p1d5cii";
+ rev = "9aa08cd0bf1e2e9d342fa0fdb816a1b5c95420a8";
+ sha256 = "1jjxfhkxz9jmhg7lgf63cs6ichqp1jsric13lgcwqsspp0hxv3wq";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -10966,12 +10978,12 @@ final: prev:
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
- version = "2022-08-17";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
- rev = "d94d234548a8fd6fa686812848f377f1419dafa1";
- sha256 = "1jyx46iddxhsb0nhbg5snj6x0snlmp1nv4m86n3afsz1y4371g9g";
+ rev = "b6739f358b60b7a5590c7a59e49b2305d23f1242";
+ sha256 = "14fpa2z4cpb7if1wf4xkn7zqydhf7iz531lv3y5kvx3hp0yh02qi";
};
meta.homepage = "https://github.com/junegunn/vim-plug/";
};
@@ -11602,12 +11614,12 @@ final: prev:
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2022-08-31";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "a6d2976f05cf31da5f4ebceb4b6f9fe2e0ec7c34";
- sha256 = "0rnqm7l264h6x6jf9644jk168bphnhpb3dbfymgpz8613psh7fza";
+ rev = "2058ac6d2da18ee06cad6513f9c5c2d211f03493";
+ sha256 = "0rwwgygzxd3slkf41vm06zmznwakc9wsl01gayfmc2hgd77pwgbg";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -11843,12 +11855,12 @@ final: prev:
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2022-08-31";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "7401804603e074ae65f19d16daf312369b153028";
- sha256 = "0kf67vayak8xqy0fykqxx9zkavf54vf4y7bsm42zf9ad1havhacy";
+ rev = "7118e9f98392b902b220a7424de13d0e0becc2c1";
+ sha256 = "1p9kqwpvr35csq75xrq9ih72q97iqhm18ci6myclc9ihrcgmdlg5";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -12023,12 +12035,12 @@ final: prev:
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2022-08-28";
+ version = "2022-09-04";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "549f99d06e61964dc54f53f3de80925885726cce";
- sha256 = "0vaarhnqnrj7myh6sjd99dp8klcw8zsqlwc8mc6lvcyl9yns95iy";
+ rev = "6a2dc6b3851f119fdf785a6c67c14816c46bd630";
+ sha256 = "0n00aja4qjbkdba7848clm4k44a5df4j72awh106qpkp2gqrw89y";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -12528,24 +12540,24 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2022-08-31";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "aa52fa6b2711347a8d3b364d2e64f608207d8710";
- sha256 = "00gih8v5f2mjmzmsns0prw00b4izx0pl08h47hln7ljjfq5v8npn";
+ rev = "6912f73ed0c7f032150578461379e538752c0a89";
+ sha256 = "0wprhz9mda982pqkg5jjywyz6ap4xi8w1jcvl6918jxagxa7hx6x";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
vimux = buildVimPluginFrom2Nix {
pname = "vimux";
- version = "2021-08-15";
+ version = "2022-09-03";
src = fetchFromGitHub {
owner = "preservim";
repo = "vimux";
- rev = "89604a4464c3069dbe31f7bc8dd16a5fbc88a303";
- sha256 = "1lr7zqza29xxwbki9fgfazrak6ybyvm1a782kbs3v3zip10xmm3x";
+ rev = "740320b798106c5de6758fb35bf39e79ee1ce0f0";
+ sha256 = "1d7ixi6whxk1p31wd2n2cvhqyyfl9cfcjm6lv43n8fjwr9sw12ic";
};
meta.homepage = "https://github.com/preservim/vimux/";
};
@@ -12624,12 +12636,12 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key.nvim";
- version = "2022-05-04";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
- rev = "bd4411a2ed4dd8bb69c125e339d837028a6eea71";
- sha256 = "0vf685xgdb967wmvffk1pfrvbhg1jkvzp1kb7r0vs90mg8gpv1aj";
+ rev = "439637d6a75fe27e369190df7910ed2a454109f6";
+ sha256 = "1xhcwnsk4s6ay00w8vicdjh93nrjd0n4sd46m0j6ihwvyc9gfz24";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
@@ -12660,12 +12672,12 @@ final: prev:
winshift-nvim = buildVimPluginFrom2Nix {
pname = "winshift.nvim";
- version = "2022-06-29";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "sindrets";
repo = "winshift.nvim";
- rev = "9e884748f2857c4ba05e5ee9521dd9a576e22083";
- sha256 = "19n5zp87qmdyz6rshxfp0j150d4sv76aicz08yv8jzsyjkaqrcxw";
+ rev = "37468ed6f385dfb50402368669766504c0e15583";
+ sha256 = "02qa8phsbqvm9c5h27ijf0vfaq3d3k65jz0x1xjn87cwvdly8vcr";
};
meta.homepage = "https://github.com/sindrets/winshift.nvim/";
};
@@ -12720,12 +12732,12 @@ final: prev:
xptemplate = buildVimPluginFrom2Nix {
pname = "xptemplate";
- version = "2022-06-10";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "drmingdrmer";
repo = "xptemplate";
- rev = "d8500403b35d5597441773074e3976238b5e8b2c";
- sha256 = "0dpdzx46rrwq9i2rymn0if7ci9h2b5hmdxqfw0dmdiyn1byj2wph";
+ rev = "0c122d20d202201787952fe76e518c287dbd684d";
+ sha256 = "0y8b46kxyjf2sfqj69yklba2lcgv7b1c4y3nm2xjn2h0xifb0n0w";
};
meta.homepage = "https://github.com/drmingdrmer/xptemplate/";
};
@@ -12769,12 +12781,12 @@ final: prev:
zen-mode-nvim = buildVimPluginFrom2Nix {
pname = "zen-mode.nvim";
- version = "2021-11-07";
+ version = "2022-09-05";
src = fetchFromGitHub {
owner = "folke";
repo = "zen-mode.nvim";
- rev = "f1cc53d32b49cf962fb89a2eb0a31b85bb270f7c";
- sha256 = "1fxkrny1xk69w8rlmz4x5msvqb8i8xvvl9csndpplxhkn8wzirdp";
+ rev = "6f5702db4fd4a4c9a212f8de3b7b982f3d93b03c";
+ sha256 = "04i8d7dlxmzgxiysy9jffxkpkw8h3qjkrv3l74z7pfksdmhlbbwz";
};
meta.homepage = "https://github.com/folke/zen-mode.nvim/";
};
@@ -12793,12 +12805,12 @@ final: prev:
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2022-06-22";
+ version = "2022-09-02";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "1eea36117a8ca4f3250c0223e78a690cdc720f9e";
- sha256 = "1bizvz1h7dqjplf2fs3w6syn5g3a1n2j84caf6saidr36h6irrns";
+ rev = "20c8c936b21ec62a1ada559c815d665576efbbaf";
+ sha256 = "0yhszw2nklxjd1hn3aj72zshrn7lmfng4gsmzlv8kfkid9z4mjjl";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
@@ -12853,12 +12865,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
- version = "2022-09-01";
+ version = "2022-09-07";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
- rev = "ddae70a80590dc3ee1c2605010abd82c615c1172";
- sha256 = "1jh9h18bgxy68wd2fw3q9vxjgnlh8653528qbwzdwrjlvwsz0qdf";
+ rev = "83b3d877dfb54d100f3f6100c2b07a5b54219cff";
+ sha256 = "0hy2s7dcazma427p2w3w23fyikx4yk5kl75d0gbpxlm62c28szdy";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@@ -12877,12 +12889,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
- version = "2022-09-01";
+ version = "2022-09-08";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "75d9335bd79bf9de6fdde974083ae7edb16d8190";
- sha256 = "1d92vj2vmnz881gqn10za5jbs47rlslkpfvbz6a5nmyjphz8fx06";
+ rev = "cf860979edc4e5a6d29041f053dd99cc81667c05";
+ sha256 = "0wc46cr0jlr6djap17rj69vwx65dafwv4dr94zm9shq9k75cla2i";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -12949,12 +12961,12 @@ final: prev:
rose-pine = buildVimPluginFrom2Nix {
pname = "rose-pine";
- version = "2022-08-14";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "rose-pine";
repo = "neovim";
- rev = "0f3ea8162459da82440c22ce0c9b0562e53f6a10";
- sha256 = "0rv0f9c38h4lz1h3dq44v08qm8awknfxclrwb0k664xbsk1d9w97";
+ rev = "f739adcaf81ee8cba04b67d287b231c70416b779";
+ sha256 = "0hdnlriy3rsv628jfxy59a19dav75wigmyk7dmsb95861fysr2wa";
};
meta.homepage = "https://github.com/rose-pine/neovim/";
};
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 59174fc69ed8..db0128b83bc2 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -257,6 +257,10 @@ self: super: {
'';
});
+ compiler-explorer-nvim = super.compiler-explorer-nvim.overrideAttrs (old: {
+ dependencies = with self; [ plenary-nvim ];
+ });
+
completion-buffers = super.completion-buffers.overrideAttrs (old: {
dependencies = with self; [ completion-nvim ];
});
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 726ef1447eba..c900a9865dca 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -155,6 +155,7 @@ https://github.com/hrsh7th/compe-conjure/,,
https://github.com/GoldsteinE/compe-latex-symbols/,,
https://github.com/tzachar/compe-tabnine/,,
https://github.com/tamago324/compe-zsh/,,
+https://github.com/krady21/compiler-explorer.nvim/,HEAD,
https://github.com/steelsojka/completion-buffers/,,
https://github.com/nvim-lua/completion-nvim/,,
https://github.com/aca/completion-tabnine/,,
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 1080f56ebe91..e755b708a063 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
- version = "20.2.3";
+ version = "20.3.0";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
- sha256 = "sha256-O/gzXAzvaYJXpexjBSc6jNW1wX0ukwQcpFU8fq4qM4k=";
+ sha256 = "bfcd363f549ce8dc13ae2287cec5099e4bf1d0d4b6f8deef40a81279f78817e1";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix
index f54aef75ac15..b6e03baace81 100644
--- a/pkgs/applications/graphics/pixinsight/default.nix
+++ b/pkgs/applications/graphics/pixinsight/default.nix
@@ -128,6 +128,7 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.sheepforce ];
+ hydraPlatforms = [];
mainProgram = "PixInsight";
};
}
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 87aeff1f912a..51994c2868dd 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,7 +1,7 @@
{
stdenv, mkDerivation, lib,
extra-cmake-modules, kdoctools,
- breeze-icons, chmlib ? null, discount, djvulibre, ebook_tools, kactivities,
+ breeze-icons, chmlib, discount, djvulibre, ebook_tools, kactivities,
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts,
kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler,
@@ -16,8 +16,8 @@ mkDerivation {
kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet
kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
- qtdeclarative qtsvg threadweaver kcrash qtspeech
- ] ++ lib.optional (!stdenv.isAarch64) chmlib;
+ qtdeclarative qtsvg threadweaver kcrash qtspeech chmlib
+ ];
# InitialPreference values are too high and end up making okular
# default for anything considered text/plain. Resetting to 1, which
diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix
index ebed42852b70..44a1f79e5b81 100644
--- a/pkgs/applications/misc/genact/default.nix
+++ b/pkgs/applications/misc/genact/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "genact";
- version = "0.12.0";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ouDaOs72vivJBZVwcJhv4YoPKQOEBctUTqubvrpoBtI=";
+ sha256 = "sha256-sKFI7r0mwmzKiHy9HmskS10M5v/jZj/VeO4F9ZQl2g0=";
};
- cargoSha256 = "sha256-csubycZaBUHPp8XJ1C+nWw7DzVGVJm38/Dgw41qUMYQ=";
+ cargoSha256 = "sha256-79IC51xdkelgsRJF+rz9UOTfrJ/HS6PbkyxySe0Qk4Q=";
meta = with lib; {
description = "A nonsense activity generator";
diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/applications/misc/gnome-frog/default.nix
index 4841a3b15091..ab6b992d5d1c 100644
--- a/pkgs/applications/misc/gnome-frog/default.nix
+++ b/pkgs/applications/misc/gnome-frog/default.nix
@@ -22,13 +22,13 @@
python3Packages.buildPythonApplication rec {
pname = "gnome-frog";
- version = "1.1.3";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "TenderOwl";
repo = "Frog";
- rev = version;
- sha256 = "sha256-yOjfiGJUU25zb/4WprPU59yDAMpttS3jREp1kB5mXUE=";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-AJ6pFtTM4ViZ9dB41wzHoPSHDdmu+SOzD5fkoAiRLzQ=";
};
format = "other";
diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix
new file mode 100644
index 000000000000..ed80e5d5af0e
--- /dev/null
+++ b/pkgs/applications/misc/rofi-bluetooth/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, rofi-unwrapped
+, bluez
+}:
+
+stdenv.mkDerivation rec {
+ pname = "rofi-bluetooth";
+ version = "unstable-2021-03-05";
+
+ src = fetchFromGitHub {
+ owner = "nickclyde";
+ repo = "rofi-bluetooth";
+ # https://github.com/nickclyde/rofi-bluetooth/issues/19
+ rev = "893db1f2b549e7bc0e9c62e7670314349a29cdf2";
+ sha256 = "sha256-3oROJKEQCuSnLfbJ+JSSc9hcmJTPrLHRQJsrUcaOMss=";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ install -D --target-directory=$out/bin/ ./rofi-bluetooth
+
+ wrapProgram $out/bin/rofi-bluetooth \
+ --prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped bluez ] }
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Rofi-based interface to connect to bluetooth devices and display status info";
+ homepage = "https://github.com/nickclyde/rofi-bluetooth";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ MoritzBoehme ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix
index b67122965234..174b95df67bb 100644
--- a/pkgs/applications/misc/sway-launcher-desktop/default.nix
+++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix
@@ -37,6 +37,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.thehedgeh0g ];
- mainProgram = "${pname}";
};
}
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 79d23bfca362..359b0a026c98 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -32,15 +32,15 @@
}
},
"dev": {
- "version": "106.0.5249.21",
- "sha256": "0d3ha2r54sjx1rhaas0mrgk2dl4xvgb83r5pbq9qzh52z43ynmlv",
- "sha256bin64": "0bawgqjkpllqif0jaah43vys57c9y8w7a5rjn35bxlmjrfmfwhwc",
+ "version": "107.0.5286.2",
+ "sha256": "111dk9qdxbad2agvnh8ijb18ip9vw32gdfxajqkrlqgcmmj61vsz",
+ "sha256bin64": "0l19ylpcrnzqj2imlhl13h0f5773znwx6h4xjzrac2z2lxkzmkmk",
"deps": {
"gn": {
- "version": "2022-08-11",
+ "version": "2022-08-31",
"url": "https://gn.googlesource.com/gn",
- "rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a",
- "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
+ "rev": "00b741b1568d56cf4e117dcb9f70cd42653b4c78",
+ "sha256": "0vi9gigzdyji8fql8k8sv1v5z0icjph8awz49xidn26bvly6526g"
}
}
},
diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix
index 0335350ec890..ca4c7139adba 100644
--- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix
+++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "argocd-autopilot";
- version = "0.4.6";
+ version = "0.4.7";
src = fetchFromGitHub {
owner = "argoproj-labs";
repo = "argocd-autopilot";
rev = "v${version}";
- sha256 = "sha256-qlxs0dafmGbJdsBgFJGpaEkcKVyOoSeiQknqzJwUs8A=";
+ sha256 = "sha256-aC3U9Qeahji3xSuJWuMlf2TzKEqPDAOuB52A4Om/fRU=";
};
vendorSha256 = "sha256-ujDtfDL1VWe4XjTHD+pXMmMFp0AiuZcE+CKRkMsiv9Q=";
diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix
index 30ae4f468f8c..75effcdc8ff5 100644
--- a/pkgs/applications/networking/cluster/glooctl/default.nix
+++ b/pkgs/applications/networking/cluster/glooctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "glooctl";
- version = "1.12.11";
+ version = "1.12.12";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
- hash = "sha256-vG1FSBHXaJBJk9dC61yZK1Vkr8PyQ7Q4TVZWRIsDY3E=";
+ hash = "sha256-aQUN1T6AH1TRj2pPkNFoS5Fmo3NPmmiEXFZfFeXtN1w=";
};
subPackages = [ "projects/gloo/cli/cmd" ];
diff --git a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix
index e273127559b8..f1b8b0a9e9c7 100644
--- a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix
@@ -23,14 +23,14 @@
stdenv.mkDerivation rec {
pname = "fractal-next";
- version = "unstable-2022-07-21";
+ version = "unstable-2022-09-09";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "fractal";
- rev = "d076bd24419ac6172c2c1a7cc023a5dca938ef07";
- hash = "sha256-2bS6PZuMbR/VgSpMD31sQR4ZkhWNu1CLSl6MX0f/m5A=";
+ rev = "5f0a4b48a745ccce202d14e7d02e14f51598fb42";
+ hash = "sha256-7s2ytHpM5pZ0dhnVMA8KDWIBaSWds7t9GB6Wav+0dQA=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/applications/science/biology/mafft/default.nix
index 7b1a3c68072c..19d0d93c58df 100644
--- a/pkgs/applications/science/biology/mafft/default.nix
+++ b/pkgs/applications/science/biology/mafft/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchFromGitLab }:
stdenv.mkDerivation rec {
pname = "mafft";
- version = "7.505";
+ version = "7.508";
- src = fetchurl {
- url = "https://mafft.cbrc.jp/alignment/software/mafft-${version}-with-extensions-src.tgz";
- sha256 = "sha256-9Up4Zw/NmWAjO8w7PdNZ85WnHAztRae+HP6uGZUM5v8=";
+ src = fetchFromGitLab {
+ owner = "sysimm";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-XQllmTgLntCBUFJzV2HL4f4oMilcUVTRgcfeZBdD5c0=";
};
preBuild = ''
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index 1de21e09f806..4ccf01d0ec6f 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -1,17 +1,20 @@
-{ lib, stdenv, fetchurl, dune_2, ocamlPackages }:
+{ lib, stdenv, fetchFromGitLab, dune_2, ocamlPackages }:
stdenv.mkDerivation {
pname = "acgtk";
- version = "1.5.2";
+ version = "1.5.4";
- src = fetchurl {
- url = "https://acg.loria.fr/software/acg-1.5.2-20201204.tar.gz";
- sha256 = "09yax7dyw8kgwzlb69r9d20y7rrymzwi3bbq2dh0qdq01vjz2xwq";
+ src = fetchFromGitLab {
+ domain = "gitlab.inria.fr";
+ owner = "acg";
+ repo = "dev/acgtk";
+ rev = "8e630b6d91bad022bd1d1a075e7768034065c428";
+ sha256 = "sha256-W/BDhbng5iYuiB7desMKvRtDFdhoaxiJNvNvtbLlA6E=";
};
buildInputs = [ dune_2 ] ++ (with ocamlPackages; [
- ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime yojson
+ ocaml findlib ansiterminal cairo2 cmdliner_1_1 fmt logs menhir menhirLib mtime sedlex yojson
]);
buildPhase = "dune build --profile=release";
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 0d045c882864..74f27fa534e2 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -95,11 +95,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- # disable stackprotector on aarch64-darwin for now
- # https://github.com/NixOS/nixpkgs/issues/158730
- # see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue
- hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
-
setupHook = ./setup-hook.sh;
meta = with lib; {
diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix
index b504cc67cd4b..2bbb39804ff7 100644
--- a/pkgs/applications/science/math/qalculate-qt/default.nix
+++ b/pkgs/applications/science/math/qalculate-qt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-qt";
- version = "4.2.0";
+ version = "4.3.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-qt";
rev = "v${version}";
- sha256 = "sha256-7H1nQLJBiuTj/GwojfOPpRbDseOHvLa94LK+bXvLhws=";
+ sha256 = "sha256-zznLCTbHX7VDMgW3b709snxSEtoF8k4xJBk3MdgFPNk=";
};
nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ];
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index abc8bd634f72..73a55554d618 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
{
- "version": "15.3.2",
- "repo_hash": "sha256-MZ8sDfJh2sw+Tu5LPcH5JjznTSwfDj/3vmaGC+K8ZeY=",
+ "version": "15.3.3",
+ "repo_hash": "sha256-cgFy119/ZAUc/mBVAwZ5t5H2Z2+i5EJI9Q1KYtB2MJo=",
"yarn_hash": "1s2xai0q16xhp3q68hf9mxh1v429h4n5qy1iizdi7a5cmg3p3ldq",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v15.3.2-ee",
+ "rev": "v15.3.3-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "15.3.2",
+ "GITALY_SERVER_VERSION": "15.3.3",
"GITLAB_PAGES_VERSION": "1.62.0",
"GITLAB_SHELL_VERSION": "14.10.0",
- "GITLAB_WORKHORSE_VERSION": "15.3.2"
+ "GITLAB_WORKHORSE_VERSION": "15.3.3"
},
"vendored_gems": [
"devise-pbkdf2-encryptable",
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 86a98488c048..bf3fcb28394d 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -11,7 +11,7 @@ let
gemdir = ./.;
};
- version = "15.3.2";
+ version = "15.3.3";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-7OAB+oHY7OBCZ4rjiS+qQIPtpYRFS8xqOkUjgWj+Qp8=";
+ sha256 = "sha256-JapesdZbEjGsiR9o1J/exkqlV6Y9a69PVVPS22AaJG0=";
};
vendorSha256 = "sha256-aPCcTS5zflpjzb2L/oDOQotdL8cFsgKPa8b+lhCpbag=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 7ba6f1aee113..f17937e4cdff 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
- version = "15.3.2";
+ version = "15.3.3";
src = fetchFromGitLab {
owner = data.owner;
diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile
index 3b1ac09c8a4c..3b22a9d50743 100644
--- a/pkgs/applications/version-management/redmine/Gemfile
+++ b/pkgs/applications/version-management/redmine/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
ruby '>= 2.4.0', '< 2.8.0'
gem 'bundler', '>= 1.12.0'
-gem 'rails', '5.2.6.3'
+gem 'rails', '5.2.8'
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
gem 'rouge', '~> 3.26.0'
@@ -14,7 +14,13 @@ gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0')
gem 'marcel'
gem "mail", "~> 2.7.1"
gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
-gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')
+gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0')
+ '~> 1.10.10'
+ elsif Gem.ruby_version < Gem::Version.new('2.6.0')
+ '~> 1.12.5'
+ else
+ '~> 1.13.6'
+ end)
gem 'i18n', '~> 1.8.2'
gem "rbpdf", "~> 1.20.0"
gem 'addressable'
diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index 2643918716af..5ad1b80d3c77 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (5.2.6.3)
- actionpack (= 5.2.6.3)
+ actioncable (5.2.8)
+ actionpack (= 5.2.8)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailer (5.2.6.3)
- actionpack (= 5.2.6.3)
- actionview (= 5.2.6.3)
- activejob (= 5.2.6.3)
+ actionmailer (5.2.8)
+ actionpack (= 5.2.8)
+ actionview (= 5.2.8)
+ activejob (= 5.2.8)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.2.6.3)
- actionview (= 5.2.6.3)
- activesupport (= 5.2.6.3)
+ actionpack (5.2.8)
+ actionview (= 5.2.8)
+ activesupport (= 5.2.8)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
@@ -21,32 +21,32 @@ GEM
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
- actionview (5.2.6.3)
- activesupport (= 5.2.6.3)
+ actionview (5.2.8)
+ activesupport (= 5.2.8)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.2.6.3)
- activesupport (= 5.2.6.3)
+ activejob (5.2.8)
+ activesupport (= 5.2.8)
globalid (>= 0.3.6)
- activemodel (5.2.6.3)
- activesupport (= 5.2.6.3)
- activerecord (5.2.6.3)
- activemodel (= 5.2.6.3)
- activesupport (= 5.2.6.3)
+ activemodel (5.2.8)
+ activesupport (= 5.2.8)
+ activerecord (5.2.8)
+ activemodel (= 5.2.8)
+ activesupport (= 5.2.8)
arel (>= 9.0)
- activestorage (5.2.6.3)
- actionpack (= 5.2.6.3)
- activerecord (= 5.2.6.3)
+ activestorage (5.2.8)
+ actionpack (= 5.2.8)
+ activerecord (= 5.2.8)
marcel (~> 1.0.0)
- activesupport (5.2.6.3)
+ activesupport (5.2.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
arel (9.0.0)
ast (2.4.2)
builder (3.2.4)
@@ -66,13 +66,13 @@ GEM
addressable
csv (3.1.9)
docile (1.4.0)
- erubi (1.10.0)
+ erubi (1.11.0)
globalid (1.0.0)
activesupport (>= 5.0)
htmlentities (4.3.4)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
- loofah (2.16.0)
+ loofah (2.18.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@@ -81,48 +81,52 @@ GEM
method_source (1.0.0)
mini_magick (4.11.0)
mini_mime (1.0.3)
- minitest (5.15.0)
- mocha (1.13.0)
- mysql2 (0.5.3)
- net-ldap (0.17.0)
+ mini_portile2 (2.8.0)
+ minitest (5.16.3)
+ mocha (1.14.0)
+ mysql2 (0.5.4)
+ net-ldap (0.17.1)
nio4r (2.5.8)
- nokogiri (1.11.7)
+ nokogiri (1.13.8)
+ mini_portile2 (~> 2.8.0)
+ racc (~> 1.4)
+ nokogiri (1.13.8-x86_64-linux)
racc (~> 1.4)
parallel (1.22.1)
- parser (3.1.2.0)
+ parser (3.1.2.1)
ast (~> 2.4.1)
pg (1.2.3)
- public_suffix (4.0.7)
- puma (5.6.4)
+ public_suffix (5.0.0)
+ puma (5.6.5)
nio4r (~> 2.0)
racc (1.6.0)
- rack (2.2.3)
+ rack (2.2.4)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
- rack-test (1.1.0)
- rack (>= 1.0, < 3)
- rails (5.2.6.3)
- actioncable (= 5.2.6.3)
- actionmailer (= 5.2.6.3)
- actionpack (= 5.2.6.3)
- actionview (= 5.2.6.3)
- activejob (= 5.2.6.3)
- activemodel (= 5.2.6.3)
- activerecord (= 5.2.6.3)
- activestorage (= 5.2.6.3)
- activesupport (= 5.2.6.3)
+ rack-test (2.0.2)
+ rack (>= 1.3)
+ rails (5.2.8)
+ actioncable (= 5.2.8)
+ actionmailer (= 5.2.8)
+ actionpack (= 5.2.8)
+ actionview (= 5.2.8)
+ activejob (= 5.2.8)
+ activemodel (= 5.2.8)
+ activerecord (= 5.2.8)
+ activestorage (= 5.2.8)
+ activesupport (= 5.2.8)
bundler (>= 1.3.0)
- railties (= 5.2.6.3)
+ railties (= 5.2.8)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
- rails-html-sanitizer (1.4.2)
+ rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
- railties (5.2.6.3)
- actionpack (= 5.2.6.3)
- activesupport (= 5.2.6.3)
+ railties (5.2.8)
+ actionpack (= 5.2.8)
+ activesupport (= 5.2.8)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@@ -145,7 +149,7 @@ GEM
roadie (>= 3.1, < 5.0)
rotp (6.2.0)
rouge (3.26.1)
- rqrcode (2.1.1)
+ rqrcode (2.1.2)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
rqrcode_core (1.2.0)
@@ -158,7 +162,7 @@ GEM
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
- rubocop-ast (1.17.0)
+ rubocop-ast (1.21.0)
parser (>= 3.1.1.0)
rubocop-performance (1.10.2)
rubocop (>= 0.90.0, < 2.0)
@@ -170,15 +174,16 @@ GEM
ruby-openid (2.9.2)
ruby-progressbar (1.11.0)
rubyzip (2.3.2)
- selenium-webdriver (4.1.0)
+ selenium-webdriver (4.4.0)
childprocess (>= 0.5, < 5.0)
rexml (~> 3.2, >= 3.2.5)
- rubyzip (>= 1.2.2)
+ rubyzip (>= 1.2.2, < 3.0)
+ websocket (~> 1.0)
simplecov (0.18.5)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.3)
- sprockets (4.0.3)
+ sprockets (4.1.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
@@ -187,20 +192,21 @@ GEM
sprockets (>= 3.0.0)
thor (1.2.1)
thread_safe (0.3.6)
- tzinfo (1.2.9)
+ tzinfo (1.2.10)
thread_safe (~> 0.1)
- unicode-display_width (2.1.0)
+ unicode-display_width (2.2.0)
webdrivers (4.7.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (> 3.141, < 5.0)
webrick (1.7.0)
+ websocket (1.2.9)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
- yard (0.9.27)
+ yard (0.9.28)
webrick (~> 1.7.0)
PLATFORMS
@@ -221,11 +227,11 @@ DEPENDENCIES
mocha (>= 1.4.0)
mysql2 (~> 0.5.0)
net-ldap (~> 0.17.0)
- nokogiri (~> 1.11.1)
+ nokogiri (~> 1.13.6)
pg (~> 1.2.2)
puma
rack-openid
- rails (= 5.2.6.3)
+ rails (= 5.2.8)
rails-dom-testing
rbpdf (~> 1.20.0)
redcarpet (~> 3.5.1)
@@ -249,4 +255,4 @@ RUBY VERSION
ruby 2.7.6p219
BUNDLED WITH
- 2.2.33
+ 2.3.20
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index 1f0f9f4e788d..a518a9cec2e8 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
+{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }:
let
- version = "4.2.5";
+ version = "4.2.7";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -16,7 +16,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
- sha256 = "112rc2sjx6x7046fjz7np0ilszvkqapc180ld02ncwmdxaq88w6r";
+ sha256 = "sha256-7UvgO1q2PCZBqH24l4c53Zl8D2Rr+hAQrJ5SEMNDck4=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -42,6 +42,8 @@ in
makeWrapper ${rubyEnv.wrappedRuby}/bin/ruby $out/bin/rdm-mailhandler.rb --add-flags $out/share/redmine/extra/mail_handler/rdm-mailhandler.rb
'';
+ passthru.tests.redmine = nixosTests.redmine;
+
meta = with lib; {
homepage = "https://www.redmine.org/";
platforms = platforms.linux;
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix
index 77d1d997fd8b..a478796ca226 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/pkgs/applications/version-management/redmine/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gmwailk92znzrdpi4116ih6bq609a38rpnszzh5piq7b507ikpn";
+ sha256 = "123nrlrh5kikl314l4gjbc8ljw3h2ppzhpmm7cilisqvn71s5ysd";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "103a1nixkazzdk21bg42vs722m6gm0vf17ag2fdad5dycwk3ycpp";
+ sha256 = "18vrdwdwfmrnpj8k30qhvdx23km233ffnhhzpbmx8m6spavwvli2";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15fz3rjk85svpx9lsqfdwlvyd972zf0g5jasnsllcbf6d300gdj6";
+ sha256 = "1knnka6n292f4hhbjfchpa4sbjj79wys5y8bcggm8ah894051kzk";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
actionpack-xml_parser = {
dependencies = ["actionpack" "railties"];
@@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00cfpmbk8gw9c589xnqazsbd860p2368gyh8nyzixcsa6k28wfwv";
+ sha256 = "0zndg7ax4bckayjw558p9hz92ic6x3r5acfbd5vnad0xh7hfdrmx";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gczbnk7qy4rjhv0q82nd70xawc9lb1vinvwr4ngpim5rqwzm6d6";
+ sha256 = "0kzb5y4lflmvi3vxz2zrj55k6xyys2h5bdqp2ki69rcyd4ay5qrg";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
activemodel = {
dependencies = ["activesupport"];
@@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ib8qlbwr9hp5284c6bmx08lrfy45zzd4inzmawz08alkgdcrzca";
+ sha256 = "1b6pskl8x4c1hcsf4xh4cl9qlh814s91bjv3yy94cdc4xpl76vr6";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
@@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ky3zc8i5rjg2dpdb95icsgb443siim9sv71xwcmryjxp5rhkqyx";
+ sha256 = "078iiv5g02n1ivrgpkbw5bxkbihi85msvn88p5q37vbfr14ynk0a";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
activestorage = {
dependencies = ["actionpack" "activerecord" "marcel"];
@@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1risg5jklxrm7j5i4rzaqpb94822ivbjaasblppwmx5f33vhfpca";
+ sha256 = "1xnxgg9j4nr6yw8g3l0jdr9m985k3wrvjql9j5qr5lfcsn9zwz4w";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
@@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09vif5aajkvrsdcl51kvk8crz8hl38awprh7d5wj93nscpxmqgns";
+ sha256 = "0anvhpxjgic1cv1h66lmz6x5nd7g0bbnwl0rgxnbdr3w76fa8w02";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
addressable = {
dependencies = ["public_suffix"];
@@ -115,10 +115,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
+ sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
type = "gem";
};
- version = "2.8.0";
+ version = "2.8.1";
};
arel = {
groups = ["default"];
@@ -237,10 +237,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
+ sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.0";
};
globalid = {
dependencies = ["activesupport"];
@@ -280,10 +280,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";
+ sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1";
type = "gem";
};
- version = "2.16.0";
+ version = "2.18.0";
};
mail = {
dependencies = ["mini_mime"];
@@ -336,25 +336,35 @@
};
version = "1.0.3";
};
+ mini_portile2 = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
+ type = "gem";
+ };
+ version = "2.8.0";
+ };
minitest = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
+ sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
type = "gem";
};
- version = "5.15.0";
+ version = "5.16.3";
};
mocha = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15s53ggsykk69kxqvs4416s8yxdhz6caggva55n8sjgy4ixzwp10";
+ sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr";
type = "gem";
};
- version = "1.13.0";
+ version = "1.14.0";
};
mysql2 = {
groups = ["default"];
@@ -369,20 +379,20 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw";
+ sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1";
type = "gem";
};
- version = "0.5.3";
+ version = "0.5.4";
};
net-ldap = {
groups = ["ldap"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n";
+ sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj";
type = "gem";
};
- version = "0.17.0";
+ version = "0.17.1";
};
nio4r = {
groups = ["default" "test"];
@@ -395,15 +405,15 @@
version = "2.5.8";
};
nokogiri = {
- dependencies = ["racc"];
+ dependencies = ["mini_portile2" "racc"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
+ sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr";
type = "gem";
};
- version = "1.11.7";
+ version = "1.13.8";
};
parallel = {
groups = ["default" "test"];
@@ -421,10 +431,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";
+ sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p";
type = "gem";
};
- version = "3.1.2.0";
+ version = "3.1.2.1";
};
pg = {
groups = ["default"];
@@ -449,10 +459,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
+ sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
type = "gem";
};
- version = "4.0.7";
+ version = "5.0.0";
};
puma = {
dependencies = ["nio4r"];
@@ -460,10 +470,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw";
+ sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436";
type = "gem";
};
- version = "5.6.4";
+ version = "5.6.5";
};
racc = {
groups = ["default" "test"];
@@ -480,10 +490,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
+ sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa";
type = "gem";
};
- version = "2.2.3";
+ version = "2.2.4";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
@@ -502,10 +512,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
+ sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd";
type = "gem";
};
- version = "1.1.0";
+ version = "2.0.2";
};
rails = {
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
@@ -513,10 +523,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19962nkjssr77753a8893yz17kmvb63h9rl3ajq6r8rx9xifq8fn";
+ sha256 = "0884z2ilm4by47qk7my856dr42vzy12ghj241rymp13flaf54449";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -535,10 +545,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk";
+ sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf";
type = "gem";
};
- version = "1.4.2";
+ version = "1.4.3";
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
@@ -546,10 +556,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0waa50li6vvckz9mznyz4jhks46ba09fmbdadrrj35mzwahyb6fy";
+ sha256 = "157mmm2jhvq2g08xhq0780i3r4i679h14m68jj7265ik26gbchhc";
type = "gem";
};
- version = "5.2.6.3";
+ version = "5.2.8";
};
rainbow = {
groups = ["default" "test"];
@@ -681,10 +691,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn";
+ sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p";
type = "gem";
};
- version = "2.1.1";
+ version = "2.1.2";
};
rqrcode_core = {
groups = ["default"];
@@ -713,10 +723,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx";
+ sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg";
type = "gem";
};
- version = "1.17.0";
+ version = "1.21.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@@ -771,15 +781,15 @@
version = "2.3.2";
};
selenium-webdriver = {
- dependencies = ["childprocess" "rexml" "rubyzip"];
+ dependencies = ["childprocess" "rexml" "rubyzip" "websocket"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17hilxa40cj7q48k6wcx1cbdb1v3q9c4nx89fji7gyqpcfm16vq7";
+ sha256 = "1vy0baak61wr652a7qf249n85sqq5k5mi51ws5ccyyirlsymz2gv";
type = "gem";
};
- version = "4.1.0";
+ version = "4.4.0";
};
simplecov = {
dependencies = ["docile" "simplecov-html"];
@@ -808,10 +818,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0";
+ sha256 = "1qj82dcfkk6c4zw357k5r05s5iwvyddh57bpwj0a1hjgaw70pcb8";
type = "gem";
};
- version = "4.0.3";
+ version = "4.1.1";
};
sprockets-rails = {
dependencies = ["actionpack" "activesupport" "sprockets"];
@@ -850,20 +860,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
+ sha256 = "0rw89y3zj0wcybcyiazgcprg6hi42k8ipp1n2lbl95z1dmpgmly6";
type = "gem";
};
- version = "1.2.9";
+ version = "1.2.10";
};
unicode-display_width = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
+ sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
webdrivers = {
dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"];
@@ -886,6 +896,16 @@
};
version = "1.7.0";
};
+ websocket = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8";
+ type = "gem";
+ };
+ version = "1.2.9";
+ };
websocket-driver = {
dependencies = ["websocket-extensions"];
groups = ["default"];
@@ -924,9 +944,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d08gkis1imlvppyh8dbslk89hwj5af2fmlzvmwahgx2bm48d9sn";
+ sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk";
type = "gem";
};
- version = "0.9.27";
+ version = "0.9.28";
};
}
diff --git a/pkgs/applications/version-management/redmine/update.sh b/pkgs/applications/version-management/redmine/update.sh
index de59f4685d5c..3c4d842735cf 100755
--- a/pkgs/applications/version-management/redmine/update.sh
+++ b/pkgs/applications/version-management/redmine/update.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell --pure -i bash -p cacert bundix
+#!nix-shell --pure -i bash -p cacert bundix bundler
# Do these steps before running this script:
# 1. Copy Gemfile from new Redmine version to this folder
@@ -14,4 +14,6 @@ for file in "gemset.nix" "Gemfile.lock"; do
fi
done
+bundle lock --add-platform ruby
+bundle lock --remove-platform x86_64-linux
bundix -l
diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix
index 4e8637cf190f..07a0a5803ca0 100644
--- a/pkgs/applications/video/ani-cli/default.nix
+++ b/pkgs/applications/video/ani-cli/default.nix
@@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation rec {
pname = "ani-cli";
- version = "3.3";
+ version = "3.4";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ani-cli";
rev = "v${version}";
- sha256 = "sha256-khgErF/1DmqnXmTUvTYWuyUAos6aUghImgXp3NjOZEg=";
+ sha256 = "sha256-Xb7MNL7YKbvyRR5ZppUfCYeYpjNAiJWNOjIFk5fUvpY=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index cf81c0e0446c..6a3bfe9fbfd9 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -24,6 +24,7 @@
, waylandSupport ? stdenv.isLinux
, wayland
, wayland-protocols
+ , wayland-scanner
, libxkbcommon
, x11Support ? stdenv.isLinux
@@ -100,6 +101,8 @@ in stdenv.mkDerivation rec {
NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "
+ lib.optionalString stdenv.isDarwin "-framework CoreFoundation";
+ dontAddWafCrossFlags = true;
+
wafConfigureFlags = [
"--enable-libmpv-shared"
"--enable-manpage-build"
@@ -127,7 +130,8 @@ in stdenv.mkDerivation rec {
python3
wafHook
which
- ] ++ lib.optionals swiftSupport [ swift ];
+ ] ++ lib.optionals swiftSupport [ swift ]
+ ++ lib.optionals waylandSupport [ wayland-scanner ];
buildInputs = [
ffmpeg
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 3d8d87ec2274..8e7a683ed33e 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, python3, python3Packages, zlib, pkg-config, glib, buildPackages
+{ lib, stdenv, fetchurl, fetchpatch, python3, zlib, pkg-config, glib, buildPackages
, perl, pixman, vde2, alsa-lib, texinfo, flex
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool
, makeWrapper, runtimeShell, removeReferencesTo
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx-rtd-theme ]
+ nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3.pkgs.sphinx python3.pkgs.sphinx-rtd-theme ]
++ lib.optionals gtkSupport [ wrapGAppsHook ]
++ lib.optionals stdenv.isDarwin [ sigtool ];
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index fbeb375fa891..480fb7b2265c 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -133,12 +133,6 @@ if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then
die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!"
fi
-oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.$sourceKey.drvAttrs.urls or [ $attr.$sourceKey.url ]) 0" | tr -d '"')
-
-if [[ -z "$oldUrl" ]]; then
- die "Couldn't evaluate source url from '$attr.$sourceKey'!"
-fi
-
oldVersion=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"')
if [[ -z "$oldVersion" ]]; then
@@ -162,7 +156,6 @@ fi
# Escape regex metacharacter that are allowed in store path names
oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
-oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g')
if [[ $(grep --count --extended-regexp "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersionEscaped\"" "$nixFile") = 1 ]]; then
pattern="/\b$versionKey\b\s*=/ s|\"$oldVersionEscaped\"|\"$newVersion\"|"
@@ -206,30 +199,36 @@ oldHashEscaped=$(echo "$oldHash" | sed -re 's|[+]|\\&|g')
tempHashEscaped=$(echo "$tempHash" | sed -re 's|[+]|\\&|g')
# Replace new version
-sed -i.bak "$nixFile" -re "$pattern"
-if cmp -s "$nixFile" "$nixFile.bak"; then
+sed -i.cmp "$nixFile" -re "$pattern"
+if cmp -s "$nixFile" "$nixFile.cmp"; then
die "Failed to replace version '$oldVersion' to '$newVersion' in '$attr'!"
fi
# Replace new URL
if [[ -n "$newUrl" ]]; then
- sed -i "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|"
+ oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.$sourceKey.drvAttrs.urls or [ $attr.$sourceKey.url ]) 0" | tr -d '"')
+ if [[ -z "$oldUrl" ]]; then
+ die "Couldn't evaluate source url from '$attr.$sourceKey'!"
+ fi
- if cmp -s "$nixFile" "$nixFile.bak"; then
+ # Escape regex metacharacter that are allowed in store path names
+ oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g')
+
+ sed -i.cmp "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|"
+ if cmp -s "$nixFile" "$nixFile.cmp"; then
die "Failed to replace source URL '$oldUrl' to '$newUrl' in '$attr'!"
fi
fi
-sed -i "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|"
-if cmp -s "$nixFile" "$nixFile.bak"; then
+sed -i.cmp "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|"
+if cmp -s "$nixFile" "$nixFile.cmp"; then
die "Failed to replace source hash of '$attr' to a temporary hash!"
fi
# Replace new revision, if given
if [[ -n "$newRevision" ]]; then
- sed -i "$nixFile" -re "s|\"$oldRevision\"|\"$newRevision\"|"
-
- if cmp -s "$nixFile" "$nixFile.bak"; then
+ sed -i.cmp "$nixFile" -re "s|\"$oldRevision\"|\"$newRevision\"|"
+ if cmp -s "$nixFile" "$nixFile.cmp"; then
die "Failed to replace source revision '$oldRevision' to '$newRevision' in '$attr'!"
fi
fi
@@ -254,16 +253,15 @@ if [[ -z "$newHash" ]]; then
fi
if [[ -z "${ignoreSameHash}" && "$oldVersion" != "$newVersion" && "$oldHash" = "$newHash" ]]; then
- mv "$nixFile.bak" "$nixFile"
die "Both the old and new source hashes of '$attr.$sourceKey' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!"
fi
-sed -i "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|"
-if cmp -s "$nixFile" "$nixFile.bak"; then
+sed -i.cmp "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|"
+if cmp -s "$nixFile" "$nixFile.cmp"; then
die "Failed to replace temporary source hash of '$attr' to the final source hash!"
fi
-rm -f "$nixFile.bak"
+rm -f "$nixFile.cmp"
rm -f "$attr.fetchlog"
if [ -n "$printChanges" ]; then
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 1caa99ff9f80..9eec8a365179 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
- version = "22.08.15";
+ version = "22.09.04";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "sha256-2Ay5wykXuXKwcGFvFKu6SIFKdWFMdBvHwgSrqNCszMM=";
+ sha256 = "sha256-eRBso0oeL+EkOw6oINbuf9s07BtKc8132FK5QbAeA8s=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 3c24621f42e7..062f16fe98d4 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
- version = "22.08.15";
+ version = "22.09.04";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "sha256-VJsxZFzraCQPNr/zS7ElPk52Tq5YHrFxaQJMUuHcnLw=";
+ sha256 = "sha256-BzwuaWaSBVIh9Vk3Y7uv0+9aivXNFhBGJJMoDPrpKh4=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index d71a50ecb68c..507f6059b768 100644
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
- version = "202208180100";
+ version = "202209080101";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
- rev = "005c33be4dd95339596ddd5ce792e8f97dd168a3";
- sha256 = "sha256-KvEmgtbelZOauE2WBTzJkwJkaUVW2x8ezgmTE+Gbwu8=";
+ rev = "2e77e5d149f0a8f9c284333b206d0f017b0b66ef";
+ sha256 = "sha256-vkWRBSwLpCqZWMlfwOyPWn2MF+/lG+VXnSrDCSR+dak=";
};
installPhase = ''
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index fc33e5a683ec..d3ddb03b9271 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -5,7 +5,9 @@
, pkg-config
, lxqt-build-tools
, json-glib
+, libexif
, libfm-qt
+, menu-cache
, qtbase
, qttools
, qtx11extras
@@ -31,7 +33,9 @@ mkDerivation rec {
buildInputs = [
json-glib
+ libexif
libfm-qt
+ menu-cache
qtbase
qttools
qtx11extras
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index cc3a6ce30cab..0d1dd2baa1b2 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "caja-extensions";
- version = "1.26.0";
+ version = "1.26.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "03zwv3yl5553cnp6jjn7vr4l28dcdhsap7qimlrbvy20119kj5gh";
+ sha256 = "WJwZ4/oQJC1iOaXMuVhVmENqVuvpTS6ypQtZUMzh1SA=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
index 8a50a0d0fa7c..8a376862d9c9 100644
--- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
@@ -1,14 +1,32 @@
-{ lib, mkXfceDerivation, glib, gtk3, libnotify, libxfce4ui, libxfce4util
-, xfce4-panel, xfconf }:
+{ lib
+, mkXfceDerivation
+, glib
+, gtk3
+, libnotify
+, libxfce4ui
+, libxfce4util
+, xfce4-panel
+, xfconf
+}:
mkXfceDerivation {
category = "apps";
pname = "xfce4-notifyd";
- version = "0.6.3";
+ version = "0.6.4";
- sha256 = "sha256-JcHxqKLl4F4FQv7lE64gWUorCvl5g5mSD+jEmj1ORfY=";
+ sha256 = "sha256-H/qAfgwM0qaIxpVlSAUJJ4/Z3WtvYxJb2TtjKHK6AjE=";
- buildInputs = [ gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
+ buildInputs = [
+ gtk3
+ glib
+ libnotify
+ libxfce4ui
+ libxfce4util
+ xfce4-panel
+ xfconf
+ ];
+
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
configureFlags = [
"--enable-dbus-start-daemon"
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
index 5915a43372d9..7591ed1e0e5c 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
@@ -18,8 +18,8 @@
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-pulseaudio-plugin";
- version = "0.4.3";
- sha256 = "sha256-+E1pyDP140xUbYPZXhdiEjdU0t8Un+IjV7Ek+hAX3OU=";
+ version = "0.4.4";
+ sha256 = "sha256-arnHB9ziQm/vQk6hYHS+MKL5dJeEVxUX+SwjZ3/LcEQ=";
nativeBuildInputs = [
automakeAddFlags
diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix
index 5cac2a8457d9..7f48108314b6 100644
--- a/pkgs/development/compilers/sagittarius-scheme/default.nix
+++ b/pkgs/development/compilers/sagittarius-scheme/default.nix
@@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
in
stdenv.mkDerivation rec {
pname = "sagittarius-scheme";
- version = "0.9.8";
+ version = "0.9.9";
src = fetchurl {
url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz";
- sha256 = "sha256-CdnBpTq+c04JdipfhIiI8EkVFsCc00Gh+cA5zYENMqI=";
+ sha256 = "sha256-UB7Lfyc2afTIVW5SIiHxXi2wyoVC2Q2ClTkSOQ6UmPg=";
};
preBuild = ''
# since we lack rpath during build, need to explicitly add build path
diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix
index 4d76331fb99a..190758855f78 100644
--- a/pkgs/development/coq-modules/Verdi/default.nix
+++ b/pkgs/development/coq-modules/Verdi/default.nix
@@ -6,7 +6,7 @@ with lib; mkCoqDerivation {
owner = "uwplse";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.7" "8.15"; out = "20211026"; }
+ { case = range "8.7" "8.16"; out = "20211026"; }
{ case = range "8.7" "8.14"; out = "20210524"; }
{ case = range "8.7" "8.13"; out = "20200131"; }
{ case = "8.6"; out = "20181102"; }
diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix
index 15b2e493b68e..90ddf3e524ff 100644
--- a/pkgs/development/coq-modules/aac-tactics/default.nix
+++ b/pkgs/development/coq-modules/aac-tactics/default.nix
@@ -6,6 +6,7 @@ mkCoqDerivation {
releaseRev = v: "v${v}";
+ release."8.16.0".sha256 = "sha256-sE1w8q/60adNF9yMJQO70CEk3D8QUopvgiszdHt5Wsw=";
release."8.15.1".sha256 = "sha256:0k2sl3ns897a5ll11bazgpv4ppgi1vmx4n89v2dnxabm5dglyglp";
release."8.14.1".sha256 = "sha256:1w99jgm7mxwdxnalxhralmhmpwwbd52pbbifq0mx13ixkv6iqm1a";
release."8.14.0".sha256 = "04x47ngb95m1h4jw2gl0v79s5im7qimcw7pafc34gkkf51pyhakp";
@@ -21,6 +22,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
+ { case = "8.16"; out = "8.16.0"; }
{ case = "8.15"; out = "8.15.1"; }
{ case = "8.14"; out = "8.14.1"; }
{ case = "8.13"; out = "8.13.2"; }
diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix
index 8a0248c952cb..8de9a8e411cd 100644
--- a/pkgs/development/coq-modules/addition-chains/default.nix
+++ b/pkgs/development/coq-modules/addition-chains/default.nix
@@ -13,7 +13,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.13" "8.15"; out = "0.6"; }
+ { case = range "8.13" "8.16"; out = "0.6"; }
{ case = range "8.11" "8.12"; out = "0.4"; }
] null;
diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
index dac52eb3124a..5a7331c22206 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -9,7 +9,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.10" "8.15"; out = "1.7"; }
+ { case = range "8.10" "8.16"; out = "1.7"; }
] null;
propagatedBuildInputs = [ mathcomp-ssreflect ];
diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix
index 4f284e7c9492..a2ef7e09a7d6 100644
--- a/pkgs/development/coq-modules/coq-bits/default.nix
+++ b/pkgs/development/coq-modules/coq-bits/default.nix
@@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
repo = "bits";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.10" "8.15"; out = "1.1.0"; }
+ { case = range "8.10" "8.16"; out = "1.1.0"; }
{ case = range "8.7" "8.15"; out = "1.0.0"; }
] null;
diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix
index 4efc776e28da..d3a8e366a0a4 100644
--- a/pkgs/development/coq-modules/coqeal/default.nix
+++ b/pkgs/development/coq-modules/coqeal/default.nix
@@ -10,7 +10,7 @@ with lib;
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
- { cases = [ (range "8.13" "8.15") (isGe "1.13.0") ]; out = "1.1.1"; }
+ { cases = [ (range "8.13" "8.16") (isGe "1.13.0") ]; out = "1.1.1"; }
{ cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; }
{ cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; }
{ cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; }
diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index e139eda77fae..09327f2ff76c 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -7,7 +7,7 @@ with lib; mkCoqDerivation {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.8" "8.15"; out = "3.2.0"; }
+ { case = range "8.8" "8.16"; out = "3.2.0"; }
{ case = range "8.8" "8.13"; out = "3.1.0"; }
{ case = range "8.5" "8.9"; out = "3.0.2"; }
] null;
diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix
index 9d823c0bf9e6..f08e86ccc4f8 100644
--- a/pkgs/development/coq-modules/deriving/default.nix
+++ b/pkgs/development/coq-modules/deriving/default.nix
@@ -9,7 +9,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.11" "8.15"; out = "0.1.0"; }
+ { case = range "8.11" "8.16"; out = "0.1.0"; }
] null;
releaseRev = v: "v${v}";
diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix
index 9fd2fb0b8bd8..2a038ff0c11a 100644
--- a/pkgs/development/coq-modules/extructures/default.nix
+++ b/pkgs/development/coq-modules/extructures/default.nix
@@ -10,7 +10,7 @@ with lib;
inherit version;
defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [
- { cases = [(range "8.11" "8.15") (isGe "1.12.0") ]; out = "0.3.1"; }
+ { cases = [(range "8.11" "8.16") (isGe "1.12.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }
{ cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }
] null;
diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix
index d4bcaa8ef81f..ce254aff78bb 100644
--- a/pkgs/development/coq-modules/gaia-hydras/default.nix
+++ b/pkgs/development/coq-modules/gaia-hydras/default.nix
@@ -11,7 +11,7 @@ with lib; mkCoqDerivation rec {
inherit version;
defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [
- { cases = [ (range "8.14" "8.15") (isGe "1.12.0") ]; out = "0.6"; }
+ { cases = [ (range "8.14" "8.16") (isGe "1.12.0") ]; out = "0.6"; }
{ cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; }
] null;
diff --git a/pkgs/development/coq-modules/goedel/default.nix b/pkgs/development/coq-modules/goedel/default.nix
index ecd154c82ed5..19efb786addf 100644
--- a/pkgs/development/coq-modules/goedel/default.nix
+++ b/pkgs/development/coq-modules/goedel/default.nix
@@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.11" "8.15"; out = "8.13.0"; }
+ { case = range "8.11" "8.16"; out = "8.13.0"; }
] null;
propagatedBuildInputs = [ hydra-battles pocklington ];
diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix
index 9ba5f03a5620..c2fca0a16a71 100644
--- a/pkgs/development/coq-modules/graph-theory/default.nix
+++ b/pkgs/development/coq-modules/graph-theory/default.nix
@@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.13" "8.15"; out = "0.9"; }
+ { case = range "8.13" "8.16"; out = "0.9"; }
] null;
propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ];
diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix
index 151a0511c806..1ffa37ec6c32 100644
--- a/pkgs/development/coq-modules/itauto/default.nix
+++ b/pkgs/development/coq-modules/itauto/default.nix
@@ -6,11 +6,13 @@ mkCoqDerivation rec {
owner = "fbesson";
domain = "gitlab.inria.fr";
+ release."8.16.0".sha256 = "sha256-4zAUYGlw/pBcLPv2GroIduIlvbfi1+Vy+TdY8KLCqO4=";
release."8.15.0".sha256 = "sha256:10qpv4nx1p0wm9sas47yzsg9z22dhvizszfa21yff08a8fr0igya";
release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9";
release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A=";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
+ { case = isEq "8.16"; out = "8.16.0"; }
{ case = isEq "8.15"; out = "8.15.0"; }
{ case = isEq "8.14"; out = "8.14.0"; }
{ case = isEq "8.13"; out = "8.13+no"; }
diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix
index 35e9398f3ad7..706ee0686922 100644
--- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix
@@ -9,7 +9,7 @@ with lib; mkCoqDerivation {
inherit version;
defaultVersion = with versions;
switch [ coq.version mathcomp-ssreflect.version ] [{
- cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.0.0";
+ cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.0.0";
}] null;
release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1";
diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix
index 463c5e5f5e9d..f39fbe0ac6a6 100644
--- a/pkgs/development/coq-modules/mathcomp-word/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-word/default.nix
@@ -15,7 +15,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
- { cases = [ (range "8.12" "8.15") (isGe "1.12") ]; out = "1.1"; }
+ { cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "1.1"; }
] null;
propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];
diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix
index 2e2593669f32..1ac1d928738b 100644
--- a/pkgs/development/coq-modules/mathcomp-zify/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix
@@ -9,7 +9,7 @@ with lib; mkCoqDerivation rec {
defaultVersion = with versions;
switch [ coq.coq-version mathcomp-algebra.version ] [
- { cases = [ (range "8.13" "8.15") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; }
+ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; }
] null;
release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k";
diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix
index 847ebb7808be..2d83cbfd883f 100644
--- a/pkgs/development/coq-modules/reglang/default.nix
+++ b/pkgs/development/coq-modules/reglang/default.nix
@@ -10,7 +10,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.10" "8.15"; out = "1.1.2"; }
+ { case = range "8.10" "8.16"; out = "1.1.2"; }
] null;
diff --git a/pkgs/development/coq-modules/trakt/default.nix b/pkgs/development/coq-modules/trakt/default.nix
index 96ba2f808a3b..f10e69cc4e90 100644
--- a/pkgs/development/coq-modules/trakt/default.nix
+++ b/pkgs/development/coq-modules/trakt/default.nix
@@ -10,7 +10,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch [ coq.version ] [
- { cases = [ (range "8.13" "8.15") ]; out = "1.0"; }
+ { cases = [ (range "8.13" "8.16") ]; out = "1.0"; }
] null;
propagatedBuildInputs = [ coq-elpi ];
diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix
index 2716b7d2954d..be88ddd95fd5 100644
--- a/pkgs/development/libraries/SDL_compat/default.nix
+++ b/pkgs/development/libraries/SDL_compat/default.nix
@@ -1,9 +1,12 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, cmake
, pkg-config
, SDL2
+, libiconv
+, Cocoa
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported
, libGL
@@ -25,9 +28,20 @@ stdenv.mkDerivation rec {
hash = "sha256-PDGlMI8q74JaqMQ5oX9Zt5CEr7frFQWECbuwq5g25eg=";
};
+ patches = optionals stdenv.hostPlatform.isDarwin [
+ # Fix broken install name in dylib, https://github.com/libsdl-org/sdl12-compat/issues/194
+ # Remove when bump > 1.2.52
+ (fetchpatch {
+ name = "SDL_compat-fix-install-name.patch";
+ url = "https://github.com/libsdl-org/sdl12-compat/commit/5642d47ae489f2eb362cece2464ecc466a700ed5.patch";
+ sha256 = "sha256-kQ5H8gXjTZVHHRF6UpgXKl3NIy87iULcc2iCsYt5Hqo=";
+ })
+ ];
+
nativeBuildInputs = [ cmake pkg-config ];
propagatedBuildInputs = [ SDL2 ]
+ ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ]
++ optionals openglSupport [ libGL libGLU ];
enableParallelBuilding = true;
@@ -35,15 +49,18 @@ stdenv.mkDerivation rec {
setupHook = ../SDL/setup-hook.sh;
postFixup = ''
- for lib in $out/lib/*.so* ; do
+ for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do
if [[ -L "$lib" ]]; then
- patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib"
+ ${if stdenv.hostPlatform.isDarwin then ''
+ install_name_tool ${lib.strings.concatMapStrings (x: " -add_rpath ${makeLibraryPath [x]} ") propagatedBuildInputs} "$lib"
+ '' else ''
+ patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib"
+ ''}
fi
done
'';
meta = with lib; {
- broken = stdenv.isDarwin;
description = "A cross-platform multimedia library - build SDL 1.2 applications against 2.0";
homepage = "https://www.libsdl.org/";
license = licenses.zlib;
diff --git a/pkgs/development/libraries/aixlog/default.nix b/pkgs/development/libraries/aixlog/default.nix
new file mode 100644
index 000000000000..282b62702c75
--- /dev/null
+++ b/pkgs/development/libraries/aixlog/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "aixlog";
+ version = "1.5.0";
+
+ src = fetchFromGitHub {
+ owner = "badaix";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-Xhle7SODRZlHT3798mYIzBi1Mqjz8ai74/UnbVWetiY=";
+ };
+
+ dontConfigure = true;
+ dontBuild = true;
+ dontFixup = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm644 $src/include/aixlog.hpp $out/include/aixlog.hpp
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Header-only C++ logging library";
+ homepage = "https://github.com/badaix/aixlog";
+ changelog = "https://github.com/badaix/aixlog/releases/tag/${src.rev}";
+ license = licenses.mit;
+ maintainers = with maintainers; [ azahi ];
+ };
+}
diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index 6740f458725e..7fe511373d8d 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cpp-utilities";
- version = "5.18.0";
+ version = "5.19.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-i/ihEPJHyWzRywzpXhYpauA8lL51yjoiWod8Nc/6gV0=";
+ sha256 = "sha256-sygt30x5S2n24ONMBRzNyLZcnl4hM4tUFpX/Yx6ZSMM=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index f49c8b982993..4e8503b48438 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, gflags, perl }:
+{ stdenv, lib, fetchFromGitHub, cmake, gflags, gtest, perl }:
stdenv.mkDerivation rec {
pname = "glog";
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
+ buildInputs = [ gtest ];
+
propagatedBuildInputs = [ gflags ];
cmakeFlags = [
@@ -25,6 +27,17 @@ stdenv.mkDerivation rec {
enableParallelChecking = false;
checkInputs = [ perl ];
+ GTEST_FILTER =
+ let
+ filteredTests = lib.optionals stdenv.hostPlatform.isMusl [
+ "Symbolize.SymbolizeStackConsumption"
+ "Symbolize.SymbolizeWithDemanglingStackConsumption"
+ ] ++ lib.optionals stdenv.hostPlatform.isStatic [
+ "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled"
+ ];
+ in
+ lib.optionalString doCheck "-${builtins.concatStringsSep ":" filteredTests}";
+
meta = with lib; {
homepage = "https://github.com/google/glog";
license = licenses.bsd3;
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index fc3e39b02261..5c4bc0430d84 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -62,7 +62,7 @@ in
stdenv.mkDerivation rec {
pname = "gtk4";
- version = "4.6.6";
+ version = "4.8.0";
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
outputBin = "dev";
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
- sha256 = "e7/k0TVp98KX7UmDSscmPjGLe/EC0ycctGbVlx9ZrnA=";
+ sha256 = "yNYgNDfR41nYMSTcWRVG1AP2fjsAVE5T3VCpuqzcvX8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/development/libraries/imtui/default.nix
new file mode 100644
index 000000000000..e534a55ae5a4
--- /dev/null
+++ b/pkgs/development/libraries/imtui/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, imgui
+, ninja
+, withEmscripten ? false, emscripten
+, withCurl ? (!withEmscripten), curl
+, withNcurses ? (!withEmscripten), ncurses
+, static ? withEmscripten
+}:
+
+stdenv.mkDerivation rec {
+ pname = "imtui";
+ version = "1.0.5";
+
+ src = fetchFromGitHub {
+ owner = "ggerganov";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-eHQPDEfxKGLdiOi0lUUgqJcmme1XJLSPAafT223YK+U=";
+ };
+
+ nativeBuildInputs = [ cmake ninja ];
+
+ buildInputs = lib.optional withEmscripten emscripten
+ ++ lib.optional withCurl curl
+ ++ lib.optional withNcurses ncurses;
+
+ postPatch = ''
+ cp -r ${imgui}/include/imgui third-party/imgui
+ '';
+
+ cmakeFlags = [
+ "-DEMSCRIPTEN:BOOL=${if withEmscripten then "ON" else "OFF"}"
+ "-DIMTUI_SUPPORT_CURL:BOOL=${if withCurl then "ON" else "OFF"}"
+ "-DIMTUI_SUPPORT_NCURSES:BOOL=${if withNcurses then "ON" else "OFF"}"
+ "-DBUILD_SHARED_LIBS:BOOL=${if (!static) then "ON" else "OFF"}"
+ "-DIMTUI_BUILD_EXAMPLES:BOOL=OFF"
+ "-DIMTUI_INSTALL_IMGUI_HEADERS:BOOL=OFF"
+ ];
+
+ postInstall = ''
+ rm -rf $out/include/imgui
+ '';
+
+ meta = with lib; {
+ description = "Immediate mode text-based user interface library";
+ longDescription = ''
+ ImTui is an immediate mode text-based user interface library. Supports 256
+ ANSI colors and mouse/keyboard input.
+ '';
+ homepage = "https://imtui.ggerganov.com";
+ changelog = "https://github.com/ggerganov/imtui/blob/${src.rev}/CHANGELOG.md";
+ license = licenses.mit;
+ maintainers = with maintainers; [ azahi ];
+ };
+}
diff --git a/pkgs/development/libraries/popl/default.nix b/pkgs/development/libraries/popl/default.nix
new file mode 100644
index 000000000000..b72b97172e37
--- /dev/null
+++ b/pkgs/development/libraries/popl/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "popl";
+ version = "1.3.0";
+
+ src = fetchFromGitHub {
+ owner = "badaix";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-AkqFRPK0tVdalL+iyMou0LIUkPkFnYYdSqwEbFbgzqI=";
+ };
+
+ dontConfigure = true;
+ dontBuild = true;
+ dontFixup = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm644 $src/include/popl.hpp $out/include/popl.hpp
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Header-only C++ program options parser library";
+ homepage = "https://github.com/badaix/popl";
+ changelog = "https://github.com/badaix/popl/releases/tag/${src.rev}";
+ license = licenses.mit;
+ maintainers = with maintainers; [ azahi ];
+ };
+}
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index e29fc1f70c93..77db5869f62a 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -2,23 +2,15 @@
stdenv.mkDerivation rec {
pname = "range-v3";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "ericniebler";
repo = "range-v3";
rev = version;
- sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh";
+ hash = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU=";
};
- patches = [
- ./gcc10.patch
- (fetchpatch {
- url = "https://github.com/ericniebler/range-v3/commit/66e847d4e14be3a369b7e26a03a172b20e62c003.patch";
- sha256 = "sha256-JOQptVqNicdMhcDhBrWQRf7MfskBv56cICwvMA8g88Y=";
- })
- ];
-
nativeBuildInputs = [ cmake ];
# Building the tests currently fails on AArch64 due to internal compiler
diff --git a/pkgs/development/libraries/range-v3/gcc10.patch b/pkgs/development/libraries/range-v3/gcc10.patch
deleted file mode 100644
index caebf0a63162..000000000000
--- a/pkgs/development/libraries/range-v3/gcc10.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From a91f0e1be27a31c446452a753001d4518ef83a6b Mon Sep 17 00:00:00 2001
-From: Eric Niebler
-Date: Mon, 17 Aug 2020 17:48:09 -0700
-Subject: [PATCH] work around premature instantiation problem on gcc; fixes
- #1545
-
----
- include/range/v3/view/chunk.hpp | 6 +++---
- include/range/v3/view/split.hpp | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/include/range/v3/view/chunk.hpp b/include/range/v3/view/chunk.hpp
-index 0c03cf1eb..b8df13303 100644
---- a/include/range/v3/view/chunk.hpp
-+++ b/include/range/v3/view/chunk.hpp
-@@ -313,8 +313,8 @@ namespace ranges
-
- public:
- inner_view() = default;
-- constexpr explicit inner_view(chunk_view_ & view) noexcept
-- : rng_{&view}
-+ constexpr explicit inner_view(chunk_view_ * view) noexcept
-+ : rng_{view}
- {}
- CPP_auto_member
- constexpr auto CPP_fun(size)()(
-@@ -338,7 +338,7 @@ namespace ranges
- constexpr inner_view read() const
- {
- RANGES_EXPECT(!done());
-- return inner_view{*rng_};
-+ return inner_view{rng_};
- }
- constexpr bool done() const
- {
-diff --git a/include/range/v3/view/split.hpp b/include/range/v3/view/split.hpp
-index facf1b37f..496220e4a 100644
---- a/include/range/v3/view/split.hpp
-+++ b/include/range/v3/view/split.hpp
-@@ -389,19 +389,19 @@ namespace ranges
- split_outer_iterator() = default;
-
- CPP_member
-- constexpr explicit CPP_ctor(split_outer_iterator)(Parent & parent)(
-+ constexpr explicit CPP_ctor(split_outer_iterator)(Parent * parent)(
- /// \pre
- requires (!forward_range))
-- : parent_(&parent)
-+ : parent_(parent)
- {}
-
- CPP_member
-- constexpr CPP_ctor(split_outer_iterator)(Parent & parent,
-+ constexpr CPP_ctor(split_outer_iterator)(Parent * parent,
- iterator_t current)(
- /// \pre
- requires forward_range)
- : Current{std::move(current)}
-- , parent_(&parent)
-+ , parent_(parent)
- {}
-
- template(bool Other)(
-@@ -519,7 +519,7 @@ namespace ranges
- ranges::equal_to> &&
- (forward_range || detail::tiny_range)
- #endif
-- struct RANGES_EMPTY_BASES split_view
-+ struct RANGES_EMPTY_BASES split_view
- : view_interface, is_finite::value ? finite : unknown>
- , private detail::split_view_base>
- {
-@@ -537,17 +537,17 @@ namespace ranges
- #if RANGES_CXX_IF_CONSTEXPR < RANGES_CXX_IF_CONSTEXPR_17
- outer_iterator()> begin_(std::true_type)
- {
-- return outer_iterator()>{*this, ranges::begin(base_)};
-+ return outer_iterator()>{this, ranges::begin(base_)};
- }
- outer_iterator begin_(std::false_type)
- {
- this->curr_ = ranges::begin(base_);
-- return outer_iterator{*this};
-+ return outer_iterator{this};
- }
-
- outer_iterator()> end_(std::true_type) const
- {
-- return outer_iterator{*this, ranges::end(base_)};
-+ return outer_iterator{this, ranges::end(base_)};
- }
- default_sentinel_t end_(std::false_type) const
- {
-@@ -580,11 +580,11 @@ namespace ranges
- {
- #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17
- if constexpr(forward_range)
-- return outer_iterator()>{*this, ranges::begin(base_)};
-+ return outer_iterator()>{this, ranges::begin(base_)};
- else
- {
- this->curr_ = ranges::begin(base_);
-- return outer_iterator{*this};
-+ return outer_iterator{this};
- }
- #else
- return begin_(meta::bool_>{});
-@@ -596,7 +596,7 @@ namespace ranges
- /// \pre
- requires forward_range && forward_range)
- {
-- return {*this, ranges::begin(base_)};
-+ return {this, ranges::begin(base_)};
- }
- CPP_member
- constexpr auto end() //
-@@ -604,14 +604,14 @@ namespace ranges
- /// \pre
- requires forward_range && common_range)
- {
-- return outer_iterator()>{*this, ranges::end(base_)};
-+ return outer_iterator()>{this, ranges::end(base_)};
- }
- constexpr auto end() const
- {
- #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17
- if constexpr(forward_range && forward_range &&
- common_range)
-- return outer_iterator{*this, ranges::end(base_)};
-+ return outer_iterator{this, ranges::end(base_)};
- else
- return default_sentinel;
- #else
diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix
index d3fc35bbfc7d..ae4b5176e3af 100644
--- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix
+++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rapidfuzz-cpp";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "rapidfuzz-cpp";
rev = "v${version}";
- hash = "sha256-S92ookWpQ4OW53oYXPiCokUchI+47CILDR5RXxPJbmU=";
+ hash = "sha256-LhMubYSq5EO4Pup+mVPQpcXwur/bPz+NZ1CcyqDt6lM=";
};
patches = [
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index eaaf621900ad..868300190bb4 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -16,12 +16,12 @@ else
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-bap";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap";
rev = "v${version}";
- sha256 = "1xc8zfcwm40zihs3ajcrh2x32xd08qnygay03qy3qxhybr5hqngr";
+ sha256 = "1c30zxn0zyi0wypvjmik3fd6n6a8xjcb102qfnccn1af052bvsrd";
};
sigs = fetchurl {
@@ -66,10 +66,6 @@ stdenv.mkDerivation rec {
patches = [
./curses_is_ncurses.patch
- (fetchpatch {
- url = "https://github.com/BinaryAnalysisPlatform/bap/commit/8b1bba30ebb551256a5b15122e70d07f40184039.patch";
- sha256 = "0il0ik5f6nyqyrlln3n43mz1zpqq34lfnhmp10wdsah4ck2dy75h";
- })
];
preConfigure = ''
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index f9434454df16..7b30f9294dd2 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
- version = "3.27.2";
+ version = "3.27.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
- hash = "sha256-bsehvoX625Lr+5/ieYnIBUMUpkCv3mlDDCCf2UyXsMk=";
+ hash = "sha256-qAkyminqLmO9ea6pwkE4gquJIbwj6cE90dd59wTQbtI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix
index 3aa3116b0f5e..104a74fa2a67 100644
--- a/pkgs/development/python-modules/aiopvapi/default.nix
+++ b/pkgs/development/python-modules/aiopvapi/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiopvapi";
- version = "1.6.19";
+ version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.5";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
owner = "sander76";
repo = "aio-powerview-api";
# no tags on git, no sdist on pypi: https://github.com/sander76/aio-powerview-api/issues/12
- rev = "89711e2a0cb4640eb458767d289dcfa3acafb10f";
- sha256 = "18gbz9rcf183syvxvvhhl62af3b7463rlqxxs49w4m805hkvirdp";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-QXWne6rTL1RjHemJJEuWX6HB2F5VSe7NJtnCpaew/xI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix
index 060da226b937..7b7ff75614de 100644
--- a/pkgs/development/python-modules/aiostream/default.nix
+++ b/pkgs/development/python-modules/aiostream/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "aiostream";
- version = "0.4.4";
+ version = "0.4.5";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "vxgmichel";
repo = pname;
- rev = "v${version}";
- sha256 = "07if27z1h0mg236sj9lc8nl0bqy9sdrj83ls73mrc69h76bzg5xi";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-WOtscg02Dq5YNSAfq4pIyH3oUP/5G+cjBwKB6c+SUVA=";
};
checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ];
diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index e4b4a94bf832..8e8cab580ea8 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -5,11 +5,12 @@
, sqlite
, isPyPy
, python
+, fetchpatch
}:
buildPythonPackage rec {
pname = "apsw";
- version = "3.38.5-r1";
+ version = "3.39.2.1";
format = "setuptools";
disabled = isPyPy;
@@ -18,13 +19,22 @@ buildPythonPackage rec {
owner = "rogerbinns";
repo = "apsw";
rev = "refs/tags/${version}";
- hash = "sha256-pPviSrONGgWZUREMENPt34bpHggR00Kl6DrB40JWm+w=";
+ hash = "sha256-W1uQFya/IQUBAPAjwdCJ1K5LVc4spcYj0dN2YP2vtN0=";
};
buildInputs = [
sqlite
];
+ patches = [
+ # ongoing issue: https://github.com/rogerbinns/apsw/issues/363
+ # apsw needs to know the compile flags of sqlite to match features
+ (fetchpatch {
+ url = "https://github.com/rogerbinns/apsw/commit/e92f019ff785d8e52d381dc541d3f4f8236fb356.patch";
+ hash = "sha256-Zdy0ukfWkak9lTdU5WMNzWNp7uDROJgXLcfvQdfm2Oo=";
+ })
+ ];
+
# Project uses custom test setup to exclude some tests by default, so using pytest
# requires more maintenance
# https://github.com/rogerbinns/apsw/issues/335
diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index 474c342cc5be..31395ad78827 100755
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
- version = "3.26.0";
+ version = "3.28.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "atlassian-api";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-S1+QKSxoBSIebsqhx4OgQAOhNw3P674m/V203ylXB+c=";
+ sha256 = "sha256-a0c/IOy14Pq8IEUKNyOh0/Z/ERGfeeI5aXFL/WpLUxE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
index 1efe4661d6fb..697df2a5d146 100644
--- a/pkgs/development/python-modules/bimmer-connected/default.nix
+++ b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
- version = "0.10.2";
+ version = "0.10.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = "refs/tags/${version}";
- hash = "sha256-DcjkS0tbNZkmU787c+ECW3UntEHeKzOThvbFS4ketzA=";
+ hash = "sha256-3jCxncR7bD0DDAH6vt28eBal9cVI9liLbBCX0IJ2bQ8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index ba83cca9e4ec..179ac7356a86 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "bx-python";
- version = "0.8.13";
+ version = "0.9.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bxlab";
repo = "bx-python";
- rev = "v${version}";
- sha256 = "0r3z02mvaswijalr42ikpa7crvliijy0aigsvp5m0frp05n4irf5";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-Pi4hV3FatCXoXY3nNgqm5UfWYIrpP/v5PzzCi3gmIbE=";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 2e027eaa990c..2d1e8ec09663 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "1.17.0";
+ version = "1.17.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "refs/tags/v${version}";
- hash = "sha256-fBMhrA4zL4XPjQ63AGc5jf585ZpHTBumPievDNfCw7o=";
+ hash = "sha256-uh5XPhLoCnJtVnEDG+/oQvneEL1KLMWfAx+RXH/GCyE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix
index 3e0245ab58d1..16a7f361be71 100644
--- a/pkgs/development/python-modules/classify-imports/default.nix
+++ b/pkgs/development/python-modules/classify-imports/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "classify-imports";
- version = "4.1.0";
+ version = "4.2.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "asottile";
repo = pname;
rev = "v${version}";
- hash = "sha256-w/+Sf2ZVSDmFNPICJfAKzfukcznWyFBhi7hjIELtYGI=";
+ hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU=";
};
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix
index 3bac60d0e7d7..77e47f07dc4c 100644
--- a/pkgs/development/python-modules/connexion/default.nix
+++ b/pkgs/development/python-modules/connexion/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "connexion";
- version = "2.14.0";
+ version = "2.14.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "spec-first";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-5+OZvJG68jZZsfOuOqsCUSPLV6vvjk9msJzjsCwo0jw=";
+ hash = "sha256-8nWNFYW4DWAzIAsxgWPXOodlc2tuuGOktNo4N1G1oOc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index 65ff9a4c8c85..9d7b58db9b55 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "deezer-python";
- version = "5.5.0";
+ version = "5.6.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "browniebroke";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-VwN/EkJ2LtbCqSelPVl33dD1MFSlypUXmyw4FnH0ee4=";
+ hash = "sha256-fj3Qp5Z7mt+NnzZhaXDDW4T+ZP6g0nT/cIhI04dqW7Y=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix
index 6ef09febb6ef..8b697fe2442c 100644
--- a/pkgs/development/python-modules/elastic-apm/default.nix
+++ b/pkgs/development/python-modules/elastic-apm/default.nix
@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "elastic-apm";
- version = "6.11.0";
+ version = "6.12.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -36,8 +36,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "elastic";
repo = "apm-agent-python";
- rev = "v${version}";
- hash = "sha256-ZmvOyEkXp0PEDHWcuGT91mhXwV2E6SPlrWBY/sNiRmc=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-tAX96aOPuwtchLk5A1ANuZI5w5H9/yX3Zj9bRSyHv90=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 9e49e4a2239a..864a5e47f214 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "fakeredis";
- version = "1.9.0";
+ version = "1.9.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc";
repo = "fakeredis-py";
rev = "refs/tags/v${version}";
- hash = "sha256-HmCF1CNZOCdvuJv3qr3qAWIP9wYr6053FToQyJ1MpmQ=";
+ hash = "sha256-3jsTNwxUZzkNxutYqK8lI37Cexrii6QydikW/TkUqbk=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix
index ea101117c135..294d7dc02c4b 100644
--- a/pkgs/development/python-modules/gcal-sync/default.nix
+++ b/pkgs/development/python-modules/gcal-sync/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "gcal-sync";
- version = "0.10.0";
+ version = "0.11.0";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "gcal_sync";
rev = "refs/tags/${version}";
- hash = "sha256-RwQOLeOGxT8FijDSrByhZC/T8pFRDfJbA1eAQ1l4qUU=";
+ hash = "sha256-7eaAgGVPzBc2A57VAlLZvz+SYl8G7hv2iCDAOh8Gmoc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index a5637da383e8..260c67bed733 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
- version = "1.8.2";
+ version = "1.9.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-PJ1qqLAAyTmOqfLDxV2IASX9nnHOQTfAwSAotC4qlLQ=";
+ hash = "sha256-T+a154A4EakPGk7OL65mweveLBEL1ol3ZYYh2MTyxy8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix
index 926da5784b1a..ec3bb8354164 100644
--- a/pkgs/development/python-modules/graphene/default.nix
+++ b/pkgs/development/python-modules/graphene/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "graphene";
- version = "3.1.0";
+ version = "3.1.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "graphql-python";
repo = "graphene";
- rev = "v${version}";
- sha256 = "sha256-fKvaor9tOsJWXFMAH0/iDQi5NYJPec2sJevbQsKhQQ4=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-04ocm/Q/CDi5dRNhReuvr5nAiowMZUJrZol/wJOjG50=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix
index 40b7b0be6879..a681cd57679e 100644
--- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix
+++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "graphql-subscription-manager";
- version = "0.6.0";
+ version = "0.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "PyGraphqlWebsocketManager";
rev = "refs/tags/${version}";
- hash = "sha256-5+KHPm/JuazObvuC2ip6hwQxvjJH/lDgukJMH49cuwg=";
+ hash = "sha256-C/awtoADq46XMGd+KwTtd1qv257FXkr6YUc/yqCQvHA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 4dd83f11192e..9e03183e2eb7 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "2022.8.15";
+ version = "2022.9.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-//qtDLU5wXE0ZrkxYI+rOgIu9cLwCbeuMtM57cE1CxA=";
+ sha256 = "sha256-LFgbZIEtHAnLPb5JPU//tAXKsvSidqT/JsVIr5uoKNs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix
index fb67dd34c7b5..d3e8c70a9b79 100644
--- a/pkgs/development/python-modules/http-message-signatures/default.nix
+++ b/pkgs/development/python-modules/http-message-signatures/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "http-message-signatures";
- version = "0.4.3";
+ version = "0.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pyauth";
repo = pname;
rev = "v${version}";
- hash = "sha256-CMF9p913P04Hx/221ck1e0AoAsP7aXkX2UKp4S1nnU0=";
+ hash = "sha256-acTziJM5H5Td+eG/LNrlNwgpVvFDyl/tf6//YuE1XZk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix
index fae5a8abf034..5ab12b4ec667 100644
--- a/pkgs/development/python-modules/ignite/default.nix
+++ b/pkgs/development/python-modules/ignite/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "ignite";
- version = "0.4.9";
+ version = "0.4.10";
src = fetchFromGitHub {
owner = "pytorch";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-KBEoMV9lwlEra4DiGDLgPb85+HrnK4Qiy3XYDa9hO3s=";
+ sha256 = "sha256-mMiEVenDBNmeXMrDSZamUpnSm+4BQEgfK89zxIaFMio=";
};
checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];
diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix
index aa8d2acf1c94..8fa13fcc0cc2 100644
--- a/pkgs/development/python-modules/itemloaders/default.nix
+++ b/pkgs/development/python-modules/itemloaders/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "itemloaders";
- version = "1.0.5";
+ version = "1.0.6";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "scrapy";
repo = pname;
- rev = "v${version}";
- hash = "sha256-ueq1Rsuae+wz4eFc1O7luBVR4XWGbefpDr124H6j56g=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-ZzpWIJNDve6SvLDb+QUDVSXUfJabFuRwtyBeCUasUgY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix
index 24c4f11b6759..d3c6f0d5b311 100644
--- a/pkgs/development/python-modules/levenshtein/default.nix
+++ b/pkgs/development/python-modules/levenshtein/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "levenshtein";
- version = "0.20.2";
+ version = "0.20.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "Levenshtein";
rev = "refs/tags/v${version}";
- hash = "sha256-zVYfErh9tts3yPgXqqeX6xp8o+gLd7nN64+Ml6YZfjE=";
+ hash = "sha256-oPG7qAzsUPKfLxjriS4/1fFjRu+FkceP87h2vC0OTBE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix
index 7ad697d341b1..372d9b653363 100644
--- a/pkgs/development/python-modules/life360/default.nix
+++ b/pkgs/development/python-modules/life360/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "life360";
- version = "5.0.0";
+ version = "5.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pnbruckner";
repo = pname;
- rev = "v${version}";
- hash = "sha256-cIyN69rDuP83jjjqJ0Zc1XN8fVMbfhHKfKJNDqi6gdc=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-/daZ/R3qhdPfvdGra0W0rEEXl6Bux5O8oTuEuCkO3bE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix
index f27897a7e1ed..915a0154fd86 100644
--- a/pkgs/development/python-modules/losant-rest/default.nix
+++ b/pkgs/development/python-modules/losant-rest/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "losant-rest";
- version = "1.16.3";
+ version = "1.16.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Losant";
repo = "losant-rest-python";
rev = "v${version}";
- sha256 = "sha256-s9WPr5sFSyPIDRgRYcD55iRLhaVIvkiDGg/m//6acFY=";
+ sha256 = "sha256-dwlLoRRY1Fx1VBOGIJr//zFPf0WpOabS3HuCxHsn4HI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix
index c1bd721fc118..c7ceeb0d4f77 100644
--- a/pkgs/development/python-modules/mne-python/default.nix
+++ b/pkgs/development/python-modules/mne-python/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "mne-python";
- version = "1.1.0";
+ version = "1.1.1";
# PyPI dist insufficient to run tests
src = fetchFromGitHub {
owner = "mne-tools";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-p4brwO6uERM2vJdkJ34GdeAKk07QeVEmQrZMPcDjI2I=";
+ sha256 = "sha256-VM7sKcQeAeK20r4/jehhGlvBSHhYwA2SgsNL5Oa/Hug=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix
index cc6cef776691..f299c4900f27 100644
--- a/pkgs/development/python-modules/pymanopt/default.nix
+++ b/pkgs/development/python-modules/pymanopt/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pymanopt";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-dqyduExNgXIbEFlgkckaPfhLFSVLqPgwAOyBUdowwiQ=";
+ sha256 = "sha256-VwCUqKI1PkR8nUVaa73bkTw67URKPaza3VU9g+rB+Mg=";
};
propagatedBuildInputs = [ numpy scipy torch ];
diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix
index f3dcdf6c45a7..d11cf4917d15 100644
--- a/pkgs/development/python-modules/pymetno/default.nix
+++ b/pkgs/development/python-modules/pymetno/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pymetno";
- version = "0.9.0";
+ version = "0.10.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "PyMetno";
- rev = version;
- sha256 = "sha256-2LNDFQObGqxrzswnqbmvCGLxEI0j+cIdv8o+RZM/7sM=";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-Do9RQS4gE2BapQtKQsnMzJ8EJzzxkCBA5r3z1zHXIsA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix
index 3401e905a1a0..3d681c75daa8 100644
--- a/pkgs/development/python-modules/pyosmium/default.nix
+++ b/pkgs/development/python-modules/pyosmium/default.nix
@@ -5,7 +5,7 @@
buildPythonPackage rec {
pname = "pyosmium";
- version = "3.3.0";
+ version = "3.4.1";
disabled = pythonOlder "3.4" || isPyPy;
@@ -13,7 +13,7 @@ buildPythonPackage rec {
owner = "osmcode";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-vXxRXr+hRrA9oPf8wAS4qQT258Vz+KRSqYwwD6HrDxk=";
+ sha256 = "sha256-PMQnQe699ZWRR2gevrSCTokyc9xr1TL9Ohuqn7NL8c8=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index 6c7d10b42040..5ff1898c98c7 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
- version = "1.5.0";
+ version = "1.5.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "refs/tags/v${version}";
- hash = "sha256-xshqcAXj6lGpnTIHhx1A2c+Vso1q8kAwZW7v6XIilj0=";
+ hash = "sha256-3vtyVXWfAIUZuV0kcnT6UniMaHTw11Az7vHdjyouPbI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix
index d9522d63a745..b183b20a5272 100644
--- a/pkgs/development/python-modules/pypdf2/default.nix
+++ b/pkgs/development/python-modules/pypdf2/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "PyPDF2";
- version = "2.10.4";
+ version = "2.10.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-8JDF/HmQz1ptY2TOI2KDSXTjITbVIpG6uyNy5dZH0Yg=";
+ sha256 = "sha256-kSKmRB9sELkrAmKpX5wE9VL+RJjybn3G49JvwKWBU84=";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix
index 0f6a9407f49d..4f79d50e3673 100644
--- a/pkgs/development/python-modules/pypinyin/default.nix
+++ b/pkgs/development/python-modules/pypinyin/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pypinyin";
- version = "0.47.0";
+ version = "0.47.1";
src = fetchFromGitHub {
owner = "mozillazg";
repo = "python-pinyin";
rev = "refs/tags/v${version}";
- sha256 = "sha256-DsSrWbnBFEGQTXP1+C8j5RqSplDitsFl+13YwwE+3pE=";
+ sha256 = "sha256-c9pEO9k5tCFWLPismrXrrYEQYmxYKkciXFgpbrDEGzE=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix
index f5817917c9ab..5bdf9979de9d 100644
--- a/pkgs/development/python-modules/pysensibo/default.nix
+++ b/pkgs/development/python-modules/pysensibo/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pysensibo";
- version = "1.0.18";
+ version = "1.0.19";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "andrey-git";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-sFEeN72+h6yFQFluhOQfxoVJPB5lCpFnlJfLnRxVjFg=";
+ hash = "sha256-pqg+NsdbSyXgC+4/AtbI4BZ5h2pMhvvBdQI9lHj6HME=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 248ccc41033b..f1e2a90daa9e 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyslurm";
- version = "21.08.4";
+ version = "22.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
repo = "pyslurm";
owner = "PySlurm";
- rev = "v${version}";
- hash = "sha256-9ZYTBO8g+5B9D8Ll5JjkJYFyh0RQNIjxg958UZoCNmA=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-Uh0P7Kevcc78vWT/Zk+MUCKh2AlDiRR3MO/nOke2yP0=";
};
buildInputs = [ cython slurm ];
diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix
index ee7774654524..b977bc2d0c20 100644
--- a/pkgs/development/python-modules/python-smarttub/default.nix
+++ b/pkgs/development/python-modules/python-smarttub/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "python-smarttub";
- version = "0.0.32";
+ version = "0.0.33";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mdz";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-3qAs0vL6YGFDsMFC3KAhSc/axxVOll/SOswaJgVi9Hc=";
+ sha256 = "sha256-BGG5SQfVxhp6ID2Ob+afm75cInVixSPD5012K4HwthU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
index 639c13508c57..e3c27eda9ef1 100644
--- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
+++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pytorch-pfn-extras";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "pfnet";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-w4WSEgNLdVLDnKS4kzJBK9BkrrGzbk2aCIhk4HCM/Bk=";
+ sha256 = "sha256-wxTs/hfgqJn4DCxZj87V/zDKZc+thx3o5bWAvZe7EJU=";
};
propagatedBuildInputs = [ numpy packaging torch typing-extensions ];
diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix
index 13c8107c9aef..dcd23aadb150 100644
--- a/pkgs/development/python-modules/surepy/default.nix
+++ b/pkgs/development/python-modules/surepy/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "surepy";
- version = "0.7.2";
+ version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "benleb";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-yc+jXA4ndFhRZmFPz11HbVs9qaPFNa6WdwXj6hRyjw4=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-/fgNznsucjHPO44lK4tk5tDJHKjCJEbPtOO7YHmDcRQ=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/toml-adapt/default.nix b/pkgs/development/python-modules/toml-adapt/default.nix
new file mode 100644
index 000000000000..0ff06f43093f
--- /dev/null
+++ b/pkgs/development/python-modules/toml-adapt/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, click
+, fetchFromGitHub
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+, toml
+}:
+
+buildPythonPackage rec {
+ pname = "toml-adapt";
+ version = "0.2.8";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "firefly-cpp";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-9auZZl6c+EfAO/2QaHW5BI1aDZkIIGU+fwzudIdFWqI=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ click
+ toml
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "toml_adapt"
+ ];
+
+ meta = with lib; {
+ description = "A simple Command-line interface for manipulating toml files";
+ homepage = "https://github.com/firefly-cpp/toml-adapt";
+ license = licenses.mit;
+ maintainers = with maintainers; [ firefly-cpp ];
+ };
+}
diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix
index b488ad8eaed7..5af50d2d13d9 100644
--- a/pkgs/development/python-modules/tweepy/default.nix
+++ b/pkgs/development/python-modules/tweepy/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "tweepy";
- version = "4.10.0";
+ version = "4.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-D/cArsGzWr+rCC9iW9qOfc5fT7UKZDupeR/rQMNK5I4=";
+ hash = "sha256-S8lF40ioarnR1ZDSy6/9arANDYvy0NpYlVi65LQlPA8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix
index 8d8fe83c527c..549e7f480b08 100644
--- a/pkgs/development/python-modules/wktutils/default.nix
+++ b/pkgs/development/python-modules/wktutils/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "wktutils";
- version = "1.1.5";
+ version = "1.1.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "asfadmin";
repo = "Discovery-WKTUtils";
rev = "refs/tags/v${version}";
- hash = "sha256-nAmU51f7K2n69G/vlLTji9EpMU1ynUpj/bZVZsaDEwM=";
+ hash = "sha256-PFeIMIFOff9ztdmIP7jcFzKkmhm01G0QnDm20AafUsg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
index 1a8d561d5de2..d2c1691cb316 100644
--- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix
+++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "yalesmartalarmclient";
- version = "0.3.8";
+ version = "0.3.9";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "domwillcode";
repo = "yale-smart-alarm-client";
- rev = "v${version}";
- sha256 = "sha256-CWL1uvmUGLaa2Ho0Ka4wTWstebhe1nQr9R821mweE60=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-Zpj1lLaxiTaYpcj1R/ktuVldl/r19r7fzNKvnSIDq80=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index b3566a6ad35e..5c5e7c2d530b 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bazelisk";
- version = "1.13.2";
+ version = "1.14.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/6px3S03HJ5W03phGzJTzZ0ROcfA9eKXP+xfBrix1DM=";
+ sha256 = "sha256-y3DVU2xHYZGUqf+kXhBDpTHACloqOXiMFY9bWU/QfOg=";
};
vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg=";
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 71b8f5515d03..3229f2287168 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -3,16 +3,16 @@
nixosTests }:
buildGoModule rec {
pname = "buildkite-agent";
- version = "3.38.0";
+ version = "3.39.0";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
- sha256 = "sha256-W93yvdyfk6niSZ/usiOp6Yb8tFgEuC3UmJI6zDEHsFY=";
+ sha256 = "sha256-wEi14Iax155S2tr+Qxa3figXPDKKIdFcwDYv/nsLScQ=";
};
- vendorSha256 = "sha256-n+n+Fank/L8mVCB7ulVXJkpJpr65ELirtBqScot2ANM=";
+ vendorSha256 = "sha256-RD8BXwzrqHwgxdjpL++a9pIvzD9rfSTqguRVh+CbbnE=";
postPatch = ''
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix
index 94232f7038c3..5a8a6c4a0754 100644
--- a/pkgs/development/tools/continuous-integration/github-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix
@@ -43,13 +43,13 @@ let
in
stdenv.mkDerivation rec {
pname = "github-runner";
- version = "2.296.1";
+ version = "2.296.2";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
- hash = "sha256-vE1x/wRzjcRR56jUgW8PVM2SzsG87IKXOZghloZBgYM=";
+ hash = "sha256-Cpg17N4LXjMpKx9SB6Bq/1eKJH5B8yVDUwjxak7xykY=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix
index 9d5436ba1712..afcc19d4431d 100644
--- a/pkgs/development/tools/ddosify/default.nix
+++ b/pkgs/development/tools/ddosify/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddosify";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-GvRooRsSLny+KZcro/rmagp4QAt4U52THiqTWqdvhK8=";
+ sha256 = "sha256-Mv56NpzDBsqzHwUkqL6d828E3hVrNT9FXLL6IqWJYeQ=";
};
vendorSha256 = "sha256-mq82KNa01gHvW+RUREra+ysaJ1YWIwX0v/uYMxmFN4M=";
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index f3a5ab297eeb..2f40aed044bf 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "go-bindata";
- version = "3.23.0";
+ version = "3.24.0";
goPackagePath = "github.com/kevinburke/go-bindata";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "kevinburke";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-pIEkD0HD/6JFOzkvEG9j9yQP7hLWvmXU3MiyvVFH2rY=";
+ sha256 = "sha256-dEfD5oV2nXLVg+a7PlB6LqhEBosG7eTptqKKDWcQAss=";
};
subPackages = [ "go-bindata" ];
diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix
index 60ede8af0a56..31af0aae0e6c 100644
--- a/pkgs/development/tools/gopls/default.nix
+++ b/pkgs/development/tools/gopls/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gopls";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchFromGitHub {
owner = "golang";
repo = "tools";
rev = "gopls/v${version}";
- sha256 = "sha256-4bhKNMhC8kLRpS5DR6tLF7MgDX4LDeSKoeXcPYC2ywE=";
+ sha256 = "sha256-kDO7Sxz2pqZZBG2eGAWyh9UTAoYLzkAn86qh9LdepoU=";
};
modRoot = "gopls";
- vendorSha256 = "sha256-r7XM7VX0VzFlUqrtvaQaiUXXiD1Vz4C3hmxRMonORAw=";
+ vendorSha256 = "sha256-ny+gD3ZXp6ZncWJtpW9fprYojQBkIUL+FEKp/7K5rrU=";
doCheck = false;
diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
index 56e55ac68f42..421076e5c6d5 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ktlint";
- version = "0.47.0";
+ version = "0.47.1";
src = fetchurl {
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
- sha256 = "sha256-NuNkEBjFWUkiFKud1sMFdYkO2z2EA03XPaylC0YxY4Q=";
+ sha256 = "sha256-ozOtAXI2mlzZc66oPgLotpjAai2qxvMpJdoDBJqj3Oc=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix
index 98ad6a7a05ee..e5100aeaee6e 100644
--- a/pkgs/development/tools/millet/default.nix
+++ b/pkgs/development/tools/millet/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
- version = "0.3.6";
+ version = "0.3.8";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-HV/0ORI3siAnVyLcNDzu4BwK/sFO841ptQoxK6c+1Xs=";
+ sha256 = "sha256-RTOFwgs9A7ESWT8g5EcVzmv9UGON/+cNj21VC8bURlk=";
};
- cargoSha256 = "sha256-jhn795bTcqOG60yzydWJ5Y9eR2UTVUBteuMw03M7wM0=";
+ cargoSha256 = "sha256-/yUyvFTaoQQ4Ttlp1IHye9Iu7iD2W/yhuHKC3Seu6k0=";
cargoBuildFlags = [ "--package" "lang-srv" ];
diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix
index c0489cdab04b..827a3bd4d536 100644
--- a/pkgs/development/tools/misc/devspace/default.nix
+++ b/pkgs/development/tools/misc/devspace/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "devspace";
- version = "6.0.1";
+ version = "6.1.0";
src = fetchFromGitHub {
owner = "loft-sh";
repo = "devspace";
rev = "v${version}";
- sha256 = "sha256-YT/DGxdsMXjCp908U2jfkQpDBPCTNjObdeIj06Bum/U=";
+ sha256 = "sha256-pbI49oklxTu02YNIA1uxcDqWwGf3LaKipErDHCVxRRc=";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix
index 8b85d80b6931..f7f272a1341f 100644
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "oh-my-posh";
- version = "8.37.1";
+ version = "9.0.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZiDrG1GkUple+Q+MoNQlHdbq3P8PeQFWvxMC9dh7VTM=";
+ sha256 = "sha256-0f7rA/GxXgIeJ9hh/g+MpAPdPW8NzaVKLApYyrhlIVM=";
};
vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";
diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix
index 71fb31f13162..f9def6885e7b 100644
--- a/pkgs/development/tools/open-policy-agent/default.nix
+++ b/pkgs/development/tools/open-policy-agent/default.nix
@@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
buildGoModule rec {
pname = "open-policy-agent";
- version = "0.43.0";
+ version = "0.44.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
- sha256 = "sha256-ZxMeYWrUnNoCUgYrg/f3C19kGeN81boTfJRSpZZ/GL4=";
+ sha256 = "sha256-N5OVGffUJXbRN3eJ5LQHWpyYxuA1/JEsro/yi+qHF14=";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 337ff0dda753..dec12ef677aa 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -1,22 +1,33 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config, libiconv, curl }:
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, libgit2
+, openssl
+, stdenv
+, Security
+}:
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
- version = "0.14.0";
+ version = "0.16.0";
src = fetchFromGitHub {
- owner = "ashleygwilliams";
+ owner = "cargo-generate";
repo = "cargo-generate";
rev = "v${version}";
- sha256 = "sha256-OYYGOB1NfNnOl8bd8KozgMCyW4Gb39LoFtD80DPzpdw=";
+ sha256 = "sha256-qL5ZbLimpsi/7yuhubHF3/tAouE/5zCWRx4nZG841cU=";
};
- cargoSha256 = "sha256-qmRKjPhPLpzVVuTHuoo0iTlX3BnT2Udo1kFXvA3zNQE=";
+ # patch Cargo.toml to not vendor libgit2 and openssl
+ cargoPatches = [ ./no-vendor.patch ];
+
+ cargoSha256 = "sha256-OB3rjJNxkUKRQPsWRvCniNPfYBgLFV4yXO7dnVvL7wo=";
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openssl ]
- ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
+ buildInputs = [ libgit2 openssl ]
+ ++ lib.optionals stdenv.isDarwin [ Security ];
preCheck = ''
export HOME=$(mktemp -d) USER=nixbld
@@ -32,8 +43,9 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "cargo, make me a project";
- homepage = "https://github.com/ashleygwilliams/cargo-generate";
- license = licenses.asl20;
- maintainers = [ maintainers.turbomack ];
+ homepage = "https://github.com/cargo-generate/cargo-generate";
+ changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${version}/CHANGELOG.md";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ figsoda turbomack ];
};
}
diff --git a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch
new file mode 100644
index 000000000000..0c3b18de211c
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -10,7 +10,7 @@ include = ["src/**/*", "LICENSE-*", "*.md"]
+
+ [dependencies]
+ clap = { version = "3.2", features = ["derive", "std"], default-features = false }
+-git2 = { version = "0.14", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false }
++git2 = { version = "0.14", features = ["ssh", "https"], default-features = false }
+ console = "0.15"
+ dialoguer = "0.10"
+ dirs = "4.0"
diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix
index bba6c791216c..983156c2c05d 100644
--- a/pkgs/development/tools/rust/cargo-public-api/default.nix
+++ b/pkgs/development/tools/rust/cargo-public-api/default.nix
@@ -8,14 +8,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
- version = "0.18.0";
+ version = "0.19.0";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-h5eLJyrk5n2lSSeAT6YHDALay7CsN/xApl3j0s3pIjc=";
+ sha256 = "sha256-gtqPt59jA4NhbaE9ij45oFEaAJ+l984lWEjloQtBSSE=";
};
- cargoSha256 = "sha256-1zt3q04LPER+Kvp6EQHziWzYeckFYO9MmPRlHto2Juo=";
+ cargoSha256 = "sha256-j0bsuu+A5oCf+0pFM4PAQ3oqq9POc5rrzt5UR0RDnAw=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
new file mode 100644
index 000000000000..ce6cd32fa553
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
@@ -0,0 +1,29 @@
+{ lib, rustPlatform, fetchFromGitHub, makeWrapper, zig }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-zigbuild";
+ version = "0.12.0";
+
+ src = fetchFromGitHub {
+ owner = "messense";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-nBncU5rM3gS5e/Qs14U/ZwAkLFLdNuO2DhSQW+7xGQk=";
+ };
+
+ cargoSha256 = "sha256-Zq+RG36aeNd8G+LSdiyLK8SYC0MckGUIBTvia4H9OJY=";
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ wrapProgram $out/bin/cargo-zigbuild \
+ --prefix PATH : ${zig}/bin
+ '';
+
+ meta = with lib; {
+ description = "A tool to compile Cargo projects with zig as the linker";
+ homepage = "https://github.com/messense/cargo-zigbuild";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index eb9478096ab6..c2d839a36efb 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "yq-go";
- version = "4.27.3";
+ version = "4.27.5";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
- sha256 = "sha256-JEIKkiqVkzSXyZBAcZASHkn8MKoFZe52vKqrdJ4kX+I=";
+ sha256 = "sha256-ZUrpmGNrLJuslcHXWERxNQBfUYutXaCSq13ajFy+D28=";
};
- vendorSha256 = "sha256-yv/qft4KpGi4xDfaQoylq1TanATUz5wd3a6RBlILG+s=";
+ vendorSha256 = "sha256-4J/Qz5JN8UUdwa3/Io2/o4Y01eFK9zOcNAZkndzI178=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
index 6301ec28c101..a11e0f4cb975 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/pkgs/development/web/valum/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "valum";
- version = "0.3.17";
+ version = "0.3.18";
src = fetchFromGitHub {
owner = "valum-framework";
repo = "valum";
rev = "v${version}";
- sha256 = "sha256-GpzFtr6MueHGHA6BEc24oGSfjxyHxIlL52cq+0gmBAI=";
+ sha256 = "sha256-baAv83YiX8HdBm/t++ktB7pmTVlt4aWZ5xnsAs/NrTI=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix
index f9a453195f74..32c9ddb65347 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/games/blightmud/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "blightmud";
- version = "3.6.2";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-0TFJjOuaixBqpo6gHJynIbVHvI+PxRhwdubIXDcR098=";
+ sha256 = "sha256-80uTwbZjXoQnfP0VWM/CnvaHyRsPA1puASJwBm3GqJk=";
};
- cargoSha256 = "sha256-jTyXoEC/QBeVbAnv2BspflGP1jA9qH+NPrRAx3x2kEg=";
+ cargoSha256 = "sha256-uXr/5G0TH3EKqPwUKTwOguBExBEYB1D3/hr8nzOwCcM=";
buildFeatures = lib.optional withTTS "tts";
diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix
new file mode 100644
index 000000000000..b2b2ee68ff09
--- /dev/null
+++ b/pkgs/games/classicube/default.nix
@@ -0,0 +1,87 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, dos2unix
+, makeWrapper
+, SDL2
+, libGL
+, curl
+, openal
+, liberation_ttf
+}:
+
+stdenv.mkDerivation rec {
+ pname = "ClassiCube";
+ version = "1.3.2";
+
+ src = fetchFromGitHub {
+ owner = "UnknownShadow200";
+ repo = "ClassiCube";
+ rev = version;
+ sha256 = "6a0f7b03ef3a7f74cf42ffa5b88ab1a7b7beb4d864871a1b700465343ae74bb6";
+ };
+
+ nativeBuildInputs = [ dos2unix makeWrapper ];
+
+ prePatch = ''
+ # The ClassiCube sources have DOS-style newlines
+ # which causes problems with diff/patch.
+ dos2unix 'src/Platform_Posix.c' 'src/Core.h'
+ '';
+
+ patches = [
+ # Fix hardcoded font paths
+ ./font-location.patch
+ # ClassiCube doesn't compile with its X11 backend
+ # because of issues with libXi.
+ ./use-sdl.patch
+ # For some reason, the Makefile doesn't link
+ # with libcurl and openal when ClassiCube requires them.
+ # Also links with SDL2 instead of libX11 and libXi.
+ ./fix-linking.patch
+ ];
+
+ font_path = "${liberation_ttf}/share/fonts/truetype";
+
+ enableParallelBuilding = true;
+
+ postPatch = ''
+ # ClassiCube hardcodes locations of fonts.
+ # This changes the hardcoded location
+ # to the path of liberation_ttf instead
+ substituteInPlace src/Platform_Posix.c \
+ --replace '%NIXPKGS_FONT_PATH%' "${font_path}"
+ # ClassiCube's Makefile hardcodes JOBS=1 for some reason,
+ # even though it works perfectly well multi-threaded.
+ substituteInPlace src/Makefile \
+ --replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES"
+ '';
+
+ buildInputs = [ SDL2 libGL curl openal liberation_ttf ];
+
+ preBuild = "cd src";
+
+ postBuild = "cd -";
+
+ installPhase = ''
+ mkdir -p "$out/bin"
+ cp 'src/ClassiCube' "$out/bin"
+ # ClassiCube puts downloaded resources
+ # next to the location of the executable by default.
+ # This doesn't work with Nix
+ # as the location of the executable is read-only.
+ # We wrap the program to make it put its resources
+ # in ~/.local/share instead.
+ wrapProgram "$out/bin/ClassiCube" \
+ --run 'mkdir -p "$HOME/.local/share/ClassiCube"' \
+ --add-flags '-d"$HOME/.local/share/ClassiCube"'
+ '';
+
+ meta = with lib; {
+ homepage = "https://www.classicube.net/";
+ description = "A lightweight, custom Minecraft Classic/ClassiCube client with optional additions written from scratch in C";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ _360ied ];
+ };
+}
diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/games/classicube/fix-linking.patch
new file mode 100644
index 000000000000..987c882367ee
--- /dev/null
+++ b/pkgs/games/classicube/fix-linking.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index 83188ce..3439cdb 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -40,7 +40,7 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9
+ endif
+
+ ifeq ($(PLAT),linux)
+-LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl
++LIBS=-lSDL2 -lpthread -lGL -lm -ldl -lcurl -lopenal
+ endif
+
+ ifeq ($(PLAT),sunos)
diff --git a/pkgs/games/classicube/font-location.patch b/pkgs/games/classicube/font-location.patch
new file mode 100644
index 000000000000..48428a8bb94f
--- /dev/null
+++ b/pkgs/games/classicube/font-location.patch
@@ -0,0 +1,16 @@
+diff --git a/src/Platform_Posix.c b/src/Platform_Posix.c
+index bca992d..3540afa 100644
+--- a/src/Platform_Posix.c
++++ b/src/Platform_Posix.c
+@@ -440,9 +440,8 @@ void Platform_LoadSysFonts(void) {
+ String_FromConst("/Library/Fonts")
+ };
+ #else
+- static const cc_string dirs[2] = {
+- String_FromConst("/usr/share/fonts"),
+- String_FromConst("/usr/local/share/fonts")
++ static const cc_string dirs[1] = {
++ String_FromConst("%NIXPKGS_FONT_PATH%")
+ };
+ #endif
+ for (i = 0; i < Array_Elems(dirs); i++) {
diff --git a/pkgs/games/classicube/use-sdl.patch b/pkgs/games/classicube/use-sdl.patch
new file mode 100644
index 000000000000..3456ef8b6469
--- /dev/null
+++ b/pkgs/games/classicube/use-sdl.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Core.h b/src/Core.h
+index e94a39e..96527d0 100644
+--- a/src/Core.h
++++ b/src/Core.h
+@@ -170,7 +170,7 @@ Thus it is **NOT SAFE** to allocate a string on the stack. */
+ #define CC_BUILD_LINUX
+ #define CC_BUILD_POSIX
+ #define CC_BUILD_GL
+-#define CC_BUILD_X11
++#define CC_BUILD_SDL
+ #define CC_BUILD_CURL
+ #define CC_BUILD_OPENAL
+ #if defined CC_BUILD_RPI
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 57825e781cae..c2489e5d033e 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, openal, fluidsynth
, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123
, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }:
@@ -52,6 +52,13 @@ let
zmusic
];
+ patches = [
+ (fetchpatch { # TODO: Delete me when upgrading to 4.9
+ url = "https://github.com/ZDoom/gzdoom/commit/aae85a1b9169953d8dcc5f138a477d5c7d75addb.patch";
+ sha256 = "upuLDgVMaGaFSVaDV9Hj13DR5LUma51xv+Mfsz9m9a0=";
+ })
+ ];
+
NIX_CFLAGS_LINK = "-lopenal -lfluidsynth";
desktopItems = [
diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix
index 2f7405725ab9..666e284cfe1d 100644
--- a/pkgs/games/openttd/nml.nix
+++ b/pkgs/games/openttd/nml.nix
@@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "openttd-nml";
- version = "0.6.1";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "OpenTTD";
repo = "nml";
- rev = version;
- hash = "sha256-AmJrPyzPMe2F8geJhhRpO8aj467n1wqldC9iuzElFnw=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-tmipHRe6qXoSLNbc0OEKxBJZrmTX3DEiuSfQeWRj1sU=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix
index 756a17d04f5b..522b13f46250 100644
--- a/pkgs/misc/autotiling/default.nix
+++ b/pkgs/misc/autotiling/default.nix
@@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "autotiling";
- version = "1.6";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
- rev = "v${version}";
- sha256 = "1hjlvg7095s322gb43r9g7mqlsy3pj13l827jpnbn5x0918rq9rr";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-BpBDafpMbK2Xcb+lGzcf5RivhwMCtoQ078EKO9AbE9U=";
};
propagatedBuildInputs = [ i3ipc importlib-metadata ];
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 0146c67f33dd..e6ac31d860a3 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -523,12 +523,12 @@ in rec {
tmux-fzf = mkTmuxPlugin {
pluginName = "tmux-fzf";
rtpFilePath = "main.tmux";
- version = "unstable-2021-10-20";
+ version = "unstable-2022-08-02";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "tmux-fzf";
- rev = "1801dd525b39154745ea668fb6916035023949e3";
- sha256 = "e929Jqletmobp3WAR1tPU3pJuYTYVynxc5CvB80gig8=";
+ rev = "3e261309ad367c3fe56c0ef14af00078684b1035";
+ sha256 = "13wlcq3f7944v74lcnfbmabcy2c0ca83ya21s3qn3j0lw3wqj6vj";
};
postInstall = ''
find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g'
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 82fea2f9b5d6..f42c979417a7 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,42 +2,42 @@
"4.14": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.291-hardened1.patch",
- "sha256": "04fkfk5kdbqavdg5syyv35xbc8dl5pz8vf1xsvfcv30z5rslsr2c",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.291-hardened1/linux-hardened-4.14.291-hardened1.patch"
+ "name": "linux-hardened-4.14.292-hardened1.patch",
+ "sha256": "0l20yxg50azpxm2x4gr37yhkvjw3wlishjm2x8pqwil3g1pxykdi",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.292-hardened1/linux-hardened-4.14.292-hardened1.patch"
},
- "sha256": "15h76l81zn733g8dc6gsymf52nz325plhminv3m4x3klwhav34zc",
- "version": "4.14.291"
+ "sha256": "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h",
+ "version": "4.14.292"
},
"4.19": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.256-hardened1.patch",
- "sha256": "1vqdv2xnfr4ccnfvdrdhj7i0yjhjf48kgc9sziz7fwnfdis8zrrf",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.256-hardened1/linux-hardened-4.19.256-hardened1.patch"
+ "name": "linux-hardened-4.19.257-hardened1.patch",
+ "sha256": "03hv417v0abn6n0zbmypfsjmxb4aqdz23vrykhgn259w4h45w2z9",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.257-hardened1/linux-hardened-4.19.257-hardened1.patch"
},
- "sha256": "0jgm7ydha9achbcq3a6q85wq1nz4qg7phx122jzk0mqb1339bpk7",
- "version": "4.19.256"
+ "sha256": "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga",
+ "version": "4.19.257"
},
"5.10": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.140-hardened1.patch",
- "sha256": "0352nh6r9p3djk07lprjpmd8q17kkqb5pi2zwrywlxrzws4wqhzh",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.140-hardened1/linux-hardened-5.10.140-hardened1.patch"
+ "name": "linux-hardened-5.10.142-hardened1.patch",
+ "sha256": "074w7j8wx2k3lk3ssm9x14wf4gns85l2p6syq4pigkb67gvdphpv",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.142-hardened1/linux-hardened-5.10.142-hardened1.patch"
},
- "sha256": "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4",
- "version": "5.10.140"
+ "sha256": "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz",
+ "version": "5.10.142"
},
"5.15": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.15.64-hardened1.patch",
- "sha256": "08hj5rx37vmw8mapzz15smpp775vrzhbfh2i0xps5qwi9majywrf",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.64-hardened1/linux-hardened-5.15.64-hardened1.patch"
+ "name": "linux-hardened-5.15.67-hardened1.patch",
+ "sha256": "1151dry0ia25rq50vnvrkjsxz5h9zsr6lahld3vilk2p01bv2fc3",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.67-hardened1/linux-hardened-5.15.67-hardened1.patch"
},
- "sha256": "0l6ylmxhk3lqz2zyqcbyhbfcq1p8i84g0p1d6x0q6yd3dy6d78f6",
- "version": "5.15.64"
+ "sha256": "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys",
+ "version": "5.15.67"
},
"5.18": {
"patch": {
@@ -52,21 +52,21 @@
"5.19": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.19.6-hardened1.patch",
- "sha256": "1lx4li0f0j6wmh3p75hr2qa780ckybhma8s34p6xlbvxz054ncpr",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.6-hardened1/linux-hardened-5.19.6-hardened1.patch"
+ "name": "linux-hardened-5.19.8-hardened1.patch",
+ "sha256": "1j7wg4hq06drxr42jl89za1f7x52d4ck5i38p4njz4j415ihsiys",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.8-hardened1/linux-hardened-5.19.8-hardened1.patch"
},
- "sha256": "0fm6xysg5mjfig0jils700ph83mvvkl27ix757260i31mwjgi921",
- "version": "5.19.6"
+ "sha256": "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1",
+ "version": "5.19.8"
},
"5.4": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.211-hardened1.patch",
- "sha256": "061c1c3ha88798l9q3n2dd3ankvw0hlz8f8cisxljpzfj4napk8z",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.211-hardened1/linux-hardened-5.4.211-hardened1.patch"
+ "name": "linux-hardened-5.4.212-hardened1.patch",
+ "sha256": "0vdx78n1aggyfia017h40k6xg7bd2spcv3s4m0kiq693skxzlh4x",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.212-hardened1/linux-hardened-5.4.212-hardened1.patch"
},
- "sha256": "1v1dgsk66fi6x6v9k6hg9ik3f3b3pv7a3gk8mybmgm9cnx0k5d5z",
- "version": "5.4.211"
+ "sha256": "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9",
+ "version": "5.4.212"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index cbcb2d04def4..71eaa0b5c23e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.291";
+ version = "4.14.292";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "15h76l81zn733g8dc6gsymf52nz325plhminv3m4x3klwhav34zc";
+ sha256 = "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index d1923b847e76..8dac0b120a9c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.256";
+ version = "4.19.257";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0jgm7ydha9achbcq3a6q85wq1nz4qg7phx122jzk0mqb1339bpk7";
+ sha256 = "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 4fc1ce1f1e59..c435a82c50dd 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.9.326";
+ version = "4.9.327";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0yw83a8nk5abjsvqrz8m2sj699c228j2f2wr5q8m95vgqzfw5wrb";
+ sha256 = "1lh63viynf9f7vl0a52mnal8jack9lbqfsfammwkxi3kafpw30r2";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 3a08b4a0a457..f17beabecd62 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.140";
+ version = "5.10.142";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4";
+ sha256 = "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix
index 8e0edd8273e0..9b98bb0e4cd0 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.15.64";
+ version = "5.15.67";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0l6ylmxhk3lqz2zyqcbyhbfcq1p8i84g0p1d6x0q6yd3dy6d78f6";
+ sha256 = "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys";
};
} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix
index 42fd32716dac..a6fb0aa1f583 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.19.6";
+ version = "5.19.8";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0fm6xysg5mjfig0jils700ph83mvvkl27ix757260i31mwjgi921";
+ sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1";
};
} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index f08433e50b47..f341bc77d438 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.211";
+ version = "5.4.212";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1v1dgsk66fi6x6v9k6hg9ik3f3b3pv7a3gk8mybmgm9cnx0k5d5z";
+ sha256 = "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 437366d1f6ec..6de38abd07f7 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "18885";
- sha256 = "1ywd4bhjh6pqxvv20jgadmyvrcrdwf8333z8rzbjy6r0b4fggpra";
+ rev = "18904";
+ sha256 = "1l200abijg5y15h4vza86sirlcplm7iyhm3igdyxqj3s0169nck9";
}
, ...
}:
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index 58be2be6e9d2..8b66df9d82e6 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.10.131-rt72"; # updated by ./update-rt.sh
+ version = "5.10.140-rt73"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b";
+ sha256 = "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "0ag000h9m7phvgrqa4jcmd94x0rk8z8bh7qhqqlywbiz2b1b91qa";
+ sha256 = "1abrxwxx3kfmbyabb1hhjpz1l7idrn2g14zx7qix7ds7n9f6dcgf";
};
}; in [ rt-patch ] ++ kernelPatches;
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 54965fd998aa..208c59a3ccbe 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "coredns";
- version = "1.9.3";
+ version = "1.9.4";
src = fetchFromGitHub {
owner = "coredns";
repo = "coredns";
rev = "v${version}";
- sha256 = "sha256-9lRZjY85SD1HXAWVCp8fpzV0d1Y+LbodT3Sp21CNp+k=";
+ sha256 = "sha256-9+DwOSfhX+sNnvLMgHKUQSozXzT9k8u7Q1p8FvbvsTE=";
};
- vendorSha256 = "sha256-gNa+dm7n71IiSCztTO5VZ5FnGTGYfNXo/HMichNzek0=";
+ vendorSha256 = "sha256-L4GzOY7oZlC3Et/kEBXrrQGt5/c3jHZimY7NnjXYSro=";
postPatch = ''
substituteInPlace test/file_cname_proxy_test.go \
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index a55b6d1a0e43..71f6fc366333 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -15,16 +15,16 @@ let
in
buildGoModule rec {
pname = "minio";
- version = "2022-09-01T23-53-36Z";
+ version = "2022-09-07T22-25-02Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "sha256-ceiwLyhpXM6Ia21KPO0nlYMcmLg0aOuCV7Iqb+djJ7o=";
+ sha256 = "sha256-zLnYORTCYuinZEeut5fC1XS1Kj7o4c1Y6GMioSvXII4=";
};
- vendorSha256 = "sha256-ziW1jxlyNiXoYP6z0Uea5XVxV5O094tmZNI0vHYofMk=";
+ vendorSha256 = "sha256-DL2hIvwflZf+jH73hhFtqK4yNbMcCXIghSVlBiSzvLk=";
doCheck = false;
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index ac8ebb8d29b6..903ae7aa2cae 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nginx_exporter";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "nginxinc";
repo = "nginx-prometheus-exporter";
rev = "v${version}";
- sha256 = "sha256-k9sbMIn5N3EJ7ZlfmD9pRV6lfywnKyFvpxC/pGGgNTA=";
+ sha256 = "sha256-glKjScJoJnFEm7Z9LAVF51haeyHB3wQ946U8RzJXs3k=";
};
- vendorSha256 = "sha256-SaaHbn97cb/d8symyrBYLzK+5ukVLfGrFiRIz+tKPhw=";
+ vendorSha256 = "sha256-YyMySHnrjBHm3hRNJDwWBs86Ih4S5DONYuwlQ3FBjkA=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix
index c889edb886ad..dda0a6d1d229 100644
--- a/pkgs/servers/piping-server-rust/default.nix
+++ b/pkgs/servers/piping-server-rust/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "piping-server-rust";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "nwtgck";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ON3/GaDwQ9DtApRZuYClZWzFhmiLi988jIBvl0DgYSM=";
+ sha256 = "sha256-QgOrKAPLphvIMqcOrbYuo4ra65IV8dK5+6tyh+YyyP4=";
};
- cargoSha256 = "sha256-rc3VTJllDu4oIFcswCNUJejJHzC2PoJJV9EU5fOC7fQ=";
+ cargoSha256 = "sha256-Nd+Frhospp6ERYFuxzEzKbkLAFqTv7Lp7MWwv09S+KA=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 4a565ad8bd70..4e4875464427 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.28.2.6106-44a5bbd28";
+ version = "1.28.2.6151-914ddd2b3";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
- sha256 = "18wlw6fjmmq3k0g8rj6p87xsiqw12721s3njyr9qw1dmlzcwh1zg";
+ sha256 = "sha256-aWRcPHwuZA/xM1QUx4rOUhh3ICvwCgDFrPgnVWB4aUE=";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
- sha256 = "0ii00qav7yamy9bwqgfdrvvmzywm7zga28g9y19g7n6f4bjzb5vh";
+ sha256 = "sha256-J8sQ/fLz00Tiy5ka+M9JIXbQUzIfGBvofiGX7stWf84=";
};
outputs = [ "out" "basedb" ];
diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix
index 30247c13c383..755b7920c1e0 100644
--- a/pkgs/servers/roon-server/default.nix
+++ b/pkgs/servers/roon-server/default.nix
@@ -15,7 +15,7 @@
, stdenv
}:
let
- version = "1.8-1021";
+ version = "1.8-1105";
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
in
stdenv.mkDerivation {
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";
- hash = "sha256-obG6e/6AxNvUZkZzgS2QAxoSbJIM2pwuQDI0O2B90J8=";
+ hash = "sha256-YijqoJ0JqAhaNQ7GNaOilEhbVqmd62Plp1ykjwQw3aw=";
};
dontConfigure = true;
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index de4d7e7fdf99..91192ee371da 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tailscale";
- version = "1.30.0";
+ version = "1.30.1";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- sha256 = "sha256-KruBCpJe6RhQYxNopj7ZZlZZy/UYtO1vQMvHxUgw0P8=";
+ sha256 = "sha256-sR1DB8Hc/JkCFaoj9FRRJhTeUWWoGUee2kx0EreUbWE=";
};
vendorSha256 = "sha256-+7Cr7wmt4PheHJRAlyKhRd6QRIZBqrbVtn5I94h8lLo=";
diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix
index 90b82659ff9f..6fd8782f5826 100644
--- a/pkgs/servers/web-apps/netbox/default.nix
+++ b/pkgs/servers/web-apps/netbox/default.nix
@@ -17,13 +17,13 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "netbox";
- version = "3.3.0";
+ version = "3.3.2";
src = fetchFromGitHub {
owner = "netbox-community";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-tdl3A5l8CDNdVpNMKHg31QJoQSdr1v0COTcX33Sh7nc=";
+ sha256 = "sha256-G7d9CG7mxdtdShWOdbbcWTVD3qrTKjh7j3MX/cTJbPw=";
};
format = "other";
diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix
index 788b1d114dd0..928b1c5bb2df 100644
--- a/pkgs/shells/carapace/default.nix
+++ b/pkgs/shells/carapace/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "carapace";
- version = "0.8.10";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "rsteube";
repo = "${pname}-bin";
rev = "v${version}";
- sha256 = "0j60fvrmjm4440gj9hib2ar386zxcblw7yifigsnchr7p3i2187n";
+ sha256 = "sha256-3ZWYEfssGq6fBoHrDsp6yvkB9TLF+heELEIbZ1TN2lI=";
};
- vendorSha256 = "1s1sws79cyz1rl63wayzf7yhb04x29a4a1mkifqnl4cc2pv806jf";
+ vendorSha256 = "sha256-OrbVqCgsVX5b5knN6IdlJBWeGfg2fh09a2xe5+2EGEs=";
subPackages = [ "./cmd/carapace" ];
diff --git a/pkgs/tools/X11/xprompt/default.nix b/pkgs/tools/X11/xprompt/default.nix
index 69149b3889b8..e8633d1eb383 100644
--- a/pkgs/tools/X11/xprompt/default.nix
+++ b/pkgs/tools/X11/xprompt/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
in
optionalString (conf != null) "cp ${configFile} config.h";
- makeFlags = [ "PREFIX=$(out)" ];
+ makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ];
passthru.updateScript = nix-update-script {
attrPath = pname;
diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix
index 7629cafec187..b39e565eadd8 100644
--- a/pkgs/tools/admin/boulder/default.nix
+++ b/pkgs/tools/admin/boulder/default.nix
@@ -7,7 +7,7 @@
buildGoModule rec {
pname = "boulder";
- version = "2022-08-29";
+ version = "2022-09-06";
src = fetchFromGitHub {
owner = "letsencrypt";
@@ -19,7 +19,7 @@ buildGoModule rec {
git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
- hash = "sha256-DiO7sOcTd8aOld4Pqd0D7yTPrRh/Mhg25I63Vb/gHhM=";
+ hash = "sha256-BteHJAjIMPckbNIxgZCSSZV2iUc/yKVd0Px+S9ZwwUI=";
};
vendorHash = null;
diff --git a/pkgs/tools/backup/gyb/default.nix b/pkgs/tools/backup/gyb/default.nix
index 2c82f40f583e..f19fe4d428ee 100644
--- a/pkgs/tools/backup/gyb/default.nix
+++ b/pkgs/tools/backup/gyb/default.nix
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "gyb";
- version = "1.62";
+ version = "1.70";
format = "other";
src = fetchFromGitHub {
owner = "GAM-team";
repo = "got-your-back";
- rev = "v${version}";
- sha256 = "sha256-HaexQ0y5i9Q0xgjzAX6E2xeyeDvARo7/Gx3ytohRT7U=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-Hgdjm59RcgUb2oi0JWP7VxowVk4v9zwqnsmKAGvrxHM=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 9c17990ee67a..2b17fa796e84 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "argyllcms";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchzip {
# Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
# while on me. It might be good to find a mirror
url = "https://www.argyllcms.com/Argyll_V${version}_src.zip";
- sha256 = "sha256-UNjCcqJgbRSox55OP3pLdKFHY0NPLHEq3nwqvxWre7U=";
+ sha256 = "sha256-XWsubjdD1tg0o7x/aoAalemAChehWkwh4fkP2WRvhAw=";
};
nativeBuildInputs = [ jam unzip ];
diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix
index 0e323ffeb102..4da42e52eaa6 100644
--- a/pkgs/tools/inputmethods/keyd/default.nix
+++ b/pkgs/tools/inputmethods/keyd/default.nix
@@ -4,10 +4,11 @@
, cmake
, pkg-config
, systemd
+, runtimeShell
+, python3
}:
-stdenv.mkDerivation rec {
- pname = "keyd";
+let
version = "2.4.2";
src = fetchFromGitHub {
@@ -17,11 +18,38 @@ stdenv.mkDerivation rec {
hash = "sha256-QWr+xog16MmybhQlEWbskYa/dypb9Ld54MOdobTbyMo=";
};
+ pypkgs = python3.pkgs;
+
+ appMap = pypkgs.buildPythonApplication rec {
+ pname = "keyd-application-mapper";
+ inherit version src;
+ format = "other";
+
+ postPatch = ''
+ substituteInPlace scripts/${pname} \
+ --replace /bin/sh ${runtimeShell}
+ '';
+
+ propagatedBuildInputs = with pypkgs; [ xlib ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ install -Dm555 -t $out/bin scripts/${pname}
+ '';
+
+ meta.mainProgram = pname;
+ };
+
+in
+stdenv.mkDerivation rec {
+ pname = "keyd";
+ inherit version src;
+
postPatch = ''
substituteInPlace Makefile \
--replace DESTDIR= DESTDIR=${placeholder "out"} \
- --replace /usr "" \
- --replace /var/log/keyd.log /var/log/keyd/keyd.log
+ --replace /usr ""
substituteInPlace keyd.service \
--replace /usr/bin $out/bin
@@ -32,6 +60,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = ''
+ ln -sf ${lib.getExe appMap} $out/bin/${appMap.pname}
rm -rf $out/etc
'';
diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix
index ec64cc56d1eb..45910d271ac0 100644
--- a/pkgs/tools/misc/hyfetch/default.nix
+++ b/pkgs/tools/misc/hyfetch/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "HyFetch";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
repo = "hyfetch";
owner = "hykilpikonna";
rev = "refs/tags/${version}";
- sha256 = "sha256-15FeW3yaM7eUJ1O20H/bQquDRAsRWTJMzkzQ5Kv1ezE=";
+ sha256 = "sha256-aVALjuFXg3ielDfxEDMTOtaPghsBg9+vKRbR3aDTalQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index 897c1bdf5002..cd5fb46d84a2 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -8,14 +8,14 @@
rustPlatform.buildRustPackage rec {
pname = "hyperfine";
- version = "1.14.0";
+ version = "1.15.0";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-3DDgh/0iD1LJEPjicLtHcs9PMso/Wv+3vlkWfdJlpIM=";
+ sha256 = "sha256-JJ4sEwe2fXOGlofJ9SkXEllMCMhn7MSJ+H3aAF0F0zk=";
};
- cargoSha256 = "sha256-VkB6KJUi5PACpjrK/OJ5tmroJJVnDxhZAQzSWkrtuCU=";
+ cargoSha256 = "sha256-3xOh51rUnQcUfQ+asurbfNYTb5dWQO5YY/AbGRV+26w=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/networking/gen6dns/default.nix b/pkgs/tools/networking/gen6dns/default.nix
new file mode 100644
index 000000000000..6f020c2a6636
--- /dev/null
+++ b/pkgs/tools/networking/gen6dns/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchurl, installShellFiles }:
+
+stdenv.mkDerivation rec {
+ pname = "gen6dns";
+ version = "1.3";
+
+ src = fetchurl {
+ url = "https://www.hznet.de/tools/gen6dns-${version}.tar.gz";
+ hash = "sha256-MhYfgzbGPmrhPx89EpObrEkxaII7uz4TbWXeEGF7Xws=";
+ };
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ preInstall = ''
+ mkdir -p $out/bin
+ '';
+
+ postInstall = ''
+ installManPage gen6dns.1
+ '';
+
+ makeFlags = [ "INSTALL_DIR=$(out)/bin" ];
+
+ meta = with lib; {
+ description = "Tool to generate static DNS records (AAAA and PTR) for hosts using Stateless Address Autoconfig (SLAAC)";
+ homepage = "https://www.hznet.de/tools.html#gen6dns";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ majiir ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix
index 98190ed31df6..aa74e1d0d2e1 100644
--- a/pkgs/tools/networking/mqttui/default.nix
+++ b/pkgs/tools/networking/mqttui/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "mqttui";
- version = "0.16.2";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "EdJoPaTo";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-u2KuB0cw0xCAc5uRgHNsQknTfLwQmO9CZjSJTdycEnc=";
+ sha256 = "sha256-GoSIck/P6s6flmfz2JbHZLgQJXXpLaxShOhmghIIMNc=";
};
- cargoSha256 = "sha256-asJvunklc0zcrkgirC6wznwKNKLFQ6sN/B1GukI/NCo=";
+ cargoSha256 = "sha256-oxbHaSS9+J3KPvKDdi+tpl2BI/YdppyxqSyCSfSxjMY=";
buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/tools/networking/sockperf/default.nix
index 31ded651b89e..28b8532e256a 100644
--- a/pkgs/tools/networking/sockperf/default.nix
+++ b/pkgs/tools/networking/sockperf/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "sockperf";
- version = "3.8";
+ version = "3.9";
src = fetchFromGitHub {
owner = "Mellanox";
repo = "sockperf";
rev = version;
- sha256 = "sha256-S5ZSGctOOnMD+AqlSAkRHMW8O1Rt8/952fali0kv/EU=";
+ sha256 = "sha256-dWhYCLZ5dzp0cSEzozlQyo2gGa6FASM93FvN2PuL34g=";
};
nativeBuildInputs = [ autoreconfHook doxygen ];
diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix
index 19387045e736..1e6833f3a8b3 100644
--- a/pkgs/tools/security/cryptomator/default.nix
+++ b/pkgs/tools/security/cryptomator/default.nix
@@ -6,13 +6,13 @@
let
pname = "cryptomator";
- version = "1.6.13";
+ version = "1.6.14";
src = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator";
rev = version;
- sha256 = "sha256-xQxCSWbovdecTFWFDFu2K+lbA6+bSV2l2kk+R/hFcQ0=";
+ sha256 = "sha256-ArOYL3xj2HiXXu1Bymd5mciMsmikCDvxr5M3LMqZgYA=";
};
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
@@ -37,7 +37,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "sha256-SFiYHUH1Et7/SgciIvLcQGh54Z3fDVp22jSvDavXPjE=";
+ outputHash = "sha256-svpz1mHCHNQGWc+CBroAPvW4cXQdYuqFkK4JSmf6kXE=";
doCheck = false;
};
diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/tools/security/faraday-agent-dispatcher/default.nix
index 1442bba07fb6..ff9bdaa1ab33 100644
--- a/pkgs/tools/security/faraday-agent-dispatcher/default.nix
+++ b/pkgs/tools/security/faraday-agent-dispatcher/default.nix
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "faraday-agent-dispatcher";
- version = "2.2.0";
+ version = "2.3.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "infobyte";
repo = "faraday_agent_dispatcher";
rev = "refs/tags/${version}";
- hash = "sha256-dTXTR2H37FDfnpY4Ts6NoYAnJX52yqRZeD2Yf8S/kS8=";
+ hash = "sha256-lsSpD3XJ6Yw9viRCRB7zhl/KTC6Nwle2vnZ9xWr4Ujo=";
};
nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix
index 177b7574f63a..2be9e30ab672 100644
--- a/pkgs/tools/security/libmodsecurity/default.nix
+++ b/pkgs/tools/security/libmodsecurity/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libmodsecurity";
- version = "3.0.7";
+ version = "3.0.8";
src = fetchFromGitHub {
owner = "SpiderLabs";
repo = "ModSecurity";
rev = "v${version}";
- sha256 = "sha256-Xf+wtYg0ZKgP5qo891fCMML/7tgSM/fvBdrmsgJixY4=";
+ sha256 = "sha256-Xqg7Y6i5pG1WGDLE7Zry+6ZN5o1LpmpOwEL67LlzIDk=";
fetchSubmodules = true;
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a1878ef61c1..18f30b7be421 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -368,6 +368,8 @@ with pkgs;
chrysalis = callPackage ../applications/misc/chrysalis { };
+ classicube = callPackage ../games/classicube { };
+
clj-kondo = callPackage ../development/tools/clj-kondo { };
cloak = callPackage ../applications/misc/cloak {
@@ -1210,6 +1212,8 @@ with pkgs;
airwindows-lv2 = callPackage ../applications/audio/airwindows-lv2 { };
+ aixlog = callPackage ../development/libraries/aixlog { };
+
aj-snapshot = callPackage ../applications/audio/aj-snapshot { };
ajour = callPackage ../tools/games/ajour {
@@ -1269,6 +1273,8 @@ with pkgs;
gam = callPackage ../tools/admin/gam { };
+ gen6dns = callPackage ../tools/networking/gen6dns { };
+
gfshare = callPackage ../tools/security/gfshare { };
gh-cal = callPackage ../tools/misc/gh-cal {
@@ -1904,6 +1910,8 @@ with pkgs;
pikchr = callPackage ../tools/graphics/pikchr { };
+ popl = callPackage ../development/libraries/popl { };
+
popsicle = callPackage ../tools/misc/popsicle { };
terminal-colors = callPackage ../applications/misc/terminal-colors { };
@@ -14587,6 +14595,8 @@ with pkgs;
cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { };
+ cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { };
+
crate2nix = callPackage ../development/tools/rust/crate2nix { };
convco = callPackage ../development/tools/convco {
@@ -18825,6 +18835,8 @@ with pkgs;
imgui = callPackage ../development/libraries/imgui { };
+ imtui = callPackage ../development/libraries/imtui { };
+
imlib = callPackage ../development/libraries/imlib {
libpng = libpng12;
};
@@ -21380,7 +21392,9 @@ with pkgs;
libGLU = null;
});
- SDL_compat = callPackage ../development/libraries/SDL_compat { };
+ SDL_compat = callPackage ../development/libraries/SDL_compat {
+ inherit (darwin.apple_sdk.frameworks) Cocoa;
+ };
SDL = SDL_classic;
@@ -23439,10 +23453,7 @@ with pkgs;
};
prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { };
prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
- prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { };
prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
};
@@ -29522,6 +29533,8 @@ with pkgs;
rofi-mpd = callPackage ../applications/audio/rofi-mpd { };
+ rofi-bluetooth = callPackage ../applications/misc/rofi-bluetooth { };
+
rofi-calc = callPackage ../applications/science/math/rofi-calc { };
rofi-emoji = callPackage ../applications/misc/rofi-emoji { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ba002444a9a..80d5ca6f9d4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10963,6 +10963,8 @@ in {
toml = callPackage ../development/python-modules/toml { };
+ toml-adapt = callPackage ../development/python-modules/toml-adapt { };
+
tomli = callPackage ../development/python-modules/tomli { };
tomli-w = callPackage ../development/python-modules/tomli-w { };