Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
c293380058
|
|
@ -658,14 +658,18 @@ This creates a derivation with a directory structure like the following:
|
|||
|
||||
## `writeReferencesToFile` {#trivial-builder-writeReferencesToFile}
|
||||
|
||||
Writes the closure of transitive dependencies to a file.
|
||||
Deprecated. Use [`writeClosure`](#trivial-builder-writeClosure) instead.
|
||||
|
||||
This produces the equivalent of `nix-store -q --requisites`.
|
||||
## `writeClosure` {#trivial-builder-writeClosure}
|
||||
|
||||
Given a list of [store paths](https://nixos.org/manual/nix/stable/glossary#gloss-store-path) (or string-like expressions coercible to store paths), write their collective [closure](https://nixos.org/manual/nix/stable/glossary#gloss-closure) to a text file.
|
||||
|
||||
The result is equivalent to the output of `nix-store -q --requisites`.
|
||||
|
||||
For example,
|
||||
|
||||
```nix
|
||||
writeReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'')
|
||||
writeClosure [ (writeScriptBin "hi" ''${hello}/bin/hello'') ]
|
||||
```
|
||||
|
||||
produces an output path `/nix/store/<hash>-runtime-deps` containing
|
||||
|
|
|
|||
|
|
@ -174,6 +174,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
|
||||
- Invidious has changed its default database username from `kemal` to `invidious`. Setups involving an externally provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857)
|
||||
|
||||
- `writeReferencesToFile` is deprecated in favour of the new trivial build helper `writeClosure`. The latter accepts a list of paths and has an unambiguous name and cleaner implementation.
|
||||
|
||||
- `inetutils` now has a lower priority to avoid shadowing the commonly used `util-linux`. If one wishes to restore the default priority, simply use `lib.setPrio 5 inetutils` or override with `meta.priority = 5`.
|
||||
|
||||
- `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
''
|
||||
machine.wait_for_x()
|
||||
machine.succeed("echo '<!DOCTYPE html><html><body><h1>Hello world</h1></body></html>' > page.html")
|
||||
machine.execute("ladybird file://$(pwd)/page.html >&2 &")
|
||||
machine.execute("Ladybird file://$(pwd)/page.html >&2 &")
|
||||
machine.wait_for_window("Ladybird")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("Hello world")
|
||||
|
|
|
|||
|
|
@ -93,23 +93,5 @@ let
|
|||
|
||||
inherit (import ../ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
|
||||
|
||||
/*
|
||||
Return a store path with a closure containing everything including
|
||||
derivations and all build dependency outputs, all the way down.
|
||||
*/
|
||||
allDrvOutputs = pkg:
|
||||
let name = "allDrvOutputs-${pkg.pname or pkg.name or "unknown"}";
|
||||
in
|
||||
pkgs.runCommand name { refs = pkgs.writeReferencesToFile pkg.drvPath; } ''
|
||||
touch $out
|
||||
while read ref; do
|
||||
case $ref in
|
||||
*.drv)
|
||||
cat $ref >>$out
|
||||
;;
|
||||
esac
|
||||
done <$refs
|
||||
'';
|
||||
|
||||
in
|
||||
tests
|
||||
|
|
|
|||
|
|
@ -669,7 +669,7 @@
|
|||
};
|
||||
|
||||
hardhat-nvim = super.hardhat-nvim.overrideAttrs {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
dependencies = with self; [ overseer-nvim plenary-nvim ];
|
||||
};
|
||||
|
||||
harpoon = super.harpoon.overrideAttrs {
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@
|
|||
, mpdSupport ? true
|
||||
, mprisSupport ? stdenv.isLinux
|
||||
, nlSupport ? true
|
||||
, pipewireSupport ? true
|
||||
, pulseSupport ? true
|
||||
, rfkillSupport ? true
|
||||
, runTests ? true
|
||||
|
|
@ -122,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fftw
|
||||
iniparser
|
||||
ncurses
|
||||
pipewire
|
||||
portaudio
|
||||
]
|
||||
++ lib.optional evdevSupport libevdev
|
||||
|
|
@ -139,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optional udevSupport udev
|
||||
++ lib.optional upowerSupport upower
|
||||
++ lib.optional wireplumberSupport wireplumber
|
||||
++ lib.optional (cavaSupport || pipewireSupport) pipewire
|
||||
++ lib.optional (!stdenv.isLinux) libinotify-kqueue;
|
||||
|
||||
nativeCheckInputs = [ catch2_3 ];
|
||||
|
|
@ -154,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"man-pages" = true;
|
||||
"mpd" = mpdSupport;
|
||||
"mpris" = mprisSupport;
|
||||
"pipewire" = pipewireSupport;
|
||||
"pulseaudio" = pulseSupport;
|
||||
"rfkill" = rfkillSupport;
|
||||
"sndio" = sndioSupport;
|
||||
|
|
|
|||
|
|
@ -1,73 +1,157 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, fetchurl
|
||||
, cacert
|
||||
, tzdata
|
||||
, unicode-emoji
|
||||
, unicode-character-database
|
||||
, darwin
|
||||
, cmake
|
||||
, ninja
|
||||
, unzip
|
||||
, wrapQtAppsHook
|
||||
, libxcrypt
|
||||
, qtbase
|
||||
, qt6Packages
|
||||
, nixosTests
|
||||
, AppKit
|
||||
, Cocoa
|
||||
, Foundation
|
||||
, OpenGL
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (builtins) elemAt;
|
||||
cldr_version = "44.1.0";
|
||||
cldr-json = fetchzip {
|
||||
url = "https://github.com/unicode-org/cldr-json/releases/download/${cldr_version}/cldr-${cldr_version}-json-modern.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-EbbzaaspKgRT/dsJV3Kf0Dfj8LN9zT+Pl4gk5kiOXWk=";
|
||||
postFetch = ''
|
||||
echo -n ${cldr_version} > $out/version.txt
|
||||
'';
|
||||
};
|
||||
unicode-idna = fetchurl {
|
||||
url = "https://www.unicode.org/Public/idna/${unicode-character-database.version}/IdnaMappingTable.txt";
|
||||
hash = "sha256-QCy9KF8flS/NCDS2NUHVT2nT2PG4+Fmb9xoaFJNfgsQ=";
|
||||
};
|
||||
adobe-icc-profiles = fetchurl {
|
||||
url = "https://download.adobe.com/pub/adobe/iccprofiles/win/AdobeICCProfilesCS4Win_end-user.zip";
|
||||
hash = "sha256-kgQ7fDyloloPaXXQzcV9tgpn3Lnr37FbFiZzEb61j5Q=";
|
||||
name = "adobe-icc-profiles.zip";
|
||||
};
|
||||
public_suffix_commit = "9094af5c6cb260e69137c043c01be18fee01a540";
|
||||
public-suffix-list = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/publicsuffix/list/${public_suffix_commit}/public_suffix_list.dat";
|
||||
hash = "sha256-0szHUz1T0MXOQ9tcXoKY2F/bI3s7hsYCjURqywZsf1w=";
|
||||
};
|
||||
# Note: The cacert version is synthetic and must match the version in the package's CMake
|
||||
cacert_version = "2023-12-12";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ladybird";
|
||||
version = "unstable-2023-01-17";
|
||||
version = "0-unstable-2024-03-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SerenityOS";
|
||||
repo = "serenity";
|
||||
rev = "45e85d20b64862df119f643f24e2d500c76c58f3";
|
||||
hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY=";
|
||||
rev = "3a8bde9ef24dace600484b38992fdc7d17bf92c3";
|
||||
hash = "sha256-r8HYcexrOjDYsXuCtROiNY7Rl60pVQBvVQf190gqNuY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/Ladybird";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "MACOSX_BUNDLE TRUE" "MACOSX_BUNDLE FALSE"
|
||||
# https://github.com/SerenityOS/serenity/issues/17062
|
||||
substituteInPlace main.cpp \
|
||||
--replace "./SQLServer/SQLServer" "$out/bin/SQLServer"
|
||||
# https://github.com/SerenityOS/serenity/issues/10055
|
||||
substituteInPlace ../Meta/Lagom/CMakeLists.txt \
|
||||
--replace "@rpath" "$out/lib"
|
||||
sed -i '/iconutil/d' CMakeLists.txt
|
||||
|
||||
# Don't set absolute paths in RPATH
|
||||
substituteInPlace ../Meta/CMake/lagom_install_options.cmake \
|
||||
--replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \
|
||||
--replace-fail "\''${CMAKE_INSTALL_LIBDIR}" "lib"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
preConfigure = ''
|
||||
# Setup caches for LibLocale, LibUnicode, LibTimezone, LibTLS and LibGfx
|
||||
# Note that the versions of the input data packages must match the
|
||||
# expected version in the package's CMake.
|
||||
mkdir -p build/Caches
|
||||
|
||||
ln -s ${cldr-json} build/Caches/CLDR
|
||||
|
||||
cp -r ${unicode-character-database}/share/unicode build/Caches/UCD
|
||||
chmod +w build/Caches/UCD
|
||||
cp ${unicode-emoji}/share/unicode/emoji/emoji-test.txt build/Caches/UCD
|
||||
cp ${unicode-idna} build/Caches/UCD/IdnaMappingTable.txt
|
||||
echo -n ${unicode-character-database.version} > build/Caches/UCD/version.txt
|
||||
chmod -w build/Caches/UCD
|
||||
|
||||
mkdir build/Caches/TZDB
|
||||
tar -xzf ${elemAt tzdata.srcs 0} -C build/Caches/TZDB
|
||||
echo -n ${tzdata.version} > build/Caches/TZDB/version.txt
|
||||
|
||||
mkdir build/Caches/CACERT
|
||||
cp ${cacert}/etc/ssl/certs/ca-bundle.crt build/Caches/CACERT/cacert-${cacert_version}.pem
|
||||
echo -n ${cacert_version} > build/Caches/CACERT/version.txt
|
||||
|
||||
mkdir build/Caches/PublicSuffix
|
||||
cp ${public-suffix-list} build/Caches/PublicSuffix/public_suffix_list.dat
|
||||
|
||||
mkdir build/Caches/AdobeICCProfiles
|
||||
cp ${adobe-icc-profiles} build/Caches/AdobeICCProfiles/adobe-icc-profiles.zip
|
||||
chmod +w build/Caches/AdobeICCProfiles
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with qt6Packages; [
|
||||
cmake
|
||||
ninja
|
||||
unzip
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = with qt6Packages; [
|
||||
libxcrypt
|
||||
qtbase
|
||||
qtmultimedia
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
Cocoa
|
||||
Foundation
|
||||
OpenGL
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Disable network operations
|
||||
"-DENABLE_TIME_ZONE_DATABASE_DOWNLOAD=false"
|
||||
"-DENABLE_UNICODE_DATABASE_DOWNLOAD=false"
|
||||
"-DSERENITY_CACHE_DIR=Caches"
|
||||
"-DENABLE_NETWORK_DOWNLOADS=OFF"
|
||||
"-DENABLE_COMMONMARK_SPEC_DOWNLOAD=OFF"
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
"-DCMAKE_INSTALL_LIBEXECDIR=libexec"
|
||||
# FIXME: Enable this when launching with the commandline flag --enable-gpu-painting doesn't fail calling eglBindAPI on GNU/Linux
|
||||
"-DENABLE_ACCELERATED_GRAPHICS=OFF"
|
||||
];
|
||||
|
||||
# FIXME: Add an option to -DENABLE_QT=ON on macOS to use Qt rather than Cocoa for the GUI
|
||||
# FIXME: Add an option to enable PulseAudio rather than using Qt multimedia on non-macOS
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
# https://github.com/SerenityOS/serenity/issues/10055
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -add_rpath $out/lib $out/bin/ladybird
|
||||
mkdir -p $out/Applications $out/bin
|
||||
mv $out/bundle/Ladybird.app $out/Applications
|
||||
'';
|
||||
|
||||
# Only Ladybird and WebContent need wrapped, if Qt is enabled.
|
||||
# On linux we end up wraping some non-Qt apps, like headless-browser.
|
||||
dontWrapQtApps = stdenv.isDarwin;
|
||||
|
||||
passthru.tests = {
|
||||
nixosTest = nixosTests.ladybird;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A browser using the SerenityOS LibWeb engine with a Qt GUI";
|
||||
homepage = "https://github.com/awesomekling/ladybird";
|
||||
description = "A browser using the SerenityOS LibWeb engine with a Qt or Cocoa GUI";
|
||||
homepage = "https://ladybird.dev";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.unix;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
|
||||
mainProgram = "Ladybird";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
}:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "3.99.23";
|
||||
version = "3.100.26";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.99.23-build-240309svrjfqia1-x86_64.AppImage";
|
||||
hash = "sha256-8kZk5tEJCcSPKgpsVKrHB5twujZF2LdepW7HIJsb52E=";
|
||||
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.100.26-build-240314pjsp57xom-x86_64.AppImage";
|
||||
hash = "sha256-KYjB7ZfjoVf6UoXQvmtAqtD23JNQGqboNzXekAiJF7k=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-i7zQQbNF9uAmvC5qAlNKV8Ip9K6sM1xOeOV4wxe5hts=";
|
||||
hash = "sha256-M1CnB1adk02lJuFsm0zzjSx/l9hKHJMt1Wh2a5Xtdyg=";
|
||||
};
|
||||
|
||||
python = python3;
|
||||
|
|
@ -53,7 +53,7 @@ let
|
|||
cd src-ui
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-oie1jUFIRrOpdxw1gDtLBgFl1Fb0F5hjvl0wTAd6eYU=";
|
||||
npmDepsHash = "sha256-qgCUfGVk698Ink23U7LxkGdFoNpOhCp240tbk+hU0dk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
rev = version;
|
||||
hash = "sha256-huHNcAIwTvKssPQmOGCc6UzPxCh7JP1gM6BGbD0QM/w=";
|
||||
hash = "sha256-Q7QwsMUlejZStmQNRQntclHSCVQl54dtg8hyvXyM4PM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
, tarsum
|
||||
, util-linux
|
||||
, vmTools
|
||||
, writeReferencesToFile
|
||||
, writeClosure
|
||||
, writeScript
|
||||
, writeShellScriptBin
|
||||
, writeText
|
||||
|
|
@ -630,7 +630,7 @@ rec {
|
|||
imageName = lib.toLower name;
|
||||
imageTag = lib.optionalString (tag != null) tag;
|
||||
inherit fromImage baseJson;
|
||||
layerClosure = writeReferencesToFile layer;
|
||||
layerClosure = writeClosure [ layer ];
|
||||
passthru.buildArgs = args;
|
||||
passthru.layer = layer;
|
||||
passthru.imageTag =
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, writeText, runCommand, writeReferencesToFile }:
|
||||
{ lib, writeText, runCommand, writeClosure }:
|
||||
|
||||
{
|
||||
buildContainer =
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
set -o pipefail
|
||||
mkdir -p $out/rootfs/{dev,proc,sys}
|
||||
cp ${config} $out/config.json
|
||||
xargs tar c < ${writeReferencesToFile args} | tar -xC $out/rootfs/
|
||||
xargs tar c < ${writeClosure args} | tar -xC $out/rootfs/
|
||||
'';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
# and how deep in the tree they live. Equally-"popular" paths are then
|
||||
# sorted by name.
|
||||
#
|
||||
# The existing writeReferencesToFile prints the paths in a simple
|
||||
# ascii-based sorting of the paths.
|
||||
# The existing writeClosure prints the paths in a simple ascii-based
|
||||
# sorting of the paths.
|
||||
#
|
||||
# Sorting the paths by graph improves the chances that the difference
|
||||
# between two builds appear near the end of the list, instead of near
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, storeDir ? builtins.storeDir
|
||||
, writeScript
|
||||
, singularity
|
||||
, writeReferencesToFile
|
||||
, writeClosure
|
||||
, bash
|
||||
, vmTools
|
||||
, gawk
|
||||
|
|
@ -50,18 +50,13 @@ rec {
|
|||
}:
|
||||
let
|
||||
projectName = singularity.projectName or "singularity";
|
||||
layer = mkLayer {
|
||||
inherit name;
|
||||
contents = contents ++ [ bash runScriptFile ];
|
||||
inherit projectName;
|
||||
};
|
||||
runAsRootFile = shellScript "run-as-root.sh" runAsRoot;
|
||||
runScriptFile = shellScript "run-script.sh" runScript;
|
||||
result = vmTools.runInLinuxVM (
|
||||
runCommand "${projectName}-image-${name}.img"
|
||||
{
|
||||
buildInputs = [ singularity e2fsprogs util-linux gawk ];
|
||||
layerClosure = writeReferencesToFile layer;
|
||||
layerClosure = writeClosure contents;
|
||||
preVM = vmTools.createEmptyImage {
|
||||
size = diskSize;
|
||||
fullName = "${projectName}-run-disk";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck-minimal }:
|
||||
{ lib, config, stdenv, stdenvNoCC, jq, lndir, runtimeShell, shellcheck-minimal }:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
|
|
@ -625,18 +625,22 @@ rec {
|
|||
|
||||
# Docs in doc/build-helpers/trivial-build-helpers.chapter.md
|
||||
# See https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-writeReferencesToFile
|
||||
writeReferencesToFile = path: runCommand "runtime-deps"
|
||||
# TODO: Convert to throw after Nixpkgs 24.05 branch-off.
|
||||
writeReferencesToFile = (if config.allowAliases then lib.warn else throw)
|
||||
"writeReferencesToFile is deprecated in favour of writeClosure"
|
||||
(path: writeClosure [ path ]);
|
||||
|
||||
# Docs in doc/build-helpers/trivial-build-helpers.chapter.md
|
||||
# See https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-writeClosure
|
||||
writeClosure = paths: runCommand "runtime-deps"
|
||||
{
|
||||
exportReferencesGraph = [ "graph" path ];
|
||||
# Get the cleaner exportReferencesGraph interface
|
||||
__structuredAttrs = true;
|
||||
exportReferencesGraph.graph = paths;
|
||||
nativeBuildInputs = [ jq ];
|
||||
}
|
||||
''
|
||||
touch $out
|
||||
while read path; do
|
||||
echo $path >> $out
|
||||
read dummy
|
||||
read nrRefs
|
||||
for ((i = 0; i < nrRefs; i++)); do read ref; done
|
||||
done < graph
|
||||
jq -r ".graph | map(.path) | sort | .[]" "$NIX_ATTRS_JSON_FILE" > "$out"
|
||||
'';
|
||||
|
||||
# Docs in doc/build-helpers/trivial-build-helpers.chapter.md
|
||||
|
|
|
|||
|
|
@ -26,6 +26,9 @@ recurseIntoAttrs {
|
|||
then references
|
||||
else {};
|
||||
writeCBin = callPackage ./writeCBin.nix {};
|
||||
writeClosure-union = callPackage ./writeClosure-union.nix {
|
||||
inherit (references) samples;
|
||||
};
|
||||
writeShellApplication = callPackage ./writeShellApplication.nix {};
|
||||
writeScriptBin = callPackage ./writeScriptBin.nix {};
|
||||
writeShellScript = callPackage ./write-shell-script.nix {};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, cleanSamples ? lib.filterAttrs (n: lib.isStringLike)
|
||||
# Test targets
|
||||
, writeDirectReferencesToFile
|
||||
, writeReferencesToFile
|
||||
, writeClosure
|
||||
}:
|
||||
|
||||
# -------------------------------------------------------------------------- #
|
||||
|
|
@ -46,8 +46,9 @@ let
|
|||
samplesToString = attrs:
|
||||
lib.concatMapStringsSep " " (name: "[${name}]=${lib.escapeShellArg "${attrs.${name}}"}") (builtins.attrNames attrs);
|
||||
|
||||
references = lib.mapAttrs (n: v: writeReferencesToFile v) samples;
|
||||
closures = lib.mapAttrs (n: v: writeClosure [ v ]) samples;
|
||||
directReferences = lib.mapAttrs (n: v: writeDirectReferencesToFile v) samples;
|
||||
collectiveClosure = writeClosure (lib.attrValues samples);
|
||||
|
||||
testScriptBin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "references-test";
|
||||
|
|
@ -61,8 +62,9 @@ let
|
|||
mkdir -p "$out/bin"
|
||||
substitute "$src" "$out/bin/${finalAttrs.meta.mainProgram}" \
|
||||
--replace "@SAMPLES@" ${lib.escapeShellArg (samplesToString samples)} \
|
||||
--replace "@REFERENCES@" ${lib.escapeShellArg (samplesToString references)} \
|
||||
--replace "@DIRECT_REFS@" ${lib.escapeShellArg (samplesToString directReferences)}
|
||||
--replace "@CLOSURES@" ${lib.escapeShellArg (samplesToString closures)} \
|
||||
--replace "@DIRECT_REFS@" ${lib.escapeShellArg (samplesToString directReferences)} \
|
||||
--replace "@COLLECTIVE_CLOSURE@" ${lib.escapeShellArg collectiveClosure}
|
||||
runHook postInstall
|
||||
chmod +x "$out/bin/${finalAttrs.meta.mainProgram}"
|
||||
'';
|
||||
|
|
@ -79,8 +81,9 @@ let
|
|||
|
||||
passthru = {
|
||||
inherit
|
||||
collectiveClosure
|
||||
directReferences
|
||||
references
|
||||
closures
|
||||
samples
|
||||
;
|
||||
};
|
||||
|
|
@ -109,8 +112,9 @@ testers.nixosTest {
|
|||
'';
|
||||
passthru = {
|
||||
inherit
|
||||
collectiveClosure
|
||||
directReferences
|
||||
references
|
||||
closures
|
||||
samples
|
||||
testScriptBin
|
||||
;
|
||||
|
|
|
|||
|
|
@ -33,16 +33,17 @@ set -euo pipefail
|
|||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")" # nixpkgs root
|
||||
|
||||
# Injected by Nix (to avoid evaluating in a derivation)
|
||||
# turn them into arrays
|
||||
# shellcheck disable=SC2206 # deliberately unquoted
|
||||
declare -A samples=( @SAMPLES@ )
|
||||
# shellcheck disable=SC2206 # deliberately unquoted
|
||||
declare -A directRefs=( @DIRECT_REFS@ )
|
||||
# shellcheck disable=SC2206 # deliberately unquoted
|
||||
declare -A references=( @REFERENCES@ )
|
||||
# Inject the path to compare from the Nix expression
|
||||
|
||||
echo >&2 Testing direct references...
|
||||
# Associative Arrays
|
||||
declare -A samples=( @SAMPLES@ )
|
||||
declare -A directRefs=( @DIRECT_REFS@ )
|
||||
declare -A closures=( @CLOSURES@ )
|
||||
|
||||
# Path string
|
||||
collectiveClosure=@COLLECTIVE_CLOSURE@
|
||||
|
||||
echo >&2 Testing direct closures...
|
||||
for i in "${!samples[@]}"; do
|
||||
echo >&2 Checking "$i" "${samples[$i]}" "${directRefs[$i]}"
|
||||
diff -U3 \
|
||||
|
|
@ -52,10 +53,16 @@ done
|
|||
|
||||
echo >&2 Testing closure...
|
||||
for i in "${!samples[@]}"; do
|
||||
echo >&2 Checking "$i" "${samples[$i]}" "${references[$i]}"
|
||||
echo >&2 Checking "$i" "${samples[$i]}" "${closures[$i]}"
|
||||
diff -U3 \
|
||||
<(sort <"${references[$i]}") \
|
||||
<(sort <"${closures[$i]}") \
|
||||
<(nix-store -q --requisites "${samples[$i]}" | sort)
|
||||
done
|
||||
|
||||
echo >&2 Testing mixed closures...
|
||||
echo >&2 Checking all samples "(${samples[*]})" "$collectiveClosure"
|
||||
diff -U3 \
|
||||
<(sort <"$collectiveClosure") \
|
||||
<(nix-store -q --requisites "${samples[@]}" | sort)
|
||||
|
||||
echo 'OK!'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
{ lib
|
||||
, runCommandLocal
|
||||
# Test targets
|
||||
, writeClosure
|
||||
, samples
|
||||
}:
|
||||
runCommandLocal "test-trivial-builders-writeClosure-union" {
|
||||
__structuredAttrs = true;
|
||||
closures = lib.mapAttrs (n: v: writeClosure [ v ]) samples;
|
||||
collectiveClosure = writeClosure (lib.attrValues samples);
|
||||
inherit samples;
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
ShamrockLee
|
||||
];
|
||||
} ''
|
||||
set -eu -o pipefail
|
||||
echo >&2 Testing mixed closures...
|
||||
echo >&2 Checking all samples "(''${samples[*]})" "$collectiveClosure"
|
||||
diff -U3 \
|
||||
<(sort <"$collectiveClosure") \
|
||||
<(cat "''${closures[@]}" | sort | uniq)
|
||||
touch "$out"
|
||||
''
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
{ autoreconfHook
|
||||
, fetchFromGitHub
|
||||
, ghostscript
|
||||
, lib
|
||||
, pkg-config
|
||||
, poppler
|
||||
, stdenv
|
||||
, texlive
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "extractpdfmark";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trueroad";
|
||||
repo = "extractpdfmark";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pNc/SWAtQWMbB2+lIQkJdBYSZ97iJXK71mS59qQa7Hs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ ghostscript poppler texlive.combined.scheme-minimal ];
|
||||
|
||||
postPatch = ''
|
||||
touch config.rpath
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/trueroad/extractpdfmark";
|
||||
description = "Extract page mode and named destinations as PDFmark from PDF";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.samueltardieu ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "extractpdfmark";
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec {
|
|||
pname = "libsignal-ffi";
|
||||
# must match the version used in mautrix-signal
|
||||
# see https://github.com/mautrix/signal/issues/401
|
||||
version = "0.39.2";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MKmkqfUhXOHUlP3jSNKsplT9kP0ERj3rmTrLLU3T2no=";
|
||||
hash = "sha256-U/Wy7nzRQJLdc/dGmYR418Nt1KV70HbcgnDHmYxKytg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ protobuf ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
, yubikey-personalization
|
||||
, libyubikey
|
||||
, libykclient
|
||||
, CoreServices
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -23,7 +25,8 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ];
|
||||
buildInputs = [ pam yubikey-personalization libyubikey libykclient ];
|
||||
buildInputs = [ pam yubikey-personalization libyubikey libykclient ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices SystemConfiguration ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yubico PAM module";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, aiodns
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, cached-ipaddress
|
||||
|
|
@ -15,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiodiscover";
|
||||
version = "1.6.1";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = "aiodiscover";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-M3tus0r58YVJyi/S7UWq+OvaKke3hqkHGuYkUxEpVxg=";
|
||||
hash = "sha256-7oeyuwirQ2mm0UQEOwTkAz126UnxkoMjg+DDu5DWY3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,11 +34,12 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
aiodns
|
||||
cached-ipaddress
|
||||
dnspython
|
||||
ifaddr
|
||||
netifaces
|
||||
pyroute2
|
||||
ifaddr
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, apispec
|
||||
, bottle
|
||||
, buildPythonPackage
|
||||
|
|
@ -13,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "apispec-webframeworks";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "marshmallow-code";
|
||||
repo = "apispec-webframeworks";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zrsqIZ5ZogZsK1ZOL2uy8igS4T8a+19IwL5dMhKw7OA=";
|
||||
hash = "sha256-qepiaRW36quIgxBtEHMF3HN0wO6jp2uGAHgg5fJoMUY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -34,6 +35,7 @@ buildPythonPackage rec {
|
|||
] ++ apispec.optional-dependencies.yaml;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiohttp
|
||||
bottle
|
||||
flask
|
||||
mock
|
||||
|
|
|
|||
|
|
@ -365,14 +365,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.64";
|
||||
version = "1.34.65";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-h/fZOx5z46enQ+553+aUXC/KkYaQ84JxfjJ8tESvlq0=";
|
||||
hash = "sha256-EF2koE3LXk3ckPIauLJKNCPs+stHdbjM04eVdOXc41g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,15 +9,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.64";
|
||||
format = "pyproject";
|
||||
version = "1.34.65";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-FcqR6qKL2AFL0xaoXt8J0WTpN5oSjLptpHLoNNct4u0=";
|
||||
hash = "sha256-fFEK2yxv/uLipfGYwQMLuO3/ITbuVuRnKcAuo3skJKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cx-freeze";
|
||||
version = "6.15.15";
|
||||
version = "6.15.16";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "cx_Freeze";
|
||||
inherit version;
|
||||
hash = "sha256-dMCr5ulaBBXLT79VxiW8JQEml4P6wt0tcetNeOk/Ihk=";
|
||||
hash = "sha256-xjmRiG/ypTGfjw0HwDSaa74aZbXzIPi5JDiI5jyaSiI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi-sso";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "tomasvotava";
|
||||
repo = "fastapi-sso";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/Mt0pmZYsWp/n9YHCy/bFKUPzmoRFB0cHKCNxEfxMLs=";
|
||||
hash = "sha256-7gBJ6Etb9X2mJzrWYpNGAl3NFoI1bz+PcGfUsMgRlN8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-marshmallow";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "marshmallow-code";
|
||||
repo = "flask-marshmallow";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QoktZcyVJXkHr8fCVYt3ZkYq52nxCsZu+AgaDyrZHWs=";
|
||||
hash = "sha256-GQLkt/CJf/QI8emvlW8xSRziGnncwfMSxBccW0Bb8I0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "mpris-server";
|
||||
version = "0.9.0";
|
||||
version = "0.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "mpris_server";
|
||||
inherit version;
|
||||
hash = "sha256-ia0567r6CGKRgXxvGVY+ATvXJ/atWaGGZT8fQzvLzrY=";
|
||||
hash = "sha256-p3nM80fOMtRmeKvOXuX40Fu9xH8gPgYyneXbUS678fE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -40,6 +40,10 @@ buildPythonPackage rec {
|
|||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
# update doesn't support python311 and monophony, the only consumer requires
|
||||
# 0.4.2
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Publish a MediaPlayer2 MPRIS device to D-Bus";
|
||||
homepage = "https://pypi.org/project/mpris-server/";
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ rec {
|
|||
|
||||
mypy-boto3-clouddirectory = buildMypyBoto3Package "clouddirectory" "1.34.0" "sha256-lWJQClNEhyq9CN8ThcHtVcEsowIp+V8RXh4rgHAclfM=";
|
||||
|
||||
mypy-boto3-cloudformation = buildMypyBoto3Package "cloudformation" "1.34.61" "sha256-fT48eggnNyP/cPXoXvm386zWKfmuyhAyxrtUGwOem0c=";
|
||||
mypy-boto3-cloudformation = buildMypyBoto3Package "cloudformation" "1.34.65" "sha256-CQJJPyXyPnCNYxKUt3m7uz6UaFQt1+JH3m6KyOJHelQ=";
|
||||
|
||||
mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.34.0" "sha256-3n/WEiQdcE253J+CFsskoYlNMXASdzkhPTWneSHDKoM=";
|
||||
|
||||
|
|
@ -415,7 +415,7 @@ rec {
|
|||
|
||||
mypy-boto3-kinesisvideo = buildMypyBoto3Package "kinesisvideo" "1.34.48" "sha256-uYSkwOuYKF3B+sj5IWbDL789Xue2yNY9g14j/2b6k6w=";
|
||||
|
||||
mypy-boto3-kms = buildMypyBoto3Package "kms" "1.34.14" "sha256-fGuTdVCmgdqaYdJcEJY7vhvNw+Qi1NXYFST16mXp0UA=";
|
||||
mypy-boto3-kms = buildMypyBoto3Package "kms" "1.34.65" "sha256-jot13mfxhgvayvQkMxnDvjdwkpGLkwsC2eeAQpMW0II=";
|
||||
|
||||
mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.34.7" "sha256-/IPOF44ohg59XX+lmMbx8WsaHFpBaMH440Wm5jgrKD4=";
|
||||
|
||||
|
|
@ -481,7 +481,7 @@ rec {
|
|||
|
||||
mypy-boto3-mediastore-data = buildMypyBoto3Package "mediastore-data" "1.34.0" "sha256-bYlKkBh7Kq4PsToHQ4+K5B3h8+IwyS+7ngEJ5AALBus=";
|
||||
|
||||
mypy-boto3-mediatailor = buildMypyBoto3Package "mediatailor" "1.34.45" "sha256-r1rzW4TQ2pZ/Bw+ina6sSLUTEk9+fakZEWYA5gOxXhY=";
|
||||
mypy-boto3-mediatailor = buildMypyBoto3Package "mediatailor" "1.34.65" "sha256-JJDQuyACp+y5PntLhMZ2rIb1wR/IW0PPPqS8HB54mNk=";
|
||||
|
||||
mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.34.0" "sha256-3lAWDWzf1MjTDh0+HDnewq0Yo3bUuhSGSSKJvJf6k8g=";
|
||||
|
||||
|
|
@ -581,7 +581,7 @@ rec {
|
|||
|
||||
mypy-boto3-rbin = buildMypyBoto3Package "rbin" "1.34.0" "sha256-Y+a/p3r5IgWk4oH6MOeq0e7rMiNvLCqoz1ZE+xXNtOw=";
|
||||
|
||||
mypy-boto3-rds = buildMypyBoto3Package "rds" "1.34.63" "sha256-1JsO69vElUUgZlDNejuZz8x7bPCtHkZAG1qEtvg+O5E=";
|
||||
mypy-boto3-rds = buildMypyBoto3Package "rds" "1.34.65" "sha256-uEgsI/MsacidGZEYWhvXDVE2RUFdtuh027YZbL4Lyb8=";
|
||||
|
||||
mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.34.6" "sha256-d+WXt3cSUe5ZxynSjPSJxXgv6evP/rhZrX1ua9rtSx8=";
|
||||
|
||||
|
|
@ -619,7 +619,7 @@ rec {
|
|||
|
||||
mypy-boto3-rum = buildMypyBoto3Package "rum" "1.34.49" "sha256-Mq2H+13cjxYRwFfxJpWTAb+W5bx+Vew+jl+zbreRIkQ=";
|
||||
|
||||
mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.34.64" "sha256-6yjHKgKA6lOpr4yEmjm2RR2At+YQwfrhWR7o79OhkNM=";
|
||||
mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.34.65" "sha256-L830Es4pJLLws021mr8GqcC75M0zYfFPDSweIRwPfd0=";
|
||||
|
||||
mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.34.18" "sha256-53s5ii1gFX9toigiazEtS5Jogg3VFFr+1/uiLzoU7Uo=";
|
||||
|
||||
|
|
@ -715,7 +715,7 @@ rec {
|
|||
|
||||
mypy-boto3-textract = buildMypyBoto3Package "textract" "1.34.0" "sha256-AeukQ85jOCNpUxfnedEyacm/bK6pFA32tmhQrieLoMo=";
|
||||
|
||||
mypy-boto3-timestream-query = buildMypyBoto3Package "timestream-query" "1.34.0" "sha256-YriLmrbBd3zPny4MBMJV5G0WB4mQZElBZDOd3DTin74=";
|
||||
mypy-boto3-timestream-query = buildMypyBoto3Package "timestream-query" "1.34.65" "sha256-RSGOulFIOZi/9Z5grP/Zv0A5fy3MJTzph+D9a45MkHA=";
|
||||
|
||||
mypy-boto3-timestream-write = buildMypyBoto3Package "timestream-write" "1.34.0" "sha256-fKi5nIyU5BffflHVh21HjcuYE+RXDiq0gXbFOKOAYPE=";
|
||||
|
||||
|
|
|
|||
|
|
@ -67,12 +67,18 @@ buildPythonPackage rec {
|
|||
pyyaml
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
# disabled tests:
|
||||
# https://bugs.launchpad.net/oslo.utils/+bug/2054134
|
||||
# netaddr default behaviour changed to be stricter
|
||||
checkPhase =''
|
||||
echo "nameserver 127.0.0.1" > resolv.conf
|
||||
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
|
||||
export LD_PRELOAD=${libredirect}/lib/libredirect.so
|
||||
|
||||
stestr run
|
||||
stestr run -e <(echo "
|
||||
oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ip
|
||||
oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ipv4
|
||||
")
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "oslo_utils" ];
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrate-limiter";
|
||||
version = "3.2.1";
|
||||
version = "2.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vutran1710";
|
||||
repo = "PyrateLimiter";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EBgeLBIyiveY9GTdwl93bX9JOCffREU4W8C0fx7zXeE=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -24,6 +24,11 @@ buildPythonPackage rec {
|
|||
"pyrate_limiter"
|
||||
];
|
||||
|
||||
# The only consumer of this is Lutris (via python-moddb), and it requires 2.x,
|
||||
# so don't auto-update it and break Lutris every python-updates.
|
||||
# FIXME: remove when python-moddb updates.
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Rate-Limiter using Leaky-Bucket Algorimth Family";
|
||||
homepage = "https://github.com/vutran1710/PyrateLimiter";
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-openstackclient";
|
||||
version = "6.5.0";
|
||||
version = "6.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EvwZNH9rGb/iw28Rx6GEH0FaLufxi5WUE8ISGZe4SVE=";
|
||||
hash = "sha256-u+8e00gpxBBSsuyiZIDinKH3K+BY0UMNpTQexExPKVw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "std-uritemplate";
|
||||
version = "0.0.54";
|
||||
version = "0.0.55";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "std_uritemplate";
|
||||
inherit version;
|
||||
hash = "sha256-FVKnB3v/T7eV6IQkaKQ8CFumIMc3PPlAgNOFNohQf9Q=";
|
||||
hash = "sha256-kHP1anfkTQWD+2ZFw35KZAo08iolXQDjeTzT8w2limg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,22 +4,27 @@
|
|||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sunweg";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rokam";
|
||||
repo = pname;
|
||||
repo = "sunweg";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-E5dwFfFzOMyYLAqoTdp22/qIS3+IXD6jkVUVZIumk6Y=";
|
||||
hash = "sha256-fgNtxCBIuNulCfuDaEsM7kL1WpwNE9O+JQ1DMZrz5jA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1110";
|
||||
version = "3.0.1111";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BJCrpeMR+wbVdkBLVtq5BN4i5nqOQd7A08wVxz1MPSw=";
|
||||
hash = "sha256-CM544yVoUH4nHE6UwPfVxZE2+P+wHLBtKMM9QWpda9A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,12 @@
|
|||
, responses
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, syrupy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tldextract";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "john-kurkowski";
|
||||
repo = "tldextract";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/VBbU8FuB8MEuX6MgGO44+gfqVjl1aHHDHncHY2Jo38=";
|
||||
hash = "sha256-rieDDSCit9UcMpCMs2X3+cCS41Wbrp4WWVMzKj/jwEM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -43,6 +44,7 @@ buildPythonPackage rec {
|
|||
pytest-mock
|
||||
pytestCheckHook
|
||||
responses
|
||||
syrupy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -51,7 +53,6 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Python module to accurately separate the TLD from the domain of an URL";
|
||||
mainProgram = "tldextract";
|
||||
longDescription = ''
|
||||
tldextract accurately separates the gTLD or ccTLD (generic or country code top-level domain)
|
||||
from the registered domain and subdomains of a URL.
|
||||
|
|
@ -60,5 +61,6 @@ buildPythonPackage rec {
|
|||
changelog = "https://github.com/john-kurkowski/tldextract/blob/${version}/CHANGELOG.md";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "tldextract";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ in stdenv.mkDerivation {
|
|||
AppKit
|
||||
]);
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
buildPhase = ''
|
||||
python build/gen.py --no-last-commit-position
|
||||
ln -s ${lastCommitPosition} out/last_commit_position.h
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.35.0";
|
||||
version = "1.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xVcqbcKb6qm/XXRBi2vSIeISjfg5EivXpEbif96f+6U=";
|
||||
hash = "sha256-Jow4A0deh6Y54KID9uLsIjBSgH5NWmR82IH7m56Y990=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buildkit";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A6BncEyuAWyDlBK9ZuBoDl8gbQo0NAaVWXvy2mZs0GA=";
|
||||
hash = "sha256-BrLDY3T40ndkjuWCx5kLZvMBp8xI5d3MFg9M3IpafWM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,20 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "2.3.5";
|
||||
format = "setuptools";
|
||||
version = "3.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
owner = "sqlfluff";
|
||||
repo = "sqlfluff";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-l9py+qMI8t5L+FcUmJYXwemjUy/pcugbvhdW3oUOZMo=";
|
||||
hash = "sha256-GJpSBDxgI0UpIIVeF9dl9XzKJ2TuwWf/IOCzoTGJNRQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appdirs
|
||||
cached-property
|
||||
|
|
@ -63,10 +67,10 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "SQL linter and auto-formatter";
|
||||
mainProgram = "sqlfluff";
|
||||
homepage = "https://www.sqlfluff.com/";
|
||||
changelog = "https://github.com/sqlfluff/sqlfluff/blob/${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "sqlfluff";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "signal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qlWp9SnS8dWZNAua9HOyOrQwBXQFaaWB3eP9aCGlDFc=";
|
||||
hash = "sha256-juem0enwwY5HOgci9Am2xcAsJK0F48DtpU7J/Osqd9k=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
libsignal-ffi
|
||||
];
|
||||
|
||||
vendorHash = "sha256-sa6M9rMrI7fa8T4su3yfJID4AYB6YnlfrVBM6cPQLvY=";
|
||||
vendorHash = "sha256-CnuRzDiUVJt4PrU8u7UmT1ejrdpsohmDv8M0qfFb0Ac=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ buildGoModule rec {
|
|||
GOARCH= CGO_ENABLED=0 go generate ./pkg/plugins/plugindef
|
||||
GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go
|
||||
GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go
|
||||
GOARCH= CGO_ENABLED=0 go generate ./pkg/kindsys/report.go
|
||||
# Setup node_modules
|
||||
export HOME="$(mktemp -d)"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.84.4";
|
||||
version = "0.84.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = "qovery-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Er7rmIo/7B4cVNVCg04ILjVajwtwlZM386V+MiCf0ok=";
|
||||
hash = "sha256-ehf0XcDYCas3bJtrt/aC3vGBHH+hNhQJgetRKfNk3Vg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YcLgmGCmOEawgTh0CvwmvOg3NAQxvA5Q9SJcH5dpwyQ=";
|
||||
vendorHash = "sha256-3UsHxBIJpmga3Hjtwx4cZ45xY52RVMdPS/DAgTBYmuw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -10,19 +10,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.49.1";
|
||||
version = "0.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+wgnj7mDIJ5UPGfD7vogdcbUeBdvTenL/a0Ew4CfuvE=";
|
||||
hash = "sha256-gRePoEfUqTWSalUaCROEsZcgxXOFGe0AukyoaDlKAsM=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-IL3FHgOYQYJIqJKr2eEeM/NzO+SeYucGSNUUY62kHNA=";
|
||||
vendorHash = "sha256-i+FgfYdfhuS4utcHDWI1QofBysiU6tV9Y7b2SE0jnVA=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asap";
|
||||
version = "6.0.2";
|
||||
version = "6.0.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://sourceforge/project/asap/asap/${version}/asap-${version}.tar.gz";
|
||||
sha256 = "sha256-hVZODnm2GxSUKglOyQ8uObeKkAKrupPTftEP0dck9a8=";
|
||||
sha256 = "sha256-a4RUtFue5wdoGUykLRb46s4+yR/I/7DhwE1SiWPRg8s=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "sish";
|
||||
version = "2.12.0";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoniomika";
|
||||
repo = pname;
|
||||
repo = "sish";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dn64M/DGnyaoEtbdeytpRsKCXQPvR+dJDI7yFt2IqU0=";
|
||||
hash = "sha256-nDmmq8Yv+iCZPor7sLdJWqWudb3yxrllZgPH4d9mP38=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-P5Y5DwF9Tb9j098XiEJZaEGZhT2Ce2emnV2SawElosI=";
|
||||
vendorHash = "sha256-4HcWD/u7aCEzQ3tYRmFwvdjPuv5eyHlCVHtxA6cBiW0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "snowflake";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
|
|
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||
owner = "anti-censorship/pluggable-transports";
|
||||
repo = "snowflake";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LDr/Fzg1fC2lf7W+yTD1y5q4C2pPXZz+ZJf9sI1BxcQ=";
|
||||
sha256 = "sha256-QyTyFz4NIuUV7g5f6qV/ujfHYZDnnZmjeBinvcWlo0U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IT2+5HmgkV6BKPEARkCZbULyVr7VDLtwGUCF22YuodA=";
|
||||
vendorHash = "sha256-Qn8JFzrLCUrr6WGvVmaSYC7ooiMGl8iPMXkRvALho1A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "System to defeat internet censorship";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2024-03-17";
|
||||
version = "2024-03-19";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Vqdi7/jr+Di20y1HoFbXnl2riZfadgsRmzpSryW03M0=";
|
||||
hash = "sha256-VfaUm1d/Hpqo3TfS3gssr0YRPHqxXewZzH52/nSLHXU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "theharvester";
|
||||
version = "4.5.1";
|
||||
version = "4.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laramies";
|
||||
repo = "theharvester";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yfi1+SCCLCV3SJ28EVmR6V2i3O92iVRBo4EwHbKKcYY=";
|
||||
hash = "sha256-B2pZBrWZqbtvcO0pnM57GFhrryYilLCBTMEmsKvyU/I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -38,6 +38,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
lxml
|
||||
netaddr
|
||||
ujson
|
||||
playwright
|
||||
plotly
|
||||
pyppeteer
|
||||
python-dateutil
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.70.1";
|
||||
version = "3.70.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-02sBzWMzpSUx1wFpKapP93JVLSlPmnXMwLAYhOVqiYE=";
|
||||
hash = "sha256-bw9Pjl3t3QEahKcpjh1IC4nWL4iLIr6P0aNPDNOQi1k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oJ5aPffmBDCJ6cD2nG1Q5w+R6LV6oDf4v9hIWN9jNdc=";
|
||||
vendorHash = "sha256-T8XLYTLQLgwJYaHC4erBt1fadSjmLtrykPJGiFioBRI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -25334,7 +25334,9 @@ with pkgs;
|
|||
|
||||
yojimbo = callPackage ../development/libraries/yojimbo { };
|
||||
|
||||
yubico-pam = callPackage ../development/libraries/yubico-pam { };
|
||||
yubico-pam = callPackage ../development/libraries/yubico-pam {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
|
||||
};
|
||||
|
||||
yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool {
|
||||
inherit (darwin.apple_sdk.frameworks) PCSC;
|
||||
|
|
@ -32805,8 +32807,9 @@ with pkgs;
|
|||
|
||||
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
|
||||
|
||||
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
|
||||
ladybird = darwin.apple_sdk_11_0.callPackage ../applications/networking/browsers/ladybird {
|
||||
stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL;
|
||||
};
|
||||
|
||||
lazpaint = callPackage ../applications/graphics/lazpaint { };
|
||||
|
|
@ -34730,7 +34733,9 @@ with pkgs;
|
|||
|
||||
siproxd = callPackage ../applications/networking/siproxd { };
|
||||
|
||||
sish = callPackage ../tools/networking/sish { };
|
||||
sish = callPackage ../tools/networking/sish {
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
|
||||
sky = libsForQt5.callPackage ../applications/networking/instant-messengers/sky {
|
||||
libjpeg_turbo = libjpeg8;
|
||||
|
|
|
|||
|
|
@ -110,8 +110,9 @@ let
|
|||
trivialBuilders = self: super:
|
||||
import ../build-support/trivial-builders {
|
||||
inherit lib;
|
||||
inherit (self) config;
|
||||
inherit (self) runtimeShell stdenv stdenvNoCC;
|
||||
inherit (self.pkgsBuildHost) shellcheck-minimal;
|
||||
inherit (self.pkgsBuildHost) jq shellcheck-minimal;
|
||||
inherit (self.pkgsBuildHost.xorg) lndir;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue