Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900 2025-02-05 22:58:25 +03:00
commit 29d8d9b1a7
93 changed files with 2928 additions and 1894 deletions

View File

@ -396,8 +396,8 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange
/pkgs/development/ocaml-modules @ulrikstrid /pkgs/development/ocaml-modules @ulrikstrid
# Zig # Zig
/pkgs/development/compilers/zig @figsoda /pkgs/development/compilers/zig @figsoda @RossComputerGuy
/doc/hooks/zig.section.md @figsoda /doc/hooks/zig.section.md @figsoda @RossComputerGuy
# Buildbot # Buildbot
nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq

View File

@ -10854,6 +10854,12 @@
githubId = 6445082; githubId = 6445082;
name = "Joseph Lukasik"; name = "Joseph Lukasik";
}; };
jhahn = {
email = "mail.jhahn@gmail.com";
github = "jrhahn";
githubId = 56772267;
name = "Jürgen Hahn";
};
jhh = { jhh = {
email = "jeff@j3ff.io"; email = "jeff@j3ff.io";
github = "jhh"; github = "jhh";

View File

@ -1159,7 +1159,10 @@ with lib.maintainers;
}; };
zig = { zig = {
members = [ figsoda ]; members = [
figsoda
RossComputerGuy
];
scope = "Maintain the Zig compiler toolchain and nixpkgs integration."; scope = "Maintain the Zig compiler toolchain and nixpkgs integration.";
shortName = "Zig"; shortName = "Zig";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;

View File

@ -284,6 +284,10 @@
- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific older versions; those will continue to be maintained as long as other packages depend on them but may be removed in the future. - The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific older versions; those will continue to be maintained as long as other packages depend on them but may be removed in the future.
- `prometheus` has been updated from 2.55.0 to 3.1.0.
Read the [release blog post](https://prometheus.io/blog/2024/11/14/prometheus-3-0/) and
[migration guide](https://prometheus.io/docs/prometheus/3.1/migration/).
- `kanata` was updated to v1.7.0, which introduces several breaking changes. - `kanata` was updated to v1.7.0, which introduces several breaking changes.
See the release notes of See the release notes of
[v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)

View File

@ -42,14 +42,21 @@ in
type = types.str; type = types.str;
default = ""; default = "";
example = '' example = ''
import cachelib
BIND_ADDRESS = '127.0.0.1' BIND_ADDRESS = '127.0.0.1'
PORT = 8000 PORT = 8000
SQLALCHEMY_DATABASE_URI = 'postgresql://powerdnsadmin@/powerdnsadmin?host=/run/postgresql' SQLALCHEMY_DATABASE_URI = 'postgresql://powerdnsadmin@/powerdnsadmin?host=/run/postgresql'
SESSION_TYPE = 'cachelib'
SESSION_CACHELIB = cachelib.simple.SimpleCache()
''; '';
description = '' description = ''
Configuration python file. Configuration python file.
See [the example configuration](https://github.com/ngoduykhanh/PowerDNS-Admin/blob/v${pkgs.powerdns-admin.version}/configs/development.py) See [the example configuration](https://github.com/ngoduykhanh/PowerDNS-Admin/blob/v${pkgs.powerdns-admin.version}/configs/development.py)
for options. for options.
Also see [Flask Session configuration](https://flask-session.readthedocs.io/en/latest/config.html#SESSION_TYPE)
as the version shipped with NixOS is more recent than the one PowerDNS-Admin expects
and it requires explicit configuration.
''; '';
}; };
@ -85,7 +92,7 @@ in
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.powerdns-admin}/bin/powerdns-admin --pid /run/powerdns-admin/pid ${escapeShellArgs cfg.extraArgs}"; ExecStart = "${pkgs.powerdns-admin}/bin/powerdns-admin --pid /run/powerdns-admin/pid ${escapeShellArgs cfg.extraArgs}";
# Set environment variables only for starting flask database upgrade # Set environment variables only for starting flask database upgrade
ExecStartPre = "${pkgs.coreutils}/bin/env FLASK_APP=${pkgs.powerdns-admin}/share/powerdnsadmin/__init__.py SESSION_TYPE= ${pkgs.python3Packages.flask}/bin/flask db upgrade -d ${pkgs.powerdns-admin}/share/migrations"; ExecStartPre = "${pkgs.coreutils}/bin/env FLASK_APP=${pkgs.powerdns-admin}/share/powerdnsadmin/__init__.py ${pkgs.python3Packages.flask}/bin/flask db upgrade -d ${pkgs.powerdns-admin}/share/migrations";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID"; ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
PIDFile = "/run/powerdns-admin/pid"; PIDFile = "/run/powerdns-admin/pid";

View File

@ -9,9 +9,13 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib; with pkgs.lib;
let let
defaultConfig = '' defaultConfig = ''
import cachelib
BIND_ADDRESS = '127.0.0.1' BIND_ADDRESS = '127.0.0.1'
PORT = 8000 PORT = 8000
CAPTCHA_ENABLE = False CAPTCHA_ENABLE = False
SESSION_TYPE = 'cachelib'
SESSION_CACHELIB = cachelib.simple.SimpleCache()
''; '';
makeAppTest = makeAppTest =

View File

@ -38,17 +38,17 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "reaper"; pname = "reaper";
version = "7.30"; version = "7.33";
src = fetchurl { src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch; url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = hash =
if stdenv.hostPlatform.isDarwin then if stdenv.hostPlatform.isDarwin then
"sha256-nPt2dWbbctRrC3+UufMMLiAikOaMB33tDfFCscJx5cA=" "sha256-EBPMuW2cuuw9B6nbUDQiRyugQOItWHldGPvlijW7s9Y="
else else
{ {
x86_64-linux = "sha256-rN4SMGkoO03JCmPOKabOdOlk2nfmGDYk1tSfniPyRnQ="; x86_64-linux = "sha256-C+iJO6hQib2Z5FKB2dBRD963x9ezSt8G3E3ocaY56TI=";
aarch64-linux = "sha256-kASD5099XAoy6w3K5z0y8xrSNpomTWAFOWjtHgULwAA="; aarch64-linux = "sha256-Lbf8yY6UqtfqHWYkLRzUkasdjxyPxFoxdehJG0+0u44=";
} }
.${stdenv.hostPlatform.system}; .${stdenv.hostPlatform.system};
}; };

View File

@ -8,13 +8,13 @@
melpaBuild { melpaBuild {
pname = "edraw"; pname = "edraw";
version = "1.2.0-unstable-2025-01-16"; version = "1.2.0-unstable-2025-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "misohena"; owner = "misohena";
repo = "el-easydraw"; repo = "el-easydraw";
rev = "449c1226f7108e1cf8b4b447a65fa053b6bd782f"; rev = "7f41e93554e4855ae44c0d719f7253f873ed4cb8";
hash = "sha256-u6lc2s4fqNWNCuICu832vAbMmV5X6FB8fIkJwgdBKfg="; hash = "sha256-dwmyBm+PtrfW74WRlhdXql8yLuB2fKwdvobaChKoBP0=";
}; };
propagatedUserEnvPkgs = [ gzip ]; propagatedUserEnvPkgs = [ gzip ];

File diff suppressed because it is too large Load Diff

View File

@ -112,6 +112,7 @@ class VimEditor(pluginupdate.Editor):
version = "{plugin.version}"; version = "{plugin.version}";
src = {src_nix}; src = {src_nix};
meta.homepage = "{repo.uri}"; meta.homepage = "{repo.uri}";
meta.hydraPlatforms = [ ];
}}; }};
""".format( """.format(

View File

@ -29,13 +29,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "dosbox-x"; pname = "dosbox-x";
version = "2025.01.01"; version = "2025.02.01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "joncampbell123"; owner = "joncampbell123";
repo = "dosbox-x"; repo = "dosbox-x";
rev = "dosbox-x-v${finalAttrs.version}"; rev = "dosbox-x-v${finalAttrs.version}";
hash = "sha256-3zE/VDCFNQRgqpIL5hRAafDoc7agX2LIsiL4xwDBLJY="; hash = "sha256-X+deR8khmCWnIyqhao122CaPGXuWEoayKTcTaYfLATY=";
}; };
# sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants

View File

@ -16,17 +16,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "inlyne"; pname = "inlyne";
version = "0.4.3"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Inlyne-Project"; owner = "Inlyne-Project";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-j4DEau7LZxIoVIIYwCUgqmkSgdRxWzF5/vOS0lvjgUk="; hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-9Ev/D58MU0aMleM6NFG7MsXqGlhi0eAujqYaLDuPjIY="; cargoHash = "sha256-jSUqpryUgOL0qo0gbbH4s24krrPsLOSNc6FQUEUeeUQ=";
nativeBuildInputs = nativeBuildInputs =
[ [

View File

@ -60,7 +60,7 @@ writeScript "update-${pname}" ''
# this is a list of sha256 and tarballs for both arches # this is a list of sha256 and tarballs for both arches
# Upstream files contains python repr strings like b'somehash', hence the sed dance # Upstream files contains python repr strings like b'somehash', hence the sed dance
shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep tar.bz2` shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep tar.xz`
cat > $tmpfile <<EOF cat > $tmpfile <<EOF
{ {
@ -75,7 +75,7 @@ writeScript "update-${pname}" ''
# - inteprets sha and path as 2 lines # - inteprets sha and path as 2 lines
for line in `echo "$shasums" | \ for line in `echo "$shasums" | \
grep $arch | \ grep $arch | \
grep "${baseName}-$version.tar.bz2$" | \ grep "${baseName}-$version.tar.xz$" | \
tr " " ":"`; do tr " " ":"`; do
# create an entry for every locale # create an entry for every locale
cat >> $tmpfile <<EOF cat >> $tmpfile <<EOF

View File

@ -9,10 +9,10 @@
buildMozillaMach rec { buildMozillaMach rec {
pname = "firefox"; pname = "firefox";
version = "128.6.0esr"; version = "128.7.0esr";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "49bce966e062766861712bd65cca46a438b339fe31598f69e4fe64da78ef6f8b4581c1d502341ef1c032aafaab2f4f88e69cb93a0b845ba7173fec277ae695b5"; sha512 = "26f9661b395b85a44b42bd72ef1ad976c614216c68f6c2dd834d0ac8b84b9c9f398b8ac550a47396995d96e6bb5fa9a50064d7f2f526bddd45aed5039ef131b8";
}; };
meta = { meta = {

View File

@ -9,10 +9,10 @@
buildMozillaMach rec { buildMozillaMach rec {
pname = "firefox"; pname = "firefox";
version = "134.0.2"; version = "135.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "74d631ecbdb5607cfcc4de408947b3b129e36b3d1daa501827aebc81f48c878f9bade875875c466c07c651f26b5388ff2d2d2087e66e0613d8914abaa7ddf5ae"; sha512 = "7d283bcefe1e328901f15a88f5ff3da566bb0495ce5b9e3895e7a156020126a5743b6bffd69d94d9eb812e1868195ae92db162d29a5d98ee118fdb238469c089";
}; };
meta = { meta = {

View File

@ -1,14 +1,14 @@
{ {
rke2Version = "1.31.4+rke2r1"; rke2Version = "1.31.5+rke2r1";
rke2Commit = "5142beec71f7a61804840df5b434c2fd7137ce82"; rke2Commit = "08e198bbe3f0b8d4c9b0af4d92085c06bb94aa89";
rke2TarballHash = "sha256-Lebi3a7kNA9IQCVVkYfUoGEeEiLScqpOx1aTCFElDvw="; rke2TarballHash = "sha256-GG1GOs/kLWDCvc/+l0ymRpJzEthIyGpampCjvfnEPB8=";
rke2VendorHash = "sha256-DGmu1vFNcu1O2wuEwRZRBTL/TP2lJ9ggQ2M/Ix+jknM="; rke2VendorHash = "sha256-xWqMidOWiLgJXp6AEITkyOieLw4yi1JMmi80YS4RNy0=";
k8sVersion = "v1.31.4"; k8sVersion = "v1.31.5";
k8sImageTag = "v1.31.4-rke2r1-build20241212"; k8sImageTag = "v1.31.5-rke2r1-build20250115";
etcdVersion = "v3.5.16-k3s1-build20241106"; etcdVersion = "v3.5.16-k3s1-build20241106";
pauseVersion = "3.6"; pauseVersion = "3.6";
ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016"; ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016";
dockerizedVersion = "v1.31.4-rke2r1"; dockerizedVersion = "v1.31.5-rke2r1";
golangVersion = "go1.22.9"; golangVersion = "go1.22.10";
eol = "2025-10-28"; eol = "2025-10-28";
} }

View File

@ -98,8 +98,8 @@ rec {
thunderbird-esr = thunderbird-128; thunderbird-esr = thunderbird-128;
thunderbird-128 = common { thunderbird-128 = common {
version = "128.6.0esr"; version = "128.6.1esr";
sha512 = "a561eac0bf0b8c72f3337ccebcde9099c342d1b31ce2b1f31096f1f805a195c49d627cf726cd56d41b21ec292d96fd577e8f226fcb24d8b13e0d773fc334b073"; sha512 = "f41936b90aaefde5c6a31a03d1f7ed4b6560729584061d82d032efde3df0836eede807a318d4a403de4a3cd5d6a6f7eace483e08fcc284699176f1b3ad01437a";
updateScript = callPackage ./update.nix { updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-128"; attrPath = "thunderbirdPackages.thunderbird-128";

View File

@ -53,13 +53,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "sdrangel"; pname = "sdrangel";
version = "7.22.5"; version = "7.22.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "f4exb"; owner = "f4exb";
repo = "sdrangel"; repo = "sdrangel";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-1jZcKx3kvWcaU9Y6StMATsZ05e7qZqA1H3i/ZvWDoKg="; hash = "sha256-ymDKHGJNoCOMa1zzFvjTzFa34wP1+iKSfJZZi7Sk/GM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -21,19 +21,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "crosvm"; pname = "crosvm";
version = "0-unstable-2025-01-21"; version = "0-unstable-2025-02-04";
src = fetchgit { src = fetchgit {
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
rev = "c93c22f1da264919ba551db84d43d4a11ea55d8d"; rev = "d8e0f16c287b962505c8746c3be08323492186c9";
hash = "sha256-edhg1ZtlbzsqvmeVO/AddMfmFBcicxTWV5VvZZ25v6U="; hash = "sha256-kiWYJLtQK9RWWRCHdVAVNcZhb4NPcLd1KIQKe3xZH+A=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
separateDebugInfo = true; separateDebugInfo = true;
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-/0HXHCfaNixT+lKkGlB90bokNrCFQANHSkSKII2pHuU="; cargoHash = "sha256-ZXJQust+NOWU70HUNIze6W1xKG+aCig0keK5HXv1D7w=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -29,17 +29,17 @@ in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rust-hypervisor-firmware"; pname = "rust-hypervisor-firmware";
version = "0.4.2"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloud-hypervisor"; owner = "cloud-hypervisor";
repo = pname; repo = "rust-hypervisor-firmware";
rev = version; tag = version;
sha256 = "sha256-hKk5pcop8rb5Q+IVchcl+XhMc3DCBBPn5P+AkAb9XxI="; sha256 = "sha256-iLYmPBJH7I6EJ8VTUbR0+lZaebvbZlRv2KglbjKX76Q=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-Cl2DHKrK24uswkMiyDbn+C1Rb7ebcqSgWoAC0yG+U8Y="; cargoHash = "sha256-iqsU4t8Zz9UTtAu+a6kqwnPZ6qdGAriQ7hcU58KDQ8M=";
# lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO' # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO'
# https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249 # https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249

View File

@ -1,6 +1,6 @@
{ {
"llvm-target": "x86_64-unknown-none", "llvm-target": "x86_64-unknown-none",
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
"arch": "x86_64", "arch": "x86_64",
"target-endian": "little", "target-endian": "little",
"target-pointer-width": "64", "target-pointer-width": "64",

View File

@ -8,7 +8,7 @@
}: }:
let let
pname = "asm-lsp"; pname = "asm-lsp";
version = "0.9.0"; version = "0.10.0";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
inherit pname version; inherit pname version;
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
owner = "bergercookie"; owner = "bergercookie";
repo = "asm-lsp"; repo = "asm-lsp";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0GB3tXZuCu3syh+RG+eXoliZVHMPOhYC3RchSSx4u5w="; hash = "sha256-RAyiE+Msmr/Qt5v7rWuUTAji383XLKxeMQJove2b1NE=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage {
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-EEWTW29GS/50fsPFYhz63m74+mqnvBfxFuH9C8+t7Ag="; cargoHash = "sha256-41iWqgywfFdqf3TzZT5peh39jiSZw8FRTI1AeL5CroY=";
# tests expect ~/.cache/asm-lsp to be writable # tests expect ~/.cache/asm-lsp to be writable
preCheck = '' preCheck = ''

View File

@ -28,11 +28,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "blueman"; pname = "blueman";
version = "2.4.3"; version = "2.4.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-vfxJkJdCy3koj4oR1vZmt1wnE7kcCF5tDdMpQ0eT/oU="; sha256 = "sha256-00+RVMjGiH0VZ50Sl0SSKscvanHLK8z7ZmL4ykRuhfA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -5,6 +5,7 @@
cpptrace, cpptrace,
src, src,
checkOutput, checkOutput,
static,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -13,7 +14,9 @@ stdenv.mkDerivation (finalAttrs: {
inherit src; inherit src;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ cpptrace ]; buildInputs = [
(cpptrace.override { inherit static; })
];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -27,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
installCheckPhase = lib.strings.concatLines ( installCheckPhase = lib.strings.concatLines (
[ "$out/bin/main" ] [ "$out/bin/main" ]
# Check that the backtrace contains the path to the executable. # Check that the backtrace contains the path to the executable.
++ lib.optionals (checkOutput) [ ++ lib.optionals checkOutput [
'' ''
if [[ !(`$out/bin/main 2>&1` =~ "${finalAttrs.name}") ]]; then if [[ !(`$out/bin/main 2>&1` =~ "${finalAttrs.name}") ]]; then
echo "ERROR: $out/bin/main does not output '${finalAttrs.name}'" echo "ERROR: $out/bin/main does not output '${finalAttrs.name}'"

View File

@ -8,18 +8,19 @@
gtest, gtest,
callPackage, callPackage,
zstd, zstd,
nix-update-script,
static ? stdenv.hostPlatform.isStatic, static ? stdenv.hostPlatform.isStatic,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "cpptrace"; pname = "cpptrace";
version = "0.6.2"; version = "0.7.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jeremy-rifkin"; owner = "jeremy-rifkin";
repo = "cpptrace"; repo = "cpptrace";
rev = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-zjPxPtq+OQ104sJoeBD3jpMV9gV57FSHEJS4W6SF8GM="; hash = "sha256-2rDyH9vo47tbqqZrTupAOrMySj4IGKeWX8HBTGjFf+g=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
buildInputs = [ libdwarf ]; buildInputs = [ libdwarf ];
propagatedBuildInputs = [ zstd ]; propagatedBuildInputs = [ zstd ] ++ (lib.optionals static [ libdwarf ]);
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true) (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true)
@ -39,15 +40,24 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
checkInputs = [ gtest ]; checkInputs = [ gtest ];
doCheck = true;
# Unit tests are flaky and hard to get right. passthru = {
doCheck = false; updateScript = nix-update-script { };
tests =
passthru.tests = { let
findpackage-integration = callPackage ./findpackage-integration.nix { mkIntegrationTest =
src = "${finalAttrs.src}/test/findpackage-integration"; { static }:
checkOutput = finalAttrs.finalPackage.doCheck; callPackage ./findpackage-integration.nix {
}; src = "${finalAttrs.src}/test/findpackage-integration";
checkOutput = finalAttrs.finalPackage.doCheck;
inherit static;
};
in
{
findpackage-integration-shared = mkIntegrationTest { static = false; };
findpackage-integration-static = mkIntegrationTest { static = true; };
};
}; };
meta = { meta = {

View File

@ -39,13 +39,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "crun"; pname = "crun";
version = "1.19.1"; version = "1.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-st8zap9WiM5+aX3spga19Ty4a4297rR3SjAY9Hrv4qg="; hash = "sha256-rSh0oPZxhFSvEqzZrgM5eFrv1lW8Xd3JN1JTCT7Mj0I=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ddev"; pname = "ddev";
version = "1.24.1"; version = "1.24.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ddev"; owner = "ddev";
repo = "ddev"; repo = "ddev";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-iOeo7FwNVqw3r4qHqJQ9wtuHQmuxNt9ChYKdpbJIVxQ="; hash = "sha256-Bvp1mx07PXnLChmbaiBv2wnoN/oAZED5xQSoKMUo9tY=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -0,0 +1,50 @@
{
lib,
stdenv,
fetchFromGitHub,
gdb,
makeWrapper,
python3Packages,
}:
stdenv.mkDerivation (finalAttrs: {
name = "gdb-dashboard";
version = "0.17.3";
src = fetchFromGitHub {
owner = "cyrus-and";
repo = "gdb-dashboard";
tag = "v${finalAttrs.version}";
hash = "sha256-x3XcAJdj2Q8s+ZkIBHpGZvCroedPzBmqt5W9Hc1FL7s=";
};
nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ python3Packages.pygments ];
installPhase = ''
runHook preInstall
mkdir -p $out/share/gdb-dashboard
cp -r .gdbinit $out/share/gdb-dashboard/gdbinit
makeWrapper ${gdb}/bin/gdb $out/bin/gdb-dashboard \
--add-flags "-q -x $out/share/gdb-dashboard/gdbinit"
p=$(toPythonPath ${python3Packages.pygments})
sed -i "/import os/a import os; import sys; sys.path[0:0] = '$p'.split(':')" \
$out/share/gdb-dashboard/gdbinit
runHook postInstall
'';
# there are no tests as this is a wrapper
meta = {
description = "Modular visual interface for GDB in Python";
homepage = "https://github.com/cyrus-and/gdb-dashboard";
downloadPage = "https://github.com/cyrus-and/gdb-dashboard";
changelog = "https://github.com/cyrus-and/gdb-dashboard/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ethancedwards8 ];
};
})

View File

@ -5,16 +5,17 @@
buildGoModule rec { buildGoModule rec {
pname = "gocover-cobertura"; pname = "gocover-cobertura";
version = "1.2.0"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "boumenot"; owner = "boumenot";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-nbwqfObU1tod5gWa9UbhmS6CpLLilvFyvNJ6XjeR8Qc="; sha256 = "sha256-Cxv1iuCYHSI0BFR1OLbeDIQfVLlMDxlTgU7ljpXWHjU=";
}; };
vendorHash = null; deleteVendor = true;
vendorHash = "sha256-b1fUikmBnc+q0KsRhK9p4VJjVnt6XFjmX9AE48TAxXg=";
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];
@ -23,6 +24,6 @@ buildGoModule rec {
description = "This is a simple helper tool for generating XML output in Cobertura format for CIs like Jenkins and others from go tool cover output"; description = "This is a simple helper tool for generating XML output in Cobertura format for CIs like Jenkins and others from go tool cover output";
mainProgram = "gocover-cobertura"; mainProgram = "gocover-cobertura";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ hmajid2301 ]; maintainers = with maintainers; [ gabyx hmajid2301 ];
}; };
} }

View File

@ -13,14 +13,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "guile-ssh"; pname = "guile-ssh";
# XXX: using unstable to ensure proper build with libssh 0.11.1 (https://github.com/artyom-poptsov/guile-ssh/issues/42) version = "0.18.0";
version = "0.17.0-unstable-2024-10-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "artyom-poptsov"; owner = "artyom-poptsov";
repo = "guile-ssh"; repo = "guile-ssh";
rev = "9336580f92f83bb73041c5374b400144a56b4c35"; tag = "v${finalAttrs.version}";
hash = "sha256-Hwg0xaNSm/SEZfzczjb7o8TJXfzT1mmOk1rJROxahLQ="; hash = "sha256-q7P/ehafnDtJhHOAWbswOfztkKHVtEw8OgcXKufVAX4=";
}; };
patches = [ patches = [

View File

@ -30,13 +30,13 @@
stdenv.mkDerivation (finalAtrs: { stdenv.mkDerivation (finalAtrs: {
pname = "hardinfo2"; pname = "hardinfo2";
version = "2.2.4"; version = "2.2.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hardinfo2"; owner = "hardinfo2";
repo = "hardinfo2"; repo = "hardinfo2";
tag = "release-${finalAtrs.version}"; tag = "release-${finalAtrs.version}";
hash = "sha256-UgVryuUkD9o2SvwA9VbX/kCaAo3+Osf6FxlYyaRX1Ag="; hash = "sha256-IIH2SH4Ph25VFx652RQFZX8rL0ZlwjjfVrb+txLF3Ks=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "koodo-reader"; pname = "koodo-reader";
version = "1.7.2"; version = "1.7.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "troyeguo"; owner = "troyeguo";
repo = "koodo-reader"; repo = "koodo-reader";
rev = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-RtEL4ZVtNSqQShgHpjd1O/wgsXJOvceV+NhIWqexVAI="; hash = "sha256-rLW5FS8xM7Z49AaLq0KzBCoRgAVxwTDCHQFdIaEyygA=";
}; };
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
meta = { meta = {
changelog = "https://github.com/troyeguo/koodo-reader/releases/tag/v${finalAttrs.version}"; changelog = "https://github.com/troyeguo/koodo-reader/releases/tag/${finalAttrs.src.tag}";
description = "Cross-platform ebook reader"; description = "Cross-platform ebook reader";
longDescription = '' longDescription = ''
A modern ebook manager and reader with sync and backup capacities A modern ebook manager and reader with sync and backup capacities

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubectl-gadget"; pname = "kubectl-gadget";
version = "0.34.0"; version = "0.37.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inspektor-gadget"; owner = "inspektor-gadget";
repo = "inspektor-gadget"; repo = "inspektor-gadget";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-qOenoC1NycRVFMXETJ1WpAhjeUAnminhkhJ39skvt4k="; hash = "sha256-M0RfwO8YcjMx2eBbSjo4BgTJHbzFnpqhGhhLg9l1KYY=";
}; };
vendorHash = "sha256-V2bgMFJGo1t1MiJyACdB9mjM2xtHwgH6bNEbEeZC2XM="; vendorHash = "sha256-gYaO+8WhMZNTSBndncrB9JDe3CYL50JGP45ugg6DMDQ=";
env.CGO_ENABLED = 0; env.CGO_ENABLED = 0;
@ -30,7 +30,7 @@ buildGoModule rec {
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
package = kubectl-gadget; package = kubectl-gadget;
command = "kubectl-gadget version || true"; # mask non-zero return code if no kubeconfig present command = "kubectl-gadget version";
version = "v${version}"; version = "v${version}";
}; };

View File

@ -11,13 +11,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubeshark"; pname = "kubeshark";
version = "52.3.94"; version = "52.3.96";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubeshark"; owner = "kubeshark";
repo = "kubeshark"; repo = "kubeshark";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-mNhI0rYWVDP40pPWCvm+V/+E5NH6rtYT6mxxpILnFGU="; hash = "sha256-o0Rzo7+gT+bj1b5YhfJMKSpeo4tkEof8QHNMzYbtpQw=";
}; };
vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo="; vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo=";
@ -60,7 +60,7 @@ buildGoModule rec {
}; };
meta = with lib; { meta = with lib; {
changelog = "https://github.com/kubeshark/kubeshark/releases/tag/${version}"; changelog = "https://github.com/kubeshark/kubeshark/releases/tag/v${version}";
description = "API Traffic Viewer for Kubernetes"; description = "API Traffic Viewer for Kubernetes";
mainProgram = "kubeshark"; mainProgram = "kubeshark";
homepage = "https://kubeshark.co/"; homepage = "https://kubeshark.co/";

View File

@ -1,10 +1,10 @@
{ {
"stable": { "stable": {
"version": "5.12.0-beta.1", "version": "5.12.3",
"hash": "sha256-ZiC6UCXsB+Czb+RAuvv3zENDxgaOKtNZQUEQuV86ggI=" "hash": "sha256-Rl21p+nN5KnabzzH9cRWJnLIKX/3Haex+VSY3PvZs5Q="
}, },
"beta": { "beta": {
"version": "5.12.0-beta.1", "version": "5.13.0-beta.4",
"hash": "sha256-ZiC6UCXsB+Czb+RAuvv3zENDxgaOKtNZQUEQuV86ggI=" "hash": "sha256-TPNS4VkbUNesT0TN2jAyTilzr5+3H6JxqOLujc7VQDA="
} }
} }

View File

@ -11,6 +11,7 @@
git, git,
pkg-config, pkg-config,
openssl, openssl,
cacert,
Security, Security,
SystemConfiguration, SystemConfiguration,
usage, usage,
@ -22,22 +23,23 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mise"; pname = "mise";
version = "2025.1.6"; version = "2025.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jdx"; owner = "jdx";
repo = "mise"; repo = "mise";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-eMKrRrthV37ndsF47jjNxigsJ5WDsCDCit9J88l5dHE="; hash = "sha256-mZZBazE8QCaz3osbLoeaIHa7tsGji6B4UkaMlKAvF0M=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-0ME2NyN9kKoaIfiuTDyQcE6AS70uGmUVyrXYXqJGUZk="; cargoHash = "sha256-ObvBSaBtf9PiC2zjcToNn59ihzR6qIxSRgi0FKNCIpY=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
pkg-config pkg-config
]; ];
buildInputs = buildInputs =
[ openssl ] [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
@ -66,6 +68,8 @@ rustPlatform.buildRustPackage rec {
--replace-fail 'cmd!("direnv"' 'cmd!("${lib.getExe direnv}"' --replace-fail 'cmd!("direnv"' 'cmd!("${lib.getExe direnv}"'
''; '';
nativeCheckInputs = [ cacert ];
checkFlags = [ checkFlags = [
# last_modified will always be different in nix # last_modified will always be different in nix
"--skip=tera::tests::test_last_modified" "--skip=tera::tests::test_last_modified"
@ -93,7 +97,9 @@ rustPlatform.buildRustPackage rec {
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
tests = { tests = {
version = testers.testVersion { package = mise; }; version = (testers.testVersion { package = mise; }).overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ cacert ];
});
usageCompat = usageCompat =
# should not crash # should not crash
runCommand "mise-usage-compatibility" runCommand "mise-usage-compatibility"

View File

@ -9,14 +9,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mlmmj"; pname = "mlmmj";
version = "1.4.7"; version = "1.5.0";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "refs/tags/RELEASE_" + lib.replaceStrings [ "." ] [ "_" ] version; rev = "refs/tags/RELEASE_" + lib.replaceStrings [ "." ] [ "_" ] version;
hash = "sha256-QetxCxny9elPetKuAsgKF0xTov1bNIRxi7gWhv6dYyU="; hash = "sha256-kAo04onxVve3kCaM4h1APsjs3C4iePabkBFJeqvnPxo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -10,19 +10,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "phraze"; pname = "phraze";
version = "0.3.17"; version = "0.3.18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sts10"; owner = "sts10";
repo = "phraze"; repo = "phraze";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-r+d2npf9qtAiAuqDhw0sZm6aIcGdsppWXLEJctZsyEg="; hash = "sha256-s021GUzclmE7nbsNXAhG0Kok+bAbLZTit9a1bK9YvGc=";
}; };
doCheck = true; doCheck = true;
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-vlxV9EfBkB42x5bBAaIOJbFDD2s27VhX9YD8IUHiZtI="; cargoHash = "sha256-QljZRl+RQDL5TAAVFQ5jyHaRygjB5vfVFMF54UeSCdw=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -6,12 +6,12 @@
let let
pname = "polypane"; pname = "polypane";
version = "23.0.0"; version = "23.0.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
name = "${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage";
sha256 = "sha256-YGNv3J1nAzj7BtJUxtgYQqlqisqzrGN9SpFs9RnaEh0="; sha256 = "sha256-phOuTka8S/aUOem6+rKx18yhRoArWLQYwxqqFF269XA=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View File

@ -32,10 +32,10 @@
}: }:
let let
version = "3.0.1"; version = "3.1.0";
webUiStatic = fetchurl { webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
hash = "sha256-MP7B7gVRQnspXLLNmPH8t3DYKbsQkDV9hPJYbM2rB9M="; hash = "sha256-05DaaDIFtADnkLFqdHe5eUvo6LRz6BduMvGVmzOeurM=";
}; };
in in
buildGoModule rec { buildGoModule rec {
@ -51,11 +51,11 @@ buildGoModule rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prometheus"; owner = "prometheus";
repo = "prometheus"; repo = "prometheus";
rev = "v${version}"; tag = "v${version}";
hash = "sha256-dN6ckW451G45ZO7baY7H4qEf88ZDeISZwZ3uwWPZsW8="; hash = "sha256-Q3f0L6cRVQRL1AHgUI3VNbMG9eTfcApbXfSjOTHr7Go=";
}; };
vendorHash = "sha256-c96YnWPLH/tbGRb2Zlqrl3PXSZvI+NeYTGlef6REAOw="; vendorHash = "sha256-vQwBnSxoyIYTeWLk3GD9pKDuUjjsMfwPptgyVnzcTok=";
excludedPackages = [ excludedPackages = [
"documentation/prometheus-mixin" "documentation/prometheus-mixin"

View File

@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ cargoBuildFlags = [
"--no-default-features" "--no-default-features"
"--features=alias,backend-gpgme,clipboard,notify,select-fzf-bin,select-skim-bin,tomb,totp" "--features=alias,backend-gpgme,clipboard,notify,select-fzf-bin,select-skim,tomb,totp"
]; ];
buildInputs = [ buildInputs = [
@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
lgpl3Only # lib lgpl3Only # lib
gpl3Only # everything else gpl3Only # everything else
]; ];
maintainers = with maintainers; [ dotlambda ]; maintainers = with maintainers; [ colemickens ];
mainProgram = "prs"; mainProgram = "prs";
}; };
} }

View File

@ -5,16 +5,16 @@
}: }:
buildNpmPackage rec { buildNpmPackage rec {
pname = "qdrant-web-ui"; pname = "qdrant-web-ui";
version = "0.1.35"; version = "0.1.36";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qdrant"; owner = "qdrant";
repo = "qdrant-web-ui"; repo = "qdrant-web-ui";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-kTXN+uouEf/szksu+rLAXW+As2YyrFF4i8AluFEPRUs="; hash = "sha256-dVRmrlS1y/ZTu2LxrvzBnUVGy3aNNQrEdKN19v7+Ehg=";
}; };
npmDepsHash = "sha256-oZydAlmzNjjcuLtXfhBXrsuOBPyOsnRZZ7DzUVg0eas="; npmDepsHash = "sha256-NYUJhqzJbeav2y5a6ZJVlsQ4vthv/azm5CaQmdSeaBY=";
npmBuildScript = "build-qdrant"; npmBuildScript = "build-qdrant";

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rpiboot"; pname = "rpiboot";
version = "20240926-102326"; version = "20250129-123632";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "usbboot"; repo = "usbboot";
rev = version; rev = version;
hash = "sha256-9m7PAw1WNQlfqOr5hDXrCsZlZLBmvoGUT58NN2cVolw="; hash = "sha256-nUwero1BLSx+JORqJVWIXi2ElnN17al1jA+I4Cqe9hM=";
}; };
buildInputs = [ libusb1 ]; buildInputs = [ libusb1 ];

View File

@ -19,13 +19,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sby"; pname = "sby";
version = "0.48"; version = "0.49";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "YosysHQ"; owner = "YosysHQ";
repo = "sby"; repo = "sby";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-icOlWutvajHMCi2YUIGU4v5S63YobXw4fYYUvPoSzo4="; hash = "sha256-vQYBezo6O1MNo82RYOXOrMPHCEM/Opyqd5gR3Rn7pig=";
}; };
nativeCheckInputs = [ nativeCheckInputs = [

View File

@ -28,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang"; pname = "shader-slang";
version = "2025.3.1"; version = "2025.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shader-slang"; owner = "shader-slang";
repo = "slang"; repo = "slang";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-YOZukHgXTgKyTp2b3Z0hwkipCwAkNoFlgVZfDlq1lz8="; hash = "sha256-odZEWiE8SQrfPlRjkI6HkB+sHUhj5ySyBQCKQua7CKA=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -1,31 +1,51 @@
{ {
lib, lib,
fetchFromGitHub, fetchFromGitHub,
flutter, flutter327,
runCommand,
yq,
sly,
_experimental-update-script-combinators,
gitUpdater,
}: }:
let
version = "0.4.0"; flutter327.buildFlutterApplication rec {
pname = "sly";
version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kra-mo"; owner = "kra-mo";
repo = "sly"; repo = "Sly";
rev = "v${version}"; tag = "v${version}";
hash = "sha256-P7LhhXQQDRsDQ8bZgfvWazLRMYVGhFhMTD41fgs718g="; hash = "sha256-pFTP+oDY3pCSgO26ZtqUR+puMJSFZAEdbM2AqmfkNX8=";
}; };
in
flutter.buildFlutterApplication {
pname = "sly";
inherit version src;
pubspecLock = lib.importJSON ./pubspec.lock.json; pubspecLock = lib.importJSON ./pubspec.lock.json;
postInstall = '' postInstall = ''
install -Dm0644 ./packaging/linux/page.kramo.Sly.svg $out/share/icons/hicolor/scalable/apps/page.kramo.Sly.svg install -Dm0644 packaging/linux/page.kramo.Sly.svg $out/share/icons/hicolor/scalable/apps/page.kramo.Sly.svg
install -Dm0644 ./packaging/linux/page.kramo.Sly.desktop $out/share/applications/page.kramo.Sly.desktop install -Dm0644 packaging/linux/page.kramo.Sly.desktop $out/share/applications/sly.desktop
''; '';
passthru = {
pubspecSource =
runCommand "pubspec.lock.json"
{
nativeBuildInputs = [ yq ];
inherit (sly) src;
}
''
cat $src/pubspec.lock | yq > $out
'';
updateScript = _experimental-update-script-combinators.sequence [
(gitUpdater { rev-prefix = "v"; })
(_experimental-update-script-combinators.copyAttrOutputToFile "sly.pubspecSource" ./pubspec.lock.json)
];
};
meta = { meta = {
description = "Friendly image editor"; description = "Friendly image editor";
homepage = "https://github.com/kra-mo/sly"; homepage = "https://github.com/kra-mo/Sly";
mainProgram = "sly"; mainProgram = "sly";
license = with lib.licenses; [ gpl3Plus ]; license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ]; maintainers = with lib.maintainers; [ ];

View File

@ -4,21 +4,21 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "archive", "name": "archive",
"sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", "sha256": "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "3.6.1" "version": "4.0.1"
}, },
"args": { "args": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "args", "name": "args",
"sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.5.0" "version": "2.6.0"
}, },
"async": { "async": {
"dependency": "transitive", "dependency": "transitive",
@ -54,11 +54,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "cli_util", "name": "cli_util",
"sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.4.1" "version": "0.4.2"
}, },
"clock": { "clock": {
"dependency": "transitive", "dependency": "transitive",
@ -74,11 +74,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "collection", "name": "collection",
"sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.18.0" "version": "1.19.0"
}, },
"console": { "console": {
"dependency": "transitive", "dependency": "transitive",
@ -94,11 +94,11 @@
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"name": "crop_image", "name": "crop_image",
"sha256": "6cf20655ecbfba99c369d43ec7adcfa49bf135af88fb75642173d6224a95d3f1", "sha256": "2e629cd141a360cb9060b5a0837fd49b0260d3d931244717213bf164f6813c82",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.0.13" "version": "1.0.15"
}, },
"cross_file": { "cross_file": {
"dependency": "transitive", "dependency": "transitive",
@ -114,21 +114,21 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "crypto", "name": "crypto",
"sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "3.0.5" "version": "3.0.6"
}, },
"equatable": { "equatable": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "equatable", "name": "equatable",
"sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.0.5" "version": "2.0.7"
}, },
"fake_async": { "fake_async": {
"dependency": "transitive", "dependency": "transitive",
@ -154,11 +154,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "file", "name": "file",
"sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "7.0.0" "version": "7.0.1"
}, },
"file_selector": { "file_selector": {
"dependency": "direct main", "dependency": "direct main",
@ -174,41 +174,41 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "file_selector_android", "name": "file_selector_android",
"sha256": "b8c9717a0177ca6fa035554b82cd6c83b838ddc66b7704eb6df0f77f027ecc90", "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.5.1+7" "version": "0.5.1+12"
}, },
"file_selector_ios": { "file_selector_ios": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "file_selector_ios", "name": "file_selector_ios",
"sha256": "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb", "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.5.3" "version": "0.5.3+1"
}, },
"file_selector_linux": { "file_selector_linux": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "file_selector_linux", "name": "file_selector_linux",
"sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492", "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.9.2+1" "version": "0.9.3+2"
}, },
"file_selector_macos": { "file_selector_macos": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "file_selector_macos", "name": "file_selector_macos",
"sha256": "f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385", "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.9.4" "version": "0.9.4+2"
}, },
"file_selector_platform_interface": { "file_selector_platform_interface": {
"dependency": "transitive", "dependency": "transitive",
@ -234,21 +234,21 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "file_selector_windows", "name": "file_selector_windows",
"sha256": "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69", "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.9.3+2" "version": "0.9.3+3"
}, },
"fl_chart": { "fl_chart": {
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"name": "fl_chart", "name": "fl_chart",
"sha256": "94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef", "sha256": "74959b99b92b9eebeed1a4049426fd67c4abc3c5a0f4d12e2877097d6a11ae08",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.69.0" "version": "0.69.2"
}, },
"flutter": { "flutter": {
"dependency": "direct main", "dependency": "direct main",
@ -270,11 +270,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "flutter_plugin_android_lifecycle", "name": "flutter_plugin_android_lifecycle",
"sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda", "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.0.22" "version": "2.0.24"
}, },
"flutter_test": { "flutter_test": {
"dependency": "direct dev", "dependency": "direct dev",
@ -292,11 +292,11 @@
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"name": "gal", "name": "gal",
"sha256": "54c9b72528efce7c66234f3b6dd01cb0304fd8af8196de15571d7bdddb940977", "sha256": "2771519c8b29f784d5e27f4efc2667667eef51c6c47cccaa0435a8fe8aa208e4",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.3.0" "version": "2.3.1"
}, },
"get_it": { "get_it": {
"dependency": "transitive", "dependency": "transitive",
@ -342,11 +342,11 @@
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"name": "image", "name": "image",
"sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", "sha256": "20842a5ad1555be624c314b0c0cc0566e8ece412f61e859a42efeb6d4101a26c",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "4.2.0" "version": "4.5.0"
}, },
"image_picker": { "image_picker": {
"dependency": "direct main", "dependency": "direct main",
@ -362,31 +362,31 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "image_picker_android", "name": "image_picker_android",
"sha256": "c0a6763d50b354793d0192afd0a12560b823147d3ded7c6b77daf658fa05cc85", "sha256": "fa8141602fde3f7e2f81dbf043613eb44dfa325fa0bcf93c0f142c9f7a2c193e",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.8.12+13" "version": "0.8.12+18"
}, },
"image_picker_for_web": { "image_picker_for_web": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "image_picker_for_web", "name": "image_picker_for_web",
"sha256": "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50", "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "3.0.5" "version": "3.0.6"
}, },
"image_picker_ios": { "image_picker_ios": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "image_picker_ios", "name": "image_picker_ios",
"sha256": "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447", "sha256": "4f0568120c6fcc0aaa04511cb9f9f4d29fc3d0139884b1d06be88dcec7641d6b",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.8.12" "version": "0.8.12+1"
}, },
"image_picker_linux": { "image_picker_linux": {
"dependency": "transitive", "dependency": "transitive",
@ -428,25 +428,35 @@
"source": "hosted", "source": "hosted",
"version": "0.2.1+1" "version": "0.2.1+1"
}, },
"json_annotation": {
"dependency": "transitive",
"description": {
"name": "json_annotation",
"sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.9.0"
},
"leak_tracker": { "leak_tracker": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "leak_tracker", "name": "leak_tracker",
"sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "10.0.5" "version": "10.0.7"
}, },
"leak_tracker_flutter_testing": { "leak_tracker_flutter_testing": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "leak_tracker_flutter_testing", "name": "leak_tracker_flutter_testing",
"sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "3.0.5" "version": "3.0.8"
}, },
"leak_tracker_testing": { "leak_tracker_testing": {
"dependency": "transitive", "dependency": "transitive",
@ -502,11 +512,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "mime", "name": "mime",
"sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.0.6" "version": "2.0.0"
}, },
"msix": { "msix": {
"dependency": "direct dev", "dependency": "direct dev",
@ -522,11 +532,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "package_config", "name": "package_config",
"sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.1.0" "version": "2.1.1"
}, },
"path": { "path": {
"dependency": "transitive", "dependency": "transitive",
@ -582,11 +592,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "platform", "name": "platform",
"sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "3.1.5" "version": "3.1.6"
}, },
"plugin_platform_interface": { "plugin_platform_interface": {
"dependency": "transitive", "dependency": "transitive",
@ -598,55 +608,105 @@
"source": "hosted", "source": "hosted",
"version": "2.1.8" "version": "2.1.8"
}, },
"posix": {
"dependency": "transitive",
"description": {
"name": "posix",
"sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.1"
},
"pub_semver": { "pub_semver": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "pub_semver", "name": "pub_semver",
"sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.1.4" "version": "2.1.5"
}, },
"screen_retriever": { "screen_retriever": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "screen_retriever", "name": "screen_retriever",
"sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.1.9" "version": "0.2.0"
},
"screen_retriever_linux": {
"dependency": "transitive",
"description": {
"name": "screen_retriever_linux",
"sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"screen_retriever_macos": {
"dependency": "transitive",
"description": {
"name": "screen_retriever_macos",
"sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"screen_retriever_platform_interface": {
"dependency": "transitive",
"description": {
"name": "screen_retriever_platform_interface",
"sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"screen_retriever_windows": {
"dependency": "transitive",
"description": {
"name": "screen_retriever_windows",
"sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
}, },
"shared_preferences": { "shared_preferences": {
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"name": "shared_preferences", "name": "shared_preferences",
"sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", "sha256": "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.3.2" "version": "2.3.4"
}, },
"shared_preferences_android": { "shared_preferences_android": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "shared_preferences_android", "name": "shared_preferences_android",
"sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e", "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.3.2" "version": "2.4.0"
}, },
"shared_preferences_foundation": { "shared_preferences_foundation": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "shared_preferences_foundation", "name": "shared_preferences_foundation",
"sha256": "c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f", "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.5.2" "version": "2.5.4"
}, },
"shared_preferences_linux": { "shared_preferences_linux": {
"dependency": "transitive", "dependency": "transitive",
@ -692,7 +752,7 @@
"dependency": "transitive", "dependency": "transitive",
"description": "flutter", "description": "flutter",
"source": "sdk", "source": "sdk",
"version": "0.0.99" "version": "0.0.0"
}, },
"source_span": { "source_span": {
"dependency": "transitive", "dependency": "transitive",
@ -708,11 +768,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "stack_trace", "name": "stack_trace",
"sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.11.1" "version": "1.12.0"
}, },
"stream_channel": { "stream_channel": {
"dependency": "transitive", "dependency": "transitive",
@ -728,11 +788,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "string_scanner", "name": "string_scanner",
"sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.2.0" "version": "1.3.0"
}, },
"term_glyph": { "term_glyph": {
"dependency": "transitive", "dependency": "transitive",
@ -748,71 +808,71 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "test_api", "name": "test_api",
"sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.7.2" "version": "0.7.3"
}, },
"typed_data": { "typed_data": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "typed_data", "name": "typed_data",
"sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.3.2" "version": "1.4.0"
}, },
"url_launcher": { "url_launcher": {
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"name": "url_launcher", "name": "url_launcher",
"sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.0"
},
"url_launcher_android": {
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.10"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "6.3.1" "version": "6.3.1"
}, },
"url_launcher_android": {
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.14"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.2"
},
"url_launcher_linux": { "url_launcher_linux": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "url_launcher_linux", "name": "url_launcher_linux",
"sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "3.2.0" "version": "3.2.1"
}, },
"url_launcher_macos": { "url_launcher_macos": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "url_launcher_macos", "name": "url_launcher_macos",
"sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "3.2.0" "version": "3.2.2"
}, },
"url_launcher_platform_interface": { "url_launcher_platform_interface": {
"dependency": "transitive", "dependency": "transitive",
@ -838,11 +898,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "url_launcher_windows", "name": "url_launcher_windows",
"sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "3.1.2" "version": "3.1.3"
}, },
"vector_math": { "vector_math": {
"dependency": "transitive", "dependency": "transitive",
@ -858,41 +918,41 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "vm_service", "name": "vm_service",
"sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "14.2.5" "version": "14.3.0"
}, },
"web": { "web": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "web", "name": "web",
"sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.0.0" "version": "1.1.0"
}, },
"window_manager": { "window_manager": {
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"name": "window_manager", "name": "window_manager",
"sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792", "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.4.2" "version": "0.4.3"
}, },
"xdg_directories": { "xdg_directories": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "xdg_directories", "name": "xdg_directories",
"sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.0.4" "version": "1.1.0"
}, },
"xml": { "xml": {
"dependency": "transitive", "dependency": "transitive",

View File

@ -8,12 +8,12 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "apache-storm"; pname = "apache-storm";
version = "2.7.1"; version = "2.8.0";
name = "${finalAttrs.pname}-${finalAttrs.version}"; name = "${finalAttrs.pname}-${finalAttrs.version}";
src = fetchurl { src = fetchurl {
url = "mirror://apache/storm/${finalAttrs.name}/${finalAttrs.name}.tar.gz"; url = "mirror://apache/storm/${finalAttrs.name}/${finalAttrs.name}.tar.gz";
hash = "sha256-AT5Eu+sgOj1BphTP80a8Wcm9NidrgLtMeggy6o5w3HM="; hash = "sha256-BpRJ1wfrD0TM25plVvSP2DV7dtCJ3MFa04t3jzZcXno=";
}; };
nativeBuildInputs = [ zip unzip ]; nativeBuildInputs = [ zip unzip ];

View File

@ -32,13 +32,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sumo"; pname = "sumo";
version = "1.21.0"; version = "1.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eclipse"; owner = "eclipse";
repo = "sumo"; repo = "sumo";
rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}"; rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-VST3ZJuDQBWf+YoN0kPyLrlXWmJABubUFDsKEMxfxHY="; hash = "sha256-4HL5wi6LfUe4/v7ObeiDCTyWV8ChRlRXDFb5OBRmjuI=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -19,12 +19,12 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "tryton"; pname = "tryton";
version = "7.4.2"; version = "7.4.4";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-488WOXQLZfbjlEE7aTQun9/qGWVvtJ+qJGUPgrOETOY="; hash = "sha256-77gc6H1xY8QCp7ld/OuJhZcwYCvVUpgygoDdJS9RGGA=";
}; };
build-system = [ python3Packages.setuptools ]; build-system = [ python3Packages.setuptools ];

View File

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tuckr"; pname = "tuckr";
version = "0.10.1"; version = "0.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RaphGL"; owner = "RaphGL";
repo = "Tuckr"; repo = "Tuckr";
rev = version; rev = version;
hash = "sha256-1hF8zZYkvNYA0bDgvu+zsfcT/8MF8HTiTHpYfOxXljA="; hash = "sha256-ez27IEdOPryyIQCGATjKGeos3stLHP4BkwnJBLk+1W8=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-RuJlF7ZFj0BF5WKHnTPnWbqU9U6rL6RtH9R/FSjavmo="; cargoHash = "sha256-4F54N+r/er3j9zAzfSkXiwl5iEjh47PPzHByMZ0jA+Y=";
doCheck = false; # test result: FAILED. 5 passed; 3 failed; doCheck = false; # test result: FAILED. 5 passed; 3 failed;

View File

@ -156,11 +156,11 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "wavebox"; pname = "wavebox";
version = "10.131.18-2"; version = "10.132.2-2";
src = fetchurl { src = fetchurl {
url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
hash = "sha256-aJp2Dr5q9gZhrDUWbztImhW8G79gDNl1J7gqWqicGPQ="; hash = "sha256-PPeYU8VN1tr2fpSnq/e1/OmWCjJEicdb3NVb+oFVD14=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -6,12 +6,12 @@
rebar3Relx rec { rebar3Relx rec {
pname = "erlfmt"; pname = "erlfmt";
version = "1.5.0"; version = "1.6.0";
releaseType = "escript"; releaseType = "escript";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WhatsApp"; owner = "WhatsApp";
repo = "erlfmt"; repo = "erlfmt";
sha256 = "sha256-TtOHcXiXl13KSGarMBdvvDjv1YQJjDVFtDLC0LDz9Bc="; sha256 = "sha256-p4cdnKDY02XqdFOkijhOo527eZenfMF8J2dbuvH/hcY=";
rev = "v${version}"; rev = "v${version}";
}; };
meta = with lib; { meta = with lib; {

View File

@ -1,111 +0,0 @@
{
lib,
callPackage,
cmake,
coreutils,
fetchFromGitHub,
libxml2,
llvmPackages,
stdenv,
testers,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zig";
version = "0.10.1";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig";
rev = finalAttrs.version;
hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=";
};
patches = [
# Backport alignment related panics from zig-master to 0.10.
# Upstream issue: https://github.com/ziglang/zig/issues/14559
./001-0.10-macho-fixes.patch
];
nativeBuildInputs = [
cmake
(lib.getDev llvmPackages.llvm)
];
buildInputs =
[
libxml2
zlib
]
++ (with llvmPackages; [
libclang
lld
llvm
]);
outputs = [
"out"
"doc"
];
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
(lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
# always link against static build of LLVM
(lib.cmakeBool "ZIG_STATIC_LLVM" true)
# ensure determinism in the compiler build
(lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline")
];
env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
doInstallCheck = true;
strictDeps = true;
# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
# work in Nix's sandbox. Use env from our coreutils instead.
postPatch = ''
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
--replace "/usr/bin/env" "${lib.getExe' coreutils "env"}"
'';
postBuild = ''
./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html
'';
postInstall = ''
install -Dm644 -t $doc/share/doc/zig-$version/html ./langref.html
'';
installCheckPhase = ''
runHook preInstallCheck
$out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig
runHook postInstallCheck
'';
passthru = {
hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "zig version";
};
};
};
meta = {
description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
homepage = "https://ziglang.org/";
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
license = lib.licenses.mit;
mainProgram = "zig";
maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
platforms = lib.platforms.unix;
};
})

View File

@ -1,43 +0,0 @@
{ makeSetupHook, zig }:
makeSetupHook {
name = "zig-hook";
propagatedBuildInputs = [ zig ];
substitutions = {
# This zig_default_flags below is meant to avoid CPU feature impurity in
# Nixpkgs. However, this flagset is "unstable": it is specifically meant to
# be controlled by the upstream development team - being up to that team
# exposing or not that flags to the outside (especially the package manager
# teams).
# Because of this hurdle, @andrewrk from Zig Software Foundation proposed
# some solutions for this issue. Hopefully they will be implemented in
# future releases of Zig. When this happens, this flagset should be
# revisited accordingly.
# Below are some useful links describing the discovery process of this 'bug'
# in Nixpkgs:
# https://github.com/NixOS/nixpkgs/issues/169461
# https://github.com/NixOS/nixpkgs/issues/185644
# https://github.com/NixOS/nixpkgs/pull/197046
# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485
# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653
zig_default_flags = [
"-Dcpu=baseline"
"-Drelease-safe=true"
];
};
passthru = {
inherit zig;
};
meta = {
description = "Setup hook for using the Zig compiler in Nixpkgs";
inherit (zig.meta) maintainers platforms broken;
};
} ./setup-hook.sh

View File

@ -1,69 +0,0 @@
# shellcheck shell=bash
# shellcheck disable=SC2034
readonly zigDefaultFlagsArray=(@zig_default_flags@)
function zigSetGlobalCacheDir {
ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)
export ZIG_GLOBAL_CACHE_DIR
}
function zigBuildPhase {
runHook preBuild
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray
echoCmd 'zig build flags' "${flagsArray[@]}"
zig build "${flagsArray[@]}"
runHook postBuild
}
function zigCheckPhase {
runHook preCheck
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigCheckFlags zigCheckFlagsArray
echoCmd 'zig check flags' "${flagsArray[@]}"
zig build test "${flagsArray[@]}"
runHook postCheck
}
function zigInstallPhase {
runHook preInstall
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray \
zigInstallFlags zigInstallFlagsArray
if [ -z "${dontAddPrefix-}" ]; then
# Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/`
flagsArray+=("${prefixKey:---prefix}" "$prefix")
fi
echoCmd 'zig install flags' "${flagsArray[@]}"
zig build install "${flagsArray[@]}"
runHook postInstall
}
# shellcheck disable=SC2154
addEnvHooks "$targetOffset" zigSetGlobalCacheDir
if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then
buildPhase=zigBuildPhase
fi
if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then
checkPhase=zigCheckPhase
fi
if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then
installPhase=zigInstallPhase
fi

View File

@ -1,105 +0,0 @@
{
lib,
callPackage,
cmake,
coreutils,
fetchFromGitHub,
libxml2,
llvmPackages,
stdenv,
testers,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zig";
version = "0.11.0";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig";
rev = finalAttrs.version;
hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I=";
};
nativeBuildInputs = [
cmake
(lib.getDev llvmPackages.llvm)
];
buildInputs =
[
libxml2
zlib
]
++ (with llvmPackages; [
libclang
lld
llvm
]);
outputs = [
"out"
"doc"
];
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
(lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
# ensure determinism in the compiler build
(lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline")
# always link against static build of LLVM
(lib.cmakeBool "ZIG_STATIC_LLVM" true)
];
env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
doInstallCheck = true;
strictDeps = true;
# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
# work in Nix's sandbox. Use env from our coreutils instead.
postPatch = ''
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
--replace "/usr/bin/env" "${lib.getExe' coreutils "env"}"
'';
postBuild = ''
stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig
'';
postInstall = ''
install -Dm444 -t $doc/share/doc/zig-$version/html langref.html
'';
installCheckPhase = ''
runHook preInstallCheck
$out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig
runHook postInstallCheck
'';
passthru = {
hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "zig version";
};
};
};
meta = {
description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
homepage = "https://ziglang.org/";
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
license = lib.licenses.mit;
mainProgram = "zig";
maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
platforms = lib.platforms.unix;
};
})

View File

@ -1,43 +0,0 @@
{ makeSetupHook, zig }:
makeSetupHook {
name = "zig-hook";
propagatedBuildInputs = [ zig ];
substitutions = {
# This zig_default_flags below is meant to avoid CPU feature impurity in
# Nixpkgs. However, this flagset is "unstable": it is specifically meant to
# be controlled by the upstream development team - being up to that team
# exposing or not that flags to the outside (especially the package manager
# teams).
# Because of this hurdle, @andrewrk from Zig Software Foundation proposed
# some solutions for this issue. Hopefully they will be implemented in
# future releases of Zig. When this happens, this flagset should be
# revisited accordingly.
# Below are some useful links describing the discovery process of this 'bug'
# in Nixpkgs:
# https://github.com/NixOS/nixpkgs/issues/169461
# https://github.com/NixOS/nixpkgs/issues/185644
# https://github.com/NixOS/nixpkgs/pull/197046
# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485
# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653
zig_default_flags = [
"-Dcpu=baseline"
"-Doptimize=ReleaseSafe"
];
};
passthru = {
inherit zig;
};
meta = {
description = "Setup hook for using the Zig compiler in Nixpkgs";
inherit (zig.meta) maintainers platforms broken;
};
} ./setup-hook.sh

View File

@ -1,69 +0,0 @@
# shellcheck shell=bash
# shellcheck disable=SC2034
readonly zigDefaultFlagsArray=(@zig_default_flags@)
function zigSetGlobalCacheDir {
ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)
export ZIG_GLOBAL_CACHE_DIR
}
function zigBuildPhase {
runHook preBuild
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray
echoCmd 'zig build flags' "${flagsArray[@]}"
zig build "${flagsArray[@]}"
runHook postBuild
}
function zigCheckPhase {
runHook preCheck
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigCheckFlags zigCheckFlagsArray
echoCmd 'zig check flags' "${flagsArray[@]}"
zig build test "${flagsArray[@]}"
runHook postCheck
}
function zigInstallPhase {
runHook preInstall
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray \
zigInstallFlags zigInstallFlagsArray
if [ -z "${dontAddPrefix-}" ]; then
# Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/`
flagsArray+=("${prefixKey:---prefix}" "$prefix")
fi
echoCmd 'zig install flags' "${flagsArray[@]}"
zig build install "${flagsArray[@]}"
runHook postInstall
}
# shellcheck disable=SC2154
addEnvHooks "$targetOffset" zigSetGlobalCacheDir
if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then
buildPhase=zigBuildPhase
fi
if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then
checkPhase=zigCheckPhase
fi
if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then
installPhase=zigInstallPhase
fi

View File

@ -1,117 +0,0 @@
{
lib,
callPackage,
cmake,
coreutils,
fetchFromGitHub,
libxml2,
llvmPackages,
stdenv,
testers,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zig";
version = "0.12.1";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig";
rev = finalAttrs.version;
hash = "sha256-C56jyVf16Co/XCloMLSRsbG9r/gBc8mzCdeEMHV2T2s=";
};
nativeBuildInputs = [
cmake
(lib.getDev llvmPackages.llvm)
];
buildInputs =
[
libxml2
zlib
]
++ (with llvmPackages; [
libclang
lld
llvm
]);
# On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build,
# which parses /System/Library/CoreServices/SystemVersion.plist and
# /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the
# OS version. This causes the build to fail during stage 3 with
# OSVersionDetectionFail when the sandbox is enabled.
__impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [
"/System/Library/CoreServices/.SystemVersionPlatform.plist"
"/System/Library/CoreServices/SystemVersion.plist"
];
outputs = [
"out"
"doc"
];
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
(lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
# ensure determinism in the compiler build
(lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline")
# always link against static build of LLVM
(lib.cmakeBool "ZIG_STATIC_LLVM" true)
];
env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
doInstallCheck = true;
# strictDeps breaks zig when clang is being used.
# https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395
strictDeps = !stdenv.cc.isClang;
# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
# work in Nix's sandbox. Use env from our coreutils instead.
postPatch = ''
substituteInPlace lib/std/zig/system.zig \
--replace "/usr/bin/env" "${lib.getExe' coreutils "env"}"
'';
postBuild = ''
stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig
'';
postInstall = ''
install -Dm444 langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
'';
installCheckPhase = ''
runHook preInstallCheck
$out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig
runHook postInstallCheck
'';
passthru = {
hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "zig version";
};
};
};
meta = {
description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
homepage = "https://ziglang.org/";
license = lib.licenses.mit;
mainProgram = "zig";
maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
platforms = lib.platforms.unix;
};
})

View File

@ -1,43 +0,0 @@
{ makeSetupHook, zig }:
makeSetupHook {
name = "zig-hook";
propagatedBuildInputs = [ zig ];
substitutions = {
# This zig_default_flags below is meant to avoid CPU feature impurity in
# Nixpkgs. However, this flagset is "unstable": it is specifically meant to
# be controlled by the upstream development team - being up to that team
# exposing or not that flags to the outside (especially the package manager
# teams).
# Because of this hurdle, @andrewrk from Zig Software Foundation proposed
# some solutions for this issue. Hopefully they will be implemented in
# future releases of Zig. When this happens, this flagset should be
# revisited accordingly.
# Below are some useful links describing the discovery process of this 'bug'
# in Nixpkgs:
# https://github.com/NixOS/nixpkgs/issues/169461
# https://github.com/NixOS/nixpkgs/issues/185644
# https://github.com/NixOS/nixpkgs/pull/197046
# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485
# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653
zig_default_flags = [
"-Dcpu=baseline"
"--release=safe"
];
};
passthru = {
inherit zig;
};
meta = {
description = "Setup hook for using the Zig compiler in Nixpkgs";
inherit (zig.meta) maintainers platforms broken;
};
} ./setup-hook.sh

View File

@ -1,69 +0,0 @@
# shellcheck shell=bash
# shellcheck disable=SC2034
readonly zigDefaultFlagsArray=(@zig_default_flags@)
function zigSetGlobalCacheDir {
ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)
export ZIG_GLOBAL_CACHE_DIR
}
function zigBuildPhase {
runHook preBuild
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray
echoCmd 'zig build flags' "${flagsArray[@]}"
zig build "${flagsArray[@]}"
runHook postBuild
}
function zigCheckPhase {
runHook preCheck
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigCheckFlags zigCheckFlagsArray
echoCmd 'zig check flags' "${flagsArray[@]}"
zig build test "${flagsArray[@]}"
runHook postCheck
}
function zigInstallPhase {
runHook preInstall
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray \
zigInstallFlags zigInstallFlagsArray
if [ -z "${dontAddPrefix-}" ]; then
# Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/`
flagsArray+=("${prefixKey:---prefix}" "$prefix")
fi
echoCmd 'zig install flags' "${flagsArray[@]}"
zig build install "${flagsArray[@]}"
runHook postInstall
}
# shellcheck disable=SC2154
addEnvHooks "$targetOffset" zigSetGlobalCacheDir
if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then
buildPhase=zigBuildPhase
fi
if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then
checkPhase=zigCheckPhase
fi
if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then
installPhase=zigInstallPhase
fi

View File

@ -1,117 +0,0 @@
{
lib,
callPackage,
cmake,
coreutils,
fetchFromGitHub,
libxml2,
llvmPackages,
stdenv,
testers,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zig";
version = "0.13.0";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig";
rev = finalAttrs.version;
hash = "sha256-5qSiTq+UWGOwjDVZMIrAt2cDKHkyNPBSAEjpRQUByFM=";
};
nativeBuildInputs = [
cmake
(lib.getDev llvmPackages.llvm)
];
buildInputs =
[
libxml2
zlib
]
++ (with llvmPackages; [
libclang
lld
llvm
]);
# On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build,
# which parses /System/Library/CoreServices/SystemVersion.plist and
# /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the
# OS version. This causes the build to fail during stage 3 with
# OSVersionDetectionFail when the sandbox is enabled.
__impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [
"/System/Library/CoreServices/.SystemVersionPlatform.plist"
"/System/Library/CoreServices/SystemVersion.plist"
];
outputs = [
"out"
"doc"
];
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
(lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
# ensure determinism in the compiler build
(lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline")
# always link against static build of LLVM
(lib.cmakeBool "ZIG_STATIC_LLVM" true)
];
env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
doInstallCheck = true;
# strictDeps breaks zig when clang is being used.
# https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395
strictDeps = !stdenv.cc.isClang;
# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
# work in Nix's sandbox. Use env from our coreutils instead.
postPatch = ''
substituteInPlace lib/std/zig/system.zig \
--replace "/usr/bin/env" "${lib.getExe' coreutils "env"}"
'';
postBuild = ''
stage3/bin/zig build langref
'';
postInstall = ''
install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
'';
installCheckPhase = ''
runHook preInstallCheck
$out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig
runHook postInstallCheck
'';
passthru = {
hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "zig version";
};
};
};
meta = {
description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
homepage = "https://ziglang.org/";
license = lib.licenses.mit;
mainProgram = "zig";
maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
platforms = lib.platforms.unix;
};
})

View File

@ -1,29 +0,0 @@
{ makeSetupHook, zig }:
makeSetupHook {
name = "zig-hook";
propagatedBuildInputs = [ zig ];
substitutions = {
# This zig_default_flags below is meant to avoid CPU feature impurity in
# Nixpkgs. However, this flagset is "unstable": it is specifically meant to
# be controlled by the upstream development team - being up to that team
# exposing or not that flags to the outside (especially the package manager
# teams).
zig_default_flags = [
"-Dcpu=baseline"
"--release=safe"
"--color off" # Turn off progress output
];
};
passthru = {
inherit zig;
};
meta = {
description = "A setup hook for using the Zig compiler in Nixpkgs";
inherit (zig.meta) maintainers platforms broken;
};
} ./setup-hook.sh

View File

@ -1,69 +0,0 @@
# shellcheck shell=bash
# shellcheck disable=SC2034
readonly zigDefaultFlagsArray=(@zig_default_flags@)
function zigSetGlobalCacheDir {
ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)
export ZIG_GLOBAL_CACHE_DIR
}
function zigBuildPhase {
runHook preBuild
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray
echoCmd 'zig build flags' "${flagsArray[@]}"
zig build "${flagsArray[@]}"
runHook postBuild
}
function zigCheckPhase {
runHook preCheck
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigCheckFlags zigCheckFlagsArray
echoCmd 'zig check flags' "${flagsArray[@]}"
zig build test "${flagsArray[@]}"
runHook postCheck
}
function zigInstallPhase {
runHook preInstall
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray \
zigInstallFlags zigInstallFlagsArray
if [ -z "${dontAddPrefix-}" ]; then
# Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/`
flagsArray+=("${prefixKey:---prefix}" "$prefix")
fi
echoCmd 'zig install flags' "${flagsArray[@]}"
zig build install "${flagsArray[@]}"
runHook postInstall
}
# shellcheck disable=SC2154
addEnvHooks "$targetOffset" zigSetGlobalCacheDir
if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then
buildPhase=zigBuildPhase
fi
if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then
checkPhase=zigCheckPhase
fi
if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then
installPhase=zigInstallPhase
fi

View File

@ -1,113 +0,0 @@
{
lib,
callPackage,
cmake,
coreutils,
fetchFromGitHub,
libxml2,
llvmPackages,
stdenv,
testers,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zig";
version = "0.9.1";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig";
rev = finalAttrs.version;
hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k=";
};
patches = [
# Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev)
./000-0.9-read-dynstr-at-rpath-offset.patch
# Fix build on macOS 13 (cherry-picked from 0.10-dev)
./001-0.9-bump-macos-supported-version.patch
];
nativeBuildInputs = [
cmake
(lib.getDev llvmPackages.llvm)
];
buildInputs =
[
libxml2
zlib
]
++ (with llvmPackages; [
libclang
lld
llvm
]);
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
(lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
# ensure determinism in the compiler build
(lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline")
];
env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
doInstallCheck = true;
strictDeps = true;
prePatch =
let
zig_0_10_0 = fetchFromGitHub {
owner = "ziglang";
repo = "zig";
rev = "0.10.0";
hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw=";
};
in
''
cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any
cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu
cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu
cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/
'';
# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
# work in Nix's sandbox. Use env from our coreutils instead.
postPatch = ''
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
--replace "/usr/bin/env" "${lib.getExe' coreutils "env"}"
'';
installCheckPhase = ''
runHook preInstallCheck
$out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig
runHook postInstallCheck
'';
passthru = {
hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "zig version";
};
};
};
meta = {
description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
homepage = "https://ziglang.org/";
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
license = lib.licenses.mit;
mainProgram = "zig";
maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
platforms = lib.platforms.unix;
};
})

View File

@ -1,43 +0,0 @@
{ makeSetupHook, zig }:
makeSetupHook {
name = "zig-hook";
propagatedBuildInputs = [ zig ];
substitutions = {
# This zig_default_flags below is meant to avoid CPU feature impurity in
# Nixpkgs. However, this flagset is "unstable": it is specifically meant to
# be controlled by the upstream development team - being up to that team
# exposing or not that flags to the outside (especially the package manager
# teams).
# Because of this hurdle, @andrewrk from Zig Software Foundation proposed
# some solutions for this issue. Hopefully they will be implemented in
# future releases of Zig. When this happens, this flagset should be
# revisited accordingly.
# Below are some useful links describing the discovery process of this 'bug'
# in Nixpkgs:
# https://github.com/NixOS/nixpkgs/issues/169461
# https://github.com/NixOS/nixpkgs/issues/185644
# https://github.com/NixOS/nixpkgs/pull/197046
# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485
# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653
zig_default_flags = [
"-Dcpu=baseline"
"-Drelease-safe=true"
];
};
passthru = {
inherit zig;
};
meta = {
description = "Setup hook for using the Zig compiler in Nixpkgs";
inherit (zig.meta) maintainers platforms broken;
};
} ./setup-hook.sh

View File

@ -1,69 +0,0 @@
# shellcheck shell=bash
# shellcheck disable=SC2034
readonly zigDefaultFlagsArray=(@zig_default_flags@)
function zigSetGlobalCacheDir {
ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)
export ZIG_GLOBAL_CACHE_DIR
}
function zigBuildPhase {
runHook preBuild
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray
echoCmd 'zig build flags' "${flagsArray[@]}"
zig build "${flagsArray[@]}"
runHook postBuild
}
function zigCheckPhase {
runHook preCheck
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigCheckFlags zigCheckFlagsArray
echoCmd 'zig check flags' "${flagsArray[@]}"
zig build test "${flagsArray[@]}"
runHook postCheck
}
function zigInstallPhase {
runHook preInstall
local flagsArray=()
concatTo flagsArray zigDefaultFlagsArray \
zigBuildFlags zigBuildFlagsArray \
zigInstallFlags zigInstallFlagsArray
if [ -z "${dontAddPrefix-}" ]; then
# Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/`
flagsArray+=("${prefixKey:---prefix}" "$prefix")
fi
echoCmd 'zig install flags' "${flagsArray[@]}"
zig build install "${flagsArray[@]}"
runHook postInstall
}
# shellcheck disable=SC2154
addEnvHooks "$targetOffset" zigSetGlobalCacheDir
if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then
buildPhase=zigBuildPhase
fi
if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then
checkPhase=zigCheckPhase
fi
if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then
installPhase=zigInstallPhase
fi

View File

@ -0,0 +1,34 @@
{
lib,
stdenv,
zig,
runCommand,
makeWrapper,
}:
let
targetPrefix = lib.optionalString (
stdenv.hostPlatform != stdenv.targetPlatform
) "${stdenv.targetPlatform.config}-";
in
runCommand "zig-bintools-${zig.version}"
{
pname = "zig-bintools";
inherit (zig) version meta;
nativeBuildInputs = [ makeWrapper ];
passthru = {
isZig = true;
inherit targetPrefix;
};
inherit zig;
}
''
mkdir -p $out/bin
for tool in ar objcopy ranlib; do
makeWrapper "$zig/bin/zig" "$out/bin/${targetPrefix}$tool" \
--add-flags "$tool" \
--run "export ZIG_GLOBAL_CACHE_DIR=\$(mktemp -d)"
done
''

View File

@ -1,42 +1,38 @@
{ {
lib, lib,
wrapCCWith,
makeWrapper,
runCommand, runCommand,
stdenv,
targetPackages,
zig, zig,
stdenv,
makeWrapper,
}: }:
wrapCCWith { let
cc = targetPrefix = lib.optionalString (
runCommand "zig-cc-${zig.version}" stdenv.hostPlatform != stdenv.targetPlatform
{ ) "${stdenv.targetPlatform.config}-";
pname = "zig-cc"; in
inherit (zig) version meta; runCommand "zig-cc-${zig.version}"
{
pname = "zig-cc";
inherit (zig) version meta;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
passthru.isZig = true; passthru = {
inherit zig; isZig = true;
} inherit targetPrefix;
'' };
mkdir -p $out/bin
for tool in ar cc c++ objcopy; do
makeWrapper "$zig/bin/zig" "$out/bin/$tool" \
--add-flags "$tool" \
--run "export ZIG_GLOBAL_CACHE_DIR=\$(mktemp -d)"
done
mv $out/bin/c++ $out/bin/clang++ inherit zig;
mv $out/bin/cc $out/bin/clang }
''; ''
mkdir -p $out/bin
for tool in cc c++ ld.lld; do
makeWrapper "$zig/bin/zig" "$out/bin/${targetPrefix}$tool" \
--add-flags "$tool" \
--run "export ZIG_GLOBAL_CACHE_DIR=\$(mktemp -d)"
done
nixSupport.cc-cflags = mv $out/bin/${targetPrefix}c++ $out/bin/${targetPrefix}clang++
[ mv $out/bin/${targetPrefix}cc $out/bin/${targetPrefix}clang
"-target" mv $out/bin/${targetPrefix}ld.lld $out/bin/${targetPrefix}ld
"${stdenv.targetPlatform.parsed.cpu.name}-${stdenv.targetPlatform.parsed.kernel.name}-${stdenv.targetPlatform.parsed.abi.name}" ''
]
++ lib.optional (
stdenv.targetPlatform.isLinux && !(targetPackages.isStatic or false)
) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}";
}

View File

@ -0,0 +1,48 @@
{
lib,
callPackage,
llvmPackages_13,
llvmPackages_15,
llvmPackages_16,
llvmPackages_17,
llvmPackages_18,
zigVersions ? { },
}:
let
versions = {
"0.9.1" = {
llvmPackages = llvmPackages_13;
hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k=";
};
"0.10.1" = {
llvmPackages = llvmPackages_15;
hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=";
};
"0.11.0" = {
llvmPackages = llvmPackages_16;
hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I=";
};
"0.12.1" = {
llvmPackages = llvmPackages_17;
hash = "sha256-C56jyVf16Co/XCloMLSRsbG9r/gBc8mzCdeEMHV2T2s=";
};
"0.13.0" = {
llvmPackages = llvmPackages_18;
hash = "sha256-5qSiTq+UWGOwjDVZMIrAt2cDKHkyNPBSAEjpRQUByFM=";
};
} // zigVersions;
mkPackage =
{
version,
hash,
llvmPackages,
}@args:
callPackage ./generic.nix args;
zigPackages = lib.mapAttrs' (
version: args:
lib.nameValuePair (lib.versions.majorMinor version) (mkPackage (args // { inherit version; }))
) versions;
in
zigPackages

View File

@ -1,40 +1,79 @@
{ lib {
, stdenv lib,
, fetchFromGitHub stdenv,
, cmake fetchFromGitHub,
, llvmPackages cmake,
, libxml2 llvmPackages,
, zlib targetPackages,
, coreutils libxml2,
, callPackage zlib,
, ... coreutils,
}: callPackage,
version,
args: hash,
patches ? [ ],
overrideCC,
wrapCCWith,
wrapBintoolsWith,
}@args:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "zig"; pname = "zig";
inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ziglang"; owner = "ziglang";
repo = "zig"; repo = "zig";
rev = finalAttrs.version; rev = finalAttrs.version;
inherit (args) hash; inherit hash;
}; };
patches =
args.patches or [ ]
++ lib.optionals (lib.versions.majorMinor finalAttrs.version == "0.9") [
# Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev)
./patches/0.9-read-dynstr-at-rpath-offset.patch
# Fix build on macOS 13 (cherry-picked from 0.10-dev)
./patches/0.9-bump-macos-supported-version.patch
]
++
lib.optional (lib.versions.majorMinor finalAttrs.version == "0.10")
# Backport alignment related panics from zig-master to 0.10.
# Upstream issue: https://github.com/ziglang/zig/issues/14559
./patches/0.10-macho-fixes.patch;
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
llvmPackages.llvm.dev (lib.getDev llvmPackages.llvm.dev)
]; ];
buildInputs = [ buildInputs =
libxml2 [
zlib libxml2
] ++ (with llvmPackages; [ zlib
libclang ]
lld ++ (with llvmPackages; [
llvm libclang
]); lld
llvm
]);
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
(lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
# ensure determinism in the compiler build
(lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline")
# always link against static build of LLVM
(lib.cmakeBool "ZIG_STATIC_LLVM" true)
];
outputs = [
"out"
] ++ lib.optional (lib.versionAtLeast finalAttrs.version "0.10") "doc";
# strictDeps breaks zig when clang is being used.
# https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395
strictDeps = !stdenv.cc.isClang;
# On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build, # On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build,
# which parses /System/Library/CoreServices/SystemVersion.plist and # which parses /System/Library/CoreServices/SystemVersion.plist and
@ -52,33 +91,76 @@ stdenv.mkDerivation (finalAttrs: {
# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
# work in Nix's sandbox. Use env from our coreutils instead. # work in Nix's sandbox. Use env from our coreutils instead.
postPatch = if lib.versionAtLeast args.version "0.12" then '' postPatch =
substituteInPlace lib/std/zig/system.zig \ if lib.versionAtLeast finalAttrs.version "0.12" then
--replace "/usr/bin/env" "${coreutils}/bin/env" ''
'' else '' substituteInPlace lib/std/zig/system.zig \
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ --replace-fail "/usr/bin/env" "${coreutils}/bin/env"
--replace-fail "/usr/bin/env" "${coreutils}/bin/env" ''
''; else
''
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
--replace-fail "/usr/bin/env" "${coreutils}/bin/env"
'';
postBuild =
if lib.versionAtLeast finalAttrs.version "0.13" then
''
stage3/bin/zig build langref
''
else if lib.versionAtLeast finalAttrs.version "0.11" then
''
stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig
''
else if lib.versionAtLeast finalAttrs.version "0.10" then
''
./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html
''
else
null;
postInstall =
if lib.versionAtLeast finalAttrs.version "0.13" then
''
install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
''
else if lib.versionAtLeast finalAttrs.version "0.10" then
''
install -Dm444 langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
''
else
null;
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''
runHook preInstallCheck runHook preInstallCheck
$out/bin/zig test -I $src/test $src/test/behavior.zig $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig
runHook postInstallCheck runHook postInstallCheck
''; '';
passthru = { passthru = {
hook = callPackage ./hook.nix { hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
zig = finalAttrs.finalPackage;
}; bintools-unwrapped = callPackage ./bintools.nix { zig = finalAttrs.finalPackage; };
cc = callPackage ./cc.nix { bintools = wrapBintoolsWith { bintools = finalAttrs.finalPackage.bintools-unwrapped; };
zig = finalAttrs.finalPackage;
}; cc-unwrapped = callPackage ./cc.nix { zig = finalAttrs.finalPackage; };
stdenv = callPackage ./stdenv.nix { cc = wrapCCWith {
zig = finalAttrs.finalPackage; cc = finalAttrs.finalPackage.cc-unwrapped;
bintools = finalAttrs.finalPackage.bintools;
nixSupport.cc-cflags =
[
"-target"
"${stdenv.targetPlatform.parsed.cpu.name}-${stdenv.targetPlatform.parsed.kernel.name}-${stdenv.targetPlatform.parsed.abi.name}"
]
++ lib.optional (
stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.isStatic or false)
) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}";
}; };
stdenv = overrideCC stdenv finalAttrs.finalPackage.cc;
}; };
meta = { meta = {
@ -90,4 +172,4 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "zig"; mainProgram = "zig";
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} // removeAttrs args [ "hash" ]) })

View File

@ -1,6 +0,0 @@
{
stdenv,
overrideCC,
zig,
}:
overrideCC stdenv zig.cc

View File

@ -9,16 +9,16 @@
php.buildComposerProject2 (finalAttrs: { php.buildComposerProject2 (finalAttrs: {
pname = "castor"; pname = "castor";
version = "0.22.0"; version = "0.22.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jolicode"; owner = "jolicode";
repo = "castor"; repo = "castor";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-PJtl1/Eete7zK81grQHdWtr9PBbLL0lC3nwz0vxtFx0="; hash = "sha256-NzrLxzfw+GjBWIZuBgUg1TCsNjEUqONW60HBZuR9AME=";
}; };
vendorHash = "sha256-TjvbuvOwML9v1fMOA+ld9PM2wyysgL4Ws9Swf+N2nwk="; vendorHash = "sha256-SWauMpiRdxXgCCYNCEMPujOQi1PzUYmYWWhjU6ClWzQ=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -0,0 +1,26 @@
{
buildPecl,
lib,
mpdecimal,
php,
}:
let
version = "1.5.0";
in
buildPecl {
pname = "decimal";
version = version;
hash = "sha256-it8w8hOLYwtCZoDYhaP5k5TD/pQLtj37K2lSESF80ok=";
buildInputs = [ mpdecimal ];
configureFlags = [ "--with-libmpdec-path=${mpdecimal}" ];
meta = {
description = "Arbitrary-precision decimal arithmetic for PHP";
homepage = "https://php-decimal.github.io";
changelog = "https://pecl.php.net/package-changelog.php?package=decimal&release=${version}";
license = lib.licenses.mit;
maintainers = lib.teams.php.members;
};
}

View File

@ -11,7 +11,7 @@
let let
pname = "bitsandbytes"; pname = "bitsandbytes";
version = "0.45.0"; version = "0.45.1";
inherit (torch) cudaPackages cudaSupport; inherit (torch) cudaPackages cudaSupport;
inherit (cudaPackages) cudaVersion; inherit (cudaPackages) cudaVersion;
@ -57,7 +57,7 @@ buildPythonPackage {
owner = "TimDettmers"; owner = "TimDettmers";
repo = "bitsandbytes"; repo = "bitsandbytes";
tag = version; tag = version;
hash = "sha256-HoZNEDhCPgGwFgwT4NqkbUAy0bYqvki75FBZn5aLuKM="; hash = "sha256-MZ+3mUXaAhRb+rBtE+eQqT3XdtFxlWJc/CmTEwQkKSA=";
}; };
# By default, which library is loaded depends on the result of `torch.cuda.is_available()`. # By default, which library is loaded depends on the result of `torch.cuda.is_available()`.

View File

@ -0,0 +1,66 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
setuptools,
hatchling,
cachecontrol,
cryptography,
google-api-python-client,
google-cloud-firestore,
google-cloud-storage,
pyjwt,
requests,
pytestCheckHook,
pytest-localserver,
pytest-mock,
}:
buildPythonPackage rec {
pname = "firebase-admin";
version = "6.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-admin-python";
tag = "v${version}";
hash = "sha256-BjYo/H5CBII9KjefhGUiEeLKBAAsnQABX+21R4pR8wE=";
};
build-system = [ setuptools ];
dependencies = [
cachecontrol
cryptography
google-api-python-client
google-cloud-firestore
google-cloud-storage
pyjwt
requests
];
nativeCheckInputs = [
pytestCheckHook
pytest-localserver
pytest-mock
];
__darwinAllowLocalNetworking = true;
disabledTests = [
# Flaky (AssertionError)
# > assert delta <= timedelta(seconds=15)
# E assert datetime.timedelta(seconds=17, microseconds=28239) <= datetime.timedelta(seconds=15)
"test_task_options"
];
meta = {
description = "Firebase Admin Python SDK";
homepage = "https://github.com/firebase/firebase-admin-python";
changelog = "https://github.com/firebase/firebase-admin-python/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ jhahn ];
};
}

View File

@ -0,0 +1,58 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
numpy,
pandas,
pydantic,
regex,
requests,
markdownify,
tls-client,
beautifulsoup4,
}:
buildPythonPackage rec {
pname = "jobspy";
version = "1.1.75";
pyproject = true;
src = fetchFromGitHub {
owner = "Bunsly";
repo = "JobSpy";
tag = version;
hash = "sha256-Wb8opQ3fsCsRuQQ8lwb9luhZbIW/x3OqLYI0PqNsMoc=";
};
pythonRelaxDeps = [
"numpy"
"markdownify"
];
build-system = [ poetry-core ];
dependencies = [
numpy
pandas
pydantic
regex
requests
markdownify
tls-client
beautifulsoup4
];
pythonImportsCheck = [ "jobspy" ];
# no package tests because they all require networking/polling
meta = {
description = "Jobs scraper library for job sites";
downloadPage = "https://github.com/Bunsly/JobSpy";
homepage = "https://github.com/Bunsly/JobSpy";
changelog = "https://github.com/Bunsly/JobSpy/releases/tag/${version}";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ ethancedwards8 ];
};
}

View File

@ -18,13 +18,13 @@
buildGoModule rec { buildGoModule rec {
pname = "buildah"; pname = "buildah";
version = "1.38.1"; version = "1.39.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = "buildah"; repo = "buildah";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Pc+JHUkGeLRfzgQCrYzsdvLEYctqPCDweS2H/ky8ltA="; hash = "sha256-R2iZpZkofg6kMTQ/kOjgKLQYw+yQQ5P3AAyBeo81lGU=";
}; };
outputs = [ outputs = [

View File

@ -11,13 +11,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "jackett"; pname = "jackett";
version = "0.22.1177"; version = "0.22.1310";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha512-C4fwh47IDsJmmXPY9Rb7LKdXvFlEVQE8ycHu1s26A9ZBP69eVP+ai08ibCJDDk13DCQYk2BCO7cRtWq2PC1P8w=="; hash = "sha512-sdAhwqM46ULgqhwd6qU4ZlmrSWqapJ9MhDAMH/E96kBXXPq5VAPaVe8lKWnJbhDK8lYiVEfcEtcKZFON/uTeRQ==";
}; };
projectFile = "src/Jackett.Server/Jackett.Server.csproj"; projectFile = "src/Jackett.Server/Jackett.Server.csproj";

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "klipper"; pname = "klipper";
version = "0.12.0-unstable-2024-10-26"; version = "0.12.0-unstable-2025-02-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KevinOConnor"; owner = "KevinOConnor";
repo = "klipper"; repo = "klipper";
rev = "31fe50ffa387ed4a45950c1043a3b214a9d554dd"; rev = "01b0e98ab21d505abcc5be83cca2b4ae1d0651eb";
sha256 = "sha256-szGAQ5ttT1Y0q3pf6m9xNHreNjdmdWU8k0hwcT/6MDA="; sha256 = "sha256-p3p7GV6Y+zY7tb08e1vvAqo1Xn3UE4Ma6mCchIqC9/o=";
}; };
sourceRoot = "${src.name}/klippy"; sourceRoot = "${src.name}/klippy";

View File

@ -3,21 +3,31 @@
fetchFromGitHub, fetchFromGitHub,
lib, lib,
rustPlatform, rustPlatform,
fetchpatch2,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "laurel"; pname = "laurel";
version = "0.6.4"; version = "0.6.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "threathunters-io"; owner = "threathunters-io";
repo = "laurel"; repo = "laurel";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-mp1XTFD6mvH3RzvzvnJ58iJ6/EjENKYSzOavC2rVixs="; hash = "sha256-1UjIye+btsNtf9Klti/3frgO7M+D05WkC1iP+TPQkZk=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-hqOtICFufmx7mNzinPpj2/abjKINR4QGoNZrk5I3GIQ="; cargoHash = "sha256-N5mgd2c/eD0QEUQ4Oe7JI/2yI0B1pawYfc4ZKZAu4Sk=";
patches = [
# https://github.com/threathunters-io/laurel/commit/d2fc51c83e78aecd5c4ce922582df649c2600e1e
# Unbreaks the userdb::test::userdb test. Will be part of the next release (likely v0.6.6).
(fetchpatch2 {
url = "https://github.com/threathunters-io/laurel/commit/d2fc51c83e78aecd5c4ce922582df649c2600e1e.patch?full_index=1";
hash = "sha256-OId5ZCF71ikoCSggyy3u4USR71onFJpirp53k4M17Vo=";
})
];
postPatch = '' postPatch = ''
# Upstream started to redirect aarch64-unknown-linux-gnu to aarch64-linux-gnu-gcc # Upstream started to redirect aarch64-unknown-linux-gnu to aarch64-linux-gnu-gcc
@ -32,7 +42,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "Transform Linux Audit logs for SIEM usage"; description = "Transform Linux Audit logs for SIEM usage";
homepage = "https://github.com/threathunters-io/laurel"; homepage = "https://github.com/threathunters-io/laurel";
changelog = "https://github.com/threathunters-io/laurel/releases/tag/v${version}"; changelog = "https://github.com/threathunters-io/laurel/releases/tag/${src.tag}";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilylange ]; maintainers = with maintainers; [ emilylange ];
platforms = platforms.linux; platforms = platforms.linux;

View File

@ -1,11 +1,10 @@
{ {
check_interfaces,
fetchurl, fetchurl,
lib, lib,
net-snmp, net-snmp,
nix-update-script, nix-update-script,
stdenv, stdenv,
testers, versionCheckHook,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "check_interfaces"; pname = "check_interfaces";
@ -27,11 +26,11 @@ stdenv.mkDerivation rec {
rm --recursive $out/include rm --recursive $out/include
''; '';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = check_interfaces;
};
}; };
meta = { meta = {

View File

@ -52,11 +52,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xwayland"; pname = "xwayland";
version = "24.1.4"; version = "24.1.5";
src = fetchurl { src = fetchurl {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
hash = "sha256-2Wp426uBn1V1AXNERESZW1Ax69zBW3ev672NvAKvNPQ="; hash = "sha256-y0vRcOb6a1RboFZ76PaT0u7M/GLQTGcDfdFPBtqtNh0=";
}; };
postPatch = '' postPatch = ''

View File

@ -7,6 +7,7 @@
qttools, qttools,
replaceVars, replaceVars,
libGLU, libGLU,
zlib,
wrapQtAppsHook, wrapQtAppsHook,
fetchpatch, fetchpatch,
}: }:
@ -19,12 +20,13 @@ stdenv.mkDerivation {
owner = "niftools"; owner = "niftools";
repo = "nifskope"; repo = "nifskope";
rev = "47b788d26ae0fa12e60e8e7a4f0fa945a510c7b2"; # `v${version}` doesn't work with submodules rev = "47b788d26ae0fa12e60e8e7a4f0fa945a510c7b2"; # `v${version}` doesn't work with submodules
sha256 = "1wqpn53rkq28ws3apqghkzyrib4wis91x171ns64g8kp4q6mfczi"; hash = "sha256-8TNXDSZ3okeMtuGEHpKOnKyY/Z/w4auG5kjgmUexF/M=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ patches = [
./external-lib-paths.patch ./external-lib-paths.patch
./zlib.patch
(replaceVars ./qttools-bins.patch { (replaceVars ./qttools-bins.patch {
qttools = "${qttools.dev}/bin"; qttools = "${qttools.dev}/bin";
}) })
@ -39,6 +41,7 @@ stdenv.mkDerivation {
qtbase qtbase
qttools qttools
libGLU libGLU
zlib
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
qmake qmake

View File

@ -0,0 +1,39 @@
diff --git a/NifSkope.pro b/NifSkope.pro
index 89b8471f6410..8e136ddf44c6 100644
--- a/NifSkope.pro
+++ b/NifSkope.pro
@@ -17,7 +17,7 @@ contains(QT_VERSION, ^5\\.[0-6]\\..*) {
CONFIG += c++14
# Dependencies
-CONFIG += nvtristrip qhull zlib lz4 fsengine gli
+CONFIG += nvtristrip qhull lz4 fsengine gli
# Debug/Release options
CONFIG(debug, debug|release) {
@@ -345,14 +345,6 @@ gli {
HEADERS += $$files($$PWD/lib/gli/external/glm/*.inl, true)
}
-zlib {
- !*msvc*:QMAKE_CFLAGS += -isystem ./lib/zlib
- !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/zlib
- else:INCLUDEPATH += lib/zlib
- HEADERS += $$files($$PWD/lib/zlib/*.h, false)
- SOURCES += $$files($$PWD/lib/zlib/*.c, false)
-}
-
lz4 {
DEFINES += LZ4_STATIC XXH_PRIVATE_API
@@ -442,6 +434,10 @@ win32 {
LIBS += -lopengl32 -lglu32
}
+unix {
+ LIBS += -lz
+}
+
unix:!macx {
LIBS += -lGLU
}

View File

@ -10841,26 +10841,21 @@ with pkgs;
stdenv; stdenv;
}; };
# requires a newer Apple SDK inherit (rec {
zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9 { zigPackages = recurseIntoAttrs (callPackage ../development/compilers/zig {});
llvmPackages = llvmPackages_13;
}; zig_0_9 = zigPackages."0.9";
# requires a newer Apple SDK zig_0_10 = zigPackages."0.10";
zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10 { zig_0_11 = zigPackages."0.11";
llvmPackages = llvmPackages_15; zig_0_12 = zigPackages."0.12";
}; zig_0_13 = zigPackages."0.13";
# requires a newer Apple SDK }) zigPackages
zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11 { zig_0_9
llvmPackages = llvmPackages_16; zig_0_10
}; zig_0_11
# requires a newer Apple SDK zig_0_12
zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12 { zig_0_13;
llvmPackages = llvmPackages_17;
};
# requires a newer Apple SDK
zig_0_13 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.13 {
llvmPackages = llvmPackages_18;
};
zig = zig_0_13; zig = zig_0_13;
zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv; zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv;

View File

@ -292,6 +292,8 @@ lib.makeScope pkgs.newScope (
inherit (pkgs) darwin; inherit (pkgs) darwin;
}; };
decimal = callPackage ../development/php-packages/decimal { };
ds = callPackage ../development/php-packages/ds { }; ds = callPackage ../development/php-packages/ds { };
event = callPackage ../development/php-packages/event { }; event = callPackage ../development/php-packages/event { };

View File

@ -4656,6 +4656,8 @@ self: super: with self; {
firebase-messaging = callPackage ../development/python-modules/firebase-messaging { }; firebase-messaging = callPackage ../development/python-modules/firebase-messaging { };
firebase-admin = callPackage ../development/python-modules/firebase-admin { };
fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { }; fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { };
firetv = callPackage ../development/python-modules/firetv { }; firetv = callPackage ../development/python-modules/firetv { };
@ -6709,6 +6711,8 @@ self: super: with self; {
joblib = callPackage ../development/python-modules/joblib { }; joblib = callPackage ../development/python-modules/joblib { };
jobspy = callPackage ../development/python-modules/jobspy { };
johnnycanencrypt = callPackage ../development/python-modules/johnnycanencrypt { johnnycanencrypt = callPackage ../development/python-modules/johnnycanencrypt {
inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; inherit (pkgs.darwin.apple_sdk.frameworks) PCSC;
}; };