ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-11 06:57:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-09-03 00:13:11 +00:00 committed by GitHub
commit a07f612219
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
49 changed files with 734 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/strings.nix
View File

@ -408,7 +408,6 @@ rec {
start ? false,
end ? false,
}:
s:
let
# Define our own whitespace character class instead of using
# `[:space:]`, which is not well-defined.
@ -425,7 +424,9 @@ rec {
"(.*[^${chars}])[${chars}]*"
else
"(.*)";
in
s:
let
# If the string was empty or entirely whitespace,
# then the regex may not match and `res` will be `null`.
res = match regex s;

2
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -177,6 +177,8 @@
- Two build helpers in `singularity-tools`, i.e., `mkLayer` and `shellScript`, are deprecated, as they are no longer involved in image-building. Maintainers will remove them in future releases.
- The `rust.toTargetArch`, `rust.toTargetOs`, `rust.toTargetFamily`, `rust.toTargetVendor`, `rust.toRustTarget`, `rust.toRustTargetSpec`, `rust.toRustTargetSpecShort`, and `rust.IsNoStdTarget` functions are deprecated in favour of the `rust.platform.arch`, `rust.platform.os`, `rust.platform.target-family`, `rust.platform.vendor`, `rust.rustcTarget`, `rust.rustcTargetSpec`, `rust.cargoShortTarget`, `rust.cargoEnvVarTarget`, and `rust.isNoStdTarget` platform attributes respectively.
- The `budgie` and `budgiePlugins` scope have been removed and their packages
moved into the top level scope (i.e., `budgie.budgie-desktop` is now
`budgie-desktop`)

105
nixos/modules/services/development/zammad.nix
View File

@ -1,11 +1,8 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.zammad;
settingsFormat = pkgs.formats.yaml { };
filterNull = filterAttrs (_: v: v != null);
filterNull = lib.filterAttrs (_: v: v != null);
serviceConfig = {
Type = "simple";
Restart = "always";
@ -29,88 +26,88 @@ in
options = {
services.zammad = {
enable = mkEnableOption "Zammad, a web-based, open source user support/ticketing solution";
enable = lib.mkEnableOption "Zammad, a web-based, open source user support/ticketing solution";
package = mkPackageOption pkgs "zammad" { };
package = lib.mkPackageOption pkgs "zammad" { };
dataDir = mkOption {
type = types.path;
dataDir = lib.mkOption {
type = lib.types.path;
default = "/var/lib/zammad";
description = ''
Path to a folder that will contain Zammad working directory.
'';
};
host = mkOption {
type = types.str;
host = lib.mkOption {
type = lib.types.str;
default = "127.0.0.1";
example = "192.168.23.42";
description = "Host address.";
};
openPorts = mkOption {
type = types.bool;
openPorts = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Whether to open firewall ports for Zammad";
};
port = mkOption {
type = types.port;
port = lib.mkOption {
type = lib.types.port;
default = 3000;
description = "Web service port.";
};
websocketPort = mkOption {
type = types.port;
websocketPort = lib.mkOption {
type = lib.types.port;
default = 6042;
description = "Websocket service port.";
};
redis = {
createLocally = mkOption {
type = types.bool;
createLocally = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Whether to create a local redis automatically.";
};
name = mkOption {
type = types.str;
name = lib.mkOption {
type = lib.types.str;
default = "zammad";
description = ''
Name of the redis server. Only used if `createLocally` is set to true.
'';
};
host = mkOption {
type = types.str;
host = lib.mkOption {
type = lib.types.str;
default = "localhost";
description = ''
Redis server address.
'';
};
port = mkOption {
type = types.port;
port = lib.mkOption {
type = lib.types.port;
default = 6379;
description = "Port of the redis server.";
};
};
database = {
type = mkOption {
type = types.enum [ "PostgreSQL" "MySQL" ];
type = lib.mkOption {
type = lib.types.enum [ "PostgreSQL" "MySQL" ];
default = "PostgreSQL";
example = "MySQL";
description = "Database engine to use.";
};
host = mkOption {
type = types.nullOr types.str;
host = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = {
PostgreSQL = "/run/postgresql";
MySQL = "localhost";
}.${cfg.database.type};
defaultText = literalExpression ''
defaultText = lib.literalExpression ''
{
PostgreSQL = "/run/postgresql";
MySQL = "localhost";
@ -121,28 +118,28 @@ in
'';
};
port = mkOption {
type = types.nullOr types.port;
port = lib.mkOption {
type = lib.types.nullOr lib.types.port;
default = null;
description = "Database port. Use `null` for default port.";
};
name = mkOption {
type = types.str;
name = lib.mkOption {
type = lib.types.str;
default = "zammad";
description = ''
Database name.
'';
};
user = mkOption {
type = types.nullOr types.str;
user = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = "zammad";
description = "Database user.";
};
passwordFile = mkOption {
type = types.nullOr types.path;
passwordFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/run/keys/zammad-dbpassword";
description = ''
@ -150,16 +147,16 @@ in
'';
};
createLocally = mkOption {
type = types.bool;
createLocally = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Whether to create a local database automatically.";
};
settings = mkOption {
settings = lib.mkOption {
type = settingsFormat.type;
default = { };
example = literalExpression ''
example = lib.literalExpression ''
{
}
'';
@ -171,8 +168,8 @@ in
};
};
secretKeyBaseFile = mkOption {
type = types.nullOr types.path;
secretKeyBaseFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/run/keys/secret_key_base";
description = ''
@ -197,10 +194,10 @@ in
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
services.zammad.database.settings = {
production = mapAttrs (_: v: mkDefault v) (filterNull {
production = lib.mapAttrs (_: v: lib.mkDefault v) (filterNull {
adapter = {
PostgreSQL = "postgresql";
MySQL = "mysql2";
@ -215,7 +212,7 @@ in
});
};
networking.firewall.allowedTCPPorts = mkIf cfg.openPorts [
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openPorts [
config.services.zammad.port
config.services.zammad.websocketPort
];
@ -243,9 +240,9 @@ in
}
];
services.mysql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "MySQL") {
services.mysql = lib.optionalAttrs (cfg.database.createLocally && cfg.database.type == "MySQL") {
enable = true;
package = mkDefault pkgs.mariadb;
package = lib.mkDefault pkgs.mariadb;
ensureDatabases = [ cfg.database.name ];
ensureUsers = [
{
@ -255,7 +252,7 @@ in
];
};
services.postgresql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "PostgreSQL") {
services.postgresql = lib.optionalAttrs (cfg.database.createLocally && cfg.database.type == "PostgreSQL") {
enable = true;
ensureDatabases = [ cfg.database.name ];
ensureUsers = [
@ -266,7 +263,7 @@ in
];
};
services.redis = optionalAttrs cfg.redis.createLocally {
services.redis = lib.optionalAttrs cfg.redis.createLocally {
servers."${cfg.redis.name}" = {
enable = true;
port = cfg.redis.port;
@ -282,7 +279,7 @@ in
after = [
"network.target"
"postgresql.service"
] ++ optionals cfg.redis.createLocally [
] ++ lib.optionals cfg.redis.createLocally [
"redis-${cfg.redis.name}.service"
];
requires = [
@ -301,13 +298,13 @@ in
# config file
cp ${databaseConfig} ./config/database.yml
chmod -R +w .
${optionalString (cfg.database.passwordFile != null) ''
${lib.optionalString (cfg.database.passwordFile != null) ''
{
echo -n " password: "
cat ${cfg.database.passwordFile}
} >> ./config/database.yml
''}
${optionalString (cfg.secretKeyBaseFile != null) ''
${lib.optionalString (cfg.secretKeyBaseFile != null) ''
{
echo "production: "
echo -n " secret_key_base: "
@ -317,7 +314,7 @@ in
if [ `${config.services.postgresql.package}/bin/psql \
--host ${cfg.database.host} \
${optionalString
${lib.optionalString
(cfg.database.port != null)
"--port ${toString cfg.database.port}"} \
--username ${cfg.database.user} \

2
nixos/modules/services/hardware/thinkfan.nix
View File

@ -12,7 +12,7 @@ let
tuple = ts: lib.mkOptionType {
name = "tuple";
merge = lib.mergeOneOption;
check = xs: all id (zipListsWith (t: x: t.check x) ts xs);
check = xs: lib.all lib.id (zipListsWith (t: x: t.check x) ts xs);
description = "tuple of" + lib.concatMapStrings (t: " (${t.description})") ts;
};
level = ints.unsigned;

2
nixos/tests/zigbee2mqtt.nix
View File

@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
machine.wait_for_unit("multi-user.target")
machine.wait_until_fails("systemctl status zigbee2mqtt.service")
machine.succeed(
"journalctl -eu zigbee2mqtt | grep 'Failed to connect to the adapter'"
"journalctl -eu zigbee2mqtt | grep 'Error: Inappropriate ioctl for device, cannot set'"
)
machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service"))

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

@ -8751,6 +8751,18 @@ final: prev:
meta.homepage = "https://github.com/samjwill/nvim-unception/";
};
nvim-various-textobjs = buildVimPlugin {
pname = "nvim-various-textobjs";
version = "2024-08-17";
src = fetchFromGitHub {
owner = "chrisgrieser";
repo = "nvim-various-textobjs";
rev = "8dbc655f794202f45ab6a1cac1cb323a218ac6a1";
sha256 = "0fj02l74ibcp4b8j6jkyjfq2k25a3jllf6cd1mddhhj7laa4zhfw";
};
meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
};
nvim-web-devicons = buildVimPlugin {
pname = "nvim-web-devicons";
version = "2024-08-04";

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

@ -737,6 +737,7 @@ https://github.com/windwp/nvim-ts-autotag/,,
https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
https://github.com/kevinhwang91/nvim-ufo/,HEAD,
https://github.com/samjwill/nvim-unception/,HEAD,
https://github.com/chrisgrieser/nvim-various-textobjs/,HEAD,
https://github.com/kyazdani42/nvim-web-devicons/,,
https://github.com/AckslD/nvim-whichkey-setup.lua/,,
https://github.com/s1n7ax/nvim-window-picker/,HEAD,

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

@ -49,13 +49,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-37";
version = "7.1.1-38";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-dlcyCJw/tytb6z5VaogblUlzBRYBtijUJbkX3vZdeEU=";
hash = "sha256-dyk9kCH1w76Jhy/yBhVFLthTKYaMgXLBn7QGWAFS0XU=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

2
pkgs/applications/networking/instant-messengers/element/seshat/default.nix
View File

@ -36,7 +36,7 @@ in rustPlatform.buildRustPackage rec {
fixup-yarn-lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules/
node_modules/.bin/neon build --release -- --target ${rust.toRustTargetSpec stdenv.hostPlatform} -Z unstable-options --out-dir target/release
node_modules/.bin/neon build --release -- --target ${stdenv.hostPlatform.rust.rustcTarget} -Z unstable-options --out-dir target/release
runHook postBuild
'';

13
pkgs/applications/window-managers/leftwm/default.nix
View File

@ -20,7 +20,16 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-wn5DurPWFwSUtc5naEL4lBSQpKWTJkugpN9mKx+Ed2Y=";
};
cargoHash = "sha256-TylRxdpAVuGtZ3Lm8je6FZ0JUwetBi6mOGRoT2M3Jyk=";
cargoPatches = [
# This pacth can be removed with the next version bump, it just updates the `time` crate
./update-time-crate.patch
];
# To show the "correct" git-hash in `leftwm-check` we manually set the GIT_HASH env variable
# can be remove together with the above patch
GIT_HASH = "36609e0 patched";
cargoHash = "sha256-SNq76pTAPSUGVRp/+fwCjSMP/lKVzh6wU+WZW5n/yjg=";
buildInputs = rpathLibs;
@ -39,7 +48,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/leftwm/leftwm";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ yanganto ];
maintainers = with lib.maintainers; [ vuimuich yanganto ];
changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG.md";
mainProgram = "leftwm";
};

57
pkgs/applications/window-managers/leftwm/update-time-crate.patch Normal file
View File

@ -0,0 +1,57 @@
From 9358bebb11df19f46d0813723959518498d812b2 Mon Sep 17 00:00:00 2001
From: VuiMuich <vuimuich@quantentunnel.de>
Date: Mon, 2 Sep 2024 11:15:27 +0200
Subject: [PATCH] fix rust 1.80.x for nixpkgs
---
Cargo.lock | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index f8a82eecf..5728b55bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -777,6 +777,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-traits"
version = "0.2.17"
@@ -1218,13 +1224,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.30"
+version = "0.3.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "ef89ece63debf11bc32d1ed8d078ac870cbeb44da02afb02a9ff135ae7ca0582"
dependencies = [
"deranged",
"itoa",
"libc",
+ "num-conv",
"num_threads",
"powerfmt",
"serde",
@@ -1240,10 +1247,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -752,6 +752,6 @@ stdenvNoCC.mkDerivation {
(optionalAttrs (cc_ ? meta) (removeAttrs cc.meta ["priority"])) //
{ description = attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)";
priority = 10;
mainProgram = if name != "" then name else ccName;
mainProgram = if name != "" then name else "${targetPrefix}${ccName}";
};
}

3
pkgs/build-support/rust/lib/default.nix
View File

@ -80,8 +80,7 @@ rec {
'';
};
} // lib.mapAttrs (old: new: platform:
# TODO: enable warning after 23.05 is EOL.
# lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead."
lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead."
lib.getAttrFromPath new platform.rust)
{
toTargetArch = [ "platform" "arch" ];

4
pkgs/by-name/aq/aquamarine/package.nix
View File

@ -23,13 +23,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "aquamarine";
version = "0.3.3";
version = "0.4.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "aquamarine";
rev = "v${finalAttrs.version}";
hash = "sha256-zushuLkBblDZGVo2qbiMTJ51LSkqYJpje/R2dvfec1U=";
hash = "sha256-EaKtf4mESHvHF2ak5Lt7ycSTLqdjI+Ry+zWpQaPqgD8=";
};
nativeBuildInputs = [

6
pkgs/by-name/aw/awscli2/package.nix
View File

@ -59,14 +59,14 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "awscli2";
version = "2.17.18"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.17.42"; # N.B: if you change this, check if overrides are still up-to-date
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = "refs/tags/${version}";
hash = "sha256-HxFtMFeGR6XAMsP5LM0tvJ/ECWVpveIhWRTKvf8uYA0=";
hash = "sha256-f6S206MQy0qyHIJTIKSHBKT+P0dVCiUn5pMp2tClSb0=";
};
patches = [
@ -79,7 +79,7 @@ py.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'awscrt>=0.19.18,<=0.20.11' 'awscrt>=0.19.18' \
--replace-fail 'awscrt>=0.19.18,<=0.21.2' 'awscrt>=0.19.18' \
--replace-fail 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \
--replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \
--replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \

4
pkgs/by-name/co/cosmic-greeter/package.nix
View File

@ -60,10 +60,10 @@ rustPlatform.buildRustPackage rec {
(placeholder "out")
"--set"
"bin-src"
"target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter"
"--set"
"daemon-src"
"target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter-daemon"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter-daemon"
];
postPatch = ''

2
pkgs/by-name/co/cosmic-session/package.nix
View File

@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
postPatch = ''
substituteInPlace Justfile \
--replace-fail '{{cargo-target-dir}}/release/cosmic-session' 'target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-session'
--replace-fail '{{cargo-target-dir}}/release/cosmic-session' 'target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-session'
substituteInPlace data/start-cosmic \
--replace-fail '/usr/bin/cosmic-session' "${placeholder "out"}/bin/cosmic-session" \
--replace-fail '/usr/bin/dbus-run-session' "${lib.getBin dbus}/bin/dbus-run-session"

42
pkgs/by-name/cr/crystal-dock/package.nix Normal file
View File

@ -0,0 +1,42 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
kdePackages,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "crystal-dock";
version = "2.2";
src = fetchFromGitHub {
owner = "dangvd";
repo = "crystal-dock";
rev = "v${finalAttrs.version}";
hash = "sha256-c5Kae2cZ/DoJ972VT4kQWNUr2cF6Noy3nPIChWok/BA=";
};
nativeBuildInputs = [
cmake
kdePackages.extra-cmake-modules
qt6.wrapQtAppsHook
];
buildInputs = [
kdePackages.layer-shell-qt
qt6.qtbase
qt6.qtwayland
];
cmakeDir = "../src";
meta = with lib; {
description = "Dock (desktop panel) for Linux desktop";
mainProgram = "crystal-dock";
license = licenses.gpl3Only;
homepage = "https://github.com/dangvd/crystal-dock";
maintainers = with maintainers; [ rafameou ];
platforms = platforms.linux;
};
})

9
pkgs/by-name/de/dezoomify-rs/package.nix
View File

@ -1,7 +1,9 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
darwin,
}:
rustPlatform.buildRustPackage rec {
@ -17,6 +19,13 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-v48eM43+/dt2M1J9yfjfTpBetv6AA2Hhzu8rrL3gojg=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks;
[
SystemConfiguration
]
);
checkFlags = [
# Tests failing due to networking errors in Nix build environment
"--skip=local_generic_tiles"

4
pkgs/by-name/fa/fantomas/package.nix
View File

@ -2,9 +2,9 @@
buildDotnetGlobalTool {
pname = "fantomas";
version = "6.3.10";
version = "6.3.11";
nugetHash = "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM=";
nugetHash = "sha256-11bHGEAZTNtdp2pTg5zqLrQiyI/j/AT7GGL/2CR4+dw=";
meta = with lib; {
description = "F# source code formatter";

101
pkgs/by-name/fl/flameshot/package.nix
View File

@ -1,16 +1,28 @@
{ libsForQt5
, stdenv
, lib
, fetchFromGitHub
, cmake
, nix-update-script
, fetchpatch
, grim
, makeBinaryWrapper
, enableWlrSupport ? false
{
stdenv,
lib,
overrideSDK,
darwin,
fetchFromGitHub,
fetchpatch,
cmake,
imagemagick,
libicns,
libsForQt5,
grim,
makeBinaryWrapper,
nix-update-script,
enableWlrSupport ? false,
enableMonochromeIcon ? false,
}:
stdenv.mkDerivation {
assert stdenv.isDarwin -> (!enableWlrSupport);
let
stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
stdenv'.mkDerivation {
pname = "flameshot";
# wlr screenshotting is currently only available on unstable version (>12.1.0)
version = "12.1.0-unstable-2024-08-02";
@ -32,23 +44,30 @@ stdenv.mkDerivation {
})
];
passthru = {
updateScript = nix-update-script {
extraArgs = [ "--version=branch" ];
};
};
cmakeFlags = [
cmakeFlags =
[
(lib.cmakeBool "DISABLE_UPDATE_CHECKER" true)
(lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon)
]
++ lib.optionals stdenv.isLinux [
(lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true)
(lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport)
]
++ lib.optionals stdenv.isDarwin [
(lib.cmakeFeature "Qt5_DIR" "${libsForQt5.qtbase.dev}/lib/cmake/Qt5")
];
nativeBuildInputs = [
nativeBuildInputs =
[
cmake
libsForQt5.qttools
libsForQt5.qtsvg
libsForQt5.wrapQtAppsHook
makeBinaryWrapper
]
++ lib.optionals stdenv.isDarwin [
imagemagick
libicns
];
buildInputs = [
@ -56,19 +75,57 @@ stdenv.mkDerivation {
libsForQt5.kguiaddons
];
postPatch = lib.optionalString stdenv.isDarwin ''
# Fix icns generation running concurrently with png generation
sed -E -i '/"iconutil -o/i\
)\
execute_process(\
' src/CMakeLists.txt
# Replace unavailable commands
sed -E -i \
-e 's/"sips -z ([0-9]+) ([0-9]+) +(.+) --out /"magick \3 -resize \1x\2\! /' \
-e 's/"iconutil -o (.+) -c icns (.+)"/"png2icns \1 \2\/*{16,32,128,256,512}.png"/' \
src/CMakeLists.txt
'';
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir $out/Applications
mv $out/bin/flameshot.app $out/Applications
ln -s $out/Applications/flameshot.app/Contents/MacOS/flameshot $out/bin/flameshot
rm -r $out/share/applications
rm -r $out/share/dbus*
rm -r $out/share/icons
rm -r $out/share/metainfo
'';
dontWrapQtApps = true;
postFixup = ''
wrapProgram $out/bin/flameshot \
postFixup =
let
binary =
if stdenv.isDarwin then "Applications/flameshot.app/Contents/MacOS/flameshot" else "bin/flameshot";
in
''
wrapProgram $out/${binary} \
${lib.optionalString enableWlrSupport "--prefix PATH : ${lib.makeBinPath [ grim ]}"} \
''${qtWrapperArgs[@]}
'';
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
};
meta = with lib; {
description = "Powerful yet simple to use screenshot software";
homepage = "https://github.com/flameshot-org/flameshot";
mainProgram = "flameshot";
maintainers = with maintainers; [ scode oxalica ];
maintainers = with maintainers; [
scode
oxalica
];
license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
};

10
pkgs/by-name/fl/flye/package.nix
View File

@ -11,14 +11,14 @@
python3Packages.buildPythonApplication rec {
pname = "flye";
version = "2.9.4";
version = "2.9.5";
pyproject = true;
src = fetchFromGitHub {
owner = "fenderglass";
repo = "flye";
rev = "refs/tags/${version}";
hash = "sha256-lwiY0VTEsLMMXt1VowsS3jj44v30Z766xNRwQtQKr10=";
hash = "sha256-448PTdGueQVHFIDS5zMy+XKZCtEb0SqP8bspPLHMJn0=";
};
patches = [
@ -34,12 +34,6 @@ python3Packages.buildPythonApplication rec {
url = "https://github.com/mikolmogorov/Flye/commit/fb34f1ccfdf569d186a4ce822ee18eced736636b.patch";
hash = "sha256-52bnZ8XyP0HsY2OpNYMU3xJgotNVdQc/O2w3XIReUdQ=";
})
(fetchpatch {
# https://github.com/mikolmogorov/Flye/pull/670
name = "remove-find_module.patch";
url = "https://github.com/mikolmogorov/Flye/commit/441b1c6eb0f60b7c4fb1a40d659c7dabb7ad41b6.patch";
hash = "sha256-RytFIN1STK33/nvXpck6woQcwV/e1fmA8AgmptiIiDU=";
})
];
postPatch = ''

35
pkgs/by-name/gn/gnome-monitor-config/package.nix
View File

@ -1,14 +1,15 @@
{ lib
, fetchFromGitHub
, stdenv
, meson
, ninja
, pkg-config
, cairo
, glib
{
lib,
fetchFromGitHub,
stdenv,
meson,
ninja,
pkg-config,
cairo,
glib,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "gnome-monitor-config";
version = "0-unstable-2023-09-26";
@ -19,10 +20,17 @@ stdenv.mkDerivation rec {
hash = "sha256-uVWhQ5SCyadDkeOd+pY2cYZAQ0ZvWMlgndcr1ZIEf50=";
};
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
glib
];
buildInputs = [
@ -30,11 +38,10 @@ stdenv.mkDerivation rec {
glib
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv src/gnome-monitor-config $out/bin
runHook postInstall
postPatch = ''
substituteInPlace src/meson.build \
--replace-fail "executable('gnome-monitor-config', src" \
"executable('gnome-monitor-config', src, install : true"
'';
meta = with lib; {

37
pkgs/by-name/hd/hdrop/package.nix
View File

@ -1,26 +1,27 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, makeWrapper
, scdoc
, coreutils
, util-linux
, jq
, libnotify
, withHyprland ? true
, hyprland
, gawk
{
coreutils,
fetchFromGitHub,
gawk,
hyprland,
jq,
lib,
libnotify,
makeWrapper,
scdoc,
stdenvNoCC,
util-linux,
withHyprland ? true,
}:
stdenvNoCC.mkDerivation rec {
pname = "hdrop";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "Schweber";
repo = "hdrop";
rev = "v${version}";
hash = "sha256-iginpMlgANSPWgFxNC2TYMjf2NKSSzzrjIN8lIsAvX8=";
hash = "sha256-0GkZBqpORJqhhC19bsJHvkbHKOno1ZyBBA7nhzfqLZw=";
};
nativeBuildInputs = [
@ -32,14 +33,18 @@ stdenvNoCC.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/hdrop --prefix PATH ':' \
"${lib.makeBinPath ([
"${
lib.makeBinPath (
[
coreutils
util-linux
jq
libnotify
gawk
]
++ lib.optional withHyprland hyprland)}"
++ lib.optional withHyprland hyprland
)
}"
'';
meta = with lib; {

10
pkgs/by-name/ol/ollama/disable-lib-check.patch
View File

@ -1,10 +0,0 @@
--- a/llm/generate/gen_linux.sh
+++ b/llm/generate/gen_linux.sh
@@ -245,7 +245,6 @@
if [ $(cat "${BUILD_DIR}/bin/deps.txt" | wc -l ) -lt 8 ] ; then
cat "${BUILD_DIR}/bin/deps.txt"
echo "ERROR: deps file short"
- exit 1
fi
compress
fi

8
pkgs/by-name/ol/ollama/package.nix
View File

@ -40,13 +40,13 @@ assert builtins.elem acceleration [
let
pname = "ollama";
# don't forget to invalidate all hashes each update
version = "0.3.5";
version = "0.3.9";
src = fetchFromGitHub {
owner = "ollama";
repo = "ollama";
rev = "v${version}";
hash = "sha256-2lPOkpZ9AmgDFoIHKi+Im1AwXnTxSY3LLtyui1ep3Dw=";
hash = "sha256-h/IFD7OaiIWNhJywqWG4uOPXExHfcnipr6f9YD1OjNc=";
fetchSubmodules = true;
};
@ -63,7 +63,6 @@ let
(preparePatch "05-default-pretokenizer.diff" "sha256-PQ0DgfzycUQ8t6S6/yjsMHHx/nFJ0w8AH6afv5Po89w=")
(preparePatch "06-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=")
(preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=")
(preparePatch "08-pooling.diff" "sha256-7meKWbr06lbVrtxau0AU9BwJ88Z9svwtDXhmHI+hYBk=")
(preparePatch "09-lora.diff" "sha256-tNtI3WHHjBq+PJZGJCBsXHa15dlNJeJm+IiaUbFC0LE=")
(preparePatch "11-phi3-sliding-window.diff" "sha256-VbcR4SLa9UXoh8Jq/bPVBerxfg68JZyWALRs7fz7hEs=")
];
@ -179,9 +178,6 @@ goBuild (
# this also disables necessary patches contained in `ollama/llm/patches/`
# those patches are added to `llamacppPatches`, and reapplied here in the patch phase
./disable-git.patch
# disable a check that unnecessarily exits compilation during rocm builds
# since `rocmPath` is in `LD_LIBRARY_PATH`, ollama uses rocm correctly
./disable-lib-check.patch
] ++ llamacppPatches;
postPatch = ''
# replace inaccurate version number with actual release version

4
pkgs/applications/audio/pyradio/default.nix → pkgs/by-name/py/pyradio/package.nix
View File

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.9.3.9";
version = "0.9.3.11";
src = fetchFromGitHub {
owner = "coderholic";
repo = "pyradio";
rev = "refs/tags/${version}";
hash = "sha256-EoHCOg4nPkKRSFX/3AUKJaXzS6J1quwtv+mKeKBu5Ns=";
hash = "sha256-JvvnzIA5xhHgH87g0j60Ul0FHGhA88knsEFf1n2MQ84=";
};
nativeBuildInputs = [

6
pkgs/by-name/rc/rcp/package.nix
View File

@ -7,20 +7,20 @@
rustPlatform.buildRustPackage rec {
pname = "rcp";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "wykurz";
repo = "rcp";
rev = "v${version}";
hash = "sha256-TQTn91FDqDpdPv6dn2cwseGF+3EcJ17sglHKD7EQLeY=";
hash = "sha256-INLXVruiaK5yv5old0NOWFcg9y13M6Dm7bBMmcPFY1I=";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
IOKit
]);
cargoHash = "sha256-uhE1AphdYKL6pFY8vsmdMGxHxFiVw75oDXNP8qGykBc=";
cargoHash = "sha256-JXDM97uGuGh3qHK3Gh8Nd/YSZq/Kcj81PpufJJMqQQI=";
RUSTFLAGS = "--cfg tokio_unstable";

6
pkgs/by-name/re/renovate/package.nix
View File

@ -21,13 +21,13 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "renovate";
version = "38.55.4";
version = "38.62.0";
src = fetchFromGitHub {
owner = "renovatebot";
repo = "renovate";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-62nijbuHCNG6ht2W3EJB6fwNvYhZHzDp+RyH1prBWVQ=";
hash = "sha256-Wv7kSKuiyqVpl0EQIygF0R8h9PMH6yI5ezXhz1hbzd8=";
};
postPatch = ''
@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-wdlGYIVGHLB2D4wSA5pjFRSHoetyLLN7v50K8nXxMO0=";
hash = "sha256-n2CnyjabKQ9D72OBdEqeHoxOJsKlLD2rJPRs50AWCXU=";
};
env.COREPACK_ENABLE_STRICT = 0;

2
pkgs/by-name/sp/speakersafetyd/package.nix
View File

@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
postPatch = ''
substituteInPlace speakersafetyd.service --replace "/usr" "$out"
substituteInPlace Makefile --replace "target/release" "target/${rust.lib.toRustTargetSpec stdenv.hostPlatform}/$cargoBuildType"
substituteInPlace Makefile --replace "target/release" "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType"
# creating files in /var does not make sense in a nix package
substituteInPlace Makefile --replace 'install -dDm0755 $(DESTDIR)/$(VARDIR)/lib/speakersafetyd/blackbox' ""
'';

23
pkgs/by-name/yt/yt-dlg/package.nix
View File

@ -1,27 +1,9 @@
{
lib,
python3,
python3Packages,
fetchFromGitHub,
fetchPypi
fetchPypi,
}:
let
python3' =
(python3.override {
packageOverrides = final: prev: {
wxpython = prev.wxpython.overrideAttrs rec {
version = "4.2.0";
src = fetchPypi {
pname = "wxPython";
inherit version;
hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc=";
};
};
};
});
python3Packages = python3'.pkgs;
in
python3Packages.buildPythonApplication rec {
pname = "yt-dlg";
version = "1.8.5";
@ -34,6 +16,7 @@ python3Packages.buildPythonApplication rec {
};
pyproject = true;
pythonRelaxDeps = [ "wxpython" ];
build-system = with python3Packages; [
setuptools
wheel

9
pkgs/development/compilers/tinygo/default.nix
View File

@ -34,8 +34,15 @@ buildGoModule rec {
owner = "tinygo-org";
repo = "tinygo";
rev = "v${version}";
hash = "sha256-zoXruGoWitx6kietF3HKTYCtUrXp5SOrf2FEGgVPzkQ=";
hash = "sha256-ehXkYOMQz6zEmofK+3ajwxLK9vIRZava/F3Ki5jTzYo=";
fetchSubmodules = true;
# The public hydra server on `hydra.nixos.org` is configured with
# `max_output_size` of 3GB. The purpose of this `postFetch` step
# is to stay below that limit and save 4.1GiB and 428MiB in output
# size respectively. These folders are not referenced in tinygo.
postFetch = ''
rm -r $out/lib/cmsis-svd/data/{SiliconLabs,Freescale}
'';
};
vendorHash = "sha256-rJ8AfJkIpxDkk+9Tf7ORnn7ueJB1kjJUBiLMDV5tias=";

6
pkgs/development/libraries/audio/roc-toolkit/default.nix
View File

@ -51,10 +51,10 @@ stdenv.mkDerivation rec {
++ lib.optional soxSupport sox
++ lib.optional libsndfileSupport libsndfile;
sconsFlags =
sconsFlags = lib.optionals (!stdenv.hostPlatform.isDarwin)
[ "--build=${stdenv.buildPlatform.config}"
"--host=${stdenv.hostPlatform.config}"
"--prefix=${placeholder "out"}" ] ++
"--host=${stdenv.hostPlatform.config}" ] ++
[ "--prefix=${placeholder "out"}" ] ++
lib.optional (!opensslSupport) "--disable-openssl" ++
lib.optional (!soxSupport) "--disable-sox" ++
lib.optional (!libunwindSupport) "--disable-libunwind" ++

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "androidtvremote2";
version = "0.1.1";
version = "0.1.2";
pyproject = true;
disabled = pythonOlder "3.10";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "tronikos";
repo = "androidtvremote2";
rev = "refs/tags/v${version}";
hash = "sha256-Zem2IWBUWmyVdBjqoVKFk+/lg5T7CPXCKFXhFusQFLY=";
hash = "sha256-4iVM7BCqOFHrW2BvPakXxp3MfZa+WlB7g/ix239NldE=";
};
build-system = [ setuptools ];

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "dirigera";
version = "1.1.8";
version = "1.1.9";
pyproject = true;
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Leggin";
repo = "dirigera";
rev = "refs/tags/v${version}";
hash = "sha256-hJE3K3h6hyjeHVrE1Sj/S9eRD4JEGIhq4BWkScy1AEk=";
hash = "sha256-5vvWBJhTIFmYKIPQqZ1q2zSkru32SyPll8WNgOAdZwU=";
};
build-system = [ setuptools ];

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

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "19.11.1";
version = "19.11.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-yG8zDC2cirP7fXVTP7TP+BoCjRNgyj6AmXUt6anMy/k=";
hash = "sha256-DQdmZ51jAG+JZkZal17+NIaQ+0lrMS7tqMSZj47tNWw=";
};
postPatch = ''

8
pkgs/development/python-modules/rns/default.nix
View File

@ -2,10 +2,12 @@
lib,
buildPythonPackage,
cryptography,
esptool,
fetchFromGitHub,
netifaces,
pyserial,
pythonOlder,
replaceVars,
setuptools,
}:
@ -23,6 +25,12 @@ buildPythonPackage rec {
hash = "sha256-YSaabiCsSoG3BZ/0gM/fRIKQKdQ9MRtlHe+tPnzFJSw=";
};
patches = [
(replaceVars ./unvendor-esptool.patch {
esptool = lib.getExe esptool;
})
];
build-system = [ setuptools ];
dependencies = [

263
pkgs/development/python-modules/rns/unvendor-esptool.patch Normal file
View File

@ -0,0 +1,263 @@
diff --git a/RNS/Utilities/rnodeconf.py b/RNS/Utilities/rnodeconf.py
index 566df60..8f6201d 100755
--- a/RNS/Utilities/rnodeconf.py
+++ b/RNS/Utilities/rnodeconf.py
@@ -1453,18 +1453,17 @@ def main():
print("\nReady to extract firmware images from the RNode")
print("Press enter to start the extraction process")
input()
- extract_recovery_esptool()
hash_f = open(EXT_DIR+"/extracted_rnode_firmware.version", "wb")
hash_f.write(v_str.encode("utf-8"))
hash_f.close()
extraction_parts = [
- ("bootloader", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x1000 0x4650 \""+EXT_DIR+"/extracted_rnode_firmware.bootloader\""),
- ("partition table", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x8000 0xC00 \""+EXT_DIR+"/extracted_rnode_firmware.partitions\""),
- ("app boot", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0xe000 0x2000 \""+EXT_DIR+"/extracted_rnode_firmware.boot_app0\""),
- ("application image", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x10000 0x200000 \""+EXT_DIR+"/extracted_rnode_firmware.bin\""),
- ("console image", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x210000 0x1F0000 \""+EXT_DIR+"/extracted_console_image.bin\""),
+ ("bootloader", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x1000 0x4650 \""+EXT_DIR+"/extracted_rnode_firmware.bootloader\""),
+ ("partition table", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x8000 0xC00 \""+EXT_DIR+"/extracted_rnode_firmware.partitions\""),
+ ("app boot", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0xe000 0x2000 \""+EXT_DIR+"/extracted_rnode_firmware.boot_app0\""),
+ ("application image", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x10000 0x200000 \""+EXT_DIR+"/extracted_rnode_firmware.bin\""),
+ ("console image", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x210000 0x1F0000 \""+EXT_DIR+"/extracted_console_image.bin\""),
]
import subprocess, shlex
for part, command in extraction_parts:
@@ -2290,25 +2289,12 @@ def main():
graceful_exit()
elif platform == ROM.PLATFORM_ESP32:
numeric_version = float(selected_version)
- flasher_dir = UPD_DIR+"/"+selected_version
- flasher = flasher_dir+"/esptool.py"
- if not os.path.isfile(flasher):
- if os.path.isfile(CNF_DIR+"/recovery_esptool.py"):
- import shutil
- if not os.path.isdir(flasher_dir):
- os.makedirs(flasher_dir)
- shutil.copy(CNF_DIR+"/recovery_esptool.py", flasher)
- RNS.log("No flasher present, using recovery flasher to write firmware to device")
-
- if os.path.isfile(flasher):
- import stat
- os.chmod(flasher, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP)
- if which(flasher) is not None:
+ if True:
if fw_filename == "rnode_firmware_tbeam.zip":
if numeric_version >= 1.55:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2326,7 +2312,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2344,7 +2330,7 @@ def main():
elif fw_filename == "rnode_firmware_tbeam_sx1262.zip":
if numeric_version >= 1.55:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2362,7 +2348,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2380,7 +2366,7 @@ def main():
elif fw_filename == "rnode_firmware_lora32v10.zip":
if numeric_version >= 1.59:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2398,7 +2384,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2416,7 +2402,7 @@ def main():
elif fw_filename == "rnode_firmware_lora32v20.zip":
if numeric_version >= 1.55:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2434,7 +2420,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2452,7 +2438,7 @@ def main():
elif fw_filename == "rnode_firmware_lora32v21.zip":
if numeric_version >= 1.55:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2470,7 +2456,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2487,7 +2473,7 @@ def main():
]
elif fw_filename == "rnode_firmware_lora32v21_tcxo.zip":
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2506,7 +2492,7 @@ def main():
elif fw_filename == "rnode_firmware_heltec32v2.zip":
if numeric_version >= 1.55:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2524,7 +2510,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2541,7 +2527,7 @@ def main():
]
elif fw_filename == "rnode_firmware_heltec32v3.zip":
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32-s3",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2559,7 +2545,7 @@ def main():
elif fw_filename == "rnode_firmware_featheresp32.zip":
if numeric_version >= 1.55:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2577,7 +2563,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2595,7 +2581,7 @@ def main():
elif fw_filename == "rnode_firmware_esp32_generic.zip":
if numeric_version >= 1.55:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2613,7 +2599,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2631,7 +2617,7 @@ def main():
elif fw_filename == "rnode_firmware_ng20.zip":
if numeric_version >= 1.55:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2649,7 +2635,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2667,7 +2653,7 @@ def main():
elif fw_filename == "rnode_firmware_ng21.zip":
if numeric_version >= 1.55:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2685,7 +2671,7 @@ def main():
]
else:
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2702,7 +2688,7 @@ def main():
]
elif fw_filename == "rnode_firmware_t3s3.zip":
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32s3",
"--port", args.port,
"--baud", args.baud_flash,
@@ -2720,7 +2706,7 @@ def main():
]
elif fw_filename == "extracted_rnode_firmware.zip":
return [
- sys.executable, flasher,
+ "@esptool@",
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,

20
pkgs/development/tools/analysis/cpplint/default.nix
View File

@ -1,26 +1,32 @@
{ lib, python3Packages, fetchFromGitHub }:
{ lib, fetchpatch, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec {
pname = "cpplint";
version = "1.6.1";
version = "1.7.0";
pyproject = true;
# Fetch from github instead of pypi, since the test cases are not in the pypi archive
src = fetchFromGitHub {
owner = "cpplint";
repo = "cpplint";
rev = "refs/tags/${version}";
hash = "sha256-N5YrlhEXQGYxhsJ4M5dGYZUzA81GKRSI83goaqbtCkI=";
# Commit where version was bumped to 1.7.0, no tag available
rev = "8f62396aff6dc850415cbe5ed7edf9dc95f4a731";
hash = "sha256-EKD7vkxJjoKWfPrXEQRA0X3PyAoYXi9wGgUFT1zC4WM=";
};
patches = [
# Whitespace fixes that make the tests pass
(fetchpatch {
url = "https://github.com/cpplint/cpplint/commit/fd257bd78db02888cf6b5985ab8f53d6b765704f.patch";
hash = "sha256-BNyW8QEY9fUe2zMG4RZzBHASaIsu4d2FJt5rX3VgkrQ=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace-fail '"pytest-runner==5.2"' ""
patchShebangs cpplint_unittest.py
substituteInPlace cpplint_unittest.py \
--replace-fail "assertEquals" "assertEqual"
'';
build-system = with python3Packages; [

2
pkgs/development/tools/devpod/default.nix
View File

@ -96,7 +96,7 @@ rec {
dontInstall = true;
};
rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform;
rustTargetPlatformSpec = stdenv.hostPlatform.rust.rustcTarget;
in
rustPlatform.buildRustPackage {
inherit version src;

42
pkgs/development/tools/misc/doclifter/default.nix
View File

@ -1,14 +1,33 @@
{ lib, stdenv, fetchurl, python3, makeWrapper, libxml2 }:
{
fetchurl,
lib,
libxml2,
makeWrapper,
python3,
stdenv,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "doclifter";
version = "2.21";
src = fetchurl {
url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-3zb+H/rRmU87LWh0+kQtiRMZ4JwJ3tVrt8vQ/EeKx8Q=";
url = "http://www.catb.org/~esr/doclifter/doclifter-${finalAttrs.version}.tar.gz";
hash = "sha256-3zb+H/rRmU87LWh0+kQtiRMZ4JwJ3tVrt8vQ/EeKx8Q=";
};
postPatch = ''
substituteInPlace manlifter \
--replace-fail '/usr/bin/env python2' '/usr/bin/env python3'
2to3 -w manlifter
'';
nativeBuildInputs = [
python3
makeWrapper
];
buildInputs = [ python3 ];
nativeBuildInputs = [ python3 makeWrapper ];
strictDeps = true;
@ -17,19 +36,18 @@ stdenv.mkDerivation rec {
preInstall = ''
mkdir -p $out/bin
mkdir -p $out/share/man/man1
substituteInPlace manlifter \
--replace '/usr/bin/env python2' '/usr/bin/env python3'
2to3 -w manlifter
cp manlifter $out/bin
wrapProgram "$out/bin/manlifter" \
--prefix PATH : "${libxml2}/bin:$out/bin"
cp manlifter.1 $out/share/man/man1
--prefix PATH : "${lib.getBin libxml2}/bin:$out/bin"
gzip < manlifter.1 > $out/share/man/man1/manlifter.1.gz
'';
meta = {
changelog = "https://gitlab.com/esr/doclifter/-/blob/2.21/NEWS";
description = "Lift documents in nroff markups to XML-DocBook";
homepage = "http://www.catb.org/esr/doclifter";
license = "BSD";
license = lib.licenses.bsd2;
mainProgram = "doclifter";
platforms = lib.platforms.unix;
};
}
})

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@ -7,12 +7,12 @@ let
# kernel config in the xanmod version commit
variants = {
lts = {
version = "6.6.47";
hash = "sha256-FF5kOUC3wIGPjf2f9pogaR51L8kdwJIpAmGc1h/LdV8=";
version = "6.6.48";
hash = "sha256-Ayuq4qKWu/wgG3wiMNrgkcc6BNSUReqileNx4vYMtak=";
};
main = {
version = "6.10.6";
hash = "sha256-QG0rOysVFm+yeYbVX9OHotdq9IvCF+zxceUuG1yytrc=";
version = "6.10.7";
hash = "sha256-I2gtxaANJBmUlko7I9x1izLTyCBMqvUW/1Qx3a0H4uU=";
};
};

6
pkgs/os-specific/linux/pam_rssh/default.nix
View File

@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "pam_rssh";
version = "1.1.0";
version = "1.2.0-rc2";
src = fetchFromGitHub {
owner = "z4yx";
repo = "pam_rssh";
rev = "v${version}";
hash = "sha256-SDtMqGy2zhq9jEQVwSEl4EwRp2jgXfTVLrCX7k/kBeU=";
hash = "sha256-sXTSICVYSmwr12kRWuhVcag8kY6VAFdCqbe6LtYs4hU=";
fetchSubmodules = true;
};
cargoHash = "sha256-gNy1tcHDUOG1XduGAIMapvx5dlq+U1LitUQkccGfb9o=";
cargoHash = "sha256-QZ1Cs3TZab9wf8l4Fe95LFZhHB6q1uq7JRzEVUMKQSI=";
postPatch = ''
substituteInPlace src/auth_keys.rs \

6
pkgs/servers/plex/raw.nix
View File

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.40.5.8897-e5987a19d";
version = "1.40.5.8921-836b34c27";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "11q9k2pf0jqh0fcian4qcapaal0viiydvl5if0z1y8hi9njfz1rz";
sha256 = "1jf47mmwvvj4c64ksbvnx3g14x7qn9h08p3xbixha7nk4nhxpqcv";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "1z2qar9lwmnk8ljb5r9g2sdr3zn7r180bsw6cyizfyv5588ljvgb";
sha256 = "0fia2d6gxlxv1my5031wnp3ihc3knfra1yrwadz44khh03zkvxq7";
};
outputs = [ "out" "basedb" ];

6
pkgs/servers/zigbee2mqtt/default.nix
View File

@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "zigbee2mqtt";
version = "1.39.1";
version = "1.40.0";
src = fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
hash = "sha256-mshQdb28vSEbHeSDLrVxx3sSgpRBMeqsVljiLtwTsF0=";
hash = "sha256-LKRCsYQOSSLYLYi2IntJuPiLR+l4oUtyVRUoGs/NWeI=";
};
npmDepsHash = "sha256-+/WLjypVYDE4b6gcxXInU9ukntPH5GZpd8T3rlqrINs=";
npmDepsHash = "sha256-ufmNe1dVqtDirn1/VydNedns5V8y0oR8fuVi6E86JFs=";
buildInputs = lib.optionals withSystemd [
systemdMinimal

6
pkgs/stdenv/adapters.nix
View File

@ -261,7 +261,10 @@ rec {
in
overrideCC targetStdenv cc;
useMoldLinker = stdenv: let
useMoldLinker = stdenv:
if stdenv.targetPlatform.isDarwin
then throw "Mold can't be used to emit Mach-O (Darwin) binaries"
else let
bintools = stdenv.cc.bintools.override {
extraBuildCommands = ''
wrap ${stdenv.cc.bintools.targetPrefix}ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold
@ -280,7 +283,6 @@ rec {
});
});
/* Modify a stdenv so that it builds binaries optimized specifically
for the machine they are built on.

6
pkgs/tools/misc/mise/default.nix
View File

@ -17,13 +17,13 @@
rustPlatform.buildRustPackage rec {
pname = "mise";
version = "2024.8.13";
version = "2024.8.15";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
rev = "v${version}";
hash = "sha256-XarSfCjEwL1ps2Kwla0lLybpfjNUcIuvTD0kb5YiKgU=";
hash = "sha256-E4eS4wPExW4R7vb1lKBbxxwCzIcL3kut3U2c6n9cs3s=";
# registry is not needed for compilation nor for tests.
# contains files with the same name but different case, which cause problems with hash on darwin
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoHash = "sha256-F+CGCk1U+I0htfWw1ZTl02lBhzSxk19hM7VjTWM8T10=";
cargoHash = "sha256-oQbjR0nsyKQh232Ga5sPEfBd24ty0Om5vc742tVkCt4=";
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

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

@ -1308,6 +1308,7 @@ mapAliases ({
redocly-cli = redocly; # Added 2024-04-14
redpanda = redpanda-client; # Added 2023-10-14
redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10
relibc = throw "relibc has been removed due to lack of maintenance"; # Added 2024-09-02
replay-sorcery = throw "replay-sorcery has been removed as it is unmaintained upstream. Consider using gpu-screen-recorder or obs-studio instead."; # Added 2024-07-13
restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04
restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22

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

@ -16902,8 +16902,6 @@ with pkgs;
pw-volume = callPackage ../tools/audio/pw-volume { };
pyradio = callPackage ../applications/audio/pyradio { };
racket = callPackage ../development/interpreters/racket {
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
@ -17593,7 +17591,9 @@ with pkgs;
bob = callPackage ../development/tools/build-managers/bob { };
buck = callPackage ../development/tools/build-managers/buck { };
buck = callPackage ../development/tools/build-managers/buck {
python3 = python311;
};
buck2 = callPackage ../development/tools/build-managers/buck2 { };