mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ddde12c6f7
@ -23,7 +23,7 @@
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Graphical text editor
|
||||
kate
|
||||
plasma5Packages.kate
|
||||
];
|
||||
|
||||
system.activationScripts.installerDesktop = let
|
||||
@ -40,7 +40,7 @@
|
||||
|
||||
ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}
|
||||
ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}
|
||||
ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
|
||||
ln -sfT ${pkgs.plasma5Packages.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
|
||||
ln -sfT ${pkgs.calamares-nixos}/share/applications/io.calamares.calamares.desktop ${desktopDir + "io.calamares.calamares.desktop"}
|
||||
'';
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Graphical text editor
|
||||
kate
|
||||
plasma5Packages.kate
|
||||
];
|
||||
|
||||
system.activationScripts.installerDesktop = let
|
||||
@ -40,7 +40,7 @@
|
||||
|
||||
ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}
|
||||
ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}
|
||||
ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
|
||||
ln -sfT ${pkgs.plasma5Packages.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
|
||||
'';
|
||||
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ with lib; let
|
||||
in
|
||||
{
|
||||
options.services.handheld-daemon = {
|
||||
enable = mkEnableOption "Enable Handheld Daemon";
|
||||
enable = mkEnableOption "Handheld Daemon";
|
||||
package = mkPackageOption pkgs "handheld-daemon" { };
|
||||
|
||||
user = mkOption {
|
||||
|
||||
@ -14,7 +14,7 @@ let
|
||||
in
|
||||
{
|
||||
options.services.tailscaleAuth = {
|
||||
enable = mkEnableOption "Enable tailscale.nginx-auth, to authenticate users via tailscale.";
|
||||
enable = mkEnableOption "tailscale.nginx-auth, to authenticate users via tailscale";
|
||||
|
||||
package = mkPackageOption pkgs "tailscale-nginx-auth" {};
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ in
|
||||
{
|
||||
options = {
|
||||
services.photonvision = {
|
||||
enable = lib.mkEnableOption "Enable PhotonVision";
|
||||
enable = lib.mkEnableOption "PhotonVision";
|
||||
|
||||
package = lib.mkPackageOption pkgs "photonvision" {};
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@ let
|
||||
defaultUser = "slskd";
|
||||
in {
|
||||
options.services.slskd = with lib; with types; {
|
||||
enable = mkEnableOption "enable slskd";
|
||||
enable = mkEnableOption "slskd";
|
||||
|
||||
package = mkPackageOptionMD pkgs "slskd" { };
|
||||
|
||||
|
||||
@ -203,10 +203,10 @@ let
|
||||
''
|
||||
echo "${cidr}" >> $state
|
||||
echo -n "adding address ${cidr}... "
|
||||
if out=$(ip addr add "${cidr}" dev "${i.name}" 2>&1); then
|
||||
if out=$(ip addr replace "${cidr}" dev "${i.name}" 2>&1); then
|
||||
echo "done"
|
||||
elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
|
||||
echo "'ip addr add "${cidr}" dev "${i.name}"' failed: $out"
|
||||
else
|
||||
echo "'ip addr replace "${cidr}" dev "${i.name}"' failed: $out"
|
||||
exit 1
|
||||
fi
|
||||
''
|
||||
|
||||
@ -50,7 +50,7 @@ in {
|
||||
};
|
||||
|
||||
options = {
|
||||
virtualisation.lxd.agent.enable = lib.mkEnableOption "Enable LXD agent";
|
||||
virtualisation.lxd.agent.enable = lib.mkEnableOption "LXD agent";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
@ -4319,8 +4319,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "uiua-vscode";
|
||||
publisher = "uiua-lang";
|
||||
version = "0.0.42";
|
||||
hash = "sha256-cgLWgMej1Nv8kNK2MfgO3Z/xJPXdcmYs8LXrFNfc3jQ=";
|
||||
version = "0.0.44";
|
||||
hash = "sha256-lumK7gcj/NIhiZKT6F++ZsTFKWw7ZVaKZgIsQvZAGs4=";
|
||||
};
|
||||
meta = {
|
||||
description = "VSCode language extension for Uiua";
|
||||
|
||||
@ -287,10 +287,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "fbneo",
|
||||
"rev": "4e0738a16d64adb4c468db4144ec3b51f9217660",
|
||||
"hash": "sha256-Se7QLJ1YVbEcwLOrKwTKTS6rgBw5Q9B4T2J40IgvOk0="
|
||||
"rev": "634d207adade213bbe83684be2a183d158f56e52",
|
||||
"hash": "sha256-hmnb7euH2VfGnF8ztGFhXYmqaCY49APDG0Y3s4ku7Ac="
|
||||
},
|
||||
"version": "unstable-2024-05-28"
|
||||
"version": "unstable-2024-06-02"
|
||||
},
|
||||
"fceumm": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -429,20 +429,20 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-libretro",
|
||||
"rev": "73e97290df6d3c4148c73e849a1f274ae1571da2",
|
||||
"hash": "sha256-osVwOUFygdsxHXKx5eg3TxJeRBiv3PmXMlAO0x/p1EY="
|
||||
"rev": "9ed9b3bdf4439d222b2b1a8c89e01fa3a6d2cc51",
|
||||
"hash": "sha256-E6/NYG+Uw+At2iAziEsl95NOwVSOs2otye+MDl+SQA0="
|
||||
},
|
||||
"version": "unstable-2024-05-27"
|
||||
"version": "unstable-2024-06-01"
|
||||
},
|
||||
"mame2003-plus": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-plus-libretro",
|
||||
"rev": "7e0673fb35f716a5c0aab601c23118f8a2c4f7d2",
|
||||
"hash": "sha256-6tzUIyrmsGIXY1MiikcP6cfeVrvx+3LxhHBBKvyDRPU="
|
||||
"rev": "b37ce123034084fa14709fb0f33c505737b3bfda",
|
||||
"hash": "sha256-vrVuUgkwZDLdFLo+bhJwXEuNWcS9ncQbjOspx6LVqhQ="
|
||||
},
|
||||
"version": "unstable-2024-05-28"
|
||||
"version": "unstable-2024-05-29"
|
||||
},
|
||||
"mame2010": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -631,10 +631,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "pcsx_rearmed",
|
||||
"rev": "87f07621f8f864204d15e5514b7dcda7ed458fd4",
|
||||
"hash": "sha256-J9HzZzzeih/Hv/hi+JmGloPMTgtRSdAubnipMDUOpIM="
|
||||
"rev": "1f8c6be323aa8fad329e38682158197e822d27c1",
|
||||
"hash": "sha256-f1U7hmSywECmXwRi6vhAFjG971XsDXhsYzSAKMa2ZVY="
|
||||
},
|
||||
"version": "unstable-2024-05-20"
|
||||
"version": "unstable-2024-05-30"
|
||||
},
|
||||
"picodrive": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -652,22 +652,22 @@
|
||||
"src": {
|
||||
"owner": "jpd002",
|
||||
"repo": "Play-",
|
||||
"rev": "5b80de936ee267b5bfcbaf3a25f8307d718e09d6",
|
||||
"hash": "sha256-ATTNivOCLp0Ze1RJfO7YWZzw7foPz/6OjVoa/4P3M4E=",
|
||||
"rev": "18c0a6b17d074c662bebea87684d025636862d64",
|
||||
"hash": "sha256-UOH3f3HkN6ak4AMH7C6E5Lqrj/WF8bqSjv0JTj7HqFU=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-05-27"
|
||||
"version": "unstable-2024-05-28"
|
||||
},
|
||||
"ppsspp": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "e69870033ef07831ecea1e68ff8ac49da1dd7fff",
|
||||
"hash": "sha256-L9NfESAHjCzdRzNoyzPZ0CJXZ8VguD91SVDlSSGGx0I=",
|
||||
"rev": "8600e81c62eaf9ea36c06d9e7d4a8b731947e255",
|
||||
"hash": "sha256-qPmJMtaUzr9pepeIl+bOgOUrxSxy4Khiq3jtXwnIZSI=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-05-28"
|
||||
"version": "unstable-2024-06-03"
|
||||
},
|
||||
"prboom": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "retroarch-assets";
|
||||
version = "1.17.0-unstable-2024-04-24";
|
||||
version = "1.19.0-unstable-2024-05-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "retroarch-assets";
|
||||
rev = "9c0bd0d1015889592ad4362b800ac90ff4d019e1";
|
||||
hash = "sha256-DB4i4iKx174822OJwJ5QIuMBLywufcR4+4Y+R01W+KQ=";
|
||||
rev = "771e60b1eacd4edc57c19b61ab2c713200af0a3f";
|
||||
hash = "sha256-304xYXY5cESjSxepb5xpfMeJBnG+EJBiaVnhSUE3icQ=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
buildPythonApplication rec {
|
||||
pname = "bitwarden-menu";
|
||||
version = "0.4.3";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "bitwarden_menu";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ticker";
|
||||
version = "4.6.2";
|
||||
version = "4.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "achannarasappa";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bNqwQwYuaWThpVVlZji0uiNKf8Ynxs00bAD+iSnbtm8=";
|
||||
hash = "sha256-EjQLJG1/AEnOKGcGh2C1HdRAVUnZLhehxTtpWlvD+jw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cTJa170oFFPRQSg3njZk26XvzsRRdJqcsFokKUWJr6Q=";
|
||||
vendorHash = "sha256-bWdyypcIagbKTMnhT0X4UmoPVjyTasCSud6pX1L3oIc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "tftui";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idoavrah";
|
||||
repo = "terraform-tui";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/y1dgQtpaIRVvhb/esJns3UPwKU1bAFHSQ8tCWzIuIw=";
|
||||
hash = "sha256-ojmq5m2BRB2Jwvg4j4zc0/jtv4rg1OKJpQiUQoBn+s0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -33,14 +33,14 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-PFAs/HoQsTqgThN5jdfwU07QNxThBrO7ES1D7GZCPH0=";
|
||||
x86_64-linux = "sha256-E28OeidntQV5Zx6BQjlYxgTXSuQM0ZLCLdb+bIYz8fY=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
displayname = "XPipe";
|
||||
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "9.3";
|
||||
version = "9.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
||||
@ -21,14 +21,14 @@
|
||||
let
|
||||
pname = "qownnotes";
|
||||
appname = "QOwnNotes";
|
||||
version = "24.5.8";
|
||||
version = "24.6.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
|
||||
hash = "sha256-ciTgJxDRQdPiQuXsiesYgvwSIdtJnkzYwQhvoKYS6mo=";
|
||||
hash = "sha256-rgnFqYqiItTd86K8U7O2sI+q3lF/PiJWU/e2C2O5mJI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.22.4";
|
||||
version = "0.22.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-AzwwOJ2SS+5wM/+357mXg+QMwXVPToKiTaFP+LZXP+U=";
|
||||
hash = "sha256-BBF4gnsZmQ36NDX7X/CTGb9+N79S5lLmBaq5keGeNfA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fyEncz5eVe8OPNQO4TJQXBMfOcybesoBBNRv3T1EooU=";
|
||||
cargoHash = "sha256-bpwZ1yDeevjMlrLLBPQa9H5NIN99o39kicsOnp+kj9M=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -13,17 +13,11 @@ let
|
||||
haskellModifications =
|
||||
lib.flip lib.pipe [
|
||||
addCompletions
|
||||
haskell.lib.doJailbreak
|
||||
haskell.lib.justStaticExecutables
|
||||
];
|
||||
|
||||
mkDerivationOverrides = finalAttrs: oldAttrs: {
|
||||
|
||||
version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}";
|
||||
|
||||
# nix-shell ./maintainers/scripts/update.nix --argstr package changelog-d
|
||||
passthru.updateScript = lib.getExe (callPackage ./updateScript.nix { });
|
||||
|
||||
# nix-build -A changelog-d.tests
|
||||
passthru.tests = {
|
||||
basic = callPackage ./tests/basic.nix { changelog-d = finalAttrs.finalPackage; };
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
{ writeShellApplication, cabal2nix }:
|
||||
|
||||
writeShellApplication {
|
||||
name = "update-changelog-d";
|
||||
runtimeInputs = [
|
||||
cabal2nix
|
||||
];
|
||||
text = ''
|
||||
cd pkgs/development/misc/haskell/changelog-d
|
||||
cabal2nix https://codeberg.org/fgaz/changelog-d >default.nix
|
||||
'';
|
||||
}
|
||||
@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "eigenlayer";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Layr-Labs";
|
||||
repo = "eigenlayer-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bj1+gm11gYwvuut8tUrML7Sg1W5rmGH49tZ4u/76s84=";
|
||||
hash = "sha256-YImQNqOPtHjFJz9mLrgoU0HUWZ4Pnkiff+5A8wYXxpA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Hws6qlt0O/1xP94ghiIBIF/FwvYGu0fY8LWjVgAp/pQ=";
|
||||
vendorHash = "sha256-+VKjsHFqWVqOxzC49GToxymD5AyI0j1ZDXQW2YnJysw=";
|
||||
|
||||
ldflags = ["-s" "-w"];
|
||||
subPackages = ["cmd/eigenlayer"];
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
|
||||
let
|
||||
pname = "fflogs";
|
||||
version = "8.5.9";
|
||||
version = "8.5.10";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
|
||||
hash = "sha256-rVkrjDocAfOI2ymsa0XMsVvbVtUa72C314InN7ZTkZc=";
|
||||
hash = "sha256-HDfmTAKOphxcoRpQDxbytQqOhhVa9Jof9D63YlH7ezQ=";
|
||||
};
|
||||
extracted = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "flawz";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "flawz";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eIZUKI/fdaSPHHEEaN/5s4I2LRX44FijUlKzzvuD42E=";
|
||||
hash = "sha256-zzZh9MjLbhvnuJEaKPtF5Rzfcu9VbeQCMiJ8MLvJBXg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UWjrVA5T78QLJtMug38y+egLnM+G7zmAIsNmqn2ZE5I=";
|
||||
cargoHash = "sha256-Dur8AcOT9sPiGg+rfcxfS2m4CeEk59tISxU+dc87urI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitui";
|
||||
version = "0.26.2";
|
||||
version = "0.26.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "extrawurst";
|
||||
repo = "gitui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eXkbvBdymwOUPLimv2zaJr9zqc+5LGK3hghZ2aUVWA0=";
|
||||
hash = "sha256-j3y+KjC+o9p2omf4bN8+XevwU7WqiaQ0sfPqHySD2ik=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Cb3/4l7fECVfmvPIw3n1QT8CoC+Kuohtfk+huKv9Yrg=";
|
||||
cargoHash = "sha256-vVEo0kSghOQsH3T6ZTAzN7gIUku0n7rDbKwNmOM9GZc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.126.2";
|
||||
version = "0.126.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ySXnJJJDjZqZkWOiq9ByflfUG6bg+0GSzuXpNnuyMZc=";
|
||||
hash = "sha256-WWpcbY8KA/62AeIt1hH+xfgEoPle4hfH+/K7I+1xdEc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VfwiA5LCAJ1pkmMCy/Dcc5bLKkNY1MHtxHcHvKLoWHs=";
|
||||
|
||||
@ -5,7 +5,7 @@ let
|
||||
in
|
||||
{
|
||||
options.services.local-ai = {
|
||||
enable = lib.mkEnableOption "Enable service";
|
||||
enable = lib.mkEnableOption "local-ai";
|
||||
|
||||
package = lib.mkPackageOption pkgs "local-ai" { };
|
||||
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
# https://github.com/abathur/resholve/issues/107
|
||||
resholve.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "3.0.4";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
hash = "sha256-3Fkat0HWU/hdQKwJYx5KWVzX8sVbGtFTon6G6/F9zFk=";
|
||||
hash = "sha256-imUlc5v/Ow7dgjCjTyEeet+4lNHLeEwfqGQcB4dKcao=";
|
||||
};
|
||||
|
||||
# skip min version checks which are redundant when built with nix
|
||||
|
||||
@ -1,33 +1,39 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, openssl, nss, p11-kit
|
||||
, opensc, gnutls, expect
|
||||
, autoreconfHook, autoconf-archive, pkg-config
|
||||
, meson, ninja, pkg-config
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pkcs11-provider";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latchset";
|
||||
repo = "pkcs11-provider";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jEQYsINRZ7bi2UqOXUUmGpm+1h+1qBNe18KvfAw2JzU=";
|
||||
hash = "sha256-f4BbW2awSXS1srSkn1CTRCqNp+2pvVpc4YL79Ht0w0A=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl nss p11-kit ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
# don't add SoftHSM to here: https://github.com/openssl/openssl/issues/22508
|
||||
nativeCheckInputs = [ p11-kit.bin opensc nss.tools gnutls openssl.bin expect ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build .
|
||||
'';
|
||||
|
||||
# Makefile redirects to logfiles; make sure we can catch them.
|
||||
for name in softokn softhsm; do
|
||||
ln -s /dev/stderr tests/setup-$name.log
|
||||
preInstall = ''
|
||||
# Meson tries to install to `$out/$out` and `$out/''${openssl.out}`; so join them.
|
||||
mkdir -p "$out"
|
||||
for dir in "$out" "${openssl.out}"; do
|
||||
mkdir -p .install/"$(dirname -- "$dir")"
|
||||
ln -s "$out" ".install/$dir"
|
||||
done
|
||||
export DESTDIR="$(realpath .install)"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -37,6 +43,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex" "v(\d\.\d)"];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/latchset/pkcs11-provider";
|
||||
description = "An OpenSSL 3.x provider to access hardware or software tokens using the PKCS#11 Cryptographic Token Interface";
|
||||
|
||||
69
pkgs/by-name/pr/probe-rs-tools/package.nix
Normal file
69
pkgs/by-name/pr/probe-rs-tools/package.nix
Normal file
@ -0,0 +1,69 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gitMinimal
|
||||
, pkg-config
|
||||
, libusb1
|
||||
, openssl
|
||||
, DarwinTools
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-rs-tools";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "probe-rs";
|
||||
repo = "probe-rs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-H1RT+H7aQjZmesW+/0mjPH2M01J1eBZ47Rern5lCqWk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aTBtWPcOYT5koIu/uw5S2oKTnsvXcqB39SFbe8U1NJY=";
|
||||
|
||||
buildAndTestSubdir = pname;
|
||||
|
||||
nativeBuildInputs = [
|
||||
# required by libz-sys, no option for dynamic linking
|
||||
# https://github.com/rust-lang/libz-sys/issues/158
|
||||
cmake
|
||||
# build.rs fails without git
|
||||
# https://github.com/probe-rs/probe-rs/pull/2492
|
||||
gitMinimal
|
||||
pkg-config
|
||||
] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
|
||||
buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
checkFlags = [
|
||||
# require a physical probe
|
||||
"--skip=cmd::dap_server::server::debugger::test::attach_request"
|
||||
"--skip=cmd::dap_server::server::debugger::test::attach_with_flashing"
|
||||
"--skip=cmd::dap_server::server::debugger::test::launch_and_threads"
|
||||
"--skip=cmd::dap_server::server::debugger::test::launch_with_config_error"
|
||||
"--skip=cmd::dap_server::server::debugger::test::test_initalize_request"
|
||||
"--skip=cmd::dap_server::server::debugger::test::test_launch_and_terminate"
|
||||
"--skip=cmd::dap_server::server::debugger::test::test_launch_no_probes"
|
||||
"--skip=cmd::dap_server::server::debugger::test::wrong_request_after_init"
|
||||
# compiles an image for an embedded target which we do not have a toolchain for
|
||||
"--skip=util::cargo::test::get_binary_artifact_with_cargo_config"
|
||||
"--skip=util::cargo::test::get_binary_artifact_with_cargo_config_toml"
|
||||
# requires other crates in the workspace
|
||||
"--skip=util::cargo::test::get_binary_artifact"
|
||||
"--skip=util::cargo::test::library_with_example_specified"
|
||||
"--skip=util::cargo::test::multiple_binaries_in_crate_select_binary"
|
||||
"--skip=util::cargo::test::workspace_binary_package"
|
||||
"--skip=util::cargo::test::workspace_root"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool for on-chip debugging and flashing of ARM chips";
|
||||
homepage = "https://probe.rs/";
|
||||
changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ xgroleau newam ];
|
||||
};
|
||||
}
|
||||
@ -5,7 +5,7 @@
|
||||
fetchFromGitLab,
|
||||
}:
|
||||
let
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
in buildGoModule {
|
||||
inherit version;
|
||||
pname = "reaction";
|
||||
@ -15,7 +15,7 @@ in buildGoModule {
|
||||
owner = "ppom";
|
||||
repo = "reaction";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hlrso4dCGwn5/jOEPvjrK0RgctB4a70UhQkF+cv6NMc=";
|
||||
sha256 = "sha256-hBEtXaTpubb5sKSrA8bhw3MW6YLszuESWrFZYf/+RvM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-THUIoWFzkqaTofwH4clBgsmtUlLS9WIB2xjqW7vkhpg=";
|
||||
|
||||
47
pkgs/by-name/si/simpleBluez/package.nix
Normal file
47
pkgs/by-name/si/simpleBluez/package.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
dbus,
|
||||
fmt_9,
|
||||
lib,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simpleBluez";
|
||||
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBluetoothToolbox";
|
||||
repo = "SimpleBLE";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CPBdPnBeQ0c3VjSX0Op6nCHF3w0MdXGULbk1aavr+LM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/simplebluez";
|
||||
|
||||
cmakeFlags = [ "-DLIBFMT_LOCAL_PATH=${fmt_9.src}" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "C++ abstraction layer for BlueZ over DBus";
|
||||
homepage = "https://github.com/OpenBluetoothToolbox/SimpleBLE";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ aciceri ];
|
||||
};
|
||||
})
|
||||
47
pkgs/by-name/si/simpleDBus/package.nix
Normal file
47
pkgs/by-name/si/simpleDBus/package.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
dbus,
|
||||
fmt_9,
|
||||
lib,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simpleDBus";
|
||||
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBluetoothToolbox";
|
||||
repo = "SimpleBLE";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CPBdPnBeQ0c3VjSX0Op6nCHF3w0MdXGULbk1aavr+LM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/simpledbus";
|
||||
|
||||
cmakeFlags = [ "-DLIBFMT_LOCAL_PATH=${fmt_9.src}" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "C++ wrapper for libdbus-1";
|
||||
homepage = "https://github.com/OpenBluetoothToolbox/SimpleBLE";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ aciceri ];
|
||||
};
|
||||
})
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
let
|
||||
pname = "simplex-chat-desktop";
|
||||
version = "5.7.4";
|
||||
version = "5.7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
|
||||
hash = "sha256-byns0F3i1YiYekO5KoAek5LXCU8bvPK/tzl+xExQM4g=";
|
||||
hash = "sha256-riJHJbl19UHJskQjWxSJUNhDEBE7FSoGE2lQecs/qvM=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "steamguard-cli";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dyc3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+Lax9MaNyrsckgx7HtpXC1zBWcZNt16inY8qil0CVLQ=";
|
||||
hash = "sha256-MTNp4LQtFUOvlcic+EgrMaJPq0aEa6YqwwdrKkpv87Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4QyFNy7oGWKScKZXQc63TxsI3avyEVSlqJAmv+lg1GE=";
|
||||
cargoHash = "sha256-FBKHvkUJcjrUxuCDrra5VKBdK95IssVw7g9zzldX6jU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
|
||||
@ -18,16 +18,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uiua";
|
||||
version = "0.10.3";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uiua-lang";
|
||||
repo = "uiua";
|
||||
rev = version;
|
||||
hash = "sha256-lqFDzM6EscC8cFPGq/JnEybctaurNRoEQi0zxFaKgwI=";
|
||||
hash = "sha256-zSSUXJtIyVUUo2g1DTdnUCbCqtelphYRRLaJXbQBgIw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-R97KO3MYmtO9C1Hi9kU+1FDdbOCVQk+gwVXTTvbeok4=";
|
||||
cargoHash = "sha256-1J8Z6gmn1d4v15q9Jrp5usY2MTQDdexaa89PY3lTDxw=";
|
||||
|
||||
nativeBuildInputs =
|
||||
lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]
|
||||
|
||||
51
pkgs/by-name/zm/zmkBATx/package.nix
Normal file
51
pkgs/by-name/zm/zmkBATx/package.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
qt6,
|
||||
pkg-config,
|
||||
dbus,
|
||||
simpleBluez,
|
||||
simpleDBus,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zmkBATx";
|
||||
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mh4x0f";
|
||||
repo = "zmkBATx";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-xbiwRHVTuaZDH3RZlMK2CpKBThtS8g6q5r3C+OccDZg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
pkg-config
|
||||
qt6.qmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
qt6.qtconnectivity
|
||||
dbus.lib
|
||||
simpleBluez
|
||||
simpleDBus
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace zmkBATx.pro --replace-fail "/usr/include/dbus-1.0" "${dbus.dev}/include/dbus-1.0"
|
||||
substituteInPlace zmkBATx.pro --replace-fail "/usr/lib/x86_64-linux-gnu/dbus-1.0/include" "${dbus.lib}/lib/dbus-1.0/include"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Battery monitoring for ZMK split keyboards";
|
||||
longDescription = "Opensource tool for peripheral battery monitoring zmk split keyboard over BLE for linux.";
|
||||
homepage = "https://github.com/mh4x0f/zmkBATx";
|
||||
license = licenses.mit;
|
||||
mainProgram = "zmkbatx";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ aciceri ];
|
||||
};
|
||||
})
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnustep-make";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-w9bnDPFWsn59HtJQHFffP5bidIjOLzUbk+R5xYwB6uc=";
|
||||
sha256 = "sha256-9UDfnw4drrPSOwjhSyBLKkbx0KQAXLFxyVMjQTgG5OE=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ config
|
||||
, lib
|
||||
, linuxPackages
|
||||
, pkgs
|
||||
, generateSplicesForMkScope
|
||||
, makeScopeWithSplicing'
|
||||
@ -140,7 +141,9 @@ makeScopeWithSplicing' {
|
||||
|
||||
xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { };
|
||||
|
||||
xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { };
|
||||
xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin {
|
||||
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
|
||||
};
|
||||
|
||||
xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { };
|
||||
|
||||
|
||||
@ -1,5 +1,20 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxfce4ui,
|
||||
libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, gitUpdater
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
intltool,
|
||||
gtk3,
|
||||
libxfce4ui,
|
||||
libxfce4util,
|
||||
xfce4-panel,
|
||||
libnotify,
|
||||
lm_sensors,
|
||||
hddtemp,
|
||||
netcat-gnu,
|
||||
nvidiaSupport ? true,
|
||||
libXNVCtrl,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
let
|
||||
@ -7,7 +22,7 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfce4-sensors-plugin";
|
||||
pname = "xfce4-sensors-plugin";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
@ -29,14 +44,20 @@ stdenv.mkDerivation rec {
|
||||
lm_sensors
|
||||
hddtemp
|
||||
netcat-gnu
|
||||
];
|
||||
] ++ lib.optionals nvidiaSupport [ libXNVCtrl ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--with-pathhddtemp=${hddtemp}/bin/hddtemp"
|
||||
"--with-pathnetcat=${netcat-gnu}/bin/netcat"
|
||||
];
|
||||
configureFlags =
|
||||
[
|
||||
"--with-pathhddtemp=${hddtemp}/bin/hddtemp"
|
||||
"--with-pathnetcat=${netcat-gnu}/bin/netcat"
|
||||
]
|
||||
++ lib.optionals nvidiaSupport [
|
||||
# Have to be explicitly enabled since this tries to figure out the default
|
||||
# based on the existence of a hardcoded `/usr/include/NVCtrl` path.
|
||||
"--enable-xnvctrl"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
|
||||
|
||||
@ -24,13 +24,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openshadinglanguage";
|
||||
version = "1.13.9.0";
|
||||
version = "1.13.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3HSmiIvGk+C5rnHzCXnYlFVeOWYa5M0WZRLTSb8Zsh8=";
|
||||
hash = "sha256-tjfg9cGbfL0D+KcxtWgQF6gY9sCjxEjyGNxFZyPhJ/U=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.40";
|
||||
version = "6.4.1";
|
||||
pname = "clips";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${
|
||||
builtins.replaceStrings [ "." ] [ "" ] version
|
||||
}.tar.gz";
|
||||
sha256 = "1pr5l61zxf6kjs8b2b028g2aq45pigavwjmrf4l5mrdmlnk3fq5d";
|
||||
hash = "sha256-qk87uLFZZL9HNPNlyVh+Mplr3dP1C/z1O5UVS+rnbuM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D -t $out/bin core/clips
|
||||
install -D -t $out/lib core/libclips.a
|
||||
install -D -t $out/include core/*.h
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitterentropy";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smuellerDD";
|
||||
repo = "jitterentropy-library";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GSGlupTN1o8BbTN287beqYSRFDaXOk6SlIRvtjpvmhQ=";
|
||||
hash = "sha256-USc9e/GyajJe58/Z201AO3Y+t3IPOOdJAaifEwvgm2Q=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -1,23 +1,24 @@
|
||||
{ mkDerivation, base, bytestring, cabal-install-parsers
|
||||
, Cabal-syntax, containers, directory, fetchgit, filepath
|
||||
, Cabal-syntax, containers, directory, fetchFromGitea, filepath
|
||||
, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty
|
||||
, regex-applicative
|
||||
, regex-applicative, frontmatter
|
||||
}:
|
||||
mkDerivation {
|
||||
mkDerivation rec {
|
||||
pname = "changelog-d";
|
||||
version = "0.1";
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/fgaz/changelog-d";
|
||||
sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7";
|
||||
rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314";
|
||||
fetchSubmodules = true;
|
||||
version = "1.0";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "fgaz";
|
||||
repo = "changelog-d";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cXczIJb5z+Obq13F90oWcgSN1JAVqRWWw4jp2HT5G5Y=";
|
||||
};
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
base bytestring cabal-install-parsers Cabal-syntax containers
|
||||
directory filepath generic-lens-lite mtl parsec pretty
|
||||
regex-applicative
|
||||
regex-applicative frontmatter
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base bytestring Cabal-syntax directory filepath
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-expr";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "dask";
|
||||
repo = "dask-expr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-N+hvalSn8mwlAaN3Xhu+YxECORfLN4UHutwmeiGR9WI=";
|
||||
hash = "sha256-Gvib8fyogIiOllDp4SoVQkGcIPHMo9e9AfJWDaZ5sTU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "2024.5.1";
|
||||
version = "2024.5.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -50,7 +50,7 @@ let
|
||||
owner = "dask";
|
||||
repo = "dask";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FzvzmQa9kJAZw67HY+d+3uC6Bd246vp5QsyXepGnKH8=";
|
||||
hash = "sha256-8U+njWp1g+rmOEuUgh+qz1QyVCZ/gdEPky206cVp7fw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -1,13 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
writeText,
|
||||
setuptools,
|
||||
wheel,
|
||||
filelock,
|
||||
huggingface-hub,
|
||||
importlib-metadata,
|
||||
@ -38,11 +35,12 @@
|
||||
torchsde,
|
||||
transformers,
|
||||
pythonAtLeast,
|
||||
diffusers,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "diffusers";
|
||||
version = "0.27.2";
|
||||
version = "0.28.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -51,29 +49,10 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "diffusers";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aRnbU3jN40xaCsoMFyRt1XB+hyIYMJP2b/T1yZho90c=";
|
||||
hash = "sha256-DYUVg96oHYoRqw/RGoH48YXfK/kfkYoqGQfkiOUr8DU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix python3.12 build
|
||||
(fetchpatch {
|
||||
# https://github.com/huggingface/diffusers/pull/7455
|
||||
name = "001-remove-distutils.patch";
|
||||
url = "https://github.com/huggingface/diffusers/compare/363699044e365ef977a7646b500402fa585e1b6b...3c67864c5acb30413911730b1ed4a9ad47c0a15c.patch";
|
||||
hash = "sha256-Qyvyp1GyTVXN+A+lA1r2hf887ubTtaUknbKd4r46NZQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# https://github.com/huggingface/diffusers/pull/7461
|
||||
name = "002-fix-removed-distutils.patch";
|
||||
url = "https://github.com/huggingface/diffusers/commit/efbbbc38e436a1abb1df41a6eccfd6f9f0333f97.patch";
|
||||
hash = "sha256-scdtpX1RYFFEDHcaMb+gDZSsPafkvnIO/wQlpzrQhLA=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
filelock
|
||||
@ -108,8 +87,10 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "diffusers" ];
|
||||
|
||||
# tests crash due to torch segmentation fault
|
||||
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
|
||||
# it takes a few hours
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.pytest = diffusers.overridePythonAttrs { doCheck = true; };
|
||||
|
||||
nativeCheckInputs = [
|
||||
parameterized
|
||||
|
||||
@ -29,14 +29,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "etils";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+0ePV/7CAuJg5UyRkrMXaS/WPbLRHZk+cLzf+inMzVg=";
|
||||
hash = "sha256-XQ+N2qjg5kDGhe16f+H8XIFiUz+hL7lF8J7MU5sLNmw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gradio-pdf";
|
||||
version = "0.0.7";
|
||||
version = "0.0.9";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "gradio_pdf";
|
||||
inherit version;
|
||||
hash = "sha256-3OJiBnp79woCUtiNiaePwfJCAS42WYkv9GFeScesFv8=";
|
||||
hash = "sha256-3mua+cZBzseXp5jONIy2OSmNpqz4s0Uvx5oW/eKgP1Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
nix-update-script,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
# pyproject
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gradio-client";
|
||||
version = "0.16.1";
|
||||
version = "0.20.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -38,9 +38,9 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "gradio-app";
|
||||
repo = "gradio";
|
||||
rev = "refs/tags/gradio_client@${version}";
|
||||
rev = "refs/tags/@gradio/client@${version}";
|
||||
sparseCheckout = [ "client/python" ];
|
||||
hash = "sha256-SVUm9LrjYG0r3U1yOd3rctxVMYlnAOW+Opqy9c3osnw=";
|
||||
hash = "sha256-55RxoZR/A6WCWGgYggdwjGornIxF8BcjJpWw3p6jrzU=";
|
||||
};
|
||||
prePatch = ''
|
||||
cd client/python
|
||||
@ -97,7 +97,9 @@ buildPythonPackage rec {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "@gradio/client@"; };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex" "@gradio/client@(.*)" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gradio.app/";
|
||||
|
||||
@ -63,16 +63,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gradio";
|
||||
version = "4.29.0";
|
||||
version = "4.32.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# We use the Pypi release, since it provides prebuilt webui assets,
|
||||
# and upstream has stopped tagging releases since 3.41.0
|
||||
# We use the Pypi release, since it provides prebuilt webui assets
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-17KT0b9kBO+xLgIgxfpwjETDoRM4aTJPlJv7HjkJXjo=";
|
||||
hash = "sha256-t8C8BwE2xfVI2eKyST1jCZgrbytxiKcrsbVhfX07nA4=";
|
||||
};
|
||||
|
||||
# fix packaging.ParserSyntaxError, which can't handle comments
|
||||
|
||||
@ -44,6 +44,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/pythongssapi/k5test/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "model-bakery";
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "model-bakers";
|
||||
repo = "model_bakery";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mf6NV7r/9kDCRlszx/QGtfEsC1O/SATd6+EX+w7ptEQ=";
|
||||
hash = "sha256-QsfVKPasGFzcLIwx7t9H9I2o2JNUFLKbKc86tntltg8=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyomo";
|
||||
version = "6.7.2";
|
||||
version = "6.7.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
repo = "pyomo";
|
||||
owner = "pyomo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-v3KVb9KZPbUlpRySzJV8dmApScKT06aJc8SULCHcnPI=";
|
||||
hash = "sha256-6qpJH6WkrTzsDCtvoGMzZgw1UeSIIyI3jSA8JMsUC4E=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.8.11";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-i3X3+JonqnR2mvJc9SFQno8HBvZUA9R6JCjEhL/5Aow=";
|
||||
hash = "sha256-5rlPGmyBdEG9qjJPpEPr1oXLYlZiBtXzupPpVRrR9wA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "riscv-config";
|
||||
version = "3.18.2";
|
||||
version = "3.18.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "riscv-software-src";
|
||||
repo = "riscv-config";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ADmf7EN3D+8isZRFx6WRMYq91YHunGavuwy3a3M3gCc=";
|
||||
hash = "sha256-eaHi6ezgU8gQYH97gCS2TzEzIP3F4zfn7uiA/To2Gmc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "pyyaml" ];
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "9.8.0";
|
||||
version = "9.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YxYfynRstqgeIVi/YZUMy4118bcjHH9KyeBYF6q1hrQ=";
|
||||
hash = "sha256-xC2Pa0RjpU86AlWBgQ9OYy4tWnHeYQD8WV11WB9ppJI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1159";
|
||||
version = "3.0.1160";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gePrTn1LR28A2C1lZgEGTxSicXW0e6G6rxgh28kBBls=";
|
||||
hash = "sha256-G0qft2hz9LfN0QKarANtJavxKVTx3rMNG6i8rJmlGnU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
55
pkgs/development/python-modules/tf-keras/default.nix
Normal file
55
pkgs/development/python-modules/tf-keras/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchPypi,
|
||||
pythonRelaxDepsHook,
|
||||
setuptools,
|
||||
wheel,
|
||||
numpy,
|
||||
tensorflow,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tf-keras";
|
||||
version = "2.16.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "tf_keras";
|
||||
inherit version;
|
||||
hash = "sha256-21OJHxrJgZfCrM7ZjNyowGuoJVZVpst+uV7UlnYRgoA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"tensorflow"
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
tensorflow
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tf_keras" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Deep learning for humans";
|
||||
homepage = "https://pypi.org/project/tf-keras/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "usort";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "facebook";
|
||||
repo = "usort";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-emnrghdsUs+VfvYiJExG13SKQNrXAEtGNAJQLScADnw=";
|
||||
hash = "sha256-iezq2K+Rw0djyOoFm7tguw/vkkDSyrPZIfZPmaZvFpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "algolia-cli";
|
||||
version = "1.6.10";
|
||||
version = "1.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algolia";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hYr2T3BLoBJzcVcINNVdnK3T0Hvs+zwsDkk9iE/csTY=";
|
||||
hash = "sha256-VqY0h0Z3ocmgw0uFI4f6B5C/bTt3zoUXBlYPgOPxBo0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk=";
|
||||
|
||||
@ -10,20 +10,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fnm";
|
||||
version = "1.36.0";
|
||||
version = "1.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Schniz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gW/KpoogFbAkOIBnJHTDYyqvxpYeCCabwftCb+T4rnE=";
|
||||
sha256 = "sha256-ruEv46jzO79l2Nvs3UjWHal2lBmhjdIKC99va/2cGio=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ];
|
||||
|
||||
cargoHash = "sha256-x66R32vbBakBlrE0eZ+sFJ2/JZ30UTIAvh3goeWkI10=";
|
||||
cargoHash = "sha256-ez6rzmVa/eRcd4bdCM4JEaNILpavub34kaonX4BRjW8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gomplate";
|
||||
version = "3.11.7";
|
||||
version = "3.11.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hairyhenderson";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0cYQ44SF8fQ5Ml0tRUbqTFZ+zDVTV6elox1q6tNsG7Q=";
|
||||
hash = "sha256-pE9TLEBY1KQvgMFwVJfn5kojESqZURcbCwRt4jrexhk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8siITXKIqDbph/74aBEvkbLVqHE30VyRompFL6z92zA=";
|
||||
vendorHash = "sha256-09QUEudbWnO11iwJafF9zoYqbTr7SVBUiPWTHGnZ06Q=";
|
||||
|
||||
postPatch = ''
|
||||
# some tests require network access
|
||||
|
||||
@ -29,12 +29,6 @@ in stdenv.mkDerivation {
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
[[ $($out/bin/mueval -e 42) == 42 ]]
|
||||
'';
|
||||
|
||||
passthru = { inherit defaultPkgs; };
|
||||
meta.mainProgram = "mueval";
|
||||
}
|
||||
|
||||
@ -10,24 +10,24 @@
|
||||
}:
|
||||
|
||||
let
|
||||
embedded-protocol-version = "2.7.0";
|
||||
embedded-protocol-version = "2.7.1";
|
||||
|
||||
embedded-protocol = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "sass";
|
||||
rev = "refs/tags/embedded-protocol-${embedded-protocol-version}";
|
||||
hash = "sha256-BQCQ4GE85teRkCY2iuvqFT4vyf6RzZ1ztoRhBCAwA4w=";
|
||||
hash = "sha256-6bGH/klCYxuq7CrOJVF8ySafhLJwet5ppBcpI8dzeCQ=";
|
||||
};
|
||||
in
|
||||
buildDartApplication rec {
|
||||
pname = "dart-sass";
|
||||
version = "1.77.2";
|
||||
version = "1.77.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Spd21/IRNDtpgMecoO2ozKWEVSQneMGCOVCCePaFzus=";
|
||||
hash = "sha256-xHOZDeK6xYnfrb6yih6jzRDZLRvyp0EeKZynEq3A4aI=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@ -24,11 +24,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "archive",
|
||||
"sha256": "ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265",
|
||||
"sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.5.1"
|
||||
"version": "3.6.1"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "direct main",
|
||||
@ -524,11 +524,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "pubspec_parse",
|
||||
"sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367",
|
||||
"sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.3"
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"quiver": {
|
||||
"dependency": "transitive",
|
||||
@ -754,11 +754,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vm_service",
|
||||
"sha256": "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b",
|
||||
"sha256": "360c4271613beb44db559547d02f8b0dc044741d0eeb9aa6ccdb47e8ec54c63a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "14.2.2"
|
||||
"version": "14.2.3"
|
||||
},
|
||||
"watcher": {
|
||||
"dependency": "direct main",
|
||||
@ -784,11 +784,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "web_socket",
|
||||
"sha256": "217f49b5213796cb508d6a942a5dc604ce1cb6a0a6b3d8cb3f0c314f0ecea712",
|
||||
"sha256": "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.4"
|
||||
"version": "0.1.5"
|
||||
},
|
||||
"web_socket_channel": {
|
||||
"dependency": "transitive",
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rain";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-cloudformation";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a+oKQB2pbheC1wLIQh+g5E/dYCIfdnGEZ7hKsHZrNxs=";
|
||||
sha256 = "sha256-2+bbTHblACG9yLBgdQ4P6PHXF06tLeVpsnuKCju8fV0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UBFOtgHf1HNERLWQGJqYlmAd8PKu2Qk49R+gVpdosuk=";
|
||||
vendorHash = "sha256-YDY9Acp8bi0Pvjdjn1hTzChCVs5E1yximIrgyd7J/7w=";
|
||||
|
||||
subPackages = [ "cmd/rain" ];
|
||||
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libusb1
|
||||
, openssl
|
||||
, DarwinTools
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-rs";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5V7eLnukVAcOSX52myvaTlDbemGp6mDaWrQc3w4P5MI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sZl4FhaKIMJe7v5AAIM2w7M8Ev7vCht3owkvt0UhOu8=";
|
||||
|
||||
cargoBuildFlags = [ "--features=cli" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
|
||||
buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool for on-chip debugging and flashing of ARM chips";
|
||||
homepage = "https://probe.rs/";
|
||||
changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ xgroleau newam ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i python -p "python3.withPackages (ps: with ps; [ps.requests ])"
|
||||
|
||||
import os
|
||||
import hashlib
|
||||
import base64
|
||||
import json
|
||||
@ -95,7 +96,13 @@ class VersionManager:
|
||||
indent=4
|
||||
)
|
||||
|
||||
def write_versions(self, file_name: str):
|
||||
def find_version_json() -> str:
|
||||
"""
|
||||
Find the versions.json file in the same directory as this script
|
||||
"""
|
||||
return os.path.join(os.path.dirname(os.path.realpath(__file__)), "versions.json")
|
||||
|
||||
def write_versions(self, file_name: str = find_version_json()):
|
||||
""" write all processed versions to json """
|
||||
# save json to versions.json
|
||||
with open(file_name, 'w') as f:
|
||||
@ -142,4 +149,4 @@ if __name__ == '__main__':
|
||||
version_manager.fetch_versions()
|
||||
version_manager.fetch_latest_version_builds()
|
||||
version_manager.generate_version_hashes()
|
||||
version_manager.write_versions(file_name="versions.json")
|
||||
version_manager.write_versions()
|
||||
|
||||
@ -22,7 +22,7 @@ let
|
||||
in {
|
||||
options = {
|
||||
services.samsung-unified-linux-driver_1_00_36 = {
|
||||
enable = mkEnableOption "enable samsung-unified-linux-driver_1_00_36";
|
||||
enable = mkEnableOption "samsung-unified-linux-driver_1_00_36";
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
@ -64,11 +64,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeipa";
|
||||
version = "4.11.1";
|
||||
version = "4.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz";
|
||||
sha256 = "sha256-Ubq2xAqBvjUwrzD2R6tB0i1WsdA0Y0jnJLgi4p4r8D4=";
|
||||
sha256 = "sha256-FEDGPhgxr5kV8BeeM10C92yLbZPE7KGPmUUwyvZCkQA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,16 +4,16 @@ let
|
||||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.9.2"; #zen
|
||||
version = "6.9.3"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1fsmpryk7an6xqppvilcf3bmxs41mqpc3v4f4c81jgrikg21gxbb"; #zen
|
||||
sha256 = "0vgy249zrzm6kn8wqisnbgbq8h6sffmk1zs6cx57annab9w0sb57"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.8.11"; #lqx
|
||||
version = "6.9.3"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "1dj4znir4wp6jqs680dcxn8z6p02d518993rmrx54ch04jyy5brj"; #lqx
|
||||
sha256 = "1wfjw5fq7myvhfb6srina0b7b76a08ib9x8hd8bdfr4zr6al8zq8"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
||||
@ -37,8 +37,7 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
nose
|
||||
pynose
|
||||
];
|
||||
|
||||
# Remove standard module argparse from requirements
|
||||
@ -46,6 +45,12 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ tarsnap ]}" ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
nosetests tests
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "tarsnapper" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pfetch-rs";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gobidev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tpJk31Z7QzZNLmEv/L1008tf6hpJJI6b7E1o/kwbJe0=";
|
||||
hash = "sha256-1Mw20O64I0UeAOO4Gea8cAbNnHkWOMvoRawIAZ62kTI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CQVPEUpblypDyr48MrLY3roGunOxem0eM1OtbcKlnsw=";
|
||||
cargoHash = "sha256-Jx8g49rMatXMV1KvoFGBhXKmf77WR4uE/Xewl5TMeWM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bkcrack";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimci86";
|
||||
repo = "bkcrack";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-x7JK7+DcD2uSWZRTJQPGCcF2mHBlu6FwYUbuYzbvD+s=";
|
||||
hash = "sha256-smDmnqmYuFT3ip3ULQfiiF5YxkwzPwPYBujqq9GUyMs=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xNKfqPPTsnEzDapBZpfmTPWc6dirOqxUDYOOdIVUzOY=";
|
||||
hash = "sha256-N2Fym3OwTHjdaJ1fzGWL+BoUYsQ5216d3Ohz5Yrf558=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jD5LQ9HZbWpoXgnyA7RacaDdyBPMbK02PhKQT+1il4Q=";
|
||||
|
||||
@ -5,21 +5,21 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "volatility3";
|
||||
version = "2.5.2";
|
||||
version = "2.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "volatilityfoundation";
|
||||
repo = "volatility3";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tghwDDfy8TohqTn9WQvmEal3qK0OKKq7GvGnPGTble0=";
|
||||
hash = "sha256-elTUAvSe91TqpsTXg08SPKaVr6iM7FKcBaVNunv+HfU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dependencies = with python3.pkgs; [
|
||||
capstone
|
||||
jsonschema
|
||||
pefile
|
||||
|
||||
@ -1056,6 +1056,7 @@ mapAliases ({
|
||||
prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20
|
||||
prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20
|
||||
privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31
|
||||
probe-rs = probe-rs-tools; # Added 2024-05-23
|
||||
probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03
|
||||
processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10
|
||||
prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
|
||||
|
||||
@ -704,7 +704,7 @@ with pkgs;
|
||||
|
||||
buildcatrust = with python3.pkgs; toPythonApplication buildcatrust;
|
||||
|
||||
probe-rs = callPackage ../development/tools/rust/probe-rs {
|
||||
probe-rs-tools = callPackage ../by-name/pr/probe-rs-tools/package.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
inherit (darwin) DarwinTools;
|
||||
};
|
||||
|
||||
@ -15089,6 +15089,8 @@ self: super: with self; {
|
||||
|
||||
textx = callPackage ../development/python-modules/textx { };
|
||||
|
||||
tf-keras = callPackage ../development/python-modules/tf-keras { };
|
||||
|
||||
tf2onnx = callPackage ../development/python-modules/tf2onnx { };
|
||||
|
||||
tflearn = callPackage ../development/python-modules/tflearn { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user