0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot] 2025-03-25 00:16:28 +00:00 committed by GitHub
commit f079e356d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
185 changed files with 1803 additions and 30191 deletions

View file

@ -54,7 +54,7 @@ jobs:
echo "systems=$(<result/systems.json)" >> "$GITHUB_OUTPUT" echo "systems=$(<result/systems.json)" >> "$GITHUB_OUTPUT"
- name: Upload the list of all attributes - name: Upload the list of all attributes
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with: with:
name: paths name: paths
path: result/* path: result/*
@ -123,7 +123,7 @@ jobs:
# If it uses too much memory, slightly decrease chunkSize # If it uses too much memory, slightly decrease chunkSize
- name: Upload the output paths and eval stats - name: Upload the output paths and eval stats
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with: with:
name: intermediate-${{ matrix.system }} name: intermediate-${{ matrix.system }}
path: result/* path: result/*
@ -160,7 +160,7 @@ jobs:
-o prResult -o prResult
- name: Upload the combined results - name: Upload the combined results
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with: with:
name: result name: result
path: prResult/* path: prResult/*
@ -224,7 +224,7 @@ jobs:
- name: Upload the combined results - name: Upload the combined results
if: steps.targetRunId.outputs.targetRunId if: steps.targetRunId.outputs.targetRunId
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with: with:
name: comparison name: comparison
path: comparison/* path: comparison/*

View file

@ -49,7 +49,7 @@ jobs:
run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.${{ matrix.system }} run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.${{ matrix.system }}
- name: Upload NixOS manual - name: Upload NixOS manual
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with: with:
name: nixos-manual-${{ matrix.system }} name: nixos-manual-${{ matrix.system }}
path: result/ path: result/

View file

@ -23,6 +23,10 @@
- [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided. - [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided.
The `name` argument will become mandatory in a future release. The `name` argument will become mandatory in a future release.
- `xdragon` package has been renamed to `dragon-drop`.
`xdragon` is an alias to `dragon-drop` and the package still provides `bin/xdragon`.
`bin/dragon` is no longer supplied.
- The `nixLog*` family of functions made available through the standard environment have been rewritten to prefix messages with both the debug level and the function name of the caller. - The `nixLog*` family of functions made available through the standard environment have been rewritten to prefix messages with both the debug level and the function name of the caller.
The `nixLog` function, which logs unconditionally, was also re-introduced and modified to prefix messages with the function name of the caller. The `nixLog` function, which logs unconditionally, was also re-introduced and modified to prefix messages with the function name of the caller.
For more information, [see this PR](https://github.com/NixOS/nixpkgs/pull/370742). For more information, [see this PR](https://github.com/NixOS/nixpkgs/pull/370742).
@ -54,7 +58,7 @@
### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded} ### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded}
- `nexusmods-app` has been upgraded from version 0.6.3 to 0.8.2. - `nexusmods-app` has been upgraded from version 0.6.3 to 0.8.3.
- Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present. - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present.

View file

@ -23338,6 +23338,12 @@
} }
]; ];
}; };
taliyahwebb = {
email = "taliyahmail@proton.me";
github = "taliyahwebb";
githubId = 161863235;
name = "Taliyah Webb";
};
talkara = { talkara = {
email = "taito.horiuchi@relexsolutions.com"; email = "taito.horiuchi@relexsolutions.com";
github = "talkara"; github = "talkara";
@ -25847,6 +25853,17 @@
github = "wraithm"; github = "wraithm";
githubId = 1512913; githubId = 1512913;
}; };
wrbbz = {
name = "Arsenii Zorin";
email = "me@wrb.bz";
github = "wrbbz";
githubId = 14261606;
keys = [
{ fingerprint = "3724 B33B 0B85 F067 814C DA30 FC77 0786 0149 E41E"; }
{ fingerprint = "A18D 996A D48C 10E8 B985 A219 B43D 995D 2501 1DFA"; }
{ fingerprint = "34DB 8D31 F782 2B61 FF06 9503 8B5C 43DC 9105 2999"; }
];
};
wrmilling = { wrmilling = {
name = "Winston R. Milling"; name = "Winston R. Milling";
email = "Winston@Milli.ng"; email = "Winston@Milli.ng";

View file

@ -70,7 +70,7 @@ in
defaultChannel = mkOption { defaultChannel = mkOption {
internal = true; internal = true;
type = types.str; type = types.str;
default = "https://nixos.org/channels/nixos-24.11"; default = "https://nixos.org/channels/nixos-unstable";
description = "Default NixOS channel to which the root user is subscribed."; description = "Default NixOS channel to which the root user is subscribed.";
}; };
}; };

View file

@ -18,6 +18,8 @@ let
nameValuePair nameValuePair
optionalString optionalString
types types
isBool
boolToString
; ;
inherit (types) listOf package; inherit (types) listOf package;
@ -26,6 +28,15 @@ let
settingsFormat = pkgs.formats.keyValue { listsAsDuplicateKeys = true; }; settingsFormat = pkgs.formats.keyValue { listsAsDuplicateKeys = true; };
inherit (settingsFormat) generate type; inherit (settingsFormat) generate type;
recursiveToString =
value:
if isList value then
map recursiveToString value
else if isBool value then
boolToString value
else
toString value;
initScript = initScript =
{ {
program, program,
@ -97,12 +108,7 @@ in
environment = { environment = {
systemPackages = [ cfg.package ] ++ cfg.extraPackages; systemPackages = [ cfg.package ] ++ cfg.extraPackages;
etc."bat/config".source = generate "bat-config" ( etc."bat/config".source = generate "bat-config" (
mapAttrs' ( mapAttrs' (name: value: nameValuePair ("--" + name) (recursiveToString value)) cfg.settings
name: value:
nameValuePair ("--" + name) (
if (isList value) then map (str: "\"${str}\"") value else "\"${value}\""
)
) cfg.settings
); );
}; };

View file

@ -11,7 +11,7 @@ let
in in
pkgs.writeShellScriptBin "steam-gamescope" '' pkgs.writeShellScriptBin "steam-gamescope" ''
${builtins.concatStringsSep "\n" exports} ${builtins.concatStringsSep "\n" exports}
gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam ${builtins.toString cfg.gamescopeSession.steamArgs}
''; '';
gamescopeSessionFile = gamescopeSessionFile =
@ -160,6 +160,17 @@ in {
Environmental variables to be passed to GameScope for the session. Environmental variables to be passed to GameScope for the session.
''; '';
}; };
steamArgs = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [
"-tenfoot"
"-pipewire-dmabuf"
];
description = ''
Arguments to be passed to Steam for the session.
'';
};
}; };
}; };
}; };

View file

@ -1,6 +1,6 @@
with import ../lib; with import ../lib;
{ nixpkgs ? { outPath = cleanSource ./..; revCount = 708350; shortRev = "1d95cb5"; } { nixpkgs ? { outPath = cleanSource ./..; revCount = 708350; shortRev = "gfedcba"; }
, stableBranch ? false , stableBranch ? false
, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
, configuration ? {} , configuration ? {}
@ -12,7 +12,7 @@ let
version = fileContents ../.version; version = fileContents ../.version;
versionSuffix = versionSuffix =
(if stableBranch then "." else "beta") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
# Run the tests for each platform. You can run a test by doing # Run the tests for each platform. You can run a test by doing
# e.g. nix-build release.nix -A tests.login.x86_64-linux, # e.g. nix-build release.nix -A tests.login.x86_64-linux,

View file

@ -7,7 +7,7 @@
let let
inherit (pkgs) lib; inherit (pkgs) lib;
# Test cases from https://docs.pgvecto.rs/use-cases/hybrid-search.html # Test cases from https://docs.vectorchord.ai/use-case/hybrid-search.html
test-sql = pkgs.writeText "postgresql-test" '' test-sql = pkgs.writeText "postgresql-test" ''
CREATE EXTENSION vectors; CREATE EXTENSION vectors;

View file

@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = { mktplcRef = {
name = "python"; name = "python";
publisher = "ms-python"; publisher = "ms-python";
version = "2025.3.2025031001"; version = "2024.15.2024091301";
hash = "sha256-uYz0WgFqbLohCEmT8ewYgvlFrVLuZr9OAiKnrbNup7U="; hash = "sha256-MB8Vq2rjO37yW3Zh+f8ek/yz0qT+ZYHn/JnF5ZA6CXQ=";
}; };
buildInputs = [ icu ]; buildInputs = [ icu ];

View file

@ -5,13 +5,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "fbneo"; core = "fbneo";
version = "0-unstable-2025-01-13"; version = "0-unstable-2025-03-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libretro"; owner = "libretro";
repo = "fbneo"; repo = "fbneo";
rev = "274cdf95a16981c130015a8b4808a95ef5b46203"; rev = "0bf8e4482caf9c18fcd74b3ddd2d7eaaf32ff8ef";
hash = "sha256-BS+Siam2jz6mFDz0mtvWH3+Is3Il78UbWkCh2f+DSAE="; hash = "sha256-vIC1S57z+agpuaY7wb5bVAppsZkxCQGEnQteiHu0Y34=";
}; };
makefile = "Makefile"; makefile = "Makefile";

View file

@ -8,13 +8,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "flycast"; core = "flycast";
version = "0-unstable-2025-01-10"; version = "0-unstable-2025-03-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flyinghead"; owner = "flyinghead";
repo = "flycast"; repo = "flycast";
rev = "2e8984804170afce31a6d85e10ee4e153bbfb5aa"; rev = "44f77408e47d2f2873e1dec4705cd6b6071784fb";
hash = "sha256-jOOfYZ33SZM39vaJ/OqL7OpvIjuYoSewspOWNVTOBdk="; hash = "sha256-3UrMup7V6K630p5DvsGweqg9TaRTtL1TU0wC9Xt7hp8=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -5,13 +5,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "mgba"; core = "mgba";
version = "0-unstable-2025-01-14"; version = "0-unstable-2025-02-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libretro"; owner = "libretro";
repo = "mgba"; repo = "mgba";
rev = "72b5a9d3c4945c381d3230d59ea484729bcfe6c7"; rev = "88b22735dbdbc4d6236ed872ef21ea1b4d2fc492";
hash = "sha256-90APQtjwYh/KPrvvlnVU+3G45gaibpOEBf9MoVWOzDI="; hash = "sha256-ouwtL8vfc1LFMjfIZQ4F/ZOBW4y3VU9zovkXug0fgZY=";
}; };
meta = { meta = {

View file

@ -12,13 +12,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "mupen64plus-next"; core = "mupen64plus-next";
version = "0-unstable-2024-10-29"; version = "0-unstable-2025-03-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libretro"; owner = "libretro";
repo = "mupen64plus-libretro-nx"; repo = "mupen64plus-libretro-nx";
rev = "4249e39b2c200e5f0895385f76d99928785f2bea"; rev = "7c7f11061f29b2ccd5d0952e2373ae5b55cfea8f";
hash = "sha256-nII/PMYo2xLznmAcKs6jDWGRS1DC3tiDeT6KJKRnaCI="; hash = "sha256-KUx1lUffGY5mqElHNGVttjsNMrgl4qRIM91jesgavF4=";
}; };
# Fix for GCC 14 # Fix for GCC 14

View file

@ -5,13 +5,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "pcsx-rearmed"; core = "pcsx-rearmed";
version = "0-unstable-2025-01-14"; version = "0-unstable-2025-03-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libretro"; owner = "libretro";
repo = "pcsx_rearmed"; repo = "pcsx_rearmed";
rev = "9fec7ce05906838a4682dd0a83d0e7d6ac0336fa"; rev = "b53685f32320245d5d500cf59963d19ddff2f7d4";
hash = "sha256-1t6mXucg2/2hqyM4Id5Ze2Ry5U2rWMw2ce9mPAJur8k="; hash = "sha256-YeTZXkoqk9sgWum+Pj6Bj7SojVBqm/m4CVA2GJT69Wg=";
}; };
dontConfigure = true; dontConfigure = true;

View file

@ -5,13 +5,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "picodrive"; core = "picodrive";
version = "0-unstable-2024-12-31"; version = "0-unstable-2025-02-19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libretro"; owner = "libretro";
repo = "picodrive"; repo = "picodrive";
rev = "bb4b7bcddb9f2f218e88971cccc66edf6c7669f0"; rev = "6123398dfe16ada8048f5ee5255e1a9e726edbf5";
hash = "sha256-KbPsPG4pFZRHQoLuPVvBdXQTa+uXtmvSBKi7ShMyB3A="; hash = "sha256-rgFmdZBtWpVClfcVMBa7tSGb98z5ejCln/w4GrFu4VA=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -13,13 +13,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "ppsspp"; core = "ppsspp";
version = "0-unstable-2025-01-14"; version = "0-unstable-2025-03-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrydgard"; owner = "hrydgard";
repo = "ppsspp"; repo = "ppsspp";
rev = "841eb115e224dcdaa4b97f33ee0126fa00149c2a"; rev = "60a2dd12bc6eebb9e7885bf77f91835d6ff07307";
hash = "sha256-QnD13GxwW+B5ZdRRBhBwxUELwCwrlBsxBO0//elIfM4="; hash = "sha256-I9v01nXxaE1JboJ3a4hxIi1Qw78mOaLWdSVikF1vv1I=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -5,13 +5,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "puae"; core = "puae";
version = "0-unstable-2025-01-24"; version = "0-unstable-2025-02-20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libretro"; owner = "libretro";
repo = "libretro-uae"; repo = "libretro-uae";
rev = "9b05ecda81e14c0c5b2c5f6af8a65d034afd54a1"; rev = "12972a7da5aeb849ba7234dff342625d23617eaf";
hash = "sha256-jBY+Xn9aR/lTyxFZlydWJA5+bpkaCcyCAiYG3fcmGmc="; hash = "sha256-/w1Rbw0eStWyoR+UDD7a298vVAa0vb67qUPfiqhfm/k=";
}; };
makefile = "Makefile"; makefile = "Makefile";

View file

@ -5,13 +5,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "stella"; core = "stella";
version = "0-unstable-2025-01-02"; version = "0-unstable-2025-02-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stella-emu"; owner = "stella-emu";
repo = "stella"; repo = "stella";
rev = "66823c533a9b273293a18a342ffaea749218827b"; rev = "dccefede9b9e0c1f08cb645ac4c1b922579b93fa";
hash = "sha256-EQGpHnIcvgNdp5rwJVxQRdJwRzBTMxZDSF1521ybZqI="; hash = "sha256-J9/6plYOa44ZeVWilJWSR5ZQF0bzZ8w5v272iIAOMxM=";
}; };
makefile = "Makefile"; makefile = "Makefile";

View file

@ -1,20 +0,0 @@
diff --git a/app/compat.h b/app/compat.h
index b63d561..c051f35 100644
--- a/app/compat.h
+++ b/app/compat.h
@@ -11,13 +11,13 @@
#if __has_include(<KCompletion/kcompletion_version.h>)
# include <KCompletion/kcompletion_version.h>
-#else // Pre KF-5.91 header layout
+#elif __has_include(<kcompletion_version.h>) // Pre KF-5.91 header layout
# include <kcompletion_version.h>
#endif
#if __has_include(<KArchive/karchive_version.h>)
# include <KArchive/karchive_version.h>
-#else // Pre KF-5.91 header layout
+#elif __has_include(<karchive_version.h>) // Pre KF-5.91 header layout
# include <karchive_version.h>
#endif

View file

@ -1,37 +1,35 @@
{ {
mkDerivation,
lib, lib,
stdenv,
fetchurl, fetchurl,
extra-cmake-modules, extra-cmake-modules,
kdoctools, kdoctools,
wrapGAppsHook3,
karchive, karchive,
kconfig, kconfig,
kcrash, kcrash,
kguiaddons, kguiaddons,
kinit,
kparts, kparts,
kwindowsystem, kwindowsystem,
cmake,
wrapQtAppsHook,
qt5compat,
kstatusnotifieritem,
}: }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "krusader"; pname = "krusader";
version = "2.8.1"; version = "2.9.0";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; url = "mirror://kde/stable/krusader/${version}/krusader-${version}.tar.xz";
hash = "sha256-N78gRRnQqxukCWSvAnQbwijxHpfyjExRjKBdNY3xgoM="; hash = "sha256-ybeb+t5sxp/g40Hs75Mvysiv2f6U6MvPvXKf61Q5TgQ=";
}; };
patches = [
# Fix compilation error due to forceful header include
./compat-fix.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake
extra-cmake-modules extra-cmake-modules
kdoctools kdoctools
wrapGAppsHook3 wrapQtAppsHook
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -39,16 +37,17 @@ mkDerivation rec {
kconfig kconfig
kcrash kcrash
kguiaddons kguiaddons
kinit
kparts kparts
kwindowsystem kwindowsystem
qt5compat
kstatusnotifieritem
]; ];
meta = with lib; { meta = {
homepage = "http://www.krusader.org"; homepage = "http://www.krusader.org";
description = "Norton/Total Commander clone for KDE"; description = "Norton/Total Commander clone for KDE";
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
maintainers = with maintainers; [ sander ]; maintainers = with lib.maintainers; [ sander ];
mainProgram = "krusader"; mainProgram = "krusader";
}; };
} }

View file

@ -87,7 +87,7 @@ let
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "Superposition"; name = "Superposition";
exec = "Superposition"; exec = "superposition";
genericName = "A GPU Stress test tool from the UNIGINE"; genericName = "A GPU Stress test tool from the UNIGINE";
icon = "Superposition"; icon = "Superposition";
desktopName = "Superposition Benchmark"; desktopName = "Superposition Benchmark";

View file

@ -18,13 +18,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "gpxsee"; pname = "gpxsee";
version = "13.37"; version = "13.38";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tumic0"; owner = "tumic0";
repo = "GPXSee"; repo = "GPXSee";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-QaYdhU8jmvgKqFKgJmVEmyxRX+zck0gT9AIorwpDi98="; hash = "sha256-ftVuFuoseXtpeXzOMZA66O2Z6wxKd7G6l3Kx8WOgor0=";
}; };
buildInputs = buildInputs =

View file

@ -786,7 +786,7 @@
} }
}, },
"ungoogled-chromium": { "ungoogled-chromium": {
"version": "134.0.6998.117", "version": "134.0.6998.165",
"deps": { "deps": {
"depot_tools": { "depot_tools": {
"rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688", "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
@ -797,16 +797,16 @@
"hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U=" "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U="
}, },
"ungoogled-patches": { "ungoogled-patches": {
"rev": "134.0.6998.117-1", "rev": "134.0.6998.165-1",
"hash": "sha256-UEdho4QgVy+iQzH+hxnQC7T1juF25Dc4fDeKqd0FRnU=" "hash": "sha256-Uia8tI3ZpryD+YVV9duH6sAmB/gKvsFg9RZVKYo/HX0="
}, },
"npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=" "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
}, },
"DEPS": { "DEPS": {
"src": { "src": {
"url": "https://chromium.googlesource.com/chromium/src.git", "url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "cbb247b860ca6b9b18dfa791157e274eab8cad6e", "rev": "fd886e2cb29dd984c13deec032832dee68d8abe3",
"hash": "sha256-StWP7bsmD5Byn9uLZz6mo/OTChUsW1Y0RhxuofsPLbY=", "hash": "sha256-xD06hGSrccTGB6fUGw0b7RrGNBQjNmdGKPaRqhXVVOY=",
"recompress": true "recompress": true
}, },
"src/third_party/clang-format/script": { "src/third_party/clang-format/script": {
@ -1146,8 +1146,8 @@
}, },
"src/third_party/icu": { "src/third_party/icu": {
"url": "https://chromium.googlesource.com/chromium/deps/icu.git", "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
"rev": "bbccc2f6efc1b825de5f2c903c48be685cd0cf22", "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
"hash": "sha256-O9qrAt8lwNBg5LCVz+SfTe48uJx8onVYwn0LRXIhUvY=" "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U="
}, },
"src/third_party/jsoncpp/source": { "src/third_party/jsoncpp/source": {
"url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",

View file

@ -1,5 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchsvn
, autoreconfHook , autoreconfHook
, dbus , dbus
, gettext , gettext
@ -20,13 +20,14 @@
, Security , Security
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "filezilla"; pname = "filezilla";
version = "3.67.0"; version = "3.68.1";
src = fetchurl { src = fetchsvn {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.xz"; url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk";
hash = "sha256-5drcgH25mc60ZJhPl00+9ZtWLFlUZlgFfpsgEYOtr5o="; rev = "11205";
hash = "sha256-izaNfagJYUcPRPihZ1yXwLUTHunzVXuiMITW69KPSFE=";
}; };
configureFlags = [ configureFlags = [

View file

@ -8,13 +8,13 @@
buildLua { buildLua {
pname = "mpv-playlistmanager"; pname = "mpv-playlistmanager";
version = "0-unstable-2025-02-23"; version = "0-unstable-2025-03-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jonniek"; owner = "jonniek";
repo = "mpv-playlistmanager"; repo = "mpv-playlistmanager";
rev = "20ad0ee48af97735bf024a0f725152c60b5728cc"; rev = "a2755132c18c050269e5fea6093672f0a36ed7db";
hash = "sha256-XHKLl+IGCJ1TD4OIUmQBAq8jRVmEUFQ2cFVdpG/xMMM="; hash = "sha256-v+zQiRXPtFXSq3Em3sA37zltUGPhGCpONJ25F2Jxe4w=";
}; };
passthru.updateScript = unstableGitUpdater { }; passthru.updateScript = unstableGitUpdater { };

View file

@ -11,16 +11,16 @@
buildGoModule rec { buildGoModule rec {
pname = "amazon-cloudwatch-agent"; pname = "amazon-cloudwatch-agent";
version = "1.300053.0"; version = "1.300053.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "amazon-cloudwatch-agent"; repo = "amazon-cloudwatch-agent";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-YXi59OHWd3NtQSKUpa7vSfDxS1TA6F3IZX8RvfiR5Q0="; hash = "sha256-UyaAFBJ/GRwfnZVfFDsRSjAbMEHoiVCpo/M6c7nzA5M=";
}; };
vendorHash = "sha256-k/u5eYVFrpP3kP2ImuYUOjy0GPuw2ZswJ3Q5ztyXZN8="; vendorHash = "sha256-MrT30LZODuvzq3hqk/6D5u0ZAf2q2WB07yfjl6RbmtM=";
# See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77. # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
subPackages = [ subPackages = [

View file

@ -3,45 +3,49 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
sfml, sfml_2,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "antsimulator"; pname = "antsimulator";
version = "3.1"; version = "3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johnBuffer"; owner = "johnBuffer";
repo = "AntSimulator"; repo = "AntSimulator";
rev = "v${version}"; tag = "v${finalAttrs.version}";
sha256 = "sha256-1KWoGbdjF8VI4th/ZjAzASgsLEuS3xiwObulzxQAppA="; hash = "sha256-1KWoGbdjF8VI4th/ZjAzASgsLEuS3xiwObulzxQAppA=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ sfml ]; buildInputs = [ sfml_2 ];
postPatch = '' postPatch = ''
substituteInPlace src/main.cpp \ substituteInPlace src/main.cpp \
--replace "res/" "$out/opt/antsimulator/" --replace-fail "res/" "$out/opt/antsimulator/"
substituteInPlace include/simulation/config.hpp \ substituteInPlace include/simulation/config.hpp \
--replace "res/" "$out/opt/antsimulator/" --replace-fail "res/" "$out/opt/antsimulator/"
substituteInPlace include/render/colony_renderer.hpp \ substituteInPlace include/render/colony_renderer.hpp \
--replace "res/" "$out/opt/antsimulator/" --replace-fail "res/" "$out/opt/antsimulator/"
''; '';
installPhase = '' installPhase = ''
runHook preInstall
install -Dm644 -t $out/opt/antsimulator res/* install -Dm644 -t $out/opt/antsimulator res/*
install -Dm755 ./AntSimulator $out/bin/antsimulator install -Dm755 ./AntSimulator $out/bin/antsimulator
runHook postInstall
''; '';
meta = with lib; { meta = {
homepage = "https://github.com/johnBuffer/AntSimulator"; homepage = "https://github.com/johnBuffer/AntSimulator";
description = "Simple Ants simulator"; description = "Simple Ants simulator";
mainProgram = "antsimulator"; mainProgram = "antsimulator";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ ]; maintainers = [ ];
platforms = platforms.unix; platforms = lib.platforms.unix;
}; };
} })

View file

@ -34,14 +34,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "apt"; pname = "apt";
version = "2.9.31"; version = "2.9.33";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "salsa.debian.org"; domain = "salsa.debian.org";
owner = "apt-team"; owner = "apt-team";
repo = "apt"; repo = "apt";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-9YamO7niRXULnxiaRYB0BlzDitNtkKMe0Rw7KxDOOSM="; hash = "sha256-CniUdpQWUyS0GMRLmdA4zX0iF3geT5dglBfJy1li9O0=";
}; };
# cycle detection; lib can't be split # cycle detection; lib can't be split

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "arkade"; pname = "arkade";
version = "0.11.36"; version = "0.11.37";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexellis"; owner = "alexellis";
repo = "arkade"; repo = "arkade";
rev = version; rev = version;
hash = "sha256-u2dfpZd523W+QNznUmcVh8o4/o6Gmkk/teullmKTXm0="; hash = "sha256-eo2Kh9b+zQMS/MEiM8cZE0QYUub4zEKFtwBMJnva+Dk=";
}; };
env.CGO_ENABLED = 0; env.CGO_ENABLED = 0;

View file

@ -7,17 +7,17 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "atac"; pname = "atac";
version = "0.18.2"; version = "0.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Julien-cpsn"; owner = "Julien-cpsn";
repo = "ATAC"; repo = "ATAC";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-4lURe1DPgtoWToVdoXKQFYEbp5/1tmogx4u/4PLBluE="; hash = "sha256-7y4DDoGguHfU4JxnMyRmjrqJ4gg76C9WSmZ8ey+Mitg=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-hM3c0O0IfZYycdGJu65ov2B5KkV3nhbRg5dzO4LxX3M="; cargoHash = "sha256-sohEi3ARZlkNTQTpPVpQ1j/IyVP4rbBSdo6cpJdY1I4=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -9,7 +9,7 @@
libarchive, libarchive,
libjpeg, libjpeg,
libGLU, libGLU,
sfml, sfml_2,
zlib, zlib,
openal, openal,
fontconfig, fontconfig,
@ -36,7 +36,7 @@ stdenv.mkDerivation {
libarchive libarchive
libjpeg libjpeg
libGLU libGLU
sfml sfml_2
zlib zlib
] ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

View file

@ -1,6 +1,7 @@
{ {
lib, lib,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
rustPlatform, rustPlatform,
clang, clang,
pkg-config, pkg-config,
@ -20,11 +21,16 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-tPweJFqhZMOL+M08bDjW6HPmtuhr9IXJNP0c938O7Cg="; hash = "sha256-tPweJFqhZMOL+M08bDjW6HPmtuhr9IXJNP0c938O7Cg=";
}; };
# Upstream forgot to commit an up-to-date lockfile. cargoPatches = [
cargoPatches = [ ./update-Cargo.lock.patch ]; (fetchpatch {
name = "update-Cargo.lock.patch";
url = "https://github.com/facebookincubator/below/commit/f46f9936ac29fa23f5cb02cafe93ae724649bafc.patch";
hash = "sha256-J+M8FIuo8ToT3+9eZi5qfwfAW98XcNRqTIJd6O8z1Ig=";
})
];
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-uNeWdsvJtkUz3E1NL10heDC7B55yKzDMMYzRhEE32EQ="; cargoHash = "sha256-JrSSIwREHSg5YJivSdBIPjOkOtdw8qGCsa4yE7rJz/E=";
prePatch = '' prePatch = ''
sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service

File diff suppressed because it is too large Load diff

View file

@ -11,8 +11,8 @@
}, },
{ {
"pname": "Azure.Bicep.Types.Az", "pname": "Azure.Bicep.Types.Az",
"version": "0.2.737", "version": "0.2.756",
"hash": "sha256-eqjucNfQg8kJ4PCSBBtl+9ddv0xyfKvBQMbIEE9FWg8=" "hash": "sha256-fYnDKiUhKY0aWz1GFkUVGWnRJQdHaTzYaj6fP7nJkqs="
}, },
{ {
"pname": "Azure.Bicep.Types.K8s", "pname": "Azure.Bicep.Types.K8s",
@ -49,25 +49,35 @@
"version": "1.224.0", "version": "1.224.0",
"hash": "sha256-T6z0ZTanppSVlsPMmtSiVdNJWReAg+snvM4qvMgNNNk=" "hash": "sha256-T6z0ZTanppSVlsPMmtSiVdNJWReAg+snvM4qvMgNNNk="
}, },
{
"pname": "Azure.Deployments.Core",
"version": "1.241.0",
"hash": "sha256-f5GLoXqPz4MQa5XLKYzNCnGq/p3nWzom0o476xnSjOA="
},
{ {
"pname": "Azure.Deployments.DiffEngine", "pname": "Azure.Deployments.DiffEngine",
"version": "1.224.0", "version": "1.241.0",
"hash": "sha256-Ca6iHQv6/BPHJt0EV/HZTUc5L+bCrX4iqQK8gtrj7Ho=" "hash": "sha256-qdBEMoqHD9aWeb1hMQm/QctNTtct2Y1HKzejLP8LeEg="
}, },
{ {
"pname": "Azure.Deployments.Engine", "pname": "Azure.Deployments.Engine",
"version": "1.224.0", "version": "1.241.0",
"hash": "sha256-crlmLUXHCzt0zqJTfulR2rttXxOgtLmo1JnO56VMhYQ=" "hash": "sha256-rOq/2I0ZErMfg/4Z3odusCIiIJHFQj6hoOqYlcmGOko="
}, },
{ {
"pname": "Azure.Deployments.Expression", "pname": "Azure.Deployments.Expression",
"version": "1.224.0", "version": "1.224.0",
"hash": "sha256-P0bncRi4VntjtNQHNZL02fa2tH8aho1Y0+lxvssY5AM=" "hash": "sha256-P0bncRi4VntjtNQHNZL02fa2tH8aho1Y0+lxvssY5AM="
}, },
{
"pname": "Azure.Deployments.Expression",
"version": "1.241.0",
"hash": "sha256-fu3gJsqarSjj6Qp2f4SDhTLU2rYtf6ld9J7ywwPVeqY="
},
{ {
"pname": "Azure.Deployments.Extensibility", "pname": "Azure.Deployments.Extensibility",
"version": "1.224.0", "version": "1.241.0",
"hash": "sha256-Dwo5xeXjwkvPA4mebl45kSgtb+kpauo9qbVTtcIhFkQ=" "hash": "sha256-PQyUoide4V5YZpnBzu5g2grCLr7jAgek+D5Xu9AIrag="
}, },
{ {
"pname": "Azure.Deployments.Extensibility.Core", "pname": "Azure.Deployments.Extensibility.Core",
@ -94,10 +104,15 @@
"version": "1.224.0", "version": "1.224.0",
"hash": "sha256-4O4tUhuWhEQpw3UywSbUQvvTOUNION7sZHGEZ8M1xWo=" "hash": "sha256-4O4tUhuWhEQpw3UywSbUQvvTOUNION7sZHGEZ8M1xWo="
}, },
{
"pname": "Azure.Deployments.Templates",
"version": "1.241.0",
"hash": "sha256-DWvdU3ipGUg5c5kyJXzFQ4x1l60x+qsWGZ++7XHMNcI="
},
{ {
"pname": "Azure.Identity", "pname": "Azure.Identity",
"version": "1.13.1", "version": "1.13.2",
"hash": "sha256-3MI7LcEAr1EKpp2ZtiJu3yrnwnrMPCfGj3auQPNrL8A=" "hash": "sha256-SCwpd4p5urStrwQqI8iNkl0oAlrarNvjzHoSodOgnBY="
}, },
{ {
"pname": "Azure.ResourceManager", "pname": "Azure.ResourceManager",
@ -119,16 +134,16 @@
"version": "1.9.0", "version": "1.9.0",
"hash": "sha256-TiFfFUjDf+R7O0Tdgodk20EWshcxuwhFSAJwmOO1gFw=" "hash": "sha256-TiFfFUjDf+R7O0Tdgodk20EWshcxuwhFSAJwmOO1gFw="
}, },
{
"pname": "Castle.Core",
"version": "5.1.1",
"hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="
},
{ {
"pname": "CommandLineParser", "pname": "CommandLineParser",
"version": "2.9.1", "version": "2.9.1",
"hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo=" "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="
}, },
{
"pname": "coverlet.collector",
"version": "6.0.3",
"hash": "sha256-gQ2u3hJggz89UVoU3P7m/riu1SkN1hu316iyrodTqt8="
},
{ {
"pname": "FluentAssertions", "pname": "FluentAssertions",
"version": "7.0.0", "version": "7.0.0",
@ -301,8 +316,8 @@
}, },
{ {
"pname": "Microsoft.CodeCoverage", "pname": "Microsoft.CodeCoverage",
"version": "17.12.0", "version": "17.13.0",
"hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE=" "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o="
}, },
{ {
"pname": "Microsoft.CSharp", "pname": "Microsoft.CSharp",
@ -319,6 +334,11 @@
"version": "3.1.3", "version": "3.1.3",
"hash": "sha256-MVKR1ZRpUMNdRAPuXh9cp5T/hG7wu8R9wUr9bey8V60=" "hash": "sha256-MVKR1ZRpUMNdRAPuXh9cp5T/hG7wu8R9wUr9bey8V60="
}, },
{
"pname": "Microsoft.DiaSymReader",
"version": "2.0.0",
"hash": "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="
},
{ {
"pname": "Microsoft.Extensions.Configuration", "pname": "Microsoft.Extensions.Configuration",
"version": "6.0.1", "version": "6.0.1",
@ -331,8 +351,8 @@
}, },
{ {
"pname": "Microsoft.Extensions.Configuration", "pname": "Microsoft.Extensions.Configuration",
"version": "9.0.0", "version": "9.0.2",
"hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM=" "hash": "sha256-AUNaLhYTcHUkqKGhSL7QgrifV9JkjKhNQ4Ws8UtZhlM="
}, },
{ {
"pname": "Microsoft.Extensions.Configuration.Abstractions", "pname": "Microsoft.Extensions.Configuration.Abstractions",
@ -349,6 +369,16 @@
"version": "9.0.0", "version": "9.0.0",
"hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
}, },
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "9.0.1",
"hash": "sha256-r3iWP+kwKo4Aib8SGo91kKWR5WusLrbFHUAw5uKQeNA="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "9.0.2",
"hash": "sha256-icRtfbi0nDRUYDErtKYx0z6A1gWo5xdswsSM6o4ozxc="
},
{ {
"pname": "Microsoft.Extensions.Configuration.Binder", "pname": "Microsoft.Extensions.Configuration.Binder",
"version": "6.0.0", "version": "6.0.0",
@ -361,8 +391,8 @@
}, },
{ {
"pname": "Microsoft.Extensions.Configuration.Binder", "pname": "Microsoft.Extensions.Configuration.Binder",
"version": "9.0.0", "version": "9.0.1",
"hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=" "hash": "sha256-uq6i0gTobSTqaNm/0XZuv8GGjFpnvgwXnCCPWl9FP9g="
}, },
{ {
"pname": "Microsoft.Extensions.Configuration.FileExtensions", "pname": "Microsoft.Extensions.Configuration.FileExtensions",
@ -386,8 +416,13 @@
}, },
{ {
"pname": "Microsoft.Extensions.DependencyInjection", "pname": "Microsoft.Extensions.DependencyInjection",
"version": "9.0.0", "version": "9.0.1",
"hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k=" "hash": "sha256-Kt9fczXVeOIlvwuxXdQDKRfIZKClay0ESGUIAJpYiOw="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "9.0.2",
"hash": "sha256-jNQVj2Xo7wzVdNDu27bLbYCVUOF8yDVrFtC3cZ9OsXo="
}, },
{ {
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@ -401,8 +436,18 @@
}, },
{ {
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "9.0.0", "version": "9.0.1",
"hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" "hash": "sha256-2tWVTPHsw1NG2zO0zsxvi1GybryqeE1V00ZRE66YZB4="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "9.0.2",
"hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
"version": "6.0.1",
"hash": "sha256-ArXJ7mfSywrfif29cfkeaXL1s0soZSi+RZgAimukqNw="
}, },
{ {
"pname": "Microsoft.Extensions.Diagnostics", "pname": "Microsoft.Extensions.Diagnostics",
@ -446,8 +491,8 @@
}, },
{ {
"pname": "Microsoft.Extensions.Logging", "pname": "Microsoft.Extensions.Logging",
"version": "9.0.0", "version": "9.0.1",
"hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=" "hash": "sha256-IjszwetJ/r1NvwVyh+/SlavabNt9UXf3ZSGP9gGwnkk="
}, },
{ {
"pname": "Microsoft.Extensions.Logging.Abstractions", "pname": "Microsoft.Extensions.Logging.Abstractions",
@ -461,8 +506,8 @@
}, },
{ {
"pname": "Microsoft.Extensions.Logging.Abstractions", "pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "9.0.0", "version": "9.0.1",
"hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" "hash": "sha256-aFZeUno9yLLbvtrj53gA7oD41vxZZYkrJhlOghpMEjo="
}, },
{ {
"pname": "Microsoft.Extensions.ObjectPool", "pname": "Microsoft.Extensions.ObjectPool",
@ -481,8 +526,8 @@
}, },
{ {
"pname": "Microsoft.Extensions.Options", "pname": "Microsoft.Extensions.Options",
"version": "9.0.0", "version": "9.0.1",
"hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" "hash": "sha256-wOKd/0+kRK3WrGA2HmS/KNYUTUwXHmTAD5IsClTFA10="
}, },
{ {
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
@ -515,19 +560,24 @@
"hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
}, },
{ {
"pname": "Microsoft.Graph.Bicep.Types", "pname": "Microsoft.Extensions.Primitives",
"version": "0.1.7-preview", "version": "9.0.1",
"hash": "sha256-Lz45XaKIjKA7w4xX2ElZO5jxVi0LqhGbGBTAHc+aqL0=" "hash": "sha256-tdbtoC7eQGW5yh66FWCJQqmFJkNJD+9e6DDKTs7YAjs="
},
{
"pname": "Microsoft.Extensions.Primitives",
"version": "9.0.2",
"hash": "sha256-zy/YNMaY47o6yNv2WuYiAJEjtoOF8jlWgsWHqXeSm4s="
}, },
{ {
"pname": "Microsoft.Identity.Client", "pname": "Microsoft.Identity.Client",
"version": "4.66.1", "version": "4.67.2",
"hash": "sha256-azhndN+YbI6IGCOAKa4GlwYBAGOFs2fjgzhwCgI3r7w=" "hash": "sha256-E8i4RE7TUVna5RlN/o6ALR7hBLk8yXLQwZm2m5gygW4="
}, },
{ {
"pname": "Microsoft.Identity.Client.Extensions.Msal", "pname": "Microsoft.Identity.Client.Extensions.Msal",
"version": "4.66.1", "version": "4.67.2",
"hash": "sha256-8iYRnxbbuy+NA2eiJATJ4RRqQbj4fjiaVI2ff3pOpkg=" "hash": "sha256-NhOz/8A2S5UT55BSNCWsMz3YSjy4lF3rhdYuTrXIYLQ="
}, },
{ {
"pname": "Microsoft.IdentityModel.Abstractions", "pname": "Microsoft.IdentityModel.Abstractions",
@ -541,8 +591,8 @@
}, },
{ {
"pname": "Microsoft.NET.Test.Sdk", "pname": "Microsoft.NET.Test.Sdk",
"version": "17.12.0", "version": "17.13.0",
"hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg=" "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY="
}, },
{ {
"pname": "Microsoft.NETCore.Platforms", "pname": "Microsoft.NETCore.Platforms",
@ -604,46 +654,66 @@
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="
}, },
{
"pname": "Microsoft.Testing.Extensions.CodeCoverage",
"version": "17.13.1",
"hash": "sha256-m74V71udgx4OZScpfyVeA0Oj5JKIvdU1W5wzXyeUHLQ="
},
{ {
"pname": "Microsoft.Testing.Extensions.Telemetry", "pname": "Microsoft.Testing.Extensions.Telemetry",
"version": "1.5.3", "version": "1.6.2",
"hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU=" "hash": "sha256-GZYUH+0vWAif5p4S81Oo9Tsez68ylsLjEQWhI2rgcik="
},
{
"pname": "Microsoft.Testing.Extensions.TrxReport",
"version": "1.6.2",
"hash": "sha256-21x7FSFGVGXS8fkOQyr3jxsemxU8+7ugkVzo+mOP0Ic="
}, },
{ {
"pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
"version": "1.5.3", "version": "1.6.2",
"hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc=" "hash": "sha256-UOpDBbW3xgahofRjqdw3wUj63zXVdkIAfUE7dA4uI4Y="
}, },
{ {
"pname": "Microsoft.Testing.Extensions.VSTestBridge", "pname": "Microsoft.Testing.Extensions.VSTestBridge",
"version": "1.5.3", "version": "1.6.2",
"hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g=" "hash": "sha256-SWaSPgc2PQNqsz7ea/SQsmqOX6le6dmrDbwCHfbppZo="
}, },
{ {
"pname": "Microsoft.Testing.Platform", "pname": "Microsoft.Testing.Platform",
"version": "1.5.3", "version": "1.4.3",
"hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM=" "hash": "sha256-KqB3+uBGl0edpaGl6Qykubb3OrVTs6IcPWc59UQ/Iww="
},
{
"pname": "Microsoft.Testing.Platform",
"version": "1.6.2",
"hash": "sha256-RfdgATa3aTYLpGfv8ORI5uEP8dH87L5/gBDkxAG6ho4="
}, },
{ {
"pname": "Microsoft.Testing.Platform.MSBuild", "pname": "Microsoft.Testing.Platform.MSBuild",
"version": "1.5.3", "version": "1.6.2",
"hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY=" "hash": "sha256-bzlz10QeFrCAR+1og0gXbxSbpO64wCFrwAhBUwAp0nI="
}, },
{ {
"pname": "Microsoft.TestPlatform.ObjectModel", "pname": "Microsoft.TestPlatform.ObjectModel",
"version": "17.12.0", "version": "17.13.0",
"hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w=" "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
}, },
{ {
"pname": "Microsoft.TestPlatform.TestHost", "pname": "Microsoft.TestPlatform.TestHost",
"version": "17.12.0", "version": "17.13.0",
"hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I=" "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo="
}, },
{ {
"pname": "Microsoft.VisualStudio.Threading", "pname": "Microsoft.VisualStudio.Threading",
"version": "17.10.48", "version": "17.10.48",
"hash": "sha256-WL8c7TjDBHGjsVLMMPf9cin8rirzOdxusEBQlkUfiVU=" "hash": "sha256-WL8c7TjDBHGjsVLMMPf9cin8rirzOdxusEBQlkUfiVU="
}, },
{
"pname": "Microsoft.VisualStudio.Threading",
"version": "17.12.19",
"hash": "sha256-4lriaeIL8wbirIvT1sxLTsL8dny+0Puq+OFxrp/4nng="
},
{ {
"pname": "Microsoft.VisualStudio.Threading", "pname": "Microsoft.VisualStudio.Threading",
"version": "17.6.40", "version": "17.6.40",
@ -651,8 +721,8 @@
}, },
{ {
"pname": "Microsoft.VisualStudio.Threading.Analyzers", "pname": "Microsoft.VisualStudio.Threading.Analyzers",
"version": "17.12.19", "version": "17.13.2",
"hash": "sha256-7EteBGfUDOOpDihazJ4XGuPA2dvdc7HkpV8zTVl3FdQ=" "hash": "sha256-pfhN5HDSWbo6hmlSnCVWvnkYTqSjs8PNtSyHCEEtUjI="
}, },
{ {
"pname": "Microsoft.VisualStudio.Validation", "pname": "Microsoft.VisualStudio.Validation",
@ -694,20 +764,30 @@
"version": "8.0.10", "version": "8.0.10",
"hash": "sha256-VlLNyPBhHsg96Oq3Z8/bxK0iaSQqiUsQ+hQo3rGD3FU=" "hash": "sha256-VlLNyPBhHsg96Oq3Z8/bxK0iaSQqiUsQ+hQo3rGD3FU="
}, },
{
"pname": "Moq",
"version": "4.20.72",
"hash": "sha256-+uAc/6xtzij9YnmZrhZwc+4vUgx6cppZsWQli3CGQ8o="
},
{
"pname": "MSTest",
"version": "3.8.2",
"hash": "sha256-k6M9buNaP/y+e4/4dsSWxsFWMmocWocDh3LW1jL97/A="
},
{ {
"pname": "MSTest.Analyzers", "pname": "MSTest.Analyzers",
"version": "3.7.3", "version": "3.8.2",
"hash": "sha256-6mNfHtx9FBWA6/QrRUepwbxXWG/54GRyeZYazDiMacg=" "hash": "sha256-r+JAxw77n/PQpQviXn8j1M+ccb9GVHTNuPWwffacVkg="
}, },
{ {
"pname": "MSTest.TestAdapter", "pname": "MSTest.TestAdapter",
"version": "3.7.3", "version": "3.8.2",
"hash": "sha256-3O/AXeS+3rHWstinivt73oa0QDp+xQpTc9p46EF+Mtc=" "hash": "sha256-z5fZWSvyxvohB8Vl6gtb8nsAGt/9saXLZRckuzfVg/Y="
}, },
{ {
"pname": "MSTest.TestFramework", "pname": "MSTest.TestFramework",
"version": "3.7.3", "version": "3.8.2",
"hash": "sha256-RweCMMf14GI6HqjDIP68JM67IaJKYQTZy0jk5Q4DFxs=" "hash": "sha256-NjQ1XU3vMRdFZSE6Ju2ASopCPZFpFZaPAQdRudqAf5c="
}, },
{ {
"pname": "Nerdbank.GitVersioning", "pname": "Nerdbank.GitVersioning",
@ -1009,6 +1089,11 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
}, },
{
"pname": "System.Buffers",
"version": "4.5.1",
"hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
},
{ {
"pname": "System.ClientModel", "pname": "System.ClientModel",
"version": "1.1.0", "version": "1.1.0",
@ -1111,8 +1196,13 @@
}, },
{ {
"pname": "System.Diagnostics.DiagnosticSource", "pname": "System.Diagnostics.DiagnosticSource",
"version": "9.0.0", "version": "9.0.1",
"hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE=" "hash": "sha256-nIIvVK+5uyOhAuU2sERNADK4N/A/x0MilBH/EAr1gOA="
},
{
"pname": "System.Diagnostics.EventLog",
"version": "6.0.0",
"hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
}, },
{ {
"pname": "System.Diagnostics.EventLog", "pname": "System.Diagnostics.EventLog",
@ -1186,8 +1276,8 @@
}, },
{ {
"pname": "System.IO.Abstractions", "pname": "System.IO.Abstractions",
"version": "21.1.7", "version": "21.3.1",
"hash": "sha256-f5VSR/MlQ/uXfQvj1533qV6nrlIeaoCmSC1VHfMTOGk=" "hash": "sha256-Y6lE9xWEEztnNGo03ME+YJrPUMed2C5M4MNek7tajjA="
}, },
{ {
"pname": "System.IO.FileSystem", "pname": "System.IO.FileSystem",
@ -1219,6 +1309,11 @@
"version": "9.0.0", "version": "9.0.0",
"hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0="
}, },
{
"pname": "System.IO.Pipelines",
"version": "9.0.2",
"hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE="
},
{ {
"pname": "System.IO.Ports", "pname": "System.IO.Ports",
"version": "8.0.0", "version": "8.0.0",
@ -1244,6 +1339,11 @@
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0=" "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="
}, },
{
"pname": "System.Memory",
"version": "4.5.4",
"hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
},
{ {
"pname": "System.Memory", "pname": "System.Memory",
"version": "4.5.5", "version": "4.5.5",
@ -1259,6 +1359,11 @@
"version": "6.0.0", "version": "6.0.0",
"hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo="
}, },
{
"pname": "System.Memory.Data",
"version": "9.0.2",
"hash": "sha256-2b8t6eeX/3JUDTD4oxsbSD2+2NV87P/a5S0YuNPWRwM="
},
{ {
"pname": "System.Numerics.Vectors", "pname": "System.Numerics.Vectors",
"version": "4.5.0", "version": "4.5.0",
@ -1339,6 +1444,11 @@
"version": "1.6.0", "version": "1.6.0",
"hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
}, },
{
"pname": "System.Reflection.Metadata",
"version": "8.0.0",
"hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
},
{ {
"pname": "System.Reflection.Primitives", "pname": "System.Reflection.Primitives",
"version": "4.0.1", "version": "4.0.1",
@ -1575,14 +1685,14 @@
"hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=" "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0="
}, },
{ {
"pname": "System.Text.Json", "pname": "System.Text.Encodings.Web",
"version": "4.7.2", "version": "9.0.2",
"hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" "hash": "sha256-tZhc/Xe+SF9bCplthph2QmQakWxKVjMfQJZzD1Xbpg8="
}, },
{ {
"pname": "System.Text.Json", "pname": "System.Text.Json",
"version": "6.0.0", "version": "4.7.2",
"hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="
}, },
{ {
"pname": "System.Text.Json", "pname": "System.Text.Json",
@ -1604,6 +1714,11 @@
"version": "9.0.0", "version": "9.0.0",
"hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=" "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk="
}, },
{
"pname": "System.Text.Json",
"version": "9.0.2",
"hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
},
{ {
"pname": "System.Text.RegularExpressions", "pname": "System.Text.RegularExpressions",
"version": "4.1.0", "version": "4.1.0",
@ -1681,12 +1796,12 @@
}, },
{ {
"pname": "TestableIO.System.IO.Abstractions", "pname": "TestableIO.System.IO.Abstractions",
"version": "21.1.7", "version": "21.3.1",
"hash": "sha256-EX5bkC9IW045vCdnl9UjjwyUtL99P8jTqkdXYEs0czI=" "hash": "sha256-qd1RLqBoX4uI58gsb2BiIrUEOL6nrhlXs9L7toFbgjk="
}, },
{ {
"pname": "TestableIO.System.IO.Abstractions.Wrappers", "pname": "TestableIO.System.IO.Abstractions.Wrappers",
"version": "21.1.7", "version": "21.3.1",
"hash": "sha256-sYF7wt6vTed2B62BJzzHw+7ySyDplFD+cTJjL5MlLig=" "hash": "sha256-+z1R4Kn0hwjGQ6vC7NIgDS7/ccGd1/wy5sjmjvXCIIQ="
} }
] ]

View file

@ -10,13 +10,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "bicep"; pname = "bicep";
version = "0.33.93"; version = "0.34.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Azure"; owner = "Azure";
repo = "bicep"; repo = "bicep";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-5XrFIgblr2WIMBPoVwRZ6X2dokbXw+nS8J7WzhHEzpU="; hash = "sha256-8ob4UISiqyhgBeQxRb6iLporsIVCq5c/7Yb2wvUW1ZQ=";
}; };
patches = [ patches = [

View file

@ -1,6 +1,6 @@
# Generated by ./update.sh - do not update manually! # Generated by ./update.sh - do not update manually!
{ {
version = "1.16.2-4"; version = "1.16.3-2";
arm64-hash = "sha256-3R6VmDteqrUzzAp/ki12bkSEBLZVMhewI507oXZ5kF4="; arm64-hash = "sha256-lVRo4w4+Hj1lDXtxUD0DnerOGeV33tdG8iZZnVWtVjc=";
x86_64-hash = "sha256-PamrsXNIKrBHq1r6d0DOE5482hGR92ipWNUO5dwxpbA="; x86_64-hash = "sha256-PAQ7B8jVDwb1qVJLFFSylL7Oh95Fe8LbgD0OcC1Xez8=";
} }

View file

@ -19,14 +19,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "cartridges"; pname = "cartridges";
version = "2.11.1"; version = "2.12.1";
pyproject = false; pyproject = false;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kra-mo"; owner = "kra-mo";
repo = "cartridges"; repo = "cartridges";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-2w7qHTEaRnVDRa0e39Dg9H7pjhgM2UATe8pGYncYILE="; hash = "sha256-pGEh9ugDWjaAjVL8mFUVqU+WFwcpRcstc11ikDxhihI=";
}; };
strictDeps = true; strictDeps = true;

View file

@ -19,17 +19,18 @@
libxml2, libxml2,
sqlite, sqlite,
webkitgtk_6_0, webkitgtk_6_0,
nix-update-script,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cassette"; pname = "cassette";
version = "0.2.0"; version = "0.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Rirusha"; owner = "Rirusha";
repo = "Cassette"; repo = "Cassette";
rev = "ver-${version}"; rev = "v${version}";
hash = "sha256-x9BRoLXrCO/7pI392MbO6m39rmpiOdCcp+pOLG6+k/s="; hash = "sha256-DXCOrCntOgUPYMVRqC4jDNTFgUjShCBoYQgLtSnuz6U=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -60,6 +61,8 @@ stdenv.mkDerivation rec {
strictDeps = true; strictDeps = true;
passthru.updateScript = nix-update-script { };
meta = { meta = {
description = "GTK4/Adwaita application that allows you to use Yandex Music service on Linux operating systems"; description = "GTK4/Adwaita application that allows you to use Yandex Music service on Linux operating systems";
homepage = "https://github.com/Rirusha/Cassette"; homepage = "https://github.com/Rirusha/Cassette";

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "charm-freeze"; pname = "charm-freeze";
version = "0.1.6"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charmbracelet"; owner = "charmbracelet";
repo = "freeze"; repo = "freeze";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-HLlMUOLDvNLVl4dvtyRwuLhp3pOlpm/naUXK2NiIAg8="; hash = "sha256-eV8X/vftF/GGuM0RnLCkIStSR98fN6nmW3BzoASPLH0=";
}; };
vendorHash = "sha256-AUFzxmQOb/h0UgcprY09IVI7Auitn3JTDU/ptKicIAU="; vendorHash = "sha256-Y/UsqYtzXtOCE4bGf/mRAqJ0GxEtKq0qYecbitn0EhM=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -125,6 +125,17 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
moveToOutput lib "$lib" moveToOutput lib "$lib"
moveToOutput lib/cmake "$dev"
substituteInPlace $dev/lib/cmake/circt/CIRCTConfig.cmake \
--replace-fail "\''${CIRCT_INSTALL_PREFIX}/lib/cmake/mlir" "${circt-llvm.dev}/lib/cmake/mlir" \
--replace-fail "\''${CIRCT_INSTALL_PREFIX}/lib/cmake/circt" "$dev/lib/cmake/circt" \
--replace-fail "\''${CIRCT_INSTALL_PREFIX}/include" "$dev/include" \
--replace-fail "\''${CIRCT_INSTALL_PREFIX}/lib" "$lib/lib" \
--replace-fail "\''${CIRCT_INSTALL_PREFIX}/bin" "$out/bin" \
--replace-fail "\''${CIRCT_INSTALL_PREFIX}" "$out"
substituteInPlace $dev/lib/cmake/circt/CIRCTTargets-release.cmake \
--replace-fail "\''${_IMPORT_PREFIX}/lib" "$lib/lib"
''; '';
passthru = { passthru = {

View file

@ -1,714 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "aho-corasick"
version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
dependencies = [
"memchr",
]
[[package]]
name = "ansi_term"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
"winapi",
]
[[package]]
name = "anyhow"
version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
"winapi",
]
[[package]]
name = "autocfg"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "bindgen"
version = "0.55.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75b13ce559e6433d360c26305643803cb52cfbabbc2b9c47ce04a58493dfb443"
dependencies = [
"bitflags",
"cexpr",
"cfg-if 0.1.10",
"clang-sys",
"clap",
"env_logger",
"lazy_static",
"lazycell",
"log",
"peeking_take_while",
"proc-macro2",
"quote",
"regex",
"rustc-hash",
"shlex",
"which",
]
[[package]]
name = "bitflags"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "cbindgen"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1df6a11bba1d7cab86c166cecf4cf8acd7d02b7b65924d81b33d27197f22ee35"
dependencies = [
"clap",
"heck",
"indexmap",
"log",
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn",
"tempfile",
"toml",
]
[[package]]
name = "cc"
version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
[[package]]
name = "cexpr"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
dependencies = [
"nom",
]
[[package]]
name = "cfg-if"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cjdns_sys"
version = "0.1.0"
dependencies = [
"anyhow",
"bindgen",
"cbindgen",
"cc",
"sodiumoxide",
"thiserror",
]
[[package]]
name = "cjdroute"
version = "0.1.0"
dependencies = [
"cjdns_sys",
]
[[package]]
name = "clang-sys"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0659001ab56b791be01d4b729c44376edc6718cf389a502e579b77b758f3296c"
dependencies = [
"glob",
"libc",
"libloading",
]
[[package]]
name = "clap"
version = "2.33.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
dependencies = [
"ansi_term",
"atty",
"bitflags",
"strsim",
"textwrap",
"unicode-width",
"vec_map",
]
[[package]]
name = "env_logger"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
dependencies = [
"atty",
"humantime",
"log",
"regex",
"termcolor",
]
[[package]]
name = "getrandom"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
dependencies = [
"cfg-if 0.1.10",
"libc",
"wasi",
]
[[package]]
name = "glob"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "hashbrown"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
[[package]]
name = "heck"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "hermit-abi"
version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
dependencies = [
"libc",
]
[[package]]
name = "humantime"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
dependencies = [
"quick-error",
]
[[package]]
name = "indexmap"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
dependencies = [
"autocfg",
"hashbrown",
]
[[package]]
name = "itoa"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lazycell"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
version = "0.2.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
[[package]]
name = "libloading"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1090080fe06ec2648d0da3881d9453d97e71a45f00eb179af7fdd7e3f686fdb0"
dependencies = [
"cfg-if 1.0.0",
"winapi",
]
[[package]]
name = "libsodium-sys"
version = "0.2.6"
source = "git+https://github.com/cjdelisle/sodiumoxide?branch=cjdns#3aa7e8e21b9cd61ad64f4a0ed125d5b1af2cf38d"
dependencies = [
"cc",
"libc",
"pkg-config",
"walkdir",
]
[[package]]
name = "log"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
dependencies = [
"cfg-if 0.1.10",
]
[[package]]
name = "makekeys"
version = "0.1.0"
dependencies = [
"cjdns_sys",
]
[[package]]
name = "memchr"
version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
name = "mkpasswd"
version = "0.1.0"
dependencies = [
"cjdns_sys",
]
[[package]]
name = "nom"
version = "5.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
dependencies = [
"memchr",
"version_check",
]
[[package]]
name = "peeking_take_while"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
[[package]]
name = "pkg-config"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
[[package]]
name = "ppv-lite86"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "privatetopublic"
version = "0.1.0"
dependencies = [
"cjdns_sys",
]
[[package]]
name = "proc-macro2"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
"unicode-xid",
]
[[package]]
name = "publictoip6"
version = "0.1.0"
dependencies = [
"cjdns_sys",
]
[[package]]
name = "quick-error"
version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rand"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
dependencies = [
"getrandom",
"libc",
"rand_chacha",
"rand_core",
"rand_hc",
]
[[package]]
name = "rand_chacha"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
dependencies = [
"ppv-lite86",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
dependencies = [
"getrandom",
]
[[package]]
name = "rand_hc"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [
"rand_core",
]
[[package]]
name = "randombytes"
version = "0.1.0"
dependencies = [
"cjdns_sys",
]
[[package]]
name = "redox_syscall"
version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "regex"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
"thread_local",
]
[[package]]
name = "regex-syntax"
version = "0.6.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
[[package]]
name = "remove_dir_all"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
dependencies = [
"winapi",
]
[[package]]
name = "rustc-hash"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "ryu"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "same-file"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
dependencies = [
"winapi-util",
]
[[package]]
name = "serde"
version = "1.0.117"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.117"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_json"
version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
dependencies = [
"itoa",
"ryu",
"serde",
]
[[package]]
name = "shlex"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
[[package]]
name = "sodiumoxide"
version = "0.2.6"
source = "git+https://github.com/cjdelisle/sodiumoxide?branch=cjdns#3aa7e8e21b9cd61ad64f4a0ed125d5b1af2cf38d"
dependencies = [
"libc",
"libsodium-sys",
]
[[package]]
name = "strsim"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "sybilsim"
version = "0.1.0"
dependencies = [
"cjdns_sys",
]
[[package]]
name = "syn"
version = "1.0.52"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c1e438504729046a5cfae47f97c30d6d083c7d91d94603efdae3477fc070d4c"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
name = "tempfile"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
dependencies = [
"cfg-if 0.1.10",
"libc",
"rand",
"redox_syscall",
"remove_dir_all",
"winapi",
]
[[package]]
name = "termcolor"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
dependencies = [
"winapi-util",
]
[[package]]
name = "testcjdroute"
version = "0.1.0"
dependencies = [
"cjdns_sys",
]
[[package]]
name = "textwrap"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
dependencies = [
"unicode-width",
]
[[package]]
name = "thiserror"
version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "thread_local"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
dependencies = [
"lazy_static",
]
[[package]]
name = "toml"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
dependencies = [
"serde",
]
[[package]]
name = "unicode-segmentation"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
[[package]]
name = "unicode-width"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
[[package]]
name = "unicode-xid"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]]
name = "vec_map"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
[[package]]
name = "walkdir"
version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
dependencies = [
"same-file",
"winapi",
"winapi-util",
]
[[package]]
name = "wasi"
version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]]
name = "which"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
dependencies = [
"libc",
]
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi",
]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

View file

@ -31,12 +31,8 @@ rustPlatform.buildRustPackage rec {
}) })
]; ];
cargoLock = { useFetchCargoVendor = true;
lockFile = ./Cargo.lock; cargoHash = "sha256-LJEKjhyAsK6b7mKObX8tNJdKt53iagMD/YLzoY5GVPw=";
outputHashes = {
"libsodium-sys-0.2.6" = "sha256-yr6wh0njbCFZViLROcqSSoRFj7ZAMYG5lo1g0j75SN0=";
};
};
nativeBuildInputs = nativeBuildInputs =
[ [

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cnquery"; pname = "cnquery";
version = "11.45.1"; version = "11.46.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mondoohq"; owner = "mondoohq";
repo = "cnquery"; repo = "cnquery";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-WqzapJkyOo1hXAXPrdEv+iwc/UZPB87YDEtGUdUqF0w="; hash = "sha256-V2N+YFaQH/1WsPJUa97CNONwpk+fB2YaO+GUnfcyBEE=";
}; };
subPackages = [ "apps/cnquery" ]; subPackages = [ "apps/cnquery" ];

View file

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
description = "Confluent CLI"; description = "Confluent CLI";
homepage = "https://docs.confluent.io/confluent-cli/current/overview.html"; homepage = "https://docs.confluent.io/confluent-cli/current/overview.html";
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree; license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ maintainers = with maintainers; [
rguevara84 rguevara84
autophagy autophagy

View file

@ -3,7 +3,7 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
sfml, sfml_2,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ sfml ]; buildInputs = [ sfml_2 ];
cmakeFlags = [ cmakeFlags = [
(lib.cmakeFeature "CMAKE_MODULE_PATH" "${sfml}/share/SFML/cmake/Modules/") (lib.cmakeFeature "CMAKE_MODULE_PATH" "${sfml_2}/share/SFML/cmake/Modules/")
]; ];
meta = { meta = {

View file

@ -4,7 +4,7 @@
fetchFromGitHub, fetchFromGitHub,
autoreconfHook, autoreconfHook,
libusb1, libusb1,
sfml, sfml_2,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Gotos"; owner = "Gotos";
repo = "cutecapture"; repo = "cutecapture";
rev = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-V8BlZykh9zOTcEypu96Ft9/6CtjsybtD8lBsg9sF5sQ="; hash = "sha256-V8BlZykh9zOTcEypu96Ft9/6CtjsybtD8lBsg9sF5sQ=";
}; };
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
libusb1 libusb1
sfml sfml_2
]; ];
postPatch = '' postPatch = ''
@ -40,11 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm444 -t $out/share/icons/hicolor/128x128/apps Cute{3,}DSCapture.png install -Dm444 -t $out/share/icons/hicolor/128x128/apps Cute{3,}DSCapture.png
''; '';
meta = with lib; { meta = {
description = "(3)DS capture software for Linux and Mac"; description = "(3)DS capture software for Linux and Mac";
homepage = "https://github.com/Gotos/CuteCapture"; homepage = "https://github.com/Gotos/CuteCapture";
license = licenses.asl20; license = lib.licenses.asl20;
platforms = platforms.linux ++ platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with maintainers; [ raphaelr ]; maintainers = with lib.maintainers; [ raphaelr ];
}; };
}) })

View file

@ -34,7 +34,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "dnf5"; pname = "dnf5";
version = "5.2.11.0"; version = "5.2.12.0";
outputs = [ outputs = [
"out" "out"
@ -45,18 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
owner = "rpm-software-management"; owner = "rpm-software-management";
repo = "dnf5"; repo = "dnf5";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-89zJ2ORHPqy6qgmMdOSyPEcgxtEYE4CPnmRp7FfNj8Y="; hash = "sha256-r5bZgcnY7O1U28tkSnSJur3/Z/llabGe7mlIMA8ZGls=";
}; };
patches = [
# Only define systemd constants when WITH_SYSTEMD is enabled
(fetchpatch {
name = "0001-offline-only-define-systemd-constants.patch";
url = "https://github.com/rpm-software-management/dnf5/commit/f75894eea0892917d80e8f0bf3f9f6c8db0ac400.patch";
hash = "sha256-4eBeBTzhOTUDtiOlfiddh7gJ8AoiMty4FSTlLtdymos=";
})
];
nativeBuildInputs = nativeBuildInputs =
[ [
cmake cmake

View file

@ -11,13 +11,13 @@
buildGoModule rec { buildGoModule rec {
pname = "docker-credential-helpers"; pname = "docker-credential-helpers";
version = "0.9.2"; version = "0.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "docker";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-B5w322Jh6HPaLOKTnGgWPVnkkLnIeyIR+lKDc+uCLHk="; sha256 = "sha256-5KrBiihpWY04PjI9M7NRS5fRu+ochzqRLvX+ZBj/wq8=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -180,6 +180,10 @@ stdenv.mkDerivation (finalAttrs: {
branch = "master"; branch = "master";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
badPlatforms = [
# error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
lib.systems.inspect.patterns.isDarwin
];
maintainers = with lib.maintainers; [ pbsds ]; maintainers = with lib.maintainers; [ pbsds ];
}; };
}) })

View file

@ -7,7 +7,7 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "xdragon"; pname = "dragon-drop";
version = "1.2.0"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -20,16 +20,21 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk3 ]; buildInputs = [ gtk3 ];
makeFlags = [ "NAME=dragon-drop" ];
installFlags = [ "PREFIX=${placeholder "out"}" ]; installFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = '' postInstall = ''
ln -s $out/bin/dragon $out/bin/xdragon ln -s $out/bin/dragon-drop $out/bin/xdragon
''; '';
meta = with lib; { meta = {
description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)"; description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)";
homepage = "https://github.com/mwh/dragon"; homepage = "https://github.com/mwh/dragon";
license = licenses.gpl3; license = lib.licenses.gpl3Plus;
maintainers = with maintainers; [ das_j ]; maintainers = with lib.maintainers; [
mainProgram = "xdragon"; das_j
taliyahwebb
];
mainProgram = "dragon-drop";
platforms = lib.platforms.linux;
}; };
}) })

View file

@ -9,7 +9,7 @@
tcl, tcl,
libglut, libglut,
freetype, freetype,
sfml, sfml_2,
libXi, libXi,
libXmu, libXmu,
libXext, libXext,
@ -22,13 +22,13 @@
intltool, intltool,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
version = "0.8.4"; version = "0.8.4";
pname = "extremetuxracer"; pname = "extremetuxracer";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; url = "mirror://sourceforge/extremetuxracer/etr-${finalAttrs.version}.tar.xz";
sha256 = "sha256-+jKFzAx1Wlr/Up8/LOo1FkgRFMa0uOHsB2n+7/BHc+U="; hash = "sha256-+jKFzAx1Wlr/Up8/LOo1FkgRFMa0uOHsB2n+7/BHc+U=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
tcl tcl
libglut libglut
freetype freetype
sfml sfml_2
libXi libXi
libXmu libXmu
libXext libXext
@ -71,4 +71,4 @@ stdenv.mkDerivation rec {
mainProgram = "etr"; mainProgram = "etr";
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} })

View file

@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
# We use $CC instead. # We use $CC instead.
configurePlatforms = [ ]; configurePlatforms = [ ];
dontAddStaticConfigureFlags = true;
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
python3.pkgs.wrapPython python3.pkgs.wrapPython

View file

@ -1,50 +1,44 @@
{ lib {
, callPackage lib,
, cmake callPackage,
, coin3d cmake,
, doxygen coin3d,
, eigen doxygen,
, fetchFromGitHub eigen,
, fmt fetchFromGitHub,
, gfortran fmt,
, gts gfortran,
, hdf5 gts,
, libf2c hdf5,
, libGLU libf2c,
, libredwg libGLU,
, libsForQt5 libredwg,
, libspnav libsForQt5,
, libXmu libspnav,
, medfile libXmu,
, mpi medfile,
, ninja mpi,
, ode ninja,
, opencascade-occt_7_6 ode,
, pkg-config opencascade-occt_7_6,
, python311Packages opencascade-occt,
, spaceNavSupport ? stdenv.hostPlatform.isLinux pkg-config,
, ifcSupport ? false python311Packages,
, stdenv spaceNavSupport ? stdenv.hostPlatform.isLinux,
, swig ifcSupport ? false,
, vtk stdenv,
, wrapGAppsHook3 swig,
, xercesc vtk,
, yaml-cpp wrapGAppsHook3,
, zlib xercesc,
, withWayland ? false yaml-cpp,
zlib,
withWayland ? false,
qtVersion ? 5,
qt5,
qt6,
}: }:
let let
opencascade-occt = opencascade-occt_7_6;
inherit (libsForQt5)
qtbase
qttools
qtwebengine
qtx11extras
qtxmlpatterns
soqt
wrapQtAppsHook
;
inherit (libsForQt5.qt5) qtwayland;
inherit (python311Packages) inherit (python311Packages)
boost boost
gitpython gitpython
@ -52,157 +46,192 @@ let
matplotlib matplotlib
pivy pivy
ply ply
py-slvs
pybind11 pybind11
pycollada pycollada
pyside2 pyside2
pyside2-tools pyside2-tools
pyside6
python python
pyyaml pyyaml
scipy scipy
shiboken2 shiboken2
shiboken6
; ;
freecad-utils = callPackage ./freecad-utils.nix { }; freecad-utils = callPackage ./freecad-utils.nix { };
in in
freecad-utils.makeCustomizable (stdenv.mkDerivation (finalAttrs: { freecad-utils.makeCustomizable (
pname = "freecad"; stdenv.mkDerivation (finalAttrs: {
version = "1.0.0"; pname = "freecad";
version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FreeCAD"; owner = "FreeCAD";
repo = "FreeCAD"; repo = "FreeCAD";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-u7RYSImUMAgKaAQSAGCFha++RufpZ/QuHAirbSFOUCI="; hash = "sha256-u7RYSImUMAgKaAQSAGCFha++RufpZ/QuHAirbSFOUCI=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs =
cmake [
ninja cmake
pkg-config ninja
pyside2-tools pkg-config
gfortran gfortran
wrapQtAppsHook wrapGAppsHook3
wrapGAppsHook3 ]
]; ++ lib.optionals (qtVersion == 5) [
pyside2-tools
qt5.wrapQtAppsHook
]
++ lib.optionals (qtVersion == 6) [ qt6.wrapQtAppsHook ];
buildInputs = buildInputs =
[ [
gitpython # for addon manager boost
boost coin3d
coin3d doxygen
doxygen eigen
eigen fmt
fmt gitpython # for addon manager
gts gts
hdf5 hdf5
libGLU libGLU
libXmu libXmu
libf2c libf2c
matplotlib matplotlib
medfile medfile
mpi mpi
ode ode
opencascade-occt pivy
pivy ply # for openSCAD file support
ply # for openSCAD file support py-slvs
pybind11 pybind11
pycollada pycollada
pyside2 python
pyside2-tools pyyaml # (at least for) PyrateWorkbench
python scipy
pyyaml # (at least for) PyrateWorkbench swig
qtbase vtk
qttools xercesc
qtwayland yaml-cpp
qtwebengine zlib
qtxmlpatterns ]
scipy ++ lib.optionals (qtVersion == 5) [
shiboken2 libsForQt5.soqt
soqt opencascade-occt_7_6
swig pyside2
vtk pyside2-tools
xercesc shiboken2
yaml-cpp qt5.qtbase
zlib qt5.qttools
] qt5.qtwayland
++ lib.optionals spaceNavSupport [ qt5.qtwebengine
libspnav qt5.qtxmlpatterns
qtx11extras ]
] ++ lib.optionals (qtVersion == 6) [
++ lib.optionals ifcSupport [ opencascade-occt
ifcopenshell pyside6
shiboken6
qt6.qtbase
qt6.qtsvg
qt6.qttools
qt6.qtwayland
qt6.qtwebengine
]
++ lib.optionals ifcSupport [
ifcopenshell
]
++ lib.optionals spaceNavSupport (
[ libspnav ] ++ lib.optionals (qtVersion == 5) [ libsForQt5.qtx11extras ]
);
patches = [
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
./0002-FreeCad-OndselSolver-pkgconfig.patch
./0003-Gui-take-in-account-module-path-argument.patch
]; ];
patches = [ cmakeFlags =
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch [
./0002-FreeCad-OndselSolver-pkgconfig.patch "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on
./0003-Gui-take-in-account-module-path-argument.patch "-DBUILD_FLAT_MESH:BOOL=ON"
]; "-DBUILD_DRAWING=ON"
"-DBUILD_FLAT_MESH:BOOL=ON"
"-DINSTALL_TO_SITEPACKAGES=OFF"
"-DFREECAD_USE_PYBIND11=ON"
]
++ lib.optionals (qtVersion == 5) [
"-DBUILD_QT5=ON"
"-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
(
"-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
+ ";${pyside2}/include/PySide2/QtCore"
+ ";${pyside2}/include/PySide2/QtWidgets"
+ ";${pyside2}/include/PySide2/QtGui"
)
"-DPYSIDE_LIBRARY=PySide2::pyside2"
]
++ lib.optionals (qtVersion == 6) [
"-DBUILD_QT5=OFF"
"-DBUILD_QT6=ON"
"-DSHIBOKEN_INCLUDE_DIR=${shiboken6}/include"
"-DSHIBOKEN_LIBRARY=Shiboken6::libshiboken"
(
"-DPYSIDE_INCLUDE_DIR=${pyside6}/include"
+ ";${pyside6}/include/PySide6/QtCore"
+ ";${pyside6}/include/PySide6/QtWidgets"
+ ";${pyside6}/include/PySide6/QtGui"
)
"-DPYSIDE_LIBRARY=PySide6::pyside6"
];
cmakeFlags = [ # This should work on both x86_64, and i686 linux
"-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on preBuild = ''
"-DBUILD_FLAT_MESH:BOOL=ON" export NIX_LDFLAGS="-L${gfortran.cc.lib}/lib64 -L${gfortran.cc.lib}/lib $NIX_LDFLAGS";
"-DBUILD_QT5=ON" '';
"-DBUILD_DRAWING=ON"
"-DBUILD_FLAT_MESH:BOOL=ON"
"-DINSTALL_TO_SITEPACKAGES=OFF"
"-DFREECAD_USE_PYBIND11=ON"
"-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
(
"-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
+ ";${pyside2}/include/PySide2/QtCore"
+ ";${pyside2}/include/PySide2/QtWidgets"
+ ";${pyside2}/include/PySide2/QtGui"
)
"-DPYSIDE_LIBRARY=PySide2::pyside2"
];
# This should work on both x86_64, and i686 linux preConfigure = ''
preBuild = '' qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
export NIX_LDFLAGS="-L${gfortran.cc.lib}/lib64 -L${gfortran.cc.lib}/lib $NIX_LDFLAGS"; '';
'';
preConfigure = '' qtWrapperArgs = [
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
'';
qtWrapperArgs =
[
"--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
"--prefix PATH : ${libredwg}/bin" "--prefix PATH : ${libredwg}/bin"
] ] ++ lib.optionals (!withWayland) [ "--set QT_QPA_PLATFORM xcb" ];
++ lib.optionals (!withWayland) [ "--set QT_QPA_PLATFORM xcb" ];
postFixup = '' postFixup = ''
mv $out/share/doc $out mv $out/share/doc $out
ln -s $out/bin/FreeCAD $out/bin/freecad ln -s $out/bin/FreeCAD $out/bin/freecad
ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
'';
passthru.tests = callPackage ./tests {};
meta = {
homepage = "https://www.freecad.org";
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
longDescription = ''
FreeCAD is an open-source parametric 3D modeler made primarily to design
real-life objects of any size. Parametric modeling allows you to easily
modify your design by going back into your model history and changing its
parameters.
FreeCAD allows you to sketch geometry constrained 2D shapes and use them
as a base to build other objects. It contains many components to adjust
dimensions or extract design details from 3D models to create high quality
production ready drawings.
FreeCAD is designed to fit a wide range of uses including product design,
mechanical engineering and architecture. Whether you are a hobbyist, a
programmer, an experienced CAD user, a student or a teacher, you will feel
right at home with FreeCAD.
''; '';
license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ srounce ]; passthru.tests = callPackage ./tests { };
platforms = lib.platforms.linux;
}; meta = {
})) homepage = "https://www.freecad.org";
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
longDescription = ''
FreeCAD is an open-source parametric 3D modeler made primarily to design
real-life objects of any size. Parametric modeling allows you to easily
modify your design by going back into your model history and changing its
parameters.
FreeCAD allows you to sketch geometry constrained 2D shapes and use them
as a base to build other objects. It contains many components to adjust
dimensions or extract design details from 3D models to create high quality
production ready drawings.
FreeCAD is designed to fit a wide range of uses including product design,
mechanical engineering and architecture. Whether you are a hobbyist, a
programmer, an experienced CAD user, a student or a teacher, you will feel
right at home with FreeCAD.
'';
license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ srounce ];
platforms = lib.platforms.linux;
};
})
)

View file

@ -1,18 +1,20 @@
{ {
lib, lib,
python3, python3Packages,
fetchPypi, fetchPypi,
}: }:
python3Packages.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "gay"; pname = "gay";
version = "1.2.9"; version = "1.3.4";
pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-x+RVVgQvJwV5j7DLYS7AnXb4OMJ4v+l0awUuonQIgzY="; hash = "sha256-pSxRrXnv4tfu7awVnOsQwC2ZOS4qsfCphFR/fpTNdPc=";
}; };
build-system = [ python3Packages.setuptools ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/ms-jpq/gay"; homepage = "https://github.com/ms-jpq/gay";
description = "Colour your text / terminal to be more gay"; description = "Colour your text / terminal to be more gay";

View file

@ -148,8 +148,8 @@ linkFarm name [
name = "12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f"; name = "12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f";
path = fetchZigArtifact { path = fetchZigArtifact {
name = "vaxis"; name = "vaxis";
url = "git+https://github.com/rockorager/libvaxis/?ref=main#6d729a2dc3b934818dffe06d2ba3ce02841ed74b"; url = "https://github.com/rockorager/libvaxis/archive/6d729a2dc3b934818dffe06d2ba3ce02841ed74b.tar.gz";
hash = "sha256-fFf79fCy4QQFVNcN722tSMjB6FyVEzCB36oH1olk9JQ="; hash = "sha256-OCNs6Gl2ruq5dBm4uIxs93hoXw/+n+x1+bIDfQGDx3s=";
}; };
} }
{ {
@ -172,8 +172,8 @@ linkFarm name [
name = "12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a"; name = "12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a";
path = fetchZigArtifact { path = fetchZigArtifact {
name = "z2d"; name = "z2d";
url = "git+https://github.com/vancluever/z2d?ref=v0.4.0#4638bb02a9dc41cc2fb811f092811f6a951c752a"; url = "https://github.com/vancluever/z2d/archive/4638bb02a9dc41cc2fb811f092811f6a951c752a.tar.gz";
hash = "sha256-YpWXn1J3JKQSCrWB25mAfzd1/T56QstEZnhPzBwxgoM="; hash = "sha256-P0UJ54RO/vVyDa+UkBl+QEOjzoMMEFSOTexQP/uBXfc=";
}; };
} }
{ {
@ -212,8 +212,8 @@ linkFarm name [
name = "1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8"; name = "1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8";
path = fetchZigArtifact { path = fetchZigArtifact {
name = "zf"; name = "zf";
url = "git+https://github.com/natecraddock/zf/?ref=main#ed99ca18b02dda052e20ba467e90b623c04690dd"; url = "https://github.com/natecraddock/zf/archive/ed99ca18b02dda052e20ba467e90b623c04690dd.tar.gz";
hash = "sha256-t6QNrEJZ4GZZsYixjYvpdrYoCmNbG8TTUmGs2MFa4sU="; hash = "sha256-/oLryY3VQfjbtQi+UP+n6FJTVA/YxIetjO+6Ovrh6/E=";
}; };
} }
{ {
@ -237,7 +237,7 @@ linkFarm name [
path = fetchZigArtifact { path = fetchZigArtifact {
name = "wayland"; name = "wayland";
url = "https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz"; url = "https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz";
hash = "sha256-m9G72jdG30KH2yQhNBcBJ46OnekzuX0i2uIOyczkpLk="; hash = "sha256-6kGR1o5DdnflHzqs3ieCmBAUTpMdOXoyfcYDXiw5xQ0=";
}; };
} }
{ {
@ -252,8 +252,8 @@ linkFarm name [
name = "12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566"; name = "12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566";
path = fetchZigArtifact { path = fetchZigArtifact {
name = "plasma_wayland_protocols"; name = "plasma_wayland_protocols";
url = "git+https://github.com/KDE/plasma-wayland-protocols?ref=main#db525e8f9da548cffa2ac77618dd0fbe7f511b86"; url = "https://github.com/KDE/plasma-wayland-protocols/archive/db525e8f9da548cffa2ac77618dd0fbe7f511b86.tar.gz";
hash = "sha256-iWRv3+OfmHxmeCJ8m0ChjgZX6mwXlcFmK8P/Vt8gDj4="; hash = "sha256-XFi6IUrNjmvKNCbcCLAixGqN2Zeymhs+KLrfccIN9EE=";
}; };
} }
{ {
@ -372,8 +372,8 @@ linkFarm name [
name = "12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806"; name = "12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806";
path = fetchZigArtifact { path = fetchZigArtifact {
name = "pixels"; name = "pixels";
url = "git+https://github.com/make-github-pseudonymous-again/pixels?ref=main#d843c2714d32e15b48b8d7eeb480295af537f877"; url = "https://github.com/make-github-pseudonymous-again/pixels/archive/d843c2714d32e15b48b8d7eeb480295af537f877.tar.gz";
hash = "sha256-kXYGO0qn2PfyOYCrRA49BHIgTzdmKhI8SNO1ZKfUYEE="; hash = "sha256-Veg7FtCRCCUCvxSb9FfzH0IJLFmCZQ4/+657SIcb8Ro=";
}; };
} }
{ {

View file

@ -42,7 +42,7 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "ghostty"; pname = "ghostty";
version = "1.1.2"; version = "1.1.3";
outputs = [ outputs = [
"out" "out"
"man" "man"
@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ghostty-org"; owner = "ghostty-org";
repo = "ghostty"; repo = "ghostty";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-HZiuxnflLT9HXU7bc0xrk5kJJHQGNTQ2QXMZS7bE2u8="; hash = "sha256-YHoyW+OFKxzKq4Ta/XUA9Xu0ieTfCcJo3khKpBGSnD4=";
}; };
deps = callPackage ./deps.nix { deps = callPackage ./deps.nix {

View file

@ -35,13 +35,13 @@ in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitbutler"; pname = "gitbutler";
version = "0.14.7"; version = "0.14.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gitbutlerapp"; owner = "gitbutlerapp";
repo = "gitbutler"; repo = "gitbutler";
tag = "release/${version}"; tag = "release/${version}";
hash = "sha256-4RWZ1eRUvHj+PU9iNnDsq8k5qHpkAn6g4Zn0cXyUEzM="; hash = "sha256-FEqlHTc7QzosjFfPYl1VgEZVJPweiaNmDzLmC6PHsA4=";
}; };
# Let Tauri know what version we're building # Let Tauri know what version we're building
@ -60,11 +60,11 @@ rustPlatform.buildRustPackage rec {
''; '';
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-f7FMJ4h+gFwHnKwisbn1c7Si2/aPJqxhqQ7ablNu3yo="; cargoHash = "sha256-vNvjUYLzwN/AjRUOXaQBstmW2LyFZBHcVdBG674ZJCA=";
pnpmDeps = pnpm_9.fetchDeps { pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src; inherit pname version src;
hash = "sha256-w7DGB9OlzXMsgikCbhBcsVQzKx2atSqIOAKF+kfNoTM="; hash = "sha256-egCJ3rcRrtMpj9AH1rx5uRT0SRho611Gx9ggVRmjFmc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -109,6 +109,8 @@ rustPlatform.buildRustPackage rec {
++ lib.concatMap excludeSpec [ ++ lib.concatMap excludeSpec [
# Requires Git directories # Requires Git directories
"but-core" "but-core"
"but-rebase"
"but-workspace"
# Fails due to the issues above and below # Fails due to the issues above and below
"but-hunk-dependency" "but-hunk-dependency"
# Errors with "Lazy instance has previously been poisoned" # Errors with "Lazy instance has previously been poisoned"

View file

@ -7,18 +7,18 @@
buildGoModule rec { buildGoModule rec {
pname = "google-alloydb-auth-proxy"; pname = "google-alloydb-auth-proxy";
version = "1.12.2"; version = "1.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoogleCloudPlatform"; owner = "GoogleCloudPlatform";
repo = "alloydb-auth-proxy"; repo = "alloydb-auth-proxy";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-3zJAwkl+fqiiGvrXWzTwFHmAOYOw1NVb/JUok5qZxNs="; hash = "sha256-yEtpCX7/QJsuFhCJFHBFQQiAMs+HV4ig3Ni0mJsygsE=";
}; };
subPackages = [ "." ]; subPackages = [ "." ];
vendorHash = "sha256-cGrJIbo4qEKIc7/XBwZtK5OrqE4t/Cmp54YKJMst8h8="; vendorHash = "sha256-mH5ni9O/S5Hnb3h39eWmmQYMdU99uC9yg29RfHGz1Fk=";
checkFlags = [ checkFlags = [
"-short" "-short"

View file

@ -171,11 +171,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: { linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru; inherit pname meta passthru;
version = "134.0.6998.88"; version = "134.0.6998.165";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-31V+2z0k2Nyv+VV9gHM7Qq+2YmaFIA0/NKO29SgGXK0="; hash = "sha256-ibPD/V8oSeaPD236ryKfYc0LfJEDdbjs0u05iRpKjyU=";
}; };
# With strictDeps on, some shebangs were not being patched correctly # With strictDeps on, some shebangs were not being patched correctly
@ -274,11 +274,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: { darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru; inherit pname meta passthru;
version = "134.0.6998.89"; version = "134.0.6998.166";
src = fetchurl { src = fetchurl {
url = "http://dl.google.com/release2/chrome/daasbcyt2x75rfu6bduujtyzfu_134.0.6998.89/GoogleChrome-134.0.6998.89.dmg"; url = "http://dl.google.com/release2/chrome/drywet6kw733g5tvesvkdv5hlm_134.0.6998.166/GoogleChrome-134.0.6998.166.dmg";
hash = "sha256-SG/U+yffEX3F5ThlQbxgY66ocPWzfe5M7lw943gvDVw="; hash = "sha256-jHD5L9mz/S9JSFjFVsNcHWx6xFFeCgOptEmclec6NiM=";
}; };
dontPatch = true; dontPatch = true;

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gtree"; pname = "gtree";
version = "1.10.14"; version = "1.10.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ddddddO"; owner = "ddddddO";
repo = "gtree"; repo = "gtree";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-c9ocRHvcu8rSgJ0Hc7E9ObsMHZtN/qvif4APUzqpjro="; hash = "sha256-6Zl8e4TmEtpC/thhisvOzPlsHksednTsmyBvq2Hk2rU=";
}; };
vendorHash = "sha256-jZlR29OUefVKx3vxigvHbsIWsZbMPNAIPEa+qoU2oo0="; vendorHash = "sha256-jx+F8FfFMMU4I61O0ERXp5OLC9SdQculYoa+3CgVL2w=";
subPackages = [ subPackages = [
"cmd/gtree" "cmd/gtree"

View file

@ -11,7 +11,7 @@
zlib, zlib,
libjpeg, libjpeg,
libusb1, libusb1,
python311Packages, python3Packages,
sane-backends, sane-backends,
dbus, dbus,
file, file,
@ -78,7 +78,7 @@ assert
builtins.elem hplipArch pluginArches builtins.elem hplipArch pluginArches
|| throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}";
python311Packages.buildPythonApplication { python3Packages.buildPythonApplication {
inherit pname version; inherit pname version;
format = "other"; format = "other";
@ -121,7 +121,7 @@ python311Packages.buildPythonApplication {
] ++ lib.optional withQt5 qt5.wrapQtAppsHook; ] ++ lib.optional withQt5 qt5.wrapQtAppsHook;
pythonPath = pythonPath =
with python311Packages; with python3Packages;
[ [
dbus dbus
pillow pillow
@ -130,6 +130,7 @@ python311Packages.buildPythonApplication {
usbutils usbutils
dbus-python dbus-python
distro distro
distutils
] ]
++ lib.optionals withQt5 [ ++ lib.optionals withQt5 [
pyqt5 pyqt5
@ -342,7 +343,7 @@ python311Packages.buildPythonApplication {
"share/hplip" "share/hplip"
"lib/cups/backend" "lib/cups/backend"
"lib/cups/filter" "lib/cups/filter"
python311Packages.python.sitePackages python3Packages.python.sitePackages
"lib/sane" "lib/sane"
]; ];

View file

@ -1,16 +1,16 @@
{ {
cmake,
fetchFromGitHub,
gitUpdater,
jazz2-content,
lib, lib,
stdenv,
fetchFromGitHub,
cmake,
jazz2-content,
libopenmpt, libopenmpt,
libvorbis, libvorbis,
openal, openal,
SDL2, SDL2,
stdenv,
testers,
zlib, zlib,
versionCheckHook,
gitUpdater,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deathkiller"; owner = "deathkiller";
repo = "jazz2-native"; repo = "jazz2-native";
rev = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-9Fsm4hiNIEi5OVZLOLccSUkFmHnQ+ZUoBor+DZ9edVo="; hash = "sha256-9Fsm4hiNIEi5OVZLOLccSUkFmHnQ+ZUoBor+DZ9edVo=";
}; };
@ -36,24 +36,27 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
cmakeFlags = [ cmakeFlags = [
"-DLIBOPENMPT_INCLUDE_DIR=${lib.getDev libopenmpt}/include/libopenmpt" (lib.cmakeFeature "LIBOPENMPT_INCLUDE_DIR" "${lib.getDev libopenmpt}/include/libopenmpt")
"-DNCINE_DOWNLOAD_DEPENDENCIES=OFF" (lib.cmakeBool "NCINE_DOWNLOAD_DEPENDENCIES" false)
"-DNCINE_OVERRIDE_CONTENT_PATH=${jazz2-content}" (lib.cmakeFeature "NCINE_OVERRIDE_CONTENT_PATH" "${jazz2-content}")
]; ];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = { passthru = {
updateScript = gitUpdater { }; updateScript = gitUpdater { };
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
};
}; };
meta = with lib; { meta = {
description = "Open-source Jazz Jackrabbit 2 reimplementation"; description = "Open-source Jazz Jackrabbit 2 reimplementation";
homepage = "https://github.com/deathkiller/jazz2-native"; homepage = "https://github.com/deathkiller/jazz2-native";
license = licenses.gpl3Only; license = lib.licenses.gpl3Only;
mainProgram = "jazz2"; mainProgram = "jazz2";
maintainers = with maintainers; [ surfaceflinger ]; maintainers = with lib.maintainers; [ surfaceflinger ];
platforms = platforms.linux; platforms = lib.platforms.linux;
}; };
}) })

View file

@ -1,8 +1,9 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (7.2.1.2) activesupport (8.0.2)
base64 base64
benchmark (>= 0.3)
bigdecimal bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1) concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5) connection_pool (>= 2.2.5)
@ -12,41 +13,47 @@ GEM
minitest (>= 5.1) minitest (>= 5.1)
securerandom (>= 0.3) securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5) tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7) addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0) public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0) base64 (0.2.0)
bigdecimal (3.1.8) benchmark (0.4.0)
bigdecimal (3.1.9)
colorator (1.1.0) colorator (1.1.0)
concurrent-ruby (1.3.4) concurrent-ruby (1.3.5)
connection_pool (2.4.1) connection_pool (2.5.0)
csv (3.3.3)
drb (2.2.1) drb (2.2.1)
em-websocket (0.5.3) em-websocket (0.5.3)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0) http_parser.rb (~> 0)
eventmachine (1.2.7) eventmachine (1.2.7)
ffi (1.17.0) ffi (1.17.1)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
gemoji (4.1.0) gemoji (4.1.0)
google-protobuf (4.28.3) google-protobuf (4.30.1)
bigdecimal bigdecimal
rake (>= 13) rake (>= 13)
html-pipeline (2.14.3) html-pipeline (2.14.3)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
http_parser.rb (0.8.0) http_parser.rb (0.8.0)
i18n (1.14.6) i18n (1.14.7)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (4.3.4) jekyll (4.4.1)
addressable (~> 2.4) addressable (~> 2.4)
base64 (~> 0.2)
colorator (~> 1.0) colorator (~> 1.0)
csv (~> 3.0)
em-websocket (~> 0.5) em-websocket (~> 0.5)
i18n (~> 1.0) i18n (~> 1.0)
jekyll-sass-converter (>= 2.0, < 4.0) jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0) jekyll-watch (~> 2.0)
json (~> 2.6)
kramdown (~> 2.3, >= 2.3.1) kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0) kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0) liquid (~> 4.0)
mercenary (>= 0.3.6, < 0.5) mercenary (~> 0.3, >= 0.3.6)
pathutil (~> 0.9) pathutil (~> 0.9)
rouge (>= 3.0, < 5.0) rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
@ -57,8 +64,8 @@ GEM
jekyll-mentions (1.6.0) jekyll-mentions (1.6.0)
html-pipeline (~> 2.3) html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0) jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (3.0.0) jekyll-sass-converter (3.1.0)
sass-embedded (~> 1.54) sass-embedded (~> 1.75)
jekyll-seo-tag (2.8.0) jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0) jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0) jekyll-sitemap (1.4.0)
@ -69,19 +76,20 @@ GEM
gemoji (>= 3, < 5) gemoji (>= 3, < 5)
html-pipeline (~> 2.2) html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0) jekyll (>= 3.0, < 5.0)
kramdown (2.4.0) json (2.10.2)
rexml kramdown (2.5.1)
rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0) kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0) kramdown (~> 2.0)
liquid (4.0.4) liquid (4.0.4)
listen (3.9.0) listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.1) logger (1.6.6)
mercenary (0.4.0) mercenary (0.4.0)
mini_portile2 (2.8.7) mini_portile2 (2.8.8)
minitest (5.25.1) minitest (5.25.5)
nokogiri (1.16.7) nokogiri (1.18.5)
mini_portile2 (~> 2.8.2) mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
pathutil (0.16.2) pathutil (0.16.2)
@ -92,19 +100,20 @@ GEM
rb-fsevent (0.11.2) rb-fsevent (0.11.2)
rb-inotify (0.11.1) rb-inotify (0.11.1)
ffi (~> 1.0) ffi (~> 1.0)
rexml (3.3.9) rexml (3.4.1)
rouge (4.4.0) rouge (4.5.1)
safe_yaml (1.0.5) safe_yaml (1.0.5)
sass-embedded (1.80.4) sass-embedded (1.86.0)
google-protobuf (~> 4.28) google-protobuf (~> 4.30)
rake (>= 13) rake (>= 13)
securerandom (0.3.1) securerandom (0.4.1)
terminal-table (3.0.2) terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3) unicode-display_width (>= 1.1.1, < 3)
tzinfo (2.0.6) tzinfo (2.0.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0) unicode-display_width (2.6.0)
webrick (1.8.2) uri (1.0.3)
webrick (1.9.1)
PLATFORMS PLATFORMS
ruby ruby
@ -118,4 +127,4 @@ DEPENDENCIES
jemoji jemoji
BUNDLED WITH BUNDLED WITH
2.5.9 2.5.22

View file

@ -2,6 +2,7 @@
activesupport = { activesupport = {
dependencies = [ dependencies = [
"base64" "base64"
"benchmark"
"bigdecimal" "bigdecimal"
"concurrent-ruby" "concurrent-ruby"
"connection_pool" "connection_pool"
@ -11,15 +12,16 @@
"minitest" "minitest"
"securerandom" "securerandom"
"tzinfo" "tzinfo"
"uri"
]; ];
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc"; sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
type = "gem"; type = "gem";
}; };
version = "7.2.1.2"; version = "8.0.2";
}; };
addressable = { addressable = {
dependencies = [ "public_suffix" ]; dependencies = [ "public_suffix" ];
@ -42,15 +44,25 @@
}; };
version = "0.2.0"; version = "0.2.0";
}; };
benchmark = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
type = "gem";
};
version = "0.4.0";
};
bigdecimal = { bigdecimal = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
type = "gem"; type = "gem";
}; };
version = "3.1.8"; version = "3.1.9";
}; };
colorator = { colorator = {
groups = [ "default" ]; groups = [ "default" ];
@ -67,20 +79,30 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
type = "gem"; type = "gem";
}; };
version = "1.3.4"; version = "1.3.5";
}; };
connection_pool = { connection_pool = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
type = "gem"; type = "gem";
}; };
version = "2.4.1"; version = "2.5.0";
};
csv = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0059n2hqiv3afahq1wc4ymr7lpka7vkisvmkx7azgnkvzfz6caby";
type = "gem";
};
version = "3.3.3";
}; };
drb = { drb = {
groups = [ "default" ]; groups = [ "default" ];
@ -121,10 +143,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6";
type = "gem"; type = "gem";
}; };
version = "1.17.0"; version = "1.17.1";
}; };
forwardable-extended = { forwardable-extended = {
groups = [ "default" ]; groups = [ "default" ];
@ -155,10 +177,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0"; sha256 = "0y077m0y4wlbv1n1halxr55b2d1kwa19389ys43qmb3fhqrv920c";
type = "gem"; type = "gem";
}; };
version = "4.28.3"; version = "4.30.1";
}; };
html-pipeline = { html-pipeline = {
dependencies = [ dependencies = [
@ -190,19 +212,22 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
type = "gem"; type = "gem";
}; };
version = "1.14.6"; version = "1.14.7";
}; };
jekyll = { jekyll = {
dependencies = [ dependencies = [
"addressable" "addressable"
"base64"
"colorator" "colorator"
"csv"
"em-websocket" "em-websocket"
"i18n" "i18n"
"jekyll-sass-converter" "jekyll-sass-converter"
"jekyll-watch" "jekyll-watch"
"json"
"kramdown" "kramdown"
"kramdown-parser-gfm" "kramdown-parser-gfm"
"liquid" "liquid"
@ -217,10 +242,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0124fnqizh7njn99qg4f3jvf9kg2rpm88drs9p9r5hqr50n2i264"; sha256 = "1h8qpki1zcw4srnzmbba2gwajycm50w53kxq8l6vicm5azc484ac";
type = "gem"; type = "gem";
}; };
version = "4.3.4"; version = "4.4.1";
}; };
jekyll-avatar = { jekyll-avatar = {
dependencies = [ "jekyll" ]; dependencies = [ "jekyll" ];
@ -253,10 +278,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "00n9v19h0qgjijygfdkdh2gwpmdlz49nw1mqk6fnp43f317ngrz2"; sha256 = "0hr4hsir8lm8aw3yj9zi7hx2xs4k00xn9inh24642d6iy625v4l3";
type = "gem"; type = "gem";
}; };
version = "3.0.0"; version = "3.1.0";
}; };
jekyll-seo-tag = { jekyll-seo-tag = {
dependencies = [ "jekyll" ]; dependencies = [ "jekyll" ];
@ -306,16 +331,26 @@
}; };
version = "0.13.0"; version = "0.13.0";
}; };
json = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
type = "gem";
};
version = "2.10.2";
};
kramdown = { kramdown = {
dependencies = [ "rexml" ]; dependencies = [ "rexml" ];
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7";
type = "gem"; type = "gem";
}; };
version = "2.4.0"; version = "2.5.1";
}; };
kramdown-parser-gfm = { kramdown-parser-gfm = {
dependencies = [ "kramdown" ]; dependencies = [ "kramdown" ];
@ -357,10 +392,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
type = "gem"; type = "gem";
}; };
version = "1.6.1"; version = "1.6.6";
}; };
mercenary = { mercenary = {
groups = [ "default" ]; groups = [ "default" ];
@ -377,20 +412,20 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
type = "gem"; type = "gem";
}; };
version = "2.8.7"; version = "2.8.8";
}; };
minitest = { minitest = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
type = "gem"; type = "gem";
}; };
version = "5.25.1"; version = "5.25.5";
}; };
nokogiri = { nokogiri = {
dependencies = [ dependencies = [
@ -401,10 +436,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8";
type = "gem"; type = "gem";
}; };
version = "1.16.7"; version = "1.18.5";
}; };
pathutil = { pathutil = {
dependencies = [ "forwardable-extended" ]; dependencies = [ "forwardable-extended" ];
@ -473,20 +508,20 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7";
type = "gem"; type = "gem";
}; };
version = "3.3.9"; version = "3.4.1";
}; };
rouge = { rouge = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs"; sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a";
type = "gem"; type = "gem";
}; };
version = "4.4.0"; version = "4.5.1";
}; };
safe_yaml = { safe_yaml = {
groups = [ "default" ]; groups = [ "default" ];
@ -507,20 +542,20 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "09hydxaq3bwwpflqz93g7pvj5kq0ylj2kvc87q2fvki5h7svbd51"; sha256 = "1nzma5pcwajmz2002jd96ylszx3jckwg9ml5bbn3hvlrdmn680f0";
type = "gem"; type = "gem";
}; };
version = "1.80.4"; version = "1.86.0";
}; };
securerandom = { securerandom = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";
type = "gem"; type = "gem";
}; };
version = "0.3.1"; version = "0.4.1";
}; };
terminal-table = { terminal-table = {
dependencies = [ "unicode-display_width" ]; dependencies = [ "unicode-display_width" ];
@ -554,14 +589,24 @@
}; };
version = "2.6.0"; version = "2.6.0";
}; };
uri = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
type = "gem";
};
version = "1.0.3";
};
webrick = { webrick = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
type = "gem"; type = "gem";
}; };
version = "1.8.2"; version = "1.9.1";
}; };
} }

View file

@ -1,8 +1,9 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (7.2.1.2) activesupport (8.0.2)
base64 base64
benchmark (>= 0.3)
bigdecimal bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1) concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5) connection_pool (>= 2.2.5)
@ -12,10 +13,12 @@ GEM
minitest (>= 5.1) minitest (>= 5.1)
securerandom (>= 0.3) securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5) tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7) addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0) public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0) base64 (0.2.0)
bigdecimal (3.1.8) benchmark (0.4.0)
bigdecimal (3.1.9)
classifier-reborn (2.3.0) classifier-reborn (2.3.0)
fast-stemmer (~> 1.0) fast-stemmer (~> 1.0)
matrix (~> 0.4) matrix (~> 0.4)
@ -25,44 +28,49 @@ GEM
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
colorator (1.1.0) colorator (1.1.0)
concurrent-ruby (1.3.4) concurrent-ruby (1.3.5)
connection_pool (2.4.1) connection_pool (2.5.0)
csv (3.3.3)
date (3.4.1)
drb (2.2.1) drb (2.2.1)
em-websocket (0.5.3) em-websocket (0.5.3)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0) http_parser.rb (~> 0)
eventmachine (1.2.7) eventmachine (1.2.7)
execjs (2.10.0) execjs (2.10.0)
faraday (2.12.0) faraday (2.12.2)
faraday-net_http (>= 2.0, < 3.4) faraday-net_http (>= 2.0, < 3.5)
json json
logger logger
faraday-net_http (3.3.0) faraday-net_http (3.4.0)
net-http net-http (>= 0.5.0)
fast-stemmer (1.0.2) fast-stemmer (1.0.2)
ffi (1.17.0) ffi (1.17.1)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
gemoji (4.1.0) gemoji (4.1.0)
google-protobuf (4.28.3) google-protobuf (4.30.1)
bigdecimal bigdecimal
rake (>= 13) rake (>= 13)
html-pipeline (2.14.3) html-pipeline (2.14.3)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
http_parser.rb (0.8.0) http_parser.rb (0.8.0)
i18n (1.14.6) i18n (1.14.7)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (4.3.4) jekyll (4.4.1)
addressable (~> 2.4) addressable (~> 2.4)
base64 (~> 0.2)
colorator (~> 1.0) colorator (~> 1.0)
csv (~> 3.0)
em-websocket (~> 0.5) em-websocket (~> 0.5)
i18n (~> 1.0) i18n (~> 1.0)
jekyll-sass-converter (>= 2.0, < 4.0) jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0) jekyll-watch (~> 2.0)
json (~> 2.6)
kramdown (~> 2.3, >= 2.3.1) kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0) kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0) liquid (~> 4.0)
mercenary (>= 0.3.6, < 0.5) mercenary (~> 0.3, >= 0.3.6)
pathutil (~> 0.9) pathutil (~> 0.9)
rouge (>= 3.0, < 5.0) rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
@ -87,12 +95,12 @@ GEM
html-pipeline (~> 2.3) html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0) jekyll (>= 3.7, < 5.0)
jekyll-paginate (1.1.0) jekyll-paginate (1.1.0)
jekyll-polyglot (1.8.1) jekyll-polyglot (1.9.0)
jekyll (>= 4.0, >= 3.0) jekyll (>= 4.0, >= 3.0)
jekyll-redirect-from (0.16.0) jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0) jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (3.0.0) jekyll-sass-converter (3.1.0)
sass-embedded (~> 1.54) sass-embedded (~> 1.75)
jekyll-seo-tag (2.8.0) jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0) jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0) jekyll-sitemap (1.4.0)
@ -103,9 +111,9 @@ GEM
gemoji (>= 3, < 5) gemoji (>= 3, < 5)
html-pipeline (~> 2.2) html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0) jekyll (>= 3.0, < 5.0)
json (2.7.4) json (2.10.2)
kramdown (2.4.0) kramdown (2.5.1)
rexml rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0) kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0) kramdown (~> 2.0)
kramdown-syntax-coderay (1.0.1) kramdown-syntax-coderay (1.0.1)
@ -117,19 +125,19 @@ GEM
listen (3.9.0) listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.1) logger (1.6.6)
matrix (0.4.2) matrix (0.4.2)
mercenary (0.4.0) mercenary (0.4.0)
mime-types (3.6.0) mime-types (3.6.1)
logger logger
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2024.1001) mime-types-data (3.2025.0318)
mini_magick (4.13.2) mini_magick (4.13.2)
mini_portile2 (2.8.7) mini_portile2 (2.8.8)
minitest (5.25.1) minitest (5.25.5)
net-http (0.4.1) net-http (0.6.0)
uri uri
nokogiri (1.16.7) nokogiri (1.18.5)
mini_portile2 (~> 2.8.2) mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
octokit (4.25.1) octokit (4.25.1)
@ -137,7 +145,8 @@ GEM
sawyer (~> 0.9) sawyer (~> 0.9)
pathutil (0.16.2) pathutil (0.16.2)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
psych (5.1.2) psych (5.2.3)
date
stringio stringio
public_suffix (6.0.1) public_suffix (6.0.1)
racc (1.8.1) racc (1.8.1)
@ -145,27 +154,27 @@ GEM
rb-fsevent (0.11.2) rb-fsevent (0.11.2)
rb-inotify (0.11.1) rb-inotify (0.11.1)
ffi (~> 1.0) ffi (~> 1.0)
rdoc (6.7.0) rdoc (6.12.0)
psych (>= 4.0.0) psych (>= 4.0.0)
rexml (3.3.9) rexml (3.4.1)
rouge (4.4.0) rouge (4.5.1)
safe_yaml (1.0.5) safe_yaml (1.0.5)
sass-embedded (1.80.4) sass-embedded (1.86.0)
google-protobuf (~> 4.28) google-protobuf (~> 4.30)
rake (>= 13) rake (>= 13)
sawyer (0.9.2) sawyer (0.9.2)
addressable (>= 2.3.5) addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3) faraday (>= 0.17.3, < 3)
securerandom (0.3.1) securerandom (0.4.1)
stringio (3.1.1) stringio (3.1.5)
terminal-table (3.0.2) terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3) unicode-display_width (>= 1.1.1, < 3)
tomlrb (2.0.3) tomlrb (2.0.3)
tzinfo (2.0.6) tzinfo (2.0.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0) unicode-display_width (2.6.0)
uri (0.13.1) uri (1.0.3)
webrick (1.8.2) webrick (1.9.1)
yajl-ruby (1.4.3) yajl-ruby (1.4.3)
PLATFORMS PLATFORMS
@ -195,4 +204,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4) yajl-ruby (~> 1.4)
BUNDLED WITH BUNDLED WITH
2.5.9 2.5.22

View file

@ -2,6 +2,7 @@
activesupport = { activesupport = {
dependencies = [ dependencies = [
"base64" "base64"
"benchmark"
"bigdecimal" "bigdecimal"
"concurrent-ruby" "concurrent-ruby"
"connection_pool" "connection_pool"
@ -11,15 +12,16 @@
"minitest" "minitest"
"securerandom" "securerandom"
"tzinfo" "tzinfo"
"uri"
]; ];
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc"; sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
type = "gem"; type = "gem";
}; };
version = "7.2.1.2"; version = "8.0.2";
}; };
addressable = { addressable = {
dependencies = [ "public_suffix" ]; dependencies = [ "public_suffix" ];
@ -42,15 +44,25 @@
}; };
version = "0.2.0"; version = "0.2.0";
}; };
benchmark = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
type = "gem";
};
version = "0.4.0";
};
bigdecimal = { bigdecimal = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
type = "gem"; type = "gem";
}; };
version = "3.1.8"; version = "3.1.9";
}; };
classifier-reborn = { classifier-reborn = {
dependencies = [ dependencies = [
@ -134,20 +146,40 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
type = "gem"; type = "gem";
}; };
version = "1.3.4"; version = "1.3.5";
}; };
connection_pool = { connection_pool = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
type = "gem"; type = "gem";
}; };
version = "2.4.1"; version = "2.5.0";
};
csv = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0059n2hqiv3afahq1wc4ymr7lpka7vkisvmkx7azgnkvzfz6caby";
type = "gem";
};
version = "3.3.3";
};
date = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz";
type = "gem";
};
version = "3.4.1";
}; };
drb = { drb = {
groups = [ "default" ]; groups = [ "default" ];
@ -203,10 +235,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "05s5pyxh7y68jphb0lgrh0ksxbp4lmbsc6a6qg0ahj15pjqx01ni"; sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm";
type = "gem"; type = "gem";
}; };
version = "2.12.0"; version = "2.12.2";
}; };
faraday-net_http = { faraday-net_http = {
dependencies = [ "net-http" ]; dependencies = [ "net-http" ];
@ -214,10 +246,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk"; sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
type = "gem"; type = "gem";
}; };
version = "3.3.0"; version = "3.4.0";
}; };
fast-stemmer = { fast-stemmer = {
groups = [ "default" ]; groups = [ "default" ];
@ -253,10 +285,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6";
type = "gem"; type = "gem";
}; };
version = "1.17.0"; version = "1.17.1";
}; };
forwardable-extended = { forwardable-extended = {
groups = [ "default" ]; groups = [ "default" ];
@ -287,10 +319,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0"; sha256 = "0y077m0y4wlbv1n1halxr55b2d1kwa19389ys43qmb3fhqrv920c";
type = "gem"; type = "gem";
}; };
version = "4.28.3"; version = "4.30.1";
}; };
html-pipeline = { html-pipeline = {
dependencies = [ dependencies = [
@ -322,19 +354,22 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
type = "gem"; type = "gem";
}; };
version = "1.14.6"; version = "1.14.7";
}; };
jekyll = { jekyll = {
dependencies = [ dependencies = [
"addressable" "addressable"
"base64"
"colorator" "colorator"
"csv"
"em-websocket" "em-websocket"
"i18n" "i18n"
"jekyll-sass-converter" "jekyll-sass-converter"
"jekyll-watch" "jekyll-watch"
"json"
"kramdown" "kramdown"
"kramdown-parser-gfm" "kramdown-parser-gfm"
"liquid" "liquid"
@ -349,10 +384,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0124fnqizh7njn99qg4f3jvf9kg2rpm88drs9p9r5hqr50n2i264"; sha256 = "1h8qpki1zcw4srnzmbba2gwajycm50w53kxq8l6vicm5azc484ac";
type = "gem"; type = "gem";
}; };
version = "4.3.4"; version = "4.4.1";
}; };
jekyll-avatar = { jekyll-avatar = {
dependencies = [ "jekyll" ]; dependencies = [ "jekyll" ];
@ -457,10 +492,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1q50kvzvc58547km41d8zp227z07jwjbc1kzqikkhqfbxb79cakd"; sha256 = "0g7z5psi72pclkq6z2spqlyabw9jj11w1al9fmb2005ik8yn0ryr";
type = "gem"; type = "gem";
}; };
version = "1.8.1"; version = "1.9.0";
}; };
jekyll-redirect-from = { jekyll-redirect-from = {
dependencies = [ "jekyll" ]; dependencies = [ "jekyll" ];
@ -479,10 +514,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "00n9v19h0qgjijygfdkdh2gwpmdlz49nw1mqk6fnp43f317ngrz2"; sha256 = "0hr4hsir8lm8aw3yj9zi7hx2xs4k00xn9inh24642d6iy625v4l3";
type = "gem"; type = "gem";
}; };
version = "3.0.0"; version = "3.1.0";
}; };
jekyll-seo-tag = { jekyll-seo-tag = {
dependencies = [ "jekyll" ]; dependencies = [ "jekyll" ];
@ -537,10 +572,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1klf2mnfilzjqwcjdi5qb1zl3ghrifz1amcnvwjvsfnx9a5jb9ly"; sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
type = "gem"; type = "gem";
}; };
version = "2.7.4"; version = "2.10.2";
}; };
kramdown = { kramdown = {
dependencies = [ "rexml" ]; dependencies = [ "rexml" ];
@ -548,10 +583,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7";
type = "gem"; type = "gem";
}; };
version = "2.4.0"; version = "2.5.1";
}; };
kramdown-parser-gfm = { kramdown-parser-gfm = {
dependencies = [ "kramdown" ]; dependencies = [ "kramdown" ];
@ -656,10 +691,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
type = "gem"; type = "gem";
}; };
version = "1.6.1"; version = "1.6.6";
}; };
matrix = { matrix = {
groups = [ "default" ]; groups = [ "default" ];
@ -709,20 +744,20 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; sha256 = "02sxpw9k3frbxbdj79hvzmzgpvlbv8gj0flrlwhkzk5s1sjjchs8";
type = "gem"; type = "gem";
}; };
version = "3.6.0"; version = "3.6.1";
}; };
mime-types-data = { mime-types-data = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd"; sha256 = "0lcf074hrgd9f7a4fnlgb7203jk6846i7jbpjw5c2nqxwbsqjrlz";
type = "gem"; type = "gem";
}; };
version = "3.2024.1001"; version = "3.2025.0318";
}; };
mini_magick = { mini_magick = {
groups = [ "default" ]; groups = [ "default" ];
@ -739,20 +774,20 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
type = "gem"; type = "gem";
}; };
version = "2.8.7"; version = "2.8.8";
}; };
minitest = { minitest = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
type = "gem"; type = "gem";
}; };
version = "5.25.1"; version = "5.25.5";
}; };
net-http = { net-http = {
dependencies = [ "uri" ]; dependencies = [ "uri" ];
@ -760,10 +795,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
type = "gem"; type = "gem";
}; };
version = "0.4.1"; version = "0.6.0";
}; };
nokogiri = { nokogiri = {
dependencies = [ dependencies = [
@ -774,10 +809,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8";
type = "gem"; type = "gem";
}; };
version = "1.16.7"; version = "1.18.5";
}; };
octokit = { octokit = {
dependencies = [ dependencies = [
@ -805,15 +840,18 @@
version = "0.16.2"; version = "0.16.2";
}; };
psych = { psych = {
dependencies = [ "stringio" ]; dependencies = [
"date"
"stringio"
];
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
type = "gem"; type = "gem";
}; };
version = "5.1.2"; version = "5.2.3";
}; };
public_suffix = { public_suffix = {
groups = [ "default" ]; groups = [ "default" ];
@ -872,30 +910,30 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi"; sha256 = "1q2nkyk6r3m15a2an7lwm4ilkcxzdh3j93s4ib8sbzqb0xp70vvx";
type = "gem"; type = "gem";
}; };
version = "6.7.0"; version = "6.12.0";
}; };
rexml = { rexml = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7";
type = "gem"; type = "gem";
}; };
version = "3.3.9"; version = "3.4.1";
}; };
rouge = { rouge = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs"; sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a";
type = "gem"; type = "gem";
}; };
version = "4.4.0"; version = "4.5.1";
}; };
safe_yaml = { safe_yaml = {
groups = [ "default" ]; groups = [ "default" ];
@ -916,10 +954,10 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "09hydxaq3bwwpflqz93g7pvj5kq0ylj2kvc87q2fvki5h7svbd51"; sha256 = "1nzma5pcwajmz2002jd96ylszx3jckwg9ml5bbn3hvlrdmn680f0";
type = "gem"; type = "gem";
}; };
version = "1.80.4"; version = "1.86.0";
}; };
sawyer = { sawyer = {
dependencies = [ dependencies = [
@ -940,20 +978,20 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";
type = "gem"; type = "gem";
}; };
version = "0.3.1"; version = "0.4.1";
}; };
stringio = { stringio = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; sha256 = "1j1mgvrgkxhadi6nb6pz1kcff7gsb5aivj1vfhsia4ssa5hj9adw";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.5";
}; };
terminal-table = { terminal-table = {
dependencies = [ "unicode-display_width" ]; dependencies = [ "unicode-display_width" ];
@ -1002,20 +1040,20 @@
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
type = "gem"; type = "gem";
}; };
version = "0.13.1"; version = "1.0.3";
}; };
webrick = { webrick = {
groups = [ "default" ]; groups = [ "default" ];
platforms = [ ]; platforms = [ ];
source = { source = {
remotes = [ "https://rubygems.org" ]; remotes = [ "https://rubygems.org" ];
sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
type = "gem"; type = "gem";
}; };
version = "1.8.2"; version = "1.9.1";
}; };
yajl-ruby = { yajl-ruby = {
groups = [ "default" ]; groups = [ "default" ];

View file

@ -1,13 +1,11 @@
{ {
cmake, cmake,
copyPkgconfigItems,
fetchFromGitHub, fetchFromGitHub,
fmt, fmt,
git, git,
gitUpdater, gitUpdater,
gtest, gtest,
lib, lib,
makePkgconfigItem,
pkg-config, pkg-config,
python3, python3,
range-v3, range-v3,
@ -39,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "args.git_version" '"${finalAttrs.version}"' \ --replace-fail "args.git_version" '"${finalAttrs.version}"' \
--replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \ --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \
--replace-fail "args.git_date" '"1970-01-01"' --replace-fail "args.git_date" '"1970-01-01"'
substituteInPlace cmake/templates/lcevc_dec.pc.in \
--replace-fail "@GIT_SHORT_VERSION@" "${finalAttrs.version}"
'' ''
+ lib.optionalString (!stdenv.hostPlatform.avxSupport) '' + lib.optionalString (!stdenv.hostPlatform.avxSupport) ''
@ -55,35 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
NIX_CFLAGS_COMPILE = "-Wno-error=unused-variable"; NIX_CFLAGS_COMPILE = "-Wno-error=unused-variable";
}; };
pkgconfigItems = [
(makePkgconfigItem rec {
name = "lcevc_dec";
inherit (finalAttrs) version;
libs = [
"-L${variables.libdir}"
"-llcevc_dec_api"
];
libsPrivate = [
"-lpthread"
"-llcevc_dec_core"
];
cflags = [
"-I${variables.includedir}"
];
variables = {
prefix = "@dev@";
includedir = "@includedir@";
libdir = "@libdir@";
};
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
python3 python3
git git
pkg-config pkg-config
copyPkgconfigItems
]; ];
buildInputs = [ buildInputs = [

View file

@ -31,13 +31,13 @@ in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "ldc"; pname = "ldc";
version = "1.39.0"; version = "1.40.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ldc-developers"; owner = "ldc-developers";
repo = "ldc"; repo = "ldc";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-ZiG0ATsY6Asu2nus3Y404fvqIwtKYoHl1JRUDU5A6mo="; hash = "sha256-WdnwdH25A5oMNNY3uWG2hxnaAT+S1hNuP7LElH3uuuk=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -2,7 +2,7 @@
stdenv, stdenv,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
sfml, sfml_2,
libffcall, libffcall,
libusb-compat-0_1, libusb-compat-0_1,
libudev-zero, libudev-zero,
@ -41,7 +41,7 @@ stdenv.mkDerivation {
''; '';
buildInputs = [ buildInputs = [
sfml sfml_2
libffcall libffcall
libusb-compat-0_1 libusb-compat-0_1
libudev-zero libudev-zero

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "lokalise2-cli"; pname = "lokalise2-cli";
version = "3.1.0"; version = "3.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lokalise"; owner = "lokalise";
repo = "lokalise-cli-2-go"; repo = "lokalise-cli-2-go";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-XFgrg/C1k0dYmhyi/a3aLo8xz6RGBKyiwGsl2jE101k="; sha256 = "sha256-CFZB1nELQOBNOuISTjes4vhXMr8Pjq4Rj83nq/FfpMY=";
}; };
vendorHash = "sha256-sM4v1EWxXPUFKFWcl9EBc8ZTmm2STOVoeGH9Zv+KEng="; vendorHash = "sha256-sM4v1EWxXPUFKFWcl9EBc8ZTmm2STOVoeGH9Zv+KEng=";

View file

@ -13,7 +13,7 @@
eigen, eigen,
glew, glew,
glm, glm,
sfml, sfml_2,
makeDesktopItem, makeDesktopItem,
}: }:
@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
eigen eigen
glew glew
glm glm
sfml sfml_2
]; ];
installFlags = [ "DESTDIR=$(out)" ]; installFlags = [ "DESTDIR=$(out)" ];

View file

@ -6,7 +6,7 @@
fribidi, fribidi,
libGL, libGL,
libGLU, libGLU,
sfml, sfml_2,
taglib, taglib,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -26,7 +26,7 @@ stdenv.mkDerivation {
fribidi fribidi
libGL libGL
libGLU libGLU
sfml sfml_2
taglib taglib
]; ];

View file

@ -3,7 +3,7 @@
buildNimPackage, buildNimPackage,
fetchFromGitHub, fetchFromGitHub,
pcre, pcre,
testers, versionCheckHook,
}: }:
buildNimPackage (finalAttrs: { buildNimPackage (finalAttrs: {
@ -22,19 +22,21 @@ buildNimPackage (finalAttrs: {
lockFile = ./lock.json; lockFile = ./lock.json;
buildInputs = [ pcre ]; buildInputs = [ pcre ];
nativeBuildInputs = [ versionCheckHook ];
passthru.tests = { nimFlags = [ ''--passC:"-Wno-incompatible-pointer-types"'' ];
version = testers.testVersion {
package = finalAttrs.finalPackage; doInstallCheck = true;
};
};
meta = with lib; { meta = with lib; {
description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing"; description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing";
mainProgram = "mosdepth"; mainProgram = "mosdepth";
license = licenses.mit; license = licenses.mit;
homepage = "https://github.com/brentp/mosdepth"; homepage = "https://github.com/brentp/mosdepth";
maintainers = with maintainers; [ jbedo ]; maintainers = with maintainers; [
jbedo
ehmry
];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}) })

View file

@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mozillavpn"; pname = "mozillavpn";
version = "2.25.0"; version = "2.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla-mobile"; owner = "mozilla-mobile";
repo = "mozilla-vpn-client"; repo = "mozilla-vpn-client";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-XunvADSdLA6jFVjXTAtmYvC1i5ZE7WYaCTvlAd8C1ko="; hash = "sha256-BKD8X4nPLyTtY0x06nCSRRK36XKucpnhvjJN8aZssUs=";
}; };
patches = [ ]; patches = [ ];
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src patches; inherit (finalAttrs) src patches;
hash = "sha256-HaOqhjDodn9z0XQMsxJAMKrs1s7l2cJCIzHECjwnA5A="; hash = "sha256-tVTXlGO969qPR9/TbOJbDdOiwOI1PT11MvNYdLqgDlo=";
}; };
buildInputs = [ buildInputs = [

View file

@ -24,12 +24,12 @@ let
in in
buildDotnetModule (finalAttrs: { buildDotnetModule (finalAttrs: {
inherit pname; inherit pname;
version = "0.8.2"; version = "0.8.3";
src = fetchgit { src = fetchgit {
url = "https://github.com/Nexus-Mods/NexusMods.App.git"; url = "https://github.com/Nexus-Mods/NexusMods.App.git";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-qRo+s1Wf6WXR1kFqvGA6n+Bsp6qTzpK8/W9fuiaA+Yo="; hash = "sha256-b6Tpwy0DepbT80+Jil8celeiNN3W+5prt57NjgLD+u0=";
fetchSubmodules = true; fetchSubmodules = true;
fetchLFS = true; fetchLFS = true;
}; };

View file

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "nordzy-cursor-theme"; pname = "nordzy-cursor-theme";
version = "2.3.0"; version = "2.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "guillaumeboehm"; owner = "guillaumeboehm";
repo = "Nordzy-cursors"; repo = "Nordzy-cursors";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3HUSl0CQcay4V9pO35cmOEZvrgNOJ3WNZahs+hJjUJU="; sha256 = "sha256-pPcdlMa3H5RtbqIxvgxDkP4tw76H2UQujXbrINc3MxE=";
}; };
installPhase = '' installPhase = ''

View file

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "oo7"; pname = "oo7";
version = "0.4.0"; version = "0.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bilelmoussaoui"; owner = "bilelmoussaoui";
repo = "oo7"; repo = "oo7";
rev = version; rev = version;
hash = "sha256-4QEFlQJt2qMf1SxP4OUP2rkmx6OjvNJ/tibuwZLRwus="; hash = "sha256-P20hxwTT/O4o+Z1LnXJJkeEHv1IILfj4/pPMNde55mY=";
}; };
# TODO: this won't cover tests from the client crate # TODO: this won't cover tests from the client crate
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
buildAndTestSubdir = "cli"; buildAndTestSubdir = "cli";
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-WqEHYywkFcHyoT55IuTFt5tfeeEtVhNc7VhuEc0nFfk="; cargoHash = "sha256-VNgbdvX5ttW+/V2Zzkd3rGIjVe1ENRE6WLg7M48ij7o=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -13,7 +13,7 @@
boost183, boost183,
ois, ois,
openal, openal,
sfml, sfml_2,
# passthru # passthru
unstableGitUpdater, unstableGitUpdater,
@ -63,7 +63,7 @@ stdenv.mkDerivation {
ogre' ogre'
ois ois
openal openal
sfml sfml_2
]; ];
cmakeFlags = [ cmakeFlags = [

View file

@ -18,11 +18,9 @@ php.buildComposerProject2 (finalAttrs: {
vendorHash = "sha256-SDLpl2gBvtVjREfcy1WDFqsGRK1fKr2wKPuBkPhApNI="; vendorHash = "sha256-SDLpl2gBvtVjREfcy1WDFqsGRK1fKr2wKPuBkPhApNI=";
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true; doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
meta = { meta = {
changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}"; changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}";

View file

@ -5,26 +5,31 @@
php, php,
phpunit, phpunit,
testers, testers,
versionCheckHook,
}: }:
php.buildComposerProject2 (finalAttrs: { php.buildComposerProject2 (finalAttrs: {
pname = "phpunit"; pname = "phpunit";
version = "12.0.7"; version = "12.0.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sebastianbergmann"; owner = "sebastianbergmann";
repo = "phpunit"; repo = "phpunit";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-opPnpdqBzCUl+VA6vmMn7WmfS97NFKJUIUKBZCxe+8Y="; hash = "sha256-JFJauSTUOZzUbpvKx6IrD3QDum/rNa+5JZZsoThA4TM=";
}; };
vendorHash = "sha256-Od+6ChNEnAX9Xsbg41z4RjL0KJWYxTFGfeb6opwvj3A="; vendorHash = "sha256-fjed7Zm/Iq1VS7eakvrvZs1Yy1t3it3p5U61FKUB2zI=";
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
tests.version = testers.testVersion { package = phpunit; }; tests.version = testers.testVersion { package = phpunit; };
}; };
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
meta = { meta = {
changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md";
description = "PHP Unit Testing framework"; description = "PHP Unit Testing framework";

View file

@ -1,61 +0,0 @@
{
stdenv,
lib,
fetchFromGitea,
rustPlatform,
makeWrapper,
protobuf,
Security,
imagemagick,
ffmpeg,
exiftool,
nixosTests,
}:
rustPlatform.buildRustPackage rec {
pname = "pict-rs";
version = "0.3.3";
src = fetchFromGitea {
domain = "git.asonix.dog";
owner = "asonix";
repo = pname;
rev = "v${version}";
sha256 = "mEZBFDR+/aMRFw54Yq+f1gyEz8H+5IggNCpzv3UdDFg=";
};
cargoLock = {
lockFile = ./Cargo-0.3.lock;
outputHashes = {
"aws-creds-0.29.1" = "bwDFmDPThMLrpaB7cAj/2/vJKhbX6/DqgcIRBVKSZhg=";
};
};
# needed for internal protobuf c wrapper library
PROTOC = "${protobuf}/bin/protoc";
PROTOC_INCLUDE = "${protobuf}/include";
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
postInstall = ''
wrapProgram "$out/bin/pict-rs" \
--prefix PATH : "${
lib.makeBinPath [
imagemagick
ffmpeg
exiftool
]
}"
'';
passthru.tests = { inherit (nixosTests) pict-rs; };
meta = with lib; {
description = "Simple image hosting service";
mainProgram = "pict-rs";
homepage = "https://git.asonix.dog/asonix/pict-rs";
license = with licenses; [ agpl3Plus ];
maintainers = with maintainers; [ happysalada ];
};
}

File diff suppressed because it is too large Load diff

View file

@ -1,8 +1,14 @@
{ callPackage, makeSetupHook }: {
callPackage,
makeSetupHook,
stdenv,
}:
makeSetupHook { makeSetupHook {
name = "postgresql-test-hook"; name = "postgresql-test-hook";
passthru.tests = { passthru.tests = {
simple = callPackage ./test.nix { }; simple = callPackage ./test.nix { };
}; };
# See comment in postgresql's generic.nix doInstallCheck section.
meta.broken = stdenv.hostPlatform.isDarwin;
} ./postgresql-test-hook.sh } ./postgresql-test-hook.sh

File diff suppressed because it is too large Load diff

View file

@ -23,12 +23,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA="; sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA=";
}; };
cargoLock = { useFetchCargoVendor = true;
lockFile = ./Cargo.lock; cargoHash = "sha256-jsaWrdJRKfu75Gw8qGHxx0FHK7rOEK8IEDiQ6ktZsM0=";
outputHashes = {
"egui_nodes-0.1.4" = "sha256-Bb88T+erjgKD769eYOSiVEg9lFnB5pBEDLeWgCdyUus=";
};
};
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -1,9 +1,9 @@
# Generated by ./update.sh - do not update manually! # Generated by ./update.sh - do not update manually!
# Last updated: 2025-03-10 # Last updated: 2025-03-24
{ {
version = "3.2.16-2025.3.7"; version = "3.2.16-2025.3.18";
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250307_amd64_01.deb"; amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250318_amd64_01.deb";
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250307_arm64_01.deb"; arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250318_arm64_01.deb";
arm64_hash = "sha256-ZzrG0rkwtgJ9YnA+WsrLqN93fwFx0u5SGJcnNw+H4qM="; arm64_hash = "sha256-j3aMjxfKyV/IpwxxchMrakJ9ZauA43WwZ9ysoZMEPyE=";
amd64_hash = "sha256-TyfWhVeQm7ghe1Li4PvNiZ/X1JAdaZYcWv/fnChawBU="; amd64_hash = "sha256-JaTsTL8j0KyACSm1mp9O+l526165+qheJUtTxMH4Tgg=";
} }

View file

@ -1,69 +1,73 @@
{ {
lib, lib,
stdenv, stdenv,
mkDerivation,
fetchurl, fetchurl,
qtbase,
qtmultimedia, # nativeBuildInputs
qtquickcontrols,
qtimageformats,
qtxmlpatterns,
ffmpeg,
guvcview,
cmake, cmake,
ninja,
libxml2,
gettext,
pkg-config,
libgphoto2,
gphoto2,
v4l-utils,
libv4l,
pcre,
qwt,
extra-cmake-modules, extra-cmake-modules,
gettext,
gphoto2,
libgphoto2,
libsForQt5,
libv4l,
libxml2,
ninja,
pkg-config,
# buildInputs
guvcview,
pcre,
v4l-utils,
ffmpeg,
}: }:
mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "qstopmotion"; pname = "qstopmotion";
version = "2.5.2"; version = "2.5.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/${pname}/Version_${ url = "mirror://sourceforge/project/qstopmotion/Version_${
builtins.replaceStrings [ "." ] [ "_" ] version lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version
}/${pname}-${version}-Source.tar.gz"; }/qstopmotion-${finalAttrs.version}-Source.tar.gz";
sha256 = "sha256-jyBUyadkSuQKXOrr5XZ1jy6of1Qw8S2HPxuOrPc7RnE="; hash = "sha256-jyBUyadkSuQKXOrr5XZ1jy6of1Qw8S2HPxuOrPc7RnE=";
}; };
buildInputs = [
qtbase
qtmultimedia
qtquickcontrols
qtimageformats
qtxmlpatterns
v4l-utils
libv4l
pcre
guvcview
qwt
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config
cmake cmake
extra-cmake-modules extra-cmake-modules
ninja
gettext gettext
libgphoto2
gphoto2 gphoto2
libxml2 libgphoto2
libsForQt5.wrapQtAppsHook
libv4l libv4l
libxml2
ninja
pkg-config
]; ];
patchPhase = '' buildInputs = [
(guvcview.override {
useQt = true;
useGtk = false;
})
libsForQt5.qtbase
libsForQt5.qtimageformats
libsForQt5.qtmultimedia
libsForQt5.qtquickcontrols
libsForQt5.qtxmlpatterns
libsForQt5.qwt
libv4l
pcre
v4l-utils
];
postPatch = ''
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \ --replace-fail \
"find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \
"find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia"
grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g' grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g'
''; '';
@ -74,7 +78,7 @@ mkDerivation rec {
(lib.makeBinPath [ ffmpeg ]) (lib.makeBinPath [ ffmpeg ])
]; ];
meta = with lib; { meta = {
homepage = "http://www.qstopmotion.org"; homepage = "http://www.qstopmotion.org";
description = "Create stopmotion animation with a (web)camera"; description = "Create stopmotion animation with a (web)camera";
longDescription = '' longDescription = ''
@ -83,11 +87,9 @@ mkDerivation rec {
imported from a camera or from the harddrive and export the imported from a camera or from the harddrive and export the
animation to different video formats such as mpeg or avi. animation to different video formats such as mpeg or avi.
''; '';
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = [ maintainers.leenaars ]; maintainers = [ lib.maintainers.leenaars ];
broken = stdenv.hostPlatform.isAarch64;
platforms = lib.platforms.gnu ++ lib.platforms.linux; platforms = lib.platforms.gnu ++ lib.platforms.linux;
mainProgram = "qstopmotion"; mainProgram = "qstopmotion";
}; };
} })

View file

@ -9,7 +9,7 @@
rainfrog, rainfrog,
}: }:
let let
version = "0.2.15"; version = "0.2.16";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
inherit version; inherit version;
@ -19,11 +19,11 @@ rustPlatform.buildRustPackage {
owner = "achristmascarl"; owner = "achristmascarl";
repo = "rainfrog"; repo = "rainfrog";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-r+tual/ko8SjToMR9ek/Gf5GJieu2wPsMMkjKXw+cLk="; hash = "sha256-jolr2KIjmjriekATTQYqzHeBadQGYYj26aETZ2Dq0IU=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-JkH771cXGz8YcRy+zO/mB4hkFrA6l0Yg86cLCgsjbrE="; cargoHash = "sha256-Q6tsJhtNt6Ph3qW2VJ+l3gg2VN0sgQ175YFqgXWu/C4=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks; with darwin.apple_sdk.frameworks;

View file

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "riffdiff"; pname = "riffdiff";
version = "3.3.8"; version = "3.3.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "walles"; owner = "walles";
repo = "riff"; repo = "riff";
tag = version; tag = version;
hash = "sha256-KJ+2MdhBW0og6uj9eTUsoKcpenQj7tp3fZzgCNfdrqI="; hash = "sha256-EhRruR5UzVP5OdPRX/k8Tasst9tlVteyfXD9BCXBhtI=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-0D/jJsPjxDqD5xjqET+Y4iXAvNzOu1c3meaFkXVtSDw="; cargoHash = "sha256-a9XLP0ydG/lIXT6fa4QK5MiBN6NWp/IrchXLBm34F6g=";
passthru = { passthru = {
tests.version = testers.testVersion { package = riffdiff; }; tests.version = testers.testVersion { package = riffdiff; };

View file

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ripsecrets"; pname = "ripsecrets";
version = "0.1.8"; version = "0.1.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sirwart"; owner = "sirwart";
repo = "ripsecrets"; repo = "ripsecrets";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-MyFeSEZAG99g1Uh8KVA7CSZZVXUOF2qYJ0o1YviiPp4="; hash = "sha256-lmahS/0W5075vdPfj4QnX7ZvrxHi986/92PRrplFblg=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-e11kd+W8M8y5rC328Ycf2NB4wPdAQ++RcprrYaoM3t0="; cargoHash = "sha256-AO0EL2JNwrqwUa7QLNB8/fjLP3HzBqidHR21YSmrMqg=";
meta = with lib; { meta = with lib; {
description = "Command-line tool to prevent committing secret keys into your source code"; description = "Command-line tool to prevent committing secret keys into your source code";

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rutorrent"; pname = "rutorrent";
version = "5.1.5"; version = "5.1.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Novik"; owner = "Novik";
repo = "ruTorrent"; repo = "ruTorrent";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-si/6iZMipfm18lrwjJvuL+vQco0l+HresUEv2gj1uRw="; hash = "sha256-XdPrl1yDcn/dFU4etacDmBAvs0kU/cJE4Ioy6q8+pig=";
}; };
installPhase = '' installPhase = ''

File diff suppressed because it is too large Load diff

View file

@ -19,15 +19,8 @@ rustPlatform.buildRustPackage {
hash = "sha256-W0lhhImSXtYJDeMbxyEioYu/Bh7ZclwR1/5DzNbxM8o="; hash = "sha256-W0lhhImSXtYJDeMbxyEioYu/Bh7ZclwR1/5DzNbxM8o=";
}; };
cargoLock = { useFetchCargoVendor = true;
lockFile = ./Cargo.lock; cargoHash = "sha256-xqj9USqVG7g2zT2P3VxDVt8fFDtyUnZOdT6gYZh4cRI=";
outputHashes = {
"msg-api-0.1.0" = "sha256-SGEr9kitvD+KZPGejwDAISK6ERk7G2uskxX8ljiJ2To=";
"smithay-client-toolkit-0.16.0" = "sha256-kiTO+BZIgpuwAr6gs9FCqz81jRg+3dV4NxzOX9kbJOc=";
"snui-0.1.4" = "sha256-jJL9ukSOczHjPM2EAXcXcz620SK4DQfr+xAT8v7fp9o=";
"snui-adwaita-0.1.0" = "sha256-pILhLMzqnhLZfGAXT8QQn6x+IvwG7CSa96wZqq1yrLY=";
};
};
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View file

@ -71,6 +71,8 @@ stdenv.mkDerivation rec {
lzop lzop
gzip gzip
pigz pigz
# /run/booted-system/sw/bin contains a sudo that does not work, so we need to override the override to use /run/wrappers/bin/sudo
"/run/wrappers"
"/run/booted-system/sw" "/run/booted-system/sw"
zfs zfs
] ]

View file

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "scooter"; pname = "scooter";
version = "0.3.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thomasschafer"; owner = "thomasschafer";
repo = "scooter"; repo = "scooter";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-TJgPBQEfoylSy0rwoN942Gigd16ZqIoi3lwdVTjXoOk="; hash = "sha256-wu9SNcd1+JqTkhUghOiRlGP/za/9Md/lgGrwNA2lCJE=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-1sIzehv/TZQnkzTVM2Nog8UyOZcpaeBRR5CFaj/otL4="; cargoHash = "sha256-DQU3djlSjG1VG2bs+JuegwF3ii+asJXpEEPb95xeXqk=";
checkFlags = [ checkFlags = [
# failed only for buildRustPackage # failed only for buildRustPackage

View file

@ -14,21 +14,23 @@
libvorbis, libvorbis,
openal, openal,
udev, udev,
libXi,
libX11, libX11,
libXcursor, libXcursor,
libXrandr, libXrandr,
libXrender, libXrender,
xcbutilimage, xcbutilimage,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "sfml"; pname = "sfml";
version = "2.6.2"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SFML"; owner = "SFML";
repo = "SFML"; repo = "SFML";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-m8FVXM56qjuRKRmkcEcRI8v6IpaJxskoUQ+sNsR1EhM="; hash = "sha256-e6x/L2D3eT6F/DBLQDZ+j0XD5NL9RalWZA8kcm9lZ3g=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional stdenv.hostPlatform.isLinux udev ++ lib.optional stdenv.hostPlatform.isLinux udev
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
libX11 libX11
libXi
libXcursor libXcursor
libXrandr libXrandr
libXrender libXrender
@ -67,11 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python. It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
''; '';
license = lib.licenses.zlib; license = lib.licenses.zlib;
maintainers = [ lib.maintainers.astsmtl ]; maintainers = with lib.maintainers; [ GaetanLepage ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
badPlatforms = [
# error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
lib.systems.inspect.patterns.isDarwin
];
}; };
}) })

View file

@ -0,0 +1,77 @@
{
lib,
stdenv,
fetchFromGitHub,
# nativeBuildInputs
cmake,
# buildInputs
flac,
freetype,
glew,
libjpeg,
libvorbis,
openal,
udev,
libX11,
libXcursor,
libXrandr,
libXrender,
xcbutilimage,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sfml";
version = "2.6.2";
src = fetchFromGitHub {
owner = "SFML";
repo = "SFML";
tag = finalAttrs.version;
hash = "sha256-m8FVXM56qjuRKRmkcEcRI8v6IpaJxskoUQ+sNsR1EhM=";
};
nativeBuildInputs = [ cmake ];
buildInputs =
[
flac
freetype
glew
libjpeg
libvorbis
openal
]
++ lib.optional stdenv.hostPlatform.isLinux udev
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
libX11
libXcursor
libXrandr
libXrender
xcbutilimage
];
cmakeFlags = [
(lib.cmakeBool "SFML_INSTALL_PKGCONFIG_FILES" true)
(lib.cmakeFeature "SFML_MISC_INSTALL_PREFIX" "share/SFML")
(lib.cmakeBool "SFML_BUILD_FRAMEWORKS" false)
(lib.cmakeBool "SFML_USE_SYSTEM_DEPS" true)
];
meta = {
description = "Simple and fast multimedia library";
homepage = "https://www.sfml-dev.org/";
changelog = "https://github.com/SFML/SFML/blob/${finalAttrs.version}/changelog.md";
longDescription = ''
SFML is a simple, fast, cross-platform and object-oriented multimedia API.
It provides access to windowing, graphics, audio and network.
It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
'';
license = lib.licenses.zlib;
maintainers = [ lib.maintainers.astsmtl ];
platforms = lib.platforms.unix;
badPlatforms = [
# error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
lib.systems.inspect.patterns.isDarwin
];
};
})

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20250319"; version = "20250322";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = "signalbackup-tools"; repo = "signalbackup-tools";
rev = version; rev = version;
hash = "sha256-kKFPaeuA0E5wf6/EiL2cV86KQukBlSKdrVwMbblx9Y4="; hash = "sha256-GMpZjXmrSFX8jw981NeuhYo3FMRK7u7cgllPXm+rRsg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

File diff suppressed because it is too large Load diff

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