diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2f5c5950cdb6..64719a7bc3a8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -82,13 +82,13 @@
/pkgs/development/interpreters/python/conda @DavHau
# Haskell
-/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn
-/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn
-/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn
-/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn
-/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn
-/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn
-/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn
+/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @expipiplus1
+/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn @expipiplus1
+/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn @expipiplus1
+/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn @expipiplus1
+/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn @expipiplus1
+/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn @expipiplus1
+/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1
# Perl
/pkgs/development/interpreters/perl @volth @stigtsp
diff --git a/README.md b/README.md
index 66025a20c4f2..3a03be0d4496 100644
--- a/README.md
+++ b/README.md
@@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
system, [Hydra](https://hydra.nixos.org/).
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for the NixOS 20.09 release](https://hydra.nixos.org/jobset/nixos/release-20.09)
+* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for the NixOS 20.09 release](https://hydra.nixos.org/job/nixos/release-20.09/tested#tabs-constituents)
+* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents)
Artifacts successfully built with Hydra are published to cache at
https://cache.nixos.org/. When successful build and test criteria are
diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md
index a1121efe3f07..11b49f4f235a 100644
--- a/doc/languages-frameworks/gnome.section.md
+++ b/doc/languages-frameworks/gnome.section.md
@@ -8,12 +8,30 @@ Programs in the GNOME universe are written in various languages but they all use
[GSettings](https://developer.gnome.org/gio/stable/GSettings.html) API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for `glib-2.0/schemas/gschemas.compiled` files inside the directories of `XDG_DATA_DIRS`.
-On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` GIO module to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.
+On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` [GIO module](#ssec-gnome-gio-modules) to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.
Last you will need the dconf database D-Bus service itself. You can enable it using `programs.dconf.enable`.
Some applications will also require `gsettings-desktop-schemas` for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for `org.gnome.desktop` and `org.gnome.system` to see if the schemas are needed.
+### GIO modules {#ssec-gnome-gio-modules}
+
+GLib’s [GIO](https://developer.gnome.org/gio/stable/ch01.html) library supports several [extension points](https://developer.gnome.org/gio/stable/extending-gio.html). Notably, they allow:
+
+* implementing settings backends (already [mentioned](#ssec-gnome-settings))
+* adding TLS support
+* proxy settings
+* virtual file systems
+
+The modules are typically installed to `lib/gio/modules/` directory of a package and you need to add them to `GIO_EXTRA_MODULES` if you need any of those features.
+
+In particular, we recommend:
+
+* adding `dconf.lib` for any software on Linux that reads [GSettings](#ssec-gnome-settings) (even transitivily through e.g. GTK’s file manager)
+* adding `glib-networking` for any software that accesses network using GIO or libsoup – glib-networking contains a module that implements TLS support and loads system-wide proxy settings
+
+To allow software to use various virtual file systems, `gvfs` package can be also added. But that is usually an optional feature so we typically use `gvfs` from the system (e.g. installed globally using NixOS module).
+
### GdkPixbuf loaders {#ssec-gnome-gdk-pixbuf-loaders}
GTK applications typically use [GdkPixbuf](https://developer.gnome.org/gdk-pixbuf/stable/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 28138d79f9aa..9e000409f446 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -318,6 +318,12 @@
githubId = 4296804;
name = "Alex Franchuk";
};
+ agbrooks = {
+ email = "andrewgrantbrooks@gmail.com";
+ github = "agbrooks";
+ githubId = 19290901;
+ name = "Andrew Brooks";
+ };
aherrmann = {
email = "andreash87@gmx.ch";
github = "aherrmann";
@@ -790,6 +796,12 @@
githubId = 718812;
name = "Antoine R. Dumont";
};
+ arezvov = {
+ email = "alex@rezvov.ru";
+ github = "arezvov";
+ githubId = 58516559;
+ name = "Alexander Rezvov";
+ };
arianvp = {
email = "arian.vanputten@gmail.com";
github = "arianvp";
@@ -896,6 +908,12 @@
githubId = 869771;
name = "Kirill Boltaev";
};
+ ashley = {
+ email = "personavinny@protonmail.com";
+ github = "paranoidcat";
+ githubId = 84152630;
+ name = "Ashley Chiara";
+ };
asppsa = {
email = "asppsa@gmail.com";
github = "asppsa";
@@ -3727,6 +3745,16 @@
githubId = 1176131;
name = "George Whewell";
};
+ georgyo = {
+ email = "george@shamm.as";
+ github = "georgyo";
+ githubId = 19374;
+ name = "George Shammas";
+ keys = [{
+ longkeyid = "rsa4096/0x82BB70D541AE2DB4";
+ fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4";
+ }];
+ };
gerschtli = {
email = "tobias.happ@gmx.de";
github = "Gerschtli";
@@ -7263,6 +7291,11 @@
githubId = 628342;
name = "Tim Steinbach";
};
+ nessdoor = {
+ name = "Tomas Antonio Lopez";
+ email = "entropy.overseer@protonmail.com";
+ githubId = 25993494;
+ };
netcrns = {
email = "jason.wing@gmx.de";
github = "netcrns";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 781734a189a8..2b0bcb4b6e56 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -40,6 +40,14 @@
services.sourcehut.
+
+
+ ucarp,
+ an userspace implementation of the Common Address Redundancy
+ Protocol (CARP). Available as
+ networking.ucarp.
+
+
@@ -232,6 +240,75 @@
services.x2goserver
+
+
+ The following dotnet-related packages have been removed for
+ being unmaintaned. Please use fetchNuGet
+ for specific packages.
+
+
+
+
+ Autofac
+
+
+
+
+ SystemValueTuple
+
+
+
+
+ MicrosoftDiaSymReader
+
+
+
+
+ MicrosoftDiaSymReaderPortablePdb
+
+
+
+
+ SystemCollectionsImmutable
+
+
+
+
+ SystemCollectionsImmutable131
+
+
+
+
+ SystemReflectionMetadata
+
+
+
+
+ NUnit350
+
+
+
+
+ Deedle
+
+
+
+
+ ExcelDna
+
+
+
+
+ GitVersionTree
+
+
+
+
+ NDeskOptions
+
+
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 3a29b29f1063..968fdb0f3be2 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -18,6 +18,10 @@ In addition to numerous new and upgraded packages, this release has the followin
development. Available as
[services.sourcehut](options.html#opt-services.sourcehut.enable).
+* [ucarp](https://download.pureftpd.org/pub/ucarp/README), an userspace
+ implementation of the Common Address Redundancy Protocol (CARP). Available as
+ [networking.ucarp](options.html#opt-networking.ucarp.enable).
+
## Backward Incompatibilities
* The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0
@@ -66,4 +70,19 @@ In addition to numerous new and upgraded packages, this release has the followin
* `programs.x2goserver` is now `services.x2goserver`
+* The following dotnet-related packages have been removed for being unmaintaned.
+ Please use `fetchNuGet` for specific packages.
+ - Autofac
+ - SystemValueTuple
+ - MicrosoftDiaSymReader
+ - MicrosoftDiaSymReaderPortablePdb
+ - SystemCollectionsImmutable
+ - SystemCollectionsImmutable131
+ - SystemReflectionMetadata
+ - NUnit350
+ - Deedle
+ - ExcelDna
+ - GitVersionTree
+ - NDeskOptions
+
## Other Notable Changes
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 9c97ce383437..5be741395a08 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -973,7 +973,7 @@ def subtest(name: str) -> Iterator[None]:
if __name__ == "__main__":
- arg_parser = argparse.ArgumentParser()
+ arg_parser = argparse.ArgumentParser(prog="nixos-test-driver")
arg_parser.add_argument(
"-K",
"--keep-vm-state",
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 715482e87304..f5780123d6b0 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -16,13 +16,19 @@ rec {
inherit pkgs;
-
- mkTestDriver =
+ # Reifies and correctly wraps the python test driver for
+ # the respective qemu version and with or without ocr support
+ pythonTestDriver = {
+ qemu_pkg ? pkgs.qemu_test
+ , enableOCR ? false
+ }:
let
- testDriverScript = ./test-driver/test-driver.py;
- in
- qemu_pkg: stdenv.mkDerivation {
name = "nixos-test-driver";
+ testDriverScript = ./test-driver/test-driver.py;
+ ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
+ imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
+ in stdenv.mkDerivation {
+ inherit name;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ (python3.withPackages (p: [ p.ptpython p.colorama ])) ];
@@ -35,7 +41,7 @@ rec {
buildPhase = ''
python < maxTestNameLen then
+ abort
+ ("The name of the test '${testName}' must not be longer than ${toString maxTestNameLen} " +
+ "it's currently ${toString testNameLen} characters long.")
+ else
+ "nixos-test-driver-${testName}";
+
+ vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
+ vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
+
+ nodeHostNames = map (c: c.config.system.name) (lib.attrValues nodes);
+
+ invalidNodeNames = lib.filter
+ (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)
+ (builtins.attrNames nodes);
+
+ testScript' =
+ # Call the test script with the computed nodes.
+ if lib.isFunction testScript
+ then testScript { inherit nodes; }
+ else testScript;
+
+ in
+ if lib.length invalidNodeNames > 0 then
+ throw ''
+ Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
+ All machines are referenced as python variables in the testing framework which will break the
+ script when special characters are used.
+ Please stick to alphanumeric chars and underscores as separation.
+ ''
+ else lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName
+ {
+ inherit testName;
+ nativeBuildInputs = [ makeWrapper ];
+ testScript = testScript';
+ preferLocalBuild = true;
+ passthru = passthru // {
+ inherit nodes;
+ };
+ }
+ ''
+ mkdir -p $out/bin
+
+ echo -n "$testScript" > $out/test-script
+ ${lib.optionalString (!skipLint) ''
+ PYFLAKES_BUILTINS="$(
+ echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)},
+ < ${lib.escapeShellArg "${testDriver}/nix-support/driver-symbols"}
+ )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script
+ ''}
+
+ ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
+ vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
+ wrapProgram $out/bin/nixos-test-driver \
+ --add-flags "''${vms[*]}" \
+ --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \
+ --set VLANS '${toString vlans}'
+ ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
+ wrapProgram $out/bin/nixos-run-vms \
+ --add-flags "''${vms[*]}" \
+ --set tests 'start_all(); join_all();' \
+ --set VLANS '${toString vlans}'
+ '');
+
+ # Make a full-blown test
makeTest =
{ testScript
, enableOCR ? false
@@ -106,128 +198,47 @@ rec {
, ...
} @ t:
let
- # A standard store path to the vm monitor is built like this:
- # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor
- # The max filename length of a unix domain socket is 108 bytes.
- # This means $name can at most be 50 bytes long.
- maxTestNameLen = 50;
- testNameLen = builtins.stringLength name;
-
-
-
- ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
-
- imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
-
- # Generate convenience wrappers for running the test driver
- # interactively with the specified network, and for starting the
- # VMs from the command line.
- mkDriver = qemu_pkg:
+ nodes = qemu_pkg:
let
build-vms = import ./build-vms.nix {
inherit system pkgs minimal specialArgs;
- extraConfigurations = extraConfigurations ++ (pkgs.lib.optional (qemu_pkg != null)
+ extraConfigurations = extraConfigurations ++ [(
{
virtualisation.qemu.package = qemu_pkg;
- }
- ) ++ [(
- {
# Ensure we do not use aliases. Ideally this is only set
# when the test framework is used by Nixpkgs NixOS tests.
nixpkgs.config.allowAliases = false;
}
)];
};
-
- # FIXME: get this pkg from the module system
- testDriver = mkTestDriver (if qemu_pkg == null then pkgs.qemu_test else qemu_pkg);
-
- nodes = build-vms.buildVirtualNetwork (
- t.nodes or (if t ? machine then { machine = t.machine; } else { })
- );
- vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
- vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
-
- testScript' =
- # Call the test script with the computed nodes.
- if lib.isFunction testScript
- then testScript { inherit nodes; }
- else testScript;
-
- testDriverName = with builtins;
- if testNameLen > maxTestNameLen then
- abort
- ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
- "it's currently ${toString testNameLen} characters long.")
- else
- "nixos-test-driver-${name}";
in
- lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName
- {
- nativeBuildInputs = [ makeWrapper ];
- testScript = testScript';
- preferLocalBuild = true;
- testName = name;
- passthru = passthru // {
- inherit nodes;
- };
- }
- ''
- mkdir -p $out/bin
+ build-vms.buildVirtualNetwork (
+ t.nodes or (if t ? machine then { machine = t.machine; } else { })
+ );
- echo -n "$testScript" > $out/test-script
- ${lib.optionalString (!skipLint) ''
- PYFLAKES_BUILTINS="$(
- echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)},
- < ${lib.escapeShellArg "${testDriver}/nix-support/driver-exports"}
- )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script
- ''}
-
- ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
- vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
- wrapProgram $out/bin/nixos-test-driver \
- --add-flags "''${vms[*]}" \
- ${lib.optionalString enableOCR
- "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
- --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \
- --set VLANS '${toString vlans}'
- ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
- wrapProgram $out/bin/nixos-run-vms \
- --add-flags "''${vms[*]}" \
- ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
- --set tests 'start_all(); join_all();' \
- --set VLANS '${toString vlans}'
- ''); # "
-
- passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
- meta = (drv.meta or { }) // t.meta;
+ driver = setupDriverForTest {
+ inherit testScript enableOCR skipLint;
+ testName = name;
+ qemu_pkg = pkgs.qemu_test;
+ nodes = nodes pkgs.qemu_test;
+ };
+ driverInteractive = setupDriverForTest {
+ inherit testScript enableOCR skipLint;
+ testName = name;
+ qemu_pkg = pkgs.qemu;
+ nodes = nodes pkgs.qemu;
};
- driver = mkDriver null;
- driverInteractive = mkDriver pkgs.qemu;
-
- test = passMeta (runTests { inherit driver pos; });
-
- nodeNames = builtins.attrNames driver.nodes;
- invalidNodeNames = lib.filter
- (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)
- nodeNames;
-
- nodeHostNames = map (c: c.config.system.name) (lib.attrValues driver.nodes);
+ test =
+ let
+ passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
+ meta = (drv.meta or { }) // t.meta;
+ };
+ in passMeta (runTests { inherit driver pos; });
in
- if lib.length invalidNodeNames > 0 then
- throw ''
- Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
- All machines are referenced as python variables in the testing framework which will break the
- script when special characters are used.
-
- Please stick to alphanumeric chars and underscores as separation.
- ''
- else
test // {
- inherit test driver driverInteractive;
- inherit (driver) nodes;
+ inherit test driver driverInteractive nodes;
};
runInMachine =
@@ -235,7 +246,7 @@ rec {
, machine
, preBuild ? ""
, postBuild ? ""
- , qemu ? pkgs.qemu_test
+ , qemu_pkg ? pkgs.qemu_test
, ... # ???
}:
let
@@ -272,6 +283,8 @@ rec {
client.succeed("sync") # flush all data before pulling the plug
'';
+ testDriver = pythonTestDriver { inherit qemu_pkg; };
+
vmRunCommand = writeText "vm-run" ''
xchg=vm-state-client/xchg
${coreutils}/bin/mkdir $out
@@ -290,7 +303,7 @@ rec {
unset xchg
export tests='${testScript}'
- ${mkTestDriver qemu}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm
+ ${testDriver}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm
''; # */
in
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2938f79fb16a..1a4c2fb719dc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -839,6 +839,7 @@
./services/networking/tox-node.nix
./services/networking/toxvpn.nix
./services/networking/tvheadend.nix
+ ./services/networking/ucarp.nix
./services/networking/unbound.nix
./services/networking/unifi.nix
./services/networking/v2ray.nix
diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix
index cd2eadf88168..4ef6724dda0a 100644
--- a/nixos/modules/services/desktops/espanso.nix
+++ b/nixos/modules/services/desktops/espanso.nix
@@ -12,7 +12,6 @@ in {
config = mkIf cfg.enable {
systemd.user.services.espanso = {
description = "Espanso daemon";
- path = with pkgs; [ espanso libnotify xclip ];
serviceConfig = {
ExecStart = "${pkgs.espanso}/bin/espanso daemon";
Restart = "on-failure";
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index dff587453042..eedb44fbe12b 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -143,6 +143,13 @@ in {
List of additional Matrix plugins to make available.
'';
};
+ withJemalloc = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to preload jemalloc to reduce memory fragmentation and overall usage.
+ '';
+ };
no_tls = mkOption {
type = types.bool;
default = false;
@@ -720,7 +727,11 @@ in {
--keys-directory ${cfg.dataDir} \
--generate-keys
'';
- environment.PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];
+ environment = {
+ PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];
+ } // optionalAttrs (cfg.withJemalloc) {
+ LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";
+ };
serviceConfig = {
Type = "notify";
User = "matrix-synapse";
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index b243e24591e6..c3e1f72945bf 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -94,7 +94,7 @@ let
description = "Name of the datasource. Required.";
};
type = mkOption {
- type = types.enum ["graphite" "prometheus" "cloudwatch" "elasticsearch" "influxdb" "opentsdb" "mysql" "mssql" "postgres" "loki"];
+ type = types.str;
description = "Datasource type. Required.";
};
access = mkOption {
diff --git a/nixos/modules/services/networking/solanum.nix b/nixos/modules/services/networking/solanum.nix
index b6496fb8b35a..dc066a245494 100644
--- a/nixos/modules/services/networking/solanum.nix
+++ b/nixos/modules/services/networking/solanum.nix
@@ -2,7 +2,7 @@
let
inherit (lib) mkEnableOption mkIf mkOption types;
- inherit (pkgs) solanum;
+ inherit (pkgs) solanum util-linux;
cfg = config.services.solanum;
configFile = pkgs.writeText "solanum.conf" cfg.config;
@@ -78,12 +78,20 @@ in
config = mkIf cfg.enable (lib.mkMerge [
{
+
+ environment.etc."solanum/ircd.conf".source = configFile;
+
systemd.services.solanum = {
description = "Solanum IRC daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
+ reloadIfChanged = true;
+ restartTriggers = [
+ configFile
+ ];
serviceConfig = {
- ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile ${configFile} -pidfile /run/solanum/ircd.pid";
+ ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile /etc/solanum/ircd.conf -pidfile /run/solanum/ircd.pid";
+ ExecReload = "${util-linux}/bin/kill -HUP $MAINPID";
DynamicUser = true;
User = "solanum";
StateDirectory = "solanum";
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 089c7a12afba..227dfe834b29 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -41,6 +41,10 @@ let
Warning: If you are using NixOps then don't use this
option since it will replace the key required for deployment via ssh.
'';
+ example = [
+ "ssh-rsa AAAAB3NzaC1yc2etc/etc/etcjwrsh8e596z6J0l7 example@host"
+ "ssh-ed25519 AAAAC3NzaCetcetera/etceteraJZMfk3QPfQ foo@bar"
+ ];
};
keyFiles = mkOption {
@@ -252,7 +256,17 @@ in
authorizedKeysFiles = mkOption {
type = types.listOf types.str;
default = [];
- description = "Files from which authorized keys are read.";
+ description = ''
+ Specify the rules for which files to read on the host.
+
+ This is an advanced option. If you're looking to configure user
+ keys, you can generally use
+ or .
+
+ These are paths relative to the host root file system or home
+ directories and they are subject to certain token expansion rules.
+ See AuthorizedKeysFile in man sshd_config for details.
+ '';
};
authorizedKeysCommand = mkOption {
diff --git a/nixos/modules/services/networking/ucarp.nix b/nixos/modules/services/networking/ucarp.nix
new file mode 100644
index 000000000000..9b19a19687bc
--- /dev/null
+++ b/nixos/modules/services/networking/ucarp.nix
@@ -0,0 +1,183 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.networking.ucarp;
+
+ ucarpExec = concatStringsSep " " (
+ [
+ "${cfg.package}/bin/ucarp"
+ "--interface=${cfg.interface}"
+ "--srcip=${cfg.srcIp}"
+ "--vhid=${toString cfg.vhId}"
+ "--passfile=${cfg.passwordFile}"
+ "--addr=${cfg.addr}"
+ "--advbase=${toString cfg.advBase}"
+ "--advskew=${toString cfg.advSkew}"
+ "--upscript=${cfg.upscript}"
+ "--downscript=${cfg.downscript}"
+ "--deadratio=${toString cfg.deadratio}"
+ ]
+ ++ (optional cfg.preempt "--preempt")
+ ++ (optional cfg.neutral "--neutral")
+ ++ (optional cfg.shutdown "--shutdown")
+ ++ (optional cfg.ignoreIfState "--ignoreifstate")
+ ++ (optional cfg.noMcast "--nomcast")
+ ++ (optional (cfg.extraParam != null) "--xparam=${cfg.extraParam}")
+ );
+in {
+ options.networking.ucarp = {
+ enable = mkEnableOption "ucarp, userspace implementation of CARP";
+
+ interface = mkOption {
+ type = types.str;
+ description = "Network interface to bind to.";
+ example = "eth0";
+ };
+
+ srcIp = mkOption {
+ type = types.str;
+ description = "Source (real) IP address of this host.";
+ };
+
+ vhId = mkOption {
+ type = types.ints.between 1 255;
+ description = "Virtual IP identifier shared between CARP hosts.";
+ example = 1;
+ };
+
+ passwordFile = mkOption {
+ type = types.str;
+ description = "File containing shared password between CARP hosts.";
+ example = "/run/keys/ucarp-password";
+ };
+
+ preempt = mkOption {
+ type = types.bool;
+ description = ''
+ Enable preemptive failover.
+ Thus, this host becomes the CARP master as soon as possible.
+ '';
+ default = false;
+ };
+
+ neutral = mkOption {
+ type = types.bool;
+ description = "Do not run downscript at start if the host is the backup.";
+ default = false;
+ };
+
+ addr = mkOption {
+ type = types.str;
+ description = "Virtual shared IP address.";
+ };
+
+ advBase = mkOption {
+ type = types.ints.unsigned;
+ description = "Advertisement frequency in seconds.";
+ default = 1;
+ };
+
+ advSkew = mkOption {
+ type = types.ints.unsigned;
+ description = "Advertisement skew in seconds.";
+ default = 0;
+ };
+
+ upscript = mkOption {
+ type = types.path;
+ description = ''
+ Command to run after become master, the interface name, virtual address
+ and optional extra parameters are passed as arguments.
+ '';
+ example = ''
+ pkgs.writeScript "upscript" '''
+ #!/bin/sh
+ $\{pkgs.iproute2\}/bin/ip addr add "$2"/24 dev "$1"
+ ''';
+ '';
+ };
+
+ downscript = mkOption {
+ type = types.path;
+ description = ''
+ Command to run after become backup, the interface name, virtual address
+ and optional extra parameters are passed as arguments.
+ '';
+ example = ''
+ pkgs.writeScript "downscript" '''
+ #!/bin/sh
+ $\{pkgs.iproute2\}/bin/ip addr del "$2"/24 dev "$1"
+ ''';
+ '';
+ };
+
+ deadratio = mkOption {
+ type = types.ints.unsigned;
+ description = "Ratio to consider a host as dead.";
+ default = 3;
+ };
+
+ shutdown = mkOption {
+ type = types.bool;
+ description = "Call downscript at exit.";
+ default = false;
+ };
+
+ ignoreIfState = mkOption {
+ type = types.bool;
+ description = "Ignore interface state, e.g., down or no carrier.";
+ default = false;
+ };
+
+ noMcast = mkOption {
+ type = types.bool;
+ description = "Use broadcast instead of multicast advertisements.";
+ default = false;
+ };
+
+ extraParam = mkOption {
+ type = types.nullOr types.str;
+ description = "Extra parameter to pass to the up/down scripts.";
+ default = null;
+ };
+
+ package = mkOption {
+ type = types.package;
+ description = ''
+ Package that should be used for ucarp.
+
+ Please note that the default package, pkgs.ucarp, has not received any
+ upstream updates for a long time and can be considered as unmaintained.
+ '';
+ default = pkgs.ucarp;
+ defaultText = "pkgs.ucarp";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.ucarp = {
+ description = "ucarp, userspace implementation of CARP";
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ serviceConfig = {
+ Type = "exec";
+ ExecStart = ucarpExec;
+
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ PrivateTmp = true;
+ ProtectClock = true;
+ ProtectKernelModules = true;
+ ProtectControlGroups = true;
+ MemoryDenyWriteExecute = true;
+ RestrictRealtime = true;
+ };
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ oxzi ];
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d8fcbde6bc0c..e8c86394831d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -433,6 +433,7 @@ in
trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
tuptime = handleTest ./tuptime.nix {};
turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
+ ucarp = handleTest ./ucarp.nix {};
ucg = handleTest ./ucg.nix {};
udisks2 = handleTest ./udisks2.nix {};
unbound = handleTest ./unbound.nix {};
diff --git a/nixos/tests/overlayfs.nix b/nixos/tests/overlayfs.nix
index 142e7d378b2f..1768f1fea1ed 100644
--- a/nixos/tests/overlayfs.nix
+++ b/nixos/tests/overlayfs.nix
@@ -15,36 +15,33 @@ import ./make-test-python.nix ({ pkgs, ... }: {
# Test ext4 + overlayfs
machine.succeed(
- """
- mkfs.ext4 -F -L overlay-ext4 /dev/vdb
- mount -t ext4 /dev/vdb /tmp/mnt
- mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged
- # Setup some existing files
- echo 'Replace' > /tmp/mnt/lower/replace.txt
- echo 'Append' > /tmp/mnt/lower/append.txt
- echo 'Overwrite' > /tmp/mnt/lower/overwrite.txt
- mount -t overlay overlay -o lowerdir=/tmp/mnt/lower,upperdir=/tmp/mnt/upper,workdir=/tmp/mnt/work /tmp/mnt/merged
- # Test new
- echo 'New' > /tmp/mnt/merged/new.txt
- [[ "\$(cat /tmp/mnt/merged/new.txt)" == "New" ]]
- # Test replace
- [[ "\$(cat /tmp/mnt/merged/replace.txt)" == "Replace" ]]
- echo 'Replaced' > /tmp/mnt/merged/replace-tmp.txt
- mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt
- [[ "\$(cat /tmp/mnt/merged/replace.txt)" == "Replaced" ]]
- # Overwrite
- [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwrite" ]]
- echo 'Overwritten' > /tmp/mnt/merged/overwrite.txt
- [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwritten" ]]
- # Test append
- [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append" ]]
- echo 'ed' >> /tmp/mnt/merged/append.txt
- #"cat /tmp/mnt/merged/append.txt && exit 1
- [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append\ned" ]]
- umount /tmp/mnt/merged
- umount /tmp/mnt
- udevadm settle
- """
+ 'mkfs.ext4 -F -L overlay-ext4 /dev/vdb',
+ 'mount -t ext4 /dev/vdb /tmp/mnt',
+ 'mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged',
+ # Setup some existing files
+ 'echo Replace > /tmp/mnt/lower/replace.txt',
+ 'echo Append > /tmp/mnt/lower/append.txt',
+ 'echo Overwrite > /tmp/mnt/lower/overwrite.txt',
+ 'mount -t overlay overlay -o lowerdir=/tmp/mnt/lower,upperdir=/tmp/mnt/upper,workdir=/tmp/mnt/work /tmp/mnt/merged',
+ # Test new
+ 'echo New > /tmp/mnt/merged/new.txt',
+ '[[ "$(cat /tmp/mnt/merged/new.txt)" == New ]]',
+ # Test replace
+ '[[ "$(cat /tmp/mnt/merged/replace.txt)" == Replace ]]',
+ 'echo Replaced > /tmp/mnt/merged/replace-tmp.txt',
+ 'mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt',
+ '[[ "$(cat /tmp/mnt/merged/replace.txt)" == Replaced ]]',
+ # Overwrite
+ '[[ "$(cat /tmp/mnt/merged/overwrite.txt)" == Overwrite ]]',
+ 'echo Overwritten > /tmp/mnt/merged/overwrite.txt',
+ '[[ "$(cat /tmp/mnt/merged/overwrite.txt)" == Overwritten ]]',
+ # Test append
+ '[[ "$(cat /tmp/mnt/merged/append.txt)" == Append ]]',
+ 'echo ed >> /tmp/mnt/merged/append.txt',
+ '[[ "$(cat /tmp/mnt/merged/append.txt)" == "Append\ned" ]]',
+ 'umount /tmp/mnt/merged',
+ 'umount /tmp/mnt',
+ 'udevadm settle',
)
'';
})
diff --git a/nixos/tests/solanum.nix b/nixos/tests/solanum.nix
index aabfb906aa81..1ecf91bce40b 100644
--- a/nixos/tests/solanum.nix
+++ b/nixos/tests/solanum.nix
@@ -16,6 +16,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
networking.firewall.allowedTCPPorts = [ ircPort ];
services.solanum = {
enable = true;
+ motd = ''
+ The default MOTD doesn't contain the word "nixos" in it.
+ This one does.
+ '';
};
};
} // lib.listToAttrs (builtins.map (client: lib.nameValuePair client {
@@ -48,6 +52,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
${client}.wait_for_unit("ii")
${client}.wait_for_file("${iiDir}/${server}/out")
''
+ # look for the custom text in the MOTD.
+ ''
+ ${client}.wait_until_succeeds("grep 'nixos' ${iiDir}/${server}/out")
+ ''
# wait until first PING from server arrives before joining,
# so we don't try it too early
''
diff --git a/nixos/tests/ucarp.nix b/nixos/tests/ucarp.nix
new file mode 100644
index 000000000000..1f60f770d3a8
--- /dev/null
+++ b/nixos/tests/ucarp.nix
@@ -0,0 +1,66 @@
+import ./make-test-python.nix ({ pkgs, lib, ...} :
+
+let
+ addrShared = "192.168.0.1";
+ addrHostA = "192.168.0.10";
+ addrHostB = "192.168.0.11";
+
+ mkUcarpHost = addr: { config, pkgs, lib, ... }: {
+ networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
+ { address = addr; prefixLength = 24; }
+ ];
+
+ networking.ucarp = {
+ enable = true;
+ interface = "eth1";
+ srcIp = addr;
+ vhId = 1;
+ passwordFile = "${pkgs.writeText "ucarp-pass" "secure"}";
+ addr = addrShared;
+ upscript = pkgs.writeScript "upscript" ''
+ #!/bin/sh
+ ${pkgs.iproute2}/bin/ip addr add "$2"/24 dev "$1"
+ '';
+ downscript = pkgs.writeScript "downscript" ''
+ #!/bin/sh
+ ${pkgs.iproute2}/bin/ip addr del "$2"/24 dev "$1"
+ '';
+ };
+ };
+in {
+ name = "ucarp";
+ meta.maintainers = with lib.maintainers; [ oxzi ];
+
+ nodes = {
+ hostA = mkUcarpHost addrHostA;
+ hostB = mkUcarpHost addrHostB;
+ };
+
+ testScript = ''
+ def is_master(host):
+ ipOutput = host.succeed("ip addr show dev eth1")
+ return "inet ${addrShared}/24" in ipOutput
+
+
+ start_all()
+
+ # First, let both hosts start and let a master node be selected
+ for host, peer in [(hostA, "${addrHostB}"), (hostB, "${addrHostA}")]:
+ host.wait_for_unit("ucarp.service")
+ host.succeed(f"ping -c 1 {peer}")
+
+ hostA.sleep(5)
+
+ hostA_master, hostB_master = is_master(hostA), is_master(hostB)
+ assert hostA_master != hostB_master, "only one master node is allowed"
+
+ master_host = hostA if hostA_master else hostB
+ backup_host = hostB if hostA_master else hostA
+
+ # Let's crash the master host and let the backup take over
+ master_host.crash()
+
+ backup_host.sleep(5)
+ assert is_master(backup_host), "backup did not take over"
+ '';
+})
diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix
index 91d5d3c216d7..ec09e62b0944 100644
--- a/pkgs/applications/audio/bchoppr/default.nix
+++ b/pkgs/applications/audio/bchoppr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bchoppr";
- version = "1.10.6";
+ version = "1.10.8";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
- sha256 = "sha256-iCDAIV2p1OkZxOMo8A6zBrOGd49FXAGqLZWk0Kbvgec=";
+ sha256 = "sha256-F2J9TBONluhBuoEnpff3tLZEHFDbmllILqbZvu+PGGI=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix
index 1ecf9c56e861..cc98e9fb359c 100644
--- a/pkgs/applications/audio/helvum/default.nix
+++ b/pkgs/applications/audio/helvum/default.nix
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "helvum";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "ryuukyu";
repo = pname;
rev = version;
- sha256 = "sha256-sQ4epL3QNOLHuR/dr/amHgiaxV/1SWeb3eijnjAAR3w=";
+ sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A=";
};
- cargoSha256 = "sha256-uNTSU06Fz/ud04K40e98rb7o/uAht0DsiJOXeHX72vw=";
+ cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU=";
nativeBuildInputs = [ clang copyDesktopItems pkg-config ];
buildInputs = [ glib gtk4 pipewire ];
diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix
index af1818fe7188..2551c610c573 100644
--- a/pkgs/applications/audio/hqplayer-desktop/default.nix
+++ b/pkgs/applications/audio/hqplayer-desktop/default.nix
@@ -17,11 +17,13 @@
mkDerivation rec {
pname = "hqplayer-desktop";
- version = "4.12.0-34";
+ version = "4.12.1-35";
src = fetchurl {
+ # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
+ # c.f. https://github.com/NixOS/nixpkgs/pull/111616
url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm";
- sha256 = "sha256-9kLKmi5lNtnRm9b4HnO01cO/C+Sg0DcKD64N5WBbYOE=";
+ sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8=";
};
unpackPhase = ''
@@ -47,6 +49,8 @@ mkDerivation rec {
dontBuild = true;
installPhase = ''
+ runHook preInstall
+
# main executable
mkdir -p $out/bin
cp ./usr/bin/* $out/bin
@@ -62,16 +66,16 @@ mkDerivation rec {
# pixmaps
mkdir -p $out/share/pixmaps
cp ./usr/share/pixmaps/* $out/share/pixmaps
+
+ runHook postInstall
'';
postInstall = ''
for desktopFile in $out/share/applications/*; do
substituteInPlace "$desktopFile" \
- --replace '/usr/bin/' '$out/bin/' \
- --replace '/usr/share/doc/' '$out/share/doc/'
+ --replace /usr/bin/ $out/bin/ \
+ --replace /usr/share/doc/ $out/share/doc/
done
-
- gunzip $out/share/doc/${pname}/*.gz
'';
postFixup = ''
@@ -81,7 +85,6 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://www.signalyst.com/custom.html";
description = "High-end upsampling multichannel software HD-audio player";
- changelog = "https://www.signalyst.eu/bins/${pname}/fc33/hqplayer4desktop-${version}fc33.x86_64.changes";
license = licenses.unfree;
maintainers = with maintainers; [ lovesegfault ];
};
diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix
index f5752dd96f4a..c5b9f2b804e8 100644
--- a/pkgs/applications/audio/ptcollab/default.nix
+++ b/pkgs/applications/audio/ptcollab/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitHub
, nix-update-script
, qmake
+, pkg-config
, qtbase
, qtmultimedia
, libvorbis
@@ -12,21 +13,16 @@
mkDerivation rec {
pname = "ptcollab";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "yuxshao";
repo = "ptcollab";
rev = "v${version}";
- sha256 = "1yfnf47saxxj17x0vyxihr343kp7gz3fashzky79j80sqlm6ng85";
+ sha256 = "sha256-98v9it9M5FXCsOpWvO10uKYmEH15v1FEH1hH73XHa7w=";
};
- postPatch = ''
- substituteInPlace src/editor.pro \
- --replace '/usr/include/rtmidi' '${rtmidi}/include/rtmidi'
- '';
-
- nativeBuildInputs = [ qmake ];
+ nativeBuildInputs = [ qmake pkg-config ];
buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ];
diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix
index 4f7e43ca004b..b27593626efb 100644
--- a/pkgs/applications/audio/sidplayfp/default.nix
+++ b/pkgs/applications/audio/sidplayfp/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
+, nix-update-script
, autoreconfHook
, perl
, pkg-config
@@ -15,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "sidplayfp";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "sidplayfp";
rev = "v${version}";
- sha256 = "0s3xmg3yzfqbsnlh2y46w7b5jim5zq7mshs6hx03q8wdr75cvwh4";
+ sha256 = "sha256-hN7225lhuYyo4wPDiiEc9FaPg90pZ13mLw93V8tb/P0=";
};
nativeBuildInputs = [ autoreconfHook perl pkg-config ];
@@ -37,6 +38,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = pname;
+ };
+ };
+
meta = with lib; {
description = "A SID player using libsidplayfp";
homepage = "https://github.com/libsidplayfp/sidplayfp";
diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix
index 3707b0741b6f..a3341a25b144 100644
--- a/pkgs/applications/blockchains/charge-lnd/default.nix
+++ b/pkgs/applications/blockchains/charge-lnd/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
rev = "v${version}";
- sha256 = "1m1ic69aj2vlnjlp4ckan8n67r01nfysvq4w6nny32wjkr0zvphr";
+ sha256 = "0npn45qbbsbzj5qy9kwx662hml1y610ysmfl89sda02l6wf1sp3y";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix
index 4f61be7dcee5..8b8ff3f48ba4 100644
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
- version = "4.0.11";
+ version = "4.0.12";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
- sha256 = "sha256-GzpYwytkWZBEIVmsOmK5RTJ7lPUfDeC1204FbK4O+XQ=";
+ sha256 = "sha256-cIMaCouzuI7UQ6UY4caGcTzA+Xp7vLdoOwIfGG+ahsU=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 4310f809bacd..40f6946d1446 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -4,6 +4,7 @@ let
# A list of binaries to put into separate outputs
bins = [
"geth"
+ "clef"
];
in buildGoModule rec {
diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix
index b4b5d13f1407..be2373941b32 100644
--- a/pkgs/applications/blockchains/openethereum/default.nix
+++ b/pkgs/applications/blockchains/openethereum/default.nix
@@ -10,18 +10,18 @@
, darwin
}:
-rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
+rustPlatform.buildRustPackage rec {
pname = "openethereum";
- version = "3.2.5";
+ version = "3.2.6";
src = fetchFromGitHub {
owner = "openethereum";
repo = "openethereum";
rev = "v${version}";
- sha256 = "1g48fkznvr9fs3j9zy2d9pcwnahmyghxg2b9bsn2mxpyczmfqrki";
+ sha256 = "0lxps3cyg8dzb9qr1kg91s9jc3mnm6hxybwcbhva38pcq4yc40xc";
};
- cargoSha256 = "02nlm5ariv4dr6b3rckzs7hw1xrl83yvhimrzb0g5l0j0sxh1nhc";
+ cargoSha256 = "08yrpls3szmw6vy2c4d6b1k907ga0809ylvyx0zb6f8mp8z7ahl2";
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix
index b629c2d21207..e0e41a78b9ce 100644
--- a/pkgs/applications/editors/emacs/27.nix
+++ b/pkgs/applications/editors/emacs/27.nix
@@ -1,7 +1,12 @@
import ./generic.nix (rec {
version = "27.2";
sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=";
- patches = [
+ patches = fetchpatch: [
./tramp-detect-wrapped-gvfsd.patch
+ (fetchpatch {
+ name = "fix-aarch64-darwin-triplet.patch";
+ url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082";
+ sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg=";
+ })
];
})
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index 1bae0a0c9702..bcd55258a49d 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -10,7 +10,7 @@
, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
-, jansson, harfbuzz
+, sigtool, jansson, harfbuzz
, dontRecurseIntoAttrs ,emacsPackagesFor
, libgccjit, targetPlatform, makeWrapper # native-comp params
, systemd ? null
@@ -46,10 +46,10 @@ assert withXwidgets -> withGTK3 && webkitgtk != null;
let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
NATIVE_FULL_AOT = "1";
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
-} // lib.optionalAttrs stdenv.isDarwin {
- CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200";
} // {
- inherit pname version patches;
+ inherit pname version;
+
+ patches = patches fetchpatch;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz";
@@ -118,8 +118,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
++ lib.optional (withX && withMotif) motif
++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
++ lib.optionals withNS [ AppKit GSS ImageIO ]
- ++ lib.optionals nativeComp [ libgccjit ]
- ;
+ ++ lib.optionals stdenv.isDarwin [ sigtool ]
+ ++ lib.optionals nativeComp [ libgccjit ];
hardeningDisable = [ "format" ];
@@ -138,7 +138,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
++ lib.optional withXwidgets "--with-xwidgets"
++ lib.optional nativeComp "--with-native-compilation"
++ lib.optional withImageMagick "--with-imagemagick"
- ;
+ ;
installTargets = [ "tags" "install" ];
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 635a8dbf46f7..dcbaa136795a 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -3,13 +3,13 @@
, vmopts ? null
}:
-{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }:
+{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }@args:
with lib;
let loName = toLower product;
hiName = toUpper product;
- execName = concatStringsSep "-" (init (splitString "-" name));
+ mainProgram = concatStringsSep "-" (init (splitString "-" name));
vmoptsName = loName
+ ( if (with stdenv.hostPlatform; (is32bit || isDarwin))
then ""
@@ -18,15 +18,17 @@ let loName = toLower product;
in
with stdenv; lib.makeOverridable mkDerivation rec {
- inherit name src meta;
+ inherit name src;
+ meta = args.meta // { inherit mainProgram; };
+
desktopItem = makeDesktopItem {
- name = execName;
- exec = execName;
+ name = mainProgram;
+ exec = mainProgram;
comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
desktopName = product;
genericName = meta.description;
categories = "Development;";
- icon = execName;
+ icon = mainProgram;
extraEntries = ''
StartupWMClass=${wmClass}
'';
@@ -64,13 +66,13 @@ with stdenv; lib.makeOverridable mkDerivation rec {
installPhase = ''
mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
cp -a . $out/$name
- ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
+ ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png
mv bin/fsnotifier* $out/libexec/${name}/.
jdk=${jdk.home}
item=${desktopItem}
- makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
+ makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \
--prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
# Some internals want libstdc++.so.6
diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix
index f0b8c43546d8..a24666741e14 100644
--- a/pkgs/applications/editors/poke/default.nix
+++ b/pkgs/applications/editors/poke/default.nix
@@ -19,11 +19,11 @@ let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
in stdenv.mkDerivation rec {
pname = "poke";
- version = "1.2";
+ version = "1.3";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- hash = "sha256-9hz42ltkwBoTWTc3JarRyiV/NcHJJp5NUN0GZBg932I=";
+ hash = "sha256-unhjA0obCABLDuj4i9qUFgcH6aeB1VVvVVtQdYPPDxs=";
};
postPatch = ''
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
] ++ lib.optional guiSupport makeWrapper;
buildInputs = [ boehmgc readline ]
- ++ lib.optional guiSupport tk
+ ++ lib.optionals guiSupport [ tk tcl.tclPackageHook tcllib ]
++ lib.optional miSupport json_c
++ lib.optional nbdSupport libnbd
++ lib.optional textStylingSupport gettext
@@ -57,11 +57,6 @@ in stdenv.mkDerivation rec {
doCheck = !isCross;
checkInputs = lib.optionals (!isCross) [ dejagnu ];
- postFixup = lib.optionalString guiSupport ''
- wrapProgram "$out/bin/poke-gui" \
- --prefix TCLLIBPATH ' ' ${tcllib}/lib/tcllib${tcllib.version}
- '';
-
meta = with lib; {
description = "Interactive, extensible editor for binary data";
homepage = "http://www.jemarch.net/poke";
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 4215b20180e3..5e1d9dc9cb8b 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -175,7 +175,8 @@ in stdenv.mkDerivation rec {
ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
'' + lib.optionalString wrapPythonDrv ''
- wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin"
+ wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" \
+ --set NIX_PYTHONPATH "${python3}/${python3.sitePackages}"
'' + lib.optionalString (guiSupport == "gtk3") ''
rewrap () {
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 27c3e31b28c7..d7840a78bb48 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -18,13 +18,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
- version = "7.0.11-9";
+ version = "7.0.11-12";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
- sha256 = "sha256-eL9zFrgkLb3pS8/UlQB5+p50UG8j3Q7TNDwcO/3BuXo=";
+ sha256 = "sha256-vTCfpHcja0z/aplcunUDlg/90EbfrR/xQ9bzdG0n2RY=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 657ea55da60d..4d273d187ca2 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
- version = "4.14.0";
+ version = "4.14.1";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
- sha256 = "sha256-BDW87UVN1Jub0sJFvtkZr5ssz835Yf2CNn5kHCn70cE=";
+ sha256 = "sha256-OXSxfNCwbZ1RjjoxDlsREtKtbzlQcuPylvD1/ehfgsI=";
};
libPath = lib.makeLibraryPath (with xorg; [
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 0c5a0fe6e3da..fc6c1d55e706 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,11 +10,11 @@
mkDerivation rec {
pname = "krita";
- version = "4.4.3";
+ version = "4.4.5";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz";
- sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";
+ sha256 = "sha256-S/1ygIcNEGCgDREj2Db8Gltb+KAoZ2Z58CaM1ef7dWg=";
};
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 676efb2aa042..4197c1af040b 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -20,7 +20,7 @@
}:
let
- version = "4.1.2";
+ version = "4.1.3";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@@ -36,7 +36,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
- sha256 = "0zvv8nmjzw5pchykz5p28483nby4lp4ah7iqr08pv36gy89l51v5";
+ sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781";
extraPostFetch = ''
mv $out ./all
@@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "05m6vbd4sfjk536kwa5wa3kv21jxxqnglx0ddvnmxfhf98371bhk";
+ sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf";
};
postUnpack = ''
diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix
index 16344d975fea..feadf1590921 100644
--- a/pkgs/applications/misc/free42/default.nix
+++ b/pkgs/applications/misc/free42/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "free42";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2TOYvZBI2EW9xjbjA4Bh+TgjbyEXRzOByalLYBW8Ba8=";
+ sha256 = "sha256-ZoW5gBAUp/5U8Is3Nhx+SHY4d0F3PGOS1/WOokKRnCU=";
};
nativeBuildInputs = [ copyDesktopItems pkg-config ];
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 854b8a5f9b36..ac33025b727e 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.17.4";
+ version = "1.17.5";
src = fetchPypi {
inherit pname version;
- sha256 = "4df80fd923b03b2413a3d1c50e32c3006d100ed5acc1400ace69d8dc2162d293";
+ sha256 = "9d64bca2bf0cdecaff1336e0656917eb9028586fee4ac342761d6cb9a0cdb4f9";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/applications/misc/jquake/default.nix
new file mode 100644
index 000000000000..eccd8b4c1896
--- /dev/null
+++ b/pkgs/applications/misc/jquake/default.nix
@@ -0,0 +1,66 @@
+{ lib, stdenv, fetchurl, copyDesktopItems, makeDesktopItem, unzip, jre8 }:
+
+stdenv.mkDerivation rec {
+ pname = "jquake";
+ version = "1.6.1";
+
+ src = fetchurl {
+ url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip";
+ sha256 = "0nw6xjc3i1b8rk15arc5d0ji2bycc40rz044qd03vzxvh0h8yvgl";
+ };
+
+ nativeBuildInputs = [ unzip copyDesktopItems ];
+
+ sourceRoot = ".";
+
+ postPatch = ''
+ # JQuake emits a lot of debug-like messages in console, but I
+ # don't think it's in our interest to void them by default. Log them at
+ # the appropriate level.
+ sed -i "/^java/ s/$/\ | logger -p user.debug/" JQuake.sh
+
+ # By default, an 'errors.log' file is created in the current directory.
+ # cd into a temporary directory and let it be created there.
+ substituteInPlace JQuake.sh \
+ --replace "java -jar " "exec ${jre8.outPath}/bin/java -jar $out/lib/" \
+ --replace "[JAR FOLDER]" "\$(mktemp -p /tmp -d jquake-errlog-XXX)"
+ '';
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ chmod +x JQuake.sh
+
+ mkdir -p $out/{bin,lib}
+ mv JQuake.sh $out/bin/JQuake
+ mv {JQuake.jar,JQuake_lib} $out/lib
+ mv sounds $out/lib
+
+ mkdir -p $out/share/licenses/jquake
+ mv LICENSE* $out/share/licenses/jquake
+
+ runHook postInstall
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "JQuake";
+ desktopName = "JQuake";
+ exec = "JQuake";
+ comment = "Real-time earthquake map of Japan";
+ })
+ ];
+
+ meta = with lib; {
+ description = "Real-time earthquake map of Japan";
+ homepage = "http://jquake.net";
+ downloadPage = "https://jquake.net/?down";
+ changelog = "https://jquake.net/?docu";
+ maintainers = with maintainers; [ nessdoor ];
+ license = licenses.unfree;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
index 1900b92e3bbe..83356b9550a0 100644
--- a/pkgs/applications/misc/logseq/default.nix
+++ b/pkgs/applications/misc/logseq/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
- version = "0.1.3";
+ version = "0.1.8";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
- sha256 = "1akg3xjbh01nb7l06qpvz3xsjj64kf042xjnapn60jlgg5y34vbm";
+ sha256 = "0q8lci72rzzc04wnfqry31zav07srw0iymjlq5mxygsq4h9bcq01";
name = "${pname}-${version}.AppImage";
};
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index af42466d0ead..0c0dae0da42e 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -33,6 +33,22 @@ let
(mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051")
(mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s")
+ # Requires websocket-client <1.0, >=0.57. Cannot do mkOverride b/c differing underscore/hyphen in pypi source name
+ (
+ self: super: {
+ websocket-client = super.websocket-client.overridePythonAttrs (
+ oldAttrs: rec {
+ version = "0.58.0";
+ src = oldAttrs.src.override {
+ pname = "websocket_client";
+ inherit version;
+ sha256 = "63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f";
+ };
+ }
+ );
+ }
+ )
+
# Octoprint needs zeroconf >=0.24 <0.25. While this should be done in
# the mkOverride aboves, this package also has broken tests, so we need
# a proper override.
@@ -134,7 +150,7 @@ let
tornado
unidecode
watchdog
- websocket_client
+ websocket-client
werkzeug
wrapt
zeroconf
diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix
index 62a6d4785f12..e20b95922f9a 100644
--- a/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
- version = "1.2.1";
+ version = "2.2.6";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-HASFaPqm/A1QQ4nkd2hgeyqWplwE1RTrWA937rJA5Oo=";
+ sha256 = "sha256-9g6rkSDjE7x/YprPX0dkzqgpjgED5qBpUUQoVv6fGkk=";
};
vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";
diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix
new file mode 100644
index 000000000000..f6865f877d7d
--- /dev/null
+++ b/pkgs/applications/misc/survex/default.nix
@@ -0,0 +1,79 @@
+{ lib
+, stdenv
+, fetchgit
+, autoreconfHook
+, pkg-config
+, wxGTK30-gtk3
+, wxmac
+, ffmpeg
+, proj
+, perl532
+, unscii
+, python
+, libGL
+, libGLU
+, xlibsWrapper
+, docbook2x
+, docbook5
+, Carbon
+, Cocoa
+}:
+
+let
+ perlenv = perl532.withPackages (perlPackages: with perlPackages; [ LocalePO ] );
+in
+stdenv.mkDerivation rec {
+ pname = "survex";
+ version = "1.2.44";
+
+ nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ];
+
+ buildInputs = [
+ libGL libGLU ffmpeg proj
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ wxmac Carbon Cocoa
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+ wxGTK30-gtk3 xlibsWrapper
+ ];
+
+ src = fetchgit {
+ url = "git://git.survex.com/survex";
+ rev = version;
+ sha256 = "11gaqmabrf3av665jy3mr0m8hg76fmvnd0g3rghzmyh8d8v6xk34";
+ };
+
+ enableParallelBuilding = true;
+
+ # Docs rely on sgmltools-lite, a package that would be quite complex to
+ # provide as it is quite old. So this preConfigure hook effectively disables
+ # the doc generation. An example of packaging sgmltools-lite from Gentoo can
+ # be found here:
+ # https://gitweb.gentoo.org/repo/gentoo.git/tree/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild?id=0b8b716331049599ea3299981e3a9ea6e258c5e0
+
+ postPatch = ''
+ patchShebangs .
+ echo "" > doc/Makefile.am
+ # substituteInPlace doc/Makefile --replace "docbook2man" "docbook2man --sgml" # Will be needed once sgmltools-lite is packaged.
+ for perltool in './extract-msgs.pl' './gettexttomsg.pl' '$(srcdir)/gdtconvert' '$(srcdir)/gen_img2aven'; do
+ substituteInPlace src/Makefile.am \
+ --replace "$perltool" "${perlenv}/bin/perl $perltool"
+ done
+ substituteInPlace lib/Makefile.am \
+ --replace '$(srcdir)/make-pixel-font' '${perlenv}/bin/perl $(srcdir)/make-pixel-font'
+ substituteInPlace lib/make-pixel-font --replace /usr/share/unifont/unifont.hex ${unscii.extra}/share/fonts/misc/unifont.hex
+ '';
+
+ meta = with lib; {
+ description = "Free Software/Open Source software package for mapping caves";
+ longDescription = ''
+ Survex is a Free Software/Open Source software package for mapping caves,
+ licensed under the GPL. It is designed to be portable and can be run on a
+ variety of platforms, including Linux/Unix, macOS, and Microsoft Windows.
+ '';
+ homepage = "https://survex.com/";
+ changelog = "https://github.com/ojwb/survex/blob/${version}/NEWS";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.matthewcroughan ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index ebfaaa1db51d..6d9d9deefa20 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec {
python-Levenshtein
pyxdg
requests
- websocket_client
+ websocket-client
];
checkInputs = with python3Packages; [
diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix
new file mode 100644
index 000000000000..7a83ec05c10a
--- /dev/null
+++ b/pkgs/applications/misc/usql/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, fetchFromGitHub
+, buildGoModule
+, unixODBC
+, icu
+}:
+
+buildGoModule rec {
+ pname = "usql";
+ version = "0.9.1";
+
+ src = fetchFromGitHub {
+ owner = "xo";
+ repo = "usql";
+ rev = "v${version}";
+ sha256 = "sha256-fcKn4kHIRvMdgGFKDNQg49YxLc0Y5j/8VwKoDLiXbEU=";
+ };
+
+ vendorSha256 = "sha256-uAV8NLnqXjIDILfnbbkVr2BOIucQ8vX89KI5yIkVtus=";
+
+ buildInputs = [ unixODBC icu ];
+
+ # These tags and flags are copied from build-release.sh
+ buildFlags = [ "-tags" ];
+ buildFlagsArray = [
+ "most"
+ "sqlite_app_armor"
+ "sqlite_fts5"
+ "sqlite_introspect"
+ "sqlite_json1"
+ "sqlite_stat4"
+ "sqlite_userauth"
+ "sqlite_vtable"
+ "sqlite_icu"
+ "no_adodb"
+ ];
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/xo/usql/text.CommandVersion=${version}"
+ ];
+
+ # All the checks currently require docker instances to run the databases.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Universal command-line interface for SQL databases";
+ homepage = "https://github.com/xo/usql";
+ license = licenses.mit;
+ maintainers = with maintainers; [ georgyo ];
+ # usql does not build on ARM.
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ };
+
+}
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index ad49a1b291e2..9663d09304f8 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -1,17 +1,26 @@
-{ buildPythonApplication
+{ stdenv
, lib
+, buildPythonApplication
, fetchFromGitHub
, dateutil
-, pyyaml
+, pandas
+, requests
+, lxml
, openpyxl
, xlrd
, h5py
-, fonttools
-, lxml
-, pandas
+, psycopg2
, pyshp
+, fonttools
+, pyyaml
+, pdfminer
+, vobject
+, tabulate
+, wcwidth
+, zstandard
, setuptools
-, withPcap ? true, dpkt ? null, dnslib ? null
+, git
+, withPcap ? true, dpkt, dnslib
}:
buildPythonApplication rec {
pname = "visidata";
@@ -25,19 +34,62 @@ buildPythonApplication rec {
};
propagatedBuildInputs = [
+ # from visidata/requirements.txt
+ # packages not (yet) present in nixpkgs are commented
dateutil
- pyyaml
+ pandas
+ requests
+ lxml
openpyxl
xlrd
h5py
- fonttools
- lxml
- pandas
+ psycopg2
pyshp
+ #mapbox-vector-tile
+ #pypng
+ fonttools
+ #sas7bdat
+ #xport
+ #savReaderWriter
+ pyyaml
+ #namestand
+ #datapackage
+ pdfminer
+ #tabula
+ vobject
+ tabulate
+ wcwidth
+ zstandard
setuptools
] ++ lib.optionals withPcap [ dpkt dnslib ];
- doCheck = false;
+ checkInputs = [
+ git
+ ];
+
+ # check phase uses the output bin, which is not possible when cross-compiling
+ doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
+
+ checkPhase = ''
+ # disable some tests which require access to the network
+ rm tests/load-http.vd # http
+ rm tests/graph-cursor-nosave.vd # http
+ rm tests/messenger-nosave.vd # dns
+
+ # disable some tests which expect Python == 3.6 (not our current version)
+ # see https://github.com/saulpw/visidata/issues/1014
+ rm tests/describe.vd
+ rm tests/describe-error.vd
+ rm tests/edit-type.vd
+
+ # tests use git to compare outputs to references
+ git init -b "test-reference"
+ git config user.name "nobody"; git config user.email "no@where"
+ git add .; git commit -m "test reference"
+
+ substituteInPlace dev/test.sh --replace "bin/vd" "$out/bin/vd"
+ bash dev/test.sh
+ '';
meta = {
inherit version;
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 7d666f5ba9f0..341462744079 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.25.68";
+ version = "1.25.72";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "OBf42L6pctflNLjtcbnw2wKo7TisRSMF3SriDPFlB6I=";
+ sha256 = "7bvcLKc/ZyVSTGOsRIO9qgHc8dSYOJaoEHJw7V2Vl/M=";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 68ca4a13e446..717bda8a297c 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "92.0.4515.51",
- "sha256": "0x9c5fy95wnri9z0s8pbwyq1lw684n7d70l1s2rp5yxh0snannxg",
- "sha256bin64": "036km5dp7asq5n86qx7c9119mdch7sl89lhq1ffss0f4mzcq42yd",
+ "version": "92.0.4515.59",
+ "sha256": "0lpmd4sybr9qxqj7ab25xjliaw2dk9njnik51gdffrrwphv9qdxb",
+ "sha256bin64": "0qq9a3pzyn5d6bagx3py86ksl8n488lmlrmadgam2gb7421jq71a",
"deps": {
"gn": {
"version": "2021-05-07",
@@ -31,15 +31,15 @@
}
},
"dev": {
- "version": "93.0.4535.3",
- "sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18",
- "sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r",
+ "version": "93.0.4542.2",
+ "sha256": "0sfyi52kaxg5mllcvn61285fjnj72vglv9fjf36ri93v6gh34rgw",
+ "sha256bin64": "0hk31b9nk834gykv977dv7f1hyl7jp527bx5ldxhwcy27333h1hr",
"deps": {
"gn": {
- "version": "2021-05-07",
+ "version": "2021-06-11",
"url": "https://gn.googlesource.com/gn",
- "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
- "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
+ "rev": "e0c476ffc83dc10897cb90b45c03ae2539352c5c",
+ "sha256": "01p5w57kksihzg9nb5096a74cw2rp8zzgdjcjm1pgrqvd1mxpjm4"
}
}
},
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 436bccba47a3..f15cf6c81b46 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
- version = "1.5.0";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
- sha256 = "sha256-W7uSyApTKBTE7bgprgCd8T5dKQ/nLYKIzFxjDMCRmZQ=";
+ sha256 = "sha256-NjiTjY2YuxUs/Wny7aDqHGw/2ML1fenjHrl089rLXFI=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix
index 118e3e0fbe2c..8620c43cdbe7 100644
--- a/pkgs/applications/networking/cluster/fn-cli/default.nix
+++ b/pkgs/applications/networking/cluster/fn-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fn";
- version = "0.6.6";
+ version = "0.6.7";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
- sha256 = "12s3xgrr11n8kfwsh8xpwcza1pr6b200dmc9h8igjy3s3cgg6sh7";
+ sha256 = "sha256-50tPR+x3U4XJB6lthEiZjOy2pD8LprSE41ZpH2Px8JY=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 8d515528a026..965c50cf03b0 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
- version = "0.24.8";
+ version = "0.24.9";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
- sha256 = "sha256-6RGm2uiYvsdpWdhNwDTw4z1O6uNErkWTuyOiwKIvXOY=";
+ sha256 = "sha256-9/P6OaSZDJ98EQ9DM4Oib0T1sC1K3WxUXh4IQU3qXbs=";
};
buildFlagsArray = ''
@@ -18,7 +18,7 @@ buildGoModule rec {
-X github.com/derailed/k9s/cmd.commit=${src.rev}
'';
- vendorSha256 = "sha256-lzxGTubm+qQes5QKaamfmSkXs4qquHHjIhts8YmKlYI=";
+ vendorSha256 = "sha256-hqmymxP4zK8GVqOxzB6vRfFyo+VIeI1suBu64/oEVig=";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 6070308bec69..a7a1737c1464 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kube3d";
- version = "4.4.5";
+ version = "4.4.6";
src = fetchFromGitHub {
owner = "rancher";
repo = "k3d";
rev = "v${version}";
- sha256 = "sha256-nT/17R1Gky9509U077tgwS7iQKRMJUk8rwQiHSHcP+s=";
+ sha256 = "sha256-gId7zDrtkTjFN59yaFyeYwrDZV24hkkV+4dPr8Jr22E=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index 0dd6363d07e3..eeab5a1d02ec 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -1,27 +1,71 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
-buildGoModule {
- pname = "linkerd-unstable";
- version = "2020-05-01";
+let generic = { channel, version, sha256, vendorSha256 }:
+ buildGoModule rec {
+ pname = "linkerd-${channel}";
+ inherit version vendorSha256;
- src = fetchFromGitHub {
- owner = "linkerd";
- repo = "linkerd2";
- rev = "9e9f3bb1e2aeab8cf20f98f5cad159bbb6f24883";
- sha256 = "1pvj31wz1klwhcqga1m8kixdqsxwmppp9ix6r3wpp4dwfig45fm0";
+ src = fetchFromGitHub {
+ owner = "linkerd";
+ repo = "linkerd2";
+ rev = "${channel}-${version}";
+ inherit sha256;
+ };
+
+ subPackages = [ "cli" ];
+ runVend = true;
+
+ preBuild = ''
+ env GOFLAGS="" go generate ./pkg/charts/static
+ env GOFLAGS="" go generate ./jaeger/static
+ env GOFLAGS="" go generate ./multicluster/static
+ env GOFLAGS="" go generate ./viz/static
+ '';
+
+ buildFlagsArray = [
+ "-tags=prod"
+ ];
+
+ ldflags = [
+ "-s" "-w"
+ "-X github.com/linkerd/linkerd2/pkg/version.Version=${src.rev}"
+ ];
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ mv $out/bin/cli $out/bin/linkerd
+ installShellCompletion --cmd linkerd \
+ --bash <($out/bin/linkerd completion bash) \
+ --zsh <($out/bin/linkerd completion zsh) \
+ --fish <($out/bin/linkerd completion fish)
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/linkerd version --client | grep ${src.rev} > /dev/null
+ '';
+
+ meta = with lib; {
+ description = "A simple Kubernetes service mesh that improves security, observability and reliability";
+ downloadPage = "https://github.com/linkerd/linkerd2/";
+ homepage = "https://linkerd.io/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ Gonzih bryanasdev000 superherointj ];
+ };
};
-
- vendorSha256 = "0vls58ld50jca5yn73kvg3lx4z83cc7skky54a90pkbj737y58pz";
-
- doCheck = false;
-
- subPackages = [ "cli/cmd" ];
-
- meta = with lib; {
- description = "A service mesh for Kubernetes and beyond";
- homepage = "https://linkerd.io/";
- license = licenses.asl20;
- maintainers = with maintainers; [ Gonzih ];
- broken = true;
- };
-}
+in
+ {
+ stable = generic {
+ channel = "stable";
+ version = "2.10.2";
+ sha256 = "sha256-dOD0S4FJ2lXE+1VZooi8tKvC8ndGEHAxmAvSqoWI/m0=";
+ vendorSha256 = "sha256-Qb0FZOvKL9GgncfUl538PynkYbm3V8Q6lUpApUoIp5s=";
+ };
+ edge = generic {
+ channel = "edge";
+ version = "21.6.2";
+ sha256 = "sha256-kgdKH+cIYRg5A3+wrJJ7jcY6Xl206EwBYa37PT3xn1k";
+ vendorSha256 = "sha256-QVLg1ZRsNQPM4lERVHpZLbd+I32JZ1pbGNSGIVTbseg=";
+ };
+ }
diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
index 54520b54c88e..bc04d283507b 100644
--- a/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,23 +1,19 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terraform-docs";
- version = "0.13.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-lx+yp0ybgZfmxvPM2BY2yq39qA6XebcKGrFd0AJa4yg=";
+ sha256 = "sha256-Jm0ySxn4GFW4iAH3tOIvclcDGJMKzH7m7fhWnAf4+gs=";
};
- vendorSha256 = "sha256-qoZUgSSr7jsDVVPBUyfN5Uw4CnH9EnD/4tX+TCSNV0Q=";
+ vendorSha256 = "sha256-IzmAlthE6SVvGHj72wrY1/KLehOv8Ck9VaTv5jMpt48=";
subPackages = [ "." ];
- preBuild = ''
- buildFlagsArray+=("-ldflags" "-X main.version=${version}")
- '';
-
meta = with lib; {
description = "A utility to generate documentation from Terraform modules in various output formats";
homepage = "https://github.com/terraform-docs/terraform-docs/";
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 739b1e2737d1..2d351eebde24 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -156,6 +156,43 @@ rec {
# Constructor for other terraform versions
mkTerraform = attrs: pluggable (generic attrs);
+ terraform_0_12 = mkTerraform {
+ version = "0.12.31";
+ sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg";
+ patches = [
+ ./provider-path.patch
+ (fetchpatch {
+ name = "fix-mac-mojave-crashes.patch";
+ url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch";
+ sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs";
+ })
+ ];
+ passthru = { inherit plugins; };
+ };
+
+ terraform_0_13 = mkTerraform {
+ version = "0.13.7";
+ sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn";
+ patches = [ ./provider-path.patch ];
+ passthru = { inherit plugins; };
+ };
+
+ terraform_0_14 = mkTerraform {
+ version = "0.14.11";
+ sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j";
+ vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
+ patches = [ ./provider-path.patch ];
+ passthru = { inherit plugins; };
+ };
+
+ terraform_0_15 = mkTerraform {
+ version = "0.15.5";
+ sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d";
+ vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0";
+ patches = [ ./provider-path-0_15.patch ];
+ passthru = { inherit plugins; };
+ };
+
terraform_1_0 = mkTerraform {
version = "1.0.0";
sha256 = "sha256-ddcT/I2Qn1pKFyhXgh+CcD3fSv2steSNmjyyiS2SE/o=";
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index e486cd9de62a..f7435aa3ae3b 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
- version = "0.0.124";
+ version = "0.0.125";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91";
+ sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g";
};
};
}.${branch}
diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/applications/networking/instant-messengers/kaidan/default.nix
new file mode 100644
index 000000000000..74449ae705e3
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/kaidan/default.nix
@@ -0,0 +1,62 @@
+{ mkDerivation
+, lib
+, fetchFromGitLab
+, cmake
+, extra-cmake-modules
+, pkg-config
+, qtquickcontrols2
+, qtmultimedia
+, qtlocation
+, qqc2-desktop-style
+, kirigami2
+, knotifications
+, zxing-cpp
+, qxmpp
+, gst_all_1
+}:
+
+mkDerivation rec {
+ pname = "kaidan";
+ version = "0.8.0";
+
+ src = fetchFromGitLab {
+ domain = "invent.kde.org";
+ owner = "network";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "070njci5zyzahmz3nqyp660chxnqx1mxp31w17syfllvrw403qmg";
+ };
+
+ nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
+
+ buildInputs = with gst_all_1; [
+ qtquickcontrols2
+ qtmultimedia
+ qtlocation
+ qqc2-desktop-style
+ kirigami2
+ knotifications
+ zxing-cpp
+ qxmpp
+ gstreamer
+ gst-plugins-bad
+ gst-plugins-base
+ gst-plugins-good
+ ];
+ postInstall = ''
+ qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+ '';
+
+ meta = with lib; {
+ description = "User-friendly and modern chat app, using XMPP";
+ homepage = "https://www.kaidan.im";
+ license = with licenses; [
+ gpl3Plus
+ mit
+ asl20
+ cc-by-sa-40
+ ];
+ maintainers = with maintainers; [ astro ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
index 87ffa16736e2..89154ad939ea 100644
--- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
@@ -13,13 +13,13 @@
mkDerivation rec {
pname = "kdeltachat";
- version = "unstable-2021-06-06";
+ version = "unstable-2021-06-14";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
- rev = "321c19b7415e837acc4e66d535e82518618bc096";
- sha256 = "19py9mxpjz09fhyyvxf75s77nq0jwwfiljq9289192p61grk6625";
+ rev = "25da4228768e260ea9f67d5aa10558e7cf9cf7ee";
+ sha256 = "17igh34cbd0w5mzra4k779nxc5s8hk6sj25h308w079y0b21lf7w";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 616a08571024..4217c9ec60a9 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -28,7 +28,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "5.4.1"; # Please backport all updates to the stable channel.
+ version = "5.5.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "1f1narpqj8gcyi4r574nqm1cbyi3azk1y7d1j300scr51gk74fq6";
+ sha256 = "0l12hwwv0ks2hgp1xc5nmn5rcqzwxdpjqhwysix550m26bz4jczp";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 137783552112..15943d34e426 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -42,11 +42,11 @@ let
pname = "slack";
- x86_64-darwin-version = "4.16.0";
- x86_64-darwin-sha256 = "078f49sgazfa99vn0yyacfya3jl2vhqz7kgxh0qp56b66pnzwbxz";
+ x86_64-darwin-version = "4.17.0";
+ x86_64-darwin-sha256 = "0r5cafxw73qnn14ljprn7w8bfn67zbkcniq60k9pf2zbqgb4cyj9";
- x86_64-linux-version = "4.16.0";
- x86_64-linux-sha256 = "0dj5k7r044mibis0zymh6wryhbw2fzsch30nddfrnn6ij89hhirv";
+ x86_64-linux-version = "4.17.0";
+ x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi";
version = {
x86_64-darwin = x86_64-darwin-version;
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index 698ee80edf60..aebe906659ef 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
env = "${buildEnv {
name = "wee-slack-env";
paths = with python3Packages; [
- websocket_client
+ websocket-client
six
];
}}/${python3Packages.python.sitePackages}";
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 48a212b4ffb1..9a65bec21c20 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null
-, gpgSupport ? true, sslSupport ? true }:
+, gpgSupport ? true, sslSupport ? true, fetchpatch }:
assert gpgSupport -> gpgme != null;
assert sslSupport -> openssl != null;
@@ -15,6 +15,17 @@ stdenv.mkDerivation rec {
sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd";
};
+ patches = [
+ (fetchpatch {
+ # patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306
+ name = "patch-libsylph_ssl_c.patch";
+ url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain";
+ sha256 = "sha256-k9OwPtHrEjaxXdH0trNqXgJMhR8kjgtei9pi6OFvILk=";
+ })
+ ];
+
+ patchFlags = [ "-p0" ];
+
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 ]
diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix
index 4440b24a2b17..19da740938c7 100644
--- a/pkgs/applications/networking/p2p/zeronet/default.nix
+++ b/pkgs/applications/networking/p2p/zeronet/default.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
};
propagatedBuildInputs = with python3Packages; [
- gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client
+ gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client
gevent-websocket rencode bitcoinlib maxminddb pyopenssl
];
diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix
index 5cbfa5b1b2af..adeb087ae8be 100644
--- a/pkgs/applications/office/espanso/default.nix
+++ b/pkgs/applications/office/espanso/default.nix
@@ -10,6 +10,7 @@
, openssl
, xclip
, xdotool
+, makeWrapper
}:
rustPlatform.buildRustPackage rec {
@@ -28,6 +29,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
extra-cmake-modules
pkg-config
+ makeWrapper
];
buildInputs = [
@@ -35,6 +37,7 @@ rustPlatform.buildRustPackage rec {
libXtst
libXi
libnotify
+ xclip
openssl
xdotool
];
@@ -42,6 +45,11 @@ rustPlatform.buildRustPackage rec {
# Some tests require networking
doCheck = false;
+ postInstall = ''
+ wrapProgram $out/bin/espanso \
+ --prefix PATH : ${lib.makeBinPath [ libnotify xclip ]}
+ '';
+
meta = with lib; {
description = "Cross-platform Text Expander written in Rust";
homepage = "https://espanso.org";
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index aacc2a2a579c..5ab9be9fa75a 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -7,11 +7,11 @@ let
inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
- version = "1.12.49";
+ version = "1.12.50";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "kcBy7JXDLgCxVv/oAVyTsyuO3zaPkEFDYZPPoy6E7Vc=";
+ sha256 = "dYgZuhvWmDgp+efG1xp/ogzXWjZSonHluwA9XYvMFLg=";
};
configureFlags = [ "--disable-component" ];
diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix
index de0b9bada53c..9752ebc0e7ce 100644
--- a/pkgs/applications/printing/pappl/default.nix
+++ b/pkgs/applications/printing/pappl/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "pappl";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-L4ptgAJAvyTUCVl6YotA8DnlISc9PwZM0WjXyOvxGJg=";
+ sha256 = "sha256-B3g6R0/li+5D4odFG21qj+SR3K4PFnzzxIGCwbk1buo=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix
index fffeca2c740c..31c1fc50ee3e 100644
--- a/pkgs/applications/science/biology/truvari/default.nix
+++ b/pkgs/applications/science/biology/truvari/default.nix
@@ -5,15 +5,20 @@
python3Packages.buildPythonApplication rec {
pname = "truvari";
- version = "2.0.2";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "spiralgenetics";
repo = "truvari";
rev = "v${version}";
- sha256 = "0lp1wnldjv92k4ncga1h0icb0dpjsrx427vggg40x04a7kp9lwx0";
+ sha256 = "14nsdbj063qm175xxixs34cihvsiskc9gym8pg7gbwsh13k5a00h";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'python-Levenshtein==0.12.1' 'python-Levenshtein>=0.12.1'
+ '';
+
propagatedBuildInputs = with python3Packages; [
pyvcf
python-Levenshtein
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index d8f7bd5eb552..93ec987e2c69 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
- version = "14.31.38";
+ version = "14.31.39";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- sha256 = "sha256-yXJ1KtTH3bi24GFiVXu8zzQkreDkqbCxgm7fVoSJepg=";
+ sha256 = "sha256-ss+QvBsmivqNdjXW45Sv9h/JXuZpryCGmRTsUgcDlRE=";
};
patchPhase = ''
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index 79c01d3ec718..30cbd8f92b57 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -1,86 +1,75 @@
-{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config
-, qtbase, qtsvg, qttools, qtserialport, boost, libgit2
+{ mkDerivation
+, lib
+, fetchFromGitHub
+, qmake
+, pkg-config
+, qtbase
+, qtsvg
+, qttools
+, qtserialport
+, boost
+, libgit2
}:
let
# build number corresponding to a release, has no further relation
# see https://github.com/fritzing/fritzing-app/releases/tag/CD-498
- fritzingBuild = "498";
+ # fritzingBuild = "498";
+ # version 0.9.6 is properly tagged, hope it continues
+
# SHA256 of the fritzing-parts HEAD on the master branch,
# which contains the latest stable parts definitions
- partsSha = "e79a69765026f3fda8aab1b3e7a4952c28047a62";
+ partsSha = "6f04697be286768bc9e4d64f8707e8e40cbcafcb";
in
mkDerivation rec {
pname = "fritzing";
- version = "0.9.4-${fritzingBuild}";
+ version = "0.9.6";
src = fetchFromGitHub {
- owner = "fritzing";
+ owner = pname;
repo = "fritzing-app";
- rev = "CD-${fritzingBuild}";
- sha256 = "0aljj2wbmm1vd64nhj6lh9qy856pd5avlgydsznya2vylyz20p34";
+ rev = version;
+ sha256 = "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs";
};
parts = fetchFromGitHub {
- owner = "fritzing";
+ owner = pname;
repo = "fritzing-parts";
name = "fritzing-parts";
rev = partsSha;
- sha256 = "0spka33a5qq34aq79j01arw1aly4vh0hzv7mahryhdlcdk22qqvc";
+ sha256 = "1f4w0hz44n4iw1rc5vhcgzvlji54rf4yr8bvzkqv99hn2xf5pjgs";
};
buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
-
nativeBuildInputs = [ qmake pkg-config qttools ];
- patches = [(fetchpatch {
- name = "fix-libgit2-version.patch";
- url = "https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079.patch";
- sha256 = "0v1zi609cjnqac80xgnk23n54z08g1lia37hbzfl8jcq9sn9adak";
- })];
-
postPatch = ''
substituteInPlace phoenix.pro \
--replace 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false'
- substituteInPlace tools/linux_release_script/release.sh \
- --replace 'git status' 'echo >/dev/null' \
- --replace 'git clean' 'echo >/dev/null' \
- --replace 'git clone' 'echo >/dev/null' \
- --replace 'release_folder="' 'release_folder="$out" #' \
- --replace './Fritzing -db' '# run after fixup'
-
substituteInPlace src/fapplication.cpp \
--replace 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";'
- '';
- buildPhase = ''
- bash tools/linux_release_script/release.sh ${version}
- '';
-
- installPhase = ''
- rm "$out/Fritzing" # remove script file
- mkdir "$out/bin"
- mv "$out/lib/Fritzing" "$out/bin/Fritzing"
- mkdir --parents "$out/share/applications" "$out/share/metainfo"
- mv --target-directory="$out/share/applications" "$out/org.fritzing.Fritzing.desktop"
- mv --target-directory="$out/share/metainfo" "$out/org.fritzing.Fritzing.appdata.xml"
- cp --recursive --no-target-directory "$parts" "$out/fritzing-parts"
+ mkdir parts
+ cp -a ${parts}/* parts/
'';
postFixup = ''
# generate the parts.db file
- QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" -db "$out/fritzing-parts/parts.db" -pp "$out/fritzing-parts" -folder "$out"
+ QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" \
+ -db "$out/share/fritzing/parts/parts.db" \
+ -pp "$out/fritzing/parts" \
+ -folder "$out/share/fritzing"
'';
qmakeFlags = [ "phoenix.pro" ];
- meta = {
+ meta = with lib; {
description = "An open source prototyping tool for Arduino-based projects";
homepage = "https://fritzing.org/";
- license = lib.licenses.gpl3;
- maintainers = [ lib.maintainers.robberer ];
- platforms = lib.platforms.linux;
+ license = with licenses; [ gpl3 cc-by-sa-30 ];
+ maintainers = with maintainers; [ robberer ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix
index 73f34f60fc47..c7c5c9c6fa70 100644
--- a/pkgs/applications/science/logic/gappa/default.nix
+++ b/pkgs/applications/science/logic/gappa/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, gmp, mpfr, boost }:
stdenv.mkDerivation {
- name = "gappa-1.3.5";
+ name = "gappa-1.4.0";
src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz";
- sha256 = "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w";
+ url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz";
+ sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA=";
};
buildInputs = [ gmp mpfr boost.dev ];
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 70729a6648cd..c15d833dfb28 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E=";
};
- nativeBuildInputs = [ installShellFiles tcl ];
+ nativeBuildInputs = [ installShellFiles tcl tcllib ];
buildInputs = [ zlib openssl readline sqlite which ed ]
++ lib.optional stdenv.isDarwin libiconv;
@@ -38,10 +38,6 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-internal-sqlite" ]
++ lib.optional withJson "--json";
- preCheck = ''
- export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"
- '';
-
preBuild = ''
export USER=nonexistent-but-specified-user
'';
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 77ad7d8658d1..95060714c24e 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "diff-so-fancy";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
- sha256 = "sha256-bV22x459QerWg4MVLWsXPDhM38QWG6BE+dVmKIFfDiE=";
+ sha256 = "sha256-1kBarsRiuB8fv7VLlWfpotPfHeMrfmIXHXTFu8TzC2A=";
};
nativeBuildInputs = [
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
diff-so-fancy builds on the good-lookin' output of git contrib's
diff-highlight to upgrade your diffs' appearances.
'';
- maintainers = with maintainers; [ fpletz globin ];
+ maintainers = with maintainers; [ fpletz globin ma27 ];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index f93947d0515b..210c0ca8c3e7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "3.1.1";
+ version = "3.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "00f1rq80vya464dkvf3mzs9zpvkz15ki8srwg08snsm5kb7amwlm";
+ sha256 = "1bssk0jqspmsvr8kha9l5cslyhjvc50y30wdgavbca256lv75gh8";
};
nativeBuildInputs = [ installShellFiles pbr ];
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 8ad150f13060..2db4b4ed7bd2 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -2,7 +2,7 @@
, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
, openssh, pcre2
-, asciidoctor, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xsl_ns, docbook_xml_dtd_45
+, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper, libiconv
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
, perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform
@@ -68,8 +68,8 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]
- ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x
- docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ];
+ ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
+ docbook_xsl docbook_xml_dtd_45 libxslt ];
buildInputs = [curl openssl zlib expat cpio libiconv]
++ lib.optionals perlSupport [ perlPackages.perl ]
++ lib.optionals guiSupport [tcl tk]
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
++ lib.optionals withLibsecret [ pkg-config glib libsecret ];
# required to support pthread_cancel()
- NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
+ NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
+ lib.optionalString (stdenv.isFreeBSD) "-lthr";
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
@@ -148,7 +148,7 @@ stdenv.mkDerivation {
}
# Install git-subtree.
- make -C contrib/subtree install ${lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"}
+ make -C contrib/subtree install ${lib.optionalString withManual "install-doc"}
rm -rf contrib/subtree
# Install contrib stuff.
@@ -233,7 +233,7 @@ stdenv.mkDerivation {
'')
+ lib.optionalString withManual ''# Install man pages
- make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \
+ make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \
-C Documentation ''
+ (if guiSupport then ''
diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix
index 12fd8357fc7a..f2a5e2368b4f 100644
--- a/pkgs/applications/version-management/git-and-tools/glab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
- version = "1.18.0";
+ version = "1.18.1";
src = fetchFromGitHub {
owner = "profclems";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/WKfMmaFjnzRWCJZEZF/CguU0K7FOtgvKNMSQGvjODQ=";
+ sha256 = "sha256-ahP5y5i0SMj2+mP4RYc7MLZGElX5eLgKwiVhBYGOX2g=";
};
- vendorSha256 = "sha256-PCkVjLdOdOhJGNSkVPFK/ONRdJT7MS0COjYgPNT5dNw=";
+ vendorSha256 = "sha256-ssVmqcJ/DxUqAkHm9tn4RwWuKzTHvxoqJquXPIRy4b8=";
runVend = true;
# Tests are trying to access /homeless-shelter
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
index 264677dc1cd9..374e68a71c79 100644
--- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lefthook";
- version = "0.7.5";
+ version = "0.7.6";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
- sha256 = "sha256-IKrutZJhs2iuwhXoV+81rDoaSi/xdYRpIlF1YjGFGY4=";
+ sha256 = "sha256-qCj6FsbzxnMISCITKFcIIYtqMiHzSNYNjlpgpE9S/Ss=";
};
vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg=";
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index f8143711318c..d814e0ca0a52 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -1,55 +1,21 @@
-{ lib, stdenv, fetchurl, fetchpatch, ed }:
+{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }:
stdenv.mkDerivation rec {
- name = "rcs-5.9.4";
+ pname = "rcs";
+ version = "5.10.0";
src = fetchurl {
- url = "mirror://gnu/rcs/${name}.tar.xz";
- sha256 = "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86";
+ url = "mirror://gnu/rcs/${pname}-${version}.tar.xz";
+ sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU";
};
- buildInputs = [ ed ];
+ ac_cv_path_ED = "${ed}/bin/ed";
+ DIFF = "${diffutils}/bin/diff";
+ DIFF3 = "${diffutils}/bin/diff3";
- patches = lib.optionals stdenv.isDarwin [
- # This failure appears unrelated to the subject of the test. This
- # test seems to rely on a bash bug where `test $x -nt $y` ignores
- # subsecond values in timetamps. This bug has been fixed in Bash
- # 5, and seemingly doesn't affect Darwin.
- ./disable-t810.patch
-
- (fetchpatch {
- url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch";
- extraPrefix = "";
- sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3";
- })
-
- # Expected to appear in the next release
- (fetchpatch {
- url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch";
- sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx";
- })
- ];
-
- doCheck = true;
-
- checkFlags = [ "VERBOSE=1" ];
-
- checkPhase = ''
- # If neither LOGNAME or USER are set, rcs will default to
- # getlogin(), which is unreliable on macOS. It will often return
- # things like `_spotlight`, or `_mbsetupuser`. macOS sets both
- # environment variables in user sessions, so this is unlikely to
- # affect regular usage.
-
- export LOGNAME=$(id -un)
-
- print_logs_and_fail() {
- grep -nH -e . -r tests/*.d/{out,err}
- return 1
- }
-
- make $checkFlags check || print_logs_and_fail
- '';
+ disallowedReferences =
+ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
+ [ buildPackages.diffutils buildPackages.ed ];
NIX_CFLAGS_COMPILE = "-std=c99";
diff --git a/pkgs/applications/version-management/rcs/disable-t810.patch b/pkgs/applications/version-management/rcs/disable-t810.patch
deleted file mode 100644
index 745f1868a369..000000000000
--- a/pkgs/applications/version-management/rcs/disable-t810.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900
-+++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900
-@@ -1372,7 +1372,6 @@
- t803 \
- t804 \
- t805 \
-- t810 \
- t900 \
- t999
-
diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix
index 881e6b687ef2..aa40291790e1 100644
--- a/pkgs/applications/video/ccextractor/default.nix
+++ b/pkgs/applications/video/ccextractor/default.nix
@@ -4,13 +4,13 @@
with lib;
stdenv.mkDerivation rec {
pname = "ccextractor";
- version = "0.88";
+ version = "0.89";
src = fetchFromGitHub {
owner = "CCExtractor";
repo = pname;
rev = "v${version}";
- sha256 = "1sya45hvv4d46bk7541yimmafgvgyhkpsvwfz9kv6pm4yi1lz6nb";
+ sha256 = "sha256-847yt6pUTsDnVbrMQQPJ0pqu6UnKmYmr8UtR8+TP11A=";
};
sourceRoot = "source/src";
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 94bd0877a7d1..d7ade6899dc2 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
requests
iso-639
iso3166
- websocket_client
+ websocket-client
isodate
]) ++ [
rtmpdump
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 5435c88f58d6..ca9ae20f3468 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,6 +1,6 @@
{ lib
, fetchFromGitHub
-, buildGoPackage
+, buildGoModule
, btrfs-progs
, go-md2man
, installShellFiles
@@ -8,19 +8,20 @@
, nixosTests
}:
-buildGoPackage rec {
+buildGoModule rec {
pname = "containerd";
- version = "1.5.1";
+ version = "1.5.2";
+
+ outputs = [ "out" "man" ];
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "sha256-jVyg+fyMuDnV/TM0Z2t+Cr17a6XBv11aWijhsqMnA5s=";
+ sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als=";
};
- goPackagePath = "github.com/containerd/containerd";
- outputs = [ "out" "man" ];
+ vendorSha256 = null;
nativeBuildInputs = [ go-md2man installShellFiles util-linux ];
@@ -28,11 +29,9 @@ buildGoPackage rec {
buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ];
- BUILDTAGS = [ ]
- ++ lib.optional (btrfs-progs == null) "no_btrfs";
+ BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ];
buildPhase = ''
- cd go/src/${goPackagePath}
patchShebangs .
make binaries man $buildFlags
'';
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index 233ee13ead88..cc8936806742 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -3,7 +3,7 @@
, mock, pytest, nose
, pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests
-, six, texttable, websocket_client, cached-property
+, six, texttable, websocket-client, cached-property
, enum34, functools32, paramiko, distro, python-dotenv
}:
@@ -22,7 +22,7 @@ buildPythonApplication rec {
checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [
pyyaml colorama dockerpty docker
- ipaddress jsonschema requests six texttable websocket_client
+ ipaddress jsonschema requests six texttable websocket-client
docopt cached-property paramiko distro python-dotenv
] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
++ lib.optional (pythonOlder "3.4") enum34
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index e9acf58713c5..68cd70aab45a 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "docker-slim";
- version = "1.35.2";
+ version = "1.36.0";
goPackagePath = "github.com/docker-slim/docker-slim";
@@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "docker-slim";
repo = "docker-slim";
rev = version;
- sha256 = "sha256-Pg3vPvnEo1OkCakwkwS/HaFnvmpjuHHlGqIjddO6jwQ=";
+ sha256 = "sha256-4wSQ5R0haVnbtWk2im83A1FzrJDHVEFLqnkROGNF4q8=";
};
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 795971a74920..b3578e175d49 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -1,6 +1,6 @@
{ lib
, fetchFromGitHub
-, buildGoPackage
+, buildGoModule
, go-md2man
, installShellFiles
, pkg-config
@@ -14,7 +14,7 @@
, nixosTests
}:
-buildGoPackage rec {
+buildGoModule rec {
pname = "runc";
version = "1.0.0-rc95";
@@ -25,7 +25,7 @@ buildGoPackage rec {
sha256 = "sha256-q4sXcvJO9gyo7m0vlaMrwh7ZZHYa58FJy3GatWndS6M=";
};
- goPackagePath = "github.com/opencontainers/runc";
+ vendorSha256 = null;
outputs = [ "out" "man" ];
nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ];
@@ -36,7 +36,6 @@ buildGoPackage rec {
buildPhase = ''
runHook preBuild
- cd go/src/${goPackagePath}
patchShebangs .
make ${toString makeFlags} runc man
runHook postBuild
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 2610e1f0fc6a..bf3285a78ead 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -15,11 +15,11 @@ with lib;
buildGoPackage rec {
pname = "singularity";
- version = "3.7.4";
+ version = "3.8.0";
src = fetchurl {
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
- sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ=";
+ sha256 = "sha256-6WCLDgqMgFIYu+eV6RdkhIN7L3/LleVGm4U7OAmiQS4=";
};
goPackagePath = "github.com/sylabs/singularity";
diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix
index 335b18d3eb86..4647f0a07217 100644
--- a/pkgs/applications/window-managers/i3/balance-workspace.nix
+++ b/pkgs/applications/window-managers/i3/balance-workspace.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "i3-balance-workspace";
- version = "1.8.4";
+ version = "1.8.5";
src = fetchPypi {
inherit pname version;
- sha256 = "bb220eb373e290312b0aafe3d7b1cc1cca34c93189a4fca5bee93ef39aafbe3d";
+ sha256 = "7b5d72b756f79878a058484825bb343b100433e00a01f80c9c6d1ccc9f4af57a";
};
propagatedBuildInputs = [ i3ipc ];
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 4182c8689ed2..63a49953115a 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "2.13.c.3";
+ version = "2.13.c.4";
pname = "i3lock-color";
src = fetchFromGitHub {
owner = "PandorasFox";
repo = "i3lock-color";
rev = version;
- sha256 = "0spldmis8fvnclwwi9xvnq2rq3hmpbiv3ck5p9pjf40ismvsi16k";
+ sha256 = "sha256-bbjkvgSKD57sdOtPYGLAKpQoIsJnF6s6ySq4dTWC3tI=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix
index 42b376a97f80..38f082b8505a 100644
--- a/pkgs/applications/window-managers/wayfire/default.nix
+++ b/pkgs/applications/window-managers/wayfire/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, meson, ninja, pkg-config, git
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config
, cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland
, wayland-protocols, wf-config, wlroots, mesa
}:
diff --git a/pkgs/build-support/pkg-config-wrapper/add-flags.sh b/pkgs/build-support/pkg-config-wrapper/add-flags.sh
index 35ecf62ca230..90aee712be63 100644
--- a/pkgs/build-support/pkg-config-wrapper/add-flags.sh
+++ b/pkgs/build-support/pkg-config-wrapper/add-flags.sh
@@ -6,7 +6,7 @@ var_templates_list=(
accumulateRoles
for var in "${var_templates_list[@]}"; do
- mangleVarList "$var" ${role_suffixes[@]+"${role_suffixes[@]}"}
+ mangleVarListGeneric ":" "$var" ${role_suffixes[@]+"${role_suffixes[@]}"}
done
export NIX_PKG_CONFIG_WRAPPER_FLAGS_SET_@suffixSalt@=1
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index 7a5db942b2cb..b27b65f48a59 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -99,7 +99,7 @@ in stdenv.mkDerivation {
inherit description platforms;
license = lib.licenses.isc;
maintainers = with lib.maintainers;
- [ pmahoney Profpatsch ] ++ maintainers;
+ [ pmahoney Profpatsch qyliss ] ++ maintainers;
};
}
diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash
index 66b7c3f3e83c..f773270f7de9 100644
--- a/pkgs/build-support/wrapper-common/utils.bash
+++ b/pkgs/build-support/wrapper-common/utils.bash
@@ -13,7 +13,9 @@ accumulateRoles() {
fi
}
-mangleVarList() {
+mangleVarListGeneric() {
+ local sep="$1"
+ shift
local var="$1"
shift
local -a role_suffixes=("$@")
@@ -25,11 +27,15 @@ mangleVarList() {
for suffix in "${role_suffixes[@]}"; do
local inputVar="${var}${suffix}"
if [ -v "$inputVar" ]; then
- export ${outputVar}+="${!outputVar:+ }${!inputVar}"
+ export ${outputVar}+="${!outputVar:+$sep}${!inputVar}"
fi
done
}
+mangleVarList() {
+ mangleVarListGeneric " " "$@"
+}
+
mangleVarBool() {
local var="$1"
shift
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index 2a770222ed10..3b5d75acb503 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -1,53 +1,59 @@
{ lib, stdenv, fetchurl, unzip
-, bdftopcf, mkfontscale, fontforge
+, bdftopcf, mkfontscale, fonttosfnt
}:
stdenv.mkDerivation {
pname = "dina-font";
version = "2.92";
+ outputs = [ "out" "bdf" ];
+
src = fetchurl {
url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
};
nativeBuildInputs =
- [ unzip bdftopcf mkfontscale fontforge ];
+ [ unzip bdftopcf mkfontscale fonttosfnt ];
- patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
+ postPatch = ''
+ sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf
+ '';
buildPhase = ''
+ runHook preBuild
+
newName() {
- test "''${1:5:1}" = i && _it=Italic || _it=
- case ''${1:6:3} in
- 400) test -z $it && _weight=Medium ;;
- 700) _weight=Bold ;;
- esac
- _pt=''${1%.bdf}
- _pt=''${_pt#*-}
- echo "Dina$_weight$_it$_pt"
+ test "''${1:5:1}" = i && _it=Italic || _it=
+ case ''${1:6:3} in
+ 400) test -z $it && _weight=Medium ;;
+ 700) _weight=Bold ;;
+ esac
+ _pt=''${1%.bdf}
+ _pt=''${_pt#*-}
+ echo "Dina$_weight$_it$_pt"
}
- # convert bdf fonts to pcf
- for i in *.bdf; do
- bdftopcf -t -o $(newName "$i").pcf "$i"
+ for f in *.bdf; do
+ name=$(newName "$f")
+ bdftopcf -t -o "$name.pcf" "$f"
+ fonttosfnt -v -o "$name.otb" "$f"
done
gzip -n -9 *.pcf
- # convert bdf fonts to otb
- for i in *.bdf; do
- fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$(newName $i).otb\")"
- done
+ runHook postBuild
'';
installPhase = ''
+ runHook preInstall
+
install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz *.otb
install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf
mkfontdir "$out/share/fonts/misc"
mkfontdir "$bdf/share/fonts/misc"
- '';
- outputs = [ "out" "bdf" ];
+ runHook postInstall
+ '';
meta = with lib; {
description = "A monospace bitmap font aimed at programmers";
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index 4dea9253c02d..162197006ba7 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -2,7 +2,7 @@
let
pname = "spleen";
- version = "1.9.0";
+ version = "1.9.1";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@@ -19,7 +19,7 @@ in fetchurl {
# create fonts.dir so NixOS xorg module adds to fp
${mkfontscale}/bin/mkfontdir "$d"
'';
- sha256 = "sha256-hNPbYiU+v7kCYKVyOn+uc5cSlu9bWsC4CwFvfH6StWM=";
+ sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94=";
meta = with lib; {
description = "Monospaced bitmap fonts";
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
index 066a4d4d9221..6fdeadf3776f 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -2,6 +2,11 @@
, fontforge, SDL, SDL_image, mkfontscale
}:
+let
+ perlenv = perl.withPackages (p: with p; [
+ TextCharWidth
+ ]);
+in
stdenv.mkDerivation rec {
pname = "unscii";
version = "1.1";
@@ -12,11 +17,23 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs =
- [ (perl.withPackages (p: [ p.TextCharWidth ]))
+ [ perlenv
bdftopcf fontforge SDL SDL_image
mkfontscale
];
+ # Fixes shebang -> wrapper problem on Darwin
+ postPatch = ''
+ for perltool in *.pl; do
+ substituteInPlace Makefile \
+ --replace "./$perltool" "${perlenv}/bin/perl ./$perltool"
+ done
+ '';
+
+ makeFlags = [
+ "CC=${stdenv.cc.targetPrefix}cc"
+ ];
+
preConfigure = ''
patchShebangs .
'';
diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix
index 51e3d5a9cdf3..803235e95843 100644
--- a/pkgs/desktops/gnome/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix
@@ -30,13 +30,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
- version = "40.0";
+ version = "40.1.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38";
+ sha256 = "IMtnPhHC8xQ9NYjPyrmhInkQgOun3GASypTBhglVjVE=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix
index 3d7f3e0b8356..f5652d8c64a1 100644
--- a/pkgs/desktops/gnome/core/evince/default.nix
+++ b/pkgs/desktops/gnome/core/evince/default.nix
@@ -44,13 +44,13 @@
stdenv.mkDerivation rec {
pname = "evince";
- version = "40.1";
+ version = "40.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks";
+ sha256 = "D/fseTdqipesTNJ00y6ATH4jbvLS1dP2Rt5uuIKmPHc=";
};
postPatch = ''
diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
index 6e8168a306af..9ccaf8bd6375 100644
--- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
- version = "40.1";
+ version = "40.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "T7/OCtQ1e+5zrn3Bjqoe9MqnOF5PlPavuN/HJR/RqL8=";
+ sha256 = "qFGN1Mg6eE+o05pe1gC/gdY3oY7r5ZDjticYPgv5FPg=";
};
patches = [
diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
index cca80708034d..4f6f291f134a 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@@ -5,9 +5,9 @@
mkXfceDerivation {
category = "xfce";
pname = "xfce4-settings";
- version = "4.16.1";
+ version = "4.16.2";
- sha256 = "0mjhglfsqmiycpv98l09n2556288g2713n4pvxn0srivm017fdir";
+ sha256 = "09npyqxsbrvz60bkbardqrizd5rvray5hkp84qgjzc10z4qrnk0f";
postPatch = ''
for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do
diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix
index b2a69a692783..4e9461dc743b 100644
--- a/pkgs/development/beam-modules/erlang-ls/default.nix
+++ b/pkgs/development/beam-modules/erlang-ls/default.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }:
let
- version = "0.16.0";
+ version = "0.17.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
@@ -17,7 +17,7 @@ in rebar3Relx {
inherit version;
src = fetchFromGitHub {
inherit owner repo;
- sha256 = "0l09yhj3rsb9zj4cs6a1bcfmi6zbyb3xk1lv494xbyiv5d61vkwm";
+ sha256 = "0szg9hx436cvy80sh94dzmf2rainnw3fjc84bv3hlzjwwzmxj9aw";
rev = version;
};
releaseType = "escript";
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index bcc1a07f6791..f7dc6f8e87c3 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -5,36 +5,13 @@ let
let files = builtins.attrNames (builtins.readDir dir);
in map (f: dir + ("/" + f)) files;
version = "2.2.1";
- dartVersion = "2.13.1";
channel = "stable";
filename = "flutter_linux_${version}-${channel}.tar.xz";
- dartStable = dart.override {
- version = dartVersion;
- sources = {
- "${dartVersion}-x86_64-darwin" = fetchurl {
- url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
- sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya";
- };
- "${dartVersion}-x86_64-linux" = fetchurl {
- url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
- sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq";
- };
- "${dartVersion}-i686-linux" = fetchurl {
- url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-ia32-release.zip";
- sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj";
- };
- "${dartVersion}-aarch64-linux" = fetchurl {
- url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
- sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc";
- };
- };
- };
in
{
mkFlutter = mkFlutter;
stable = mkFlutter rec {
- dart = dartStable;
- inherit version;
+ inherit dart version;
pname = "flutter";
src = fetchurl {
url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}";
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 4012aa260f8c..f3bd5d9f4a31 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -24,9 +24,8 @@ openjdk11.overrideAttrs (oldAttrs: rec {
your own risk.
'';
homepage = "https://bintray.com/jetbrains/intellij-jdk/";
- license = licenses.gpl2;
+ inherit (openjdk11.meta) license platforms mainProgram;
maintainers = with maintainers; [ edwtjo petabyteboy ];
- platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
};
passthru = oldAttrs.passthru // {
home = "${jetbrains.jdk}/lib/openjdk";
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 5fdf58e56f5d..0fb58bfeda4f 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kotlin";
- version = "1.5.0";
+ version = "1.5.10";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
- sha256 = "1dyiis96skflhlsmc8byp5j8j3vsicmlslwyrkn1pv4gc8gzqhq3";
+ sha256 = "0kiwddq5b0dk63nlifb8bbaimh8inxsbk97nbw2m8qw17gby339g";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix
index e0c52651cadc..b42f40b96943 100644
--- a/pkgs/development/compilers/llvm/10/clang/default.nix
+++ b/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
@@ -46,6 +46,10 @@ let
# https://reviews.llvm.org/D51899
./compiler-rt-baremetal.patch
./gnu-install-dirs.patch
+ (substituteAll {
+ src = ../../clang-6-10-LLVMgold-path.patch;
+ libllvmLibdir = "${libllvm.lib}/lib";
+ })
];
postPatch = ''
@@ -64,12 +68,7 @@ let
outputs = [ "out" "lib" "dev" "python" ];
- # Clang expects to find LLVMgold in its own prefix
postInstall = ''
- if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
- ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
- fi
-
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix
index 74078c1ac667..9eed5269da6b 100644
--- a/pkgs/development/compilers/llvm/11/clang/default.nix
+++ b/pkgs/development/compilers/llvm/11/clang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, fetch, fetchpatch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, llvm_meta, fetch, fetchpatch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
@@ -62,6 +62,10 @@ let
excludes = [ "docs/*" "test/*" ];
sha256 = "0gxgmi0qbm89mq911dahallhi8m6wa9vpklklqmxafx4rplrr8ph";
})
+ (substituteAll {
+ src = ../../clang-11-12-LLVMgold-path.patch;
+ libllvmLibdir = "${libllvm.lib}/lib";
+ })
];
postPatch = ''
@@ -80,12 +84,7 @@ let
outputs = [ "out" "lib" "dev" "python" ];
- # Clang expects to find LLVMgold in its own prefix
postInstall = ''
- if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
- ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
- fi
-
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix
index 3d1106dbc52c..dbd6ea1e1ac4 100644
--- a/pkgs/development/compilers/llvm/12/clang/default.nix
+++ b/pkgs/development/compilers/llvm/12/clang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
@@ -44,6 +44,10 @@ let
./purity.patch
# https://reviews.llvm.org/D51899
./gnu-install-dirs.patch
+ (substituteAll {
+ src = ../../clang-11-12-LLVMgold-path.patch;
+ libllvmLibdir = "${libllvm.lib}/lib";
+ })
];
postPatch = ''
@@ -59,12 +63,7 @@ let
outputs = [ "out" "lib" "dev" "python" ];
- # Clang expects to find LLVMgold in its own prefix
postInstall = ''
- if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
- ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
- fi
-
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch b/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch
new file mode 100644
index 000000000000..6a09c91b5132
--- /dev/null
+++ b/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch
@@ -0,0 +1,14 @@
+diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
+index 00bd60bc24bb..17416b0bd3c0 100644
+--- a/lib/Driver/ToolChains/CommonArgs.cpp
++++ b/lib/Driver/ToolChains/CommonArgs.cpp
+@@ -376,8 +376,7 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,
+ // as gold requires -plugin to come before any -plugin-opt that -Wl might
+ // forward.
+ CmdArgs.push_back("-plugin");
+- std::string Plugin =
+- ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so";
++ std::string Plugin = "@libllvmLibdir@" "/LLVMgold.so";
+ CmdArgs.push_back(Args.MakeArgString(Plugin));
+
+ // Try to pass driver level flags relevant to LTO code generation down to
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index b5887a23c65e..df3d26139866 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
@@ -43,6 +43,10 @@ let
patches = [
./purity.patch
./gnu-install-dirs.patch
+ (substituteAll {
+ src = ./LLVMgold-path.patch;
+ libllvmLibdir = "${libllvm.lib}/lib";
+ })
];
postPatch = ''
@@ -58,12 +62,7 @@ let
outputs = [ "out" "lib" "dev" "python" ];
- # Clang expects to find LLVMgold in its own prefix
postInstall = ''
- if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
- ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
- fi
-
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index eba9111d9d32..ee8859c159a1 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
@@ -43,6 +43,10 @@ let
patches = [
./purity.patch
./gnu-install-dirs.patch
+ (substituteAll {
+ src = ../../clang-6-10-LLVMgold-path.patch;
+ libllvmLibdir = "${libllvm.lib}/lib";
+ })
];
postPatch = ''
@@ -58,12 +62,7 @@ let
outputs = [ "out" "lib" "dev" "python" ];
- # Clang expects to find LLVMgold in its own prefix
postInstall = ''
- if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
- ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
- fi
-
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
index e1b031ad352b..afa1669ace61 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
@@ -52,6 +52,10 @@ let
# needed for our bootstrapping to not interfere with C.
./unwindlib.patch
./gnu-install-dirs.patch
+ (substituteAll {
+ src = ../../clang-6-10-LLVMgold-path.patch;
+ libllvmLibdir = "${libllvm.lib}/lib";
+ })
];
postPatch = ''
@@ -70,12 +74,7 @@ let
outputs = [ "out" "lib" "dev" "python" ];
- # Clang expects to find LLVMgold in its own prefix
postInstall = ''
- if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
- ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
- fi
-
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix
index c3399dccd1d7..5cb7720d026f 100644
--- a/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/8/clang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
@@ -59,6 +59,10 @@ let
# make clang -xhip use $PATH to find executables
./HIP-use-PATH-8.patch
./gnu-install-dirs.patch
+ (substituteAll {
+ src = ../../clang-6-10-LLVMgold-path.patch;
+ libllvmLibdir = "${libllvm.lib}/lib";
+ })
];
postPatch = ''
@@ -77,12 +81,7 @@ let
outputs = [ "out" "lib" "dev" "python" ];
- # Clang expects to find LLVMgold in its own prefix
postInstall = ''
- if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
- ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
- fi
-
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
index 700fcb414fce..c98b4a830c42 100644
--- a/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
+{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
@@ -52,6 +52,10 @@ let
# make clang -xhip use $PATH to find executables
./HIP-use-PATH-9.patch
./gnu-install-dirs.patch
+ (substituteAll {
+ src = ../../clang-6-10-LLVMgold-path.patch;
+ libllvmLibdir = "${libllvm.lib}/lib";
+ })
];
postPatch = ''
@@ -70,12 +74,7 @@ let
outputs = [ "out" "lib" "dev" "python" ];
- # Clang expects to find LLVMgold in its own prefix
postInstall = ''
- if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
- ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
- fi
-
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch b/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch
new file mode 100644
index 000000000000..8f8991976f33
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
+index 6b6e276b8ce7..7896542a1202 100644
+--- a/lib/Driver/ToolChains/CommonArgs.cpp
++++ b/lib/Driver/ToolChains/CommonArgs.cpp
+@@ -409,7 +409,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
+
+ SmallString<1024> Plugin;
+ llvm::sys::path::native(
+- Twine(D.Dir) + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + Suffix,
++ Twine("@libllvmLibdir@" "/LLVMgold") + Suffix,
+ Plugin);
+ CmdArgs.push_back(Args.MakeArgString(Plugin));
+ }
diff --git a/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch b/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch
new file mode 100644
index 000000000000..93504316edf3
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch
@@ -0,0 +1,15 @@
+diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
+index 37ec73468570..b73e75aa6e59 100644
+--- a/lib/Driver/ToolChains/CommonArgs.cpp
++++ b/lib/Driver/ToolChains/CommonArgs.cpp
+@@ -370,8 +370,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,
+ #endif
+
+ SmallString<1024> Plugin;
+- llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) +
+- "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" +
++ llvm::sys::path::native(Twine("@libllvmLibdir@"
++ "/LLVMgold") +
+ Suffix,
+ Plugin);
+ CmdArgs.push_back(Args.MakeArgString(Plugin));
diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix
index 9a5d34107fb4..1bbbbd963f68 100644
--- a/pkgs/development/compilers/llvm/git/default.nix
+++ b/pkgs/development/compilers/llvm/git/default.nix
@@ -21,8 +21,8 @@ let
release_version = "13.0.0";
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
- rev = "50c0aaed47b518beea550a6858c2967eaeaef7eb"; # When using a Git commit
- rev-version = "unstable-2021-06-04"; # When using a Git commit
+ rev = "643b6407faf460915679f304420cfbee87c47734"; # When using a Git commit
+ rev-version = "unstable-2021-06-11"; # When using a Git commit
version = if rev != "" then rev-version else "${release_version}${dash-candidate}";
targetConfig = stdenv.targetPlatform.config;
@@ -30,7 +30,7 @@ let
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
- sha256 = "1w1ahcg707yh3xiy6y28b90ag03dwjplj0bg39l4w72krqr28661";
+ sha256 = "0b06qqbks20m1cy9g1k8y4w8vh9zcbh9ag2bpk9xgg2xkmbq42az";
};
llvm_meta = {
diff --git a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch
index f62a23716987..18fa5fc6d89c 100644
--- a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch
+++ b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e5febba8043c..3cf530c341b0 100644
+index 135036f509d2..265c36f8211b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,15 +270,21 @@ if (CMAKE_BUILD_TYPE AND
@@ -37,7 +37,7 @@ index e5febba8043c..3cf530c341b0 100644
CACHE STRING "OCamldoc-generated HTML documentation install directory")
option (LLVM_BUILD_EXTERNAL_COMPILER_RT
-@@ -1046,7 +1052,7 @@ endif()
+@@ -1048,7 +1054,7 @@ endif()
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
install(DIRECTORY include/llvm include/llvm-c
@@ -46,7 +46,7 @@ index e5febba8043c..3cf530c341b0 100644
COMPONENT llvm-headers
FILES_MATCHING
PATTERN "*.def"
-@@ -1057,7 +1063,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+@@ -1059,7 +1065,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
)
install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c
@@ -55,7 +55,7 @@ index e5febba8043c..3cf530c341b0 100644
COMPONENT llvm-headers
FILES_MATCHING
PATTERN "*.def"
-@@ -1071,13 +1077,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+@@ -1073,13 +1079,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
if (LLVM_INSTALL_MODULEMAPS)
install(DIRECTORY include/llvm include/llvm-c
@@ -72,10 +72,10 @@ index e5febba8043c..3cf530c341b0 100644
RENAME "module.extern.modulemap"
)
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
-index 1c419cddbe93..fa0be670986b 100644
+index 9c2b85374307..5531ceeb2eeb 100644
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
-@@ -801,9 +801,9 @@ macro(add_llvm_library name)
+@@ -818,9 +818,9 @@ macro(add_llvm_library name)
get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella})
install(TARGETS ${name}
${export_to_llvmexports}
@@ -88,7 +88,7 @@ index 1c419cddbe93..fa0be670986b 100644
if (NOT LLVM_ENABLE_IDE)
add_llvm_install_targets(install-${name}
-@@ -1019,7 +1019,7 @@ function(process_llvm_pass_plugins)
+@@ -1036,7 +1036,7 @@ function(process_llvm_pass_plugins)
"set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})")
install(FILES
${llvm_cmake_builddir}/LLVMConfigExtensions.cmake
@@ -97,7 +97,7 @@ index 1c419cddbe93..fa0be670986b 100644
COMPONENT cmake-exports)
set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def")
-@@ -1233,7 +1233,7 @@ macro(add_llvm_example name)
+@@ -1250,7 +1250,7 @@ macro(add_llvm_example name)
endif()
add_llvm_executable(${name} ${ARGN})
if( LLVM_BUILD_EXAMPLES )
@@ -106,7 +106,7 @@ index 1c419cddbe93..fa0be670986b 100644
endif()
set_target_properties(${name} PROPERTIES FOLDER "Examples")
endmacro(add_llvm_example name)
-@@ -1851,7 +1851,7 @@ function(llvm_install_library_symlink name dest type)
+@@ -1868,7 +1868,7 @@ function(llvm_install_library_symlink name dest type)
set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX})
set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX})
@@ -115,7 +115,7 @@ index 1c419cddbe93..fa0be670986b 100644
if(WIN32 AND "${type}" STREQUAL "SHARED")
set(output_dir bin)
endif()
-@@ -1862,7 +1862,7 @@ function(llvm_install_library_symlink name dest type)
+@@ -1879,7 +1879,7 @@ function(llvm_install_library_symlink name dest type)
endfunction()
@@ -124,7 +124,7 @@ index 1c419cddbe93..fa0be670986b 100644
cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN})
foreach(path ${CMAKE_MODULE_PATH})
if(EXISTS ${path}/LLVMInstallSymlink.cmake)
-@@ -1885,7 +1885,7 @@ function(llvm_install_symlink name dest)
+@@ -1902,7 +1902,7 @@ function(llvm_install_symlink name dest)
set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX})
install(SCRIPT ${INSTALL_SYMLINK}
@@ -133,7 +133,7 @@ index 1c419cddbe93..fa0be670986b 100644
COMPONENT ${component})
if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE)
-@@ -1968,7 +1968,8 @@ function(add_llvm_tool_symlink link_name target)
+@@ -1985,7 +1985,8 @@ function(add_llvm_tool_symlink link_name target)
endif()
if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS)
@@ -143,7 +143,7 @@ index 1c419cddbe93..fa0be670986b 100644
endif()
endif()
endfunction()
-@@ -2097,9 +2098,9 @@ function(llvm_setup_rpath name)
+@@ -2114,9 +2115,9 @@ function(llvm_setup_rpath name)
# Since BUILD_SHARED_LIBS is only recommended for use by developers,
# hardcode the rpath to build/install lib dir first in this mode.
# FIXME: update this when there is better solution.
@@ -227,19 +227,19 @@ index 3e6a2c9a2648..52e14d955c60 100644
message(STATUS "Creating ${name}")
diff --git a/docs/CMake.rst b/docs/CMake.rst
-index 589b09f28281..af43b082f755 100644
+index f1ac2c7d4934..c6e1469b5e13 100644
--- a/docs/CMake.rst
+++ b/docs/CMake.rst
-@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``.
+@@ -202,7 +202,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``.
**LLVM_LIBDIR_SUFFIX**:STRING
Extra suffix to append to the directory where libraries are to be
installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64``
- to install libraries to ``/usr/lib64``.
+ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``.
- **CMAKE_C_FLAGS**:STRING
- Extra flags to use when compiling C source files.
-@@ -555,8 +555,8 @@ LLVM-specific variables
+ Rarely-used CMake variables
+ ---------------------------
+@@ -551,8 +551,8 @@ LLVM-specific variables
**LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING
The path to install Doxygen-generated HTML documentation to. This path can
@@ -248,47 +248,9 @@ index 589b09f28281..af43b082f755 100644
+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to
+ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`.
- **LLVM_ENABLE_SPHINX**:BOOL
- If specified, CMake will search for the ``sphinx-build`` executable and will make
-@@ -587,13 +587,33 @@ LLVM-specific variables
-
- **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING
- The path to install Sphinx-generated HTML documentation to. This path can
-- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to
-- `share/doc/llvm/html`.
-+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to
-+ `${CMAKE_INSTALL_DOCDIR}/${project}/html`.
-
- **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING
- The path to install OCamldoc-generated HTML documentation to. This path can
-- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to
-- `share/doc/llvm/ocaml-html`.
-+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to
-+ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`.
-+
-+**CMAKE_INSTALL_BINDIR**:STRING
-+ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``.
-+ Defaults to `bin`.
-+
-+**CMAKE_INSTALL_LIBDIR**:STRING
-+ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``.
-+ Defaults to `lib`.
-+
-+**CMAKE_INSTALL_INCLUDEDIR**:STRING
-+ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``.
-+ Defaults to `include`.
-+
-+**CMAKE_INSTALL_DOCDIR**:STRING
-+ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``.
-+ Defaults to `share/doc`.
-+
-+**CMAKE_INSTALL_MANDIR**:STRING
-+ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``.
-+ Defaults to `share/man`.
-
- **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL
- macOS Only: If enabled CMake will generate a target named
-@@ -791,9 +811,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``).
+ **LLVM_LINK_LLVM_DYLIB**:BOOL
+ If enabled, tools will be linked with the libLLVM shared library. Defaults
+@@ -792,9 +792,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``).
This file is available in two different locations.
@@ -379,11 +341,11 @@ index 1a2f04552d13..44fa7d3eec6b 100644
}
diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt
-index 2963f97cad88..69d66c9c9ca1 100644
+index 0af29ad762c5..37b99b83e35c 100644
--- a/tools/lto/CMakeLists.txt
+++ b/tools/lto/CMakeLists.txt
-@@ -25,7 +25,7 @@ add_llvm_library(LTO SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS
- intrinsics_gen)
+@@ -33,7 +33,7 @@ add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN
+ ${SOURCES} DEPENDS intrinsics_gen)
install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
- DESTINATION include/llvm-c
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index ef593422ff26..d7aaf2dcb55e 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -39,6 +39,7 @@ let
./read-truststore-from-env-jdk10.patch
./currency-date-range-jdk10.patch
./increase-javadoc-heap.patch
+ ./fix-library-path-jdk11.patch
] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk10.patch
];
@@ -136,14 +137,7 @@ let
disallowedReferences = [ openjdk11-bootstrap ];
- meta = with lib; {
- homepage = "http://openjdk.java.net/";
- license = licenses.gpl2;
- description = "The open-source Java Development Kit";
- maintainers = with maintainers; [ edwtjo asbachb ];
- platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
- mainProgram = "java";
- };
+ meta = import ./meta.nix lib;
passthru = {
architecture = "";
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index 66aeff306e38..3bbe12477388 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -145,14 +145,7 @@ let
disallowedReferences = [ openjdk11 ];
- meta = with lib; {
- homepage = "http://openjdk.java.net/";
- license = licenses.gpl2;
- description = "The open-source Java Development Kit";
- maintainers = with maintainers; [ edwtjo ];
- platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
- mainProgram = "java";
- };
+ meta = import ./meta.nix lib;
passthru = {
architecture = "";
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index 96a567895d6a..ed79ceafc55e 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -145,14 +145,7 @@ let
disallowedReferences = [ openjdk13-bootstrap ];
- meta = with lib; {
- homepage = "http://openjdk.java.net/";
- license = licenses.gpl2;
- description = "The open-source Java Development Kit";
- maintainers = with maintainers; [ edwtjo ];
- platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
- mainProgram = "java";
- };
+ meta = import ./meta.nix lib;
passthru = {
architecture = "";
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix
index fae27b8ca754..247cf941f002 100644
--- a/pkgs/development/compilers/openjdk/14.nix
+++ b/pkgs/development/compilers/openjdk/14.nix
@@ -141,14 +141,7 @@ let
disallowedReferences = [ openjdk14-bootstrap ];
- meta = with lib; {
- homepage = "https://openjdk.java.net/";
- license = licenses.gpl2;
- description = "The open-source Java Development Kit";
- maintainers = with maintainers; [ edwtjo ];
- platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
- mainProgram = "java";
- };
+ meta = import ./meta.nix lib;
passthru = {
architecture = "";
diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix
index 11333b1ef66a..d41a245c5448 100644
--- a/pkgs/development/compilers/openjdk/15.nix
+++ b/pkgs/development/compilers/openjdk/15.nix
@@ -141,14 +141,7 @@ let
disallowedReferences = [ openjdk15-bootstrap ];
- meta = with lib; {
- homepage = "https://openjdk.java.net/";
- license = licenses.gpl2;
- description = "The open-source Java Development Kit";
- maintainers = with maintainers; [ edwtjo ];
- platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
- mainProgram = "java";
- };
+ meta = import ./meta.nix lib;
passthru = {
architecture = "";
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix
index 99033e8738c5..df8a3a68f487 100644
--- a/pkgs/development/compilers/openjdk/16.nix
+++ b/pkgs/development/compilers/openjdk/16.nix
@@ -147,14 +147,7 @@ let
disallowedReferences = [ openjdk16-bootstrap ];
- meta = with lib; {
- homepage = "https://openjdk.java.net/";
- license = licenses.gpl2;
- description = "The open-source Java Development Kit";
- maintainers = with maintainers; [ edwtjo ];
- platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
- mainProgram = "java";
- };
+ meta = import ./meta.nix lib;
passthru = {
architecture = "";
diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix
index 5dd979e5521a..ae045ddfdba0 100644
--- a/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -69,10 +69,6 @@ let
home = jdk;
};
- meta = with lib; {
- license = licenses.gpl2;
- platforms = platforms.darwin;
- };
-
+ meta = import ./meta.nix lib;
};
in jdk
diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix
index 0941aa728ead..c7367a5d642c 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -73,10 +73,6 @@ let
home = jdk;
};
- meta = with lib; {
- license = licenses.gpl2;
- platforms = platforms.darwin;
- };
-
+ meta = import ./meta.nix lib;
};
in jdk
diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index 509d1ab55227..9478f83477c8 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -69,10 +69,6 @@ let
home = jdk;
};
- meta = with lib; {
- license = licenses.gpl2;
- platforms = platforms.darwin;
- };
-
+ meta = import ./meta.nix lib;
};
in jdk
diff --git a/pkgs/development/compilers/openjdk/darwin/meta.nix b/pkgs/development/compilers/openjdk/darwin/meta.nix
new file mode 100644
index 000000000000..abe469af6915
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/darwin/meta.nix
@@ -0,0 +1,4 @@
+lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // {
+ platforms = lib.platforms.darwin;
+ homepage = "https://www.azul.com/";
+}
diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch b/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch
new file mode 100644
index 000000000000..21263dd68926
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch
@@ -0,0 +1,37 @@
+diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
+index 0dbe03349e..847d56778d 100644
+--- a/src/hotspot/os/linux/os_linux.cpp
++++ b/src/hotspot/os/linux/os_linux.cpp
+@@ -326,13 +326,13 @@ void os::init_system_properties_values() {
+ // ...
+ // 7: The default directories, normally /lib and /usr/lib.
+ #if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) || defined(S390)
+- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
++ #define DEFAULT_LIBPATH ""
+ #else
+- #define DEFAULT_LIBPATH "/lib:/usr/lib"
++ #define DEFAULT_LIBPATH ""
+ #endif
+
+ // Base path of extensions installed on the system.
+-#define SYS_EXT_DIR "/usr/java/packages"
++#define SYS_EXT_DIR ""
+ #define EXTENSIONS_DIR "/lib/ext"
+
+ // Buffer that fits several sprintfs.
+@@ -392,13 +392,13 @@ void os::init_system_properties_values() {
+ strlen(v) + 1 +
+ sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1,
+ mtInternal);
+- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon);
++ sprintf(ld_library_path, "%s", v);
+ Arguments::set_library_path(ld_library_path);
+ FREE_C_HEAP_ARRAY(char, ld_library_path);
+ }
+
+ // Extensions directories.
+- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home());
++ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home());
+ Arguments::set_ext_dirs(buf);
+
+ FREE_C_HEAP_ARRAY(char, buf);
diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix
new file mode 100644
index 000000000000..d635d5c01e6b
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/meta.nix
@@ -0,0 +1,8 @@
+lib: with lib; {
+ homepage = "https://openjdk.java.net/";
+ license = licenses.gpl2Only;
+ description = "The open-source Java Development Kit";
+ maintainers = with maintainers; [ edwtjo asbachb ];
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+ mainProgram = "java";
+}
diff --git a/pkgs/development/compilers/rust/1_52.nix b/pkgs/development/compilers/rust/1_52.nix
index bfd6fc47ad20..49176ad3fedd 100644
--- a/pkgs/development/compilers/rust/1_52.nix
+++ b/pkgs/development/compilers/rust/1_52.nix
@@ -15,21 +15,22 @@
, CoreFoundation, Security
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
-, llvmPackages_11, llvm_11
+, llvmPackages_11
+, llvmPackages_12, llvm_12
} @ args:
import ./default.nix {
rustcVersion = "1.52.1";
rustcSha256 = "sha256-Om8jom0Oj4erv78yxc19qgwLcdCYar78Vrml+/vQv5g=";
- llvmSharedForBuild = pkgsBuildBuild.llvmPackages_11.libllvm.override { enableSharedLibraries = true; };
- llvmSharedForHost = pkgsBuildHost.llvmPackages_11.libllvm.override { enableSharedLibraries = true; };
- llvmSharedForTarget = pkgsBuildTarget.llvmPackages_11.libllvm.override { enableSharedLibraries = true; };
+ llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; };
+ llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; };
+ llvmSharedForTarget = pkgsBuildTarget.llvmPackages_12.libllvm.override { enableSharedLibraries = true; };
llvmBootstrapForDarwin = llvmPackages_11;
# For use at runtime
- llvmShared = llvm_11.override { enableSharedLibraries = true; };
+ llvmShared = llvm_12.override { enableSharedLibraries = true; };
# Note: the version MUST be one version prior to the version we're
# building
@@ -56,4 +57,4 @@ import ./default.nix {
];
}
-(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"])
+(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_12" "llvm_12"])
diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix
index 92531eacd20d..c0ee8988c094 100644
--- a/pkgs/development/interpreters/chibi/default.nix
+++ b/pkgs/development/interpreters/chibi/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper }:
let
- version = "0.9.1";
+ version = "0.10";
name = "chibi-scheme-${version}";
in
stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
owner = "ashinn";
repo = "chibi-scheme";
rev = version;
- sha256 = "0nd63i924ifh39cba1hd4sbi6vh1cb73v97nrn4bf8rrjh3k8pdi";
+ sha256 = "sha256-7vDxcnXhq1wJSLFHGxtwh+H+KWxh6B0JXSMPzSmQFXo=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 685d58f11027..1d6abb59504e 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -2,33 +2,32 @@
, lib
, fetchurl
, unzip
-, version ? "2.12.2"
-, sources ?
- let
+, version ? "2.13.1"
+, sources ? let
base = "https://storage.googleapis.com/dart-archive/channels";
x86_64 = "x64";
i686 = "ia32";
aarch64 = "arm64";
# Make sure that if the user overrides version parameter they're
# also need to override sources, to avoid mistakes
- version = "2.12.2";
+ version = "2.13.1";
in
{
"${version}-x86_64-darwin" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
- sha256 = "0h6mpy0kfc842vhg053fyxbjnd8lw1d1shdcsj800048260lxhyd";
+ sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya";
};
"${version}-x86_64-linux" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
- sha256 = "1gg210gf4yif3bl9k19znkndc4c1cd529xwxpi20ykaw3zfxxz2z";
+ sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq";
};
"${version}-i686-linux" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
- sha256 = "1wngxba71j20gq9vy7n8q0m9rnqs047xm5b03bxk3hhaq6dyzkwn";
+ sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj";
};
"${version}-aarch64-linux" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
- sha256 = "0rqsmzl5g5kgk54qb03kamjm5n5g5pqfl79np37xdzwqbv0zx22b";
+ sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc";
};
}
}:
@@ -40,9 +39,7 @@ stdenv.mkDerivation {
pname = "dart";
inherit version;
- nativeBuildInputs = [
- unzip
- ];
+ nativeBuildInputs = [ unzip ];
src = sources."${version}-${stdenv.hostPlatform.system}" or (throw "unsupported version/system: ${version}/${stdenv.hostPlatform.system}");
diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index 360666d898af..ba533a172761 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, validatePkgConfig }:
stdenv.mkDerivation rec {
pname = "duktape";
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n";
};
+ nativeBuildInputs = [ validatePkgConfig ];
+
postPatch = ''
substituteInPlace Makefile.sharedlibrary \
--replace 'gcc' '${stdenv.cc.targetPrefix}cc' \
@@ -23,9 +25,10 @@ stdenv.mkDerivation rec {
installPhase = ''
install -d $out/bin
install -m755 duk $out/bin/
- install -d $out/lib
+ install -d $out/lib/pkgconfig
install -d $out/include
make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out
+ substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/duktape/duktape.pc.in b/pkgs/development/interpreters/duktape/duktape.pc.in
new file mode 100644
index 000000000000..d34edb320e2e
--- /dev/null
+++ b/pkgs/development/interpreters/duktape/duktape.pc.in
@@ -0,0 +1,10 @@
+prefix=@out@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: duktape
+Description: An embeddable Javascript engine, with a focus on portability and compact footprint
+Version: @version@
+Libs: -L${libdir} -lduktape
+Cflags: -I${includedir}
diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix
index ee788560dcf4..3ecbf3de2a91 100644
--- a/pkgs/development/interpreters/erlang/R23.nix
+++ b/pkgs/development/interpreters/erlang/R23.nix
@@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
- version = "23.3.4.2";
- sha256 = "QAIkiYBhYnUzyRg70SQ4BwjjYqclDA4uruqRNTgB2Sk=";
+ version = "23.3.4.3";
+ sha256 = "wmR0XTMrJ3608HD341lNlYChwxs/8jb12Okw3RNHGCA=";
}
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index abfa74bb67d3..108da08b80d7 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.kovirobi ];
platforms = with platforms; linux ++ darwin;
inherit version;
+ mainProgram = "apl";
longDescription = ''
GNU APL is a free interpreter for the programming language APL, with an
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index 4c836264017b..c0438d1e0076 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
- version = "1.16.0";
+ version = "1.16.1";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Wrr2zie251oB+uhsLMmkPBV0b3MwTmcPTgNJOsgCems=";
+ sha256 = "sha256-TzJbHmHIySlf3asQ02HOdehMR+s0KkPifBiaQ4FvFCg=";
};
nativeBuildInputs = [ meson ninja ];
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 4e540dc8aacb..f5368e405387 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
- version = "9.2.17.0";
+ version = "9.2.18.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
- sha256 = "sha256-dwHTU3s6YG0nZaxtXEDmdd2qAdPOutJqIaZuOq3VwgI=";
+ sha256 = "sha256-QlpclwptkYrlMSdYUGNNEhaeNVd1SyuBf7+3mHoywac=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
index 6dd384b4847f..745f02e8c9bc 100644
--- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
@@ -7,7 +7,7 @@ pipBuildPhase() {
mkdir -p dist
echo "Creating a wheel..."
- @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
+ @pythonInterpreter@ -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
echo "Finished creating a wheel..."
runHook postBuild
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 358b8663196b..1b2655fe7712 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
- version = "2021.02.1";
+ version = "2021.05";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
- sha256 = "1xwqx4357bw7h5pdmwxm5wxh8wjvrcdk4rvr3wyrhg1wzy5qvsn8";
+ sha256 = "0h9kdb4vvscflifmclx0zhwb5qfakiggnbvlf9cx2hmp5vnk71jk";
};
buildInputs = [ icu zlib gmp perl ];
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index e5baacf5c295..0dbe0f5d97e3 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
- version = "2021.02";
+ version = "2021.05";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
- sha256 = "08ri9mvbk97qfxcy6lj4cb7j3a789ck052m2vqfhis3vkrkw780r";
+ sha256 = "15x8lra3k7lpcisfxvrrz3jqp2dilfrwgqzxkknwlfsfcrw8fk5i";
};
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index cd60bb3b7900..317a8226852e 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
- version = "2021.02";
+ version = "2021.05";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
- sha256 = "1vyl6x811f8mbdnp34yj6kfmfpxp2yfrr8cqf1w47rzmr741sjyj";
+ sha256 = "0gzpzzvqs3xar5657yx07hsvqn3xckdfvq9jw73qfccbbb9gjg5l";
};
buildInputs = [ perl ];
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 9179866fe9e3..9386eb75abdd 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -12,7 +12,7 @@ let
opString = lib.optionalString;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix { inherit fetchFromSavannah; };
- rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
+ rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; };
# Contains the ruby version heuristics
rubyVersion = import ./ruby-version.nix { inherit lib; };
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index db508caae310..cf2ca1b766ea 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl }:
+{ stdenv, lib, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
name = "rubygems";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
./0001-add-post-extract-hook.patch
./0002-binaries-with-env-shebang.patch
./0003-gem-install-default-to-user.patch
+ # Ensure tmp directory are not left behind
+ # https://github.com/rubygems/rubygems/pull/4610
+ (fetchpatch {
+ url = "https://github.com/rubygems/rubygems/commit/2c2ffde6e4a9f7f571d38af687034fb8507a833d.patch";
+ sha256 = "sha256-bs2dXALKiJvMgk7lKjMx0NzGqlEqDYBBO35UrzNifms=";
+ })
];
installPhase = ''
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index e665e8cfb1ea..beb95d51d2c1 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -1,55 +1,67 @@
-{ lib, stdenv
+{ lib, stdenv, callPackage, makeSetupHook, makeWrapper
# Version specific stuff
, release, version, src
, ...
}:
-stdenv.mkDerivation {
- pname = "tcl";
- inherit version;
+let
+ baseInterp =
+ stdenv.mkDerivation {
+ pname = "tcl";
+ inherit version src;
- inherit src;
+ outputs = [ "out" "man" ];
- outputs = [ "out" "man" ];
+ setOutputFlags = false;
- setOutputFlags = false;
+ preConfigure = ''
+ cd unix
+ '';
- preConfigure = ''
- cd unix
- '';
+ configureFlags = [
+ "--enable-threads"
+ # Note: using $out instead of $man to prevent a runtime dependency on $man.
+ "--mandir=${placeholder "out"}/share/man"
+ "--enable-man-symlinks"
+ # Don't install tzdata because NixOS already has a more up-to-date copy.
+ "--with-tzdata=no"
+ "tcl_cv_strtod_unbroken=ok"
+ ] ++ lib.optional stdenv.is64bit "--enable-64bit";
- configureFlags = [
- "--enable-threads"
- # Note: using $out instead of $man to prevent a runtime dependency on $man.
- "--mandir=${placeholder "out"}/share/man"
- "--enable-man-symlinks"
- # Don't install tzdata because NixOS already has a more up-to-date copy.
- "--with-tzdata=no"
- "tcl_cv_strtod_unbroken=ok"
- ] ++ lib.optional stdenv.is64bit "--enable-64bit";
+ enableParallelBuilding = true;
- enableParallelBuilding = true;
+ postInstall = let
+ dllExtension = stdenv.hostPlatform.extensions.sharedLibrary;
+ in ''
+ make install-private-headers
+ ln -s $out/bin/tclsh${release} $out/bin/tclsh
+ ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension}
+ '';
- postInstall = let
- dllExtension = stdenv.hostPlatform.extensions.sharedLibrary;
- in ''
- make install-private-headers
- ln -s $out/bin/tclsh${release} $out/bin/tclsh
- ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension}
- '';
+ meta = with lib; {
+ description = "The Tcl scripting language";
+ homepage = "https://www.tcl.tk/";
+ license = licenses.tcltk;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ agbrooks ];
+ };
- meta = with lib; {
- description = "The Tcl scripting language";
- homepage = "https://www.tcl.tk/";
- license = licenses.tcltk;
- platforms = platforms.all;
- maintainers = with maintainers; [ vrthra ];
- };
+ passthru = rec {
+ inherit release version;
+ libPrefix = "tcl${release}";
+ libdir = "lib/${libPrefix}";
+ tclPackageHook = callPackage ({}: makeSetupHook {
+ name = "tcl-package-hook";
+ deps = [ makeWrapper ];
+ } ./tcl-package-hook.sh) {};
+ };
+ };
- passthru = rec {
- inherit release version;
- libPrefix = "tcl${release}";
- libdir = "lib/${libPrefix}";
- };
-}
+ mkTclDerivation = callPackage ./mk-tcl-derivation.nix { tcl = baseInterp; };
+
+in baseInterp.overrideAttrs (self: {
+ passthru = self.passthru // {
+ inherit mkTclDerivation;
+ };
+})
diff --git a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
new file mode 100644
index 000000000000..4f3ffe6f995f
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
@@ -0,0 +1,69 @@
+# Generic builder for tcl packages/applications, generally based on mk-python-derivation.nix
+{ tcl
+, lib
+, makeWrapper
+, runCommand
+, writeScript
+}:
+
+{ buildInputs ? []
+, nativeBuildInputs ? []
+, propagatedBuildInputs ? []
+, checkInputs ? []
+
+# true if we should skip the configuration phase altogether
+, dontConfigure ? false
+
+# Extra flags passed to configure step
+, configureFlags ? []
+
+# Whether or not we should add common Tcl-related configure flags
+, addTclConfigureFlags ? true
+
+, meta ? {}
+, passthru ? {}
+, doCheck ? true
+, ... } @ attrs:
+
+let
+ inherit (tcl) stdenv;
+ inherit (lib) getBin optionalAttrs optionals;
+
+ defaultTclPkgConfigureFlags = [
+ "--with-tcl=${tcl}/lib"
+ "--with-tclinclude=${tcl}/include"
+ "--exec-prefix=\${out}"
+ ];
+
+ self = (stdenv.mkDerivation ((builtins.removeAttrs attrs [
+ "addTclConfigureFlags" "checkPhase" "checkInputs" "doCheck"
+ ]) // {
+
+ buildInputs = buildInputs ++ [ makeWrapper tcl.tclPackageHook ];
+ nativeBuildInputs = nativeBuildInputs ++ [ tcl ];
+ propagatedBuildInputs = propagatedBuildInputs ++ [ tcl ];
+
+ TCLSH = "${getBin tcl}/bin/tclsh";
+
+ # Run tests after install, at which point we've done all TCLLIBPATH setup
+ doCheck = false;
+ doInstallCheck = attrs.doCheck or ((attrs ? doInstallCheck) && attrs.doInstallCheck);
+ installCheckInputs = checkInputs ++ (optionals (attrs ? installCheckInputs) attrs.installCheckInputs);
+
+ # Add typical values expected by TEA for configureFlags
+ configureFlags =
+ if (!dontConfigure && addTclConfigureFlags)
+ then (configureFlags ++ defaultTclPkgConfigureFlags)
+ else configureFlags;
+
+ meta = {
+ platforms = tcl.meta.platforms;
+ } // meta;
+
+
+ } // optionalAttrs (attrs?checkPhase) {
+ installCheckPhase = attrs.checkPhase;
+ }
+ ));
+
+in lib.extendDerivation true passthru self
diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh
new file mode 100644
index 000000000000..747783cb1c27
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh
@@ -0,0 +1,74 @@
+# This hook ensures that we do the following in post-fixup:
+# * wrap any installed executables with a wrapper that configures TCLLIBPATH
+# * write a setup hook that extends the TCLLIBPATH of any anti-dependencies
+
+# Add a directory to TCLLIBPATH, provided that it exists
+_addToTclLibPath() {
+ local tclPkg="$1"
+ if [[ -z "$tclPkg" ]]; then
+ return
+ fi
+
+ if [[ ! -d "$tclPkg" ]]; then
+ >&2 echo "can't add $tclPkg to TCLLIBPATH; that directory doesn't exist"
+ exit 1
+ fi
+
+ if [[ "$tclPkg" == *" "* ]]; then
+ tclPkg="{$tclPkg}"
+ fi
+
+ if [[ -z "${TCLLIBPATH-}" ]]; then
+ export TCLLIBPATH="$tclPkg"
+ else
+ if [[ "$TCLLIBPATH" != *"$tclPkg "* && "$TCLLIBPATH" != *"$tclPkg" ]]; then
+ export TCLLIBPATH="${TCLLIBPATH} $tclPkg"
+ fi
+ fi
+}
+
+# Locate any directory containing an installed pkgIndex file
+findInstalledTclPkgs() {
+ local -r newLibDir="${!outputLib}/lib"
+ if [[ ! -d "$newLibDir" ]]; then
+ >&2 echo "Assuming no loadable tcl packages installed ($newLibDir does not exist)"
+ return
+ fi
+ echo "$(find "$newLibDir" -name pkgIndex.tcl -exec dirname {} \;)"
+}
+
+# Wrap any freshly-installed binaries and set up their TCLLIBPATH
+wrapTclBins() {
+ if [[ -z "${TCLLIBPATH-}" ]]; then
+ echo "skipping automatic Tcl binary wrapping (nothing to do)"
+ return
+ fi
+
+ local -r tclBinsDir="${!outputBin}/bin"
+ if [[ ! -d "$tclBinsDir" ]]; then
+ echo "No outputBin found, not using any TCLLIBPATH wrapper"
+ return
+ fi
+
+ find "$tclBinsDir" -type f -executable -print |
+ while read -r someBin; do
+ echo "Adding TCLLIBPATH wrapper for $someBin"
+ wrapProgram "$someBin" --prefix TCLLIBPATH ' ' "$TCLLIBPATH"
+ done
+}
+
+# Generate hook to adjust TCLLIBPATH in anti-dependencies
+writeTclLibPathHook() {
+ local -r hookPath="${!outputLib}/nix-support/setup-hook"
+ mkdir -p "$(dirname "$hookPath")"
+
+ typeset -f _addToTclLibPath >> "$hookPath"
+ local -r tclPkgs=$(findInstalledTclPkgs)
+ while IFS= read -r tclPkg; do
+ echo "_addToTclLibPath \"$tclPkg\"" >> "$hookPath"
+ _addToTclLibPath "$tclPkg" true
+ done <<< "$tclPkgs"
+}
+
+postFixupHooks+=(writeTclLibPathHook)
+postFixupHooks+=(wrapTclBins)
diff --git a/pkgs/development/interpreters/tclreadline/default.nix b/pkgs/development/interpreters/tclreadline/default.nix
index 44d2745dac8b..de671bab5739 100644
--- a/pkgs/development/interpreters/tclreadline/default.nix
+++ b/pkgs/development/interpreters/tclreadline/default.nix
@@ -8,7 +8,7 @@
, tk
}:
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
pname = "tclreadline";
version = "2.3.8";
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
readline
- tcl
tk
];
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-tclshrl"
"--enable-wishrl"
- "--with-tcl=${tcl}/lib"
"--with-tk=${tk}/lib"
"--with-readline-includes=${readline.dev}/include/readline"
"--with-libtool=${libtool}"
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index bd8edc14a8bb..3ca359b3da5d 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cgal";
- version = "5.2.1";
+ version = "5.2.2";
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
- sha256 = "sha256-sJyeehgt84rLX8ZBYIbFgHLG2aJDDHEj5GeVnQhjiOQ=";
+ sha256 = "sha256-DeTJAAY3OEu+pVazt5es1v3l1nGAfjvE0wQmYISRYoo=";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 333dbb053f52..0ed9aa204706 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "alembic";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = version;
- sha256 = "sha256-ObjpWreabeVzKYVgC62JaoGUf1BZCxP0STjox3akDvo=";
+ sha256 = "sha256-e87pnWIV8fbjEQa5iXRPXA9MkJN9NwY9PW/QI+cVSKo=";
};
outputs = [ "bin" "dev" "out" "lib" ];
diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index e3bc04a6d226..5d5277afcd3e 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
- version = "2021.Q2.4";
+ version = "2021.Q2.5";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "KPWkwbD55BoztF6DPmvau9i1AMhR+5ad5VrrD8I2YyI=";
+ sha256 = "0NJoGk++SHt4dtoUj3UQeW4zFtwa7osczUr+vxi8DG8=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 7961211dc63e..38c557316982 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
, fixDarwinDylibNames, gobject-introspection, gnome
+, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
}:
let
@@ -17,8 +18,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
- ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+ nativeBuildInputs = [ meson ninja pkg-config gettext glib ]
+ ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
+ ++ lib.optional withIntrospection gobject-introspection;
propagatedBuildInputs = [
# Required by atk.pc
@@ -31,6 +33,10 @@ stdenv.mkDerivation rec {
./fix_pc.patch
];
+ mesonFlags = [
+ "-Dintrospection=${lib.boolToString withIntrospection}"
+ ];
+
doCheck = true;
passthru = {
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 2e10dbd88150..49a3a5478cff 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -15,7 +15,7 @@ let
x86_64-linux = "x64/libbass.so";
};
urlpath = "bass24-linux.zip";
- sha256 = "1z01im0l2ydi608vc0n0c1cfyp1vrh6681zn2zkhg98vvs20y805";
+ sha256 = "1ycvpfa7yyi1qxgflpfzcw1q32f0isd14m9cf351pk8zwndkmp4q";
};
bass_fx = {
diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index f3f09497a660..34f0e8b5b495 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl, tcl }:
+{ lib, fetchurl, tcl, tk }:
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
pname = "bwidget";
version = "1.9.14";
@@ -10,21 +10,17 @@ stdenv.mkDerivation rec {
};
dontBuild = true;
+ propagatedBuildInputs = [ tk ];
installPhase = ''
- mkdir -p "$out/lib/${passthru.libPrefix}"
- cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}"
+ mkdir -p "$out/lib/bwidget${version}"
+ cp -R *.tcl lang images "$out/lib/bwidget${version}"
'';
- passthru = {
- libPrefix = "bwidget${version}";
- };
-
- buildInputs = [ tcl ];
-
meta = {
homepage = "https://sourceforge.net/projects/tcllib";
description = "High-level widget set for Tcl/Tk";
+ maintainers = with lib.maintainers; [ agbrooks ];
license = lib.licenses.tcltk;
platforms = lib.platforms.linux;
};
diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 51df5a9254a5..fe6926fe809a 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -10,14 +10,14 @@ assert useVulkan -> withExamples;
stdenv.mkDerivation rec {
pname = "dav1d";
- version = "0.8.2";
+ version = "0.9.0";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";
repo = pname;
rev = version;
- sha256 = "0plmnxpz66yv3nqv1kgbyyfnwfqi9dqs0zbsdj488i6464a1m6si";
+ sha256 = "0ki3wlyaqr80gl1srbbd18dd5bs1sl9icxym8ar62abpvgzxl5yk";
};
nativeBuildInputs = [ meson ninja nasm pkg-config ];
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index f56a1eaac245..0bab4eb1949e 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "dbus-glib-0.110";
+ name = "dbus-glib-0.112";
src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
- sha256 = "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w";
+ sha256 = "sha256-fVUNzN/NKG4ziVUBgp7Zce62XGFOc6rbSgiu73GbFDo=";
};
outputs = [ "out" "dev" "devdoc" ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://dbus.freedesktop.org";
- license = with lib.licenses; [ afl21 gpl2 ];
+ license = with lib.licenses; [ afl21 gpl2Plus ];
description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism";
maintainers = [ ];
platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
index a0c4f5a3e216..3978c05f2c71 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "gensio";
- version = "2.2.5";
+ version = "2.2.7";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-QC07NGgZa++qHyGZY3fjosjJVuRFfc7HYmdGxQHAz4s=";
+ sha256 = "sha256-2wxsPHrQ9GgyUE4p6zYuR1mPU2OyjtgiPnMApEscR2g=";
};
passthru = {
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index bec366b8e168..2d9d280ba75f 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation {
tampering, or message forgery."
'';
- homepage = "https://www.gnu.org/software/gnutls/";
+ homepage = "https://gnutls.org/";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ eelco fpletz ];
platforms = platforms.all;
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 3a48fa524842..85c9b77c6bdc 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "goffice";
- version = "0.10.49";
+ version = "0.10.50";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k=";
+ sha256 = "LFw93HsIs0UkCMgbEhxfASpzSYHXXkRN68yxxY5cv9w=";
};
nativeBuildInputs = [ pkg-config intltool ];
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index 67ae5623db12..dae01961a10c 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, writeText, tcl }:
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
pname = "incrtcl";
version = "4.2.0";
@@ -9,18 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw";
};
- buildInputs = [ tcl ];
- configureFlags = [ "--with-tcl=${tcl}/lib" ];
enableParallelBuilding = true;
patchPhase = ''
substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include"
'';
- preConfigure = ''
- configureFlags="--exec_prefix=$prefix $configureFlags"
- '';
-
postInstall = ''
rmdir $out/bin
mv $out/lib/itcl${version}/* $out/lib
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index 78e2ebae96ac..47a3ca4f9f99 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-sdk";
- version = "21.2.0";
+ version = "21.2.2";
src = fetchFromGitHub {
owner = "Intel-Media-SDK";
repo = "MediaSDK";
rev = "intel-mediasdk-${version}";
- sha256 = "sha256-LusgmvlWOMEQjy47IpA9IYcl/cUTSMmvxSwvV/ihs2g=";
+ sha256 = "sha256-iSrr9g6C8YRcmu92sTyDCh76Cdu8wbDL3COwiVxox4Q=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix
index 570190a43c1e..66039c61b4d5 100644
--- a/pkgs/development/libraries/itktcl/default.nix
+++ b/pkgs/development/libraries/itktcl/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, tcl, tk, incrtcl }:
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
pname = "itk-tcl";
version = "4.1.0";
@@ -9,11 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1iy964jfgsfnc1agk1w6bbm44x18ily8d4wmr7cc9z9f4acn2r6s";
};
- buildInputs = [ tcl tk incrtcl ];
+ buildInputs = [ tk incrtcl ];
enableParallelBuilding = true;
configureFlags = [
- "--with-tcl=${tcl}/lib"
"--with-tk=${tk}/lib"
"--with-itcl=${incrtcl}/lib"
"--with-tkinclude=${tk.dev}/include"
diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix
index 4e8aa57d9568..153892304e9c 100644
--- a/pkgs/development/libraries/kyotocabinet/default.nix
+++ b/pkgs/development/libraries/kyotocabinet/default.nix
@@ -1,11 +1,12 @@
{ lib, stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "kyotocabinet-1.2.76";
+ pname = "kyotocabinet";
+ version = "1.2.79";
src = fetchurl {
- url = "http://fallabs.com/kyotocabinet/pkg/${name}.tar.gz";
- sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1";
+ url = "https://dbmx.net/kyotocabinet/pkg/kyotocabinet-${version}.tar.gz";
+ sha256 = "079ymsahlrijswgwfr2la9yw5h57l752cprhp5dz31iamsj1vyv7";
};
prePatch = lib.optionalString stdenv.isDarwin ''
@@ -24,18 +25,12 @@ stdenv.mkDerivation rec {
--replace stdc++ c++
'';
- patches = [(fetchurl {
- name = "gcc6.patch";
- url = "https://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch";
- sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23";
- })];
-
buildInputs = [ zlib ];
meta = with lib; {
- homepage = "http://fallabs.com/kyotocabinet";
+ homepage = "https://dbmx.net/kyotocabinet";
description = "A library of routines for managing a database";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 61d87211e0a5..2d439db5934e 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
- version = "1.12.4";
+ version = "1.12.5";
src = fetchFromGitHub {
- sha256 = "sha256-7e9D9Q3CAm+2+0vl81djSZwKrQRXc5UxcbJVMt91/vU=";
+ sha256 = "sha256-1romJiOIQDlglo/nAJjn1l06dSwDRwG1b49H6js9MB4=";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index b7fd94f9f123..ca90750b8c24 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "libdrm";
- version = "2.4.105";
+ version = "2.4.106";
src = fetchurl {
url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0iiamypwdfiz250ki120nh598r48yyacmnndb4mkximdgi5h478x";
+ sha256 = "1m3vwpabjg3az84vmyxi96jyd7rrqm6qkhk1gq41w5wv89aarn4j";
};
outputs = [ "out" "dev" "bin" ];
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 6b761d2170c3..506b1a5b25fb 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
pname = "libgcrypt";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
- sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo=";
+ sha256 = "sha256-l+vk+U4vfjW3UhlM4VoPPGYyTg/2ryZlm7+1/y7DKP0=";
};
outputs = [ "out" "dev" "info" ];
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.gnu.org/software/libgcrypt/";
+ changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}";
description = "General-purpose cryptographic library";
license = licenses.lgpl2Plus;
platforms = platforms.all;
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index da53a9916d05..1f6fd4835afa 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -34,16 +34,6 @@ in stdenv.mkDerivation (rec {
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''
ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
- ''
- # This file was accidentally excluded from the sdist until
- # 013720333c6ec1d38791689bc49ba039d98e16b3, post release.
- # TODO make unconditional next mass rebuild
- + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
- cp ${fetchurl {
- url = "https://raw.githubusercontent.com/gpg/libgpg-error/50e62b36ea01ed25d12c443088b85d4f41a2b3e1/src/gen-lock-obj.sh";
- sha256 = "10cslipa6npalj869asaamj0w941dhmx0yjafpyyh69ypsg2m2c3";
- }} ./src/gen-lock-obj.sh
- chmod +x ./src/gen-lock-obj.sh
'';
outputs = [ "out" "dev" "info" ];
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 964a007cc80b..3d7df2bba9cb 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -16,13 +16,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both
stdenv.mkDerivation rec {
pname = "libjpeg-turbo";
- version = "2.0.6";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "libjpeg-turbo";
repo = "libjpeg-turbo";
rev = version;
- sha256 = "0njdxfmyk8smj8bbd6fs3lxjaq3lybivwgg16gpnbiyl984dpi9b";
+ sha256 = "sha256-Ma3Q/zMJPjsQmoaYJtVbHJOx65AfGLWJYi2iRFm3l5s=";
};
# This is needed by freeimage
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index e623aa0d1119..c8998446c7da 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,11 +1,11 @@
{ buildPackages, lib, stdenv, fetchurl, gettext, libgpgerror }:
stdenv.mkDerivation rec {
- name = "libksba-1.5.0";
+ name = "libksba-1.5.1";
src = fetchurl {
url = "mirror://gnupg/libksba/${name}.tar.bz2";
- sha256 = "1fm0mf3wq9fmyi1rmc1vk2fafn6liiw2mgxml3g7ybbb44lz2jmf";
+ sha256 = "sha256-sPTGXk5EfZojSfa4wOd6KL6VMeRUi6AsVF0fRtx7+SE=";
};
outputs = [ "out" "dev" "info" ];
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index 91a2c378c03c..6e82191e7558 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook
-, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
+, asciidoc, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
, json_c, kmod, which, util-linux, udev, keyutils
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "man" "dev" ];
nativeBuildInputs =
- [ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+ [ autoreconfHook asciidoc pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt
which
];
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--without-bash"
"--without-systemd"
+ "--disable-asciidoctor" # depends on ruby 2.7, use asciidoc instead
];
patchPhase = ''
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 8a3179b03427..a812a2d78489 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "libqmi";
- version = "1.28.2";
+ version = "1.28.4";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
- sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M=";
+ sha256 = "sha256-OxTNKrUiGnrbs5/tFu9pdTjqHHkwiCGtLRm1BeHarqA=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix
index eb9c514d59d2..3a2ca1e18c15 100644
--- a/pkgs/development/libraries/librime/default.nix
+++ b/pkgs/development/libraries/librime/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "librime";
- version = "1.7.2";
+ version = "1.7.3";
src = fetchFromGitHub {
owner = "rime";
repo = pname;
rev = version;
- sha256 = "023c7bpfnyf8wlrssn89ziwsjccflyanrxlaqmwcbx8a5dvipk01";
+ sha256 = "sha256-GzNMwyJR9PgJN0eGYbnBW6LS3vo4SUVLdyNG9kcEE18=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index f4caa22b3229..9b61ce65d453 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libsass";
- version = "3.6.4";
+ version = "3.6.5";
src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
- sha256 = "074kvacdan85h4qrvsk97575ys9xgkc044gplz3m6vn4a8pcl2rn";
+ sha256 = "1cxj6r85d5f3qxdwzxrmkx8z875hig4cr8zsi30w6vj23cyds3l2";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix
new file mode 100644
index 000000000000..7b48f150c9a1
--- /dev/null
+++ b/pkgs/development/libraries/libserdes/default.nix
@@ -0,0 +1,61 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, perl
+, boost
+, rdkafka
+, jansson
+, curl
+, avro-c
+, avro-cpp }:
+
+stdenv.mkDerivation rec {
+ pname = "libserdes";
+ version = "6.2.0";
+
+ src = fetchFromGitHub {
+ owner = "confluentinc";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "194ras18xw5fcnjgg1isnb24ydx9040ndciniwcbdb7w7wd901gc";
+ };
+
+ outputs = [ "dev" "out" ];
+
+ nativeBuildInputs = [ perl ];
+
+ buildInputs = [ boost rdkafka jansson curl avro-c avro-cpp ];
+
+ makeFlags = [ "GEN_PKG_CONFIG=y" ];
+
+ postPatch = ''
+ patchShebangs configure lds-gen.pl
+ '';
+
+ # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh:
+ setOutputFlags = false;
+
+ preConfigure = ''
+ configureFlagsArray+=(
+ "--libdir=''${!outputLib}/lib"
+ "--includedir=''${!outputInclude}/include"
+ )
+ '';
+
+ preInstall = ''
+ installFlagsArray+=("pkgconfigdir=''${!outputDev}/lib/pkgconfig")
+ '';
+
+ # Header files get installed with executable bit for some reason; get rid of it.
+ postInstall = ''
+ chmod -x ''${!outputInclude}/include/libserdes/*.h
+ '';
+
+ meta = with lib; {
+ description = "A schema-based serializer/deserializer C/C++ library with support for Avro and the Confluent Platform Schema Registry";
+ homepage = "https://github.com/confluentinc/libserdes";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ liff ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
index 97991a0cffbf..fe02a96a565c 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@@ -1,7 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
-, fetchpatch
+, nix-update-script
, autoreconfHook
, pkg-config
, perl
@@ -16,29 +16,16 @@
stdenv.mkDerivation rec {
pname = "libsidplayfp";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "libsidplayfp";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "0487gap2b0ypikyra74lk1qwqwr0vncldamk5xb1db2x97v504fd";
+ sha256 = "sha256-lDM4nJozZF8Rt+XWnM41hBAYatZVsmvvQajgHLI9uy0=";
};
- # https://github.com/libsidplayfp/libsidplayfp/issues/13
- # Remove on next version bump
- patches = [
- (fetchpatch {
- url = "https://github.com/libsidplayfp/libsidplayfp/commit/84f5498f5653261ed84328e1b5676c31e3ba9e6e.patch";
- sha256 = "1vysbl4fkdzm11k40msng2ag6i6mb6z9jsw32vyj9calcfha5957";
- })
- (fetchpatch {
- url = "https://github.com/libsidplayfp/libsidplayfp/commit/c1a1b732cc2e791d910522d58f47c6d094493c6d.patch";
- sha256 = "1d3sgdly0q9dysgkx5afxbwfas6p0m8n3lw1hmj4n6wm3j9sdz4g";
- })
- ];
-
postPatch = ''
patchShebangs .
'';
@@ -72,6 +59,12 @@ stdenv.mkDerivation rec {
mv docs/html $doc/share/doc/libsidplayfp/
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = pname;
+ };
+ };
+
meta = with lib; {
description = "A library to play Commodore 64 music derived from libsidplay2";
longDescription = ''
diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix
index 5da6cf6bbbcb..7180587e8e6b 100644
--- a/pkgs/development/libraries/libslirp/default.nix
+++ b/pkgs/development/libraries/libslirp/default.nix
@@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "libslirp";
- version = "4.5.0";
+ version = "4.6.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "slirp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-UdKBED7xR0gDf3aj3+6I62CnAwGP7XxskaFzWeUUkkk=";
+ sha256 = "sha256-1Zp1+PW0WtNzRYIA87X42CJeSzVFhi5sGi9/rlUP4Vo=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index c17b8be592aa..5bb6445ac38f 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen, python3 }:
stdenv.mkDerivation rec {
pname = "libwacom";
- version = "1.9";
+ version = "1.10";
outputs = [ "out" "dev" ];
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
owner = "linuxwacom";
repo = "libwacom";
rev = "libwacom-${version}";
- sha256 = "sha256-o1xCSrWKPzz1GePEVB1jgx2cGzRtw0I6c4wful08Vx4=";
+ sha256 = "sha256-Q7b54AMAxdIzN7TUuhIdlrXaVtj2szV4n3y9bAE0LsU=";
};
- nativeBuildInputs = [ pkg-config meson ninja doxygen ];
+ nativeBuildInputs = [ pkg-config meson ninja doxygen python3 ];
mesonFlags = [ "-Dtests=disabled" ];
diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix
index 9e7886eb68d1..1fcb91a7fb39 100644
--- a/pkgs/development/libraries/libwpe/default.nix
+++ b/pkgs/development/libraries/libwpe/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "libwpe";
- version = "1.10.0";
+ version = "1.10.1";
src = fetchurl {
url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
- sha256 = "sha256-JBXicNReNZXtQFK8EF9zN0TcLTZ34S/0qDHlAphBCE0=";
+ sha256 = "sha256-oyez/88jVtvoFIwdtLvcU1nX5xY9F39nVRqDk7FErfA=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix
index 48c5a4f9b475..95ce2406223c 100644
--- a/pkgs/development/libraries/libxc/default.nix
+++ b/pkgs/development/libraries/libxc/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }:
let
- version = "5.1.4";
+ version = "5.1.5";
in stdenv.mkDerivation {
pname = "libxc";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
owner = "libxc";
repo = "libxc";
rev = version;
- sha256 = "0rs6v72zz3jr22r29zxxdk8wdsfv6wid6cx2661974z09dbvbr1f";
+ sha256 = "0cy3x2zn1bldc5i0rzislfbc8h4nqgds445jkfqjv0d1shvdy0zn";
};
buildInputs = [ gfortran ];
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index ca3cbc4a1884..1b58b4539e46 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl
+{ stdenv, lib, fetchurl, fetchpatch
, zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs
, pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null
@@ -27,6 +27,13 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/63174
# https://github.com/NixOS/nixpkgs/pull/72342
./utf8-xmlErrorFuncHandler.patch
+
+ # Work around lxml API misuse.
+ # https://gitlab.gnome.org/GNOME/libxml2/issues/255
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/libxml2/commit/85b1792e37b131e7a51af98a37f92472e8de5f3f.patch";
+ sha256 = "epqlNs2S0Zczox3KyCB6R2aJKh87lXydlZ0x6tLHweE=";
+ })
];
outputs = [ "bin" "dev" "out" "man" "doc" ]
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 2b94f9c3bb50..3c7ea16b26ae 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -4,8 +4,7 @@
, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau
-, libglvnd
-, enableRadv ? true
+, libglvnd, libunwind
, galliumDrivers ? ["auto"]
, driDrivers ? ["auto"]
, vulkanDrivers ? ["auto"]
@@ -32,7 +31,7 @@ with lib;
let
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
- version = "21.0.1";
+ version = "21.1.2";
branch = versions.major version;
self = stdenv.mkDerivation {
@@ -46,7 +45,7 @@ self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
];
- sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp";
+ sha256 = "0pw2wba4q66rhdx0hpimvxmrl7k2vv315gmmk17kl7snc0vvdd13";
};
prePatch = "patchShebangs .";
@@ -128,6 +127,7 @@ self = stdenv.mkDerivation {
libpthreadstubs openssl /*or another sha1 provider*/
] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
+ ++ lib.optionals stdenv.isDarwin [ libunwind ]
++ lib.optional withValgrind valgrind-light;
depsBuildBuild = [ pkg-config ];
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
index 72488893c6b6..c17d54908553 100644
--- a/pkgs/development/libraries/mesa/missing-includes.patch
+++ b/pkgs/development/libraries/mesa/missing-includes.patch
@@ -9,14 +9,14 @@
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"
---- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
++++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -28,6 +28,8 @@
#ifndef RADV_AMDGPU_WINSYS_H
#define RADV_AMDGPU_WINSYS_H
-
+
+#include
+
- #include "radv_radeon_winsys.h"
- #include "ac_gpu_info.h"
- #include "addrlib/addrinterface.h"
+ #include
+ #include
+ #include "util/list.h"
diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix
index 4e71c4d65e6e..527e7d4898e1 100644
--- a/pkgs/development/libraries/nsss/default.nix
+++ b/pkgs/development/libraries/nsss/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "nsss";
- version = "0.1.0.0";
- sha256 = "15rxbwf16wm1la079yr2xn4bccjgd7m8dh6r7bpr6s57cj93i2mq";
+ version = "0.1.0.1";
+ sha256 = "1nair10m7fddp50mpqnwj0qiggnh5qmnffmyzxis5l1ixcav1ir0";
description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix
new file mode 100644
index 000000000000..4867c67277d8
--- /dev/null
+++ b/pkgs/development/libraries/qxmpp/default.nix
@@ -0,0 +1,46 @@
+{ mkDerivation
+, lib
+, fetchFromGitHub
+, cmake
+, pkg-config
+, withGstreamer ? true
+, gst_all_1
+}:
+
+mkDerivation rec {
+ pname = "qxmpp";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "qxmpp-project";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ] ++ lib.optionals withGstreamer [
+ pkg-config
+ ];
+ buildInputs = lib.optionals withGstreamer (with gst_all_1; [
+ gstreamer
+ gst-plugins-bad
+ gst-plugins-base
+ gst-plugins-good
+ ]);
+ cmakeFlags = [
+ "-DBUILD_EXAMPLES=false"
+ "-DBUILD_TESTS=false"
+ ] ++ lib.optionals withGstreamer [
+ "-DWITH_GSTREAMER=ON"
+ ];
+
+ meta = with lib; {
+ description = "Cross-platform C++ XMPP client and server library";
+ homepage = "https://github.com/qxmpp-project/qxmpp";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ astro ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index f464a755f6e4..ccb37d295bff 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, which
+{ lib, stdenv, fetchFromGitHub, perl, which
# Most packages depending on openblas expect integer width to match
# pointer width, but some expect to use 32-bit integers always
# (for compatibility with reference BLAS).
@@ -116,7 +116,7 @@ let
in
stdenv.mkDerivation rec {
pname = "openblas";
- version = "0.3.13";
+ version = "0.3.15";
outputs = [ "out" "dev" ];
@@ -124,19 +124,9 @@ stdenv.mkDerivation rec {
owner = "xianyi";
repo = "OpenBLAS";
rev = "v${version}";
- sha256 = "14jxh0v3jfbw4mfjx4mcz4dd51lyq7pqvh9k8dg94539ypzjr2lj";
+ sha256 = "1qjr02cqncv20abdp1yzr55n7smhx6h9chqvb0xbp18byynvj87w";
};
- # apply https://github.com/xianyi/OpenBLAS/pull/3060 to fix a crash on arm
- # remove this when updating to 0.3.14 or newer
- patches = [
- (fetchpatch {
- name = "label-get_cpu_ftr-as-volatile.patch";
- url = "https://github.com/xianyi/OpenBLAS/commit/6fe0f1fab9d6a7f46d71d37ebb210fbf56924fbc.diff";
- sha256 = "06gwh73k4sas1ap2fi3jvpifbjkys2vhmnbj4mzrsvj279ljsfdk";
- })
- ];
-
inherit blas64;
# Some hardening features are disabled due to sporadic failures in
diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix
index 848a07dc4563..f407303d9878 100644
--- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix
+++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix
@@ -76,6 +76,15 @@ stdenv.mkDerivation rec {
sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l";
};
+ patches = [
+ # TODO: remove on the next version bump
+ (fetchpatch {
+ name = "include-schema-conversion-utils-source.patch";
+ url = "https://github.com/tensorflow/tensorflow/commit/f3c4f4733692150fd6174f2cd16438cfaba2e5ab.patch";
+ sha256 = "0zx4hbz679kn79f30159rl1mq74dg45cvaawii0cyv48z472yy4k";
+ })
+ ];
+
buildInputs = [ zlib flatbuffers ];
dontConfigure = true;
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 3d90a8ebb21c..09530db0532c 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "skalibs";
- version = "2.10.0.2";
- sha256 = "03qyi77wgcw3nzy7i932wd98d6j7nnzxc8ddl973vf5sa1v3vflb";
+ version = "2.10.0.3";
+ sha256 = "0ka6n5rnxd5sn5lycarf596d5wlak5s535zqqlz0rnhdcnpb105p";
description = "A set of general-purpose C programming libraries";
diff --git a/pkgs/development/libraries/spice/correct-meson.patch b/pkgs/development/libraries/spice/correct-meson.patch
deleted file mode 100644
index d3422cb915b3..000000000000
--- a/pkgs/development/libraries/spice/correct-meson.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 8b8ae8bb..e58c436c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2,7 +2,7 @@
- # project definition
- #
- project('spice', 'c',
-- version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(),
-+ version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(),
- license : 'LGPLv2.1',
- meson_version : '>= 0.48')
-
-diff --git a/server/meson.build b/server/meson.build
-index 34d8eef1..988ccab2 100644
---- a/server/meson.build
-+++ b/server/meson.build
-@@ -7,7 +7,7 @@ version_info = meson.project_version().split('.')
- major = '@0@'.format(version_info[0])
- minor = '@0@'.format(version_info[1])
- micro = version_info[2].to_int()
--if not version_info[3].contains('git')
-+if not version_info.contains('git')
- micro += 1
- endif
- micro = '@0@'.format(micro)
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index ff1f5eb8041a..33677303ddcb 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -26,18 +26,13 @@
stdenv.mkDerivation rec {
pname = "spice";
- version = "0.14.2";
+ version = "0.15.0";
src = fetchurl {
- url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2";
- sha256 = "19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj";
+ url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2";
+ sha256 = "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k";
};
- patches = [
- # submitted https://gitlab.freedesktop.org/spice/spice/merge_requests/4
- ./correct-meson.patch
- ];
-
postPatch = ''
patchShebangs build-aux
'';
diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 4cab15ca5c22..90c4528a6454 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl, tcl }:
+{ lib, fetchurl, tcl }:
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
pname = "tcllib";
version = "1.20";
@@ -9,12 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0wax281h6ksz974a5qpfgf9y34lmlpd8i87lkm1w94ybbd3rgc73";
};
- passthru = {
- libPrefix = "tcllib${version}";
- };
-
- buildInputs = [ tcl ];
-
meta = {
homepage = "https://sourceforge.net/projects/tcllib/";
description = "Tcl-only library of standard routines for Tcl";
diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix
index e88358bbce0a..8883ad5dd440 100644
--- a/pkgs/development/libraries/tcltls/default.nix
+++ b/pkgs/development/libraries/tcltls/default.nix
@@ -1,33 +1,24 @@
-{ lib, stdenv, fetchurl, tcl, openssl }:
+{ lib, fetchurl, tcl, openssl }:
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
pname = "tcltls";
- version = "1.6.7";
+ version = "1.7.21";
src = fetchurl {
- url = "mirror://sourceforge/tls/tls${version}-src.tar.gz";
- sha256 = "1f53sfcnrridjl5ayrq1xrqkahs8khf8c3d0m2brndbhahzdw6ai";
+ url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${version}.tar.gz";
+ sha256 = "0xf1rfsnn4k9j1bd2a1p8ir0xr4a3phgr9lcgbazh4084l2y8sl0";
};
- buildInputs = [ tcl openssl ];
+ buildInputs = [ openssl ];
configureFlags = [
- "--with-tcl=${tcl}/lib"
- "--with-tclinclude=${tcl}/include"
"--with-ssl-dir=${openssl.dev}"
];
- preConfigure = ''
- configureFlags="--exec_prefix=$prefix $configureFlags"
- '';
-
- passthru = {
- libPrefix = "tls${version}";
- };
-
meta = {
- homepage = "http://tls.sourceforge.net/";
+ homepage = "https://core.tcl-lang.org/tcltls/index";
description = "An OpenSSL / RSA-bsafe Tcl extension";
+ maintainers = [ lib.maintainers.agbrooks ];
license = lib.licenses.tcltk;
platforms = lib.platforms.unix;
};
diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix
index 85eae730575f..a8cf2a44fab6 100644
--- a/pkgs/development/libraries/tclx/default.nix
+++ b/pkgs/development/libraries/tclx/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl, tcl }:
+{ lib, fetchurl, tcl }:
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
name = "tclx-${version}.${patch}";
version = "8.4";
patch = "1";
@@ -10,13 +10,10 @@ stdenv.mkDerivation rec {
sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59";
};
- passthru = {
- libPrefix = ""; # Using tclx${version} did not work
- };
-
- buildInputs = [ tcl ];
-
- configureFlags = [ "--with-tcl=${tcl}/lib" "--exec-prefix=\${prefix}" ];
+ # required in order for tclx to properly detect tclx.tcl at runtime
+ postInstall = ''
+ ln -s $prefix/lib/tclx${version} $prefix/lib/tclx${version}/tclx${version}
+ '';
meta = {
homepage = "http://tclx.sourceforge.net/";
diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix
index e0f91330efca..c42847ef5335 100644
--- a/pkgs/development/libraries/tix/default.nix
+++ b/pkgs/development/libraries/tix/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, tcl, tk, fetchpatch } :
-stdenv.mkDerivation {
+tcl.mkTclDerivation {
version = "8.4.3";
pname = "tix";
src = fetchurl {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
sha256 = "1jaz0l22xj7x1k4rb9ia6i1psnbwk4pblgq4gfvya7gg7fbb7r36";
})
;
- buildInputs = [ tcl tk ];
+ buildInputs = [ tk ];
# the configure script expects to find the location of the sources of
# tcl and tk in {tcl,tk}Config.sh
# In fact, it only needs some private headers. We copy them in
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
ln -s $i private_headers/generic;
done;
'';
+ addTclConfigureFlags = false;
configureFlags = [
- "--with-tclinclude=${tcl}/include"
"--with-tclconfig=."
"--with-tkinclude=${tk.dev}/include"
"--with-tkconfig=."
@@ -52,4 +52,3 @@ stdenv.mkDerivation {
];
};
}
-
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index ecb3840b2de3..b829d846be56 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -2,7 +2,7 @@
, enableAqua ? stdenv.isDarwin, darwin
, ... }:
-stdenv.mkDerivation {
+tcl.mkTclDerivation {
name = "tk-${tcl.version}";
inherit src patches;
@@ -33,14 +33,13 @@ stdenv.mkDerivation {
configureFlags = [
"--enable-threads"
- "--with-tcl=${tcl}/lib"
] ++ lib.optional stdenv.is64bit "--enable-64bit"
++ lib.optional enableAqua "--enable-aqua";
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]);
- propagatedBuildInputs = [ tcl libXft ];
+ propagatedBuildInputs = [ libXft ];
doCheck = false; # fails. can't find itself
diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix
index 107c23dcb59b..be74748cb369 100644
--- a/pkgs/development/libraries/utmps/default.nix
+++ b/pkgs/development/libraries/utmps/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "utmps";
- version = "0.1.0.0";
- sha256 = "09p0k2sgxr7jlsbrn66fzvzf9zxvpjp85y79xk10hxjglypszyml";
+ version = "0.1.0.2";
+ sha256 = "1vjza7m65ziq54q0sv46kb3lss9cmxkkv0n9h3i8505x0h2hlvlb";
description = "A secure utmpx and wtmp implementation";
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 8a2b05aa4dff..7f3ec5f3d597 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -1,15 +1,29 @@
-{ lib, stdenv, fetchurl, wayland-scanner }:
+{ lib, stdenv, fetchurl
+, pkg-config
+, meson, ninja, wayland-scanner
+, python3, wayland
+}:
stdenv.mkDerivation rec {
pname = "wayland-protocols";
version = "1.21";
+ doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
sha256 = "1rfdlkzz67qsb955zqb8jbw3m22pl6ppvrvfq8bqiqcb5n24b6dr";
};
- nativeBuildInputs = [ wayland-scanner ];
+ postPatch = lib.optionalString doCheck ''
+ patchShebangs tests/
+ '';
+
+ depsBuildBuild = [ pkg-config ];
+ nativeBuildInputs = [ meson ninja wayland-scanner ];
+ checkInputs = [ python3 wayland ];
+
+ mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ];
meta = {
description = "Wayland protocol extensions";
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 76d54ed62563..9f8e357d3ab0 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "zimlib";
- version = "6.3.0";
+ version = "6.3.2";
src = fetchFromGitHub {
owner = "openzim";
repo = "libzim";
rev = version;
- sha256 = "0iy0f1clhihq277x218ccx3mszgpr3h9l0by48b9ykr115nffw3s";
+ sha256 = "sha256-xlYu74akK9WFy86hcQe7zp11TImwl8llgDIZBRgmbAI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/cstruct/async.nix b/pkgs/development/ocaml-modules/cstruct/async.nix
new file mode 100644
index 000000000000..579f12776c08
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cstruct/async.nix
@@ -0,0 +1,11 @@
+{ lib, buildDunePackage, cstruct, async_unix }:
+
+buildDunePackage rec {
+ pname = "cstruct-async";
+ inherit (cstruct) src version meta useDune2;
+
+ propagatedBuildInputs = [
+ async_unix
+ cstruct
+ ];
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/cli.nix b/pkgs/development/ocaml-modules/reason-native/cli.nix
new file mode 100644
index 000000000000..1a4c020dc352
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/cli.nix
@@ -0,0 +1,11 @@
+{ re, reason, pastel, ... }:
+
+{
+ pname = "cli";
+
+ buildInputs = [
+ re
+ reason
+ pastel
+ ];
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/console.nix b/pkgs/development/ocaml-modules/reason-native/console.nix
new file mode 100644
index 000000000000..c11c12b46730
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/console.nix
@@ -0,0 +1,21 @@
+{ buildDunePackage, callPackage, reason, console, ... }:
+
+{
+ pname = "console";
+
+ buildInputs = [
+ reason
+ ];
+
+ passthru.tests = {
+ console = callPackage ./tests/console {
+ inherit buildDunePackage reason console;
+ };
+ };
+
+ meta = {
+ description = "A library providing a web-influenced polymorphic console API for native Console.log(anything) with runtime printing";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console";
+ homepage = "https://reason-native.com/docs/console/";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/default.nix b/pkgs/development/ocaml-modules/reason-native/default.nix
new file mode 100644
index 000000000000..f65aa5159b9d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/default.nix
@@ -0,0 +1,43 @@
+{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native }:
+
+let
+ generic = (somePath:
+ let
+ prepkg = import somePath {
+ inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason;
+ inherit (reason-native) console file-context-printer fp pastel rely;
+ };
+ in
+ buildDunePackage
+ ({
+ version = "2021-16-16-aec0ac6";
+ src = fetchFromGitHub {
+ owner = "reasonml";
+ repo = "reason-native";
+ rev = "aec0ac681be7211b4d092262281689c46deb63e1";
+ sha256 = "sha256-QoyI50MBY3RJBmM1y90n7oXrLmHe0CQxKojv+7YbegE=";
+ };
+ useDune2 = true;
+ meta = with lib; {
+ description = "Libraries for building and testing native Reason programs";
+ downloadPage = "https://github.com/reasonml/reason-native";
+ homepage = "https://reason-native.com/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ superherointj ];
+ } // (prepkg.meta or {});
+ } // prepkg)
+ );
+ cli = generic ./cli.nix; # Used only by Rely.
+in
+ lib.makeScope newScope (self: with self; {
+ console = generic ./console.nix;
+ dir = generic ./dir.nix;
+ file-context-printer = generic ./file-context-printer.nix;
+ fp = generic ./fp.nix;
+ pastel = generic ./pastel.nix;
+ pastel-console = generic ./pastel-console.nix;
+ qcheck-rely = generic ./qcheck-rely.nix;
+ refmterr = generic ./refmterr.nix;
+ rely = generic ./rely.nix;
+ rely-junit-reporter = generic ./rely-junit-reporter.nix;
+ })
diff --git a/pkgs/development/ocaml-modules/reason-native/dir.nix b/pkgs/development/ocaml-modules/reason-native/dir.nix
new file mode 100644
index 000000000000..e6eb9c0c403f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/dir.nix
@@ -0,0 +1,18 @@
+{ reason, fp, ... }:
+
+{
+ pname = "dir";
+
+ buildInputs = [
+ reason
+ ];
+
+ propagatedBuildInputs = [
+ fp
+ ];
+
+ meta = {
+ description = "A library that provides a consistent API for common system, user and application directories consistently on all platforms";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix
new file mode 100644
index 000000000000..749e727feeca
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix
@@ -0,0 +1,20 @@
+{ reason, re, pastel, ... }:
+
+{
+ pname = "file-context-printer";
+
+ buildInputs = [
+ reason
+ ];
+
+ propagatedBuildInputs = [
+ re
+ pastel
+ ];
+
+ meta = {
+ description = "Utility for displaying snippets of files on the command line";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer";
+ homepage = "https://reason-native.com/docs/file-context-printer/";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/fp.nix b/pkgs/development/ocaml-modules/reason-native/fp.nix
new file mode 100644
index 000000000000..ae6ae50705d5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/fp.nix
@@ -0,0 +1,14 @@
+{ reason, ... }:
+
+{
+ pname = "fp";
+
+ buildInputs = [
+ reason
+ ];
+
+ meta = {
+ description = "A library for creating and operating on file paths consistently on multiple platforms";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix
new file mode 100644
index 000000000000..f1d2c7cc7264
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix
@@ -0,0 +1,20 @@
+{ reason, console, pastel, ... }:
+
+{
+ pname = "pastel-console";
+
+ buildInputs = [
+ reason
+ ];
+
+ propagatedBuildInputs = [
+ console
+ pastel
+ ];
+
+ meta = {
+ description = "Small library for pretty coloring to Console output";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console";
+ homepage = "https://reason-native.com/docs/pastel/console";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/pastel.nix b/pkgs/development/ocaml-modules/reason-native/pastel.nix
new file mode 100644
index 000000000000..a5abc4e219c5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/pastel.nix
@@ -0,0 +1,20 @@
+{ reason, re, ... }:
+
+{
+ pname = "pastel";
+
+ minimalOCamlVersion = "4.05";
+
+ buildInputs = [
+ reason
+ ];
+ propagatedBuildInputs = [
+ re
+ ];
+
+ meta = {
+ description = "A text formatting library that harnesses Reason JSX to provide intuitive terminal output. Like React but for CLI";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel";
+ homepage = "https://reason-native.com/docs/pastel/";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
new file mode 100644
index 000000000000..a3d297b4f5a5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
@@ -0,0 +1,20 @@
+{ qcheck-core, reason, console, rely, ... }:
+
+{
+ pname = "qcheck-rely";
+
+ buildInputs = [
+ reason
+ ];
+
+ propagatedBuildInputs = [
+ qcheck-core
+ console
+ rely
+ ];
+
+ meta = {
+ description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix
new file mode 100644
index 000000000000..9b14d4a8ba31
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix
@@ -0,0 +1,21 @@
+{ atdgen, re, reason, pastel, ... }:
+
+{
+ pname = "refmterr";
+
+ buildInputs = [
+ reason
+ ];
+
+ propagatedBuildInputs = [
+ atdgen
+ re
+ pastel
+ ];
+
+ meta = {
+ description = "An error formatter tool for Reason and OCaml. Takes raw error output from compiler and converts to pretty output";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr";
+ homepage = "https://reason-native.com/docs/refmterr/";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix
new file mode 100644
index 000000000000..6e8b41bbd1c4
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix
@@ -0,0 +1,23 @@
+{ atdgen, junit, re, reason, pastel, rely, ... }:
+
+{
+ pname = "rely-junit-reporter";
+
+ buildInputs = [
+ atdgen
+ reason
+ ];
+
+ propagatedBuildInputs = [
+ junit
+ re
+ pastel
+ rely
+ ];
+
+ meta = {
+ description = "A tool providing JUnit Reporter for Rely Testing Framework";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter";
+ homepage = "https://reason-native.com/docs/rely/";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/rely.nix b/pkgs/development/ocaml-modules/reason-native/rely.nix
new file mode 100644
index 000000000000..a2230426bec1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/rely.nix
@@ -0,0 +1,22 @@
+{ re, reason, cli, file-context-printer, pastel, ... }:
+
+{
+ pname = "rely";
+
+ buildInputs = [
+ reason
+ ];
+
+ propagatedBuildInputs = [
+ re
+ cli
+ file-context-printer
+ pastel
+ ];
+
+ meta = {
+ description = "A Jest-inspired testing framework for native OCaml/Reason";
+ downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely";
+ homepage = "https://reason-native.com/docs/rely/";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam b/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re b/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re
new file mode 100644
index 000000000000..15685205e1bc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re
@@ -0,0 +1 @@
+Console.log(Some("Hello fellow Nixer!")); /* {"Hello fellow Nixer!"} */
diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix
new file mode 100644
index 000000000000..e1a995d33c5c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildDunePackage, reason, console }:
+
+buildDunePackage rec {
+ pname = "console-test";
+ version = "1";
+
+ src = ./.;
+
+ useDune2 = true;
+
+ buildInputs = [
+ reason
+ console
+ ];
+
+ doInstallCheck = true;
+ postInstallCheck = ''
+ $out/bin/console-test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null
+ '';
+}
diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/dune b/pkgs/development/ocaml-modules/reason-native/tests/console/dune
new file mode 100644
index 000000000000..49f2121385e2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/reason-native/tests/console/dune
@@ -0,0 +1,4 @@
+(executable
+ (name console-test)
+ (public_name console-test)
+ (libraries reason console.lib))
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index e555d69169b5..388880cda0b3 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.0.7912";
+ version = "9.0.8021";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-q1mi8ZNvjb3XM3le4ysy58bb978102OFKypTp9mSzxo=";
+ sha256 = "sha256-DeQvYuVRYOxyVPqHzTSNtEUUN4tHhSVMZoex6SUWik8=";
};
propagatedBuildInputs = [ pyvex ];
diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix
index 2def7919fa11..b42ba55bfa74 100644
--- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix
+++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "aio-geojson-geonetnz-quakes";
- version = "0.12";
+ version = "0.13";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-geojson-geonetnz-quakes";
rev = "v${version}";
- sha256 = "166gvcc1rzigb822k1373y18k54x5aklikr8sc7hyml5vz937xr7";
+ sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix
new file mode 100644
index 000000000000..3568e98a59ec
--- /dev/null
+++ b/pkgs/development/python-modules/aioazuredevops/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, aiohttp
+, click
+}:
+
+buildPythonPackage rec {
+ pname = "aioazuredevops";
+ version = "1.3.5";
+
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "4c98a995d0516f502ba191fa3ac973ee72b93425e7eab3cdf770516c6e93c780";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ click
+ ];
+
+ # no tests implemented
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "aioazuredevops.builds"
+ "aioazuredevops.client"
+ "aioazuredevops.core"
+ ];
+
+ meta = with lib; {
+ description = "Get data from the Azure DevOps API";
+ homepage = "https://github.com/timmo001/aioazuredevops";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix
index 388c856fc619..74ff8fb3fde6 100644
--- a/pkgs/development/python-modules/aioguardian/default.nix
+++ b/pkgs/development/python-modules/aioguardian/default.nix
@@ -16,7 +16,6 @@
buildPythonPackage rec {
pname = "aioguardian";
version = "1.0.7";
- disabled = pythonAtLeast "3.9";
src = fetchFromGitHub {
owner = "bachya";
diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index 6d77598c863e..a94cdf865b03 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -13,7 +13,6 @@ buildPythonPackage rec {
pname = "aiohomekit";
version = "0.2.67";
format = "pyproject";
- disabled = pythonAtLeast "3.9";
src = fetchFromGitHub {
owner = "Jc2k";
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 0ea298e06e19..89cdc5c55f0b 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -42,14 +42,14 @@ in
buildPythonPackage rec {
pname = "angr";
- version = "9.0.7912";
+ version = "9.0.8021";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-261fk0JM37Hq+xsMF95VqLyidWE4ZUeygp8BP/DBXG4=";
+ sha256 = "sha256-brX/HdeZSPOnZKuD1v086GwyWSV8yA/FaMC3CbeI4Xk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix
index cbe2ed9db2ad..09d1388c25ec 100644
--- a/pkgs/development/python-modules/angrop/default.nix
+++ b/pkgs/development/python-modules/angrop/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "angrop";
- version = "9.0.7912";
+ version = "9.0.8021";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-nbVvgbTk9LFA376alu4Cxqcu9b9CT9yutnfE5fVT8gY=";
+ sha256 = "sha256-wkCgVVHulu1hGdbUSEi38aMWy2UfR3g/7jj+o+NLI44=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index e6cc3182487a..86fa3bafa2a8 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -8,6 +8,8 @@
, typing-extensions
, curio
, hypothesis
+, mock
+, pytest-mock
, pytestCheckHook
, trio
, trustme
@@ -16,7 +18,7 @@
buildPythonPackage rec {
pname = "anyio";
- version = "2.2.0";
+ version = "3.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -24,7 +26,7 @@ buildPythonPackage rec {
owner = "agronholm";
repo = pname;
rev = version;
- sha256 = "0ram1niv2lg9qj53zssph104a4kxl8f94ilfn6mibn034m3ikcc8";
+ sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8=";
};
propagatedBuildInputs = [
@@ -37,18 +39,21 @@ buildPythonPackage rec {
checkInputs = [
curio
hypothesis
+ pytest-mock
pytestCheckHook
trio
trustme
uvloop
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ mock
];
- pytestFlagsArray = [
- # lots of DNS lookups
- "--ignore=tests/test_sockets.py"
+ disabledTestPaths = [
+ # lots of DNS lookups
+ "tests/test_sockets.py"
] ++ lib.optionals stdenv.isDarwin [
# darwin sandboxing limitations
- "--ignore=tests/streams/test_tls.py"
+ "tests/streams/test_tls.py"
];
pythonImportsCheck = [ "anyio" ];
diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix
new file mode 100644
index 000000000000..4c3ff7d85a57
--- /dev/null
+++ b/pkgs/development/python-modules/arcam-fmj/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, aiohttp
+, attrs
+, defusedxml
+, pytest-aiohttp
+, pytest-mock
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "arcam-fmj";
+ version = "0.7.0";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "elupus";
+ repo = "arcam_fmj";
+ rev = version;
+ sha256 = "0y4wvvbcsizjd9qz6iw4gjhq5qf0qcqs27hpx1cd90vhy6rclxm0";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ attrs
+ defusedxml
+ ];
+
+ checkInputs = [
+ pytest-aiohttp
+ pytest-mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "arcam.fmj"
+ "arcam.fmj.client"
+ "arcam.fmj.state"
+ "arcam.fmj.utils"
+ ];
+
+ meta = with lib; {
+ description = "Python library for speaking to Arcam receivers";
+ homepage = "https://github.com/elupus/arcam_fmj";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 601dd954bc42..96cbf539fd18 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.0.7912";
+ version = "9.0.8021";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-nHXF6Il6rHHrnGYEmv4FPQr6MsurzH1exkJS9UXThBs=";
+ sha256 = "sha256-j8sPrSaKam5gv1ZlTA3fF1u3UMei9jy843O0n8Hsibc=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
index 2bb950beb282..9ea4fdf64b5b 100644
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, aria2, poetry, pytest, pytestcov, pytest_xdist, responses
-, asciimatics, loguru, requests, setuptools, websocket_client
+, asciimatics, loguru, requests, setuptools, websocket-client
}:
buildPythonPackage rec {
@@ -32,7 +32,7 @@ buildPythonPackage rec {
pytest -nauto -k "not test_api and not test_cli and not test_interface"
'';
- propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ];
+ propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket-client ];
meta = with lib; {
homepage = "https://github.com/pawamoy/aria2p";
diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix
index 0f1f6d046463..a780ae59be70 100644
--- a/pkgs/development/python-modules/authcaptureproxy/default.nix
+++ b/pkgs/development/python-modules/authcaptureproxy/default.nix
@@ -27,9 +27,10 @@ buildPythonPackage rec {
postPatch = ''
# https://github.com/alandtse/auth_capture_proxy/issues/14
- substituteInPlace pyproject.toml --replace \
- "poetry.masonry.api" \
- "poetry.core.masonry.api"
+ # https://github.com/alandtse/auth_capture_proxy/issues/15
+ substituteInPlace pyproject.toml \
+ --replace "poetry.masonry.api" "poetry.core.masonry.api" \
+ --replace 'importlib-metadata = "^3.4.0"' 'importlib-metadata = "*"'
'';
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix
new file mode 100644
index 000000000000..21b711c8ab0e
--- /dev/null
+++ b/pkgs/development/python-modules/azure-eventhub/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, azure-core
+, uamqp
+}:
+
+buildPythonPackage rec {
+ pname = "azure-eventhub";
+ version = "5.5.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "7b757b4910ac74902564b38089b9861c1bc51ff15bd49ff056888f939f7c4c49";
+ };
+
+ propagatedBuildInputs = [
+ azure-core
+ uamqp
+ ];
+
+ # too complicated to set up
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "azure.eventhub"
+ "azure.eventhub.aio"
+ ];
+
+ meta = with lib; {
+ description = "Microsoft Azure Event Hubs Client Library for Python";
+ homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix
index a9bc0b55955b..0b4703e26516 100644
--- a/pkgs/development/python-modules/backports-zoneinfo/default.nix
+++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix
@@ -1,6 +1,9 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pythonOlder
+, python
+, substituteAll
, importlib-resources
+, tzdata
, hypothesis
, pytestCheckHook
}:
@@ -16,7 +19,17 @@ buildPythonPackage rec {
sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24=";
};
- propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
+ patches = [
+ (substituteAll {
+ name = "zoneinfo-path";
+ src = ./zoneinfo.patch;
+ zoneinfo = "${tzdata}/lib/${python.libPrefix}/site-packages/tzdata/zoneinfo";
+ })
+ ];
+
+ propagatedBuildInputs = [
+ tzdata
+ ] ++ lib.optionals (pythonOlder "3.7") [
importlib-resources
];
@@ -27,8 +40,14 @@ buildPythonPackage rec {
pytestCheckHook
];
- # unfortunately /etc/zoneinfo doesn't exist in sandbox, and many tests fail
- doCheck = false;
+ disabledTests = [
+ # AssertionError: 'AEDT' != 'AEST'
+ "test_folds_and_gaps"
+ # AssertionError: 0 != 1 : (datetime.datetime(1917, 3, 25, 2, 0, 1, tzinfo=backports.zoneinfo.ZoneInfo(key='Australia/Sydney')), datetime.datetime(1917, 3, 24, 15, 0, tzinfo=datetime.timezone.utc))
+ "test_folds_from_utc"
+ # backports.zoneinfo._common.ZoneInfoNotFoundError: 'No time zone found with key Eurasia/Badzone'
+ "test_bad_keys"
+ ];
meta = with lib; {
description = "Backport of the standard library module zoneinfo";
diff --git a/pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch b/pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch
new file mode 100644
index 000000000000..69dd75030ab2
--- /dev/null
+++ b/pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch
@@ -0,0 +1,17 @@
+diff --git a/src/backports/zoneinfo/_tzpath.py b/src/backports/zoneinfo/_tzpath.py
+index 9baaf6b..3f842af 100644
+--- a/src/backports/zoneinfo/_tzpath.py
++++ b/src/backports/zoneinfo/_tzpath.py
+@@ -24,10 +24,7 @@ def reset_tzpath(to=None):
+ base_tzpath = _parse_python_tzpath(env_var)
+ elif sys.platform != "win32":
+ base_tzpath = [
+- "/usr/share/zoneinfo",
+- "/usr/lib/zoneinfo",
+- "/usr/share/lib/zoneinfo",
+- "/etc/zoneinfo",
++ "@zoneinfo@"
+ ]
+
+ base_tzpath.sort(key=lambda x: not os.path.exists(x))
+
diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
new file mode 100644
index 000000000000..c7abe9cfd990
--- /dev/null
+++ b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pbr
+, requests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "bimmer-connected";
+ version = "0.7.15";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "bimmerconnected";
+ repo = "bimmer_connected";
+ rev = version;
+ sha256 = "193m16rrq7mfvzjcq823icdr9fp3i8grqqn3ci8zhcsq6w3vnb90";
+ };
+
+ nativeBuildInputs = [
+ pbr
+ ];
+
+ PBR_VERSION = version;
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ description = "Library to read data from the BMW Connected Drive portal";
+ homepage = "https://github.com/bimmerconnected/bimmer_connected";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix
new file mode 100644
index 000000000000..c3dbe3ccd321
--- /dev/null
+++ b/pkgs/development/python-modules/blebox-uniapi/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, aiohttp
+, semver
+, asynctest
+, deepmerge
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "blebox-uniapi";
+ version = "1.3.3";
+
+ src = fetchFromGitHub {
+ owner = "blebox";
+ repo = "blebox_uniapi";
+ rev = "v${version}";
+ sha256 = "0qvv2697yhqjmgvh37h8wgz3a77n61kqmxvsk4pf47wn43hks15c";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pytest-runner" ""
+ '';
+
+ propagatedBuildInputs = [
+ aiohttp
+ semver
+ ];
+
+ checkInputs = [
+ asynctest
+ deepmerge
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "blebox_uniapi" ];
+
+ meta = with lib; {
+ description = "Python API for accessing BleBox smart home devices";
+ homepage = "https://github.com/blebox/blebox_uniapi";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix
new file mode 100644
index 000000000000..a73514805249
--- /dev/null
+++ b/pkgs/development/python-modules/blinkpy/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, python-dateutil
+, python-slugify
+, requests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "blinkpy";
+ version = "0.17.1";
+
+ src = fetchFromGitHub {
+ owner = "fronzbot";
+ repo = "blinkpy";
+ rev = "v${version}";
+ sha256 = "11h4r2vkrlxwjig1lay1n5wpny5isfgz85f7lsn8ndnqa2wpsymp";
+ };
+
+ propagatedBuildInputs = [
+ python-dateutil
+ python-slugify
+ requests
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "blinkpy"
+ "blinkpy.api"
+ "blinkpy.auth"
+ "blinkpy.blinkpy"
+ "blinkpy.camera"
+ "blinkpy.helpers.util"
+ "blinkpy.sync_module"
+ ];
+
+ meta = with lib; {
+ description = "Python library for the Blink Camera system";
+ homepage = "https://github.com/fronzbot/blinkpy";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix
new file mode 100644
index 000000000000..39a6cc443334
--- /dev/null
+++ b/pkgs/development/python-modules/bond-api/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, aioresponses
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "bond-api";
+ version = "0.1.12";
+
+ src = fetchFromGitHub {
+ owner = "prystupa";
+ repo = "bond-api";
+ rev = "v${version}";
+ sha256 = "0zqaqqadr4x4vmq28nfk5x67gfwqqfy19z0cgrpxlbbvxamccym0";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ checkInputs = [
+ aioresponses
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "bond_api" ];
+
+ meta = with lib; {
+ description = "Asynchronous Python wrapper library over Bond Local API";
+ homepage = "https://github.com/prystupa/bond-api";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix
new file mode 100644
index 000000000000..f644c8c9c20f
--- /dev/null
+++ b/pkgs/development/python-modules/boost-histogram/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark }:
+
+buildPythonPackage rec {
+ pname = "boost-histogram";
+ version = "1.0.2";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ pname = "boost_histogram";
+ inherit version;
+ sha256 = "b79cb9a00c5b8e44ff24ffcbec0ce5d3048dd1570c8592066344b6d2f2369fa2";
+ };
+
+ buildInputs = [ boost ];
+ propagatedBuildInputs = [ numpy ];
+
+ checkInputs = [ pytestCheckHook pytest-benchmark ];
+
+ meta = with lib; {
+ description = "Python bindings for the C++14 Boost::Histogram library";
+ homepage = "https://github.com/scikit-hep/boost-histogram";
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index ad3c97b920d7..03be293a5674 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.0.7912";
+ version = "9.0.8021";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-p9i3ajN/CpLdwcg8HLhtION0ghgs1fcnqjzUrxu1wDw=";
+ sha256 = "sha256-btV6J5r4ogb4yC0G3lyXXkCTnx55nfBkWFH1wgiWtjs=";
};
# Use upstream z3 implementation
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 45e619b25c6d..bb99365e33fa 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
- version = "9.0.7912";
+ version = "9.0.8021";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-AHJk40uRhrlQbfzRmMJXremKxnxjpmxLLAAYxNV9vkc=";
+ sha256 = "sha256-pgOeNAzAq2x7MEnheV6txmXISFY/0sWw4cVzs51k4eM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/colorthief/default.nix b/pkgs/development/python-modules/colorthief/default.nix
new file mode 100644
index 000000000000..cdb37df3e392
--- /dev/null
+++ b/pkgs/development/python-modules/colorthief/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pillow
+}:
+
+buildPythonPackage rec {
+ pname = "colorthief";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "fengsp";
+ repo = "color-thief-py";
+ rev = version;
+ sha256 = "0lzpflal1iqbj4k7hayss5z024qf2sn8c3wxw03a0mgxg06ca2hm";
+ };
+
+ propagatedBuildInputs = [
+ pillow
+ ];
+
+ # no tests implemented
+ doCheck = false;
+
+ pythonImportsCheck = [ "colorthief" ];
+
+ meta = with lib; {
+ description = "Python module for grabbing the color palette from an image";
+ homepage = "https://github.com/fengsp/color-thief-py";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix
index 90e34288154a..44a0165d6fd8 100644
--- a/pkgs/development/python-modules/devolo-home-control-api/default.nix
+++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix
@@ -6,7 +6,7 @@
, pytestCheckHook
, pythonOlder
, requests
-, websocket_client
+, websocket-client
, zeroconf
}:
@@ -25,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
zeroconf
- websocket_client
+ websocket-client
];
checkInputs = [
diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix
new file mode 100644
index 000000000000..5f8c40c075aa
--- /dev/null
+++ b/pkgs/development/python-modules/directv/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, yarl
+, aresponses
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "directv";
+ version = "0.4.0";
+
+ src = fetchFromGitHub {
+ owner = "ctalkington";
+ repo = "python-directv";
+ rev = version;
+ sha256 = "19jckf6qvl8fwi8yff1qy8c44xdz3zpi1ip1md6zl2c503qc91mk";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ yarl
+ ];
+
+ checkInputs = [
+ aresponses
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "directv" ];
+
+ meta = with lib; {
+ description = "Asynchronous Python client for DirecTV (SHEF)";
+ homepage = "https://github.com/ctalkington/python-directv";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix
index f7982c4a1191..2d88f64d36a5 100644
--- a/pkgs/development/python-modules/docker-py/default.nix
+++ b/pkgs/development/python-modules/docker-py/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }:
+{ lib, buildPythonPackage, fetchPypi, six, requests, websocket-client, docker_pycreds }:
buildPythonPackage rec {
version = "1.10.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
six
requests
- websocket_client
+ websocket-client
docker_pycreds
];
diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index ab7a7b664b0d..5e5071e93086 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -9,7 +9,7 @@
, pytestCheckHook
, requests
, six
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
paramiko
requests
six
- websocket_client
+ websocket-client
] ++ lib.optional isPy27 backports_ssl_match_hostname;
checkInputs = [
diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix
index 072129e6ea5a..eff080fa2f8f 100644
--- a/pkgs/development/python-modules/foxdot/default.nix
+++ b/pkgs/development/python-modules/foxdot/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "FoxDot";
- version = "0.8.11";
+ version = "0.8.12";
src = fetchPypi {
inherit pname version;
- sha256 = "00yqpkv7cxwk301cyiwjzr9yfq8hpnhqyspw3z874ydrl3cmssdb";
+ sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90";
};
propagatedBuildInputs = [ tkinter supercollider ];
diff --git a/pkgs/development/python-modules/garminconnect-ha/default.nix b/pkgs/development/python-modules/garminconnect-ha/default.nix
new file mode 100644
index 000000000000..e3d4cd5b48e9
--- /dev/null
+++ b/pkgs/development/python-modules/garminconnect-ha/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "garminconnect-ha";
+ version = "0.1.6";
+
+ src = fetchFromGitHub {
+ owner = "cyberjunky";
+ repo = "python-garminconnect-ha";
+ rev = version;
+ sha256 = "0ngas6zikhpja1cdkq64m9pjm4b0z3qaj9g3x88mggy60jsxm1d7";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ # Project has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "garminconnect_ha" ];
+
+ meta = with lib; {
+ description = "Minimal Garmin Connect Python 3 API wrapper for Home Assistant";
+ homepage = "https://github.com/cyberjunky/python-garminconnect-ha";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
index 4ce833668474..3fada45d0c8c 100644
--- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
+++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "georss-ign-sismologia-client";
- version = "0.2";
+ version = "0.3";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-georss-ign-sismologia-client";
rev = "v${version}";
- sha256 = "1xylgvbdrpl3wxa6qqc8jma4c9520rld0pv28y3b6b0m07ab6ijl";
+ sha256 = "sha256-7Jj6uWb4HyPAh3/XtVTy0N23bk33mlIiqlt9z/PW+4Y=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/goalzero/default.nix b/pkgs/development/python-modules/goalzero/default.nix
new file mode 100644
index 000000000000..e0e52b6702d9
--- /dev/null
+++ b/pkgs/development/python-modules/goalzero/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, aiohttp
+, ratelimit
+}:
+
+buildPythonPackage rec {
+ pname = "goalzero";
+ version = "0.1.7";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1f6a2755a745ea14e65d6bf3e56bd090a508bf6f63ccb76b9b89ce3d844a2160";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ratelimit
+ ];
+
+ # no tests implemented
+ doCheck = false;
+
+ pythonImportsCheck = [ "goalzero" ];
+
+ meta = with lib; {
+ description = "Goal Zero Yeti REST Api Library";
+ homepage = "https://github.com/tkdrob/goalzero";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix
index 1965e0d3aded..9a2f89e8c419 100644
--- a/pkgs/development/python-modules/gradient/default.nix
+++ b/pkgs/development/python-modules/gradient/default.nix
@@ -17,7 +17,7 @@
, requests
, requests_toolbelt
, terminaltables
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -55,7 +55,7 @@ buildPythonPackage rec {
requests
requests_toolbelt
terminaltables
- websocket_client
+ websocket-client
];
# tries to use /homeless-shelter to mimic container usage, etc
diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix
index 46db97a9aedd..a0229d1e5012 100644
--- a/pkgs/development/python-modules/hg-evolve/default.nix
+++ b/pkgs/development/python-modules/hg-evolve/default.nix
@@ -1,19 +1,54 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPy3k
+, mercurial
}:
buildPythonPackage rec {
pname = "hg-evolve";
- version = "10.3.1";
+ version = "10.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "03xwnadpvgna70n6pfxb7xdrszppdqrx5qmkbr1v0jzbh5rnzi6b";
+ sha256 = "ba819732409d39ddd4ff2fc507dc921408bf30535d2d78313637b29eeac98860";
};
- doCheck = false;
+ checkInputs = [
+ mercurial
+ ];
+
+ checkPhase = ''
+ runHook preCheck
+
+ export TESTTMP=$(mktemp -d)
+ export HOME=$TESTTMP
+ cat <$HOME/.hgrc
+ [extensions]
+ evolve =
+ topic =
+ EOF
+
+ # Shipped tests use the mercurial testing framework, and produce inconsistent results.
+ # Do a quick smoke-test to see if things do what we expect.
+ hg init $TESTTMP/repo
+ pushd $TESTTMP/repo
+ touch a
+ hg add a
+ hg commit -m "init a"
+ hg topic something
+
+ touch b
+ hg add b
+ hg commit -m "init b"
+
+ echo hi > b
+ hg amend
+
+ hg obslog
+ popd
+
+ runHook postCheck
+ '';
meta = with lib; {
description = "Enables the “changeset evolution” feature of Mercurial core";
diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix
index b2d6da18fe74..c8cc21278b66 100644
--- a/pkgs/development/python-modules/homematicip/default.nix
+++ b/pkgs/development/python-modules/homematicip/default.nix
@@ -10,7 +10,7 @@
, pytest-aiohttp
, pytest-asyncio
, requests
-, websocket_client
+, websocket-client
, websockets
}:
@@ -31,7 +31,7 @@ buildPythonPackage rec {
aiohttp
async-timeout
requests
- websocket_client
+ websocket-client
websockets
];
diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index 079b5e71a10f..7781dbe8b319 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -2,31 +2,33 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
+, anyio
, h11
, h2
, pproxy
, pytest-asyncio
-, pytest-trio
, pytestCheckHook
, pytestcov
, sniffio
+, trio
, trustme
, uvicorn
}:
buildPythonPackage rec {
pname = "httpcore";
- version = "0.13.0";
+ version = "0.13.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8=";
+ sha256 = "sha256-7G7jchOQTgcFSGZfoMPFm0NY9ofg5MM5Xn5lV+W9w8k=";
};
propagatedBuildInputs = [
+ anyio
h11
h2
sniffio
@@ -35,16 +37,23 @@ buildPythonPackage rec {
checkInputs = [
pproxy
pytest-asyncio
- pytest-trio
pytestCheckHook
pytestcov
+ trio
trustme
uvicorn
];
+ postPatch = ''
+ # The anyio 3.1.0 release is not picked-up proberly
+ substituteInPlace setup.py --replace "anyio==3.*" "anyio"
+ '';
+
+
disabledTestPaths = [
# these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
"tests/test_threadsafety.py"
+ "tests/async_tests/"
"tests/sync_tests/test_interfaces.py"
"tests/sync_tests/test_retries.py"
];
diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix
index fe8756fde03b..1c59878b4784 100644
--- a/pkgs/development/python-modules/ibm-watson/default.nix
+++ b/pkgs/development/python-modules/ibm-watson/default.nix
@@ -8,7 +8,7 @@
, tox
, requests
, python-dateutil
-, websocket_client
+, websocket-client
, ibm-cloud-sdk-core
}:
@@ -34,7 +34,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
python-dateutil
- websocket_client
+ websocket-client
ibm-cloud-sdk-core
];
diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix
index 4149de3f43ae..d430c4cf29c2 100644
--- a/pkgs/development/python-modules/importlib-metadata/default.nix
+++ b/pkgs/development/python-modules/importlib-metadata/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "importlib-metadata";
- version = "3.7.3";
+ version = "4.0.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "importlib_metadata";
inherit version;
- sha256 = "742add720a20d0467df2f444ae41704000f50e1234f46174b51f9c6031a1bd71";
+ sha256 = "sha256-jFARluSfud9d9DgzvbHkMo9khHdj7IpQcDFItzeE1YE=";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
index 84ea65a74773..ca96e63060da 100644
--- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
+++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
@@ -1,5 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi, requests
-, websocket_client, pythonOlder }:
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, requests
+, six
+, websocket-client
+}:
buildPythonPackage rec {
pname = "jellyfin-apiclient-python";
@@ -11,7 +17,11 @@ buildPythonPackage rec {
sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A=";
};
- propagatedBuildInputs = [ requests websocket_client ];
+ propagatedBuildInputs = [
+ requests
+ six
+ websocket-client
+ ];
doCheck = false; # no tests
pythonImportsCheck = [ "jellyfin_apiclient_python" ];
diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index f2cb598a6c9b..952527d5cab7 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonAtLeast,
- ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
+ ipaddress, websocket-client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
buildPythonPackage rec {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
};
checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
- propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ];
+ propagatedBuildInputs = [ ipaddress websocket-client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ];
meta = with lib; {
description = "Kubernetes python client";
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index a900c61d40b8..a70923de2bea 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchPypi, buildPythonPackage, hidapi
, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client
+ hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket-client
];
# No tests
diff --git a/pkgs/development/python-modules/libpyfoscam/default.nix b/pkgs/development/python-modules/libpyfoscam/default.nix
new file mode 100644
index 000000000000..3f7eaad8ce81
--- /dev/null
+++ b/pkgs/development/python-modules/libpyfoscam/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "libpyfoscam";
+ version = "1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c274cafd2c6493ab397fe9f0f8aae0b2c35c7c661fe76dde3bd2f1cd56b8fc32";
+ };
+
+ # tests need access to a camera
+ doCheck = false;
+
+ pythonImportsCheck = [ "libpyfoscam" ];
+
+ meta = with lib; {
+ description = "Python Library for Foscam IP Cameras";
+ homepage = "https://github.com/viswa-swami/python-foscam";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix
index 77dcdcaef025..edee7a625366 100644
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, enum-compat
, requests
-, websocket_client
+, websocket-client
, zeroconf
, pytestCheckHook
}:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
enum-compat
- websocket_client
+ websocket-client
zeroconf
];
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index ba10c89e1405..a5483245d663 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
+, pythonOlder
, fetchPypi
, marshmallow
, sqlalchemy
@@ -9,11 +10,12 @@
buildPythonPackage rec {
pname = "marshmallow-sqlalchemy";
- version = "0.24.2";
+ version = "0.25.0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "ee3ead3b83de6608c6850ff60515691b0dc556ca226680f8a82b9f785cdb71b1";
+ sha256 = "0i39ckrixh1w9fmkm0wl868gvza72j5la0x6dd0cij9shf1iyjgi";
};
propagatedBuildInputs = [
@@ -21,6 +23,10 @@ buildPythonPackage rec {
sqlalchemy
];
+ pythonImportsCheck = [
+ "marshmallow_sqlalchemy"
+ ];
+
checkInputs = [
pytest-lazy-fixture
pytestCheckHook
@@ -28,7 +34,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
- description = "SQLAlchemy integration with marshmallow ";
+ description = "SQLAlchemy integration with marshmallow";
license = licenses.mit;
};
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index a7ca14beb942..0deeb0e53866 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -1,27 +1,40 @@
-{ lib, buildPythonPackage, fetchPypi,
- dateutil, simplejson, isPy27
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pytestCheckHook
+, pytz
+, simplejson
}:
buildPythonPackage rec {
pname = "marshmallow";
- version = "3.10.0";
- disabled = isPy27;
+ version = "3.11.1";
+ disabled = pythonOlder "3.5";
- meta = {
- homepage = "https://github.com/marshmallow-code/marshmallow";
+ src = fetchFromGitHub {
+ owner = "marshmallow-code";
+ repo = pname;
+ rev = version;
+ sha256 = "1ypm142y3giaqydc7fkigm9r057yp2sd1ng5zr2x3w3wbbj5yfm6";
+ };
+
+ pythonImportsCheck = [
+ "marshmallow"
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytz
+ simplejson
+ ];
+
+ meta = with lib; {
description = ''
A lightweight library for converting complex objects to and from
simple Python datatypes.
'';
- license = lib.licenses.mit;
+ homepage = "https://github.com/marshmallow-code/marshmallow";
+ license = licenses.mit;
};
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "4ab2fdb7f36eb61c3665da67a7ce281c8900db08d72ba6bf0e695828253581f7";
- };
-
- propagatedBuildInputs = [ dateutil simplejson ];
-
- doCheck = false;
}
diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix
index 6209baa144bb..17a3a7691112 100644
--- a/pkgs/development/python-modules/orvibo/default.nix
+++ b/pkgs/development/python-modules/orvibo/default.nix
@@ -6,7 +6,7 @@
, pytest-runner
, pytestCheckHook
, requests
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix
index dc832809c28f..5c41c3308bed 100644
--- a/pkgs/development/python-modules/plexapi/default.nix
+++ b/pkgs/development/python-modules/plexapi/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, requests
, tqdm
-, websocket_client
+, websocket-client
, isPy27
}:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
tqdm
- websocket_client
+ websocket-client
];
# Tests require a running Plex instance
diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix
index 3fc485c00ec2..242300949ecb 100644
--- a/pkgs/development/python-modules/praw/6.3.nix
+++ b/pkgs/development/python-modules/praw/6.3.nix
@@ -9,7 +9,7 @@
, pytest
, requests-toolbelt
, update_checker
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -31,7 +31,7 @@ buildPythonPackage rec {
mock
prawcore
update_checker
- websocket_client
+ websocket-client
];
checkInputs = [
diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index 5047c1e88b0d..5ae4d0b280f5 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -9,7 +9,7 @@
, pytestCheckHook
, requests-toolbelt
, update_checker
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
mock
prawcore
update_checker
- websocket_client
+ websocket-client
];
checkInputs = [
diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix
index 43cab7db6756..92338d92531b 100644
--- a/pkgs/development/python-modules/pushbullet/default.nix
+++ b/pkgs/development/python-modules/pushbullet/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, requests
-, websocket_client
+, websocket-client
, python_magic
, cryptography
, pytestCheckHook
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
};
- propagatedBuildInputs = [ cryptography requests websocket_client python_magic ];
+ propagatedBuildInputs = [ cryptography requests websocket-client python_magic ];
preCheck = ''
export PUSHBULLET_API_KEY=""
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 3a375b8d284b..989433b499d3 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -57,8 +57,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "A cross-language development platform for in-memory data";
homepage = "https://arrow.apache.org/";
- license = lib.licenses.asl20;
+ license = licenses.asl20;
platforms = platforms.unix;
- maintainers = with lib.maintainers; [ veprbl ];
+ maintainers = with maintainers; [ veprbl ];
};
}
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index 143f578b08d5..3ed34b4e73d7 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -14,12 +14,12 @@
}:
buildPythonPackage rec {
- version = "0.13";
+ version = "0.13.1";
pname = "pybids";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-zVFaGAKgTP9UiUdmO4+Tut8Qc64xuGyB26cQLRHOqYw=";
+ sha256 = "sha256-ySDhVX4drotnFiXXDK+9woQ3uigistudpMJYenYl47o=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix
new file mode 100644
index 000000000000..93f7dcdc0a23
--- /dev/null
+++ b/pkgs/development/python-modules/pycontrol4/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, aiohttp
+, xmltodict
+}:
+
+buildPythonPackage rec {
+ pname = "pycontrol4";
+ version = "0.1.0";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "lawtancool";
+ repo = "pyControl4";
+ rev = "v${version}";
+ sha256 = "0idw9kv6yxrbp0r33vb1jlzgil20m2rjjfrxhcwxmbjjqv93zn6d";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ xmltodict
+ ];
+
+ # tests access network
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "pyControl4.account"
+ "pyControl4.alarm"
+ "pyControl4.director"
+ "pyControl4.light"
+ ];
+
+ meta = with lib; {
+ description = "Python 3 asyncio package for interacting with Control4 systems";
+ homepage = "https://github.com/lawtancool/pyControl4";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/pkgs/development/python-modules/pycoolmasternet-async/default.nix
new file mode 100644
index 000000000000..45b40ddeadb9
--- /dev/null
+++ b/pkgs/development/python-modules/pycoolmasternet-async/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "pycoolmasternet-async";
+ version = "0.1.2";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "OnFreund";
+ repo = "pycoolmasternet-async";
+ rev = "v${version}";
+ sha256 = "0qzdk18iqrvin8p8zrydf69d6pii3j47j11h7ymmsx08gh7c176g";
+ };
+
+ # no tests implemented
+ doCheck = false;
+
+ pythonImportsCheck = [ "pycoolmasternet_async" ];
+
+ meta = with lib; {
+ description = "Python library to control CoolMasterNet HVAC bridges over asyncio";
+ homepage = "https://github.com/OnFreund/pycoolmasternet-async";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix
index 209ef3dbc235..fbb205bb9f78 100644
--- a/pkgs/development/python-modules/pydaikin/default.nix
+++ b/pkgs/development/python-modules/pydaikin/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pydaikin";
- version = "2.4.1";
+ version = "2.4.2";
disabled = pythonOlder "3.6";
src = fetchFromBitbucket {
owner = "mustang51";
repo = pname;
rev = "v${version}";
- sha256 = "1624adp4lqd1n9flnf0wqrcibml2nd19ga3fmxzjg4x5z6767bs3";
+ sha256 = "13cslszjhd1x7j0ja0n0wpy62hb2sdmkrmjl3qhwqfggps2w2wy1";
};
propagatedBuildInputs = [
@@ -28,6 +28,10 @@ buildPythonPackage rec {
urllib3
];
+ # while they have tests, they do not run them in their CI and they fail as of 2.4.2
+ # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption'
+ doCheck = false;
+
checkInputs = [
freezegun
pytest-aiohttp
diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix
index 99d910dd8af2..9d917a480168 100644
--- a/pkgs/development/python-modules/pyfireservicerota/default.nix
+++ b/pkgs/development/python-modules/pyfireservicerota/default.nix
@@ -4,7 +4,7 @@
, pytz
, oauthlib
, requests
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
pytz
oauthlib
requests
- websocket_client
+ websocket-client
];
# no tests implemented
diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix
index 626560d89b6d..3de7afd9668d 100644
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -7,7 +7,6 @@
, cloudpickle
, msgpack
, isPy27
-, selectors34
, pytestCheckHook
}:
@@ -15,6 +14,8 @@ buildPythonPackage rec {
pname = "Pyro4";
version = "4.80";
+ disabled = isPy27;
+
src = fetchPypi {
inherit pname version;
sha256 = "46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
serpent
- ] ++ lib.optionals isPy27 [ selectors34 ];
+ ];
buildInputs = [
dill
diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix
index d02c85fb4ffd..9d0bef8e19dc 100644
--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/pkgs/development/python-modules/pysc2/default.nix
@@ -12,7 +12,7 @@
, pygame
, s2clientprotocol
, six
-, websocket_client
+, websocket-client
, sc2-headless
}:
@@ -49,7 +49,7 @@ buildPythonPackage {
pygame
s2clientprotocol
six
- websocket_client
+ websocket-client
sc2-headless
];
diff --git a/pkgs/development/python-modules/python-engineio/3.nix b/pkgs/development/python-modules/python-engineio/3.nix
index 5deeec0bb573..f113f47802b7 100644
--- a/pkgs/development/python-modules/python-engineio/3.nix
+++ b/pkgs/development/python-modules/python-engineio/3.nix
@@ -10,7 +10,7 @@
, requests
, six
, tornado
-, websocket_client
+, websocket-client
, websockets
, pytestCheckHook
, pythonAtLeast
@@ -37,7 +37,7 @@ buildPythonPackage rec {
mock
requests
tornado
- websocket_client
+ websocket-client
websockets
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index ed03d9663076..486484bca3ae 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -9,7 +9,7 @@
, requests
, six
, tornado
-, websocket_client
+, websocket-client
, websockets
, pytestCheckHook
}:
@@ -31,7 +31,7 @@ buildPythonPackage rec {
mock
requests
tornado
- websocket_client
+ websocket-client
websockets
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
index 82ee7e209241..8c43d7a4ca27 100644
--- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
+++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests
-, tqdm, websocket_client, pythonOlder }:
+, tqdm, websocket-client, pythonOlder }:
buildPythonPackage rec {
pname = "python-mpv-jsonipc";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
# 'mpv-jsonipc' does not have any tests
doCheck = false;
- propagatedBuildInputs = [ requests tqdm websocket_client ];
+ propagatedBuildInputs = [ requests tqdm websocket-client ];
pythonImportsCheck = [ "python_mpv_jsonipc" ];
diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix
index c1901a750864..0d269522e1a0 100644
--- a/pkgs/development/python-modules/pytile/default.nix
+++ b/pkgs/development/python-modules/pytile/default.nix
@@ -14,7 +14,6 @@
buildPythonPackage rec {
pname = "pytile";
version = "5.2.1";
- disabled = pythonAtLeast "3.9";
src = fetchFromGitHub {
owner = "bachya";
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index cb0547dfe4ce..b2696b101b42 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.0.7912";
+ version = "9.0.8021";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-KqTfu49Muicr5oJcXcoYpz3S7+0hk7dxbU7GMCDlJQA=";
+ sha256 = "sha256-Bx6A258LgmmRBbrwY2pgf0DXdMwh9QjaA4sVbxj+kBo=";
};
postPatch = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix
index 7448f1f7f2c7..ceb190fe753a 100644
--- a/pkgs/development/python-modules/pywemo/default.nix
+++ b/pkgs/development/python-modules/pywemo/default.nix
@@ -47,11 +47,6 @@ buildPythonPackage rec {
pytestCheckHook
];
- disabledTests = [
- # https://github.com/NixOS/nixpkgs/issues/124165
- "test_bridge_getdevicestatus"
- ];
-
pythonImportsCheck = [ "pywemo" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix
index dc31ea4a038f..677483e8823b 100644
--- a/pkgs/development/python-modules/roonapi/default.nix
+++ b/pkgs/development/python-modules/roonapi/default.nix
@@ -7,7 +7,7 @@
, pythonOlder
, requests
, six
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -31,7 +31,7 @@ buildPythonPackage rec {
ifaddr
requests
six
- websocket_client
+ websocket-client
];
patches = [
diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix
index 9244a94d2357..c47054632c6f 100644
--- a/pkgs/development/python-modules/runway-python/default.nix
+++ b/pkgs/development/python-modules/runway-python/default.nix
@@ -21,7 +21,7 @@
, deepdiff
, pytestCheckHook
, pytestcov
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -62,7 +62,7 @@ buildPythonPackage rec {
deepdiff
pytestCheckHook
pytestcov
- websocket_client
+ websocket-client
];
disabledTests = [
diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix
index d29e89db8462..174af9023512 100644
--- a/pkgs/development/python-modules/samsungctl/default.nix
+++ b/pkgs/development/python-modules/samsungctl/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- websocket_client
+ websocket-client
];
# no tests
diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix
index 3a12568c4d6d..31fa56a34726 100644
--- a/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, requests
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- websocket_client
+ websocket-client
requests
];
diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix
deleted file mode 100644
index 2209ccf43d26..000000000000
--- a/pkgs/development/python-modules/selectors34/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, python
-, six
-}:
-
-buildPythonPackage rec {
- pname = "selectors34";
- version = "1.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c";
- };
-
- propagatedBuildInputs = [ six ];
-
- checkPhase = ''
- ${python.interpreter} setup.py test
- '';
-
- meta = with lib; {
- description = "A backport of the selectors module from Python 3.4";
- homepage = "https://github.com/berkerpeksag/selectors34";
- license = licenses.psfl;
- maintainers = with maintainers; [ prusnak ];
- };
-}
diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index d04fd24f2e97..1d884959831c 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -15,7 +15,7 @@
, pytestCheckHook
, pytestrunner
, sqlalchemy
-, websocket_client
+, websocket-client
, websockets
}:
@@ -36,7 +36,7 @@ buildPythonPackage rec {
aiohttp
boto3
sqlalchemy
- websocket_client
+ websocket-client
websockets
];
diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix
index cf7b161261ed..e96161228a52 100644
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@@ -14,7 +14,7 @@
, requests
, responses
, six
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -32,7 +32,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
- websocket_client
+ websocket-client
requests
six
];
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 5964e382084f..5eb1a19c8917 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,4 +1,11 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch
+{ stdenv
+, lib
+, fetchPypi
+, buildPythonPackage
+, isPy3k
+, pythonOlder
+, greenlet
+, importlib-metadata
, mock
, pysqlite ? null
, pytestCheckHook
@@ -7,29 +14,24 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
- version = "1.3.23";
+ version = "1.4.16";
src = fetchPypi {
inherit pname version;
- sha256 = "6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b";
+ sha256 = "15yl9frbxsq90hq5b8znqy34fg5kqdw1jjw933kz709rbpxw4lzd";
};
- patches = [
- # fix test_pyodbc_extra_connect_azure test failure
- (fetchpatch {
- url = "https://github.com/sqlalchemy/sqlalchemy/commit/7293b3dc0e9eb3dae84ffd831494b85355df8e73.patch";
- sha256 = "1z61lzxamz74771ddlqmbxba1dcr77f016vqfcmb44dxb228w2db";
- })
+ propagatedBuildInputs = [
+ greenlet
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
];
checkInputs = [
pytestCheckHook
- pytest_xdist
mock
] ++ lib.optional (!isPy3k) pysqlite;
- pytestFlagsArray = [ "-n auto" ];
-
postInstall = ''
sed -e 's:--max-worker-restart=5::g' -i setup.cfg
'';
@@ -37,8 +39,10 @@ buildPythonPackage rec {
dontUseSetuptoolsCheck = true;
# disable mem-usage tests on mac, has trouble serializing pickle files
- disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "]
- ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ];
+ disabledTests = lib.optionals stdenv.isDarwin [
+ "MemUsageWBackendTest"
+ "MemUsageTest"
+ ];
meta = with lib; {
homepage = "http://www.sqlalchemy.org/";
diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix
index ddc497a64ab6..30028a9599cf 100644
--- a/pkgs/development/python-modules/strictyaml/default.nix
+++ b/pkgs/development/python-modules/strictyaml/default.nix
@@ -7,15 +7,20 @@
}:
buildPythonPackage rec {
- version = "1.3.2";
+ version = "1.4.2";
pname = "strictyaml";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "637399fd80dccc95f5287b2606b74098b23c08031b7ec33c5afb314ccbf10948";
+ sha256 = "sha256-3bTk6AfdUQybx/xQ/I0Tae1pbtXMktSUtedSuoJ2paI=";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "ruamel.yaml==0.17.4" "ruamel.yaml"
+ '';
+
propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
# Library tested with external tool
diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix
index 569096cb466c..4f09d6002d5c 100644
--- a/pkgs/development/python-modules/typing-inspect/default.nix
+++ b/pkgs/development/python-modules/typing-inspect/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "typing-inspect";
- version = "0.6.0";
+ version = "0.7.1";
src = fetchPypi {
inherit version;
pname = "typing_inspect";
- sha256 = "1dzs9a1pr23dhbvmnvms2jv7l7jk26023g5ysf0zvnq8b791s6wg";
+ sha256 = "1al2lyi3r189r5xgw90shbxvd88ic4si9w7n3d9lczxiv6bl0z84";
};
propagatedBuildInputs = [
@@ -26,6 +26,5 @@ buildPythonPackage rec {
homepage = "https://github.com/ilevkivskyi/typing_inspect";
license = licenses.mit;
maintainers = with maintainers; [ albakham ];
- broken = isPy39; # see https://github.com/ilevkivskyi/typing_inspect/issues/65
};
}
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 125850a080f3..a762ec55ee36 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -48,6 +48,9 @@ buildPythonPackage rec {
# test gets stuck in epoll_pwait on hydras aarch64 builders
# https://github.com/MagicStack/uvloop/issues/412
"--deselect" "tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data"
+ ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+ # Flaky test: https://github.com/MagicStack/uvloop/issues/412
+ "--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set"
];
disabledTestPaths = [
diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix
index a07c1e6333e8..526066f1fa74 100644
--- a/pkgs/development/python-modules/waterfurnace/default.nix
+++ b/pkgs/development/python-modules/waterfurnace/default.nix
@@ -6,7 +6,7 @@
, pytest-runner
, pytestCheckHook
, requests
-, websocket_client
+, websocket-client
}:
buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
click
pytest-runner
requests
- websocket_client
+ websocket-client
];
checkInputs = [
diff --git a/pkgs/development/python-modules/websocket_client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix
similarity index 56%
rename from pkgs/development/python-modules/websocket_client/default.nix
rename to pkgs/development/python-modules/websocket-client/default.nix
index 6ad0634631de..ee09ceb10504 100644
--- a/pkgs/development/python-modules/websocket_client/default.nix
+++ b/pkgs/development/python-modules/websocket-client/default.nix
@@ -1,26 +1,22 @@
{ lib
-, backports_ssl_match_hostname
, buildPythonPackage
, fetchPypi
-, isPy27
+, pythonOlder
, pytestCheckHook
-, six
+, pysocks
}:
buildPythonPackage rec {
- pname = "websocket_client";
- version = "0.58.0";
+ pname = "websocket-client";
+ version = "1.1.0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8=";
+ sha256 = "sha256-to5JWdcEdo+iDjXJ1QjI3Cu8BB/Y0mfA1zRc/+KCRWg=";
};
- propagatedBuildInputs = [
- six
- ] ++ lib.optional isPy27 backports_ssl_match_hostname;
-
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [ pytestCheckHook pysocks ];
pythonImportsCheck = [ "websocket" ];
@@ -29,5 +25,6 @@ buildPythonPackage rec {
homepage = "https://github.com/websocket-client/websocket-client";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ fab ];
+ changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog";
};
}
diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index 7008814ba287..6c2118f391b4 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -5,14 +5,14 @@
}:
buildPythonPackage rec {
- version = "1.6.2";
+ version = "1.6.4";
pname = "xmlschema";
src = fetchFromGitHub {
owner = "sissaschool";
repo = "xmlschema";
rev = "v${version}";
- sha256 = "sha256-GL2PlHxKDSEsZwHPBAy+tjBSbKyvlbXUWwXakKPmzSs=";
+ sha256 = "sha256-0KVGu163t3stCgx7aWW/Ggf6CUW2ZhOOnPU6FfGHfKA=";
};
propagatedBuildInputs = [ elementpath ];
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 2178e4d25791..832eb3f6b5b1 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "yamllint";
- version = "1.26.0";
+ version = "1.26.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "11qhs1jk9pwvyk5k3q5blh9sq42dh1ywdf1f3i2zixf7hncwir5h";
+ sha256 = "sha256-h9lGKz7X6d+hnKoXf3p3zZiIs9xARER9auCrIzvNEyQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index ae95157a8e5e..11c2178b6987 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "8.42";
+ version = "8.43";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
- sha256 = "sha256-SYLr6qQp/kHzviwzCaXEnYTHHuH3j5ZzRLi8gs8xAao=";
+ sha256 = "sha256-jb864Kr5Hx/e2OIRYPLJGkRIsxT/cebLnOGGy1YtJY8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix
index f477da365d75..51e43555d5ea 100644
--- a/pkgs/development/tools/analysis/dotenv-linter/default.nix
+++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "dotenv-linter";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "dotenv-linter";
repo = "dotenv-linter";
rev = "v${version}";
- sha256 = "sha256-3Lj5GtWGyWDkZPhxYQu7UWzmh7TO5wk1UJ0lek1jTto=";
+ sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ=";
};
- cargoSha256 = "sha256-FDkxJuZPzDrgLJgefkRUPS+0Ys3DaBOD3XAuS/Z6TtI=";
+ cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM=";
meta = with lib; {
description = "Lightning-fast linter for .env files. Written in Rust";
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 0be3f5c0b7ef..06bff61fcdd1 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
- version = "10.10.0";
+ version = "10.11.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "v${version}";
- sha256 = "sha256-gWU219QlV+24RxnTHqQzQeGZHzVwmBXNKU+3QI6WvHI=";
+ sha256 = "sha256-mti93UDFgHQKJt3z1sjCkT71TZtwh2YnhTyUCi5tS5c=";
};
subPackages = [ "." ];
- vendorSha256 = "sha256-d965Rt8W74bsIZAZPZLe3twuUpp4wrnNc0qwjsKikOE=";
+ vendorSha256 = "sha256-NEW1qXOxFPmDFUTciJkqwutZd3+sVkHgoZgQO8Gsdwk=";
doCheck = false;
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 711b971c2d88..cbc2ceb21abc 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "bazel-remote";
- version = "2.0.1";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "buchgr";
repo = pname;
rev = "v${version}";
- sha256 = "193amcx4nk7mr51jcawym46gizqmfkvksjxm64pf7s3wraf00v01";
+ sha256 = "sha256-GpbweI/grJNIRg/7lFd4tMhr9E2SPX+YUrzPJs0Gsik=";
};
- vendorSha256 = "1sxv9mya8plkn3hpjgfpzgwlh4m3cbhpywqv86brj2h9i4ad0gl5";
+ vendorSha256 = "sha256-dXBGWTgUaVJCwf2LB1QdmSPP3BlKqZ28HUnq1oervNg=";
doCheck = false;
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index e7b0c1d105b4..a94ca34d0364 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "bear";
- version = "3.0.9";
+ version = "3.0.12";
src = fetchFromGitHub {
owner = "rizsotto";
repo = pname;
rev = version;
- sha256 = "xac8PYo3qYjtQbDy8piOz5BQQpcVlAvMCv1qHrVZmPQ=";
+ sha256 = "0nalvmkl9iwbs4wbsacryrwr46vk3x6jzqj9v5wfyf6aim3s1szs";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/rizsotto/Bear";
license = licenses.gpl3Plus;
platforms = platforms.unix;
- maintainers = [ maintainers.babariviere ];
+ maintainers = with maintainers; [ babariviere qyliss ];
# ld: symbol(s) not found for architecture x86_64
broken = stdenv.isDarwin;
};
diff --git a/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/pkgs/development/tools/build-managers/bear/no-double-relative.patch
index f4d247fa5760..257c7ffea38f 100644
--- a/pkgs/development/tools/build-managers/bear/no-double-relative.patch
+++ b/pkgs/development/tools/build-managers/bear/no-double-relative.patch
@@ -1,14 +1,22 @@
-diff --git a/source/config.h.in b/source/config.h.in
-index 728c234..a3e76c6 100644
---- a/source/config.h.in
-+++ b/source/config.h.in
-@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@";
+diff --git i/source/config.h.in w/source/config.h.in
+index ffcce3a..0caba6d 100644
+--- i/source/config.h.in
++++ w/source/config.h.in
+@@ -107,7 +107,7 @@ namespace cmd {
+ }
- constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames";
- constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept";
--constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
--constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper";
--constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";
-+constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
-+constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper";
-+constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";
+ namespace wrapper {
+- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper";
++ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/wrapper";
+ constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d";
+
+ constexpr char FLAG_VERBOSE[] = "--verbose";
+@@ -120,7 +120,7 @@ namespace cmd {
+ }
+
+ namespace library {
+- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
++ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
+
+ constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND";
+ constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION";
diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix
index f8b2a27dfc40..f417dc420350 100644
--- a/pkgs/development/tools/butane/default.nix
+++ b/pkgs/development/tools/butane/default.nix
@@ -4,13 +4,13 @@ with lib;
buildGoModule rec {
pname = "butane";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchFromGitHub {
owner = "coreos";
repo = "butane";
rev = "v${version}";
- sha256 = "0wjnzxjv71pmn88f6fm20xhsmdib6jwn9839n1xw9px9w95qg0yy";
+ sha256 = "1bgh7h3hwrgjkw72233qzqpkshzbizhdapa0lalzj1xnclq3rqlp";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/development/tools/database/litestream/default.nix
new file mode 100644
index 000000000000..3f70f39da951
--- /dev/null
+++ b/pkgs/development/tools/database/litestream/default.nix
@@ -0,0 +1,30 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+buildGoModule rec {
+ pname = "litestream";
+ version = "0.3.5";
+
+ src = fetchFromGitHub {
+ owner = "benbjohnson";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-OQ8j0FOUWU5TfCl4AZpmX5tuhtHAbrhvzT6ve6AJNn0=";
+ };
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.Version=${version}"
+ ];
+
+ vendorSha256 = "sha256-ScG8cukUuChOvN9r0HvVJsYnu1X9DSO7aD32iu55jIM=";
+
+ meta = with lib; {
+ description = "Streaming replication for SQLite";
+ license = licenses.asl20;
+ homepage = "https://litestream.io/";
+ maintainers = with maintainers; [ fbrs ];
+ };
+}
diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix
index 1e71c63272fd..b46a97df20a3 100644
--- a/pkgs/development/tools/earthly/default.nix
+++ b/pkgs/development/tools/earthly/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "earthly";
- version = "0.5.16";
+ version = "0.5.17";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
- sha256 = "sha256-p2O9GkXrRCxgOnVVmtBFUpbg0w9b3LB0PNOlK1gxYAY=";
+ sha256 = "sha256-SuHHeO2KFjB3HbLv1ODBGaXzNaDi/FNPOGg/lX8JLJE=";
};
- vendorSha256 = "sha256-avxNVTPcJ5HjeN7Q9rVmmSud1i3Yb8cSFTAUtNPYbBg=";
+ vendorSha256 = "sha256-D62fG+T3G1W7xteSGlTtEkXbQfGAmBTYJeATH2CVtwY=";
buildFlagsArray = ''
-ldflags=
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index 2a7a7b1a16a3..192a33ad7ca7 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -1,20 +1,16 @@
-{ lib, stdenv, cmake, llvmPackages, irony }:
+{ lib, stdenv, cmake, llvmPackages, llvm, irony }:
stdenv.mkDerivation {
pname = "irony-server";
inherit (irony) src version;
- nativeBuildInputs = [ cmake llvmPackages.llvm.dev ];
- buildInputs = [ llvmPackages.libclang llvmPackages.llvm ];
+ nativeBuildInputs = [ cmake llvm ];
+ buildInputs = [ llvmPackages.libclang ];
dontUseCmakeBuildDir = true;
cmakeDir = "server";
- cmakeFlags = [
- "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
- ];
-
meta = with lib; {
description = "The server part of irony";
homepage = "https://melpa.org/#/irony";
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index dbd10772a626..e1ae8a5a0e7c 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-C0W5oMnKlQ5hg/0YLKZKiQfLghJ7yAJYW6k0G6eOFQE=";
+ rev = version;
+ sha256 = "sha256-fDbnOfT2BTCLF2knUf3ccDnuA0mhM+gkbja7xgmWoaY=";
};
- cargoSha256 = "sha256-TqvUunBFpKIog0pG85M/JLz8orncgbRqnQolseXYSo4=";
+ cargoSha256 = "sha256-mBrFw5d0LXTKj7Nm8XmT5hsq/d/x84U/Gp02+lay2OY=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix
index efe2b397f952..e8a2a9b89217 100644
--- a/pkgs/development/tools/mpfshell/default.nix
+++ b/pkgs/development/tools/mpfshell/default.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec {
};
propagatedBuildInputs = with python3Packages; [
- pyserial colorama websocket_client
+ pyserial colorama websocket-client
];
doCheck = false;
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 6c59eaa73838..c4b0546ec368 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "packer";
- version = "1.7.2";
+ version = "1.7.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
- sha256 = "sha256-Ey1gkld7WosJgoqnNp4Lz2x3PTI+w5p+A8Cwv4+uUZw=";
+ sha256 = "sha256-k5GCUFzjf0mipIQlnf7VCUS2j7cFwoGCeM7T6qgGnJA=";
};
- vendorSha256 = null;
+ vendorSha256 = "sha256-5Wb7WAUGXJ7VMWiQyboH3PXJazsqitD9N0Acd+WItaY=";
subPackages = [ "." ];
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index 756d99c6e7f4..50e8101c17a5 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "byacc";
- version = "20210109";
+ version = "20210520";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
];
- sha256 = "sha256-nn13aFhxQed4RJJhXf78cKjgBBAEO2OQHv7cG1DBm5c=";
+ sha256 = "sha256-19MdrnLLlzSC73+XVgmuQBzMEu4/sWi2emlSbGCv5D4=";
};
configureFlags = [
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
index 148004de4657..5ebc9c9a0f3c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
- "rev": "5b6bfbdcdbdda7da4839d7163ce579ed98410282",
- "date": "2021-05-21T15:22:56+02:00",
- "path": "/nix/store/msyjbgxf3y3rj6m3w2apd65cvr9x523r-tree-sitter-c-sharp",
- "sha256": "0ls2qic3jb20zv4m5pdrc3ikfb66afay3krvc6gsq1fi9hbxrmvv",
+ "rev": "aa429589525bb849189a0c5ddb52267ce578f988",
+ "date": "2021-06-07T18:47:38+02:00",
+ "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp",
+ "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
index 13fd96817095..9ed735f1e3fa 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c",
- "rev": "f05e279aedde06a25801c3f2b2cc8ac17fac52ae",
- "date": "2021-03-28T09:12:10-07:00",
- "path": "/nix/store/4bcxsfrgrcpjy3f6dsmqli2xawjpyz44-tree-sitter-c",
- "sha256": "1rismmgaqii1sdnri66h75sgw3mky4aha9hff6fan1qzll4f3hif",
+ "rev": "008008e30a81849fca0c79291e2b480855e0e02c",
+ "date": "2021-05-26T09:13:01-07:00",
+ "path": "/nix/store/vkps4991ip8dhgjqwfw7mamnmnizw31m-tree-sitter-c",
+ "sha256": "1mw4vma7kl504qn91f6janiqk9i05849rizqkqhyagb3glfbkrx2",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index 3dc04b3b08ad..b8ca41abcf29 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
- "rev": "2e33ffa3313830faa325fe25ebc3769896b3a68b",
- "date": "2021-04-19T23:45:03+02:00",
- "path": "/nix/store/75mc2mfs4sm21c871s5lm9djnjk90r7n-tree-sitter-haskell",
- "sha256": "0np7mzi1na1qscdxsjpyw314iwcmpzzrx1v7fk3yxc70qwzjcpp1",
+ "rev": "237f4eb4417c28f643a29d795ed227246afb66f9",
+ "date": "2021-06-05T13:41:42+02:00",
+ "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell",
+ "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index c0411d15fb69..65066c66d539 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
- "rev": "6c8cfae935f67dd9e3a33982e5e06be0ece6399a",
- "date": "2021-05-11T09:51:32-07:00",
- "path": "/nix/store/dhh1gz45l3h3p31jfg5fgy1kns1lbw6d-tree-sitter-javascript",
- "sha256": "1mw6miw4yp6s1i0b08hflamfvrjdim4fnnj6fy461n05jp1s1i78",
+ "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5",
+ "date": "2021-06-09T14:12:41-07:00",
+ "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript",
+ "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
index 9996ac8d917e..ce1e4f1bb38d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
@@ -1,9 +1,9 @@
{
- "url": "https://github.com/Azganoth/tree-sitter-lua",
- "rev": "a943944ec09c5e96f455bb166079de4ef3534457",
- "date": "2020-12-27T00:15:24-03:00",
- "path": "/nix/store/6glr8p3x58pva0nn586dk5jwb3bpgqrj-tree-sitter-lua",
- "sha256": "0pm6wwb3kv73bfvvshdmvazcb1is5x1z6jwr31gz0niln18nqvpb",
+ "url": "https://github.com/nvim-treesitter/tree-sitter-lua",
+ "rev": "b6d4e9e10ccb7b3afb45018fbc391b4439306b23",
+ "date": "2021-03-05T14:55:53+01:00",
+ "path": "/nix/store/mlvnfmm5q67810qdim11qs4ivq54jrmr-tree-sitter-lua",
+ "sha256": "17kf1m2qpflqv7xng6ls4v1qxfgdlpgxs4qjwb6rcc8nbcdsj4ms",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index 4ff38790b6f7..49b57f4d8a39 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
- "rev": "6a271f4075e11815e787df9055a950fb844ee63b",
- "date": "2021-05-13T12:41:22+02:00",
- "path": "/nix/store/n6hycd1scxa990xchk5h09ilxi7w18f5-tree-sitter-php",
- "sha256": "1ijxc6brd0d35hr89ic8k5ispc6sj4mxln7bznd9n6zrgjvfdjqb",
+ "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04",
+ "date": "2021-06-01T20:33:20+02:00",
+ "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php",
+ "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
index 37b0d1532408..41c63a2ce8c0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ql",
- "rev": "965948cce9a94a710b1339851e0919471ad5ee2c",
- "date": "2021-03-04T14:34:34-08:00",
- "path": "/nix/store/4hi59c856ii2b79nv2wjib6qbp3hk24i-tree-sitter-ql",
- "sha256": "01y1fzclwlaffx0rzg49h7kyvhhm25fba0w362n2y8hgjp3imgmg",
+ "rev": "8e7fd7e638d4a0ec7a792ee16b19dbc6407aa810",
+ "date": "2021-06-02T18:46:47+02:00",
+ "path": "/nix/store/yhyi9y09shv1fm87gka43vnv9clvyd92-tree-sitter-ql",
+ "sha256": "0x5f9989ymqvw3g8acckyk4j7zpmnc667qishbgly9icl9rkmv7w",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index c8142974fd43..a96363af7139 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
- "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",
- "date": "2021-03-03T16:54:30-08:00",
- "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",
- "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",
+ "rev": "391269d74d20154bbd0ac9be20b35eced6920290",
+ "date": "2021-05-04T14:02:32-07:00",
+ "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby",
+ "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
index 41c4fcfe734d..b224fa54dafe 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/Himujjal/tree-sitter-svelte",
- "rev": "c696a13a587b0595baf7998f1fb9e95c42750263",
- "date": "2021-03-20T16:45:11+05:30",
- "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte",
- "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3",
+ "rev": "10c113001acf9852817150acb3031a5e68d2b4cf",
+ "date": "2021-05-02T10:05:14+05:30",
+ "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte",
+ "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 168c9a0a403d..ad064c556ad7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -75,7 +75,7 @@ let
repo = "tree-sitter-nix";
};
"tree-sitter-lua" = {
- orga = "Azganoth";
+ orga = "nvim-treesitter";
repo = "tree-sitter-lua";
};
"tree-sitter-fennel" = {
diff --git a/pkgs/development/tools/protoc-gen-twirp/default.nix b/pkgs/development/tools/protoc-gen-twirp/default.nix
index 5db843e6f61f..363dfcaed612 100644
--- a/pkgs/development/tools/protoc-gen-twirp/default.nix
+++ b/pkgs/development/tools/protoc-gen-twirp/default.nix
@@ -2,20 +2,19 @@
buildGoPackage rec {
pname = "protoc-gen-twirp";
- version = "8.0.0";
+ version = "8.1.0";
src = fetchFromGitHub {
owner = "twitchtv";
repo = "twirp";
rev = "v${version}";
- sha256 = "sha256-lwozRwH96nh4Zlf6ggOF+FuUEfxkN38wxygg5HXw/M0=";
+ sha256 = "sha256-ezSNrDfOE1nj4FlX7E7Z7/eGfQw1B7NP34aj8ml5pDk=";
};
goPackagePath = "github.com/twitchtv/twirp";
subPackages = [
"protoc-gen-twirp"
- "protoc-gen-twirp_python"
];
doCheck = true;
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 598d01a8af5f..267cc4fcfbab 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin
+{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeScriptBin
, runtimeShell
, bash
}:
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0r60smhlx1992a1s1k5sxjpdqllb2xsqcimgx3ldp5fdkfphk3cw";
#for substituteAll
- libclang = llvmPackages.libclang.lib;
+ libclang = llvmPackages_latest.libclang.lib;
inherit bash;
buildInputs = [ libclang ];
diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix
index 9458cb030a7c..71394c098907 100644
--- a/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/pkgs/development/tools/rust/cargo-c/default.nix
@@ -5,7 +5,7 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-c";
- version = "0.8.0";
+ version = "0.8.1";
src = stdenv.mkDerivation rec {
name = "${pname}-source-${version}";
@@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec {
owner = "lu-zero";
repo = pname;
rev = "v${version}";
- sha256 = "1rvbikhbqsfa2sh79kapqg4yz19r1yhqfykl6cf4yjg6vawkwfw1";
+ sha256 = "0fd0xql5cbqgmir2z3ah91iasaq9133wmi5bnhiy3dv7drcqv4rc";
};
cargoLock = fetchurl {
url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock";
- sha256 = "17cdac8ym59jwjxs3k4isazknhrlr6lw0j0r76n5xf0dd7apfgcs";
+ sha256 = "1xlh3h77rxhqyr1nkqyanb120lwdks6fklh202camqpmznd763g5";
};
installPhase = ''
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
'';
};
- cargoSha256 = "0pxakfiidxfczh3harnjhb1zv340r812jxzwam8z2kyw3mkyhh8z";
+ cargoSha256 = "0b952xkg0l31laqlhsv3cqdag7v15k9na6xr6q9y8xwy1fjh9gzv";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index 2f20c66bbe25..d5fd7ee4a839 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
- version = "0.33.0";
+ version = "0.34.0";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-OnCSWAGcxQsLq5aQmd/15lAQmdsCGPqLeRYWXQG0oG0=";
+ sha256 = "sha256-/9v9nedLoXwuFuqw3W4RjTwvNIlisbiPCcVF/0oH4fw=";
};
nativeBuildInputs = [ pkg-config ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
- cargoSha256 = "sha256-BsE5+0bL9ctsdZ/PM1d6TfrXuzNMYHejoqA3bgH8140=";
+ cargoSha256 = "sha256-clav4lGDuWvwzq78Kw+vtz+boNcZnNH+NHH7ZaZYSC4=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.
diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix
index 74c2d9e680f0..216e83622158 100644
--- a/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/pkgs/development/tools/rust/cargo-msrv/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-msrv";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "foresterre";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-DpgZrKy2rEKnI0/t4l3sDtNUhAwwFFSzq4CdRFqAkzY=";
+ sha256 = "sha256-yTUYMLVjzbuHqQxW68snxQ0CzoOwEBGXWFR/4yfDZ34=";
};
- cargoSha256 = "sha256-ny8EA3dkirxEiFYiSFRxHnjf3mVO2LCWVR8fPHX87Ek=";
+ cargoSha256 = "sha256-WXvl+Xbu/oGTEFhbn6GuLoiNX+DxwhtT6cuucCOQsC4=";
passthru = {
updateScript = nix-update-script {
diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix
index 56c57483ddc5..b26449ba7c73 100644
--- a/pkgs/development/tools/stylua/default.nix
+++ b/pkgs/development/tools/stylua/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "stylua";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "johnnymorganz";
repo = pname;
rev = "v${version}";
- sha256 = "0gjm9pvwfbwhd49pm5sw5plwhlhvbfkms44h67zgvy7xzqv8h3dw";
+ sha256 = "0ihb6hq1va6nj7d2883m9gdhzrwmcsw7z0fxqkhs9scv4i9x6s9d";
};
- cargoSha256 = "117m78naldp6yvwcccvsrbnx6x6287cvq0saa06pmiqv1rqm50m3";
+ cargoSha256 = "04gm9drb4qh1sdzqqdj3lwb462y22sz24gjr6nw3sd2a0iqhsknf";
cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ]
++ lib.optionals luauSupport [ "--features" "luau" ];
diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix
index d360500e1fb2..6d1622c5b864 100644
--- a/pkgs/development/tools/wiggle/default.nix
+++ b/pkgs/development/tools/wiggle/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, ncurses, groff }:
+{ lib, stdenv, fetchFromGitHub, ncurses, groff }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+ name = "wiggle";
+ version = "1.3";
- name = "wiggle-1.3";
-
- src = fetchurl {
- url = "https://github.com/neilbrown/wiggle/archive/v1.3.tar.gz";
- sha256 = "sha256-/5LPATPB9NzjNWPiY8sw59229KvfhtQnsewUkL7CWvo=";
+ src = fetchFromGitHub {
+ owner = "neilbrown";
+ repo = "wiggle";
+ rev = "v${version}";
+ sha256 = "sha256-rlHhYzP81lfblZvtZ1lhiq4iQ6WRpBYukoGqpVP+NKI=";
};
buildInputs = [ ncurses groff ];
@@ -21,24 +23,22 @@ stdenv.mkDerivation {
patchShebangs .
'';
- meta = {
- homepage = "http://blog.neil.brown.name/category/wiggle/";
+ meta = with lib; {
+ homepage = "https://blog.neil.brown.name/category/wiggle/";
description = "Tool for applying patches with conflicts";
-
longDescription = ''
- Wiggle applies patches to a file in a similar manner to the patch(1)
- program. The distinctive difference is, however, that wiggle will
- attempt to apply a patch even if the "before" part of the patch doesn't
- match the target file perfectly. This is achieved by breaking the file
- and patch into words and finding the best alignment of words in the file
- with words in the patch. Once this alignment has been found, any
- differences (word-wise) in the patch are applied to the file as best as
- possible. Also, wiggle will (in some cases) detect changes that have
- already been applied, and will ignore them.
+ Wiggle applies patches to a file in a similar manner to the patch(1)
+ program. The distinctive difference is, however, that wiggle will
+ attempt to apply a patch even if the "before" part of the patch doesn't
+ match the target file perfectly. This is achieved by breaking the file
+ and patch into words and finding the best alignment of words in the file
+ with words in the patch. Once this alignment has been found, any
+ differences (word-wise) in the patch are applied to the file as best as
+ possible. Also, wiggle will (in some cases) detect changes that have
+ already been applied, and will ignore them.
'';
-
- license = lib.licenses.gpl2Plus;
- platforms = lib.platforms.all;
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = [ ];
};
-
}
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index dee8ad0c9b84..1211440b6b43 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.11.0";
+ version = "1.11.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-rsQ9MdMgYPqnLzMfW4rwDpx5QKVDm6TMCCHqJzvTpjw=";
+ sha256 = "sha256-+EXkWtqJihNx5wvEhRycVpPDs1QxfoqcbMW5aLrofI8=";
};
- cargoSha256 = "sha256-nKbc73bEKb0XzuBZApu21E1OzkgU9sqbCaaWhUMiWdQ=";
+ cargoSha256 = "sha256-j/1NJlGRq1MuE+EU7VstwSMmRYfudBmv3nAe3bAyv+U=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix
index 7054e4c66b87..27b2a4f33191 100644
--- a/pkgs/development/web/nodejs/v14.nix
+++ b/pkgs/development/web/nodejs/v14.nix
@@ -1,14 +1,13 @@
-{ callPackage, icu68, python3, lib, stdenv, enableNpm ? true }:
+{ callPackage, python3, lib, stdenv, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
- icu = icu68;
python = python3;
};
in
buildNodejs {
inherit enableNpm;
- version = "14.17.0";
- sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n";
+ version = "14.17.1";
+ sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index bd8825582c43..243db1e1c398 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "dwarf-therapist";
- version = "41.1.5";
+ version = "41.2.2";
src = fetchFromGitHub {
owner = "Dwarf-Therapist";
repo = "Dwarf-Therapist";
rev = "v${version}";
- sha256 = "0w1mwwf49vdmvmdfvlkn4m0hzvlj111rpl8hv4rw6v8nv6yfb2y4";
+ sha256 = "sha256-zsEG68ioSw64UfmqlTLO1i5sObg8C4zxvdPxdQGMhhU=";
};
nativeBuildInputs = [ texlive cmake ninja ];
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 8a7573dd5841..efdcbe9b36d8 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
- version = "2021.602.0";
+ version = "2021.612.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
- sha256 = "t9Byn3eAAkxnBQBfdvz2CGGXu8d3JzTnSz7I68Ntp3A=";
+ sha256 = "1hrk8sfg4bdrrrqpwb5a8dhpy0lfnrx575z3l2jygzbwgqgr4jy4";
};
patches = [ ./bypass-tamper-detection.patch ];
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index 0b6579bae064..d0a571717518 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -301,8 +301,8 @@
})
(fetchNuGet {
name = "Markdig";
- version = "0.22.1";
- sha256 = "1m62kjwz93h323w8qvwmld2g8dy17a3ny5wyy29pwqj7ig4y8ymj";
+ version = "0.24.0";
+ sha256 = "03i0mw9717xwf3pffr8ar7k7fmyhgdw222j58l4x0xr4slpg94l7";
})
(fetchNuGet {
name = "MessagePack";
@@ -374,6 +374,11 @@
version = "1.0.0";
sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh";
})
+ (fetchNuGet {
+ name = "Microsoft.Bcl.AsyncInterfaces";
+ version = "1.1.0";
+ sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1";
+ })
(fetchNuGet {
name = "Microsoft.Bcl.AsyncInterfaces";
version = "5.0.0";
@@ -446,13 +451,13 @@
})
(fetchNuGet {
name = "Microsoft.Diagnostics.NETCore.Client";
- version = "0.2.61701";
- sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1";
+ version = "0.2.221401";
+ sha256 = "1k55l60bg8lj5ayl3kixbzvx2684xd7a9nzha5fiqjgp85cimb3r";
})
(fetchNuGet {
name = "Microsoft.Diagnostics.Runtime";
- version = "2.0.222201";
- sha256 = "1vsa6xbqi4f2mx85rjmq641r9zgssj0bbfcsqlsa5nx6lqh2rf2q";
+ version = "2.0.226801";
+ sha256 = "1w8ahqkv8nbq2ch17aa9axhqqnybmc9bsxpdhpiy52ix70mr72w1";
})
(fetchNuGet {
name = "Microsoft.DotNet.PlatformAbstractions";
@@ -571,8 +576,8 @@
})
(fetchNuGet {
name = "Microsoft.Extensions.ObjectPool";
- version = "5.0.5";
- sha256 = "0hh0xm14hp479dsd0gb9igz0vbbn3sak27v39phpyilxvk7ky5z1";
+ version = "5.0.6";
+ sha256 = "0kwhcnsagwn3x9ms2sfy5js25gfnipkrakqgn7bbg0a1k35qa5xx";
})
(fetchNuGet {
name = "Microsoft.Extensions.Options";
@@ -751,13 +756,13 @@
})
(fetchNuGet {
name = "ppy.LocalisationAnalyser";
- version = "2021.525.0";
- sha256 = "1h8p8d1xk03904fifhi77zrjkh4sknp4mxjqd3nbpfyikd8f7c8p";
+ version = "2021.608.0";
+ sha256 = "1lsb7nr2gynz7llbl22f5mrd9hlxaq48gssfcn5qfji7afv8kwql";
})
(fetchNuGet {
name = "ppy.osu.Framework";
- version = "2021.601.0";
- sha256 = "0y17s60r4q0c05gm67fmp700zwb7k74xdi45hprblyxsplnbkmi0";
+ version = "2021.611.0";
+ sha256 = "14a2032khf2ys51rp6qs3ikp0lvqxgdqh0hbvchj34q0l3g40yv0";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@@ -766,8 +771,8 @@
})
(fetchNuGet {
name = "ppy.osu.Game.Resources";
- version = "2021.525.0";
- sha256 = "15ksxv5fasfzdkmwikjbn17c1d4rssjfm2vp71b7m834ghm6pnbd";
+ version = "2021.611.0";
+ sha256 = "01pbxccfrwzn47xg9xgjn91l6w3d0d3gqkkx53ak7ynxbbvx9q07";
})
(fetchNuGet {
name = "ppy.osuTK.NS20";
@@ -1009,11 +1014,6 @@
version = "1.5.0";
sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06";
})
- (fetchNuGet {
- name = "System.Collections.Immutable";
- version = "1.7.1";
- sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq";
- })
(fetchNuGet {
name = "System.Collections.Immutable";
version = "5.0.0";
@@ -1379,11 +1379,6 @@
version = "4.3.0";
sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";
})
- (fetchNuGet {
- name = "System.Reflection.Metadata";
- version = "1.8.1";
- sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj";
- })
(fetchNuGet {
name = "System.Reflection.Metadata";
version = "5.0.0";
@@ -1444,11 +1439,6 @@
version = "4.5.3";
sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln";
})
- (fetchNuGet {
- name = "System.Runtime.CompilerServices.Unsafe";
- version = "4.7.1";
- sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j";
- })
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "5.0.0";
@@ -1699,6 +1689,11 @@
version = "4.3.0";
sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
})
+ (fetchNuGet {
+ name = "System.Threading.Tasks.Extensions";
+ version = "4.5.2";
+ sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj";
+ })
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.5.3";
diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix
index 33373e0e7b1d..2837f96357a7 100644
--- a/pkgs/games/scid-vs-pc/default.nix
+++ b/pkgs/games/scid-vs-pc/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
+{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
pname = "scid-vs-pc";
version = "4.21";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ tcl tk libX11 zlib ];
+ buildInputs = [ tk libX11 zlib ];
prePatch = ''
sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
@@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
for cmd in $out/bin/* ; do
wrapProgram "$cmd" \
- --set TCLLIBPATH "${tcl}/${tcl.libdir}" \
--set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
done
'';
@@ -79,4 +78,3 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
};
}
-
diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix
index 7b1a15c0a551..43794f6bc255 100644
--- a/pkgs/games/scid/default.nix
+++ b/pkgs/games/scid/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }:
+{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper }:
-stdenv.mkDerivation {
+tcl.mkTclDerivation {
pname = "scid";
version = "4.3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ tcl tk libX11 zlib ];
+ buildInputs = [ tk libX11 zlib ];
prePatch = ''
sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
@@ -45,13 +45,13 @@ stdenv.mkDerivation {
for cmd in $out/bin/*
do
wrapProgram "$cmd" \
- --set TCLLIBPATH "${tcl}/${tcl.libdir}" \
--set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
done
'';
meta = {
description = "Chess database with play and training functionality";
+ maintainers = with lib.maintainers; [ agbrooks ];
homepage = "http://scid.sourceforge.net/";
license = lib.licenses.gpl2;
};
diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix
index 734e7be3666b..dbc429746846 100644
--- a/pkgs/games/tcl2048/default.nix
+++ b/pkgs/games/tcl2048/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, tcl, tcllib, runtimeShell }:
-stdenv.mkDerivation {
+tcl.mkTclDerivation {
name = "tcl2048-0.4.0";
src = fetchurl {
@@ -8,20 +8,12 @@ stdenv.mkDerivation {
sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e";
};
- phases = "installPhase";
+ buildInputs = [ tcllib ];
+ phases = "installPhase fixupPhase";
installPhase = ''
mkdir -pv $out/bin
- cp $src $out/2048.tcl
- cat > $out/bin/2048 << EOF
- #!${runtimeShell}
-
- # wrapper for tcl2048
- export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"
- ${tcl}/bin/tclsh $out/2048.tcl
- EOF
-
- chmod +x $out/bin/2048
+ install -m 755 $src $out/bin/2048
'';
meta = {
diff --git a/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix
new file mode 100644
index 000000000000..0542b2ab303e
--- /dev/null
+++ b/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, stdenv
+, fetchurl
+, dpkg
+, makeWrapper
+, coreutils
+, gnugrep
+, gnused
+, mfc9140cdnlpr
+, pkgsi686Linux
+, psutils
+}:
+
+stdenv.mkDerivation rec {
+ pname = "mfc9140cdncupswrapper";
+ version = "1.1.4-0";
+
+ src = fetchurl {
+ url = "https://download.brother.com/welcome/dlf100407/${pname}-${version}.i386.deb";
+ sha256 = "18aramgqgra1shdhsa75i0090hk9i267gvabildwsk52kq2b96c6";
+ };
+
+ unpackPhase = ''
+ dpkg-deb -x $src $out
+ '';
+
+ nativeBuildInputs = [
+ dpkg
+ makeWrapper
+ ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ lpr=${mfc9140cdnlpr}/opt/brother/Printers/mfc9140cdn
+ dir=$out/opt/brother/Printers/mfc9140cdn
+
+ interpreter=${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2
+ patchelf --set-interpreter "$interpreter" "$dir/cupswrapper/brcupsconfpt1"
+
+ substituteInPlace $dir/cupswrapper/cupswrappermfc9140cdn \
+ --replace "mkdir -p /usr" ": # mkdir -p /usr" \
+ --replace '/opt/brother/''${device_model}/''${printer_model}/lpd/filter''${printer_model}' "$lpr/lpd/filtermfc9140cdn" \
+ --replace '/usr/share/ppd/Brother/brother_''${printer_model}_printer_en.ppd' "$dir/cupswrapper/brother_mfc9140cdn_printer_en.ppd" \
+ --replace '/usr/share/cups/model/Brother/brother_''${printer_model}_printer_en.ppd' "$dir/cupswrapper/brother_mfc9140cdn_printer_en.ppd" \
+ --replace '/opt/brother/Printers/''${printer_model}/' "$lpr/" \
+ --replace 'nup="psnup' "nup=\"${psutils}/bin/psnup" \
+ --replace '/usr/bin/psnup' "${psutils}/bin/psnup"
+
+ mkdir -p $out/lib/cups/filter
+ mkdir -p $out/share/cups/model
+
+ ln $dir/cupswrapper/cupswrappermfc9140cdn $out/lib/cups/filter
+ ln $dir/cupswrapper/brother_mfc9140cdn_printer_en.ppd $out/share/cups/model
+
+ sed -n '/!ENDOFWFILTER!/,/!ENDOFWFILTER!/p' "$dir/cupswrapper/cupswrappermfc9140cdn" | sed '1 br; b; :r s/.*/printer_model=mfc9140cdn; cat < $out/lib/cups/filter/brother_lpdwrapper_mfc9140cdn
+ sed -i "/#! \/bin\/sh/a PATH=${lib.makeBinPath [ coreutils gnused gnugrep ]}:\$PATH" $out/lib/cups/filter/brother_lpdwrapper_mfc9140cdn
+ chmod +x $out/lib/cups/filter/brother_lpdwrapper_mfc9140cdn
+ '';
+
+ meta = with lib; {
+ description = "Brother MFC-9140CDN CUPS wrapper driver";
+ homepage = "http://www.brother.com/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix b/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix
new file mode 100644
index 000000000000..4128123d6431
--- /dev/null
+++ b/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix
@@ -0,0 +1,73 @@
+{ stdenv
+, lib
+, fetchurl
+, dpkg
+, makeWrapper
+, coreutils
+, file
+, gawk
+, ghostscript
+, gnused
+, pkgsi686Linux
+}:
+
+stdenv.mkDerivation rec {
+ pname = "mfc9140cdnlpr";
+ version = "1.1.2-1";
+
+ src = fetchurl {
+ url = "https://download.brother.com/welcome/dlf100405/${pname}-${version}.i386.deb";
+ sha256 = "1wqx8njrv078fc3vlq90qyrfg3cw9kr9m6f3qvfnkhq1f95fbslh";
+ };
+
+ unpackPhase = ''
+ dpkg-deb -x $src $out
+ '';
+
+ nativeBuildInputs = [
+ dpkg
+ makeWrapper
+ ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ dir=$out/opt/brother/Printers/mfc9140cdn
+
+ patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $dir/lpd/brmfc9140cdnfilter
+
+ wrapProgram $dir/inf/setupPrintcapij \
+ --prefix PATH : ${lib.makeBinPath [
+ coreutils
+ ]}
+
+ substituteInPlace $dir/lpd/filtermfc9140cdn \
+ --replace "BR_CFG_PATH=" "BR_CFG_PATH=\"$dir/\" #" \
+ --replace "BR_LPD_PATH=" "BR_LPD_PATH=\"$dir/\" #"
+
+ wrapProgram $dir/lpd/filtermfc9140cdn \
+ --prefix PATH : ${lib.makeBinPath [
+ coreutils
+ file
+ ghostscript
+ gnused
+ ]}
+
+ substituteInPlace $dir/lpd/psconvertij2 \
+ --replace '`which gs`' "${ghostscript}/bin/gs"
+
+ wrapProgram $dir/lpd/psconvertij2 \
+ --prefix PATH : ${lib.makeBinPath [
+ gnused
+ gawk
+ ]}
+ '';
+
+ meta = with lib; {
+ description = "Brother MFC-9140CDN LPR printer driver";
+ homepage = "http://www.brother.com/";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ hexa ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 4f5b4f7d69b6..124b8cb8e690 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -1,5 +1,6 @@
{ mkDerivation
, fetchFromGitHub
+, fetchpatch
, SDL2
, cmake
, ffmpeg
@@ -26,6 +27,15 @@ mkDerivation rec {
sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU=";
};
+ patches = [
+ # fix compability with ffmpeg 4.4, remove on next release after 1.11
+ (fetchpatch {
+ name = "fix_ffmpeg_4.4.patch";
+ url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch";
+ sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo=";
+ })
+ ];
+
postPatch = ''
substituteInPlace git-version.cmake --replace unknown ${src.rev}
substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share
diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/misc/emulators/punes/default.nix
index 0d2a5b117984..c0bf7a223a3b 100644
--- a/pkgs/misc/emulators/punes/default.nix
+++ b/pkgs/misc/emulators/punes/default.nix
@@ -17,13 +17,13 @@
mkDerivation rec {
pname = "punes";
- version = "unstable-2021-04-25";
+ version = "unstable-2021-06-05";
src = fetchFromGitHub {
owner = "punesemu";
repo = "puNES";
- rev = "4b4c3495a56d3989544cb56079ce641da8aa9b35";
- sha256 = "1wszvdgm38513v26p14k58shbkxn1qhkn8l0hsqi04vviicad59s";
+ rev = "07fd123f62b2d075894a0cc966124db7b427b791";
+ sha256 = "1wxff7b397ayd2s2v14w6a0zfgklc7y0kv3mkz1gg5x47mnll24l";
};
postPatch = ''
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index bf8ad20cfcbc..531fc45ac182 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -221,12 +221,12 @@ final: prev:
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
- version = "2021-06-01";
+ version = "2021-06-13";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
- rev = "80ddcf26eca11cf4d48a52ffec094fe5a4711f32";
- sha256 = "0kh6a5hm0ppsbfpp7yhr2k4v36mj203q59wy15sgajx08ww0jj3m";
+ rev = "7587e38c32f4bba2b41516fc3aba3ddc50995e97";
+ sha256 = "126fxl5krs6xkq12yjw6j9whh74msznw939hq4i0fcrhsx2f5y5m";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@@ -269,12 +269,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
- version = "2021-06-03";
+ version = "2021-06-12";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "23b6f64c9523522dd185482c856de492476a760c";
- sha256 = "1ijm4w4nqa037vjpjgjizhzrnpj10hwjc93lhzq29qs3cx85df1q";
+ rev = "33639e53d0bf69444275ed048c5bfd7e29396634";
+ sha256 = "0zqc4j0nbdhap8a67529n2k4k53xnqxrjsn2a4sdqdwvm207y6r9";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@@ -413,12 +413,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-06-09";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "eaee30fe7afdbce73f92d0c766f4b411c8de5525";
- sha256 = "0b73k55zfhd4ygqiwwps17fp9nksbs8km57vfl0y85vb3ajzg0l6";
+ rev = "7da6e0f36b88144a3371a07c8ccb8cc9510da9ea";
+ sha256 = "18j5jj28riv7nchxlj9q4p83gkn3h1b43c4fpdqfidhbda0lxhl6";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -449,12 +449,12 @@ final: prev:
ci_dark = buildVimPluginFrom2Nix {
pname = "ci_dark";
- version = "2021-06-04";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "yunlingz";
repo = "ci_dark";
- rev = "d50cd0c60ecdaffb779d2acb7ce2bb94df1ed867";
- sha256 = "0pqpvqas1z173c2ngka787d9gp49ai3x85haingkxvir3bf0nbqm";
+ rev = "436cda40ec6491c68d5f995fa9da41361a3478fc";
+ sha256 = "0jw07l6l273w6rs877anjdmiraawain48zs2xxzyvh4pshw8szz9";
};
meta.homepage = "https://github.com/yunlingz/ci_dark/";
};
@@ -557,12 +557,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-06-08";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "898335d52ed925e8dd5dd3da3c25470d352b2e11";
- sha256 = "19ks20v1mjm5yrhlrkxqpmsc8jz2nfz5w38ixfkpbhdj3qwdf5gg";
+ rev = "0692698256a55c0c9c2f12988f12dc68b00890ad";
+ sha256 = "0ncdjkgg0yi76rklzhvysiaczh85gwbbsyxnn6z29g5clxcar3j0";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -714,12 +714,12 @@ final: prev:
completion-nvim = buildVimPluginFrom2Nix {
pname = "completion-nvim";
- version = "2021-06-01";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "completion-nvim";
- rev = "c8db953a8e9f4bc8183e31831297cf84d6f521b8";
- sha256 = "0p35msrh7g100ayl0g8285q43v20n6hlv1grdb0rmw8sil0j881a";
+ rev = "d62fff879b29fa1ce915887a75305af0fff57d32";
+ sha256 = "0hfsz06djyja8phj099fmbg2sa9jj89rqxvizwhwdxadshmr1f20";
};
meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
};
@@ -774,12 +774,12 @@ final: prev:
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
- version = "2021-06-08";
+ version = "2021-06-13";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
- rev = "643ae9bf5f08e752a22027628b69a31ce271f1b5";
- sha256 = "0jbd1y0riq6xdyh0x5msw8475b7v0viapgkmawyda3ax8bczb3jv";
+ rev = "b55e4906a10db0f6917058aec6616075c4d06994";
+ sha256 = "0agmfahppcaxxn3kwfg9wx9ncdz51qixqh52xw6rddhpda5h7gfm";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@@ -1014,24 +1014,24 @@ final: prev:
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2021-06-06";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "a20d2376b57ca500782719f1c4f83796d160c296";
- sha256 = "15hrlr6f98y1cmdyrlady6h4b501b7mvyzfbvsqcxjj8vj18pxas";
+ rev = "2e63db65e99d2d34835e227aa6803ec6cfbde3a9";
+ sha256 = "0v2lvrvlmsdpccfwjcl18ijif9appzn62cl58m6p2y4zvcz7dh0z";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
- version = "2021-06-05";
+ version = "2021-06-13";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
- rev = "6f3574b091d48e37599dcb356349a31472556716";
- sha256 = "0im9jnrbf1qbglh9wzqalfvp98wx9ccg5gk89k40nz3gggpwsbfh";
+ rev = "5861affed0158c68b91b0bd3d9f0f4184ac5bb29";
+ sha256 = "0dhhqzdr0j1zvgwsssx90b9rfcval18cr5jc9kg6xlccg492x7jl";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@@ -1304,12 +1304,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview-nvim";
- version = "2021-06-08";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "93c3aba19c54a7e68fab6c9864eff499a744b4cc";
- sha256 = "01s43bg2y0yb5h7gkr75j23i5jy5acaz0m65nbx5c6x1lbm7fy20";
+ rev = "f06495b12ba47460c61e8ad1388326e3f94e5637";
+ sha256 = "0lxv2c8wa0a6nknw2vfms9fzgjrmjk8klavhs8ay1qcgzis9s1iq";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -1462,12 +1462,12 @@ final: prev:
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
- version = "2021-04-14";
+ version = "2021-06-11";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
- rev = "376aacc4ec6dd5495f201bc5bea0c1bcff574535";
- sha256 = "1y3r36594f6vhgi0gzszl9pf1d7jizxj6iamcpwmbqbj75i62hp3";
+ rev = "0893abf44cd6dda4d50e98c4ab1f9aea8e61d617";
+ sha256 = "12fa2kwg2495qhs845g31a9iszlrry4jc19famgpjg1glgm9lkrm";
};
meta.homepage = "https://github.com/fenetikm/falcon/";
};
@@ -1522,12 +1522,12 @@ final: prev:
ferret = buildVimPluginFrom2Nix {
pname = "ferret";
- version = "2020-12-08";
+ version = "2021-06-12";
src = fetchFromGitHub {
owner = "wincent";
repo = "ferret";
- rev = "fbcd9de1e88391d8a1ab39adb520d6a5ac29792f";
- sha256 = "068v0gj7vn3halj0mcjfnziklqcssyln61ip5zalnw7x6vm3yblk";
+ rev = "ce27366ab52ef27a2307836e586b9b9c54a00ae5";
+ sha256 = "1j69gd5j7bml6a8gaa8skp3z0145372pnqmqq8hfn7gvncql6l97";
};
meta.homepage = "https://github.com/wincent/ferret/";
};
@@ -1607,12 +1607,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
- version = "2021-05-28";
+ version = "2021-06-13";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
- rev = "496ccb632e1dd66ab4561304faa431125c0bf0de";
- sha256 = "1rbgji9x0bf8l7kqph77nfnpipy4d1863ml3wx75404q43nld7w8";
+ rev = "22c37fd12074290561210004918a870db085ceb3";
+ sha256 = "1nky1sq602vn8bwdr4h7a3djx0s8adq6jd7jbb87vqb3z63q4xl9";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@@ -1739,24 +1739,24 @@ final: prev:
gina-vim = buildVimPluginFrom2Nix {
pname = "gina-vim";
- version = "2021-06-05";
+ version = "2021-06-12";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "gina.vim";
- rev = "7069668147157d872821ebed1eee07742ece48fd";
- sha256 = "0fbr154jgvr71liq0cwdl1qwg8j40yg9i2gb6ykz4p2y5cvs3wz6";
+ rev = "abdbe0fe33f3b6fc59e94f7cc3072768f8dfd8ac";
+ sha256 = "1f3shh6jxr5i1an2dbb1vmc0l2xg03fm6ava25ahxg4b5ka59bc5";
};
meta.homepage = "https://github.com/lambdalisue/gina.vim/";
};
git-blame-nvim = buildVimPluginFrom2Nix {
pname = "git-blame-nvim";
- version = "2021-04-15";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "f-person";
repo = "git-blame.nvim";
- rev = "bba913f065b7fba7150e71dc07e093c758c5ca98";
- sha256 = "1xvy5pnqcrvcs19b2b6l3n9rkj281grcgbrsg87iwvc9sw98bywl";
+ rev = "125f09f3e09091fa9cc6585156e199d08989dc0e";
+ sha256 = "1d6al5yrwv0wfmy39k8ky5ha1x0a6mz6djscibwz13fvgqka2730";
};
meta.homepage = "https://github.com/f-person/git-blame.nvim/";
};
@@ -1799,12 +1799,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-06-08";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "b5a6c6c0cbac430d61965be1fac5b984d3c9c469";
- sha256 = "19k96irs8saibjxah457ir418l3aih1rp3arj6b1m14p3yf2dxy3";
+ rev = "229d9c0d387789e5aff7138a513fcd1184b0ec26";
+ sha256 = "03yl9dq09l7mfal44qh16k4wav0lq4cq0ng715knnvqc0qhyk7p1";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1907,12 +1907,12 @@ final: prev:
gruvbox-flat-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox-flat-nvim";
- version = "2021-06-09";
+ version = "2021-06-11";
src = fetchFromGitHub {
owner = "eddyekofo94";
repo = "gruvbox-flat.nvim";
- rev = "0b27de51438f62870f1558ef9c27cb20caec69cf";
- sha256 = "0k9hqjw857ri0vbgjncbbfgh0yh1bpqr25vj0drp9wiakn5pywqf";
+ rev = "4e6615e601ce6861dddc6533532a7901fd0a68a4";
+ sha256 = "0p4390xdf4m3n6604nvpaca4dnswayja69brg55lhs5x1nrrfsn0";
};
meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/";
};
@@ -2003,12 +2003,12 @@ final: prev:
hologram-nvim = buildVimPluginFrom2Nix {
pname = "hologram-nvim";
- version = "2021-05-21";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "edluffy";
repo = "hologram.nvim";
- rev = "593a458d04f7457669280373d98e41195c106d13";
- sha256 = "0diq42zdr9l8qw198c5y4jy5siab3cwh4ncsb5z111m28n6a6i5c";
+ rev = "d8300f996fde96fc37c02b89f70642c1c44057a3";
+ sha256 = "0g9i5mgd69kgkl27my1xnyd3yf77c8313ikbhm7cn6i6iqml1blf";
};
meta.homepage = "https://github.com/edluffy/hologram.nvim/";
};
@@ -2147,12 +2147,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim";
- version = "2021-03-06";
+ version = "2021-06-10";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
- rev = "47691a67b690ad6ebd9df67574691822d226a5b6";
- sha256 = "0lkw6mslkd0gax0s280icpa5saq3320kkkmjih04mmnnf1vnwq6a";
+ rev = "5d5d2f80ec48e3f5fe7237ec17cd1587f39d3be7";
+ sha256 = "005nv99jw9ricgy1xyxixl1ssyh7jai9kv7cx95g5igfvvpblz7k";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@@ -2400,12 +2400,12 @@ final: prev:
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
- version = "2021-06-09";
+ version = "2021-06-10";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
- rev = "183fa5f3203983fed87174e6f193f271133fe974";
- sha256 = "17if75p3x4lkqncl296f3jdq0rcc69b0mgj0dbz6cl851bmqvy40";
+ rev = "95f14d52554bc5d9e7fe1bfe92c0c542aab9125e";
+ sha256 = "0isbqyi3ny0zy2npq15j4hpkhnqvf17zv39wpc62i91dqyplp4yy";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@@ -2496,24 +2496,24 @@ final: prev:
lightline-ale = buildVimPluginFrom2Nix {
pname = "lightline-ale";
- version = "2021-05-04";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "maximbaz";
repo = "lightline-ale";
- rev = "98a7417ff66829b1d14cb9e4e7aa6a1a0ef25103";
- sha256 = "1ripdl58pcmylgzzj92v8myjjw22h1g9g6drld9ng1qcg1zn2br8";
+ rev = "a861f691ac7e40b1b359bc7a147078fa1e0570ce";
+ sha256 = "0bi3pghcjdpbrp235bhkgqrsyfr1m6v40krxfb2qbc1yy9plbs9q";
};
meta.homepage = "https://github.com/maximbaz/lightline-ale/";
};
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
- version = "2021-04-16";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
- rev = "570e732e9e89f2a900a1e86fb3fa170c7dd201d6";
- sha256 = "0jvd7jp92qffas5hb2m6jg1vlm4g2is8q8hkj5mhyr5gnbpj2xf0";
+ rev = "ce6b2e1e09654af34a80af774879eac4708cc11e";
+ sha256 = "0cv5845d1gg9mv5pcp8c9afydvgihgfyk7ibjr3fgkqacwcfzjmy";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@@ -2542,6 +2542,18 @@ final: prev:
meta.homepage = "https://github.com/itchyny/lightline.vim/";
};
+ lightspeed-nvim = buildVimPluginFrom2Nix {
+ pname = "lightspeed-nvim";
+ version = "2021-06-16";
+ src = fetchFromGitHub {
+ owner = "ggandor";
+ repo = "lightspeed.nvim";
+ rev = "2c9ee4d31c84835e0d929a98d9142ac9e3e9dc0c";
+ sha256 = "0hc0xis0zgikf8mlsvqrn2vqjq6v1sscfihd8895wrz0hnzcmn8s";
+ };
+ meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
+ };
+
limelight-vim = buildVimPluginFrom2Nix {
pname = "limelight-vim";
version = "2020-10-13";
@@ -2604,12 +2616,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
- version = "2021-06-08";
+ version = "2021-06-10";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
- rev = "88272b6d89e8140a35099ea563978172f2776dc9";
- sha256 = "013ffydnhjwzj0y106m0x65zx31kabsxrs86ndq2vik3pc6vyslq";
+ rev = "3c80042ce8d9aa378698f80ea24742122ac529d7";
+ sha256 = "0rrmi7q8f8s208zbbdvfr0ysag8x0xkc8j9cpljc2n8a4pyn6z0z";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@@ -3060,12 +3072,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2021-06-07";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "55dcb4206324e3f90dd9dd41bed22fc6d4887098";
- sha256 = "0iiblvqmn7xg3mpyppzng081wgpdfrdn9jpa3ijr2ly6w5jg0yqa";
+ rev = "c5c39a18b5415da175e37ce8c5c4fb8648edc9f4";
+ sha256 = "1ixidbf996nrwmw81h2j5bg2npai4w5dsr2507w436ic04s9dn59";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -3264,12 +3276,12 @@ final: prev:
nlua-nvim = buildVimPluginFrom2Nix {
pname = "nlua-nvim";
- version = "2021-04-22";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "tjdevries";
repo = "nlua.nvim";
- rev = "31e3430acb84368c0933a3e765d834e897dfca2f";
- sha256 = "0h8908x2pf139q6mxckcglb5w7zxvhp0vj97za0g8343lvlhf0v1";
+ rev = "a0722bd2f6fdf54f85aaf8dcd6a1032f64c83905";
+ sha256 = "1j3350hs5dhbksi7wbzaq5p2268544virj0hj41bs5iv078pjj45";
};
meta.homepage = "https://github.com/tjdevries/nlua.nvim/";
};
@@ -3288,12 +3300,12 @@ final: prev:
nord-vim = buildVimPluginFrom2Nix {
pname = "nord-vim";
- version = "2020-07-06";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "arcticicestudio";
repo = "nord-vim";
- rev = "57dffa746907e8ce5c4b520146ed0d89d3c29a51";
- sha256 = "0xpz71rj74514789v6x9wrg95n8bsag8f5ygd7js40qrwpxq6b4j";
+ rev = "537c66ca7c1308430b00dab41d9ad9c4201555f7";
+ sha256 = "18v7xgag87czxnm2mvxg273z88gc8bh4jgzl1rh10y6kbbyv9c82";
};
meta.homepage = "https://github.com/arcticicestudio/nord-vim/";
};
@@ -3324,12 +3336,12 @@ final: prev:
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
- version = "2021-06-02";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
- rev = "7c85366c9d457ed0e3c3532ee312307476afbbdc";
- sha256 = "02hxjwi8g07zhx6xagma5m3sa0j4ljg79377zfn2vy4snnib452p";
+ rev = "2afb852177a28e579c1348033dbc043a99ca6dc7";
+ sha256 = "1aghwwcwsh4dka8jwq254pdb9l9c193iwnax9ab8s0zzcyk0x4bq";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@@ -3348,24 +3360,24 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-06-07";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "34a02b4f37a99b80eff03dff90c675b7374af54b";
- sha256 = "0vz610ifrzzish5qysz8pz7w0zcfhm0q0xvya3r48fgs12ipahmq";
+ rev = "5a5c14e492638856fcd57d867be419829f158278";
+ sha256 = "1pyw0y2lhhaid3ggzlnxmc3c0xhs2vgsx3pfgwm46mi5v6xl2h2l";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
- version = "2021-06-07";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
- rev = "b53dbb4d33a77e1b9b16672565749d6990e84cf0";
- sha256 = "1fwb797jcp5xkrfcqqljlhpnggkj3wfrc6zb0h662i35yhbhnin8";
+ rev = "8715d4db49706e7c50958a56e5b14791d539c10c";
+ sha256 = "1as567f3apgb9i2rh6j6d3gk6ipwm3kz694rbxzy2rpzmk4ic93h";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
@@ -3384,12 +3396,12 @@ final: prev:
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
- version = "2021-06-08";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
- rev = "7b510d5241fb29f5a5e985e02c4cfa046ec4ee3e";
- sha256 = "1ahy4v7z08l0z6c7v19dik8icw943kc243vlzhs1bfa4aj13nncs";
+ rev = "2db4a3c2c42816a31db391f30a708d976a8c679c";
+ sha256 = "0az2hn4h6cjrr55l56jm3la78lip4c6frz82d731pxqypnynqg84";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@@ -3420,12 +3432,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-06-08";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "c459c3f3a18c7ff7a312593c481af2b90fa01655";
- sha256 = "148k41db7ncri3mgdhc13mi4xk7chdchbgf42zldhcrf05y3xd58";
+ rev = "9c123d662715f1346d7b51f37fc78df33fe75e2d";
+ sha256 = "0zgwma3wvhq3h64apy06wpnz3gq7dgfzf4yb6llxsqb0qj032f3f";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3444,36 +3456,36 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2021-06-07";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "dfacc1fb7aeb0789c4fd27004e312cf363becba5";
- sha256 = "058kjgngg7l37q9zbfz0xfqajx526m4cp85i3chcsfrvp99c7mzv";
+ rev = "d5e57dc263ab14ec5d99049f66f5a069b63837dc";
+ sha256 = "02gjplbgc2lxbgvirhvk4qp0ns1xk73wf7v4iw6v9bcr6sr95iqn";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
- version = "2021-06-08";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
- rev = "9190b4a625a449927ffc3777b45db6cb392dc8f6";
- sha256 = "1gai54z6w4dw17irwnwfd35k8zy2aiws2ia9vqamzicaf0n8axr8";
+ rev = "40160a6d6b090339c0337c0c538f670bf9387d63";
+ sha256 = "17s0l7xc9080ssv6lk0lhjvj002ccqw7p0k8xb0ps5wacndkm81v";
};
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
};
nvim-dap-virtual-text = buildVimPluginFrom2Nix {
pname = "nvim-dap-virtual-text";
- version = "2021-05-16";
+ version = "2021-06-12";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "nvim-dap-virtual-text";
- rev = "29a79b7c15e7e15a416bcaa0efddfe67928b7bdd";
- sha256 = "0wl9dl83cx2hlik7yx6kknb7spsaqlzri2kybf3xcna44mqfq688";
+ rev = "c07c23f52e1019b237927f9520c691e57adb9e6a";
+ sha256 = "0pa1xjp6h5ny7lnql8nsqszx0gpzc1fa9xiksq3k1k5yjjj4wm1z";
};
meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
};
@@ -3492,24 +3504,24 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
- version = "2021-05-29";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
- rev = "9c15a789df5af1d3c83c0d680154ca226253eb26";
- sha256 = "0dz3bbyrwgxvsdmix2h6xbgj7wv9zbj08wgy46sjhzdhaxdfjx4z";
+ rev = "d0bdf0cb2d11064ac09d57bcfd48b53f0ee77124";
+ sha256 = "0smkmaz36zjisnlfzjmqgvljb0xk7j07xja69va3bf7k4kcg326y";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
- version = "2021-06-06";
+ version = "2021-06-12";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
- rev = "081fac590588ce0f6bcf54699658ba960a514172";
- sha256 = "05sw210pfsb4nfcix978x1mrnmjz5yv1rmv1501mqla8xq18cskv";
+ rev = "dd688e37458a6fdeb050942da8c1260389c2a99a";
+ sha256 = "0q4bmp3wy0miaysldpfm6646r8c0llygfnlbmk5brs4la321hjld";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@@ -3528,12 +3540,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-06-06";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "89fdc14457f2b18eebebeb226df9f6d5e464e318";
- sha256 = "09rd1hq8rzp84aiplvp0w4j1wykycrb55z1qwk83d9fv006sqvcl";
+ rev = "a26e1818fa62cfbcbd9728ad11bc3fc312d6e50e";
+ sha256 = "00w6jdpqfzxi9kfvwig052g8c0184pq71fs9p2dryx9klcxkcjnb";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -3552,12 +3564,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-06-08";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "f95be0c947237edb88df148dd61790988ab3a23e";
- sha256 = "1cddnkil9xid7xq3k0iszk12ma9pi396khqx6dzh2z9p7nkhk2rg";
+ rev = "f81570d1288fd974098e0f311f728469ca919155";
+ sha256 = "162j51rw1gv0gwip4d82qvmgpk7ky22xhhb2sjqm43zhjv3hqy0g";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3636,24 +3648,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-06-09";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "906a35cd0e7520eaff369688cb0a090240d7c2b9";
- sha256 = "18nw0xm4dp45v9s9kn0cmjwxdwydgr5f1v2kgm6h6kc1wvvd5scj";
+ rev = "bfeaf4c8ef5ff24e93005da2561407a13ba69d4d";
+ sha256 = "0sqydjvcjrqzw91b7sk7y9rrcs0l2j34hshcbwwwz8nrilfk6ak7";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-06-06";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "37ed50f28f8350de8dc70b56d8ac198aac9b1178";
- sha256 = "16mmjpk0pqqshlw1qj3zxx197iv4g7mscgfya17c7r03rybz0q19";
+ rev = "84015ac3c7e3f6a05482a26b78a072f8242e62c7";
+ sha256 = "170ldagz7d3fnd050jpz0dxjm64lr9biqr7qixc8gfgav664b5ib";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3696,24 +3708,24 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2021-06-02";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "cadb8110817884fff506043497c0f2b92026aacb";
- sha256 = "01f1913r1q1x1qwp6l6xrqxfc9lffngnc8js5n37r7naszc9r7w8";
+ rev = "6cea13039db901afb75c8efa587274ebd94c875a";
+ sha256 = "16bi6lzb4dl6m5kcp7z2q26a9w6sb0lb3y39wd3ai5ir3p7alix4";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2021-06-04";
+ version = "2021-06-10";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "0fffdcb37cf7d43bc138c89eb002957819c748af";
- sha256 = "0xd79f7a7zyqj6yzkjanli8r4wjhy17gsp1wl7p7vws6axrbgvjl";
+ rev = "8b9def16536e459eafa9e216e05929a02244760b";
+ sha256 = "0y958rn62xz2smb1z3ckf3l4pgnd6lph9wdbw52z77yj2bskcgf3";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@@ -3792,12 +3804,12 @@ final: prev:
one-nvim = buildVimPluginFrom2Nix {
pname = "one-nvim";
- version = "2021-06-02";
+ version = "2021-06-10";
src = fetchFromGitHub {
owner = "Th3Whit3Wolf";
repo = "one-nvim";
- rev = "d6e62bc7cdfae97d1ffc4f508a43955664ad5b73";
- sha256 = "0bna2kpvaxvwglgmdgp1g93bcygvnc1c25w4isawlgmsclzz9cc6";
+ rev = "faf6fb3f98fccbe009c3466f657a8fff84a5f956";
+ sha256 = "1ajg3vlrms2jy23sd2my0yrrng6wfjklq8fkpnkgxypd4gy6k9rv";
};
meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
};
@@ -3852,12 +3864,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-06-07";
+ version = "2021-06-13";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "d21e0e2c157af0fad6c6752ca07a274632202710";
- sha256 = "0zww9975x8wkmcdxzg4b51v94iy9644lb1miaz9ra2nwzz4ljqzj";
+ rev = "4012bd40af350a38696a6ba92a5df9bd99b48527";
+ sha256 = "0w3glp57wm7fkh0x3mqalckf8kw3x0rpbwvnafvfpsaapvmfci4h";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -3960,12 +3972,12 @@ final: prev:
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-06-02";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "3834d42236c155bb4240fb4008ea6e62c4a21dae";
- sha256 = "1y9aqpb6j36873kcp8dbv5mm04qccjicrs0z0z9cy53s8sgfx558";
+ rev = "c4dd6e7b29e77d7d795c0f7c67a8ca9673a7b50f";
+ sha256 = "1bq5myxd91pbs2malh4zglmj6bqa3jrjg4allrn9zbkvwxhylygi";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -4009,12 +4021,12 @@ final: prev:
presence-nvim = buildVimPluginFrom2Nix {
pname = "presence-nvim";
- version = "2021-06-08";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "andweeb";
repo = "presence.nvim";
- rev = "f4c1e227be0a0c863c2de201155401950eda572e";
- sha256 = "08s4az1gv6r5sl0jqkaf4yzibglibb7n2sivh7qccj8dz8id3883";
+ rev = "65a16b25f98891e2832daa437cdd682e546a494e";
+ sha256 = "0fwxxrwad3y69bczs7rxa0brff4vp139w2ylv8rfh0v2dgx2gmay";
};
meta.homepage = "https://github.com/andweeb/presence.nvim/";
};
@@ -4201,12 +4213,12 @@ final: prev:
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers-nvim";
- version = "2021-05-28";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
- rev = "34bbf868da6ef0225739e7977a4063872cd2b1e8";
- sha256 = "0ghy760dc07xwjaf5ci2di8qfq0qip8jyrp7x0rsl820ryy7rggy";
+ rev = "a80e199ad4e6e7027f2822fcbf92428606127893";
+ sha256 = "0xssz0vhylxhsbr7fm5gbagp23xcbl1nv16845nmahawab6ir9ks";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@@ -4297,12 +4309,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools-nvim";
- version = "2021-06-03";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
- rev = "177507f1443be150250ce90c18f5f6fb8d798543";
- sha256 = "0wj6pccjbcvj42i4516y6wjrssyl3p060454yjxhgqnnnzxc2dh4";
+ rev = "493202aa28b5b9e4aa378ad04de50162ec1f353c";
+ sha256 = "11azahjqg6wvahchds8hanbs8qrx2kjz7g5vcxcfyajfpns1ck6r";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@@ -4500,6 +4512,18 @@ final: prev:
meta.homepage = "https://github.com/gorkunov/smartpairs.vim/";
};
+ snap = buildVimPluginFrom2Nix {
+ pname = "snap";
+ version = "2021-06-16";
+ src = fetchFromGitHub {
+ owner = "camspiers";
+ repo = "snap";
+ rev = "8628478288bb64ed59989910e736879054facda3";
+ sha256 = "0sq7wv07hckk8qfg39qv507i33vg1c6nr5gjrjl5126i1h5afa8j";
+ };
+ meta.homepage = "https://github.com/camspiers/snap/";
+ };
+
snippets-nvim = buildVimPluginFrom2Nix {
pname = "snippets-nvim";
version = "2020-09-09";
@@ -4550,12 +4574,12 @@ final: prev:
Spacegray-vim = buildVimPluginFrom2Nix {
pname = "Spacegray-vim";
- version = "2021-01-02";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "ackyshake";
repo = "Spacegray.vim";
- rev = "012ff0065eac2c149084d59e1272ec0d740051ab";
- sha256 = "0y0jlycgsc8ll5gnqmjc9blyn9ynnzrgnp280k49h4lh5b689y5m";
+ rev = "0aa4e5c973413add9766689385bf9137d8c6cbc9";
+ sha256 = "12lwvcm2ahwvr8gj1sdlgf42cd2f4xxjmiir68f09yimzajip7yi";
};
meta.homepage = "https://github.com/ackyshake/Spacegray.vim/";
};
@@ -4900,12 +4924,12 @@ final: prev:
telescope-symbols-nvim = buildVimPluginFrom2Nix {
pname = "telescope-symbols-nvim";
- version = "2021-02-04";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-symbols.nvim";
- rev = "5139fdf31fdffdac75209362409d62d2b6033a20";
- sha256 = "0va4czhncw7jhirbqr7wdap4qg3i5x7g6ic8migpmv57ym2py0m9";
+ rev = "e211b6aeed1f94ca660c407f3052f83ab8f4b2a9";
+ sha256 = "0nd02akh5nmcnv8mqih6xpzc4pbhys6rva7v60p38kxx50ycfkvw";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/";
};
@@ -4924,12 +4948,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-06-06";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "feaed4b6e23bd56906089154f293f2b1ecb68c7e";
- sha256 = "0kx9xmlv6smpqgf2mdz0n6r4cwrsldw9d92xk5m1pdsmpi1b61sa";
+ rev = "6ac5ee0854fe02d651cadf2fc97a2463ff92f322";
+ sha256 = "1k2glya8cd000kzfvx5fif9fcqvcq1k2vrkwyzhfm4yngz7bxm1p";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -5020,12 +5044,12 @@ final: prev:
todo-comments-nvim = buildVimPluginFrom2Nix {
pname = "todo-comments-nvim";
- version = "2021-05-26";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "folke";
repo = "todo-comments.nvim";
- rev = "8560546c466d1f555573d37e062e95e7ae94bbab";
- sha256 = "1g0ypjdcj7sp433n933n3qazp7301b2q7p968v57mgmlh5saq6kb";
+ rev = "014959e82aabc07a16739c771bf40e7fd6de3fe9";
+ sha256 = "031jyzykn9i32h8pq89571p2yrwp1d30qh2616h978l8a7bp8cyq";
};
meta.homepage = "https://github.com/folke/todo-comments.nvim/";
};
@@ -5045,12 +5069,12 @@ final: prev:
traces-vim = buildVimPluginFrom2Nix {
pname = "traces-vim";
- version = "2021-01-23";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "markonm";
repo = "traces.vim";
- rev = "0f29f8e53503b8ce0bb43467064b2401cf34acd1";
- sha256 = "1xx2b59wcnbh5662j7b68maz5ccxj5xpfpnjn2r669aiv0a5snhw";
+ rev = "e36a2e45791ef9078de781a781fec70e160044b0";
+ sha256 = "1qndaqs38mgkl15n895nzjc98h2cy4gjgr3r72cpwhn9qmzhi5zc";
};
meta.homepage = "https://github.com/markonm/traces.vim/";
};
@@ -5081,12 +5105,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble-nvim";
- version = "2021-06-04";
+ version = "2021-06-14";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
- rev = "a7dca6204316b9be7c95d056088c67371151c8ab";
- sha256 = "0b2wha4qmn9gb5fmj57ymhn3jrajq71yk48m8gddr1hx244adknh";
+ rev = "36b6813a2103d85b469a61721b030903ddd8b3b3";
+ sha256 = "1wbnwa420xa9ypwr6fgfvms7f2kpk3ya0221i6vfifyx37skjkra";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@@ -5129,12 +5153,12 @@ final: prev:
ultisnips = buildVimPluginFrom2Nix {
pname = "ultisnips";
- version = "2021-06-08";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "SirVer";
repo = "ultisnips";
- rev = "b6c9a814a4fdfcad3ea53d8888746803a7218a9e";
- sha256 = "0iqirp8pmsrgrk3i0hkk1a66igc5ydi96scp62yl97nazhz45xxr";
+ rev = "aec91caefec10741722927cf073703a528fe7a8f";
+ sha256 = "1a5527adkaawgcj1pm5qp0qiq084x70ljj7a35abjil20f3s7y85";
};
meta.homepage = "https://github.com/SirVer/ultisnips/";
};
@@ -5765,12 +5789,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-06-08";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "c7e013cb273597e37eb65b481cbeb7d1b92b01b7";
- sha256 = "1i33y3jqjqbrg2mgnz4sxvsckl1ggdg3aymxxz4l3qivnbn1fni5";
+ rev = "47eb68fc714de966b385b679d50e1c6e324a0ed4";
+ sha256 = "110fvacvn0r68y4c3p07vi4iv34jjywykpmssvjzclqsia6v758h";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -6269,12 +6293,12 @@ final: prev:
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
- version = "2021-05-16";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "elixir-editors";
repo = "vim-elixir";
- rev = "6dc61ad4dcfa520d56f3a4373bd507f529a25382";
- sha256 = "1rqr16wcwzrs6w9iwg4wghqm7nb1jgzwjmfimvclnkbqpp8ssaq6";
+ rev = "58084475c1e523caeac97ffff62c154f7f8fcc66";
+ sha256 = "09nv87iqjnwpfkvbspgwxibjlf1aj4syw0nv885fyw8fjpbhf06l";
};
meta.homepage = "https://github.com/elixir-editors/vim-elixir/";
};
@@ -6533,12 +6557,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-06-06";
+ version = "2021-06-11";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "41960996e0c532069533072b3fd820fafe9ce0b3";
- sha256 = "0lzjwjbdq90b39561yp7qs1l69iw4jlxcjrsi5yvh1rbhv7gpy1i";
+ rev = "be9ff95f27d12b7bd46ab5d36f7149cb0864c329";
+ sha256 = "1j8lgf5ppp28qqqvvw2isbg4cb00l83np5y7vkqfy9346awwhwq7";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -6653,12 +6677,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-06-04";
+ version = "2021-06-12";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "edd8c160e54c2861a617777192a48d0a64704192";
- sha256 = "1xdggzasvv3x1h61yqp2rl30r6kppf6aqdjqsrpzihz809w5zgry";
+ rev = "57e01d258804fa8a0a2f2e62b33130ecd7d1b57f";
+ sha256 = "18hn9x2yfr3h1ji13rkp65lgpcljlp7agkhj3argyymzwid5bxzm";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -6701,12 +6725,12 @@ final: prev:
vim-gruvbox8 = buildVimPluginFrom2Nix {
pname = "vim-gruvbox8";
- version = "2021-05-28";
+ version = "2021-06-13";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-gruvbox8";
- rev = "66d58b569fdbe0ec389acb66eb4a585f3110e43e";
- sha256 = "0bggkq2p109vc67s0idplrf4sy4j12smwkx2wvsc626bzflzc2fb";
+ rev = "73bd562267d3dea92b6e8dd1f0e3caca024927ad";
+ sha256 = "01x0y5ma7wz2yjcq12zzlmkn8x4yz4gcmxmkyrcy127pnhjn8a23";
};
meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
};
@@ -6737,12 +6761,12 @@ final: prev:
vim-hardtime = buildVimPluginFrom2Nix {
pname = "vim-hardtime";
- version = "2020-05-01";
+ version = "2021-06-11";
src = fetchFromGitHub {
owner = "takac";
repo = "vim-hardtime";
- rev = "ef06cf30fd3843e7857fdb79c6868660220b9391";
- sha256 = "0yhai27zqkdmgck1iy64fw9yy2vghmqvj4g2lbh21h50df1sa8cf";
+ rev = "00fde0a5e3fe15e329bdeac5331e4b439b6972a8";
+ sha256 = "1c66q7bcg0m19zjd3yz5ywhm094cr48yr6rxp8zhlavaswwx8wz7";
};
meta.homepage = "https://github.com/takac/vim-hardtime/";
};
@@ -6954,12 +6978,12 @@ final: prev:
vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate";
- version = "2021-06-03";
+ version = "2021-06-12";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-illuminate";
- rev = "daa49da1e7a6d8c8dcbd3a40f91046d1505fd645";
- sha256 = "1qvnij7z48g1m6n2qz5lbgbiwwaqnb626sz6qvhkd5jh556pmfah";
+ rev = "8fe150bd775f659da7e40ea2d3ad7473e6d29494";
+ sha256 = "1y8bhfcbk5062nrscihr24p8b955c09hnbii5grb4x16jir06cbg";
};
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
};
@@ -7351,12 +7375,12 @@ final: prev:
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-06-08";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "516fd7ce956bdfa2fa6ee8ac6d77ad8a57616811";
- sha256 = "0anfwxq93ddmymdna692xz74h3kimwmw1ii6pq8ci08i3pkqjrf7";
+ rev = "fb0a72306e1fc42c1ce8909aa1e420ddfccf6fbf";
+ sha256 = "0dzy7cvpmzvx6z5pifzj4y7biln5gcn4iic35ha58ixwgwcw784m";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -7460,12 +7484,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2021-06-02";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "fd9f3c09b04725c8042149bfe3fd080b6f6962cb";
- sha256 = "08cqh4b01jl0iqd1nj2sw2jcwxp48m9rdh50sdnfjgdvynnpagik";
+ rev = "be396a2abce5bf564e53c8a1cbef78ea37602ce9";
+ sha256 = "0kn6qqry2x9s4i813bglvdpwcq6223m8zay2p77wqds2g8xxz5dk";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -7844,12 +7868,12 @@ final: prev:
vim-pandoc = buildVimPluginFrom2Nix {
pname = "vim-pandoc";
- version = "2021-04-30";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc";
- rev = "587399591a9e9b8da9846c0d724a84a3bd1ce98e";
- sha256 = "1xghmq15i8wqfwx7gib8j54c5s3an9q4idy6c6mbywd75s4384m5";
+ rev = "1c56693951ce81f344cff0d7c8a6f7ea62a06981";
+ sha256 = "017g2cq05pfxjmcdm42qz6pv2cf2v18lnnrfnizm1cd388r9byll";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
};
@@ -7988,12 +8012,12 @@ final: prev:
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
- version = "2021-06-04";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
- rev = "c312d30231f136d2fbb32a2cfea554af5066e6b0";
- sha256 = "1apd860v2xfi3fjgl15j7mgn6nczx10vj324w1vf1ic5nyy4b594";
+ rev = "4899585281beab51e5dff1d9ae4d3159244a8275";
+ sha256 = "1518dvxf99nvky0mrvgv65if0wjhpiv3021rddhn52j04vri4pdd";
};
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
};
@@ -8252,12 +8276,12 @@ final: prev:
vim-ruby = buildVimPluginFrom2Nix {
pname = "vim-ruby";
- version = "2021-02-03";
+ version = "2021-06-12";
src = fetchFromGitHub {
owner = "vim-ruby";
repo = "vim-ruby";
- rev = "4788a08433c3c90e131fc7d110d82577e1234a86";
- sha256 = "1sq1li4s40xgy8ww4krsxqdqlwhcd9l67551iadccvsvjka16ynw";
+ rev = "a006f67d18ce0ed6ff75c98b266eaa606dfcec30";
+ sha256 = "0dhkyfignmcv9jwrszk37k7l8h2ivbv3krz5xwk17fbdd2y7jwz2";
};
meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
};
@@ -8528,12 +8552,12 @@ final: prev:
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2021-04-19";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "2a28fc35f6848ad38681d4b509ae3f5962276b5d";
- sha256 = "05xywkyh809g7zax4wdw5vn29xcs1wg3ylbsdi9rz18phm6im41k";
+ rev = "3cee4da7ef73b1c22551d00ac1fdf7f61b71d7cc";
+ sha256 = "1xg6kd5nh76bq45q1za4nlmasa8plz57kvqd5ag89samdmzsjny9";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -8744,12 +8768,12 @@ final: prev:
vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform";
- version = "2021-05-08";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "hashivim";
repo = "vim-terraform";
- rev = "9166d42e5dc9bc0ef7e1b9e93d52bb4c5b923560";
- sha256 = "1wr1sqxjy1dqyvkvii8jrxwagfph52z2ij8p1nz5b1kpyzvvpg7b";
+ rev = "814a21db89f742c3ea492c69c5a2bfecded1aeb3";
+ sha256 = "0acdq2m16mhm3g6n4saqf9fljz5qfdalw88h126z2f6mm731y6pi";
};
meta.homepage = "https://github.com/hashivim/vim-terraform/";
};
@@ -8937,12 +8961,12 @@ final: prev:
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2021-06-03";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "683cf4f2e16149c477a8f5c96b7429932a68d801";
- sha256 = "0gr5k4bzzzvn00plimpkjiavya04jvcgg322k8yblzmm01r6vcr2";
+ rev = "3b0050c1079804633494c1b498bf84838c91e97c";
+ sha256 = "0vmxjmpih7424k064vjnfpdb417l9gyccd1jmwa4vx33v0mlxzhj";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -8997,12 +9021,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest";
- version = "2021-06-07";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "vim-ultest";
- rev = "d864a6b2b0f394b9371246cad226adac7507e13d";
- sha256 = "0bvdhbla38mvq9x595h5mcvib13sb84mz3z9f7sqf4m3c9v9376m";
+ rev = "4d6d02bf940401ee103df8110b412d9ff95be2d2";
+ sha256 = "12dz6r6fz3pvd62fxyl8smna88l7k8f60n9s1xnyf573xms5ka5w";
};
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
@@ -9069,12 +9093,12 @@ final: prev:
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
- version = "2021-06-01";
+ version = "2021-06-11";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
- rev = "2b9d104c57aeb612d7f00e1d071d712ed8671949";
- sha256 = "17f92pka2flwnhx8yg7skbp8kyhbb6gmvm0mni2jm7w3iq68nbmw";
+ rev = "8566a3137bd51ca2f6d12a06dbc70ce831dd2d1c";
+ sha256 = "0krdc2d6dxpfsy50xk3cq9m9fcmcc5bng7k6yz3qpwz05n4pbgii";
};
meta.homepage = "https://github.com/mg979/vim-visual-multi/";
};
@@ -9225,12 +9249,12 @@ final: prev:
vim-xtabline = buildVimPluginFrom2Nix {
pname = "vim-xtabline";
- version = "2021-06-08";
+ version = "2021-06-10";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-xtabline";
- rev = "5e67677a4815bbf474b52f8aefcfa2090fe43768";
- sha256 = "17pb39zhzsmmibxmsbrsd3znky88sar2sl0h7b1418qqkaakx4p9";
+ rev = "1dbf84a3095eff9bd0d1e49824dddac56c378ed9";
+ sha256 = "16qwp8kk3c2lzfnmzkzi71ilrcssga17kjiphskph5kl35igr16v";
};
meta.homepage = "https://github.com/mg979/vim-xtabline/";
};
@@ -9417,12 +9441,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-06-07";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "1cbb400d426760a63d5383e2574e9d8905bebe51";
- sha256 = "172kryvxphsvbh2f60ka21rjsrq4abgdh1ijyxp57p1qbbv9fhcc";
+ rev = "bab81953d76f4027e78a9f85ae2ea360597588ef";
+ sha256 = "0fbqayfg8pdivdg0fa4q42vb59vvwb1llq73kzh65zgwfs1k1zr1";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -9430,12 +9454,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-06-06";
+ version = "2021-06-16";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "fef77c8edf655d947e4d9c78d7bd2740ccda70cd";
- sha256 = "06hdz4rwwnmm1hhhjhvcd50r04qnvmksriaw4csv3gfnkfkm5v9r";
+ rev = "4d3ba03b6a592c44547e3aef92489f7fb3a491ef";
+ sha256 = "0kxg9kkfbfwcrpfg2vdzzgy2yy6b66y6jcym94g4q3nlj2gg130b";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -9478,12 +9502,12 @@ final: prev:
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
- version = "2021-05-28";
+ version = "2021-06-13";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "19cad968d2cd759e7f9de1d662ec680bd93ebebc";
- sha256 = "0r01b6mml6qgyybi6i59bflgqi03w0fnl0wfgwac96ixs2wdvl1l";
+ rev = "d4f9bd468deaa9abf665288c9e179701728128bd";
+ sha256 = "1v2r5vbqafrg5ay140p4z2vl1lwy6vz16zv6skwz1in0gaicwgxv";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@@ -9708,12 +9732,12 @@ final: prev:
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2021-05-12";
+ version = "2021-06-15";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "9ec189bc76ed2850f916394ed8d6127290f51338";
- sha256 = "0xl2pxgmam5ls7a59bdvx3gyzcgsq3wvgby2c5667627kcq05j6s";
+ rev = "c339f13d9e840a9b4e392d104f9a0a2960f4a49a";
+ sha256 = "1w8127zhzz74gzclg5bv4kl11cwhi48wqqc1x176rsrlac7qfpp1";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 4e43bbe29a24..0901531a8aa3 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -208,7 +208,7 @@ self: super: {
});
ensime-vim = super.ensime-vim.overrideAttrs (old: {
- passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
+ passthru.python3Dependencies = ps: with ps; [ sexpdata websocket-client ];
dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ];
});
@@ -621,7 +621,7 @@ self: super: {
libiconv
];
- cargoSha256 = "sha256-/ALOjJayCmLpMV8zC9ryEofUxYdvqj4Cn+sY1qRuqcs=";
+ cargoSha256 = "sha256-IKSnXNFdtykuajOxpw5CYsw2q/mkVLkRtPC49hiXsPc=";
};
in
''
@@ -755,6 +755,10 @@ self: super: {
dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
});
+ vim-speeddating = super.vim-speeddating.overrideAttrs (old: {
+ dependencies = with self; [ vim-repeat ];
+ });
+
vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
postPatch = old.postPatch or "" + ''
substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \
@@ -763,6 +767,14 @@ self: super: {
'';
});
+ vim-surround = super.vim-surround.overrideAttrs (old: {
+ dependencies = with self; [ vim-repeat ];
+ });
+
+ vim-unimpaired = super.vim-unimpaired.overrideAttrs (old: {
+ dependencies = with self; [ vim-repeat ];
+ });
+
vim-wakatime = super.vim-wakatime.overrideAttrs (old: {
buildInputs = [ python ];
});
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 9d6ffbb301b4..942d358f0def 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -20,7 +20,7 @@ AndrewRadev/sideways.vim@main
AndrewRadev/splitjoin.vim@main
andsild/peskcolor.vim
andviro/flake8-vim
-andweeb/presence.nvim
+andweeb/presence.nvim@main
andymass/vim-matchup
andys8/vim-elm-syntax
antoinemadec/coc-fzf
@@ -47,6 +47,7 @@ bronson/vim-trailing-whitespace
brooth/far.vim
buoto/gotests-vim
camspiers/lens.vim
+camspiers/snap@main
carlitux/deoplete-ternjs
ccarpita/rtorrent-syntax-file
cespare/vim-toml
@@ -158,6 +159,7 @@ gennaro-tedesco/nvim-peekup
gentoo/gentoo-syntax
GEverding/vim-hocon
gfanto/fzf-lsp.nvim@main
+ggandor/lightspeed.nvim@main
gibiansky/vim-textobj-haskell
gioele/vim-autoswap
gleam-lang/gleam.vim
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 8f09964a2fbc..1c54a455f7a3 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq }:
+{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
@@ -120,7 +120,6 @@ let
sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=";
};
nativeBuildInputs = [ jq ];
- buildInputs = [ nixpkgs-fmt ];
postInstall = ''
cd "$out/$installPrefix"
tmp_package_json=$(mktemp)
@@ -453,6 +452,23 @@ let
};
};
+ foam.foam-vscode = buildVscodeMarketplaceExtension {
+ meta = with lib; {
+ changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
+ description = "A personal knowledge management and sharing system for VSCode ";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=foam.foam-vscode";
+ homepage = "https://foambubble.github.io/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ratsclub ];
+ };
+ mktplcRef = {
+ name = "foam-vscode";
+ publisher = "foam";
+ version = "0.13.7";
+ sha256 = "Y2pcd4iXPiuhJdD/9d+tbTJN18O4+kRMqUdOtbx8xy8=";
+ };
+ };
+
formulahendry.auto-close-tag = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "auto-close-tag";
@@ -567,8 +583,8 @@ let
mktplcRef = {
name = "Go";
publisher = "golang";
- version = "0.18.1";
- sha256 = "sha256-b2Wa3TULQQnBm1/xnDCB9SZjE+Wxz5wBttjDEtf8qlE=";
+ version = "0.25.1";
+ sha256 = "sha256-ZDUWN9lzDnR77W7xcMFQaaFl/6Lf/x1jgaBkwZPqGGw=";
};
meta = {
license = lib.licenses.mit;
@@ -1165,9 +1181,16 @@ let
mktplcRef = {
name = "shellcheck";
publisher = "timonwong";
- version = "0.12.3";
- sha256 = "1i9rszgnac2z1kyahmgxmz05ib7z14s458fvvjlzmvl64fa1fdvf";
+ version = "0.14.1";
+ sha256 = "sha256-X3ihMxANcqNLWl9oTZjCgwRt1uBsSN2BmC2D4dPRFLE=";
};
+ nativeBuildInputs = [ jq ];
+ postInstall = ''
+ cd "$out/$installPrefix"
+ tmp_package_json=$(mktemp)
+ jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json > "$tmp_package_json"
+ mv "$tmp_package_json" package.json
+ '';
meta = {
license = lib.licenses.mit;
};
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix
index 14945380e20c..6e987c5dfb41 100644
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix
+++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix
@@ -151,6 +151,9 @@ in rec {
# This framework doesn't exist in newer SDKs (somewhere around 10.13), but
# there are references to it in nixpkgs.
QuickTime = throw "QuickTime framework not available";
+
+ # Seems to be appropriate given https://developer.apple.com/forums/thread/666686
+ JavaVM = super.JavaNativeFoundation;
};
bareFrameworks = (
diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index dedc75789510..b4d26327bdcd 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "1qgimh58hcx5f646gj2kpd36ayvrdkw616ad8cb3lcm11kg0ag79";
};
- buildFlags = [ "ARCHES=x86_64" ];
+ buildFlags =
+ if stdenv.hostPlatform.system == "x86_64-darwin" then [ "ARCHES=x86_64" ]
+ else if stdenv.hostPlatform.system == "aarch64-darwin" then [ "ARCHES=arm64" ]
+ else throw "reattach-to-user-namespace isn't being built for ${stdenv.hostPlatform.system} yet.";
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index 8a41cd126dfc..60e597685e42 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "ell";
- version = "0.40";
+ version = "0.41";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version;
- sha256 = "sha256-Yr08Kb8YU7xqBnhhS8rn+GFXAV68Hgj4aY26eptb9/8=";
+ sha256 = "sha256-UCE+PgGmbePlOoAc8jXxCX6fHr16qf1AQMKxizfSTJM=";
};
nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix
new file mode 100644
index 000000000000..47cfa57fe817
--- /dev/null
+++ b/pkgs/os-specific/linux/iotop-c/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchFromGitHub, lib, ncurses, pkg-config }:
+
+stdenv.mkDerivation rec {
+ pname = "iotop-c";
+ version = "1.17";
+
+ src = fetchFromGitHub {
+ owner = "Tomas-M";
+ repo = "iotop";
+ rev = "v${version}";
+ sha256 = "0hjy30155c3nijx3jgyn5kpj293632p0j6f3lf5acdfax1ynav86";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ ncurses ];
+ makeFlags = [ "DESTDIR=$(out)" "TARGET=iotop-c" ];
+
+ postInstall = ''
+ mv $out/usr/share/man/man8/{iotop,iotop-c}.8
+ ln -s $out/usr/sbin $out/bin
+ ln -s $out/usr/share $out/share
+ '';
+
+ meta = with lib; {
+ description = "iotop identifies processes that use high amount of input/output requests on your machine";
+ homepage = "https://github.com/Tomas-M/iotop";
+ maintainers = [ maintainers.arezvov ];
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 63692149f3dc..3b7cc7d3d406 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -12,12 +12,12 @@
stdenv.mkDerivation rec {
pname = "iwd";
- version = "1.14";
+ version = "1.15";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version;
- sha256 = "sha256-uGe4TO1/bs8k2z3wOJqaZgT6u6yX/7wx4HMSS2hN4XE=";
+ sha256 = "sha256-qGQDIzJfeBT9VLwr9Ci9vXcM0ZvFvjL2E9PcKoZ8E94=";
};
outputs = [ "out" "man" ]
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index f9c25f123688..1fedb688920b 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,32 +1,32 @@
{
"4.14": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.236-hardened1.patch",
- "sha256": "08wnc1acx8fnnrpaz5hxw9gakgk7qxf3kq1pycljl7396dnsy6xg",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.236-hardened1/linux-hardened-4.14.236-hardened1.patch"
+ "name": "linux-hardened-4.14.237-hardened1.patch",
+ "sha256": "0iz7q29dazp11ii1f2kcffkpi14765w0ryrn6dsb8mlqcsw639lc",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.237-hardened1/linux-hardened-4.14.237-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.194-hardened1.patch",
- "sha256": "102w5algxybffy5176zzgz7knafpdc0lp9y5wjdrf6yr65l4j5rj",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.194-hardened1/linux-hardened-4.19.194-hardened1.patch"
+ "name": "linux-hardened-4.19.195-hardened1.patch",
+ "sha256": "1h8v28kscaz4y2samww3vxpq4xvkbdvsnr0hybimn0ygwphshpqq",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.195-hardened1/linux-hardened-4.19.195-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.43-hardened1.patch",
- "sha256": "0hx2g4brpk32phiin96w4kgsbibrcb69a22p0rsqcanxl76v48sz",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.43-hardened1/linux-hardened-5.10.43-hardened1.patch"
+ "name": "linux-hardened-5.10.44-hardened1.patch",
+ "sha256": "12bxv87w74lj73vqflpfk022x2ig81lfn4pf1gfanw9zxjrapw4m",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.44-hardened1/linux-hardened-5.10.44-hardened1.patch"
},
"5.12": {
"extra": "-hardened1",
- "name": "linux-hardened-5.12.10-hardened1.patch",
- "sha256": "0wyw33kg3xih2j19hsff9mapxjll8ad38il74gkcbnhwci0ys1mc",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.10-hardened1/linux-hardened-5.12.10-hardened1.patch"
+ "name": "linux-hardened-5.12.11-hardened1.patch",
+ "sha256": "15qi1znszdg6c0v077k1p4gs0kbpvp6hqjcyg262yqjlpn1c7hcb",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.11-hardened1/linux-hardened-5.12.11-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.125-hardened1.patch",
- "sha256": "1vc6jgiglc4i5my9iw24yw16wi0x1lxkvyb6i619z3k3zh39gm04",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.125-hardened1/linux-hardened-5.4.125-hardened1.patch"
+ "name": "linux-hardened-5.4.126-hardened1.patch",
+ "sha256": "05bjry8390iy01nfvkp12x78brgndwm5rsqhnl7yp6vwgdi0fyj1",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.126-hardened1/linux-hardened-5.4.126-hardened1.patch"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 9f40429f0ada..a550008b9d50 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.236";
+ version = "4.14.237";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0albmgxj3cb1dvjagj54l0ffa7kwi8brh7bqwj6gvzpylsby5sp4";
+ sha256 = "0kib9p61hhwjbr8zhir9aw86qik7k6bm95503n3k09ayyachajpq";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index e42a1646791d..42d98f1485e8 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.194";
+ version = "4.19.195";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "15l80psfgffa756vpjxmjkwjqif2gpx441hpzr473xwryp6bvbma";
+ sha256 = "02rdy5mdmwxli0cin5n7ab492y9fs01hhqxrjq6b4idwv5baa42m";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 4fc2985b586e..d06d5133b477 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.4.272";
+ version = "4.4.273";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1ar468ymk96v2pq9x209z2z4wbypppb91jpw8g22aa30pr9aagyi";
+ sha256 = "1pd39cak0zhda3m9nvn9yxgd070wxvckaha5wl8pi7c8i6jfpclb";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index d0cb868f1722..d614464bf2ae 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.9.272";
+ version = "4.9.273";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0n0hrszaijdpnbdvd8bvz15m7g268is0zw84w4vaf37418whrgzq";
+ sha256 = "0jjarv3xfkc21j1xhgch53w8wm6rq3xw1i03rjw9fv5i9k4x6qsw";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 50ef93c04b97..7606af512763 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.43";
+ version = "5.10.44";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "00yl1g6irpwy3sy0d43qvlk7x1gfk4v1dyv460afxy527d1ixf43";
+ sha256 = "0ry7hfcj07xc6l9mrm5f0ylz54ca3aklgf9x6plf2k45kjjyzgkp";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix
index 6ae39a84891b..9c70f150e2d9 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.12.10";
+ version = "5.12.11";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "03v3wzpbxb78gf4wsnc5wv6683g439cm2bzcjj4q657dagy9km68";
+ sha256 = "0ykzyvb4c6mqcy0fl3wvpn4laj1cllsg80dxnv0gssjz6q836z5f";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 94d5f6bd3ff6..751295f435d2 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.125";
+ version = "5.4.126";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0g73xfkmj4sahrk7gx72hm2i4m98gqghswqyf8yqh77b9857bvhp";
+ sha256 = "0xsjcdgiix8slykzi9c12pl5hk2fnz1bqrxxdcr79d9nmfc7kzf7";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
index fafa0e538102..b3cacfc1d45a 100644
--- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
- version = "5.12.10";
+ version = "5.12.11";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@@ -12,7 +12,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
- sha256 = "sha256-DxWkknL8kgFmdI+jb5chVnWCz6oDKOw6iuT69zDaDNs=";
+ sha256 = "sha256-EQ52Leg7i1Xb2b29JbaKFKRE/jKXB48GXhbM/Ay5QTY=";
};
extraMeta = {
diff --git a/pkgs/os-specific/linux/mdevd/default.nix b/pkgs/os-specific/linux/mdevd/default.nix
index b88e3ad1e6f0..58299ba5e878 100644
--- a/pkgs/os-specific/linux/mdevd/default.nix
+++ b/pkgs/os-specific/linux/mdevd/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "mdevd";
- version = "0.1.3.0";
- sha256 = "0spvw27xxd0m6j8bl8xysmgsx18fl769smr6dsh25s2d5h3sp2dy";
+ version = "0.1.4.0";
+ sha256 = "1lnwk7qa6x7iia0v12i2jckg42ypi35hk3sa7cjm23ngnhiv5lzz";
description = "mdev-compatible Linux hotplug manager daemon";
platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 3ac8e6dcd4af..f8bb7c67d8e5 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "microcode-intel";
- version = "20210216";
+ version = "20210608";
src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}";
- sha256 = "17wrfp7h7xbvncgm1fp103zkyz9n1f820jy6yca1aq208264hjkv";
+ sha256 = "08nk353z2lcqsjbm2qdsfapfgrvlfw0rj7r9scr9pllzkjj5n9x3";
};
nativeBuildInputs = [ iucode-tool libarchive ];
diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/os-specific/linux/s6-linux-init/default.nix
index 41790e5eb781..5d6941259e1b 100644
--- a/pkgs/os-specific/linux/s6-linux-init/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-init/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-linux-init";
- version = "1.0.6.1";
- sha256 = "0sq8ya39a1qs61cdjns8ijwrvxnqd4snk2ab4j5wl9a87i7wixhn";
+ version = "1.0.6.2";
+ sha256 = "06xcmn2a89fvng056lcnnyrl2ak0y7cblkc90lj9a2liyhawy9dr";
description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 132a0b49574c..3596ab23e72b 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-linux-utils";
- version = "2.5.1.4";
- sha256 = "02gxzc9igid2kf2rvm3v6kc9806mpjmdq7cpanv4cml0ip68vbfq";
+ version = "2.5.1.5";
+ sha256 = "1fj5ldlrc6bx40pphg29rp3byd6fal6869v85kw86c2kdgrxn063";
description = "A set of minimalistic Linux-specific system utilities";
platforms = lib.platforms.linux;
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 11adceb0f74d..394c76dbdb23 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,17 +1,17 @@
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2
-, autoreconfHook
+, autoreconfHook, nixosTests
}:
let inherit (lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "3.0.6";
+ version = "3.0.7";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "63756ac5a00c3e4a066ed231a287faef5963a9183d77326e30bf0644cdf74f86";
+ sha256 = "2bad8be0be95c8f54a26d1e16299e65f31ae1b34bd6ad3819aa50e7b40521484";
};
outputs = [ "bin" "out" "dev" ];
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
rm -r "$out"/lib/*.la
'';
+ passthru.tests = { inherit (nixosTests) knot; };
+
meta = with lib; {
description = "Authoritative-only DNS server from .cz domain registry";
homepage = "https://knot-dns.cz";
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 7b100b692a32..7af675de41fe 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
sockjs
uvloop
voluptuous
- websocket_client
+ websocket-client
yarl
];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 37e6f472fd61..12606f75f486 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2021.6.4";
+ version = "2021.6.5";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@@ -45,7 +45,7 @@
"aprs" = ps: with ps; [ aprslib geopy ];
"aqualogic" = ps: with ps; [ aqualogic ];
"aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc
- "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj
+ "arcam_fmj" = ps: with ps; [ arcam-fmj ];
"arduino" = ps: with ps; [ ]; # missing inputs: PyMata
"arest" = ps: with ps; [ ];
"arlo" = ps: with ps; [ ha-ffmpeg pyarlo ];
@@ -68,8 +68,8 @@
"awair" = ps: with ps; [ python-awair ];
"aws" = ps: with ps; [ aiobotocore ];
"axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ];
- "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops
- "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub
+ "azure_devops" = ps: with ps; [ aioazuredevops ];
+ "azure_event_hub" = ps: with ps; [ azure-eventhub ];
"azure_service_bus" = ps: with ps; [ azure-servicebus ];
"baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip
"bayesian" = ps: with ps; [ ];
@@ -81,8 +81,8 @@
"bitcoin" = ps: with ps; [ blockchain ];
"bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus
"blackbird" = ps: with ps; [ pyblackbird ];
- "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi
- "blink" = ps: with ps; [ ]; # missing inputs: blinkpy
+ "blebox" = ps: with ps; [ blebox-uniapi ];
+ "blink" = ps: with ps; [ blinkpy ];
"blinksticklight" = ps: with ps; [ BlinkStick ];
"blinkt" = ps: with ps; [ ]; # missing inputs: blinkt
"blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api
@@ -94,8 +94,8 @@
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
- "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
- "bond" = ps: with ps; [ ]; # missing inputs: bond-api
+ "bmw_connected_drive" = ps: with ps; [ bimmer-connected ];
+ "bond" = ps: with ps; [ bond-api ];
"bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ];
"braviatv" = ps: with ps; [ bravia-tv ];
"broadlink" = ps: with ps; [ broadlink ];
@@ -130,7 +130,7 @@
"cmus" = ps: with ps; [ ]; # missing inputs: pycmus
"co2signal" = ps: with ps; [ ]; # missing inputs: co2signal
"coinbase" = ps: with ps; [ ]; # missing inputs: coinbase
- "color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief
+ "color_extractor" = ps: with ps; [ colorthief ];
"comed_hourly_pricing" = ps: with ps; [ ];
"comfoconnect" = ps: with ps; [ pycomfoconnect ];
"command_line" = ps: with ps; [ ];
@@ -138,9 +138,9 @@
"concord232" = ps: with ps; [ ]; # missing inputs: concord232
"config" = ps: with ps; [ aiohttp-cors ];
"configurator" = ps: with ps; [ ];
- "control4" = ps: with ps; [ ]; # missing inputs: pyControl4
+ "control4" = ps: with ps; [ pycontrol4 ];
"conversation" = ps: with ps; [ aiohttp-cors ];
- "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet-async
+ "coolmaster" = ps: with ps; [ pycoolmasternet-async ];
"coronavirus" = ps: with ps; [ coronavirus ];
"counter" = ps: with ps; [ ];
"cover" = ps: with ps; [ ];
@@ -175,7 +175,7 @@
"dialogflow" = ps: with ps; [ aiohttp-cors ];
"digital_ocean" = ps: with ps; [ digital-ocean ];
"digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower
- "directv" = ps: with ps; [ ]; # missing inputs: directv
+ "directv" = ps: with ps; [ directv ];
"discogs" = ps: with ps; [ discogs_client ];
"discord" = ps: with ps; [ discordpy ];
"discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ];
@@ -278,7 +278,7 @@
"foobot" = ps: with ps; [ foobot-async ];
"forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java
"fortios" = ps: with ps; [ fortiosapi ];
- "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
+ "foscam" = ps: with ps; [ libpyfoscam ];
"foursquare" = ps: with ps; [ aiohttp-cors ];
"free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
"freebox" = ps: with ps; [ freebox-api ];
@@ -293,7 +293,7 @@
"futurenow" = ps: with ps; [ pyfnip ];
"garadget" = ps: with ps; [ ];
"garages_amsterdam" = ps: with ps; [ garages-amsterdam ];
- "garmin_connect" = ps: with ps; [ garminconnect-aio ];
+ "garmin_connect" = ps: with ps; [ garminconnect-ha ];
"gc100" = ps: with ps; [ ]; # missing inputs: python-gc100
"gdacs" = ps: with ps; [ aio-georss-gdacs ];
"generic" = ps: with ps; [ ];
@@ -312,7 +312,7 @@
"glances" = ps: with ps; [ glances-api ];
"gntp" = ps: with ps; [ gntp ];
"goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
- "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero
+ "goalzero" = ps: with ps; [ goalzero ];
"gogogate2" = ps: with ps; [ ismartgate ];
"google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ];
"google_assistant" = ps: with ps; [ aiohttp-cors ];
@@ -323,7 +323,7 @@
"google_translate" = ps: with ps; [ gtts ];
"google_travel_time" = ps: with ps; [ googlemaps ];
"google_wifi" = ps: with ps; [ ];
- "gpmdp" = ps: with ps; [ websocket_client ];
+ "gpmdp" = ps: with ps; [ websocket-client ];
"gpsd" = ps: with ps; [ gps3 ];
"gpslogger" = ps: with ps; [ aiohttp-cors ];
"graphite" = ps: with ps; [ ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index bf1798a905f5..d22b23c3b6e4 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitHub
, python3
, inetutils
-, tzdata
, nixosTests
# Look up dependencies of specified components in component-packages.nix
@@ -52,12 +51,12 @@ let
# https://github.com/home-assistant/core/pull/48137 was merged
(self: super: {
iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec {
- version = "0.3.4";
+ version = "0.3.90";
src = fetchFromGitHub {
owner = "flz";
repo = "iaqualink-py";
rev = "v${version}";
- sha256 = "16mn6nd9x3hm6j6da99qhwbqs95hh8wx21r1h1m9csl76z77n9lh";
+ sha256 = "0c8ckbbr1n8gx5k63ymgyfkbz3d0rbdvghg8fqdvbg4nrigrs5v0";
};
checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ];
});
@@ -135,19 +134,6 @@ let
});
})
- # Remove after https://github.com/NixOS/nixpkgs/pull/121854 has passed staging-next
- (self: super: {
- sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
- version = "1.4.13";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "0npsg38d11skv04zvsi90j93f6jdgm8666ds2ri7shr1pz1732hx";
- };
- patches = [];
- propagatedBuildInputs = [ python3.pkgs.greenlet ];
- });
- })
-
# home-assistant-frontend does not exist in python3.pkgs
(self: super: {
home-assistant-frontend = self.callPackage ./frontend.nix { };
@@ -181,7 +167,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2021.6.4";
+ hassVersion = "2021.6.5";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -193,14 +179,12 @@ in with py.pkgs; buildPythonApplication rec {
# don't try and fail to strip 6600+ python files, it takes minutes!
dontStrip = true;
- inherit availableComponents;
-
# PyPI tarball is missing tests/ directory
src = fetchFromGitHub {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "058dx5hg0a3zvd85sxglbadigfzajmzx8i5jxvw0ww9yp8002qj1";
+ sha256 = "1cp294hy35k9hjbp8iqmaf1m5qbbkh3jwf92ym49waw8di5a5wvh";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@@ -219,7 +203,7 @@ in with py.pkgs; buildPythonApplication rec {
'';
propagatedBuildInputs = [
- # Only packages required in setup.py + hass-frontend
+ # Only packages required in setup.py
aiohttp
astral
async-timeout
@@ -293,6 +277,7 @@ in with py.pkgs; buildPythonApplication rec {
"apple_tv"
"apprise"
"aprs"
+ "arcam_fmj"
"arlo"
"asuswrt"
"atag"
@@ -303,11 +288,17 @@ in with py.pkgs; buildPythonApplication rec {
"awair"
"aws"
"axis"
+ "azure_devops"
+ "azure_event_hub"
"bayesian"
"binary_sensor"
"blackbird"
+ "blebox"
+ "blink"
"blueprint"
"bluetooth_le_tracker"
+ "bmw_connected_drive"
+ "bond"
"bosch_shc"
"braviatv"
"broadlink"
@@ -324,12 +315,15 @@ in with py.pkgs; buildPythonApplication rec {
"climate"
"cloud"
"cloudflare"
+ "color_extractor"
"comfoconnect"
"command_line"
"compensation"
"config"
"configurator"
+ "control4"
"conversation"
+ "coolmaster"
"coronavirus"
"counter"
"cover"
@@ -348,6 +342,7 @@ in with py.pkgs; buildPythonApplication rec {
"dexcom"
"dhcp"
"dialogflow"
+ "directv"
"discovery"
"dsmr"
"dte_energy_bridge"
@@ -383,6 +378,7 @@ in with py.pkgs; buildPythonApplication rec {
"folder"
"folder_watcher"
"foobot"
+ "foscam"
"freebox"
"freedns"
"fritz"
@@ -402,6 +398,7 @@ in with py.pkgs; buildPythonApplication rec {
"geonetnz_volcano"
"gios"
"glances"
+ "goalzero"
"gogogate2"
"google"
"google_assistant"
@@ -774,6 +771,8 @@ in with py.pkgs; buildPythonApplication rec {
# onboarding tests rpi_power component, for which we are lacking rpi_bad_power library
"test_onboarding_core_sets_up_rpi_power"
"test_onboarding_core_no_rpi_power"
+ # hue/test_sensor_base.py: Race condition when counting events
+ "test_hue_events"
];
preCheck = ''
@@ -785,9 +784,6 @@ in with py.pkgs; buildPythonApplication rec {
# put ping binary into PATH, e.g. for wake_on_lan tests
export PATH=${inetutils}/bin:$PATH
- # set up zoneinfo data for backports-zoneinfo in pvpc_hourly_pricing tests
- export PYTHONTZPATH="${tzdata}/share/zoneinfo"
-
# error out when component test directory is missing, otherwise hidden by xdist execution :(
for component in ${lib.concatStringsSep " " (map lib.escapeShellArg componentTests)}; do
test -d "tests/components/$component" || {
@@ -798,11 +794,11 @@ in with py.pkgs; buildPythonApplication rec {
'';
passthru = {
- inherit (py.pkgs) hass-frontend;
+ inherit availableComponents;
+ python = py;
tests = {
inherit (nixosTests) home-assistant;
};
- python = py;
};
meta = with lib; {
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 5d8678a6267f..2cdc44caaae9 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -183,8 +183,7 @@ def main() -> None:
if attr_path is not None:
# Add attribute path without "python3Packages." prefix
attr_paths.append(attr_path[len(PKG_SET + ".") :])
- # home-assistant-frontend is always in propagatedBuildInputs
- elif name != 'home-assistant-frontend':
+ else:
missing_reqs.append(name)
else:
build_inputs[component] = (attr_paths, missing_reqs)
diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh
index e80b7acbed0f..5ed865f411e2 100755
--- a/pkgs/servers/home-assistant/update.sh
+++ b/pkgs/servers/home-assistant/update.sh
@@ -26,7 +26,7 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \
./parse-requirements.py
(
cd ../../..
- nix-update --version "$FRONTEND_VERSION" home-assistant.hass-frontend
+ nix-update --version "$FRONTEND_VERSION" home-assistant.python.pkgs.home-assistant-frontend
nix-update --version "$TARGET_VERSION" --build home-assistant
)
diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix
index 10524c71612b..ea6cd9ae04c3 100644
--- a/pkgs/servers/hqplayerd/default.nix
+++ b/pkgs/servers/hqplayerd/default.nix
@@ -16,11 +16,13 @@
stdenv.mkDerivation rec {
pname = "hqplayerd";
- version = "4.24.0-61";
+ version = "4.24.1-62";
src = fetchurl {
+ # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
+ # c.f. https://github.com/NixOS/nixpkgs/pull/111616
url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm";
- sha256 = "sha256-VouqkWRu9lcbCQNmXJayrsZZnhvM5xEZlUyBEkURBOQ=";
+ sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs=";
};
unpackPhase = ''
@@ -45,6 +47,8 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
+ runHook preInstall
+
# main executable
mkdir -p $out/bin
cp ./usr/bin/hqplayerd $out/bin
@@ -62,12 +66,14 @@ stdenv.mkDerivation rec {
cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system
# documentation
- mkdir -p $out/share/doc/${pname}
- cp ./usr/share/doc/${pname}/* $out/share/doc/${pname}
+ mkdir -p $out/share/doc/hqplayerd
+ cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd
# misc service support files
- mkdir -p $out/var/lib/${pname}
- cp -r ./var/hqplayer/web $out/var/lib/${pname}
+ mkdir -p $out/var/lib/hqplayerd
+ cp -r ./var/hqplayer/web $out/var/lib/hqplayerd
+
+ runHook postInstall
'';
postInstall = ''
@@ -82,7 +88,6 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.signalyst.com/custom.html";
description = "High-end upsampling multichannel software embedded HD-audio player";
- changelog = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.changes";
license = licenses.unfree;
maintainers = with maintainers; [ lovesegfault ];
};
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 78e108d8c8da..506b692e68af 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -20,31 +20,25 @@ let
mv $out/webapps $webapps/
'';
- meta = {
+ meta = with lib; {
homepage = "https://tomcat.apache.org/";
description = "An implementation of the Java Servlet and JavaServer Pages technologies";
- platforms = with lib.platforms; all;
- maintainers = with lib.maintainers; [ danbst ];
- license = [ lib.licenses.asl20 ];
+ platforms = platforms.all;
+ maintainers = [ ];
+ license = [ licenses.asl20 ];
};
});
in {
- tomcat7 = common {
- versionMajor = "7";
- versionMinor = "0.100";
- sha256 = "0wjjnvxjz0xbnsfgyp0xc7nlij4z093v54hg59vww2nmkz5mg01v";
- };
-
- tomcat8 = common {
- versionMajor = "8";
- versionMinor = "5.51";
- sha256 = "1zmg0hi4nw4y5sknd0jgq9lb3bncjjscay5fdiiq3qh5cs0wsvl3";
- };
-
tomcat9 = common {
versionMajor = "9";
- versionMinor = "0.31";
- sha256 = "0hybcy280qhhp9if58xw0rmyyqz1m1bzby7qnwz3y2wc1y4is48v";
+ versionMinor = "0.46";
+ sha256 = "02p1d7xkmfna5brwi5imjz83g5va1g6fxkiaj4q22l8jpkr6xf6h";
+ };
+
+ tomcat10 = common {
+ versionMajor = "10";
+ versionMinor = "0.6";
+ sha256 = "1bpcxpsfws3b8ykq53vrcx3f04mvs5if80p329jm3x2dvdvj3d9n";
};
}
diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix
index c9c4453cf5f7..dfcbe5d0f18b 100644
--- a/pkgs/servers/http/tomcat/tomcat-native.nix
+++ b/pkgs/servers/http/tomcat/tomcat-native.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tomcat-native";
- version = "1.2.28";
+ version = "1.2.30";
src = fetchurl {
url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz";
- sha512 = "16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb";
+ sha512 = "51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953";
};
sourceRoot = "${pname}-${version}-src/native";
diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix
index 8080d82a185f..d5e70799cf54 100644
--- a/pkgs/servers/irc/solanum/default.nix
+++ b/pkgs/servers/irc/solanum/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
./dont-create-logdir.patch
];
+ postPatch = ''
+ substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum'
+ '';
+
configureFlags = [
"--enable-epoll"
"--enable-ipv6"
@@ -57,7 +61,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An IRCd for unified networks";
homepage = "https://github.com/solanum-ircd/solanum";
- license = licenses.gpl2Only;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ hexa ];
platforms = platforms.unix;
};
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 116fd9bae927..d78524039858 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.18.231";
+ version = "0.18.234";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "sha256-fl0M4Emstp21CrrE4Znzwi1XvTzx6TpPnNKYM65aoN4=";
+ sha256 = "sha256-F01iR1BdSWCBqBI+Mh8uyzWKIbiMR2tOW6sJgFU3hG8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 4387542e5af0..e445184b9561 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,32 +1,107 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap
-, db, cyrus_sasl, svrcore, icu, net-snmp, libkrb5, pcre, perlPackages, libevent, openssl, python3
+{ stdenv
+, autoreconfHook
+, fetchFromGitHub
+, lib
+
+, bzip2
+, cmocka
+, cracklib
+, cyrus_sasl
+, db
+, doxygen
+, icu
+, libevent
+, libkrb5
+, lm_sensors
+, net-snmp
+, nspr
+, nss
+, openldap
+, openssl
+, pcre
+, perl
+, perlPackages
+, pkg-config
+, python3
+, svrcore
+, zlib
+
+, enablePamPassthru ? true
+, pam
+
+, enableCockpit ? true
+, rsync
+
+, enableDna ? true
+, enableLdapi ? true
+, enableAutobind ? false
+, enableAutoDnSuffix ? false
+, enableBitwise ? true
+, enableAcctPolicy ? true
+, enablePosixWinsync ? true
}:
stdenv.mkDerivation rec {
pname = "389-ds-base";
- version = "1.3.9.1";
+ version = "2.0.5";
- src = fetchurl {
- url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6";
+ src = fetchFromGitHub {
+ owner = "389ds";
+ repo = pname;
+ rev = "${pname}-${version}";
+ sha256 = "sha256-H0G8py4sB+2CSZKyCIb2TCIXOpnPx7udWUEK4Tg5TD8=";
};
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
- buildInputs = [
- perl pam nspr nss openldap db cyrus_sasl svrcore icu
- net-snmp libkrb5 pcre libevent openssl python3
- ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
- patches = [
- (fetchpatch {
- name = "389-ds-nss.patch";
- url = "https://aur.archlinux.org/cgit/aur.git/plain/nss.patch?h=389-ds-base&id=b80ed52cc65ff9b1d72f8ebc54dbd462b12f6be9";
- sha256 = "07z7jl9z4gzhk3k6qyfn558xl76js8041llyr5n99h20ckkbwagk";
- })
- ];
+ buildInputs = [
+ bzip2
+ cracklib
+ cyrus_sasl
+ db
+ icu
+ libevent
+ libkrb5
+ lm_sensors
+ net-snmp
+ nspr
+ nss
+ openldap
+ openssl
+ pcre
+ perl
+ python3
+ svrcore
+ zlib
+
+ # tests
+ cmocka
+ libevent
+
+ # lib389
+ (python3.withPackages (ps: with ps; [
+ setuptools
+ ldap
+ six
+ pyasn1
+ pyasn1-modules
+ dateutil
+ argcomplete
+ libselinux
+ ]))
+
+ # logconv.pl
+ perlPackages.DBFile
+ perlPackages.ArchiveTar
+ ]
+ ++ lib.optional enableCockpit rsync
+ ++ lib.optional enablePamPassthru pam;
+
postPatch = ''
substituteInPlace Makefile.am \
--replace 's,@perlpath\@,$(perldir),g' 's,@perlpath\@,$(perldir) $(PERLPATH),g'
+
+ patchShebangs ./buildnum.py ./ldap/servers/slapd/mkDBErrStrs.py
'';
preConfigure = ''
@@ -38,21 +113,37 @@ stdenv.mkDerivation rec {
export PERLPATH
'';
- configureFlags = [
- "--sysconfdir=/etc"
- "--localstatedir=/var"
- "--with-openldap"
- "--with-db"
- "--with-db-inc=${db.dev}/include"
- "--with-db-lib=${db.out}/lib"
- "--with-sasl=${cyrus_sasl.dev}"
- "--with-netsnmp=yes"
- "--with-netsnmp-inc=${lib.getDev net-snmp}/include"
- "--with-netsnmp-lib=${lib.getLib net-snmp}/lib"
- ];
+ configureFlags =
+ let
+ mkEnable = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
+ in
+ [
+ "--enable-cmocka"
+ "--localstatedir=/var"
+ "--sysconfdir=/etc"
+ "--with-db-inc=${db.dev}/include"
+ "--with-db-lib=${db.out}/lib"
+ "--with-db=yes"
+ "--with-netsnmp-inc=${lib.getDev net-snmp}/include"
+ "--with-netsnmp-lib=${lib.getLib net-snmp}/lib"
+ "--with-netsnmp=yes"
+ "--with-openldap"
+
+ "${mkEnable enableCockpit "cockpit"}"
+ "${mkEnable enablePamPassthru "pam-passthru"}"
+ "${mkEnable enableDna "dna"}"
+ "${mkEnable enableLdapi "ldapi"}"
+ "${mkEnable enableAutobind "autobind"}"
+ "${mkEnable enableAutoDnSuffix "auto-dn-suffix"}"
+ "${mkEnable enableBitwise "bitwise"}"
+ "${mkEnable enableAcctPolicy "acctpolicy"}"
+ "${mkEnable enablePosixWinsync "posix-winsync"}"
+ ];
enableParallelBuilding = true;
+ doCheck = true;
+
installFlags = [
"sysconfdir=${placeholder "out"}/etc"
"localstatedir=${placeholder "TMPDIR"}"
@@ -65,8 +156,5 @@ stdenv.mkDerivation rec {
description = "Enterprise-class Open Source LDAP server for Linux";
license = licenses.gpl3Plus;
platforms = platforms.linux;
- knownVulnerabilities = [
- "CVE-2021-3514" # https://nvd.nist.gov/vuln/detail/CVE-2021-3514
- ];
};
}
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index ad704ca792b7..2fddaae47b28 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
pname = "postfix";
- version = "3.6.0";
+ version = "3.6.1";
src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
- sha256 = "sha256-d0YolNdnHWPL5fwnM/lBCIUVptZxCLnxgIt9rjfoPC4=";
+ sha256 = "sha256-IKgFYlYB57lZiSIIMsj6FM43TwcR2gVBiPjOxqkv1xw=";
};
nativeBuildInputs = [ makeWrapper m4 ];
diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
index 20ae2a8f5c80..ea59f73b88df 100644
--- a/pkgs/servers/mastodon/gemset.nix
+++ b/pkgs/servers/mastodon/gemset.nix
@@ -230,10 +230,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55";
+ sha256 = "0fs3fy6k4wmzh0z6c4rl313f5px81pj0viqxj1prksza4j7iymmi";
type = "gem";
};
- version = "1.452.0";
+ version = "1.465.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -263,10 +263,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0803g2c1hhdk6fbliww12in4czsxj47fip9dpl35hbqsnrpjc4y9";
+ sha256 = "0mm96blh0515lymkwamcnv5jih36v0yykcqx4fr0wwvwmyh637zv";
type = "gem";
};
- version = "1.94.1";
+ version = "1.95.1";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@@ -875,10 +875,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z3d4y6xg8prn3zdjw1qpqrnziq1d3zigqil4sxjj0pbr46gc1d6";
+ sha256 = "1hwir9b9zy0asy0vap7zfqv75lbws4a1pmh74lhqd2rndv32vfc5";
type = "gem";
};
- version = "2.17.0";
+ version = "2.18.0";
};
faraday = {
dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
@@ -1170,10 +1170,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mq67if5lq388raxa5rh43z6g5zlqh9yixcja4s81p9dzrsj4i3x";
+ sha256 = "1dr7cj8km01kjsiwrx7n3qxr264ga13ll15s4h9dbbyj5m8kxqd2";
type = "gem";
};
- version = "1.4.3";
+ version = "1.5.0";
};
i18n = {
dependencies = ["concurrent-ruby"];
@@ -1524,14 +1524,15 @@
version = "1.0.3";
};
mini_portile2 = {
+ dependencies = ["net-ftp"];
groups = ["default" "development" "pam_authentication" "production" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
+ sha256 = "0a2y04km3aciybk12yimkqn0ycrzy23iygl116n7addix9xdii3s";
type = "gem";
};
- version = "2.5.1";
+ version = "2.5.2";
};
minitest = {
groups = ["default" "development" "pam_authentication" "production" "test"];
@@ -1573,6 +1574,17 @@
};
version = "2.1.1";
};
+ net-ftp = {
+ dependencies = ["net-protocol" "time"];
+ groups = ["default" "development" "pam_authentication" "production" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1gx09b00k454fgn7q41r9xs5j5v9qj8xhfxnm650cns1ywcmzkil";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
net-ldap = {
groups = ["default"];
platforms = [];
@@ -1583,6 +1595,16 @@
};
version = "0.17.0";
};
+ net-protocol = {
+ groups = ["default" "development" "pam_authentication" "production" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01wxv9sl2lcf5212vqzblw9k241ga54cppi4dk5y9ylhllbqag8a";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
net-scp = {
dependencies = ["net-ssh"];
groups = ["default" "development"];
@@ -1620,10 +1642,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
+ sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z";
type = "gem";
};
- version = "1.11.3";
+ version = "1.11.6";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -1927,10 +1949,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1";
+ sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj";
type = "gem";
};
- version = "5.3.0";
+ version = "5.3.2";
};
pundit = {
dependencies = ["activesupport"];
@@ -2332,10 +2354,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0chjr6i0g7frbp7dhi4d83ppf7akkdaw7mcgcwbxd6a9mairafpp";
+ sha256 = "1xhay8qn3p5f3g6x8i6zh372zk5w2wjrv9dksysxal1r5brkly1w";
type = "gem";
};
- version = "1.14.0";
+ version = "1.15.0";
};
rubocop-ast = {
dependencies = ["parser"];
@@ -2493,10 +2515,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dzwz30gr2mjdr70gnz2mmplhfqldz0jhdw1n3ric0y3yj81m02d";
+ sha256 = "1m8l8mwvbf6cdd7jqy0l6cg2zxi1qs8ya78jail8pvi4ay7hglm1";
type = "gem";
};
- version = "7.0.9";
+ version = "7.0.11";
};
simple-navigation = {
dependencies = ["activesupport"];
@@ -2504,10 +2526,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pkj5z48k90v9v53gckl1b0jsix08kpl6qkgsd4pkc7cva8dbqid";
+ sha256 = "0izbisjc4ng77v79x6jv1z3a8fkpdb5isgjcrx60d8vl743x7hab";
type = "gem";
};
- version = "4.1.0";
+ version = "4.3.0";
};
simple_form = {
dependencies = ["actionpack" "activemodel"];
@@ -2688,6 +2710,16 @@
};
version = "2.0.10";
};
+ time = {
+ groups = ["default" "development" "pam_authentication" "production" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ayfwm8b0c6n0z34vwfpmy83lf1gd0mq7jbybzarkqp2ylmdlzvy";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
tpm-key_attestation = {
dependencies = ["bindata" "openssl-signature_algorithm"];
groups = ["default"];
@@ -2853,10 +2885,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "038igpmkpmn0nw0k7s4db8x88af1nwcy7wzh9m9c9q4p74h7rii0";
+ sha256 = "0zd5aid4ya47xlfsaf1mlf83vkyljpnsvgwqhchf0cs7353kdss9";
type = "gem";
};
- version = "3.12.2";
+ version = "3.13.0";
};
webpacker = {
dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"];
@@ -2864,10 +2896,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xpjdbcnsapk9y1hbryxan3a0yks37j59l3ifpmlfrqfxp08anvr";
+ sha256 = "0bs6m6annfb2pazb5wb2l3lbnkaa4438ixldnamlx9hg7z3j646h";
type = "gem";
};
- version = "5.3.0";
+ version = "5.4.0";
};
webpush = {
dependencies = ["hkdf" "jwt"];
diff --git a/pkgs/servers/mastodon/package.json b/pkgs/servers/mastodon/package.json
index be41b4d59254..7d5400079091 100644
--- a/pkgs/servers/mastodon/package.json
+++ b/pkgs/servers/mastodon/package.json
@@ -1,5 +1,5 @@
{
- "version": "3.4.0",
+ "version": "3.4.1",
"name": "@tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {
@@ -60,11 +60,11 @@
},
"private": true,
"dependencies": {
- "@babel/core": "^7.14.0",
- "@babel/plugin-proposal-decorators": "^7.13.15",
+ "@babel/core": "^7.14.3",
+ "@babel/plugin-proposal-decorators": "^7.14.2",
"@babel/plugin-transform-react-inline-elements": "^7.12.13",
- "@babel/plugin-transform-runtime": "^7.13.15",
- "@babel/preset-env": "^7.14.1",
+ "@babel/plugin-transform-runtime": "^7.14.3",
+ "@babel/preset-env": "^7.14.4",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@gamestdio/websocket": "^0.3.2",
@@ -85,11 +85,11 @@
"color-blend": "^3.0.1",
"compression-webpack-plugin": "^6.1.1",
"cross-env": "^7.0.3",
- "css-loader": "^5.2.4",
+ "css-loader": "^5.2.6",
"cssnano": "^4.1.11",
"detect-passive-events": "^2.0.3",
- "dotenv": "^9.0.1",
- "emoji-mart": "Gargron/emoji-mart#build",
+ "dotenv": "^9.0.2",
+ "emoji-mart": "^3.0.1",
"es6-symbol": "^3.1.3",
"escape-html": "^1.0.3",
"exif-js": "^2.3.0",
@@ -138,9 +138,9 @@
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
- "react-select": "^4.3.0",
+ "react-select": "^4.3.1",
"react-sparklines": "^1.7.0",
- "react-swipeable-views": "^0.13.9",
+ "react-swipeable-views": "^0.14.0",
"react-textarea-autosize": "^8.3.2",
"react-toggle": "^4.1.2",
"redis": "^3.1.2",
@@ -152,8 +152,8 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.2",
- "sass": "^1.32.12",
- "sass-loader": "^10.1.1",
+ "sass": "^1.34.0",
+ "sass-loader": "^10.2.0",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
"substring-trie": "^1.0.2",
@@ -165,23 +165,23 @@
"uuid": "^8.3.1",
"webpack": "^4.46.0",
"webpack-assets-manifest": "^4.0.6",
- "webpack-bundle-analyzer": "^4.4.1",
+ "webpack-bundle-analyzer": "^4.4.2",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.1",
- "ws": "^7.4.5",
+ "ws": "^7.4.6",
"kind-of": "^6.0.3"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.12.0",
- "@testing-library/react": "^11.2.6",
+ "@testing-library/react": "^11.2.7",
"babel-eslint": "^10.1.0",
- "babel-jest": "^26.6.3",
- "eslint": "^7.26.0",
- "eslint-plugin-import": "~2.22.1",
+ "babel-jest": "^27.0.2",
+ "eslint": "^7.27.0",
+ "eslint-plugin-import": "~2.23.4",
"eslint-plugin-jsx-a11y": "~6.4.1",
"eslint-plugin-promise": "~5.1.0",
- "eslint-plugin-react": "~7.23.2",
+ "eslint-plugin-react": "~7.24.0",
"jest": "^26.6.3",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
diff --git a/pkgs/servers/mastodon/resolutions.patch b/pkgs/servers/mastodon/resolutions.patch
index 4160647123f7..f1f30725f1d4 100644
--- a/pkgs/servers/mastodon/resolutions.patch
+++ b/pkgs/servers/mastodon/resolutions.patch
@@ -1,13 +1,13 @@
diff --git a/package.json b/package.json
-index 5bc1f6bf3..8cc22a403 100644
+index f485b1370..ce8e42699 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,8 @@
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.1",
-- "ws": "^7.4.5"
-+ "ws": "^7.4.5",
+- "ws": "^7.4.6"
++ "ws": "^7.4.6",
+ "kind-of": "^6.0.3"
},
"devDependencies": {
@@ -23,12 +23,12 @@ index 5bc1f6bf3..8cc22a403 100644
"bufferutil": "^4.0.3",
"utf-8-validate": "^5.0.5"
diff --git a/yarn.lock b/yarn.lock
-index 6c8bcf549..bda3adbe8 100644
+index b8ea0f369..32e929c0d 100644
--- a/yarn.lock
+++ b/yarn.lock
-@@ -5833,6 +5833,11 @@ is-binary-path@~2.1.0:
+@@ -5939,6 +5939,11 @@ is-boolean-object@^1.1.0:
dependencies:
- binary-extensions "^2.0.0"
+ call-bind "^1.0.2"
+is-buffer@^1.1.5:
+ version "1.1.6"
@@ -38,7 +38,7 @@ index 6c8bcf549..bda3adbe8 100644
is-callable@^1.1.4, is-callable@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-@@ -6769,7 +6774,26 @@ killable@^1.0.1:
+@@ -6971,7 +6976,26 @@ killable@^1.0.1:
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index e7e8135bef2b..be64ff23150d 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -2,8 +2,8 @@
{ fetchgit, applyPatches }: let
src = fetchgit {
url = "https://github.com/tootsuite/mastodon.git";
- rev = "v3.4.0";
- sha256 = "0wa1j4iin6nlb1p5lxzgldzgr0vhrmm835gj2zqadw37vpsxdis3";
+ rev = "v3.4.1";
+ sha256 = "1pg3yh6gfzwrhzm35s6ydpny4fj117z2avi4rck5d7n20j8s2hf5";
};
in applyPatches {
inherit src;
diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix
index 9aa1e187187b..4ccfa7d8ebc6 100644
--- a/pkgs/servers/mastodon/version.nix
+++ b/pkgs/servers/mastodon/version.nix
@@ -1 +1 @@
-"3.4.0"
+"3.4.1"
diff --git a/pkgs/servers/mastodon/version.patch b/pkgs/servers/mastodon/version.patch
index eb0bd3937356..08bc2f827a8b 100644
--- a/pkgs/servers/mastodon/version.patch
+++ b/pkgs/servers/mastodon/version.patch
@@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag
+++ b/package.json
@@ -1,4 +1,5 @@
{
-+ "version": "3.4.0",
++ "version": "3.4.1",
"name": "@tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {
diff --git a/pkgs/servers/mastodon/yarn.nix b/pkgs/servers/mastodon/yarn.nix
index 9d22eb6bd5af..01aa11cfcac0 100644
--- a/pkgs/servers/mastodon/yarn.nix
+++ b/pkgs/servers/mastodon/yarn.nix
@@ -18,27 +18,27 @@
};
}
{
- name = "_babel_compat_data___compat_data_7.14.0.tgz";
+ name = "_babel_compat_data___compat_data_7.14.4.tgz";
path = fetchurl {
- name = "_babel_compat_data___compat_data_7.14.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz";
- sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919";
+ name = "_babel_compat_data___compat_data_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz";
+ sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58";
};
}
{
- name = "_babel_core___core_7.14.0.tgz";
+ name = "_babel_core___core_7.14.3.tgz";
path = fetchurl {
- name = "_babel_core___core_7.14.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz";
- sha1 = "47299ff3ec8d111b493f1a9d04bf88c04e728d88";
+ name = "_babel_core___core_7.14.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz";
+ sha1 = "5395e30405f0776067fbd9cf0884f15bfb770a38";
};
}
{
- name = "_babel_generator___generator_7.14.0.tgz";
+ name = "_babel_generator___generator_7.14.3.tgz";
path = fetchurl {
- name = "_babel_generator___generator_7.14.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.0.tgz";
- sha1 = "0f35d663506c43e4f10898fbda0d752ec75494be";
+ name = "_babel_generator___generator_7.14.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz";
+ sha1 = "0c2652d91f7bddab7cccc6ba8157e4f40dcedb91";
};
}
{
@@ -74,27 +74,27 @@
};
}
{
- name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz";
+ name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz";
path = fetchurl {
- name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz";
- sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c";
+ name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz";
+ sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516";
};
}
{
- name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz";
+ name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz";
path = fetchurl {
- name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz";
- sha1 = "30d30a005bca2c953f5653fc25091a492177f4f6";
+ name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz";
+ sha1 = "832111bcf4f57ca57a4c5b1a000fc125abc6554a";
};
}
{
- name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.0.tgz";
+ name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.4.tgz";
path = fetchurl {
- name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz";
- sha1 = "38367d3dab125b12f94273de418f4df23a11a15e";
+ name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz";
+ sha1 = "abf888d836a441abee783c75229279748705dc42";
};
}
{
@@ -129,6 +129,14 @@
sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a";
};
}
+ {
+ name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz";
+ path = fetchurl {
+ name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz";
+ sha1 = "397688b590760b6ef7725b5f0860c82427ebaac2";
+ };
+ }
{
name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz";
path = fetchurl {
@@ -153,14 +161,6 @@
sha1 = "c5715695b4f8bab32660dbdcdc2341dec7e3df40";
};
}
- {
- name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.0.tgz";
- path = fetchurl {
- name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz";
- sha1 = "6aa4bb678e0f8c22f58cdb79451d30494461b091";
- };
- }
{
name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz";
path = fetchurl {
@@ -178,11 +178,11 @@
};
}
{
- name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz";
+ name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz";
path = fetchurl {
- name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz";
- sha1 = "8fcf78be220156f22633ee204ea81f73f826a8ad";
+ name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz";
+ sha1 = "ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5";
};
}
{
@@ -217,14 +217,6 @@
sha1 = "00ec4fb6862546bd3d0aff9aac56074277173121";
};
}
- {
- name = "_babel_helper_replace_supers___helper_replace_supers_7.13.0.tgz";
- path = fetchurl {
- name = "_babel_helper_replace_supers___helper_replace_supers_7.13.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz";
- sha1 = "6034b7b51943094cb41627848cb219cb02be1d24";
- };
- }
{
name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz";
path = fetchurl {
@@ -233,6 +225,22 @@
sha1 = "6442f4c1ad912502481a564a7386de0c77ff3804";
};
}
+ {
+ name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz";
+ path = fetchurl {
+ name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz";
+ sha1 = "ca17b318b859d107f0e9b722d58cf12d94436600";
+ };
+ }
+ {
+ name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz";
+ path = fetchurl {
+ name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz";
+ sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836";
+ };
+ }
{
name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz";
path = fetchurl {
@@ -306,11 +314,11 @@
};
}
{
- name = "_babel_parser___parser_7.14.0.tgz";
+ name = "_babel_parser___parser_7.14.3.tgz";
path = fetchurl {
- name = "_babel_parser___parser_7.14.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz";
- sha1 = "2f0ebfed92bcddcc8395b91f1895191ce2760380";
+ name = "_babel_parser___parser_7.14.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz";
+ sha1 = "9b530eecb071fd0c93519df25c5ff9f14759f298";
};
}
{
@@ -322,11 +330,11 @@
};
}
{
- name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.15.tgz";
+ name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.15.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz";
- sha1 = "80e549df273a3b3050431b148c892491df1bcc5b";
+ name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz";
+ sha1 = "3a2085abbf5d5f962d480dbc81347385ed62eb1e";
};
}
{
@@ -338,91 +346,91 @@
};
}
{
- name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.13.11.tgz";
+ name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.3.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.13.11.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz";
- sha1 = "6fcbba4a962702c17e5371a0c7b39afde186d703";
+ name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz";
+ sha1 = "5a527e2cae4a4753119c3a3e7f64ecae8ccf1360";
};
}
{
- name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.13.15.tgz";
+ name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.13.15.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz";
- sha1 = "e91ccfef2dc24dd5bd5dcc9fc9e2557c684ecfb8";
+ name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.2.tgz";
+ sha1 = "e68c3c5e4a6a08834456568256fc3e71b93590cf";
};
}
{
- name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz";
+ name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz";
- sha1 = "876a1f6966e1dec332e8c9451afda3bebcdf2e1d";
+ name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz";
+ sha1 = "01ebabd7c381cff231fa43e302939a9de5be9d9f";
};
}
{
- name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz";
+ name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz";
- sha1 = "393be47a4acd03fa2af6e3cde9b06e33de1b446d";
+ name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz";
+ sha1 = "62542f94aa9ce8f6dba79eec698af22112253791";
};
}
{
- name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz";
+ name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz";
- sha1 = "bf1fb362547075afda3634ed31571c5901afef7b";
+ name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz";
+ sha1 = "830b4e2426a782e8b2878fbfe2cba85b70cbf98c";
};
}
{
- name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz";
+ name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz";
- sha1 = "93fa78d63857c40ce3c8c3315220fd00bfbb4e1a";
+ name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz";
+ sha1 = "222348c080a1678e0e74ea63fe76f275882d1fd7";
};
}
{
- name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz";
+ name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz";
- sha1 = "3730a31dafd3c10d8ccd10648ed80a2ac5472ef3";
+ name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz";
+ sha1 = "425b11dc62fc26939a2ab42cbba680bdf5734546";
};
}
{
- name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz";
+ name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz";
- sha1 = "bd9da3188e787b5120b4f9d465a8261ce67ed1db";
+ name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz";
+ sha1 = "82b4cc06571143faf50626104b335dd71baa4f9e";
};
}
{
- name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz";
+ name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.4.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz";
- sha1 = "5d210a4d727d6ce3b18f9de82cc99a3964eed60a";
+ name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz";
+ sha1 = "0e2b4de419915dc0b409378e829412e2031777c4";
};
}
{
- name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz";
+ name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz";
- sha1 = "3ad6bd5901506ea996fc31bdcf3ccfa2bed71107";
+ name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz";
+ sha1 = "150d4e58e525b16a9a1431bd5326c4eed870d717";
};
}
{
- name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz";
+ name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz";
- sha1 = "ba9feb601d422e0adea6760c2bd6bbb7bfec4866";
+ name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz";
+ sha1 = "df8171a8b9c43ebf4c1dabe6311b432d83e1b34e";
};
}
{
@@ -618,19 +626,19 @@
};
}
{
- name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.1.tgz";
+ name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.4.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.1.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz";
- sha1 = "ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2";
+ name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz";
+ sha1 = "caf140b0b2e2462c509553d140e6d0abefb61ed8";
};
}
{
- name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz";
+ name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.4.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz";
- sha1 = "0265155075c42918bf4d3a4053134176ad9b533b";
+ name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz";
+ sha1 = "a83c15503fc71a0f99e876fdce7dadbc6575ec3a";
};
}
{
@@ -642,11 +650,11 @@
};
}
{
- name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz";
+ name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.4.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz";
- sha1 = "678d96576638c19d5b36b332504d3fd6e06dea27";
+ name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz";
+ sha1 = "acbec502e9951f30f4441eaca1d2f29efade59ed";
};
}
{
@@ -706,11 +714,11 @@
};
}
{
- name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.0.tgz";
+ name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz";
- sha1 = "589494b5b290ff76cf7f59c798011f6d77026553";
+ name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz";
+ sha1 = "6622806fe1a7c07a1388444222ef9535f2ca17b0";
};
}
{
@@ -762,11 +770,11 @@
};
}
{
- name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz";
+ name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.2.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz";
- sha1 = "8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007";
+ name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz";
+ sha1 = "e4290f72e0e9e831000d066427c4667098decc31";
};
}
{
@@ -834,11 +842,11 @@
};
}
{
- name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.13.15.tgz";
+ name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.14.3.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.13.15.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz";
- sha1 = "2eddf585dd066b84102517e10a577f24f76a9cd7";
+ name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.14.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz";
+ sha1 = "1fd885a2d0de1d3c223795a4e9be72c2db4515cf";
};
}
{
@@ -898,11 +906,11 @@
};
}
{
- name = "_babel_preset_env___preset_env_7.14.1.tgz";
+ name = "_babel_preset_env___preset_env_7.14.4.tgz";
path = fetchurl {
- name = "_babel_preset_env___preset_env_7.14.1.tgz";
- url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz";
- sha1 = "b55914e2e68885ea03f69600b2d3537e54574a93";
+ name = "_babel_preset_env___preset_env_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.4.tgz";
+ sha1 = "73fc3228c59727e5e974319156f304f0d6685a2d";
};
}
{
@@ -954,19 +962,19 @@
};
}
{
- name = "_babel_traverse___traverse_7.14.0.tgz";
+ name = "_babel_traverse___traverse_7.14.2.tgz";
path = fetchurl {
- name = "_babel_traverse___traverse_7.14.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz";
- sha1 = "cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef";
+ name = "_babel_traverse___traverse_7.14.2.tgz";
+ url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz";
+ sha1 = "9201a8d912723a831c2679c7ebbf2fe1416d765b";
};
}
{
- name = "_babel_types___types_7.14.1.tgz";
+ name = "_babel_types___types_7.14.4.tgz";
path = fetchurl {
- name = "_babel_types___types_7.14.1.tgz";
- url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz";
- sha1 = "095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db";
+ name = "_babel_types___types_7.14.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz";
+ sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0";
};
}
{
@@ -986,11 +994,11 @@
};
}
{
- name = "_emotion_cache___cache_11.1.3.tgz";
+ name = "_emotion_cache___cache_11.4.0.tgz";
path = fetchurl {
- name = "_emotion_cache___cache_11.1.3.tgz";
- url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.1.3.tgz";
- sha1 = "c7683a9484bcd38d5562f2b9947873cf66829afd";
+ name = "_emotion_cache___cache_11.4.0.tgz";
+ url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz";
+ sha1 = "293fc9d9a7a38b9aad8e9337e5014366c3b09ac0";
};
}
{
@@ -1193,6 +1201,14 @@
sha1 = "5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b";
};
}
+ {
+ name = "_jest_transform___transform_27.0.2.tgz";
+ path = fetchurl {
+ name = "_jest_transform___transform_27.0.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz";
+ sha1 = "b073b7c589e3f4b842102468875def2bb722d6b5";
+ };
+ }
{
name = "_jest_types___types_25.5.0.tgz";
path = fetchurl {
@@ -1209,6 +1225,14 @@
sha1 = "bef5a532030e1d88a2f5a6d933f84e97226ed48e";
};
}
+ {
+ name = "_jest_types___types_27.0.2.tgz";
+ path = fetchurl {
+ name = "_jest_types___types_27.0.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz";
+ sha1 = "e153d6c46bda0f2589f0702b071f9898c7bbd37e";
+ };
+ }
{
name = "_npmcli_move_file___move_file_1.0.1.tgz";
path = fetchurl {
@@ -1266,11 +1290,11 @@
};
}
{
- name = "_testing_library_react___react_11.2.6.tgz";
+ name = "_testing_library_react___react_11.2.7.tgz";
path = fetchurl {
- name = "_testing_library_react___react_11.2.6.tgz";
- url = "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.6.tgz";
- sha1 = "586a23adc63615985d85be0c903f374dab19200b";
+ name = "_testing_library_react___react_11.2.7.tgz";
+ url = "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.7.tgz";
+ sha1 = "b29e2e95c6765c815786c0bc1d5aed9cb2bf7818";
};
}
{
@@ -1282,11 +1306,11 @@
};
}
{
- name = "_types_babel__core___babel__core_7.1.9.tgz";
+ name = "_types_babel__core___babel__core_7.1.14.tgz";
path = fetchurl {
- name = "_types_babel__core___babel__core_7.1.9.tgz";
- url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz";
- sha1 = "77e59d438522a6fb898fa43dc3455c6e72f3963d";
+ name = "_types_babel__core___babel__core_7.1.14.tgz";
+ url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz";
+ sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402";
};
}
{
@@ -1537,6 +1561,14 @@
sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79";
};
}
+ {
+ name = "_types_yargs___yargs_16.0.3.tgz";
+ path = fetchurl {
+ name = "_types_yargs___yargs_16.0.3.tgz";
+ url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz";
+ sha1 = "4b6d35bb8e680510a7dc2308518a80ee1ef27e01";
+ };
+ }
{
name = "_webassemblyjs_ast___ast_1.9.0.tgz";
path = fetchurl {
@@ -1841,6 +1873,14 @@
sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4";
};
}
+ {
+ name = "ajv___ajv_8.5.0.tgz";
+ path = fetchurl {
+ name = "ajv___ajv_8.5.0.tgz";
+ url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz";
+ sha1 = "695528274bcb5afc865446aa275484049a18ae4b";
+ };
+ }
{
name = "alphanum_sort___alphanum_sort_1.0.2.tgz";
path = fetchurl {
@@ -2074,11 +2114,11 @@
};
}
{
- name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
+ name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz";
path = fetchurl {
- name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
- url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz";
- sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b";
+ name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz";
+ url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz";
+ sha1 = "6ef638b43312bd401b4c6199fdec7e2dc9e9a123";
};
}
{
@@ -2257,6 +2297,14 @@
sha1 = "d87d25cb0037577a0c89f82e5755c5d293c01056";
};
}
+ {
+ name = "babel_jest___babel_jest_27.0.2.tgz";
+ path = fetchurl {
+ name = "babel_jest___babel_jest_27.0.2.tgz";
+ url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz";
+ sha1 = "7dc18adb01322acce62c2af76ea2c7cd186ade37";
+ };
+ }
{
name = "babel_loader___babel_loader_8.2.2.tgz";
path = fetchurl {
@@ -2289,6 +2337,14 @@
sha1 = "8185bd030348d254c6d7dd974355e6a28b21e62d";
};
}
+ {
+ name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz";
+ path = fetchurl {
+ name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz";
+ url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz";
+ sha1 = "a6d10e484c93abff0f4e95f437dad26e5736ea11";
+ };
+ }
{
name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz";
path = fetchurl {
@@ -2369,6 +2425,14 @@
sha1 = "747872b1171df032252426586881d62d31798fee";
};
}
+ {
+ name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz";
+ path = fetchurl {
+ name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz";
+ url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz";
+ sha1 = "7a50c75d16647c23a2cf5158d5bb9eb206b10e20";
+ };
+ }
{
name = "babel_runtime___babel_runtime_6.26.0.tgz";
path = fetchurl {
@@ -2618,27 +2682,11 @@
};
}
{
- name = "browserslist___browserslist_4.14.5.tgz";
+ name = "browserslist___browserslist_4.16.6.tgz";
path = fetchurl {
- name = "browserslist___browserslist_4.14.5.tgz";
- url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz";
- sha1 = "1c751461a102ddc60e40993639b709be7f2c4015";
- };
- }
- {
- name = "browserslist___browserslist_4.14.7.tgz";
- path = fetchurl {
- name = "browserslist___browserslist_4.14.7.tgz";
- url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz";
- sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6";
- };
- }
- {
- name = "browserslist___browserslist_4.16.3.tgz";
- path = fetchurl {
- name = "browserslist___browserslist_4.16.3.tgz";
- url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz";
- sha1 = "340aa46940d7db878748567c5dea24a48ddf3717";
+ name = "browserslist___browserslist_4.16.6.tgz";
+ url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz";
+ sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2";
};
}
{
@@ -2826,27 +2874,11 @@
};
}
{
- name = "caniuse_lite___caniuse_lite_1.0.30001143.tgz";
+ name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz";
path = fetchurl {
- name = "caniuse_lite___caniuse_lite_1.0.30001143.tgz";
- url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001143.tgz";
- sha1 = "560f2cfb9f313d1d7e52eb8dac0e4e36c8821c0d";
- };
- }
- {
- name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz";
- path = fetchurl {
- name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz";
- url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz";
- sha1 = "bebde28f893fa9594dadcaa7d6b8e2aa0299df20";
- };
- }
- {
- name = "caniuse_lite___caniuse_lite_1.0.30001191.tgz";
- path = fetchurl {
- name = "caniuse_lite___caniuse_lite_1.0.30001191.tgz";
- url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz";
- sha1 = "bacb432b6701f690c8c5f7c680166b9a9f0843d9";
+ name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz";
+ url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz";
+ sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa";
};
}
{
@@ -2953,6 +2985,14 @@
sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46";
};
}
+ {
+ name = "ci_info___ci_info_3.2.0.tgz";
+ path = fetchurl {
+ name = "ci_info___ci_info_3.2.0.tgz";
+ url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz";
+ sha1 = "2876cb948a498797b5236f0095bc057d0dca38b6";
+ };
+ }
{
name = "cipher_base___cipher_base_1.0.4.tgz";
path = fetchurl {
@@ -3145,14 +3185,6 @@
sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10";
};
}
- {
- name = "colorette___colorette_1.2.1.tgz";
- path = fetchurl {
- name = "colorette___colorette_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz";
- sha1 = "4d0b921325c14faf92633086a536db6e89564b1b";
- };
- }
{
name = "colorette___colorette_1.2.2.tgz";
path = fetchurl {
@@ -3273,14 +3305,6 @@
sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
};
}
- {
- name = "contains_path___contains_path_0.1.0.tgz";
- path = fetchurl {
- name = "contains_path___contains_path_0.1.0.tgz";
- url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz";
- sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a";
- };
- }
{
name = "content_disposition___content_disposition_0.5.3.tgz";
path = fetchurl {
@@ -3514,11 +3538,11 @@
};
}
{
- name = "css_loader___css_loader_5.2.4.tgz";
+ name = "css_loader___css_loader_5.2.6.tgz";
path = fetchurl {
- name = "css_loader___css_loader_5.2.4.tgz";
- url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.4.tgz";
- sha1 = "e985dcbce339812cb6104ef3670f08f9893a1536";
+ name = "css_loader___css_loader_5.2.6.tgz";
+ url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.6.tgz";
+ sha1 = "c3c82ab77fea1f360e587d871a6811f4450cc8d1";
};
}
{
@@ -3978,11 +4002,11 @@
};
}
{
- name = "dns_packet___dns_packet_1.3.1.tgz";
+ name = "dns_packet___dns_packet_1.3.4.tgz";
path = fetchurl {
- name = "dns_packet___dns_packet_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz";
- sha1 = "12aa426981075be500b910eedcd0b47dd7deda5a";
+ name = "dns_packet___dns_packet_1.3.4.tgz";
+ url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz";
+ sha1 = "e3455065824a2507ba886c55a89963bb107dec6f";
};
}
{
@@ -4098,11 +4122,11 @@
};
}
{
- name = "dotenv___dotenv_9.0.1.tgz";
+ name = "dotenv___dotenv_9.0.2.tgz";
path = fetchurl {
- name = "dotenv___dotenv_9.0.1.tgz";
- url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.1.tgz";
- sha1 = "a889a28a3a515812dde1e7f8183ef5cdf3186b97";
+ name = "dotenv___dotenv_9.0.2.tgz";
+ url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz";
+ sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05";
};
}
{
@@ -4146,27 +4170,11 @@
};
}
{
- name = "electron_to_chromium___electron_to_chromium_1.3.574.tgz";
+ name = "electron_to_chromium___electron_to_chromium_1.3.736.tgz";
path = fetchurl {
- name = "electron_to_chromium___electron_to_chromium_1.3.574.tgz";
- url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.574.tgz";
- sha1 = "bdd87f62fe70165e5c862a0acf0cee9889e23aa3";
- };
- }
- {
- name = "electron_to_chromium___electron_to_chromium_1.3.603.tgz";
- path = fetchurl {
- name = "electron_to_chromium___electron_to_chromium_1.3.603.tgz";
- url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz";
- sha1 = "1b71bec27fb940eccd79245f6824c63d5f7e8abf";
- };
- }
- {
- name = "electron_to_chromium___electron_to_chromium_1.3.672.tgz";
- path = fetchurl {
- name = "electron_to_chromium___electron_to_chromium_1.3.672.tgz";
- url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.672.tgz";
- sha1 = "3a6e335016dab4bc584d5292adc4f98f54541f6a";
+ name = "electron_to_chromium___electron_to_chromium_1.3.736.tgz";
+ url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz";
+ sha1 = "f632d900a1f788dab22fec9c62ec5c9c8f0c4052";
};
}
{
@@ -4186,11 +4194,11 @@
};
}
{
- name = "934f314fd8322276765066e8a2a6be5bac61b1cf";
+ name = "emoji_mart___emoji_mart_3.0.1.tgz";
path = fetchurl {
- name = "934f314fd8322276765066e8a2a6be5bac61b1cf";
- url = "https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf";
- sha1 = "1768aa6ab3d6b926f457e082bd4ed7279f6fc9cf";
+ name = "emoji_mart___emoji_mart_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-3.0.1.tgz";
+ sha1 = "9ce86706e02aea0506345f98464814a662ca54c6";
};
}
{
@@ -4313,6 +4321,14 @@
sha1 = "088101a55f0541f595e7e057199e27ddc8f3a5c2";
};
}
+ {
+ name = "es_abstract___es_abstract_1.18.3.tgz";
+ path = fetchurl {
+ name = "es_abstract___es_abstract_1.18.3.tgz";
+ url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz";
+ sha1 = "25c4c3380a27aa203c44b2b685bba94da31b63e0";
+ };
+ }
{
name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
path = fetchurl {
@@ -4409,6 +4425,14 @@
sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344";
};
}
+ {
+ name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz";
+ path = fetchurl {
+ name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz";
+ sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34";
+ };
+ }
{
name = "escodegen___escodegen_1.14.3.tgz";
path = fetchurl {
@@ -4434,19 +4458,19 @@
};
}
{
- name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
+ name = "eslint_module_utils___eslint_module_utils_2.6.1.tgz";
path = fetchurl {
- name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz";
- sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6";
+ name = "eslint_module_utils___eslint_module_utils_2.6.1.tgz";
+ url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz";
+ sha1 = "b51be1e473dd0de1c5ea638e22429c2490ea8233";
};
}
{
- name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz";
+ name = "eslint_plugin_import___eslint_plugin_import_2.23.4.tgz";
path = fetchurl {
- name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz";
- sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702";
+ name = "eslint_plugin_import___eslint_plugin_import_2.23.4.tgz";
+ url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz";
+ sha1 = "8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97";
};
}
{
@@ -4466,11 +4490,11 @@
};
}
{
- name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz";
+ name = "eslint_plugin_react___eslint_plugin_react_7.24.0.tgz";
path = fetchurl {
- name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz";
- sha1 = "2d2291b0f95c03728b55869f01102290e792d494";
+ name = "eslint_plugin_react___eslint_plugin_react_7.24.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz";
+ sha1 = "eadedfa351a6f36b490aa17f4fa9b14e842b9eb4";
};
}
{
@@ -4522,11 +4546,11 @@
};
}
{
- name = "eslint___eslint_7.26.0.tgz";
+ name = "eslint___eslint_7.27.0.tgz";
path = fetchurl {
- name = "eslint___eslint_7.26.0.tgz";
- url = "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz";
- sha1 = "d416fdcdcb3236cd8f282065312813f8c13982f6";
+ name = "eslint___eslint_7.27.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz";
+ sha1 = "665a1506d8f95655c9274d84bd78f7166b07e9c7";
};
}
{
@@ -5393,6 +5417,14 @@
sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
};
}
+ {
+ name = "has_bigints___has_bigints_1.0.1.tgz";
+ path = fetchurl {
+ name = "has_bigints___has_bigints_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz";
+ sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113";
+ };
+ }
{
name = "has_flag___has_flag_1.0.0.tgz";
path = fetchurl {
@@ -5425,6 +5457,14 @@
sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8";
};
}
+ {
+ name = "has_symbols___has_symbols_1.0.2.tgz";
+ path = fetchurl {
+ name = "has_symbols___has_symbols_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz";
+ sha1 = "165d3070c00309752a1236a479331e3ac56f1423";
+ };
+ }
{
name = "has_unicode___has_unicode_2.0.1.tgz";
path = fetchurl {
@@ -6073,6 +6113,14 @@
sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03";
};
}
+ {
+ name = "is_bigint___is_bigint_1.0.2.tgz";
+ path = fetchurl {
+ name = "is_bigint___is_bigint_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz";
+ sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a";
+ };
+ }
{
name = "is_binary_path___is_binary_path_1.0.1.tgz";
path = fetchurl {
@@ -6089,6 +6137,14 @@
sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09";
};
}
+ {
+ name = "is_boolean_object___is_boolean_object_1.1.1.tgz";
+ path = fetchurl {
+ name = "is_boolean_object___is_boolean_object_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz";
+ sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8";
+ };
+ }
{
name = "is_buffer___is_buffer_1.1.6.tgz";
path = fetchurl {
@@ -6105,6 +6161,14 @@
sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9";
};
}
+ {
+ name = "is_callable___is_callable_1.2.3.tgz";
+ path = fetchurl {
+ name = "is_callable___is_callable_1.2.3.tgz";
+ url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz";
+ sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e";
+ };
+ }
{
name = "is_ci___is_ci_2.0.0.tgz";
path = fetchurl {
@@ -6113,6 +6177,14 @@
sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c";
};
}
+ {
+ name = "is_ci___is_ci_3.0.0.tgz";
+ path = fetchurl {
+ name = "is_ci___is_ci_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz";
+ sha1 = "c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994";
+ };
+ }
{
name = "is_color_stop___is_color_stop_1.1.0.tgz";
path = fetchurl {
@@ -6122,11 +6194,11 @@
};
}
{
- name = "is_core_module___is_core_module_2.2.0.tgz";
+ name = "is_core_module___is_core_module_2.4.0.tgz";
path = fetchurl {
- name = "is_core_module___is_core_module_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz";
- sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a";
+ name = "is_core_module___is_core_module_2.4.0.tgz";
+ url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz";
+ sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1";
};
}
{
@@ -6297,6 +6369,14 @@
sha1 = "3de746c18dda2319241a53675908d8f766f11c24";
};
}
+ {
+ name = "is_number_object___is_number_object_1.0.5.tgz";
+ path = fetchurl {
+ name = "is_number_object___is_number_object_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz";
+ sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb";
+ };
+ }
{
name = "is_number___is_number_3.0.0.tgz";
path = fetchurl {
@@ -6385,6 +6465,14 @@
sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9";
};
}
+ {
+ name = "is_regex___is_regex_1.1.3.tgz";
+ path = fetchurl {
+ name = "is_regex___is_regex_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz";
+ sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f";
+ };
+ }
{
name = "is_resolvable___is_resolvable_1.1.0.tgz";
path = fetchurl {
@@ -6417,6 +6505,14 @@
sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6";
};
}
+ {
+ name = "is_string___is_string_1.0.6.tgz";
+ path = fetchurl {
+ name = "is_string___is_string_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz";
+ sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f";
+ };
+ }
{
name = "is_symbol___is_symbol_1.0.3.tgz";
path = fetchurl {
@@ -6425,6 +6521,14 @@
sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937";
};
}
+ {
+ name = "is_symbol___is_symbol_1.0.4.tgz";
+ path = fetchurl {
+ name = "is_symbol___is_symbol_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz";
+ sha1 = "a6dac93b635b063ca6872236de88910a57af139c";
+ };
+ }
{
name = "is_typedarray___is_typedarray_1.0.0.tgz";
path = fetchurl {
@@ -6649,6 +6753,14 @@
sha1 = "dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa";
};
}
+ {
+ name = "jest_haste_map___jest_haste_map_27.0.2.tgz";
+ path = fetchurl {
+ name = "jest_haste_map___jest_haste_map_27.0.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz";
+ sha1 = "3f1819400c671237e48b4d4b76a80a0dbed7577f";
+ };
+ }
{
name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz";
path = fetchurl {
@@ -6705,6 +6817,14 @@
sha1 = "d25e7184b36e39fd466c3bc41be0971e821fee28";
};
}
+ {
+ name = "jest_regex_util___jest_regex_util_27.0.1.tgz";
+ path = fetchurl {
+ name = "jest_regex_util___jest_regex_util_27.0.1.tgz";
+ url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz";
+ sha1 = "69d4b1bf5b690faa3490113c47486ed85dd45b68";
+ };
+ }
{
name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz";
path = fetchurl {
@@ -6745,6 +6865,14 @@
sha1 = "d139aafd46957d3a448f3a6cdabe2919ba0742d1";
};
}
+ {
+ name = "jest_serializer___jest_serializer_27.0.1.tgz";
+ path = fetchurl {
+ name = "jest_serializer___jest_serializer_27.0.1.tgz";
+ url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz";
+ sha1 = "2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020";
+ };
+ }
{
name = "jest_snapshot___jest_snapshot_26.6.2.tgz";
path = fetchurl {
@@ -6761,6 +6889,14 @@
sha1 = "907535dbe4d5a6cb4c47ac9b926f6af29576cbc1";
};
}
+ {
+ name = "jest_util___jest_util_27.0.2.tgz";
+ path = fetchurl {
+ name = "jest_util___jest_util_27.0.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz";
+ sha1 = "fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7";
+ };
+ }
{
name = "jest_validate___jest_validate_26.6.2.tgz";
path = fetchurl {
@@ -6793,6 +6929,14 @@
sha1 = "7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed";
};
}
+ {
+ name = "jest_worker___jest_worker_27.0.2.tgz";
+ path = fetchurl {
+ name = "jest_worker___jest_worker_27.0.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz";
+ sha1 = "4ebeb56cef48b3e7514552f80d0d80c0129f0b05";
+ };
+ }
{
name = "jest___jest_26.6.3.tgz";
path = fetchurl {
@@ -6881,6 +7025,14 @@
sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660";
};
}
+ {
+ name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz";
+ path = fetchurl {
+ name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz";
+ sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2";
+ };
+ }
{
name = "json_schema___json_schema_0.2.3.tgz";
path = fetchurl {
@@ -7122,11 +7274,11 @@
};
}
{
- name = "load_json_file___load_json_file_2.0.0.tgz";
+ name = "load_json_file___load_json_file_4.0.0.tgz";
path = fetchurl {
- name = "load_json_file___load_json_file_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz";
- sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+ name = "load_json_file___load_json_file_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz";
+ sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b";
};
}
{
@@ -7201,6 +7353,14 @@
sha1 = "f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9";
};
}
+ {
+ name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz";
+ path = fetchurl {
+ name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
+ sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
+ };
+ }
{
name = "lodash.debounce___lodash.debounce_4.0.8.tgz";
path = fetchurl {
@@ -7273,6 +7433,14 @@
sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe";
};
}
+ {
+ name = "lodash.merge___lodash.merge_4.6.2.tgz";
+ path = fetchurl {
+ name = "lodash.merge___lodash.merge_4.6.2.tgz";
+ url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz";
+ sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a";
+ };
+ }
{
name = "lodash.sortby___lodash.sortby_4.7.0.tgz";
path = fetchurl {
@@ -7281,6 +7449,14 @@
sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438";
};
}
+ {
+ name = "lodash.truncate___lodash.truncate_4.4.2.tgz";
+ path = fetchurl {
+ name = "lodash.truncate___lodash.truncate_4.4.2.tgz";
+ url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz";
+ sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193";
+ };
+ }
{
name = "lodash.uniq___lodash.uniq_4.5.0.tgz";
path = fetchurl {
@@ -7497,6 +7673,14 @@
sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259";
};
}
+ {
+ name = "micromatch___micromatch_4.0.4.tgz";
+ path = fetchurl {
+ name = "micromatch___micromatch_4.0.4.tgz";
+ url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz";
+ sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9";
+ };
+ }
{
name = "miller_rabin___miller_rabin_4.0.1.tgz";
path = fetchurl {
@@ -7754,11 +7938,11 @@
};
}
{
- name = "nanoid___nanoid_3.1.22.tgz";
+ name = "nanoid___nanoid_3.1.23.tgz";
path = fetchurl {
- name = "nanoid___nanoid_3.1.22.tgz";
- url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz";
- sha1 = "b35f8fb7d151990a8aebd5aa5015c03cf726f844";
+ name = "nanoid___nanoid_3.1.23.tgz";
+ url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz";
+ sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81";
};
}
{
@@ -7866,27 +8050,11 @@
};
}
{
- name = "node_releases___node_releases_1.1.61.tgz";
+ name = "node_releases___node_releases_1.1.72.tgz";
path = fetchurl {
- name = "node_releases___node_releases_1.1.61.tgz";
- url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz";
- sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e";
- };
- }
- {
- name = "node_releases___node_releases_1.1.67.tgz";
- path = fetchurl {
- name = "node_releases___node_releases_1.1.67.tgz";
- url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz";
- sha1 = "28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12";
- };
- }
- {
- name = "node_releases___node_releases_1.1.71.tgz";
- path = fetchurl {
- name = "node_releases___node_releases_1.1.71.tgz";
- url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz";
- sha1 = "cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb";
+ name = "node_releases___node_releases_1.1.72.tgz";
+ url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz";
+ sha1 = "14802ab6b1039a79a0c7d662b610a5bbd76eacbe";
};
}
{
@@ -8017,6 +8185,14 @@
sha1 = "6c299d38fdf207746e5d2d46c2877f6f25d15b52";
};
}
+ {
+ name = "object_inspect___object_inspect_1.10.3.tgz";
+ path = fetchurl {
+ name = "object_inspect___object_inspect_1.10.3.tgz";
+ url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz";
+ sha1 = "c2aa7d2d09f50c99375704f7a0adf24c5782d369";
+ };
+ }
{
name = "object_inspect___object_inspect_1.8.0.tgz";
path = fetchurl {
@@ -8074,11 +8250,11 @@
};
}
{
- name = "object.entries___object.entries_1.1.3.tgz";
+ name = "object.entries___object.entries_1.1.4.tgz";
path = fetchurl {
- name = "object.entries___object.entries_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz";
- sha1 = "c601c7f168b62374541a07ddbd3e2d5e4f7711a6";
+ name = "object.entries___object.entries_1.1.4.tgz";
+ url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz";
+ sha1 = "43ccf9a50bc5fd5b649d45ab1a579f24e088cafd";
};
}
{
@@ -8106,11 +8282,11 @@
};
}
{
- name = "object.values___object.values_1.1.3.tgz";
+ name = "object.values___object.values_1.1.4.tgz";
path = fetchurl {
- name = "object.values___object.values_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz";
- sha1 = "eaa8b1e17589f02f698db093f7c62ee1699742ee";
+ name = "object.values___object.values_1.1.4.tgz";
+ url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz";
+ sha1 = "0d273762833e816b693a637d30073e7051535b30";
};
}
{
@@ -8385,14 +8561,6 @@
sha1 = "7b60b060705a25a9b90b7f0ed493e5823248a652";
};
}
- {
- name = "parse_json___parse_json_2.2.0.tgz";
- path = fetchurl {
- name = "parse_json___parse_json_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz";
- sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
- };
- }
{
name = "parse_json___parse_json_4.0.0.tgz";
path = fetchurl {
@@ -8538,11 +8706,11 @@
};
}
{
- name = "path_type___path_type_2.0.0.tgz";
+ name = "path_type___path_type_3.0.0.tgz";
path = fetchurl {
- name = "path_type___path_type_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz";
- sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+ name = "path_type___path_type_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz";
+ sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f";
};
}
{
@@ -8641,6 +8809,14 @@
sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad";
};
}
+ {
+ name = "picomatch___picomatch_2.3.0.tgz";
+ path = fetchurl {
+ name = "picomatch___picomatch_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz";
+ sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972";
+ };
+ }
{
name = "pify___pify_2.3.0.tgz";
path = fetchurl {
@@ -8649,6 +8825,14 @@
sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
};
}
+ {
+ name = "pify___pify_3.0.0.tgz";
+ path = fetchurl {
+ name = "pify___pify_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz";
+ sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+ };
+ }
{
name = "pify___pify_4.0.1.tgz";
path = fetchurl {
@@ -8705,6 +8889,14 @@
sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3";
};
}
+ {
+ name = "pkg_up___pkg_up_2.0.0.tgz";
+ path = fetchurl {
+ name = "pkg_up___pkg_up_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz";
+ sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f";
+ };
+ }
{
name = "pluralize___pluralize_1.2.1.tgz";
path = fetchurl {
@@ -9058,11 +9250,11 @@
};
}
{
- name = "postcss___postcss_8.2.10.tgz";
+ name = "postcss___postcss_8.3.0.tgz";
path = fetchurl {
- name = "postcss___postcss_8.2.10.tgz";
- url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz";
- sha1 = "ca7a042aa8aff494b334d0ff3e9e77079f6f702b";
+ name = "postcss___postcss_8.3.0.tgz";
+ url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.0.tgz";
+ sha1 = "b1a713f6172ca427e3f05ef1303de8b65683325f";
};
}
{
@@ -9546,11 +9738,11 @@
};
}
{
- name = "react_select___react_select_4.3.0.tgz";
+ name = "react_select___react_select_4.3.1.tgz";
path = fetchurl {
- name = "react_select___react_select_4.3.0.tgz";
- url = "https://registry.yarnpkg.com/react-select/-/react-select-4.3.0.tgz";
- sha1 = "6bde634ae7a378b49f3833c85c126f533483fa2e";
+ name = "react_select___react_select_4.3.1.tgz";
+ url = "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz";
+ sha1 = "389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81";
};
}
{
@@ -9562,27 +9754,27 @@
};
}
{
- name = "react_swipeable_views_core___react_swipeable_views_core_0.13.7.tgz";
+ name = "react_swipeable_views_core___react_swipeable_views_core_0.14.0.tgz";
path = fetchurl {
- name = "react_swipeable_views_core___react_swipeable_views_core_0.13.7.tgz";
- url = "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.13.7.tgz";
- sha1 = "c082b553f26e83fd20fc17f934200eb717023c8a";
+ name = "react_swipeable_views_core___react_swipeable_views_core_0.14.0.tgz";
+ url = "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.14.0.tgz";
+ sha1 = "6ac443a7cc7bc5ea022fbd549292bb5fff361cce";
};
}
{
- name = "react_swipeable_views_utils___react_swipeable_views_utils_0.13.9.tgz";
+ name = "react_swipeable_views_utils___react_swipeable_views_utils_0.14.0.tgz";
path = fetchurl {
- name = "react_swipeable_views_utils___react_swipeable_views_utils_0.13.9.tgz";
- url = "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.13.9.tgz";
- sha1 = "a66e98f2f4502d8b00182901f80d13b2f903e10f";
+ name = "react_swipeable_views_utils___react_swipeable_views_utils_0.14.0.tgz";
+ url = "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.14.0.tgz";
+ sha1 = "6b76e251906747482730c22002fe47ab1014ba32";
};
}
{
- name = "react_swipeable_views___react_swipeable_views_0.13.9.tgz";
+ name = "react_swipeable_views___react_swipeable_views_0.14.0.tgz";
path = fetchurl {
- name = "react_swipeable_views___react_swipeable_views_0.13.9.tgz";
- url = "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.13.9.tgz";
- sha1 = "d6a6c508bf5288ad55509f9c65916db5df0f2cec";
+ name = "react_swipeable_views___react_swipeable_views_0.14.0.tgz";
+ url = "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.14.0.tgz";
+ sha1 = "149c0df3d92220cc89e3f6d5c04a78dfe46f9b54";
};
}
{
@@ -9634,11 +9826,11 @@
};
}
{
- name = "read_pkg_up___read_pkg_up_2.0.0.tgz";
+ name = "read_pkg_up___read_pkg_up_3.0.0.tgz";
path = fetchurl {
- name = "read_pkg_up___read_pkg_up_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
- sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+ name = "read_pkg_up___read_pkg_up_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz";
+ sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07";
};
}
{
@@ -9650,11 +9842,11 @@
};
}
{
- name = "read_pkg___read_pkg_2.0.0.tgz";
+ name = "read_pkg___read_pkg_3.0.0.tgz";
path = fetchurl {
- name = "read_pkg___read_pkg_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz";
- sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+ name = "read_pkg___read_pkg_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz";
+ sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389";
};
}
{
@@ -10242,19 +10434,19 @@
};
}
{
- name = "sass_loader___sass_loader_10.1.1.tgz";
+ name = "sass_loader___sass_loader_10.2.0.tgz";
path = fetchurl {
- name = "sass_loader___sass_loader_10.1.1.tgz";
- url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz";
- sha1 = "4ddd5a3d7638e7949065dd6e9c7c04037f7e663d";
+ name = "sass_loader___sass_loader_10.2.0.tgz";
+ url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz";
+ sha1 = "3d64c1590f911013b3fa48a0b22a83d5e1494716";
};
}
{
- name = "sass___sass_1.32.12.tgz";
+ name = "sass___sass_1.34.0.tgz";
path = fetchurl {
- name = "sass___sass_1.32.12.tgz";
- url = "https://registry.yarnpkg.com/sass/-/sass-1.32.12.tgz";
- sha1 = "a2a47ad0f1c168222db5206444a30c12457abb9f";
+ name = "sass___sass_1.34.0.tgz";
+ url = "https://registry.yarnpkg.com/sass/-/sass-1.34.0.tgz";
+ sha1 = "e46d5932d8b0ecc4feb846d861f26a578f7f7172";
};
}
{
@@ -10633,6 +10825,14 @@
sha1 = "3993bd873bfc48479cca9ea3a547835c7c154b34";
};
}
+ {
+ name = "source_map_js___source_map_js_0.6.2.tgz";
+ path = fetchurl {
+ name = "source_map_js___source_map_js_0.6.2.tgz";
+ url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz";
+ sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e";
+ };
+ }
{
name = "source_map_resolve___source_map_resolve_0.5.3.tgz";
path = fetchurl {
@@ -10938,11 +11138,11 @@
};
}
{
- name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz";
+ name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz";
path = fetchurl {
- name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz";
- sha1 = "608f255e93e072107f5de066f81a2dfb78cf6b29";
+ name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz";
+ url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz";
+ sha1 = "59370644e1db7e4c0c045277690cf7b01203c4da";
};
}
{
@@ -11161,6 +11361,14 @@
sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da";
};
}
+ {
+ name = "supports_color___supports_color_8.1.1.tgz";
+ path = fetchurl {
+ name = "supports_color___supports_color_8.1.1.tgz";
+ url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz";
+ sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c";
+ };
+ }
{
name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz";
path = fetchurl {
@@ -11194,11 +11402,11 @@
};
}
{
- name = "table___table_6.0.4.tgz";
+ name = "table___table_6.7.1.tgz";
path = fetchurl {
- name = "table___table_6.0.4.tgz";
- url = "https://registry.yarnpkg.com/table/-/table-6.0.4.tgz";
- sha1 = "c523dd182177e926c723eb20e1b341238188aa0d";
+ name = "table___table_6.7.1.tgz";
+ url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz";
+ sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2";
};
}
{
@@ -11633,6 +11841,14 @@
sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
};
}
+ {
+ name = "unbox_primitive___unbox_primitive_1.0.1.tgz";
+ path = fetchurl {
+ name = "unbox_primitive___unbox_primitive_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz";
+ sha1 = "085e215625ec3162574dc8859abee78a59b14471";
+ };
+ }
{
name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz";
path = fetchurl {
@@ -12050,11 +12266,11 @@
};
}
{
- name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.1.tgz";
+ name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.2.tgz";
path = fetchurl {
- name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.1.tgz";
- url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.1.tgz";
- sha1 = "c71fb2eaffc10a4754d7303b224adb2342069da1";
+ name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.2.tgz";
+ url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz";
+ sha1 = "39898cf6200178240910d629705f0f3493f7d666";
};
}
{
@@ -12161,6 +12377,14 @@
sha1 = "85e7f9795108b53d554cec640b2e8aee2a0d4bfd";
};
}
+ {
+ name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz";
+ path = fetchurl {
+ name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz";
+ sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6";
+ };
+ }
{
name = "which_module___which_module_2.0.0.tgz";
path = fetchurl {
@@ -12282,11 +12506,11 @@
};
}
{
- name = "ws___ws_7.4.5.tgz";
+ name = "ws___ws_7.4.6.tgz";
path = fetchurl {
- name = "ws___ws_7.4.5.tgz";
- url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz";
- sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1";
+ name = "ws___ws_7.4.6.tgz";
+ url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz";
+ sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c";
};
}
{
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 0fce99819671..c65627311439 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.35.1";
+ version = "1.36.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-MJ3RG60rWbcfQxhj34k99AFg8TsPd3ECEw/x2+xU1js=";
+ sha256 = "sha256-OMbSd64mD2+6GVUxGL4lvQlKAiBuen0PjvyVdk/ePbI=";
};
patches = [
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index b13958739344..a5b2f14e9d58 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
- version = "unstable-2021-06-15";
+ version = "0.1.7";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
- rev = "d3b9f4f63744398cd2282c1927d02cb5bdb8c474";
- sha256 = "sha256-ueqAvfgQDTcNIad9fRCKiRpR0vGUJZbf3EmcJpQ2Y/g=";
+ rev = "v${version}";
+ sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE=";
};
buildInputs = [ olm ];
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 1043b70b5844..7420fa22e638 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,8 +1,8 @@
-{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, fetchpatch }:
buildGoModule rec {
pname = "grafana";
- version = "8.0.1";
+ version = "8.0.2";
excludedPackages = [ "release_publisher" ];
@@ -10,15 +10,24 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "sha256-Vs/4urH/XuoVly26YfhFbf/T3x5jdS4BgrVStuTHaHo=";
+ sha256 = "sha256-kCsrLZ0EbuMwqqDvUvhm8+B/vh6FpeJ5zkwste+qwyQ=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "sha256-b05nUApLjdQW5vbS56HUK+/GXKcHo2UAHybfe6ZTr3U=";
+ sha256 = "sha256-QBMGLN3MjYJcv2vbs9GHfrCixcV7nH+Ox3o6/YtRYak=";
};
- vendorSha256 = "sha256-iwB1JtekxFYSHjaV+TqBDqnyE5zt3RJ4dQmf12AA53U=";
+ vendorSha256 = "sha256-x7sSVIim/TOhMTbnRK/fpgxiSRSO8KwGILTE2i1gU3U=";
+
+ patches = [
+ # https://github.com/grafana/grafana/pull/35635 (fixes declarative plugins for us)
+ (fetchpatch {
+ url = "https://github.com/grafana/grafana/commit/5b5cb948092bdb85e0378fd9ae01b564c4bf65f1.patch";
+ sha256 = "sha256-MnCjfLiHsBSWPcxVZ2dC4q8x1/TjzR8uyQhH2Jzgx7o=";
+ includes = [ "pkg/util/filepath.go" ];
+ })
+ ];
preBuild = ''
# The testcase makes an API call against grafana.com:
@@ -32,7 +41,12 @@ buildGoModule rec {
# + (string) (len=5) "error": (string) (len=171) "Failed to send request: Get \"https://grafana.com/api/plugins/repo/test\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:48019->[::1]:53: read: connection refused",
# + (string) (len=7) "message": (string) (len=24) "Failed to install plugin"
# }
- sed -ie '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go
+ sed -i -e '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go
+
+ # Skip a flaky test (https://github.com/NixOS/nixpkgs/pull/126928#issuecomment-861424128)
+ sed -i -e '/it should change folder successfully and return correct result/{N;s/$/\nt.Skip();/}'\
+ pkg/services/libraryelements/libraryelements_patch_test.go
+
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
rm -r scripts/go
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix
index c0648c97e68b..365c188541b4 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix
@@ -2,11 +2,11 @@
grafanaPlugin rec {
pname = "grafana-clock-panel";
- version = "1.1.1";
- zipHash = "sha256-SvZyg7r+XG6i7jqYwxpPn6ZzJc7qmtfPtyphYppURDk=";
+ version = "1.1.3";
+ zipHash = "sha256-80JaMhY/EduSWvFrScfua99DGhT/FJUqY/kl0CafKCs=";
meta = with lib; {
description = "Clock panel for Grafana";
- license = licenses.asl20;
+ license = licenses.mit;
maintainers = with maintainers; [ lukegb ];
platforms = platforms.unix;
};
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix
index 2c44d3a4a062..3787c6cc5e1d 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix
@@ -2,11 +2,11 @@
grafanaPlugin rec {
pname = "grafana-piechart-panel";
- version = "1.6.1";
- zipHash = "sha256-64K/efoBKuBFp8Jw79hTdMyTurTZsL0qfgPDcUWz2jg=";
+ version = "1.6.2";
+ zipHash = "sha256-xKyVT092Ffgzl0BewQw5iZ14I/q6CviUR5t9BVM0bf0=";
meta = with lib; {
description = "Pie chart panel for Grafana";
- license = licenses.asl20;
+ license = licenses.mit;
maintainers = with maintainers; [ lukegb ];
platforms = platforms.unix;
};
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix
index 2f1671750fa5..4060a1c8dd88 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix
@@ -2,11 +2,11 @@
grafanaPlugin rec {
pname = "grafana-worldmap-panel";
- version = "0.3.2";
- zipHash = "sha256-MGAJzS9X91x6wt305jH1chLoW3zd7pIYDwRnPg9qrgE=";
+ version = "0.3.3";
+ zipHash = "sha256-3n1p3SvcBQMmnbnHimLBP7hauVV1IS3SMwttUWTNvb8=";
meta = with lib; {
description = "World Map panel for Grafana";
- license = licenses.asl20;
+ license = licenses.mit;
maintainers = with maintainers; [ lukegb ];
platforms = platforms.unix;
};
diff --git a/pkgs/servers/ucarp/default.nix b/pkgs/servers/ucarp/default.nix
new file mode 100644
index 000000000000..321a725cc89a
--- /dev/null
+++ b/pkgs/servers/ucarp/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, fetchurl, libpcap }:
+
+stdenv.mkDerivation rec {
+ pname = "ucarp";
+ version = "1.5.2";
+
+ src = fetchurl {
+ url = "https://download.pureftpd.org/pub/ucarp/ucarp-${version}.tar.bz2";
+ sha256 = "0qidz5sr55nxlmnl8kcbjsrff2j97b44h9l1dmhvvjl46iji7q7j";
+ };
+
+ buildInputs = [ libpcap ];
+
+ meta = with lib; {
+ description = "Userspace implementation of CARP";
+ longDescription = ''
+ UCARP allows a couple of hosts to share common virtual IP addresses in
+ order to provide automatic failover. It is a portable userland
+ implementation of the secure and patent-free Common Address Redundancy
+ Protocol (CARP, OpenBSD's alternative to the patents-bloated VRRP).
+
+ Warning: This package has not received any upstream updates for a long
+ time and can be considered as unmaintained.
+ '';
+ license = with licenses; [ isc bsdOriginal bsd2 gpl2Plus ];
+ maintainers = with maintainers; [ oxzi ];
+ };
+}
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 12ae858ea3a4..5e7c4d5368a4 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -6,13 +6,13 @@
}:
let
- version = "2.7.0";
+ version = "2.7.4";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
- sha256 = "sha256-w26pwGDL2j7qbporUzZATgw7E//E6xwahCbXv35QNnc=";
+ sha256 = "sha256-3cvrdWBXRM5F8qFEqbe8ru1U0wBqCkRxK7GAV0beJNk=";
};
runtimeDeps = [
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
index d3f999d34f47..af968cdf3313 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
@@ -232,7 +232,7 @@ GEM
multipart-post (2.1.1)
mustache (1.1.1)
nio4r (2.5.7)
- nokogiri (1.11.3)
+ nokogiri (1.11.5)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.5)
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
index 4b3ce8ce2192..974df1ed4eae 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
@@ -1284,10 +1284,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
+ sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
type = "gem";
};
- version = "1.11.3";
+ version = "1.11.5";
};
nokogumbo = {
dependencies = ["nokogiri"];
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 03498e59e464..ed6108d51480 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -571,11 +571,11 @@ lib.makeScope newScope (self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation {
- name = "fonttosfnt-1.2.2";
+ name = "fonttosfnt-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2";
- sha256 = "0r1s43ypy0a9z6hzdq5y02s2acj965rax4flwdyylvc54ppv86qs";
+ url = "mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2";
+ sha256 = "16r51h5wfy85wnbq3q8v8a184hb25c3ksjgix0mlcywdz7qkbj07";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
@@ -755,11 +755,11 @@ lib.makeScope newScope (self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation {
- name = "libX11-1.7.0";
+ name = "libX11-1.7.1";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2";
- sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n";
+ url = "mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2";
+ sha256 = "0isxad59hvdwggbxqqjjjg3zmih9xiq4d9mdsnqbyb2nmbg46kp6";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index bec738bd8929..e92491803585 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -175,7 +175,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2
+mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2
mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2
diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix
index e0449ce24c22..2ffd10e3a6ad 100644
--- a/pkgs/shells/hilbish/default.nix
+++ b/pkgs/shells/hilbish/default.nix
@@ -2,23 +2,23 @@
buildGoModule rec {
pname = "hilbish";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
- owner = "Hilbis";
+ owner = "Rosettea";
repo = "Hilbish";
rev = "v${version}";
- sha256 = "sha256-7YJkjkA6lGyO4PwJcdeUzqQvFsslDfIqAH6vlBtyYz8=";
+ sha256 = "sha256-cYpGTk0adT3X/elrJW2Wjv4SbPvgeyYmsOHTrft8678=";
};
- vendorSha256 = "sha256-9FftzTn5nxjfsHStcnrn9a+sECmcHRBUEtFjsMp8/ks=";
+ vendorSha256 = "sha256-8l+Kb1ADMLwv0Hf/ikok8eUcEEST07rhk8BjHxJI0lc=";
buildInputs = [ readline ];
meta = with lib; {
description = "An interactive Unix-like shell written in Go";
- changelog = "https://github.com/Hilbis/Hilbish/releases/tag/v${version}";
- homepage = "https://github.com/Hilbis/Hilbish";
+ changelog = "https://github.com/Rosettea/Hilbish/releases/tag/v${version}";
+ homepage = "https://github.com/Rosettea/Hilbish";
maintainers = with maintainers; [ fortuneteller2k ];
license = licenses.mit;
platforms = platforms.linux; # only officially supported on Linux
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index ea0caf020555..7c75e34f019a 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -145,7 +145,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
sshtunnel
urllib3
vsts-cd-manager
- websocket_client
+ websocket-client
xmltodict
javaproperties
jsondiff
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index 6dc575c6b602..228fb4503cf6 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -499,11 +499,10 @@ let
};
});
- websocket_client = super.websocket_client.overridePythonAttrs(oldAttrs: rec {
+ websocket-client = super.websocket-client.overridePythonAttrs(oldAttrs: rec {
version = "0.56.0";
- src = super.fetchPypi {
- inherit (oldAttrs) pname;
+ src = oldAttrs.src.override {
inherit version;
sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z";
};
diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index c2671646cb6b..62d07486214a 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
- version = "1.31.0";
+ version = "1.32.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-2CK/W8h0xfReqYt4a3qQ88Ydr8u9Ky6DfttJJaGu9kM=";
+ sha256 = "sha256-SQWGFF43J730XFj32ZU2N8PQMP2yIiSLLfEIAbeJvBg=";
};
goPackagePath = "github.com/exoscale/cli";
diff --git a/pkgs/tools/backup/mastodon-archive/default.nix b/pkgs/tools/backup/mastodon-archive/default.nix
new file mode 100644
index 000000000000..10e500339ee0
--- /dev/null
+++ b/pkgs/tools/backup/mastodon-archive/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "mastodon-archive";
+ version = "1.3.1";
+
+ src = fetchFromGitHub {
+ owner = "kensanata";
+ repo = "mastodon-backup";
+ rev = "v${version}";
+ sha256 = "1dlrkygywxwm6xbn0pnfwd3f7641wnvxdyb5qihbsf62w1w08x8r";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [
+ html2text
+ mastodon-py
+ progress
+ ];
+
+ # There is no test
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Utility for backing up your Mastodon content";
+ homepage = "https://alexschroeder.ch/software/Mastodon_Archive";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ julm ];
+ };
+}
diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix
index 175fa92bad2f..a108d55c6b5a 100644
--- a/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "bluez-alsa";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "Arkq";
repo = "bluez-alsa";
rev = "v${version}";
- sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8";
+ sha256 = "sha256-bohc/0hUr1mcV2JbFy71TjY8MXOU3oBBPCcupgkWsWY=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 9a05a0d67fec..aad633f3ba46 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
- version = "5.11.1";
+ version = "5.12.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- sha256 = "sha256-46rMxHVuxOVQLLKp+Ftn1SiWZE9MPA+IprxZjHC96/4=";
+ sha256 = "sha256-lQhG/qRU+0scOfD6RUmDZEVy35HfXAYEezNb8tVHN1k=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index ee7f86760707..92d35338d180 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
- version = "0.35.0";
+ version = "0.35.1";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
- sha256 = "sha256-GJ21Cqd/W/PocmN1p4OeeUdswhH7fSmAMiNTs0X3564=";
+ sha256 = "sha256-A6vhdECKMq0kcR7mUTPu9F0N7gVj7tOg7UXeJ/gmbnM=";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
diff --git a/pkgs/tools/games/amidst/default.nix b/pkgs/tools/games/amidst/default.nix
index 886ba3752a0b..552efee1537e 100644
--- a/pkgs/tools/games/amidst/default.nix
+++ b/pkgs/tools/games/amidst/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "amidst";
- version = "4.6";
+ version = "4.7";
src = fetchurl { # TODO: Compile from src
url = "https://github.com/toolbox4minecraft/amidst/releases/download/v${version}/amidst-v${lib.replaceStrings [ "." ] [ "-" ] version}.jar";
- sha256 = "0nz6xfhshy36j8k81kqdfbbxih96l7f3s9156f9lmw0mi1qlyzqk";
+ sha256 = "sha256-oecRjD7JUuvFym8N/hSE5cbAFQojS6yxOuxpwWRlW9M=";
};
dontUnpack = true;
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index b7a717b5b2f3..46efe896bf27 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "2.0.13";
+ version = "2.0.14";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "sha256-ApgprU8PC5sn62D6eM1JG3s4DD2+e8SfyPpiC/6ANmQ=";
+ sha256 = "sha256-nOXp7NdSZaWivrYd6TsmTtS2c8eBvEY7Ba0zZEEEI0A=";
};
- vendorSha256 = "sha256-07v+JzOYtfaaL2M/z5FOWlhhaEwWwc0wui3RLynP5N8=";
+ vendorSha256 = "sha256-7SfqBxCfOYwePK/6SsWS5StuVr0png6WjQXIDuQW0EE=";
doCheck = false;
diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix
index 32c5d3b47457..20288bf3f5e7 100644
--- a/pkgs/tools/misc/dua/default.nix
+++ b/pkgs/tools/misc/dua/default.nix
@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
- version = "2.13.0";
+ version = "2.13.1";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
- sha256 = "sha256-gJOEMp2Ex9gBsvYOmIKH7WNLQejiJhY8wnw2JYxcUU4=";
+ sha256 = "sha256-6xSRsLM1DD1xMjOGzHMDVLibrJlu9lN9OoSV7B/WMT0=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
'';
};
- cargoSha256 = "sha256-cN5rURv1RmesLzwm3ZXyGJXxvFeIbpTb6kWzJSKgX5o=";
+ cargoSha256 = "sha256-udz1EtPchEHxkvvVFnkwSOpFz4XEBGOXRz8qWREyzvc=";
doCheck = false;
diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix
new file mode 100644
index 000000000000..3edf59002b3d
--- /dev/null
+++ b/pkgs/tools/misc/esphome/dashboard.nix
@@ -0,0 +1,20 @@
+{ lib
+, python3
+}:
+
+with python3.pkgs; buildPythonPackage rec {
+ pname = "esphome-dashboard";
+ version = "20210615.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "07ammr46bipfi4b7nnjkip5l7966wxqhp5n3g2wqf68m3ymx24s9";
+ };
+
+ meta = with lib; {
+ description = "ESPHome dashboard";
+ homepage = "https://esphome.io/";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index fe02fe0d5219..1daf4f139cf6 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -1,4 +1,5 @@
{ lib
+, pkgs
, python3
, fetchFromGitHub
, platformio
@@ -6,15 +7,18 @@
, git
}:
+let
+ esphome-dashboard = pkgs.callPackage ./dashboard.nix {};
+in
python3.pkgs.buildPythonApplication rec {
pname = "esphome";
- version = "1.18.0";
+ version = "1.19.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1vz3d59wfqssfv1kvd4minlxibr0id06xfyg8956w9s3b22jc5vq";
+ sha256 = "07brvpsy40jv30h0a0ywrw4bgwajjd37xznw34s8k53y92qs8lfi";
};
postPatch = ''
@@ -44,6 +48,7 @@ python3.pkgs.buildPythonApplication rec {
click
colorama
cryptography
+ esphome-dashboard
ifaddr
paho-mqtt
pillow
@@ -66,6 +71,7 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = with python3.pkgs; [
hypothesis
mock
+ pytest-asyncio
pytest-mock
pytest-sugar
pytestCheckHook
@@ -75,6 +81,10 @@ python3.pkgs.buildPythonApplication rec {
$out/bin/esphome --help > /dev/null
'';
+ passthru = {
+ dashboard = esphome-dashboard;
+ };
+
meta = with lib; {
description = "Make creating custom firmwares for ESP32/ESP8266 super easy";
homepage = "https://esphome.io/";
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 705a8a554c18..095e43b9d3ee 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "execline";
- version = "2.8.0.0";
- sha256 = "0vbn4pdazy6x6213vn42k0khcij5bvkbrcfg7nw6inhf8154nx77";
+ version = "2.8.0.1";
+ sha256 = "1v9swmhw2rcrr9fmkmd7qh8qq0kslhmvxwz2a3bhan9ksabz8wx3";
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index 1315ac8540cb..03e8e260ac6b 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch }:
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
pname = "expect";
version = "5.45.4";
@@ -20,24 +20,14 @@ stdenv.mkDerivation rec {
sed -i "s,/bin/stty,$(type -p stty),g" configure.in
'';
- nativeBuildInputs = [ autoreconfHook makeWrapper tcl ];
- buildInputs = [ tcl ];
+ nativeBuildInputs = [ autoreconfHook makeWrapper ];
strictDeps = true;
hardeningDisable = [ "format" ];
- configureFlags = [
- "--with-tcl=${buildPackages.tcl}/lib"
- "--with-tclinclude=${tcl}/include"
- "--exec-prefix=${placeholder "out"}"
- ];
-
- postInstall = ''
+ postInstall = lib.optionalString stdenv.isDarwin ''
for i in $out/bin/*; do
- wrapProgram $i \
- --prefix PATH : "${tcl}/bin" \
- --prefix TCLLIBPATH ' ' $out/lib/* \
- ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"}
+ wrapProgram $i --prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}
done
'';
diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix
index c845c3de8e95..94b209bcd000 100644
--- a/pkgs/tools/misc/fsmon/default.nix
+++ b/pkgs/tools/misc/fsmon/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fsmon";
- version = "1.8.2";
+ version = "1.8.4";
src = fetchFromGitHub {
owner = "nowsecure";
repo = "fsmon";
rev = version;
- sha256 = "0y0gqb07girhz3r7gn9yrrysvhj5fapdafim0q8n7krk5y23hmh0";
+ sha256 = "sha256-4KF8h+YdCMrF9Yk/9y71WqNjzyoEZnddriDZAdpIaa4=";
};
installPhase = ''
diff --git a/pkgs/tools/misc/hdf4/darwin-aarch64.patch b/pkgs/tools/misc/hdf4/darwin-aarch64.patch
new file mode 100644
index 000000000000..cff81e581176
--- /dev/null
+++ b/pkgs/tools/misc/hdf4/darwin-aarch64.patch
@@ -0,0 +1,11 @@
+--- a/hdf/src/hdfi.h 2021-06-16 16:31:31.000000000 +1200
++++ b/hdf/src/hdfi.h 2021-06-16 16:42:26.000000000 +1200
+@@ -1343,7 +1343,7 @@
+ #endif /* IA64 */
+
+ /* Linux AArch64 */
+-#if defined __aarch64__
++#if defined __aarch64__ && !defined __APPLE__
+
+ #ifdef GOT_MACHINE
+ If you get an error on this line more than one machine type has been defined.
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix
index 5373c64d647c..99acda6b7883 100644
--- a/pkgs/tools/misc/hdf4/default.nix
+++ b/pkgs/tools/misc/hdf4/default.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch";
sha256 = "112svcsilk16ybbsi8ywnxfl2p1v44zh3rfn4ijnl8z08vfqrvvs";
})
+ ./darwin-aarch64.patch
];
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 0d684b16be58..b268b170ebbf 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lf";
- version = "22";
+ version = "23";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
- sha256 = "10zmac9xza2v7l13zkavmc34ppcpmb82v8dxvrv4ggm261ns1abr";
+ sha256 = "sha256-rwKTumletIN4OzvA2VzYh++vioUftvtKYAZoaEL5P7U=";
};
- vendorSha256 = "1yjsig2x6zrxdjnds6nqqq3r3g5lq8g9dvmz60nbifqhcx112bcw";
+ vendorSha256 = "sha256-ujQh4aE++K/fn3PJqkAbTtwRyJPSI9TJQ1DvwLF9etU=";
nativeBuildInputs = [ installShellFiles ];
@@ -35,6 +35,6 @@ buildGoModule rec {
changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}";
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index 293cc136c8c8..d10811ffa049 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -3,20 +3,18 @@
, fetchurl
, tk
, tcllib
-, makeWrapper
+, tcl
, tkremind ? true
}:
let
- inherit (lib) optional optionalString;
- tclLibraries = lib.optionals tkremind [ tcllib tk ];
- tclLibPaths = lib.concatStringsSep " "
- (map (p: "${p}/lib/${p.libPrefix}") tclLibraries);
+ inherit (lib) optional optionals optionalString;
+ tclLibraries = optionals tkremind [ tcllib tk ];
tkremindPatch = optionalString tkremind ''
substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
'';
in
-stdenv.mkDerivation rec {
+tcl.mkTclDerivation rec {
pname = "remind";
version = "03.03.06";
@@ -25,7 +23,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lpoMAXDJxwODY0/aoo25GRBYWFhE4uf11pR5/ITZX1s=";
};
- nativeBuildInputs = optional tkremind makeWrapper;
propagatedBuildInputs = tclLibraries;
postPatch = ''
@@ -37,10 +34,6 @@ stdenv.mkDerivation rec {
${tkremindPatch}
'';
- postInstall = optionalString tkremind ''
- wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}"
- '';
-
meta = with lib; {
homepage = "https://dianne.skoll.ca/projects/remind/";
description = "Sophisticated calendar and alarm program for the console";
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 731f6c48785f..d6f475a408ef 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -2,13 +2,10 @@
with skawarePackages;
-let
+buildPackage {
pname = "s6-portable-utils";
-
-in buildPackage {
- pname = pname;
- version = "2.2.3.1";
- sha256 = "1ks1ch5v3p2z8y8wp5fmzzgjrqn2l5sj1sgfp8vv6wy8psd8mrj3";
+ version = "2.2.3.2";
+ sha256 = "173nmygkp7ky3093dg4rx3ahvyl7ll86z8qj6pl3jd96xb9s49v6";
description = "A set of tiny general Unix utilities optimized for simplicity and small size";
@@ -28,7 +25,7 @@ in buildPackage {
rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
rm seekablepipe
- mv doc $doc/share/doc/${pname}/html
+ mv doc $doc/share/doc/s6-portable-utils/html
'';
diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix
index ebe1f056f4e2..e6fc7bf3f7fe 100644
--- a/pkgs/tools/misc/tfk8s/default.nix
+++ b/pkgs/tools/misc/tfk8s/default.nix
@@ -2,13 +2,14 @@
buildGoModule rec {
pname = "tfk8s";
- version = "0.1.3";
+ version = "0.1.4";
+ tag = "v${version}";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
- rev = "v${version}";
- sha256 = "sha256-3iI5gYfpkxfVylBgniaMeQ73uR8dAjVrdg/eBLRxUR4";
+ rev = tag;
+ sha256 = "sha256-Ha/F8rCGZqFYqJzfemmKRyEBI5khaSIerJxvf2Pf2ao=";
};
vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE=";
@@ -18,12 +19,19 @@ buildGoModule rec {
"-ldflags="
"-s"
"-w"
- "-X main.toolVersion=${version}"
+ "-X main.toolVersion=${tag}"
"-X main.builtBy=nixpkgs"
];
+ doCheck = true;
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/tfk8s --version | grep ${tag} > /dev/null
+ '';
+
meta = with lib; {
- description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format.";
+ description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format";
license = licenses.mit;
longDescription = ''
tfk8s is a tool that makes it easier to work with the Terraform Kubernetes Provider.
diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix
index ef7bd00f0e1e..d0a6114316fc 100644
--- a/pkgs/tools/misc/vivid/default.nix
+++ b/pkgs/tools/misc/vivid/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "vivid";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
- sha256 = "0m928hy2q8byfpm55nziiz86gcnhdnw3zpj78d8wx0pp318zjbla";
+ sha256 = "sha256-2rdNjpJrBuj6toLFzFJScNh6od5qUhkSaZF+NbPBlQA=";
};
- cargoSha256 = "1sn1cq3kaswnz2z9q5h84qipp64ha7jv5kix31lm7v6nam0f5awz";
+ cargoSha256 = "sha256-1aox1eiF3hu5guBjRcM3qb6mHJOutI+yargW7X4cFfg=";
meta = with lib; {
description = "A generator for LS_COLORS with support for multiple color themes";
diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix
index c3bea1d9e8c5..8dad93d0debb 100644
--- a/pkgs/tools/misc/yafetch/default.nix
+++ b/pkgs/tools/misc/yafetch/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "yafetch";
- version = "unstable-2021-06-01";
+ version = "unstable-2021-06-15";
src = fetchFromGitLab {
owner = "cyberkitty";
repo = pname;
- rev = "d9bbc1e4abca87028f898473c9a265161af3c287";
- sha256 = "0hyb5k7drnm9li720z1fdvz7b15xgf7n6yajnz1j98day3k88bqk";
+ rev = "423a7d1f1ef8f0e4caf586710828620d3cb593e3";
+ sha256 = "184yy7i8ca2fh6d1rxyhxi9gqb57fpz7ia0i56dl1zhg769m8b99";
};
# Use the provided NixOS logo automatically
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.com/cyberkitty/yafetch";
description = "Yet another fetch clone written in C++";
license = licenses.gpl2Only;
- maintainers = [ maintainers.ivar ];
+ maintainers = with maintainers; [ ivar ashley ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 6b3e9f839c70..1110c2cdb645 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
- version = "9.1.5";
+ version = "9.1.6";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-NjKj1m1g3F+YLNhFLDeO5DXtHIxPRwfSpunhRnSHRFc=";
+ sha256 = "sha256-FMx2Siw1J7UKtuwLcSkgMhs4Dl0erQcRb5FGkq2hFv0=";
};
- vendorSha256 = "sha256-cBf4UV9jBKvmcBG2XLPpPgO05GRB1SV1W3lJCuoQJQ4=";
+ vendorSha256 = "sha256-tPBPmZLcBR16RxqvL3UYlIAwK8IeV+DYkRrVOgBkm58=";
doCheck = false;
diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/tools/networking/croc/test-local-relay.nix
index 4ddad86bd009..bdcecb6b54c2 100644
--- a/pkgs/tools/networking/croc/test-local-relay.nix
+++ b/pkgs/tools/networking/croc/test-local-relay.nix
@@ -12,8 +12,7 @@ stdenv.mkDerivation {
${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
# wait for things to settle
sleep 1
- # receive, as of croc 9 --overwrite is required for noninteractive use
- MSG2=$(${croc}/bin/croc --overwrite --relay localhost:11111 --yes correct-horse-battery-staple)
+ MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple)
# compare
[ "$MSG" = "$MSG2" ] && touch $out
'';
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix
index f40ef295d138..744fd482ab18 100644
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/pkgs/tools/networking/dd-agent/5.nix
@@ -17,7 +17,7 @@ let
propagatedBuildInputs = with self; [
six
requests
- websocket_client
+ websocket-client
ipaddress
docker_pycreds
uptime
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 5036b1a87eaa..a4ebf5beef9b 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-dns";
- version = "2.3.5.0";
- sha256 = "0h5p5dbkkdadahrp4pqhc3x9ds758i6djy49k5zrn7mm5k4722wz";
+ version = "2.3.5.1";
+ sha256 = "0qsgqwdr5ms337fc9f2b4aa5cr7myvbzndvgkgswnrdwszjm078c";
description = "A suite of DNS client programs and libraries for Unix systems";
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index be19656f1c2d..e0c8eda9c749 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
buildPackage {
pname = "s6-networking";
- version = "2.4.1.0";
- sha256 = "023wnayv1gddklnsh3qv7i5jfy2fisbp24wa0nzjg0nfq3p807yc";
+ version = "2.4.1.1";
+ sha256 = "0m55ibx7k2wgrqbpci1n667ij0h925ajzggxalq2pj65kmwcmyx3";
description = "A suite of small networking utilities for Unix systems";
diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix
index c24b9a860e17..c08f234ab5b1 100644
--- a/pkgs/tools/networking/slirp4netns/default.nix
+++ b/pkgs/tools/networking/slirp4netns/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "slirp4netns";
- version = "1.1.10";
+ version = "1.1.11";
src = fetchFromGitHub {
owner = "rootless-containers";
repo = "slirp4netns";
rev = "v${version}";
- sha256 = "sha256-Qk5a8h9IkLwYRmPL8pFlyVsQ/xMZ2/wkq8zZ7yfrLEQ=";
+ sha256 = "sha256-Gxcu9XlLPLcFUoCDrMeWJ6SGUSHU9ZKPHq1oBvmNoJ8=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix
index ae9a8714b852..5da02aa771ba 100644
--- a/pkgs/tools/package-management/libdnf/default.nix
+++ b/pkgs/tools/package-management/libdnf/default.nix
@@ -3,13 +3,13 @@
gcc9Stdenv.mkDerivation rec {
pname = "libdnf";
- version = "0.62.0";
+ version = "0.63.0";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = pname;
rev = version;
- sha256 = "sha256-Se15VmBbzt/NASjrA25RdpHDVIG/GOSqn6ibpBe752g=";
+ sha256 = "sha256-+D1KosfeoEzRgAE6WheO0Vo/1oq7+1tWPa7rRemyZYo=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix
index bc6ca60a9e7b..5b49cbf023bf 100644
--- a/pkgs/tools/package-management/reuse/default.nix
+++ b/pkgs/tools/package-management/reuse/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "reuse";
- version = "0.12.1";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "fsfe";
repo = "reuse-tool";
rev = "v${version}";
- sha256 = "0ql0krnz0fmq405r2qrm9ysm3cvmqfw14j06pny6na7qshibj78z";
+ sha256 = "0didqsbvrn06aylp71jl3hqb4rd95d8s613xz6jw6mngyjqv0hq2";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix
index 31b76727cddc..5d634630128d 100644
--- a/pkgs/tools/security/kubesec/default.nix
+++ b/pkgs/tools/security/kubesec/default.nix
@@ -5,23 +5,24 @@
buildGoModule rec {
pname = "kubesec";
- version = "2.11.1";
+ version = "2.11.2";
src = fetchFromGitHub {
owner = "controlplaneio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-vT+SiSt9QoOkGbnPdKkzE8yehNJMa/3jYC+4h4QeNmw=";
+ sha256 = "sha256-W9c3L8lYjF1W0kwSODhMldlqX1h+2mZIRtElZ20skn4=";
};
vendorSha256 = "sha256-zfQu1EdwvR+LGmsbE8RA4pcOGgsukG1TMTCgPyNoVsc=";
- # Tests wants to download additional files
+ # Tests wants to download the kubernetes schema for use with kubeval
doCheck = false;
meta = with lib; {
description = "Security risk analysis tool for Kubernetes resources";
homepage = "https://github.com/controlplaneio/kubesec";
+ changelog = "https://github.com/controlplaneio/kubesec/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/tools/security/pass/clip-wayland-support.patch b/pkgs/tools/security/pass/clip-wayland-support.patch
deleted file mode 100644
index 7b8d2eb010d2..000000000000
--- a/pkgs/tools/security/pass/clip-wayland-support.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From b0b784b1a57c0b06936e6f5d6560712b4b810cd3 Mon Sep 17 00:00:00 2001
-From: Brett Cornwall
-Date: Wed, 27 Feb 2019 00:08:33 -0700
-Subject: clip: Add support for wl-clipboard
-
-Edited to properly apply with
-`set-correct-program-name-for-sleep.patch`.
-
----
- README | 4 +++-
- man/pass.1 | 5 +++++
- src/password-store.sh | 26 +++++++++++++++++++++-----
- 3 files changed, 29 insertions(+), 6 deletions(-)
-
-diff --git a/README b/README
-index 6b59965..1a46242 100644
---- a/README
-+++ b/README
-@@ -19,8 +19,10 @@ Depends on:
- http://www.gnupg.org/
- - git
- http://www.git-scm.com/
--- xclip
-+- xclip (for X11 environments)
- http://sourceforge.net/projects/xclip/
-+- wl-clipboard (for wlroots Wayland-based environments)
-+ https://github.com/bugaevc/wl-clipboard
- - tree >= 1.7.0
- http://mama.indstate.edu/users/ice/tree/
- - GNU getopt
-diff --git a/man/pass.1 b/man/pass.1
-index 01a3fbe..a555dcb 100644
---- a/man/pass.1
-+++ b/man/pass.1
-@@ -99,6 +99,8 @@ Decrypt and print a password named \fIpass-name\fP. If \fI--clip\fP or \fI-c\fP
- is specified, do not print the password but instead copy the first (or otherwise specified)
- line to the clipboard using
- .BR xclip (1)
-+or
-+.BR wl-clipboard(1)
- and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds. If \fI--qrcode\fP
- or \fI-q\fP is specified, do not print the password but instead display a QR code using
- .BR qrencode (1)
-@@ -132,6 +134,8 @@ in generating passwords can be changed with the \fIPASSWORD_STORE_CHARACTER_SET\
- If \fI--clip\fP or \fI-c\fP is specified, do not print the password but instead copy
- it to the clipboard using
- .BR xclip (1)
-+or
-+.BR wl-clipboard(1)
- and then restore the clipboard after 45 (or \fIPASSWORD_STORE_CLIP_TIME\fP) seconds. If \fI--qrcode\fP
- or \fI-q\fP is specified, do not print the password but instead display a QR code using
- .BR qrencode (1)
-@@ -466,6 +470,7 @@ The location of the text editor used by \fBedit\fP.
- .BR tr (1),
- .BR git (1),
- .BR xclip (1),
-+.BR wl-clipboard (1),
- .BR qrencode (1).
-
- .SH AUTHOR
-diff --git a/src/password-store.sh b/src/password-store.sh
-index d89d455..284eabf 100755
---- a/src/password-store.sh
-+++ b/src/password-store.sh
-@@ -152,16 +152,32 @@ check_sneaky_paths() {
- #
-
- clip() {
-+ if [[ -n $WAYLAND_DISPLAY ]]; then
-+ local copy_cmd=( wl-copy )
-+ local paste_cmd=( wl-paste -n )
-+ if [[ $X_SELECTION == primary ]]; then
-+ copy_cmd+=( --primary )
-+ paste_cmd+=( --primary )
-+ fi
-+ local display_name="$WAYLAND_DISPLAY"
-+ elif [[ -n $DISPLAY ]]; then
-+ local copy_cmd=( xclip -selection "$X_SELECTION" )
-+ local paste_cmd=( xclip -o -selection "$X_SELECTION" )
-+ local display_name="$DISPLAY"
-+ else
-+ die "Error: No X11 or Wayland display detected"
-+ fi
-+ local sleep_argv0="password store sleep on display $display_name"
-+
- # This base64 business is because bash cannot store binary data in a shell
- # variable. Specifically, it cannot store nulls nor (non-trivally) store
- # trailing new lines.
-- local sleep_argv0="password store sleep on display $DISPLAY"
- pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
-- local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | $BASE64)"
-- echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard"
-+ local before="$("${paste_cmd[@]}" 2>/dev/null | $BASE64)"
-+ echo -n "$1" | "${copy_cmd[@]}" || die "Error: Could not copy data to the clipboard"
- (
- ( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") )
-- local now="$(xclip -o -selection "$X_SELECTION" | $BASE64)"
-+ local now="$("${paste_cmd[@]}" | $BASE64)"
- [[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
-
- # It might be nice to programatically check to see if klipper exists,
-@@ -173,7 +189,7 @@ clip() {
- # so we axe it here:
- qdbus org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory &>/dev/null
-
-- echo "$before" | $BASE64 -d | xclip -selection "$X_SELECTION"
-+ echo "$before" | $BASE64 -d | "${copy_cmd[@]}"
- ) >/dev/null 2>&1 & disown
- echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds."
- }
---
-cgit v1.2.1-28-gf32c
-
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index a7872c50fb3b..7468b5dcc8d3 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -3,8 +3,9 @@
, which, procps , qrencode , makeWrapper, pass, symlinkJoin
, xclip ? null, xdotool ? null, dmenu ? null
-, x11Support ? !stdenv.isDarwin , dmenuSupport ? x11Support
+, x11Support ? !stdenv.isDarwin , dmenuSupport ? (x11Support || waylandSupport)
, waylandSupport ? false, wl-clipboard ? null
+, ydotool ? null, dmenu-wayland ? null
# For backwards-compatibility
, tombPluginSupport ? false
@@ -13,13 +14,15 @@
with lib;
assert x11Support -> xclip != null;
-
-assert dmenuSupport -> dmenu != null
- && xdotool != null
- && x11Support;
-
assert waylandSupport -> wl-clipboard != null;
+assert dmenuSupport -> x11Support || waylandSupport;
+assert dmenuSupport && x11Support
+ -> dmenu != null && xdotool != null;
+assert dmenuSupport && waylandSupport
+ -> dmenu-wayland != null && ydotool != null;
+
+
let
passExtensions = import ./extensions { inherit pkgs; };
@@ -52,21 +55,18 @@ let
in
stdenv.mkDerivation rec {
- version = "1.7.3";
+ version = "1.7.4";
pname = "password-store";
src = fetchurl {
url = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz";
- sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b";
+ sha256 = "1h4k6w7g8pr169p5w9n6mkdhxl3pw51zphx7www6pvgjb7vgmafg";
};
patches = [
./set-correct-program-name-for-sleep.patch
./extension-dir.patch
- ] ++ lib.optional stdenv.isDarwin ./no-darwin-getopt.patch
- # TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next
- # version bump.
- ++ lib.optional waylandSupport ./clip-wayland-support.patch;
+ ] ++ lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
nativeBuildInputs = [ makeWrapper ];
@@ -74,8 +74,7 @@ stdenv.mkDerivation rec {
postInstall = ''
# Install Emacs Mode. NOTE: We can't install the necessary
- # dependencies (s.el and f.el) here. The user has to do this
- # himself.
+ # dependencies (s.el) here. The user has to do this themselves.
mkdir -p "$out/share/emacs/site-lisp"
cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
'' + optionalString dmenuSupport ''
@@ -96,8 +95,10 @@ stdenv.mkDerivation rec {
procps
] ++ optional stdenv.isDarwin openssl
++ optional x11Support xclip
- ++ optionals dmenuSupport [ xdotool dmenu ]
- ++ optional waylandSupport wl-clipboard);
+ ++ optional waylandSupport wl-clipboard
+ ++ optionals (waylandSupport && dmenuSupport) [ ydotool dmenu-wayland ]
+ ++ optionals (x11Support && dmenuSupport) [ xdotool dmenu ]
+ );
postFixup = ''
# Fix program name in --help
diff --git a/pkgs/tools/security/pass/no-darwin-getopt.patch b/pkgs/tools/security/pass/no-darwin-getopt.patch
index e8f7e138ff02..7e8b66dd7f1a 100644
--- a/pkgs/tools/security/pass/no-darwin-getopt.patch
+++ b/pkgs/tools/security/pass/no-darwin-getopt.patch
@@ -1,9 +1,11 @@
-diff -Naur password-store-1.6.5-orig/src/platform/darwin.sh password-store-1.6.5/src/platform/darwin.sh
---- password-store-1.6.5-orig/src/platform/darwin.sh 2015-01-28 16:43:02.000000000 +0000
-+++ password-store-1.6.5/src/platform/darwin.sh 2015-02-15 16:09:02.000000000 +0000
-@@ -31,5 +31,4 @@
- mount -t hfs -o noatime -o nobrowse "$DARWIN_RAMDISK_DEV" "$SECURE_TMPDIR" || die "Error: could not mount filesystem on ramdisk."
+diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh
+index f6cc471..e2e8bba 100644
+--- a/src/platform/darwin.sh
++++ b/src/platform/darwin.sh
+@@ -39,6 +39,5 @@ qrcode() {
+ fi
}
--GETOPT="$(brew --prefix gnu-getopt 2>/dev/null || { which port &>/dev/null && echo /opt/local; } || echo /usr/local)/bin/getopt"
+-GETOPT="$({ test -x /usr/local/opt/gnu-getopt/bin/getopt && echo /usr/local/opt/gnu-getopt; } || brew --prefix gnu-getopt 2>/dev/null || { which port &>/dev/null && echo /opt/local; } || echo /usr/local)/bin/getopt"
SHRED="srm -f -z"
+ BASE64="openssl base64"
diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
index f3a844ad2d6d..a71a279c1ef7 100644
--- a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
+++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
@@ -5,29 +5,10 @@ Subject: [PATCH] Patch the clip() function to work even when using
single-binary coreutils
---
- src/password-store.sh | 4 ++--
src/platform/cygwin.sh | 4 ++--
src/platform/darwin.sh | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/src/password-store.sh b/src/password-store.sh
-index 7264ffc..68551a4 100755
---- a/src/password-store.sh
-+++ b/src/password-store.sh
-@@ -155,11 +155,11 @@ clip() {
- # variable. Specifically, it cannot store nulls nor (non-trivally) store
- # trailing new lines.
- local sleep_argv0="password store sleep on display $DISPLAY"
-- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
-+ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
- local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | $BASE64)"
- echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard"
- (
-- ( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" )
-+ ( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") )
- local now="$(xclip -o -selection "$X_SELECTION" | $BASE64)"
- [[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
-
diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh
index 5a8d5ea..423e0ce 100644
--- a/src/platform/cygwin.sh
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 8ee30317bef5..4b1bcec96a7b 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfs";
- version = "2.2";
+ version = "2.2.1";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
- sha256 = "sha256-YxQBKXjYITVy8c6DJ3GwDR0ESgzghqJCcj1GEv8Lp2Q=";
+ sha256 = "sha256-3E1EXtI8QvHRDoVSV21K1/Rknp3E+GV1n5iorrv5jNY=";
};
buildInputs = lib.optionals stdenv.isLinux [ libcap acl ];
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 20c23e150519..532575d16c88 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-rc";
- version = "0.5.2.1";
- sha256 = "02pszbi440wagx2qp8aqj9mv5wm2qisw9lkq7mbnbnxxw9azlhi8";
+ version = "0.5.2.2";
+ sha256 = "12bzc483jpd16xmhfsfrib84daj1k3kwy5s5nc18ap60apa1r39a";
description = "A service manager for s6-based systems";
platforms = lib.platforms.linux;
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index 16fd1be63394..e9d096a7ab0e 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6";
- version = "2.10.0.2";
- sha256 = "08bcrp7ck1l3wmjyzxi3vgk6j0n2jfymxs4rjjw4if40f3lgqfmj";
+ version = "2.10.0.3";
+ sha256 = "0mw7blp8dwr09z58m9mrxwmmvvpnjzq9klcf1vgm0hbha4qkf88x";
description = "skarnet.org's small & secure supervision software suite";
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 97c61d2da0e7..a53ef4ae9f85 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "thinkfan";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "vmatare";
repo = "thinkfan";
rev = version;
- sha256 = "18vgm5w5pjnpipa34j4x87q10695w2jnqwvc2f027afy7mnzw7kz";
+ sha256 = "01l1pnj1cgy3dwgyys2s5iqzyv6kk47vlpy09qjafk8py21ijik3";
};
postPatch = ''
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index 1c9e81492323..eaaf7046fff9 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -79,7 +79,7 @@ in with localPython.pkgs; buildPythonApplication rec {
# Otherwise, awsebcli will try to install it using pip when using some
# commands (like "eb local run").
blessed botocore cement colorama dockerpty docopt pathspec pyyaml
- requests semantic-version setuptools tabulate termcolor websocket_client
+ requests semantic-version setuptools tabulate termcolor websocket-client
];
postInstall = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eedf4fc75efc..ed0f82e9404f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -818,10 +818,6 @@ mapAliases ({
telepathy_salut = telepathy-salut; # added 2018-02-25
telnet = inetutils; # added 2018-05-15
terraform_1_0_0 = terraform_1_0; # added 2021-06-15
- terraform_0_12 = throw "terraform 0.12 has been removed"; # added 2021-06-15
- terraform_0_13 = throw "terraform 0.13 has been removed"; # added 2021-06-15
- terraform_0_14 = throw "terraform 0.14 has been removed"; # added 2021-06-15
- terraform_0_15 = throw "terraform 0.15 has been removed"; # added 2021-06-15
terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28
terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28
terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16
@@ -834,7 +830,9 @@ mapAliases ({
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
tftp_hpa = tftp-hpa; # added 2015-04-03
timescale-prometheus = promscale; # added 2020-09-29
- tomcat85 = tomcat8; # added 2020-03-11
+ tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
+ tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
+ tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11
torbrowser = tor-browser-bundle-bin; # added 2017-04-05
torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28
torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 774d62aeb4bb..f858f8d9911d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -946,9 +946,7 @@ in
flavour = "git";
};
- logseq = callPackage ../applications/misc/logseq {
- electron = electron_12;
- };
+ logseq = callPackage ../applications/misc/logseq { };
lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
@@ -9403,6 +9401,8 @@ in
ubertooth = callPackage ../applications/radio/ubertooth { };
+ ucarp = callPackage ../servers/ucarp { };
+
ucl = callPackage ../development/libraries/ucl { };
ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { };
@@ -11789,7 +11789,7 @@ in
};
rust_1_52 = callPackage ../development/compilers/rust/1_52.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
- llvm_11 = llvmPackages_11.libllvm;
+ llvm_12 = llvmPackages_12.libllvm;
};
rust = rust_1_52;
@@ -13652,6 +13652,8 @@ in
litecli = callPackage ../development/tools/database/litecli {};
+ litestream = callPackage ../development/tools/database/litestream {};
+
lsof = callPackage ../development/tools/misc/lsof { };
ltrace = callPackage ../development/tools/misc/ltrace { };
@@ -13669,6 +13671,8 @@ in
massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
+ mastodon-archive = callPackage ../tools/backup/mastodon-archive { };
+
maven = maven3;
maven3 = callPackage ../development/tools/build-managers/apache-maven { };
@@ -15280,6 +15284,8 @@ in
qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { };
+ qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp {};
+
gnet = callPackage ../development/libraries/gnet { };
gnu-config = callPackage ../development/libraries/gnu-config { };
@@ -16215,6 +16221,8 @@ in
libsecret = callPackage ../development/libraries/libsecret { };
+ libserdes = callPackage ../development/libraries/libserdes { };
+
libserialport = callPackage ../development/libraries/libserialport { };
libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { };
@@ -16297,7 +16305,7 @@ in
libgpgerror = callPackage ../development/libraries/libgpg-error { };
- # https://github.com/gpg/libgpg-error/blob/70058cd9f944d620764e57c838209afae8a58c78/README#L118-L140
+ # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118
libgpgerror-gen-posix-lock-obj = libgpgerror.override {
genPosixLockObjOnly = true;
};
@@ -18329,9 +18337,7 @@ in
tcllib = callPackage ../development/libraries/tcllib { };
- tcltls = callPackage ../development/libraries/tcltls {
- openssl = openssl_1_0_2;
- };
+ tcltls = callPackage ../development/libraries/tcltls { };
tclx = callPackage ../development/libraries/tclx { };
@@ -19241,7 +19247,7 @@ in
gofish = callPackage ../servers/gopher/gofish { };
grafana = callPackage ../servers/monitoring/grafana { };
- grafanaPlugins = dontRecurseIntoAttrs (callPackage ../servers/monitoring/grafana/plugins { });
+ grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
@@ -20006,9 +20012,8 @@ in
trafficserver = callPackage ../servers/http/trafficserver { };
inherit (callPackages ../servers/http/tomcat { })
- tomcat7
- tomcat8
- tomcat9;
+ tomcat9
+ tomcat10;
tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
@@ -20429,6 +20434,7 @@ in
iomelt = callPackage ../os-specific/linux/iomelt { };
iotop = callPackage ../os-specific/linux/iotop { };
+ iotop-c = callPackage ../os-specific/linux/iotop-c { };
iproute2 = callPackage ../os-specific/linux/iproute { };
@@ -23411,6 +23417,7 @@ in
acl = null;
gpm = null;
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
+ inherit (darwin) sigtool;
};
emacs27-nox = lowPrio (appendToName "nox" (emacs27.override {
@@ -24768,6 +24775,8 @@ in
kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
+ kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { };
+
kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
@@ -24893,7 +24902,9 @@ in
fluxcd = callPackage ../applications/networking/cluster/fluxcd { };
- linkerd = callPackage ../applications/networking/cluster/linkerd { };
+ linkerd_stable = (callPackage ../applications/networking/cluster/linkerd { }).stable;
+ linkerd_edge = (callPackage ../applications/networking/cluster/linkerd { }).edge;
+ linkerd = linkerd_edge;
kile-wl = callPackage ../applications/misc/kile-wl { };
@@ -26818,6 +26829,10 @@ in
git = gitMinimal;
};
+ survex = callPackage ../applications/misc/survex {
+ inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+ };
+
sunvox = callPackage ../applications/audio/sunvox { };
svkbd = callPackage ../applications/accessibility/svkbd { };
@@ -28180,7 +28195,7 @@ in
zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
- openethereum = callPackage ../applications/blockchains/openethereum { stdenv = llvmPackages_12.stdenv; };
+ openethereum = callPackage ../applications/blockchains/openethereum { };
parity-ui = callPackage ../applications/blockchains/parity-ui { };
@@ -30627,6 +30642,8 @@ in
j2cli = with python3Packages; toPythonApplication j2cli;
+ jquake = callPackage ../applications/misc/jquake { };
+
jstest-gtk = callPackage ../tools/misc/jstest-gtk { };
keynav = callPackage ../tools/X11/keynav { };
@@ -31148,6 +31165,9 @@ in
mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { };
mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { };
+ mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { };
+ mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { };
+
samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36/default.nix { };
samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { };
samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
@@ -31249,6 +31269,10 @@ in
inherit (callPackage ../applications/networking/cluster/terraform { })
mkTerraform
+ terraform_0_12
+ terraform_0_13
+ terraform_0_14
+ terraform_0_15
terraform_1_0
terraform_plugins_test
;
@@ -31330,6 +31354,8 @@ in
urbit = callPackage ../misc/urbit { };
+ usql = callPackage ../applications/misc/usql { };
+
utf8cpp = callPackage ../development/libraries/utf8cpp { };
utf8proc = callPackage ../development/libraries/utf8proc { };
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 4dc848c08c6f..6a189c0005a0 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -14,12 +14,6 @@
let self = dotnetPackages // overrides; dotnetPackages = with self; {
# BINARY PACKAGES
- Autofac = fetchNuGet {
- baseName = "Autofac";
- version = "3.5.2";
- sha256 = "194cs8ybn5xjqnzy643w5i62m0d5s34d3nshwxp2v4fcb94wa4ri";
- outputFiles = [ "lib/portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1/*" ];
- };
NUnit3 = fetchNuGet {
baseName = "NUnit";
@@ -28,13 +22,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "lib/*" ];
};
- NUnit350 = fetchNuGet {
- baseName = "NUnit";
- version = "3.5.0";
- sha256 = "19fxq9cf754ygda5c8rn1zqs71pfxi7mb96jwqhlichnqih6i16z";
- outputFiles = [ "*" ];
- };
-
NUnit2 = fetchNuGet {
baseName = "NUnit";
version = "2.6.4";
@@ -86,13 +73,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "tools/*" ];
};
- SystemValueTuple = fetchNuGet {
- baseName = "System.ValueTuple";
- version = "4.3.1";
- sha256 = "0qzq878s66yfkf4n2b9af8lw2bx45s3cg6mi0w8w0bi358fa7q70";
- outputFiles = [ "*" ];
- };
-
RestSharp = fetchNuGet {
baseName = "RestSharp";
version = "105.2.3";
@@ -135,20 +115,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "lib/*" ];
};
- MicrosoftDiaSymReader = fetchNuGet {
- baseName = "Microsoft.DiaSymReader";
- version = "1.1.0";
- sha256 = "04dgwy6nyxksd1nb24k5c5vz8naggg7hryadvwqnm2v3alkh6g88";
- outputFiles = [ "*" ];
- };
-
- MicrosoftDiaSymReaderPortablePdb = fetchNuGet {
- baseName = "Microsoft.DiaSymReader.PortablePdb";
- version = "1.2.0";
- sha256 = "0qa8sqg0lzz9galkkfyi8rkbkali0nxm3qd5y4dlxp96ngrq5ldz";
- outputFiles = [ "*" ];
- };
-
NUnitRunners = fetchNuGet {
baseName = "NUnit.Runners";
version = "2.6.4";
@@ -157,26 +123,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
preInstall = "mv -v tools/lib/* tools && rmdir -v tools/lib";
};
- SystemCollectionsImmutable = fetchNuGet {
- baseName = "System.Collections.Immutable";
- version = "1.1.36";
- sha256 = "0760kzf5s771pnvnxsgas446kqdh1b71w6g3k75jpzldfmsd3vyq";
- outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ];
- };
-
- SystemCollectionsImmutable131 = fetchNuGet {
- baseName = "System.Collections.Immutable";
- version = "1.3.1";
- sha256 = "149fcp7k7r9iw24dv5hbaij0c38kcv28dyhzbkggilfh4x2hy8c2";
- outputFiles = [ "*" ];
- };
-
- SystemReflectionMetadata = fetchNuGet {
- baseName = "System.Reflection.Metadata";
- version = "1.4.2";
- sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i";
- outputFiles = [ "*" ];
- };
# SOURCE PACKAGES
Boogie = buildDotnetPackage rec {
@@ -300,91 +246,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
- Deedle = fetchNuGet {
- baseName = "Deedle";
- version = "1.2.5";
- sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw";
- outputFiles = [ "*" ];
- };
-
- ExcelDna = buildDotnetPackage {
- baseName = "Excel-DNA";
- version = "0.32.0";
-
- src = fetchFromGitHub {
- owner = "Excel-DNA";
- repo = "ExcelDna";
- rev = "10a163843bcc2fb5517f6f3d499e18a8b64df511";
- sha256 = "1w2ag9na20ly0m2sic3nkgdc4qqyb4x4c9iv588ynpkgd1pjndrk";
- };
-
- buildInputs = [ ];
-
- preConfigure = ''
- rm -vf Distribution/*.dll Distribution/*.exe # Make sure we don't use those
- substituteInPlace Source/ExcelDna.Integration/ExcelDna.Integration.csproj --replace LogDisplay.designer.cs LogDisplay.Designer.cs
- '';
-
- xBuildFiles = [ "Source/ExcelDna.sln" ];
- outputFiles = [ "Source/ExcelDnaPack/bin/Release/*" "Distribution/ExcelDna.xll" "Distribution/ExcelDna64.xll" ];
-
- meta = {
- description = "Excel-DNA is an independent project to integrate .NET into Excel";
- homepage = "https://excel-dna.net/";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ obadz ];
- platforms = with lib.platforms; linux;
- };
- };
-
- GitVersionTree = buildDotnetPackage {
- baseName = "GitVersionTree";
- version = "2013-10-01";
-
- src = fetchFromGitHub {
- owner = "crc8";
- repo = "GitVersionTree";
- rev = "58dc39c43cffea44f721ee4425835e56518f7da2";
- sha256 = "0mna5pkpqkdr5jgn8paz004h1pa24ncsvmi2c8s4gp94nfw34x05";
- };
-
- buildInputs = with pkgs; [ ed ];
-
- postPatch = ''
- ed -v -p: -s GitVersionTree/Program.cs << EOF
- /Main()
- c
- static void Main(string[] args)
- .
- /EnableVisualStyles
- i
- Reg.Write("GitPath", "${pkgs.gitMinimal}/bin/git");
- Reg.Write("GraphvizPath", "${pkgs.graphviz}/bin/dot");
- if (args.Length > 0) {
- Reg.Write("GitRepositoryPath", args[0]);
- }
- .
- w
- EOF
-
- substituteInPlace GitVersionTree/Forms/MainForm.cs \
- --replace 'Directory.GetParent(Application.ExecutablePath)' 'Environment.CurrentDirectory' \
- --replace '\\' '/' \
- --replace '@"\"' '"/"'
- '';
-
- outputFiles = [ "GitVersionTree/bin/Release/*" ];
- exeFiles = [ "GitVersionTree.exe" ];
-
- meta = with lib; {
- description = "A tool to help visualize git revisions and branches";
- homepage = "https://github.com/crc8/GitVersionTree";
- license = licenses.gpl2;
- maintainers = with maintainers; [ obadz ];
- platforms = platforms.all;
- };
- };
-
MonoAddins = buildDotnetPackage rec {
baseName = "Mono.Addins";
version = "1.2";
@@ -417,38 +278,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
-
- NDeskOptions = stdenv.mkDerivation rec {
- pname = "NDesk.Options";
- version = "0.2.1";
-
- src = fetchurl {
- name = "${pname}-${version}.tar.gz";
- url = "http://www.ndesk.org/archive/ndesk-options/ndesk-options-${version}.tar.gz";
- sha256 = "1y25bfapafwmifakjzyb9c70qqpvza8g5j2jpf08j8wwzkrb6r28";
- };
-
- buildInputs = [
- mono
- pkg-config
- ];
-
- postInstall = ''
- # Otherwise pkg-config won't find it and the DLL will get duplicated
- ln -sv $out/lib/pkgconfig/ndesk-options.pc $out/lib/pkgconfig/NDesk.Options.pc
- '';
-
- dontStrip = true;
-
- meta = {
- description = "A callback-based program option parser for C#";
- homepage = "http://www.ndesk.org/Options";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ obadz ];
- platforms = with lib.platforms; linux;
- };
- };
-
NewtonsoftJson = fetchNuGet {
baseName = "Newtonsoft.Json";
version = "11.0.2";
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9168661a75b9..c6172887833b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -217,6 +217,8 @@ let
cstruct = callPackage ../development/ocaml-modules/cstruct {};
+ cstruct-async = callPackage ../development/ocaml-modules/cstruct/async.nix { };
+
cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { };
cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {};
@@ -1144,6 +1146,8 @@ let
reason = callPackage ../development/compilers/reason { };
+ reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { });
+
rope = callPackage ../development/ocaml-modules/rope { };
rpclib = callPackage ../development/ocaml-modules/rpclib { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 4a19d69d5628..b9c37c960908 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -48,8 +48,10 @@ mapAliases ({
pytest-pep8 = pytestpep8; # added 2021-01-04
pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
+ selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10
setuptools_scm = setuptools-scm; # added 2021-06-03
smart_open = smart-open; # added 2021-03-14
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22
+ websocket_client = websocket-client;
})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c51f9ccbab9..1b42003c32dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -245,6 +245,8 @@ in {
aioasuswrt = callPackage ../development/python-modules/aioasuswrt { };
+ aioazuredevops = callPackage ../development/python-modules/aioazuredevops { };
+
aiocache = callPackage ../development/python-modules/aiocache { };
aiocoap = callPackage ../development/python-modules/aiocoap { };
@@ -499,6 +501,8 @@ in {
arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { };
+ arcam-fmj = callPackage ../development/python-modules/arcam-fmj { };
+
archinfo = callPackage ../development/python-modules/archinfo { };
area = callPackage ../development/python-modules/area { };
@@ -725,6 +729,8 @@ in {
azure-eventgrid = callPackage ../development/python-modules/azure-eventgrid { };
+ azure-eventhub = callPackage ../development/python-modules/azure-eventhub { };
+
azure-functions-devops-build = callPackage ../development/python-modules/azure-functions-devops-build { };
azure-graphrbac = callPackage ../development/python-modules/azure-graphrbac { };
@@ -1053,6 +1059,8 @@ in {
billiard = callPackage ../development/python-modules/billiard { };
+ bimmer-connected = callPackage ../development/python-modules/bimmer-connected { };
+
binaryornot = callPackage ../development/python-modules/binaryornot { };
binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };
@@ -1099,12 +1107,16 @@ in {
bleak = callPackage ../development/python-modules/bleak { };
+ blebox-uniapi = callPackage ../development/python-modules/blebox-uniapi { };
+
blessed = callPackage ../development/python-modules/blessed { };
blessings = callPackage ../development/python-modules/blessings { };
blinker = callPackage ../development/python-modules/blinker { };
+ blinkpy = callPackage ../development/python-modules/blinkpy { };
+
BlinkStick = callPackage ../development/python-modules/blinkstick { };
blis = callPackage ../development/python-modules/blis { };
@@ -1133,6 +1145,8 @@ in {
boltztrap2 = callPackage ../development/python-modules/boltztrap2 { };
+ bond-api = callPackage ../development/python-modules/bond-api { };
+
booleanoperations = callPackage ../development/python-modules/booleanoperations { };
boolean-py = callPackage ../development/python-modules/boolean-py { };
@@ -1146,6 +1160,10 @@ in {
boschshcpy = callPackage ../development/python-modules/boschshcpy { };
+ boost-histogram = callPackage ../development/python-modules/boost-histogram {
+ inherit (pkgs) boost;
+ };
+
boto3 = callPackage ../development/python-modules/boto3 { };
boto = callPackage ../development/python-modules/boto { };
@@ -1551,6 +1569,8 @@ in {
colorspacious = callPackage ../development/python-modules/colorspacious { };
+ colorthief = callPackage ../development/python-modules/colorthief { };
+
colour = callPackage ../development/python-modules/colour { };
commandparse = callPackage ../development/python-modules/commandparse { };
@@ -1899,6 +1919,8 @@ in {
dipy = callPackage ../development/python-modules/dipy { };
+ directv = callPackage ../development/python-modules/directv { };
+
discid = callPackage ../development/python-modules/discid { };
discogs_client = callPackage ../development/python-modules/discogs_client { };
@@ -2706,6 +2728,8 @@ in {
garminconnect-aio = callPackage ../development/python-modules/garminconnect-aio { };
+ garminconnect-ha = callPackage ../development/python-modules/garminconnect-ha { };
+
gast = callPackage ../development/python-modules/gast { };
garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { };
@@ -2852,6 +2876,8 @@ in {
gnureadline = callPackage ../development/python-modules/gnureadline { };
+ goalzero = callPackage ../development/python-modules/goalzero { };
+
goobook = callPackage ../development/python-modules/goobook { };
goocalendar = callPackage ../development/python-modules/goocalendar { };
@@ -3948,6 +3974,8 @@ in {
libpurecool = callPackage ../development/python-modules/libpurecool { };
+ libpyfoscam = callPackage ../development/python-modules/libpyfoscam { };
+
libredwg = toPythonModule (pkgs.libredwg.override {
enablePython = true;
inherit (self) python libxml2;
@@ -5208,6 +5236,10 @@ in {
pyatag = callPackage ../development/python-modules/pyatag { };
+ pycontrol4 = callPackage ../development/python-modules/pycontrol4 { };
+
+ pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { };
+
pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { };
pyflick = callPackage ../development/python-modules/pyflick { };
@@ -7666,8 +7698,6 @@ in {
selectors2 = callPackage ../development/python-modules/selectors2 { };
- selectors34 = callPackage ../development/python-modules/selectors34 { };
-
selenium = callPackage ../development/python-modules/selenium { };
semantic-version = callPackage ../development/python-modules/semantic-version { };
@@ -8954,7 +8984,7 @@ in {
webrtcvad = callPackage ../development/python-modules/webrtcvad { };
- websocket_client = callPackage ../development/python-modules/websocket_client { };
+ websocket-client = callPackage ../development/python-modules/websocket-client { };
websockets = callPackage ../development/python-modules/websockets { };
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 931ad1f01ae9..a7905d0db299 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -151,7 +151,7 @@ let
otherPackageSets = self: super: {
# This maps each entry in lib.systems.examples to its own package
# set. Each of these will contain all packages cross compiled for
- # that target system. For instance, pkgsCross.rasberryPi.hello,
+ # that target system. For instance, pkgsCross.raspberryPi.hello,
# will refer to the "hello" package built for the ARM6-based
# Raspberry Pi.
pkgsCross = lib.mapAttrs (n: crossSystem: