Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -35,6 +35,7 @@ env:
|
||||
|
||||
jobs:
|
||||
get-merge-commit:
|
||||
if: github.repository_owner == 'NixOS'
|
||||
uses: ./.github/workflows/get-merge-commit.yml
|
||||
|
||||
# Check that code owners is valid
|
||||
@@ -42,12 +43,11 @@ jobs:
|
||||
name: Check
|
||||
runs-on: ubuntu-24.04
|
||||
needs: get-merge-commit
|
||||
if: needs.get-merge-commit.outputs.mergedSha
|
||||
if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha
|
||||
steps:
|
||||
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
|
||||
|
||||
- uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
|
||||
if: github.repository_owner == 'NixOS'
|
||||
with:
|
||||
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
|
||||
name: nixpkgs-ci
|
||||
@@ -88,6 +88,7 @@ jobs:
|
||||
request:
|
||||
name: Request
|
||||
runs-on: ubuntu-24.04
|
||||
if: github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ jobs:
|
||||
echo "systems=$(<result/systems.json)" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Upload the list of all attributes
|
||||
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
|
||||
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
|
||||
with:
|
||||
name: paths
|
||||
path: result/*
|
||||
@@ -122,7 +122,7 @@ jobs:
|
||||
# If it uses too much memory, slightly decrease chunkSize
|
||||
|
||||
- name: Upload the output paths and eval stats
|
||||
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
|
||||
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
|
||||
with:
|
||||
name: intermediate-${{ matrix.system }}
|
||||
path: result/*
|
||||
@@ -159,7 +159,7 @@ jobs:
|
||||
-o prResult
|
||||
|
||||
- name: Upload the combined results
|
||||
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
|
||||
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
|
||||
with:
|
||||
name: result
|
||||
path: prResult/*
|
||||
@@ -223,7 +223,7 @@ jobs:
|
||||
|
||||
- name: Upload the combined results
|
||||
if: steps.targetRunId.outputs.targetRunId
|
||||
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
|
||||
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
|
||||
with:
|
||||
name: comparison
|
||||
path: comparison/*
|
||||
|
||||
@@ -16699,10 +16699,16 @@
|
||||
githubId = 99221043;
|
||||
};
|
||||
numinit = {
|
||||
email = "me@numin.it";
|
||||
email = "me+nixpkgs@numin.it";
|
||||
name = "Morgan Jones";
|
||||
github = "numinit";
|
||||
githubId = 369111;
|
||||
name = "Morgan Jones";
|
||||
keys = [
|
||||
# >=2025
|
||||
{ fingerprint = "FD28 F9C9 81C5 D78E 56E8 8311 5C3E B94D 198F 1491"; }
|
||||
# <=2024
|
||||
{ fingerprint = "190B DA97 F616 DE35 6899 ED17 F819 F1AF 2FC1 C1FF"; }
|
||||
];
|
||||
};
|
||||
numkem = {
|
||||
name = "Sebastien Bariteau";
|
||||
|
||||
@@ -198,6 +198,8 @@
|
||||
|
||||
- `sm64ex-coop` has been removed as it was archived upstream. Consider migrating to `sm64coopdx`.
|
||||
|
||||
- `tldr` now uses [`tldr-python-client`](https://github.com/tldr-pages/tldr-python-client) instead of [`tldr-c-client`](https://github.com/tldr-pages/tldr-c-client) which is unmaintained.
|
||||
|
||||
- `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.
|
||||
Like upstream's docker images, renovate now runs on NodeJS 22.
|
||||
|
||||
|
||||
@@ -9,59 +9,52 @@ let
|
||||
inherit (lib) types;
|
||||
|
||||
imageModules = {
|
||||
amazon = [ ../../maintainers/scripts/ec2/amazon-image.nix ];
|
||||
azure = [ ../virtualisation/azure-image.nix ];
|
||||
digital-ocean = [ ../virtualisation/digital-ocean-image.nix ];
|
||||
google-compute = [ ../virtualisation/google-compute-image.nix ];
|
||||
hyperv = [ ../virtualisation/hyperv-image.nix ];
|
||||
linode = [ ../virtualisation/linode-image.nix ];
|
||||
lxc = [ ../virtualisation/lxc-container.nix ];
|
||||
lxc-metadata = [ ../virtualisation/lxc-image-metadata.nix ];
|
||||
oci = [ ../virtualisation/oci-image.nix ];
|
||||
openstack = [ ../../maintainers/scripts/openstack/openstack-image.nix ];
|
||||
openstack-zfs = [ ../../maintainers/scripts/openstack/openstack-image-zfs.nix ];
|
||||
proxmox = [ ../virtualisation/proxmox-image.nix ];
|
||||
proxmox-lxc = [ ../virtualisation/proxmox-lxc.nix ];
|
||||
qemu-efi = [ ../virtualisation/disk-image.nix ];
|
||||
qemu = [
|
||||
../virtualisation/disk-image.nix
|
||||
{
|
||||
image.efiSupport = false;
|
||||
}
|
||||
];
|
||||
raw-efi = [
|
||||
../virtualisation/disk-image.nix
|
||||
{
|
||||
image.format = "raw";
|
||||
}
|
||||
];
|
||||
raw = [
|
||||
../virtualisation/disk-image.nix
|
||||
{
|
||||
image.format = "raw";
|
||||
image.efiSupport = false;
|
||||
}
|
||||
];
|
||||
kubevirt = [ ../virtualisation/kubevirt.nix ];
|
||||
vagrant-virtualbox = [ ../virtualisation/vagrant-virtualbox-image.nix ];
|
||||
virtualbox = [ ../virtualisation/virtualbox-image.nix ];
|
||||
vmware = [ ../virtualisation/vmware-image.nix ];
|
||||
iso = [ ../installer/cd-dvd/iso-image.nix ];
|
||||
iso-installer = [ ../installer/cd-dvd/installation-cd-base.nix ];
|
||||
sd-card = [
|
||||
(
|
||||
amazon = ../../maintainers/scripts/ec2/amazon-image.nix;
|
||||
azure = ../virtualisation/azure-image.nix;
|
||||
digital-ocean = ../virtualisation/digital-ocean-image.nix;
|
||||
google-compute = ../virtualisation/google-compute-image.nix;
|
||||
hyperv = ../virtualisation/hyperv-image.nix;
|
||||
linode = ../virtualisation/linode-image.nix;
|
||||
lxc = ../virtualisation/lxc-container.nix;
|
||||
lxc-metadata = ../virtualisation/lxc-image-metadata.nix;
|
||||
oci = ../virtualisation/oci-image.nix;
|
||||
openstack = ../../maintainers/scripts/openstack/openstack-image.nix;
|
||||
openstack-zfs = ../../maintainers/scripts/openstack/openstack-image-zfs.nix;
|
||||
proxmox = ../virtualisation/proxmox-image.nix;
|
||||
proxmox-lxc = ../virtualisation/proxmox-lxc.nix;
|
||||
qemu-efi = ../virtualisation/disk-image.nix;
|
||||
qemu = {
|
||||
imports = [ ../virtualisation/disk-image.nix ];
|
||||
image.efiSupport = false;
|
||||
};
|
||||
raw-efi = {
|
||||
imports = [ ../virtualisation/disk-image.nix ];
|
||||
image.format = "raw";
|
||||
};
|
||||
raw = {
|
||||
imports = [ ../virtualisation/disk-image.nix ];
|
||||
image.format = "raw";
|
||||
image.efiSupport = false;
|
||||
};
|
||||
kubevirt = ../virtualisation/kubevirt.nix;
|
||||
vagrant-virtualbox = ../virtualisation/vagrant-virtualbox-image.nix;
|
||||
virtualbox = ../virtualisation/virtualbox-image.nix;
|
||||
vmware = ../virtualisation/vmware-image.nix;
|
||||
iso = ../installer/cd-dvd/iso-image.nix;
|
||||
iso-installer = ../installer/cd-dvd/installation-cd-base.nix;
|
||||
sd-card = {
|
||||
imports =
|
||||
let
|
||||
module = ../. + "/installer/sd-card/sd-image-${pkgs.targetPlatform.linuxArch}.nix";
|
||||
in
|
||||
if builtins.pathExists module then module else throw "The module ${module} does not exist."
|
||||
)
|
||||
];
|
||||
kexec = [ ../installer/netboot/netboot-minimal.nix ];
|
||||
if builtins.pathExists module then [ module ] else throw "The module ${module} does not exist.";
|
||||
};
|
||||
kexec = ../installer/netboot/netboot-minimal.nix;
|
||||
};
|
||||
imageConfigs = lib.mapAttrs (
|
||||
name: modules:
|
||||
name: module:
|
||||
extendModules {
|
||||
inherit modules;
|
||||
modules = [ module ];
|
||||
}
|
||||
) config.image.modules;
|
||||
in
|
||||
@@ -77,7 +70,7 @@ in
|
||||
};
|
||||
};
|
||||
image.modules = lib.mkOption {
|
||||
type = types.attrsOf (types.listOf types.deferredModule);
|
||||
type = types.attrsOf types.deferredModule;
|
||||
description = ''
|
||||
image-specific NixOS Modules used for `system.build.images`.
|
||||
'';
|
||||
|
||||
@@ -708,6 +708,9 @@ in {
|
||||
"zha"
|
||||
"zwave"
|
||||
"zwave_js"
|
||||
|
||||
# Custom components, maintained manually.
|
||||
"amshan"
|
||||
];
|
||||
in {
|
||||
ExecStart = escapeSystemdExecArgs ([
|
||||
|
||||
@@ -273,7 +273,8 @@ in
|
||||
ProtectKernelTunables = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
# "all" is required because faster-whisper accesses /proc/cpuinfo to determine cpu capabilities
|
||||
ProcSubset = "all";
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
|
||||
@@ -32,9 +32,9 @@ in
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "calibre-web";
|
||||
default = "/var/lib/calibre-web";
|
||||
description = ''
|
||||
The directory below {file}`/var/lib` where Calibre-Web stores its data.
|
||||
The directory where Calibre-Web stores its data.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -107,9 +107,14 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.tmpfiles.settings."10-calibre-web".${cfg.dataDir}.d = {
|
||||
inherit (cfg) user group;
|
||||
mode = "0700";
|
||||
};
|
||||
|
||||
systemd.services.calibre-web = let
|
||||
appDb = "/var/lib/${cfg.dataDir}/app.db";
|
||||
gdriveDb = "/var/lib/${cfg.dataDir}/gdrive.db";
|
||||
appDb = "${cfg.dataDir}/app.db";
|
||||
gdriveDb = "${cfg.dataDir}/gdrive.db";
|
||||
calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}";
|
||||
|
||||
settings = concatStringsSep ", " (
|
||||
@@ -134,7 +139,6 @@ in
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
|
||||
StateDirectory = cfg.dataDir;
|
||||
ExecStartPre = pkgs.writeShellScript "calibre-web-pre-start" (
|
||||
''
|
||||
__RUN_MIGRATIONS_AND_EXIT=1 ${calibreWebCmd}
|
||||
|
||||
@@ -35,14 +35,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
version = "28.0";
|
||||
version = "28.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
];
|
||||
# hash retrieved from signed SHA256SUMS
|
||||
sha256 = "700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f";
|
||||
sha256 = "c5ae2dd041c7f9d9b7c722490ba5a9d624f7e9a089c67090615e1ba4ad0883ba";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
boost,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
mkDerivation,
|
||||
muparser,
|
||||
pkg-config,
|
||||
qmake,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qttools,
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "librecad";
|
||||
version = "2.2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreCAD";
|
||||
repo = "LibreCAD";
|
||||
rev = version;
|
||||
sha256 = "sha256-Vj6nvOfmhzou2hhmujm47a7aKBzmgchDb/BbwCb3/hI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
muparser
|
||||
qtbase
|
||||
qtsvg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
qmake
|
||||
qttools
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
"MUPARSER_DIR=${muparser}"
|
||||
"BOOST_DIR=${boost.dev}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/postprocess-unix.sh \
|
||||
--replace /bin/sh ${runtimeShell}
|
||||
|
||||
substituteInPlace librecad/src/main/qc_applicationwindow.cpp \
|
||||
--replace __DATE__ 0
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm555 -t $out/bin unix/{librecad,ttf2lff}
|
||||
install -Dm444 -t $out/share/applications desktop/librecad.desktop
|
||||
install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png
|
||||
install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
|
||||
install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
|
||||
$out/share/icons/hicolor/scalable/apps/librecad.svg
|
||||
|
||||
installManPage desktop/librecad.?
|
||||
|
||||
cp -R unix/resources $out/share/librecad
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "2D CAD package based on Qt";
|
||||
homepage = "https://librecad.org";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abracadabra";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KejPi";
|
||||
repo = "AbracaDABra";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PPG71W5HeLr4R8je88K4VXPiSbJn5T7dP3M05C+bkv0=";
|
||||
hash = "sha256-T2l5wjE62xBb55IzKzInf/K4VPOuZ68vp5VxS0vIn+I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "alt-tab-macos";
|
||||
version = "7.18.0";
|
||||
version = "7.18.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
|
||||
hash = "sha256-9+XK+rDyV2V4RIAfMR2EUcSf6AEpQKAOLDp6RXb5Wb8=";
|
||||
hash = "sha256-PMnA0G/CuofKR7mlWkcbQ+JVdGf91yQf7q8znFCIujY=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -78,13 +78,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ansel";
|
||||
version = "0-unstable-2024-12-19";
|
||||
version = "0-unstable-2025-01-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aurelienpierreeng";
|
||||
repo = "ansel";
|
||||
rev = "854924f0cefd485ede726eb060b765712c0d393c";
|
||||
hash = "sha256-G8+A4c2d6OFfYo7T5sk8JsDw5RrNnH5Bmmo8YkCsbsA=";
|
||||
rev = "c15d92ab7236e61454aaf8e8591777adfa3a73f7";
|
||||
hash = "sha256-FVb4xoHIs+DJG6Lw6Qf755Tjt0Sg9i+Hp979/GgD3IQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
copyDesktopItems,
|
||||
electron_33,
|
||||
fetchFromGitHub,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_33;
|
||||
version = "2024.12.1";
|
||||
in
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "appium-inspector";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "appium";
|
||||
repo = "appium-inspector";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-O2rBODsZuW6M3dM1zL2TVTPxnTPaReD+yOyBLywnxIU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-RhRa0VgEfVv9kW+EY7yhmm6k/waYAVcvom55xUbfhDs=";
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
npm run build:electron
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
-c.electronDist=${electron.dist} \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/share/appium-inspector"
|
||||
cp -r release/*-unpacked/resources "$out/share/appium-inspector/"
|
||||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/appium-inspector" \
|
||||
--add-flags "$out/share/appium-inspector/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set NODE_ENV production
|
||||
|
||||
install -m 444 -D 'app/common/renderer/assets/images/icon.png' \
|
||||
$out/share/icons/hicolor/512x512/apps/appium-inspector.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "appium-inspector";
|
||||
exec = "appium-inspector";
|
||||
desktopName = "Appium Inspector";
|
||||
comment = "A GUI inspector for mobile apps and more, powered by a (separately installed) Appium server";
|
||||
categories = [ "Development" ];
|
||||
icon = "appium-inspector";
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "GUI inspector for the appium UI automation tool";
|
||||
homepage = "https://appium.github.io/appium-inspector";
|
||||
changelog = "https://github.com/appium/appium-inspector/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "appium-inspector";
|
||||
maintainers = with lib.maintainers; [ marie ];
|
||||
inherit (electron.meta) platforms;
|
||||
};
|
||||
}
|
||||
@@ -17,20 +17,20 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bruno";
|
||||
version = "1.37.0";
|
||||
version = "1.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+CLop9fU0fk5n5jNkLbTXZfXyfOXyigukRhTHnML4t0=";
|
||||
hash = "sha256-VZRVmOJkNjZLpIG5oBIbDVJl8EZhOtBMywwJKdfD9Hc=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-K7M4eZQpI79TUI2rf0UP2hEipqaOVjhjMRjIVlcy7c8=";
|
||||
npmDepsHash = "sha256-qgg/dpkBAbOgBeGC0BiKQTyLsOOKwfsJD3fhs/cXYHo=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buf";
|
||||
version = "1.48.0";
|
||||
version = "1.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "buf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F1ZmhVAjm8KVFePXLeOnyvh1TvjXBDCwUizwQSpp6L4=";
|
||||
hash = "sha256-fYCMVR3meuSrTCkM2SfKeh03k4a3n4RHMhWgQ7FsIAU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M5q93hJjEsdMG4N+bjHTTUqBLgy2b7oIRmkizuGxeoE=";
|
||||
vendorHash = "sha256-jfpB1QVc5xjJ9uYDcyVmK6fDqnNLV1goEBYX3oEDQQw=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
||||
@@ -42,7 +42,6 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
git
|
||||
python3
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
@@ -51,7 +50,13 @@ stdenv.mkDerivation {
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
configurePlatforms = [ ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build .
|
||||
substituteInPlace ./config/configure \
|
||||
--replace-fail 'bup_git=' 'bup_git="${lib.getExe git}" #'
|
||||
'';
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
@@ -62,6 +67,7 @@ stdenv.mkDerivation {
|
||||
"LIBDIR=$(out)/lib/bup"
|
||||
];
|
||||
|
||||
env.BUP_PYTHON_CONFIG = lib.getExe' (lib.getDev python3) "python-config";
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=implicit-int";
|
||||
|
||||
postInstall = ''
|
||||
@@ -88,5 +94,7 @@ stdenv.mkDerivation {
|
||||
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
# bespoke ./configure does not like cross
|
||||
broken = stdenv.buildPlatform != stdenv.hostPlatform;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-temp";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yozhgoor";
|
||||
repo = "cargo-temp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nfkFrNVt5DmYiy/V9rztJjDU07lGw7QwXR6NDYW9Jc0=";
|
||||
hash = "sha256-fy4bG+UoN/51hiveYecl3ciJPV1g8/fC2dTFnUJZqAY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-x3DqU1KGKwfazCl305SmLWi/yUhPOkWcL0Z67FPdY8Y=";
|
||||
cargoHash = "sha256-st8BLru9hp1qi784Zm4yVB8AJQfowF36201Yw8uQQ2k=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "chirp";
|
||||
version = "0.4.0-unstable-2024-12-26";
|
||||
version = "0.4.0-unstable-2025-01-12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "43449629fb3c2ae0b71e8b7cb7d49e8e97a00c64";
|
||||
hash = "sha256-zn9pInfJ/QbwgvBqkqzdW7txVGZVU1EPDo4I4ZQDdLY=";
|
||||
rev = "fc94f14823f3257961c4d0e144083fe6f397ad55";
|
||||
hash = "sha256-J1Hhz6M1VhfIttz9lJnPNQsOJbzKBrb6Yz154oh3moo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cntr";
|
||||
version = "1.5.4";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "cntr";
|
||||
rev = version;
|
||||
sha256 = "sha256-ErGratd1RCynE+iS+qn9feJi5o9f94lUNJZfy4XAjkc=";
|
||||
sha256 = "sha256-A622DfygwZ8HVgSxmPINkuCsYFKQBAUdsnXQmB/LS8w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4EDAQ0MG0BTN0L3W4Jm0IdVY8vj5U3faO+ruUjLMBMY=";
|
||||
cargoHash = "sha256-LRX7NuNLyEnw+2kj1MG4JvSL2jzVFxH6tMAx4+cCeow=";
|
||||
|
||||
passthru.tests = nixosTests.cntr;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "codecrafters-cli";
|
||||
version = "35";
|
||||
version = "36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codecrafters-io";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gCSlXI8DggQts7Em1onD4B5CxrfAlPuwovWRUgpsu/E=";
|
||||
hash = "sha256-YgQPDc5BUIoEd44NLpRluxCKooW99qvcSTrFPm6qJKM=";
|
||||
# A shortened git commit hash is part of the version output, and is
|
||||
# needed at build time. Use the `.git` directory to retrieve the
|
||||
# commit SHA, and remove the directory afterwards since it is not needed
|
||||
@@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lRDHe/7kCy8T4paA/6FVfM/sjBpvcGWLeW7b+dOnFo0=";
|
||||
vendorHash = "sha256-5t/bRx3mT66e/efjWbb527ZdKOn3qV3hroqiLwP180g=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-wallpapers";
|
||||
version = "1.0.0-alpha.4";
|
||||
version = "1.0.0-alpha.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbeaver-bin";
|
||||
version = "24.3.0";
|
||||
version = "24.3.2";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
aarch64-darwin = "macos-aarch64.dmg";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-7tmz6ThT6oH2eMRl5XTf1+nr/ufDlp4BvGyKFICiTRw=";
|
||||
aarch64-linux = "sha256-idnTeh37Ew6fg1gdJaoFF+wpgoShcJZokmWsid6g3ow=";
|
||||
x86_64-darwin = "sha256-P1XseM1Al7y1JFVe/8VCIE84nMT4l9KF+Ik+rHjrv20=";
|
||||
aarch64-darwin = "sha256-Xl4D8qTwB0tccuXqon4DApOOM95swxbfwSTD8gqc7jo=";
|
||||
x86_64-linux = "sha256-kbpdAA/ZmH1f+MEfozyjr8HTKLhWEhswAGc7iSpy9rE=";
|
||||
aarch64-linux = "sha256-SiNriPbyiMeHZSHab3JwyedURogPjI9McXwJqjpZXiA=";
|
||||
x86_64-darwin = "sha256-cBJvElGfuCbyFRXzqcuQRa4GA6nXmEDxtse388FuH30=";
|
||||
aarch64-darwin = "sha256-kzJeKY7V8CBcdsoDZDI9eBrr1hEWh3vyHI3wgos/s/M=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
@@ -107,10 +107,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
"libc.so.8"
|
||||
];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://dbeaver.io/";
|
||||
changelog = "https://github.com/dbeaver/dbeaver/releases/tag/${finalAttrs.version}";
|
||||
description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more";
|
||||
longDescription = ''
|
||||
Free multi-platform database tool for developers, SQL programmers, database
|
||||
@@ -118,10 +123,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access,
|
||||
Teradata, Firebird, Derby, etc.
|
||||
'';
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
gepbird
|
||||
mkg20001
|
||||
yzx9
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
themeName = "Dracula";
|
||||
version = "4.0.0-unstable-2024-12-05";
|
||||
version = "4.0.0-unstable-2025-01-10";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dracula-theme";
|
||||
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "gtk";
|
||||
rev = "3478e48925f33af411393adaa4043193f03a4e9a";
|
||||
hash = "sha256-/7/zJXk1LLZKWOpYbrFWBfhFcyddU1y0IwT+RXyyP1M=";
|
||||
rev = "79235b53c33f02d826d76cf991f5aa8f04ed4e76";
|
||||
hash = "sha256-glcDK0zUSYRU3SOrjxDUI170Ky995Js24DPxmL1rSPA=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
|
||||
@@ -17,10 +17,8 @@
|
||||
gd,
|
||||
autoreconfHook,
|
||||
gawk,
|
||||
rebar3WithPlugins,
|
||||
fetchFromGitHub,
|
||||
fetchgit,
|
||||
fetchHex,
|
||||
beamPackages,
|
||||
nixosTests,
|
||||
withMysql ? false,
|
||||
@@ -40,6 +38,8 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (beamPackages) buildRebar3 fetchHex rebar3WithPlugins;
|
||||
|
||||
ctlpath = lib.makeBinPath [
|
||||
bash
|
||||
gnused
|
||||
@@ -50,7 +50,7 @@ let
|
||||
procps
|
||||
];
|
||||
|
||||
provider_asn1 = beamPackages.buildRebar3 {
|
||||
provider_asn1 = buildRebar3 {
|
||||
name = "provider_asn1";
|
||||
version = "0.3.0";
|
||||
src = fetchHex {
|
||||
@@ -60,7 +60,7 @@ let
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
rebar3_hex = beamPackages.buildRebar3 {
|
||||
rebar3_hex = buildRebar3 {
|
||||
name = "rebar3_hex";
|
||||
version = "7.0.7";
|
||||
src = fetchHex {
|
||||
@@ -73,7 +73,7 @@ let
|
||||
|
||||
allBeamDeps = import ./rebar-deps.nix {
|
||||
inherit fetchHex fetchgit fetchFromGitHub;
|
||||
builder = lib.makeOverridable beamPackages.buildRebar3;
|
||||
builder = lib.makeOverridable buildRebar3;
|
||||
|
||||
overrides = final: prev: {
|
||||
jiffy = prev.jiffy.override { buildPlugins = [ beamPackages.pc ]; };
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "factoriolab";
|
||||
version = "3.8.10";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "factoriolab";
|
||||
repo = "factoriolab";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vwcqUsqlggmqqlQ3fyn+s3NKQ0oNcVztfjTpJPW1mFs=";
|
||||
hash = "sha256-ogmez21QwFdRYVsMxeFmNnEerXbH4rQXmOwKuKbpuGs=";
|
||||
};
|
||||
buildInputs = [ vips ];
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -45,13 +45,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.34.0";
|
||||
version = "2.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZTtDYUnLp8IzGluJXLCHBxHCZAXxO+akUkPOCPMdA5w=";
|
||||
hash = "sha256-kCSRS2GD58HS9Qdrv7ju8b7IGznBsP1IIAvvzkWPaLk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh-ost";
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "gh-ost";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dTz4w+OJXe2+ygsYsQ9tanDyaMXvdh8W3d8xpjQMapI=";
|
||||
hash = "sha256-TTc69dWasqMVwwJNo+M9seMKEWgerZ2ZR7dwDfM1gWI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -25,14 +25,26 @@ buildGoModule rec {
|
||||
"-X main.AppVersion=${version}"
|
||||
];
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
# Skip tests that require docker daemon
|
||||
skippedTests = [
|
||||
"TestApplier"
|
||||
"TestEventsStreamer"
|
||||
"TestMigrator"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = gh-ost;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Triggerless online schema migration solution for MySQL";
|
||||
homepage = "https://github.com/github/gh-ost";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
mainProgram = "gh-ost";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (final: {
|
||||
pname = "glaze";
|
||||
version = "4.2.3";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stephenberry";
|
||||
repo = "glaze";
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-exEmEV4j18WGnnEFPaHlfFuLk0dPu18pYp85XBX8Y2w=";
|
||||
hash = "sha256-iFFc2FjcvlQqvjXvFZ+J3RTEIritSM6AZXQlLE5YF9A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -35,6 +36,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "GyFOwEYmipQdFLtTXn7+NvhDTzxBlOAghr3cZT4QpQw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# gcc-14 build failure fix
|
||||
(fetchpatch {
|
||||
name = "gcc-14.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/recipes/-/commit/c0304675f63a33737b24fdf37e06c6b154a91a31.patch";
|
||||
hash = "sha256-YTf4NDwUiU/q96RAXKTO499pW9sPrgh8IvdPBPEnV6Q=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@@ -234,6 +234,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# GCC 14 makes these errors by default
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration -Wno-error=int-conversion";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "gtkradiant";
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, libGL
|
||||
, libGLU
|
||||
, libpng
|
||||
@@ -12,7 +14,6 @@
|
||||
, pcre
|
||||
, SDL2
|
||||
, sqlite
|
||||
, getconf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -26,7 +27,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-rXw56zoFpLMzz8U3RHWGBF0dUFCUTjXShUEhzp2Qc5g=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
# incompatible pointer type error: const char ** -> const void **
|
||||
postPatch = ''
|
||||
substituteInPlace libs/sqlite/sqlite.c \
|
||||
--replace-warn \
|
||||
"sqlite3_prepare16_v2(db->db, sql, -1, &r->r, &tl)" \
|
||||
"sqlite3_prepare16_v2(db->db, sql, -1, &r->r, (const void**)&tl)"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
@@ -42,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
sqlite
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ getconf ];
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
||||
# append default installPhase with library install for haxe
|
||||
postInstall = let
|
||||
@@ -50,11 +57,7 @@ stdenv.mkDerivation rec {
|
||||
in ''
|
||||
mkdir -p "${haxelibPath}"
|
||||
echo -n "${version}" > "${haxelibPath}/../.current"
|
||||
cp -r other/haxelib/* "${haxelibPath}"
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool -change libhl.dylib $out/lib/libhl.dylib $out/bin/hl
|
||||
cp -r ../other/haxelib/* "${haxelibPath}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "havn";
|
||||
version = "0.1.17";
|
||||
version = "0.1.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjackwills";
|
||||
repo = "havn";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-13ilzqFSBrOOPuSu0sqROqAPu6QWAI3dag5paSnq+2A=";
|
||||
hash = "sha256-G6nhWcrnMYysIHSocIeQsBGG51D1ozZPF/LGsDNG/+k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Pl4+zVrhr2AZ4fcE/bhmmgfZaKpTqAktjiUfqLXq1BI=";
|
||||
cargoHash = "sha256-xlaf6S4JeFmSuBOxykTXZlP2dXg4R/5RY7HsJi3/7PU=";
|
||||
|
||||
checkFlags = [
|
||||
# Skip tests that require network access
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iotop-c";
|
||||
version = "1.26";
|
||||
version = "1.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tomas-M";
|
||||
repo = "iotop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m75BHvKMk9ckZ6TgT1QDfHYcEfvfEwWu0bQacnVgSmU=";
|
||||
sha256 = "sha256-o8OJnZjrDbzzhwfzRWmyCmhBWxMVKRDeDWWBCXy3C90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kdlfmt";
|
||||
version = "0.0.8";
|
||||
version = "0.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hougesen";
|
||||
repo = "kdlfmt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Eq/m5PnStfZokktgrsYx7e8uWZDB/JgomsrahuL5GYo=";
|
||||
hash = "sha256-XqcexHeXXVfNoIu0h0Ooxlkm/FaDh/ctkH3cod1mlwY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ay8QO2mHsbfidM9iBHfSdt7JN33T1o87jA/3ZIg1eUw=";
|
||||
cargoHash = "sha256-ZlaILIVG3gLVFGqv1cozDtbHcL+dxUJXq/DvuJ077O8=";
|
||||
|
||||
meta = {
|
||||
description = "Formatter for kdl documents";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kor";
|
||||
version = "0.5.7";
|
||||
version = "0.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yonahd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r494fmkT94rLEAfeXpiYKt8sCmTHT5fktQXaIbUgMoM=";
|
||||
hash = "sha256-cRnhLh1LSI9JXNes8USoGs8crVejh57tXWWI3xzf7o8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OldJ80DYSlihhnjaCGh3Qh0g80pC4EstP+r3UO309Y0=";
|
||||
vendorHash = "sha256-VxSdN4VjVDT2gjQFPY79O/yGX87TFQG6+fe/lckQ7J8=";
|
||||
|
||||
preCheck = ''
|
||||
HOME=$(mktemp -d)
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "controller-tools";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ybm20A8VCbLZdS190O0VnzCKxasRg6zX2S8rEtB+igA=";
|
||||
sha256 = "sha256-6tqUWsI8SJsBOUO9i+czilOJWlflZ8Sj/rdnZaLJeSQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QCl0IOWJzk1ddr8yS94Jh/RuGruK/0BLbFnIxbwV9pE=";
|
||||
vendorHash = "sha256-NX4e//77G+jTL2309x6+UEmFarsNWO/n0Pex2pJ+S/s=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -16,10 +16,10 @@ buildGoModule {
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-M+JbbrHmN+ayLKXostvsVdSueXG7CHJXPRyOjWoabpI=";
|
||||
hash = "sha256-blrg55q+wjzGo3v+tE3fSrKIfQ+O+P1Uus5QaNT4mOE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-phXZUKmadtWmevSXGOxu3NRIdAYCALiD3yepvMTLmT4=";
|
||||
vendorHash = "sha256-nwjw58Ut4Ozx3OZtQ21qLd/Ohg/jcl+JCxc1X+JlNNE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
boost,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
muparser,
|
||||
pkg-config,
|
||||
qt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "librecad";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreCAD";
|
||||
repo = "LibreCAD";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GBn4lduzaKWEWzeTNjC9TpioSouVj+jVl32PLjc8FBc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
muparser
|
||||
qt5.qtbase
|
||||
qt5.qtsvg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
qt5.qmake
|
||||
qt5.qttools
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
"MUPARSER_DIR=${muparser}"
|
||||
"BOOST_DIR=${boost.dev}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace librecad/src/main/qc_applicationwindow.cpp \
|
||||
--replace-warn __DATE__ 0
|
||||
|
||||
substituteInPlace librecad/src/src.pro \
|
||||
--replace-warn '$$[QT_INSTALL_BINS]' '${lib.getDev qt5.qttools}/bin'
|
||||
substituteInPlace librecad/src/muparser.pri \
|
||||
--replace-warn "macx|" ""
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv LibreCAD.app $out/Applications
|
||||
ln -s $out/Applications/LibreCAD.app/Contents/MacOS/LibreCAD $out/bin/librecad
|
||||
# Prevent wrapping, otherwise plugins will not be loaded
|
||||
chmod -x $out/Applications/LibreCAD.app/Contents/Resources/plugins/*.dylib
|
||||
''}
|
||||
|
||||
${lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
install -Dm555 -t $out/bin unix/{librecad,ttf2lff}
|
||||
install -Dm444 -t $out/share/applications desktop/librecad.desktop
|
||||
install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png
|
||||
install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
|
||||
install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
|
||||
$out/share/icons/hicolor/scalable/apps/librecad.svg
|
||||
|
||||
installManPage desktop/librecad.?
|
||||
|
||||
cp -R unix/resources $out/share/librecad
|
||||
''}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "2D CAD package based on Qt";
|
||||
homepage = "https://librecad.org";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "librecad";
|
||||
};
|
||||
})
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lock";
|
||||
version = "1.3.7";
|
||||
version = "1.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "konstantintutsch";
|
||||
repo = "Lock";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UZt8SlkwhtVRLUMf1uYNLchzkWnL+6e7xLYZ81+YQsw=";
|
||||
hash = "sha256-6nZwxNwCxMCx+6lE7roteCIZp5b7MIDosB0/TseBXeg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -19,6 +19,35 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-untwo0go8O8zNO0EyZ4n/n7mngSXLr3Z/FSkXA8ptnU=";
|
||||
};
|
||||
|
||||
# based on the list in m4/m4_ax_ext.m4
|
||||
configureFlags = builtins.map (s: "ax_cv_have_${s}_cpu_ext=no") (
|
||||
[
|
||||
"sha"
|
||||
"xop"
|
||||
]
|
||||
++ lib.optional (!stdenv.hostPlatform.sse3Support) "sse3"
|
||||
++ lib.optional (!stdenv.hostPlatform.ssse3Support) "ssse3"
|
||||
++ lib.optional (!stdenv.hostPlatform.sse4_1Support) "sse41"
|
||||
++ lib.optional (!stdenv.hostPlatform.sse4_2Support) "sse42"
|
||||
++ lib.optional (!stdenv.hostPlatform.sse4_aSupport) "sse4a"
|
||||
++ lib.optional (!stdenv.hostPlatform.aesSupport) "aes"
|
||||
++ lib.optional (!stdenv.hostPlatform.avxSupport) "avx"
|
||||
++ lib.optional (!stdenv.hostPlatform.fmaSupport) "fma3"
|
||||
++ lib.optional (!stdenv.hostPlatform.fma4Support) "fma4"
|
||||
++ lib.optional (!stdenv.hostPlatform.avx2Support) "avx2"
|
||||
++ lib.optionals (!stdenv.hostPlatform.avx512Support) [
|
||||
"avx512f"
|
||||
"avx512cd"
|
||||
"avx512pf"
|
||||
"avx512er"
|
||||
"avx512vl"
|
||||
"avx512bw"
|
||||
"avx512dq"
|
||||
"avx512ifma"
|
||||
"avx512vbmi"
|
||||
]
|
||||
);
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,13 +12,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mimalloc";
|
||||
version = "2.1.7";
|
||||
version = "2.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-slAi8Ht/jwpsFy5zC3CpfTdAkxEMpHJlgmNqMgz+psU=";
|
||||
sha256 = "sha256-C0cqYiXxx8tW3plUZrfAJYKeY36opGKymkZ/CWrVuEI=";
|
||||
};
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isStatic;
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "moe";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/moe/moe-${finalAttrs.version}.tar.lz";
|
||||
hash = "sha256-9Lq9bOCuGVFvmDRU+yDTLf9xrTFjN6xr+TpCpf8gnJ0=";
|
||||
hash = "sha256-QfjIsJnOMEeUXKTgl6YNkkPpxz+7JowZShLaiw2fCmY=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./dont_register_file_types.patch ];
|
||||
|
||||
# fix build with GCC 14
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int -Wno-return-mismatch";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \
|
||||
--replace '-I/usr/X11R6/include' "" \
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
libnitrokey,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "0.4.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "nitrocli";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "d-e-s-o";
|
||||
repo = "nitrocli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-j1gvh/CmRhPTeesMIK5FtaqUW7c8hN3ub+kQ2NM3dNM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-loCVYe4vdalo2AvoMo9th/V9xXulaq6HlPOw3idbqEw=";
|
||||
|
||||
# tests require a connected Nitrokey device
|
||||
doCheck = false;
|
||||
|
||||
# link against packaged libnitrokey
|
||||
USE_SYSTEM_LIBNITROKEY = 1;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = [ libnitrokey ];
|
||||
|
||||
postInstall =
|
||||
(lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd nitrocli \
|
||||
--bash <($out/bin/shell-complete bash nitrocli) \
|
||||
--fish <($out/bin/shell-complete fish nitrocli) \
|
||||
--zsh <($out/bin/shell-complete zsh nitrocli)
|
||||
'')
|
||||
+ ''
|
||||
installManPage doc/nitrocli.1
|
||||
rm $out/bin/shell-complete
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command line tool for interacting with Nitrokey devices";
|
||||
homepage = "https://github.com/d-e-s-o/nitrocli";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "nitrocli";
|
||||
maintainers = with lib.maintainers; [ robinkrahl ];
|
||||
};
|
||||
}
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notcurses";
|
||||
version = "3.0.11";
|
||||
version = "3.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dankamongmen";
|
||||
repo = "notcurses";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3ddiHzPZ74GN2Hu+6Oe1DaNFn6S9gegGwXSX8fbtPp8=";
|
||||
sha256 = "sha256-x7utMjXel5ax3mN7/QmSwFXCUVrkAx4exRHDTNIEETM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "noto-fonts${suffix}";
|
||||
version = "2024.12.01";
|
||||
version = "2025.01.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notofonts";
|
||||
repo = "notofonts.github.io";
|
||||
rev = "noto-monthly-release-${version}";
|
||||
hash = "sha256-CmYGnQOSABTMir120VWtROiLcEBVj117ZpgwPijoWnI=";
|
||||
hash = "sha256-25517Bkx/kcMETJvGJvcHSJ3e/N7U8LWqp62dADm9G4=";
|
||||
};
|
||||
|
||||
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oauth2c";
|
||||
version = "1.17.0";
|
||||
version = "1.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudentity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2EfkNtTbHSa0UZGfYylz0HlyVxGdSJNIUj6682DICSg=";
|
||||
hash = "sha256-rrQSQDrdaU3HBTZL0vwHYK07XzcYwUZQp9aG6lwuDsc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZQFIETfiNKyeZuskwNfoTXBy3MSWmG0tDztz0Mm7xJY=";
|
||||
|
||||
@@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in}
|
||||
'';
|
||||
|
||||
# https://github.com/POV-Ray/povray/issues/460
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-fno-finite-math-only"
|
||||
"-DBOOST_BIND_GLOBAL_PLACEHOLDERS"
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"COMPILED_BY=NixOS"
|
||||
"--with-boost-thread=boost_thread"
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pv";
|
||||
version = "1.9.25";
|
||||
version = "1.9.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-FiSVqrscuEIYbLIkmV49X2Cp9SeknMvYISODzHK3w2w=";
|
||||
hash = "sha256-JTZZ3IZWk2PwZfXogeE1oMlZS5h/NKGbEEx0FKLSxHk=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2024-12-28";
|
||||
version = "0-unstable-2025-01-13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "f655a1380364fdab9fa0f72909c19ab8ff16dbb6";
|
||||
hash = "sha256-mErr95/Ew9HwKDJhQy7V86H1MJb5Y7IFzg7Id8Llqy8=";
|
||||
rev = "d9b880c36988c0500f67d2206c4b2fdf42fd6e65";
|
||||
hash = "sha256-Apu5WEwlUhO8/j84jH/CzWae17H5U1cwV7h9J8Nx5J0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Generated
+12
-18
@@ -329,12 +329,6 @@
|
||||
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Targets",
|
||||
"version": "1.1.3",
|
||||
"hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETFramework.ReferenceAssemblies",
|
||||
"version": "1.0.3",
|
||||
@@ -409,9 +403,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.VisualStudio.Telemetry",
|
||||
"version": "17.12.32",
|
||||
"hash": "sha256-HkAQyMovZEABmgcaaSo/DOyRbx+pyVOZGxEm7GEKd2E=",
|
||||
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.12.32/microsoft.visualstudio.telemetry.17.12.32.nupkg"
|
||||
"version": "17.13.28",
|
||||
"hash": "sha256-DAmV0dT0Bw+BITSQbL/26055k2tAXtIfhnBmv1DwrA8=",
|
||||
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.13.28/microsoft.visualstudio.telemetry.17.13.28.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.VisualStudio.Threading",
|
||||
@@ -427,9 +421,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.VisualStudio.Utilities.Internal",
|
||||
"version": "16.3.73",
|
||||
"hash": "sha256-zwk4jWuCw2ANhG00TnwT9JE7n/h2EQkYKeq6o966ilo=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.73/microsoft.visualstudio.utilities.internal.16.3.73.nupkg"
|
||||
"version": "16.3.90",
|
||||
"hash": "sha256-3OkOduGmMmenv73Yidzz6dvbRISyjo+hGRYhWOFmV4s=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.90/microsoft.visualstudio.utilities.internal.16.3.90.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.VisualStudio.Validation",
|
||||
@@ -991,9 +985,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Private.Uri",
|
||||
"version": "4.3.2",
|
||||
"hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.2/system.private.uri.4.3.2.nupkg"
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection",
|
||||
@@ -1159,9 +1153,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "8.0.4",
|
||||
"hash": "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.4/system.text.json.8.0.4.nupkg"
|
||||
"version": "8.0.5",
|
||||
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading",
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props
|
||||
index 2dddaff1560..bc8fd1938d5 100644
|
||||
--- a/eng/targets/TargetFrameworks.props
|
||||
+++ b/eng/targets/TargetFrameworks.props
|
||||
@@ -17,7 +17,7 @@
|
||||
<NetVS>net8.0</NetVS>
|
||||
<NetVSCode>net8.0</NetVSCode>
|
||||
<NetVSShared>net8.0</NetVSShared>
|
||||
- <NetRoslynBuildHostNetCoreVersion>net6.0</NetRoslynBuildHostNetCoreVersion>
|
||||
+ <NetRoslynBuildHostNetCoreVersion>net8.0</NetRoslynBuildHostNetCoreVersion>
|
||||
<NetRoslynNext>net9.0</NetRoslynNext>
|
||||
</PropertyGroup>
|
||||
|
||||
diff --git a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
|
||||
index 8101f56b8be..1733955dc3d 100644
|
||||
--- a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
|
||||
+++ b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
|
||||
@@ -28,6 +28,12 @@
|
||||
-->
|
||||
<_MsbuildVersion>17.3.4</_MsbuildVersion>
|
||||
</PropertyGroup>
|
||||
+ <PropertyGroup>
|
||||
+ <_MsbuildFramework>$(TargetFramework)</_MsbuildFramework>
|
||||
+ </PropertyGroup>
|
||||
+ <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
||||
+ <_MsbuildFramework>net6.0</_MsbuildFramework>
|
||||
+ </PropertyGroup>
|
||||
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||
<PackageReference Include="Microsoft.Build" VersionOverride="$(_MsbuildVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
|
||||
<PackageReference Include="Microsoft.Build.Framework" VersionOverride="$(_MsbuildVersion)" ExcludeAssets="Runtime" />
|
||||
@@ -36,10 +42,10 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
|
||||
<!-- Reference MSBuild directly to avoid redistributing its package closure and including the dependencies in deps.json file. -->
|
||||
- <PackageDownloadAndReference Include="Microsoft.Build" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
|
||||
- <PackageDownloadAndReference Include="Microsoft.Build.Framework" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
|
||||
- <PackageDownloadAndReference Include="Microsoft.Build.Tasks.Core" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
|
||||
- <PackageDownloadAndReference Include="Microsoft.Build.Utilities.Core" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
|
||||
+ <PackageDownloadAndReference Include="Microsoft.Build" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
|
||||
+ <PackageDownloadAndReference Include="Microsoft.Build.Framework" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
|
||||
+ <PackageDownloadAndReference Include="Microsoft.Build.Tasks.Core" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
|
||||
+ <PackageDownloadAndReference Include="Microsoft.Build.Utilities.Core" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Build.Locator" PrivateAssets="All" />
|
||||
@@ -18,9 +18,6 @@ let
|
||||
(combinePackages [
|
||||
sdk_9_0
|
||||
sdk_8_0
|
||||
# NOTE: we should be able to remove net6.0 after upstream removes from here:
|
||||
# https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20
|
||||
sdk_6_0
|
||||
])
|
||||
packages
|
||||
targetPackages
|
||||
@@ -35,24 +32,28 @@ in
|
||||
buildDotnetModule rec {
|
||||
inherit pname dotnet-sdk dotnet-runtime;
|
||||
|
||||
vsVersion = "2.59.14";
|
||||
vsVersion = "2.61.27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotnet";
|
||||
repo = "roslyn";
|
||||
rev = "VSCode-CSharp-${vsVersion}";
|
||||
hash = "sha256-tzBIqXBtPGupBBvHTFO93w6f5qCgllWY420xtjf9o3g=";
|
||||
hash = "sha256-mqlCfgymhH/pR/GW3qZd0rmLdNezgVGZS6Q6zaNor8E=";
|
||||
};
|
||||
|
||||
# versioned independently from vscode-csharp
|
||||
# "roslyn" in here:
|
||||
# https://github.com/dotnet/vscode-csharp/blob/main/package.json
|
||||
version = "4.13.0-3.24577.4";
|
||||
version = "4.13.0-3.25051.1";
|
||||
projectFile = "src/LanguageServer/${project}/${project}.csproj";
|
||||
useDotnetFromEnv = true;
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
nativeBuildInputs = [ jq ];
|
||||
|
||||
# until upstream updates net6.0 here:
|
||||
# https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20
|
||||
patches = [ ./force-sdk_8_0.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version.
|
||||
jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rpl";
|
||||
version = "1.15.7";
|
||||
version = "1.16";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Xq3GLa1TnS4nobPHHCkFUEo9vgI4DGyY2/hQWtkwNRA=";
|
||||
hash = "sha256-uBpzKYfdGu2j1ZEaw4TN1fH+W9VLrJf7a87vzZBBU3Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
[
|
||||
# network access
|
||||
"test_connecting_to_remote_server"
|
||||
"test_does_not_crash_with_slash_in_request"
|
||||
"test_query_codebase"
|
||||
"test_status_endpoint_with_all_files_analyzed"
|
||||
"test_status_endpoint_with_some_files_not_analyzed"
|
||||
"test_status_2"
|
||||
"test_stop"
|
||||
"test_status_with_json_when_server_running"
|
||||
"test_server_status_not_running_if_process_does_not_exist"
|
||||
"test_query_codebase_no_results"
|
||||
"test_servers_info_includes_version_and_server_details"
|
||||
"test_query_files_endpoint"
|
||||
"test_snapshot_results_with_real_repo"
|
||||
"test_ignores_certain_branches"
|
||||
"test_analysis_results_are_persisted_between_runs"
|
||||
"test_damaged_cache_doesnt_crash_app_1"
|
||||
"test_damaged_cache_doesnt_crash_app_2"
|
||||
"test_only_returns_supported_file_types"
|
||||
"test_file_score_is_recalculated_when_needed"
|
||||
"test_does_not_crash_because_of_non_existent_files"
|
||||
"test_ignored_files_is_really_ignored"
|
||||
"test_allows_limiting_how_many_files_are_automatically_analized"
|
||||
"test_allows_limiting_how_many_files_are_automatically_analized"
|
||||
"test_allows_limiting_how_many_files_are_automatically_analized"
|
||||
"test_includes_all_matching_lines_from_line"
|
||||
"test_search_is_case_insensitive"
|
||||
"test_respects_file_extension_restrictions"
|
||||
"test_includes_context_lines_properly"
|
||||
"test_includes_context_lines_properly"
|
||||
"test_includes_context_lines_properly"
|
||||
"test_includes_context_lines_properly"
|
||||
"test_ripgrep_respects_custom_ignore_patterns"
|
||||
"test_filters_stop_words"
|
||||
"test_does_not_filter_stop_words_if_that_is_all_whats_in_the_query"
|
||||
"test_integration_test_without_color"
|
||||
"test_integration_test_vimgrep_mode"
|
||||
"test_integration_test_no_results"
|
||||
"test_server_is_not_running_error"
|
||||
"test_server_is_not_running_error"
|
||||
"test_reverse_ordering"
|
||||
"test_reverse_ordering"
|
||||
"test_file_returns_global_metadata_1"
|
||||
"test_file_returns_global_metadata_2"
|
||||
"test_important_files_are_analyzed_first"
|
||||
"test_simple_regexp"
|
||||
"test_regexp_combined_with_chroma"
|
||||
"test_returns_file_list_1"
|
||||
"test_returns_file_list_2"
|
||||
"test_file_change_many_times_is_first_result"
|
||||
"test_newer_change_can_beat_frequent_change_in_past"
|
||||
"test_commit_messages_with_three_or_more_colons"
|
||||
]
|
||||
@@ -0,0 +1,74 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
ripgrep,
|
||||
gitMinimal,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "seagoat";
|
||||
version = "0.50.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kantord";
|
||||
repo = "SeaGOAT";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tf3elcKXUwBqtSStDksOaSN3Q66d72urrG/Vab2M4f0=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
appdirs
|
||||
blessed
|
||||
chardet
|
||||
flask
|
||||
deepmerge
|
||||
chromadb
|
||||
gitpython
|
||||
jsonschema
|
||||
pygments
|
||||
requests
|
||||
nest-asyncio
|
||||
waitress
|
||||
psutil
|
||||
stop-words
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
freezegun
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytest-snapshot
|
||||
gitMinimal
|
||||
ripgrep
|
||||
];
|
||||
|
||||
disabledTests = import ./failing_tests.nix;
|
||||
|
||||
# require network access
|
||||
disabledTestPaths = [
|
||||
"tests/test_chroma.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
git init
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/seagoat-server \
|
||||
--prefix PATH : "${ripgrep}/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Local-first semantic code search engine";
|
||||
homepage = "https://kantord.github.io/SeaGOAT/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lavafroth ];
|
||||
mainProgram = "seagoat";
|
||||
};
|
||||
}
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ser2net";
|
||||
version = "4.6.2";
|
||||
version = "4.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cminyard";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cREtVvUZggVZpd3HFqrfikCInIyrRXSk4HKYhEWkXXc=";
|
||||
hash = "sha256-rxFCACCfnPV5Lbd3k/zk9JbFAXJJTNGQzpOpD2M9zhg=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "serie";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lusingander";
|
||||
repo = "serie";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F7AlDuvRYCMhOXyzg9/oTukAEaDJENG0ZEhIlNe+Cic=";
|
||||
hash = "sha256-F+pKnvsBh3bVnFBe4HSPiUIUKivMCeVPuLX3MqxxjPQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Ug4dB3Xx0bm4brztpBbf55QdWc+7nyShMYP8kPC/82k=";
|
||||
cargoHash = "sha256-TXDZsT+p8s6jd3D7EakaDHkzKiM/ad1LPnJtIy1QcPo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shiori";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
|
||||
vendorHash = "sha256-RTnaDAl79LScbeKKAGJOI/YOiHEwwlxS2CmNhw80KL0=";
|
||||
|
||||
@@ -19,7 +19,7 @@ buildGoModule rec {
|
||||
owner = "go-shiori";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e60eeP0vgQ2/ZE/kO3LcG50EITeF1eN7m1/Md23/HwU=";
|
||||
sha256 = "sha256-T4EFwvejLgNkcykPjSHU8WXJwqSqYPFaAD+9JX+uiJU=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -17,30 +17,25 @@
|
||||
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "sonarlint-ls";
|
||||
version = "3.5.1.75119";
|
||||
version = "3.14.1.75775";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SonarSource";
|
||||
repo = "sonarlint-language-server";
|
||||
rev = version;
|
||||
hash = "sha256-6tbuX0wUpqbTyM44e7PqZHL0/XjN8hTFCgfzV+qc1m0=";
|
||||
hash = "sha256-QXBSdXpkhqcvfjihcWwy4oCjTMmbAJRZG1T66sa8T4U=";
|
||||
};
|
||||
|
||||
# Replaces unavailable versions with available ones in maven central. Can be
|
||||
# removed again if
|
||||
# https://github.com/SonarSource/sonarlint-language-server/pull/427 is
|
||||
# merged.
|
||||
patches = [ ./sonar-analyzers-versions.patch ];
|
||||
|
||||
mvnJdk = jdk17;
|
||||
manualMvnArtifacts = [
|
||||
"org.apache.maven.surefire:surefire-junit-platform:3.1.2"
|
||||
"org.junit.platform:junit-platform-launcher:1.8.2"
|
||||
];
|
||||
mvnHash = "sha256-SKkOf3f9Ze3Rm6i2uYbFkvSnnEySARvaoiAS1e2kFi0=";
|
||||
|
||||
mvnHash = "sha256-ZhAQtpi0wQP8+QPeYaor2MveY+DZ9RPENb3kITnuWd8=";
|
||||
|
||||
buildOffline = true;
|
||||
|
||||
# disable node and npm module installation because the need network access
|
||||
# for the tests.
|
||||
mvnDepsParameters = "-Dskip.installnodenpm=true -Dskip.npm package";
|
||||
|
||||
# disable failing tests which either need network access or are flaky
|
||||
# Disables failing tests which either need network access or are flaky.
|
||||
mvnParameters = lib.escapeShellArgs [
|
||||
"-Dskip.installnodenpm=true"
|
||||
"-Dskip.npm"
|
||||
@@ -48,20 +43,16 @@ maven.buildMavenPackage rec {
|
||||
!LanguageServerWithFoldersMediumTests,
|
||||
!NotebookMediumTests,
|
||||
!ConnectedModeMediumTests,
|
||||
!JavaMediumTests"
|
||||
!JavaMediumTests,
|
||||
!OpenNotebooksCacheTests"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share/plugins}
|
||||
install -Dm644 target/sonarlint-language-server-*.jar \
|
||||
$out/share/sonarlint-ls.jar
|
||||
install -Dm644 target/plugins/* \
|
||||
$out/share/plugins
|
||||
|
||||
install -Dm644 target/sonarlint-language-server-*.jar $out/share/sonarlint-ls.jar
|
||||
install -Dm644 target/plugins/* $out/share/plugins
|
||||
|
||||
makeWrapper ${jre_headless}/bin/java $out/bin/sonarlint-ls \
|
||||
--add-flags "-jar $out/share/sonarlint-ls.jar" \
|
||||
@@ -95,17 +86,23 @@ maven.buildMavenPackage rec {
|
||||
gnused
|
||||
];
|
||||
text = ''
|
||||
LATEST_TAG=$(curl https://api.github.com/repos/${src.owner}/${src.repo}/tags | \
|
||||
if [ -z "''${GITHUB_TOKEN:-}" ]; then
|
||||
echo "no GITHUB_TOKEN provided - you could meet API request limiting" >&2
|
||||
fi
|
||||
|
||||
LATEST_TAG=$(curl -H "Accept: application/vnd.github+json" \
|
||||
''${GITHUB_TOKEN:+-H "Authorization: bearer $GITHUB_TOKEN"} \
|
||||
-Lsf https://api.github.com/repos/${src.owner}/${src.repo}/tags | \
|
||||
jq -r '[.[] | select(.name | test("^[0-9]"))] | sort_by(.name | split(".") |
|
||||
map(tonumber)) | reverse | .[0].name')
|
||||
update-source-version sonarlint-ls "$LATEST_TAG"
|
||||
update-source-version ${pname} "$LATEST_TAG"
|
||||
sed -i '0,/mvnHash *= *"[^"]*"/{s/mvnHash = "[^"]*"/mvnHash = ""/}' ${pkgFile}
|
||||
|
||||
echo -e "\nFetching all mvn dependencies to calculate the mvnHash. This may take a while ..."
|
||||
nix-build -A sonarlint-ls.fetchedMavenDeps 2> sonarlint-ls-stderr.log || true
|
||||
nix-build -A ${pname}.fetchedMavenDeps 2> ${pname}-stderr.log || true
|
||||
|
||||
NEW_MVN_HASH=$(grep "got:" sonarlint-ls-stderr.log | awk '{print ''$2}')
|
||||
rm sonarlint-ls-stderr.log
|
||||
NEW_MVN_HASH=$(grep "got:" ${pname}-stderr.log | awk '{print ''$2}')
|
||||
rm ${pname}-stderr.log
|
||||
# escaping double quotes looks ugly but is needed for variable substitution
|
||||
# use # instead of / as separator because the sha256 might contain the / character
|
||||
sed -i "0,/mvnHash *= *\"[^\"]*\"/{s#mvnHash = \"[^\"]*\"#mvnHash = \"$NEW_MVN_HASH\"#}" ${pkgFile}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index c020fd1..fd4146b 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -34,10 +34,10 @@
|
||||
<sonar.python.version>4.17.0.14845</sonar.python.version>
|
||||
<sonar.html.version>3.16.0.5274</sonar.html.version>
|
||||
<sonar.xml.version>2.10.0.4108</sonar.xml.version>
|
||||
- <sonar.text.version>2.18.0.4812</sonar.text.version>
|
||||
+ <sonar.text.version>2.18.0.4866</sonar.text.version>
|
||||
<sonar.go.version>1.15.0.4655</sonar.go.version>
|
||||
<sonar.iac.version>1.27.0.9518</sonar.iac.version>
|
||||
- <sonar.csharp.version>10.2.0.103721</sonar.csharp.version>
|
||||
+ <sonar.csharp.version>10.2.0.105762</sonar.csharp.version>
|
||||
<sonarlint.omnisharp.version>1.25.0.100242</sonarlint.omnisharp.version>
|
||||
<gitRepositoryName>sonarlint-language-server</gitRepositoryName>
|
||||
<!-- Release: enable publication to Bintray -->
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
pkgs,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
lib,
|
||||
stdenv,
|
||||
gtk3,
|
||||
@@ -35,6 +36,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# restrict GDK backends to only X11
|
||||
./x11-only.patch
|
||||
|
||||
# gcc-14 build fix from:
|
||||
# https://github.com/IgnorantGuru/spacefm/pull/816
|
||||
(fetchpatch {
|
||||
name = "gcc-14.patch";
|
||||
url = "https://github.com/IgnorantGuru/spacefm/commit/98efb1f43e6339b3ceddb9f65ee85e26790fefdf.patch";
|
||||
hash = "sha256-dau1AMnSBsp8iDrjoo0WTnFQ13vNZW2kM4qz0B/beDI=";
|
||||
})
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "task-keeper";
|
||||
version = "0.28.0";
|
||||
version = "0.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-china";
|
||||
repo = "task-keeper";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ufKHKQULN1zaEmnLx4voL/rL8bBe0aZEfclb+5/ybps=";
|
||||
hash = "sha256-PT8NN6rHY9Ph15KikoAYAfJ++u6t6Mp8SPm24ZBdPDk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
cargoHash = "sha256-g2CxCpSBAKUn+ENduuh+u5l3KD7rchY0qLAuPz8ATww=";
|
||||
cargoHash = "sha256-fFN7nkkOlOreFVg2phvX2uj3crnohJrLgpgDUJucz5Y=";
|
||||
|
||||
# tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅
|
||||
doCheck = false;
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
stdenv.mkDerivation (
|
||||
finalAttrs:
|
||||
let
|
||||
version = "4.17.0";
|
||||
buildNum = "3543";
|
||||
version = "4.18.0";
|
||||
buildNum = "3768";
|
||||
in
|
||||
{
|
||||
pname = "tlclient";
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.cendio.com/downloads/clients/tl-${finalAttrs.version}-client-linux-dynamic-x86_64.tar.gz";
|
||||
hash = "sha256-7pl97xGNFwSDpWMpBvkz/bfMsWquVsJVGB+feWJvRQY=";
|
||||
hash = "sha256-fTezGhn0UESEQRPrHYVZNcplV48wb5X/xqplIfLRLAA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,60 +1,68 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
libzip,
|
||||
pkg-config,
|
||||
installShellFiles,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tldr";
|
||||
version = "1.6.1";
|
||||
version = "3.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tldr-pages";
|
||||
repo = "tldr-c-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1L9frURnzfq0XvPBs8D+hBikybAw8qkb0DyZZtkZleY=";
|
||||
repo = "tldr-python-client";
|
||||
tag = version;
|
||||
hash = "sha256-lc0Jen8vW4BNg784td1AZa2GTYvXC1d83FnAe5RZqpY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
libzip
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"LD=${stdenv.cc.targetPrefix}cc"
|
||||
"CFLAGS="
|
||||
dependencies = with python3Packages; [
|
||||
termcolor
|
||||
colorama
|
||||
shtab
|
||||
];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd tldr autocomplete/complete.{bash,fish,zsh}
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
pytest -k 'not test_error_message'
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
doCheck = true;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd tldr \
|
||||
--bash <($out/bin/tldr --print-completion bash) \
|
||||
--zsh <($out/bin/tldr --print-completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simplified and community-driven man pages";
|
||||
longDescription = ''
|
||||
tldr pages gives common use cases for commands, so you don't need to hunt
|
||||
through a man page for the correct flags.
|
||||
'';
|
||||
homepage = "https://tldr.sh";
|
||||
changelog = "https://github.com/tldr-pages/tldr-c-client/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
changelog = "https://github.com/tldr-pages/tldr-python-client/blob/${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
taeer
|
||||
carlosdagos
|
||||
kbdharun
|
||||
];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "tldr";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "259.241223.0";
|
||||
version = "259.241223.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
|
||||
hash = "sha256-PfgdYKy3JfId04hu8qrNhmdpwOmyfsfz7Bk7KpLTdzk=";
|
||||
hash = "sha256-VeAXOCdvy9liCJBNMdPc6iIeuOutqQ9sShc4XytApH4=";
|
||||
};
|
||||
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
@@ -17,17 +17,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uv";
|
||||
version = "0.5.17";
|
||||
version = "0.5.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = version;
|
||||
hash = "sha256-LK+S1L5XaflfkmKQcYHPDrXO+XjNJNX4mBg1ST74PzY=";
|
||||
hash = "sha256-n/Vh79CZ6mq5JB8Z+wZo+s6t87Bt9ISPj4svMOrMJf0=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-3wPR9OOgmZ99BXaHBzPPPPt5dHPXRDiNY0S6nhC2nx4=";
|
||||
cargoHash = "sha256-+hv1LPbw1GAMcHIb7lxt8QNyQFtuuhPFJAa3iOJq3PQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "1.0-unstable-2024-12-25";
|
||||
version = "1.0-unstable-2025-01-04";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "c93972cae22be2300d1cade49142546cf162da50";
|
||||
hash = "sha256-SXzuNfiCQaQxC2AOwm2+SYMb4Z3vQE+g1yolRoPaCQc=";
|
||||
rev = "b2d09ce518742de16add4d5f5b96f320e274e5a2";
|
||||
hash = "sha256-BNI2226vWo/XcIRrTWdoHmkckQ0U9yWawqlPamTu0PI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "v2ray-core";
|
||||
version = "5.23.0";
|
||||
version = "5.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "v2ray-core";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V7/dhTJWd9Qf+80xYpfPJtm4VdH9vVQoL84RKAcyoVo=";
|
||||
hash = "sha256-3xbXqfac1Kv77uBxykoX1nDB5NqTJDYmmzRloZUL/dA=";
|
||||
};
|
||||
|
||||
# `nix-update` doesn't support `vendorHash` yet.
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "vault-tasks";
|
||||
@@ -14,9 +14,9 @@ rustPlatform.buildRustPackage {
|
||||
owner = "louis-thevenet";
|
||||
repo = "vault-tasks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-liU2zxBEOH5KMftru2PaIYZHLskm9WLNmUakn300/Xo=";
|
||||
hash = "sha256-4sg1v541NknaOClZAkYC6tGlpItBT6RzUK9Itniu7OQ=";
|
||||
};
|
||||
cargoHash = "sha256-uKhgi3u7YSKLqG2ROCWs6+p206xghnsQ7nIZw5OtkY4=";
|
||||
cargoHash = "sha256-7MSe2YpVV68nXXeMPy+AGO0hYPpsOaR2S82c/EBczwQ=";
|
||||
|
||||
postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications";
|
||||
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wastebin";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matze";
|
||||
repo = "wastebin";
|
||||
rev = version;
|
||||
hash = "sha256-abqVjjV1RK9F8xo23Ir8jqoo9jqSe/Kra1IJNHadqXs=";
|
||||
hash = "sha256-iiGg5En7p+7142qURsdOj7nYwS/ushbxfa5QlT/pHDc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-D/a+aEK4Usa4HFOKCxCIy9bHabH5tmBdFRRRQ7aKs/I=";
|
||||
cargoHash = "sha256-yfjAtORymdSn0pLwnGPvjLH3/R4juY08+NanTdm4420=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "whisper-ctranslate2";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
inherit pname version;
|
||||
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication {
|
||||
owner = "Softcatala";
|
||||
repo = "whisper-ctranslate2";
|
||||
tag = version;
|
||||
hash = "sha256-y1xCycWUxrLwmnk6tlyag0uN0oo6DRQFeIIBw555VjY=";
|
||||
hash = "sha256-53sKuaZJcH/i2C4oeKcvxRs3OmkvR3USw6nnPh+i+Eo=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
meson,
|
||||
@@ -22,30 +21,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-terminal";
|
||||
version = "6.3.0";
|
||||
version = "6.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "terminal";
|
||||
rev = version;
|
||||
sha256 = "sha256-Pr2Jm37vuw1DOx63BXKT3oPK6C7i5v9ObYFNR6Hvhns=";
|
||||
sha256 = "sha256-W06J+QqouoZBWGm/w5aBuL009IO4odmSKHoeJkXnVpA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix clear and reset actions when ongoing foreground process
|
||||
# https://github.com/elementary/terminal/pull/823
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/terminal/commit/3c84bcb98ecdadb4d5e0c7a8f52fb5238f5e92f0.patch";
|
||||
hash = "sha256-XViJR+vj+qy2A1nZa3Pdo8uY24tS4ZqZKjTAyPN9sPA=";
|
||||
})
|
||||
# Only reset/clear screen when <Shift> is pressed
|
||||
# https://github.com/elementary/terminal/pull/827
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/terminal/commit/91b93d883c2b8a8549d9743292d6a564e3b2d3cb.patch";
|
||||
hash = "sha256-3opiRhQLJCYFDwDjEbm0CZ9y8CF/6biU+cJk1Ideyks=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
meson
|
||||
|
||||
@@ -434,6 +434,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
|
||||
'' + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") ''
|
||||
export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
|
||||
export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
|
||||
'' + optionalString stdenv.hostPlatform.isWindows ''
|
||||
export NIX_CFLAGS_COMPILE+=" -Wno-error=incompatible-pointer-types"
|
||||
'' + optionalString stdenv.hostPlatform.isMusl ''
|
||||
export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
|
||||
'' +
|
||||
@@ -665,5 +667,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd;
|
||||
mainProgram = executable;
|
||||
maintainers = lib.teams.python.members;
|
||||
# mingw patches only apply to Python 3.11 currently
|
||||
broken = (lib.versions.minor version) != "11" && stdenv.hostPlatform.isWindows;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -39,7 +39,7 @@ let
|
||||
cleanArgs args
|
||||
// {
|
||||
pname = "astal-${name}";
|
||||
version = "0-unstable-2025-01-12";
|
||||
version = "0-unstable-2025-01-13";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -47,8 +47,8 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aylur";
|
||||
repo = "astal";
|
||||
rev = "6fd7ae514af36ff9baf1209a2eeebd3a26cf94ce";
|
||||
hash = "sha256-IjLW96gjrCAjx/QZOvYyNpoeb53bkOJ6dDQt8ubaMMY=";
|
||||
rev = "cac0fc63bfe098b26753db8262f5d95ac42b281b";
|
||||
hash = "sha256-kNtKWbQ+gMzmAF7KNSZ4Hb8/2cfSNoURCyRSB0nx2I4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/${sourceRoot}";
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "alexapy";
|
||||
version = "1.28.0";
|
||||
version = "1.29.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -27,17 +27,17 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitLab {
|
||||
owner = "keatontaylor";
|
||||
repo = "alexapy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sRTK3qaIiYxz9Z+LT2pFjqKXBHyr3EkSD4dtc+KXFQw=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-46dRjVm3d1/bMlJCO6Dy/+cOYsPNruUADshrdrObw5Q=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "aiofiles" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiofiles
|
||||
aiohttp
|
||||
authcaptureproxy
|
||||
@@ -56,11 +56,11 @@ buildPythonPackage rec {
|
||||
# Module has no tests (only a websocket test which seems unrelated to the module)
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Python Package for controlling Alexa devices (echo dot, etc) programmatically";
|
||||
homepage = "https://gitlab.com/keatontaylor/alexapy";
|
||||
changelog = "https://gitlab.com/keatontaylor/alexapy/-/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
construct,
|
||||
paho-mqtt,
|
||||
pyserial-asyncio,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "amshan";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "toreamun";
|
||||
repo = "amshan";
|
||||
rev = version;
|
||||
hash = "sha256-aw0wTqb2s84STVUN55h6L926pXwaMSppBCfXZVb87w0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
construct
|
||||
paho-mqtt
|
||||
pyserial-asyncio
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "han" ];
|
||||
|
||||
meta = {
|
||||
description = "Decode smart power meter data stream of Cosem HDLC frames used by MBUS";
|
||||
longDescription = ''
|
||||
The package has special support of formats for Aidon, Kaifa and Kamstrup
|
||||
meters used in Norway and Sweden (AMS HAN).
|
||||
'';
|
||||
homepage = "https://github.com/toreamun/amshan";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bjornfor ];
|
||||
};
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.37.0";
|
||||
version = "1.38.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "casbin";
|
||||
repo = "pycasbin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gFh8+fcunDG4kT+cJpmuVGsgWQzntbbm6AQmvS/iCo0=";
|
||||
hash = "sha256-HrPf56J9tKQRzdXIGYTrbyvGOAXGUovm3VaHndBw+gY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc";
|
||||
version = "3.58.0";
|
||||
version = "3.59.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -66,7 +66,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = "dvc";
|
||||
tag = version;
|
||||
hash = "sha256-ljrQV+Ca0EooCdoEU1B2mnN62bpKV0ZGnX8W1yZWyjM=";
|
||||
hash = "sha256-kjaYn0DJAKETtVDcBs43OTif0TwKsAaKs4jnLODNQz8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -12,15 +12,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "facedancer";
|
||||
version = "3.0.6";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greatscottgadgets";
|
||||
repo = "facedancer";
|
||||
tag = version;
|
||||
hash = "sha256-okpxZzVwVgpFuZIsmJ8+1UwwxYFAPFpCkVnIxJjddwE=";
|
||||
hash = "sha256-u1fvrfjk79R16MUuYx8m63EkgHJiMmAksaduk4lVnTw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-limiter";
|
||||
version = "3.9.2";
|
||||
version = "3.10.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "alisaifee";
|
||||
repo = "flask-limiter";
|
||||
tag = version;
|
||||
hash = "sha256-JkO5DNGVTnqbMfkadQGdyJEsfDfMDZ+nfjEjRpoMOfk=";
|
||||
hash = "sha256-spE0gVrPlbz0JDXGznJ6RN2uNAsQn7tbHxWGU98221M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -4,22 +4,32 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pkg-config,
|
||||
setuptools,
|
||||
fuse,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fuse-python";
|
||||
version = "1.0.7";
|
||||
format = "setuptools";
|
||||
version = "1.0.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MhiAY2UkCM1HKuu2+S0135LIu0IAk3H4yJJ7s35r3Rs=";
|
||||
inherit version;
|
||||
pname = "fuse_python";
|
||||
hash = "sha256-ntWVd8NqshjXAKooOfAh8SwlKzVxhgV1crmOGbwqhYk=";
|
||||
};
|
||||
|
||||
buildInputs = [ fuse ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail 'pkg-config' "${stdenv.cc.targetPrefix}pkg-config"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
buildInputs = [ fuse ];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
requests,
|
||||
pytestCheckHook,
|
||||
requests-mock,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "kestra";
|
||||
version = "0.20.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kestra-io";
|
||||
repo = "libs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ck0eM3YZRRoORN77e46J9CG5Uj6Y7fNdVWAErT7LbpA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# Required for building the library (https://github.com/kestra-io/libs/blob/v0.20.0/python/setup.py#L20)
|
||||
# The path resolve to CWD, so README.md isn't picked in the parent folder
|
||||
ln -s ../README.md README.md
|
||||
'';
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kestra"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Infinitely scalable orchestration and scheduling platform, creating, running, scheduling, and monitoring millions of complex pipelines";
|
||||
homepage = "https://github.com/kestra-io/libs";
|
||||
license = lib.licenses.apsl20;
|
||||
maintainers = with lib.maintainers; [ DataHearth ];
|
||||
};
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pbs-installer";
|
||||
version = "2024.10.16";
|
||||
version = "2025.01.06";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "frostming";
|
||||
repo = "pbs-installer";
|
||||
tag = version;
|
||||
hash = "sha256-rMj0zKqfYvOvKZVNoZxOULaXyzjiMfBN49M+Z3+SAaM=";
|
||||
hash = "sha256-PWKzIRVpiSJK/aS3fwqnXnyT6lpXjtGxdm4ZKinwkBI=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyexploitdb";
|
||||
version = "0.2.62";
|
||||
version = "0.2.63";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyExploitDb";
|
||||
inherit version;
|
||||
hash = "sha256-lXmhRMyb7yB9qq/CmR/pnY0ttpiINhhPHPZfcfNjqpg=";
|
||||
hash = "sha256-PJfbs1qSiumTiHOoffZqag+jVpNbvTOeTpz/peRUlq0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,47 +8,62 @@
|
||||
poetry-core,
|
||||
setuptools,
|
||||
numpy,
|
||||
pydicom,
|
||||
pylibjpeg-data,
|
||||
pylibjpeg,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylibjpeg-libjpeg";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
let
|
||||
self = buildPythonPackage {
|
||||
pname = "pylibjpeg-libjpeg";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydicom";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xqSA1cutTsH9k4l9CW96n/CURzkAyDi3PZylZeedVjA=";
|
||||
fetchSubmodules = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydicom";
|
||||
repo = "pylibjpeg-libjpeg";
|
||||
tag = "v${self.version}";
|
||||
hash = "sha256-xqSA1cutTsH9k4l9CW96n/CURzkAyDi3PZylZeedVjA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'poetry-core >=1.8,<2' 'poetry-core'
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
poetry-core
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [ numpy ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pydicom
|
||||
pylibjpeg-data
|
||||
pylibjpeg
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
doCheck = false; # circular test dependency with `pylibjpeg` and `pydicom`
|
||||
|
||||
passthru.tests.check = self.overridePythonAttrs (_: {
|
||||
doCheck = true;
|
||||
});
|
||||
|
||||
pythonImportsCheck = [ "libjpeg" ];
|
||||
|
||||
meta = {
|
||||
description = "JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg";
|
||||
homepage = "https://github.com/pydicom/pylibjpeg-libjpeg";
|
||||
changelog = "https://github.com/pydicom/pylibjpeg-libjpeg/releases/tag/v${self.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
};
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'poetry-core >=1.8,<2' 'poetry-core'
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
poetry-core
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [ numpy ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
doCheck = false; # tests try to import 'libjpeg.data', which errors
|
||||
|
||||
pythonImportsCheck = [ "libjpeg" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg";
|
||||
homepage = "https://github.com/pydicom/pylibjpeg-libjpeg";
|
||||
changelog = "https://github.com/pydicom/pylibjpeg-libjpeg/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
in
|
||||
self
|
||||
|
||||
@@ -7,11 +7,12 @@
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
syrupy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypalazzetti";
|
||||
version = "0.1.16";
|
||||
version = "0.1.19";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -20,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "dotvav";
|
||||
repo = "py-palazzetti-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JYTrZ1Ty9y+yvoeVXus1qqNFnB0NmczCz6Kq2PjpiLk=";
|
||||
hash = "sha256-Bmx4CU6bx5FVR7xdDxrtVSXunthi2s2Esj1FtSjh61U=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -30,6 +31,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
syrupy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pypalazzetti" ];
|
||||
|
||||
@@ -2,32 +2,37 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-hpilo";
|
||||
version = "4.4.3";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seveas";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1dk5xswydw7nmn9hlna1xca1mzcas9qv2kmid5yx8kvk3hjqci9v";
|
||||
repo = "python-hpilo";
|
||||
tag = version;
|
||||
hash = "sha256-O0WGJRxzT9R9abFOsXHSiv0aFOtBWQqTrfbw5rnuZbY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Most tests requires an actual iLO to run
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "hpilo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to access the HP iLO XML interface";
|
||||
mainProgram = "hpilo_cli";
|
||||
homepage = "https://seveas.github.io/python-hpilo/";
|
||||
changelog = "https://github.com/seveas/python-hpilo/blob/${version}/CHANGES";
|
||||
license = with licenses; [
|
||||
asl20
|
||||
gpl3Plus
|
||||
];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "hpilo_cli";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "switchbot-api";
|
||||
version = "2.2.1";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "SeraphicCorp";
|
||||
repo = "py-switchbot-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jpm01wDVLgGr5SMaevxiYGfv8tVa1ibRtcHkEK3yb58=";
|
||||
hash = "sha256-SVVFz+8LjPOJNjEREkKE4yyrDPE5Gf5qKY3ftsx3SyI=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1300";
|
||||
version = "3.0.1301";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = version;
|
||||
hash = "sha256-pvs2vLceRtg4Ro+ZqGdTNXchezu/dO6xizoRZ4xYRZ8=";
|
||||
hash = "sha256-FdLulpo58oj54R289dnI2gEQJCxQk8asSjpIBwKkjZI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tplink-omada-client";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "tplink_omada_client";
|
||||
inherit version;
|
||||
hash = "sha256-REzjeZs2Ddhw2TLD4Vp75XT2iLaxxzDK/F3UmrC1deo=";
|
||||
hash = "sha256-6MiPgseHrqgD+DGth5rJ03HK+0YfBpmDPXybzrTDeeA=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -8,23 +8,26 @@
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "versionfinder";
|
||||
version = "1.1.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jantman";
|
||||
repo = pname;
|
||||
repo = "versionfinder";
|
||||
rev = version;
|
||||
sha256 = "16mvjwyhmw39l8by69dgr9b9jnl7yav36523lkh7w7pwd529pbb9";
|
||||
hash = "sha256-aa2bRGn8Hn7gpEMUM7byh1qZVsqvJeMXomnwCj2Xu5o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
gitpython
|
||||
backoff
|
||||
];
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
isPy3k,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yahooweather";
|
||||
version = "0.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0bsxmngkpzvqm50i2cnxjzhpbdhb8s10ly8h5q08696cjihqdkpa";
|
||||
};
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provide an interface to the Yahoo! Weather RSS feed";
|
||||
homepage = "https://github.com/pvizeli/yahooweather";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
mkTclDerivation,
|
||||
fetchzip,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
mkTclDerivation rec {
|
||||
pname = "lexec";
|
||||
version = "0-unstable-2020-03-11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://chiselapp.com/user/pooryorick/repository/lexec/tarball/3880618cfe/unnamed-3880618cfe.tar.gz";
|
||||
hash = "sha256-MHsVcCPjdNn1ca6GFP4jWlDk7zioD0VSEh1CImud4fc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Implementation of Tcl TIP 424 \"Improving [exec]\" as a separate package";
|
||||
homepage = "https://chiselapp.com/user/pooryorick/repository/lexec/index";
|
||||
license = lib.licenses.tcltk;
|
||||
maintainers = with lib.maintainers; [ fgaz ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackfire";
|
||||
version = "2.28.21";
|
||||
version = "2.28.22";
|
||||
|
||||
src =
|
||||
passthru.sources.${stdenv.hostPlatform.system}
|
||||
@@ -60,23 +60,23 @@ stdenv.mkDerivation rec {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
|
||||
sha256 = "PT2qUKRoIIFu2FGHAHfhufmm8s+rc5TZBs1xr0qVSPg=";
|
||||
sha256 = "vZemxC5Vg916imzecW2Wa88nBO9NH8zMY0RFfRjKoF4=";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
|
||||
sha256 = "S0cpqoJbwHSfH46MxoWh0iitNmBQ+yi2nWcGwXdcZUk=";
|
||||
sha256 = "hTqeL5xLyd6QWk4aFH3k5/GBc4fsc4EHZ5PMpT9j24g=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
|
||||
sha256 = "ZJIw8cB/GIAeyDgPmJVwwkMdQsRqgIyBjGDZZeEu/ro=";
|
||||
sha256 = "ARYJY5xDDzhatUWmyyjmewRV47hmNYgC5xlOdHBV0Po=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
|
||||
sha256 = "usvKbAp7RgiPGQOvrzCeHNYHddj3VCGwg1oYFVTMVN4=";
|
||||
sha256 = "gqA40eKuDneFKAC1oCby9aE6iLGwO2VNjazkf0U+uzU=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
|
||||
sha256 = "fKad8UipQIJYRoFQD1wWn8N86TpEGjR9G+qdI4Syiig=";
|
||||
sha256 = "hgtQJtu3beRrcDuR8reX+82D/5n8XiRBOSmNtykf1RE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "patchelf";
|
||||
version = "0.18.0-unstable-2024-11-18";
|
||||
version = "0.18.0-unstable-2025-01-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "patchelf";
|
||||
rev = "769337c227799aa60911562b6940530f4a86eb3c";
|
||||
sha256 = "sha256-eOHQ7pD8OfSLIIFfF6daCnntzHKqpraAGFfFqSlPtbY=";
|
||||
rev = "43b75fbc9ffbc1190fee7c8693ad74cb8286cfd4";
|
||||
sha256 = "sha256-rqFH9xUu36Hky763cQ9D1V7iuWteItAFDM2jIQGP5Us=";
|
||||
};
|
||||
|
||||
# Drop test that fails on musl (?)
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ fetchFromGitHub }:
|
||||
rec {
|
||||
pname = "authelia";
|
||||
version = "4.38.17";
|
||||
version = "4.38.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authelia";
|
||||
repo = "authelia";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JymfNe7Xoa2Hh219GtBjlyaGK+Jn8XWqrTnkY8377Ro=";
|
||||
hash = "sha256-gJEKjplESS6wNN2cM/JYRAHm7200tMlBKs1lZi0ShiE=";
|
||||
};
|
||||
vendorHash = "sha256-q38jSX7jZO3Y4gn7dxq4NYLEfCUWVcUwmNfqT52AU/M=";
|
||||
pnpmDepsHash = "sha256-jih+mFZKKOBUH0f2zzKN49VV6iUbMhVImFDWFYaZWWI=";
|
||||
vendorHash = "sha256-K5PunLkbcEuWL4IWbXYqgP3H5S/d5IHrWqCin//qJxw=";
|
||||
pnpmDepsHash = "sha256-jkghQGWLvmL1Vxwl7v4T/H1UUN8DeaCgbc8lnUcS4nA=";
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildHomeAssistantComponent,
|
||||
amshan,
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "toreamun";
|
||||
domain = "amshan";
|
||||
version = "2024.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "toreamun";
|
||||
repo = "amshan-homeassistant";
|
||||
tag = version;
|
||||
hash = "sha256-L7TGdUjDvIRP9dHIkng9GYwilmRzhGbUK6ivx8PVtQ4=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
amshan
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Home Assistant integration for electricity meters (AMS/HAN/P1)";
|
||||
longDescription = ''
|
||||
The integration supports both streaming (serial port / TCP/IP) and MQTT
|
||||
(Tibber Pulse, energyintelligence.se etc.).
|
||||
'';
|
||||
homepage = "https://github.com/toreamun/amshan-homeassistant";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bjornfor ];
|
||||
};
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "Tautulli";
|
||||
version = "2.15.0";
|
||||
version = "2.15.1";
|
||||
format = "other";
|
||||
|
||||
pythonPath = [ setuptools ];
|
||||
@@ -22,7 +22,7 @@ buildPythonApplication rec {
|
||||
owner = "Tautulli";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-QhJc4Jwxlp3yB0jWa7sRDnIOWLW8CQUupnzbUscJH+c=";
|
||||
sha256 = "sha256-c+xGgjmn2HE+sl8Vbw9Neztm8g6s9eF/QOVXRtOZWgI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user