JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-09-03 18:01:56 +00:00 committed by GitHub
commit e61c4306f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 229 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View File

@ -8975,7 +8975,7 @@
name = "Millian Poquet";
};
mpscholten = {
email = "marc@mpscholten.de";
email = "marc@digitallyinduced.com";
github = "mpscholten";
githubId = 2072185;
name = "Marc Scholten";
@ -15146,4 +15146,14 @@
fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4";
}];
};
cafkafk = {
email = "cafkafk@cafkafk.com";
matrix = "@cafkafk:matrix.cafkafk.com";
name = "Christina Sørensen";
github = "cafkafk";
githubId = 89321978;
keys = [{
fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8";
}];
};
}

15
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View File

@ -211,6 +211,13 @@
<link xlink:href="options.html#opt-services.kanata.enable">services.kanata</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://languagetool.org/">languagetool</link>,
a multilingual grammar, style, and spell checker. Available as
<link xlink:href="options.html#opt-services.languagetool.enable">services.languagetool</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://www.getoutline.com/">Outline</link>,
@ -389,6 +396,14 @@
<literal>cosigned</literal> binary anymore.
</para>
</listitem>
<listitem>
<para>
Emacs now uses the Lucid toolkit by default instead of GTK
because of stability and compatibility issues. Users who still
wish to remain using GTK can do so by using
<literal>emacs-gtk</literal>.
</para>
</listitem>
<listitem>
<para>
riak package removed along with

6
nixos/doc/manual/release-notes/rl-2211.section.md
View File

@ -78,6 +78,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization.
Available as [services.kanata](options.html#opt-services.kanata.enable).
- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker.
Available as [services.languagetool](options.html#opt-services.languagetool.enable).
- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable).
- [netbird](https://netbird.io), a zero configuration VPN.
@ -136,6 +139,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- `pkgs.cosign` does not provide the `cosigned` binary anymore.
- Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues.
Users who still wish to remain using GTK can do so by using `emacs-gtk`.
- riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module.

6
nixos/lib/test-driver/test_driver/machine.py
View File

@ -426,7 +426,9 @@ class Machine:
self.monitor.send(message)
return self.wait_for_monitor_prompt()
def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None:
def wait_for_unit(
self, unit: str, user: Optional[str] = None, timeout: int = 900
) -> None:
"""Wait for a systemd unit to get into "active" state.
Throws exceptions on "failed" and "inactive" states as well as
after timing out.
@ -456,7 +458,7 @@ class Machine:
unit, f" with user {user}" if user is not None else ""
)
):
retry(check_active)
retry(check_active, timeout)
def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]:
status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user)

1
nixos/modules/module-list.nix
View File

@ -589,6 +589,7 @@
./services/misc/jackett.nix
./services/misc/jellyfin.nix
./services/misc/klipper.nix
./services/misc/languagetool.nix
./services/misc/logkeys.nix
./services/misc/leaps.nix
./services/misc/lidarr.nix

78
nixos/modules/services/misc/languagetool.nix Normal file
View File

@ -0,0 +1,78 @@
{ config, lib, options, pkgs, ... }:
with lib;
let
cfg = config.services.languagetool;
settingsFormat = pkgs.formats.javaProperties {};
in {
options.services.languagetool = {
enable = mkEnableOption (mdDoc "the LanguageTool server");
port = mkOption {
type = types.port;
default = 8081;
example = 8081;
description = mdDoc ''
Port on which LanguageTool listens.
'';
};
public = mkEnableOption (mdDoc "access from anywhere (rather than just localhost)");
allowOrigin = mkOption {
type = types.nullOr types.str;
default = null;
example = "https://my-website.org";
description = mdDoc ''
Set the Access-Control-Allow-Origin header in the HTTP response,
used for direct (non-proxy) JavaScript-based access from browsers.
`null` to allow access from all sites.
'';
};
settings = lib.mkOption {
type = types.submodule {
freeformType = settingsFormat.type;
options.cacheSize = mkOption {
type = types.ints.unsigned;
default = 1000;
apply = toString;
description = mdDoc "Number of sentences cached.";
};
};
default = {};
description = mdDoc ''
Configuration file options for LanguageTool, see
'languagetool-http-server --help'
for supported settings.
'';
};
};
config = mkIf cfg.enable {
systemd.services.languagetool = {
description = "LanguageTool HTTP server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
DynamicUser = true;
User = "languagetool";
Group = "languagetool";
CapabilityBoundingSet = [ "" ];
RestrictNamespaces = [ "" ];
SystemCallFilter = [ "@system-service" "~ @privileged" ];
ProtectHome = "yes";
ExecStart = ''
${pkgs.languagetool}/bin/languagetool-http-server \
--port ${toString cfg.port} \
${optionalString cfg.public "--public"} \
${optionalString (cfg.allowOrigin != null) "--allow-origin ${cfg.allowOrigin}"} \
"--configuration" ${settingsFormat.generate "languagetool.conf" cfg.settings}
'';
};
};
};
}

1
nixos/modules/services/networking/teamspeak3.nix
View File

@ -152,6 +152,7 @@ in
WorkingDirectory = cfg.dataDir;
User = user;
Group = group;
Restart = "on-failure";
};
};
};

1
nixos/tests/all-tests.nix
View File

@ -276,6 +276,7 @@ in {
krb5 = discoverTests (import ./krb5 {});
ksm = handleTest ./ksm.nix {};
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
languagetool = handleTest ./languagetool.nix {};
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
leaps = handleTest ./leaps.nix {};
lemmy = handleTest ./lemmy.nix {};

2
nixos/tests/cagebreak.nix
View File

@ -33,7 +33,7 @@ in
hardware.opengl.enable = true;
programs.xwayland.enable = true;
services.udisks2.enable = true;
security.polkit.enable = true;
environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ];
# Need to switch to a different GPU driver than the default one (-vga std) so that Cagebreak can launch:

19
nixos/tests/languagetool.nix Normal file
View File

@ -0,0 +1,19 @@
import ./make-test-python.nix ({ pkgs, lib, ... }:
let port = 8082;
in {
name = "languagetool";
meta = with lib.maintainers; { maintainers = [ fbeffa ]; };
nodes.machine = { ... }:
{
services.languagetool.enable = true;
services.languagetool.port = port;
};
testScript = ''
machine.start()
machine.wait_for_unit("languagetool.service")
machine.wait_for_open_port(${toString port})
machine.wait_until_succeeds('curl -d "language=en-US" -d "text=a simple test" http://localhost:${toString port}/v2/check')
'';
})

2
nixos/tests/moodle.nix
View File

@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
testScript = ''
start_all()
machine.wait_for_unit("phpfpm-moodle.service")
machine.wait_for_unit("phpfpm-moodle.service", timeout=1800)
machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'")
'';
})

2
pkgs/applications/editors/emacs/generic.nix
View File

@ -18,7 +18,7 @@
, withX ? !stdenv.isDarwin
, withNS ? stdenv.isDarwin
, withGTK2 ? false, gtk2-x11 ? null
, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
, withGTK3 ? false, gtk3-x11 ? null, gsettings-desktop-schemas ? null
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
, withMotif ? false, motif ? null
, withSQLite3 ? false

12
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -4437,6 +4437,18 @@ final: prev:
meta.homepage = "https://github.com/tomasr/molokai/";
};
moonscript-vim = buildVimPluginFrom2Nix {
pname = "moonscript-vim";
version = "2016-11-22";
src = fetchFromGitHub {
owner = "leafo";
repo = "moonscript-vim";
rev = "715c96c7c3b02adc507f84bf5754985460afc426";
sha256 = "1m4yz2xnazqagmkcli2xvwidsgssy9p650ykgdybk7wwlrq2vvqi";
};
meta.homepage = "https://github.com/leafo/moonscript-vim/";
};
mru = buildVimPluginFrom2Nix {
pname = "mru";
version = "2022-08-20";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -372,6 +372,7 @@ https://github.com/jghauser/mkdir.nvim/,main,
https://github.com/SidOfc/mkdx/,,
https://github.com/tomasr/molokai/,,
https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
https://github.com/leafo/moonscript-vim/,HEAD,
https://github.com/yegappan/mru/,,
https://github.com/ncm2/ncm2/,,
https://github.com/ncm2/ncm2-bufword/,,

12
pkgs/applications/editors/vscode/vscode.nix
View File

@ -15,17 +15,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "08p4l47zr4dm7mw65wwdsf6q1wkzkzg3l2y5zrs3ng3nafql96zs";
x86_64-darwin = "1pf8xpg2sb0iwfaixvzhmglqrrky2625b66fjwlc5zkj0dlff106";
aarch64-linux = "1c35s7zykcrqf3va1cv7hqf1dp3cl70kdvqv3vgflqldc1wcza9h";
aarch64-darwin = "1jpsf54x7yy53d6766gpw90ngdi6kicpqm1qbzbmmsasndl7rklp";
armv7l-linux = "10vj751bjdkzsdcrdpq6xb430pdhdbz8ysk835ir64i3mv6ygi7k";
x86_64-linux = "0cnrbjqcnkv7ybj9j7l0lcnfnxq18mddhdkj9797928q643bmj6z";
x86_64-darwin = "1d9gb3i2k0c9cn38igg1nm91bfqdi4xg29zlprqsqh98ijwqy25y";
aarch64-linux = "1jm8ll8f4m99ly53rv7000ng9a0l8jn4xpc6kfhmqdnf0jqfncsh";
aarch64-darwin = "1awmaxkr5nl513c50g6k4r2j3w8p2by1j9i3kw7vkmwn91bk24i4";
armv7l-linux = "1d2hl9jy1kfkzn4j7qkp3k8j1qc3r9rpqhvkfrr2axcqrahcrfsd";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.70.2";
version = "1.71.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

4
pkgs/applications/graphics/hydrus/default.nix
View File

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "496";
version = "497";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
sha256 = "sha256-Ng3ogPxyzn4cKVE/0iz56VWGyABkM2ZF7ktajaJ9Mn8=";
sha256 = "sha256-dQ6a3jys6V1ihT6q8FUaX7jOA1ZDZdX5EUy03ILk7vM=";
};
nativeBuildInputs = [

10
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -45,9 +45,9 @@
}
},
"ungoogled-chromium": {
"version": "105.0.5195.54",
"sha256": "0hj40scp54hp5xw036vb9v0h951hik4dq8skr52hffw24jqa9d5k",
"sha256bin64": null,
"version": "105.0.5195.102",
"sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw",
"sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa",
"deps": {
"gn": {
"version": "2022-07-11",
@ -56,8 +56,8 @@
"sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng"
},
"ungoogled-patches": {
"rev": "105.0.5195.54-1",
"sha256": "021y7cm1fdwkakhqrvz3jw5hx30740qn827wcvih0jdc3msfgd97"
"rev": "105.0.5195.102-1",
"sha256": "17n06lqzbz19a3fdqbv5wj7s6v3rc0bfshdz8syw0k2gkw3x6ivc"
}
}
}

4
pkgs/applications/networking/cluster/kops/default.nix
View File

@ -62,8 +62,8 @@ rec {
};
kops_1_24 = mkKops rec {
version = "1.24.1";
sha256 = "sha256-rePNCk76/j6ssvi+gSvxn4GqoW/QovTFCJ0rj2Dd+0A=";
version = "1.24.2";
sha256 = "sha256-QEoaSkJ3fzUr2Fr3M2EOd/3iwq1ZX2YHEez2i0kjRmY=";
rev = "v${version}";
};

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.19";
ptb = "0.0.29";
canary = "0.0.137";
canary = "0.0.138";
} else {
stable = "0.0.264";
ptb = "0.0.59";
@ -22,7 +22,7 @@ let
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-dreKO2yBDP547VYuJziBhC2sLdpbM2fcK5bxeds0zUQ=";
sha256 = "sha256-NojoHrrgdvLiMgWYPClXzWjWXuvHz7urhyHzMnZwvBY=";
};
};
aarch64-darwin = {

4
pkgs/applications/radio/chirp/default.nix
View File

@ -4,11 +4,11 @@
}:
python2.pkgs.buildPythonApplication rec {
pname = "chirp-daily";
version = "20211016";
version = "20220823";
src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
sha256 = "13xzqnhvnw6yipv4izkq0s9ykyl9pc5ifpr1ii8xfp28ch706qyw";
sha256 = "sha256-V+8HQAYU2XjOYeku0XEHqkY4m0XjiUBxM61QcupnlVM=";
};
propagatedBuildInputs = with python2.pkgs; [

7
pkgs/applications/science/robotics/mavproxy/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial
, setuptools, wxPython_4_0, billiard, gnureadline }:
, setuptools, wxPython_4_0, billiard, gnureadline, opencv4 }:
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.52";
version = "1.8.55";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-H30QZbUj6SXuwhhQUvHoPDM1D4ynm/vt1Mi4rkCB1oo=";
sha256 = "sha256-RS3/U52n1Gs3cJtlZeE5z5q1EmC8NrPFt0mHhvIWVTA=";
};
postPatch = ''
@ -22,6 +22,7 @@ buildPythonApplication rec {
pyserial
setuptools
wxPython_4_0
opencv4
] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ];
# No tests

36
pkgs/applications/video/video-trimmer/default.nix
View File

@ -1,18 +1,15 @@
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, rustPlatform
, gnome
, pkg-config
, meson
, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
, blueprint-compiler
, ninja
, python3
, gtk3-x11
, glib
, gobject-introspection
, gtk4
, libadwaita
@ -37,31 +34,25 @@ stdenv.mkDerivation rec {
};
patches = [
# The metainfo.xml file has a URL to a screenshot of the application,
# unaccessible in the build's sandbox. We don't need the screenshot, so
# it's best to remove it.
./remove-screenshot-metainfo.diff
# https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12
(fetchpatch {
url = "https://gitlab.gnome.org/YaLTeR/video-trimmer/-/commit/2faf4bb13d44463ea940c39ece9187f76627dbe9.diff";
sha256 = "sha256-BPjwfFCDIqnS1rAlIinQ982VKdAYLyzDAPLCmPDvdp4=";
})
];
postPatch = ''
patchShebangs \
build-aux/meson/postinstall.py \
build-aux/cargo.sh \
build-aux/dist-vendor.sh
'';
nativeBuildInputs = [
pkg-config
meson
wrapGAppsHook4
appstream-glib
gobject-introspection
desktop-file-utils
blueprint-compiler
ninja
# For post-install.py
python3
gtk3-x11 # For gtk-update-icon-cache
glib # For glib-compile-schemas
# Present here in addition to buildInputs, because meson runs
# `gtk4-update-icon-cache` during installPhase, thanks to:
# https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12
gtk4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
@ -69,7 +60,6 @@ stdenv.mkDerivation rec {
]);
buildInputs = [
gobject-introspection
gtk4
libadwaita
gst_all_1.gstreamer
@ -79,10 +69,6 @@ stdenv.mkDerivation rec {
doCheck = true;
passthru.updateScript = gnome.updateScript {
packageName = pname;
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer";
description = "Trim videos quickly";

17
pkgs/applications/video/video-trimmer/remove-screenshot-metainfo.diff
View File

@ -1,17 +0,0 @@
diff --git i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in
index 9bd25b6..c627369 100644
--- i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in
+++ w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in
@@ -19,12 +19,6 @@
Video Trimmer cuts out a fragment of a video given the start and end timestamps. The video is never re-encoded, so the process is very fast and does not reduce the video quality.
</p>
</description>
- <screenshots>
- <screenshot type="default">
- <image>https://gitlab.gnome.org/YaLTeR/video-trimmer/uploads/e840fa093439348448007197d07c8033/image.png</image>
- <caption>Main Window</caption>
- </screenshot>
- </screenshots>
<releases>
<release version="0.7.1" date="2022-03-23">
<description>

4
pkgs/data/misc/osinfo-db/default.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20220727";
version = "20220830";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "sha256-IpHlI07Ymagww28rQFb/XnYjX0uge1k0IfSGUpBjTV4=";
sha256 = "sha256-gRFkPZDeq4ONt/IT8VS+8uBXNQqcg0JF7gHdZEM7qvs=";
};
nativeBuildInputs = [

6
pkgs/development/libraries/science/math/suitesparse/default.nix
View File

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "suitesparse";
version = "5.11.0";
version = "5.13.0";
outputs = [ "out" "dev" "doc" ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "DrTimothyAldenDavis";
repo = "SuiteSparse";
rev = "v${version}";
sha256 = "sha256-AM16ngJ/CoSV6BOb80Pi9EqWoRILryOO4Rk+S5DffLU=";
sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8=";
};
nativeBuildInputs = [
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
"CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so"
] ++ lib.optionals stdenv.isDarwin [
# Unless these are set, the build will attempt to use `Accelerate` on darwin, see:
# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.11.0/SuiteSparse_config/SuiteSparse_config.mk#L368
# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368
"BLAS=-lblas"
"LAPACK=-llapack"
]

4
pkgs/development/python-modules/awscrt/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.14.3";
version = "0.14.5";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-nLlldO4otyWKn91L6vCiBh9csplFrN8tiK1tfeik6Y4=";
hash = "sha256-5dmPTN86DtEtGTgvX1T8QfvPdqZNdyBQP3lt4e4tH3o=";
};
buildInputs = lib.optionals stdenv.isDarwin [

8
pkgs/os-specific/linux/apfs/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation {
pname = "apfs";
version = "unstable-2022-07-24-${kernel.version}";
version = "unstable-2022-08-15-${kernel.version}";
src = fetchFromGitHub {
owner = "linux-apfs";
repo = "linux-apfs-rw";
rev = "925d86b7be3ccf21b17734cfececf40e43c4598e";
sha256 = "sha256-N5lGJu4c03cVDk3WTcegzZHBDmguPEX8dCedJS2TMSI=";
rev = "e4bf2d51d3fe8485ad2b28a89c157ada32ee3d77";
sha256 = "sha256-zvl1H9AIExgt6t2A2w7zDwXmRsmLY8y3P6EfbBuFdh8=";
};
hardeningDisable = [ "pic" ];
@ -29,7 +29,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/linux-apfs/linux-apfs-rw";
license = licenses.gpl2Only;
platforms = platforms.linux;
broken = kernel.kernelOlder "4.9" || kernel.kernelAtLeast "5.19";
broken = kernel.kernelOlder "4.9";
maintainers = with maintainers; [ Luflosi ];
};
}

4
pkgs/servers/frr/default.nix
View File

@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "frr";
version = "8.3";
version = "8.3.1";
src = fetchFromGitHub {
owner = "FRRouting";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-PW6ULiSGNznKS6zw4aa27QSSgbew7TTLCqwNm9bH2LY=";
hash = "sha256-+M4xTdjCp5TJh0U8ZfUmw84Y7O0TZ9mmUXhh2J/QOE0=";
};
nativeBuildInputs = [

11
pkgs/tools/X11/wpgtk/default.nix
View File

@ -3,19 +3,22 @@
python3Packages.buildPythonApplication rec {
pname = "wpgtk";
version = "6.5.0";
version = "6.5.5";
src = fetchFromGitHub {
owner = "deviantfero";
repo = "wpgtk";
rev = version;
sha256 = "0gv607jrdfbmadjyy3pbrj5ksh1dmaw5hz7l8my2z7sh0ifds0n2";
sha256 = "sha256-g3flxQNiNta+uL4t21Lhpij8b5yB78SJLGaFpTcm9fE=";
};
nativeBuildInputs = [
gobject-introspection
];
buildInputs = [
wrapGAppsHook
gtk3
gobject-introspection
gnome.adwaita-icon-theme
libxslt
];
@ -46,6 +49,6 @@ python3Packages.buildPythonApplication rec {
homepage = "https://github.com/deviantfero/wpgtk";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = [ maintainers.melkor333 ];
maintainers = [ maintainers.melkor333 maintainers.cafkafk ];
};
}

4
pkgs/tools/misc/dynamic-colors/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dynamic-colors";
version = "0.2.2.2";
version = "0.2.5";
src = fetchFromGitHub {
owner = "peterhoeg";
repo = "dynamic-colors";
rev = "v${version}";
sha256 = "0i63570z9aqbxa8ixh4ayb3akgjdnlqyl2sbf9d7x8f1pxhk5kd5";
sha256 = "sha256-jSdwq9WwYZP8MK6z7zJa0q93xfanr6iuvAt8YQkQxxE=";
};
PREFIX = placeholder "out";

29
pkgs/tools/misc/gammy/default.nix
View File

@ -1,29 +0,0 @@
{ lib, stdenv, fetchFromGitHub, qmake, libXxf86vm, wrapQtAppsHook }:
let
pname = "gammy";
version = "0.9.64";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "Fushko";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NPvkT7jSbDjcZDHpMIOik9fNsz7OJXQ3g9OFxkpA3pk=";
};
nativeBuildInputs = [ qmake wrapQtAppsHook ];
buildInputs = [ libXxf86vm ];
meta = with lib; {
description = "GUI tool for manual- of auto-adjusting of brightness/temperature";
homepage = "https://github.com/Fushko/gammy";
license = licenses.gpl3;
maintainers = with maintainers; [ atemu ];
platforms = platforms.linux;
};
}

6
pkgs/tools/security/arti/default.nix
View File

@ -10,7 +10,7 @@
rustPlatform.buildRustPackage rec {
pname = "arti";
version = "0.6.0";
version = "1.0.0";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
owner = "core";
repo = "arti";
rev = "arti-v${version}";
sha256 = "sha256-3zlpmOGCjox8dVItVxyQloPgC0+dYw57pFFBySAXC5g=";
sha256 = "sha256-BHYzthKjD1JFYcZDCjI5/w82q2rsgGhrEorPF5RExhQ=";
};
cargoSha256 = "sha256-LvhSgJQyPyTSD1koXBXYaC6I5njZavgQK4WaW5/b9g4=";
cargoSha256 = "sha256-BBQfefi1ZT9qIUx7xK/fH4WNgxvowl/Yvu7LgLXd4bM=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];

6
pkgs/tools/security/gopass/default.nix
View File

@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
version = "1.14.4";
version = "1.14.5";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UQvwkprHGez5qRpk6KodtgX99013rcezbgpaCateI4k=";
sha256 = "sha256-MFnenWoInS2vWySa0IxKAFLYF9VHmPaL0eGM27b1wpI=";
};
vendorSha256 = "sha256-169KBsJhytzfOgIOHb54gEsLAmhVv+O64hP/DU6cT6A=";
vendorSha256 = "sha256-clJAt/SZCLlLnYf2tmR9nmsbZ0SzMj7x+1Ft9dfEdJ4=";
subPackages = [ "." ];

4
pkgs/tools/text/languagetool/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, jre, makeWrapper }:
{ lib, stdenv, fetchzip, jre, makeWrapper, nixosTests }:
stdenv.mkDerivation rec {
pname = "LanguageTool";
@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.tests.languagetool = nixosTests.languagetool;
meta = with lib; {
homepage = "https://languagetool.org";
sourceProvenance = with sourceTypes; [ binaryBytecode ];

1
pkgs/top-level/aliases.nix
View File

@ -463,6 +463,7 @@ mapAliases ({
g4py = python3Packages.geant4; # Added 2020-06-06
gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06
gammy = throw "'gammy' is deprecated upstream and has been replaced by 'gummy'"; # Added 2022-09-03
gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03
gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22

18
pkgs/top-level/all-packages.nix
View File

@ -2493,8 +2493,6 @@ with pkgs;
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
gammy = qt5.callPackage ../tools/misc/gammy { stdenv = gcc10StdenvCompat; };
gams = callPackage ../tools/misc/gams (config.gams or {});
gem = callPackage ../applications/audio/pd-plugins/gem { };
@ -27179,6 +27177,7 @@ with pkgs;
em = callPackage ../applications/editors/em { };
emacs = emacs28;
emacs-gtk = emacs28-gtk;
emacs-nox = emacs28-nox;
emacs28 = callPackage ../applications/editors/emacs/28.nix {
@ -27193,6 +27192,10 @@ with pkgs;
inherit (darwin) sigtool;
};
emacs28-gtk = emacs28.override {
withGTK3 = true;
};
emacs28-nox = lowPrio (emacs28.override {
withX = false;
withNS = false;
@ -27704,14 +27707,15 @@ with pkgs;
firefox-unwrapped = firefoxPackages.firefox;
firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102;
firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91;
firefox-esr-unwrapped = firefoxPackages.firefox-esr-102;
firefox = wrapFirefox firefox-unwrapped { };
firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; };
firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { };
firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { };
firefox-esr = firefox-esr-91;
firefox-esr-unwrapped = firefoxPackages.firefox-esr-91;
firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; };
firefox-esr = firefox-esr-102;
firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { };
firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { };
firefox-esr-wayland = wrapFirefox firefox-esr-102-unwrapped { forceWayland = true; };
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
inherit (gnome) adwaita-icon-theme;