gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-27 00:15:14 +00:00
committed by GitHub
parent 8c2d58df12 69661586d1
commit 2e0988846d
83 changed files with 2721 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/labeler.yml
+20 -1
View File
@@ -176,13 +176,32 @@
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/programs/java.nix
# Distributions
- pkgs/development/compilers/adoptopenjdk-icedtea-web/**/*
- pkgs/development/compilers/corretto/**/*
- pkgs/development/compilers/graalvm/**/*
- pkgs/development/compilers/openjdk/**/*
- pkgs/development/compilers/semeru-bin/**/*
- pkgs/development/compilers/temurin-bin/**/*
- pkgs/development/compilers/zulu/**/*
# Documentation
- doc/languages-frameworks/java.section.md
# Gradle
- doc/languages-frameworks/gradle.section.md
- pkgs/development/tools/build-managers/gradle/**/*
- pkgs/by-name/gr/gradle-completion/**/*
# Maven
- pkgs/by-name/ma/maven/**/*
- doc/languages-frameworks/maven.section.md
# Ant
- pkgs/by-name/ap/apacheAnt/**/*
# javaPackages attrset
- pkgs/development/java-modules/**/*
- pkgs/top-level/java-packages.nix
# Maintainer tooling
- pkgs/by-name/ni/nixpkgs-openjdk-updater/**/*
# Misc
- nixos/modules/programs/java.nix
"6.topic: jitsi":
- any:
nixos/doc/manual/release-notes/rl-2505.section.md
+3
View File
@@ -22,6 +22,9 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available.
See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information.
- `buildGoPackage` has been removed. Use `buildGoModule` instead. See the [Go section in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-language-go) for details.
- `timescaledb` requires manual upgrade steps.
nixos/lib/make-disk-image.nix
+4 -1
View File
@@ -163,6 +163,9 @@ To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$imag
, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw.
format ? "raw"
, # Disk image filename, without any extensions (e.g. `image_1`).
baseName ? "nixos"
# Whether to fix:
# - GPT Disk Unique Identifier (diskGUID)
# - GPT Partition Unique Identifier: depends on the layout, root partition UUID can be controlled through `rootGPUID` option
@@ -208,7 +211,7 @@ let format' = format; in let
compress = lib.optionalString (format' == "qcow2-compressed") "-c";
filename = "nixos." + {
filename = "${baseName}." + {
qcow2 = "qcow2";
vdi = "vdi";
vpc = "vhd";
nixos/modules/image/file-options.nix
+48
View File
@@ -0,0 +1,48 @@
{
lib,
config,
pkgs,
...
}:
{
options.image = {
baseName = lib.mkOption {
type = lib.types.str;
default = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
description = ''
Basename of the image filename without any extension (e.g. `image_1`).
'';
};
extension = lib.mkOption {
type = lib.types.str;
description = ''
Extension of the image filename (e.g. `raw`).
'';
};
# FIXME: this should be marked readOnly, when there are no
# mkRenamedOptionModuleWith calls with `image.fileName` as
# as a target left anymore (i.e. 24.11). We can't do it
# before, as some source options where writable before.
# Those should use image.baseName and image.extension instead.
fileName = lib.mkOption {
type = lib.types.str;
default = "${config.image.baseName}.${config.image.extension}";
description = ''
Filename of the image including all extensions (e.g `image_1.raw` or
`image_1.raw.zst`).
'';
};
filePath = lib.mkOption {
type = lib.types.str;
default = config.image.fileName;
description = ''
Path of the image, relative to `$out` in `system.build.image`.
While it defaults to `config.image.fileName`, it can be different for builders where
the image is in sub directory, such as `iso`, `sd-card` or `kexec` images.
'';
};
};
}
nixos/modules/image/images.nix
+56
View File
@@ -0,0 +1,56 @@
{
config,
lib,
pkgs,
extendModules,
...
}:
let
inherit (lib) types;
imageModules = { };
imageConfigs = lib.mapAttrs (
name: modules:
extendModules {
inherit modules;
}
) config.image.modules;
in
{
options = {
system.build = {
images = lib.mkOption {
type = types.lazyAttrsOf types.raw;
readOnly = true;
description = ''
Different target images generated for this NixOS configuration.
'';
};
};
image.modules = lib.mkOption {
type = types.attrsOf (types.listOf types.deferredModule);
description = ''
image-specific NixOS Modules used for `system.build.images`.
'';
};
};
config.image.modules = lib.mkIf (!config.system.build ? image) imageModules;
config.system.build.images = lib.mkIf (!config.system.build ? image) (
lib.mapAttrs (
name: nixos:
let
inherit (nixos) config;
inherit (config.image) filePath;
builder =
config.system.build.image
or (throw "Module for `system.build.images.${name}` misses required `system.build.image` option.");
in
lib.recursiveUpdate builder {
passthru = {
inherit config filePath;
};
}
) imageConfigs
);
}
nixos/modules/module-list.nix
+1
View File
@@ -125,6 +125,7 @@
./i18n/input-method/kime.nix
./i18n/input-method/nabi.nix
./i18n/input-method/uim.nix
./image/images.nix
./installer/tools/tools.nix
./misc/assertions.nix
./misc/crashdump.nix
nixos/modules/services/web-apps/agorakit.nix
+1 -1
View File
@@ -325,7 +325,7 @@ in
services.mysql = mkIf db.createLocally {
enable = true;
package = mkDefault pkgs.mysql;
package = mkDefault pkgs.mariadb;
ensureDatabases = [ db.name ];
ensureUsers = [
{
nixos/tests/scion/freestanding-deployment/bootstrap.sh
+15 -15
View File
@@ -5,18 +5,18 @@ mkdir AS{1..5}
# Create voting and root keys and (self-signed) certificates for core ASes
pushd AS1
scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key
scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 regular voting cert"}') regular-voting.pem regular-voting.key
scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 cp root cert"}') cp-root.pem cp-root.key
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 regular voting cert"}') regular-voting.pem regular-voting.key
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 cp root cert"}') cp-root.pem cp-root.key
popd
pushd AS2
scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 cp root cert"}') cp-root.pem cp-root.key
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 cp root cert"}') cp-root.pem cp-root.key
popd
pushd AS3
scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key
scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 regular voting cert"}') regular-voting.pem regular-voting.key
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 regular voting cert"}') regular-voting.pem regular-voting.key
popd
# Create the TRC (Trust Root Configuration)
@@ -33,8 +33,8 @@ authoritative_ases = ["ffaa:1:1", "ffaa:1:2", "ffaa:1:3"]
cert_files = ["AS1/sensitive-voting.pem", "AS1/regular-voting.pem", "AS1/cp-root.pem", "AS2/cp-root.pem", "AS3/sensitive-voting.pem", "AS3/regular-voting.pem"]
[validity]
not_before = '$(date +%s)'
validity = "365d"' \
not_before = '0'
validity = "36500d"' \
> trc-B1-S1-pld.tmpl
scion-pki trc payload --out=tmp/ISD42-B1-S1.pld.der --template trc-B1-S1-pld.tmpl
@@ -51,18 +51,18 @@ rm tmp -r
# Create CA key and certificate for issuing ASes
pushd AS1
scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key
popd
pushd AS2
scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key
popd
# Create AS key and certificate chains
scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 AS cert"}') AS1/cp-as.pem AS1/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle
scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 AS cert"}') AS2/cp-as.pem AS2/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle
scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 AS cert"}') AS3/cp-as.pem AS3/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle
scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:4", "common_name": "42-ffaa:1:4 AS cert"}') AS4/cp-as.pem AS4/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle
scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:5", "common_name": "42-ffaa:1:5 AS cert"}') AS5/cp-as.pem AS5/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 AS cert"}') AS1/cp-as.pem AS1/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 AS cert"}') AS2/cp-as.pem AS2/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 AS cert"}') AS3/cp-as.pem AS3/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:4", "common_name": "42-ffaa:1:4 AS cert"}') AS4/cp-as.pem AS4/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle
scion-pki certificate create --not-before="1970-01-01T00:00:00Z" --not-after="2124-11-02T15:41:22Z" --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:5", "common_name": "42-ffaa:1:5 AS cert"}') AS5/cp-as.pem AS5/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle
for i in {1..5}
do
pkgs/applications/audio/hqplayer-desktop/default.nix
+40 -30
View File
@@ -1,48 +1,62 @@
{ mkDerivation
{ stdenv
, alsa-lib
, autoPatchelfHook
, dpkg
, evince
, fetchurl
, flac
, gcc12
, lib
, libmicrohttpd
, libogg
, libusb-compat-0_1
, llvmPackages
, mpfr
, qtcharts
, qtdeclarative
, qtquickcontrols2
, qtwayland
, qtwebengine
, qtwebview
, rpmextract
, wavpack
, wrapQtAppsHook
}:
mkDerivation rec {
pname = "hqplayer-desktop";
version = "4.22.0-65";
src = fetchurl {
url = "https://www.signalyst.eu/bins/hqplayer4desktop-${version}.fc36.x86_64.rpm";
sha256 = "sha256-PA8amsqy4O9cMruNYVhG+uBiUGQ5WfnZC2ARppmZd7g=";
let
version = "5.8.2-25";
srcs = {
aarch64-linux = fetchurl {
url = "https://signalyst.com/bins/bookworm/hqplayer5desktop_${version}_arm64.deb";
hash = "sha256-t3aiEkxl5fP5yup2l/iuLqZhltIjo4Ahe8EUg52lOLQ=";
};
x86_64-linux = fetchurl {
url = "https://signalyst.com/bins/noble/hqplayer5desktop_${version}_amd64.deb";
hash = "sha256-kDNVR8HkMogbdk5+eRszpyLeuE+vO3ynDS+TmCWYZ2Y=";
};
};
in
stdenv.mkDerivation {
pname = "hqplayer-desktop";
inherit version;
unpackPhase = ''
${rpmextract}/bin/rpmextract "$src"
'';
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [ autoPatchelfHook rpmextract ];
nativeBuildInputs = [
autoPatchelfHook
dpkg
wrapQtAppsHook
];
buildInputs = [
alsa-lib
flac
gcc12.cc.lib
stdenv.cc.cc.lib
libmicrohttpd
libogg
libusb-compat-0_1
llvmPackages.openmp
mpfr
qtcharts
qtdeclarative
qtquickcontrols2
qtwayland
qtwebengine
qtwebview
wavpack
@@ -55,18 +69,14 @@ mkDerivation rec {
installPhase = ''
runHook preInstall
# additional library
mkdir -p "$out"/lib
mv ./opt/hqplayer4desktop/lib/* "$out"/lib
# main executable
mkdir -p "$out"/bin
mv ./usr/bin/* "$out"/bin
# documentation
mkdir -p "$doc/share/doc/${pname}" "$doc/share/applications"
mv ./usr/share/doc/hqplayer4desktop/* "$doc/share/doc/${pname}"
mv ./usr/share/applications/hqplayer4desktop-manual.desktop "$doc/share/applications"
mkdir -p "$doc/share/doc/hqplayer-desktop" "$doc/share/applications"
mv ./usr/share/doc/hqplayer5desktop/* "$doc/share/doc/hqplayer-desktop"
mv ./usr/share/applications/hqplayer5desktop-manual.desktop "$doc/share/applications"
# desktop files
mkdir -p "$out/share/applications"
@@ -83,25 +93,25 @@ mkDerivation rec {
outputs = [ "out" "doc" ];
postInstall = ''
for desktopFile in $out/share/applications/hqplayer4{desktop-nostyle,desktop-highdpi,-client,desktop}.desktop; do
for desktopFile in $out/share/applications/hqplayer5{client,desktop}.desktop; do
substituteInPlace "$desktopFile" \
--replace /usr/bin "$out"/bin
done
substituteInPlace "$doc/share/applications/hqplayer4desktop-manual.desktop" \
--replace /usr/share/doc/hqplayer4desktop "$doc/share/doc/${pname}" \
substituteInPlace "$doc/share/applications/hqplayer5desktop-manual.desktop" \
--replace /usr/share/doc/hqplayer5desktop "$doc/share/doc/hqplayer-desktop" \
--replace evince "${evince}/bin/evince"
'';
postFixup = ''
patchelf --replace-needed libomp.so.5 libomp.so "$out/bin/.hqplayer4desktop-wrapped"
patchelf --replace-needed libomp.so.5 libomp.so $out/bin/.hqplayer5*-wrapped
'';
meta = with lib; {
homepage = "https://www.signalyst.com/custom.html";
homepage = "https://www.signalyst.com";
description = "High-end upsampling multichannel software HD-audio player";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" ];
platforms = builtins.attrNames srcs;
maintainers = with maintainers; [ lovesegfault ];
};
}
pkgs/applications/blockchains/sparrow/fhsenv.nix
+2 -1
View File
@@ -3,7 +3,8 @@
}:
buildFHSEnv {
name = "sparrow-desktop";
pname = "sparrow-desktop";
inherit (sparrow-unwrapped) version;
runScript = "${sparrow-unwrapped}/bin/sparrow-desktop";
pkgs/applications/editors/vim/plugins/deprecated.json
+4 -4
View File
@@ -3,10 +3,6 @@
"date": "2022-07-27",
"new": "true-zen-nvim"
},
"compe-tmux": {
"date": "2021-12-07",
"new": "cmp-tmux"
},
"compe-conjure": {
"date": "2024-11-19",
"new": "cmp-conjure"
@@ -19,6 +15,10 @@
"date": "2024-11-19",
"new": "cmp-tabnine"
},
"compe-tmux": {
"date": "2021-12-07",
"new": "cmp-tmux"
},
"compe-zsh": {
"date": "2024-11-19",
"new": "cmp-zsh"
pkgs/applications/editors/vim/plugins/generated.nix
+379 -379
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+87 -87
View File
@@ -50,12 +50,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=415ebc8";
version = "0.0.0+rev=017696b";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-arduino";
rev = "415ebc8f75eb02a748faa03f5af199f08ced120f";
hash = "sha256-cgmlrAeuCnocdjI/zvafMxmXPmOE7GnrC+HlNJcT1Y0=";
rev = "017696bdf47ca2b10948c5a511f9ab387722d0f3";
hash = "sha256-zIs3ujkxfgCj6VBkNy/mobsAQ2mcxtjDMHxiQEMlWm8=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
};
@@ -204,12 +204,12 @@
};
c_sharp = buildGrammar {
language = "c_sharp";
version = "0.0.0+rev=362a8a4";
version = "0.0.0+rev=285c993";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "362a8a41b265056592a0c3771664a21d23a71392";
hash = "sha256-weH0nyLpvVK/OpgvOjTuJdH2Hm4a1wVshHmhUdFq3XA=";
rev = "285c993f01d9955932b45a6192055003aa70a570";
hash = "sha256-sgJw0oeJmj6ZOxBXevLIQ3oE03fRs5guY3ZfE2Xou+c=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
@@ -237,12 +237,12 @@
};
chatito = buildGrammar {
language = "chatito";
version = "0.0.0+rev=a461f20";
version = "0.0.0+rev=b4cbe9a";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-chatito";
rev = "a461f20dedb43905febb12c1635bc7d2e43e96f0";
hash = "sha256-nAdyG068usqGr9OI/bZXiNfSkIg/+L6KTcylZVNNc+o=";
rev = "b4cbe9ab7672d5106e9550d8413835395a1be362";
hash = "sha256-te2Eg8J4Zf5H6FKLnCAyyKSjTABESUKzqQWwW/k/Y1c=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito";
};
@@ -414,12 +414,12 @@
};
desktop = buildGrammar {
language = "desktop";
version = "0.0.0+rev=d52964c";
version = "0.0.0+rev=54133af";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-desktop";
rev = "d52964c67d98eaedabca6ed1ec21ae54a522e8f8";
hash = "sha256-JF6xSMKj0tZ53t+65pk4P+Mn3ubbVczJGVDGGfqDiO4=";
rev = "54133af61b2a9a75fd42c49ce0c771115f81f50b";
hash = "sha256-HsAFkM7JX0hFKVMaDypP1i5GOSj2h7cLvbxIJDM0SB8=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
};
@@ -548,12 +548,12 @@
};
editorconfig = buildGrammar {
language = "editorconfig";
version = "0.0.0+rev=e47638f";
version = "0.0.0+rev=5f4f84f";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-editorconfig";
rev = "e47638f125a4d8256f4c45f0570c8918d3a1b237";
hash = "sha256-9TEob2XBbCzktup168z5dJ9OXrdUm43qXy3khvGDTtw=";
rev = "5f4f84f0e79049e4526c0a1db669378092ecb256";
hash = "sha256-SjH1g2a7/wc9WNkscDVgffzOc0I2ULBH70CntIAlsuE=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
};
@@ -735,12 +735,12 @@
};
fortran = buildGrammar {
language = "fortran";
version = "0.0.0+rev=e9fbb3a";
version = "0.0.0+rev=4c96c4d";
src = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
rev = "e9fbb3acbfc62b051616e53b17ab97b9823e8617";
hash = "sha256-G7tsnI22k7Ndur3fLnfr2xk4fUaJ4kIy3Dw0GuqHSqg=";
rev = "4c96c4d00b5c17b109028e8627407971085034ce";
hash = "sha256-c/UfQOUfIAL6BVprefuWmCSZJXP90cRN64OgPgWJgN0=";
};
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
};
@@ -890,12 +890,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=2702fe8";
version = "0.0.0+rev=066704e";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "2702fe84b986e4403a071bcb112d48e3dcde0ca4";
hash = "sha256-DY79MOnZqb145DtmUyhma0WZ5PksDeqVvhwGuvFXGjM=";
rev = "066704e4826699e754d351e3bbe12bf2e51de9d8";
hash = "sha256-2gNta/JR6FOiidUAbcfcQol5Eb7pa8omDMsIj8TXXAE=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@@ -967,12 +967,12 @@
};
go = buildGrammar {
language = "go";
version = "0.0.0+rev=0942d76";
version = "0.0.0+rev=12fe553";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-go";
rev = "0942d76fc517739b5d29a0e420b5e602d19c724d";
hash = "sha256-2j5cYuIn2gMFzNixijUcA9Ax2US8PEb/5VK44rjnZs4=";
rev = "12fe553fdaaa7449f764bc876fd777704d4fb752";
hash = "sha256-E8ieOSkpmdsMrj1m0op0WA5ki4VkodHBMtJRCmYtmGY=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-go";
};
@@ -1044,12 +1044,12 @@
};
gpg = buildGrammar {
language = "gpg";
version = "0.0.0+rev=f99323f";
version = "0.0.0+rev=63e80cf";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gpg-config";
rev = "f99323fb8f3f10b6c69db0c2f6d0a14bd7330675";
hash = "sha256-VJXXpHVMKUNaslsjoKR6XsaUJ8C+0MyidXtRPRywnpg=";
rev = "63e80cfe1302da9f9c7ee8d9df295f47d7d181bf";
hash = "sha256-W8BglyjX/OytZCACpVi9V/k7A0Q4JaVQV+9NcyqtFsc=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config";
};
@@ -1221,12 +1221,12 @@
};
hoon = buildGrammar {
language = "hoon";
version = "0.0.0+rev=a24c5a3";
version = "0.0.0+rev=2ac017d";
src = fetchFromGitHub {
owner = "urbit-pilled";
repo = "tree-sitter-hoon";
rev = "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8";
hash = "sha256-jBKgZaZpm81ufN32sRNsCRtZhI5m057J+UY1uQdZK3E=";
rev = "2ac017d168aca1e75b3df94dbbb6b3083f79cdfe";
hash = "sha256-fRaEZGpZWiwhClYZnkkCC8rIamR38PhesY5LY6GFozQ=";
};
meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
};
@@ -1441,12 +1441,12 @@
};
just = buildGrammar {
language = "just";
version = "0.0.0+rev=11b8c43";
version = "0.0.0+rev=f6d2930";
src = fetchFromGitHub {
owner = "IndianBoy42";
repo = "tree-sitter-just";
rev = "11b8c436bfcadaa22aa6299d9635685045ad97f3";
hash = "sha256-duCuKIyfCkxXDk6eXSFwfQ0mHRQP526yWL3TZDjuENY=";
rev = "f6d29300f9fee15dcd8c2b25ab762001d38da731";
hash = "sha256-b42Dt9X0gaHjywb+tahNomGfDx9ZP+roudNuGAhKYPg=";
};
meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
};
@@ -1530,12 +1530,12 @@
};
ledger = buildGrammar {
language = "ledger";
version = "0.0.0+rev=a2eff7f";
version = "0.0.0+rev=19699bd";
src = fetchFromGitHub {
owner = "cbarrete";
repo = "tree-sitter-ledger";
rev = "a2eff7fee59ee6adfc4a3646e2f41ba3b340a97d";
hash = "sha256-7TM+Y2lDt53mxfeE5XepcdnoUtzv9FzH0klEEl4BOWU=";
rev = "19699bd9fe0bacf90d464747aab9b6179fc7b1c0";
hash = "sha256-5kTLVwakxAph33nWqMvGcHERJaSzvUGImxv7obLGz1E=";
};
meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger";
};
@@ -1730,12 +1730,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=5b8867f";
version = "0.0.0+rev=3362ba5";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "5b8867f59954c9cae76f2aa1ac88ae513de412bd";
hash = "sha256-gbqXyIGlj7XnafqlGUaG0iPHRBabcni3pJxlehO70jg=";
rev = "3362ba5caab4de11f42b4a736a0e2bcdc9343480";
hash = "sha256-LyjGD0aND/ErSDc80zvA89TbWvvMcJGd+r43aEw3BZk=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1753,12 +1753,12 @@
};
nasm = buildGrammar {
language = "nasm";
version = "0.0.0+rev=570f3d7";
version = "0.0.0+rev=d1b3638";
src = fetchFromGitHub {
owner = "naclsn";
repo = "tree-sitter-nasm";
rev = "570f3d7be01fffc751237f4cfcf52d04e20532d1";
hash = "sha256-205joaeq4ZSyfgxagPQTsx0zpZwSEpq1VCQoHJ77OL8=";
rev = "d1b3638d017f2a8585e26dcfc66fe1df94185e30";
hash = "sha256-38yRvaSkHZ7iRmHlXdCssJtd/RQRfBB437HzBwWv2mg=";
};
meta.homepage = "https://github.com/naclsn/tree-sitter-nasm";
};
@@ -1852,12 +1852,12 @@
};
nu = buildGrammar {
language = "nu";
version = "0.0.0+rev=45f9e51";
version = "0.0.0+rev=74e6037";
src = fetchFromGitHub {
owner = "nushell";
repo = "tree-sitter-nu";
rev = "45f9e51e5ee296dc0965a80f3d00178d985dffbd";
hash = "sha256-G4m2cSouRvMaxoNCKuzGK3+V+rAiaGSwVYA1DYwHwpk=";
rev = "74e6037383ce3a77ed6fdb8281bbd69316c723a4";
hash = "sha256-gkHPhTy/GxsYekMwVKTbSPpN6zyU0QWuhAdqOeF3u5M=";
};
meta.homepage = "https://github.com/nushell/tree-sitter-nu";
};
@@ -1965,46 +1965,46 @@
};
pem = buildGrammar {
language = "pem";
version = "0.0.0+rev=217ff2a";
version = "0.0.0+rev=1d16b8e";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-pem";
rev = "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a";
hash = "sha256-KGJ9ulGi3gKUJxNXil5Zai4v5/5ImUSMVP3/19ra3A0=";
rev = "1d16b8e063fdf4385e389096c4bc4999eaaef05f";
hash = "sha256-NhiSqaLjzEJHj8JimFdcZBVAR00lKf9O5JLtwIUCKhw=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pem";
};
perl = buildGrammar {
language = "perl";
version = "0.0.0+rev=089c124";
version = "0.0.0+rev=7120632";
src = fetchFromGitHub {
owner = "tree-sitter-perl";
repo = "tree-sitter-perl";
rev = "089c124d3c0c406cc01e0936c0b3941618a1f45d";
hash = "sha256-4hm76cRm+w0sFWXq1AxdagcXHfnwGVxxwHkLvuXmqxE=";
rev = "71206326a8bcbdc2032f852bab8698e315bf5910";
hash = "sha256-EySvg8EcCrRS7QfiainRgsCYg8Kvn5DROLxrnyD3rkU=";
};
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
};
php = buildGrammar {
language = "php";
version = "0.0.0+rev=6918e69";
version = "0.0.0+rev=43aad2b";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "6918e6908d78780ddd996b9fcbaa835b42782d5b";
hash = "sha256-U9OQNyjTKQVMLeiB/tNNA2hl7wug4q/pK22X4QRskk0=";
rev = "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8";
hash = "sha256-+CnUnrNRaD+CejyYjqelMYA1K3GN/WPeZBJoP2y5cmI=";
};
location = "php";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};
php_only = buildGrammar {
language = "php_only";
version = "0.0.0+rev=6918e69";
version = "0.0.0+rev=43aad2b";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "6918e6908d78780ddd996b9fcbaa835b42782d5b";
hash = "sha256-U9OQNyjTKQVMLeiB/tNNA2hl7wug4q/pK22X4QRskk0=";
rev = "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8";
hash = "sha256-+CnUnrNRaD+CejyYjqelMYA1K3GN/WPeZBJoP2y5cmI=";
};
location = "php_only";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
@@ -2055,12 +2055,12 @@
};
poe_filter = buildGrammar {
language = "poe_filter";
version = "0.0.0+rev=592476d";
version = "0.0.0+rev=908ba6a";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-poe-filter";
rev = "592476d81f95d2451f2ca107dc872224c76fecdf";
hash = "sha256-dmo/t8gCT7UTlhBvxH4xmliR3Evazv3qsz9EWz7h/gU=";
rev = "908ba6accbd9cd3fdf0a208fdc186b9ca3db123c";
hash = "sha256-WeDnIGTr3H5kqgGcMe9zEXdErg1FETNWuY0Pf4G3gAY=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter";
};
@@ -2289,12 +2289,12 @@
};
r = buildGrammar {
language = "r";
version = "0.0.0+rev=c094bd5";
version = "0.0.0+rev=a0d3e33";
src = fetchFromGitHub {
owner = "r-lib";
repo = "tree-sitter-r";
rev = "c094bd57652f8a08edc31d79a31222268fe798ee";
hash = "sha256-gF1sarYoI+6pjww1++eEu0sUDlH2cOddP1k/SjFozFg=";
rev = "a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a";
hash = "sha256-ryKgJ+3dv/O2AN5zIGtQnKml0zU0/s4Io8Tumpm62Gc=";
};
meta.homepage = "https://github.com/r-lib/tree-sitter-r";
};
@@ -2421,12 +2421,12 @@
};
robot = buildGrammar {
language = "robot";
version = "0.0.0+rev=322e4cc";
version = "0.0.0+rev=17c2300";
src = fetchFromGitHub {
owner = "Hubro";
repo = "tree-sitter-robot";
rev = "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af";
hash = "sha256-VxWZWFPYkD3odM3TpEgLKsFnN8wB6xoIiXUYqBbpDqw=";
rev = "17c2300e91fc9da4ba14c16558bf4292941dc074";
hash = "sha256-9f0xFmhEQnETvV2SAZW+jRtsVdl0ZT3CDmGkcd3Fn88=";
};
meta.homepage = "https://github.com/Hubro/tree-sitter-robot";
};
@@ -2498,23 +2498,23 @@
};
rust = buildGrammar {
language = "rust";
version = "0.0.0+rev=32c17ce";
version = "0.0.0+rev=cad8a20";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "32c17ce5463818032a9c252a849b910315b6e485";
hash = "sha256-ThsMUVCql0Z9ztMQDeLXR7gTWYY+uMGWuPvr3P8A/Hk=";
rev = "cad8a206f2e4194676b9699f26f6560d07130d3f";
hash = "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
};
scala = buildGrammar {
language = "scala";
version = "0.0.0+rev=28c3be0";
version = "0.0.0+rev=5f44942";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "28c3be045afe1e293b5ba1a74e759601e74050c3";
hash = "sha256-xJeimj4OJ2Fdqu2rA+FnCVvBo56qC9vreo7EOY4w3kc=";
rev = "5f44942205c2364ce2ced14a40687d1e09685034";
hash = "sha256-qe2ozmVxjeTIZyhnDegJj9nBccD4mpevVcF5wIsJSbI=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
@@ -2678,12 +2678,12 @@
};
sql = buildGrammar {
language = "sql";
version = "0.0.0+rev=cf6e016";
version = "0.0.0+rev=3d516e6";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "cf6e016eef607e909761d2c5170cc58b4da2bc6a";
hash = "sha256-MZ0t5XrzKBrv5g8ReG+1F839xxRwp2xZKkGSJPTluhQ=";
rev = "3d516e6ae778bd41f9d5178823798ff6af96da60";
hash = "sha256-5lmnH4ro4+M5dCpW8GnnOHEuSCCQMCqhlK3bnzEr518=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@@ -2878,24 +2878,24 @@
};
teal = buildGrammar {
language = "teal";
version = "0.0.0+rev=a8901ac";
version = "0.0.0+rev=635e616";
src = fetchFromGitHub {
owner = "euclidianAce";
repo = "tree-sitter-teal";
rev = "a8901ac8a60a11784e73542ed7a7887e206764e5";
hash = "sha256-VxFSKK7kG3hjcmCXXqi8FQZlG+aS/pjobuaCxKe8hOo=";
rev = "635e61625949a0711f63b52cfaaac1c75769885c";
hash = "sha256-LOUASVnU0KSyqcLUFbrwvqWeotX6FzoqKJAkSEapvyk=";
};
generate = true;
meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal";
};
templ = buildGrammar {
language = "templ";
version = "0.0.0+rev=c926ed7";
version = "0.0.0+rev=dc41c08";
src = fetchFromGitHub {
owner = "vrischmann";
repo = "tree-sitter-templ";
rev = "c926ed73e101bbdef3f54eaa05b8fa30d2676dfe";
hash = "sha256-mXZij3BFmekuQN+I1NXUyIXpf7C3xxO47KKt2w/G0QQ=";
rev = "dc41c080783c6305d66471672a9c9147561126e4";
hash = "sha256-zOjHKBOFOLDji8U+4ZNrpqprw/7eGwJU9w+q8i4Neno=";
};
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
};
@@ -3137,12 +3137,12 @@
};
v = buildGrammar {
language = "v";
version = "0.0.0+rev=bb0a1bd";
version = "0.0.0+rev=bbba20d";
src = fetchFromGitHub {
owner = "vlang";
repo = "v-analyzer";
rev = "bb0a1bd4c2a56f6b191b7d051ea3f2976c3bcb11";
hash = "sha256-I92i27S6d8VH1DFVfqVCH8ZxvVfSu86DcPIu/lxKIh4=";
rev = "bbba20d654a764c2d2de272fd5f45a2433870640";
hash = "sha256-icEa8TeoF/MZILYwS/ZqTUaiBEqoHKVV7etUPwyuIkw=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/vlang/v-analyzer";
@@ -3315,12 +3315,12 @@
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=0e315b8";
version = "0.0.0+rev=ce8129b";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "0e315b84aaf018533bbf3fb15360cf74eaa0305b";
hash = "sha256-MVraqKJardqS3jtWKmRRDN8KOY6H1jv3OlxI80LprLk=";
rev = "ce8129b03f03413f18f8cd989f88c05c59151bb5";
hash = "sha256-r/3aFqq6e8LYUOQ5HggqL84jlovixBdUzTzWXYjFN0E=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
pkgs/applications/editors/vim/plugins/overrides.nix
+1 -1
View File
@@ -175,7 +175,7 @@ in
pname = "avante-nvim-lib";
inherit (oldAttrs) version src;
cargoHash = "sha256-M58LL50uddn2siS3j8WovWSymdPmbJyZg1y6pGudgEo=";
cargoHash = "sha256-aB+KhqSTGTiZKml6G+cte94EAWNWo1dP8igfFOIfHXA=";
nativeBuildInputs = [
pkg-config
pkgs/applications/editors/vim/plugins/vim-plugin-names
+2 -2
View File
@@ -234,7 +234,7 @@ https://github.com/ms-jpq/coq.artifacts/,HEAD,
https://github.com/ms-jpq/coq.thirdparty/,HEAD,
https://github.com/jvoorhis/coq.vim/,,
https://github.com/ms-jpq/coq_nvim/,,
https://github.com/isovector/cornelis/,HEAD,
https://github.com/agda/cornelis/,HEAD,
https://github.com/lfilho/cosco.vim/,,
https://github.com/nixprime/cpsm/,,
https://github.com/saecki/crates.nvim/,,
@@ -722,7 +722,7 @@ https://github.com/roxma/nvim-cm-racer/,,
https://github.com/hrsh7th/nvim-cmp/,,
https://github.com/weilbith/nvim-code-action-menu/,,
https://github.com/willothy/nvim-cokeline/,HEAD,
https://github.com/nvchad/nvim-colorizer.lua/,,
https://github.com/catgoose/nvim-colorizer.lua/,,
https://github.com/terrortylor/nvim-comment/,,
https://github.com/roxma/nvim-completion-manager/,,
https://github.com/klen/nvim-config-local/,,
pkgs/applications/misc/lutris/fhsenv.nix
+2 -1
View File
@@ -23,7 +23,8 @@ let
];
in buildFHSEnv {
name = "lutris";
pname = "lutris";
inherit (lutris-unwrapped) version;
runScript = "lutris";
pkgs/applications/misc/prusa-slicer/default.nix
+11
View File
@@ -90,10 +90,19 @@ stdenv.mkDerivation (finalAttrs: {
rev = "version_${finalAttrs.version}";
};
# required for GCC 14
postPatch = ''
substituteInPlace src/libslic3r/Arrange/Core/DataStoreTraits.hpp \
--replace-fail \
"WritableDataStoreTraits<ArrItem>::template set" \
"WritableDataStoreTraits<ArrItem>::set"
'';
nativeBuildInputs = [
cmake
pkg-config
wrapGAppsHook3
wxGTK-override'
];
buildInputs = [
@@ -132,6 +141,8 @@ stdenv.mkDerivation (finalAttrs: {
darwin.apple_sdk_11_0.frameworks.CoreWLAN
];
strictDeps = true;
separateDebugInfo = true;
# The build system uses custom logic - defined in
pkgs/applications/networking/browsers/floorp/default.nix
+2 -10
View File
@@ -9,7 +9,7 @@
(
(buildMozillaMach rec {
pname = "floorp";
packageVersion = "11.20.0";
packageVersion = "11.21.0";
applicationName = "Floorp";
binaryName = "floorp";
branding = "browser/branding/official";
@@ -24,7 +24,7 @@
repo = "Floorp";
fetchSubmodules = true;
rev = "v${packageVersion}";
hash = "sha256-+FVnG8CKEQdFN9bO8rUZadp+d8keCB98T7qt9OBfLDA=";
hash = "sha256-gb190h7BAt0biE/RQayyzwSFCDEMe4F8YT6Re2mK9r4=";
};
extraConfigureFlags = [
@@ -74,12 +74,4 @@
(prev: {
MOZ_DATA_REPORTING = "";
MOZ_TELEMETRY_REPORTING = "";
# Upstream already includes some of the bugfix patches that are applied by
# `buildMozillaMach`. Pick out only the relevant ones for Floorp and override
# the list here.
patches = [
../firefox/env_var_for_system_dir-ff111.patch
../firefox/no-buildconfig-ffx121.patch
];
})
pkgs/build-support/vm/default.nix
-4
View File
@@ -176,10 +176,6 @@ rec {
fi
source $stdenv/setup
# Set the system time from the hardware clock. Works around an
# apparent KVM > 1.5.2 bug.
${util-linux}/bin/hwclock -s
export NIX_STORE=${storeDir}
export NIX_BUILD_TOP=/tmp
export TMPDIR=/tmp
pkgs/by-name/bf/bfg-repo-cleaner/package.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfg-repo-cleaner";
version = "1.13.0";
version = "1.14.0";
jarName = "bfg-${version}.jar";
src = fetchurl {
url = "mirror://maven/com/madgag/bfg/${version}/${jarName}";
sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz";
hash = "sha256-GnXpOQVB9LVdnAElazYbgVweCiY+L7PQcrVcKRHq0Lc=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/bi/binwalk/Cargo.lock
Generated
+1394
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/bi/binwalk/package.nix
+50
View File
@@ -0,0 +1,50 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
fontconfig,
bzip2,
}:
rustPlatform.buildRustPackage rec {
pname = "binwalk";
version = "3.1.0";
src = fetchFromGitHub {
owner = "ReFirmLabs";
repo = "binwalk";
rev = "refs/tags/v${version}";
hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
fontconfig
bzip2
];
# skip broken tests
checkFlags = [
"--skip=binwalk::Binwalk"
"--skip=binwalk::Binwalk::analyze"
"--skip=binwalk::Binwalk::extract"
"--skip=binwalk::Binwalk::scan"
];
meta = {
description = "Firmware Analysis Tool";
homepage = "https://github.com/ReFirmLabs/binwalk";
changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/${src.rev}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
koral
felbinger
];
};
}
pkgs/by-name/bi/bitwarden-cli/package.nix
+6 -16
View File
@@ -3,22 +3,22 @@
, buildNpmPackage
, nodejs_20
, fetchFromGitHub
, python3
, cctools
, nix-update-script
, nixosTests
, perl
, xcbuild
}:
buildNpmPackage rec {
pname = "bitwarden-cli";
version = "2024.9.0";
version = "2024.11.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "cli-v${version}";
hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w=";
hash = "sha256-4QTQgW8k3EMf07Xqs2B+VXQOUPzoOgaNvoC02x4zvu8=";
};
postPatch = ''
@@ -28,12 +28,11 @@ buildNpmPackage rec {
nodejs = nodejs_20;
npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk=";
npmDepsHash = "sha256-YzhCyNMvfXGmgOpl3qWj1Pqd1hY8CJ9QLwQds5ZMnqg=";
nativeBuildInputs = [
(python3.withPackages (ps: with ps; [ setuptools ]))
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
cctools
perl
xcbuild.xcrun
];
@@ -44,15 +43,6 @@ buildNpmPackage rec {
npm_config_build_from_source = "true";
};
# node-argon2 builds with LTO, but that causes missing symbols. So disable it
# and rebuild. See https://github.com/ranisalt/node-argon2/pull/415
preConfigure = ''
pushd node_modules/argon2
substituteInPlace binding.gyp --replace-fail '"-flto", ' ""
"$npm_config_node_gyp" rebuild
popd
'';
npmBuildScript = "build:oss:prod";
npmWorkspace = "apps/cli";
pkgs/by-name/bo/bottles/package.nix
+3 -2
View File
@@ -8,6 +8,7 @@
let
fhsEnv = {
inherit (bottles-unwrapped) version;
# Many WINE games need 32bit
multiArch = true;
@@ -113,14 +114,14 @@ symlinkJoin {
(buildFHSEnv (
fhsEnv
// {
name = "bottles";
pname = "bottles";
runScript = "bottles";
}
))
(buildFHSEnv (
fhsEnv
// {
name = "bottles-cli";
pname = "bottles-cli";
runScript = "bottles-cli";
}
))
pkgs/by-name/cl/clang-uml/package.nix
+2 -2
View File
@@ -17,13 +17,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "clang-uml";
version = "0.5.5";
version = "0.5.6";
src = fetchFromGitHub {
owner = "bkryza";
repo = "clang-uml";
rev = finalAttrs.version;
hash = "sha256-YzHlauVuFLT2PmfqJBNwqQ/P7d7tyl3brk7Vo/kTOF4=";
hash = "sha256-fsN9l5sgQ9NIjS0Tn/tAUK/p2mdP7/R7a9BFb+9I0UU=";
};
nativeBuildInputs =
pkgs/by-name/cl/cloudflare-warp/package.nix
+3 -3
View File
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "cloudflare-warp";
version = "2024.9.346";
version = "2024.11.309";
suffix = {
aarch64-linux = "arm64";
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_${suffix}.deb";
hash = {
aarch64-linux = "sha256-dgu/OiQPT7bkPnhrDArQg2lDAcOyhzZ5nJrjS2dqpFo=";
x86_64-linux = "sha256-KwxLF7LWB49M+kZPJ9M4OcDSF1f3MX4S0dTtTkzQVRQ=";
aarch64-linux = "sha256-pdCPN4NxaQqWNRPZY1CN03KnTdzl62vJ3JNfxGozI4k=";
x86_64-linux = "sha256-THxXETyy08rBmvghrc8HIQ2cBSLeNVl8SkD43CVY/tE=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
pkgs/by-name/en/envision/package.nix
+2 -1
View File
@@ -4,7 +4,8 @@
}:
buildFHSEnv {
name = "envision";
pname = "envision";
inherit (envision-unwrapped) version;
extraOutputsToInstall = [ "dev" ];
pkgs/by-name/fw/fwupd/installed-tests-path.patch
+8 -28
View File
@@ -1,33 +1,13 @@
commit 27ddb6910ec9027f8f502f5240fb33cddd9fd16b
commit 2fa1d39bb54d448ffe59bf6a8358c01f786a1cce
Author: r-vdp <ramses@well-founded.dev>
Date: Tue Oct 15 14:49:53 2024 +0200
Add output for installed tests
diff --git a/data/device-tests/meson.build b/data/device-tests/meson.build
index 4f3a5f2da..b0d21c8bd 100644
--- a/data/device-tests/meson.build
+++ b/data/device-tests/meson.build
@@ -67,5 +67,5 @@ install_data([
'wacom-intuos-bt-s.json',
'wistron-dock-40b7.json',
],
- install_dir: join_paths(datadir, 'fwupd', 'device-tests'),
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'device-tests'),
)
diff --git a/data/tests/meson.build b/data/tests/meson.build
index 3da184010..8606c9280 100644
index a22a989f3..cbd135cfa 100644
--- a/data/tests/meson.build
+++ b/data/tests/meson.build
@@ -2,7 +2,7 @@ con2 = configuration_data()
con2.set('installedtestsdir', installed_test_datadir)
con2.set('installedtestsbindir', installed_test_bindir)
con2.set('installedtestsdatadir', installed_test_datadir)
-con2.set('devicetestdir', join_paths(datadir, 'fwupd', 'device-tests'))
+con2.set('devicetestdir', join_paths(installed_test_datadir, 'fwupd', 'device-tests'))
con2.set('bindir', bindir)
con2.set('libexecdir', libexecdir)
@@ -105,7 +105,7 @@ configure_file(
output: 'fwupd-tests.conf',
configuration: con2,
@@ -38,7 +18,7 @@ index 3da184010..8606c9280 100644
if umockdev_integration_tests.allowed()
diff --git a/meson.build b/meson.build
index 62c127c35..2ceaf531c 100644
index 5a35cfda1..40ef142f0 100644
--- a/meson.build
+++ b/meson.build
@@ -194,8 +194,8 @@ else
@@ -52,7 +32,7 @@ index 62c127c35..2ceaf531c 100644
daemon_dir = join_paths(libexecdir, 'fwupd')
endif
mandir = join_paths(prefix, get_option('mandir'))
@@ -541,6 +541,7 @@ gnome = import('gnome')
@@ -545,6 +545,7 @@ gnome = import('gnome')
i18n = import('i18n')
conf.set_quoted('FWUPD_PREFIX', prefix)
@@ -61,12 +41,12 @@ index 62c127c35..2ceaf531c 100644
conf.set_quoted('FWUPD_LIBDIR', libdir)
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
diff --git a/meson_options.txt b/meson_options.txt
index 769a5b655..a4a211fbb 100644
index e04bb37c9..b1060ddb8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -328,6 +328,10 @@ option('systemd_unit_user',
value: 'fwupd-refresh',
description: 'User account to use for fwupd-refresh.service (empty for DynamicUser)',
@@ -333,6 +333,10 @@ option('systemd_syscall_filter',
value: 'true',
description: 'Enable systemd syscall filter',
)
+option('installed_test_prefix',
+ type: 'string',
pkgs/by-name/fw/fwupd/package.nix
+2 -7
View File
@@ -124,7 +124,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
version = "2.0.1";
version = "2.0.2";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
rev = finalAttrs.version;
hash = "sha256-cIkbYoSqVZtEEIh0iTr+Ovu5BWGh6d2NfImTJoc69QU=";
hash = "sha256-rmMb109SJVWDGT4z5GOA4V9O0cDMptTpwx0TXdGWjvk=";
};
patches = [
@@ -163,11 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
# EFI capsule is located in fwupd-efi now.
./efi-app-path.patch
(fetchpatch {
url = "https://github.com/fwupd/fwupd/pull/7994.diff?full_index=1";
hash = "sha256-fRM033aCoj11Q5u9Yfi3BSD/zpm2kIqf5qabs60nEoM=";
})
];
nativeBuildInputs = [
pkgs/by-name/gh/gh-f/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "gh-f";
version = "1.1.6";
version = "1.2.0";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "gh-f";
rev = "v${version}";
hash = "sha256-F98CqsSRymL/8s8u7P2Pqt6+ipLoG9Z9Q8bB+IWZTpI=";
hash = "sha256-rdHQIhrU0nzIURnmPGyzSkew6FVn4Z6J1rn3HvyDpJI=";
};
nativeBuildInputs = [
pkgs/by-name/li/libdeltachat/package.nix
+3 -3
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.150.0";
version = "1.151.1";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-lVMXW2fnpoa/iiypLhHl7WXLqouHfrRapEbXL37X7B8=";
hash = "sha256-sQPJ1IQicHzgjc2l1JYG7ieC+GKvp8cqhwZbL1yU29M=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-nzAQEaTHkKjDmKDmwZEznpvVh1KfxTM83/82hjV/Cpw=";
hash = "sha256-EyOT88XEjIVTFv7XGUEsUIu4NcDdD89W5Hbl4xa/urc=";
};
nativeBuildInputs = [
pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix
+3 -3
View File
@@ -25,13 +25,13 @@ in
stdenv.mkDerivation {
pname = "magnetic-${lib.toLower pname}";
version = "0-unstable-2024-06-27";
version = "0-unstable-2024-11-06";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Catppuccin-GTK-Theme";
rev = "0bd2869e7f0fdb36c720a4fb873d4fed361b0606";
hash = "sha256-oFVsYrJ27hYGY+x9+Z4SxVCp3w6PiLYTZaxmGhnpVHQ=";
rev = "be79b8289200aa1a17620f84dde3fe4c3b9c5998";
hash = "sha256-QItHmYZpe7BiPC+2CtFwiRXyMTG7+ex0sJTs63xmkAo=";
};
nativeBuildInputs = [jdupes sassc];
pkgs/by-name/op/open-webui/package.nix
+4 -3
View File
@@ -7,19 +7,19 @@
}:
let
pname = "open-webui";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
rev = "refs/tags/v${version}";
hash = "sha256-KbU8g9iqz7ow2Yxl5EizcYckMOHGGsEK5HkkchSXxQo=";
hash = "sha256-XbH6tAmwIZzCasuL6e0Su56ZAlSBBZsq3iBytOthEZM=";
};
frontend = buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-MdftLgmFL5zkScC4XFfjKooQa4PX3il65P9BjfU5mXk=";
npmDepsHash = "sha256-bEmShvxHzDHiliA3IGN5A6Xf3cKf1PhULTueioDT7js=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.
@@ -63,6 +63,7 @@ python312.pkgs.buildPythonApplication rec {
dependencies = with python312.pkgs; [
aiocache
aiofiles
aiohttp
alembic
anthropic
pkgs/by-name/pa/patroni/package.nix
+21 -14
View File
@@ -1,22 +1,24 @@
{ lib
, python3Packages
, fetchFromGitHub
, nixosTests
, nix-update-script
{
lib,
python3Packages,
fetchFromGitHub,
versionCheckHook,
nixosTests,
nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "patroni";
version = "4.0.3";
version = "4.0.4";
src = fetchFromGitHub {
owner = "zalando";
repo = pname;
repo = "patroni";
rev = "refs/tags/v${version}";
sha256 = "sha256-urNTxaipM4wD+1fp7EFdT7/FGLq86O1nOfst7JyX0fc=";
sha256 = "sha256-if3azfBb6/OegahZYAM2RMxmWRDsCX5DNkUATTcAUrw=";
};
propagatedBuildInputs = with python3Packages; [
dependencies = with python3Packages; [
boto3
click
consul
@@ -35,18 +37,22 @@ python3Packages.buildPythonApplication rec {
ydiff
];
pythonImportsCheck = [ "patroni" ];
nativeCheckInputs = with python3Packages; [
flake8
mock
pytestCheckHook
pytest-cov
requests
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
# Fix tests by preventing them from writing to /homeless-shelter.
preCheck = "export HOME=$(mktemp -d)";
pythonImportsCheck = [ "patroni" ];
__darwinAllowLocalNetworking = true;
passthru = {
tests.patroni = nixosTests.patroni;
@@ -54,11 +60,12 @@ python3Packages.buildPythonApplication rec {
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
homepage = "https://patroni.readthedocs.io/en/latest/";
description = "Template for PostgreSQL HA with ZooKeeper, etcd or Consul";
license = licenses.mit;
platforms = platforms.unix;
maintainers = teams.deshaw.members;
changelog = "https://github.com/patroni/patroni/blob/v${version}/docs/releases.rst";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = lib.teams.deshaw.members;
};
}
pkgs/by-name/po/pocketbase/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.22.22";
version = "0.23.1";
src = fetchFromGitHub {
owner = "pocketbase";
repo = "pocketbase";
rev = "v${version}";
hash = "sha256-X2m7BBAF91wcWlzYYhAw9PuBzMQHtRsCrgh08VaITGg=";
hash = "sha256-he4lvlIqbIozbtMizZEjfnBbXXd6+LfZqKD95UE8sPI=";
};
vendorHash = "sha256-ItuwB3Dk89fazRZL0l5EPMJ8VGC3p2jwECYVquV7xsc=";
vendorHash = "sha256-zMHEArUS4/r7nkZfDK8BwGMLrpkBihxhkBoO/p6auTk=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];
pkgs/by-name/po/poutine/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "poutine";
version = "0.13.0";
version = "0.15.2";
src = fetchFromGitHub {
owner = "boostsecurityio";
repo = "poutine";
rev = "refs/tags/v${version}";
hash = "sha256-9vbK2tc57e/YNfhSVbCMxnzOmmahr9T3x5Tt7GQjVnc=";
hash = "sha256-YBoGsexYT2/lAWEajMVa/xNRBv1R1i0hB6pTAlk43E0=";
};
vendorHash = "sha256-HYuyGSatUOch73IKc7/9imhwz0Oz6Mrccs2HKVQtaVE=";
vendorHash = "sha256-CZLzIGu6jj4JXmKJaWmyeRvcRNjBYecblW47kcsg5Nw=";
ldflags = [
"-s"
pkgs/by-name/pr/prometheus/package.nix
+5 -6
View File
@@ -31,10 +31,10 @@
}:
let
version = "2.55.0";
version = "3.0.0";
webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
hash = "sha256-iSiK6JKm78AMANfBydfCQu+aUpw6B1sZ5fGPa0KL7Fs=";
hash = "sha256-a3xyStDsutLjYIEm7t3WilmvO36eMHvd4pOtZYYsJCM=";
};
in
buildGoModule rec {
@@ -47,12 +47,12 @@ buildGoModule rec {
owner = "prometheus";
repo = "prometheus";
rev = "v${version}";
hash = "sha256-yzAp/YxLCWlpkj5z2aUdsokDaFvRwVnT6ViwL3hivdI=";
hash = "sha256-IMYDtAb2ojzZLBqRJkMcB8yFpmmJPwbbyAxFfbCikkA=";
};
vendorHash = "sha256-p2PjhFT8KOido+MMmKc7eHPkE175my3VfTp1G8bBZcA=";
vendorHash = "sha256-c96YnWPLH/tbGRb2Zlqrl3PXSZvI+NeYTGlef6REAOw=";
excludedPackages = [ "documentation/prometheus-mixin" ];
excludedPackages = [ "documentation/prometheus-mixin" "web/ui/mantine-ui/src/promql/tools" ];
postPatch = ''
tar -C web/ui -xzf ${webUiStatic}
@@ -112,7 +112,6 @@ buildGoModule rec {
preInstall = ''
mkdir -p "$out/share/doc/prometheus" "$out/etc/prometheus"
cp -a $src/documentation/* $out/share/doc/prometheus
cp -a $src/console_libraries $src/consoles $out/etc/prometheus
'';
postInstall = ''
pkgs/by-name/r2/r2modman/package.nix
+3 -3
View File
@@ -14,18 +14,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "r2modman";
version = "3.1.50";
version = "3.1.54";
src = fetchFromGitHub {
owner = "ebkr";
repo = "r2modmanPlus";
rev = "v${finalAttrs.version}";
hash = "sha256-WmF7tH5PiaggyvP/klWwNgaLKVhIoApxDtwwLpug52A=";
hash = "sha256-hsaFtQW/awhnBFS6xqDtRvzkzr/afzojYecgglsc3K8=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-ntXZ4gRXRqiPQxdwXDsLxGdBqUV5eboy9ntTlJsz9FA=";
hash = "sha256-VXlFB7hT+aL3yufJ/Ar7FMdrk2Iptf5rdvagAop00lk=";
};
patches = [
pkgs/by-name/r2/r2modman/steam-launch-fix.patch
+3 -5
View File
@@ -1,8 +1,6 @@
diff --git a/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts b/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts
index ddee0e9..fc9ffca 100644
--- a/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts
+++ b/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts
@@ -61,15 +61,9 @@ export default class SteamGameRunner_Linux extends GameRunnerProvider {
@@ -64,15 +64,8 @@
async start(game: Game, args: string): Promise<void | R2Error> {
const settings = await ManagerSettings.getSingleton(game);
@@ -11,8 +9,8 @@ index ddee0e9..fc9ffca 100644
- return steamDir;
- }
-
- LoggerProvider.instance.Log(LogSeverity.INFO, `Steam directory is: ${steamDir}`);
- LoggerProvider.instance.Log(LogSeverity.INFO, `Steam folder is: ${steamDir}`);
-
try {
- const cmd = `"${steamDir}/steam.sh" -applaunch ${game.activePlatform.storeIdentifier} ${args} ${settings.getContext().gameSpecific.launchParameters}`;
+ const cmd = `steam -applaunch ${game.activePlatform.storeIdentifier} ${args} ${settings.getContext().gameSpecific.launchParameters}`;
pkgs/by-name/re/reposilite/package.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "Reposilite";
version = "3.5.18";
version = "3.5.19";
src = fetchurl {
url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
hash = "sha256-Wc7VAUkM6c1BJLTg5GXY6nNtjDxi6I2ym14Tpc667Tw=";
hash = "sha256-EA8YCJy7iQKG4FuGfmWx0NkEb5+UqklCcPEsO6DvSf4=";
};
dontUnpack = true;
pkgs/by-name/sh/shticker-book-unwritten/package.nix
+2 -1
View File
@@ -4,7 +4,8 @@ let
shticker-book-unwritten-unwrapped = callPackage ./unwrapped.nix { };
in buildFHSEnv {
name = "shticker_book_unwritten";
pname = "shticker_book_unwritten";
inherit (shticker-book-unwritten-unwrapped) version;
targetPkgs = pkgs: with pkgs; [
alsa-lib
libglvnd
pkgs/by-name/su/sunvox/package.nix
+1 -2
View File
@@ -30,8 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
urls = [
"https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
# Upstream removes downloads of older versions, please save bumped versions to archive.org
# FIXME At the time of writing, archive.org is still recovering from the recent attacks and has not yet re-opened the page saving functionality
# https://blog.archive.org/2024/10/21/internet-archive-services-update-2024-10-21/
"https://web.archive.org/web/20241121002213/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
];
hash = "sha256-7DZyoOz3jDYsuGqbs0PRs6jdWCxBhSDUKk8KVJQm/3o=";
};
pkgs/by-name/ta/tana/package.nix
+2 -2
View File
@@ -55,7 +55,7 @@ let
];
buildInputs = glLibs ++ libs;
runpathPackages = glLibs ++ [ stdenv.cc.cc stdenv.cc.libc ];
version = "1.0.16";
version = "1.0.17";
in
stdenv.mkDerivation {
pname = "tana";
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
hash = "sha256-XLjzvMai5HyxEGK02DfBAKy5jva9wEGcf5A/38jzu+s=";
hash = "sha256-IgF4VWCp3M6tQBfFAPR9u9UgGFs6f7qU3s94nGYEKkY=";
};
nativeBuildInputs = [
pkgs/by-name/tr/tracexec/package.nix
+31 -14
View File
@@ -5,10 +5,16 @@
rustPlatform,
cargo-about,
nix-update-script,
pkg-config,
libbpf,
elfutils,
libseccomp,
zlib,
clang,
}:
let
pname = "tracexec";
version = "0.5.2";
version = "0.8.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -17,31 +23,42 @@ rustPlatform.buildRustPackage {
owner = "kxxt";
repo = "tracexec";
rev = "refs/tags/v${version}";
hash = "sha256-PLUB0t9eDR0mYUI6TiUxafo6yMymwdTux7ykF8rTGGc=";
hash = "sha256-ZoYqmjqY9eAHGDIbFX9FY1yGF210C60UWcHi0lxzL7g=";
};
cargoHash = "sha256-PJclGjQTAOvnl8LJTxlDyEuzdWE1R7A2gJe1I1sKde0=";
cargoHash = "sha256-mZSj45im5b25mt8mGYLq03blvFCyS02kVK7yV3bIlUg=";
nativeBuildInputs = [ cargo-about ];
hardeningDisable = [ "zerocallusedregs" ];
# Remove RiscV64 specialisation when this is fixed:
# * https://github.com/NixOS/nixpkgs/pull/310158#pullrequestreview-2046944158
# * https://github.com/rust-vmm/seccompiler/pull/72
cargoBuildFlags = lib.optional stdenv.hostPlatform.isRiscV64 "--no-default-features";
nativeBuildInputs = [
cargo-about
pkg-config
clang
];
buildInputs = [
libbpf
elfutils
libseccomp
zlib
];
cargoBuildFlags =
[
"--no-default-features"
"--features=recommended"
]
# Remove RiscV64 specialisation when this is fixed:
# * https://github.com/NixOS/nixpkgs/pull/310158#pullrequestreview-2046944158
# * https://github.com/rust-vmm/seccompiler/pull/72
++ lib.optional stdenv.hostPlatform.isRiscV64 "--no-default-features";
preBuild = ''
sed -i '1ino-clearly-defined = true' about.toml # disable network requests
cargo about generate --config about.toml -o THIRD_PARTY_LICENSES.HTML about.hbs
'';
# Tests don't work for native non-x86 compilation
# because upstream overrides the name of the linker executables,
# see https://github.com/NixOS/nixpkgs/pull/310158#issuecomment-2118845043
doCheck = stdenv.hostPlatform.isx86_64;
checkFlags = [
"--skip=cli::test::log_mode_without_args_works" # `Permission denied` (needs `CAP_SYS_PTRACE`)
"--skip=tracer::test::tracer_emits_exec_event" # needs `/bin/true`
];
postInstall = ''
pkgs/by-name/ug/ugrep/package.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ugrep";
version = "7.0.3";
version = "7.1.0";
src = fetchFromGitHub {
owner = "Genivia";
repo = "ugrep";
rev = "v${finalAttrs.version}";
hash = "sha256-C/Nb5wxZtMzYBJmqOj8UwCU5yrQIrHCHsstuIiKMMq0=";
hash = "sha256-H2c2PpdgjzPwR2aOFgQSLTeyxCBg4Ngibf0t1aT3xl8=";
};
buildInputs = [
pkgs/by-name/vi/vieb/package.nix
+3 -3
View File
@@ -2,20 +2,20 @@
buildNpmPackage rec {
pname = "vieb";
version = "12.0.0";
version = "12.1.0";
src = fetchFromGitHub {
owner = "Jelmerro";
repo = pname;
rev = version;
hash = "sha256-/gMAGmTsaS9B0qHXHq2Z/77LgcAMKjF6Mt7OiJ9l4wU=";
hash = "sha256-Gx2O5KJ0N/rSTwYcA10bRjXacIUdXETd18dkGBVv8wM=";
};
postPatch = ''
sed -i '/"electron"/d' package.json
'';
npmDepsHash = "sha256-sGDygjb9+tIBHykMUb3UGZrCF8btkFVObTdyx4Y3Q2c=";
npmDepsHash = "sha256-eajM2YysFhp3eiWeJwkfpZPpte31UHrtg9rfMexefsg=";
makeCacheWritable = true;
dontNpmBuild = true;
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
pkgs/development/embedded/platformio/chrootenv.nix
+2 -1
View File
@@ -21,7 +21,8 @@ let
in
buildFHSEnv {
name = "platformio";
pname = "platformio";
inherit (platformio-core) version;
targetPkgs = pio-pkgs;
# disabled temporarily because fastdiff no longer support 32bit
pkgs/development/libraries/vtk/generic.nix
+2 -22
View File
@@ -4,13 +4,10 @@
, enableQt ? false, qtx11extras, qttools, qtdeclarative, qtEnv
, enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given."
, enableEgl ? false
# Darwin support
, AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc
}:
let
inherit (lib) optionalString optionals optional;
inherit (lib) optionalString optionals;
version = "${majorVersion}.${minorVersion}";
pythonMajor = lib.substring 0 1 python.pythonVersion;
@@ -34,26 +31,10 @@ in stdenv.mkDerivation {
libGLU
xorgproto
libXt
] ++ optionals stdenv.hostPlatform.isDarwin [
xpc
AGL
Cocoa
CoreServices
DiskArbitration
IOKit
CFNetwork
Security
ApplicationServices
CoreText
IOSurface
ImageIO
OpenGL
GLUT
] ++ optionals enablePython [
python
];
propagatedBuildInputs = optionals stdenv.hostPlatform.isDarwin [ libobjc ]
++ optionals stdenv.hostPlatform.isLinux [ libX11 libGL ];
propagatedBuildInputs = optionals stdenv.hostPlatform.isLinux [ libX11 libGL ];
# see https://github.com/NixOS/nixpkgs/pull/178367#issuecomment-1238827254
patches = map fetchpatch patchesToFetch;
@@ -94,7 +75,6 @@ in stdenv.mkDerivation {
] ++ optionals enableQt [
"-DVTK_GROUP_ENABLE_Qt:STRING=YES"
]
++ optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
++ optionals enablePython [
"-DVTK_WRAP_PYTHON:BOOL=ON"
"-DVTK_PYTHON_VERSION:STRING=${pythonMajor}"
pkgs/development/lua-modules/generated-packages.nix
+76 -76
View File
@@ -250,14 +250,14 @@ buildLuarocksPackage {
commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "commons.nvim";
version = "19.0.0-1";
version = "21.1.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/commons.nvim-19.0.0-1.rockspec";
sha256 = "0ispimmwx2zh8jpdhdqk0r837y6959l9r2y8iri6l67dnfy7j4ky";
url = "mirror://luarocks/commons.nvim-21.1.0-1.rockspec";
sha256 = "00gq8ca65s01ay5c577dqbrya1vkqanf147wi25z6k1jlan33la1";
}).outPath;
src = fetchzip {
url = "https://github.com/linrongbin16/commons.nvim/archive/ab59d5ab57d02bcb2b29234637c79ff74d7693b6.zip";
sha256 = "0n7dpwhs1f6rmxvjhqj1vs29apmmcbdwcifjjxi13vdxmx1zn2dq";
url = "https://github.com/linrongbin16/commons.nvim/archive/ff4a221ac0007f9a47c2f5479a5e6180cc743ed1.zip";
sha256 = "1f7964rdmzsp3a7av4in7biki32l5mv4y3jahjpr7sxh10ly6slh";
};
disabled = luaOlder "5.1";
@@ -555,14 +555,14 @@ buildLuarocksPackage {
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "fzf-lua";
version = "0.0.1483-1";
version = "0.0.1494-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/fzf-lua-0.0.1483-1.rockspec";
sha256 = "07ryrmv1s9kcv06kzg37cdzl4gshiq214zcsrn9a7mcb0823vfns";
url = "mirror://luarocks/fzf-lua-0.0.1494-1.rockspec";
sha256 = "0k6igz74ah84a91wbasqdjs44fcc91mijgi3ks0g6is9xkdvscy8";
}).outPath;
src = fetchzip {
url = "https://github.com/ibhagwan/fzf-lua/archive/2a7eb32871a131e24021dd1756865e475fe7e274.zip";
sha256 = "0cll709szckarz4d1847vm12c3v9japb90rnzmh0xfwbdknbz7cn";
url = "https://github.com/ibhagwan/fzf-lua/archive/ce978474e406f4faacd2e66ec35d93b9e8ae069e.zip";
sha256 = "078i9f5n2iphghjxrz42gra5hnfcwqhprp5wj9rwlsq4ws6ks4d6";
};
disabled = luaOlder "5.1";
@@ -606,8 +606,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7";
hash = "sha256-8vWilpsVw22+nAEAjhGOvZniRRj5r1UITcW9YeuDH8o=";
rev = "5f808b5e4fef30bd8aca1b803b4e555da07fc412";
hash = "sha256-H7A+AxioiedSuC+jqRwP4c7DjZR/0j4o/fTUasT2urc=";
};
disabled = lua.luaversion != "5.1";
@@ -1678,16 +1678,16 @@ buildLuarocksPackage {
luadbi = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }:
buildLuarocksPackage {
pname = "luadbi";
version = "0.7.3-1";
version = "0.7.4-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luadbi-0.7.3-1.rockspec";
sha256 = "0lyiwyg6qnnj7d5rxim6b9p68nbszmwhg57xjlvalbcgwgipk1ns";
url = "mirror://luarocks/luadbi-0.7.4-1.rockspec";
sha256 = "12nqbl2zmwyz7k0x1y5h235di3jb0xwf27p1rh8lcgg4cqx6izr7";
}).outPath;
src = fetchFromGitHub {
owner = "mwild1";
repo = "luadbi";
rev = "v0.7.3";
hash = "sha256-L2i/e44HvPRhGKH4pUE/6QzO8pHYymHdj2SpHf6YO/I=";
rev = "v0.7.4";
hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.5";
@@ -1702,16 +1702,16 @@ buildLuarocksPackage {
luadbi-mysql = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder, luadbi }:
buildLuarocksPackage {
pname = "luadbi-mysql";
version = "0.7.3-1";
version = "0.7.4-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luadbi-mysql-0.7.3-1.rockspec";
sha256 = "1x0pl6qpdi4vmhxs2076kkxmikbv0asndh8lp34r47lym37hcrr3";
url = "mirror://luarocks/luadbi-mysql-0.7.4-1.rockspec";
sha256 = "0ngpml0mw272pp03kabl1q3jj4fd5hmdlgvw9a2hgl0051358i6c";
}).outPath;
src = fetchFromGitHub {
owner = "mwild1";
repo = "luadbi";
rev = "v0.7.3";
hash = "sha256-L2i/e44HvPRhGKH4pUE/6QzO8pHYymHdj2SpHf6YO/I=";
rev = "v0.7.4";
hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.5";
@@ -1727,16 +1727,16 @@ buildLuarocksPackage {
luadbi-postgresql = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder, luadbi }:
buildLuarocksPackage {
pname = "luadbi-postgresql";
version = "0.7.3-1";
version = "0.7.4-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luadbi-postgresql-0.7.3-1.rockspec";
sha256 = "1bnjsgk7cl6wmfhmn8b0av49yabf8flhdi1jhczksvvpf32p77bw";
url = "mirror://luarocks/luadbi-postgresql-0.7.4-1.rockspec";
sha256 = "0wybfngdz8hw4sgmz8rmym1frz6fwrvpx1l5gh0j68m7q4l25crg";
}).outPath;
src = fetchFromGitHub {
owner = "mwild1";
repo = "luadbi";
rev = "v0.7.3";
hash = "sha256-L2i/e44HvPRhGKH4pUE/6QzO8pHYymHdj2SpHf6YO/I=";
rev = "v0.7.4";
hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.5";
@@ -1752,16 +1752,16 @@ buildLuarocksPackage {
luadbi-sqlite3 = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder, luadbi }:
buildLuarocksPackage {
pname = "luadbi-sqlite3";
version = "0.7.3-1";
version = "0.7.4-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luadbi-sqlite3-0.7.3-1.rockspec";
sha256 = "0ppkk1jkxw2fhc4x26h7h2bks51shl3am552phn7all5h3k7h3by";
url = "mirror://luarocks/luadbi-sqlite3-0.7.4-1.rockspec";
sha256 = "05kjihy5a8hyhn286gi2q1qyyiy8ajnyqp90wv41zjvhxjhg8ymx";
}).outPath;
src = fetchFromGitHub {
owner = "mwild1";
repo = "luadbi";
rev = "v0.7.3";
hash = "sha256-L2i/e44HvPRhGKH4pUE/6QzO8pHYymHdj2SpHf6YO/I=";
rev = "v0.7.4";
hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.5";
@@ -2396,6 +2396,31 @@ buildLuarocksPackage {
};
}) {};
lusc_luv = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luv }:
buildLuarocksPackage {
pname = "lusc_luv";
version = "4.0.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lusc_luv-4.0.1-1.rockspec";
sha256 = "1bgk481ljfy8q7r3w9z1x5ix0dm6v444c7mf9nahlpyrz9skxakp";
}).outPath;
src = fetchFromGitHub {
owner = "svermeulen";
repo = "lusc_luv";
rev = "main";
hash = "sha256-xT3so0QHtzzLRNRb7yqfaRMwkl2bt1MP1xh8BkHKqqo=";
};
disabled = luaOlder "5.1";
propagatedBuildInputs = [ luv ];
meta = {
homepage = "https://github.com/svermeulen/lusc_luv";
description = "Structured Async/Concurrency for Lua using Luv";
license.fullName = "MIT";
};
}) {};
lush-nvim = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }:
buildLuarocksPackage {
pname = "lush.nvim";
@@ -2443,31 +2468,6 @@ buildLuarocksPackage {
};
}) {};
lusc_luv = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luv }:
buildLuarocksPackage {
pname = "lusc_luv";
version = "4.0.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lusc_luv-4.0.1-1.rockspec";
sha256 = "1bgk481ljfy8q7r3w9z1x5ix0dm6v444c7mf9nahlpyrz9skxakp";
}).outPath;
src = fetchFromGitHub {
owner = "svermeulen";
repo = "lusc_luv";
rev = "838b8f647911b1fcfe160ddce881409ea9b35acf";
hash = "sha256-xT3so0QHtzzLRNRb7yqfaRMwkl2bt1MP1xh8BkHKqqo=";
};
disabled = luaOlder "5.1";
propagatedBuildInputs = [ luv ];
meta = {
homepage = "https://github.com/svermeulen/lusc_luv";
description = "Structured Async/Concurrency for Lua using Luv";
license.fullName = "MIT";
};
}) {};
luv = callPackage({ buildLuarocksPackage, cmake, fetchurl, luaOlder }:
buildLuarocksPackage {
pname = "luv";
@@ -2707,8 +2707,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "leafo";
repo = "moonscript";
rev = "d5341c9093c49d3724072b209cde28b5cb0f47c9";
hash = "sha256-sVMhqCzGhfEGoFueVINx9hnnE5vNN61S6t3CXGBnxcA=";
rev = "60094ca0be870462678925413b6528ae5bf4690a";
hash = "sha256-xYKn/A1mX1h4LdLcV/2Vww1YJCfhlkXy8fEcqeofYPk=";
};
disabled = luaOlder "5.1";
@@ -2846,8 +2846,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "f17d9b4394027ff4442b298398dfcaab97e40c4f";
hash = "sha256-iNEoMl/X0nh2sAio1h+dkuobeOXRBXKFJCcElUyyW54=";
rev = "ed31156aa2cc14e3bc066c59357cc91536a2bc01";
hash = "sha256-Rpb1rPYFQs74XzNQfj83o/l7bfM3GnYk+EqoDnz2JyM=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.4";
@@ -3025,14 +3025,14 @@ buildLuarocksPackage {
rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }:
buildLuarocksPackage {
pname = "rocks-config.nvim";
version = "3.0.0-1";
version = "3.1.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks-config.nvim-3.0.0-1.rockspec";
sha256 = "08jg5v1jnmg0ig395d6lmsdpa2vw8m9w3barvar0s77a7lkxgywg";
url = "mirror://luarocks/rocks-config.nvim-3.1.0-1.rockspec";
sha256 = "0165jyp21hxaaimn166r3r5rrjzx9q8ci1s2w54kiijz79i7kpg3";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v3.0.0.zip";
sha256 = "16836pxg0bq6f8qj6kn73v75kbwlr533pmv9dal4h53qldqjn9hh";
url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v3.1.0.zip";
sha256 = "1r5g3f039b41c0c55i6vqph4hslc0706s6blrz15yxhgyj4ksi8p";
};
disabled = luaOlder "5.1";
@@ -3144,14 +3144,14 @@ buildLuarocksPackage {
rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "rustaceanvim";
version = "5.14.1-1";
version = "5.15.2-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rustaceanvim-5.14.1-1.rockspec";
sha256 = "1xr2vvcsd525h304w1hf6ij1qfwlklyczk1bh5jd6s2hnrkwyy5b";
url = "mirror://luarocks/rustaceanvim-5.15.2-1.rockspec";
sha256 = "146wgs02qvlhpvq4vkn3kyjqa7305lc8741rqd46rw7y4cmnxmrn";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.14.1.zip";
sha256 = "1p0pqv0a415k0ndgdjy0k0p58sdvn4ngm9zymd5hn3ny9441b22v";
url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.15.2.zip";
sha256 = "0kflz9n5kzyfjix8gmy8a7rqdzwwp77m2ffx54a82rbb9ddqs5jr";
};
disabled = luaOlder "5.1";
@@ -3501,16 +3501,16 @@ buildLuarocksPackage {
vusted = callPackage({ buildLuarocksPackage, busted, fetchFromGitHub, fetchurl, luasystem }:
buildLuarocksPackage {
pname = "vusted";
version = "2.5.0-1";
version = "2.5.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/vusted-2.5.0-1.rockspec";
sha256 = "05jv8kl0hy3pyrknafmynifrqyrcc5q9qkd4ly1vmxgmmbm30nqz";
url = "mirror://luarocks/vusted-2.5.1-1.rockspec";
sha256 = "14h1vbms6ygqpdfsms1prvp29ld8kk1w2qa2c9b6i02h3dg45dv6";
}).outPath;
src = fetchFromGitHub {
owner = "notomo";
repo = "vusted";
rev = "v2.5.0";
hash = "sha256-1/fZ8OAw9NZoY1YDN6OhOJRqwRDWps5JJDIsvWg1Nr4=";
rev = "v2.5.1";
hash = "sha256-XHAPgLNGVdqyeukqimLqRlDhuiMEhOhBO0vUIFDAPjM=";
};
propagatedBuildInputs = [ busted luasystem ];
pkgs/development/lua-modules/overrides.nix
+2 -3
View File
@@ -349,9 +349,8 @@ in
luarocksConfig = lib.recursiveUpdate oa.luarocksConfig {
variables = {
# Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql";
MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql";
MYSQL_INCDIR = "${lib.getDev libmysqlclient}/include/";
MYSQL_LIBDIR = "${lib.getLib libmysqlclient}/lib/";
};
};
buildInputs = oa.buildInputs ++ [
pkgs/development/python-modules/asyncstdlib/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "asyncstdlib";
version = "3.12.5";
version = "3.13.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "maxfischer2781";
repo = "asyncstdlib";
rev = "refs/tags/v${version}";
hash = "sha256-RQoq+Okzan4/Q51mlL1EPyZuBSr3+xGWEPSAnZYJGyA=";
hash = "sha256-0VEJ26MP6gIgPvjan7LgCEtSLpg4wXhmFNPGZGntPD8=";
};
build-system = [ flit-core ];
pkgs/development/python-modules/binwalk/default.nix
-87
View File
@@ -1,87 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
stdenv,
zlib,
xz,
gzip,
bzip2,
gnutar,
p7zip,
cabextract,
cramfsprogs,
cramfsswap,
sasquatch,
setuptools,
squashfsTools,
matplotlib,
pycrypto,
pyqtgraph,
pyqt5,
pytestCheckHook,
yaffshiv,
visualizationSupport ? false,
}:
buildPythonPackage rec {
pname = "binwalk${lib.optionalString visualizationSupport "-full"}";
version = "2.4.3";
pyproject = true;
src = fetchFromGitHub {
owner = "OSPG";
repo = "binwalk";
rev = "refs/tags/v${version}";
hash = "sha256-kabibUMh5HyAJCXOyZo3QSNIVz8fER4Xivuv9E3CfEE=";
};
build-system = [ setuptools ];
propagatedBuildInputs =
[
zlib
xz
gzip
bzip2
gnutar
p7zip
cabextract
squashfsTools
xz
pycrypto
yaffshiv
]
++ lib.optionals visualizationSupport [
matplotlib
pyqtgraph
pyqt5
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
cramfsprogs
cramfsswap
sasquatch
];
# setup.py only installs version.py during install, not test
postPatch = ''
echo '__version__ = "${version}"' > src/binwalk/core/version.py
'';
# binwalk wants to access ~/.config/binwalk/magic
preCheck = ''
HOME=$(mktemp -d)
'';
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "binwalk" ];
meta = with lib; {
homepage = "https://github.com/OSPG/binwalk";
description = "Tool for searching a given binary image for embedded files";
mainProgram = "binwalk";
maintainers = [ maintainers.koral ];
license = licenses.mit;
};
}
pkgs/development/python-modules/deltachat-rpc-client/default.nix
+4 -3
View File
@@ -21,11 +21,12 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [ imap-tools ];
pythonImportsCheck = [ "deltachat_rpc_client" ];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
imap-tools
pytestCheckHook
];
# requires a chatmail server
doCheck = false;
pkgs/development/python-modules/dnachisel/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "dnachisel";
version = "3.2.11";
version = "3.2.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Edinburgh-Genome-Foundry";
repo = "DnaChisel";
rev = "refs/tags/v${version}";
hash = "sha256-rcZq/HhU1xIyQ1jM8+gO9ONDLBAxiUIByoWk2nMwuGA=";
hash = "sha256-zoKaeK0b4EoxEQMODfrzDpI7xIKQ/w6Dmot+dw92fuw=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/fastapi-mail/default.nix
+11 -15
View File
@@ -1,27 +1,26 @@
{
lib,
aioredis,
aiosmtplib,
blinker,
buildPythonPackage,
email-validator,
fakeredis,
fastapi,
fetchFromGitHub,
httpx,
jinja2,
poetry-core,
pydantic,
pydantic-settings,
pydantic,
pytest-asyncio,
pytestCheckHook,
python-multipart,
pythonOlder,
redis,
starlette,
}:
buildPythonPackage rec {
pname = "fastapi-mail";
version = "1.4.1";
version = "1.4.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -30,7 +29,7 @@ buildPythonPackage rec {
owner = "sabuhish";
repo = "fastapi-mail";
rev = "refs/tags/${version}";
hash = "sha256-2iTZqZIxlt1GKhElasTcnys18UbNNDwHoZziHBOIGBo=";
hash = "sha256-QypW7yE5jBkS1Q4XPIOktWnCmCXGoUzZF/SdWmFsPX8=";
};
pythonRelaxDeps = [
@@ -38,27 +37,24 @@ buildPythonPackage rec {
"pydantic"
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'version = "1.2.5"' 'version = "${version}"'
'';
build-system = [ poetry-core ];
dependencies = [
aioredis
aiosmtplib
blinker
email-validator
fakeredis
fastapi
httpx
jinja2
pydantic
pydantic-settings
python-multipart
starlette
];
optional-dependencies = {
httpx = [ httpx ];
redis = [ redis ];
};
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
pkgs/development/python-modules/geoarrow-c/default.nix
+53
View File
@@ -0,0 +1,53 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pytestCheckHook,
pyarrow,
cython,
numpy,
setuptools,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "geoarrow-c";
version = "0.1.3";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
repo = "geoarrow-c";
owner = "geoarrow";
rev = "refs/tags/geoarrow-c-python-${version}";
hash = "sha256-kQCD3Vptl7GtRFigr4darvdtwnaHRLZWvBBpZ0xHMgM=";
};
sourceRoot = "${src.name}/python/geoarrow-c";
build-system = [
cython
setuptools
setuptools-scm
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeCheckInputs = [
pytestCheckHook
pyarrow
numpy
];
pythonImportsCheck = [ "geoarrow.c" ];
meta = with lib; {
description = "Experimental C and C++ implementation of the GeoArrow specification";
homepage = "https://github.com/geoarrow/geoarrow-c";
license = licenses.asl20;
maintainers = with maintainers; [
cpcloud
];
};
}
pkgs/development/python-modules/geoarrow-pandas/default.nix
+52
View File
@@ -0,0 +1,52 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pytestCheckHook,
pandas,
pyarrow,
geoarrow-pyarrow,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "geoarrow-pandas";
version = "0.1.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
repo = "geoarrow-python";
owner = "geoarrow";
rev = "refs/tags/geoarrow-pandas-${version}";
hash = "sha256-Ni+GKTRhRDRHip1us3OZPuUhHQCNU7Nap865T/+CU8Y=";
};
sourceRoot = "${src.name}/geoarrow-pandas";
build-system = [ setuptools-scm ];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
dependencies = [
geoarrow-pyarrow
pandas
pyarrow
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "geoarrow.pandas" ];
meta = with lib; {
description = "Python implementation of the GeoArrow specification";
homepage = "https://github.com/geoarrow/geoarrow-python";
license = licenses.asl20;
maintainers = with maintainers; [
cpcloud
];
};
}
pkgs/development/python-modules/geoarrow-pyarrow/default.nix
+77
View File
@@ -0,0 +1,77 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pytestCheckHook,
geoarrow-c,
pyarrow,
pyarrow-hotfix,
numpy,
pandas,
geopandas,
pyogrio,
pyproj,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "geoarrow-pyarrow";
version = "0.1.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
repo = "geoarrow-python";
owner = "geoarrow";
rev = "refs/tags/geoarrow-pyarrow-${version}";
hash = "sha256-Ni+GKTRhRDRHip1us3OZPuUhHQCNU7Nap865T/+CU8Y=";
};
sourceRoot = "${src.name}/geoarrow-pyarrow";
build-system = [ setuptools-scm ];
disabledTests = [
# these tests are incompatible with arrow 17
"test_make_point"
"test_point_with_offset"
"test_linestring_with_offset"
"test_polygon_with_offset"
"test_multipoint_with_offset"
"test_multilinestring_with_offset"
"test_multipolygon_with_offset"
"test_multipolygon_with_offset_nonempty_inner_lists"
"test_interleaved_multipolygon_with_offset"
"test_readpyogrio_table_gpkg"
"test_geometry_type_basic"
];
dependencies = [
geoarrow-c
pyarrow
pyarrow-hotfix
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeCheckInputs = [
pytestCheckHook
numpy
pandas
geopandas
pyogrio
pyproj
];
pythonImportsCheck = [ "geoarrow.pyarrow" ];
meta = with lib; {
description = "PyArrow implementation of geospatial data types";
homepage = "https://github.com/geoarrow/geoarrow-python";
license = licenses.asl20;
maintainers = with maintainers; [
cpcloud
];
};
}
pkgs/development/python-modules/geoarrow-types/default.nix
+45
View File
@@ -0,0 +1,45 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pytestCheckHook,
pyarrow,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "geoarrow-types";
version = "0.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
repo = "geoarrow-python";
owner = "geoarrow";
rev = "refs/tags/geoarrow-types-${version}";
hash = "sha256-LySb4AsRuSirDJ73MAPpnMwPM2WFfG6X82areR4Y4lI=";
};
sourceRoot = "${src.name}/geoarrow-types";
build-system = [ setuptools-scm ];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeCheckInputs = [
pytestCheckHook
pyarrow
];
pythonImportsCheck = [ "geoarrow.types" ];
meta = with lib; {
description = "PyArrow types for geoarrow";
homepage = "https://github.com/geoarrow/geoarrow-python";
license = licenses.asl20;
maintainers = with maintainers; [
cpcloud
];
};
}
pkgs/development/python-modules/jc/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "jc";
version = "1.25.3";
version = "1.25.4";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "kellyjonbrazil";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-yp5533CzqJ++G6nHip1281ZkB4JyfLb3inR9BwDkxSs=";
hash = "sha256-9006FoIGUpmb+tC2d6jLsYpKUPM5OEXxK1ztAREwZ1E=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/meteoswiss-async/default.nix
+4 -1
View File
@@ -26,7 +26,10 @@ buildPythonPackage rec {
hash = "sha256-xFvfyLZvBfnbzShKN+94piNUVjV1cfi4jWpc/Xw6XG4=";
};
pythonRelaxDeps = [ "aiohttp" ];
pythonRelaxDeps = [
"aiohttp"
"asyncstdlib"
];
build-system = [ setuptools ];
pkgs/development/python-modules/python-etcd/default.nix
+14 -3
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
setuptools,
@@ -9,7 +10,6 @@
etcd_3_4,
mock,
pyopenssl,
stdenv,
}:
buildPythonPackage {
@@ -48,9 +48,20 @@ buildPythonPackage {
done
'';
meta = with lib; {
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# Seems to be failing because of network restrictions
# AttributeError: Can't get local object 'TestWatch.test_watch_indexed_generator.<locals>.watch_value'
"test_watch"
"test_watch_generator"
"test_watch_indexed"
"test_watch_indexed_generator"
];
__darwinAllowLocalNetworking = true;
meta = {
description = "Python client for Etcd";
homepage = "https://github.com/jplana/python-etcd";
license = licenses.mit;
license = lib.licenses.mit;
};
}
pkgs/development/python-modules/pytransportnswv2/default.nix
+3 -2
View File
@@ -16,7 +16,8 @@ buildPythonPackage rec {
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
pname = "PyTransportNSWv2";
inherit version;
hash = "sha256-hpbq1Krv+DklSXBMJsyRZd8d0yj+vaRjlu2pu6sLV0Y=";
};
@@ -30,7 +31,7 @@ buildPythonPackage rec {
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "TransportNSW" ];
pythonImportsCheck = [ "TransportNSWv2" ];
meta = with lib; {
description = "Python module to access Transport NSW information";
pkgs/development/python-modules/radio-beam/default.nix
+4 -12
View File
@@ -15,23 +15,15 @@
buildPythonPackage rec {
pname = "radio-beam";
version = "0.3.7";
version = "0.3.8";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-7AFkuuYLzibwwgz6zrFw0fBXCnGLzdm4OgT+Chve5jU=";
inherit version;
pname = "radio_beam"; # Tarball was uploaded with an underscore in this version
hash = "sha256-CE/rcYKO3Duz5zwmJ4gEuqOoO3Uy7sjwOi96HP0Y53A=";
};
# Fix distutils deprecation in Python 3.12. See:
# https://github.com/radio-astro-tools/radio-beam/pull/124
patches = [
(fetchpatch2 {
url = "https://github.com/radio-astro-tools/radio-beam/commit/1eb0216c8d7f5a4494d8d1fe8c79b48425a9c491.patch";
hash = "sha256-kTJF/cnkJCjJI2psvs+4MWFn/+b8TvUWjdfYu5ot0XU=";
})
];
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [
pkgs/development/python-modules/syrupy/default.nix
+4 -2
View File
@@ -5,12 +5,13 @@
python,
poetry-core,
pytest,
pytest-xdist,
invoke,
}:
buildPythonPackage rec {
pname = "syrupy";
version = "4.7.2";
version = "4.8.0";
pyproject = true;
disabled = lib.versionOlder python.version "3.8.1";
@@ -19,7 +20,7 @@ buildPythonPackage rec {
owner = "syrupy-project";
repo = "syrupy";
rev = "refs/tags/v${version}";
hash = "sha256-akYUsstepkDrRXqp1DY6wEeXMMlLNcCqitnWpjcAurg=";
hash = "sha256-IifGufCUhjbl8Tqvcjm8XF4QPvOsRacPWxI1yT79eNs=";
};
build-system = [ poetry-core ];
@@ -29,6 +30,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
invoke
pytest
pytest-xdist
];
checkPhase = ''
pkgs/development/python-modules/urwid-readline/default.nix
+4 -4
View File
@@ -9,19 +9,19 @@
buildPythonPackage rec {
pname = "urwid-readline";
version = "0.14";
version = "0.15.1";
pyproject = true;
src = fetchFromGitHub {
owner = "rr-";
repo = "urwid_readline";
rev = "refs/tags/${version}";
hash = "sha256-ZTg+GZnu7R6Jf2+SIwVo57yHnjwuY92DElTJs8oRErE=";
hash = "sha256-HiMMLzVE/Qw/PR7LXACyfzblxrGYrbMoi3/e/QzqF34=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [ urwid ];
dependencies = [ urwid ];
pythonImportsCheck = [ "urwid_readline" ];
pkgs/development/tools/build-managers/moon/default.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "moon";
version = "1.29.0";
version = "1.29.4";
src = fetchFromGitHub {
owner = "moonrepo";
repo = pname;
rev = "v${version}";
hash = "sha256-s0JwqEso1Mum+fMTg2rn58oxoSqraQ0iEnsRpgMmtVU=";
hash = "sha256-/EaRryWuH5BPm6bv8KWfLewS/8W6nUspBjvNnFq/sUQ=";
};
cargoHash = "sha256-5WFB2+dWm0q+Ui7rpVlvVrmCHoc4v5x5QNEbDpANkhA=";
cargoHash = "sha256-m5+8WHWpOTF2vIg4ctLPC5m9F+MGRofoEAHGv1ejQXA=";
env = {
RUSTFLAGS = "-C strip=symbols";
pkgs/development/tools/marksman/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "marksman";
version = "2024-10-07";
version = "2024-11-20";
src = fetchFromGitHub {
owner = "artempyanykh";
repo = "marksman";
rev = version;
sha256 = "sha256-BU9ttJsAQ8du9NUs69c7/FxZodUS/BhzKm+P1RocCms=";
sha256 = "sha256-gQ/CncjGBR4cAVRko+u3Zv6QTg8AxmV+9+WbAcp+qX4=";
};
projectFile = "Marksman/Marksman.fsproj";
pkgs/development/tools/marksman/deps.nix
Generated
+17 -122
View File
@@ -2,193 +2,88 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "coverlet.collector"; version = "6.0.0"; hash = "sha256-IEmweTMapcPhFHpmJsPXfmMhravYOrWupgjeOvMmQ4o="; })
(fetchNuGet { pname = "dotnet-fsharplint"; version = "0.21.6"; hash = "sha256-iAJ4AAWuDjpQL/ZtxkI4BfgLTHfvdC4xx56jCFKNRk0="; })
(fetchNuGet { pname = "fantomas"; version = "6.2.3"; hash = "sha256-Aol10o5Q7l8s6SdX0smVdi3ec2IgAx+gMksAMjXhIfU="; })
(fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; hash = "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo="; })
(fetchNuGet { pname = "fantomas"; version = "6.3.16"; hash = "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs="; })
(fetchNuGet { pname = "FSharp.SystemCommandLine"; version = "0.13.0-beta4"; hash = "sha256-QDT7vllfe978acAmSXltWXsnG/LZOEWTb1C85vBDBYI="; })
(fetchNuGet { pname = "FSharpPlus"; version = "1.5.0"; hash = "sha256-jQUlF3hsi3xpg+AdTnQw2L+lzbvTh5BIyLXCdVT6u6M="; })
(fetchNuGet { pname = "FSharpPlus"; version = "1.6.1"; hash = "sha256-MGwxfDTg6gJiS88yiqi1OGJk5WmaAFkVniniwF9Ilkc="; })
(fetchNuGet { pname = "Glob"; version = "1.1.9"; hash = "sha256-o3igdoWYiatTNlvBA6UrhZVLweh6qcY7CcQtILCC4uA="; })
(fetchNuGet { pname = "Markdig"; version = "0.37.0"; hash = "sha256-nPox06LraU0xZPGj+rQaBAxpiiLnhM1NduUEidVpgzU="; })
(fetchNuGet { pname = "Markdig"; version = "0.38.0"; hash = "sha256-5DuDlj+TCDJWP8oJM2WU48ps3HFuUg5P28O/SPcjwGk="; })
(fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; })
(fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; hash = "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk="; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; hash = "sha256-cv/wAXfTNS+RWEsHWNKqRDHC7LOQSSdFJ1a9cZuSfJw="; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.1"; hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; })
(fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; hash = "sha256-uz7QvW+NsVRsp8FR1wjnGEOkUaPX4JyieywvCN6g2+s="; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.1"; hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; hash = "sha256-9TwGrjVvbtyetw67Udp3EMK5MX8j0RFRjduxPCs9ESw="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; hash = "sha256-+CTYFu631uovLCO47RKe86YaAqfoLA4r73vKORJUsjg="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.1"; hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.1"; hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; hash = "sha256-5HtsgSPV5RdaPREGDvJ7qMOFubb1wMyHwkfTnZs9Zsc="; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; hash = "sha256-WghLNITEsKTV5pCjogmhfsVD3iO7ghTk0KNrOXzKSS0="; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
(fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.66"; hash = "sha256-35qyZOVDemtsBYjaZSkzuXGp0mIOSFnCeEHWsUXb5BI="; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; hash = "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="; })
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; })
(fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; })
(fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; })
(fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; })
(fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; })
(fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; })
(fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; })
(fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; })
(fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; })
(fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; })
(fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; })
(fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; })
(fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; })
(fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; })
(fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; })
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; })
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; })
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; })
(fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; })
(fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; })
(fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; })
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; })
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; })
(fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; })
(fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; })
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; })
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; })
(fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; })
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; })
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; })
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; })
(fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; })
(fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; })
(fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; })
(fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; })
(fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; })
(fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; })
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; })
(fetchNuGet { pname = "Serilog"; version = "2.11.0"; hash = "sha256-kI7I/NiH7GuR0MQTZsy+m+8+2qT0xMBrY7SXYCocbds="; })
(fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; hash = "sha256-n0LQOEsUg9M/T1aWryiG2690pyGBjHsk6TRZz2aCGyA="; })
(fetchNuGet { pname = "Snapper"; version = "2.4.0"; hash = "sha256-CBi7AWRL20oVBApWp+819Uky9WPzLzuL5VvGEfiHYbw="; })
(fetchNuGet { pname = "Snapper"; version = "2.4.1"; hash = "sha256-mgYpGR3MWNQyueF07kDgl8ToyzcISqYTabVYn8Davpo="; })
(fetchNuGet { pname = "StreamJsonRpc"; version = "2.16.36"; hash = "sha256-XLCQsY7xu67E8E7WJIvjHtk3iobREPCiljW8jNpfi68="; })
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; })
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; })
(fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; })
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; })
(fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; })
(fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; })
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; })
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; })
(fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; })
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; })
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; })
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; })
(fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; })
(fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; })
(fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; })
(fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; })
(fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; })
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; })
(fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; })
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; })
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; })
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; })
(fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; })
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; })
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; })
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; })
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; })
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; })
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; })
(fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; })
(fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; })
(fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; })
(fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; })
(fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; })
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; })
(fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; })
(fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; })
(fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; })
(fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; })
(fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; })
(fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; })
(fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; hash = "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4="; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; })
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; })
(fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; hash = "sha256-KTeMhCWcyYEwG7EkA0VkVvHwo0B2FBs5FpjW3BFNVUE="; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; })
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; })
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; })
(fetchNuGet { pname = "Tomlyn"; version = "0.17.0"; hash = "sha256-pJHF7w8RJhV23wiI3qzm5el4qPlPlgYTmTKA8yGhzXY="; })
(fetchNuGet { pname = "xunit"; version = "2.6.2"; hash = "sha256-/2F8w7meblC2/g3miSbnbFo+tHppSRZSz5ylnXkHsjw="; })
(fetchNuGet { pname = "xunit"; version = "2.9.2"; hash = "sha256-h5+yTTfCmokCPy4lqdEw8RGzQlrlsQAW3Am0Jh0q7oo="; })
(fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; })
(fetchNuGet { pname = "xunit.analyzers"; version = "1.6.0"; hash = "sha256-cd3+K0SFphHZz7uTVDkWQg7FiQL5LcV5FhOK2Sv4mds="; })
(fetchNuGet { pname = "xunit.assert"; version = "2.6.2"; hash = "sha256-FAtAQIeamQMh4vGed0U/2XbYFlLnKhtpigVAiFFNr9s="; })
(fetchNuGet { pname = "xunit.core"; version = "2.6.2"; hash = "sha256-RsIYhKRUxAWGPKTjpsQ65LZAud03BCrVIrhDsJr8E2A="; })
(fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.2"; hash = "sha256-TGAgjPOMd/y7pSyNEdpS2SyRMniVOPfeyJLHK8CzR6g="; })
(fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.2"; hash = "sha256-NtxeWsL8/SgK0wjeJ2+0dBQSvuywodOD4aR9anCmENI="; })
(fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.4"; hash = "sha256-bT/pr74NTey2iuNzllCgv4BrnIOChBMyTQATWir641Y="; })
(fetchNuGet { pname = "xunit.analyzers"; version = "1.16.0"; hash = "sha256-P5Bvl9hvHvF8KY1YWLg4tKiYxlfRnmHyL14jfSACDaU="; })
(fetchNuGet { pname = "xunit.assert"; version = "2.9.2"; hash = "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4="; })
(fetchNuGet { pname = "xunit.core"; version = "2.9.2"; hash = "sha256-zhjV1I5xh0RFckgTEK72tIkLxVl4CPmter2UB++oye8="; })
(fetchNuGet { pname = "xunit.extensibility.core"; version = "2.9.2"; hash = "sha256-MQAC/4d67Nssu3R+pHPh6vHitBXQYxEEZkVVMGW720c="; })
(fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.9.2"; hash = "sha256-f+9UfoPyK3JIDhQSW0Yu9c4PGqUqZC96DMINCYi2i80="; })
(fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.8.2"; hash = "sha256-UlfK348r8kJuraywfdCtpJJxHkv04wPNzpUaz4UM/60="; })
]
pkgs/misc/tmux-plugins/default.nix
+20
View File
@@ -772,6 +772,26 @@ in rec {
};
};
tmux-powerline = mkTmuxPlugin {
pluginName = "powerline";
version = "3.0.0";
src = fetchFromGitHub {
owner = "erikw";
repo = "tmux-powerline";
rev = "2480e5531e0027e49a90eaf540f973e624443937";
hash = "sha256-25uG7OI8OHkdZ3GrTxG1ETNeDtW1K+sHu2DfJtVHVbk=";
};
rtpFilePath = "main.tmux";
meta = {
homepage = "https://github.com/erikw/tmux-powerline";
description = "Empowering your tmux (status bar) experience!";
longDescription = "A tmux plugin giving you a hackable status bar consisting of dynamic & beautiful looking powerline segments, written purely in bash.";
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ thomasjm ];
};
};
tmux-thumbs = pkgs.callPackage ./tmux-thumbs {
inherit mkTmuxPlugin;
};
pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
-2
View File
@@ -23,6 +23,4 @@ mkDerivation {
install
m4
];
BOOTSTRAPPING = !stdenv.hostPlatform.isFreeBSD;
}
pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix
+20 -23
View File
@@ -9,31 +9,28 @@
makeMinimal,
install,
}:
mkDerivation (
{
path = "usr.bin/localedef";
mkDerivation ({
path = "usr.bin/localedef";
extraPaths = [
"lib/libc/locale"
"lib/libc/stdtime"
] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ "." ];
extraPaths = [
"lib/libc/locale"
"lib/libc/stdtime"
] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ "." ];
nativeBuildInputs = [
bsdSetupHook
byacc
freebsdSetupHook
makeMinimal
install
];
nativeBuildInputs = [
bsdSetupHook
byacc
freebsdSetupHook
makeMinimal
install
];
buildInputs = [ ];
buildInputs = [ ];
preBuild = lib.optionalString (!stdenv.hostPlatform.isFreeBSD) ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${compat}/include -D__unused= -D__pure= -Wno-strict-aliasing"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${compat}/lib"
'';
preBuild = lib.optionalString (!stdenv.hostPlatform.isFreeBSD) ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${compat}/include -D__unused= -D__pure= -Wno-strict-aliasing"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${compat}/lib"
'';
MK_TESTS = "no";
}
// lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { BOOTSTRAPPING = 1; }
)
MK_TESTS = "no";
})
pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
+28 -23
View File
@@ -56,8 +56,6 @@ lib.makeOverridable (
] ++ attrs.extraNativeBuildInputs or [ ];
buildInputs = compatIfNeeded;
HOST_SH = stdenv'.shell;
makeFlags =
[
"STRIP=-s" # flag to install, not command
@@ -65,14 +63,36 @@ lib.makeOverridable (
++ lib.optional (!stdenv'.hostPlatform.isFreeBSD) "MK_WERROR=no"
++ lib.optional stdenv.hostPlatform.isStatic "SHLIB_NAME=";
# amd64 not x86_64 for this on unlike NetBSD
MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv';
env =
{
HOST_SH = stdenv'.shell;
MACHINE = freebsd-lib.mkBsdMachine stdenv';
# amd64 not x86_64 for this on unlike NetBSD
MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv';
MACHINE_CPUARCH = freebsd-lib.mkBsdCpuArch stdenv';
MACHINE = freebsd-lib.mkBsdMachine stdenv';
COMPONENT_PATH = attrs.path or null;
MACHINE_CPUARCH = freebsd-lib.mkBsdCpuArch stdenv';
COMPONENT_PATH = attrs.path or null;
}
// lib.optionalAttrs stdenv'.hasCC {
# TODO should CC wrapper set this?
CPP = "${stdenv'.cc.targetPrefix}cpp";
# Since STRIP in `makeFlags` has to be a flag, not the binary itself
STRIPBIN = "${stdenv'.cc.bintools.targetPrefix}strip";
}
// lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { BOOTSTRAPPING = true; }
// lib.optionalAttrs stdenv'.hostPlatform.isDarwin { MKRELRO = "no"; }
// lib.optionalAttrs (stdenv'.cc.isClang or false) {
HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc);
}
// lib.optionalAttrs (stdenv'.cc.isGNU or false) {
HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc);
}
// lib.optionalAttrs (stdenv'.hostPlatform.isx86_32) { USE_SSP = "no"; }
// (attrs.env or { });
strictDeps = true;
@@ -85,26 +105,11 @@ lib.makeOverridable (
license = lib.licenses.bsd2;
} // attrs.meta or { };
}
// lib.optionalAttrs stdenv'.hasCC {
# TODO should CC wrapper set this?
CPP = "${stdenv'.cc.targetPrefix}cpp";
# Since STRIP in `makeFlags` has to be a flag, not the binary itself
STRIPBIN = "${stdenv'.cc.bintools.targetPrefix}strip";
}
// lib.optionalAttrs stdenv'.hostPlatform.isDarwin { MKRELRO = "no"; }
// lib.optionalAttrs (stdenv'.cc.isClang or false) {
HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc);
}
// lib.optionalAttrs (stdenv'.cc.isGNU or false) {
HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc);
}
// lib.optionalAttrs (stdenv'.hostPlatform.isx86_32) { USE_SSP = "no"; }
// lib.optionalAttrs (attrs.headersOnly or false) {
installPhase = "includesPhase";
dontBuild = true;
}
// attrs
// (builtins.removeAttrs attrs [ "env" ])
// lib.optionalAttrs (stdenv'.hasCC && stdenv'.cc.isClang or false && attrs.clangFixup or true) {
preBuild =
''
pkgs/os-specific/bsd/freebsd/pkgs/mkcsmapper.nix
-2
View File
@@ -13,8 +13,6 @@ mkDerivation {
"lib/libiconv_modules/mapper_std"
];
BOOTSTRAPPING = !stdenv.hostPlatform.isFreeBSD;
extraNativeBuildInputs = [
byacc
flex
pkgs/os-specific/bsd/freebsd/pkgs/mkesdb.nix
-3
View File
@@ -1,5 +1,4 @@
{
stdenv,
mkDerivation,
byacc,
flex,
@@ -10,8 +9,6 @@ mkDerivation {
extraPaths = [ "lib/libc/iconv" ];
BOOTSTRAPPING = !stdenv.hostPlatform.isFreeBSD;
extraNativeBuildInputs = [
byacc
flex
pkgs/servers/monitoring/prometheus/redis-exporter.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "redis_exporter";
version = "1.65.0";
version = "1.66.0";
src = fetchFromGitHub {
owner = "oliver006";
repo = "redis_exporter";
rev = "v${version}";
sha256 = "sha256-koUvcWd5AWhkxIfMJc0YOHaurO4evf83xn+bBCbyiPY=";
sha256 = "sha256-y+SZedMYxO0AMSjA5sCz9ynY1N537PCJ8LT3Mx1N4eA=";
};
vendorHash = "sha256-gTxNuqaGpigtRwYIU69woebze0QoLZE+ArROUsQAUwA=";
vendorHash = "sha256-b3rvF91f/JoAAY6vut+NUCbuQAf2XsQn/n5mVLPnIoU=";
ldflags = [
"-X main.BuildVersion=${version}"
pkgs/servers/monitoring/zabbix/versions.nix
+2 -2
View File
@@ -1,7 +1,7 @@
generic: {
v70 = generic {
version = "7.0.5";
hash = "sha256-IVMBtuCJpoWi+rzKF/xl5XZtQtIHkXS2WhvyjfdnlpI=";
version = "7.0.6";
hash = "sha256-DXfODjhNbTCqc55ZZIBGqtoxqX/NfWJr2a+jfkIKLdA=";
vendorHash = null;
};
v64 = generic {
pkgs/servers/tautulli/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "Tautulli";
version = "2.14.6";
version = "2.15.0";
format = "other";
pythonPath = [ setuptools ];
@@ -11,8 +11,8 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "Tautulli";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sZHrEDb3uuogSjG2qKSm6V+nHZq/FdMq9xQgTIerjuE=";
rev = "refs/tags/v${version}";
sha256 = "sha256-QhJc4Jwxlp3yB0jWa7sRDnIOWLW8CQUupnzbUscJH+c=";
};
installPhase = ''
pkgs/tools/misc/diffoscope/default.nix
+2 -1
View File
@@ -72,6 +72,7 @@
xz,
zip,
zstd,
binwalk,
# updater only
writeScript,
}:
@@ -235,10 +236,10 @@ python.pkgs.buildPythonApplication rec {
ubootTools
wabt
xmlbeans
binwalk
]
++ (with python.pkgs; [
androguard
binwalk
guestfs
h5py
pdfminer-six
pkgs/tools/typesetting/htmldoc/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "htmldoc";
version = "1.9.18";
version = "1.9.19";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = "htmldoc";
rev = "v${version}";
sha256 = "sha256-fibk58X0YtQ8vh8Lyqp9ZAsC79BjCptiqUA5t5Hiisg=";
sha256 = "sha256-JNZoPAXriaYpeiwO9GaxGPwiGohwIK1skhq/Ot/UUvI=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/top-level/all-packages.nix
+2 -10
View File
@@ -2033,8 +2033,6 @@ with pkgs;
biliass = with python3.pkgs; toPythonApplication biliass;
binwalk = with python3Packages; toPythonApplication binwalk;
birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
charles = charles4;
@@ -3818,7 +3816,7 @@ with pkgs;
hpccm = with python3Packages; toPythonApplication hpccm;
hqplayer-desktop = libsForQt5.callPackage ../applications/audio/hqplayer-desktop { };
hqplayer-desktop = qt6Packages.callPackage ../applications/audio/hqplayer-desktop { };
html-proofer = callPackage ../tools/misc/html-proofer { };
@@ -11112,13 +11110,7 @@ with pkgs;
gtkVersion = "4";
};
vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT;
};
vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { };
vtk_9_withQt5 = vtk_9.override { enableQt = true; };
pkgs/top-level/perl-packages.nix
+3 -3
View File
@@ -16600,10 +16600,10 @@ with self; {
ModuleScanDeps = buildPerlPackage {
pname = "Module-ScanDeps";
version = "1.34";
version = "1.37";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.34.tar.gz";
hash = "sha256-ysUw5c/EE+BneXx9I3xsXNMpFcPZ+u5dlANcjzqFUOs=";
url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.37.tar.gz";
hash = "sha256-H14RnK3hRmw5xx5bw1qNT05nJjXbA9eaWg3PCMTitaM=";
};
buildInputs = [ TestRequires IPCRun3 ];
propagatedBuildInputs = [ TextParsewords ];
pkgs/top-level/python-packages.nix
+8 -4
View File
@@ -1635,10 +1635,6 @@ self: super: with self; {
binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };
binwalk = callPackage ../development/python-modules/binwalk { };
binwalk-full = self.binwalk.override { visualizationSupport = true; };
biom-format = callPackage ../development/python-modules/biom-format { };
biopandas = callPackage ../development/python-modules/biopandas { };
@@ -5062,6 +5058,14 @@ self: super: with self; {
geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { };
geoarrow-c = callPackage ../development/python-modules/geoarrow-c { };
geoarrow-types = callPackage ../development/python-modules/geoarrow-types { };
geoarrow-pandas = callPackage ../development/python-modules/geoarrow-pandas { };
geoarrow-pyarrow = callPackage ../development/python-modules/geoarrow-pyarrow { };
geocachingapi = callPackage ../development/python-modules/geocachingapi { };
geocoder = callPackage ../development/python-modules/geocoder { };