mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-14 17:53:37 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
7398920e33
@ -257,7 +257,7 @@ propagated-dep(mapOffset(h0, t0, h1),
|
||||
```
|
||||
let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
|
||||
|
||||
dep(h0, _, A, B)
|
||||
dep(h0, t0, A, B)
|
||||
propagated-dep(h1, t1, B, C)
|
||||
h0 + h1 in {-1, 0, 1}
|
||||
h0 + t1 in {-1, 0, -1}
|
||||
|
||||
@ -6612,6 +6612,12 @@
|
||||
github = "Icy-Thought";
|
||||
githubId = 53710398;
|
||||
};
|
||||
idlip = {
|
||||
name = "Dilip";
|
||||
email = "igoldlip@gmail.com";
|
||||
github = "idlip";
|
||||
githubId = 117019901;
|
||||
};
|
||||
idontgetoutmuch = {
|
||||
email = "dominic@steinitz.org";
|
||||
github = "idontgetoutmuch";
|
||||
@ -8262,6 +8268,12 @@
|
||||
githubId = 16481032;
|
||||
name = "Kiba Fox";
|
||||
};
|
||||
kidanger = {
|
||||
email = "angerj.dev@gmail.com";
|
||||
github = "kidanger";
|
||||
githubId = 297479;
|
||||
name = "Jérémy Anger";
|
||||
};
|
||||
kidd = {
|
||||
email = "raimonster@gmail.com";
|
||||
github = "kidd";
|
||||
|
||||
@ -546,6 +546,17 @@ with lib.maintainers; {
|
||||
shortName = "Matrix";
|
||||
};
|
||||
|
||||
minimal-bootstrap = {
|
||||
members = [
|
||||
artturin
|
||||
emilytrau
|
||||
ericson2314
|
||||
jk
|
||||
];
|
||||
scope = "Maintain the minimal-bootstrap toolchain and related packages.";
|
||||
shortName = "Minimal Bootstrap";
|
||||
};
|
||||
|
||||
mobile = {
|
||||
members = [
|
||||
samueldr
|
||||
|
||||
@ -47,16 +47,16 @@ assert usbBootable -> isohybridMbrImage != "";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = isoName;
|
||||
builder = ./make-iso9660-image.sh;
|
||||
__structuredAttrs = true;
|
||||
|
||||
buildCommandPath = ./make-iso9660-image.sh;
|
||||
nativeBuildInputs = [ xorriso syslinux zstd libossp_uuid ];
|
||||
|
||||
inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable;
|
||||
|
||||
# !!! should use XML.
|
||||
sources = map (x: x.source) contents;
|
||||
targets = map (x: x.target) contents;
|
||||
|
||||
# !!! should use XML.
|
||||
objects = map (x: x.object) storeContents;
|
||||
symlinks = map (x: x.symlink) storeContents;
|
||||
|
||||
|
||||
@ -1,12 +1,3 @@
|
||||
source $stdenv/setup
|
||||
|
||||
sources_=($sources)
|
||||
targets_=($targets)
|
||||
|
||||
objects=($objects)
|
||||
symlinks=($symlinks)
|
||||
|
||||
|
||||
# Remove the initial slash from a path, since genisofs likes it that way.
|
||||
stripSlash() {
|
||||
res="$1"
|
||||
@ -35,13 +26,13 @@ if test -n "$bootable"; then
|
||||
# The -boot-info-table option modifies the $bootImage file, so
|
||||
# find it in `contents' and make a copy of it (since the original
|
||||
# is read-only in the Nix store...).
|
||||
for ((i = 0; i < ${#targets_[@]}; i++)); do
|
||||
stripSlash "${targets_[$i]}"
|
||||
for ((i = 0; i < ${#targets[@]}; i++)); do
|
||||
stripSlash "${targets[$i]}"
|
||||
if test "$res" = "$bootImage"; then
|
||||
echo "copying the boot image ${sources_[$i]}"
|
||||
cp "${sources_[$i]}" boot.img
|
||||
echo "copying the boot image ${sources[$i]}"
|
||||
cp "${sources[$i]}" boot.img
|
||||
chmod u+w boot.img
|
||||
sources_[$i]=boot.img
|
||||
sources[$i]=boot.img
|
||||
fi
|
||||
done
|
||||
|
||||
@ -66,9 +57,9 @@ touch pathlist
|
||||
|
||||
|
||||
# Add the individual files.
|
||||
for ((i = 0; i < ${#targets_[@]}; i++)); do
|
||||
stripSlash "${targets_[$i]}"
|
||||
addPath "$res" "${sources_[$i]}"
|
||||
for ((i = 0; i < ${#targets[@]}; i++)); do
|
||||
stripSlash "${targets[$i]}"
|
||||
addPath "$res" "${sources[$i]}"
|
||||
done
|
||||
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "squashfs.img";
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [ squashfsTools ];
|
||||
|
||||
|
||||
@ -80,7 +80,7 @@ in rec {
|
||||
description = lib.mdDoc ''
|
||||
Units that want (i.e. depend on) this unit. The default method for
|
||||
starting a unit by default at boot time is to set this option to
|
||||
'["multi-user.target"]' for system services. Likewise for user units
|
||||
`["multi-user.target"]` for system services. Likewise for user units
|
||||
(`systemd.user.<name>.*`) set it to `["default.target"]` to make a unit
|
||||
start by default when the user `<name>` logs on.
|
||||
|
||||
|
||||
@ -48,6 +48,7 @@ with lib;
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "notify";
|
||||
User = "clickhouse";
|
||||
Group = "clickhouse";
|
||||
ConfigurationDirectory = "clickhouse-server";
|
||||
@ -55,6 +56,12 @@ with lib;
|
||||
StateDirectory = "clickhouse";
|
||||
LogsDirectory = "clickhouse";
|
||||
ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml";
|
||||
TimeoutStartSec = "infinity";
|
||||
};
|
||||
|
||||
environment = {
|
||||
# Switching off watchdog is very important for sd_notify to work correctly.
|
||||
CLICKHOUSE_WATCHDOG_ENABLE = "0";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -34,14 +34,15 @@ in {
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
boot.kernelModules = [ "i2c-dev" ]
|
||||
++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix" ]
|
||||
++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix4" ]
|
||||
++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ];
|
||||
|
||||
systemd.services.openrgb = {
|
||||
description = "OpenRGB server daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
StateDirectory = "OpenRGB";
|
||||
WorkingDirectory = "/var/lib/OpenRGB";
|
||||
ExecStart = "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}";
|
||||
Restart = "always";
|
||||
};
|
||||
|
||||
@ -45,6 +45,11 @@ let
|
||||
'';
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
# https://github.com/zedeus/nitter/pull/772
|
||||
(mkRemovedOptionModule [ "services" "nitter" "replaceInstagram" ] "Nitter no longer supports this option as Bibliogram has been discontinued.")
|
||||
];
|
||||
|
||||
options = {
|
||||
services.nitter = {
|
||||
enable = mkEnableOption (lib.mdDoc "Nitter");
|
||||
@ -155,6 +160,22 @@ in
|
||||
description = lib.mdDoc "Use base64 encoding for proxied media URLs.";
|
||||
};
|
||||
|
||||
enableRSS = mkEnableOption (lib.mdDoc "RSS feeds") // { default = true; };
|
||||
|
||||
enableDebug = mkEnableOption (lib.mdDoc "request logs and debug endpoints");
|
||||
|
||||
proxy = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = lib.mdDoc "URL to a HTTP/HTTPS proxy.";
|
||||
};
|
||||
|
||||
proxyAuth = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = lib.mdDoc "Credentials for proxy.";
|
||||
};
|
||||
|
||||
tokenCount = mkOption {
|
||||
type = types.int;
|
||||
default = 10;
|
||||
@ -192,12 +213,6 @@ in
|
||||
description = lib.mdDoc "Replace Reddit links with links to this instance (blank to disable).";
|
||||
};
|
||||
|
||||
replaceInstagram = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = lib.mdDoc "Replace Instagram links with links to this instance (blank to disable).";
|
||||
};
|
||||
|
||||
mp4Playback = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
@ -275,6 +290,12 @@ in
|
||||
default = false;
|
||||
description = lib.mdDoc "Hide tweet replies.";
|
||||
};
|
||||
|
||||
squareAvatars = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Square profile pictures.";
|
||||
};
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
|
||||
@ -24,7 +24,9 @@ let
|
||||
else
|
||||
device
|
||||
) folder.devices;
|
||||
}) cfg.settings.folders;
|
||||
}) (filterAttrs (_: folder:
|
||||
folder.enable
|
||||
) cfg.settings.folders);
|
||||
|
||||
updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
|
||||
set -efu
|
||||
|
||||
@ -261,7 +261,8 @@ in {
|
||||
|
||||
services.xserver.libinput = {
|
||||
enable = mkEnableOption (lib.mdDoc "libinput") // {
|
||||
default = true;
|
||||
default = config.services.xserver.enable;
|
||||
defaultText = lib.literalExpression "config.services.xserver.enable";
|
||||
};
|
||||
mouse = mkConfigForDevice "mouse";
|
||||
touchpad = mkConfigForDevice "touchpad";
|
||||
|
||||
@ -137,14 +137,15 @@ let
|
||||
awkCmd = "${pkgs.gawk}/bin/awk";
|
||||
inherit cfgZfs;
|
||||
}) + ''
|
||||
poolImported "${pool}" && exit
|
||||
echo -n "importing ZFS pool \"${pool}\"..."
|
||||
# Loop across the import until it succeeds, because the devices needed may not be discovered yet.
|
||||
for trial in `seq 1 60`; do
|
||||
poolReady "${pool}" && poolImport "${pool}" && break
|
||||
sleep 1
|
||||
done
|
||||
poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool.
|
||||
if ! poolImported "${pool}"; then
|
||||
echo -n "importing ZFS pool \"${pool}\"..."
|
||||
# Loop across the import until it succeeds, because the devices needed may not be discovered yet.
|
||||
for trial in `seq 1 60`; do
|
||||
poolReady "${pool}" && poolImport "${pool}" && break
|
||||
sleep 1
|
||||
done
|
||||
poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool.
|
||||
fi
|
||||
if poolImported "${pool}"; then
|
||||
${optionalString keyLocations.hasKeys ''
|
||||
${keyLocations.command} | while IFS=$'\t' read ds kl ks; do
|
||||
@ -159,7 +160,7 @@ let
|
||||
tries=3
|
||||
success=false
|
||||
while [[ $success != true ]] && [[ $tries -gt 0 ]]; do
|
||||
${systemd}/bin/systemd-ask-password "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \
|
||||
${systemd}/bin/systemd-ask-password --timeout=${toString cfgZfs.passwordTimeout} "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \
|
||||
&& success=true \
|
||||
|| tries=$((tries - 1))
|
||||
done
|
||||
@ -312,6 +313,16 @@ in
|
||||
an interactive prompt (keylocation=prompt) and from a file (keylocation=file://).
|
||||
'';
|
||||
};
|
||||
|
||||
passwordTimeout = mkOption {
|
||||
type = types.int;
|
||||
default = 0;
|
||||
description = lib.mdDoc ''
|
||||
Timeout in seconds to wait for password entry for decrypt at boot.
|
||||
|
||||
Defaults to 0, which waits forever.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
services.zfs.autoSnapshot = {
|
||||
|
||||
63
pkgs/applications/graphics/vpv/default.nix
Normal file
63
pkgs/applications/graphics/vpv/default.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, libpng
|
||||
, libtiff
|
||||
, libjpeg
|
||||
, SDL2
|
||||
, gdal
|
||||
, octave
|
||||
, rustPlatform
|
||||
, cargo
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vpv";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kidanger";
|
||||
repo = "vpv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "0cphgq1pqmwrjdmq524j5y522iaq6yhp2dpjdv0a3f9558dayxix";
|
||||
};
|
||||
|
||||
cargoRoot = "src/fuzzy-finder";
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
src = finalAttrs.src;
|
||||
sourceRoot = "source/src/fuzzy-finder";
|
||||
hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libpng
|
||||
libtiff
|
||||
libjpeg
|
||||
SDL2
|
||||
gdal
|
||||
octave
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_GDAL=ON"
|
||||
"-DUSE_OCTAVE=ON"
|
||||
"-DVPV_VERSION=v${finalAttrs.version}"
|
||||
"-DBUILD_TESTING=ON"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kidanger/vpv";
|
||||
description = "Image viewer for image processing experts";
|
||||
maintainers = [ lib.maintainers.kidanger ];
|
||||
license = lib.licenses.gpl3;
|
||||
broken = stdenv.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin
|
||||
};
|
||||
})
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bemenu";
|
||||
version = "0.6.14";
|
||||
version = "0.6.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-bMnnuT+LNNKphmvVcD1aaNZxasSGOEcAveC4stCieG8=";
|
||||
sha256 = "sha256-gdeNaqtxqxBtG9bkxozPE/DLQgLqCt1vh2A2WmgNn7w=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iptsd";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8RE93pIg5fVAYOOq8zHlWy0uTxep7hrJlowPu48beTs=";
|
||||
hash = "sha256-h2d31/0lT0GykFSjp59Gm+28zm3Z/RzdeGtPs0hGW5o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon-bin";
|
||||
version = "32.1.1";
|
||||
version = "32.2.0";
|
||||
|
||||
src = fetchzip {
|
||||
urls = [
|
||||
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
|
||||
"https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
|
||||
];
|
||||
hash = if withGTK3 then
|
||||
"sha256-Kre+F1AE4bC5hAODYjo+S6TUCpKk8KMnYumQWHz+epY="
|
||||
"sha256-Bw8L5+3f46lOGJ5xR3bBF7sQWwEFxoK/NH3ngs1i4lU="
|
||||
else
|
||||
"sha256-LIsep7KsNhsw3zlmgltu6/4qZEWjGQbUmLqHCabSTfg=";
|
||||
"sha256-eP7GIsWPFLYmBPUcMPn6vAlsFEAP3Oyy9mhj0oGeMT4=";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -1,222 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, alsa-lib
|
||||
, autoconf213
|
||||
, cairo
|
||||
, dbus
|
||||
, dbus-glib
|
||||
, desktop-file-utils
|
||||
, fetchFromGitea
|
||||
, ffmpeg
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gnome2
|
||||
, gnum4
|
||||
, libGL
|
||||
, libGLU
|
||||
, libevent
|
||||
, libnotify
|
||||
, libpulseaudio
|
||||
, libstartup_notification
|
||||
, pango
|
||||
, perl
|
||||
, pkg-config
|
||||
, python2
|
||||
, unzip
|
||||
, which
|
||||
, wrapGAppsHook
|
||||
, writeScript
|
||||
, xorg
|
||||
, yasm
|
||||
, zip
|
||||
, zlib
|
||||
, withGTK3 ? true, gtk3, gtk2
|
||||
, testers
|
||||
, palemoon
|
||||
}:
|
||||
|
||||
# Only specific GCC versions are supported with branding
|
||||
# https://developer.palemoon.org/build/linux/
|
||||
assert stdenv.cc.isGNU;
|
||||
assert with lib.strings; (
|
||||
versionAtLeast stdenv.cc.version "7.1"
|
||||
&& versionOlder stdenv.cc.version "13"
|
||||
);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "32.1.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "repo.palemoon.org";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-Z9dBYO5AGDYRLlnEfHUu6thgc2a8OK/tPuRzwp0j9J8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf213
|
||||
desktop-file-utils
|
||||
gnum4
|
||||
perl
|
||||
pkg-config
|
||||
python2
|
||||
unzip
|
||||
which
|
||||
wrapGAppsHook
|
||||
yasm
|
||||
zip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
cairo
|
||||
dbus
|
||||
dbus-glib
|
||||
ffmpeg
|
||||
fontconfig
|
||||
freetype
|
||||
gnome2.GConf
|
||||
gtk2
|
||||
libGL
|
||||
libGLU
|
||||
libevent
|
||||
libnotify
|
||||
libpulseaudio
|
||||
libstartup_notification
|
||||
pango
|
||||
zlib
|
||||
]
|
||||
++ (with xorg; [
|
||||
libX11
|
||||
libXext
|
||||
libXft
|
||||
libXi
|
||||
libXrender
|
||||
libXScrnSaver
|
||||
libXt
|
||||
pixman
|
||||
xorgproto
|
||||
])
|
||||
++ lib.optionals withGTK3 [
|
||||
gtk3
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./mach
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
# Too many cores can lead to build flakiness
|
||||
# https://forum.palemoon.org/viewtopic.php?f=5&t=28480
|
||||
export jobs=$(($NIX_BUILD_CORES<=16 ? $NIX_BUILD_CORES : 16))
|
||||
if [ -z "$enableParallelBuilding" ]; then
|
||||
jobs=1
|
||||
fi
|
||||
|
||||
export MOZCONFIG=$PWD/mozconfig
|
||||
export MOZ_NOSPAM=1
|
||||
|
||||
export build64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}
|
||||
export gtkversion=${if withGTK3 then "3" else "2"}
|
||||
export xlibs=${lib.makeLibraryPath [ xorg.libX11 ]}
|
||||
export prefix=$out
|
||||
export mozmakeflags="-j$jobs"
|
||||
export autoconf=${autoconf213}/bin/autoconf
|
||||
|
||||
substituteAll ${./mozconfig} $MOZCONFIG
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
./mach build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
./mach install
|
||||
|
||||
# Install official branding stuff
|
||||
desktop-file-install --dir=$out/share/applications \
|
||||
./palemoon/branding/official/palemoon.desktop
|
||||
for iconname in default{16,22,24,32,48,256} mozicon128; do
|
||||
n=''${iconname//[^0-9]/}
|
||||
size=$n"x"$n
|
||||
install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
|
||||
done
|
||||
|
||||
# Remove unneeded SDK data from installation
|
||||
# https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729
|
||||
rm -r $out/{include,share/idl,lib/palemoon-devel-${version}}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup =
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
ffmpeg
|
||||
libpulseaudio
|
||||
];
|
||||
in
|
||||
''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix LD_LIBRARY_PATH : "${libPath}"
|
||||
)
|
||||
wrapGApp $out/lib/palemoon-${version}/palemoon
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.palemoon.org/";
|
||||
description = "An Open Source, Goanna-based web browser focusing on efficiency and customization";
|
||||
longDescription = ''
|
||||
Pale Moon is an Open Source, Goanna-based web browser focusing on
|
||||
efficiency and customization.
|
||||
|
||||
Pale Moon offers you a browsing experience in a browser completely built
|
||||
from its own, independently developed source that has been forked off from
|
||||
Firefox/Mozilla code a number of years ago, with carefully selected
|
||||
features and optimizations to improve the browser's stability and user
|
||||
experience, while offering full customization and a growing collection of
|
||||
extensions and themes to make the browser truly your own.
|
||||
'';
|
||||
changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ AndersonTorres OPNA2608 ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update-${pname}" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl libxml2
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
# Only release note announcement == finalized release
|
||||
version="$(
|
||||
curl -s 'http://www.palemoon.org/releasenotes.shtml' |
|
||||
xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 |
|
||||
sed 's/v\(\S*\).*/\1/'
|
||||
)"
|
||||
update-source-version ${pname} "$version"
|
||||
'';
|
||||
tests.version = testers.testVersion {
|
||||
package = palemoon;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
# -*- mode: sh; coding: utf-8-unix; fill-column: 80 -*-
|
||||
|
||||
# Mozconfig template file for nixpkgs
|
||||
|
||||
# Keep this similar to the official .mozconfig file, only minor changes for
|
||||
# portability are permitted with branding.
|
||||
# https://developer.palemoon.org/build/linux/
|
||||
|
||||
_BUILD_64=@build64@
|
||||
|
||||
# Set GTK Version
|
||||
_GTK_VERSION=@gtkversion@
|
||||
|
||||
# Standard build options for Pale Moon
|
||||
ac_add_options --enable-application=palemoon
|
||||
ac_add_options --enable-optimize="-O2 -w"
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION
|
||||
ac_add_options --enable-jemalloc
|
||||
ac_add_options --enable-strip
|
||||
ac_add_options --enable-devtools
|
||||
ac_add_options --enable-av1
|
||||
ac_add_options --enable-jxl
|
||||
|
||||
ac_add_options --disable-eme
|
||||
ac_add_options --disable-webrtc
|
||||
ac_add_options --disable-gamepad
|
||||
ac_add_options --disable-tests
|
||||
ac_add_options --disable-debug
|
||||
ac_add_options --disable-necko-wifi
|
||||
ac_add_options --disable-updater
|
||||
|
||||
ac_add_options --with-pthreads
|
||||
|
||||
# Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding.
|
||||
ac_add_options --enable-official-branding
|
||||
export MOZILLA_OFFICIAL=1
|
||||
|
||||
ac_add_options --x-libraries=@xlibs@
|
||||
|
||||
# MOZ_PKG_SPECIAL is only relevant for upstream's packaging
|
||||
|
||||
#
|
||||
# NixOS-specific additions
|
||||
#
|
||||
|
||||
ac_add_options --prefix=@prefix@
|
||||
|
||||
mk_add_options MOZ_MAKE_FLAGS=@mozmakeflags@
|
||||
mk_add_options AUTOCONF=@autoconf@
|
||||
@ -23,6 +23,7 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }:
|
||||
description = "Cloud native networking and network security";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
platforms = platforms.linux;
|
||||
inherit mainProgram;
|
||||
};
|
||||
}) {
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-dashboard";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "komodorio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D9da40+DbU1EMdR/a4ahLtqlzwPdcHOiAJtPjKZ2Ehc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LJVL20CsDxaAJ/qS+2P7Pv/jhyRO6WAmhGLCR9CmQKE=";
|
||||
|
||||
# tests require internet access
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
|
||||
|
||||
meta = {
|
||||
description = "A simplified way of working with Helm";
|
||||
longDescription = ''
|
||||
Helm Dashboard is an open-source project which offers a UI-driven way to view the installed Helm charts,
|
||||
see their revision history and corresponding k8s resources.
|
||||
'';
|
||||
homepage = "https://github.com/komodorio/helm-dashboard/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ qjoly ];
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeseal";
|
||||
version = "0.20.5";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitnami-labs";
|
||||
repo = "sealed-secrets";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G7v5hRSUtO7AwotQ/2eftfs31+IbyzGHydT/IR1bhOY=";
|
||||
sha256 = "sha256-FLNF3addRA6xLN8DM6dyx2joHSwO+8rdA53yzDXk9fU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fndK1PO4CfTGQV1f9PJ+ju5VUW/RIE5i8IBARJn0g6g=";
|
||||
vendorHash = "sha256-AZRpzY/r0tKGZzC99qFGQtUkqwYoS6SRD6nVHuBIy4A=";
|
||||
|
||||
subPackages = [ "cmd/kubeseal" ];
|
||||
|
||||
|
||||
@ -327,11 +327,11 @@
|
||||
"vendorHash": "sha256-SvyeMKuAJ4vu++7Fx0hutx3vQvgf1sh1PFSLPRqJPjw="
|
||||
},
|
||||
"dnsimple": {
|
||||
"hash": "sha256-XLye6cuVZN9AdLuISJOw9aOSFXMdFNqrOCBGASVC2Bw=",
|
||||
"hash": "sha256-Q/EjVBjZyML1coMblzqGU7AFdG+of1hVQ4GibM7MiRw=",
|
||||
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
|
||||
"owner": "dnsimple",
|
||||
"repo": "terraform-provider-dnsimple",
|
||||
"rev": "v1.1.1",
|
||||
"rev": "v1.1.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-rCM+PL78zD1FYK2v9ihdLkoFwbkgtJTSEq5vKXZPAsU="
|
||||
},
|
||||
@ -764,13 +764,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-YD7RpzhFgX9BwXzZ4OO3XdPPGLurTvEA6Y0iXnVxTPg=",
|
||||
"hash": "sha256-GTjrbA1IX2OxHDdxyTprWH/ctvjlXJUvqdxqcvDA1ug=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.22.0",
|
||||
"rev": "v3.23.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-LWIqCc4hn4ExG4LkFKD5NLM6djWpKgYQdqZM7atTez8="
|
||||
"vendorHash": "sha256-WjiTfHs+MEc06aNstblGKvd3cTj49JF1fvm+tuR2WH8="
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=",
|
||||
@ -810,11 +810,11 @@
|
||||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-XHHZpl936xZ4jjk71bmlxm1xilqFamdgL3AdkyRBT5Y=",
|
||||
"hash": "sha256-TnCRDWmlyBYOY1lpYP0evguM6wFszZdOdmFsztdbRrc=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.120.0",
|
||||
"rev": "v4.121.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -1098,11 +1098,11 @@
|
||||
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-eHv6rqVwWxYcQmoYlkKbOFqJ2BG3KMurn2u8rim/mN0=",
|
||||
"hash": "sha256-fHcEVQZLLmtaKsAaeFcnRxzPBcGv/UUZOpNHsB9VGXA=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.81.0",
|
||||
"rev": "v1.81.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zarf";
|
||||
version = "0.26.3";
|
||||
version = "0.26.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "defenseunicorns";
|
||||
repo = "zarf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gJpXdT0Uj+7UecPPuRphbtbh8v80UztKmiOAP+U7Tpc=";
|
||||
hash = "sha256-uY29LfjflV25/mE6BplV6I+scoD1f0lJ4rnWfTF7Vd0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5k2NnQ18bL0v7YHTvw2nz5H5n5DQOmozkUhyf97eKl8=";
|
||||
vendorHash = "sha256-27OeyGvUHGvkaPNVvr8UH0SRUQdCx4uM2JziOsjo9bE=";
|
||||
proxyVendor = true;
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, copyDesktopItems
|
||||
, pkg-config
|
||||
@ -12,21 +12,20 @@
|
||||
, libssh2
|
||||
, openssl
|
||||
, wxGTK32
|
||||
, gitUpdater
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freefilesync";
|
||||
version = "12.2";
|
||||
version = "12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hkneptune";
|
||||
repo = "FreeFileSync";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pCXMpK+NF06vgEgX31wyO24+kPhvPhdTeRk1j84nYd0=";
|
||||
src = fetchurl {
|
||||
url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip";
|
||||
hash = "sha256-s6jNWqqriL/ePFCUQvLeNxNjHz+nZevD2x1kkw1gDE8=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
# Patches from Debian
|
||||
patches = [
|
||||
# Disable loading of the missing Animal.dat
|
||||
@ -112,10 +111,6 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open Source File Synchronization & Backup Software";
|
||||
homepage = "https://freefilesync.org";
|
||||
|
||||
@ -17,18 +17,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.0.88";
|
||||
version = "1.0.92";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eaXW52e+YJbL+0d2Cqrpp6M11rGsyNfIhgjHLzLDbWQ=";
|
||||
sha256 = "sha256-wRgXb0yzrpRlZkZ6RHMU2wdR11lwR5n6tTUbCEURvDQ=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw=";
|
||||
sha256 = "sha256-Zk3TAoGAPeki/ogfNl/XqeBBn6N/kbNcktRHEyqPOAA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.8.1";
|
||||
version = "3.8.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -34,7 +34,7 @@ mkDerivation rec {
|
||||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BTve1dq+OiUwh/Kiy20iSAyALolkdOX7FHwxvVAdS4U=";
|
||||
sha256 = "sha256-V5g6+Ci2MjBKnitY6IIaMY4gpoeMK+sd7HGZ1U87xL4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-05-13";
|
||||
version = "unstable-2023-05-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "c48cc033c941fb1898e12189e96188a98df69b96";
|
||||
sha256 = "EzLhsuDY/H3t69nuwWj/3fxJdAX6ze/IB/i5WsVJmOo=";
|
||||
rev = "9c59ce89a0d9bcf6f0c65e9e9453ad433222c603";
|
||||
sha256 = "uBoHaamFZ6m328NWkbTWMbc1OSFuyif+3OcCvwTwKfU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dvc";
|
||||
version = "2.56.0";
|
||||
version = "2.57.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-IpdlNwOuUNWgfphRH2UTQ/IvBHo39PafCqyioju8miI=";
|
||||
hash = "sha256-WOg/FROeM8G0knqg0EzyWSthGs3rhDu09kk6R0trOVs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
45
pkgs/applications/video/dra-cla/default.nix
Normal file
45
pkgs/applications/video/dra-cla/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, gnugrep
|
||||
, gnused
|
||||
, curl
|
||||
, mpv
|
||||
, aria2
|
||||
, ffmpeg
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dra-cla";
|
||||
version = "unstable-2023-03-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CoolnsX";
|
||||
repo = "dra-cla";
|
||||
rev = "fd5e43bb32b5bc9013382917d1efacda9c3071a8";
|
||||
hash = "sha256-SMtuflVsxe0PWmzabSDy+vhIN2bTqyiYAT/T1ChY+xY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 dra-cla $out/bin/dra-cla
|
||||
|
||||
wrapProgram $out/bin/dra-cla \
|
||||
--prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl mpv aria2 ffmpeg openssl ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/CoolnsX/dra-cla";
|
||||
description = "A cli tool to browse and play korean drama, chinese drama";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ idlip ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -27,6 +27,7 @@
|
||||
, tpmSupport ? true
|
||||
, uringSupport ? stdenv.isLinux, liburing
|
||||
, canokeySupport ? false, canokey-qemu
|
||||
, capstoneSupport ? true, capstone
|
||||
, enableDocs ? true
|
||||
, hostCpuOnly ? false
|
||||
, hostCpuTargets ? (if hostCpuOnly
|
||||
@ -94,7 +95,8 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals libiscsiSupport [ libiscsi ]
|
||||
++ lib.optionals smbdSupport [ samba ]
|
||||
++ lib.optionals uringSupport [ liburing ]
|
||||
++ lib.optionals canokeySupport [ canokey-qemu ];
|
||||
++ lib.optionals canokeySupport [ canokey-qemu ]
|
||||
++ lib.optionals capstoneSupport [ capstone ];
|
||||
|
||||
dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
|
||||
|
||||
@ -175,7 +177,8 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional libiscsiSupport "--enable-libiscsi"
|
||||
++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"
|
||||
++ lib.optional uringSupport "--enable-linux-io-uring"
|
||||
++ lib.optional canokeySupport "--enable-canokey";
|
||||
++ lib.optional canokeySupport "--enable-canokey"
|
||||
++ lib.optional capstoneSupport "--enable-capstone";
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weston";
|
||||
version = "11.0.1";
|
||||
version = "11.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/weston-${version}.tar.xz";
|
||||
sha256 = "sha256-pBP2jCUpV/wxkcNlCCPsNWrowSTMwMtEDaXNxOLLnlc=";
|
||||
url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz";
|
||||
hash = "sha256-ckB1LO8LfeYiuvi9U0jmP8axnwLvgklhsq3Rd9llKVI=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
@ -111,7 +111,7 @@ let
|
||||
init = run: writeShellScript "${name}-init" ''
|
||||
source /etc/profile
|
||||
${createLdConfCache}
|
||||
exec ${run} "$@"
|
||||
exec ${lib.escapeShellArg run} "$@"
|
||||
'';
|
||||
|
||||
indentLines = str: lib.concatLines (map (s: " " + s) (filter (s: s != "") (lib.splitString "\n" str)));
|
||||
|
||||
@ -108,7 +108,7 @@ let
|
||||
|
||||
# Replaces values inherited by workspace members.
|
||||
replaceWorkspaceValues = writers.writePython3 "replace-workspace-values"
|
||||
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; }
|
||||
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" "W503" ]; }
|
||||
(builtins.readFile ./replace-workspace-values.py);
|
||||
|
||||
# Fetch and unpack a crate.
|
||||
|
||||
@ -18,7 +18,11 @@ def load_file(path: str) -> dict[str, Any]:
|
||||
def replace_key(
|
||||
workspace_manifest: dict[str, Any], table: dict[str, Any], section: str, key: str
|
||||
) -> bool:
|
||||
if "workspace" in table[key] and table[key]["workspace"] is True:
|
||||
if (
|
||||
isinstance(table[key], dict)
|
||||
and "workspace" in table[key]
|
||||
and table[key]["workspace"] is True
|
||||
):
|
||||
print("replacing " + key)
|
||||
|
||||
replaced = table[key]
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
v1 = callPackage ./v1 { };
|
||||
gitDependencyWorkspaceInheritance = callPackage ./git-dependency-workspace-inheritance {
|
||||
replaceWorkspaceValues = writers.writePython3 "replace-workspace-values"
|
||||
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; }
|
||||
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" "W503" ]; }
|
||||
(builtins.readFile ../../replace-workspace-values.py);
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
[package]
|
||||
name = "im_using_workspaces"
|
||||
version = { workspace = true }
|
||||
publish = false
|
||||
keywords = [
|
||||
"workspace",
|
||||
"other_thing",
|
||||
"third_thing",
|
||||
]
|
||||
|
||||
[dependencies]
|
||||
foo = { workspace = true, features = ["cat"] }
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
[package]
|
||||
name = "im_using_workspaces"
|
||||
version = "1.0.0"
|
||||
publish = false
|
||||
keywords = [
|
||||
"workspace",
|
||||
"other_thing",
|
||||
"third_thing",
|
||||
]
|
||||
|
||||
[dependencies]
|
||||
bar = "1.0.0"
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
@ -19,13 +20,24 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-utils";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bkqj8qwwml9xyvb680yy06lv3dzwkv89yrzz5jamvz88ar6m9bw";
|
||||
sha256 = "L1NHWxoJkd1ak9ndpY/KTkFvJZJTWG2UpbEQjxI3BiA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Hopefully helps "libxml2.treeError: xmlSetProp() failed"
|
||||
# This patch is not part of upstream yet.
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919058
|
||||
# https://github.com/mate-desktop/mate-utils/issues/210
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian-mate-team/mate-utils/-/raw/2b43d78f3fdbf0aa50716b62bcada2ef015957c6/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch";
|
||||
sha256 = "SZVpdup/bNv+3hEGQ0L13mgXyNm+wRcL53t9/Oi24wA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cmdstan";
|
||||
version = "2.32.1";
|
||||
version = "2.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stan-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-VFZ8YOJMGKlROYsmfiQxAgYvz4zPMdzfRfAgStbRSJg=";
|
||||
hash = "sha256-obV+R1ZjBgunXndCNry+MEne1nQawo81IV2DWwYbbIQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ stanc ];
|
||||
|
||||
@ -14,14 +14,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextpnr";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr";
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-3/a6nVr2v9kK/FFmxZq9LQLAoE/yNRcTGojiFPGRkHU=";
|
||||
hash = "sha256-S6qvTzvkS2tBMvuTpmuCx6h0OcKP5NBbmgRgOpAVtnA=";
|
||||
name = "nextpnr";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "stanc";
|
||||
version = "2.32.1";
|
||||
version = "2.32.2";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
duneVersion = "3";
|
||||
|
||||
@ -1722,9 +1722,6 @@ self: super: {
|
||||
servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
|
||||
|
||||
hercules-ci-agent = lib.pipe super.hercules-ci-agent [
|
||||
(pkg: pkg.override (_: {
|
||||
cachix = super.cachix_1_3_3;
|
||||
}))
|
||||
(self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ])
|
||||
];
|
||||
|
||||
|
||||
@ -994,30 +994,43 @@ self: super: builtins.intersectAttrs super {
|
||||
# won't work (or would need to patch test suite).
|
||||
domaindriven-core = dontCheck super.domaindriven-core;
|
||||
|
||||
cachix = overrideCabal (drv: {
|
||||
version = "1.4.2";
|
||||
cachix-api = overrideCabal (drv: {
|
||||
version = "1.5";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "cachix";
|
||||
rev = "v1.4.2";
|
||||
sha256 = "sha256-EjfBM5O+wXJhthRU/Nd9VFue7xo5O93nx0pMt3jx0Ow=";
|
||||
rev = "v1.5";
|
||||
sha256 = "sha256-bt8FFtDSJpBckx3dIjW5Xdvj8aVCm78R3VTpjK5F3Ac=";
|
||||
};
|
||||
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
|
||||
postPatch = ''
|
||||
sed -i 's/1.4.2/1.5/' cachix-api.cabal
|
||||
'';
|
||||
}) super.cachix-api;
|
||||
cachix = overrideCabal (drv: {
|
||||
version = "1.5";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "cachix";
|
||||
rev = "v1.5";
|
||||
sha256 = "sha256-bt8FFtDSJpBckx3dIjW5Xdvj8aVCm78R3VTpjK5F3Ac=";
|
||||
};
|
||||
postUnpack = "sourceRoot=$sourceRoot/cachix";
|
||||
postPatch = ''
|
||||
sed -i 's/1.4.1/1.4.2/' cachix.cabal
|
||||
sed -i 's/1.4.2/1.5/' cachix.cabal
|
||||
'';
|
||||
}) (super.cachix.override {
|
||||
fsnotify = dontCheck super.fsnotify_0_4_1_0;
|
||||
hnix-store-core = super.hnix-store-core_0_6_1_0;
|
||||
});
|
||||
|
||||
cachix_1_3_3 = overrideCabal (drv: {
|
||||
hydraPlatforms = pkgs.lib.platforms.all;
|
||||
}) (super.cachix_1_3_3.override {
|
||||
nix = self.hercules-ci-cnix-store.nixPackage;
|
||||
fsnotify = dontCheck super.fsnotify_0_4_1_0;
|
||||
hnix-store-core = super.hnix-store-core_0_6_1_0;
|
||||
});
|
||||
}) (lib.pipe
|
||||
(super.cachix.override {
|
||||
fsnotify = dontCheck super.fsnotify_0_4_1_0;
|
||||
hnix-store-core = super.hnix-store-core_0_6_1_0;
|
||||
})
|
||||
[
|
||||
(addBuildTool self.hercules-ci-cnix-store.nixPackage)
|
||||
(addBuildTool pkgs.pkg-config)
|
||||
(addBuildDepend self.inline-c-cpp)
|
||||
(addBuildDepend self.hercules-ci-cnix-store)
|
||||
]
|
||||
);
|
||||
|
||||
hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };
|
||||
hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });
|
||||
|
||||
@ -1,20 +1,23 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nickel";
|
||||
version = "0.3.1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tweag";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}"; # because pure ${version} doesn't work
|
||||
hash = "sha256-bUUQP7ze0j8d+VEckexDOferAgAHdKZbdKR3q0TNOeE=";
|
||||
hash = "sha256-8peoO3B5LHKiTUyDLpe0A2xg82LPI7l2vuGdyNhV478=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-E8eIUASjCIVsZhptbU41VfK8bFmA4FTT3LVagLrgUso=";
|
||||
cargoHash = "sha256-lrRCc5kUekUHrJTznR8xRiLVgQLJ/PsMP967PS41UJU=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://nickel-lang.org/";
|
||||
@ -29,6 +32,6 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
maintainers = with maintainers; [ AndersonTorres felschr ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -286,6 +286,7 @@ let
|
||||
license = licenses.ruby;
|
||||
maintainers = with maintainers; [ vrthra manveru marsam ];
|
||||
platforms = platforms.all;
|
||||
knownVulnerabilities = op (lib.versionOlder ver.majMin "3.0") "This Ruby release has reached its end of life. See https://www.ruby-lang.org/en/downloads/branches/.";
|
||||
};
|
||||
|
||||
passthru = rec {
|
||||
|
||||
207
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
207
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
@ -60,9 +60,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "0.7.20"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
|
||||
checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@ -114,9 +114,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.70"
|
||||
version = "1.0.71"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
|
||||
checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
]
|
||||
@ -270,7 +270,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.13",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -306,9 +306,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||
|
||||
[[package]]
|
||||
name = "axum"
|
||||
version = "0.6.12"
|
||||
version = "0.6.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491"
|
||||
checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"axum-core",
|
||||
@ -341,9 +341,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "axum-core"
|
||||
version = "0.3.3"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e"
|
||||
checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bytes",
|
||||
@ -1144,7 +1144,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat"
|
||||
version = "1.114.0"
|
||||
version = "1.115.0"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
@ -1219,7 +1219,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-jsonrpc"
|
||||
version = "1.114.0"
|
||||
version = "1.115.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-channel",
|
||||
@ -1242,7 +1242,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-repl"
|
||||
version = "1.114.0"
|
||||
version = "1.115.0"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
@ -1257,7 +1257,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-rpc-server"
|
||||
version = "1.114.0"
|
||||
version = "1.115.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
@ -1277,12 +1277,12 @@ name = "deltachat_derive"
|
||||
version = "2.0.0"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 2.0.13",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "deltachat_ffi"
|
||||
version = "1.114.0"
|
||||
version = "1.115.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
@ -1422,9 +1422,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "5.0.0"
|
||||
version = "5.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
|
||||
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
|
||||
dependencies = [
|
||||
"dirs-sys",
|
||||
]
|
||||
@ -1441,13 +1441,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys"
|
||||
version = "0.4.0"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
|
||||
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"option-ext",
|
||||
"redox_users",
|
||||
"windows-sys 0.45.0",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2036,9 +2037,9 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
|
||||
|
||||
[[package]]
|
||||
name = "futures-lite"
|
||||
version = "1.12.0"
|
||||
version = "1.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
|
||||
checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
|
||||
dependencies = [
|
||||
"fastrand",
|
||||
"futures-core",
|
||||
@ -2057,7 +2058,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.13",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2307,9 +2308,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
|
||||
|
||||
[[package]]
|
||||
name = "human-panic"
|
||||
version = "1.1.3"
|
||||
version = "1.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0a6557b29bbdc9d6c7a5cdbe2962e78eaf48115e8d55b0b62282956981c1f605"
|
||||
checksum = "c16465f6227e18e5a64eba488245d7b2974d4db0c4404ca5a69b550defa18d0a"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"os_info",
|
||||
@ -2660,9 +2661,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.140"
|
||||
version = "0.2.142"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
|
||||
checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
|
||||
|
||||
[[package]]
|
||||
name = "libm"
|
||||
@ -3153,6 +3154,12 @@ dependencies = [
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "option-ext"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
||||
|
||||
[[package]]
|
||||
name = "os_info"
|
||||
version = "3.6.0"
|
||||
@ -3603,7 +3610,7 @@ dependencies = [
|
||||
"rand 0.8.5",
|
||||
"rand_chacha 0.3.1",
|
||||
"rand_xorshift",
|
||||
"regex-syntax",
|
||||
"regex-syntax 0.6.29",
|
||||
"unarray",
|
||||
]
|
||||
|
||||
@ -3645,9 +3652,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
|
||||
|
||||
[[package]]
|
||||
name = "quick-xml"
|
||||
version = "0.28.1"
|
||||
version = "0.28.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2"
|
||||
checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@ -3874,13 +3881,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.7.3"
|
||||
version = "1.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
|
||||
checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax",
|
||||
"regex-syntax 0.7.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3889,7 +3896,7 @@ version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
||||
dependencies = [
|
||||
"regex-syntax",
|
||||
"regex-syntax 0.6.29",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3899,10 +3906,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
version = "0.11.16"
|
||||
name = "regex-syntax"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
|
||||
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
|
||||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
version = "0.11.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91"
|
||||
dependencies = [
|
||||
"base64 0.21.0",
|
||||
"bytes",
|
||||
@ -4280,9 +4293,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.159"
|
||||
version = "1.0.160"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
|
||||
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
@ -4307,20 +4320,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.159"
|
||||
version = "1.0.160"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
|
||||
checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.13",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.95"
|
||||
version = "1.0.96"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
|
||||
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
@ -4620,9 +4633,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.13"
|
||||
version = "2.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
|
||||
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -4752,7 +4765,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.13",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -4830,9 +4843,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.27.0"
|
||||
version = "1.28.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
|
||||
checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"bytes",
|
||||
@ -4844,7 +4857,7 @@ dependencies = [
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"tokio-macros",
|
||||
"windows-sys 0.45.0",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -4859,13 +4872,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio-macros"
|
||||
version = "2.0.0"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
|
||||
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.13",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -4895,9 +4908,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio-stream"
|
||||
version = "0.1.12"
|
||||
version = "0.1.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313"
|
||||
checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"pin-project-lite",
|
||||
@ -4933,9 +4946,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio-util"
|
||||
version = "0.7.7"
|
||||
version = "0.7.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
|
||||
checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"futures-core",
|
||||
@ -5275,9 +5288,9 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
|
||||
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
version = "1.3.0"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
|
||||
checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2"
|
||||
dependencies = [
|
||||
"getrandom 0.2.8",
|
||||
"serde",
|
||||
@ -5503,12 +5516,12 @@ version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_gnullvm 0.42.1",
|
||||
"windows_aarch64_msvc 0.42.1",
|
||||
"windows_i686_gnu 0.42.1",
|
||||
"windows_i686_msvc 0.42.1",
|
||||
"windows_x86_64_gnu 0.42.1",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_gnullvm 0.42.1",
|
||||
"windows_x86_64_msvc 0.42.1",
|
||||
]
|
||||
|
||||
@ -5518,7 +5531,16 @@ version = "0.45.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
"windows-targets 0.42.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
|
||||
dependencies = [
|
||||
"windows-targets 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -5527,21 +5549,42 @@ version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_gnullvm 0.42.1",
|
||||
"windows_aarch64_msvc 0.42.1",
|
||||
"windows_i686_gnu 0.42.1",
|
||||
"windows_i686_msvc 0.42.1",
|
||||
"windows_x86_64_gnu 0.42.1",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_gnullvm 0.42.1",
|
||||
"windows_x86_64_msvc 0.42.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm 0.48.0",
|
||||
"windows_aarch64_msvc 0.48.0",
|
||||
"windows_i686_gnu 0.48.0",
|
||||
"windows_i686_msvc 0.48.0",
|
||||
"windows_x86_64_gnu 0.48.0",
|
||||
"windows_x86_64_gnullvm 0.48.0",
|
||||
"windows_x86_64_msvc 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.32.0"
|
||||
@ -5554,6 +5597,12 @@ version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.32.0"
|
||||
@ -5566,6 +5615,12 @@ version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.32.0"
|
||||
@ -5578,6 +5633,12 @@ version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.32.0"
|
||||
@ -5590,12 +5651,24 @@ version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.32.0"
|
||||
@ -5608,6 +5681,12 @@ version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.4.1"
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.114.0";
|
||||
version = "1.115.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fonrf4DZI5HhUY08yZmAHp2SKJYA2OywVBa31W7O1qU=";
|
||||
hash = "sha256-GAU/v2/MwvgqtZnvp2wwrKpPXhzr5g7QxVngR+pt35c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
import tarfile
|
||||
import sys
|
||||
|
||||
|
||||
def process_columns(line: list[str]) -> tuple[str, list[str]]:
|
||||
match line:
|
||||
case [name, h_prefix, nrbytes, flags]:
|
||||
return (h_prefix, flags.lower().split(","))
|
||||
case other:
|
||||
raise Exception("Unsupported hashes.conf line format", other)
|
||||
|
||||
|
||||
def find_tar_file(tar: tarfile.TarFile, requested_name: str):
|
||||
"""Attempts to find a single file with given name in tarball."""
|
||||
all_names = tar.getnames()
|
||||
|
||||
if requested_name in all_names:
|
||||
return requested_name
|
||||
|
||||
requested_suffix = f"/{requested_name}"
|
||||
candidate_names = [name for name in all_names if name.endswith(requested_suffix)]
|
||||
match candidate_names:
|
||||
case [real_name]:
|
||||
return real_name
|
||||
case other:
|
||||
raise KeyError(
|
||||
f"Could not locate a single {requested_name} in the contents of the tarball."
|
||||
)
|
||||
|
||||
|
||||
hashes_path = "lib/hashes.conf"
|
||||
|
||||
|
||||
def main() -> None:
|
||||
match sys.argv:
|
||||
case [_name, src, enable_hashes, "--", *enabled_crypt_scheme_ids]:
|
||||
pass
|
||||
case other:
|
||||
raise Exception(
|
||||
"Incorrect number of arguments. Usage: check_passthru_matches.py <src> <enable_hashes> -- <enabled_crypt_scheme_ids...>"
|
||||
)
|
||||
|
||||
with tarfile.open(src, "r") as tar:
|
||||
real_hashes_path = find_tar_file(tar, hashes_path)
|
||||
config = tar.extractfile(real_hashes_path).read().decode("utf-8")
|
||||
|
||||
formats = [
|
||||
process_columns(columns)
|
||||
for line in config.splitlines()
|
||||
if not line.startswith("#") and len(columns := line.split()) > 0
|
||||
]
|
||||
expected_supported_formats = set(
|
||||
prefix
|
||||
for (prefix, flags) in formats
|
||||
if enable_hashes in flags or enable_hashes == "all"
|
||||
)
|
||||
passthru_supported_schemes = set(
|
||||
f"${scheme}$" for scheme in enabled_crypt_scheme_ids
|
||||
)
|
||||
|
||||
assert (
|
||||
len(expected_supported_formats - passthru_supported_schemes) == 0
|
||||
), f"libxcrypt package enables the following crypt schemes that are not listed in passthru.enabledCryptSchemeIds: {expected_supported_formats - passthru_supported_schemes}"
|
||||
assert (
|
||||
len(passthru_supported_schemes - expected_supported_formats) == 0
|
||||
), f"libxcrypt package lists the following crypt schemes in passthru.enabledCryptSchemeIds that are not supported: {passthru_supported_schemes - expected_supported_formats}"
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -2,14 +2,16 @@
|
||||
# Update the enabled crypt scheme ids in passthru when the enabled hashes change
|
||||
, enableHashes ? "strong"
|
||||
, nixosTests
|
||||
, runCommand
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libxcrypt";
|
||||
version = "4.4.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/besser82/libxcrypt/releases/download/v${version}/libxcrypt-${version}.tar.xz";
|
||||
url = "https://github.com/besser82/libxcrypt/releases/download/v${finalAttrs.version}/libxcrypt-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-6HrPnGUsVzpHE9VYIVn5jzBdVu1fdUzmT1fUGU1rOm8=";
|
||||
};
|
||||
|
||||
@ -37,6 +39,11 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) login shadow;
|
||||
|
||||
passthruMatches = runCommand "libxcrypt-test-passthru-matches" { } ''
|
||||
${python3.interpreter} "${./check_passthru_matches.py}" ${lib.escapeShellArgs ([ finalAttrs.src enableHashes "--" ] ++ finalAttrs.passthru.enabledCryptSchemeIds)}
|
||||
touch "$out"
|
||||
'';
|
||||
};
|
||||
enabledCryptSchemeIds = [
|
||||
# https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf
|
||||
@ -57,4 +64,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ dottedmag hexa ];
|
||||
license = licenses.lgpl21Plus;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "live555";
|
||||
version = "2023.03.30";
|
||||
version = "2023.05.10";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
|
||||
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-v/1Nh8dicdWeNxFp7bakhEaKB4ysKtRFnyLKqNmJ2tQ=";
|
||||
sha256 = "sha256-6ph9x4UYELkkJVIE9r25ycc5NOYbPcgAy9LRZebvGFY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic-v3.nix ({
|
||||
version = "3.8.0";
|
||||
sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8";
|
||||
} // args)
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioswitcher";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "TomerFi";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dg3oGSwRoOFkX97ZBk7fgOv0fZjOZ+FRXNO9DKEU6Zk=";
|
||||
hash = "sha256-coTENnNX8GFLstpQtuJOC8050llW4QuLiutYARDWaSo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-detect-secrets";
|
||||
version = "1.4.27";
|
||||
version = "1.4.28";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "bridgecrewio";
|
||||
repo = "detect-secrets";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-iQNMU77nTv6KY9LJb1fiBUVs5LkpX732UpJAYdUWNyc=";
|
||||
hash = "sha256-SH45I+81fqvViyiiSwYJq6v8PPcWENCh0Ey6taKI3Us=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitstring";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "scott-griffiths";
|
||||
repo = pname;
|
||||
rev = "bitstring-${version}";
|
||||
hash = "sha256-eHP20F9PRe9ZNXjcDcsI3iFVswA6KtRWhBMAT7dkCv0=";
|
||||
hash = "sha256-LghfDjf/Z1dEU0gjH1cqMb04ChnW+aGDjmN+RAhMWW8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,25 +1,26 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
{ lib
|
||||
, stdenv
|
||||
, apscheduler
|
||||
, bitstring
|
||||
, buildPythonPackage
|
||||
, cffi
|
||||
, ecdsa
|
||||
, fetchFromGitHub
|
||||
, monero
|
||||
, poetry-core
|
||||
, pypng
|
||||
, pyqrcode
|
||||
, pyramid
|
||||
, pyramid_jinja2
|
||||
, pysocks
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, tzlocal
|
||||
, waitress
|
||||
, yoyo-migrations
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, webtest
|
||||
, yoyo-migrations
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -27,6 +28,8 @@ buildPythonPackage rec {
|
||||
version = "1.0.16";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CypherpunkPay";
|
||||
repo = "CypherpunkPay";
|
||||
@ -34,17 +37,18 @@ buildPythonPackage rec {
|
||||
hash = "sha256-X0DB0PVwR0gRnt3jixFzglWAOPKBMvqTOG6pK6OJ03w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "bitstring = '^3.1.9'" "bitstring = '>=3.1.9'" \
|
||||
--replace 'cffi = "1.15.0"' 'cffi = ">=1.15.0"' \
|
||||
--replace 'ecdsa = "^0.17.0"' 'ecdsa = ">=0.17.0"' \
|
||||
--replace 'pypng = "^0.0.20"' 'pypng = ">=0.0.20"' \
|
||||
--replace 'tzlocal = "2.1"' 'tzlocal = ">=2.1"'
|
||||
'';
|
||||
pythonRelaxDeps = [
|
||||
"bitstring"
|
||||
"cffi"
|
||||
"ecdsa"
|
||||
"pypng"
|
||||
"tzlocal"
|
||||
"yoyo-migrations"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -66,10 +70,14 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
webtest
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W"
|
||||
"ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# performance test
|
||||
"tests/unit/tools/pbkdf2_test.py"
|
||||
@ -94,9 +102,14 @@ buildPythonPackage rec {
|
||||
"tests/acceptance/views_dummystore"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cypherpunkpay"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern self-hosted software for accepting Bitcoin";
|
||||
homepage = "https://cypherpunkpay.org";
|
||||
homepage = "https://github.com/CypherpunkPay/CypherpunkPay";
|
||||
changelog = "https://github.com/CypherpunkPay/CypherpunkPay/releases/tag/v${version}";
|
||||
license = with licenses; [ mit /* or */ unlicense ];
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "2.9.1";
|
||||
version = "2.9.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bxWSYDKKnsWs/bTRkIsNJ2hOIoHS2xhl4IIW+uEnbMU=";
|
||||
hash = "sha256-3Q9rp2V8TawT5yT3TBtdUgnMFqFGRNQCDhtgMb2dS6U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-bootstrap4";
|
||||
version = "3.0.1";
|
||||
version = "23.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zostera";
|
||||
repo = "django-bootstrap4";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5t6b/1921AMDqoYg7XC2peGxOBFE8XlvgGjHnTlQa4c=";
|
||||
hash = "sha256-55pfUPwxDzpDn4stMEPvrQAexs+goN5SKFvwSR3J4aM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-render";
|
||||
version = "0.5.0";
|
||||
version = "0.5.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-x9vb8X7p4MOMZwr91ronXB/bPZD3PqYhbzLccRewyco=";
|
||||
hash = "sha256-u3llBwuojMRhWkbGW3AF3HyDmiN2Mywf2TF1BDCG0Q0=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-studio-client";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yiNhvemeN3Dbs8/UvdTsy0K/FORoAy27tvT4ElwFxRk=";
|
||||
hash = "sha256-ko69Zhs3B7zEq+CFky0Ff4Vf4MJbCLEp+q79s+5MtJM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ecs-logging";
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "elastic";
|
||||
repo = "ecs-logging-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2BfZ96D24sfjFD6l+gjp6xXbSJ0kjQD/FhHLI3bpVGM=";
|
||||
hash = "sha256-CfPpUpzNfPuCAiuNsJrJ1nVLiUCPvclfrK7tByytoQE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "edk2-pytool-library";
|
||||
version = "0.14.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tianocore";
|
||||
repo = "edk2-pytool-library";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-l3ZM2xxZrFz7n/uLSd994l+mGJDi4Qw4C2Lg2uyttL8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
pythonImportsCheck = [ "edk2toollib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library package that supports UEFI development";
|
||||
homepage = "https://github.com/tianocore/edk2-pytool-library";
|
||||
license = licenses.bsd2Patent;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
||||
@ -85,7 +85,10 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Neural network library for JAX";
|
||||
homepage = "https://github.com/google/flax";
|
||||
changelog = "https://github.com/google/flax/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ndl ];
|
||||
# Requires orbax which is not available
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -27,14 +27,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-auth";
|
||||
version = "2.17.3";
|
||||
version = "2.18.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zjEeK8WLEw/d8xbfV8mzlDwqe09uwx3pZjqTM+QGTvw=";
|
||||
hash = "sha256-16MkkCfn9GT7v9fugxmgitCdLupRV4V1xL02D/oEnMs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-kms";
|
||||
version = "2.16.1";
|
||||
version = "2.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CspzN6DaD62IBATlB/+vefIf2oMT9Cwr9kHq63V6k2Q=";
|
||||
hash = "sha256-AoIoGmOvL0mAD5dhsWxIkIFAw4G+1i9SyNF4D5I4Fz0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-resource-manager";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-v8PmDrkuJaxWKpJIu4/BfpvvBMPcnwMf++Df4o2Rkoc=";
|
||||
hash = "sha256-yXT7b5gQR2z3tj6ok5TBqN9H9/LcIwPnKLt0tQC83mc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-spanner";
|
||||
version = "3.33.0";
|
||||
version = "3.34.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-k+2s1GPBK/mPCwRK0UzuoNSKNMouwIcoRM7BagXUNS8=";
|
||||
hash = "sha256-1eDl130G8UqQ7Sgix1uoUf6h2eA/bTIwL2yzF1kK2PM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,25 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, justbases
|
||||
, unittestCheckHook
|
||||
, hypothesis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "justbytes";
|
||||
version = "0.15";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qrMO9X0v5yYjeWa72mogegR+ii8tCi+o7qZ+Aff2wZQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mulkieran";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+jwIK1ZU+j58VoOfZAm7GdFy7KHU28khwzxhYhcws74=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ justbases ];
|
||||
nativeCheckInputs = [ hypothesis ];
|
||||
nativeCheckInputs = [ unittestCheckHook hypothesis ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "computing with and displaying bytes";
|
||||
homepage = "https://pythonhosted.org/justbytes";
|
||||
homepage = "https://github.com/mulkieran/justbytes";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "neo4j";
|
||||
version = "5.8.0";
|
||||
version = "5.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "neo4j";
|
||||
repo = "neo4j-python-driver";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-11fa6scRcC+bQxEccCgxSJaMjwkUVs4DQj1NSaXlpb8=";
|
||||
hash = "sha256-kcZtfK4OogHvnZT789LfF7yi9jSWSCXPp0QC2RWAe+I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
38
pkgs/development/python-modules/opcua-widgets/default.nix
Normal file
38
pkgs/development/python-modules/opcua-widgets/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ pkgs
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pyqt5
|
||||
, asyncua
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opcua-widgets";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeOpcUa";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ABJlKYN5H/1k8ynvSTSoJBX12vTTyavuNUAmTJ84mn0=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyqt5
|
||||
asyncua
|
||||
];
|
||||
|
||||
pythonImportChecks = [ "opcua-widgets" ];
|
||||
|
||||
#This test is broken, when updating this package check if the test was fixed.
|
||||
doCheck = false;
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "Common widgets for opcua-modeler og opcua-client-gui";
|
||||
homepage = "https://github.com/FreeOpcUa/opcua-widgets";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ janik ];
|
||||
};
|
||||
}
|
||||
@ -1,40 +1,49 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pytest
|
||||
, jdcal
|
||||
, et_xmlfile
|
||||
, fetchFromGitLab
|
||||
, jdcal
|
||||
, lxml
|
||||
, pillow
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openpyxl";
|
||||
version = "3.1.1";
|
||||
disabled = isPy27; # 2.6.4 was final python2 release
|
||||
version = "3.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8G1E4slzeBBovOXs+GCgm82xx/XOH6zV6aqCySyTrnI=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "foss.heptapod.net";
|
||||
owner = "openpyxl";
|
||||
repo = "openpyxl";
|
||||
rev = version;
|
||||
hash = "sha256-SWRbjA83AOLrfe6on2CSb64pH5EWXkfyYcTqWJNBEP0=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ jdcal et_xmlfile lxml ];
|
||||
propagatedBuildInputs = [
|
||||
jdcal
|
||||
et_xmlfile
|
||||
lxml
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# LICENSE.rst is missing, and setup.cfg currently doesn't contain anything useful anyway
|
||||
# This should likely be removed in the next update
|
||||
rm setup.cfg
|
||||
'';
|
||||
nativeCheckInputs = [
|
||||
pillow
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests are not included in archive.
|
||||
# https://bitbucket.org/openpyxl/openpyxl/issues/610
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [
|
||||
"openpyxl"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A Python library to read/write Excel 2007 xlsx/xlsm files";
|
||||
meta = with lib; {
|
||||
description = "Python library to read/write Excel 2010 xlsx/xlsm files";
|
||||
homepage = "https://openpyxl.readthedocs.org";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lihop ];
|
||||
changelog = "https://foss.heptapod.net/openpyxl/openpyxl/-/blob/${version}/doc/changes.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lihop ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, toml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -34,6 +35,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
toml
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -6,22 +6,27 @@
|
||||
, pytest-timeout
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypck";
|
||||
version = "0.7.16";
|
||||
format = "setuptools";
|
||||
version = "0.7.17";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alengwenus";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-OcXMVgG62JUH28BGvfO/rpnC++/klhBLJ2HafDu9R40=";
|
||||
hash = "sha256-Vlt4+fRULb9mB0ceRmc7MJ50DnF9DAJPHA8iCbNVvcE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-timeout
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyquil";
|
||||
version = "3.3.4";
|
||||
version = "3.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "rigetti";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iHyYX9e3O611OzBMafqn4V+yR1y8y4twiJehYDYlvdg=";
|
||||
hash = "sha256-Fr9SnAzDHaSKp0AYra/gCZOJ5Fzcx1EO56ahZQZP2Ss=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma";
|
||||
version = "0.9.9";
|
||||
version = "0.9.11";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-N3BHIec1j4G5bVQu5KKTzmxr4fFjTWIZdmtp1pSfdSg=";
|
||||
hash = "sha256-lbpx5THSegZK09jREH15RpokmdfOng2vX4tClsc/x/A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-benedict";
|
||||
version = "0.30.0";
|
||||
version = "0.30.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "fabiocaccamo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/LERLQw0Jb/Yuf2CfEKIZ658LtSkHjMvMxGcB00IgKs=";
|
||||
hash = "sha256-7X8a9033r6MJT1KgPH7FiXL0EZqwi4wnKVw5AYAaVR8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "0.18.3";
|
||||
version = "0.18.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-a1X7aRWURteIBVwl+pgHcaeWXAWv+zicz154fJgWVy4=";
|
||||
hash = "sha256-UyRPaMI1Ur4a4JtBuEoRlEz8E8NB+jGWsPVIk0z9jeg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,23 +9,28 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-slugify";
|
||||
version = "6.1.2";
|
||||
version = "8.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "un33k";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JGjUNBEMuICsaClQGDSGX4qFRjecVKzmpPNRUTvfwho=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MJac63XjgWdUQdyyEm8O7gAGVszmHxZzRF4frJtR0BU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
text-unidecode
|
||||
unidecode
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
unidecode = [
|
||||
unidecode
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
@ -41,6 +46,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python Slugify application that handles Unicode";
|
||||
homepage = "https://github.com/un33k/python-slugify";
|
||||
changelog = "https://github.com/un33k/python-slugify/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
};
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "regenmaschine";
|
||||
version = "2023.05.0";
|
||||
version = "2023.05.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-u6GHDiTGa7v9tK/4VTVPQL/2kjomo0x/EGC7LD8lMvM=";
|
||||
hash = "sha256-8+lHfepVvR1+est5RImV4L3PHtME1o8xRX2cI1YpUKI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snapcast";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "happyleavesaoc";
|
||||
repo = "python-snapcast";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kUUKDcHnWA+saqQM7aCfW9NmhG6DYsB21tlEQ3cYNs4=";
|
||||
hash = "sha256-IFgSO0PjlFb4XJarx50Xnx6dF4tBKk3sLcoLWVdpnk8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-urllib3";
|
||||
version = "1.26.25.12";
|
||||
version = "1.26.25.13";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-oVVzVc6NNQpVXRQlifMAGQN1fS02wYpm9YjZZZu8kX0=";
|
||||
hash = "sha256-MwBTjJ3BHa0y6uSCesMT9dmGuLIUlIAfG/l6GsbAOuU=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs-ble";
|
||||
version = "2.1.16";
|
||||
version = "2.1.17";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dA0g5HAvbnN1t2D+JTfphxZUEbUT7NBLY6oCKFNf5E8=";
|
||||
hash = "sha256-mN3/spDTWJfSCsKcRV24+tIjWmxI1gsO5qGuAZykWY0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -22,14 +22,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.3.237";
|
||||
version = "2.3.246";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7ugTfWv6CRj5vsrT1DvfaR39Ytct3tse+2210WBHP9g=";
|
||||
hash = "sha256-IDyDvwpCB/rZkaAWmAvudctT3FDDCKentqJVfM/YV7s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -121,6 +121,7 @@ buildPythonApplication rec {
|
||||
"test_secret_value_in_keyword"
|
||||
"test_runner_verify_secrets_skip_invalid_suppressed"
|
||||
"test_runner_verify_secrets_skip_all_no_effect"
|
||||
"test_runner"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@ -21,25 +21,20 @@
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ashpd-demo";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src =
|
||||
let
|
||||
share = fetchFromGitHub {
|
||||
owner = "bilelmoussaoui";
|
||||
repo = "ashpd";
|
||||
rev = version;
|
||||
sha256 = "9O6XqM4oys/hXgztQQ8tTobJV8U52db/VY6FlTMUvGY=";
|
||||
};
|
||||
in
|
||||
"${share}/ashpd-demo";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bilelmoussaoui";
|
||||
repo = "ashpd";
|
||||
rev = "${finalAttrs.version}-demo";
|
||||
hash = "sha256-isc0+Mke6XeCCLiuxnjHqrnlGqYuQnmcU1acM14UOno=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-eFq42m16zzrUBbAqv7BsAf4VxyO93WynLjvIzKbZwnQ=";
|
||||
src = "${finalAttrs.src}/ashpd-demo";
|
||||
hash = "sha256-9L/WFL2fLCRahjGCVdgV+3HfDMrntdIWcuuOJbzdPiI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -66,13 +61,9 @@ stdenv.mkDerivation rec {
|
||||
libshumate
|
||||
];
|
||||
|
||||
# FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream
|
||||
# https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
postPatch = ''
|
||||
cd ashpd-demo
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for playing with XDG desktop portals";
|
||||
@ -81,4 +72,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
24
pkgs/development/tools/language-servers/nls/default.nix
Normal file
24
pkgs/development/tools/language-servers/nls/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, nickel
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "nls";
|
||||
|
||||
inherit (nickel) src version;
|
||||
|
||||
cargoHash = "sha256-tahSuSc16oUUjeBBAnTDAiSaLr0zMKgN/XvypXqvvxw=";
|
||||
|
||||
cargoBuildFlags = [ "-p nickel-lang-lsp" ];
|
||||
|
||||
meta = {
|
||||
inherit (nickel.meta) homepage changelog license maintainers;
|
||||
description = "A language server for the Nickel programming language";
|
||||
longDescription = ''
|
||||
The Nickel Language Server (NLS) is a language server for the Nickel
|
||||
programming language. NLS offers error messages, type hints, and
|
||||
auto-completion right in your favorite LSP-enabled editor.
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -17,8 +17,8 @@ buildBazelPackage rec {
|
||||
# These environment variables are read in bazel/build-version.py to create
|
||||
# a build string shown in the tools --version output.
|
||||
# If env variables not set, it would attempt to extract it from .git/.
|
||||
GIT_DATE = "2023-04-14";
|
||||
GIT_VERSION = "v0.0-3179-g525ffaf7";
|
||||
GIT_DATE = "2023-05-05";
|
||||
GIT_VERSION = "v0.0-3253-gf85c768c";
|
||||
|
||||
# Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345"
|
||||
version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION)));
|
||||
@ -27,7 +27,7 @@ buildBazelPackage rec {
|
||||
owner = "chipsalliance";
|
||||
repo = "verible";
|
||||
rev = "${GIT_VERSION}";
|
||||
sha256 = "sha256-IXS8yeyryBNpPkCpMcOUsdIlKo447d0a8aZKroFJOzM=";
|
||||
sha256 = "sha256-scLYQQt6spBImJEYG60ZbIsUfKqWBj2DINjZgFKESoI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,89 +1,96 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, libdrm
|
||||
, libpciaccess
|
||||
, cairo
|
||||
, xorgproto
|
||||
, udev
|
||||
, libX11
|
||||
, libXext
|
||||
, libXv
|
||||
, libXrandr
|
||||
, glib
|
||||
, fetchFromGitLab
|
||||
|
||||
# build time
|
||||
, bison
|
||||
, libunwind
|
||||
, python3
|
||||
, kmod
|
||||
, procps
|
||||
, utilmacros
|
||||
, gtk-doc
|
||||
, docbook_xsl
|
||||
, openssl
|
||||
, peg
|
||||
, elfutils
|
||||
, docutils
|
||||
, flex
|
||||
, gtk-doc
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, utilmacros
|
||||
|
||||
# runtime
|
||||
, alsa-lib
|
||||
, cairo
|
||||
, curl
|
||||
, elfutils
|
||||
, glib
|
||||
, gsl
|
||||
, json_c
|
||||
, kmod
|
||||
, libdrm
|
||||
, liboping
|
||||
, libpciaccess
|
||||
, libunwind
|
||||
, libX11
|
||||
, libXext
|
||||
, libXrandr
|
||||
, libXv
|
||||
, openssl
|
||||
, peg
|
||||
, procps
|
||||
, python3
|
||||
, udev
|
||||
, valgrind
|
||||
, xmlrpc_c
|
||||
, gsl
|
||||
, alsa-lib
|
||||
, curl
|
||||
, json_c
|
||||
, liboping
|
||||
, flex
|
||||
, docutils
|
||||
, xorgproto
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gpu-tools";
|
||||
version = "1.26";
|
||||
version = "1.27.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-${version}.tar.xz";
|
||||
sha256 = "1dwvxh1yplsh1a7h3gpp40g91v12cfxy6yy99s1v9yr2kwxikm1n";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "drm";
|
||||
repo = "igt-gpu-tools";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7Z9Y7uUjtjdQbB+xV/fvO18xB18VV7fBZqw1fI7U0jQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with meson 0.60
|
||||
(fetchpatch {
|
||||
url = "https://github.com/freedesktop/xorg-intel-gpu-tools/commit/963917a3565466832a3b2fc22e9285d34a0bf944.patch";
|
||||
sha256 = "sha256-goO2N7aK2dJYMhFGS1DlvjEYMSijN6stV6Q5z/RP8Ko=";
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
docbook_xsl
|
||||
docutils
|
||||
flex
|
||||
gtk-doc
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
utilmacros
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config utilmacros meson ninja flex bison gtk-doc docutils docbook_xsl ];
|
||||
buildInputs = [
|
||||
libdrm
|
||||
libpciaccess
|
||||
alsa-lib
|
||||
cairo
|
||||
xorgproto
|
||||
udev
|
||||
libX11
|
||||
kmod
|
||||
libXext
|
||||
libXv
|
||||
libXrandr
|
||||
curl
|
||||
elfutils
|
||||
glib
|
||||
gsl
|
||||
json_c
|
||||
kmod
|
||||
libdrm
|
||||
liboping
|
||||
libpciaccess
|
||||
libunwind
|
||||
python3
|
||||
procps
|
||||
libX11
|
||||
libXext
|
||||
libXrandr
|
||||
libXv
|
||||
openssl
|
||||
peg
|
||||
elfutils
|
||||
procps
|
||||
python3
|
||||
udev
|
||||
valgrind
|
||||
xmlrpc_c
|
||||
gsl
|
||||
alsa-lib
|
||||
curl
|
||||
json_c
|
||||
liboping
|
||||
xorgproto
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs tests man
|
||||
'';
|
||||
@ -91,7 +98,8 @@ stdenv.mkDerivation rec {
|
||||
hardeningDisable = [ "bindnow" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://01.org/linuxgraphics/";
|
||||
changelog = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/v${version}/NEWS";
|
||||
homepage = "https://drm.pages.freedesktop.org/igt-gpu-tools/";
|
||||
description = "Tools for development and testing of the Intel DRM driver";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pulumictl";
|
||||
version = "0.0.42";
|
||||
version = "0.0.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "pulumictl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fs+etB/tzqzV3QbQKa4xqsAjtUkr1BdKtTNvRylnKaY=";
|
||||
sha256 = "sha256-iz0ahzR0+CpNZSLbR9zyIRS5k3y1GYbh7BPif9I6n4k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "skaffold";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "skaffold";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-feUR8R8mlKfSV2ct9EeAcEHJiK7Hb5PAXTnES9UG2Qc=";
|
||||
hash = "sha256-0sOj5U9GFDFOs6uvgGHQfRFLlAoGk1DwRW4kN0lOIK0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "upbound";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "up";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7fR6RiyxPgaf2uK/JY9ydwdUcRRhShFK2ij6WVTA/Vc=";
|
||||
sha256 = "sha256-WUMFWI3SzpgQgf6txOOIVTK/gTp9h5w/iQUkwyxVbKA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FDwcsf69l8GcMet9zUG2fuyoZgpEujB3A59eWg2GbdI=";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aaaaxy";
|
||||
version = "1.3.524";
|
||||
version = "1.3.530";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "divVerent";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9g0wTvG6XSKI7e3RP6e3RoYyvE5UjOYxI5hVINI9Fq8=";
|
||||
hash = "sha256-jbuBkxd686ky7KFYUaLJ51jon5hwuwkr0QdhMTtZ7eo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Mk+5s9OlkyTLXZYVT0+8Qcjy2Sb5uy2hcC8CML0biNY=";
|
||||
};
|
||||
|
||||
buildInputs = [ file ];
|
||||
buildInputs = [ file stdenv.cc.cc.libgcc ];
|
||||
nativeBuildInputs = [ autoPatchelfHook unzip ];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
50
pkgs/misc/opcua-client-gui/default.nix
Normal file
50
pkgs/misc/opcua-client-gui/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "opcua-client-gui";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeOpcUa";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pyqt5
|
||||
asyncua
|
||||
opcua-widgets
|
||||
numpy
|
||||
pyqtgraph
|
||||
];
|
||||
|
||||
#This test uses a deprecated libarby, when updating the package check if the test was updated as well
|
||||
doCheck = false;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "opcua-client";
|
||||
exec = "opcua-client";
|
||||
comment = "OPC UA Client";
|
||||
type = "Application";
|
||||
#no icon because the app dosn't have one
|
||||
desktopName = "opcua-client";
|
||||
terminal = false;
|
||||
categories = [ "Utility" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OPC UA GUI Client";
|
||||
homepage = "https://github.com/FreeOpcUa/opcua-client-gui";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ janik ];
|
||||
};
|
||||
}
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
let
|
||||
pname = "yabai";
|
||||
version = "5.0.2";
|
||||
version = "5.0.4";
|
||||
|
||||
test-version = testers.testVersion {
|
||||
package = yabai;
|
||||
@ -52,7 +52,7 @@ in
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
|
||||
sha256 = "sha256-wL6N2+mfFISrOFn4zaCQI+oH6ixwUMRKRi1dAOigBro=";
|
||||
sha256 = "sha256-2PH3Hi9x0323MjKHPybNmFddvNNlsaDb1LdiVcZTNJc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -88,7 +88,7 @@ in
|
||||
owner = "koekeishiya";
|
||||
repo = "yabai";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/HS8TDzDA4Zvmm56ZZeMXyCKHRRTcucd7qDHT0qbrQg=";
|
||||
sha256 = "sha256-TCY0EvP0+2+U1k9kYIi8jMt4mj3ZRaQPsb1wtU3Z2U4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
2833
pkgs/os-specific/linux/firmware/firmware-manager/Cargo.lock
generated
2833
pkgs/os-specific/linux/firmware/firmware-manager/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -13,20 +13,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "firmware-manager";
|
||||
version = "unstable-2022-12-09";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = "9be8160346689bd74f95db7897884a91fa48afe3";
|
||||
sha256 = "sha256-zZk2RVghhKxETSVv/Jtv8Wq6+ITx/BudE/o7h4jKk5M=";
|
||||
rev = version;
|
||||
hash = "sha256-Q+LJJ4xK583fAcwuOFykt6GKT0rVJgmTt+zUX4o4Tm4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ecflash-0.1.0" = "sha256-W613wbW54R65/rs6oiPAH/qov2OVEjMMszpUJdX4TxI=";
|
||||
"system76-firmware-1.0.45" = "sha256-2ougRwPvdet5nIKcFGElBRrsxukW8jMNCBw3C68VJ+Q=";
|
||||
"system76-firmware-1.0.51" = "sha256-+GPz7uKygGnFUptQEGYWkEdHgxBc65kLZqpwZqtwets=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -80,7 +80,10 @@ let
|
||||
|
||||
# Enable lazy RCUs for power savings:
|
||||
# https://lore.kernel.org/rcu/20221019225138.GA2499943@paulmck-ThinkPad-P17-Gen-1/
|
||||
RCU_LAZY = whenAtLeast "6.2" yes;
|
||||
# RCU_LAZY depends on RCU_NOCB_CPU depends on NO_HZ_FULL
|
||||
# depends on HAVE_VIRT_CPU_ACCOUNTING_GEN depends on 64BIT,
|
||||
# so we can't force-enable this
|
||||
RCU_LAZY = whenAtLeast "6.2" (option yes);
|
||||
} // optionalAttrs (stdenv.hostPlatform.isx86) {
|
||||
INTEL_IDLE = yes;
|
||||
INTEL_RAPL = whenAtLeast "5.3" module;
|
||||
@ -128,7 +131,8 @@ let
|
||||
|
||||
timer = {
|
||||
# Enable Full Dynticks System.
|
||||
NO_HZ_FULL = mkIf stdenv.is64bit yes; # TODO: more precise condition?
|
||||
# NO_HZ_FULL depends on HAVE_VIRT_CPU_ACCOUNTING_GEN depends on 64BIT
|
||||
NO_HZ_FULL = mkIf stdenv.is64bit yes;
|
||||
};
|
||||
|
||||
# Enable NUMA.
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "6.1.27";
|
||||
hash = "sha256-Wq95e0UEwbm1nOQNOdUuxTWGfYz/UXvSbfl3P1AEnw0=";
|
||||
version = "6.1.28";
|
||||
hash = "sha256-VCZ/Hev7bI/5HjPkHUnKkdEmJB5otzoSCJL0iE3KCHQ=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.3.1";
|
||||
hash = "sha256-ofCL8LxSndjj2pg8tphe58n51+TbSDcLDrCFGFSoLhg=";
|
||||
version = "6.3.2";
|
||||
hash = "sha256-/+tg7fhAQZzo9iSrGi5vFXcbMqL21d+L7dTFGRp6Bo4=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
||||
112
pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix
Normal file
112
pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix
Normal file
@ -0,0 +1,112 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, kaem
|
||||
, tinycc
|
||||
, gnumake
|
||||
, gnupatch
|
||||
}:
|
||||
let
|
||||
pname = "coreutils";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/coreutils/coreutils-${version}.tar.gz";
|
||||
sha256 = "10wq6k66i8adr4k08p0xmg87ff4ypiazvwzlmi7myib27xgffz62";
|
||||
};
|
||||
|
||||
# Thanks to the live-bootstrap project!
|
||||
# See https://github.com/fosslinux/live-bootstrap/blob/e86db47b6ee40d68e26866dd15e8637f64d6d778/sysa/coreutils-5.0/coreutils-5.0.kaem
|
||||
liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/e86db47b6ee40d68e26866dd15e8637f64d6d778/sysa/coreutils-5.0";
|
||||
|
||||
makefile = fetchurl {
|
||||
url = "${liveBootstrap}/mk/main.mk";
|
||||
sha256 = "0njg4xccxfqrslrmlb8ls7h6hlnfmdx42nvxwmca8flvczwrplfd";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# modechange.h uses functions defined in sys/stat.h, so we need to move it to
|
||||
# after sys/stat.h include.
|
||||
(fetchurl {
|
||||
url = "${liveBootstrap}/patches/modechange.patch";
|
||||
sha256 = "04xa4a5w2syjs3xs6qhh8kdzqavxnrxpxwyhc3qqykpk699p3ms5";
|
||||
})
|
||||
# mbstate_t is a struct that is required. However, it is not defined by mes libc.
|
||||
(fetchurl {
|
||||
url = "${liveBootstrap}/patches/mbstate.patch";
|
||||
sha256 = "0rz3c0sflgxjv445xs87b83i7gmjpl2l78jzp6nm3khdbpcc53vy";
|
||||
})
|
||||
# strcoll() does not exist in mes libc, change it to strcmp.
|
||||
(fetchurl {
|
||||
url = "${liveBootstrap}/patches/ls-strcmp.patch";
|
||||
sha256 = "0lx8rz4sxq3bvncbbr6jf0kyn5bqwlfv9gxyafp0541dld6l55p6";
|
||||
})
|
||||
# getdate.c is pre-compiled from getdate.y
|
||||
# At this point we don't have bison yet and in any case getdate.y does not
|
||||
# compile when generated with modern bison.
|
||||
(fetchurl {
|
||||
url = "${liveBootstrap}/patches/touch-getdate.patch";
|
||||
sha256 = "1xd3z57lvkj7r8vs5n0hb9cxzlyp58pji7d335snajbxzwy144ma";
|
||||
})
|
||||
# touch: add -h to change symlink timestamps, where supported
|
||||
(fetchurl {
|
||||
url = "${liveBootstrap}/patches/touch-dereference.patch";
|
||||
sha256 = "0wky5r3k028xwyf6g6ycwqxzc7cscgmbymncjg948vv4qxsxlfda";
|
||||
})
|
||||
# strcoll() does not exist in mes libc, change it to strcmp.
|
||||
(fetchurl {
|
||||
url = "${liveBootstrap}/patches/expr-strcmp.patch";
|
||||
sha256 = "19f31lfsm1iwqzvp2fyv97lmqg4730prfygz9zip58651jf739a9";
|
||||
})
|
||||
# strcoll() does not exist in mes libc, change it to strcmp.
|
||||
# hard_LC_COLLATE is used but not declared when HAVE_SETLOCALE is unset.
|
||||
(fetchurl {
|
||||
url = "${liveBootstrap}/patches/sort-locale.patch";
|
||||
sha256 = "0bdch18mpyyxyl6gyqfs0wb4pap9flr11izqdyxccx1hhz0a2i6c";
|
||||
})
|
||||
];
|
||||
in
|
||||
kaem.runCommand "${pname}-${version}" {
|
||||
inherit pname version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
tinycc.compiler
|
||||
gnumake
|
||||
gnupatch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The GNU Core Utilities";
|
||||
homepage = "https://www.gnu.org/software/coreutils";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.minimal-bootstrap.members;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} ''
|
||||
# Unpack
|
||||
ungz --file ${src} --output coreutils.tar
|
||||
untar --file coreutils.tar
|
||||
rm coreutils.tar
|
||||
cd coreutils-${version}
|
||||
|
||||
# Patch
|
||||
${lib.concatMapStringsSep "\n" (f: "patch -Np0 -i ${f}") patches}
|
||||
|
||||
# Configure
|
||||
catm config.h
|
||||
cp lib/fnmatch_.h lib/fnmatch.h
|
||||
cp lib/ftw_.h lib/ftw.h
|
||||
cp lib/search_.h lib/search.h
|
||||
rm src/dircolors.h
|
||||
|
||||
# Build
|
||||
make -f ${makefile} \
|
||||
CC="tcc -B ${tinycc.libs}/lib" \
|
||||
PREFIX=''${out}
|
||||
|
||||
# Check
|
||||
./src/echo "Hello coreutils!"
|
||||
|
||||
# Install
|
||||
./src/mkdir -p ''${out}/bin
|
||||
make -f ${makefile} install PREFIX=''${out}
|
||||
''
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user