mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-14 19:57:52 +00:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
commit
93d8c36a1b
@ -90,6 +90,7 @@ in rec {
|
||||
(onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvols")
|
||||
(onSystems ["x86_64-linux"] "nixos.tests.installer.luksroot")
|
||||
(onSystems ["x86_64-linux"] "nixos.tests.installer.lvm")
|
||||
(onSystems ["x86_64-linux"] "nixos.tests.installer.separateBootZfs")
|
||||
(onSystems ["x86_64-linux"] "nixos.tests.installer.separateBootFat")
|
||||
(onSystems ["x86_64-linux"] "nixos.tests.installer.separateBoot")
|
||||
(onSystems ["x86_64-linux"] "nixos.tests.installer.simpleLabels")
|
||||
|
||||
@ -4,12 +4,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
maintainers = [ fgaz ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
imports = [
|
||||
./common/x11.nix
|
||||
];
|
||||
|
||||
services.xserver.enable = true;
|
||||
sound.enable = true;
|
||||
environment.systemPackages = [ pkgs.ft2-clone ];
|
||||
};
|
||||
@ -30,4 +29,3 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
machine.screenshot("screen")
|
||||
'';
|
||||
})
|
||||
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
# lvm
|
||||
separateBoot
|
||||
separateBootFat
|
||||
separateBootZfs
|
||||
simple
|
||||
simpleLabels
|
||||
simpleProvided
|
||||
|
||||
@ -878,6 +878,78 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
# Same as the previous, but with ZFS /boot.
|
||||
separateBootZfs = makeInstallerTest "separateBootZfs" {
|
||||
extraInstallerConfig = {
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
};
|
||||
|
||||
extraConfig = ''
|
||||
# Using by-uuid overrides the default of by-id, and is unique
|
||||
# to the qemu disks, as they don't produce by-id paths for
|
||||
# some reason.
|
||||
boot.zfs.devNodes = "/dev/disk/by-uuid/";
|
||||
networking.hostId = "00000000";
|
||||
'';
|
||||
|
||||
createPartitions = ''
|
||||
machine.succeed(
|
||||
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
|
||||
+ " mkpart primary ext2 1M 256MB" # /boot
|
||||
+ " mkpart primary linux-swap 256MB 1280M"
|
||||
+ " mkpart primary ext2 1280M -1s", # /
|
||||
"udevadm settle",
|
||||
|
||||
"mkswap /dev/vda2 -L swap",
|
||||
"swapon -L swap",
|
||||
|
||||
"mkfs.ext4 -L nixos /dev/vda3",
|
||||
"mount LABEL=nixos /mnt",
|
||||
|
||||
# Use as many ZFS features as possible to verify that GRUB can handle them
|
||||
"zpool create"
|
||||
" -o compatibility=grub2"
|
||||
" -O utf8only=on"
|
||||
" -O normalization=formD"
|
||||
" -O compression=lz4" # Activate the lz4_compress feature
|
||||
" -O xattr=sa"
|
||||
" -O acltype=posixacl"
|
||||
" bpool /dev/vda1",
|
||||
"zfs create"
|
||||
" -o recordsize=1M" # Prepare activating the large_blocks feature
|
||||
" -o mountpoint=legacy"
|
||||
" -o relatime=on"
|
||||
" -o quota=1G"
|
||||
" -o filesystem_limit=100" # Activate the filesystem_limits features
|
||||
" bpool/boot",
|
||||
|
||||
# Snapshotting the top-level dataset would trigger a bug in GRUB2: https://github.com/openzfs/zfs/issues/13873
|
||||
"zfs snapshot bpool/boot@snap-1", # Prepare activating the livelist and bookmarks features
|
||||
"zfs clone bpool/boot@snap-1 bpool/test", # Activate the livelist feature
|
||||
"zfs bookmark bpool/boot@snap-1 bpool/boot#bookmark", # Activate the bookmarks feature
|
||||
"zpool checkpoint bpool", # Activate the zpool_checkpoint feature
|
||||
"mkdir -p /mnt/boot",
|
||||
"mount -t zfs bpool/boot /mnt/boot",
|
||||
"touch /mnt/boot/empty", # Activate zilsaxattr feature
|
||||
"dd if=/dev/urandom of=/mnt/boot/test bs=1M count=1", # Activate the large_blocks feature
|
||||
|
||||
# Print out all enabled and active ZFS features (and some other stuff)
|
||||
"sync /mnt/boot",
|
||||
"zpool get all bpool >&2",
|
||||
|
||||
# Abort early if GRUB2 doesn't like the disks
|
||||
"grub-probe --target=device /mnt/boot >&2",
|
||||
)
|
||||
'';
|
||||
|
||||
# umount & export bpool before shutdown
|
||||
# this is a fix for "cannot import 'bpool': pool was previously in use from another system."
|
||||
postInstallCommands = ''
|
||||
machine.succeed("umount /mnt/boot")
|
||||
machine.succeed("zpool export bpool")
|
||||
'';
|
||||
};
|
||||
|
||||
# zfs on / with swap
|
||||
zfsroot = makeInstallerTest "zfs-root" {
|
||||
extraInstallerConfig = {
|
||||
@ -897,7 +969,7 @@ in {
|
||||
createPartitions = ''
|
||||
machine.succeed(
|
||||
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
|
||||
+ " mkpart primary 1M 100MB" # bpool
|
||||
+ " mkpart primary 1M 100MB" # /boot
|
||||
+ " mkpart primary linux-swap 100M 1024M"
|
||||
+ " mkpart primary 1024M -1s", # rpool
|
||||
"udevadm settle",
|
||||
@ -909,20 +981,12 @@ in {
|
||||
"zfs create -o mountpoint=legacy rpool/root/usr",
|
||||
"mkdir /mnt/usr",
|
||||
"mount -t zfs rpool/root/usr /mnt/usr",
|
||||
"zpool create -o compatibility=grub2 bpool /dev/vda1",
|
||||
"zfs create -o mountpoint=legacy bpool/boot",
|
||||
"mkfs.vfat -n BOOT /dev/vda1",
|
||||
"mkdir /mnt/boot",
|
||||
"mount -t zfs bpool/boot /mnt/boot",
|
||||
"mount LABEL=BOOT /mnt/boot",
|
||||
"udevadm settle",
|
||||
)
|
||||
'';
|
||||
|
||||
# umount & export bpool before shutdown
|
||||
# this is a fix for "cannot import 'bpool': pool was previously in use from another system."
|
||||
postInstallCommands = ''
|
||||
machine.succeed("umount /mnt/boot")
|
||||
machine.succeed("zpool export bpool")
|
||||
'';
|
||||
};
|
||||
|
||||
# Create two physical LVM partitions combined into one volume group
|
||||
|
||||
@ -27,9 +27,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
hardware.pulseaudio.enable = true;
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript = { nodes, ... }:
|
||||
let
|
||||
user = nodes.machine.users.users.alice;
|
||||
env = "DISPLAY=:0.0 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus";
|
||||
in
|
||||
''
|
||||
with subtest("Wait for login"):
|
||||
@ -48,11 +51,31 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
machine.wait_for_window("Bottom Panel")
|
||||
machine.wait_until_succeeds("pgrep caja")
|
||||
machine.wait_for_window("Caja")
|
||||
machine.wait_for_text('(Applications|Places|System)')
|
||||
machine.wait_for_text('(Computer|Home|Trash)')
|
||||
|
||||
with subtest("Lock the screen"):
|
||||
machine.wait_until_succeeds("su - ${user.name} -c '${env} mate-screensaver-command -q' | grep 'The screensaver is inactive'")
|
||||
machine.succeed("su - ${user.name} -c '${env} mate-screensaver-command -l >&2 &'")
|
||||
machine.wait_until_succeeds("su - ${user.name} -c '${env} mate-screensaver-command -q' | grep 'The screensaver is active'")
|
||||
machine.sleep(2)
|
||||
machine.send_chars("${user.password}", delay=0.2)
|
||||
machine.wait_for_text("${user.description}")
|
||||
machine.screenshot("screensaver")
|
||||
machine.send_chars("\n")
|
||||
machine.wait_until_succeeds("su - ${user.name} -c '${env} mate-screensaver-command -q' | grep 'The screensaver is inactive'")
|
||||
|
||||
with subtest("Open MATE control center"):
|
||||
machine.succeed("su - ${user.name} -c '${env} mate-control-center >&2 &'")
|
||||
machine.wait_for_window("Control Center")
|
||||
machine.wait_for_text('(Groups|Administration|Hardware)')
|
||||
|
||||
with subtest("Open MATE terminal"):
|
||||
machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 mate-terminal >&2 &'")
|
||||
machine.succeed("su - ${user.name} -c '${env} mate-terminal >&2 &'")
|
||||
machine.wait_for_window("Terminal")
|
||||
machine.sleep(20)
|
||||
|
||||
with subtest("Check if MATE has ever coredumped"):
|
||||
machine.fail("coredumpctl --json=short | grep -E 'mate|marco|caja'")
|
||||
machine.screenshot("screen")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -210,6 +210,7 @@ in {
|
||||
enableSystemdStage1 = true;
|
||||
};
|
||||
|
||||
installerBoot = (import ./installer.nix { }).separateBootZfs;
|
||||
installer = (import ./installer.nix { }).zfsroot;
|
||||
|
||||
expand-partitions = makeTest {
|
||||
|
||||
@ -5,18 +5,18 @@
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "ledfx";
|
||||
version = "2.0.80";
|
||||
version = "2.0.86";
|
||||
pyproject= true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vwLk3EpXqUSAwzY2oX0ZpXrmH2cT0GdYdL/Mifav6mU=";
|
||||
hash = "sha256-miOGMsrvK3A3SYnd+i/lqB+9GOHtO4F3RW8NkxDgFqU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \
|
||||
--replace "sentry-sdk==1.14.0" "sentry-sdk" \
|
||||
--replace "sentry-sdk==1.38.0" "sentry-sdk" \
|
||||
--replace "~=" ">="
|
||||
'';
|
||||
|
||||
@ -32,12 +32,14 @@ python3.pkgs.buildPythonPackage rec {
|
||||
cython
|
||||
flux-led
|
||||
icmplib
|
||||
mss
|
||||
multidict
|
||||
numpy
|
||||
openrgb-python
|
||||
paho-mqtt
|
||||
pillow
|
||||
psutil
|
||||
pybase64
|
||||
pyserial
|
||||
pystray
|
||||
python-mbedtls
|
||||
|
||||
@ -24,15 +24,15 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.10.6";
|
||||
format = "pyproject";
|
||||
version = "3.11.2";
|
||||
pyproject = true;
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cDfeSCG+L8ALCC2CdfKIPzqMrWtwwN6KSvZS5n8rdXQ=";
|
||||
hash = "sha256-IM3qVn+XAv0EvRYc7ujMU4NPly5IaxF0efHAgI/lyms=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -60,6 +60,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
loguru
|
||||
more-itertools
|
||||
packaging
|
||||
pendulum
|
||||
psutil
|
||||
pynzb
|
||||
pyrsistent
|
||||
|
||||
@ -1,20 +1,32 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-hound";
|
||||
version = "1.4";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tillson";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E=";
|
||||
hash = "sha256-W+rYDyRIw4jWWO4UZkUHFq/D/7ZXM+y5vdbclk6S0ro=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
patches = [
|
||||
# https://github.com/tillson/git-hound/pull/66
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tillson/git-hound/commit/cd8aa19401cfdec9e4d76c1f6eb4d85928ec4b03.patch";
|
||||
hash = "sha256-EkdR2KkxxlMLNtKFGpxsQ/msJT5NcMF7irIUcU2WWJY=";
|
||||
})
|
||||
];
|
||||
|
||||
# tests fail outside of nix
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-8teIa083oMXm0SjzMP+mGOVAel1Hbsp3TSMhdvqVbQs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reconnaissance tool for GitHub code search";
|
||||
@ -26,6 +38,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/tillson/git-hound";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
|
||||
mainProgram = "git-hound";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cntr";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "cntr";
|
||||
rev = version;
|
||||
sha256 = "sha256-eDozoYN2iOFUY/w7Gjki4nnASyZo4V/YGPjdX2xjNGY=";
|
||||
sha256 = "sha256-spa4qPEhpNSZIk16jeH9YEr4g9JcVmpetHz72A/ZAPY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UZrVZBdaiIrMajePKWXDZI+Z+nXTGadNKmoa3gdfzp4=";
|
||||
cargoHash = "sha256-YN8EtUXKtT8Xc0RnW7QqL+awyWy5xFKWhYMxgYG28I4=";
|
||||
|
||||
passthru.tests = nixosTests.cntr;
|
||||
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doublecmd";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doublecmd";
|
||||
repo = "doublecmd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-eY8hYstNJ5RMiz3TUfgPFpvKycxTMVaZ6PE69Glxa0I=";
|
||||
hash = "sha256-gUYn1b5X1uP1Ig2u/XiEP6MRhWs2ID64GSdBUSP5YEQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,20 +1,19 @@
|
||||
{ lib, appimageTools, fetchurl }:
|
||||
|
||||
let
|
||||
version = "0.9.9.6";
|
||||
version = "0.9.9.7";
|
||||
pname = "hifile";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hifile.app/files/HiFile-${version}.AppImage";
|
||||
hash = "sha256-qfBV4w4nChH2wUAHdcUFwVs+3OeqcKqMJ8WUucn31q4=";
|
||||
hash = "sha256-/vFW+jHmtCEioJt0B5TnNDsaIyFlDuVABnHNccm6iEw=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
};
|
||||
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
in appimageTools.wrapType2 rec {
|
||||
inherit pname version src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
|
||||
66
pkgs/by-name/ov/overskride/package.nix
Normal file
66
pkgs/by-name/ov/overskride/package.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform, cargo, rustc, meson, ninja
|
||||
, pkg-config, wrapGAppsHook4, desktop-file-utils, appstream-glib
|
||||
, blueprint-compiler, dbus, gtk4, libadwaita, bluez, libpulseaudio }: let
|
||||
|
||||
owner = "kaii-lb";
|
||||
name = "overskride";
|
||||
version = "0.5.6";
|
||||
|
||||
in rustPlatform.buildRustPackage {
|
||||
|
||||
pname = name;
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = name;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-syQzHHT0s15oj8Yl2vhgyXlPI8UxOqIXGDqFeUc/dJQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NEsqVfKZqXSLieRO0BvQGdggmXXYO15qVhbfgAFATPc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
appstream-glib
|
||||
blueprint-compiler
|
||||
meson
|
||||
ninja
|
||||
cargo
|
||||
rustc
|
||||
];
|
||||
|
||||
buildInputs = [ dbus gtk4 libadwaita bluez libpulseaudio ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
meson setup build --prefix $out && cd build
|
||||
meson compile && meson devenv
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# The "Validate appstream file" test fails.
|
||||
# TODO: This appears to have been fixed upstream
|
||||
# so checks should be enabled with the next version.
|
||||
doCheck = false;
|
||||
|
||||
preFixup = ''
|
||||
glib-compile-schemas $out/share/gsettings-schemas/${name}-${version}/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"A Bluetooth and Obex client that is straight to the point, DE/WM agnostic, and beautiful";
|
||||
homepage = "https://github.com/${owner}/${name}";
|
||||
changelog = "https://github.com/${owner}/${name}/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
mainProgram = name;
|
||||
maintainers = with maintainers; [ mrcjkb ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,15 +1,24 @@
|
||||
{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper
|
||||
, python3, binutils-unwrapped, findutils, gawk, kmod, pciutils, libraspberrypi
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, python3
|
||||
, binutils-unwrapped
|
||||
, findutils
|
||||
, gawk
|
||||
, kmod
|
||||
, pciutils
|
||||
, libraspberrypi
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "raspberrypi-eeprom";
|
||||
version = "2023.10.30-2712";
|
||||
version = "2023.12.06-2712";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "rpi-eeprom";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TKvby0qIXidM5Qk7q+ovLk0DpHsCbdQe7xndrgKrSXk=";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-bX+WSWj8Lk0S9GgauJsqElur+AAp5JB8LMEstB6aRGo=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
@ -58,5 +67,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-4-boot-eeprom";
|
||||
license = with licenses; [ bsd3 unfreeRedistributableFirmware ];
|
||||
maintainers = with maintainers; [ das_j Luflosi ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@ -32,6 +32,7 @@ let
|
||||
#### Services
|
||||
biometryd = callPackage ./services/biometryd { };
|
||||
hfd-service = callPackage ./services/hfd-service { };
|
||||
history-service = callPackage ./services/history-service { };
|
||||
lomiri-download-manager = callPackage ./services/lomiri-download-manager { };
|
||||
lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };
|
||||
mediascanner2 = callPackage ./services/mediascanner2 { };
|
||||
|
||||
203
pkgs/desktops/lomiri/services/history-service/default.nix
Normal file
203
pkgs/desktops/lomiri/services/history-service/default.nix
Normal file
@ -0,0 +1,203 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, gitUpdater
|
||||
, testers
|
||||
, cmake
|
||||
, dbus
|
||||
, dbus-test-runner
|
||||
, dconf
|
||||
, gnome
|
||||
, libphonenumber
|
||||
, libqtdbustest
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, qtpim
|
||||
, sqlite
|
||||
, telepathy
|
||||
, telepathy-mission-control
|
||||
, wrapQtAppsHook
|
||||
, xvfb-run
|
||||
}:
|
||||
|
||||
let
|
||||
replaceDbusService = pkg: name: "--replace \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "history-service";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/history-service";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-oCX+moGQewzstbpddEYYp1kQdO2mVXpWJITfvzDzQDI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Deprecation warnings with Qt5.15, allow disabling -Werror
|
||||
# Remove when version > 0.4
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/ubports/development/core/history-service/-/commit/1370777952c6a2efb85f582ff8ba085c2c0e290a.patch";
|
||||
hash = "sha256-Z/dFrFo7WoPZlKto6wNGeWdopsi8iBjmd5ycbqMKgxo=";
|
||||
})
|
||||
|
||||
# Drop deprecated qt5_use_modules usage
|
||||
# Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/36 merged & in release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OPNA2608/history-service/-/commit/b36ab377aca93555b29d1471d6eaa706b5c843ca.patch";
|
||||
hash = "sha256-mOpXqqd4JI7lHtcWDm9LGCrtB8ERge04jMpHIagDM2k=";
|
||||
})
|
||||
|
||||
# Add more / correct existing GNUInstallDirs usage
|
||||
# Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/37 merged & in release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OPNA2608/history-service/-/commit/bb4dbdd16e80dcd286d8edfb86b08f0b61bc7fec.patch";
|
||||
hash = "sha256-C/XaygI663yaU06klQD9g0NnbqYxHSmzdbrRxcfiJkk=";
|
||||
})
|
||||
|
||||
# Correct version information
|
||||
# Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/38 merged & in release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OPNA2608/history-service/-/commit/30d9fbee203205ec1ea8fd19c9b6eb54c080a9e2.patch";
|
||||
hash = "sha256-vSZ1ii5Yhw7pB+Pd1pjWnW7JsQxKnn+LeuBKo6qZjQs=";
|
||||
})
|
||||
|
||||
# Make tests optional
|
||||
# Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/39 merged & in release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OPNA2608/history-service/-/commit/cb5c80cffc35611657244e15a7eb10edcd598ccd.patch";
|
||||
hash = "sha256-MFHGu4OMScdThq9htUgFMpezP7Ym6YTIZUHWol20wqw=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream's way of generating their schema doesn't work for us, don't quite understand why.
|
||||
# (gdb) bt
|
||||
# #0 QSQLiteResult::prepare (this=0x4a4650, query=...) at qsql_sqlite.cpp:406
|
||||
# #1 0x00007ffff344bcf4 in QSQLiteResult::reset (this=0x4a4650, query=...) at qsql_sqlite.cpp:378
|
||||
# #2 0x00007ffff7f95f39 in QSqlQuery::exec (this=this@entry=0x7fffffffaad8, query=...) at kernel/qsqlquery.cpp:406
|
||||
# #3 0x00000000004084cb in SQLiteDatabase::dumpSchema (this=<optimized out>) at /build/source/plugins/sqlite/sqlitedatabase.cpp:148
|
||||
# #4 0x0000000000406d70 in main (argc=<optimized out>, argv=<optimized out>)
|
||||
# at /build/source/plugins/sqlite/schema/generate_schema.cpp:56
|
||||
# (gdb) p lastError().driverText().toStdString()
|
||||
# $17 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
|
||||
# _M_p = 0x4880d0 "Unable to execute statement"}, _M_string_length = 27, {
|
||||
# _M_local_buf = "\033\000\000\000\000\000\000\000+\344\371\367\377\177\000", _M_allocated_capacity = 27}}
|
||||
# (gdb) p lastError().databaseText().toStdString()
|
||||
# $18 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
|
||||
# _M_p = 0x48c480 "no such column: rowid"}, _M_string_length = 21, {
|
||||
# _M_local_buf = "\025\000\000\000\000\000\000\000A\344\371\367\377\177\000", _M_allocated_capacity = 21}}
|
||||
#
|
||||
# This makes the tests stall indefinitely and breaks history-service usage.
|
||||
# This replacement script should hopefully achieve the same / a similar-enough result with just sqlite
|
||||
cp ${./update_schema.sh.in} plugins/sqlite/schema/update_schema.sh.in
|
||||
|
||||
# libphonenumber -> protobuf -> abseil-cpp demands C++14
|
||||
# But uses std::string_view which is C++17?
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace '-std=c++11' '-std=c++17'
|
||||
|
||||
# Uses pkg_get_variable, cannot substitute prefix with that
|
||||
substituteInPlace daemon/CMakeLists.txt \
|
||||
--replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")'
|
||||
|
||||
# Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}"
|
||||
'' + lib.optionalString finalAttrs.finalPackage.doCheck ''
|
||||
# Tests launch these DBus services, fix paths related to them
|
||||
substituteInPlace tests/common/dbus-services/CMakeLists.txt \
|
||||
${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \
|
||||
${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \
|
||||
${replaceDbusService dconf "ca.desrt.dconf.service"}
|
||||
|
||||
substituteInPlace cmake/modules/GenerateTest.cmake \
|
||||
--replace '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \
|
||||
--replace '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
sqlite
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libphonenumber
|
||||
protobuf
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtpim
|
||||
telepathy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
dbus-test-runner
|
||||
dconf
|
||||
gnome.gnome-keyring
|
||||
telepathy-mission-control
|
||||
xvfb-run
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Many deprecation warnings with Qt 5.15
|
||||
(lib.cmakeBool "ENABLE_WERROR" false)
|
||||
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [
|
||||
# DaemonTest is flaky
|
||||
# https://gitlab.com/ubports/development/core/history-service/-/issues/13
|
||||
"-E" "^DaemonTest"
|
||||
]))
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# SQLiteDatabase is used on host to generate SQL schemas
|
||||
# Tests also need this to use SQLiteDatabase for verifying correct behaviour
|
||||
export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
# Starts & talks to D-Bus services, breaks with parallelism
|
||||
enableParallelChecking = false;
|
||||
|
||||
preCheck = ''
|
||||
export QT_PLUGIN_PATH=${lib.getBin qtpim}/${qtbase.qtPluginPrefix}:$QT_PLUGIN_PATH
|
||||
export HOME=$PWD
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Service that provides call log and conversation history";
|
||||
longDescription = ''
|
||||
History service provides the database and an API to store/retrieve the call log (used by dialer-app) and the sms/mms history (used by messaging-app).
|
||||
|
||||
See as well telepathy-ofono for incoming message events.
|
||||
|
||||
Database location: ~/.local/share/history-service/history.sqlite
|
||||
'';
|
||||
homepage = "https://gitlab.com/ubports/development/core/history-service";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = teams.lomiri.members;
|
||||
platforms = platforms.linux;
|
||||
pkgConfigModules = [
|
||||
"history-service"
|
||||
];
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,34 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ $# -lt 3 ]; then
|
||||
echo "Usage: $0 <source directory> <target file> <version info file>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SOURCE_DIR=$1
|
||||
TARGET_FILE=$2
|
||||
VERSION_FILE=$3
|
||||
|
||||
VERSION="1"
|
||||
LATEST_VERSION="1"
|
||||
MERGED_COMMANDS="merged.sql"
|
||||
|
||||
[ -e $MERGED_COMMANDS ] && rm $MERGED_COMMANDS
|
||||
SCHEMA_FILE="$SOURCE_DIR/v${VERSION}.sql"
|
||||
while [ -e $SCHEMA_FILE ]; do
|
||||
cat $SCHEMA_FILE >> $MERGED_COMMANDS
|
||||
LATEST_VERSION=$VERSION
|
||||
VERSION=$(($VERSION+1))
|
||||
SCHEMA_FILE="$SOURCE_DIR/v${VERSION}.sql"
|
||||
done
|
||||
|
||||
# To output the schema
|
||||
echo ".fullschema" >> $MERGED_COMMANDS
|
||||
|
||||
# The schemas may use functions that history-service defines in C which don't affect the generated schema in a meaningful way.
|
||||
# sqlite will return an error after processing queries with such function calls, so remove them.
|
||||
sed -i -e '/normalizeId(/d' $MERGED_COMMANDS
|
||||
|
||||
sqlite3 <$MERGED_COMMANDS >$TARGET_FILE
|
||||
|
||||
echo $LATEST_VERSION > $VERSION_FILE
|
||||
@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
|
||||
mate.mate-desktop
|
||||
mate.libmatekbd
|
||||
mate.mate-menus
|
||||
mate.mate-panel # for org.mate.panel schema, see m-c-c#678
|
||||
mate.marco
|
||||
mate.mate-settings-daemon
|
||||
];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, makeFontsConf
|
||||
, nix-update-script
|
||||
, autoreconfHook
|
||||
@ -27,6 +28,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-KCp/8UjVl8e3+4s1FD4GvHP7AUAS+eIB7RWhmgm5GIA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull autoconf-2.72 compatibility fix:
|
||||
# https://github.com/libsidplayfp/libsidplayfp/pull/103
|
||||
(fetchpatch {
|
||||
name = "autoconf-2.72";
|
||||
url = "https://github.com/libsidplayfp/libsidplayfp/commit/b8fff55f6aaa005a3899b59e70cd8730f962641b.patch";
|
||||
hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfhummus";
|
||||
version = "4.6.1";
|
||||
version = "4.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "galkahana";
|
||||
repo = "PDF-Writer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4QJxYxLELBDg5GZISdO2xKzJej8F21BY+GD+KkrGXws=";
|
||||
hash = "sha256-PXiLP0lgqBdDbHHfvRT/d0M1jGjMVZZ3VDYnByzkKeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
|
||||
# Packages that provide a single executable.
|
||||
"@angular/cli" = "ng";
|
||||
"@antora/cli" = "antora";
|
||||
"@astrojs/language-server" = "astro-ls";
|
||||
"@babel/cli" = "babel";
|
||||
"@commitlint/cli" = "commitlint";
|
||||
|
||||
@ -3,24 +3,27 @@
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, ciso8601
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytest-freezegun
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioskybell";
|
||||
version = "22.7.0";
|
||||
format = "setuptools";
|
||||
version = "23.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tkdrob";
|
||||
repo = pname;
|
||||
repo = "aioskybell";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q=";
|
||||
hash = "sha256-5F0B5z0pJLKJPzKIowE07vEgmNXnDVEeGFbPGnJ6H9I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -28,14 +31,20 @@ buildPythonPackage rec {
|
||||
--replace 'version="master",' 'version="${version}",'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
aiofiles
|
||||
ciso8601
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytest-freezegun
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apprise";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Pu+rHF15eLDmXFCR0c2+kgaGXcPLXRnKXPvdt26Kr/4=";
|
||||
hash = "sha256-2NVxDTyVJYbCz633zp6g/mC4DsqTlGSX4+8Y88wO7Bk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
50
pkgs/development/python-modules/borb/default.nix
Normal file
50
pkgs/development/python-modules/borb/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchPypi
|
||||
, fonttools
|
||||
, lxml
|
||||
, pillow
|
||||
, python-barcode
|
||||
, pythonOlder
|
||||
, qrcode
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "borb";
|
||||
version = "2.1.20";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HvPwFtqAPtJrG+O+t8OyQmYHVo6DC7StAjSfAxtuFe4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
fonttools
|
||||
lxml
|
||||
pillow
|
||||
python-barcode
|
||||
qrcode
|
||||
requests
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"borb.pdf"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for reading, creating and manipulating PDF files in Python";
|
||||
homepage = "https://borbpdf.com/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
};
|
||||
}
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-filter";
|
||||
version = "23.4";
|
||||
version = "23.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vtBws4NZ3OfS2+BXsWXVl3MFeYY1bLgJ3tmDs2x3qXY=";
|
||||
hash = "sha256-Z1g6pDuR/oxJ90qDLZX02EQr5ij9TG1l6fgR9RU6Tlw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
@ -8,11 +8,12 @@
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, tqdm
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-generativeai";
|
||||
version = "0.2.2";
|
||||
version = "0.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "google";
|
||||
repo = "generative-ai-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WiDoeScro7TcW5nQBmLpVQriL6IzR9CAVqBj36nqivk=";
|
||||
hash = "sha256-SL0jnuDHjeiqDq1VvWr4vQPFZ5yyea/OAGArmxztwB4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@ -38,6 +39,7 @@ buildPythonPackage rec {
|
||||
google-api-core
|
||||
protobuf
|
||||
tqdm
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# Issue with the google.ai module. Check with the next release
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hvplot";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BkxnV90QxJjQYqN0DdjGbjPmNDaDN9hUBjO7nQte7eg=";
|
||||
hash = "sha256-KB0YmiEtJkGT9446k079oWqTwBZMSFTakzW0LuBlazo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "internetarchive";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "jjjake";
|
||||
repo = "internetarchive";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-apBzx1qMHEA0wiWh82sS7I+AaiMEoAchhPsrtAgujbQ=";
|
||||
hash = "sha256-hy5e6DEAwLKn0l2nJD7fyW5r4ZZiH+fuTEDLQen+dNk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "losant-rest";
|
||||
version = "1.19.2";
|
||||
version = "1.19.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Losant";
|
||||
repo = "losant-rest-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JaXADzNxRqumjx6FZxJj6ioMVdUMR6S1FQQ6QcP8S5Q=";
|
||||
hash = "sha256-Ppy7vOA7ix76nvzVEP+BkL8dsoN0oXNX/5IZyhXDoSw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -3,9 +3,7 @@
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, appdirs
|
||||
, black
|
||||
, importlib-metadata
|
||||
, isPy3k
|
||||
, jedi
|
||||
, prompt-toolkit
|
||||
, pygments
|
||||
@ -25,7 +23,6 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
black # yes, this is in install_requires
|
||||
jedi
|
||||
prompt-toolkit
|
||||
pygments
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatmo";
|
||||
version = "8.0.1";
|
||||
version = "8.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "jabesq";
|
||||
repo = "pyatmo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ASjAmkM/BFWzZYnLeXATbZzSG6KBDcmy66/R1MgzAwQ=";
|
||||
hash = "sha256-AKpDXfNF2t/3F4SmMWIgfkxHgcJobYs225gIeJ31l6k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "s6-dns";
|
||||
version = "2.3.7.0";
|
||||
sha256 = "rusndssjTpA5enjGqjclkkqgcQwQNcpw3VYouExnAdE=";
|
||||
version = "2.3.7.1";
|
||||
sha256 = "zwJYV07H1itlTgwq14r0x9Z6xMnLN/eBSA9ZflSzD20=";
|
||||
|
||||
description = "A suite of DNS client programs and libraries for Unix systems";
|
||||
|
||||
@ -28,7 +28,6 @@ buildPackage {
|
||||
rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
|
||||
rm libs6dns.*
|
||||
rm libskadns.*
|
||||
rm libdcache.*
|
||||
|
||||
mv doc $doc/share/doc/s6-dns/html
|
||||
'';
|
||||
|
||||
@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
|
||||
|
||||
buildPackage {
|
||||
pname = "s6-networking";
|
||||
version = "2.7.0.0";
|
||||
sha256 = "mf1uP5PW1qlb9+l4lVt9BTYpWReUsGjtogBKuLSQVVI=";
|
||||
version = "2.7.0.1";
|
||||
sha256 = "36SWTU8b2umrX8RQh2n9b+/DOlJ9UVOjd3xrBG7upWQ=";
|
||||
|
||||
description = "A suite of small networking utilities for Unix systems";
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "s6";
|
||||
version = "2.12.0.2";
|
||||
sha256 = "qpF+/+Eq6XN5CQ91/aSfDV8PZ81lVDaEz/BtyIFyj4w=";
|
||||
version = "2.12.0.3";
|
||||
sha256 = "gA0xIm9sJc3T7AtlJA+AtWzl7BNzQdCo0VTndjjlgQM=";
|
||||
|
||||
description = "skarnet.org's small & secure supervision software suite";
|
||||
|
||||
|
||||
@ -8,8 +8,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "skalibs";
|
||||
version = "2.14.0.1";
|
||||
sha256 = "tD69s2+KjfQPGgjBOwg5O85J+vM05ioNuRmzrkr9FIg=";
|
||||
version = "2.14.1.0";
|
||||
sha256 = "24YTUWEngQ2N/thutCRaX/JCBPHhb6KOiqrTRtlqrug=";
|
||||
|
||||
description = "A set of general-purpose C programming libraries";
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "tipidee";
|
||||
version = "0.0.2.0";
|
||||
sha256 = "5I+/gfvN8s4bf6Oi+5kzRndWeLV7movyRfznz0kNMoY=";
|
||||
version = "0.0.3.0";
|
||||
sha256 = "0dk6k86UKgJ2ioX5H2Xoga9S+SwMy9NFrK2KEKoNxCA=";
|
||||
|
||||
description = "A HTTP 1.1 webserver, serving static files and CGI/NPH";
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
pname = "cargo-mobile2";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -20,14 +20,14 @@ rustPlatform.buildRustPackage {
|
||||
owner = "tauri-apps";
|
||||
repo = pname;
|
||||
rev = "cargo-mobile2-v${version}";
|
||||
hash = "sha256-zLArfCUgBWx/xrcjvyhQbSxjH0JKI3JhoDVRX2/kBnQ=";
|
||||
hash = "sha256-gyTA85eLVvDQKWo7D2zO6zFC8910AyNasXGjR1qkI6c=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
# sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-13iCSd2BQ4fEeXSOfDBVgnzFSl1fUAPrbZZJ3qx7oHc=";
|
||||
cargoHash = "sha256-Zcs+Sm2+xd7OSPXv+QDd7Jh8YvlmVrhWotjVNMqyE60=";
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/share/
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, gccStdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, autoreconfHook269
|
||||
, xorgproto
|
||||
, libX11
|
||||
, libXpm
|
||||
@ -18,7 +18,7 @@ gccStdenv.mkDerivation rec {
|
||||
sha256 = "WO7PN192HhcDl6iHIbVbH7MVMi1Tl2KyQbDa9DWRO6M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [ autoreconfHook269 ];
|
||||
buildInputs = [ libX11 xorgproto libXpm ];
|
||||
|
||||
configureFlags = [ "--with-x" ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fheroes2";
|
||||
version = "1.0.10";
|
||||
version = "1.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihhub";
|
||||
repo = "fheroes2";
|
||||
rev = version;
|
||||
hash = "sha256-bh27piX1/HIlbOmTpqQCV7NaHxOMtwMIGrjlXrFvHWE=";
|
||||
hash = "sha256-R7hl5VzzdRcU9TF6WfiLYgUFpVixuppLobMsan0jKsQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imagemagick ];
|
||||
|
||||
@ -27,14 +27,14 @@ assert lib.assertOneOf "backend" backend [ "opencl" "cuda" "tensorrt" "eigen" ];
|
||||
# of gcc. If you need to use cuda10, please override stdenv with gcc8Stdenv
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "katago";
|
||||
version = "1.13.1";
|
||||
githash = "3539a3d410b12f79658bb7a2cdaf1ecb6c95e6c1";
|
||||
version = "1.14.0";
|
||||
githash = "c6de1bbda837a0717eaeca46102f7326ed0da0d4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightvector";
|
||||
repo = "katago";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A2ZvFcklYQoxfqYrLrazksrJkfdELnn90aAbkm7pJg0=";
|
||||
sha256 = "sha256-0WB/weQIJkLXedcOJO7D/N85oXTufvbmyfIp8XdrACg=";
|
||||
};
|
||||
|
||||
fakegit = writeShellScriptBin "git" "echo ${githash}";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.12.3";
|
||||
version = "2023.12.4";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
@ -5603,6 +5603,7 @@
|
||||
"android_ip_webcam"
|
||||
"androidtv"
|
||||
"androidtv_remote"
|
||||
"anova"
|
||||
"anthemav"
|
||||
"apache_kafka"
|
||||
"apcupsd"
|
||||
|
||||
@ -41,6 +41,16 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
aioairq = super.aioairq.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "CorantGmbH";
|
||||
repo = "aioairq";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SRsDSHTZkkygaQZjHENKNLx3ZWMi/PubS1m/MonEKNk=";
|
||||
};
|
||||
});
|
||||
|
||||
aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "19.2.1";
|
||||
src = fetchFromGitHub {
|
||||
@ -93,6 +103,16 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
aiohttp-zlib-ng = super.aiohttp-zlib-ng.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = "aiohttp-zlib-ng";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dTNwt4eX6ZQ8ySK2/9ziVbc3KFg2aL/EsiBWaJRC4x8=";
|
||||
};
|
||||
});
|
||||
|
||||
aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.1.1";
|
||||
src = fetchFromGitHub {
|
||||
@ -505,7 +525,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.12.3";
|
||||
hassVersion = "2023.12.4";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -523,13 +543,13 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pTDYiy9Ux7Rgsf9rXXF3GbaiJkTX5FA/7K2hJtiNOkQ=";
|
||||
hash = "sha256-XzjsSM0xKxLeuP30u8LReJtmJMbJq+yQ2Pp5xWmNLFw=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cvsYkuQG4i3GG8VGJ+HGSjdvpSBLzh0BFYQQpoVq4FY=";
|
||||
hash = "sha256-dea0PacCzCWhMh2gw/kVJHwYCoT7zJ52qTQbHmqcwU8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.12.3";
|
||||
version = "2023.12.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PQZsesdGqeZgQUgO7DkKDcBrWRM/CY8giPx8cK3531s=";
|
||||
hash = "sha256-a27PeLEArT87+DOrKZ5rLM5o2T3swzLwY+mBhOtd9dQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -77,5 +77,6 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ bjornfor brecht ];
|
||||
mainProgram = "lighttpd";
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,17 +13,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pict-rs";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.asonix.dog";
|
||||
owner = "asonix";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nFfGyOxzJZ2U/1FpY64BorRd5yncipsaBbr/TsYnmjM=";
|
||||
sha256 = "sha256-s870SjFFjjugqNDEAPMvwZ8Q1QT+9RKwujs4zDPVYGc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-11TyKs+JQiKBzFzGJe5sOllbPVEhchZrsryZp6L2JFo=";
|
||||
cargoHash = "sha256-lLE8N3IuSEoohjtENNc0ixMq80cWIsy6Vd8/sEiwQFw=";
|
||||
|
||||
# needed for internal protobuf c wrapper library
|
||||
PROTOC = "${protobuf}/bin/protoc";
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.76.0";
|
||||
version = "0.77.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = "qovery-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Gf0wW+bv3+uvovsRa2AHn/N4sN8lc1ADK9t+jEVMA0c=";
|
||||
hash = "sha256-247YXfZHxnH3IrCpM/BOmJclKdsC561R2m5seqEknaE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-R1CAB42moobsYuXNTtZXNLcCpSp8jfSt2FQi5fRnEdI=";
|
||||
vendorHash = "sha256-uYmA6dYdCTf/oon202s6RBGNfOaXLllX+mPM8fRkCh0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = finalAttrs.pname;
|
||||
repo = "rpi-imager";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
sha256 = "sha256-ZuS/fhPpVlLSdaD+t+qIw6fdEbi7c82X+BxcgWlPntg=";
|
||||
};
|
||||
@ -72,9 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Raspberry Pi Imaging Utility";
|
||||
homepage = "https://www.raspberrypi.com/software/";
|
||||
homepage = "https://github.com/raspberrypi/rpi-imager/";
|
||||
changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${finalAttrs.version}";
|
||||
downloadPage = "https://github.com/raspberrypi/rpi-imager/";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "rpi-imager";
|
||||
maintainers = with maintainers; [ ymarkus anthonyroussel ];
|
||||
|
||||
@ -4,13 +4,12 @@
|
||||
, nixosTests
|
||||
, testers
|
||||
, sqlite3-to-mysql
|
||||
, fetchPypi
|
||||
, mysql80
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlite3-to-mysql";
|
||||
version = "2.1.1";
|
||||
version = "2.1.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.8";
|
||||
@ -19,7 +18,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "techouse";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g3W6ts5Mk//l6E4Yg49rf9dmu+yzgH+mCjz+vPW9ZRQ=";
|
||||
hash = "sha256-RIe4If7R8snbNN2yIPxAh39EQplVyhMF2c0G06Zipds=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/mrash/fwknop/commit/a8214fd58bc46d23b64b3a55db023c7f5a5ea6af.patch";
|
||||
sha256 = "0cp1350q66n455hpd3rdydb9anx66bcirza5gyyyy5232zgg58bi";
|
||||
})
|
||||
|
||||
# Pull patch pending upstream inclusion for `autoconf-2.72` support:
|
||||
# https://github.com/mrash/fwknop/pull/357
|
||||
(fetchpatch {
|
||||
name = "autoconf-2.72.patch";
|
||||
url = "https://github.com/mrash/fwknop/commit/bee7958532338499e35c19e75937891c8113f7de.patch";
|
||||
hash = "sha256-lrro5dSDR0Zz9aO3bV5vFFADNJjoDR9z6P5lFYWyLW8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -20,6 +21,15 @@ buildGoModule rec {
|
||||
"-w"
|
||||
"-s"
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd goverview \
|
||||
--bash <($out/bin/goverview completion bash) \
|
||||
--fish <($out/bin/goverview completion fish) \
|
||||
--zsh <($out/bin/goverview completion zsh)
|
||||
'';
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@ -22440,7 +22440,7 @@ with pkgs;
|
||||
libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };
|
||||
|
||||
libao = callPackage ../development/libraries/libao {
|
||||
usePulseAudio = config.pulseaudio or lib.meta.availableOn stdenv.hostPlatform libpulseaudio;
|
||||
usePulseAudio = config.pulseaudio or (lib.meta.availableOn stdenv.hostPlatform libpulseaudio);
|
||||
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
|
||||
};
|
||||
|
||||
@ -28678,8 +28678,6 @@ with pkgs;
|
||||
raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { };
|
||||
raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { };
|
||||
|
||||
raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom { };
|
||||
|
||||
raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { };
|
||||
|
||||
reap = callPackage ../os-specific/linux/reap { };
|
||||
@ -37936,6 +37934,7 @@ with pkgs;
|
||||
|
||||
katagoWithCuda = katago.override {
|
||||
backend = "cuda";
|
||||
cudaPackages = cudaPackages_12;
|
||||
};
|
||||
|
||||
katagoCPU = katago.override {
|
||||
@ -37944,6 +37943,7 @@ with pkgs;
|
||||
|
||||
katagoTensorRT = katago.override {
|
||||
backend = "tensorrt";
|
||||
cudaPackages = cudaPackages_12;
|
||||
};
|
||||
|
||||
klavaro = callPackage ../games/klavaro { };
|
||||
|
||||
@ -1610,6 +1610,8 @@ self: super: with self; {
|
||||
enablePython = true;
|
||||
});
|
||||
|
||||
borb = callPackage ../development/python-modules/borb { };
|
||||
|
||||
bork = callPackage ../development/python-modules/bork { };
|
||||
|
||||
boschshcpy = callPackage ../development/python-modules/boschshcpy { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user