mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-13 07:57:32 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
725f8c39d3
@ -7727,6 +7727,13 @@
|
||||
githubId = 1608697;
|
||||
name = "Jens Binkert";
|
||||
};
|
||||
jeremiahs = {
|
||||
email = "jeremiah@secrist.xyz";
|
||||
github = "JeremiahSecrist";
|
||||
githubId = 26032621;
|
||||
matrix = "@jeremiahs:matrix.org";
|
||||
name = "Jeremiah Secrist";
|
||||
};
|
||||
jeremyschlatter = {
|
||||
email = "github@jeremyschlatter.com";
|
||||
github = "jeremyschlatter";
|
||||
|
||||
@ -195,7 +195,9 @@ in
|
||||
--seed="${cfg.seed}" \
|
||||
--definitions="$amendedRepartDefinitions" \
|
||||
--split="${lib.boolToString cfg.split}" \
|
||||
image.raw
|
||||
--json=pretty \
|
||||
image.raw \
|
||||
| tee repart-output.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -206,7 +206,7 @@ if [[ -z $noBootLoader ]]; then
|
||||
mount --rbind --mkdir / "$mountPoint"
|
||||
mount --make-rslave "$mountPoint"
|
||||
/run/current-system/bin/switch-to-configuration boot
|
||||
umount -R "$mountPoint" && rmdir "$mountPoint"
|
||||
umount -R "$mountPoint" && (rmdir "$mountPoint" 2>/dev/null || true)
|
||||
EOF
|
||||
)"
|
||||
fi
|
||||
|
||||
33
pkgs/applications/display-managers/lemurs/default.nix
Normal file
33
pkgs/applications/display-managers/lemurs/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
linux-pam,
|
||||
rustPlatform,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lemurs";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coastalwhite";
|
||||
repo = "lemurs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6mNSLEWafw8yDGnemOhEiK8FTrBC+6+PuhlbOXTGmN0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nfUBC1HSs7PcIbD7MViJFkfFAPda83XbAupNeShfwOs=";
|
||||
|
||||
# Fixes a lock issue
|
||||
preConfigure = "cargo update --offline";
|
||||
|
||||
buildInputs = [
|
||||
linux-pam
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A customizable TUI display/login manager written in Rust";
|
||||
homepage = "https://github.com/coastalwhite/lemurs";
|
||||
license = with licenses; [asl20 mit];
|
||||
maintainers = with maintainers; [jeremiahs];
|
||||
};
|
||||
}
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mainsail";
|
||||
version = "2.6.0";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
|
||||
hash = "sha256-zTlM02brIiXWKkRQ4zW+BEp+66iCelNsd+uN6yWfqYM=";
|
||||
hash = "sha256-/ej26rLze/QaxGDtU4XhaejlkbkzZfzB+ib2I+3W8Ho=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
77
pkgs/applications/misc/plots/default.nix
Normal file
77
pkgs/applications/misc/plots/default.nix
Normal file
@ -0,0 +1,77 @@
|
||||
{ fetchFromGitHub
|
||||
, gobject-introspection
|
||||
, lib
|
||||
, libadwaita
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, lmmath
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "plots";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexhuntley";
|
||||
repo = "Plots";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libadwaita
|
||||
(python3.withPackages (p: with p; [
|
||||
numpy
|
||||
pygobject3
|
||||
lark
|
||||
jinja2
|
||||
freetype-py
|
||||
pyopengl
|
||||
pycairo
|
||||
pyglm
|
||||
]))
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
(python3.withPackages (p: with p; [
|
||||
pytest
|
||||
]))
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -D ${lmmath}/share/fonts/opentype/latinmodern-math.otf -t $out/share/fonts/
|
||||
|
||||
install -D res/com.github.alexhuntley.Plots.metainfo.xml -t $out/share/metainfo/
|
||||
install -D res/com.github.alexhuntley.Plots.desktop -t $out/share/applications/
|
||||
install -D res/com.github.alexhuntley.Plots.svg -t $out/share/icons/hicolor/scalable/apps/
|
||||
install -D res/com.github.alexhuntley.Plots-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/
|
||||
|
||||
for lang_dir in help/*; do
|
||||
lang=$(basename "$lang_dir")
|
||||
install -D -t $out/share/help/$lang/plots/ $lang_dir/*
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graph plotting app for GNOME";
|
||||
longDescription = ''
|
||||
Plots is a graph plotting app for GNOME.
|
||||
Plots makes it easy to visualise mathematical formulae.
|
||||
In addition to basic arithmetic operations, it supports trigonometric, hyperbolic, exponential and logarithmic functions, as well as arbitrary sums and products.
|
||||
It can display polar equations, and both implicit and explicit Cartesian equations.
|
||||
'';
|
||||
homepage = "https://github.com/alexhuntley/Plots";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sund3RRR ];
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{ desktop-file-utils
|
||||
, fetchurl
|
||||
, fetchFromSourcehut
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, lib
|
||||
@ -16,9 +16,11 @@ stdenv.mkDerivation rec {
|
||||
pname = "shipments";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.sr.ht/~martijnbraam/shipments/archive/${version}.tar.gz";
|
||||
sha256 = "1znybldx21wjnb8qy6q9p52pi6lfz81743xgrnjmvjji4spwaipf";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~martijnbraam";
|
||||
repo = "shipments";
|
||||
rev = version;
|
||||
hash = "sha256-8wX1s5mPCdMINIQP4m5q5StKqxY6CGBBxIxyQAvU7Pc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "transifex-cli";
|
||||
version = "1.6.9";
|
||||
version = "1.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "transifex";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-92FT0LLo5kw4uCTNVnY+TLegOG5Xs8WWUocU8yb/HJ4=";
|
||||
sha256 = "sha256-76nmlZFLon9EquM7tQ/PReM1rxkzh7x1rNdaP3n4KKg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eks-node-viewer";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k8WCD/FirC62WSmcgM5PmTs/hZEmR9xpneyZ1orcoMI=";
|
||||
sha256 = "sha256-zuez0ELtlphMHP/Pxu5ARnYhkmLJW/ehNrTLXSGmGL8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nUVFQruesP6a74s4UfVrd+2P2lmn1NyVrJBS2dR2QdI=";
|
||||
vendorHash = "sha256-n2H6hiKZqujrJyojO2uQTIMLMHaX//t7328GPK6hxH0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kyverno";
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyverno";
|
||||
repo = "kyverno";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TmnWDCucZ4yQjl0+2hGGoopQ62h+AM1WogC5d+JUIO0=";
|
||||
sha256 = "sha256-kk+NgupFLzbkh/jrbJj9E6H0v3QighKa7DQJoh/fZi8=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ buildGoModule, lib, installShellFiles, fetchFromGitHub }:
|
||||
let
|
||||
short_hash = "69aa892";
|
||||
short_hash = "86497a5";
|
||||
in buildGoModule rec {
|
||||
pname = "deck";
|
||||
version = "1.23.0";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PrpiZBGNb8tWt2RiZ4iHKibN+2EQRm1/tBbDLng/lkA=";
|
||||
hash = "sha256-dmzxCgZ0HLT9he8jS7lMtSFg5vbEbs8q368vE3lafhQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@ -21,7 +21,7 @@ in buildGoModule rec {
|
||||
"-X github.com/kong/deck/cmd.COMMIT=${short_hash}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-brd+gtIHIarMv3l6O6JMDPRFlMwKSLZjBABAvByUC6o=";
|
||||
vendorHash = "sha256-ucwJQSZSBvSJzNQYLeNyCnZETmrNgVPFLjjkr1zP6b4=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd deck \
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vnote";
|
||||
version = "3.15.1";
|
||||
version = "3.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vnotex";
|
||||
repo = "vnote";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-A0OJzhvHP+muPI8N23zD4RTiyK0m3JGr/3uJ0Tqz97c=";
|
||||
hash = "sha256-tcu6y2DqdhFE2nbDkiANDk/Mzidcp8PLi8bWZaI6sH0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://vnotex.github.io/vnote";
|
||||
description = "A pleasant note-taking platform";
|
||||
changelog = "https://github.com/vnotex/vnote/releases/tag/v${finalAttrs.src.rev}";
|
||||
changelog = "https://github.com/vnotex/vnote/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcftools";
|
||||
version = "1.17";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-AfddjnAdhbLHWRckEgCcwE8pthYWrOL6dRFhI95Flsw=";
|
||||
sha256 = "sha256-2bnTYpPkzGKrdHOqJTk4nU4d55sakn1IP26R88POrH4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -58,14 +58,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "budgie-control-center";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-z9apestNLEUKzrCMNo0BNAWeyE6FsUCAzcHIom8LcUs=";
|
||||
sha256 = "sha256-7E23cgX7TkBJT/yansBfvMx0ddfAwrF7mGfqzbyLY4Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "flix";
|
||||
version = "0.38.0";
|
||||
version = "0.39.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
|
||||
sha256 = "sha256-KiN7qpyAd1svRWWRtuj/lRXyHoLNM2FaTWVgFC4aPrg=";
|
||||
sha256 = "sha256-kIH5vv/7pKgfAL1BaWYH6PSyEaKVONcccUczsudyfO4=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avrdude";
|
||||
version = "7.1";
|
||||
version = "7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avrdudes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pGjOefWnf11kG/zFGwYGet1OjAhKsULNGgh6vqvIQ7c=";
|
||||
sha256 = "sha256-/JyhMBcjNklyyXZEFZGTjrTNyafXEdHEhcLz6ZQx9aU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake bison flex ] ++ lib.optionals docSupport [
|
||||
|
||||
@ -1,18 +1,43 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc
|
||||
, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
|
||||
, cryptsetup, lvm2, util-linux, libbytesize, libndctl, nss, volume_key
|
||||
, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
|
||||
, thin-provisioning-tools, makeWrapper, e2fsprogs, libnvme, keyutils
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, gtk-doc
|
||||
, docbook_xml_dtd_43
|
||||
, python3
|
||||
, gobject-introspection
|
||||
, glib
|
||||
, udev
|
||||
, kmod
|
||||
, parted
|
||||
, cryptsetup
|
||||
, lvm2
|
||||
, util-linux
|
||||
, libbytesize
|
||||
, libndctl
|
||||
, nss
|
||||
, volume_key
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
, gptfdisk
|
||||
, libyaml
|
||||
, autoconf-archive
|
||||
, thin-provisioning-tools
|
||||
, makeBinaryWrapper
|
||||
, e2fsprogs
|
||||
, libnvme
|
||||
, keyutils
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libblockdev";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storaged-project";
|
||||
repo = "libblockdev";
|
||||
rev = "${version}-1";
|
||||
sha256 = "sha256-WnHcRKRxfdSRmOW2K/vn1WQ4iPm0uS0Td0cWXaeo5hk=";
|
||||
rev = "${finalAttrs.version}-1";
|
||||
hash = "sha256-tqF96yeBPilF0zQ53RNN7IZ2wVgWQOwbGkvoywN/i+0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
@ -22,13 +47,35 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook pkg-config gtk-doc libxslt docbook_xsl docbook_xml_dtd_43
|
||||
python3 gobject-introspection autoconf-archive makeWrapper
|
||||
autoconf-archive
|
||||
autoreconfHook
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_43
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
libxslt
|
||||
makeBinaryWrapper
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
e2fsprogs glib udev keyutils kmod parted gptfdisk cryptsetup lvm2 util-linux libbytesize
|
||||
libndctl libnvme nss volume_key libyaml
|
||||
cryptsetup
|
||||
e2fsprogs
|
||||
glib
|
||||
gptfdisk
|
||||
keyutils
|
||||
kmod
|
||||
libbytesize
|
||||
libndctl
|
||||
libnvme
|
||||
libyaml
|
||||
lvm2
|
||||
nss
|
||||
parted
|
||||
udev
|
||||
util-linux
|
||||
volume_key
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@ -36,12 +83,12 @@ stdenv.mkDerivation rec {
|
||||
${lib.makeBinPath [ thin-provisioning-tools ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst";
|
||||
description = "A library for manipulating block devices";
|
||||
homepage = "http://storaged.org/libblockdev/";
|
||||
changelog = "https://github.com/storaged-project/libblockdev/raw/${src.rev}/NEWS.rst";
|
||||
license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils
|
||||
maintainers = with maintainers; [ johnazoidberg ];
|
||||
platforms = platforms.linux;
|
||||
license = with lib.licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils
|
||||
maintainers = with lib.maintainers; [ johnazoidberg ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.40.4";
|
||||
version = "2.40.5";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-jRYzeSl6L39RtFUSf5mDbZ/hVyKJ93tjD/PWOiywbaw=";
|
||||
hash = "sha256-feBRomNmhiHZGmGl6xw3cdGnzskABD1K/vBsMmwWA38=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
||||
@ -42,14 +42,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "4.2.3";
|
||||
version = "4.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RadH4cWz1t8bFBsUgeGTsDP9H9vaP/Umd9yBr9qsuu0=";
|
||||
hash = "sha256-fkIl7AZeDzVMz3NJoi0gneCcwcB0gyvp64TFHBeZxDI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.23.3";
|
||||
version = "1.23.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-feD/8GLkewfVwtGRZs8YaWnb96bFICpcH6nkJmCmPgs=";
|
||||
hash = "sha256-d0KONiYS/5JXrl5izFSTYeABEhCW+W9cKpMgk9o9LB4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
||||
23
pkgs/development/python-modules/pyglm/default.nix
Normal file
23
pkgs/development/python-modules/pyglm/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "PyGLM";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zuzu-Typ";
|
||||
repo = "PyGLM";
|
||||
rev = "${version}";
|
||||
hash = "sha256-+On4gqfB9hxuINQdcGcrZyOsphfylUNq7tB2uvjsCkE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Zuzu-Typ/PyGLM";
|
||||
description = "An OpenGL Mathematics (GLM) library for Python written in C++";
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ sund3RRR ];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, boost, tbb
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, boost, tbb
|
||||
, gmp, llvm, clang, sqlite, python3
|
||||
, ocamlPackages, mpfr, ppl, doxygen, graphviz
|
||||
}:
|
||||
@ -11,13 +11,18 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ikos";
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NASA-SW-VnV";
|
||||
repo = "ikos";
|
||||
rev = "v${version}";
|
||||
sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f";
|
||||
hash = "sha256-scaFkUhCkIi41iR6CGPbEndzXkgqTKMb3PDNvhgVbCE=";
|
||||
};
|
||||
|
||||
patches = fetchpatch {
|
||||
url = "https://github.com/NASA-SW-VnV/ikos/commit/2e647432427b3f0dbb639e0371d976ab6406f290.patch";
|
||||
hash = "sha256-ffzjlqEp4qp76Kwl5zpyQlg/xUMt8aLDSSP4XA4ndS8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9Mv+We4VtsnnZJJF5P3+1EhrX6QrcV7hEzYaLqai5IU=";
|
||||
hash = "sha256-ms736KXQjqWnIU7WHQ4k1r6qwCp07N6tufCx9s9biVc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ptfrcsE3YQBqChxbOjkO3xia6ZTI0fGJNXA+q32m9wY=";
|
||||
vendorHash = "sha256-zssmvu1s7O2DdvjxUYkR13CKOe4EYn50RFRRIPBJ9qg=";
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-gateway";
|
||||
version = "2.16.1";
|
||||
version = "2.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-gateway";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SqHGPfmLBLVniknulTVRM+2lpRuL0n7Vvj+joq/uz0o=";
|
||||
sha256 = "sha256-oKmT1qvEWNk0q5JnzsUaCWCsllUtyIAsWXUP4DsmgnA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-piAJj/B9DfjbwXZR6EAwk36vhJvuiX/IEabdctOtwy8=";
|
||||
vendorHash = "sha256-YqDQ6dQQDzkehRN0jWmfjG4acB4rtL2HGHOl71IM8Lk=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopls";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "tools";
|
||||
rev = "gopls/v${version}";
|
||||
sha256 = "sha256-E/QX3J/ux7GAG93b1K7OdDjYBAzte2HMa6bfALtXgcU=";
|
||||
hash = "sha256-2eGnctA5HlNRGv9iV5HoT4ByA8fK/mTxldHll0UMD5c=";
|
||||
};
|
||||
|
||||
modRoot = "gopls";
|
||||
vendorSha256 = "sha256-e83y8bu0xKGEg7o2BWt4CzM2YosLDefFRgTfA0f3ZmI=";
|
||||
vendorHash = "sha256-2H8Qh88ikmEqToGOCOoovcCh3dMToeFP/GavG9dlML8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -97,5 +97,6 @@ stdenv.mkDerivation rec {
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.epl20;
|
||||
maintainers = with maintainers; [ matt-snider ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-deny";
|
||||
rev = version;
|
||||
hash = "sha256-oNo/I0GblFnOZ6+/SBn31jp+Fywlf7PIpJQnWyPn8hU=";
|
||||
hash = "sha256-3k8UPA4zf2WfEZ8fnBhqpYH269nfecBv+68+7IDkuY4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DbC9VeJl0OObZNvMkTIp0caiBMlw2EvJ9ib1TCRlJGQ=";
|
||||
cargoHash = "sha256-w72T2MGtf6+YePscCHBWMzHXnB7+kdguZDuB7Hqs4rI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
23
pkgs/development/tools/rust/specr-transpile/default.nix
Normal file
23
pkgs/development/tools/rust/specr-transpile/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "specr-transpile";
|
||||
version = "0.1.20";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-HXqUp80vPFwG0B+f/Zfem0gOHF/igmtxTvS1c8amLmo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UCIXuVwMDCJkHQJtmRUw6EiGDYCF5DeUVxBrQM4lgxg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Converts Specr lang code to Rust";
|
||||
homepage = "https://github.com/RalfJung/minirust-tooling";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@ -18,7 +18,7 @@ let
|
||||
availableBinaries = {
|
||||
x86_64-linux = {
|
||||
platform = "linux-x64";
|
||||
checksum = "sha256-QL1Kca1yM1P4Tn+Citw4UG6wPX/ji6oBjCONE4tyNPQ=";
|
||||
checksum = "sha256-khMJRCGNIITvs56SHHKxoxptoMBb7lqA3FS293qfMys=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
platform = "linux-arm64";
|
||||
@ -30,7 +30,7 @@ let
|
||||
inherit (binary) platform checksum;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cypress";
|
||||
version = "12.17.2";
|
||||
version = "12.17.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip";
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
From 65d90cd17ad7cd3f9aeeb805a08be780fc5bae1a Mon Sep 17 00:00:00 2001
|
||||
From: Sjoerd Simons <sjoerd@collabora.com>
|
||||
Date: Sun, 22 Aug 2021 16:36:55 +0200
|
||||
Subject: [PATCH] rpi: Copy properties from firmware dtb to the loaded dtb
|
||||
|
||||
The RPI firmware adjusts several property values in the dtb it passes
|
||||
to u-boot depending on the board/SoC revision. Inherit some of these
|
||||
when u-boot loads a dtb itself. Specificaly copy:
|
||||
|
||||
* /model: The firmware provides a more specific string
|
||||
* /memreserve: The firmware defines a reserved range, better keep it
|
||||
* emmc2bus and pcie0 dma-ranges: The C0T revision of the bcm2711 Soc (as
|
||||
present on rpi 400 and some rpi 4B boards) has different values for
|
||||
these then the B0T revision. So these need to be adjusted to boot on
|
||||
these boards
|
||||
* blconfig: The firmware defines the memory area where the blconfig
|
||||
stored. Copy those over so it can be enabled.
|
||||
* /chosen/kaslr-seed: The firmware generates a kaslr seed, take advantage
|
||||
of that.
|
||||
|
||||
Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
|
||||
Origin: https://patchwork.ozlabs.org/project/uboot/patch/20210822143656.289891-1-sjoerd@collabora.com/
|
||||
---
|
||||
board/raspberrypi/rpi/rpi.c | 48 +++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 48 insertions(+)
|
||||
|
||||
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
|
||||
index 372b26b6f2..64b8684b68 100644
|
||||
--- a/board/raspberrypi/rpi/rpi.c
|
||||
+++ b/board/raspberrypi/rpi/rpi.c
|
||||
@@ -495,10 +495,58 @@ void *board_fdt_blob_setup(void)
|
||||
return (void *)fw_dtb_pointer;
|
||||
}
|
||||
|
||||
+int copy_property(void *dst, void *src, char *path, char *property)
|
||||
+{
|
||||
+ int dst_offset, src_offset;
|
||||
+ const fdt32_t *prop;
|
||||
+ int len;
|
||||
+
|
||||
+ src_offset = fdt_path_offset(src, path);
|
||||
+ dst_offset = fdt_path_offset(dst, path);
|
||||
+
|
||||
+ if (src_offset < 0 || dst_offset < 0)
|
||||
+ return -1;
|
||||
+
|
||||
+ prop = fdt_getprop(src, src_offset, property, &len);
|
||||
+ if (!prop)
|
||||
+ return -1;
|
||||
+
|
||||
+ return fdt_setprop(dst, dst_offset, property, prop, len);
|
||||
+}
|
||||
+
|
||||
+/* Copy tweaks from the firmware dtb to the loaded dtb */
|
||||
+void update_fdt_from_fw(void *fdt, void *fw_fdt)
|
||||
+{
|
||||
+ /* Using dtb from firmware directly; leave it alone */
|
||||
+ if (fdt == fw_fdt)
|
||||
+ return;
|
||||
+
|
||||
+ /* The firmware provides a more precie model; so copy that */
|
||||
+ copy_property(fdt, fw_fdt, "/", "model");
|
||||
+
|
||||
+ /* memory reserve as suggested by the firmware */
|
||||
+ copy_property(fdt, fw_fdt, "/", "memreserve");
|
||||
+
|
||||
+ /* Adjust dma-ranges for the SD card and PCI bus as they can depend on
|
||||
+ * the SoC revision
|
||||
+ */
|
||||
+ copy_property(fdt, fw_fdt, "emmc2bus", "dma-ranges");
|
||||
+ copy_property(fdt, fw_fdt, "pcie0", "dma-ranges");
|
||||
+
|
||||
+ /* Bootloader configuration template exposes as nvmem */
|
||||
+ if (copy_property(fdt, fw_fdt, "blconfig", "reg") == 0)
|
||||
+ copy_property(fdt, fw_fdt, "blconfig", "status");
|
||||
+
|
||||
+ /* kernel address randomisation seed as provided by the firmware */
|
||||
+ copy_property(fdt, fw_fdt, "/chosen", "kaslr-seed");
|
||||
+}
|
||||
+
|
||||
int ft_board_setup(void *blob, struct bd_info *bd)
|
||||
{
|
||||
int node;
|
||||
|
||||
+ update_fdt_from_fw(blob, (void *)fw_dtb_pointer);
|
||||
+
|
||||
node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer");
|
||||
if (node < 0)
|
||||
lcd_dt_simplefb_add_node(blob);
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@ -24,10 +24,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
defaultVersion = "2023.01";
|
||||
defaultVersion = "2023.07.02";
|
||||
defaultSrc = fetchurl {
|
||||
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
|
||||
hash = "sha256-aUI7rTgPiaCRZjbonm3L0uRRLVhDCNki0QOdHkMxlQ8=";
|
||||
url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
|
||||
hash = "sha256-a2pIWBwUq7D5W9h8GvTXQJIkBte4AQAqn5Ryf93gIdU=";
|
||||
};
|
||||
buildUBoot = lib.makeOverridable ({
|
||||
version ? null
|
||||
@ -48,11 +48,6 @@ let
|
||||
|
||||
patches = [
|
||||
./0001-configs-rpi-allow-for-bigger-kernels.patch
|
||||
|
||||
# Make U-Boot forward some important settings from the firmware-provided FDT. Fixes booting on BCM2711C0 boards.
|
||||
# See also: https://github.com/NixOS/nixpkgs/issues/135828
|
||||
# Source: https://patchwork.ozlabs.org/project/uboot/patch/20210822143656.289891-1-sjoerd@collabora.com/
|
||||
./0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch
|
||||
] ++ extraPatches;
|
||||
|
||||
postPatch = ''
|
||||
@ -70,6 +65,7 @@ let
|
||||
(buildPackages.python3.withPackages (p: [
|
||||
p.libfdt
|
||||
p.setuptools # for pkg_resources
|
||||
p.pyelftools
|
||||
]))
|
||||
swig
|
||||
which # for scripts/dtc-version.sh
|
||||
@ -487,7 +483,6 @@ in {
|
||||
sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
|
||||
};
|
||||
in buildUBoot {
|
||||
extraMakeFlags = [ "all" "u-boot.itb" ];
|
||||
defconfig = "rock64-rk3328_defconfig";
|
||||
extraMeta = {
|
||||
platforms = [ "aarch64-linux" ];
|
||||
@ -509,7 +504,6 @@ in {
|
||||
};
|
||||
|
||||
ubootRockPro64 = buildUBoot {
|
||||
extraMakeFlags = [ "all" "u-boot.itb" ];
|
||||
extraPatches = [
|
||||
# https://patchwork.ozlabs.org/project/uboot/list/?series=237654&archive=both&state=*
|
||||
(fetchpatch {
|
||||
|
||||
@ -1,31 +1,31 @@
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-t+nFutMp1DwK7S9rQXcGQJjG/8plmlu5rJ1v5t8zJzE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-7GoW0Re4NZa31mmNPto9fCVzKCl5ymUYQCwmDfuAnIc=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-irL+9P+ZmGsAqbCOEtaC0u+YJykRgjG7dJx1qvP197w=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-A3EGk+dsh1/m4rAWKNq6va75pA4OFLo9kSLb0b/1uZA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-6XEtCqlYIFh4Aw/Y+PxvLJmk5os5T0JPMnE2yTdT4Tw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-8OIxMXjCZEurxInuDRAzEZ/Vjn1ixzZRMqXiSKgx7GE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-o2EmkJ9jJAhQS25JCN15GBb+gGFOiKS/87PW2ge0YNg=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-japMeJETDPy0RaxJOs6dDktQfTZ1sLB4jotxLYZhxfc=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-YjecZiVwaK3/1In5uKSE5pF21YQJNpxEpPK0abNf3iQ=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-E1MsoM3ZDaEPFLvXWt/+0hv8CVu2v9xlX0rvh4vmj6Y=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-Or650AgvB/452wFiBLw1DezLIzYMSg0dQG66HeKypYg=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_armv6.tar.gz";
|
||||
sha256 = "sha256-LovoihsVGtDif7sSqS3CE3QXNv2v2aSLr/x9sq2j78E=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-i/jKr05o7UeXdEPusTQP0FeQoATl36ydDgtg5w/pMO4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_armv7.tar.gz";
|
||||
sha256 = "sha256-ArTTEWD0yYLRrX8jytkMtKWLbEfr90O4i73dMjA+sdE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.34";
|
||||
version = "0.107.35";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -149,6 +149,9 @@ in stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals (versionAtLeast version "4.4") [ "--link-model=static" ]
|
||||
++ map (lib: "--use-system-${lib}") system-libraries;
|
||||
|
||||
# This seems to fix mongodb not able to find OpenSSL's crypto.h during build
|
||||
hardeningDisable = [ "fortify3" ];
|
||||
|
||||
preBuild = ''
|
||||
sconsFlags+=" CC=$CC"
|
||||
sconsFlags+=" CXX=$CXX"
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shiori";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
|
||||
vendorHash = "sha256-8aiaG2ry/XXsosbrLBmwnjbwIhbKMdM6WHae07MG7WI=";
|
||||
vendorHash = "sha256-suWdtqf5IZntEVD+NHGD6RsL1tjcGH9vh5skISW+aCc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -12,7 +12,7 @@ buildGoModule rec {
|
||||
owner = "go-shiori";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QZTYhRz65VLs3Ytv0k8ptfeQ/36M2VBXFaD9zhQXDh8=";
|
||||
sha256 = "sha256-kGPvCYvLLixEH9qih/F3StUyGPqlKukTWLSw41+Mq8E=";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "aws-sso-cli";
|
||||
version = "1.9.10";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "synfinatic";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hDXCH5B4bc0SKv/qzk92bPm366LmdYWTuVVn8KI0avo=";
|
||||
hash = "sha256-Kcjg2xzW8l/3RViJri1UpG36YkmbHbXIKkDQnVr/26g=";
|
||||
};
|
||||
vendorHash = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI=";
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wander";
|
||||
version = "0.10.1";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robinovitch61";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jg83GHNlzPPzzhrLWw686vrmLlDL5L0+OUYqMoYUiJw=";
|
||||
sha256 = "sha256-EIMHCal4jt8tMEfx2Lol2/7IK8uROaNC1ABB+0d0YTg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SqDGXV8MpvEQFAkcE1NWvWjdzYsvbO5vA6k+hpY0js0=";
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "squashfuse";
|
||||
version = "0.2.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vasi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-agapkSl4KEK+7MA2+gcfaXv6+rpG0MQAhAG5At9rXqk=";
|
||||
sha256 = "sha256-gK1k1Ooue3HLtBmPFMZdW4h2Ee1Uy4T26EOBeQICQpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook libtool pkg-config ];
|
||||
|
||||
@ -4,31 +4,39 @@
|
||||
, pkg-config
|
||||
, libgit2
|
||||
, openssl
|
||||
, zlib
|
||||
, stdenv
|
||||
, Security
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fw";
|
||||
version = "2.16.1";
|
||||
version = "2.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brocode";
|
||||
repo = pname;
|
||||
repo = "fw";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nhkirjq2q9sxg4k2scy8vxlqa9ikvr5lid0f22vws07vif4kkfs";
|
||||
hash = "sha256-8Jq7VjTKwq8n9lrwTzazkkrq8/mNacFTwz/M+eAwBWM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-iD3SBSny0mYpmVEInYaylHn0AbtIqTOwJHdFeq3UBaM=";
|
||||
cargoHash = "sha256-tIrACx4KRjfxLyxTiP32PpdN8NegaHBIkINsPGgygVQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
USER = "nixbld";
|
||||
buildInputs = [
|
||||
libgit2
|
||||
openssl
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A workspace productivity booster";
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fwup";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fhunleth";
|
||||
repo = "fwup";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oFGgQa52NPNOouNHvyZoen7jDIqxckpjLFfzfbbcT/c=";
|
||||
sha256 = "sha256-s2TlxksxGYvRqDwRA7eLlXAyT5uPK2DiL8ma1nNVz5Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, libiconv
|
||||
, Security
|
||||
, iputils
|
||||
@ -9,21 +10,27 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gping";
|
||||
version = "1.13.1";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orf";
|
||||
repo = "gping";
|
||||
rev = "gping-v${version}";
|
||||
hash = "sha256-EkoOHyHYcbyqtT1zCq0kmXND1eSADE7QD3QQ01RJtvM=";
|
||||
hash = "sha256-ReP+s2p0X39LVvl3/QF7fsYkU+OvsQyMhyuH8v4HuVU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iDB3ZIlSLEBf+nSxLeQcE93nqMjH29w+z7kwCNksuSk=";
|
||||
cargoHash = "sha256-FTiNxCoEe/iMz68F1CpJHypgrhn4WwwWowuN9I1rl6E=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
nativeCheckInputs = lib.optionals stdenv.isLinux [ iputils ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage gping.1
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/gping --version | grep "${version}"
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmodsecurity";
|
||||
version = "3.0.9";
|
||||
version = "3.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpiderLabs";
|
||||
repo = "ModSecurity";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7tA1fqKK5aGOhWBifLAjDmQ80ven4+OcwAzAowPStzA=";
|
||||
sha256 = "sha256-VaoPpJ0twuGWU7G9AvKK4kq9Ed0BeG2J7B81sOuJVrE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1,61 +1,86 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, pcsclite, qt5
|
||||
, gcc-arm-embedded }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, gcc-arm-embedded
|
||||
, readline
|
||||
, bzip2
|
||||
, openssl
|
||||
, jansson
|
||||
, whereami
|
||||
, lua
|
||||
, Foundation
|
||||
, AppKit
|
||||
, withGui ? true, wrapQtAppsHook, qtbase
|
||||
, withPython ? true, python3
|
||||
, withBlueshark ? false, bluez5
|
||||
, withGeneric ? false
|
||||
, withSmall ? false
|
||||
, withoutFunctions ? []
|
||||
, hardwarePlatform ? if withGeneric then "PM3GENERIC" else "PM3RDV4"
|
||||
, hardwarePlatformExtras ? lib.optionalString withBlueshark "BTADDON"
|
||||
, standalone ? "LF_SAMYRUN"
|
||||
}:
|
||||
assert withBlueshark -> stdenv.hostPlatform.isLinux;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proxmark3";
|
||||
version = "4.16717";
|
||||
|
||||
let
|
||||
generic = { pname, version, rev, sha256 }:
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Proxmark";
|
||||
repo = "proxmark3";
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gcc-arm-embedded ];
|
||||
buildInputs = [ ncurses readline pcsclite qt5.qtbase ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace client/Makefile --replace '-ltermcap' ' '
|
||||
substituteInPlace liblua/Makefile --replace '-ltermcap' ' '
|
||||
substituteInPlace client/flasher.c \
|
||||
--replace 'armsrc/obj/fullimage.elf' \
|
||||
'${placeholder "out"}/firmware/fullimage.elf'
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
make bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf client
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin client/proxmark3
|
||||
install -T client/flasher $out/bin/proxmark3-flasher
|
||||
install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for proxmark3, powerful general purpose RFID tool";
|
||||
homepage = "http://www.proxmark.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
{
|
||||
proxmark3 = generic rec {
|
||||
pname = "proxmark3";
|
||||
version = "3.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "proxmark3";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qw28n1bhhl91ix77lv50qcr919fq3hjc8zhhqphwxal2svgx2jf";
|
||||
sha256 = "sha256-rkfVgT+9fqlWvUXzLH28Nzd8HldJnU+IZz8conY8Mis=";
|
||||
};
|
||||
|
||||
proxmark3-unstable = generic {
|
||||
pname = "proxmark3-unstable";
|
||||
version = "2019-12-28";
|
||||
rev = "a4ff62be63ca2a81071e9aa2b882bd3ff57f13ad";
|
||||
sha256 = "067lp28xqx61n3i2a2fy489r5frwxqrcfj8cpv3xdzi3gb3vk5c3";
|
||||
patches = [
|
||||
# Don't check for DISPLAY env variable on Darwin. pm3 uses this to test if
|
||||
# XQuartz is installed, however it is not actually required for GUI features
|
||||
./darwin-always-gui.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove hardcoded paths on Darwin
|
||||
substituteInPlace Makefile.defs \
|
||||
--replace "/usr/bin/ar" "ar" \
|
||||
--replace "/usr/bin/ranlib" "ranlib"
|
||||
# Replace hardcoded path to libwhereami
|
||||
substituteInPlace client/Makefile \
|
||||
--replace "/usr/include/whereami.h" "${whereami}/include/whereami.h"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gcc-arm-embedded
|
||||
] ++ lib.optional withGui wrapQtAppsHook;
|
||||
buildInputs = [
|
||||
readline
|
||||
bzip2
|
||||
openssl
|
||||
jansson
|
||||
whereami
|
||||
lua
|
||||
] ++ lib.optional withGui qtbase
|
||||
++ lib.optional withPython python3
|
||||
++ lib.optional withBlueshark bluez5
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"UDEV_PREFIX=${placeholder "out"}/etc/udev/rules.d"
|
||||
"PLATFORM=${hardwarePlatform}"
|
||||
"PLATFORM_EXTRAS=${hardwarePlatformExtras}"
|
||||
"STANDALONE=${standalone}"
|
||||
"USE_BREW=0"
|
||||
] ++ lib.optional withSmall "PLATFORM_SIZE=256"
|
||||
++ map (x: "SKIP_${x}=1") withoutFunctions;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for proxmark3, powerful general purpose RFID tool";
|
||||
homepage = "https://github.com/RfidResearchGroup/proxmark3";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ nyanotech emilytrau ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, gcc-arm-embedded
|
||||
, readline
|
||||
, bzip2
|
||||
, openssl
|
||||
, jansson
|
||||
, whereami
|
||||
, lua
|
||||
, Foundation
|
||||
, AppKit
|
||||
, withGui ? true, wrapQtAppsHook, qtbase
|
||||
, withPython ? true, python3
|
||||
, withBlueshark ? false, bluez5
|
||||
, withGeneric ? false
|
||||
, withSmall ? false
|
||||
, withoutFunctions ? []
|
||||
, hardwarePlatform ? if withGeneric then "PM3GENERIC" else "PM3RDV4"
|
||||
, hardwarePlatformExtras ? lib.optionalString withBlueshark "BTADDON"
|
||||
, standalone ? "LF_SAMYRUN"
|
||||
}:
|
||||
assert withBlueshark -> stdenv.hostPlatform.isLinux;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proxmark3-rrg";
|
||||
version = "4.16717";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "proxmark3";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rkfVgT+9fqlWvUXzLH28Nzd8HldJnU+IZz8conY8Mis=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Don't check for DISPLAY env variable on Darwin. pm3 uses this to test if
|
||||
# XQuartz is installed, however it is not actually required for GUI features
|
||||
./darwin-always-gui.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove hardcoded paths on Darwin
|
||||
substituteInPlace Makefile.defs \
|
||||
--replace "/usr/bin/ar" "ar" \
|
||||
--replace "/usr/bin/ranlib" "ranlib"
|
||||
# Replace hardcoded path to libwhereami
|
||||
substituteInPlace client/Makefile \
|
||||
--replace "/usr/include/whereami.h" "${whereami}/include/whereami.h"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gcc-arm-embedded
|
||||
] ++ lib.optional withGui wrapQtAppsHook;
|
||||
buildInputs = [
|
||||
readline
|
||||
bzip2
|
||||
openssl
|
||||
jansson
|
||||
whereami
|
||||
lua
|
||||
] ++ lib.optional withGui qtbase
|
||||
++ lib.optional withPython python3
|
||||
++ lib.optional withBlueshark bluez5
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"UDEV_PREFIX=${placeholder "out"}/etc/udev/rules.d"
|
||||
"PLATFORM=${hardwarePlatform}"
|
||||
"PLATFORM_EXTRAS=${hardwarePlatformExtras}"
|
||||
"STANDALONE=${standalone}"
|
||||
"USE_BREW=0"
|
||||
] ++ lib.optional withSmall "PLATFORM_SIZE=256"
|
||||
++ map (x: "SKIP_${x}=1") withoutFunctions;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for proxmark3, powerful general purpose RFID tool";
|
||||
homepage = "https://github.com/RfidResearchGroup/proxmark3";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ nyanotech emilytrau ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spire";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
outputs = [ "out" "agent" "server" ];
|
||||
|
||||
@ -10,10 +10,10 @@ buildGoModule rec {
|
||||
owner = "spiffe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aJ9T8OUsHNeWV05MWLet35V0YFyD7QoiExN6PTmHs3w=";
|
||||
sha256 = "sha256-42UEFil9b2z8vfnA5oJvkqcPuSApi61m//RZ4pKZZ5w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4KJysqByDVuK2OU/+sGtpXtSJe4YkVe4OhRyn9tkgsg=";
|
||||
vendorHash = "sha256-H4INblBEWc/AuOn59lXmj5XX6mKrhmRTRVWtVhusW9k=";
|
||||
|
||||
subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];
|
||||
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanata";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtroo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gHkcOn37MNpcP6ra1Eur9O4/trPGmAOAGVU1NwiuQGY=";
|
||||
sha256 = "sha256-Tenh2LARajYAFHJ5gddeozY7rfySSvqFhudc/7b9cGg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-C2d7QdgWd9RTQtXLD4mO0txpzo/SbemJx9YYu62QbqA=";
|
||||
cargoHash = "sha256-oJVGZhKJVK8q5lgK+G+KhVupOF05u37B7Nmv4rrI28I=";
|
||||
|
||||
buildFeatures = lib.optional withCmd "cmd";
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chroma";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
# To update:
|
||||
# nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
|
||||
@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
inherit (srcInfo) sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "0kw53983bjrmh9nk2xcv4d9104krxnc1jh1g44xjmaq8i6f3q0k1";
|
||||
vendorSha256 = "1qawayihklidfzln3jr899wh4zp9w7yq3i18klaylqndrg47k286";
|
||||
|
||||
modRoot = "./cmd/chroma";
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"url": "https://github.com/alecthomas/chroma.git",
|
||||
"rev": "b9e37581208ea7d7f167c59e6f635721617c381b",
|
||||
"date": "2023-03-21T13:55:45+11:00",
|
||||
"path": "/nix/store/52c919gjqdwva73ajwz11iv5gg18vi8y-chroma",
|
||||
"sha256": "0i4ck23gn0v7x6r8wa2k7qiwhxpxqqnaknb9iy9rz8pjcj14ai75",
|
||||
"rev": "e8acfc274c22a76fd38030d2977a2246cd4322b3",
|
||||
"date": "2023-06-30T08:43:39+10:00",
|
||||
"path": "/nix/store/57y15g11dmdy2s6vxrjzl03s03j509gy-chroma",
|
||||
"sha256": "0fdgpi5r0k42qzdn4lxh81ww1zcn9mwfildwrqf1s7crsqmr9dc5",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook-toc";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badboy";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-3lAi9ZNtwhA2OtIR4tN2wiztp3pnRxtaGG0MwGEk0u0=";
|
||||
sha256 = "sha256-Z3ZspXD7M3VVi70+dRz7NhO6msw5htmPRX6VzhA9NPY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-l3ETQ/ARBZmU1wMCK6F/4g6tlxHsEV9D5LO1wue1Jps=";
|
||||
cargoHash = "sha256-5EC9xfjSg0sIkZ2fIkX3SrwL0wzBfpIObFQpkMRj6oM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
||||
@ -1416,6 +1416,8 @@ mapAliases ({
|
||||
protobuf3_11 = throw "protobuf3_11 does not receive updates anymore and has been removed"; # Added 2022-09-28
|
||||
protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21
|
||||
protonup = protonup-ng; # Added 2022-11-06
|
||||
proxmark3-rrg = proxmark3; # Added 2023-07-25
|
||||
proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25
|
||||
proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15
|
||||
pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23
|
||||
pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01
|
||||
|
||||
@ -2508,9 +2508,7 @@ with pkgs;
|
||||
|
||||
fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { };
|
||||
|
||||
fw = callPackage ../tools/misc/fw {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
fw = callPackage ../tools/misc/fw { };
|
||||
|
||||
g810-led = callPackage ../misc/g810-led { };
|
||||
|
||||
@ -11814,6 +11812,8 @@ with pkgs;
|
||||
|
||||
plotinus = callPackage ../tools/misc/plotinus { };
|
||||
|
||||
plots = callPackage ../applications/misc/plots { };
|
||||
|
||||
plotutils = callPackage ../tools/graphics/plotutils { };
|
||||
|
||||
plowshare = callPackage ../tools/misc/plowshare { };
|
||||
@ -11949,10 +11949,7 @@ with pkgs;
|
||||
|
||||
prototypejs = callPackage ../development/libraries/prototypejs { };
|
||||
|
||||
inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; })
|
||||
proxmark3 proxmark3-unstable;
|
||||
|
||||
proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix {
|
||||
proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation AppKit;
|
||||
};
|
||||
|
||||
@ -17083,6 +17080,7 @@ with pkgs;
|
||||
};
|
||||
rusty-man = callPackage ../development/tools/rust/rusty-man { };
|
||||
rustycli = callPackage ../development/tools/rust/rustycli { };
|
||||
specr-transpile = callPackage ../development/tools/rust/specr-transpile { };
|
||||
typeshare = callPackage ../development/tools/rust/typeshare { };
|
||||
|
||||
sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme { };
|
||||
@ -19196,7 +19194,8 @@ with pkgs;
|
||||
iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { };
|
||||
|
||||
ikos = callPackage ../development/tools/analysis/ikos {
|
||||
inherit (llvmPackages_9) stdenv clang llvm;
|
||||
inherit (llvmPackages_14) stdenv clang llvm;
|
||||
tbb = tbb_2021_8;
|
||||
};
|
||||
|
||||
img = callPackage ../development/tools/img { };
|
||||
@ -35004,6 +35003,8 @@ with pkgs;
|
||||
|
||||
insync = callPackage ../applications/networking/insync { };
|
||||
|
||||
lemurs = callPackage ../applications/display-managers/lemurs { };
|
||||
|
||||
libstrangle = callPackage ../tools/X11/libstrangle {
|
||||
stdenv = stdenv_32bit;
|
||||
};
|
||||
|
||||
@ -8983,6 +8983,8 @@ self: super: with self; {
|
||||
|
||||
pyglet = callPackage ../development/python-modules/pyglet { };
|
||||
|
||||
pyglm = callPackage ../development/python-modules/pyglm { };
|
||||
|
||||
pygls = callPackage ../development/python-modules/pygls { };
|
||||
|
||||
pygmars = callPackage ../development/python-modules/pygmars { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user