mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 23:52:55 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
14af82271b
@ -7700,6 +7700,12 @@
|
||||
fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A";
|
||||
}];
|
||||
};
|
||||
Golo300 = {
|
||||
email = "lanzingertm@gmail.com";
|
||||
github = "Golo300";
|
||||
githubId = 58785758;
|
||||
name = "Tim Lanzinger";
|
||||
};
|
||||
Gonzih = {
|
||||
email = "gonzih@gmail.com";
|
||||
github = "Gonzih";
|
||||
|
||||
@ -77,6 +77,7 @@ lualogging,,,,,,
|
||||
luaossl,,,,,5.1,
|
||||
luaposix,,,,34.1.1-1,,vyp lblasc
|
||||
luarepl,,,,,,
|
||||
luarocks,,,,,,mrcjkb teto
|
||||
luarocks-build-rust-mlua,,,,,,mrcjkb
|
||||
luarocks-build-treesitter-parser,,,,,,mrcjkb
|
||||
luasec,,,,,,flosse
|
||||
|
||||
|
@ -429,7 +429,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
|
||||
|
||||
- `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment.
|
||||
|
||||
- `security.pam.enableSSHAgentAuth` now requires `services.openssh.authorizedKeysFiles` to be non-empty,
|
||||
- `security.pam.sshAgentAuth.enable` now requires `services.openssh.authorizedKeysFiles` to be non-empty,
|
||||
which is the case when `services.openssh.enable` is true. Previously, `pam_ssh_agent_auth` silently failed to work.
|
||||
|
||||
- `security.pam.enableSSHAgentAuth` was replaced by the `sshAgentAuth` attrset, and **only**
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -110,7 +110,7 @@ in
|
||||
users.groups."${cfg.group}" = { };
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.stateDir}' - ${config.users.users.gollum.name} ${config.users.groups.gollum.name} - -"
|
||||
"d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
|
||||
];
|
||||
|
||||
systemd.services.gollum = {
|
||||
|
||||
@ -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" { };
|
||||
|
||||
|
||||
@ -83,7 +83,7 @@ in
|
||||
# These assertions can be removed in NixOS 24.11, when all users have been
|
||||
# warned once.
|
||||
{
|
||||
assertion = (cfg.settings ? replication_factor || cfg.settings ? replication_mode) || lib.versionOlder cfg.package "1.0.0";
|
||||
assertion = (cfg.settings ? replication_factor || cfg.settings ? replication_mode) || lib.versionOlder cfg.package.version "1.0.0";
|
||||
message = ''
|
||||
Garage 1.0.0 requires an explicit replication factor to be set.
|
||||
Please set replication_factor to 1 explicitly to preserve the previous behavior.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
@ -22,7 +22,7 @@ in
|
||||
];
|
||||
|
||||
options.services.nginx.tailscaleAuth = {
|
||||
enable = mkEnableOption "Enable tailscale.nginx-auth, to authenticate nginx users via tailscale.";
|
||||
enable = mkEnableOption "tailscale.nginx-auth, to authenticate nginx users via tailscale";
|
||||
|
||||
expectedTailnet = mkOption {
|
||||
default = "";
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -43,13 +43,10 @@ in
|
||||
)
|
||||
|
||||
# Start MuseScore window
|
||||
machine.execute("DISPLAY=:0.0 mscore >&2 &")
|
||||
machine.execute("env XDG_RUNTIME_DIR=$PWD DISPLAY=:0.0 mscore >&2 &")
|
||||
|
||||
# Wait until MuseScore has launched
|
||||
machine.wait_for_window("MuseScore 4")
|
||||
|
||||
# Wait until the window has completely initialised
|
||||
machine.wait_for_text("MuseScore 4")
|
||||
machine.wait_for_window("MuseScore Studio")
|
||||
|
||||
machine.screenshot("MuseScore0")
|
||||
|
||||
@ -75,29 +72,22 @@ in
|
||||
machine.screenshot("MuseScore2")
|
||||
|
||||
# Go to the export dialogue and create a PDF
|
||||
machine.send_key("alt-f")
|
||||
machine.sleep(1)
|
||||
machine.send_key("e")
|
||||
machine.send_key("ctrl-p")
|
||||
|
||||
# Wait until the export dialogue appears.
|
||||
machine.wait_for_text("Export")
|
||||
|
||||
machine.screenshot("MuseScore3")
|
||||
|
||||
machine.send_key("shift-tab")
|
||||
machine.sleep(1)
|
||||
machine.send_key("ret")
|
||||
machine.sleep(1)
|
||||
machine.send_key("ret")
|
||||
# Wait until the Print dialogue appears.
|
||||
machine.wait_for_window("Print")
|
||||
|
||||
machine.screenshot("MuseScore4")
|
||||
|
||||
# Wait until PDF is exported
|
||||
machine.wait_for_file('"/root/Documents/MuseScore4/Scores/Untitled score.pdf"')
|
||||
|
||||
# Check that it contains the title of the score
|
||||
machine.succeed('pdfgrep "Untitled score" "/root/Documents/MuseScore4/Scores/Untitled score.pdf"')
|
||||
machine.send_key("alt-p")
|
||||
machine.sleep(1)
|
||||
|
||||
machine.screenshot("MuseScore5")
|
||||
|
||||
# Wait until PDF is exported
|
||||
machine.wait_for_file('"/root/Untitled score.pdf"')
|
||||
|
||||
## Check that it contains the title of the score
|
||||
machine.succeed('pdfgrep "Untitled score" "/root/Untitled score.pdf"')
|
||||
machine.copy_from_vm("/root/Untitled score.pdf")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -20,6 +20,9 @@
|
||||
, qtdeclarative
|
||||
, qtgraphicaleffects
|
||||
, flac
|
||||
, libopusenc
|
||||
, libopus
|
||||
, tinyxml-2
|
||||
, qtquickcontrols
|
||||
, qtquickcontrols2
|
||||
, qtscript
|
||||
@ -47,13 +50,13 @@ let
|
||||
} else portaudio;
|
||||
in stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "musescore";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "musescore";
|
||||
repo = "MuseScore";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-X3zvrIf5DOC5PWcnuw0aClm++IWUED1ZzAyjnp7Mo+g=";
|
||||
sha256 = "sha256-EqPofl2l+UBkmuzym4bL0EyFx+SOxVy0EXtxbw9Sqiw=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
@ -62,8 +65,12 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
# not useful on NixOS, see:
|
||||
# https://github.com/musescore/MuseScore/issues/15571
|
||||
"-DMUE_BUILD_CRASHPAD_CLIENT=OFF"
|
||||
# Use our freetype
|
||||
# Use our versions of system libraries
|
||||
"-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON"
|
||||
"-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON"
|
||||
# Implies also -DMUE_COMPILE_USE_SYSTEM_OPUS=ON
|
||||
"-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON"
|
||||
"-DMUE_COMPILE_USE_SYSTEM_FLAC=ON"
|
||||
# From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake,
|
||||
# upstream defaults to compiling to x86_64 only, unless this cmake flag is
|
||||
# set
|
||||
@ -102,6 +109,9 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
portaudio'
|
||||
portmidi
|
||||
flac
|
||||
libopusenc
|
||||
libopus
|
||||
tinyxml-2
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtgraphicaleffects
|
||||
|
||||
@ -19,7 +19,7 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
||||
hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
||||
aarch64-linux = "sha512-U3Az5MtsHup+aNO6lVHeAXRAnNLUbQkL5qMTpYZTaLgiZEFQCUigBJXNPaiUiHA1rJAsFh6wpv20iRMcqRr9gA==";
|
||||
aarch64-linux = "sha512-CFkL7vVYz6cS3iHyfG026+c4T3h9y3yDhNkwMKhbrt7hK33Yj1yLQUBw826DUmUNOgwomRwubz5jigCl2724bw==";
|
||||
x86_64-linux = "sha512-JgcnCiq/ozrYDMH7zIns5c6x7TwtpJ6VVg6PUkcoDDgmr9ngIJmAdb+/v9mJUv98WNAPKmhCt0/H9DY2qWJ2Bg==";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@ -5,23 +5,24 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tuigreet";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apognu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-o1NPwZ2gvFxq988RhLz/6ucL4qb2dGtMdhNvAbQzIvg=";
|
||||
repo = "tuigreet";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-dfzNRs3NOtHoWBq6tx3DjL2knNwsdxBmjqJbPzQJifQ=";
|
||||
cargoSha256 = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A=";
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Graphical console greeter for greetd";
|
||||
homepage = "https://github.com/apognu/tuigreet";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ luc65r ivar ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/apognu/tuigreet/releases/tag/${version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ luc65r ivar ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "tuigreet";
|
||||
};
|
||||
}
|
||||
|
||||
@ -3943,8 +3943,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "code-spell-checker";
|
||||
publisher = "streetsidesoftware";
|
||||
version = "4.0.1";
|
||||
hash = "sha256-Vxk+PpwwRV7dH8A9hI+DSzPMqH2l//VtrgUV+w8at4g=";
|
||||
version = "4.0.2";
|
||||
hash = "sha256-k3FxRAtW9Fdhm7jD3ingFXONiBsOia1Whs7OPeDmlSw=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
|
||||
@ -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";
|
||||
|
||||
@ -165,10 +165,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "bsnes-libretro",
|
||||
"rev": "37606e377ebae5d3175cd6267e4ddfa3f3c5091f",
|
||||
"hash": "sha256-B1ragos8ZeCjg8Xlt6SC8V69iTZ6OXTpPptlWw4EMOU="
|
||||
"rev": "44f6ce5dedb138ded8e59d71df18cae5b0655eba",
|
||||
"hash": "sha256-7iB2VQ3f8YVOV3C+Rkviaj7USoZdO/riDnT9kCdzc8k="
|
||||
},
|
||||
"version": "unstable-2024-05-17"
|
||||
"version": "unstable-2024-05-31"
|
||||
},
|
||||
"bsnes-hd": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -287,31 +287,31 @@
|
||||
"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",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-fceumm",
|
||||
"rev": "0dc5915f0ba10d4bb63b35fbfa57b81a3dd0955e",
|
||||
"hash": "sha256-fLgJ3EWOaHMpBxPqhjcyYKuwVzIiAmKhk0KUmUswlmY="
|
||||
"rev": "c970bcc2b527f2c9d072e3ad2a5e3b4143246e25",
|
||||
"hash": "sha256-EOtUExsYIXyuX2bTzs9Ia0i9aIMdXVByhZ+S0bSPfJw="
|
||||
},
|
||||
"version": "unstable-2024-05-27"
|
||||
"version": "unstable-2024-05-29"
|
||||
},
|
||||
"flycast": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "flyinghead",
|
||||
"repo": "flycast",
|
||||
"rev": "90896368b80531e492fede0e17c54f7e6855a13b",
|
||||
"hash": "sha256-7JhHpNYxC6oNyvLCMmBie0pkPgWJ9hxfeYRxmmgpBso=",
|
||||
"rev": "021249c321826ecb6b0a0ed6e5d2af9044e973a3",
|
||||
"hash": "sha256-/S/43/fKZrUjZTSq51NY3OU3oDpyoqNbHB2QGzqBOuk=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-05-27"
|
||||
"version": "unstable-2024-06-02"
|
||||
},
|
||||
"fmsx": {
|
||||
"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"
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-201zceUedEl93nyglWJo0f9SDfFX31toP0MzzHQeJds=";
|
||||
hash = "sha256-g0aMpSENMKHCyKyB2Lhq9XjH9GIx7l4/Sz9GDXmzUqU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q=";
|
||||
|
||||
@ -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,7 +33,7 @@ stdenvNoCC.mkDerivation {
|
||||
name = "Session";
|
||||
desktopName = "Session";
|
||||
comment = "Onion routing based messenger";
|
||||
exec = "${appimage}/bin/session-desktop-${version}";
|
||||
exec = "session-desktop";
|
||||
icon = "${appimage-contents}/session-desktop.png";
|
||||
terminal = false;
|
||||
type = "Application";
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -1,22 +1,39 @@
|
||||
{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib
|
||||
, defusedxml, future, ujson, packaging, psutil, setuptools
|
||||
# Optional dependencies:
|
||||
, bottle, pysnmp
|
||||
, hddtemp
|
||||
, netifaces # IP module
|
||||
, py-cpuinfo
|
||||
{
|
||||
stdenv,
|
||||
buildPythonApplication,
|
||||
fetchFromGitHub,
|
||||
isPyPy,
|
||||
lib,
|
||||
defusedxml,
|
||||
future,
|
||||
ujson,
|
||||
packaging,
|
||||
psutil,
|
||||
setuptools,
|
||||
pydantic,
|
||||
# Optional dependencies:
|
||||
fastapi,
|
||||
jinja2,
|
||||
orjson,
|
||||
pysnmp,
|
||||
hddtemp,
|
||||
netifaces, # IP module
|
||||
py-cpuinfo,
|
||||
uvicorn,
|
||||
requests,
|
||||
prometheus-client,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "glances";
|
||||
version = "4.0.6";
|
||||
version = "4.0.7";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicolargo";
|
||||
repo = "glances";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FkAMsfr/bO7Chemw4hhVt2SKkSyPLECNVuOsOxKWsGE=";
|
||||
hash = "sha256-Vfsco8Wno57aPM7PtwCc/gI+6FnAG3H/t5OAUngDU5o=";
|
||||
};
|
||||
|
||||
# On Darwin this package segfaults due to mismatch of pure and impure
|
||||
@ -24,7 +41,9 @@ buildPythonApplication rec {
|
||||
# scripts a workaround below is still required.
|
||||
# Relevant: https://github.com/NixOS/nixpkgs/issues/24693
|
||||
makeWrapperArgs = lib.optionals stdenv.isDarwin [
|
||||
"--set" "DYLD_FRAMEWORK_PATH" "/System/Library/Frameworks"
|
||||
"--set"
|
||||
"DYLD_FRAMEWORK_PATH"
|
||||
"/System/Library/Frameworks"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
@ -33,7 +52,6 @@ buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bottle
|
||||
defusedxml
|
||||
future
|
||||
ujson
|
||||
@ -43,14 +61,25 @@ buildPythonApplication rec {
|
||||
pysnmp
|
||||
setuptools
|
||||
py-cpuinfo
|
||||
pydantic
|
||||
fastapi
|
||||
uvicorn
|
||||
requests
|
||||
jinja2
|
||||
orjson
|
||||
prometheus-client
|
||||
] ++ lib.optional stdenv.isLinux hddtemp;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://nicolargo.github.io/glances/";
|
||||
description = "Cross-platform curses-based monitoring tool";
|
||||
mainProgram = "glances";
|
||||
changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ jonringer primeos koral ];
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
jonringer
|
||||
primeos
|
||||
koral
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, clangStdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, spdlog
|
||||
@ -9,6 +10,7 @@
|
||||
, libbpf
|
||||
, elfutils
|
||||
, bpftools
|
||||
, pcre2
|
||||
, zlib
|
||||
}:
|
||||
|
||||
@ -24,6 +26,15 @@ clangStdenv.mkDerivation rec {
|
||||
sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# FIXME: remove this when updating to next stable release
|
||||
(fetchpatch {
|
||||
name = "allow-regex-pattern-matching.patch";
|
||||
url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/6ea2dccceec39b6c4913f617dad81d859aa20f24.patch";
|
||||
hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -33,6 +44,7 @@ clangStdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pcre2
|
||||
spdlog
|
||||
nlohmann_json
|
||||
systemd
|
||||
@ -51,6 +63,7 @@ clangStdenv.mkDerivation rec {
|
||||
"-DUSE_BPF_PROC_IMPL=ON"
|
||||
"-DBPF_BUILD_LIBBPF=OFF"
|
||||
"-DENABLE_SYSTEMD=ON"
|
||||
"-DENABLE_REGEX_SUPPORT=ON"
|
||||
"-DVERSION=${version}"
|
||||
];
|
||||
|
||||
@ -59,12 +72,15 @@ clangStdenv.mkDerivation rec {
|
||||
rm -rf "$out"/lib/cmake
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp";
|
||||
description = "Rewrite of ananicy in c++ for lower cpu and memory usage";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ artturin ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
artturin
|
||||
johnrtitor
|
||||
];
|
||||
mainProgram = "ananicy-cpp";
|
||||
};
|
||||
}
|
||||
@ -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 ];
|
||||
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "2.7.6";
|
||||
version = "2.8.4";
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aZ7hdAZJH1PvrX9GQLzLquzzZG3LZSKOvt7sWQhTiR8=";
|
||||
hash = "sha256-O4s7PhSUTXoNEIi+zYASx8AgClMC5rs7se863G6w+l0=";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
@ -24,10 +24,10 @@ buildGoModule {
|
||||
owner = "caddyserver";
|
||||
repo = "caddy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-th0R3Q1nGT0q5PGOygtD1/CpJmrT5TYagrwQR4t/Fvg=";
|
||||
hash = "sha256-CBfyqtWp3gYsYwaIxbfXO3AYaBiM7LutLC7uZgYXfkQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ebnSehuhbCY58ctM8IRVMfNxxbJBp6ht9cbuLdGFNek=";
|
||||
vendorHash = "sha256-1Api8bBZJ1/oYk4ZGIiwWCSraLzK9L+hsKXkFtk6iVM=";
|
||||
|
||||
subPackages = [ "cmd/caddy" ];
|
||||
|
||||
@ -36,6 +36,9 @@ buildGoModule {
|
||||
"-X github.com/caddyserver/caddy/v2.CustomVersion=${version}"
|
||||
];
|
||||
|
||||
# matches upstream since v2.8.0
|
||||
tags = [ "nobadger" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -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"];
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "fantomas";
|
||||
version = "6.3.4";
|
||||
version = "6.3.7";
|
||||
|
||||
nugetSha256 = "sha256-1aWqZynBkQoznenGoP0sbf1PcUXAbcHiWyECuv89xa0=";
|
||||
nugetSha256 = "sha256-tEW1qQTcAqMVwH5tYeyukFQrjel7PrcteubzffgqKvw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "F# source code formatter";
|
||||
|
||||
@ -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=";
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "icloudpd";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "icloud-photos-downloader";
|
||||
repo = "icloud_photos_downloader";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QVfzGL/W7EmJvGXM8ge4sxWhSyshHYPykudMO1IcZJs=";
|
||||
hash = "sha256-VUa/VWLyGSuI+DRdrwXfvakB9/QD6qJik/XAfGtUubU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
|
||||
let
|
||||
pname = "jan";
|
||||
version = "0.4.14";
|
||||
version = "0.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
|
||||
hash = "sha256-nqTvLZ0upNI82R4QaHTKaGQLVC3eHMVEHoOZ4JvXR1E=";
|
||||
hash = "sha256-yU2J9RctID/n0INAFyHbdbaHvWJm1384p1Za3MCJuL0=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@ -71,13 +71,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "3015";
|
||||
version = "3070";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-/n5SiTU5//Vx/vtIev8Yxc/xYwjxVpPhiTr1LnDp4fs=";
|
||||
hash = "sha256-3PJ3YBFMSv2bFHkcDpOAZ/ZbuKEGjyfeLI7oavDbfBc=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@ -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" { };
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
, nix-output-monitor
|
||||
}:
|
||||
let
|
||||
version = "3.5.15";
|
||||
version = "3.5.16";
|
||||
runtimeDeps = [ nvd nix-output-monitor ];
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
|
||||
owner = "viperML";
|
||||
repo = "nh";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1mE4ZXGAMZl2Mufr47y+2UMDHBelqsvChaCsQDK3m70=";
|
||||
hash = "sha256-uAoD6tW1lSMt5X6hzouZ1qWzImmg4VAMy663BLcOALs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
|
||||
--prefix PATH : ${lib.makeBinPath runtimeDeps}
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-5BazSJGsafSl0eE7GOWw2SrVgC3k1tlrLiIFIpC51/o=";
|
||||
cargoHash = "sha256-610gS1T7i5rBEWeWzolRz/mUTGw5EJf1B68CWc4gkm4=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -30,13 +30,13 @@
|
||||
let
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.1.39";
|
||||
version = "0.1.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OYWHpPvnIgdjDjpcV8BKnr5cq6eJzBsAOGZmaVBBalQ=";
|
||||
hash = "sha256-rwJf/DbqTOD2TIS0YHK8CaIEC93CfeDg08qV9ydaNe4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -50,7 +50,7 @@ let
|
||||
(preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=")
|
||||
(preparePatch "03-load_exception.diff" "sha256-0XfMtMyg17oihqSFDBakBtAF0JwhsR188D+cOodgvDk=")
|
||||
(preparePatch "04-metal.diff" "sha256-Ne8J9R8NndUosSK0qoMvFfKNwqV5xhhce1nSoYrZo7Y=")
|
||||
(preparePatch "05-default-pretokenizer.diff" "sha256-8ffYnl9kMHEZ05e5CqryYJLdJ6/EEQJSlW6e/IgaU2Q=")
|
||||
(preparePatch "05-default-pretokenizer.diff" "sha256-NrQ0Fv5DAZYtRM0NBEeM2JLVTLFmb4Fs9RhwXhdMCC4=")
|
||||
];
|
||||
|
||||
preparePatch = patch: hash: fetchpatch {
|
||||
|
||||
@ -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 ];
|
||||
};
|
||||
}
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "radicale";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kozea";
|
||||
repo = "Radicale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ=";
|
||||
hash = "sha256-OUwznn71xl8oWkw90fT1NYYZOuD83k+B5zLhygp1VQQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -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=";
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2024-05-29";
|
||||
version = "0-unstable-2024-05-31";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "ed137a21c1d18272a16d6801de1029d183ab11c8";
|
||||
hash = "sha256-SbWRgTz/zxLcM+Zr0IW4gZTspumFSDA9FcfOwAGOeUI=";
|
||||
rev = "fadea1fb13d562e52de95d3f2724c4110bb258d0";
|
||||
hash = "sha256-Jbog3YgaoTUEdb1G9eS9SAhlbQRITS2jSsp0yeTHdnI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
renode.overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.15.0+20240517gitf683c4f59";
|
||||
version = "1.15.0+20240603gitf830e6345";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
|
||||
hash = "sha256-fbGzh2vBKmtLbji8FunbNmbONZdFpJ/r6VUEO8odUec=";
|
||||
hash = "sha256-4DV5dYnT7oZl/i7k3g6ydXxIRt4+z/jLZAB7c6JDgO4=";
|
||||
};
|
||||
|
||||
passthru.updateScript =
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "rofi-obsidian";
|
||||
version = "0.1.0";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nydragon";
|
||||
repo = "rofi-obsidian";
|
||||
rev = "c8f34e424a59b8a15bc77152462d59cfff7fc20e";
|
||||
hash = "sha256-t/neFiLdrA37jknLEsHmWhCug5BS40HgQpQ5a1svtQw=";
|
||||
rev = "0.1.5";
|
||||
hash = "sha256-EQ7OGW5FTgfuJ/xJzOhl1eb3XNORUfs0efP17A6yp7g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Eikzn7ZMsrujBdzmsiHGSYAJ+kGBgQAaiVJzixHknWM=";
|
||||
cargoHash = "sha256-hAiBSAvnMRchH49bku2oPhoCK3+bcWiZW4YbcMuAiqU=";
|
||||
|
||||
meta = {
|
||||
description = "Launch your Obsidian vaults from the comfort of rofi";
|
||||
|
||||
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 {
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "snipe-it";
|
||||
version = "6.4.1";
|
||||
version = "6.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snipe";
|
||||
repo = "snipe-it";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7IK5KLdWYcdzsJwzXfHsYvxWiR/R4407gGAGiY9+czY=";
|
||||
hash = "sha256-wNHFFqi1WNTzI3xv1/aXTPpVXe7oxiTqWMEYhplNM9A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KkFoc/fqYVgA5Vv6oEk+1/Rcj9VA52ZnH5O5qmLhmE4=";
|
||||
|
||||
3983
pkgs/by-name/sn/snx-rs/Cargo.lock
generated
Normal file
3983
pkgs/by-name/sn/snx-rs/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
33
pkgs/by-name/sn/snx-rs/package.nix
Normal file
33
pkgs/by-name/sn/snx-rs/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup, webkitgtk_4_1 }:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "snx-rs";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ancwrd1";
|
||||
repo = "snx-rs";
|
||||
rev = "v2.2.0";
|
||||
hash = "sha256-9aBJM20+G1U2NuJXBmax50o3M/lwRpLeqdcHCA28iAw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl glib atk gtk3 libsoup webkitgtk_4_1 ];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=platform::linux::net::tests::test_default_ip"
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"isakmp-0.1.0" = "sha256-Gk0/tyIQ62kH6ZSW6ov8SMVR2UBEWkz8HfqeWjSXmlY=";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Open source Linux client for Checkpoint VPN tunnels";
|
||||
homepage = "https://github.com/ancwrd1/snx-rs";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ lib.maintainers.lheckemann ];
|
||||
};
|
||||
}
|
||||
50
pkgs/by-name/st/stash/package.nix
Normal file
50
pkgs/by-name/st/stash/package.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
let
|
||||
|
||||
version = "0.25.1";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/stashapp/stash/releases/download/v${version}/stash-linux";
|
||||
hash = "sha256-Rb4x6iKx6T9NPuWWDbNaz+35XPzLqZzSm0psv+k2Gw4=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/stashapp/stash/releases/download/v${version}/stash-linux-arm64v8";
|
||||
hash = "sha256-6qPyIYKFkhmBNO47w9E91FSKlByepBOnl0MNJighGSc=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/stashapp/stash/releases/download/v${version}/stash-macos";
|
||||
hash = "sha256-W8+rgqWUDTOB8ykGO2GL9tKEjaDXdx9LpFg0TAtJsxM=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit version;
|
||||
|
||||
pname = "stash";
|
||||
|
||||
src = fetchurl { inherit (sources.${stdenv.system}) url hash; };
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 $src $out/bin/stash
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Stash is a self-hosted porn app.";
|
||||
homepage = "https://github.com/stashapp/stash";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ Golo300 ];
|
||||
platforms = builtins.attrNames sources;
|
||||
mainProgram = "stash";
|
||||
};
|
||||
})
|
||||
@ -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 ]
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "xcaddy";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
subPackages = [ "cmd/xcaddy" ];
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoModule rec {
|
||||
owner = "caddyserver";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xEPSRKrQC9hb+G9/rV9/k4btvZxXZkcsxmaxWcgl2fk=";
|
||||
hash = "sha256-4evqpkDb6/sduPuqRlnvvi/kS4H2zpYB8LB2PXmoopA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
"-X github.com/caddyserver/xcaddy/cmd.customVersion=v${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-7yd/6h1DKw7X/1NbHtr2vbpyapF81HPmDm7O4oV5nlc=";
|
||||
vendorHash = "sha256-NoOEvvaD3oUejlFIe1s95SjL/YRsuCSHFElnxaweA/s=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/caddyserver/xcaddy";
|
||||
|
||||
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
|
||||
'';
|
||||
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "groovy";
|
||||
version = "3.0.11";
|
||||
version = "4.0.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip";
|
||||
sha256 = "85abb44e81f94d794230cf5c2c7f1003e598a5f8a6ae04322f28c6f9efe395f6";
|
||||
sha256 = "sha256-Xvh49w24tkLSBOmkEMUZwRMaPnqd20tpENIUkJyy6Yo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out
|
||||
mkdir -p $out/share/doc/groovy
|
||||
rm bin/*.bat
|
||||
mv {bin,conf,grooid,indy,lib} $out
|
||||
mv {bin,conf,grooid,lib} $out
|
||||
mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy
|
||||
|
||||
sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
{ lib
|
||||
, lua
|
||||
, wrapLua
|
||||
, luarocks
|
||||
, luarocks_bootstrap
|
||||
, writeTextFile
|
||||
|
||||
# Whether the derivation provides a lua module or not.
|
||||
@ -91,7 +91,7 @@ let
|
||||
nativeBuildInputs = [
|
||||
lua # for lua.h
|
||||
wrapLua
|
||||
luarocks
|
||||
luarocks_bootstrap
|
||||
];
|
||||
|
||||
inherit doCheck extraConfig rockspecFilename knownRockspec externalDeps nativeCheckInputs;
|
||||
@ -99,7 +99,7 @@ let
|
||||
buildInputs = let
|
||||
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
|
||||
externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps;
|
||||
in [ lua.pkgs.luarocks ]
|
||||
in [ luarocks_bootstrap ]
|
||||
++ buildInputs
|
||||
++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs)
|
||||
++ (map (d: d.dep) externalDeps')
|
||||
|
||||
@ -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" ];
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proj";
|
||||
version = "9.4.0";
|
||||
version = "9.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-m8u5+uWeXI2lxxsTcVJbvCiV30CQifw4reAY3GHHavA=";
|
||||
hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1913,6 +1913,30 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
luarocks = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }:
|
||||
buildLuarocksPackage {
|
||||
pname = "luarocks";
|
||||
version = "3.11.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/luarocks-3.11.0-1.rockspec";
|
||||
sha256 = "0pi55445dskpw6nhrq52589h4v39fsf23c0kp8d4zg2qaf6y2n38";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "luarocks";
|
||||
repo = "luarocks";
|
||||
rev = "v3.11.0";
|
||||
hash = "sha256-mSwwBuLWoMT38iYaV/BTdDmmBz4heTRJzxBHC0Vrvc4=";
|
||||
};
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.luarocks.org";
|
||||
description = "A package manager for Lua modules.";
|
||||
maintainers = with lib.maintainers; [ mrcjkb teto ];
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }:
|
||||
buildLuarocksPackage {
|
||||
pname = "luarocks-build-rust-mlua";
|
||||
|
||||
@ -54,6 +54,8 @@
|
||||
, vimPlugins
|
||||
, vimUtils
|
||||
, yajl
|
||||
, zip
|
||||
, unzip
|
||||
, zlib
|
||||
, zziplib
|
||||
}:
|
||||
@ -407,6 +409,34 @@ in
|
||||
];
|
||||
});
|
||||
|
||||
|
||||
# As a nix user, use this derivation instead of "luarocks_bootstrap"
|
||||
luarocks = prev.luarocks.overrideAttrs (oa: {
|
||||
|
||||
nativeBuildInputs = oa.nativeBuildInputs ++ [ installShellFiles lua unzip ];
|
||||
# cmake is just to compile packages with "cmake" buildType, not luarocks itself
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
propagatedBuildInputs = [ zip unzip cmake ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd luarocks \
|
||||
--bash <($out/bin/luarocks completion bash) \
|
||||
--fish <($out/bin/luarocks completion fish) \
|
||||
--zsh <($out/bin/luarocks completion zsh)
|
||||
|
||||
installShellCompletion --cmd luarocks-admin \
|
||||
--bash <($out/bin/luarocks-admin completion bash) \
|
||||
--fish <($out/bin/luarocks-admin completion fish) \
|
||||
--zsh <($out/bin/luarocks-admin completion zsh)
|
||||
'';
|
||||
|
||||
meta = oa.meta // {
|
||||
mainProgram = "luarocks";
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
luasec = prev.luasec.overrideAttrs (oa: {
|
||||
externalDeps = [
|
||||
{ name = "OPENSSL"; dep = openssl; }
|
||||
|
||||
@ -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
|
||||
|
||||
@ -5,13 +5,14 @@
|
||||
stdenv,
|
||||
|
||||
autoreconfHook,
|
||||
boost,
|
||||
boost185,
|
||||
cairomm,
|
||||
cgal,
|
||||
expat,
|
||||
gmp,
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
llvmPackages,
|
||||
matplotlib,
|
||||
mpfr,
|
||||
numpy,
|
||||
@ -23,32 +24,51 @@
|
||||
sparsehash,
|
||||
}:
|
||||
|
||||
let
|
||||
# graph-tool doesn't build against boost181 on Darwin
|
||||
boost = boost185.override {
|
||||
enablePython = true;
|
||||
inherit python;
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "graph-tool";
|
||||
version = "2.65";
|
||||
version = "2.68";
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
|
||||
hash = "sha256-ozpFv9rri2toG8BeNTqzoJdkwB06GdJ69XjtPkjUKZw=";
|
||||
hash = "sha256-jB+/R6yZVhU0iohxYVNHdD205MauRxMoohbj4a2T+rw=";
|
||||
};
|
||||
|
||||
# Remove error messages about tput during build process without adding ncurses,
|
||||
# and replace unavailable git commit hash and date.
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'tput setaf $1' : \
|
||||
--replace-fail 'tput sgr0' : \
|
||||
--replace-fail \
|
||||
"\"esyscmd(git show | head -n 1 | sed 's/commit //' | grep -o -e '.\{8\}' | head -n 1 |tr -d '\n')\"" \
|
||||
'["(nixpkgs-${version})"]' \
|
||||
--replace-fail \
|
||||
"\"esyscmd(git log -1 | head -n 3 | grep 'Date:' | sed s/'Date: '// | tr -d '\n')\"" \
|
||||
'["(unavailable)"]'
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-python-module-path=$(out)/${python.sitePackages}"
|
||||
"--with-boost-libdir=${boost}/lib"
|
||||
"--with-expat=${expat}"
|
||||
"--with-cgal=${cgal}"
|
||||
"--enable-openmp"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# https://git.skewed.de/count0/graph-tool/-/wikis/installation-instructions#manual-compilation
|
||||
# https://graph-tool.skewed.de/installation.html#manual-compilation
|
||||
dependencies = [
|
||||
boost
|
||||
cairomm
|
||||
@ -64,13 +84,15 @@ buildPythonPackage rec {
|
||||
pygobject3
|
||||
scipy
|
||||
sparsehash
|
||||
];
|
||||
] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
|
||||
|
||||
meta = with lib; {
|
||||
pythonImportsCheck = [ "graph_tool" ];
|
||||
|
||||
meta = {
|
||||
description = "Python module for manipulation and statistical analysis of graphs";
|
||||
homepage = "https://graph-tool.skewed.de";
|
||||
license = licenses.lgpl3Plus;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ ];
|
||||
changelog = "https://git.skewed.de/count0/graph-tool/commits/release-${version}";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2024.4.12";
|
||||
version = "2024.5.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = "hahomematic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-iWl9kDLRh9CAk0tOibDOHcBV7lwVY/TWKYMBZW9G2k0=";
|
||||
hash = "sha256-pNG1R19H3fRje2pfW2hZw3zuGnElksI+Ugm6imnzK/w=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lupa";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dgAwcS1SczlvXpY92HMa77WsZdku/4v4/UEkwWMP6VA=";
|
||||
hash = "sha256-ZloAa8+Nmqzf25U4JLkp0GoMVZEKZitZvi8VerTIkk0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -36,13 +36,13 @@ assert !lapack.isILP64;
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meep";
|
||||
version = "1.28.0";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NanoComp";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o/Xrd/Gn1RsbB+ZfggGH6/ugdsGtfTe2RgaHdpY5AyE=";
|
||||
hash = "sha256-TB85obdk8pSWRaz3+3I6P6+dQtCHosWHRnKGck/wG9Q=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -7,24 +7,28 @@
|
||||
python,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
which,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nodeenv";
|
||||
version = "1.8.0";
|
||||
format = "setuptools";
|
||||
version = "1.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ekalinin";
|
||||
repo = pname;
|
||||
repo = "nodeenv";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-aW/aNZbFXfP4bF/Nlvv419IDfaJRA1pJYM7awj+6Hz0=";
|
||||
hash = "sha256-85Zr4RbmNeW3JAdtvDblWaPTivWWUJKh+mJbtsGJVO4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyexploitdb";
|
||||
version = "0.2.19";
|
||||
version = "0.2.20";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyExploitDb";
|
||||
inherit version;
|
||||
hash = "sha256-coxO3WQt60b6I2QfhViuTiOp+VuktUoddWjbMxUOx7E=";
|
||||
hash = "sha256-vRh99vi+24euDF3FwYs5KgYlWymCRK8fh8yp2FYYHkQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -2,17 +2,18 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
proj,
|
||||
fetchpatch,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
substituteAll,
|
||||
cython,
|
||||
pytestCheckHook,
|
||||
mock,
|
||||
|
||||
certifi,
|
||||
cython,
|
||||
mock,
|
||||
numpy,
|
||||
shapely,
|
||||
pandas,
|
||||
proj,
|
||||
shapely,
|
||||
xarray,
|
||||
}:
|
||||
|
||||
@ -36,6 +37,12 @@ buildPythonPackage rec {
|
||||
proj = proj;
|
||||
projdev = proj.dev;
|
||||
})
|
||||
|
||||
# fix test failure caused by update of EPSG DB
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pyproj4/pyproj/commit/3f7c7e5bcec33d9b2f37ceb03c484ea318dff3ce.patch";
|
||||
hash = "sha256-0J8AlInuhFDAYIBJAJ00XbqIanJY/D8xPVwlOapmLDE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
@ -44,11 +51,11 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [ certifi ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
numpy
|
||||
shapely
|
||||
pandas
|
||||
pytestCheckHook
|
||||
shapely
|
||||
xarray
|
||||
];
|
||||
|
||||
|
||||
@ -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 = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user