Merge master into staging-next
This commit is contained in:
@@ -322,7 +322,7 @@ module.exports = async ({ github, context, core, dry }) => {
|
||||
|
||||
Object.assign(prLabels, evalLabels, {
|
||||
'11.by: package-maintainer':
|
||||
packages.length &&
|
||||
Boolean(packages.length) &&
|
||||
packages.every((pkg) =>
|
||||
maintainers[pkg]?.includes(pull_request.user.id),
|
||||
),
|
||||
|
||||
@@ -25747,12 +25747,6 @@
|
||||
githubId = 102452;
|
||||
name = "Niclas Thall";
|
||||
};
|
||||
thammers = {
|
||||
email = "jawr@gmx.de";
|
||||
github = "tobias-hammerschmidt";
|
||||
githubId = 2543259;
|
||||
name = "Tobias Hammerschmidt";
|
||||
};
|
||||
thanegill = {
|
||||
email = "me@thanegill.com";
|
||||
github = "thanegill";
|
||||
|
||||
@@ -267,6 +267,8 @@
|
||||
|
||||
- The `services.meilisearch` module now always defaults to the latest version of meilisearch, as the previous `meilisearch_1_11` package was removed. This is only an issue if you were using the old version.
|
||||
|
||||
- `services.journald.gateway.user` and `services.journald.gateway.system` now defaults to `false`. This new behaviour matches the default behaviour of the [`systemd-journal-gatewayd`](https://www.freedesktop.org/software/systemd/man/latest/systemd-journal-gatewayd.service.html) service itself.
|
||||
|
||||
- The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection.
|
||||
|
||||
- The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill.
|
||||
|
||||
@@ -6,9 +6,11 @@
|
||||
{
|
||||
imports = [
|
||||
./disk.nix
|
||||
./firmware.nix
|
||||
./keyboard.nix
|
||||
./networking
|
||||
./system.nix
|
||||
./virtualisation.nix
|
||||
];
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ mic92 ];
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
facterLib = import ./lib.nix lib;
|
||||
|
||||
inherit (config.hardware.facter) report;
|
||||
isBaremetal = config.hardware.facter.detected.virtualisation.none.enable;
|
||||
hasAmdCpu = facterLib.hasAmdCpu report;
|
||||
hasIntelCpu = facterLib.hasIntelCpu report;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf isBaremetal {
|
||||
# none (e.g. bare-metal)
|
||||
# provide firmware for devices that might not have been detected by nixos-facter
|
||||
hardware.enableRedistributableFirmware = lib.mkDefault true;
|
||||
|
||||
# update microcode
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkIf hasAmdCpu (
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware
|
||||
);
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkIf hasIntelCpu (
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware
|
||||
);
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (config.hardware.facter) report;
|
||||
cfg = config.hardware.facter.detected.virtualisation;
|
||||
in
|
||||
{
|
||||
options.hardware.facter.detected.virtualisation = {
|
||||
virtio_scsi.enable = lib.mkEnableOption "Enable the Facter Virtualisation Virtio SCSI module" // {
|
||||
default = lib.any (
|
||||
{ vendor, device, ... }:
|
||||
# vendor (0x1af4) Red Hat, Inc.
|
||||
(vendor.value or 0) == 6900
|
||||
&&
|
||||
# device (0x1004, 0x1048) Virtio SCSI
|
||||
(lib.elem (device.value or 0) [
|
||||
4100
|
||||
4168
|
||||
])
|
||||
) (report.hardware.scsi or [ ]);
|
||||
defaultText = "hardware dependent";
|
||||
};
|
||||
oracle.enable = lib.mkEnableOption "Enable the Facter Virtualisation Oracle module" // {
|
||||
default = report.virtualisation or null == "oracle";
|
||||
defaultText = "environment dependent";
|
||||
};
|
||||
parallels.enable = lib.mkEnableOption "Enable the Facter Virtualisation Parallels module" // {
|
||||
default = report.virtualisation or null == "parallels";
|
||||
defaultText = "environment dependent";
|
||||
};
|
||||
qemu.enable = lib.mkEnableOption "Enable the Facter Virtualisation Qemu module" // {
|
||||
default = builtins.elem (report.virtualisation or null) [
|
||||
"qemu"
|
||||
"kvm"
|
||||
"bochs"
|
||||
];
|
||||
defaultText = "environment dependent";
|
||||
};
|
||||
hyperv.enable = lib.mkEnableOption "Enable the Facter Virtualisation Hyper-V module" // {
|
||||
default = report.virtualisation or null == "microsoft";
|
||||
defaultText = "environment dependent";
|
||||
};
|
||||
# no virtualisation detected
|
||||
none.enable = lib.mkEnableOption "Enable the Facter Virtualisation None module" // {
|
||||
default = report.virtualisation or null == "none";
|
||||
defaultText = "environment dependent";
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
|
||||
# KVM support
|
||||
boot.kernelModules =
|
||||
let
|
||||
hasCPUFeature =
|
||||
feature: lib.any ({ features, ... }: lib.elem feature features) (report.hardware.cpu or [ ]);
|
||||
in
|
||||
lib.mkMerge [
|
||||
(lib.mkIf (hasCPUFeature "vmx") [ "kvm-intel" ])
|
||||
(lib.mkIf (hasCPUFeature "svm") [ "kvm-amd" ])
|
||||
];
|
||||
|
||||
# virtio & qemu
|
||||
boot.initrd = {
|
||||
kernelModules = lib.optionals cfg.qemu.enable [
|
||||
"virtio_balloon"
|
||||
"virtio_console"
|
||||
"virtio_rng"
|
||||
"virtio_gpu"
|
||||
];
|
||||
|
||||
availableKernelModules = lib.mkMerge [
|
||||
(lib.mkIf cfg.qemu.enable [
|
||||
"virtio_net"
|
||||
"virtio_pci"
|
||||
"virtio_mmio"
|
||||
"virtio_blk"
|
||||
"9p"
|
||||
"9pnet_virtio"
|
||||
])
|
||||
(lib.mkIf cfg.virtio_scsi.enable [
|
||||
"virtio_scsi"
|
||||
])
|
||||
];
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
# oracle
|
||||
virtualbox.guest.enable = lib.mkIf cfg.oracle.enable (lib.mkDefault true);
|
||||
# hyper-v
|
||||
hypervGuest.enable = lib.mkIf cfg.hyperv.enable (lib.mkDefault true);
|
||||
};
|
||||
|
||||
# parallels
|
||||
hardware.parallels.enable = lib.mkIf cfg.parallels.enable (lib.mkDefault true);
|
||||
nixpkgs.config = lib.mkIf (!options.nixpkgs.pkgs.isDefined && cfg.parallels.enable) {
|
||||
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "prl-tools" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -25,7 +25,7 @@ in
|
||||
|
||||
enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";
|
||||
|
||||
package = lib.mkPackageOption pkgs "udisks2" { };
|
||||
package = lib.mkPackageOption pkgs "udisks" { };
|
||||
|
||||
mountOnMedia = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
|
||||
@@ -22,7 +22,7 @@ in
|
||||
path = [
|
||||
pkgs.udevil
|
||||
pkgs.procps
|
||||
pkgs.udisks2
|
||||
pkgs.udisks
|
||||
pkgs.which
|
||||
];
|
||||
serviceConfig.ExecStart = "${pkgs.udevil}/bin/devmon";
|
||||
|
||||
@@ -75,7 +75,7 @@ in
|
||||
};
|
||||
|
||||
system = lib.mkOption {
|
||||
default = true;
|
||||
default = false;
|
||||
type = lib.types.bool;
|
||||
description = ''
|
||||
Serve entries from system services and the kernel.
|
||||
@@ -85,7 +85,7 @@ in
|
||||
};
|
||||
|
||||
user = lib.mkOption {
|
||||
default = true;
|
||||
default = false;
|
||||
type = lib.types.bool;
|
||||
description = ''
|
||||
Serve entries from services for the current user.
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
partitions = {
|
||||
"nix-store" = {
|
||||
storePaths = [ config.system.build.toplevel ];
|
||||
stripNixStorePrefix = true;
|
||||
nixStorePrefix = "/";
|
||||
repartConfig = {
|
||||
Type = "linux-generic";
|
||||
Label = "nix-store";
|
||||
@@ -89,7 +89,7 @@
|
||||
"-f",
|
||||
"qcow2",
|
||||
"-b",
|
||||
"${nodes.machine.system.build.image}/${nodes.machine.image.repart.imageFile}",
|
||||
"${nodes.machine.system.build.image}/${nodes.machine.image.fileName}",
|
||||
"-F",
|
||||
"raw",
|
||||
tmp_disk_image.name,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
udisks2,
|
||||
udisks,
|
||||
qt6,
|
||||
cmake,
|
||||
ninja,
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
udisks2
|
||||
udisks
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@@ -70,6 +70,7 @@ let
|
||||
"8.20.0".sha256 = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0=";
|
||||
"8.20.1".sha256 = "sha256-nRaLODPG4E3gUDzGrCK40vhl4+VhPyd+/fXFK/HC3Ig=";
|
||||
"9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
|
||||
"9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
|
||||
"9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
|
||||
};
|
||||
releaseRev = v: "V${v}";
|
||||
|
||||
@@ -23,6 +23,7 @@ let
|
||||
|
||||
release = {
|
||||
"9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
|
||||
"9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
|
||||
"9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
|
||||
};
|
||||
releaseRev = v: "V${v}";
|
||||
|
||||
@@ -29,28 +29,28 @@
|
||||
},
|
||||
"beta": {
|
||||
"linux": {
|
||||
"version": "8.11.14-20.BETA",
|
||||
"version": "8.11.18-30.BETA",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-20.BETA.x64.tar.gz",
|
||||
"hash": "sha256-/B06ghBsr7xgEWgXo+jkz5PUJVS51WfzyBZFxwu3XBM="
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.18-30.BETA.x64.tar.gz",
|
||||
"hash": "sha256-rCb54NhczM5Us6DRd1DgA7xGem4Ri4GIcJ0FFCiNAvo="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-20.BETA.arm64.tar.gz",
|
||||
"hash": "sha256-gSdlXULW7q7uRWm5CncA/ya+LA4k4y8g+Lj79h5V2kc="
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.18-30.BETA.arm64.tar.gz",
|
||||
"hash": "sha256-qL6Xa8g2qgyl+UfDThH18rbaXxkt+bN0y2TcQ8C214Y="
|
||||
}
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
"version": "8.11.14-20.BETA",
|
||||
"version": "8.11.18-30.BETA",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-x86_64.zip",
|
||||
"hash": "sha256-1ZPekYyHLVbIop2Yw3sj1XsWCG5SgoI0MFVK44HJfCs="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-x86_64.zip",
|
||||
"hash": "sha256-xkCTyFxZhCKsCTTyWz3SPA9XKhR5p7GT3hwBwXQVb40="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-aarch64.zip",
|
||||
"hash": "sha256-Ca3jpcfxaINKSR0JjF7fT+6rfrbK//f22RT7UhEhDaM="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-aarch64.zip",
|
||||
"hash": "sha256-Ou3GSMTNmaz+sbYCYqmxH9qrQMDmUBfTUPVcvdNDt6k="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{ lib, bundlerApp }:
|
||||
{
|
||||
lib,
|
||||
bundlerApp,
|
||||
}:
|
||||
|
||||
bundlerApp {
|
||||
pname = "3llo";
|
||||
@@ -7,9 +10,9 @@ bundlerApp {
|
||||
|
||||
exes = [ "3llo" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Trello interactive CLI on terminal";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/qcam/3llo";
|
||||
maintainers = [ ];
|
||||
};
|
||||
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
|
||||
doCheck = false;
|
||||
# internal_volume_io.h: No such file or directory
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/${owner}/arguments";
|
||||
description = "Library for argument handling for MINC programs";
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "arkenfox-userjs";
|
||||
version = "140.0";
|
||||
version = "140.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/arkenfox/user.js/${finalAttrs.version}/user.js";
|
||||
hash = "sha256-/cz0dnQXKa3c/DqUTAEwBV0I9Tc3x6uzU6rtYijg3Zo=";
|
||||
url = "https://raw.githubusercontent.com/arkenfox/user.js/refs/tags/${finalAttrs.version}/user.js";
|
||||
hash = "sha256-jxzIiARi+GXD+GSGPr1exeEHjR/LsXSUQPGZ+hF36xg=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
@@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/arkenfox/user.js/releases/tag/${finalAttrs.version}";
|
||||
description = "Comprehensive user.js template for configuration and hardening";
|
||||
homepage = "https://github.com/arkenfox/user.js";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -25,14 +25,14 @@ in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "awsebcli";
|
||||
version = "3.25.1";
|
||||
version = "3.25.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-elastic-beanstalk-cli";
|
||||
tag = version;
|
||||
hash = "sha256-objIzpYMyuFjEc85H9dXhQez3MZfNu3lWSWm6+E2iJs=";
|
||||
hash = "sha256-6PeOn0owjEjTWdEwgXILiGq+6T5GBBc61viiG5GNeYo=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPackages,
|
||||
libcxxStdenv,
|
||||
fetchurl,
|
||||
pkgsStatic,
|
||||
runCommandLocal,
|
||||
binutils,
|
||||
python3,
|
||||
docutils,
|
||||
bzip2,
|
||||
zlib,
|
||||
jitterentropy,
|
||||
darwin,
|
||||
esdm,
|
||||
tpm2-tss,
|
||||
static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
|
||||
static ? stdenv.hostPlatform.isStatic,
|
||||
windows,
|
||||
|
||||
# build ESDM RNG plugin
|
||||
@@ -20,7 +21,7 @@
|
||||
# useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
|
||||
withTpm2 ? false,
|
||||
policy ? null,
|
||||
}:
|
||||
}@args:
|
||||
|
||||
assert lib.assertOneOf "policy" policy [
|
||||
# no explicit policy is given. The defaults by the library are used
|
||||
@@ -32,11 +33,25 @@ assert lib.assertOneOf "policy" policy [
|
||||
# only allow "modern" algorithms
|
||||
"modern"
|
||||
];
|
||||
|
||||
let
|
||||
stdenv' = if static then buildPackages.libcxxStdenv else stdenv;
|
||||
stdenv = if static then libcxxStdenv else args.stdenv;
|
||||
|
||||
# (based on same workaround from capnproto package)
|
||||
#
|
||||
# HACK: work around https://github.com/NixOS/nixpkgs/issues/177129
|
||||
# Though this is an issue between Clang and GCC,
|
||||
# so it may not get fixed anytime soon...
|
||||
empty-libgcc_eh =
|
||||
runCommandLocal "empty-libgcc_eh"
|
||||
{
|
||||
nativeBuildInputs = [ binutils ];
|
||||
}
|
||||
''
|
||||
mkdir -p "$out"/lib
|
||||
${stdenv.cc.targetPrefix}ar r "$out"/lib/libgcc_eh.a
|
||||
'';
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "3.9.0";
|
||||
pname = "botan";
|
||||
|
||||
@@ -82,6 +97,8 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
windows.pthreads
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optional static empty-libgcc_eh;
|
||||
|
||||
buildTargets = [
|
||||
"cli"
|
||||
]
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
shared-mime-info,
|
||||
testers,
|
||||
tzdata,
|
||||
udisks2,
|
||||
udisks,
|
||||
upower,
|
||||
webp-pixbuf-loader,
|
||||
wrapGAppsHook3,
|
||||
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
networkmanager
|
||||
polkit
|
||||
samba
|
||||
udisks2
|
||||
udisks
|
||||
upower
|
||||
];
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
libmtp,
|
||||
withOnlineServices ? true,
|
||||
withDevices ? true,
|
||||
udisks2,
|
||||
udisks,
|
||||
withDynamic ? true,
|
||||
withHttpServer ? true,
|
||||
withLibVlc ? true,
|
||||
@@ -156,7 +156,7 @@ let
|
||||
{
|
||||
names = [ "UDISKS2" ];
|
||||
enable = withUdisks;
|
||||
pkgs = [ udisks2 ];
|
||||
pkgs = [ udisks ];
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "chirp";
|
||||
version = "0.4.0-unstable-2025-10-23";
|
||||
version = "0.4.0-unstable-2025-10-30";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "8116c3782a6b6b7112cc372f0b423853d3645f5a";
|
||||
hash = "sha256-64QKsdNL5HcjYHMH1H03Nm5PqH5ypkpeX9uqN2GdnuI=";
|
||||
rev = "a3b973cceb46e431423b3599fb365668958963d5";
|
||||
hash = "sha256-z68yLImyB7MvCd/+ZNiqZjFtXk6+fZ2uJPj5GUJZg8M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "compose2nix";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aksiksi";
|
||||
repo = "compose2nix";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3i49IyYDwyVQffjHrHPmtPJl4ZkT1VpiFVDmX/dHcKw=";
|
||||
hash = "sha256-0QCYgzxg0upnrVGDXbX9GgSHyzeMP3yqNor2t8DVwiU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ckN4nK2A0micl+iBtvxwf5iMchrcGdC0xzjQta6Jges=";
|
||||
vendorHash = "sha256-8boWHIGvenGugKq+8ysPCsUib7QQ0ov+jbKFDKpls3g=";
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastcdr";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-CDR";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-2xaiyF3dK4BfSa7u5kwYGYaXY0c9/MLiV34jmvTzI4k=";
|
||||
hash = "sha256-KXQRQieyDPuSmLltf7iOVO4QdsHgaek+x1vneZyEg0E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = "https://savannah.nongnu.org/projects/flvstreamer";
|
||||
|
||||
maintainers = [ lib.maintainers.thammers ];
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -92,6 +92,8 @@ buildGoModule rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
# Cannot process container options: '--pid=host --device=/dev/sda': 'unknown server OS: darwin'
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
description = "Runner for Forgejo based on act";
|
||||
homepage = "https://code.forgejo.org/forgejo/runner";
|
||||
changelog = "https://code.forgejo.org/forgejo/runner/releases/tag/${src.rev}";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "globalping-cli";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsdelivr";
|
||||
repo = "globalping-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UB2vYdyJ2+H8rFyJn1KBNnWoGUlRjwYorWXqoB9WDu0=";
|
||||
hash = "sha256-muWhiKqPdNVhy7c7MSRHACGzOn5pIVRdqSdfdCJw2CA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dJAuN5srL5EvMaRg8rHaTsurjYrdH45p965DeubpB0E=";
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
tinysparql,
|
||||
localsearch,
|
||||
tzdata,
|
||||
udisks2,
|
||||
udisks,
|
||||
upower,
|
||||
wayland-scanner,
|
||||
libepoxy,
|
||||
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
samba
|
||||
tinysparql
|
||||
localsearch # for search locations dialog
|
||||
udisks2
|
||||
udisks
|
||||
upower
|
||||
# For animations in Mouse panel.
|
||||
gst_all_1.gst-plugins-base
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
ninja,
|
||||
pkg-config,
|
||||
systemd,
|
||||
udisks2,
|
||||
udisks,
|
||||
wrapGAppsHook3,
|
||||
xz,
|
||||
}:
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
libpwquality
|
||||
libsecret
|
||||
systemd
|
||||
udisks2
|
||||
udisks
|
||||
xz
|
||||
];
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
pkg-config,
|
||||
meson,
|
||||
ninja,
|
||||
adwaita-icon-theme,
|
||||
exiv2,
|
||||
libheif,
|
||||
libjpeg,
|
||||
@@ -22,8 +21,10 @@
|
||||
libX11,
|
||||
lcms2,
|
||||
bison,
|
||||
brasero,
|
||||
flex,
|
||||
clutter-gtk,
|
||||
colord,
|
||||
wrapGAppsHook3,
|
||||
shared-mime-info,
|
||||
python3,
|
||||
@@ -33,13 +34,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gthumb";
|
||||
version = "3.12.7";
|
||||
version = "3.12.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-7hLSTPIxAQJB91jWyVudU6c4Enj6dralGLPQmzce+uw=";
|
||||
sha256 = "sha256-JzYvwRylxYHzFoIjDJUCDlofzd9M/+vnVVeCjGF021s=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
desktop-file-utils
|
||||
@@ -53,10 +56,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
brasero
|
||||
clutter-gtk
|
||||
colord
|
||||
exiv2
|
||||
glib
|
||||
adwaita-icon-theme
|
||||
gsettings-desktop-schemas
|
||||
gst_all_1.gst-plugins-base
|
||||
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
|
||||
@@ -75,14 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libX11
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dlibjxl=true"
|
||||
# Depends on libsoup2.
|
||||
# https://gitlab.gnome.org/GNOME/gthumb/-/issues/244
|
||||
"-Dlibchamplain=false"
|
||||
"-Dwebservices=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x gthumb/make-gthumb-h.py
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
glib,
|
||||
udevSupport ? stdenv.hostPlatform.isLinux,
|
||||
libgudev,
|
||||
udisks2,
|
||||
udisks,
|
||||
libgcrypt,
|
||||
libcap,
|
||||
polkit,
|
||||
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals udevSupport [
|
||||
libgudev
|
||||
udisks2
|
||||
udisks
|
||||
fuse3
|
||||
libcdio
|
||||
samba
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hddfancontrol";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desbma";
|
||||
repo = "hddfancontrol";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kKzjg2D/7Thzu6JzmLyu2eJAr+N6Bi95WEBKrqB/vXo=";
|
||||
hash = "sha256-VnHXRheqh+NwbFBWsX9XUbRuto7weyX7aHZ+BDi2Vns=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0TRNiRmxwV/p7nLOrU9GHjTzIaan4JV8C6e443nd2zY=";
|
||||
cargoHash = "sha256-lm4ARffPOYCewNyREb1PQ8M5icqh8c+z6ZNXZKpBlRE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -11,12 +11,12 @@ let
|
||||
in
|
||||
{
|
||||
# Compiler version & repo
|
||||
idris2-version = "0.7.0";
|
||||
idris2-version = "0.8.0";
|
||||
idris2-src = fetchFromGitHub {
|
||||
owner = "idris-lang";
|
||||
repo = "Idris2";
|
||||
rev = "v${self.idris2-version}";
|
||||
hash = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
|
||||
hash = "sha256-MvFNSPpgONSTjACH3HGWEiNgz9aAeBPmyQwFe21+fe0=";
|
||||
};
|
||||
# Prelude libraries
|
||||
mkPrelude = callPackage ./mkPrelude.nix { }; # Build helper
|
||||
|
||||
@@ -149,9 +149,9 @@ in
|
||||
transformBuildIdrisOutput = pkg: pkg.library { withSource = false; };
|
||||
expectedTree = ''
|
||||
`-- lib
|
||||
`-- idris2-0.7.0
|
||||
`-- idris2-${idris2.version}
|
||||
`-- pkg-0
|
||||
|-- 2023090800
|
||||
|-- 2025081600
|
||||
| |-- Main.ttc
|
||||
| `-- Main.ttm
|
||||
`-- pkg.ipkg
|
||||
@@ -186,9 +186,9 @@ in
|
||||
transformBuildIdrisOutput = pkg: pkg.library { withSource = true; };
|
||||
expectedTree = ''
|
||||
`-- lib
|
||||
`-- idris2-0.7.0
|
||||
`-- idris2-${idris2.version}
|
||||
`-- pkg-0
|
||||
|-- 2023090800
|
||||
|-- 2025081600
|
||||
| |-- Main.ttc
|
||||
| `-- Main.ttm
|
||||
|-- Main.idr
|
||||
@@ -224,9 +224,9 @@ in
|
||||
transformBuildIdrisOutput = pkg: pkg.library'.withSource;
|
||||
expectedTree = ''
|
||||
`-- lib
|
||||
`-- idris2-0.7.0
|
||||
`-- idris2-${idris2.version}
|
||||
`-- pkg-0
|
||||
|-- 2023090800
|
||||
|-- 2025081600
|
||||
| |-- Main.ttc
|
||||
| `-- Main.ttm
|
||||
|-- Main.idr
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "immich-cli";
|
||||
version = "2.2.99";
|
||||
version = "2.2.100";
|
||||
inherit (immich) src pnpmDeps;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
esbuild' = buildPackages.esbuild.override {
|
||||
buildGoModule =
|
||||
@@ -108,7 +108,7 @@ let
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PBhUTDnZtl7Ri9thSAXuazpcmpWEUNn7BXLix+AuaE8=";
|
||||
hash = "sha256-0ibXs4c61CEp6s/gOCsIj2A7VTnA+72jTMXoo4kkt74=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
|
||||
@@ -39,13 +39,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "koboldcpp";
|
||||
version = "1.100.1";
|
||||
version = "1.101";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LostRuins";
|
||||
repo = "koboldcpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Z3yPsC7WDFHwXVInnu96ZVWAjn6XyN0aVviwGkvoe1A=";
|
||||
hash = "sha256-WwTl+u7FJ4E+x+jjwh0wmPM7fjsPxu7+TrEwKQQfyLA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
curl,
|
||||
openssl,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdbook-plugins";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustForWeb";
|
||||
repo = "mdbook-plugins";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IyIUJH5pbuvDarQf7yvrStMIb5HdimudYF+Tq/+OtvY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/UM85Lhq52MFTjczPRuXENPJOQkjiHLWGPPW/VD9kBQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
openssl
|
||||
];
|
||||
|
||||
env.OPENSSL_NO_VENDOR = true;
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin=mdbook-tabs"
|
||||
"--bin=mdbook-trunk"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "--version";
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Plugins for mdBook";
|
||||
homepage = "https://mdbook-plugins.rustforweb.org/";
|
||||
changelog = "https://github.com/RustForWeb/mdbook-plugins/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ redianthus ];
|
||||
mainProgram = "mdbook-tabs";
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdfried";
|
||||
version = "0.12.9";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benjajaja";
|
||||
repo = "mdfried";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0vAPUmG11Qvds3g2iaH7umZpo4b2/Dtvcm6I8WfM8jw=";
|
||||
hash = "sha256-BMBV01VF0oubtFP6WHBiZqUAkxkhsxggPZ0255pONoA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3jx4sIXETEsgTBcTTbedEv0BXoSejLe4oEaudhQIN6s=";
|
||||
cargoHash = "sha256-FJFdGhoV7Y9sy24DmqLiuwgOryodLjacobeT9jamEfk=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
qt6,
|
||||
udisks2,
|
||||
udisks,
|
||||
xz,
|
||||
}:
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
qt6.qtbase
|
||||
qt6.qtdeclarative
|
||||
qt6.qtsvg
|
||||
udisks2
|
||||
udisks
|
||||
xz
|
||||
];
|
||||
|
||||
|
||||
@@ -3,17 +3,18 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
systemd,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-store-veritysetup-generator";
|
||||
version = "0.1.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikstur";
|
||||
repo = "nix-store-veritysetup-generator";
|
||||
rev = version;
|
||||
hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I=";
|
||||
hash = "sha256-RTGdcLn4zuZAcC1Td4gJcywIerCYyaD0JYz8g5ybmho=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/rust";
|
||||
@@ -34,6 +35,10 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
stripAllList = [ "bin" ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) nix-store-veritysetup;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Systemd unit generator for a verity protected Nix Store";
|
||||
homepage = "https://github.com/nikstur/nix-store-veritysetup-generator";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openhue-cli";
|
||||
version = "0.20";
|
||||
version = "0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openhue";
|
||||
repo = "openhue-cli";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vUmJjuBcOjIhhtWrzq+y0fDlh+wQhgBwxnfuod27CBA=";
|
||||
hash = "sha256-u6ulk+qv1FlZ7PdUiO9UXtRqWWp2MMRAnc8F9vHnRBo=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DhTe0fSWoAwzoGr8rZMsbSE92jJFr4T7aVx/ULMfVFo=";
|
||||
vendorHash = "sha256-3930OjQ26n7J3XDWjCthfQjORP5wpJ3ZZK/m6/wi2X4=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "openlist-frontend";
|
||||
version = "4.1.5";
|
||||
version = "4.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenListTeam";
|
||||
repo = "OpenList-Frontend";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J/6ZebKn7z5oagXF8in4PX9kMbdzBtqiwOgQdznYNzM=";
|
||||
hash = "sha256-XvlnsBq3LtOs7uOl505uXjADukgKOl7JYYtJHmbD1lY=";
|
||||
};
|
||||
|
||||
i18n = fetchzip {
|
||||
url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz";
|
||||
hash = "sha256-rpLHflA5EHxmc2ST0AhDnFOXbI5aE4jdedHOEFZ9+RY=";
|
||||
hash = "sha256-oSWkOouUpWWM7d8TilFKHur5rbC+6AM0OUHxG/LZJRg=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-Ge+uwFGvEtRgYf5zkwYbNfBONXoVxlw4pmu25nY4HTc=";
|
||||
hash = "sha256-1TCgJIBh3KEBTau5EG+oreCrFSZovmQgPpuZ3IcruCc=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openlist";
|
||||
version = "4.1.5";
|
||||
version = "4.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenListTeam";
|
||||
repo = "OpenList";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x4cuymUzfMe49R9PRyD14f6piP4iR8AoYkvEfdRBKcE=";
|
||||
hash = "sha256-6GO8xcTw05OrKpfiRmVD75rbI2OtmXjpf3pWjGg3AdM=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
Subject: Vendor upstream patches (mercurial/sourceforge)
|
||||
Author: Andreas Metzler
|
||||
|
||||
From:
|
||||
- https://sourceforge.net/p/panotools/libpano13/ci/698e20b4d296c1dbde9d010c3fb8d54050e56ddb/
|
||||
- https://sourceforge.net/p/panotools/libpano13/ci/6b0f2a5ef7a0490866fb224158d1dfbb8bf5896f/
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -28,8 +28,7 @@
|
||||
## may need to edit the wxWidgets version number below.
|
||||
##
|
||||
|
||||
-# require at least cmake 3.0
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.12...4.0)
|
||||
if(POLICY CMP0074)
|
||||
cmake_policy(SET CMP0074 NEW)
|
||||
endif()
|
||||
@@ -382,12 +382,12 @@
|
||||
endif()
|
||||
|
||||
# create TAGS file
|
||||
-ADD_CUSTOM_COMMAND( OUTPUT ctags POST_BUILD
|
||||
- COMMAND ctags-exuberant -e *.c *.h tools/*.c
|
||||
+ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_SOURCE_DIR}/TAGS
|
||||
+ COMMAND ctags -e *.c *.h tools/*.c
|
||||
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/
|
||||
COMMENT "Build TAGS file"
|
||||
)
|
||||
-ADD_CUSTOM_TARGET( TAGS DEPENDS ctags)
|
||||
+ADD_CUSTOM_TARGET( TAGS DEPENDS ${PROJECT_SOURCE_DIR}/TAGS)
|
||||
@@ -11,15 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libpano13";
|
||||
version = "2.9.22";
|
||||
version = "2.9.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/panotools/libpano13-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM=";
|
||||
hash = "sha256-58B203oUw5Q0liEV5H3b4YRSyj3lzkDiqu+nz1gV6ig=";
|
||||
};
|
||||
|
||||
patches = [ ./cmake4.patch ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "parallel";
|
||||
version = "20250822";
|
||||
version = "20251022";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-AZ0yhyKGfP/pGMRJNkMIwN8EhFbGkpm5FFGj5vrJFno=";
|
||||
hash = "sha256-R0Mm1ZaI0vwHjPiaewtKEcyWhCKbP6AVj+i8A/G2nuE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -110,11 +110,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "petsc";
|
||||
version = "3.24.0";
|
||||
version = "3.24.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-5jqYTo5sfwLNByOlpry0zpI+q3u7ErwJJ97h7w5bvNQ=";
|
||||
hash = "sha256-E/KPoTeeEfvsqfqjflpDTZFSI534YdtfVVWZ/Xa029I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "phoenixd";
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchurl {
|
||||
url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip";
|
||||
hash = selectSystem {
|
||||
aarch64-darwin = "sha256-6yZmvoVCCW3ulYB8khJ8khtk8o/AiN/0tbwGwpH8ekA=";
|
||||
x86_64-darwin = "sha256-aZy984ttf1NaCo+5LU/03CTPmcpb2N2rfRd3H5Vc0hA=";
|
||||
x86_64-linux = "sha256-2ir2mfjp+2ExdT6drrbrTJcJzauXD7wtE3oTJ+J0WpI=";
|
||||
aarch64-linux = "sha256-zXJ4fihwM2a04Uv2LcctcmN2PiZLtjGQwpxUVP/Sn6Y=";
|
||||
aarch64-darwin = "sha256-8j3fzT2KWlspp4+5vplbvO6nrd1G+Fox6B6+YB+NE1k=";
|
||||
x86_64-darwin = "sha256-f7OwOr0PRkfX6rdddoW4GNvIv16wjAU0G7LiI+oS+xQ=";
|
||||
x86_64-linux = "sha256-2oVnY/BjSC3HxfOMlqWyI/Yue3PT+vNWten4ty2DZVk=";
|
||||
aarch64-linux = "sha256-oRUXFZwGShZzqNiY18gKm1ZNVJ/zfARhr9d7S4hN8XQ=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "WITH_DEVIL" false)
|
||||
(lib.cmakeBool "WITH_FREEIMAGE" false)
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 58a5b45..b41e6a3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,3 +1,5 @@
|
||||
+cmake_minimum_required(VERSION 3.10)
|
||||
+
|
||||
PROJECT(pslib C)
|
||||
option(ENABLE_BMP "Build with BMP support" ON)
|
||||
|
||||
@@ -73,7 +75,6 @@ INCLUDE(CheckFunctionExists)
|
||||
INCLUDE(TestBigEndian)
|
||||
test_big_endian(WORDS_BIGENDIAN)
|
||||
|
||||
-SUBDIRS( src )
|
||||
SET(SOURCES
|
||||
src/pslib.c
|
||||
src/ps_memory.c
|
||||
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-gaWNvBLuUUy0o+HWCOyG6KmzxDrYCY6PV3WbA/jjH64=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./cmake4.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -33,10 +37,6 @@ stdenv.mkDerivation rec {
|
||||
libtiff
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "qrtool";
|
||||
version = "0.12.1";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sorairolake";
|
||||
repo = "qrtool";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-I/LyDHV3pbRj+utzJBLvkgstEOodLkvfQT6uMLnOEgM=";
|
||||
hash = "sha256-ckdtmnUupnKAaspLm/l+nmPNdQ/sFAusQehzWikxq7A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-c1sw0zyJZDvJe3Hcn1W4UPkqTKqRhywHpR6HLrqAN+A=";
|
||||
cargoHash = "sha256-RGEHsMay7+sjmrKz4g6uFXt6fUFiu0xIjr4fQaARKIM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoctor
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rectangle";
|
||||
version = "0.91";
|
||||
version = "0.92";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg";
|
||||
hash = "sha256-MOpg8N2mMNB81dmtgQc7KRax+g4d1Xedh9dkC/zYhLw=";
|
||||
hash = "sha256-0Yv2DroNvk2U17U5vzrhfEcr9xAVpV0ivFVIDviI11s=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sigsum";
|
||||
version = "0.11.2";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.glasklar.is";
|
||||
@@ -16,7 +16,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "core";
|
||||
repo = "sigsum-go";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oaYquy0N8yHfKLoNEv8Vte3dpp/UQFZ74mZHin8dDzw=";
|
||||
hash = "sha256-SFEKbPOAU2cpsc9oLiX3Lhv/AvYNPNiLjjjGteHOtpg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
|
||||
--replace-fail "info.Main.Version" '"${finalAttrs.version}"'
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-8Tyhd13PRTO2dGOdhkgYmwsVzWfqwOpZ9XSsAtiCcyM=";
|
||||
vendorHash = "sha256-2v9NShhmHr0O5FH49tDSPUK1lT2tmhJkrZaVTwrL3cY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
ifuseSupport ? false,
|
||||
ifuse ? null,
|
||||
lsof,
|
||||
udisks2,
|
||||
udisks,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
||||
ffmpegthumbnailer
|
||||
jmtpfs
|
||||
lsof
|
||||
udisks2
|
||||
udisks
|
||||
]
|
||||
++ (lib.optionals ifuseSupport [ ifuse ]);
|
||||
# Introduced because ifuse doesn't build due to CVEs in libplist
|
||||
|
||||
@@ -118,7 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "tmux";
|
||||
maintainers = with lib.maintainers; [
|
||||
thammers
|
||||
fpletz
|
||||
];
|
||||
};
|
||||
|
||||
@@ -65,6 +65,9 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/tpm2-software/tpm2-tools";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
maintainers = with maintainers; [
|
||||
matthiasbeyer
|
||||
scottstephens
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/tpm2-software/tpm2-tools";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ scottstephens ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,14 +22,27 @@
|
||||
|
||||
let
|
||||
pname = "typora";
|
||||
version = "1.11.5";
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.typora.io/linux/typora_${version}_amd64.deb"
|
||||
"https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
|
||||
];
|
||||
hash = "sha256-CpUF8pRLzR3RzFD85Cobbmo3BInaeCee0NWKsmelPGs=";
|
||||
};
|
||||
version = "1.12.2";
|
||||
|
||||
src =
|
||||
fetchurl
|
||||
{
|
||||
x86_64-linux = {
|
||||
urls = [
|
||||
"https://download.typora.io/linux/typora_${version}_amd64.deb"
|
||||
"https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
|
||||
];
|
||||
hash = "sha256-g5GB4hc1cphnOXcVV+YR+YULJOzWAslio3yXjW9MGOk=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
urls = [
|
||||
"https://download.typora.io/linux/typora_${version}_arm64.deb"
|
||||
"https://downloads.typoraio.cn/linux/typora_${version}_arm64.deb"
|
||||
];
|
||||
hash = "sha256-br9kn3P4Pzbef6u581YcX8c0uiB/c1pKqGogLX3sruw=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
|
||||
|
||||
typoraBase = stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
@@ -116,7 +129,7 @@ let
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
inherit pname version src;
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
@@ -132,11 +145,17 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "A minimal Markdown editor and reader.";
|
||||
homepage = "https://typora.io/";
|
||||
changelog = "https://typora.io/releases/all";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ npulidomateo ];
|
||||
maintainers = with lib.maintainers; [
|
||||
npulidomateo
|
||||
chillcicada
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "typora";
|
||||
};
|
||||
|
||||
Executable
+12
@@ -0,0 +1,12 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl common-updater-scripts
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
version=$(curl -s "https://typora.io/#linux" | sed -E -n 's/.*typora_([0-9.]+)_amd64.*/\1/p')
|
||||
|
||||
amd64_hash=$(nix-hash --type sha256 --to-sri $(nix-prefetch-url https://download.typora.io/linux/typora_${version}_amd64.deb))
|
||||
update-source-version typora $version $amd64_hash --system=x86_64-linux --ignore-same-version
|
||||
|
||||
arm64_hash=$(nix-hash --type sha256 --to-sri $(nix-prefetch-url https://download.typora.io/linux/typora_${version}_arm64.deb))
|
||||
update-source-version typora $version $arm64_hash --system=aarch64-linux --ignore-same-version
|
||||
@@ -9,7 +9,7 @@
|
||||
libnotify,
|
||||
librsvg,
|
||||
python3Packages,
|
||||
udisks2,
|
||||
udisks,
|
||||
wrapGAppsHook3,
|
||||
testers,
|
||||
udiskie,
|
||||
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
|
||||
libappindicator-gtk3
|
||||
libnotify
|
||||
librsvg # SVG icons
|
||||
udisks2
|
||||
udisks
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
|
||||
@@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "storaged-project";
|
||||
repo = "udisks";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ=";
|
||||
tag = "udisks-${version}";
|
||||
hash = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -154,15 +154,15 @@ stdenv.mkDerivation rec {
|
||||
tests.vm = nixosTests.udisks2;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Daemon, tools and libraries to access and manipulate disks, storage devices and technologies";
|
||||
homepage = "https://www.freedesktop.org/wiki/Software/udisks/";
|
||||
license = with licenses; [
|
||||
license = with lib.licenses; [
|
||||
lgpl2Plus
|
||||
gpl2Plus
|
||||
]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
|
||||
maintainers = with maintainers; [ johnazoidberg ];
|
||||
teams = [ teams.freedesktop ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ johnazoidberg ];
|
||||
teams = [ lib.teams.freedesktop ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unrar";
|
||||
version = "7.1.10";
|
||||
version = "7.2.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
|
||||
stripRoot = false;
|
||||
hash = "sha256-qUqUJ7NZyF+/skmdYMeE+u6KoHswcJvQSnRQ8rAKXp8=";
|
||||
hash = "sha256-er4F+TUFZ7Iv48PbV5FT371CPQ93Zorc5fCxfqGmij0=";
|
||||
};
|
||||
|
||||
sourceRoot = finalAttrs.src.name;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
pkg-config,
|
||||
dbus,
|
||||
libnotify,
|
||||
udisks2,
|
||||
udisks,
|
||||
gdk-pixbuf,
|
||||
}:
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
dbus
|
||||
libnotify
|
||||
udisks2
|
||||
udisks
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
|
||||
@@ -20,23 +20,23 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vicinae";
|
||||
version = "0.15.5";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vicinaehq";
|
||||
repo = "vicinae";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3pKexTUWfohL/S/yWsVMShmtMlBFI9zsd7NFzySKG0w=";
|
||||
hash = "sha256-PWfgR7wyQINl0Xy/AJAaaUo1WtrkznGcaL1aCACqI7U=";
|
||||
};
|
||||
|
||||
apiDeps = fetchNpmDeps {
|
||||
src = "${finalAttrs.src}/typescript/api";
|
||||
hash = "sha256-dSHEzw15lSRRbldl9PljuWFf2htdG+HgSeKPAB88RBg=";
|
||||
hash = "sha256-VrtxQG1wQGcRHbJWPPt6aS7x1hAHc4Z1+0l+cKv3YdI=";
|
||||
};
|
||||
|
||||
extensionManagerDeps = fetchNpmDeps {
|
||||
src = "${finalAttrs.src}/typescript/extension-manager";
|
||||
hash = "sha256-TCT7uZRZn4rsLA/z2yLeK5Bt4DJPmdSC4zkmuCxTtc8=";
|
||||
hash = "sha256-krDFHTG8irgVk4a79LMz148drLgy2oxEoHCKRpur1R4=";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.mapAttrsToList lib.cmakeFeature {
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
# adds support for handling removable media (vifm-media). Linux only!
|
||||
mediaSupport ? false,
|
||||
python3 ? null,
|
||||
udisks2 ? null,
|
||||
udisks ? null,
|
||||
lib ? null,
|
||||
gitUpdater,
|
||||
}:
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
postFixup =
|
||||
let
|
||||
path = lib.makeBinPath [
|
||||
udisks2
|
||||
udisks
|
||||
(python3.withPackages (p: [ p.dbus-python ]))
|
||||
];
|
||||
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vintagestory";
|
||||
version = "1.21.4";
|
||||
version = "1.21.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
|
||||
hash = "sha256-npffJgxgUMefX9OiveNk1r4kVqsMaVCC1jcWaibz9l8=";
|
||||
hash = "sha256-dG1D2Buqht+bRyxx2ie34Z+U1bdKgi5R3w29BG/a5jg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "yara-x";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = "yara-x";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dl2uxMo81K2ZEAfZk2OP0FXTY4lKGmzqZe0QQo/YIsA=";
|
||||
hash = "sha256-yoQoAtgXBgniNebU9HMxF1m0UHFD6iU095he9tCNNIo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+Bva1uch6fd6gl2MH2ss3S6Ea1QkvgVePhdUVUDuIE8=";
|
||||
cargoHash = "sha256-/HMyNofKpeYaFfRcZ1LAb3vfW/TQy+DsILXRCpJFlCQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoda";
|
||||
version = "2.1.0";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "hepcedar";
|
||||
repo = "yoda";
|
||||
rev = "yoda-${version}";
|
||||
hash = "sha256-cYJNB4Nk6r9EbTbMrhUFvj6s0VR/QH2o9wl/cUw9jQ0=";
|
||||
hash = "sha256-cgThoxqPX6dVyGNTLXatW3uQV+41o38fTfkvHXsDs9A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -24,5 +24,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/";
|
||||
platforms = platforms.all;
|
||||
license = licenses.zlib;
|
||||
# last successful hydra build on darwin was in 2024
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
libexif,
|
||||
pam,
|
||||
xkeyboard_config,
|
||||
udisks2,
|
||||
udisks,
|
||||
waylandSupport ? false,
|
||||
wayland-protocols,
|
||||
xwayland,
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
libexif
|
||||
pam
|
||||
xkeyboard_config
|
||||
udisks2 # for removable storage mounting/unmounting
|
||||
udisks # for removable storage mounting/unmounting
|
||||
]
|
||||
++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
|
||||
++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
mate-menus,
|
||||
mate-panel,
|
||||
mate-settings-daemon,
|
||||
udisks2,
|
||||
udisks,
|
||||
systemd,
|
||||
hicolor-icon-theme,
|
||||
wrapGAppsHook3,
|
||||
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
mate-menus
|
||||
mate-panel # for org.mate.panel schema, see m-c-c#678
|
||||
mate-settings-daemon
|
||||
udisks2
|
||||
udisks
|
||||
systemd
|
||||
];
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
libgtop,
|
||||
libcanberra-gtk3,
|
||||
inkscape,
|
||||
udisks2,
|
||||
udisks,
|
||||
mate-desktop,
|
||||
mate-panel,
|
||||
hicolor-icon-theme,
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
libgtop
|
||||
libcanberra-gtk3
|
||||
libxml2
|
||||
udisks2
|
||||
udisks
|
||||
mate-desktop
|
||||
mate-panel
|
||||
hicolor-icon-theme
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
linuxPackages,
|
||||
live-chart,
|
||||
pciutils,
|
||||
udisks2,
|
||||
udisks,
|
||||
wingpanel,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
linuxPackages.nvidia_x11.settings.libXNVCtrl
|
||||
live-chart
|
||||
pciutils
|
||||
udisks2
|
||||
udisks
|
||||
wingpanel
|
||||
];
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
packagekit,
|
||||
polkit,
|
||||
switchboard,
|
||||
udisks2,
|
||||
udisks,
|
||||
fwupd,
|
||||
appstream,
|
||||
elementary-settings-daemon,
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
packagekit
|
||||
polkit
|
||||
switchboard
|
||||
udisks2
|
||||
udisks
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -22,24 +22,24 @@ let
|
||||
inherit (idris2Packages) idris2Api;
|
||||
lspLib = idris2Packages.buildIdris {
|
||||
ipkgName = "lsp-lib";
|
||||
version = "2024-01-21";
|
||||
version = "2025-08-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "idris-community";
|
||||
repo = "LSP-lib";
|
||||
rev = "03851daae0c0274a02d94663d8f53143a94640da";
|
||||
hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM=";
|
||||
rev = "ca77e80a392b8cfeee3aaeb150069957699cdb82";
|
||||
hash = "sha256-maXHx/OrflIdV7XPfDCRShUGZekLbLOSFQPHnL6DxnI=";
|
||||
};
|
||||
idrisLibraries = [ ];
|
||||
};
|
||||
|
||||
lspPkg = idris2Packages.buildIdris {
|
||||
ipkgName = "idris2-lsp";
|
||||
version = "2024-01-21";
|
||||
version = "2025-09-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "idris-community";
|
||||
repo = "idris2-lsp";
|
||||
rev = "a77ef2d563418925aa274fa29f06880dde43f4ec";
|
||||
hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o=";
|
||||
rev = "81344545c134c8e7105ecf1fdd7a1caae6647035";
|
||||
hash = "sha256-uYmg9Jd98RiO5SpRFox2xNAxY4nocPuK//zxuaIi/DM=";
|
||||
};
|
||||
idrisLibraries = [
|
||||
idris2Api
|
||||
|
||||
@@ -26,7 +26,6 @@ let
|
||||
(case "8.18" "1.3.1-8.18")
|
||||
(case "8.19" "1.3.3-8.19")
|
||||
(case "8.20" "1.3.4-8.20")
|
||||
(case "9.0" "1.3.4-9.0")
|
||||
] null;
|
||||
release = {
|
||||
"1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
|
||||
|
||||
@@ -15,10 +15,11 @@ let
|
||||
case = case: out: { inherit case out; };
|
||||
in
|
||||
lib.switch coq.coq-version [
|
||||
(case "9.0" "1.4-9.0")
|
||||
(case "9.0" "1.4-9.0.1")
|
||||
] null;
|
||||
release = {
|
||||
"1.4-9.0".sha256 = "sha256-5QecDAMkvgfDPZ7/jDfnOgcE+Eb1LTAozP7nz6nkuxg=";
|
||||
"1.4-9.0.1".sha256 = "sha256-zMUd2A6EG0LYK3L9ABQvS/Et4MDpSmf3Pxd9+IPNYkI=";
|
||||
};
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
wrapGAppsHook3,
|
||||
readline,
|
||||
@@ -121,6 +122,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gnudatalanguage/gdl/commit/b648a63c5070f38e90167f858a79ba6f01dad1d3.patch?full_index=1";
|
||||
includes = [ "CMakeLists.txt" ];
|
||||
hash = "sha256-lYtAstI21Up4RArf6pXnjiTwJ3Omoisw43Ih1H2Wc0s=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'FATAL_ERROR "The src' 'WARNING "The src' \
|
||||
|
||||
@@ -171,6 +171,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/tpm2-software/tpm2-tss";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ baloo ];
|
||||
maintainers = with maintainers; [
|
||||
baloo
|
||||
scottstephens
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -5,17 +5,17 @@
|
||||
fpath,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "directories";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
|
||||
minimalOCamlVersion = "4.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OCamlPro";
|
||||
repo = pname;
|
||||
tag = version;
|
||||
hash = "sha256-c/9ChiSODD1K7YsMj65tjErAwXeWvEQ8BkAcUvsr19c=";
|
||||
repo = "directories";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-6qPdHqkZ0xREOTFOe5sGfz2ysDX+9JZDrEmJvenBcqw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -35,8 +35,11 @@ buildDunePackage rec {
|
||||
xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on
|
||||
macOS.
|
||||
'';
|
||||
changelog = "https://raw.githubusercontent.com/OCamlPro/directories/refs/tags/${src.tag}/CHANGES.md";
|
||||
changelog = "https://raw.githubusercontent.com/OCamlPro/directories/${finalAttrs.version}/CHANGES.md";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ bcc32 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
bcc32
|
||||
redianthus
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.4.27";
|
||||
version = "1.4.28";
|
||||
aws = [ fs-s3fs ];
|
||||
grpc = [
|
||||
grpcio
|
||||
@@ -130,7 +130,7 @@ let
|
||||
owner = "bentoml";
|
||||
repo = "BentoML";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-B1slcxNIqT6+xRQkTTCXFjUyFfiBv5En+gYY6lAJJuU=";
|
||||
hash = "sha256-9hxAsTy3e9BDWhJCB5N2RaEFIO0Lc6FK2XKgJC78VUg=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
|
||||
@@ -45,10 +45,12 @@ let
|
||||
(lib.getDev cuda_cccl) # <thrust/*>
|
||||
(lib.getDev libcublas) # cublas_v2.h
|
||||
(lib.getLib libcublas)
|
||||
(lib.getInclude libcublas) # cublasLt.h
|
||||
libcurand
|
||||
libcusolver # cusolverDn.h
|
||||
(lib.getDev libcusparse) # cusparse.h
|
||||
(lib.getLib libcusparse) # cusparse.h
|
||||
(lib.getInclude libcusparse) # cusparse.h
|
||||
(lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
|
||||
];
|
||||
|
||||
|
||||
@@ -34,8 +34,9 @@ buildPythonPackage rec {
|
||||
pythonRelaxDeps = [
|
||||
"argcomplete"
|
||||
"cryptography"
|
||||
"pycryptodome"
|
||||
"dnspython"
|
||||
"ldap3"
|
||||
"pycryptodome"
|
||||
"pyopenssl"
|
||||
];
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "eheimdigital";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitea {
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "autinerd";
|
||||
repo = "eheimdigital";
|
||||
tag = version;
|
||||
hash = "sha256-wFKkfzZ4LLwWhVYigospWYBxTGAJGZWO6Wrj3bvUsc8=";
|
||||
hash = "sha256-skr5KEUQp3fSfTgTHPIxVdT8v9WnPp2NrzA+zhtudlg=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
pythonOlder,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
hatchling,
|
||||
flake8,
|
||||
@@ -10,15 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-deprecated";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "flake8_deprecated";
|
||||
inherit version;
|
||||
hash = "sha256-7pbKAB0coFYfqORvI+LSRgsYqGaWNzyrZE4QKuD/KqI=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gforcada";
|
||||
repo = "flake8-deprecated";
|
||||
tag = version;
|
||||
hash = "sha256-KF0hWhMZEWuSPUyfStayNa5Nfss9NpTvMXPeemWbQXU=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -31,10 +29,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "flake8_deprecated" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/gforcada/flake8-deprecated/blob/${src.tag}/CHANGES.rst";
|
||||
description = "Flake8 plugin that warns about deprecated method calls";
|
||||
homepage = "https://github.com/gforcada/flake8-deprecated";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ lopsided98 ];
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ lopsided98 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "librehardwaremonitor-api";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sab44";
|
||||
repo = "librehardwaremonitor-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yYJOizO6blfwRBWD9oFnaein7DK1F8Kl744ErehXU0Q=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "librehardwaremonitor_api" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python API client for LibreHardwareMonitor";
|
||||
homepage = "https://github.com/Sab44/librehardwaremonitor-api";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -8,23 +8,20 @@
|
||||
nats-server,
|
||||
nkeys,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
uvloop,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nats-py";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nats.py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wILjBhdlNU8U2lyJm4CmPy4DzOjJ7cBIkawKwW5KVgg=";
|
||||
hash = "sha256-HQtoFyw3Gi/lIQFVrFvRtWWzHTY+TchZYKqTiHfUWFk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -71,7 +68,7 @@ buildPythonPackage rec {
|
||||
description = "Python client for NATS.io";
|
||||
homepage = "https://github.com/nats-io/nats.py";
|
||||
changelog = "https://github.com/nats-io/nats.py/releases/tag/${src.tag}";
|
||||
license = with licenses; [ asl20 ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -199,6 +199,8 @@ buildPythonPackage rec {
|
||||
"test_connect_error_multi_hosts_each_message_preserved"
|
||||
# Flaky, fails intermittently
|
||||
"test_break_attempts"
|
||||
# ConnectionResetError: [Errno 104] Connection reset by peer
|
||||
"test_wait_r"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
pyyaml,
|
||||
@@ -9,14 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyngrok";
|
||||
version = "7.4.0";
|
||||
version = "7.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-H3hv7Y0Va5m//XEwlqfsjIEYH5Scj1ySD2gg6S1rmHY=";
|
||||
hash = "sha256-rYY3c4ztW9uIwosIf+o5ylUoYMLTAASsAQM8D460824=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -17,6 +17,13 @@ buildPythonPackage rec {
|
||||
repo = "python-jsonpath";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
preFetch = ''
|
||||
# can't clone using ssh
|
||||
# https://github.com/jg-rp/python-jsonpath/pull/122
|
||||
export GIT_CONFIG_COUNT=1
|
||||
export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf
|
||||
export GIT_CONFIG_VALUE_0=git@github.com:
|
||||
'';
|
||||
hash = "sha256-DiXBIo/I36rrn+RCQda+khfViCnzHwiGzK2X9ACF3io=";
|
||||
};
|
||||
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-open-router";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joostlek";
|
||||
repo = "python-open-router";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EoLBlgXKrAo2DKOuLGvN3MbWIJIG+Ehtznegnq3VX44=";
|
||||
hash = "sha256-SSpSoo82FD1KUwbZpeHpl9I4A50yuJmdTVaHDxLZXso=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -6,23 +6,20 @@
|
||||
fetchFromGitHub,
|
||||
orjson,
|
||||
pycryptodomex,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.16.2";
|
||||
version = "0.16.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
tag = version;
|
||||
hash = "sha256-Vkjt+/dG9m3sf9sQM++I+IgWdsBe338VjqoVr2pD3C0=";
|
||||
hash = "sha256-lfkQtVnaEge6Upvd73fqBtXf5NQIq7vhTP4IOwWjNBw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scooby";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "banesullivan";
|
||||
repo = "scooby";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vOcCs8U8HeBgO86bgS/kqYrNai1IsQ0upQveV06YfoE=";
|
||||
hash = "sha256-krExDVT9evG9ODZjTGpX+S1ygh7lMob06fzOwhh/hzA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user