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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-06-02 18:01:04 +00:00 committed by GitHub
commit 6084eca7dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
67 changed files with 595 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/derivations.nix
View File

@ -31,7 +31,7 @@ in
(lazyDerivation { inherit derivation; meta.foo = true; }).meta
In these expressions, it `derivation` _will_ be evaluated:
In these expressions, `derivation` _will_ be evaluated:
"${lazyDerivation { inherit derivation }}"

12
maintainers/maintainer-list.nix
View File

@ -6382,6 +6382,12 @@
fingerprint = "45A9 9917 578C D629 9F5F B5B4 C22D 4DE4 D7B3 2D19";
}];
};
hitsmaxft = {
name = "Bhe Hongtyu";
email = "mfthits@gmail.com";
github = "hitsmaxft";
githubId = 352727;
};
hjones2199 = {
email = "hjones2199@gmail.com";
github = "hjones2199";
@ -15214,6 +15220,12 @@
githubId = 38893265;
name = "StrikerLulu";
};
stteague = {
email = "stteague505@yahoo.com";
github = "stteague";
githubId = 77596767;
name = "Scott Teague";
};
stumoss = {
email = "samoss@gmail.com";
github = "stumoss";

2
nixos/modules/services/networking/murmur.nix
View File

@ -313,7 +313,7 @@ in
systemd.services.murmur = {
description = "Murmur Chat Service";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ];
after = [ "network.target" ];
preStart = ''
${pkgs.envsubst}/bin/envsubst \
-o /run/murmur/murmurd.ini \

2
nixos/modules/services/web-apps/pixelfed.nix
View File

@ -448,7 +448,7 @@ in {
cfg.nginx
{
root = lib.mkForce "${pixelfed}/public/";
locations."/".tryFiles = "$uri $uri/ /index.php?query_string";
locations."/".tryFiles = "$uri $uri/ /index.php?$query_string";
locations."/favicon.ico".extraConfig = ''
access_log off; log_not_found off;
'';

3
nixos/modules/services/web-servers/garage.nix
View File

@ -49,7 +49,7 @@ in
replication_mode = mkOption {
default = "none";
type = types.enum ([ "none" "1" "2" "3" 1 2 3 ]);
type = types.enum ([ "none" "1" "2" "3" "2-dangerous" "3-dangerous" "3-degraded" 1 2 3 ]);
apply = v: toString v;
description = lib.mdDoc "Garage replication mode, defaults to none, see: <https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#replication-mode> for reference.";
};
@ -80,6 +80,7 @@ in
after = [ "network.target" "network-online.target" ];
wants = [ "network.target" "network-online.target" ];
wantedBy = [ "multi-user.target" ];
restartTriggers = [ configFile ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/garage server";

4
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -70,9 +70,9 @@ in
name = mkDefault "Mint-Y-Aqua";
package = mkDefault pkgs.cinnamon.mint-themes;
};
iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-x-icons) {
iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
name = mkDefault "Mint-Y-Aqua";
package = mkDefault pkgs.cinnamon.mint-x-icons;
package = mkDefault pkgs.cinnamon.mint-y-icons;
};
cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
name = mkDefault "Bibata-Modern-Classic";

9
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -227,11 +227,16 @@ in
xdg.icons.enable = true;
xdg.portal.enable = true;
xdg.portal.extraPortals = with pkgs.pantheon; [
xdg.portal.extraPortals = [
# Some Pantheon apps enforce portal usage, we need this for e.g. notifications.
# Currently we have buildPortalsInGnome enabled, if you run into issues related
# to https://github.com/flatpak/xdg-desktop-portal/issues/656 please report to us.
pkgs.xdg-desktop-portal-gtk
] ++ (with pkgs.pantheon; [
elementary-files
elementary-settings-daemon
xdg-desktop-portal-pantheon
];
]);
# Override GSettings schemas
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

29
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -1,11 +1,8 @@
# This module creates a virtual machine from the NixOS configuration.
# Building the `config.system.build.vm' attribute gives you a command
# that starts a KVM/QEMU VM running the NixOS configuration defined in
# `config'. The Nix store is shared read-only with the host, which
# makes (re)building VMs very efficient. However, it also means you
# can't reconfigure the guest inside the guest - you need to rebuild
# the VM in the host. On the other hand, the root filesystem is a
# read/writable disk image persistent across VM reboots.
# `config'. By default, the Nix store is shared read-only with the
# host, which makes (re)building VMs very efficient.
{ config, lib, pkgs, options, ... }:
@ -778,12 +775,11 @@ in
default = false;
description =
lib.mdDoc ''
If enabled, the virtual machine will be booted using the
regular boot loader (i.e., GRUB 1 or 2). This allows
testing of the boot loader. If
disabled (the default), the VM directly boots the NixOS
kernel and initial ramdisk, bypassing the boot loader
altogether.
Use a boot loader to boot the system.
This allows, among other things, testing the boot loader.
If disabled, the kernel and initrd are directly booted,
forgoing any bootloader.
'';
};
@ -1026,7 +1022,6 @@ in
"-netdev user,id=user.0,${forwardingOptions}${restrictNetworkOption}\"$QEMU_NET_OPTS\""
];
# FIXME: Consolidate this one day.
virtualisation.qemu.options = mkMerge [
(mkIf cfg.qemu.virtioKeyboard [
"-device virtio-keyboard"
@ -1078,14 +1073,12 @@ in
}) cfg.emptyDiskImages)
];
# Use mkVMOverride to enable building test VMs (e.g. via `nixos-rebuild
# build-vm`) of a system configuration, where the regular value for the
# `fileSystems' attribute should be disregarded (since those filesystems
# don't necessarily exist in the VM).
fileSystems = mkVMOverride cfg.fileSystems;
# Mount the host filesystem via 9P, and bind-mount the Nix store
# of the host into our own filesystem. We use mkVMOverride to
# allow this module to be applied to "normal" NixOS system
# configuration, where the regular value for the `fileSystems'
# attribute should be disregarded for the purpose of building a VM
# test image (since those filesystems don't exist in the VM).
virtualisation.fileSystems = let
mkSharedDir = tag: share:
{

2
nixos/tests/aaaaxy.nix
View File

@ -21,7 +21,7 @@
"ln -s '${pkgs.aaaaxy.testing_infra}/assets/demos/benchmark.dem' '/tmp/aaaaxy/assets/demos/'",
"""
'${pkgs.aaaaxy.testing_infra}/scripts/regression-test-demo.sh' \
'aaaaxy' 'on track for Any%, All Paths and No Teleports' \
'aaaaxy' 'on track for Any%, All Paths, No Teleports and No Coil' \
'${pkgs.aaaaxy}/bin/aaaaxy' '/tmp/aaaaxy/assets/demos/benchmark.dem'
""",
)

4
nixos/tests/cinnamon.nix
View File

@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
meta.maintainers = lib.teams.cinnamon.members;
nodes.machine = { nodes, ... }: {
nodes.machine = { ... }: {
imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.desktopManager.cinnamon.enable = true;
@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
testScript = { nodes, ... }:
let
user = nodes.machine.config.users.users.alice;
user = nodes.machine.users.users.alice;
uid = toString user.uid;
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
display = "DISPLAY=:0.0";

2
pkgs/applications/editors/jetbrains/update.py
View File

@ -64,7 +64,7 @@ def update_product(name, product):
build = latest_build(channel)
new_version = build["@version"]
new_build_number = build["@fullNumber"]
if all(x not in channel["@name"] for x in ["EAP", "Gateway"]):
if "EAP" not in channel["@name"]:
version_or_build_number = new_version
else:
version_or_build_number = new_build_number

24
pkgs/applications/editors/jetbrains/versions.json
View File

@ -19,10 +19,10 @@
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
"version": "2023.1.1",
"sha256": "217196806daebd14e604d13247862e44e6a0b0b9f115f1b9ceadbcfb064b3c3c",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1.tar.gz",
"build_number": "231.8770.69"
"version": "2023.1.2",
"sha256": "fab46521e7a4558a166e3b11d86ca2312a9807e69419925ed5743ab4f421ab96",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.2.tar.gz",
"build_number": "231.9011.34"
},
"goland": {
"update-channel": "GoLand RELEASE",
@ -126,10 +126,10 @@
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
"version": "2023.1.1",
"sha256": "e580bf5bd657b721677fec0250ce582adb1cf92daa1ac065b56fc2d8148fac97",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1.dmg",
"build_number": "231.8770.69"
"version": "2023.1.2",
"sha256": "320beadb9eb50f48eb431bcd2c88ec1c2e7e0ef2f1f2414aa3842de5930d79ff",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.2.dmg",
"build_number": "231.9011.34"
},
"goland": {
"update-channel": "GoLand RELEASE",
@ -233,10 +233,10 @@
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
"version": "2023.1.1",
"sha256": "ab0c773315a6d8abcaae75440f7fc122a7e80237eddaa3487c3222a52a95497f",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1-aarch64.dmg",
"build_number": "231.8770.69"
"version": "2023.1.2",
"sha256": "338edd281715b14193834ed01947c6161865e58d1416557316c2b298401a0272",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.2-aarch64.dmg",
"build_number": "231.9011.34"
},
"goland": {
"update-channel": "GoLand RELEASE",

6
pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock generated
View File

@ -749,9 +749,9 @@ dependencies = [
[[package]]
name = "h2"
version = "0.3.16"
version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
dependencies = [
"bytes",
"fnv",
@ -1086,7 +1086,7 @@ dependencies = [
[[package]]
name = "maple"
version = "0.1.43"
version = "0.1.44"
dependencies = [
"built",
"chrono",

8
pkgs/applications/editors/vim/plugins/vim-clap/default.nix
View File

@ -7,16 +7,17 @@
, stdenv
, darwin
, vimUtils
, nix-update-script
}:
let
version = "0.43";
version = "0.44";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "v${version}";
hash = "sha256-UHsDSah8Fn67w11s/lwL76qbGPqXhz6tYlBBuiqTNXs=";
hash = "sha256-3kPRntl5tHsITrEJaRRcidowcyMpXDTVV5jFN/GV8Sk=";
};
meta = with lib; {
@ -62,5 +63,8 @@ vimUtils.buildVimPluginFrom2Nix {
passthru = {
inherit maple;
updateScript = nix-update-script {
attrPath = "vimPlugins.vim-clap.maple";
};
};
}

17
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -305,6 +305,23 @@ let
};
};
asdine.cue = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "cue";
publisher = "asdine";
version = "0.3.2";
sha256 = "sha256-jMXqhgjRdM3UG/9NtiwWAg61mBW8OYVAKDWgb4hzhA4=";
};
meta = {
description = "Cue language support for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=asdine.cue";
homepage = "https://github.com/asdine/vscode-cue";
changelog = "https://marketplace.visualstudio.com/items/asdine.cue/changelog";
license = lib.licenses.mit;
maintainers = [lib.maintainers.matthewpi];
};
};
astro-build.astro-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "astro-vscode";

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

@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-10";
version = "7.1.1-11";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-W7s/j4R4C22hYVhye8TjDYHtDq/1Q4GGu/9lxyjk6sA=";
hash = "sha256-/CZRnNy/p87sEcH94RkRYgYXexFSU0Bm809pcvDFdV4=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

49
pkgs/applications/misc/octoprint/default.nix
View File

@ -4,7 +4,6 @@
, lib
, fetchFromGitHub
, python3
, fetchPypi
, substituteAll
, nix-update-script
, nixosTests
@ -17,43 +16,6 @@ let
self = py;
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
[
(
# with version 3 of flask-limiter octoprint 1.8.7 fails to start with
# TypeError: Limiter.__init__() got multiple values for argument 'key_func'
self: super: {
flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec {
version = "2.6.2";
src = fetchFromGitHub {
owner = "alisaifee";
repo = "flask-limiter";
rev = version;
sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew=";
};
});
flask-babel = super.flask-babel.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0";
src = fetchPypi {
pname = "Flask-Babel";
inherit version;
sha256 = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0=";
};
nativeBuildInputs = [ ];
format = "setuptools";
outputs = [ "out" ];
patches = [ ];
});
# downgrade needed for flask-babel 2.0.0
babel = super.babel.overridePythonAttrs (oldAttrs: rec {
version = "2.11.0";
src = fetchPypi {
pname = "Babel";
inherit version;
hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y=";
};
propagatedBuildInputs = [ self.pytz ];
});
}
)
# Built-in dependency
(
self: super: {
@ -94,14 +56,14 @@ let
self: super: {
octoprint-pisupport = self.buildPythonPackage rec {
pname = "OctoPrint-PiSupport";
version = "2022.6.13";
version = "2023.5.24";
format = "setuptools";
src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint-PiSupport";
rev = version;
hash = "sha256-3z5Btl287W3j+L+MQG8FOWt21smML0vpmu9BP48B9A0=";
hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew=";
};
# requires octoprint itself during tests
@ -118,13 +80,13 @@ let
self: super: {
octoprint = self.buildPythonPackage rec {
pname = "OctoPrint";
version = "1.8.7";
version = "1.9.0";
src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint";
rev = version;
hash = "sha256-g4PYB9YbkX0almRPgMFlb8D633Y5fc3H+Boa541suqc=";
hash = "sha256-gTWQSqgksZMxdaZ7V3hmnqXlZ+OMI86RX0lC8z1AEzI=";
};
propagatedBuildInputs = with self; [
@ -176,6 +138,8 @@ let
wrapt
zeroconf
zipstream-ng
class-doc
pydantic
] ++ lib.optionals stdenv.isDarwin [
py.pkgs.appdirs
];
@ -217,6 +181,7 @@ let
"werkzeug"
"flask"
"Flask-Limiter"
"blinker"
];
in
''

25
pkgs/applications/misc/octoprint/ffmpeg-path.patch
View File

@ -1,30 +1,11 @@
diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2
index 79342dcd7..6165a4119 100644
--- a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2
+++ b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2
@@ -29,14 +29,3 @@
{% include "snippets/settings/webcam/webcamStreamUrl.jinja2" %}
{% include "snippets/settings/webcam/webcamSnapshotUrl.jinja2" %}
</form>
-
-<h4>{{ _('Timelapse Recordings') }}</h4>
-
-{% trans %}<p>
- To render the snapshots into timelapse recordings, OctoPrint also needs to
- know the correct <strong>path to FFMPEG</strong>.
-</p>{% endtrans %}
-
-<form class="form-horizontal" data-bind="with: settingsViewModel" onsubmit="return false;">
- {% include "snippets/settings/webcam/ffmpegPath.jinja2" %}
-</form>
diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py
index c3e6cea10..ced2f8fa0 100644
--- a/src/octoprint/server/api/settings.py
+++ b/src/octoprint/server/api/settings.py
@@ -130,7 +130,7 @@ def getSettings():
"snapshotUrl": s.get(["webcam", "snapshot"]),
@@ -130,7 +130,7 @@ data["webcam"] = {
"webcamEnabled": s.getBoolean(["webcam", "webcamEnabled"]),
"snapshotTimeout": s.getInt(["webcam", "snapshotTimeout"]),
"snapshotSslValidation": s.getBoolean(["webcam", "snapshotSslValidation"]),
"timelapseEnabled": s.getBoolean(["webcam", "timelapseEnabled"]),
- "ffmpegPath": s.get(["webcam", "ffmpeg"]),
+ "ffmpegPath": "@ffmpeg@",
"ffmpegCommandline": s.get(["webcam", "ffmpegCommandline"]),

4
pkgs/applications/misc/ticker/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ticker";
version = "4.5.10";
version = "4.5.13";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-2CELRY6V7/6PcC5s4XjOqadxXc5SbS0vstqLEej3xnI=";
hash = "sha256-0T4Cl9o21Tt4ZFeY7kUe4Obu4IY9JMLBwUqgs4rZx1U=";
};
vendorHash = "sha256-c7wU9LLRlS9kOhE4yAiKAs/npQe8lvSwPcd+/D8o9rk=";

48
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -28,20 +28,20 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"aiven": {
"hash": "sha256-adBkV3Gg75M0336GDzzxN3ONt24/KBKPC2EDDFRB7JY=",
"hash": "sha256-kHCgl4osr0L9GR9Fv3u8dUs+ko82vxjE6dmJ9QZoQsE=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
"rev": "v4.4.0",
"rev": "v4.4.1",
"spdx": "MIT",
"vendorHash": "sha256-5m2ZZ/tuLz8zTt8B1TiokDZeQ9qJYeaVEhqMU04zV2s="
"vendorHash": "sha256-phcV7ZQ/7umtJMp0ozGV0jpYizlvmNq3Eo/wZ7tfNec="
},
"akamai": {
"hash": "sha256-IbftoN1fnnl6Z4SkW2DsPvlaNTSLc+oskJBnAM2afpg=",
"hash": "sha256-RIJarmJZHDl5XhXLnr1igiBq9Uu9/2N+vhosPFTs2tg=",
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
"owner": "akamai",
"repo": "terraform-provider-akamai",
"rev": "v4.0.0",
"rev": "v4.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Z7HlUJ5VuQ7rBhoprmvS6HwNZ53iUoBnfXzKTV43bzE="
},
@ -110,13 +110,13 @@
"vendorHash": null
},
"aws": {
"hash": "sha256-eHU3dsu/aJ72BTwe4CAWhf29ZueUhyg10Ncs9yUxi80=",
"hash": "sha256-DbBS2gEUqG3YjGfLIj3YvQUCTyp+nRH7d4htTUkUNHQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v5.0.1",
"rev": "v5.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-53BHSeRBgnT5LuSuTUA5R/bbeozd2gOxsXd/2tlrbYU="
"vendorHash": "sha256-0LH3zYIdqgxpKtxQBEuTxRivHf0yvmwUTUo+vAAmdaY="
},
"azuread": {
"hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=",
@ -128,11 +128,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-GVxIr57y5tlOrZYtu09FI0IYG2cLkHkYMMofdqdCans=",
"hash": "sha256-Zyv4il6co+TcMkN+Hl7znGT1uN5Xohe8zFv5ghkeZP8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.58.0",
"rev": "v3.59.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -390,13 +390,13 @@
"vendorHash": null
},
"flexibleengine": {
"hash": "sha256-TZR/zXgecHUbaD9Yb83HvBwWauDtHDsnEcSZYFmY5y4=",
"hash": "sha256-WO99FOJ6zZ0GPxoYwH55Ul0HTktH2UZ3yWRrwjk3qA4=",
"homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine",
"owner": "FlexibleEngineCloud",
"repo": "terraform-provider-flexibleengine",
"rev": "v1.37.0",
"rev": "v1.38.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-HcyUGKbgj322fU7keN/lBEn6UJhV3QXScBJHZHJkCII="
"vendorHash": "sha256-DSdE0CkAIJje71/S64no9fMJMUhAnFiK3lWewvcyE14="
},
"fortios": {
"deleteVendor": true,
@ -419,11 +419,11 @@
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
},
"github": {
"hash": "sha256-f/9Dn5jsh+aWpfmSeICQQUOuD9A6A4/1pMb+Q19HDLI=",
"hash": "sha256-DEylIY8bU0obeeAUYwNx1f5mZwQpmhILdp+940P9z78=",
"homepage": "https://registry.terraform.io/providers/integrations/github",
"owner": "integrations",
"repo": "terraform-provider-github",
"rev": "v5.25.1",
"rev": "v5.26.0",
"spdx": "MIT",
"vendorHash": null
},
@ -493,13 +493,13 @@
"vendorHash": "sha256-qa6DUmzL+JB/WTJM+a5VDvBCsrbt8gq/LeqzdAHLm0Q="
},
"helm": {
"hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=",
"hash": "sha256-1yoFtTuB8GI2eazW85isgKYOcyL2codoXvTE0VCu5ZI=",
"homepage": "https://registry.terraform.io/providers/hashicorp/helm",
"owner": "hashicorp",
"repo": "terraform-provider-helm",
"rev": "v2.9.0",
"rev": "v2.10.0",
"spdx": "MPL-2.0",
"vendorHash": null
"vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE="
},
"heroku": {
"hash": "sha256-xxNFI36UYhCsz/mqcRkG+XEIlAyw4RCLuwrz02rdJqY=",
@ -855,13 +855,13 @@
"vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI="
},
"opentelekomcloud": {
"hash": "sha256-8Is/KtVE9eoOAk7GTsqkBe1Ppw0YpThBnj0uxQlBMuY=",
"hash": "sha256-35Xp3FfkBvdacbZ20+Z8DgwavA5XvqJknEzLM71YkXg=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.34.4",
"rev": "v1.35.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-2EuGZxHrpPwDicSrIf/Jx/c4LhOtE5HvTz9LkJ4xCSY="
"vendorHash": "sha256-ubEoh4GUkyNAvyHCowURhvucOyFpMidxoFeqE1w2GQY="
},
"opsgenie": {
"hash": "sha256-fcQChRIwxAeAdYPTYC9rPSdbrmXaBIOotF7vQhO9Sl0=",
@ -1044,13 +1044,13 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
"hash": "sha256-VzIQqxEZl3+cRk19vxJGF0DbzutrfOWeP27TMat//Es=",
"hash": "sha256-gaQN06gJIsJVRmURzs7cWQEX7bM0LCMJfzR10PslFh4=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.120.0",
"rev": "v1.121.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-/sXd/qAChMpVTY/JN45fb2XFG0nsqc1ytC2FjXpva3c="
"vendorHash": "sha256-hfg3XyBf5V+NJTzCoHbnTU4HkEdQsllqcH2NjeTmlf0="
},
"stackpath": {
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",

50
pkgs/applications/radio/abracadabra/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
, qtbase, qtmultimedia, qttools
, faad2, mpg123, portaudio
, libusb1, rtl-sdr, airspy, soapysdr-with-plugins
} :
stdenv.mkDerivation rec {
pname = "abracadabra";
version = "2.1.1";
src = fetchFromGitHub {
owner = "KejPi";
repo = "AbracaDABra";
rev = "v${version}";
sha256 = "sha256-pjcao8KTEmgE54dUBxLLnStszR32LryfciMKScBOGdc=";
};
nativeBuildInputs = [
cmake
wrapQtAppsHook
qttools
];
buildInputs = [
qtbase
qtmultimedia
faad2
mpg123
portaudio
libusb1
rtl-sdr
airspy
soapysdr-with-plugins
];
cmakeFlags = [
"-DAIRSPY=ON"
"-DSOAPYSDR=ON"
];
meta = with lib; {
description = "DAB/DAB+ radio application";
homepage = "https://github.com/KejPi/AbracaDABra";
platforms = platforms.linux;
license = licenses.mit;
maintainers = [ maintainers.markuskowa ];
mainProgram = "AbracaDABra";
};
}

41
pkgs/applications/radio/flamp/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchgit
, autoreconfHook
, pkg-config
, fltk13
, libsndfile
, gettext
}:
stdenv.mkDerivation (finalAttrs: {
pname = "flamp";
version = "2.2.07";
src = fetchgit {
url = "https://git.code.sf.net/p/fldigi/flamp";
rev = "v${finalAttrs.version}";
hash = "sha256-BnKL1iwaw1iJC5qcGCvdMr461n0BSYxk61dbAnhpz2c=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
gettext
];
buildInputs = [
fltk13
];
enableParallelBuilding = true;
meta = with lib; {
description = "Digital modem program";
homepage = "https://sourceforge.net/projects/fldigi/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ stteague ];
platforms = platforms.unix;
broken = stdenv.system == "x86_64-darwin";
};
})

4
pkgs/applications/science/misc/boinc/default.nix
View File

@ -26,14 +26,14 @@
stdenv.mkDerivation rec {
pname = "boinc";
version = "7.22.1";
version = "7.22.2";
src = fetchFromGitHub {
name = "${pname}-${version}-src";
owner = "BOINC";
repo = "boinc";
rev = "client_release/${lib.versions.majorMinor version}/${version}";
hash = "sha256-DYbcWBJEjSJWRXNdumDhhybKSs8ofyREWqj2ghrvmBE=";
hash = "sha256-9GgvyYiDfppRuDFfxn50e+YZeSX0SLKSfo31lWx2FBs=";
};
nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];

4
pkgs/applications/version-management/ghorg/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ghorg";
version = "1.9.4";
version = "1.9.5";
src = fetchFromGitHub {
owner = "gabrie30";
repo = "ghorg";
rev = "v${version}";
sha256 = "sha256-J/oZrtm/Bs4SU/Wl9LEH0kMxkOEXR2g/Bod5QFoCudU=";
sha256 = "sha256-beFZRH5FG6aEvMhjsheeBHxqHRH0jkRt5FDYkeyrc2E=";
};
doCheck = false;

29
pkgs/applications/version-management/git-credential-oauth/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "git-credential-oauth";
version = "0.7.0";
src = fetchFromGitHub {
owner = "hickford";
repo = pname;
rev = "v${version}";
hash = "sha256-f12PgTtfs/S9RI8+QFROkNqccRWeIW1/YkynqvKJc7I=";
};
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
];
vendorHash = "sha256-9X7ti3NR5MKK0MpiyTOTO+EtdMuu4/TW/diHq9FjSHY=";
meta = {
description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth";
homepage = "https://github.com/hickford/git-credential-oauth";
changelog = "https://github.com/hickford/git-credential-oauth/releases/tag/${src.rev}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ shyim ];
};
}

6
pkgs/applications/version-management/gitsign/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "gitsign";
version = "0.6.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
hash = "sha256-VgkTFYnHKpqZOack5SabOFu2BRespVRhgrsepo0V1mI=";
hash = "sha256-99JpuABkPHTNy9OpvRL7aIe1ZTrs2uZvxtxZf8346Ao=";
};
vendorHash = "sha256-zalysp+90+QM5hX7yUudJW61h+3tQOab7ZpcF5kZSB0=";
vendorHash = "sha256-+EKC/Up48EjwfVhLTpoxctWCSMDL0kLZaRPLBl0JGFQ=";
subPackages = [
"."

9
pkgs/desktops/cinnamon/warpinator/default.nix
View File

@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation rec {
pname = "warpinator";
version = "1.6.1";
version = "1.6.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-H8bFSgx3IysHCoKrMZ9gbwRl9forEjY90a/PIC68E6k=";
hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc=";
};
nativeBuildInputs = [
@ -77,11 +77,6 @@ stdenv.mkDerivation rec {
--replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \
--replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \
--replace 'GLib.find_program_in_path("bwrap")' "True"
# Typo fix that can be removed on next update
# https://github.com/linuxmint/warpinator/pull/174
substituteInPlace src/remote.py \
--replace "receiver.remaining_count" "op.remaining_count"
'';
passthru.updateScript = gitUpdater {

4
pkgs/desktops/pantheon/apps/elementary-videos/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "elementary-videos";
version = "2.9.0";
version = "2.9.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "videos";
rev = version;
sha256 = "sha256-QQcuhYe3/ZMqQEFJS72+vr1AzJC9Y7mr5Fa5yFsNYIc=";
sha256 = "sha256-G961ndONwHiqdeO26Ulxkg71ByfdFMAV35VFzu4TQ3M=";
};
nativeBuildInputs = [

4
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy";
version = "2.4.1";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-k8IQumV8rjV3U4ACm5FxCqzSdwqKBaGAqsv45hsP/7c=";
sha256 = "sha256-J3lUyLNyxlleD2jklXB2jMRvLY6WG5iccA2lIaJL3d4=";
};
nativeBuildInputs = [

4
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "elementary-default-settings";
version = "7.0.1";
version = "7.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "default-settings";
rev = version;
sha256 = "sha256-RPnERK93GCfWyw1sIW5BitCIo11/t1koV4r1+NF5NdI=";
sha256 = "sha256-YFI1UM7CxjYkoIhSg9Fn81Ze6DX7D7p89xibk7ik8bI=";
};
nativeBuildInputs = [

14
pkgs/development/interpreters/clojure/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper, writeScript }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "clojure";
version = "1.11.1.1273";
version = "1.11.1.1347";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-X4uvzyS9FIrJvL5gqOe4CTye2OuODzhxmXcOOPDkDOY=";
url = "https://download.clojure.org/install/clojure-tools-${finalAttrs.version}.tar.gz";
hash = "sha256-1ebAPk64tJt/Cpt3pKfMTN50YABKPflqG055f4Quv+M=";
};
nativeBuildInputs = [
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
install -Dm644 example-deps.edn "$clojure_lib_dir/example-deps.edn"
install -Dm644 tools.edn "$clojure_lib_dir/tools.edn"
install -Dm644 exec.jar "$clojure_lib_dir/libexec/exec.jar"
install -Dm644 clojure-tools-${version}.jar "$clojure_lib_dir/libexec/clojure-tools-${version}.jar"
install -Dm644 clojure-tools-${finalAttrs.version}.jar "$clojure_lib_dir/libexec/clojure-tools-${finalAttrs.version}.jar"
echo "Installing clojure and clj into $bin_dir"
substituteInPlace clojure --replace PREFIX $out
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \
-Spath \
-Sverbose \
-Scp $out/libexec/clojure-tools-${version}.jar
-Scp $out/libexec/clojure-tools-${finalAttrs.version}.jar
'';
passthru.updateScript = writeScript "update-clojure" ''
@ -98,4 +98,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ jlesquembre thiagokokada ];
platforms = platforms.unix;
};
}
})

4
pkgs/development/libraries/zchunk/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "zchunk";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "zchunk";
repo = pname;
rev = version;
hash = "sha256-9T1u2Qvy2gRUQzgAp81x+tSbHXuEoxhYhS1T9XntvKk=";
hash = "sha256-mZc8DC26c4hZzHsozhBmuvaIjL3ifQ7GYYGDEsBBPKc=";
};
nativeBuildInputs = [

49
pkgs/development/python-modules/class-doc/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, more-itertools
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "class-doc";
version = "0.2.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "danields761";
repo = "${pname}";
rev = "9b122d85ce667d096ebee75a49350bbdbd48686d"; # no 0.2.6 version tag
hash = "sha256-4Sn/TuBvBpl1nvJBg327+sVrjGavkYKEYP32DwLWako=";
};
nativeBuildInputs = [
poetry-core
];
postPatch = ''
substituteInPlace pyproject.toml --replace \
"poetry.masonry.api" \
"poetry.core.masonry.api"
'';
propagatedBuildInputs = [
more-itertools
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"class_doc"
];
meta = with lib; {
description = "Extract attributes docstrings defined in various ways";
homepage = "https://github.com/danields761/class-doc";
license = licenses.mit;
maintainers = with maintainers; [ gador ];
};
}

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "plexapi";
version = "4.13.4";
version = "4.14.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pkkid";
repo = "python-plexapi";
rev = "refs/tags/${version}";
hash = "sha256-yq1tQ6xJn+IxrKXwUVeLhki6sdkwzu9hHSILsLJdPPY=";
hash = "sha256-wSM8YCKRvwEs7fEjUjOp52PdF2Y1kxnX/Xpf0KdXR2k=";
};
propagatedBuildInputs = [

19
pkgs/development/python-modules/pysmart/default.nix
View File

@ -1,35 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, smartmontools
, chardet
, humanfriendly
, pytestCheckHook
, pythonOlder
, setuptools-scm
, smartmontools
}:
buildPythonPackage rec {
pname = "pysmart";
version = "1.2.3";
format = "setuptools";
version = "1.2.5";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "truenas";
repo = "py-SMART";
rev = "refs/tags/v${version}";
hash = "sha256-5VoZEgHWmHUDkm2KhBP0gfmhOJUYJUqDLWBp/kU1404=";
rev = "v${version}";
hash = "sha256-NqE7Twl1kxXrASyxw35xIOTB+LThU0a45NCxh8SUxfI=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
postPatch = ''
substituteInPlace pySMART/utils.py \
--replace "which('smartctl')" '"${smartmontools}/bin/smartctl"'
'';
propagatedBuildInputs = [
chardet
humanfriendly
];
nativeBuildInputs = [
setuptools-scm
];
nativeCheckInputs = [
pytestCheckHook
];

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "python-lsp-ruff";
version = "1.4.0";
version = "1.5.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit version;
pname = "python-lsp-ruff";
sha256 = "sha256-TqTeQc/lT5DcPcJbZXbEiUGbYjFP8idpzdSZlXD59Y4=";
sha256 = "sha256-yvG4Qn9aym0rTDALURxHrWtDhO7g2VYsI+zLgb8z+gE=";
};
postPatch = ''

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

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "tldextract";
version = "3.4.1";
version = "3.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+p5QxKA77eKh2V3KYg1mFnhIRiaFjM84jPlnGg3Ul6Q=";
hash = "sha256-mONrCqOm2P0ITYDXWuE3LaAgJ++1VsFGpZ39FEVwcbo=";
};
nativeBuildInputs = [

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

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "txtorcon";
version = "23.0.0";
version = "23.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-AiX/rWdokTeEmtmtNK21abDYj5rwRQMABnpfkB6ZQyU=";
hash = "sha256-k/2Aqd1QX2mNCGT+k9uLapwRRLX+uRUwggtw7YmCZRw=";
};
propagatedBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "xapp";
version = "2.4.0";
version = "2.4.1";
format = "other";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "linuxmint";
repo = "python-xapp";
rev = version;
hash = "sha256-qEK71cGNGmaThxlFVsfnLUTD83RTr8GP+501c4UbHCk=";
hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o=";
};
nativeBuildInputs = [

5
pkgs/development/ruby-modules/bundler-update-script/default.nix
View File

@ -1,11 +1,11 @@
{ runtimeShell, lib, writeScript, bundix, bundler, bundler-audit, coreutils, git, nix }:
{ runtimeShell, lib, writeScript, bundix, bundler, coreutils, git, nix }:
attrPath:
let
updateScript = writeScript "bundler-update-script" ''
#!${runtimeShell}
PATH=${lib.makeBinPath [ bundler bundler-audit bundix coreutils git nix ]}
PATH=${lib.makeBinPath [ bundler bundix coreutils git nix ]}
set -o errexit
set -o nounset
set -o pipefail
@ -19,7 +19,6 @@ let
cd "$gemdir"
bundler lock --update
bundler-audit check --update
bundix
'';
in [ updateScript attrPath ]

11
pkgs/development/tools/godot/3/default.nix
View File

@ -79,9 +79,9 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out/bin"
cp bin/godot.* $out/bin/godot
cp bin/godot.* $out/bin/godot3
wrapProgram "$out/bin/godot" \
wrapProgram "$out/bin/godot3" \
--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib
mkdir "$dev"
@ -91,11 +91,12 @@ stdenv.mkDerivation rec {
cp misc/dist/linux/godot.6 "$man/share/man/man6/"
mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/"
cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/org.godotengine.Godot3.desktop"
cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
cp icon.png "$out/share/icons/godot.png"
substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \
--replace "Exec=godot" "Exec=$out/bin/godot"
substituteInPlace "$out/share/applications/org.godotengine.Godot3.desktop" \
--replace "Exec=godot" "Exec=$out/bin/godot3" \
--replace "Godot Engine" "Godot Engine 3"
'';
meta = with lib; {

9
pkgs/development/tools/godot/4/default.nix
View File

@ -109,14 +109,15 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out/bin"
cp bin/godot.* $out/bin/godot
cp bin/godot.* $out/bin/godot4
installManPage misc/dist/linux/godot.6
mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/"
substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \
--replace "Exec=godot" "Exec=$out/bin/godot"
cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/org.godotengine.Godot4.desktop"
substituteInPlace "$out/share/applications/org.godotengine.Godot4.desktop" \
--replace "Exec=godot" "Exec=$out/bin/godot4" \
--replace "Godot Engine" "Godot Engine 4"
cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
cp icon.png "$out/share/icons/godot.png"
'';

6
pkgs/development/tools/golangci-lint/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golangci-lint";
version = "1.52.2";
version = "1.53.1";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
hash = "sha256-FmNXjOMDDdGxMQvy5f1NoaqrKFpmlPWclXooMxXP8zg=";
hash = "sha256-8cZpWfWkqMqz63dcF11ZKRWEFbk3XUG7a69nASC7dNE=";
};
vendorHash = "sha256-BhD3a0LNc3hpiH4QC8FpmNn3swx3to8+6gfcgZT8TLg=";
vendorHash = "sha256-DnAW56TSZRywom4riRvylJaN8zk9U0Eq0quh6LRGtL4=";
subPackages = [ "cmd/golangci-lint" ];

6
pkgs/development/tools/language-servers/dot-language-server/default.nix
View File

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "dot-language-server";
version = "1.1.27";
version = "1.2.1";
src = fetchFromGitHub {
owner = "nikeee";
repo = "dot-language-server";
rev = "v${version}";
hash = "sha256-Dha6S+qc9rwPvxUkBXYUomyKckEcqp/ESU/24GkrmpA=";
hash = "sha256-NGkobMZrvWlW/jteFowZgGUVQiNm3bS5gv5tN2485VA=";
};
npmDepsHash = "sha256-nI8xPCTZNqeGW4I99cDTxtVLicF1MEIMTPRp7O0bFE4=";
npmDepsHash = "sha256-spskj0vqfR9GoQeKyfLsQgRp6JasZeVLCVBt6wZiSP8=";
npmBuildScript = "compile";

23
pkgs/development/tools/misc/husky/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, buildNpmPackage, fetchFromGitHub }:
buildNpmPackage rec {
pname = "husky";
version = "8.0.3";
src = fetchFromGitHub {
owner = "typicode";
repo = "husky";
rev = "v${version}";
hash = "sha256-KoF2+vikgFyCGjfKeaqkC720UVMuvCIn9ApDPKbudsA=";
};
npmDepsHash = "sha256-u1dndTKvInobva+71yI2vPiwrW9vqzAJ2sDAqT9YJsg=";
meta = with lib; {
description = "Git hooks made easy 🐶 woof!";
homepage = "https://github.com/typicode/husky";
changelog = "https://github.com/typicode/husky/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
};
}

4
pkgs/development/tools/package-project-cmake/default.nix
View File

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "package-project-cmake";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "TheLartians";
repo = "PackageProject.cmake";
rev = "v${finalAttrs.version}";
hash = "sha256-tDjWknwqN8NLx6GX16WOn0JUDAyaGU9HA7fTsHNLx9s=";
hash = "sha256-41cJm6eO5Q6xhARJbshi6Tesk/IxEQNsMShmDcjVqzs=";
};
dontConfigure = true;

6
pkgs/development/tools/packer/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "packer";
version = "1.8.7";
version = "1.9.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
sha256 = "sha256-M37JFKAv1GMtMr0UQ8lFEcTuboSMmCQ29dr6OP07HB8=";
sha256 = "sha256-UcYaZOXDcKlvE6Iba2DrGM6L8RqaYjSWTv+8YmrBQjs=";
};
vendorHash = "sha256-uQQv89562bPOoKDu5qEEs+p+N8HPRmgFZKUc5YEsz/w=";
vendorHash = "sha256-aRjSYnb8xyjI4Gn4I91aP3evCqimlL5zR6jpgWNFRME=";
subPackages = [ "." ];

4
pkgs/development/tools/protoc-gen-connect-go/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "protoc-gen-connect-go";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "connect-go";
rev = "refs/tags/v${version}";
hash = "sha256-KtyDnBDG67H4r/3s1ehbJhrzeG1LoU2BatWWgfTkAAs=";
hash = "sha256-V6PXapfWo0WlRz1PP90ZcHI/s9MHXhU3p4i7K6eWC8g=";
};
vendorHash = "sha256-yCZ16rmqi8DAwIVuEgCw373bQX+cLhSNbpKutF5L2bc=";

6
pkgs/development/tools/relic/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "relic";
version = "7.5.4";
version = "7.5.5";
src = fetchFromGitHub {
owner = "sassoftware";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rm52XrN0554copqIllfaNC9EIZ+6rxVeZWTWR2y9X14=";
sha256 = "sha256-2mE3A2aJWEHqsl/hX6zxjPx+vxDhWLkxENLCNpYEI1M=";
};
vendorHash = "sha256-389ki4hsx7l2gHSiOHledo/ZP+I3NAkk1K8anq2kfEE=";
vendorHash = "sha256-EZohpGzMDYKUbjSOIfoUbbsABNDOddrTt52pv+VQLdI=";
meta = with lib; {
homepage = "https://github.com/sassoftware/relic";

4
pkgs/development/web/twitter-bootstrap/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bootstrap";
version = "5.2.3";
version = "5.3.0";
src = fetchurl {
url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";
sha256 = "sha256-j6IBaj3uHiBL0WI+BQ3PR36dKME7uYofWPV+D9QM3Tg=";
sha256 = "sha256-RUN0HbrDlUt7fMDjSHaIoTyOchSmfsMQZyATZmz2zY0=";
};
nativeBuildInputs = [ unzip ];

10
pkgs/games/aaaaxy/default.nix
View File

@ -12,22 +12,24 @@
, libXxf86vm
, go-licenses
, pkg-config
, zip
, advancecomp
, nixosTests
}:
buildGoModule rec {
pname = "aaaaxy";
version = "1.3.538";
version = "1.4.2";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-APoU+VlIUSwMai9INSOyqBp8azy970tF5bz8IDr5NiI=";
hash = "sha256-8cu8/IQTcqC5p23YLQMpmOTCbtduJvi+8SDaztGjJnI=";
fetchSubmodules = true;
};
vendorHash = "sha256-slvBpweXRLsDegJDQ0ysZ0pugx5fdOOnD/OxWUfUnno=";
vendorHash = "sha256-8Yk2r8JPh53I0SRUc2V8Ehh/V3qUQOU1PsLk81sW7pg=";
buildInputs = [
alsa-lib
@ -39,6 +41,8 @@ buildGoModule rec {
nativeBuildInputs = [
go-licenses
pkg-config
zip
advancecomp
];
outputs = [ "out" "testing_infra" ];

6
pkgs/games/gogdl/default.nix
View File

@ -10,14 +10,14 @@
buildPythonApplication rec {
pname = "gogdl";
version = "0.7.1";
version = "0.7.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "heroic-gogdl";
rev = "8bfb965090153c946c616bb0f82e3dc432e0d0e1";
sha256 = "sha256-ZdPyJk4WPVBtKMTf/AHNpG8QTV2qmpD1DT1D3gK5g2I=";
rev = "d7f29dfef5818e8b323d04761e18a9abb750f93e";
hash = "sha256-9dAenawt9h/sz5paVYoqk+nmzPrInlqyh1EgshI25CE=";
};
disabled = pythonOlder "3.8";

21
pkgs/games/heroic/default.nix
View File

@ -2,8 +2,6 @@
, stdenv
, fetchFromGitHub
, fetchYarnDeps
, fetchpatch
, gitUpdater
, yarn
, fixup_yarn_lock
, nodejs
@ -17,29 +15,20 @@
let appName = "heroic";
in stdenv.mkDerivation rec {
pname = "heroic-unwrapped";
version = "2.7.1";
version = "2.8.0";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "HeroicGamesLauncher";
rev = "v${version}";
sha256 = "sha256-l2eVLn1N+1nGxr8Oa2ecQgBmO0w/VJ8AY06GYQ0HiiI=";
hash = "sha256-AZwJRBkWuzBPT+ADVHabiK2KRXe6clZFa0IO99BO2Wk=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
sha256 = "sha256-R0lZrVfUH8NucuwarcE47jQ8ex5FY2hK6jJJ2TIRSWY=";
hash = "sha256-xiLK0D9+oL2UMD7b/9htOQJEpYCNayKW+KJ/vNVCgsw=";
};
patches = [
# Fix for capturing keyboard shortcuts when not in focus.
# TODO: Remove when updating past 2.7.1.
(fetchpatch {
url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/commit/c82e6ca8dd7070071793fe5a3c4c04b4ae02c3c7.patch";
hash = "sha256-Pum67YPejfq8ERv6XWVLQzs+/SyNojmTGTQpE0UR4kg=";
})
];
nativeBuildInputs = [
yarn
fixup_yarn_lock
@ -102,10 +91,6 @@ in stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = with lib; {
description = "A Native GOG and Epic Games Launcher for Linux, Windows and Mac";
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";

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

@ -6,7 +6,7 @@
}:
let
tag = "0.3.1";
tag = "0.3.3";
in
stdenv.mkDerivation {
pname = "apfs";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
owner = "linux-apfs";
repo = "linux-apfs-rw";
rev = "v${tag}";
sha256 = "sha256-KYPZsCAEqJl0VjV/TmJWi20Y7yApIJH0YMwQIL80Ep4=";
hash = "sha256-dxbpJ9Jdn8u16yD001zCZxrr/nPbxdpF7JvU+oD+hTw=";
};
hardeningDisable = [ "pic" ];

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

@ -24,11 +24,11 @@ assert withRest -> withJson;
stdenv.mkDerivation rec {
pname = "freeradius";
version = "3.2.2";
version = "3.2.3";
src = fetchurl {
url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
hash = "sha256-FEv37X7fIcrL0HUdQWAI+s4VZwI7ODKxGm2wejsH2cA=";
hash = "sha256-S94EcSLliMY/4tWZpz96uahjgG+ecW6Io9dwgLSCxXc=";
};
nativeBuildInputs = [ autoreconfHook ];

8
pkgs/servers/mattermost/default.nix
View File

@ -7,21 +7,21 @@
buildGoModule rec {
pname = "mattermost";
version = "7.8.5";
version = "7.10.2";
src = fetchFromGitHub {
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
hash = "sha256-qC6tJcWruiTbWXKuACuhl0kwbRdPVXfUlaFJx4DiQgE=";
hash = "sha256-gccWFcG+Jc/77nN9hiV/2gUcY5w0IzOktykbGgafBD0=";
};
webapp = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
hash = "sha256-ojAGa4tZ5aZp+4XSW6ycDvJ295zH8GaYsA9w6z8n2WM=";
hash = "sha256-T2lyg4BtArx813kk6edQ7AX3ZmA7cTsrJuWs7k6WYPU=";
};
vendorHash = "sha256-VvGLYOESyoBpFmIibHWxazliHcscMxf3KcQ46NQ4syk=";
vendorHash = "sha256-7YxbBmkKeb20a3BNllB3RtvjAJLZzoC2OBK4l1Ud1bw=";
subPackages = [ "cmd/mattermost" ];

6
pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "prometheus-nextcloud-exporter";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "xperimental";
repo = "nextcloud-exporter";
rev = "v${version}";
sha256 = "sha256-/EwQSxYDaf7B8A48aelf1yYbM7Vw6ntoz1VuYM2HDEc=";
sha256 = "sha256-8Pz1Xa8P0T+5P4qCoyRyRqPtAaSiZw4BV+rSZf4exC0=";
};
vendorSha256 = "sha256-b05N5TXsRHD8h3q+ckxaVizq+A7VqkDWOSb0LOMGCHM=";
vendorHash = "sha256-NIJH5Ya+fZ+37y+Lim/WizNCOYk1lpPRf6u70IoiFZk=";
passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; };

70
pkgs/servers/photofield/default.nix Normal file
View File

@ -0,0 +1,70 @@
{ lib
, fetchFromGitHub
, buildGoModule
, buildNpmPackage
, makeWrapper
, exiftool
, ffmpeg
}:
let
pname = "photofield-ui";
version = "0.10.3";
src = fetchFromGitHub {
owner = "SmilyOrg";
repo = "photofield";
rev = "v${version}";
hash = "sha256-OrLsthhnjX6LWehwiBDRzhCmTp3IBsbu9WKVu0zhgaQ=";
};
webui = buildNpmPackage {
inherit src version;
pname = "photofield-ui";
sourceRoot = "source/ui";
npmDepsHash = "sha256-YVyaZsFh5bolDzMd5rXWrbbXQZBeEIV6Fh/kwN+rvPk=";
installPhase = ''
mkdir -p $out/share
mv dist $out/share/photofield-ui
'';
};
in
buildGoModule rec {
pname = "photofield";
inherit version src;
vendorHash = "sha256-g6jRfPALBAgZVuljq/JiCpea7gZl/8akiabxjRmDsFs=";
preBuild = ''
cp -r ${webui}/share/photofield-ui ui/dist
'';
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.builtBy=Nix"
];
tags = [ "embedstatic" ];
doCheck = false; # tries to modify filesytem
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/photofield \
--prefix PATH : "${lib.makeBinPath [exiftool ffmpeg]}"
'';
meta = with lib; {
description = "Experimental fast photo viewer";
homepage = "https://github.com/SmilyOrg/photofield";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
};
}

33
pkgs/shells/zsh/antidote/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation (finalAttrs: {
version = "1.8.6";
pname = "antidote";
src = fetchFromGitHub {
owner = "mattmc3";
repo = "antidote";
rev = "v${finalAttrs.version}";
hash = "sha256-CcWEXvz1TB6LFu9qvkVB1LJsa68grK16VqjUTiuVG/c=";
};
dontPatch = true;
dontBuild = true;
dontConfigure = true;
dontFixup = true;
installPhase = ''
runHook preInstall
install -D antidote --target-directory=$out/share/antidote
install -D antidote.zsh --target-directory=$out/share/antidote
install -D functions/* --target-directory=$out/share/antidote/functions
runHook postInstall
'';
meta = {
description = "A zsh plugin manager made from the ground up thinking about performance";
homepage = "https://getantidote.github.io/";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.hitsmaxft ];
};
})

4
pkgs/tools/misc/hyperledger-fabric/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "hyperledger-fabric";
version = "2.4.9";
version = "2.5.1";
src = fetchFromGitHub {
owner = "hyperledger";
repo = "fabric";
rev = "v${version}";
hash = "sha256-tHchOki5xlu87onUCqdK/OQxJ6lcvhlUlLcQM6Fap+A=";
hash = "sha256-hZAGLSf/hez2pvfmaZJRD5b7GW3+exUXgLXUd2Awvpg=";
};
vendorHash = null;

6
pkgs/tools/misc/jfrog-cli/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "jfrog-cli";
version = "2.38.2";
version = "2.38.5";
src = fetchFromGitHub {
owner = "jfrog";
repo = "jfrog-cli";
rev = "refs/tags/v${version}";
hash = "sha256-oCcpW4JP61w7TIWR11g/NaHri93cgGorEmRndZXZyE0=";
hash = "sha256-fd5YJCaqT78TjhC3CkX7+iPTxW278U7GTiXLH46L2m4=";
};
vendorHash = "sha256-voMKA7NpQHF4DIZP+vO/ZwlOcBNFwp3vThCM7s8RSpY=";
vendorHash = "sha256-6sUifqqryPrlwOFYPKp1VrgGE+xF/ELz8s7eLrMJnr4=";
postInstall = ''
# Name the output the same way as the original build script does

4
pkgs/tools/misc/yad/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yad";
version = "12.3";
version = "13.0";
src = fetchFromGitHub {
owner = "v1cont";
repo = "yad";
rev = "v${version}";
sha256 = "sha256-VaeA83Wk5N3uLf8Eb606w3KPwV/3be5D39wW2JuSdp0=";
sha256 = "sha256-iYAhiaGfC9/OQ5HrSjX2fhpbwdZun6sxyw8o+8svcvY=";
};
configureFlags = [

4
pkgs/tools/networking/netbird/default.nix
View File

@ -30,13 +30,13 @@ let
in
buildGoModule rec {
pname = "netbird";
version = "0.20.5";
version = "0.20.8";
src = fetchFromGitHub {
owner = "netbirdio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Di3Y5Pa4A6Iw0rXp0VdAPUuzFO3SnpV6Ip6N1gyFuoU=";
sha256 = "sha256-nLUk3R2c1JsZLNFGWbPF/icO+rmieaa/im47ntByU2E=";
};
vendorHash = "sha256-wgiDwf1aV8hM33ADgqAbmeLu9lDKdvw0d88IrVg0fmo=";

54
pkgs/tools/security/donkey/default.nix Normal file
View File

@ -0,0 +1,54 @@
{ stdenv
, fetchFromGitLab
, libmd
, coreutils
, lib
, testers
, donkey
}:
stdenv.mkDerivation rec {
pname = "donkey";
version = "1.2.0";
src = fetchFromGitLab {
owner = "donkey";
repo = "donkey";
rev = "tags/release/${version}";
hash = "sha256-2xgb9l0Eko39HJVROAWEIP3qLg5t/5h/rm2MoXoKnJI=";
};
sourceRoot = "source/src";
buildInputs = [ libmd ];
preInstall = ''
# don't change the owner, use global permissions:
export INSTALL_PROGRAM="${coreutils}/bin/install -m 555"
export INSTALL_DATA="${coreutils}/bin/install -m 444"
'';
passthru.tests.version = testers.testVersion { package = donkey; };
meta = with lib; {
description = "an alternative for S/KEY's 'key' command.";
longDescription = ''
Donkey is an alternative for S/KEY's "key" command. The new feature that
the original key doesn't have is print an entry for skeykeys as
follows;
kazu 0099 al02004 115d83956f1089b6 Apr 26,1995 22:13:27
This means that donkey is also an alternative for "keyinit". Since the
entry is printed to stdout (not to /etc/skeykeys), you can easily send
it to a remote operator by e-mail (with a PGP signature or something).
So, it is possible to initiate S/KEY without logging in from the console of
the host.
The name "Donkey" is an acronym of "Don't Key".
'';
homepage = "https://devel.ringlet.net/security/donkey";
license = licenses.gpl2;
maintainers = with maintainers; [ raboof ];
platforms = platforms.all;
};
}

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

@ -1534,6 +1534,8 @@ with pkgs;
dolbybcsoftwaredecode = callPackage ../applications/audio/dolbybcsoftwaredecode { };
donkey = callPackage ../tools/security/donkey { };
dwarfs = callPackage ../tools/filesystems/dwarfs { };
etlegacy = callPackage ../games/etlegacy { lua = lua5_4; };
@ -1982,6 +1984,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
};
git-credential-oauth = callPackage ../applications/version-management/git-credential-oauth { };
git-crypt = callPackage ../applications/version-management/git-crypt { };
git-delete-merged-branches = callPackage ../applications/version-management/git-delete-merged-branches { };
@ -2788,6 +2792,8 @@ with pkgs;
twine = with python3Packages; toPythonApplication twine;
abracadabra = qt6Packages.callPackage ../applications/radio/abracadabra { };
accelergy = callPackage ../applications/science/computer-architecture/accelergy { };
aldo = callPackage ../applications/radio/aldo { };
@ -5698,6 +5704,8 @@ with pkgs;
photon = callPackage ../tools/networking/photon { };
photofield = callPackage ../servers/photofield { };
photoprism = callPackage ../servers/photoprism { };
piglit = callPackage ../tools/graphics/piglit { };
@ -6002,6 +6010,8 @@ with pkgs;
antibody = callPackage ../shells/zsh/antibody { };
antidote = callPackage ../shells/zsh/antidote { };
antigen = callPackage ../shells/zsh/antigen { };
apparix = callPackage ../tools/misc/apparix { };
@ -30442,6 +30452,8 @@ with pkgs;
flacon = libsForQt5.callPackage ../applications/audio/flacon { };
flamp = callPackage ../applications/radio/flamp { };
flexget = callPackage ../applications/networking/flexget { };
fldigi = callPackage ../applications/radio/fldigi {
@ -31331,6 +31343,8 @@ with pkgs;
hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { };
husky = callPackage ../development/tools/misc/husky { };
hydrogen = qt5.callPackage ../applications/audio/hydrogen { };
hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit.

2
pkgs/top-level/make-tarball.nix
View File

@ -19,7 +19,7 @@ pkgs.releaseTools.sourceTarball {
versionSuffix = "pre${
if nixpkgs ? lastModified
then builtins.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified)
else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}";
else toString (nixpkgs.revCount or 0)}.${nixpkgs.shortRev or "dirty"}";
buildInputs = with pkgs; [ nix.out jq lib-tests brotli ];

2
pkgs/top-level/python-packages.nix
View File

@ -1861,6 +1861,8 @@ self: super: with self; {
cock = callPackage ../development/python-modules/cock { };
class-doc = callPackage ../development/python-modules/class-doc { };
click = callPackage ../development/python-modules/click { };
clickclick = callPackage ../development/python-modules/clickclick { };