Merge master into staging-next

This commit is contained in:
github-actions[bot]
2025-01-08 18:04:29 +00:00
committed by GitHub
106 changed files with 1443 additions and 4194 deletions
+74 -3
View File
@@ -52,10 +52,81 @@ let
in
rec {
/* !!! The interface of this function is kind of messed up, since
it's way too overloaded and almost but not quite computes a
topological sort of the depstrings. */
/**
Topologically sort a collection of dependent strings.
Only the values to keys listed in `arg` and their dependencies will be included in the result.
::: {.note}
This function doesn't formally fulfill the definition of topological sorting, but it's good enough for our purposes in Nixpkgs.
:::
# Inputs
`predefined` (attribute set)
: strings with annotated dependencies (strings or attribute set)
A value can be a simple string if it has no dependencies.
Otherwise, is can be an attribute set with the following attributes:
- `deps` (list of strings)
- `text` (Any
`arg` (list of strings)
: Keys for which the values in the dependency closure will be included in the result
# Type
```
textClosureList :: { ${phase} :: { deps :: [String]; text :: String; } | String; } -> [String] -> [String]
```
# Examples
:::{.example}
## `lib.stringsWithDeps.textClosureList` usage example
```nix
textClosureList {
a = {
deps = [ "b" "c" "e" ];
text = "a: depends on b, c and e";
};
b = {
deps = [ ];
text = "b: no dependencies";
};
c = {
deps = [ "b" ];
text = "c: depends on b";
};
d = {
deps = [ "c" ];
text = "d: not being depended on by anything in `arg`";
};
e = {
deps = [ "c" ];
text = "e: depends on c, depended on by a, not in `arg`";
};
} [
"a"
"b"
"c"
]
=> [
"b: no dependencies"
"c: depends on b"
"e: depends on c, depended on by a, not in `arg`"
"a: depends on b, c and e"
]
```
:::
Common real world usages are:
- Ordering the dependent phases of `system.activationScripts`
- Ordering the dependent phases of `system.userActivationScripts`
For further examples see: [NixOS activation script](https://nixos.org/manual/nixos/stable/#sec-activation-script)
*/
textClosureList = predefined: arg:
let
f = done: todo:
@@ -343,6 +343,12 @@ have a predefined type and string generator already declared under
and returning a set with TOML-specific attributes `type` and
`generate` as specified [below](#pkgs-formats-result).
`pkgs.formats.cdn` { }
: A function taking an empty attribute set (for future extensibility)
and returning a set with [CDN](https://github.com/dzikoysk/cdn)-specific
attributes `type` and `generate` as specified [below](#pkgs-formats-result).
`pkgs.formats.elixirConf { elixir ? pkgs.elixir }`
: A function taking an attribute set with values
@@ -156,6 +156,10 @@
access or want to access home directory via `killHook`, hardening setting can
be changed via, e.g. `systemd.services.earlyoom.serviceConfig.ProtectSystem`.
`services.earlyoom.extraArgs` is now shell-escaped for each element without
word-breaking. So you want to write `extraArgs = [ "--prefer" "spaced pat" ]`
rather than previous `extraArgs = [ "--prefer 'spaced pat'" ]`.
- `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead.
- `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead.
@@ -870,6 +870,7 @@ in
# Create the ISO image.
image.extension = if config.isoImage.compressImage then "iso.zst" else "iso";
image.filePath = "iso/${config.image.fileName}";
image.baseName = "nixos${lib.optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}" }-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
system.build.image = config.system.build.isoImage;
system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
inherit (config.isoImage) compressImage volumeID contents;
+7 -2
View File
@@ -139,9 +139,14 @@ in
default = [ ];
example = [
"-g"
"--prefer '(^|/)(java|chromium)$'"
"--prefer"
"(^|/)(java|chromium)$"
];
description = "Extra command-line arguments to be passed to earlyoom.";
description = ''
Extra command-line arguments to be passed to earlyoom. Each element in
the value list will be escaped as an argument without further
word-breaking.
'';
};
};
+1 -3
View File
@@ -61,9 +61,7 @@ let
hydraJob ((import lib/eval-config.nix {
inherit system;
modules = makeModules module {
image.baseName = "nixos-${type}";
};
modules = makeModules module { };
}).config.system.build.isoImage);
+14 -2
View File
@@ -78,12 +78,24 @@ let
passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; };
preConfigure = ''
# include llvm-config in path
export PATH="${lib.getDev llvm_18}/bin:$PATH"
cd build
sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static
substituteInPlace Make.llvm.static \
--replace 'mkdir -p $@ && cd $@ && ar -x ../../$<' 'mkdir -p $@ && cd $@ && ar -x ../source/build/lib/libfaust.a && cd ../source/build/'
substituteInPlace Make.llvm.static \
--replace 'rm -rf $(TMP)' ' '
--replace 'rm -rf $(TMP)' ' ' \
--replace-fail "ar" "${stdenv.cc.targetPrefix}ar"
sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static
cd ..
shopt -s globstar
for f in **/Makefile **/Makefile.library **/CMakeLists.txt build/Make.llvm.static embedded/faustjava/faust2engine architecture/autodiff/autodiff.sh source/tools/faust2appls/* **/llvm.cmake tools/benchmark/faust2object; do
echo $f "llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
substituteInPlace $f \
--replace-quiet "llvm-config" "llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
done
shopt -u globstar
cd build
'';
cmakeFlags = [
@@ -1,4 +1,5 @@
{
bash,
faust,
jack2,
qtbase,
@@ -32,6 +33,10 @@ faust.wrapWithBuildEnv {
"faust2jackserver"
];
buildInputs = [
bash
];
propagatedBuildInputs = [
jack2
qtbase
@@ -1,4 +1,5 @@
{
bash,
boost,
faust,
lv2,
@@ -9,6 +10,10 @@ faust.wrapWithBuildEnv {
baseName = "faust2lv2";
buildInputs = [
bash
];
propagatedBuildInputs = [
boost
lv2
@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "electrs";
version = "0.10.7";
version = "0.10.8";
src = fetchFromGitHub {
owner = "romanz";
repo = pname;
rev = "v${version}";
hash = "sha256-KDl+SV5U2aqsl3UMK8WWZiwkcqLpaRGmH/J8vBKTZcQ=";
hash = "sha256-L26jzAn8vwnw9kFd6ciyYS/OLEFTbN8doNKy3P8qKRE=";
};
cargoHash = "sha256-vcn+94KklWlYQw4fbH8KxhBnovk0dJc8Hkj+jJ+SeB0=";
cargoHash = "sha256-/0XS4xF5gzEBWXS39f0FsIK1dFwmGT4McaExR/srB5Y=";
# needed for librocksdb-sys
nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "24.7.17";
version = "26.0.4";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-DWNFh3ocU5WVi5WZheMOMUYH6FHJ+LJbaUC1XkQ5TFo=";
hash = "sha256-3tEWLRen8lRQEDFlfTWT9+L15k+7z/7To6p7SkmdJhU=";
};
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-bAvS7AXmmS+yYsEkXxvszlErpZ3J5hVVXxxzYcsVP5Y=";
hash = "sha256-DElSCZwVGZF/sjec0SFi7iIe/2Ern85oT5rp6bQl5wg=";
};
nativeBuildInputs =
@@ -119,11 +119,9 @@ lib.makeScope pkgs.newScope (
nativeBuildInputs = with pkgs; [ which ];
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.cc.isClang [
"-Wno-error=incompatible-function-pointer-types"
]
);
# workaround for issue:
# https://github.com/alessandrofrancesconi/gimp-plugin-bimp/issues/411
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
installFlags = [
"SYSTEM_INSTALL_DIR=${placeholder "out"}/${gimp.targetPluginDir}/bimp"
@@ -139,69 +137,6 @@ lib.makeScope pkgs.newScope (
};
};
gap = pluginDerivation {
/*
menu:
Video
*/
pname = "gap";
version = "2.6.0-unstable-2023-05-20";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "Archive";
repo = "gimp-gap";
rev = "b2aa06cc7ee4ae1938f14640fe46b75ef5b15982";
hash = "sha256-q5TgCy0+iIfxyqJRXsKxiFrWMFSzBqC0SA9MBGTHXcA=";
};
nativeBuildInputs = with pkgs; [ autoreconfHook ];
postUnpack = ''
tar -xf $sourceRoot/extern_libs/ffmpeg.tar.gz -C $sourceRoot/extern_libs
'';
postPatch =
let
ffmpegPatch = fetchpatch2 {
name = "fix-ffmpeg-binutil-2.41.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb";
hash = "sha256-vLSltvZVMcQ0CnkU0A29x6fJSywE8/aU+Mp9os8DZYY=";
};
in
''
patch -Np1 -i ${ffmpegPatch} -d extern_libs/ffmpeg
ffmpegSrc=$(realpath extern_libs/ffmpeg)
'';
configureFlags =
[
"--with-ffmpegsrcdir=${placeholder "ffmpegSrc"}"
]
++ lib.optionals (!stdenv.hostPlatform.isx86) [
"--disable-libavformat"
];
hardeningDisable = [ "format" ];
env = {
NIX_LDFLAGS = "-lm";
};
meta = with lib; {
description = "GIMP Animation Package";
homepage = "https://www.gimp.org";
# The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license
# falls inside "free".
license = with licenses; [
gpl3
free
];
# Depends on linux/soundcard.h
platforms = platforms.linux;
};
};
farbfeld = pluginDerivation {
pname = "farbfeld";
version = "unstable-2019-08-12";
@@ -371,10 +306,14 @@ lib.makeScope pkgs.newScope (
sha256 = "1jj3n7spkjc63aipwdqsvq9gi07w13bb1v8iqzvxwzld2kxa3c8w";
};
buildInputs = with pkgs; [
lensfun
gexiv2
];
buildInputs = (
with pkgs;
[
lensfun
gexiv2
]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp
);
installPhase = "
installPlugin gimp-lensfun
@@ -387,7 +326,6 @@ lib.makeScope pkgs.newScope (
license = lib.licenses.gpl3Plus;
maintainers = [ ];
platforms = lib.platforms.gnu ++ lib.platforms.linux;
};
};
@@ -1,9 +1,9 @@
{
"chromium": {
"version": "131.0.6778.204",
"version": "131.0.6778.264",
"chromedriver": {
"hash_darwin": "sha256-xxTu1aPNTfGpaPFC55NihzJbcjDL3fBXimQIGBPaU18=",
"hash_darwin_aarch64": "sha256-WyNiLNIPPUesDCYYs6Uc0aZDou0N60kZvL31DlqHMtw="
"hash_darwin": "sha256-ibvVBD3q+ed1VffgSEZie7VAmSdBT3CJ9bNnjyYzWis=",
"hash_darwin_aarch64": "sha256-Eup+/qrFxMAU9AoYfd5BYTKM+J7CWE7GLGETiYdYorU="
},
"deps": {
"depot_tools": {
@@ -19,8 +19,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "52183f9e99a61056f9b78535f53d256f1516f2a0",
"hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=",
"rev": "2d05e31515360f4da764174f7c448b33e36da871",
"hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -760,8 +760,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0",
"hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc="
"rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1",
"hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58="
}
}
},
@@ -615,11 +615,11 @@
"vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8="
},
"huaweicloud": {
"hash": "sha256-WVoG8XoH1u0mnM4i/mULV+c6gGr3u6AVj5RiqOAlBmA=",
"hash": "sha256-cfyd8vbzRPaGqgo3iPqjzoeb3h2hWvLgFP+Q41kDn/c=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.71.2",
"rev": "v1.72.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -958,13 +958,13 @@
"vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI="
},
"opentelekomcloud": {
"hash": "sha256-H7IG6YjGSbPXaprWfGjQzHcaEIa9H6xUuoG4PPho/8s=",
"hash": "sha256-gcELIKjDeXp0rqz+tDp2S9VEzPVoL+7RfvpfNF/qets=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.36.27",
"rev": "v1.36.28",
"spdx": "MPL-2.0",
"vendorHash": "sha256-3dDj0I7kBkwbQun90VUqdvpUcelMz1v7/OfgXfb87yE="
"vendorHash": "sha256-KvQNpXn11KdGbGQBWj7FwVypJOcFhLjgOKBfFZOyL7M="
},
"opsgenie": {
"hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",
@@ -184,9 +184,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.10.3";
hash = "sha256-KY18YFTKWj366CPTh1MJ9DLamiFUVql3BhuMUzN7zf8=";
vendorHash = "sha256-AajBuUwOhK0OniRRfCqR89+mA9LnQBkbG3Xge9c0qSQ=";
version = "1.10.4";
hash = "sha256-wJg/BfKWgDzv9HKOsNaq+l2jG37VbOtmBF+QEhNLQ1k=";
vendorHash = "sha256-YFsPxDlD7SqHo0x2UQnsJ5jDTp2JXdhEgDvtIpWVQ9o=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;
@@ -102,6 +102,9 @@ stdenv.mkDerivation rec {
DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g')
# Temp fix: openjfx doesn't build with webkit
unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/
runHook postInstall
'';
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.32.1";
version = "2.32.2";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-b+HaFXi3Z2vOU2saEvg22uLHbJLdM4dGEZeI6lvI/dk=";
hash = "sha256-i4wpM7Rc4pFUUzPFvoPxUlifIvk4GJzBhCLpUndFnjE=";
};
postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-AOLAyyg8ZFPjreK/PEY+TJy4puxqMCg5kjEyBfEfmPk=";
vendorHash = "sha256-UP1SDAaoGD1iYqb0RKCZgB22CuE2OU8FW7YFPxiY42w=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "ab-av1";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "alexheretic";
repo = "ab-av1";
rev = "v${version}";
hash = "sha256-xKZVvwRSCd4AxJnfEnRYuyB0yhxkg19a2tI0x2rcvWs=";
hash = "sha256-I9XApll0/mvfhL/BLWoVwL0ffqa5r3dOBWYTHizJ0hc=";
};
cargoHash = "sha256-nK3ye3wJBBv4ei41e9V/bj5kg5ujjzi0EvLwKKfvfUU=";
cargoHash = "sha256-jTCAB4O+SePCaKivHwbfFJZKjlxZmzP4uLT5idKmiO4=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
copyPkgconfigItems,
makePkgconfigItem,
version ? "2.1.1",
version ? "2.1.2",
}:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
rev = "rel-${version}";
hash =
{
"2.1.1" = "sha256-1/qJGGyx+hGZ09pIT2uNykotaYlU8BCKArblYhHsMxo=";
"2.1.2" = "sha256-fhvQd/f8eaw7OA2/XoOTVOnQxSSxUvugu6VWo2nmpQ0=";
"2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc=";
}
.${version};
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-bundle-licenses";
version = "1.3.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "sstadick";
repo = "cargo-bundle-licenses";
rev = "v${version}";
hash = "sha256-pWQU0IMahbFJR7oRUqnz73cB8yRbTpkh5NASmUKg0E0=";
hash = "sha256-oyb5uWIKXhPSMpb1t6C/IYKK8FMSANIQXs2XdJ/bD2A=";
};
cargoHash = "sha256-eUY3dyyWbqSqFqafdZ2AdI7vsH60vCRNk2cAGJw0ROk=";
cargoHash = "sha256-HxFRHgb0nBF6YGaiynv95fNwej70IAwP4jhVcGvdFok=";
meta = with lib; {
description = "Generate a THIRDPARTY file with all licenses in a cargo project";
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-component";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "cargo-component";
rev = "v${version}";
hash = "sha256-HiDwFWEzzCmwlEKsVmKREtn5OfAziC+irgeh66fRWIQ=";
hash = "sha256-pW3hhcsMzKSWmUX8HwAtZCB+v9B4qXw6WUGODhPtW+Q=";
};
cargoHash = "sha256-AtOZGYH0ya5mza3QFTfaXvw9tcFDGuz72JUhfTdUml8=";
cargoHash = "sha256-knNtEBSJigamj1hE6wU4Hc/f3TUcFiufOUMLwsK6t+A=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deb";
version = "2.9.4";
version = "2.10.0";
src = fetchFromGitHub {
owner = "kornelski";
repo = pname;
rev = "v${version}";
hash = "sha256-jTmETLENCUaGIJIN2smSS+QKNco0mFJWrOkQgiMBcz8=";
hash = "sha256-J3ChNrZUctDcs1bOCoDLTQtqTT9rWi24XK2fki8PYLw=";
};
cargoHash = "sha256-QruSmVER4WE0++b5MHKCtVduQkyF2Dkszw6gmhdZEKs=";
cargoHash = "sha256-CjlMadj4/QhbSlCoZs3JRaplbY4XlcBFKR4ZXJLK+Uo=";
nativeBuildInputs = [
makeWrapper
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-shuttle";
version = "0.49.0";
version = "0.50.0";
src = fetchFromGitHub {
owner = "shuttle-hq";
repo = "shuttle";
rev = "v${version}";
hash = "sha256-97AiRgTPzkNsnxMTF0zleHVR6QYLyRlhguh2nz+duUM=";
hash = "sha256-D3o4GdGD/lP4bchjpyj684G1CDWMhnZHke131GAI1es=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-eHmNGIcSXzFdfEHKKr0R+igtZbm8bPRFg2uhzJwKDhk=";
cargoHash = "sha256-hlYcDQi4wv43UBYSvnWUMunAKVCFVFA7hvxjaeGA2pA=";
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -6,11 +6,11 @@
let
pname = "codux";
version = "15.40.0";
version = "15.41.0";
src = fetchurl {
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
hash = "sha256-HPpzlIpMieQbFJFFshGtKm7ztnZ8obnVEpJTETQekL8=";
hash = "sha256-l1Z4jcbsTdzn4kFDcAGENAuewIThP2ENB/fbG7XerdY=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
+2 -2
View File
@@ -22,13 +22,13 @@ let
in
buildDartApplication rec {
pname = "dart-sass";
version = "1.83.0";
version = "1.83.1";
src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
hash = "sha256-BT9ubYNireRXWqTHRrL7gHXle6tX3pjKG3siQ9TNf1M=";
hash = "sha256-uy3kp6oT51AW2qE+qHOvvDDS59Tgw9fEAer94PsQOkg=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
+18 -18
View File
@@ -180,11 +180,11 @@
"dependency": "direct dev",
"description": {
"name": "dart_style",
"sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
"sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.7"
"version": "3.0.1"
},
"dartdoc": {
"dependency": "direct dev",
@@ -290,11 +290,11 @@
"dependency": "transitive",
"description": {
"name": "http_parser",
"sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360",
"sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.1.1"
"version": "4.1.2"
},
"io": {
"dependency": "transitive",
@@ -510,11 +510,11 @@
"dependency": "direct dev",
"description": {
"name": "pub_api_client",
"sha256": "d9ced27bb5b933012a5218120f1fbee2a7d3bd234a7d5cc6fe29dedf4df6127a",
"sha256": "1b95df9b91bc1d5edf21a46e74b7aad64eaf33d56467781bfd8d730539a1f57d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.0"
"version": "3.1.0"
},
"pub_semver": {
"dependency": "direct main",
@@ -530,11 +530,11 @@
"dependency": "direct dev",
"description": {
"name": "pubspec_parse",
"sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
"sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.0"
"version": "1.4.0"
},
"retry": {
"dependency": "transitive",
@@ -620,21 +620,21 @@
"dependency": "direct main",
"description": {
"name": "stack_trace",
"sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
"sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.12.0"
"version": "1.12.1"
},
"stream_channel": {
"dependency": "direct main",
"description": {
"name": "stream_channel",
"sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
"sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
"version": "2.1.4"
},
"stream_transform": {
"dependency": "direct main",
@@ -670,11 +670,11 @@
"dependency": "direct dev",
"description": {
"name": "test",
"sha256": "43490fe4c0f5ecb898f3fa1cdcdad8d521d7f6ff17ebdc4e8cd32b2e99524a20",
"sha256": "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.25.13"
"version": "1.25.14"
},
"test_api": {
"dependency": "transitive",
@@ -700,11 +700,11 @@
"dependency": "direct dev",
"description": {
"name": "test_descriptor",
"sha256": "abe245e8b0d61245684127fe32343542c25dc2a1ce8f405531637241d98d07e4",
"sha256": "9ce468c97ae396e8440d26bb43763f84e2a2a5331813ee5a397cb4da481aaf9a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.1"
"version": "2.0.2"
},
"test_process": {
"dependency": "direct dev",
@@ -810,11 +810,11 @@
"dependency": "direct dev",
"description": {
"name": "yaml",
"sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
"sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.2"
"version": "3.1.3"
}
},
"sdks": {
+65
View File
@@ -0,0 +1,65 @@
{
lib,
stdenv,
fetchFromGitHub,
desktop-file-utils,
glib,
gobject-introspection,
gtk3,
meson,
ninja,
pkg-config,
vala,
wrapGAppsHook3,
xvfb-run,
libayatana-appindicator,
libpeas,
libXtst,
zeitgeist,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "diodon";
version = "1.13.0";
src = fetchFromGitHub {
owner = "diodon-dev";
repo = "diodon";
tag = finalAttrs.version;
hash = "sha256-VCJANasrGmC0jIy8JNNURvmgpL/SLOaVsKo7Pf+X8DQ=";
};
strictDeps = true;
nativeBuildInputs = [
desktop-file-utils # for `desktop-file-validate`
glib # for glib-compile-schemas
gobject-introspection # For g-ir-compiler
gtk3 # for gtk-update-icon-cache
meson
ninja
pkg-config
vala
wrapGAppsHook3
xvfb-run
];
buildInputs = [
gtk3
libayatana-appindicator
libpeas
libXtst
zeitgeist
];
doCheck = true;
meta = {
description = "Aiming to be the best integrated clipboard manager for the Unity desktop";
homepage = "https://launchpad.net/diodon";
mainProgram = "diodon";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.sfrijters ];
platforms = lib.platforms.unix;
};
})
+2 -2
View File
@@ -22,7 +22,7 @@
python3Packages.buildPythonApplication rec {
pname = "eartag";
version = "0.6.3";
version = "0.6.4";
format = "other";
src = fetchFromGitLab {
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
owner = "World";
repo = pname;
rev = version;
hash = "sha256-eo6Vboo2Kn39M0r1OeqRFG3ug6frxzMKler5qT9KysY=";
hash = "sha256-K93sj84MdDCQgIMghkjpGIieSrlnlQiw85JSgggRlf4=";
};
postPatch = ''
@@ -1,6 +1,7 @@
{
stdenv,
lib,
bash,
fetchFromGitHub,
faust2jaqt,
faust2lv2,
@@ -16,28 +17,45 @@ stdenv.mkDerivation rec {
sha256 = "sha256-CADiJXyB4FivQjbh1nhpAVgCkTi1pW/vtXKXfL7o7xU=";
};
buildInputs = [
nativeBuildInputs = [
faust2jaqt
faust2lv2
];
buildInputs = [
bash
];
# ld: /nix/store/*-gcc-14-20241116/lib/gcc/x86_64-unknown-linux-gnu/14.2.1/crtbegin.o:
# relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object
hardeningDisable = [ "pie" ];
dontWrapQtApps = true;
buildPhase = ''
runHook preBuild
cd examples/physicalModeling
for f in *MIDI.dsp; do
faust2jaqt -time -vec -double -midi -nvoices 16 -t 99999 $f
faust2lv2 -time -vec -double -gui -nvoices 16 -t 99999 $f
done
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/lv2 $out/bin
mv *.lv2/ $out/lib/lv2
for f in $(find . -executable -type f); do
cp $f $out/bin/
done
patchShebangs --host $out/bin
runHook postInstall
'';
meta = with lib; {
@@ -46,5 +64,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ magnetophon ];
# compiles stuff for the build platform, difficult to do properly
broken = stdenv.hostPlatform != stdenv.buildPlatform;
};
}
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fcgi";
version = "2.4.3";
version = "2.4.4";
src = fetchFromGitHub {
owner = "FastCGI-Archives";
repo = "fcgi2";
rev = finalAttrs.version;
hash = "sha256-P8wkiURBc5gV0PxwemkIIpTPOpug6YIZE//3j5U76K0=";
hash = "sha256-GI2RL0djfCej7bBhxR6cK/FrTbDYEl75SEfQFgl0ctA=";
};
nativeBuildInputs = [ autoreconfHook ];
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "flip-link";
version = "0.1.9";
version = "0.1.10";
src = fetchFromGitHub {
owner = "knurling-rs";
repo = pname;
rev = "v${version}";
hash = "sha256-slidPVL0LAUtmCI2rlAwfGVUmB4WRF9bHqQhdgbO2oc=";
hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g=";
};
cargoHash = "sha256-x3JnqztoLol5dNMact/qMveQuvcMTg/jqHxW0lksB7Y=";
cargoHash = "sha256-OxmRIJ2LtAz+Paxzy1ppxnLliMocKbiJXf/io8mGPNQ=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
+7 -5
View File
@@ -1,17 +1,19 @@
{
lib,
python3Packages,
fetchPypi,
fetchFromGitHub,
git,
}:
python3Packages.buildPythonApplication rec {
pname = "git-aggregator";
version = "2.1.0";
version = "4.0.2";
src = fetchPypi {
inherit pname version;
hash = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw=";
src = fetchFromGitHub {
owner = "acsone";
repo = "git-aggregator";
tag = version;
hash = "sha256-6o+bf3s5KyRQWA7hp3xk76AfxBdzP0lOBOozgwe3Wtw=";
};
nativeBuildInputs = with python3Packages; [
+3 -3
View File
@@ -10,16 +10,16 @@
buildGo123Module rec {
pname = "git-spice";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "abhinav";
repo = "git-spice";
tag = "v${version}";
hash = "sha256-Q5cNkX6ZtNXh+qDjpR0a2FfHmk5YA9izLCBRPFRpdvs=";
hash = "sha256-1EWuKjvDeOV6W+nntdevUI/SO68ssYgoxJ5QIy5jkFM=";
};
vendorHash = "sha256-4NkeLDToefiRYv9xta3U6O/5L2/J0d+59Er515R2zcw=";
vendorHash = "sha256-F9CyhUtdkwvEsmQ+T5zt2n+TBRhVgyr2CEOvIzcXpug=";
subPackages = [ "." ];
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (final: {
pname = "glaze";
version = "4.2.2";
version = "4.2.3";
src = fetchFromGitHub {
owner = "stephenberry";
repo = "glaze";
rev = "v${final.version}";
hash = "sha256-P6hrwSpeQXHhag7HV28EVXsEwd2ZJEad3GRclCiOz8w=";
hash = "sha256-exEmEV4j18WGnnEFPaHlfFuLk0dPu18pYp85XBX8Y2w=";
};
nativeBuildInputs = [ cmake ];
@@ -0,0 +1,16 @@
libcob: Fix include for xmlCleanupParser
common.c uses xmlCleanupParser, which is defined in libxml/parser.h.
---
--- a/libcob/common.c 2025-01-01 03:03:49.762316279 +0100
+++ b/libcob/common.c 2025-01-01 03:01:56.632597306 +0100
@@ -136,6 +136,7 @@
#if defined (WITH_XML2)
#include <libxml/xmlversion.h>
#include <libxml/xmlwriter.h>
+#include <libxml/parser.h>
#endif
#if defined (WITH_CJSON)
+4
View File
@@ -63,6 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
# XXX: Without this, we get a cycle between bin and dev
propagatedBuildOutputs = [ ];
patches = [
./fix-libxml2-include.patch
];
# Skips a broken test
postPatch = ''
sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "go-ios";
version = "1.0.166";
version = "1.0.168";
src = fetchFromGitHub {
owner = "danielpaulus";
repo = "go-ios";
rev = "v${version}";
sha256 = "sha256-Lao7cK7ZWeU0WXa9qDHlc+NuE9Ktl7k3mJXxIIfbROk=";
sha256 = "sha256-BaJFFaNPPpPvDc8bMl89SfGYglvx9TwpoDQUEr0mqYM=";
};
proxyVendor = true;
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-mockery";
version = "2.50.1";
version = "2.50.4";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
sha256 = "sha256-WRzrWyBkngTlAh8Nu1dKht28A5R7mV/8pljtwh6SZQU=";
sha256 = "sha256-pJUMdCnvgfm/re442QhuQs4UCdPicitLu1NTS+I61IY=";
};
preCheck = ''
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "gql";
version = "0.33.0";
version = "0.35.0";
src = fetchFromGitHub {
owner = "AmrDeveloper";
repo = "GQL";
rev = version;
hash = "sha256-I0ggNHvswuRhcUkndl0acEU3eOHGJqHB2csm9rXZ2sU=";
hash = "sha256-3aIZZvOmmGOa1+QHz7VrhLeEcyHSbsUMdD3PAqPpXVY=";
};
cargoHash = "sha256-yOf5kKHiPMvKi/+j6SCBZD1+gUBK4oR+H1JICPThwBA=";
cargoHash = "sha256-IHh+7BdIZZOUyjJPHpuoUDfZDHUYoVQaMYjq1CCoxfM=";
nativeBuildInputs = [
pkg-config
@@ -0,0 +1,33 @@
{
lib,
fetchFromGitHub,
buildGoModule,
nix-update-script,
}:
buildGoModule rec {
pname = "kubectl-linstor";
version = "0.3.1";
src = fetchFromGitHub {
owner = "piraeusdatastore";
repo = "kubectl-linstor";
tag = "v${version}";
hash = "sha256-1wXhrnQlOIg2mJi6DhHGcb+OxSblDq+V95pZ5bl72R4=";
};
vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs=";
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Plugin to control a LINSTOR cluster using kubectl";
homepage = "https://github.com/piraeusdatastore/kubectl-linstor";
changelog = "https://github.com/piraeusdatastore/kubectl-linstor/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "kubectl-linstor";
};
}
+3 -3
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "kubelogin";
version = "1.31.0";
version = "1.31.1";
src = fetchFromGitHub {
owner = "int128";
repo = "kubelogin";
rev = "v${version}";
hash = "sha256-IEKP5mHxJyGzlxNL4h0MR/Ge7g1kKidIjinYr+bL6as=";
hash = "sha256-LfMxfXM3L4r0S8eDQVgFO1jTf/BcYpxxQSMl4zRh/yA=";
};
subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule rec {
"-X main.version=v${version}"
];
vendorHash = "sha256-3hNc16zpazm9YqDx2M/RafCBLev2S8TzJzClGRkKydg=";
vendorHash = "sha256-o+74+PnwhMe2oMfFLMD95R4m3gMjQS2d4pAvCEjh05U=";
# test all packages
preCheck = ''
+6
View File
@@ -26,6 +26,12 @@ stdenv.mkDerivation {
sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030";
};
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-implicit-function-declaration"
"-Wno-error=int-conversion"
"-Wno-error=return-mismatch"
];
nativeBuildInputs = [
pkg-config
autoconf
+6 -2
View File
@@ -5,19 +5,21 @@
fetchFromGitHub,
git,
gmp,
cadical,
libuv,
perl,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lean4";
version = "4.11.0";
version = "4.12.0";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean4";
rev = "v${finalAttrs.version}";
hash = "sha256-5KIZGt4glC2rZDKDL0FiHUNVjVZAyY8iWDWQgdF/PIs=";
hash = "sha256-O2Egyh2D0TfQWzQKfHUeAh7qAjMfeLVwXwGUw5QqcvE=";
};
postPatch = ''
@@ -35,10 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
cadical
];
buildInputs = [
gmp
libuv
];
nativeCheckInputs = [
+79 -84
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "lesspipe";
version = "2.14";
version = "2.17";
src = fetchFromGitHub {
owner = "wofr06";
repo = "lesspipe";
rev = "v${version}";
hash = "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=";
hash = "sha256-afJuTByGUMU6kFqGGa3pbPaFVdYGcJYiR0RfDNYNgDk=";
};
nativeBuildInputs = [
@@ -85,89 +85,84 @@ stdenv.mkDerivation rec {
];
fake = {
# script guards usage behind has_cmd test function, it's safe to leave these external and optional
external =
[
"cpio"
"isoinfo"
"cabextract"
"bsdtar"
"rpm2cpio"
"bsdtar"
"unzip"
"ar"
"unrar"
"rar"
"7zr"
"7za"
"isoinfo"
"gzip"
"bzip2"
"lzip"
"lzma"
"xz"
"brotli"
"compress"
"zstd"
"lz4"
"archive_color"
"bat"
"batcat"
"pygmentize"
"source-highlight"
"vimcolor"
"code2color"
external = [
"cpio"
"isoinfo"
"cabextract"
"bsdtar"
"rpm2cpio"
"bsdtar"
"unzip"
"ar"
"unrar"
"rar"
"7zr"
"7za"
"isoinfo"
"gzip"
"bzip2"
"lzip"
"lzma"
"xz"
"brotli"
"compress"
"zstd"
"lz4"
"archive_color"
"bat"
"batcat"
"pygmentize"
"source-highlight"
"vimcolor"
"code2color"
"w3m"
"lynx"
"elinks"
"html2text"
"xmq"
"dtc"
"pdftotext"
"pdftohtml"
"pdfinfo"
"ps2ascii"
"procyon"
"ccze"
"mdcat"
"pandoc"
"docx2txt"
"libreoffice"
"pptx2md"
"mdcat"
"xlscat"
"odt2txt"
"wvText"
"catdoc"
"broken_catppt"
"sxw2txt"
"groff"
"mandoc"
"unrtf"
"dvi2tty"
"pod2text"
"perldoc"
"h5dump"
"ncdump"
"matdump"
"djvutxt"
"openssl"
"gpg"
"plistutil"
"plutil"
"id3v2"
"csvlook"
"csvtable"
"jq"
"zlib-flate"
"lessfilter"
"snap"
]
++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [
# resholve only identifies this on darwin/bsd
# call site is guarded by || so it's safe to leave dynamic
"locale"
];
"w3m"
"lynx"
"elinks"
"html2text"
"xmq"
"dtc"
"pdftotext"
"pdftohtml"
"pdfinfo"
"ps2ascii"
"procyon"
"ccze"
"mdcat"
"pandoc"
"docx2txt"
"libreoffice"
"pptx2md"
"mdcat"
"xlscat"
"odt2txt"
"wvText"
"catdoc"
"broken_catppt"
"sxw2txt"
"groff"
"mandoc"
"unrtf"
"dvi2tty"
"pod2text"
"perldoc"
"h5dump"
"ncdump"
"matdump"
"djvutxt"
"openssl"
"gpg"
"plistutil"
"plutil"
"id3v2"
"csvlook"
"csvtable"
"jq"
"zlib-flate"
"lessfilter"
"snap"
"locale" # call site is guarded by || so it's safe to leave dynamic
];
builtin = [ "setopt" ];
};
execer = [
+9
View File
@@ -7,6 +7,7 @@
cpp-jwt,
doxygen,
enet,
fetchpatch,
fetchzip,
fmt,
ffmpeg_6-headless,
@@ -112,6 +113,14 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals enableCubeb [ cubeb ]
++ optional useDiscordRichPresence rapidjson;
patches = [
# Fix boost errors
(fetchpatch {
url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/fa2f92b888f8c0aab70414ca560b823ffb33b122/games-emulation/lime3ds/files/lime3ds-0002-boost-fix.patch";
hash = "sha256-XJogqvQE7I5lVHtvQja0woVlO40blhFOqnoYftIQwJs=";
})
];
postPatch = ''
# Fix file not found when looking in var/empty instead of opt
mkdir externals/dynarmic/src/dynarmic/ir/var
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lua-language-server";
version = "3.13.4";
version = "3.13.5";
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
tag = finalAttrs.version;
hash = "sha256-keyJ1Vtt+QjBAgGSIx6WEWAowFKgBpCfZMgemt6Qh9M=";
hash = "sha256-t1kKRLrh5gVWIiVNEW2O3YAyECVzWc84Wp91Sc9fTrU=";
fetchSubmodules = true;
};
+14 -3
View File
@@ -2,22 +2,33 @@
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
testers,
mago,
}:
rustPlatform.buildRustPackage rec {
pname = "mago";
version = "0.0.9";
version = "0.0.18";
src = fetchFromGitHub {
owner = "carthage-software";
repo = "mago";
tag = version;
hash = "sha256-MeI2pya0K1W7tbEJU8VrT6b0wYlr9Q7MTi27+wHfJjg=";
hash = "sha256-QSb+5wlv8uFT2wTeJyfsz+vE4Kegqgi7Dqyl1KZU//U=";
};
cargoHash = "sha256-LcY04XkTQHpixPPPs86OVO1ehPrcdynKmScgfWEU24Q=";
cargoHash = "sha256-7ElDEhWZLFuqzZjeh7TdrLy1++bmdS7CLRwyOLzaJ18=";
env = {
# Get openssl-sys to use pkg-config
OPENSSL_NO_VENDOR = 1;
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
passthru = {
tests.version = testers.testVersion {
+43
View File
@@ -0,0 +1,43 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
oniguruma,
stdenv,
darwin,
}:
rustPlatform.buildRustPackage rec {
pname = "marmite";
version = "0.2.3";
src = fetchFromGitHub {
owner = "rochacbruno";
repo = "marmite";
tag = version;
hash = "sha256-AblitYe7YDUc2Tg2P7j+wnOjMAhDtieDsbq6B6x+uMs=";
};
cargoHash = "sha256-u8sJS9hvIao+af7IA4vE0eUSx0xmI1Kb5NXyZBrOCIw=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
oniguruma
];
env = {
RUSTONIG_SYSTEM_LIBONIG = true;
};
meta = {
description = "Static Site Generator for Blogs";
homepage = "https://github.com/rochacbruno/marmite";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ matthewcroughan ];
mainProgram = "marmite";
};
}
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "melange";
version = "0.18.2";
version = "0.18.3";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-DlFGB0uVAPUd9EqTWEQm1AKtUbTgm1z5ftENzPMkAz4=";
hash = "sha256-bFlILwA8Vy7u8pJFx8PHvfYaeh8M2SRzrTpdDMYz6+M=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "moar";
version = "1.30.0";
version = "1.31.0";
src = fetchFromGitHub {
owner = "walles";
repo = pname;
rev = "v${version}";
hash = "sha256-fEJttsZt3pET1Xga8AYkLCX5aGkW23R2jGQvML3w+eo=";
hash = "sha256-0HDFK2wPQtwIAVup/pVSjrdt1zpbfLV08HxeVPWC8dE=";
};
vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE=";
+2 -2
View File
@@ -6,12 +6,12 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "10.86";
version = "10.87";
pname = "monkeys-audio";
src = fetchzip {
url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
hash = "sha256-kT44DHD1XcIcijQ2LM69kvDfTfxiNYTQS/JFn0kEHgY=";
hash = "sha256-IKOFJMt/9auQEQmRksoByS4UEkKorCurvnIxe8VsAI0=";
stripRoot = false;
};
-3449
View File
File diff suppressed because it is too large Load Diff
+2 -6
View File
@@ -23,12 +23,8 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-PbEoM+AnZTuo9xtwcDcTH9FZAzPzfBhX41+zVVTdgRo=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tun-0.6.1" = "sha256-tJx/qRwPcZOAfxyjZUHKLKsLu+loltVUOCP8IzWMryM=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-63AB63vmxXi6ugLCAOKI1eJcOB8XHWEiCc5yoIEqd+w=";
nativeBuildInputs = [ versionCheckHook ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "namespace-cli";
version = "0.0.398";
version = "0.0.399";
src = fetchFromGitHub {
owner = "namespacelabs";
repo = "foundation";
rev = "v${version}";
hash = "sha256-wSRlasUxHb4ukmQRZcuLqjcIwN/vat4kWet2R8Cyxt0=";
hash = "sha256-n1dnJOrrpfDlwdkuh7fcudZz3/W4+8Cg5E7/ecetr3U=";
};
vendorHash = "sha256-b8er/iF7Dqq+BAulzE/tUebNeKmTMilc+a0yCAJ5E/0=";
+33 -6
View File
@@ -8,6 +8,34 @@ positional_args=()
nix_args=(--arg nixos "import <nixpkgs/nixos> { }")
flake=""
discover_git() {
if [[ $# -ne 1 ]]; then
echo "$0 directory"
return 1
fi
local previous=
local current=$1
while [[ -d "$current" && "$current" != "$previous" ]]; do
# .git can be a file for worktrees otherwise it's a directory
if [[ -d "$current/.git" ]]; then
echo "$current"
return
elif [[ -f "$current/.git" ]]; then
# resolve worktree
dotgit=$(<"$current/.git")
if [[ ${dotgit[0]} =~ gitdir:\ (.*) ]]; then
echo "${BASH_REMATCH[1]}"
return
fi
else
previous=$current
current=$(dirname "$current")
fi
done
}
while [[ $# -gt 0 ]]; do
case "$1" in
--help)
@@ -66,18 +94,17 @@ if [[ -z "$flake" ]] && [[ -e /etc/nixos/flake.nix ]] && [[ "$no_flake" == "fals
fi
if [[ -n "$flake" ]]; then
echo >&2 "[WARN] Flake support in nixos-option is experimental and has known issues."
if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then
flake="${BASH_REMATCH[1]}"
flakeAttr="${BASH_REMATCH[2]}"
fi
# Unlike nix cli, builtins.getFlake infer path:// when a path is given
# See https://github.com/NixOS/nix/issues/5836
# Using `git rev-parse --show-toplevel` since we can't assume the flake dir
# itself is a git repo, because the flake could be in a sub directory
if [[ -d "$flake" ]] && git -C "$flake" rev-parse --show-toplevel &>/dev/null; then
flake="git+file://$(realpath "$flake")"
if [[ -d "$flake" ]]; then
repo=$(discover_git "$(realpath "$flake")")
if [[ -n "$repo" ]]; then
flake="git+file://$repo"
fi
fi
if [[ -z "${flakeAttr:-}" ]]; then
hostname=$(< /proc/sys/kernel/hostname)
-2
View File
@@ -1,7 +1,6 @@
{
lib,
coreutils,
git,
installShellFiles,
jq,
makeWrapper,
@@ -57,7 +56,6 @@ stdenvNoCC.mkDerivation {
--prefix PATH : ${
lib.makeBinPath [
coreutils
git
jq
man-db
nix
+2 -2
View File
@@ -10,11 +10,11 @@
}:
stdenv.mkDerivation rec {
pname = "nzbhydra2";
version = "7.11.0";
version = "7.11.3";
src = fetchzip {
url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
hash = "sha256-vFPpBM438TU9kthrt80soNki0T34j6EktWYhvIJNhWw=";
hash = "sha256-OR0Yk0tVajfMtMHisWqBbLeCScgenjyYTmNWTcMG/KE=";
stripRoot = false;
};
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "plantuml-server";
version = "1.2024.8";
version = "1.2025.0";
src = fetchurl {
url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
hash = "sha256-etarM3ByPHjGKfy+L1akYyz3J2hnDCcMKgjLviEW0yc=";
hash = "sha256-AQL5ad7xowQbZdwngWVT2RsHdyKNRKGm2rP0dFUhyTM=";
};
dontUnpack = true;
+2 -2
View File
@@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plantuml";
version = "1.2024.8";
version = "1.2025.0";
src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
hash = "sha256-mMhhdkR2/Sh60dmvAu63+PGryg6+UrpoE1mqQaZ7wm0=";
hash = "sha256-tHlhO7+q/iG5jbivTzQtvaOiDXoIEC/thA2nJnS6Kak=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "plemoljp-hs";
version = "2.0.0";
version = "2.0.2";
src = fetchzip {
url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_HS_v${version}.zip";
hash = "sha256-0p1orGKMKYiIZymAtbHp87DoS89ir9SbYfhs1Ki1JbE=";
hash = "sha256-UpU3Zrvyqfsio8N3Bha9J4+v/eThKvPiA9g5ySLhJnY=";
};
installPhase = ''
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "plemoljp-nf";
version = "2.0.0";
version = "2.0.2";
src = fetchzip {
url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_NF_v${version}.zip";
hash = "sha256-+RFUQv/OjHFfYdodcGpnGJQ6r99q2gHKNFynFm4C8Lo=";
hash = "sha256-dYkxKDUBldzW77R8/+MdkQopcanFfaKP0VbQDCIUqz0=";
};
installPhase = ''
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "plemoljp";
version = "2.0.0";
version = "2.0.2";
src = fetchzip {
url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_v${version}.zip";
hash = "sha256-6u7JfU5fYGGKcvLocKaT5rRun/CYhzk80rmlvP+utuM=";
hash = "sha256-e2uhDJfw3/Aisjo0ezVyxfvhBVagggTC87DSxIzbLoI=";
};
installPhase = ''
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.23.12";
version = "0.24.1";
src = fetchFromGitHub {
owner = "pocketbase";
repo = "pocketbase";
rev = "v${version}";
hash = "sha256-qYhy6fuyfgBd0Up9HXqnrXxoVqJD02r7IvtCpqGLNTg=";
hash = "sha256-SbcCa4ckRso/NzStIiFHmBWKdjbg01L/WMDgfduqnwA=";
};
vendorHash = "sha256-R/ZnPQSmiRSypCny/xnozUhEhVWpg0YkSbNJ6p6KV6Q=";
vendorHash = "sha256-YgQwi6eqW1mwUwfQ58Y0PHggGiglMmjBwuDHckP9X9o=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];
+3 -3
View File
@@ -5,16 +5,16 @@
}:
buildGoModule rec {
pname = "protolint";
version = "0.51.0";
version = "0.52.0";
src = fetchFromGitHub {
owner = "yoheimuta";
repo = pname;
rev = "v${version}";
hash = "sha256-q5Ck9p4UXmOur4mtQZ8nbBeXKCi5F++N5JU+E+sSHFk=";
hash = "sha256-nghe8arZwXzuZnGuVnhDnyEEgdLF1oImIy4E1jW37RQ=";
};
vendorHash = "sha256-u4KLYzM1A3t7qdIdbOw6rYPIBnO7TXKjxSgSUNB+Pcg=";
vendorHash = "sha256-3J72Pb4XqMptEXANYgNgvWGdD+z0mP7Nnx3C9Wp22s0=";
# Something about the way we run tests causes issues. It doesn't happen
# when using "go test" directly:
@@ -25,7 +25,7 @@ let
proxmox-backup_src = fetchgit {
url = "git://git.proxmox.com/git/proxmox-backup.git";
rev = "ed8bc69a50301ad420366d8431a7891b4992408d"; # no version tag unfortunately
tag = "v${version}";
name = "proxmox-backup";
hash = "sha256-0piUftzuK9e8KbOe+bc3SXWa0DlnEgk5iNGWGn4fw7Y=";
};
+20
View File
@@ -6,6 +6,8 @@
adwaita-icon-theme,
wrapGAppsHook3,
gdk-pixbuf,
makeDesktopItem,
copyDesktopItems,
}:
let
version = "2.61.3";
@@ -22,6 +24,17 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-i8NcRTn817gqwQP6j0RPUJkq09eTI4nfe3EVqYnWRpo=";
};
desktopItems = [
(makeDesktopItem {
name = pname;
exec = "${pname} %U";
icon = "pyfa";
desktopName = pname;
genericName = "Python fitting assistant for Eve Online";
categories = [ "Game" ];
})
];
build-system = [ python3Packages.setuptools ];
dependencies = with python3Packages; [
wxpython
@@ -50,6 +63,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [
python3Packages.pyinstaller
wrapGAppsHook3
copyDesktopItems
];
#
@@ -90,12 +104,18 @@ python3Packages.buildPythonApplication rec {
# exposing the innards of pyfa to the rest of the env.
#
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/share/pixmaps
mkdir -p $out/share/icons/hicolor/64x64/apps/
cp -r dist/pyfa $out/share/
cp imgs/gui/pyfa64.png $out/share/pixmaps/pyfa.png
cp imgs/gui/pyfa64.png $out/share/icons/hicolor/64x64/apps/${pname}.png
ln -sf $out/share/pyfa/pyfa $out/bin/pyfa
runHook postInstall
'';
fixupPhase = ''
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "rare";
version = "0.4.0";
version = "0.4.2";
src = fetchFromGitHub {
owner = "zix99";
repo = "rare";
rev = version;
hash = "sha256-UKxgzLXAXgedR0i3dREjrCNhtksg4LNO6ZM25+8EE7g=";
hash = "sha256-Sc8Ek1JfagqEDZ1Ci2UdqDkKZbQ6klH+uICML/ifO0Q=";
};
vendorHash = "sha256-wUOtxNjL/4MosACCzPTWKWrnMZhxINfN1ppkRsqDh9M=";
+1 -1
View File
@@ -53,6 +53,6 @@ rustPlatform.buildRustPackage rec {
bloxx12
];
mainProgram = "rmpc";
platforms = lib.platforms.linux;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
+2
View File
@@ -68,6 +68,8 @@ rustPlatform.buildRustPackage {
doCheck = false;
passthru.webui = rqbit-webui;
meta = with lib; {
description = "Bittorrent client in Rust";
homepage = "https://github.com/ikatson/rqbit";
+110 -21
View File
@@ -1,34 +1,123 @@
{
appimageTools,
lib,
fetchurl,
cargo-tauri,
cargo-tauri_1,
fetchFromGitHub,
glib-networking,
libayatana-appindicator,
libsoup_2_4,
libsoup_3,
nix-update,
nodejs,
openssl,
perl,
pkg-config,
pnpm,
protobuf,
rustPlatform,
stdenv,
webkitgtk_4_0,
webkitgtk_4_1,
wrapGAppsHook4,
writeShellScript,
# This package provides can be built using tauri v1 or v2.
# Try legacy (v1) version if main (v2) doesn't work.
app-type ? "main", # main or legacy
}:
let
pname = "rquickshare";
version = "0.11.2";
src = fetchurl {
url = "https://github.com/Martichou/rquickshare/releases/download/v${version}/r-quick-share-legacy_v${version}_glibc-2.31_amd64.AppImage";
hash = "sha256-VXYiYrTSedH8xFjuxbdplzVdfnO6s3ftY2I121Unlfw=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
app-type-either =
arg1: arg2:
if app-type == "main" then
arg1
else if app-type == "legacy" then
arg2
else
throw "Wrong argument for app-type in rquickshare package";
proper-cargo-tauri = app-type-either cargo-tauri cargo-tauri_1;
in
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
install -Dm444 ${appimageContents}/r-quick-share.desktop -t $out/share/applications
substituteInPlace $out/share/applications/r-quick-share.desktop \
--replace-fail 'Exec=r-quick-share' 'Exec=r-quick-share %u'
cp -r ${appimageContents}/usr/share/icons $out/share
rustPlatform.buildRustPackage rec {
pname = "rquickshare" + (app-type-either "" "-legacy");
version = "0.11.3";
src = fetchFromGitHub {
owner = "Martichou";
repo = "rquickshare";
tag = "v${version}";
hash = "sha256-6gXt1UGcjOFInsCep56s3K5Zk/KIz2ZrFlmrgXP7/e8=";
};
# from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
'';
pnpmRoot = "app/${app-type}";
pnpmDeps = pnpm.fetchDeps {
inherit pname version src;
sourceRoot = "${src.name}/app/${app-type}";
hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-sDHysaKMdNcbL1szww7/wg0bGHOnEKsKoySZJJCcPik=";
};
useFetchCargoVendor = true;
cargoRoot = "app/${app-type}/src-tauri";
buildAndTestSubdir = cargoRoot;
cargoPatches = [ ./remove-duplicate-versions-of-sys-metrics.patch ];
cargoHash = app-type-either "sha256-R1RDBV8lcEuFdkh9vrNxFRSPSYVOWDvafPQAmQiJV2s=" "sha256-tgnSOICA/AFASIIlxnRoSjq5nx30Z7C6293bcvnWl0k=";
nativeBuildInputs = [
proper-cargo-tauri.hook
# Setup pnpm
nodejs
pnpm.configHook
# Make sure we can find our libraries
perl
pkg-config
protobuf
wrapGAppsHook4
];
buildInputs =
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
libayatana-appindicator
]
++ lib.optionals (app-type == "main") [
webkitgtk_4_1
libsoup_3
]
++ lib.optionals (app-type == "legacy") [
webkitgtk_4_0
libsoup_2_4
];
passthru.updateScript =
let
updateScript = writeShellScript "update-rquickshare.sh" ''
${lib.getExe nix-update} rquickshare
sed -i 's/version = "0.0.0";/' pkgs/by-name/rq/rquickshare/package.nix
${lib.getExe nix-update} rquickshare-legacy
'';
in
# Don't set an update script for the legacy version
# so r-ryantm won't create two duplicate PRs
app-type-either updateScript null;
meta = {
description = "Rust implementation of NearbyShare/QuickShare from Android for Linux";
description = "Rust implementation of NearbyShare/QuickShare from Android for Linux and macOS";
homepage = "https://github.com/Martichou/rquickshare";
changelog = "https://github.com/Martichou/rquickshare/blob/v${version}/CHANGELOG.md";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.luftmensch-luftmensch ];
platforms = [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
mainProgram = "rquickshare";
mainProgram = app-type-either "rquickshare" "r-quick-share";
maintainers = with lib.maintainers; [
perchun
luftmensch-luftmensch
];
};
}
@@ -0,0 +1,116 @@
diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock
index 109db68..c3a70c6 100644
--- a/app/legacy/src-tauri/Cargo.lock
+++ b/app/legacy/src-tauri/Cargo.lock
@@ -4138,7 +4138,7 @@ dependencies = [
"rand 0.8.5",
"serde",
"sha2",
- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
+ "sys_metrics",
"tokio",
"tokio-util",
"tracing-subscriber",
@@ -4158,7 +4158,7 @@ dependencies = [
"rqs_lib",
"serde",
"serde_json",
- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sys_metrics",
"tauri",
"tauri-build",
"tauri-plugin-autostart",
@@ -4759,22 +4759,7 @@ dependencies = [
[[package]]
name = "sys_metrics"
version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484"
-dependencies = [
- "core-foundation-sys",
- "glob",
- "io-kit-sys",
- "lazy_static",
- "libc",
- "mach",
- "serde",
-]
-
-[[package]]
-name = "sys_metrics"
-version = "0.2.7"
-source = "git+https://github.com/Martichou/sys_metrics#c0f4ec7b9156d3ab83ee61276984c7fd4e632098"
+source = "git+https://github.com/Martichou/sys_metrics#e5b324a17d1724bd97923a173c3535cc06a44b0c"
dependencies = [
"core-foundation-sys",
"glob",
diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml
index 5468707..68ed47b 100644
--- a/app/legacy/src-tauri/Cargo.toml
+++ b/app/legacy/src-tauri/Cargo.toml
@@ -20,7 +20,7 @@ notify-rust = "4.10"
rqs_lib = { path = "../../../core_lib", features = ["experimental"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
-sys_metrics = "0.2"
+sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }
tauri = { version = "1.5", features = ["api-all", "reqwest-native-tls-vendored", "system-tray", "devtools"] }
tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock
index c1f175c..7bf1450 100644
--- a/app/main/src-tauri/Cargo.lock
+++ b/app/main/src-tauri/Cargo.lock
@@ -4182,7 +4182,7 @@ dependencies = [
"rand 0.8.5",
"serde",
"sha2",
- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
+ "sys_metrics",
"tokio",
"tokio-util",
"tracing-subscriber",
@@ -4202,7 +4202,7 @@ dependencies = [
"rqs_lib",
"serde",
"serde_json",
- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sys_metrics",
"tauri",
"tauri-build",
"tauri-plugin-autostart",
@@ -4867,21 +4867,6 @@ dependencies = [
"syn 2.0.95",
]
-[[package]]
-name = "sys_metrics"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484"
-dependencies = [
- "core-foundation-sys",
- "glob",
- "io-kit-sys",
- "lazy_static",
- "libc",
- "mach",
- "serde",
-]
-
[[package]]
name = "sys_metrics"
version = "0.2.7"
diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml
index 90dcc88..56abae2 100644
--- a/app/main/src-tauri/Cargo.toml
+++ b/app/main/src-tauri/Cargo.toml
@@ -20,7 +20,7 @@ notify-rust = "4.10"
rqs_lib = { path = "../../../core_lib", features = ["experimental"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
-sys_metrics = "0.2"
+sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }
tauri = { version = "2.2", features = [ "devtools", "tray-icon", "native-tls-vendored"] }
tauri-plugin-autostart = "2.2"
tauri-plugin-process = "2.2"
+10 -9
View File
@@ -4,28 +4,29 @@
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rutorrent";
version = "5.1.5";
src = fetchFromGitHub {
owner = "Novik";
repo = "ruTorrent";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-si/6iZMipfm18lrwjJvuL+vQco0l+HresUEv2gj1uRw=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -r . $out/
runHook postInstall;
mkdir -p "$out"
cp -r . "$out"
runHook postInstall
'';
meta = with lib; {
meta = {
changelog = "https://github.com/Novik/ruTorrent/releases/tag/v${finalAttrs.version}";
description = "Yet another web front-end for rTorrent";
homepage = "https://github.com/Novik/ruTorrent";
license = licenses.gpl3Plus;
platforms = platforms.unix;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix;
};
}
})
+13 -16
View File
@@ -13,28 +13,22 @@
libGL,
pkg-config,
ttf_bitstream_vera,
nix-update-script,
}:
stdenv.mkDerivation rec {
let
version = "0.8.13";
in
stdenv.mkDerivation {
pname = "setbfree";
version = "0.8.12";
inherit version;
src = fetchFromGitHub {
owner = "pantherb";
repo = "setBfree";
rev = "v${version}";
hash = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI=";
hash = "sha256-jtiyJntaFnAVeC1Rvkzi3wNodyJpEQKgnOAP7++36wo=";
};
patches = [
# link with -lGL can remove on next update
(fetchpatch {
name = "ui-add-lGL.patch";
url = "https://github.com/pantherb/setBfree/commit/756437db43fbf5481f101d8fc695f8b11192047f.patch";
hash = "sha256-49PYTayD4TchAApfFvj3DLc4EBTxH8LYx48TtdSRwwA=";
})
];
postPatch = ''
substituteInPlace common.mak \
--replace /usr/local "$out" \
@@ -65,14 +59,17 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "DSP tonewheel organ emulator";
homepage = "https://setbfree.org";
license = licenses.gpl2;
license = lib.licenses.gpl2;
platforms = [
"x86_64-linux"
"i686-linux"
]; # fails on ARM and Darwin
maintainers = [ ];
broken = stdenv.hostPlatform.isAarch64;
maintainers = [ lib.maintainers.l1npengtul ];
};
}
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20250106";
version = "20250107";
src = fetchFromGitHub {
owner = "bepaald";
repo = "signalbackup-tools";
rev = version;
hash = "sha256-sCJA9Rns5kGYHM5D/lCqXk81m0R0T6mAigAogkcfYL0=";
hash = "sha256-NXV9QK7Ssj0wXS3bjYyHtJrhZxEH3lLGIzMPEE4FLMA=";
};
nativeBuildInputs = [
@@ -1,12 +0,0 @@
diff --git a/src/SplitCode.h b/src/SplitCode.h
index 45c199c..fb05250 100644
--- a/src/SplitCode.h
+++ b/src/SplitCode.h
@@ -18,6 +18,7 @@
#include <stack>
#include <cmath>
#include <iomanip>
+#include <cstdint>
#if defined(_MSVC_LANG)
#define SPLITCODE_CPP_VERSION _MSVC_LANG
+10 -5
View File
@@ -5,9 +5,10 @@
cmake,
libcxx,
zlib,
nix-update-script,
}:
let
version = "0.30.0";
version = "0.31.2";
in
stdenv.mkDerivation {
pname = "splitcode";
@@ -16,12 +17,10 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "pachterlab";
repo = "splitcode";
rev = "v${version}";
hash = "sha256-g38pJFP9uA2P5ktogAPXKgPtsEJn5vtnK5HClqqezmg=";
tag = "v${version}";
hash = "sha256-fIx8EXdhkIkWmb86HKlUPSgsKvbGcrKsuNMWo8kU+Aw=";
};
patches = [ ./add-stdint.patch ];
nativeBuildInputs = [ cmake ];
buildInputs = [
@@ -36,6 +35,8 @@ stdenv.mkDerivation {
bash ./func_tests/runtests.sh
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Tool for flexible, efficient parsing, interpreting, and editing of technical sequences in sequencing reads";
homepage = "https://github.com/pachterlab/splitcode";
@@ -43,5 +44,9 @@ stdenv.mkDerivation {
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ zimward ];
mainProgram = "splitcode";
badPlatforms = [
# Test hangs indefinitely. See https://github.com/pachterlab/splitcode/issues/31
"aarch64-linux"
];
};
}
+3 -3
View File
@@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "tabiew";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "shshemi";
repo = "tabiew";
rev = "v${version}";
hash = "sha256-/AfhYr93OOtI2I8IDrXXH1zhCJcXNZM19RuKfOe5ikk=";
hash = "sha256-Q/GX3kcGx83h0XFlG0r2RGpoh63ijnaM4mp/ewrf920=";
};
cargoHash = "sha256-j68IAbjc9xlb9QKdXKmxjI9OTenDSrZoqZ5UJeLGJes=";
cargoHash = "sha256-gG9zb4DrgTiYOQ2ZFHz0Dcc0koa0++G6hNWtbfnJle0=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "terramate";
version = "0.11.5";
version = "0.11.6";
src = fetchFromGitHub {
owner = "terramate-io";
repo = "terramate";
rev = "v${version}";
hash = "sha256-xEV72bswFW7ie3FWa07vmffIXMIi0A5ZSpg6wRS7o5g=";
hash = "sha256-MqJc1gi+Din7G+WxOQaZmXvDvN9YXRIevenFK1m72S0=";
};
vendorHash = "sha256-6nnUyNOdG1QmaHeRXRWvyjLhYPXA3Xs9062ZkF82Kzo=";
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonApplication rec {
pname = "twitch-dl";
version = "2.9.3";
version = "2.9.4";
pyproject = true;
src = fetchFromGitHub {
owner = "ihabunek";
repo = "twitch-dl";
tag = version;
hash = "sha256-kkSCkSFY6UQWtzKOTJ187SDQsb+O5VRR2PRjazC83i0=";
hash = "sha256-kc/YU37q91IBcX4JOzN9549OX0jDYFTvI9g7OqN/IXs=";
};
pythonRelaxDeps = [
+65 -146
View File
@@ -3,20 +3,27 @@
stdenv,
stdenvNoCC,
fetchFromGitHub,
fetchurl,
cmake,
pkg-config,
git,
libcxx,
# buildInputs
SDL2,
libcxx,
openal,
# nativeBuildInputs
cmake,
git,
pkg-config,
imagemagick,
libicns,
symlinkJoin,
unar,
rsync,
makeDesktopItem,
copyDesktopItems,
makeDesktopItem,
# passthru
callPackage,
symlinkJoin,
rsync,
appName,
CMAKE_BUILD_TYPE ? "RelWithDebInfo", # "Choose the type of build, recommended options are: Debug Release RelWithDebInfo"
}:
@@ -39,19 +46,20 @@ stdenv.mkDerivation (finalAttrs: {
NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
buildInputs = [
libcxx
SDL2
libcxx
openal
];
nativeBuildInputs =
[
cmake
pkg-config
git
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libicns
imagemagick
libicns
]
++ lib.optionals stdenv.hostPlatform.isLinux [
copyDesktopItems
@@ -112,6 +120,51 @@ stdenv.mkDerivation (finalAttrs: {
})
];
passthru =
let
packages = callPackage ./passthru-packages.nix { inherit appName; };
in
{
inherit packages;
withPackages =
cb:
let
dataDerivation = symlinkJoin {
name = "${appName}-data";
paths = if builtins.isFunction cb then cb packages else cb;
};
in
stdenvNoCC.mkDerivation {
pname = "${appName}-with-packages";
inherit (finalAttrs.finalPackage) version meta;
buildInputs = [ dataDerivation ] ++ finalAttrs.buildInputs;
nativeBuildInputs = [ rsync ];
phases = [ "buildPhase" ];
buildPhase =
let
Default_Data_Path =
if stdenv.isDarwin then
"$out/Applications/${appName}.app/Contents/share/${appName}"
else
"$out/share/${appName}";
in
''
# The default Data_Path() is rely on the Program_Path(), which is the real path of executable, so we need to make executable non symlink here.
rsync --archive --mkpath --chmod=a+w ${finalAttrs.finalPackage}/ $out/
# Symlink the data derivation to the default data path
mkdir -p ${builtins.dirOf Default_Data_Path}
ln -s ${dataDerivation} ${Default_Data_Path}
# Fix `error: suspicious ownership or permission on '/nix/store/xxx-0.0.0' for output 'out'; rejecting this build output`
chmod 755 $out
'';
};
};
meta = {
description =
{
@@ -127,138 +180,4 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ xiaoxiangmoe ];
platforms = with lib.platforms; darwin ++ linux;
};
passthru = rec {
packages =
builtins.mapAttrs
(
name: buildPhase:
stdenvNoCC.mkDerivation {
inherit name buildPhase;
phases = [ "buildPhase" ];
nativeBuildInputs = [ unar ];
meta = {
sourceProvenance = with lib.sourceTypes; [
binaryBytecode
];
license = with lib.licenses; [
unfree
];
};
}
)
(
if appName == "vanillatd" then
let
CCDEMO1_ZIP = fetchurl {
url = "https://archive.org/download/CommandConquerDemo/cc1demo1.zip";
hash = "sha256-KdM4SctFCocmJCbMWbJbql4DO5TC40leyU+BPzvAn4c=";
};
CCDEMO2_ZIP = fetchurl {
url = "https://archive.org/download/CommandConquerDemo/cc1demo2.zip";
hash = "sha256-pCgEuE5AFcJur3qUOTmP3GCb/Wp7p7JyVn8Yeq17PEg=";
};
demo = ''
unar -no-directory ${CCDEMO1_ZIP} DEMO.MIX DEMOL.MIX SOUNDS.MIX SPEECH.MIX
unar -no-directory ${CCDEMO2_ZIP} DEMOM.MIX
mkdir -p $out
mv DEMO.MIX $out/demo.mix
mv DEMOL.MIX $out/demol.mix
mv SOUNDS.MIX $out/sounds.mix
mv SPEECH.MIX $out/speech.mix
mv DEMOM.MIX $out/demom.mix
'';
in
# see https://github.com/TheAssemblyArmada/Vanilla-Conquer/wiki/Installing-VanillaTD
{
inherit demo;
}
else if appName == "vanillara" then
let
RA95DEMO_ZIP = fetchurl {
url = "https://archive.org/download/CommandConquerRedAlert_1020/ra95demo.zip";
hash = "sha256-jEi9tTUj6k01OnkU2SNM5OPm9YMu60eztrAFhT6HSNI=";
};
demo = ''
unar -no-directory ${RA95DEMO_ZIP} ra95demo/INSTALL/MAIN.MIX ra95demo/INSTALL/REDALERT.MIX
install -D ra95demo/INSTALL/REDALERT.MIX $out/redalert.mix
install -D ra95demo/INSTALL/MAIN.MIX $out/main.mix
'';
REDALERT_ALLIED_ISO = fetchurl {
url = "https://archive.org/download/cnc-red-alert/redalert_allied.iso";
hash = "sha256-Npx6hSTJetFlcb/Fi3UQEGuP0iLk9LIrRmAI7WgEtdw=";
};
REDALERT_SOVIETS_ISO = fetchurl {
url = "https://archive.org/download/cnc-red-alert/redalert_soviets.iso";
hash = "sha256-aJGr+w1BaGaLwX/pU0lMmu6Cgn9pZ2D/aVafBdtds2Q=";
};
retail-allied = ''
unar -output-directory allied -no-directory ${REDALERT_ALLIED_ISO} MAIN.MIX INSTALL/REDALERT.MIX
mkdir -p $out/allied/
mv allied/INSTALL/REDALERT.MIX $out/redalert.mix
mv allied/MAIN.MIX $out/allied/main.mix
'';
retail-soviet = ''
unar -output-directory soviet -no-directory ${REDALERT_SOVIETS_ISO} MAIN.MIX INSTALL/REDALERT.MIX
mkdir -p $out/soviet/
mv soviet/INSTALL/REDALERT.MIX $out/redalert.mix
mv soviet/MAIN.MIX $out/soviet/main.mix
'';
retail = ''
unar -output-directory allied -no-directory ${REDALERT_ALLIED_ISO} MAIN.MIX INSTALL/REDALERT.MIX
unar -output-directory soviet -no-directory ${REDALERT_SOVIETS_ISO} MAIN.MIX
mkdir -p $out/allied/ $out/soviet/
mv allied/INSTALL/REDALERT.MIX $out/redalert.mix
mv allied/MAIN.MIX $out/allied/main.mix
mv soviet/MAIN.MIX $out/soviet/main.mix
'';
in
# see https://github.com/TheAssemblyArmada/Vanilla-Conquer/wiki/Installing-VanillaRA
{
inherit
demo
retail-allied
retail-soviet
retail
;
}
else
{ }
);
withPackages =
cb:
let
dataDerivation = symlinkJoin {
name = "${appName}-data";
paths = if builtins.isFunction cb then cb packages else cb;
};
in
stdenvNoCC.mkDerivation {
pname = "${appName}-with-packages";
inherit (finalAttrs.finalPackage) version meta;
buildInputs = [ dataDerivation ] ++ finalAttrs.buildInputs;
nativeBuildInputs = [ rsync ];
phases = [ "buildPhase" ];
buildPhase =
let
Default_Data_Path =
if stdenv.isDarwin then
"$out/Applications/${appName}.app/Contents/share/${appName}"
else
"$out/share/${appName}";
in
''
# The default Data_Path() is rely on the Program_Path(), which is the real path of executable, so we need to make executable non symlink here.
rsync --archive --mkpath --chmod=a+w ${finalAttrs.finalPackage}/ $out/
# Symlink the data derivation to the default data path
mkdir -p ${builtins.dirOf Default_Data_Path}
ln -s ${dataDerivation} ${Default_Data_Path}
# Fix `error: suspicious ownership or permission on '/nix/store/xxx-0.0.0' for output 'out'; rejecting this build output`
chmod 755 $out
'';
};
};
})
@@ -0,0 +1,103 @@
{
lib,
stdenvNoCC,
unar,
appName,
fetchurl,
...
}:
builtins.mapAttrs
(
name: buildPhase:
stdenvNoCC.mkDerivation {
inherit name buildPhase;
phases = [ "buildPhase" ];
nativeBuildInputs = [ unar ];
meta = {
sourceProvenance = with lib.sourceTypes; [
binaryBytecode
];
license = with lib.licenses; [
unfree
];
};
}
)
(
if appName == "vanillatd" then
let
CCDEMO1_ZIP = fetchurl {
url = "https://archive.org/download/CommandConquerDemo/cc1demo1.zip";
hash = "sha256-KdM4SctFCocmJCbMWbJbql4DO5TC40leyU+BPzvAn4c=";
};
CCDEMO2_ZIP = fetchurl {
url = "https://archive.org/download/CommandConquerDemo/cc1demo2.zip";
hash = "sha256-pCgEuE5AFcJur3qUOTmP3GCb/Wp7p7JyVn8Yeq17PEg=";
};
demo = ''
unar -no-directory ${CCDEMO1_ZIP} DEMO.MIX DEMOL.MIX SOUNDS.MIX SPEECH.MIX
unar -no-directory ${CCDEMO2_ZIP} DEMOM.MIX
mkdir -p $out
mv DEMO.MIX $out/demo.mix
mv DEMOL.MIX $out/demol.mix
mv SOUNDS.MIX $out/sounds.mix
mv SPEECH.MIX $out/speech.mix
mv DEMOM.MIX $out/demom.mix
'';
in
# see https://github.com/TheAssemblyArmada/Vanilla-Conquer/wiki/Installing-VanillaTD
{
inherit demo;
}
else if appName == "vanillara" then
let
RA95DEMO_ZIP = fetchurl {
url = "https://archive.org/download/CommandConquerRedAlert_1020/ra95demo.zip";
hash = "sha256-jEi9tTUj6k01OnkU2SNM5OPm9YMu60eztrAFhT6HSNI=";
};
demo = ''
unar -no-directory ${RA95DEMO_ZIP} ra95demo/INSTALL/MAIN.MIX ra95demo/INSTALL/REDALERT.MIX
install -D ra95demo/INSTALL/REDALERT.MIX $out/redalert.mix
install -D ra95demo/INSTALL/MAIN.MIX $out/main.mix
'';
REDALERT_ALLIED_ISO = fetchurl {
url = "https://archive.org/download/cnc-red-alert/redalert_allied.iso";
hash = "sha256-Npx6hSTJetFlcb/Fi3UQEGuP0iLk9LIrRmAI7WgEtdw=";
};
REDALERT_SOVIETS_ISO = fetchurl {
url = "https://archive.org/download/cnc-red-alert/redalert_soviets.iso";
hash = "sha256-aJGr+w1BaGaLwX/pU0lMmu6Cgn9pZ2D/aVafBdtds2Q=";
};
retail-allied = ''
unar -output-directory allied -no-directory ${REDALERT_ALLIED_ISO} MAIN.MIX INSTALL/REDALERT.MIX
mkdir -p $out/allied/
mv allied/INSTALL/REDALERT.MIX $out/redalert.mix
mv allied/MAIN.MIX $out/allied/main.mix
'';
retail-soviet = ''
unar -output-directory soviet -no-directory ${REDALERT_SOVIETS_ISO} MAIN.MIX INSTALL/REDALERT.MIX
mkdir -p $out/soviet/
mv soviet/INSTALL/REDALERT.MIX $out/redalert.mix
mv soviet/MAIN.MIX $out/soviet/main.mix
'';
retail = ''
unar -output-directory allied -no-directory ${REDALERT_ALLIED_ISO} MAIN.MIX INSTALL/REDALERT.MIX
unar -output-directory soviet -no-directory ${REDALERT_SOVIETS_ISO} MAIN.MIX
mkdir -p $out/allied/ $out/soviet/
mv allied/INSTALL/REDALERT.MIX $out/redalert.mix
mv allied/MAIN.MIX $out/allied/main.mix
mv soviet/MAIN.MIX $out/soviet/main.mix
'';
in
# see https://github.com/TheAssemblyArmada/Vanilla-Conquer/wiki/Installing-VanillaRA
{
inherit
demo
retail-allied
retail-soviet
retail
;
}
else
{ }
)
+2 -2
View File
@@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation rec {
pname = "warpinator";
version = "1.8.7";
version = "1.8.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-EgTz0i7Dui74xYFShkLox6ITAEAF8yYATEcQ51pc7gA=";
hash = "sha256-aqqKCYlCAL/6srbyYRoVQlIFKpTmwYZsdfLibRyAUXg=";
};
nativeBuildInputs = [
+9 -6
View File
@@ -7,13 +7,13 @@
# Testing this requires a Thinkpad or the presence of /proc/acpi/ibm/fan
stdenv.mkDerivation (finalAttrs: {
pname = "zcfan";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "cdown";
repo = "zcfan";
rev = finalAttrs.version;
hash = "sha256-zpYQEHXt8LBNX+luM4YxP0dKH+hb2c8Z0BEeGP09oZo=";
hash = "sha256-/q9jDqjG4g211CTb4ahagpxux2BsZWTEyoAY8kRRTB8=";
};
postPatch = ''
@@ -31,13 +31,16 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstallCheck
'';
meta = with lib; {
meta = {
description = "Zero-configuration fan daemon for ThinkPads";
mainProgram = "zcfan";
homepage = "https://github.com/cdown/zcfan";
changelog = "https://github.com/cdown/zcfan/tags/${finalAttrs.version}";
license = licenses.mit;
maintainers = with maintainers; [ kashw2 ];
platforms = platforms.linux;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
luftmensch-luftmensch
kashw2
];
platforms = lib.platforms.linux;
};
})
+1 -1
View File
@@ -163,7 +163,7 @@ let
qtwayland = callPackage ./modules/qtwayland.nix { };
qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
qtwebengine = callPackage ./modules/qtwebengine {
inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds;
inherit (darwin) bootstrap_cmds;
};
qtwebsockets = callPackage ./modules/qtwebsockets.nix { };
qtwebview = callPackage ./modules/qtwebview.nix { };
@@ -62,7 +62,6 @@
libgbm,
enableProprietaryCodecs ? true,
# darwin
autoSignDarwinBinariesHook,
bootstrap_cmds,
cctools,
xcbuild,
@@ -85,9 +84,6 @@ qtModule {
gn
nodejs
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
autoSignDarwinBinariesHook
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
bootstrap_cmds
cctools
@@ -124,6 +120,24 @@ qtModule {
extraPrefix = "src/3rdparty/chromium/third_party/xnnpack/src/";
hash = "sha256-GUESVNR88I1K2V5xr0e09ec4j2eselMhNN06+PCcINM=";
})
# The latest version of Clang changed what macros it predefines on Apple
# targets, causing errors about predefined macros in zlib.
(fetchpatch {
url = "https://github.com/chromium/chromium/commit/2f39ac8d0a414dd65c0e1d5aae38c8f97aa06ae9.patch";
stripLen = 1;
extraPrefix = "src/3rdparty/chromium/";
hash = "sha256-07hWANY9JGFmqvjdOD6SFmVI6sQRRyvW+7wxGZF5GVo=";
})
# The latest version of Clang changed what macros it predefines on Apple
# targets, causing errors about predefined macros in libpng.
(fetchpatch {
url = "https://github.com/chromium/chromium/commit/66defc14abe47c0494da9faebebfa0a5b6efcf38.patch";
stripLen = 1;
extraPrefix = "src/3rdparty/chromium/";
hash = "sha256-FWIi1VsBZFqOoPIkPxPkcfexPkx1458rB5ldtA7T2uE=";
})
];
postPatch =
@@ -148,6 +162,13 @@ qtModule {
--replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
--replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
--replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""
substituteInPlace configure.cmake src/gn/CMakeLists.txt \
--replace "AppleClang" "Clang"
# Disable metal shader compilation, Xcode only
substituteInPlace src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/metal/metal_backend.gni \
--replace-fail 'angle_has_build && !is_ios && target_os == host_os' "false"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
@@ -157,8 +178,6 @@ qtModule {
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace configure.cmake src/gn/CMakeLists.txt \
--replace "AppleClang" "Clang"
substituteInPlace cmake/Functions.cmake \
--replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
'';
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "clarifai";
version = "10.11.1";
version = "11.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "Clarifai";
repo = "clarifai-python";
tag = version;
hash = "sha256-dXsEYHkt4Z2YldqbCorNPG7rVSLfU8shYdk6lzFBz/M=";
hash = "sha256-TJXgcoa8s22fEyXER1C+MxFrvDt5DzY/k5T5fKE4Rec=";
};
pythonRelaxDeps = [
@@ -1,25 +0,0 @@
From 10c3d787cc9c7fb31c6cc7074e9ce00dfeb6bb85 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Thu, 14 Nov 2024 16:16:17 +0800
Subject: [PATCH] Part of 1992
---
tests/decorators/test_validation.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/decorators/test_validation.py b/tests/decorators/test_validation.py
index bece403..d7e0984 100644
--- a/tests/decorators/test_validation.py
+++ b/tests/decorators/test_validation.py
@@ -78,7 +78,7 @@ def test_invalid_type(monkeypatch):
logger = MagicMock()
monkeypatch.setattr("connexion.validators.parameter.logger", logger)
result = ParameterValidator.validate_parameter(
- "formdata", 20, {"type": "string", "name": "foo"}
+ "formdata", 20, {"name": "foo", "type": "string"}
)
expected_result = """20 is not of type 'string'
--
2.47.0
@@ -35,7 +35,7 @@
buildPythonPackage rec {
pname = "connexion";
version = "3.1.0";
version = "3.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -44,14 +44,9 @@ buildPythonPackage rec {
owner = "spec-first";
repo = "connexion";
tag = version;
hash = "sha256-rngQDU9kXw/Z+Al0SCVnWN8xnphueTtZ0+xPBR5MbEM=";
hash = "sha256-ruwpA2yd7FRME1FvYrZh0EOnhmQ26YVouXzpVD9ph6g=";
};
patches = [
# A really small Part of https://github.com/spec-first/connexion/pull/1992 Will fix check on newest dependencies
./0001-Part-of-1992.patch
];
build-system = [ poetry-core ];
dependencies = [
@@ -89,17 +84,10 @@ buildPythonPackage rec {
[
"test_build_example"
"test_mock_resolver_no_example"
"test_sort_apis_by_basepath"
"test_sort_routes"
# Tests require network access
"test_remote_api"
# AssertionError
"test_headers"
# waiter.acquire() deadlock
"test_cors_server_error"
"test_get_bad_default_response"
"test_schema_response"
"test_writeonly"
# test expects "{'name': 'foo', 'type': 'string'}" rather than "{'type': 'string', 'name': 'foo'}"
"test_invalid_type"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# ImportError: Error while finding loader for '/private/tmp/nix-build-python3.12-connexion-3.1.0.drv-0/source' (<class 'ModuleNotFoundError'>: No module named '/private/tmp/nix-build-python3')
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "elasticsearch-dsl";
version = "8.17.0";
version = "8.17.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "elasticsearch_dsl";
inherit version;
hash = "sha256-wgQhgXVGLRCKhPuRM3HkXT9J6d1xHKJux+2Jq06PKH0=";
hash = "sha256-2BcGmb/bT+f6s4VM2sMZotbd26opyep5k9LsIgVttaA=";
};
build-system = [ setuptools ];
@@ -0,0 +1,33 @@
{
lib,
fetchPypi,
buildPythonPackage,
setuptools,
flake8,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "flake8-class-newline";
version = "1.6.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-UUxJI8iOuLPdUttLVbjTSDUg24nbgK9rqBKkrxVCH/E=";
};
build-system = [ setuptools ];
dependencies = [ flake8 ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "flake8_class_newline" ];
meta = with lib; {
description = "Flake8 extension to check if a new line is present after a class definition";
homepage = "https://github.com/alexandervaneck/flake8-class-newline";
license = licenses.mit;
maintainers = with maintainers; [ lopsided98 ];
};
}
@@ -0,0 +1,40 @@
{
lib,
pythonOlder,
fetchPypi,
buildPythonPackage,
hatchling,
flake8,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "flake8-deprecated";
version = "2.2.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "flake8_deprecated";
inherit version;
hash = "sha256-7pbKAB0coFYfqORvI+LSRgsYqGaWNzyrZE4QKuD/KqI=";
};
build-system = [ hatchling ];
dependencies = [ flake8 ];
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "run_tests.py" ];
pythonImportsCheck = [ "flake8_deprecated" ];
meta = with lib; {
description = "Flake8 plugin that warns about deprecated method calls";
homepage = "https://github.com/gforcada/flake8-deprecated";
license = licenses.gpl2Only;
maintainers = with maintainers; [ lopsided98 ];
};
}
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "githubkit";
version = "0.12.3";
version = "0.12.4";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "yanyongyu";
repo = "githubkit";
tag = "v${version}";
hash = "sha256-sI24tSvwbh+zPTPVjkNlBg7TM6D5qMxfeF4pfj+6Q+E=";
hash = "sha256-h2XoHb3ukh6MKQG2v0TZg81mcwNGk4cfK8CWjzhM8W4=";
};
pythonRelaxDeps = [ "hishel" ];
@@ -0,0 +1,66 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
llm,
# dependencies
click,
ollama,
pydantic,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "llm-ollama";
version = "0.8.1";
pyproject = true;
src = fetchFromGitHub {
owner = "taketwo";
repo = "llm-ollama";
tag = version;
hash = "sha256-9AgHX2FJRXSKZOLt7JR/9Fg4i2HGNQY2vSsJa4+2BGQ=";
};
build-system = [
setuptools
# Follows the reasoning from https://github.com/NixOS/nixpkgs/pull/327800#discussion_r1681586659 about including llm in build-system
llm
];
dependencies = [
click
ollama
pydantic
];
nativeCheckInputs = [
pytestCheckHook
];
# These tests try to access the filesystem and fail
disabledTests = [
"test_registered_model"
"test_registered_chat_models"
"test_registered_embedding_models"
"test_registered_models_when_ollama_is_down"
];
pythonImportCheck = [
"llm_ollama"
];
meta = {
description = "LLM plugin providing access to Ollama models using HTTP API";
homepage = "https://github.com/taketwo/llm-ollama";
changelog = "https://github.com/taketwo/llm-ollama/releases/tag/${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ erethon ];
};
}
@@ -5,22 +5,25 @@
pytestCheckHook,
nodejs,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "pscript";
version = "0.7.7";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "flexxui";
repo = pname;
repo = "pscript";
tag = "v${version}";
hash = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o=";
};
build-system = [ setuptools ];
nativeCheckInputs = [
pytestCheckHook
nodejs
@@ -33,6 +36,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pscript" ];
disabledTests = [
# https://github.com/flexxui/pscript/issues/69
"test_async_and_await"
];
meta = with lib; {
description = "Python to JavaScript compiler";
homepage = "https://pscript.readthedocs.io";
@@ -15,9 +15,9 @@
zlib,
}:
buildPythonPackage rec {
buildPythonPackage {
pname = "pysam";
version = "0.22.1";
version = "0.22.1-unstable-2024-10-30";
pyproject = true;
# Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is
@@ -26,8 +26,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pysam-developers";
repo = "pysam";
tag = "v${version}";
hash = "sha256-1sivEf8xN4SJPtJiAcBZG1bbgy66yWXzQis1mPeU+sA=";
rev = "0eae5be21ac3ab3ac7aa770a3931e2977e37b909";
hash = "sha256-i8glYSpuCRNhNtK4i6eUrerz8daiMfY/YgDwgSuELbc=";
};
nativeBuildInputs = [
@@ -75,12 +75,12 @@ buildPythonPackage rec {
"pysam.libcvcf"
];
meta = with lib; {
meta = {
description = "Python module for reading, manipulating and writing genome data sets";
downloadPage = "https://github.com/pysam-developers/pysam";
homepage = "https://pysam.readthedocs.io/";
maintainers = with maintainers; [ unode ];
license = licenses.mit;
platforms = platforms.unix;
homepage = "https://pysam.readthedocs.io";
maintainers = with lib.maintainers; [ unode ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
}
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysuez";
version = "2.0.1";
version = "2.0.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "jb101010-2";
repo = "pySuez";
tag = version;
hash = "sha256-p9kTWaSMRgKZFonHTgT7nj4NdeTFCeEHawIFew/rii4=";
hash = "sha256-D/XsJL393fDIKMB1Wyzods5hLsdU3Qgq8T5aTJ3SLrM=";
};
build-system = [ hatchling ];
@@ -36,6 +36,9 @@ buildGoModule rec {
doCheck = false;
# /nix/store/.../bin/ld: internal/mkcw/embed/entrypoint_amd64.o: relocation R_X86_64_32S against `.rodata.1' can not be used when making a PIE object; recompile with -fPIE
hardeningDisable = [ "pie" ];
nativeBuildInputs = [
go-md2man
installShellFiles
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
version = "0.24.0";
version = "0.24.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
sha256 = "sha256-9tBPV0VR1bZUgYDD6T+hthPIzN9aGAyi1sUyeaynOQA=";
sha256 = "sha256-h4GaOZ9wHhRq8/GRKrXkH7fJPpOdYmwZ2nQPsVzt66U=";
};
cargoHash = "sha256-Igq4vjIyixpAhFd1wZqrVXCUmJdetUn6uM1eIX/0CiM=";
cargoHash = "sha256-dtl1YCMZdNtgaR8TxT3UZ7+CYREzpjaxmT80C1VTTa8=";
nativeBuildInputs = [ installShellFiles ];
@@ -6,25 +6,26 @@
buildDartApplication rec {
pname = "protoc-gen-dart";
version = "3.1.0";
version = "21.1.2";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf.dart";
rev = "protobuf-v${version}";
sha256 = "sha256-2QnLS6GHhDHMCnAY+2c1wMyPY3EKtlijWHQC+9AVt0k=";
tag = "protoc_plugin-v${version}";
hash = "sha256-luptbRgOtOBapWmyIJ35GqOClpcmDuKSPu3QoDfp2FU=";
};
sourceRoot = "${src.name}/protoc_plugin";
pubspecLock = lib.importJSON ./pubspec.lock.json;
passthru.updateScript = ./update.sh;
meta = with lib; {
meta = {
description = "Protobuf plugin for generating Dart code";
mainProgram = "protoc-gen-dart";
homepage = "https://pub.dev/packages/protoc_plugin";
license = licenses.bsd3;
maintainers = with maintainers; [ lelgenio ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ lelgenio ];
};
}
@@ -4,91 +4,97 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
"sha256": "eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051",
"sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "64.0.0"
"version": "73.0.0"
},
"_macros": {
"dependency": "transitive",
"description": "dart",
"source": "sdk",
"version": "0.3.2"
},
"analyzer": {
"dependency": "transitive",
"description": {
"name": "analyzer",
"sha256": "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893",
"sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.2.0"
"version": "6.8.0"
},
"args": {
"dependency": "transitive",
"description": {
"name": "args",
"sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
"sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.2"
"version": "2.6.0"
},
"async": {
"dependency": "transitive",
"description": {
"name": "async",
"sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
"sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.11.0"
"version": "2.12.0"
},
"boolean_selector": {
"dependency": "transitive",
"description": {
"name": "boolean_selector",
"sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
"sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.1"
"version": "2.1.2"
},
"collection": {
"dependency": "direct dev",
"description": {
"name": "collection",
"sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
"sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.18.0"
"version": "1.19.1"
},
"convert": {
"dependency": "transitive",
"description": {
"name": "convert",
"sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
"sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.1"
"version": "3.1.2"
},
"coverage": {
"dependency": "transitive",
"description": {
"name": "coverage",
"sha256": "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097",
"sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.6.3"
"version": "1.11.1"
},
"crypto": {
"dependency": "transitive",
"description": {
"name": "crypto",
"sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.3"
"version": "3.0.6"
},
"dart_flutter_team_lints": {
"dependency": "direct dev",
@@ -104,31 +110,31 @@
"dependency": "transitive",
"description": {
"name": "file",
"sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
"sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.0"
"version": "7.0.1"
},
"fixnum": {
"dependency": "direct main",
"description": {
"name": "fixnum",
"sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
"sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.0"
"version": "1.1.1"
},
"frontend_server_client": {
"dependency": "transitive",
"description": {
"name": "frontend_server_client",
"sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612",
"sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.0"
"version": "4.0.0"
},
"glob": {
"dependency": "transitive",
@@ -144,41 +150,41 @@
"dependency": "transitive",
"description": {
"name": "http_multi_server",
"sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
"sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.1"
"version": "3.2.2"
},
"http_parser": {
"dependency": "transitive",
"description": {
"name": "http_parser",
"sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
"sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.2"
"version": "4.1.2"
},
"io": {
"dependency": "transitive",
"description": {
"name": "io",
"sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
"sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.4"
"version": "1.0.5"
},
"js": {
"dependency": "transitive",
"description": {
"name": "js",
"sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
"sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.6.7"
"version": "0.7.1"
},
"lints": {
"dependency": "transitive",
@@ -194,41 +200,51 @@
"dependency": "transitive",
"description": {
"name": "logging",
"sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
"sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
"version": "1.3.0"
},
"macros": {
"dependency": "transitive",
"description": {
"name": "macros",
"sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.2-main.4"
},
"matcher": {
"dependency": "direct dev",
"description": {
"name": "matcher",
"sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e",
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.12.16"
"version": "0.12.17"
},
"meta": {
"dependency": "transitive",
"description": {
"name": "meta",
"sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3",
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.9.1"
"version": "1.16.0"
},
"mime": {
"dependency": "transitive",
"description": {
"name": "mime",
"sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e",
"sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.4"
"version": "2.0.0"
},
"node_preamble": {
"dependency": "transitive",
@@ -244,21 +260,21 @@
"dependency": "transitive",
"description": {
"name": "package_config",
"sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
"sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
"version": "2.1.1"
},
"path": {
"dependency": "direct main",
"description": {
"name": "path",
"sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917",
"sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.8.3"
"version": "1.9.1"
},
"pool": {
"dependency": "transitive",
@@ -273,31 +289,32 @@
"protobuf": {
"dependency": "direct main",
"description": {
"path": "../protobuf",
"relative": true
"name": "protobuf",
"sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d",
"url": "https://pub.dev"
},
"source": "path",
"source": "hosted",
"version": "3.1.0"
},
"pub_semver": {
"dependency": "transitive",
"description": {
"name": "pub_semver",
"sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
"sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
"version": "2.1.5"
},
"shelf": {
"dependency": "transitive",
"description": {
"name": "shelf",
"sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
"sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.1"
"version": "1.4.2"
},
"shelf_packages_handler": {
"dependency": "transitive",
@@ -313,184 +330,204 @@
"dependency": "transitive",
"description": {
"name": "shelf_static",
"sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
"sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.2"
"version": "1.1.3"
},
"shelf_web_socket": {
"dependency": "transitive",
"description": {
"name": "shelf_web_socket",
"sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1",
"sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.4"
"version": "2.0.1"
},
"source_map_stack_trace": {
"dependency": "transitive",
"description": {
"name": "source_map_stack_trace",
"sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.1"
},
"source_maps": {
"dependency": "transitive",
"description": {
"name": "source_maps",
"sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.10.12"
},
"source_span": {
"dependency": "transitive",
"description": {
"name": "source_span",
"sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.10.0"
},
"stack_trace": {
"dependency": "transitive",
"description": {
"name": "stack_trace",
"sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.11.1"
},
"stream_channel": {
"dependency": "transitive",
"description": {
"name": "stream_channel",
"sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
"sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
},
"source_maps": {
"dependency": "transitive",
"description": {
"name": "source_maps",
"sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.10.13"
},
"source_span": {
"dependency": "transitive",
"description": {
"name": "source_span",
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.10.1"
},
"stack_trace": {
"dependency": "transitive",
"description": {
"name": "stack_trace",
"sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.12.1"
},
"stream_channel": {
"dependency": "transitive",
"description": {
"name": "stream_channel",
"sha256": "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.3"
},
"string_scanner": {
"dependency": "transitive",
"description": {
"name": "string_scanner",
"sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
"sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
"version": "1.4.1"
},
"term_glyph": {
"dependency": "transitive",
"description": {
"name": "term_glyph",
"sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
"sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.1"
"version": "1.2.2"
},
"test": {
"dependency": "direct dev",
"description": {
"name": "test",
"sha256": "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9",
"sha256": "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.24.6"
"version": "1.25.14"
},
"test_api": {
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b",
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.6.1"
"version": "0.7.4"
},
"test_core": {
"dependency": "transitive",
"description": {
"name": "test_core",
"sha256": "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265",
"sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.5.6"
"version": "0.6.8"
},
"typed_data": {
"dependency": "transitive",
"description": {
"name": "typed_data",
"sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
"sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.2"
"version": "1.4.0"
},
"vm_service": {
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583",
"sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "11.10.0"
"version": "15.0.0"
},
"watcher": {
"dependency": "transitive",
"description": {
"name": "watcher",
"sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
"sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.1"
},
"web": {
"dependency": "transitive",
"description": {
"name": "web",
"sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.0"
},
"web_socket": {
"dependency": "transitive",
"description": {
"name": "web_socket",
"sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.6"
},
"web_socket_channel": {
"dependency": "transitive",
"description": {
"name": "web_socket_channel",
"sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b",
"sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "3.0.1"
},
"webkit_inspection_protocol": {
"dependency": "transitive",
"description": {
"name": "webkit_inspection_protocol",
"sha256": "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d",
"sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
"version": "1.2.1"
},
"yaml": {
"dependency": "transitive",
"description": {
"name": "yaml",
"sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
"sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.2"
"version": "3.1.3"
}
},
"sdks": {
"dart": ">=3.0.0 <4.0.0"
"dart": ">=3.5.0 <4.0.0"
}
}

Some files were not shown because too many files have changed in this diff Show More