diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4610d1f9a6c5..88ad688b9def 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14062,6 +14062,12 @@
githubId = 687198;
name = "Yuri Aisaka";
};
+ yurkobb = {
+ name = "Yury Bulka";
+ email = "setthemfree@privacyrequired.com";
+ github = "yurkobb";
+ githubId = 479389;
+ };
yurrriq = {
email = "eric@ericb.me";
github = "yurrriq";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 53233754f000..492df2d828a0 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -214,6 +214,14 @@
(with foo; isPower && is32bit && isBigEndian).
+
+
+ bsp-layout no longer uses the command
+ cycle to switch to other window layouts, as
+ it got replaced by the commands previous
+ and next.
+
+
The Barco ClickShare driver/client package
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index abe0c7bdeaa6..0c5342f729af 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -86,6 +86,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
+- `bsp-layout` no longer uses the command `cycle` to switch to other window layouts, as it got replaced by the commands `previous` and `next`.
+
- The Barco ClickShare driver/client package `pkgs.clickshare-csc1` and the option `programs.clickshare-csc1.enable` have been removed,
as it requires `qt4`, which reached its end-of-life 2015 and will no longer be supported by nixpkgs.
[According to Barco](https://www.barco.com/de/support/knowledge-base/4380-can-i-use-linux-os-with-clickshare-base-units) many of their base unit models can be used with Google Chrome and the Google Cast extension.
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 1e68fef7ce74..a10a8c6428a1 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -65,7 +65,7 @@ let
${fcBool cfg.hinting.autohint}
- hintslight
+ ${cfg.hinting.style}
${fcBool cfg.antialias}
@@ -226,7 +226,6 @@ in
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
- (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options")
@@ -349,6 +348,20 @@ in
fonts, but better than unhinted fonts.
'';
};
+
+ style = mkOption {
+ type = types.enum [ "hintnone" "hintslight" "hintmedium" "hintfull" ];
+ default = "hintslight";
+ description = ''
+ Hintstyle is the amount of font reshaping done to line up
+ to the grid.
+
+ hintslight will make the font more fuzzy to line up to the grid
+ but will be better in retaining font shape, while hintfull will
+ be a crisp font that aligns well to the pixel grid but will lose
+ a greater amount of font shape.
+ '';
+ };
};
includeUserConf = mkOption {
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 160d76597c88..5ccbaf77481b 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -360,7 +360,7 @@ let
${optionalString (config.alias != null) "alias ${config.alias};"}
${optionalString (config.return != null) "return ${config.return};"}
${config.extraConfig}
- ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
+ ${optionalString (config.proxyPass != null && config.recommendedProxySettings) "include ${recommendedProxyConfig};"}
${mkBasicAuth "sublocation" config}
}
'') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));
@@ -423,7 +423,7 @@ in
default = false;
type = types.bool;
description = "
- Enable recommended proxy settings.
+ Whether to enable recommended proxy settings if a vhost does not specify the option manually.
";
};
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index 6fd00b386974..49dd8893015a 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -3,7 +3,7 @@
# has additional options that affect the web server as a whole, like
# the user/group to run under.)
-{ lib }:
+{ lib, config }:
with lib;
@@ -128,5 +128,14 @@ with lib;
a greater priority.
'';
};
+
+ recommendedProxySettings = mkOption {
+ type = types.bool;
+ default = config.services.nginx.recommendedProxySettings;
+ defaultText = literalExpression "config.services.nginx.recommendedProxySettings";
+ description = ''
+ Enable recommended proxy settings.
+ '';
+ };
};
}
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 2c77d6ee8162..a9929297a248 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -281,7 +281,7 @@ with lib;
locations = mkOption {
type = types.attrsOf (types.submodule (import ./location-options.nix {
- inherit lib;
+ inherit lib config;
}));
default = {};
example = literalExpression ''
diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix
index 08c2c7afc45f..75e7f64227bb 100644
--- a/pkgs/applications/misc/mapproxy/default.nix
+++ b/pkgs/applications/misc/mapproxy/default.nix
@@ -6,10 +6,10 @@
with python3.pkgs;
buildPythonApplication rec {
pname = "MapProxy";
- version = "1.14.0";
+ version = "1.15.1";
src = fetchPypi {
inherit pname version;
- sha256 = "dd36278d60cdcaaf31f7f9bbc50e90e770f3feb65cf4b3eff287215ee85f018d";
+ sha256 = "sha256-SVKZDLH8IfdND0/BFj/lrqp7BNanpzkjuTxlSMGjuiY=";
};
prePatch = ''
substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index be134d465738..35f0712d9abc 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -20,11 +20,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "5.3.2679.58-1";
+ version = "5.3.2679.61-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "085r5mrj8kp65fv0fw3azcgl9a7wxw4vcmnma36ihml8r53f8iaw";
+ sha256 = "0cxsdcksv29dxync8rxrn30kr68qzf615085nhkk0ava7jdlvz9g";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index ffcfc8e9c177..624814c1bb65 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
- version = "3.3.5";
+ version = "3.3.8";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
- sha256 = "sha256-EeGpJliE38MroeScdmeMp36rEDld59zDEM5i4QqxYik=";
+ sha256 = "sha256-9RwUKLVf8ArDAE6ivbWqxDCCW4OjqQFEEoWHBIv/cww=";
};
vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0=";
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index d039b7bc3460..d7f685ee14f2 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atlantis";
- version = "0.19.3";
+ version = "0.19.4";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
- sha256 = "sha256-0/LrXdksljoTvhOWAyKzR/8fNqM6ZqCjfgTNUfZNdXw=";
+ sha256 = "sha256-OvUcSccSBLuWci0DZPd6+ztthnAf47CvuAxu2NnqRQ0=";
};
- vendorSha256 = "sha256-HEMyJRNk7sii87cZBfuQy41n0sI+On4271bVVNVWXeg=";
+ vendorSha256 = "sha256-LActkTCZ7/KlvFmJ+58I8hTQWdxFxlRN09Jmj1vDa2U=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
index ec9f45a83886..b7992e2c723d 100644
--- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
+++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "cloudfoundry-cli";
- version = "8.3.0";
+ version = "8.4.0";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-tC9U0yvuMEwO4mzWyUC+v+/H0EzgwTu02waTQrx19Bs=";
+ sha256 = "sha256-+UP1abTDYLn+lhMvo9G57X0nlColai7isNswog+3Y40=";
};
- vendorSha256 = "sha256-aXq92SI4cgJrmo67SEfg8YKPEpO2UW2fcYnKq9TmAQg=";
+ vendorSha256 = "sha256-opVnj6dTtHrPYM1v+EFw39XDMF/fampAn7n+JvlBcJk=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix
index a488f1d2f52d..0cde6d0090e7 100644
--- a/pkgs/applications/networking/cluster/driftctl/default.nix
+++ b/pkgs/applications/networking/cluster/driftctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "driftctl";
- version = "0.31.0";
+ version = "0.34.1";
src = fetchFromGitHub {
owner = "snyk";
repo = "driftctl";
rev = "v${version}";
- sha256 = "sha256-2h7tasHxeEe65BpUXmHkMsNmjiG+QofyGVqXPuk4Ej8=";
+ sha256 = "sha256-/tdAmu/BurCFB82i9pT2+PNOsPtHdlL/brUt4B9Q/EA=";
};
- vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA=";
+ vendorSha256 = "sha256-KChEDFZj5zsZ/viOVWgC15WI8mp5cUC+SdNwkCjo6bI=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index d1f06ce333bc..dd9875929258 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
- version = "1.25.1";
+ version = "1.25.2";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
- sha256 = "sha256-l/BPnqa0j0yAdrl9BxFUKt94JwiNyPq1gKYuhGj/c8w=";
+ sha256 = "sha256-OZLTT54InDPF+m5e4xtuAL311wCD16Ne/T0PbgiSaN4=";
};
- vendorSha256 = "sha256-PZriaKbgRKm7ssHOBmbzbma5LrRt0TsQiphSrtcT83k=";
+ vendorSha256 = "sha256-Q9THG76/B/gdfhf5wLxVXoAAzXeOjaaAyYaGKy9LeF0=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
index 127ee9c6895a..85971b8dfb10 100644
--- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
+++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chart-testing";
- version = "3.5.1";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "helm";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-LNCzz5me60R/moFfdJhGMgUToFxADiPL02G4QCv0DLg=";
+ sha256 = "sha256-WGoLj6IuhxARSB3vAnprW1UO2g142uKZVHI3ubJepRs=";
};
- vendorSha256 = "sha256-38ufXHzGlZgEh6swD/GhWbIYdY5uYznKCQ9OaoyOEiY=";
+ vendorSha256 = "sha256-gXW1NarCo42d/awg22wr6bIQQFRVTVnRUUAtQU8zY4M=";
postPatch = ''
substituteInPlace pkg/config/config.go \
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a281505e0ec6..9bc29755ddb9 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -168,29 +168,6 @@ rec {
# Constructor for other terraform versions
mkTerraform = attrs: pluggable (generic attrs);
- 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 = "sha256-tWrSr6JCS9s+I0T1o3jgZ395u8IBmh73XGrnJidWI7U=";
- patches = [ ./provider-path.patch ];
- passthru = { inherit plugins; };
- };
-
- terraform_0_15 = mkTerraform {
- version = "0.15.5";
- sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d";
- vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo=";
- patches = [ ./provider-path-0_15.patch ];
- passthru = { inherit plugins; };
- };
-
terraform_1 = mkTerraform {
version = "1.2.3";
sha256 = "sha256-hkPlufjlvmI5tKz1VTY5RztuDKEsgjrLR+f7HRrJmkA=";
diff --git a/pkgs/applications/networking/cluster/terraform/provider-path.patch b/pkgs/applications/networking/cluster/terraform/provider-path.patch
deleted file mode 100644
index 39a69e4a389f..000000000000
--- a/pkgs/applications/networking/cluster/terraform/provider-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/command/init.go b/command/init.go
-index 403ca245b..05d98329a 100644
---- a/command/init.go
-+++ b/command/init.go
-@@ -64,6 +64,11 @@ func (c *InitCommand) Run(args []string) int {
- return 1
- }
-
-+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
-+ if ok {
-+ flagPluginPath = append(flagPluginPath, val)
-+ }
-+
- if len(flagPluginPath) > 0 {
- c.pluginPath = flagPluginPath
- c.getPlugins = false
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 0ceefe9b5dd8..a723fc720f10 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ginac";
- version = "1.8.2";
+ version = "1.8.3";
src = fetchurl {
url = "https://www.ginac.de/ginac-${version}.tar.bz2";
- sha256 = "sha256-v811Gryviv3bg5WMKtInY6deokAyVT5QPumzjj6jtsM=";
+ sha256 = "sha256-d8caWGrfb8C12rVzQ08wz/FXkVPNd8broCKS4Xj3pJA=";
};
propagatedBuildInputs = [ cln ];
diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix
index 0e97eab1773e..1600b1b4d8bb 100644
--- a/pkgs/applications/video/clapper/default.nix
+++ b/pkgs/applications/video/clapper/default.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "clapper";
- version = "0.4.1";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "Rafostar";
repo = pname;
rev = version;
- sha256 = "sha256-ccvg8yxPCN7OYmJvq0SPY6iyiuFuWJyiu+mRoykEzqI=";
+ sha256 = "sha256-o68IdI20gSwWCPI0g/BhUGF5ro6srXMy0JD1EgmY5ck=";
};
nativeBuildInputs = [
@@ -65,11 +65,6 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson/postinstall.py
'';
- mesonFlags = [
- # TODO: https://github.com/NixOS/nixpkgs/issues/36468
- "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
- ];
-
postInstall = ''
cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/
cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/
diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/applications/window-managers/shod/default.nix
new file mode 100644
index 000000000000..f9e6216a86ab
--- /dev/null
+++ b/pkgs/applications/window-managers/shod/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, writeText
+, fontconfig
+, libX11
+, libXft
+, libXinerama
+, libXpm
+, libXrender
+, conf ? null
+}:
+
+stdenv.mkDerivation rec {
+ pname = "shod";
+ version = "2.4.0";
+
+ src = fetchFromGitHub {
+ owner = "phillbush";
+ repo = "shod";
+ rev = "v${version}";
+ sha256 = "sha256-jrPuI3ADppqaJ2y9GksiJZZd4LtN1P5yjWwlf9VuYDc=";
+ };
+
+ buildInputs = [
+ fontconfig
+ libX11
+ libXft
+ libXinerama
+ libXpm
+ libXrender
+ ];
+
+ postPatch =
+ let
+ configFile =
+ if lib.isDerivation conf || builtins.isPath conf
+ then conf else writeText "config.h" conf;
+ in
+ lib.optionalString (conf != null) "cp ${configFile} config.h";
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with lib; {
+ description = "A mouse-based window manager that can tile windows inside floating containers";
+ longDescription = ''
+ shod is a multi-monitor floating reparenting X11 window manager that
+ supports tiled and tabbed containers. shod sets no keybindings, reads no
+ configuration, and works only via mouse with a given key modifier (Alt by
+ default) and by responding to client messages sent by the shodc utility
+ (shod's remote controller).
+ '';
+ homepage = "https://github.com/phillbush/shod";
+ license = licenses.mit;
+ maintainers = with maintainers; [ azahi ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 859d46459cb8..6bb1a70b8650 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "allegro";
- version = "5.2.7.0";
+ version = "5.2.8.0";
src = fetchFromGitHub {
owner = "liballeg";
repo = "allegro5";
rev = version;
- sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0=";
+ sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix
new file mode 100644
index 000000000000..8d5ef86a8967
--- /dev/null
+++ b/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, lib
+, fetchurl
+, autoreconfHook
+, pkg-config
+, libopenmpt
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libopenmpt-modplug";
+ version = "0.8.9.0-openmpt1";
+
+ outputs = [ "out" "dev" ];
+
+ src = fetchurl {
+ url = "https://lib.openmpt.org/files/libopenmpt-modplug/libopenmpt-modplug-${version}.tar.gz";
+ sha256 = "sha256-7M4aDuz9sLWCTKuJwnDc5ZWWKVosF8KwQyFez018T/c=";
+ };
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ libopenmpt
+ ];
+
+ configureFlags = [
+ "--enable-libmodplug"
+ ];
+
+ meta = with lib; {
+ description = "A libmodplug emulation layer based on libopenmpt";
+ homepage = "https://lib.openmpt.org/libopenmpt/";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ OPNA2608 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index aeb9728af826..3f1d12198994 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
pname = "capnproto";
- version = "0.9.1";
+ version = "0.10.1";
# release tarballs are missing some ekam rules
src = fetchFromGitHub {
owner = "capnproto";
repo = "capnproto";
rev = "v${version}";
- sha256 = "0cbiwkmd29abih8rjjm35dfkrkr8c6axbzq3fkryay6jyvpi42c5";
+ sha256 = "sha256-VdeoTU802kAqTdu8CJTIhy3xHM3ZCPqb5YNUS2k1x7E=";
};
nativeBuildInputs = [ cmake ]
@@ -21,9 +21,6 @@ stdenv.mkDerivation rec {
cmakeFlags = lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) "-DEXTERNAL_CAPNP";
- # Upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, modified to apply to v0.9.1. Drop on update.
- patches = lib.optional stdenv.hostPlatform.isMusl ./musl-no-fibers.patch;
-
meta = with lib; {
homepage = "https://capnproto.org/";
description = "Cap'n Proto cerealization protocol";
diff --git a/pkgs/development/libraries/capnproto/musl-no-fibers.patch b/pkgs/development/libraries/capnproto/musl-no-fibers.patch
deleted file mode 100644
index bb7804fb0abb..000000000000
--- a/pkgs/development/libraries/capnproto/musl-no-fibers.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 3d983eff304c28574c330a52d70a60145c9e157e Mon Sep 17 00:00:00 2001
-From: Jonas Vautherin
-Date: Fri, 14 Jan 2022 00:14:26 +0100
-Subject: [PATCH] Add support for musl
-
----
-Based on upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c,
-modified slightly by dtzWill to apply to v0.9.1.
-
-(drop whitespace change to a cmake "if (WITH_OPENSSL)",
-leave the other instance of that change since it applies)
----
-
-Co-authored-by: Guillaume Papin
-(cherry picked from commit 77ac9154440bcc216fda1092fd5bb51da62ae09c)
----
- .github/workflows/quick-test.yml | 9 ++++++
- c++/CMakeLists.txt | 46 ++++++++++++++++++++++++++++-
- c++/cmake/CapnProtoConfig.cmake.in | 32 ++++++++++++++++++++
- c++/configure.ac | 47 ++++++++++++++++++++++++++++--
- c++/src/kj/CMakeLists.txt | 11 ++++++-
- 5 files changed, 141 insertions(+), 4 deletions(-)
-
-diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml
-index c18ef6a6..773ff043 100644
---- a/.github/workflows/quick-test.yml
-+++ b/.github/workflows/quick-test.yml
-@@ -10,6 +10,15 @@ on:
- - 'release-*'
-
- jobs:
-+ Linux-musl:
-+ runs-on: ubuntu-latest
-+ container: alpine:latest
-+ steps:
-+ - uses: actions/checkout@v2
-+ - name: install dependencies
-+ run: apk add autoconf automake build-base cmake libtool libucontext-dev linux-headers openssl-dev
-+ - name: super-test
-+ run: ./super-test.sh quick
- Linux:
- runs-on: ubuntu-latest
- strategy:
-diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
-index 548dfd1f..5de7ab26 100644
---- a/c++/CMakeLists.txt
-+++ b/c++/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.4)
-+cmake_minimum_required(VERSION 3.6)
- project("Cap'n Proto" CXX)
- set(VERSION 0.9.1)
-
-@@ -64,6 +64,50 @@ elseif (WITH_OPENSSL)
- find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL)
- endif()
-
-+set(WITH_FIBERS "AUTO" CACHE STRING
-+ "Whether or not to build libkj-async with fibers")
-+# define list of values GUI will offer for the variable
-+set_property(CACHE WITH_FIBERS PROPERTY STRINGS AUTO ON OFF)
-+
-+# CapnProtoConfig.cmake.in needs this variable.
-+set(_WITH_LIBUCONTEXT OFF)
-+
-+if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO")
-+ set(_capnp_fibers_found OFF)
-+ if (WIN32 OR CYGWIN)
-+ set(_capnp_fibers_found ON)
-+ else()
-+ # Fibers need makecontext, setcontext, getcontext, swapcontext that may be in libc,
-+ # or in libucontext (e.g. for musl).
-+ # We assume that makecontext implies that the others are present.
-+ include(CheckLibraryExists)
-+ check_library_exists(c makecontext "" HAVE_UCONTEXT_LIBC)
-+ if (HAVE_UCONTEXT_LIBC)
-+ set(_capnp_fibers_found ON)
-+ else()
-+ # Try with libucontext
-+ find_package(PkgConfig)
-+ if (PKG_CONFIG_FOUND)
-+ pkg_check_modules(libucontext IMPORTED_TARGET libucontext)
-+ if (libucontext_FOUND)
-+ set(_WITH_LIBUCONTEXT ON)
-+ set(_capnp_fibers_found ON)
-+ endif()
-+ else()
-+ set(_capnp_fibers_found OFF)
-+ endif()
-+ endif()
-+ endif()
-+
-+ if (_capnp_fibers_found)
-+ set(WITH_FIBERS ON)
-+ elseif(WITH_FIBERS STREQUAL "AUTO")
-+ set(WITH_FIBERS OFF)
-+ else()
-+ message(FATAL_ERROR "Missing 'makecontext', 'getcontext', 'setcontext' or 'swapcontext' symbol in libc and no libucontext found: KJ won't be able to build with fibers. Disable fibers (-DWITH_FIBERS=OFF).")
-+ endif()
-+endif()
-+
- if(MSVC)
- # TODO(cleanup): Enable higher warning level in MSVC, but make sure to test
- # build with that warning level and clean out false positives.
-diff --git a/c++/cmake/CapnProtoConfig.cmake.in b/c++/cmake/CapnProtoConfig.cmake.in
-index 667f502f..0580b11a 100644
---- a/c++/cmake/CapnProtoConfig.cmake.in
-+++ b/c++/cmake/CapnProtoConfig.cmake.in
-@@ -62,6 +62,38 @@ if (@WITH_OPENSSL@) # WITH_OPENSSL
- endif()
- endif()
-
-+if (@_WITH_LIBUCONTEXT@) # _WITH_LIBUCONTEXT
-+ set(forwarded_config_flags)
-+ if(CapnProto_FIND_QUIETLY)
-+ list(APPEND forwarded_config_flags QUIET)
-+ endif()
-+ if(CapnProto_FIND_REQUIRED)
-+ list(APPEND forwarded_config_flags REQUIRED)
-+ endif()
-+ # If the consuming project called find_package(CapnProto) with the QUIET or REQUIRED flags, forward
-+ # them to calls to find_package(PkgConfig) and pkg_check_modules(). Note that find_dependency()
-+ # would do this for us in the former case, but there is no such forwarding wrapper for
-+ # pkg_check_modules().
-+
-+ find_package(PkgConfig ${forwarded_config_flags})
-+ if(NOT ${PkgConfig_FOUND})
-+ # If we're here, the REQUIRED flag must not have been passed, else we would have had a fatal
-+ # error. Nevertheless, a diagnostic for this case is probably nice.
-+ if(NOT CapnProto_FIND_QUIETLY)
-+ message(WARNING "pkg-config cannot be found")
-+ endif()
-+ set(CapnProto_FOUND OFF)
-+ return()
-+ endif()
-+
-+ if (CMAKE_VERSION VERSION_LESS 3.6)
-+ # CMake >= 3.6 required due to the use of IMPORTED_TARGET
-+ message(SEND_ERROR "libucontext support requires CMake >= 3.6.")
-+ endif()
-+
-+ pkg_check_modules(libucontext IMPORTED_TARGET ${forwarded_config_flags} libucontext)
-+endif()
-+
- include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoTargets.cmake")
- include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoMacros.cmake")
-
-diff --git a/c++/configure.ac b/c++/configure.ac
-index 72fe8456..b627bec8 100644
---- a/c++/configure.ac
-+++ b/c++/configure.ac
-@@ -32,6 +32,11 @@ AC_ARG_WITH([openssl],
- [build libkj-tls by linking against openssl @<:@default=check@:>@])],
- [],[with_openssl=check])
-
-+AC_ARG_WITH([fibers],
-+ [AS_HELP_STRING([--with-fibers],
-+ [build libkj-async with fibers @<:@default=check@:>@])],
-+ [],[with_fibers=check])
-+
- AC_ARG_ENABLE([reflection], [
- AS_HELP_STRING([--disable-reflection], [
- compile Cap'n Proto in "lite mode", in which all reflection APIs (schema.h, dynamic.h, etc.)
-@@ -195,8 +200,46 @@ AS_IF([test "$with_openssl" != no], [
- ])
- AM_CONDITIONAL([BUILD_KJ_TLS], [test "$with_openssl" != no])
-
--# CapnProtoConfig.cmake.in needs this variable.
--AC_SUBST(WITH_OPENSSL, $with_openssl)
-+# Fibers need the symbols getcontext, setcontext, swapcontext and makecontext.
-+# We assume that makecontext implies the rest.
-+AS_IF([test "$with_fibers" != no], [
-+ libc_supports_fibers=yes
-+ AC_SEARCH_LIBS([makecontext], [], [], [
-+ libc_supports_fibers=no
-+ ])
-+
-+ AS_IF([test "$libc_supports_fibers" = yes], [
-+ with_fibers=yes
-+ ], [
-+ # If getcontext does not exist in libc, try with libucontext
-+ ucontext_supports_fibers=yes
-+ AC_CHECK_LIB(ucontext, [makecontext], [], [
-+ ucontext_supports_fibers=no
-+ ])
-+ AS_IF([test "$ucontext_supports_fibers" = yes], [
-+ ASYNC_LIBS="$ASYNC_LIBS -lucontext"
-+ with_fibers=yes
-+ ], [
-+ AS_IF([test "$with_fibers" = yes], [
-+ AC_MSG_ERROR([Missing symbols required for fibers (makecontext, setcontext, ...). Disable fibers (--without-fibers) or install libucontext])
-+ ], [
-+ AC_MSG_WARN([could not find required symbols (makecontext, setcontext, ...) -- won't build with fibers])
-+ with_fibers=no
-+ ])
-+ ])
-+ ])
-+])
-+AS_IF([test "$with_fibers" = yes], [
-+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS"
-+], [
-+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS=0"
-+])
-+
-+# CapnProtoConfig.cmake.in needs these variables,
-+# we force them to NO because we don't need the CMake dependency for them,
-+# the dependencies are provided by the .pc files.
-+AC_SUBST(WITH_OPENSSL, NO)
-+AC_SUBST(_WITH_LIBUCONTEXT, NO)
-
- AM_CONDITIONAL([HAS_FUZZING_ENGINE], [test "x$LIB_FUZZING_ENGINE" != "x"])
-
-diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt
-index 813fac4d..f7b4dddf 100644
---- a/c++/src/kj/CMakeLists.txt
-+++ b/c++/src/kj/CMakeLists.txt
-@@ -136,6 +136,15 @@ if(NOT CAPNP_LITE)
- add_library(kj-async ${kj-async_sources})
- add_library(CapnProto::kj-async ALIAS kj-async)
- target_link_libraries(kj-async PUBLIC kj)
-+ if(WITH_FIBERS)
-+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS)
-+ if(_WITH_LIBUCONTEXT)
-+ target_link_libraries(kj-async PUBLIC PkgConfig::libucontext)
-+ endif()
-+ else()
-+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS=0)
-+ endif()
-+
- if(UNIX)
- # external clients of this library need to link to pthreads
- target_compile_options(kj-async INTERFACE "-pthread")
-@@ -181,7 +190,7 @@ if(NOT CAPNP_LITE)
- add_library(kj-tls ${kj-tls_sources})
- add_library(CapnProto::kj-tls ALIAS kj-tls)
- target_link_libraries(kj-tls PUBLIC kj-async)
-- if (WITH_OPENSSL)
-+ if(WITH_OPENSSL)
- target_compile_definitions(kj-tls PRIVATE KJ_HAS_OPENSSL)
- target_link_libraries(kj-tls PRIVATE OpenSSL::SSL OpenSSL::Crypto)
- endif()
---
-2.35.1
-
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index a3626feca9de..fdda2b3a6205 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "folly";
- version = "2022.05.23.00";
+ version = "2022.06.13.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "sha256-ti/aqVg6b3ZPEI72AZNo/4NrtlI/mKQb39tlTw+3VG4=";
+ sha256 = "sha256-30Fzk97wVK0JR/6YllyBjW9KlYrFj+GJpuV+V2bKXL8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 4f520772b750..b6c4c4e6570c 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -845,4 +845,15 @@ rec {
platforms = platforms.all;
};
};
+
+ /* CROATIAN */
+
+ hr_HR = hr-hr;
+ hr-hr = mkDictFromLibreOffice {
+ shortName = "hr-hr";
+ dictFileName = "hr_HR";
+ shortDescription = "Croatian (Croatia)";
+ readmeFile = "README_hr_HR.txt";
+ license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ];
+ };
}
diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix
index 9dfb8de3b2c6..27c62ea66326 100644
--- a/pkgs/development/python-modules/Pmw/default.nix
+++ b/pkgs/development/python-modules/Pmw/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Pmw";
- version = "2.0.1";
+ version = "2.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "080iml3868nxniyn56kcwnbghm10j7fw74a5nj0s19sm4zsji78b";
+ sha256 = "sha256-lIQSRXz8zwx3XdCOCRP7APkIlqM8eXN9VxxzEq6vVcY=";
};
propagatedBuildInputs = [ tkinter ];
diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix
index 785d0f610361..535594e3d28d 100644
--- a/pkgs/development/python-modules/aiosteamist/default.nix
+++ b/pkgs/development/python-modules/aiosteamist/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiosteamist";
- version = "0.3.1";
+ version = "0.3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = version;
- hash = "sha256-VoIJh3EDBPKmvEmM3gP2pyt/0oz4i6Y0zIkkprTcFLg=";
+ hash = "sha256-IKrAJ4QDcYJRO4hcomL9FRs8hJ3k7SgRgK4H1b8SxIM=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 802e7ee72c7b..69d80afb872f 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -20,7 +20,7 @@
let
pname = "ansible";
- version = "5.8.0";
+ version = "6.0.0";
in
buildPythonPackage {
inherit pname version;
@@ -30,7 +30,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-+gVkdiAfQGJfs22VxQQe9GOIC+GL5cc7mYtXtAGWeGM=";
+ sha256 = "sha256-ZBosJ7xXaPmorRSIDx9uVxwfKvHUXnbycdduP3R1TFM=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix
index 11e1f444cb0b..d4a71d639c73 100644
--- a/pkgs/development/python-modules/authcaptureproxy/default.nix
+++ b/pkgs/development/python-modules/authcaptureproxy/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "authcaptureproxy";
- version = "1.1.3";
+ version = "1.1.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "alandtse";
repo = "auth_capture_proxy";
- rev = "v${version}";
- sha256 = "sha256-RD/8v3IQb50iGkU6zj5QfHXakjHdcCBWWAkXhCIF6qo=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch b/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
new file mode 100644
index 000000000000..38ca864add3b
--- /dev/null
+++ b/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
@@ -0,0 +1,26 @@
+From 94c4768cd69b026e498d92133dd6c7d8589cf911 Mon Sep 17 00:00:00 2001
+From: Jiajie Chen
+Date: Sat, 25 Jun 2022 10:19:44 +0800
+Subject: [PATCH] Patch LDCXXSHARED for macOS along with LDSHARED
+
+In Nixpkgs, we patched distutils to respect LDCXXSHARED environment, so
+the replacement should be taken on LDCXXSHARED as well.
+---
+ cocotb_build_libs.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cocotb_build_libs.py b/cocotb_build_libs.py
+index 66097ec2..d5555b36 100755
+--- a/cocotb_build_libs.py
++++ b/cocotb_build_libs.py
+@@ -583,6 +583,7 @@ def get_ext():
+
+ if sys.platform == "darwin":
+ cfg_vars["LDSHARED"] = cfg_vars["LDSHARED"].replace("-bundle", "-dynamiclib")
++ cfg_vars["LDCXXSHARED"] = cfg_vars["LDCXXSHARED"].replace("-bundle", "-dynamiclib")
+
+ share_lib_dir = os.path.relpath(os.path.join(cocotb_share_dir, "lib"))
+ include_dir = os.path.relpath(os.path.join(cocotb_share_dir, "include"))
+--
+2.36.1
+
diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index d24d3bc79822..83ed76ac8669 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -40,8 +40,17 @@ buildPythonPackage rec {
# remove circular dependency cocotb-bus from setup.py
substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
+ '' + lib.optionalString stdenv.isDarwin ''
+ # disable lto on darwin
+ # https://github.com/NixOS/nixpkgs/issues/19098
+ substituteInPlace cocotb_build_libs.py --replace "-flto" ""
'';
+ patches = [
+ # Fix "can't link with bundle (MH_BUNDLE) only dylibs (MH_DYLIB) file" error
+ ./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
+ ];
+
checkInputs = [ cocotb-bus pytestCheckHook swig verilog ];
checkPhase = ''
@@ -53,6 +62,5 @@ buildPythonPackage rec {
homepage = "https://github.com/cocotb/cocotb";
license = licenses.bsd3;
maintainers = with maintainers; [ matthuszagh ];
- broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index dc0a6d12f0c1..94589087625e 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "nibabel";
- version = "3.2.2";
+ version = "4.0.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-sNzBdLMEBc6ej+weqzy7sg9cXkkgl2wIsi4FC3wST5Q=";
+ sha256 = "sha256-bVvOqRGZYn1KEAhmzVfmR5Nkh3MAJ5Evl1z59us4AYA=";
};
propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ];
diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix
new file mode 100644
index 000000000000..07991a0fac7e
--- /dev/null
+++ b/pkgs/development/python-modules/oscpy/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "oscpy";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "kivy";
+ repo = "oscpy";
+ rev = "v${version}";
+ hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA=";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "oscpy" ];
+
+ meta = with lib; {
+ description = "A modern implementation of OSC for python2/3";
+ license = licenses.mit;
+ homepage = "https://github.com/kivy/oscpy";
+ maintainers = [ maintainers.yurkobb ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix
index 92ef636932fd..e6b8edb784aa 100644
--- a/pkgs/development/python-modules/pyserial/default.nix
+++ b/pkgs/development/python-modules/pyserial/default.nix
@@ -4,6 +4,7 @@
, fetchPypi
, python
, pythonOlder
+, isPy3k
}:
buildPythonPackage rec {
@@ -11,7 +12,8 @@ buildPythonPackage rec {
version = "3.5";
format = "setuptools";
- disabled = pythonOlder "3.7";
+ # Supports Python 2.7 and 3.4+
+ disabled = isPy3k && pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json
index 5bf6e5f3e2fd..bd3a4efc57bf 100644
--- a/pkgs/development/tools/build-managers/scala-cli/sources.json
+++ b/pkgs/development/tools/build-managers/scala-cli/sources.json
@@ -1,6 +1,10 @@
{
"version": "0.1.8",
"assets": {
+ "aarch64-darwin": {
+ "asset": "scala-cli-x86_64-apple-darwin.gz",
+ "sha256": "1dxhwhdk7kflzn4ckqxfxkz4v26l39ki6ykpml6k6kvy3nn0wwz3"
+ },
"x86_64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1dxhwhdk7kflzn4ckqxfxkz4v26l39ki6ykpml6k6kvy3nn0wwz3"
diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix
index 5838f5e94b43..cca4b1589976 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.6.14";
+ version = "0.6.16";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
- sha256 = "sha256-1zJPtx+W+UuH+upun1o9f3ofieahTsb4bSuznPhIYnw=";
+ sha256 = "sha256-PKvF5dO7aFF3WOAWOxFTy1PpCr6o9s4QjQkgI7EO6Ss=";
};
- vendorSha256 = "sha256-2bOaJdK12qGjjVtoBp3LeSyIiFwm4ZvxNI5yR0HriXI=";
+ vendorSha256 = "sha256-ESPi6ZjN2GkvzVidmBmuglL4Oh0EjyhGBdvjjiXB38s=";
ldflags = [
"-s" "-w"
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 02c6c6ae9437..4cf9efb964ab 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
stdenv.mkDerivation rec{
pname = "flyway";
- version = "8.5.11";
+ version = "8.5.13";
src = fetchurl {
url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
- sha256 = "sha256-qmDvubyWWBRTbspVDSACiklC6a8l5n4y88vz3VZFnV0=";
+ sha256 = "sha256-9MEsZ5lc9cF7MKD+dYdZGR9cnMHFxELACp4gsC0gzRc=";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 5eb252a9c0e4..bf1784e08a02 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "fswatch";
- version = "1.16.0";
+ version = "1.17.0";
src = fetchFromGitHub {
owner = "emcrisostomo";
repo = "fswatch";
rev = version;
- sha256 = "sha256-EKbo5gkrWuijLJgYsNBDtxy0ioXu/yHxnPPeOpk620g=";
+ sha256 = "sha256-9xCp/SaqdUsVhOYr/QfAN/7RcRxsybCmfiO91vf3j40=";
};
nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
diff --git a/pkgs/games/graphwar/default.nix b/pkgs/games/graphwar/default.nix
new file mode 100644
index 000000000000..3586979292e6
--- /dev/null
+++ b/pkgs/games/graphwar/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, copyDesktopItems
+, jdk
+, makeDesktopItem
+, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+ pname = "graphwar";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "catabriga";
+ repo = "graphwar";
+ rev = version;
+ sha256 = "sha256-t3Y576dXWp2Mj6OSQN5cm9FuNBWNqKq6xxkVRbjIBgE=";
+ };
+
+ nativeBuildInputs = [ copyDesktopItems makeWrapper ];
+ buildInputs = [ jdk ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ mkdir -p out/
+ javac -d out/ -sourcepath src/ -classpath out/ -encoding utf8 src/**/*.java
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/lib/
+ mv out $out/lib/graphwar
+ cp -r rsc $out/lib/graphwar/rsc
+
+ makeWrapper ${jdk}/bin/java $out/bin/graphwar \
+ --add-flags "-classpath $out/lib/graphwar Graphwar.Graphwar"
+ makeWrapper ${jdk}/bin/java $out/bin/graphwar-roomserver \
+ --add-flags "-classpath $out/lib/graphwar RoomServer.RoomServer"
+ makeWrapper ${jdk}/bin/java $out/bin/graphwar-globalserver \
+ --add-flags "-classpath $out/lib/graphwar GlobalServer.GlobalServer"
+
+ runHook postInstall
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "graphwar";
+ exec = "graphwar";
+ desktopName = "Graphwar";
+ categories = [ "Game" ];
+ })
+ ];
+
+ meta = with lib; {
+ homepage = "http://www.graphwar.com/";
+ description = "An artillery game in which you must hit your enemies using mathematical functions";
+ license = licenses.gpl3Plus;
+ platforms = jdk.meta.platforms;
+ maintainers = with maintainers; [ yrd ];
+ };
+}
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix
index db5c8e5d903b..50d1133c3820 100644
--- a/pkgs/misc/drivers/steamcontroller/default.nix
+++ b/pkgs/misc/drivers/steamcontroller/default.nix
@@ -1,5 +1,4 @@
{ lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders
-, GyroplotSupport ? false
}:
with python3Packages;
@@ -21,9 +20,7 @@ buildPythonApplication {
'';
buildInputs = [ libusb1 ];
- propagatedBuildInputs = [ psutil python3Packages.libusb1 ]
- ++ lib.optionals GyroplotSupport [ pyqtgraph pyside ];
-
+ propagatedBuildInputs = [ psutil python3Packages.libusb1 ];
doCheck = false;
pythonImportsCheck = [ "steamcontroller" ];
diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/misc/opensbi/default.nix
index 3a3e9edf93a2..558f5c487ae1 100644
--- a/pkgs/misc/opensbi/default.nix
+++ b/pkgs/misc/opensbi/default.nix
@@ -6,15 +6,19 @@
stdenv.mkDerivation rec {
pname = "opensbi";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "riscv-software-src";
repo = "opensbi";
rev = "v${version}";
- sha256 = "sha256-OgzcH+RLU680qF3+lUiWFFbif6YtjIknJriGlRqcOGs=";
+ sha256 = "sha256-k6f4/lWY/f7qqk0AFY4tdEi4cDilSv/jngaJYhKFlnY=";
};
+ postPatch = ''
+ patchShebangs ./scripts
+ '';
+
installFlags = [
"I=$(out)"
];
diff --git a/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix b/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
index 5fb922c2df08..f6de7f017537 100644
--- a/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mod_cspnonce";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "wyattoday";
repo = "mod_cspnonce";
rev = version;
- sha256 = "0kqvxf1dn8r0ywrfiwsxryjrxii2sq11wisbjnm7770sjwckwqh5";
+ hash = "sha256-uUWRKUjS2LvHgT5xrK+LZLQRHc6wMaxGca2OsVxVlRs=";
};
buildInputs = [ apacheHttpd ];
diff --git a/pkgs/servers/search/lnx/default.nix b/pkgs/servers/search/lnx/default.nix
new file mode 100644
index 000000000000..cda779ee2632
--- /dev/null
+++ b/pkgs/servers/search/lnx/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, lib
+, rustPlatform
+, fetchFromGitHub
+, DiskArbitration
+, Foundation
+}:
+
+# unstable was chosen because of an added Cargo.lock
+# revert to stable for the version after 0.9.0
+let version = "unstable-2022-06-25";
+in
+rustPlatform.buildRustPackage {
+ pname = "lnx";
+ inherit version;
+ src = fetchFromGitHub {
+ owner = "lnx-search";
+ repo = "lnx";
+ rev = "2cb80f344c558bfe37f21ccfb83265bf351419d9";
+ sha256 = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g=";
+ };
+ cargoSha256 = "sha256-JpsZ37u3+4+X8knTxoGmJisopTsPR221rv3Bu4DMZZI=";
+ buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ];
+ meta = with lib; {
+ description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants. ";
+ homepage = "https://lnx.rs/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ happysalada ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json
index bb7dc863d5bb..934cccd205f7 100644
--- a/pkgs/servers/web-apps/lemmy/package.json
+++ b/pkgs/servers/web-apps/lemmy/package.json
@@ -1,7 +1,7 @@
{
"name": "lemmy-ui",
"description": "An isomorphic UI for lemmy",
- "version": "0.15.1",
+ "version": "0.16.4",
"author": "Dessalines ",
"license": "AGPL-3.0",
"scripts": {
@@ -17,14 +17,14 @@
},
"repository": "https://github.com/LemmyNet/lemmy-ui",
"dependencies": {
- "@typescript-eslint/parser": "^5.6.0",
+ "@typescript-eslint/parser": "^5.21.0",
"autosize": "^5.0.1",
- "check-password-strength": "^2.0.3",
- "choices.js": "^10.0.0",
+ "check-password-strength": "^2.0.5",
+ "choices.js": "^10.1.0",
"classnames": "^2.3.1",
- "emoji-short-name": "^1.0.0",
- "express": "~4.17.1",
- "i18next": "^21.5.4",
+ "emoji-short-name": "^2.0.0",
+ "express": "~4.18.0",
+ "i18next": "^21.6.16",
"inferno": "^7.4.11",
"inferno-create-element": "^7.4.11",
"inferno-helmet": "^5.2.1",
@@ -34,15 +34,16 @@
"inferno-server": "^7.4.11",
"isomorphic-cookie": "^1.2.4",
"jwt-decode": "^3.1.2",
- "markdown-it": "^12.1.0",
+ "markdown-it": "^13.0.0",
"markdown-it-container": "^3.0.0",
+ "markdown-it-footnote": "^3.0.3",
"markdown-it-html5-embed": "^1.0.0",
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
- "moment": "^2.29.1",
+ "moment": "^2.29.3",
"register-service-worker": "^1.7.2",
- "rxjs": "^7.4.0",
- "sass": "^1.47.0",
+ "rxjs": "^7.5.5",
+ "sass": "^1.51.0",
"serialize-javascript": "^6.0.0",
"tippy.js": "^6.3.7",
"toastify-js": "^1.11.2",
@@ -50,48 +51,47 @@
"websocket-ts": "^1.1.1"
},
"devDependencies": {
- "@babel/core": "^7.16.0",
- "@babel/plugin-transform-runtime": "^7.16.4",
+ "@babel/core": "^7.17.9",
+ "@babel/plugin-transform-runtime": "^7.17.0",
"@babel/plugin-transform-typescript": "^7.16.1",
- "@babel/preset-env": "7.16.8",
+ "@babel/preset-env": "7.16.11",
"@babel/preset-typescript": "^7.16.0",
- "@babel/runtime": "^7.16.3",
+ "@babel/runtime": "^7.17.9",
"@types/autosize": "^4.0.0",
"@types/express": "^4.17.13",
- "@types/node": "^17.0.8",
- "@types/node-fetch": "^2.5.11",
+ "@types/node": "^17.0.29",
+ "@types/node-fetch": "^2.6.1",
"@types/serialize-javascript": "^5.0.1",
- "@typescript-eslint/eslint-plugin": "^5.6.0",
- "babel-loader": "^8.2.3",
- "babel-plugin-inferno": "^6.3.0",
+ "@typescript-eslint/eslint-plugin": "^5.21.0",
+ "babel-loader": "^8.2.5",
+ "babel-plugin-inferno": "^6.4.0",
"bootstrap": "^5.1.3",
"bootswatch": "^5.1.3",
"clean-webpack-plugin": "^4.0.0",
- "copy-webpack-plugin": "^10.0.0",
- "css-loader": "^6.5.1",
- "eslint": "^8.4.0",
+ "copy-webpack-plugin": "^10.2.4",
+ "css-loader": "^6.7.1",
+ "eslint": "^8.14.0",
"eslint-plugin-prettier": "^4.0.0",
"husky": "^7.0.4",
"import-sort-style-module": "^6.0.0",
- "iso-639-1": "^2.1.10",
- "lemmy-js-client": "0.15.0",
- "lint-staged": "^12.1.2",
- "mini-css-extract-plugin": "^2.4.5",
+ "lemmy-js-client": "0.16.4",
+ "lint-staged": "^12.4.1",
+ "mini-css-extract-plugin": "^2.6.0",
"node-fetch": "^2.6.1",
- "prettier": "^2.5.1",
+ "prettier": "^2.6.2",
"prettier-plugin-import-sort": "^0.0.7",
"prettier-plugin-organize-imports": "^2.3.4",
- "prettier-plugin-packagejson": "^2.2.15",
+ "prettier-plugin-packagejson": "^2.2.17",
"rimraf": "^3.0.2",
"run-node-webpack-plugin": "^1.3.0",
- "sass-loader": "^12.3.0",
+ "sass-loader": "^12.6.0",
"sortpack": "^2.2.0",
"style-loader": "^3.3.1",
- "terser": "^5.10.0",
- "typescript": "^4.5.2",
- "webpack": "5.66.0",
- "webpack-cli": "^4.9.1",
- "webpack-dev-server": "4.7.3",
+ "terser": "^5.13.0",
+ "typescript": "^4.6.3",
+ "webpack": "5.72.0",
+ "webpack-cli": "^4.9.2",
+ "webpack-dev-server": "4.8.1",
"webpack-node-externals": "^3.0.0"
},
"engines": {
diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json
index 9a588b54da99..c22c821f5db3 100644
--- a/pkgs/servers/web-apps/lemmy/pin.json
+++ b/pkgs/servers/web-apps/lemmy/pin.json
@@ -1,7 +1,7 @@
{
- "version": "0.15.1",
- "serverSha256": "sha256-HHr9mG0AuI/86+EjODE/GT9lhl5DeNkzQ4k077b7ICU=",
- "serverCargoSha256": "sha256-ErMNsyHfBiYZA4gjaxPHO+fQseUVIKy/928oGqw+Adg=",
- "uiSha256": "sha256-Al6Q1xXkjqIb2v2S4JbmlQAAFCKwzkAW924uolC0tu8=",
- "uiYarnDepsSha256": "sha256-Zadp74ZHmbxCHxpDAYOa6Ot2kWujIj8ZzrSaIEsYgMY="
+ "version": "0.16.4",
+ "serverSha256": "sha256-xbxavlmRm7QTbrAjw6IMgQq8rEgyEHdcj11EhsOY+j0=",
+ "serverCargoSha256": "sha256-vDIaLpw0C6fnv0quH20qRN0I38Br338+MS9YzVfNizU=",
+ "uiSha256": "sha256-GZH/fSYLbxwigrr5LwAzxH4ElDVjTs8Tqqq+xYDFNCU",
+ "uiYarnDepsSha256": "sha256-BQs9UXUT/CcxJ7CdLksYGvGPGAaW7FLUAShLsbPC0jw="
}
diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix
index 5526d8fe31f3..52dddc8183c0 100644
--- a/pkgs/servers/web-apps/lemmy/server.nix
+++ b/pkgs/servers/web-apps/lemmy/server.nix
@@ -7,6 +7,7 @@
, libiconv
, Security
, protobuf
+, rustfmt
}:
let
pinData = lib.importJSON ./pin.json;
@@ -21,6 +22,7 @@ rustPlatform.buildRustPackage rec {
repo = "lemmy";
rev = version;
sha256 = pinData.serverSha256;
+ fetchSubmodules = true;
};
cargoSha256 = pinData.serverCargoSha256;
@@ -37,7 +39,7 @@ rustPlatform.buildRustPackage rec {
PROTOC = "${protobuf}/bin/protoc";
PROTOC_INCLUDE = "${protobuf}/include";
- nativeBuildInputs = [ protobuf ];
+ nativeBuildInputs = [ protobuf rustfmt ];
passthru.updateScript = ./update.sh;
diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix
index a3cd4b9b5149..02d75ac629c8 100644
--- a/pkgs/tools/admin/docker-credential-gcr/default.nix
+++ b/pkgs/tools/admin/docker-credential-gcr/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-credential-gcr";
- version = "2.1.4";
+ version = "2.1.5";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "docker-credential-gcr";
rev = "v${version}";
- sha256 = "sha256-1AUs8Gt2Qw8BJk2zwRcazVl+POkPSy9e1jW9Mk/0rx8=";
+ sha256 = "sha256-NUFSnegLVGNUc6f/WSyIk1U6UQorxRykqojhgE/maw8=";
};
patches = [
diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix
index fa9b5d0845df..c265a54a9813 100644
--- a/pkgs/tools/compression/bzip3/default.nix
+++ b/pkgs/tools/compression/bzip3/default.nix
@@ -2,11 +2,12 @@
, stdenv
, fetchFromGitHub
, autoreconfHook
+, pkg-config
}:
stdenv.mkDerivation rec {
pname = "bzip3";
- version = "1.1.3";
+ version = "1.1.4";
outputs = [ "bin" "dev" "out" ];
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "kspalaiologos";
repo = "bzip3";
rev = version;
- hash = "sha256-puGtaL76p4BzSiTPf3qFgXN4pz90CDU9dziGIszk3to=";
+ hash = "sha256-rbJUvFm8WYgQLNpbX6kcXb5qAGAJfylTo4HgOvZVCu8=";
};
postPatch = ''
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
+ pkg-config
];
configureFlags = [
diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/tools/misc/bsp-layout/default.nix
index bad5b4d9a89f..48f68bebe6c5 100644
--- a/pkgs/tools/misc/bsp-layout/default.nix
+++ b/pkgs/tools/misc/bsp-layout/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "bsp-layout";
- version = "unstable-2021-05-10";
+ version = "unstable-2022-06-19";
src = fetchFromGitHub {
owner = "phenax";
repo = pname;
- rev = "726b850b79eabdc6f4d236cff52e434848cb55e3";
- sha256 = "1wqlzbz7l9vz37gin2zckrnxkkabnd7x5mi9pb0x96w4yhld5mx6";
+ rev = "181d38443778e81df2d4bc3639063c3ae608f9c7";
+ sha256 = "sha256-4NKI+OnOTYGaJnaPvSoXGJdSSzMo9AjYRLOomp9onoo=";
};
nativeBuildInputs = [ makeWrapper git bc ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/phenax/bsp-layout";
license = licenses.mit;
- maintainers = with maintainers; [ devins2518 totoroot ];
+ maintainers = with maintainers; [ totoroot ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/tools/misc/mandown/default.nix
index 08755ede14db..4851c764d0eb 100644
--- a/pkgs/tools/misc/mandown/default.nix
+++ b/pkgs/tools/misc/mandown/default.nix
@@ -15,6 +15,6 @@ rustPlatform.buildRustPackage rec {
description = "Markdown to groff (man page) converter";
homepage = "https://gitlab.com/kornelski/mandown";
license = with licenses; [ asl20 /* or */ mit ];
- maintainers = with maintainers; [ zowoq ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix
index f6986a1516b3..16350850163e 100644
--- a/pkgs/tools/networking/ghostunnel/default.nix
+++ b/pkgs/tools/networking/ghostunnel/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "ghostunnel";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "ghostunnel";
repo = "ghostunnel";
rev = "v${version}";
- sha256 = "sha256-EE8gCm/gOp3lmCx1q4PahulipLoBZnEatNAVUXzHIVw=";
+ sha256 = "sha256-VameENcHZ6AttV0D8ekPGGFoMHTiTXAY2FxK/Nxwjmk=";
};
- vendorSha256 = "sha256-XgmvqB1PCfL2gSDqwqauSixk8vlINHRmX6U0h9EXXdU=";
+ vendorSha256 = null;
deleteVendor = true;
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index b218a19154a5..ec5b13b34f26 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
- sha256 = "rb8R04eU/rG7PXx/horYk0+/3AgbxYYZtxy4ACILOZ8=";
+ sha256 = "dFYITyO9znocf9fv3eh2h83NM3RDYcpDV/uxOISChZo=";
};
postPatch = ''
diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix
index 0b15e9b02353..9877131d0a34 100644
--- a/pkgs/tools/security/gopass/git-credential.nix
+++ b/pkgs/tools/security/gopass/git-credential.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "git-credential-gopass";
- version = "1.12.0";
+ version = "1.14.3";
src = fetchFromGitHub {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-IvYxpUMclDAKJ/EkRbNrX8eIFyhtY9Q0B0RipweieZA=";
+ sha256 = "sha256-ggdQL8BU56zE5figmbfHKlZ7WGZ7z5nKunXTy3kn170=";
};
- vendorSha256 = "sha256-N6eU6KsnUrYBK90ydwUH8LNkR9KRjgc4ciGOGvy7pw8=";
+ vendorSha256 = "sha256-fwqkiPzrfo83NweuGONRx8+MOE4wQxg2Xk4/1kZwnCM=";
subPackages = [ "." ];
diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix
new file mode 100644
index 000000000000..49618c53aead
--- /dev/null
+++ b/pkgs/tools/security/gopass/hibp.nix
@@ -0,0 +1,39 @@
+{ lib
+, makeWrapper
+, buildGoModule
+, fetchFromGitHub
+, gopass
+}:
+
+buildGoModule rec {
+ pname = "gopass-hibp";
+ version = "1.14.3";
+
+ src = fetchFromGitHub {
+ owner = "gopasspw";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-JwZZ2VaSD9xkLny5sFeku5rN4FitI1dyW56JSWPMagM=";
+ };
+
+ vendorSha256 = "sha256-YySkVWdfGIT5qz0jTGlLEHoO0vGY0iNZ/oG9IZCjwRE=";
+
+ subPackages = [ "." ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ ldflags = [
+ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}"
+ ];
+
+ postFixup = ''
+ wrapProgram $out/bin/gopass-hibp --prefix PATH : "${lib.makeBinPath [ gopass ]}"
+ '';
+
+ meta = with lib; {
+ description = "Gopass haveibeenpwnd.com integration";
+ homepage = "https://www.gopass.pw/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sikmir ];
+ };
+}
diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix
index c138bde2cc3c..5f6dab2e9069 100644
--- a/pkgs/tools/security/gopass/jsonapi.nix
+++ b/pkgs/tools/security/gopass/jsonapi.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "gopass-jsonapi";
- version = "1.11.1";
+ version = "1.14.3";
src = fetchFromGitHub {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
- sha256 = "03xhza7n92xg12z83as9qdvvc0yx1qy6q0c7i4njvng594f9a8x2";
+ sha256 = "sha256-uLsKxx2Yr0g3vf2AQqRqRzNsBX2D4+6wwxM+czthL+I=";
};
- vendorSha256 = "0d4fyppsdfzvmjb0qvpnfnw0vl6z256bly7hfb0whk6rldks60wr";
+ vendorSha256 = "sha256-QEqtyHb+/tpbbHLCSBw7uafAtKzKkmxoFGqFVHSR03I=";
subPackages = [ "." ];
diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix
index c1be7c9eb081..f3968bb3ce2a 100644
--- a/pkgs/tools/security/gopass/summon.nix
+++ b/pkgs/tools/security/gopass/summon.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gopass-summon-provider";
- version = "1.12.0";
+ version = "1.14.3";
src = fetchFromGitHub {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-mRZXczIlW1s0VGZJ+KQue4Dz6XCXGfl56+g6iRv2lZg=";
+ sha256 = "sha256-Pbe5LMQioHDBHeEoT2brtsEBKq4oNROIlLccIjppRVo=";
};
- vendorSha256 = "sha256-fiV4rtel2jOw6y/ukOZHeFuNVqxHS3rnYhXJ6JZ+a/8=";
+ vendorSha256 = "sha256-U0qniRHl4YgSy1GpsaYknMQpjpM8uKNtyLm6YblSd4U=";
subPackages = [ "." ];
diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix
index f443d765b571..c3334875d2f0 100644
--- a/pkgs/tools/security/witness/default.nix
+++ b/pkgs/tools/security/witness/default.nix
@@ -2,25 +2,25 @@
buildGoModule rec {
pname = "witness";
- version = "0.1.8";
+ version = "0.1.10";
src = fetchFromGitHub {
owner = "testifysec";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-i76sw5ysWDZwuNt7CYtpVy9mEV643i4YaMxksglyPWw=";
+ sha256 = "sha256-BRYp8gp3TNZrl6fRNHOIgdhCVCN+N2lReFk+0FxCUxY=";
};
- vendorSha256 = "sha256-A3fnAWEJ7SeUnDfIIOkbHIhUBRB8INcqMleOLL3LHF0=";
+ vendorSha256 = "sha256-/NniYty50dO44VUTfVq9b8dbT3le4uZ2ZoDN4IjLBto=";
nativeBuildInputs = [ installShellFiles ];
# We only want the witness binary, not the helper utilities for generating docs.
- subPackages = [ "cmd/witness" ];
+ subPackages = [ "." ];
ldflags = [
"-s"
"-w"
- "-X github.com/testifysec/witness/cmd/witness/cmd.Version=v${version}"
+ "-X github.com/testifysec/witness/cmd.Version=v${version}"
];
# Feed in all tests for testing
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bd19a8d3059d..11aa7b335e53 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1370,12 +1370,9 @@ mapAliases ({
telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22
telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22
terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21
- terraform-provider-ibm = throw "'terraform-provider-ibm' has been renamed to/replaced by 'terraform-providers.ibm'"; # Converted to throw 2022-02-22
- terraform-provider-libvirt = throw "'terraform-provider-libvirt' has been renamed to/replaced by 'terraform-providers.libvirt'"; # Converted to throw 2022-02-22
- terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16
- terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01";
- terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08
- terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15
+ terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26
+ terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26
+ terraform_0_15 = throw "terraform_0_15 has been removed from nixpkgs"; # Added 2022-06-26
tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22
testVersion = testers.testVersion; # Added 2022-04-20
invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f668ce3f8281..b58f20503244 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2495,11 +2495,21 @@ with pkgs;
buildGoModule = buildGo118Module;
};
- gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { };
+ gopass-hibp = callPackage ../tools/security/gopass/hibp.nix {
+ buildGoModule = buildGo118Module;
+ };
- git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
+ gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix {
+ buildGoModule = buildGo118Module;
+ };
- gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };
+ git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix {
+ buildGoModule = buildGo118Module;
+ };
+
+ gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix {
+ buildGoModule = buildGo118Module;
+ };
gosca = callPackage ../development/tools/gosca { };
@@ -7709,6 +7719,10 @@ with pkgs;
lnch = callPackage ../tools/misc/lnch { };
+ lnx = callPackage ../servers/search/lnx {
+ inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
+ };
+
loadlibrary = callPackage ../tools/misc/loadlibrary { };
loc = callPackage ../development/misc/loc { };
@@ -28766,6 +28780,8 @@ with pkgs;
scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
+ shod = callPackage ../applications/window-managers/shod { };
+
shotcut = libsForQt5.callPackage ../applications/video/shotcut { };
shogun = callPackage ../applications/science/machine-learning/shogun {
@@ -29048,6 +29064,8 @@ with pkgs;
libopenmpt = callPackage ../development/libraries/audio/libopenmpt { };
+ libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { };
+
openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon;
opusfile = callPackage ../applications/audio/opusfile { };
@@ -32057,6 +32075,8 @@ with pkgs;
wine = wineWowPackages.unstable;
};
+ graphwar = callPackage ../games/graphwar { };
+
gtetrinet = callPackage ../games/gtetrinet {
inherit (gnome2) GConf libgnome libgnomeui;
};
@@ -34950,9 +34970,6 @@ with pkgs;
inherit (callPackage ../applications/networking/cluster/terraform { })
mkTerraform
- terraform_0_13
- terraform_0_14
- terraform_0_15
terraform_1
terraform_plugins_test
;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc513f4410d9..eb6fe06b5fde 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6163,6 +6163,8 @@ in {
oscrypto = callPackage ../development/python-modules/oscrypto { };
+ oscpy = callPackage ../development/python-modules/oscpy { };
+
oset = callPackage ../development/python-modules/oset { };
osmnx = callPackage ../development/python-modules/osmnx { };