mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge master into staging-next
This commit is contained in:
commit
fc7fa5f568
104 changed files with 5116 additions and 5201 deletions
|
@ -1521,6 +1521,12 @@
|
|||
githubId = 962885;
|
||||
name = "Andrew Chambers";
|
||||
};
|
||||
andrewgazelka = {
|
||||
email = "andrew@gazelka.com";
|
||||
github = "andrewgazelka";
|
||||
githubId = 7644264;
|
||||
name = "Andrew Gazelka";
|
||||
};
|
||||
andrewrk = {
|
||||
email = "superjoe30@gmail.com";
|
||||
github = "andrewrk";
|
||||
|
@ -23125,6 +23131,12 @@
|
|||
githubId = 1141680;
|
||||
name = "Thane Gill";
|
||||
};
|
||||
ThaoTranLePhuong = {
|
||||
email = "thaotran.lp@gmail.com";
|
||||
github = "Thao-Tran";
|
||||
githubId = 7060816;
|
||||
name = "Thao-Tran Le-Phuong";
|
||||
};
|
||||
thblt = {
|
||||
name = "Thibault Polge";
|
||||
email = "thibault@thb.lt";
|
||||
|
|
|
@ -81,6 +81,7 @@ luaexpat,,,,1.4.1-1,,arobyn flosse
|
|||
luaffi,,,http://luarocks.org/dev,,,
|
||||
luafilesystem,,,,1.8.0-1,,flosse
|
||||
lualdap,,,,,,aanderse
|
||||
lualine.nvim,,,http://luarocks.org/dev,,,
|
||||
lualogging,,,,,,
|
||||
luaossl,,,,,5.1,
|
||||
luaposix,,,,34.1.1-1,,vyp lblasc
|
||||
|
@ -125,6 +126,7 @@ nvim-cmp,https://raw.githubusercontent.com/hrsh7th/nvim-cmp/main/nvim-cmp-scm-1.
|
|||
nvim-dbee,,,,,,perchun
|
||||
nvim-nio,,,,,,mrcjkb
|
||||
nvim-web-devicons,,,,,,
|
||||
oil.nvim,,,,,,
|
||||
orgmode,,,,,,
|
||||
papis-nvim,,,,,,GaetanLepage
|
||||
pathlib.nvim,,,,,,
|
||||
|
|
|
|
@ -940,9 +940,18 @@ in {
|
|||
of /etc/shadow (file where hashes are stored) are colon-separated.
|
||||
Please check the value of option `users.users."${user.name}".hashedPassword`.'';
|
||||
}
|
||||
{
|
||||
assertion = user.isNormalUser && user.uid != null -> user.uid >= 1000;
|
||||
message = ''
|
||||
A user cannot have a users.users.${user.name}.uid set below 1000 and set users.users.${user.name}.isNormalUser.
|
||||
Either users.users.${user.name}.isSystemUser must be set to true instead of users.users.${user.name}.isNormalUser
|
||||
or users.users.${user.name}.uid must be changed to 1000 or above.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = let
|
||||
isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 1000);
|
||||
# we do an extra check on isNormalUser here, to not trigger this assertion when isNormalUser is set and uid to < 1000
|
||||
isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 1000 && !user.isNormalUser);
|
||||
in xor isEffectivelySystemUser user.isNormalUser;
|
||||
message = ''
|
||||
Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set.
|
||||
|
|
|
@ -718,8 +718,8 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
type = mkDefOpt (types.enum [ "SRV" "A" "AAAA" ]) "SRV" ''
|
||||
The type of DNS query to perform. One of SRV, A, or AAAA.
|
||||
type = mkDefOpt (types.enum [ "SRV" "A" "AAAA" "MX" "NS" ]) "SRV" ''
|
||||
The type of DNS query to perform.
|
||||
'';
|
||||
|
||||
port = mkOpt types.port ''
|
||||
|
|
|
@ -13,6 +13,8 @@ in
|
|||
services.webdav = {
|
||||
enable = lib.mkEnableOption "WebDAV server";
|
||||
|
||||
package = lib.mkPackageOption pkgs "webdav" { };
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "webdav";
|
||||
|
@ -95,7 +97,7 @@ in
|
|||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.webdav}/bin/webdav -c ${cfg.configFile}";
|
||||
ExecStart = "${lib.getExe cfg.package} -c ${cfg.configFile}";
|
||||
Restart = "on-failure";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
|
|
|
@ -56,6 +56,22 @@ in
|
|||
default = null;
|
||||
example = "/dev/vda";
|
||||
};
|
||||
|
||||
empty = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"refuse"
|
||||
"allow"
|
||||
"require"
|
||||
"force"
|
||||
"create"
|
||||
];
|
||||
description = ''
|
||||
Controls how to operate on empty devices that contain no partition table yet.
|
||||
See {manpage}`systemd-repart(8)` for details.
|
||||
'';
|
||||
example = "require";
|
||||
default = "refuse";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.repart = {
|
||||
|
@ -145,7 +161,9 @@ in
|
|||
''
|
||||
${config.boot.initrd.systemd.package}/bin/systemd-repart \
|
||||
--definitions=/etc/repart.d \
|
||||
--dry-run=no ${lib.optionalString (initrdCfg.device != null) initrdCfg.device}
|
||||
--dry-run=no \
|
||||
--empty=${initrdCfg.empty} \
|
||||
${lib.optionalString (initrdCfg.device != null) initrdCfg.device}
|
||||
''
|
||||
];
|
||||
};
|
||||
|
|
|
@ -270,12 +270,9 @@ in
|
|||
};
|
||||
|
||||
ui = {
|
||||
enable = lib.mkEnableOption "(experimental) Incus UI";
|
||||
enable = lib.mkEnableOption "Incus Web UI";
|
||||
|
||||
package = lib.mkPackageOption pkgs [
|
||||
"incus"
|
||||
"ui"
|
||||
] { };
|
||||
package = lib.mkPackageOption pkgs [ "incus-ui-canonical" ] { };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -97,6 +97,7 @@ import ../make-test-python.nix (
|
|||
# TODO: Check sending and receiving email.
|
||||
# server.wait_for_unit("postfix.service")
|
||||
|
||||
server.succeed("sudo -iu weblate -- weblate check")
|
||||
# TODO: The goal is for this to succeed, but there are still some checks failing.
|
||||
# server.succeed("sudo -iu weblate -- weblate check --deploy")
|
||||
'';
|
||||
|
|
|
@ -7051,19 +7051,6 @@ final: prev:
|
|||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
lualine-nvim = buildVimPlugin {
|
||||
pname = "lualine.nvim";
|
||||
version = "2025-02-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lualine";
|
||||
repo = "lualine.nvim";
|
||||
rev = "f4f791f67e70d378a754d02da068231d2352e5bc";
|
||||
sha256 = "12jm3vc3mi0p9kjw7g1cd6a9nkgws1mvq2h7lpfmflad8zfmw35q";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
luasnip-latex-snippets-nvim = buildVimPlugin {
|
||||
pname = "luasnip-latex-snippets.nvim";
|
||||
version = "2024-11-25";
|
||||
|
@ -11020,20 +11007,6 @@ final: prev:
|
|||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
oil-nvim = buildVimPlugin {
|
||||
pname = "oil.nvim";
|
||||
version = "2025-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "oil.nvim";
|
||||
rev = "7cde5aab10f564408e9ac349d457d755422d58cd";
|
||||
sha256 = "0x6vaapj5x7a4jhdc8mvzb701cfvziyb9ywj9sshsyfdhw9q8phs";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/oil.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
ollama-nvim = buildVimPlugin {
|
||||
pname = "ollama.nvim";
|
||||
version = "2024-06-09";
|
||||
|
|
|
@ -4004,6 +4004,7 @@ in
|
|||
"gitsigns-nvim"
|
||||
"image-nvim"
|
||||
"lsp-progress-nvim"
|
||||
"lualine-nvim"
|
||||
"luasnip"
|
||||
"lush-nvim"
|
||||
"lz-n"
|
||||
|
@ -4018,6 +4019,7 @@ in
|
|||
"nvim-dbee"
|
||||
"nvim-nio"
|
||||
"nvim-web-devicons"
|
||||
"oil-nvim"
|
||||
"orgmode"
|
||||
"papis-nvim"
|
||||
"rest-nvim"
|
||||
|
|
|
@ -540,7 +540,6 @@ https://github.com/nvimdev/lspsaga.nvim/,,
|
|||
https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
|
||||
https://github.com/nvim-java/lua-async/,HEAD,
|
||||
https://github.com/arkav/lualine-lsp-progress/,,
|
||||
https://github.com/nvim-lualine/lualine.nvim/,,
|
||||
https://github.com/evesdropper/luasnip-latex-snippets.nvim/,HEAD,
|
||||
https://github.com/alvarosevilla95/luatab.nvim/,,
|
||||
https://github.com/mkasa/lushtags/,,
|
||||
|
@ -846,7 +845,6 @@ https://github.com/epwalsh/obsidian.nvim/,HEAD,
|
|||
https://github.com/nvimdev/oceanic-material/,,
|
||||
https://github.com/mhartington/oceanic-next/,,
|
||||
https://github.com/pwntester/octo.nvim/,,
|
||||
https://github.com/stevearc/oil.nvim/,HEAD,
|
||||
https://github.com/nomnivore/ollama.nvim/,HEAD,
|
||||
https://github.com/yonlu/omni.vim/,,
|
||||
https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
|
||||
|
|
|
@ -9,7 +9,7 @@ let
|
|||
versions =
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
{
|
||||
stable = "0.0.84";
|
||||
stable = "0.0.85";
|
||||
ptb = "0.0.130";
|
||||
canary = "0.0.585";
|
||||
development = "0.0.68";
|
||||
|
@ -26,7 +26,7 @@ let
|
|||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-Gbxa8Yekjx8a3BkPBfUAdLW5gdnq3WMcwW3rzVgZjog=";
|
||||
hash = "sha256-XxEiwekRXeO9+snvUuyz+dbrP3cyVYfI8i/n/u5SE7E=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.19.1";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f-koehler";
|
||||
repo = "KTailctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UUxHLC35au4Valy/ArFdBjI5uGsIQ8aMdNLMPz0gSTs=";
|
||||
hash = "sha256-0P3cvBI5CM03y6Km7d31Z3ZzpGW3y1oKkprpPglrujg=";
|
||||
};
|
||||
|
||||
goDeps =
|
||||
|
@ -40,7 +40,7 @@ let
|
|||
pname = "ktailctl-go-wrapper";
|
||||
inherit src version;
|
||||
modRoot = "src/wrapper";
|
||||
vendorHash = "sha256-xe2LUdh/F3ATRi2+5UbfLGAMgDnYj/J1ZIaB1lMPIkk=";
|
||||
vendorHash = "sha256-o7eH3f+yeRr5CnBIuL2jMtVQaBLVihz2dg5RTF8RvaM=";
|
||||
}).goModules;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
@ -67,13 +67,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freerdp";
|
||||
version = "3.10.3";
|
||||
version = "3.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-qFjR1Z2GZsNpgjlbHw+o+dLCBLZQ9D9c93FFqFGM8T4=";
|
||||
hash = "sha256-Bbpwfnz8xPyNLZ+UtcYw4arpzGEh3znqncExl4DlByA=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
@ -86,6 +86,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
substituteInPlace "libfreerdp/freerdp.pc.in" \
|
||||
--replace-fail "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
|
||||
|
||||
substituteInPlace client/SDL/SDL2/dialogs/{sdl_input.cpp,sdl_select.cpp,sdl_widget.cpp,sdl_widget.hpp} \
|
||||
--replace-fail "<SDL_ttf.h>" "<SDL2/SDL_ttf.h>"
|
||||
''
|
||||
+ lib.optionalString (pcsclite != null) ''
|
||||
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "abcmidi";
|
||||
version = "2025.01.30";
|
||||
version = "2025.02.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sshlien";
|
||||
repo = "abcmidi";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3l9sOPwoi5jHZraEldNiXXMC3Dz3km5z848IBP+8aPg=";
|
||||
hash = "sha256-oX+k8eJH3E3AqPFbiWMYilIvhlPn6kxZbZfqxUksCxE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
4397
pkgs/by-name/am/amdgpu_top/Cargo.lock
generated
4397
pkgs/by-name/am/amdgpu_top/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -16,21 +16,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "amdgpu_top";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Umio-Yasuno";
|
||||
repo = pname;
|
||||
repo = "amdgpu_top";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sXVUtqPnVYSJ+/RF4/FuXEZOA3DgHMv5Yd8ew/tJJeY=";
|
||||
hash = "sha256-9PHMPyL2yg36vG+wax0Lb/LFT7CQWnBnZ+t38hr01PE=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libdrm_amdgpu_sys-0.8.3" = "sha256-unjsJqQ6e9Xo522ETTpy6bxXYW/NzNOnVV+w1ord87U=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-W20jtH3w8LVqKwdf2ifwXKO2xgF3e/DuZ8vWqHOAGy0=";
|
||||
|
||||
buildInputs = [
|
||||
libdrm
|
||||
|
@ -45,7 +41,8 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
|
||||
postInstall = ''
|
||||
install -D ./assets/${pname}.desktop -t $out/share/applications/
|
||||
install -D ./assets/amdgpu_top.desktop -t $out/share/applications/
|
||||
install -D ./assets/amdgpu_top-tui.desktop -t $out/share/applications/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
@ -59,7 +56,10 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/Umio-Yasuno/amdgpu_top";
|
||||
changelog = "https://github.com/Umio-Yasuno/amdgpu_top/releases";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ geri1701 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
geri1701
|
||||
Gliczy
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "amdgpu_top";
|
||||
};
|
||||
|
|
|
@ -14,7 +14,7 @@ save_api = waybackpy.WaybackMachineSaveAPI("https://nav.gov.hu/pfile/programFile
|
|||
url = save_api.save()
|
||||
|
||||
print("Prefetching...")
|
||||
sha256, unpack_path = subprocess.check_output(["nix-prefetch-url", "--unpack", "--print-path", url], universal_newlines=True).split("\n")[:2]
|
||||
sha256, unpack_path = subprocess.check_output(["nix-prefetch-url", "--unpack", "--print-path", "--name", "abevjava", url], universal_newlines=True).split("\n")[:2]
|
||||
|
||||
print("Extracting version...")
|
||||
manifest = (Path(unpack_path) / "META-INF" / "MANIFEST.MF").read_text()
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"url": "https://web.archive.org/web/20240506155046/https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava",
|
||||
"sha256": "1bvhk8b5b1f5f940zzmpx7xp858p2a27iwqij43fs4kqagz2v782",
|
||||
"version": "3.33.0"
|
||||
"url": "https://web.archive.org/web/20250202083430/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
|
||||
"sha256": "0w6ps68z7kgfqkc35sxqkcflm4svzykhiafadkw4k40ihin4fa5w",
|
||||
"version": "3.39.0"
|
||||
}
|
||||
|
|
|
@ -12,12 +12,12 @@
|
|||
let
|
||||
tantivy-go = callPackage ../tantivy-go { };
|
||||
pname = "anytype-heart";
|
||||
version = "0.38.9";
|
||||
version = "0.39.10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-heart";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0MRtzPSUxbCBJQLJbHsdEpf6GEFoS4ud1S6j9GZWzAE=";
|
||||
hash = "sha256-w7l/J3UwLiyM1vFhIW2WEdCxxXER+x9xMPH+LfyCQWM=";
|
||||
};
|
||||
|
||||
arch =
|
||||
|
@ -33,7 +33,7 @@ in
|
|||
buildGoModule {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = "sha256-8QN7SipgkoJ9yRCl1Hv8ZIkeEwbWcFS6QiumXIIN1Bg=";
|
||||
vendorHash = "sha256-fbZ1DiRcD9dnS8e7BMrKPYApqZmQbaH6DsSSO1knDmo=";
|
||||
|
||||
subPackages = [ "cmd/grpcserver" ];
|
||||
tags = [
|
||||
|
|
|
@ -15,27 +15,27 @@
|
|||
let
|
||||
anytype-heart = callPackage ./anytype-heart { };
|
||||
pname = "anytype";
|
||||
version = "0.44.0";
|
||||
version = "0.45.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-ts";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-a2ZnTEAFzzTb+lxtQkC6QLG5SP1+gDSjI9dqUNZWfCg=";
|
||||
hash = "sha256-0jyC4TVbJBIWGUG1YJ642v17XUBnhntaqS4yxz2l8k0=";
|
||||
};
|
||||
description = "P2P note-taking tool";
|
||||
|
||||
locales = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "l10n-anytype-ts";
|
||||
rev = "a5c81ad55383c4e6e9bb7893ecfcb879bac87bea";
|
||||
hash = "sha256-evSB0ohHm++tZiazXRMR4vj34IfW3HIkfZ2gwsi/2dk=";
|
||||
rev = "822f8ea833a94fb48cd8e304ef8dc557b67a9f7b";
|
||||
hash = "sha256-fum8zLRXb8xW8TwNyelIZVZR6XXsdPHSt1WDo+TX4CU=";
|
||||
};
|
||||
in
|
||||
buildNpmPackage {
|
||||
inherit pname version src;
|
||||
|
||||
npmDepsHash = "sha256-DDVsrXgijYYOeCc1gIe2nVb+oL8v4Hqq80d7l5b6MR0=";
|
||||
npmDepsHash = "sha256-aYxTEy6lO2NLI8fEYUJVXTxCEyx9Hi8nABe7oo/PD9I=";
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
|
|
@ -9,17 +9,17 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "argon";
|
||||
version = "2.0.22";
|
||||
version = "2.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argon-rbx";
|
||||
repo = "argon";
|
||||
tag = version;
|
||||
hash = "sha256-Nno6uZIlD4tA3opzhzO4ylPPGq3RDDrhAIQnt/rTXdA=";
|
||||
hash = "sha256-Pj6czSNFaMtu5fZV51lFDYEiWlMcj1peu7i8JUnFSXk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-W3Z/WVGP+RBbnqgcgIcrfkmgfmdKdH8kG/LBfvtArqo=";
|
||||
cargoHash = "sha256-Lc9k6WDp7ZU4lBGbXJJATcH/+SQkbutMTgzmxZh2JCk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -1,25 +1,18 @@
|
|||
diff --git a/src/arma3-unix-launcher/mainwindow.cpp b/src/arma3-unix-launcher/mainwindow.cpp
|
||||
index 66b73cc..f89f66b 100644
|
||||
--- a/src/arma3-unix-launcher/mainwindow.cpp
|
||||
+++ b/src/arma3-unix-launcher/mainwindow.cpp
|
||||
@@ -56,6 +56,3 @@ MainWindow::MainWindow(std::unique_ptr<ARMA3::Client> arma3_client, std::filesys
|
||||
{
|
||||
- if (use_steam_integration)
|
||||
- steam_integration = std::make_unique<Steam::SteamIntegration>(ARMA3::Definitions::app_id);
|
||||
- else
|
||||
- steam_integration = std::make_unique<Steam::IntegrationStub>(ARMA3::Definitions::app_id);
|
||||
+ steam_integration = std::make_unique<Steam::IntegrationStub>(ARMA3::Definitions::app_id);
|
||||
|
||||
diff --git a/src/dayz-linux-launcher/mainwindow.cpp b/src/dayz-linux-launcher/mainwindow.cpp
|
||||
index d9223db..5773593 100644
|
||||
--- a/src/dayz-linux-launcher/mainwindow.cpp
|
||||
+++ b/src/dayz-linux-launcher/mainwindow.cpp
|
||||
@@ -56,6 +56,3 @@ MainWindow::MainWindow(std::unique_ptr<DayZ::Client> arma3_client, std::filesyst
|
||||
{
|
||||
- if (use_steam_integration)
|
||||
- steam_integration = std::make_unique<Steam::SteamIntegration>(DayZ::Definitions::app_id);
|
||||
- else
|
||||
- steam_integration = std::make_unique<Steam::IntegrationStub>(DayZ::Definitions::app_id);
|
||||
+ steam_integration = std::make_unique<Steam::IntegrationStub>(DayZ::Definitions::app_id);
|
||||
diff --git a/src/arma3-unix-launcher/main.cpp b/src/arma3-unix-launcher/main.cpp
|
||||
index 10f6ed9..c706734 100644
|
||||
--- a/src/arma3-unix-launcher/main.cpp
|
||||
+++ b/src/arma3-unix-launcher/main.cpp
|
||||
@@ -216,3 +216,3 @@ int main(int argc, char *argv[])
|
||||
|
||||
- MainWindow w(std::move(client), config_file, parser.get<bool>("--disable-steam-integration"));
|
||||
+ MainWindow w(std::move(client), config_file, !parser.get<bool>("--disable-steam-integration"));
|
||||
w.show();
|
||||
diff --git a/src/dayz-linux-launcher/main.cpp b/src/dayz-linux-launcher/main.cpp
|
||||
index f30bf8a..e0cef66 100644
|
||||
--- a/src/dayz-linux-launcher/main.cpp
|
||||
+++ b/src/dayz-linux-launcher/main.cpp
|
||||
@@ -216,3 +216,3 @@ int main(int argc, char *argv[])
|
||||
|
||||
- MainWindow w(std::move(client), config_file, parser.get<bool>("--disable-steam-integration"));
|
||||
+ MainWindow w(std::move(client), config_file, !parser.get<bool>("--disable-steam-integration"));
|
||||
w.show();
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "arma3-unix-launcher";
|
||||
version = "413";
|
||||
version = "413-unstable-2025-02-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muttleyxd";
|
||||
repo = "arma3-unix-launcher";
|
||||
rev = "2ea62d961522f1542d4c8e669ef5fe856916f9ec";
|
||||
hash = "sha256-uym93mYmVj9UxT8RbwdRUyIPrQX7nZTNWUUVjxCQmVU=";
|
||||
rev = "7d4bcb166da3bb64ef10af421619d0b00136ebd5";
|
||||
hash = "sha256-so7fjxESUAkQfO4hO5aQTzU5lHpeJlOOfEGp0Pb89sQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"owner": "advplyr",
|
||||
"repo": "audiobookshelf",
|
||||
"rev": "82ab95ab028711626b01838a2c562c796b36c2b0",
|
||||
"hash": "sha256-qxYch3NLxB072eKafkeZwEE1WqEmAc+kEMxR1fQxtCI=",
|
||||
"version": "2.19.0",
|
||||
"depsHash": "sha256-ha1ar06WCyUb1DvX5fswMKcebBzc7o+px1/l7TTrkmI=",
|
||||
"clientDepsHash": "sha256-OdlnH7PAlhFSaHXEry3XY5xkTdqEk+Us8ugGHkXRDds="
|
||||
"rev": "ebdf377fc186ee34c1700b8943cfc088b549369e",
|
||||
"hash": "sha256-Aukw0sHF5WThTUFUi5UP+Dp9SWMqiatZwYtGa2b/2vU=",
|
||||
"version": "2.19.2",
|
||||
"depsHash": "sha256-Vlo8HyuBMm6nltY0qoo4qvEkqVFHe1Q8YWLsxT5M5Ok=",
|
||||
"clientDepsHash": "sha256-8leIaSVQsCltRo9ZCDkCJ3xyiB6ggXFqNgYtQlAeGLQ="
|
||||
}
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
openssl,
|
||||
pango,
|
||||
systemd,
|
||||
wrapGAppsHook3,
|
||||
xorg,
|
||||
zlib,
|
||||
}:
|
||||
|
@ -108,6 +109,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -180,7 +182,7 @@ stdenv.mkDerivation rec {
|
|||
sqltoolsserviceRpath
|
||||
];
|
||||
|
||||
fixupPhase = ''
|
||||
preFixup = ''
|
||||
fix_sqltoolsservice()
|
||||
{
|
||||
mv ${sqltoolsservicePath}/$1 ${sqltoolsservicePath}/$1_old
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.1.2";
|
||||
version = "2.1.6";
|
||||
|
||||
jdk = jdk23.override { enableJavaFX = true; };
|
||||
|
||||
|
@ -41,15 +41,15 @@ let
|
|||
{
|
||||
"E222AA02" = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/E222AA02.asc";
|
||||
sha256 = "sha256-31uBpe/+0QQwFyAsoCt1TUWRm0PHfCFOGOx1M16efoE=";
|
||||
hash = "sha256-31uBpe/+0QQwFyAsoCt1TUWRm0PHfCFOGOx1M16efoE=";
|
||||
};
|
||||
|
||||
"387C8307" = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/387C8307.asc";
|
||||
sha256 = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI=";
|
||||
hash = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI=";
|
||||
};
|
||||
}
|
||||
."387C8307";
|
||||
."E222AA02";
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit version;
|
||||
|
@ -58,7 +58,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
|
||||
sha256 = "0zgv70xlz3c9mrwmiaa1dgagbc441ppk2vrkgard8zjrvk8rg7va";
|
||||
hash = "sha256-420XZt8wEzY70xv1OZswYZO1/dtVDt8CRyKCJW068H0=";
|
||||
|
||||
# Verify the upstream Debian package prior to extraction.
|
||||
# See https://bisq.wiki/Bisq_2#Installation
|
||||
|
@ -82,7 +82,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
signature = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
|
||||
sha256 = "sha256-WZhI8RDmb7nQqpCQJM86vrp8qQNg+mvRVdSPcDqgzxE=";
|
||||
hash = "sha256-17NjRIcDKlmqvX/zKVrahWd8qJEY+v25qP9yfFMPojw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
40
pkgs/by-name/bo/bounty/package.nix
Normal file
40
pkgs/by-name/bo/bounty/package.nix
Normal file
|
@ -0,0 +1,40 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
openssl,
|
||||
libgit2,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "bounty";
|
||||
version = "0.1.0-unstable-25-01-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghbountybot";
|
||||
repo = "cli";
|
||||
rev = "452c7545e611e0648de661f7f9c6444c157a3945";
|
||||
hash = "sha256-0f+ad7mgFskESh9yW+Y53hCFmHmINyy1XgHyB14sK54=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dlfoA5bWtyHrsviPdFd6O47D/cglvhJzChOboyu1Io0=";
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
libgit2
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "CLI tool for bountybot.dev";
|
||||
homepage = "https://github.com/ghbountybot/cli";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = with lib.maintainers; [ andrewgazelka ];
|
||||
mainProgram = "bounty";
|
||||
};
|
||||
}
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "changedetection-io";
|
||||
version = "0.49.0";
|
||||
version = "0.49.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgtlmoon";
|
||||
repo = "changedetection.io";
|
||||
tag = version;
|
||||
hash = "sha256-u0sJSOwPmt6Bg++hlL9CR+PREdLF/mYuha8VRgMBMHg=";
|
||||
hash = "sha256-2DfuD7/LmJXJIbtEhwoDdANBfP7lIXpd7BWDuvd+ci8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
@ -74,7 +74,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Self-hosted free open source website change detection tracking, monitoring and notification service";
|
||||
homepage = "https://github.com/dgtlmoon/changedetection.io";
|
||||
changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${version}";
|
||||
changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${src.tag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mikaelfangel ];
|
||||
mainProgram = "changedetection.io";
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cldr-annotations";
|
||||
version = "46.0";
|
||||
version = "46.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip";
|
||||
url = "https://unicode.org/Public/cldr/${version}/cldr-common-${version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-d8VjhE4k4QdlWNtUGcQf1jx7igBxziCwNpWx0ef4h8c=";
|
||||
hash = "sha256-HNQVVbUIjsGOnkzUlH2m8I0IDgEfy2omCTekZlSyXQI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "clorinde";
|
||||
version = "0.11.4";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halcyonnouveau";
|
||||
repo = "clorinde";
|
||||
tag = "clorinde-v${version}";
|
||||
hash = "sha256-p91LgbRj2+acOrmNuupIR92Z5aOJnTobVDd7A6ezrHk=";
|
||||
hash = "sha256-F6RGDhx5+efOKHB35obx6GTncVb0ZloSfLbRbFfunVY=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Vo7Ho+48QJEeAm+eLTCvB/4Q6/YoE0KbbfvdC2WictY=";
|
||||
cargoHash = "sha256-xC/g0J3647QI6tZOozxfDVxe5S4OCJ3DIYEq1U8wpck=";
|
||||
|
||||
cargoBuildFlags = [ "--package=clorinde" ];
|
||||
|
||||
|
|
|
@ -6,12 +6,13 @@
|
|||
installShellFiles,
|
||||
testers,
|
||||
nix-update-script,
|
||||
deno,
|
||||
dprint,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dprint";
|
||||
version = "0.48.0";
|
||||
version = "0.49.0";
|
||||
|
||||
# Prefer repository rather than crate here
|
||||
# - They have Cargo.lock in the repository
|
||||
|
@ -20,16 +21,22 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "dprint";
|
||||
repo = "dprint";
|
||||
tag = version;
|
||||
hash = "sha256-Zem37oHku90c7PDV8ep/7FN128eGRUvfIvRsaXa7X9g=";
|
||||
hash = "sha256-IhxtHOf4IY95B7UQPSOyLj4LqvcD2I9RxEu8B+OjtCE=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-sSxtqg4VQhY84F8GZ0mbXzmsN2VFrr77z95LEly1ROo=";
|
||||
cargoHash = "sha256-OdtUzlvbezeNk06AB6mzR3Rybh08asJJ3roNX0WOg54=";
|
||||
|
||||
nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
# Used in unsafe_ignore_cert test
|
||||
# https://github.com/dprint/dprint/blob/00e8f5e9895147b20fe70a0e4e5437bd54d928e8/crates/dprint/src/utils/url.rs#L527
|
||||
deno
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# Require creating directory and network access
|
||||
"--skip=plugins::cache_fs_locks::test"
|
||||
|
|
|
@ -28,13 +28,13 @@ assert blas.isILP64 == scalapack.isILP64;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elpa";
|
||||
version = "2024.05.001";
|
||||
version = "2025.01.001";
|
||||
|
||||
passthru = { inherit (blas) isILP64; };
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz";
|
||||
sha256 = "sha256-nK9Bo+YA4vb0zhkxvVQYUXna3pwXFVbQybQbvGlA8vY=";
|
||||
sha256 = "sha256-PvDGrtmj4F2276/m4U1m64iyoTVNYedlt83g09XzlR4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
50
pkgs/by-name/em/ember-language-server/package.nix
Normal file
50
pkgs/by-name/em/ember-language-server/package.nix
Normal file
|
@ -0,0 +1,50 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
nodejs,
|
||||
yarnConfigHook,
|
||||
yarnInstallHook,
|
||||
yarnBuildHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ember-language-server";
|
||||
version = "2.30.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ember-tooling";
|
||||
repo = "ember-language-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/6j71pBmZor7C1u9BkptwwQonh6ZWoLmMDCMOGCpMik=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-vWCG+FDf6XTNrgqOQGMnE6xNZ5A8PU5DA+FcTLLurIg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
yarnInstallHook
|
||||
# Needed for executing package.json scripts
|
||||
nodejs
|
||||
];
|
||||
|
||||
yarnBuildScript = "compile";
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/@ember-tooling/ember-language-server $out/bin/ember-language-server
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Language Server Protocol implementation for Ember.js projects";
|
||||
homepage = "https://github.com/ember-tooling/ember-language-server";
|
||||
changelog = "https://github.com/ember-tooling/ember-language-server/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ThaoTranLePhuong ];
|
||||
mainProgram = "ember-language-server";
|
||||
};
|
||||
})
|
|
@ -6,12 +6,13 @@
|
|||
nodejs,
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
nix-update-script,
|
||||
extraBuildEnv ? { },
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ente-web";
|
||||
version = "0.9.16";
|
||||
version = "0.9.97";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
|
@ -19,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
sparseCheckout = [ "web" ];
|
||||
tag = "photos-v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-DqfUUXY79CndEqPT8TR4PasLtaSCtqZaV2kp10Vu4PQ=";
|
||||
hash = "sha256-JEVz02FfPRhTolZMXOSmYzvLJTm0ImCuf912MAk2EmM=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/web";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/web/yarn.lock";
|
||||
hash = "sha256-tgFh8Av1Wl77N4hR2Y5TQp9lEH4ZCQnCIWMPmlZBlV4=";
|
||||
hash = "sha256-GIgvHfQc9qz06267lfiDo/WQhxBgS7vMCocMf6PWCHc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -45,6 +46,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"photos-v(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Web client for Ente Photos";
|
||||
homepage = "https://ente.io/";
|
||||
|
|
|
@ -0,0 +1,103 @@
|
|||
From 38b2cb092e866dede6b6ffddd135ff54a9bda69e Mon Sep 17 00:00:00 2001
|
||||
From: Angel Pons <th3fanbus@gmail.com>
|
||||
Date: Wed, 2 Nov 2022 22:45:52 +0100
|
||||
Subject: [PATCH] sb600spi.c: Drop "Promontory" support
|
||||
|
||||
The "Promontory" code is riddled with issues, some of them can result in
|
||||
soft bricks. Moreover, Promontory doesn't have a SPI controller.
|
||||
|
||||
Drop support for "Promontory" in flashrom for now: it's holding back the
|
||||
entire project and it's unlikely that it'll be fixed in a timely manner.
|
||||
|
||||
Change-Id: I1457946dce68321b496d9ffa40a0c5ab46455f72
|
||||
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
|
||||
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68824
|
||||
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
|
||||
Reviewed-by: Felix Singer <felixsinger@posteo.net>
|
||||
Reviewed-by: Swift Geek (Sebastian Grzywna) <swiftgeek@gmail.com>
|
||||
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
|
||||
(cherry picked from commit 664c58f32af45b2acf7520c05bb40ef2c2f0891e)
|
||||
---
|
||||
sb600spi.c | 31 ++-----------------------------
|
||||
1 file changed, 2 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/sb600spi.c b/sb600spi.c
|
||||
index cec7e0a5..e84bb8d6 100644
|
||||
--- a/sb600spi.c
|
||||
+++ b/sb600spi.c
|
||||
@@ -48,7 +48,6 @@ enum amd_chipset {
|
||||
CHIPSET_HUDSON234,
|
||||
CHIPSET_BOLTON,
|
||||
CHIPSET_YANGTZE,
|
||||
- CHIPSET_PROMONTORY,
|
||||
};
|
||||
|
||||
#define FIFO_SIZE_OLD 8
|
||||
@@ -135,7 +134,8 @@ static enum amd_chipset determine_generation(struct pci_dev *dev)
|
||||
*/
|
||||
} else if (rev == 0x4b || rev == 0x51 || rev == 0x59 || rev == 0x61 || rev == 0x71) {
|
||||
msg_pdbg("Promontory (rev 0x%02x) detected.\n", rev);
|
||||
- return CHIPSET_PROMONTORY;
|
||||
+ msg_perr("AMD \"Promontory\" chipsets are currently not supported (https://ticket.coreboot.org/issues/370)");
|
||||
+ return CHIPSET_AMD_UNKNOWN;
|
||||
} else {
|
||||
msg_pwarn("FCH device found but SMBus revision 0x%02x does not match known values.\n"
|
||||
"Please report this to flashrom@flashrom.org and include this log and\n"
|
||||
@@ -572,18 +572,6 @@ static int handle_imc(const struct programmer_cfg *cfg, struct pci_dev *dev, enu
|
||||
return amd_imc_shutdown(dev);
|
||||
}
|
||||
|
||||
-static int promontory_read_memmapped(struct flashctx *flash, uint8_t *buf,
|
||||
- unsigned int start, unsigned int len)
|
||||
-{
|
||||
- struct sb600spi_data * data = (struct sb600spi_data *)flash->mst->spi.data;
|
||||
- if (!data->flash) {
|
||||
- map_flash(flash);
|
||||
- data->flash = flash; /* keep a copy of flashctx for unmap() on tear-down. */
|
||||
- }
|
||||
- mmio_readn((void *)(flash->virtual_memory + start), buf, len);
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
static int sb600spi_shutdown(void *data)
|
||||
{
|
||||
struct sb600spi_data *sb600_data = data;
|
||||
@@ -617,17 +605,6 @@ static const struct spi_master spi_master_yangtze = {
|
||||
.shutdown = sb600spi_shutdown,
|
||||
};
|
||||
|
||||
-static const struct spi_master spi_master_promontory = {
|
||||
- .max_data_read = MAX_DATA_READ_UNLIMITED,
|
||||
- .max_data_write = FIFO_SIZE_YANGTZE - 3,
|
||||
- .command = spi100_spi_send_command,
|
||||
- .map_flash_region = physmap,
|
||||
- .unmap_flash_region = physunmap,
|
||||
- .read = promontory_read_memmapped,
|
||||
- .write_256 = default_spi_write_256,
|
||||
- .shutdown = sb600spi_shutdown,
|
||||
-};
|
||||
-
|
||||
int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev)
|
||||
{
|
||||
struct pci_dev *smbus_dev;
|
||||
@@ -731,8 +708,6 @@ int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev)
|
||||
case CHIPSET_SB89XX:
|
||||
case CHIPSET_HUDSON234:
|
||||
case CHIPSET_YANGTZE:
|
||||
- case CHIPSET_PROMONTORY:
|
||||
- msg_pdbg(", SpiBusy=%"PRIi32"", (tmp >> 31) & 0x1);
|
||||
default: break;
|
||||
}
|
||||
msg_pdbg("\n");
|
||||
@@ -808,8 +783,6 @@ int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev)
|
||||
register_spi_master(&spi_master_sb600, data);
|
||||
else if (amd_gen == CHIPSET_YANGTZE)
|
||||
register_spi_master(&spi_master_yangtze, data);
|
||||
- else
|
||||
- register_spi_master(&spi_master_promontory, data);
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
|
|
@ -1,31 +1,50 @@
|
|||
{
|
||||
fetchurl,
|
||||
stdenv,
|
||||
installShellFiles,
|
||||
bash-completion,
|
||||
cmocka,
|
||||
lib,
|
||||
libftdi1,
|
||||
libjaylink,
|
||||
libusb1,
|
||||
openssl,
|
||||
meson,
|
||||
ninja,
|
||||
pciutils,
|
||||
pkg-config,
|
||||
sphinx,
|
||||
jlinkSupport ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flashrom";
|
||||
version = "1.3.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2";
|
||||
hash = "sha256-oFMjRFPM0BLnnzRDvcxhYlz5e3/Xy0zdi/v/vosUliM=";
|
||||
url = "https://download.flashrom.org/releases/flashrom-v${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-H5NLB27UnqziA2Vewkn8eGGmuOh/5K73MuR7bkhbYpM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Release notes for 1.4.0 state that Promontory chipsets are unsupported, and that attempting to read flash on those systems may crash the system.
|
||||
# The patch that removes this (broken) support only made it into the 1.3.0 release, seemingly by mistake, and the relevant code has been essentially untouched since.
|
||||
# We cherry-pick the upstream patch from 1.3.0, though amended to reference the relevant bug in the error message, rather than requesting the user email upstream.
|
||||
# https://ticket.coreboot.org/issues/370
|
||||
# https://review.coreboot.org/c/flashrom/+/68824
|
||||
./0001-sb600spi.c-Drop-Promontory-support.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
installShellFiles
|
||||
sphinx
|
||||
bash-completion
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
openssl
|
||||
cmocka
|
||||
libftdi1
|
||||
libusb1
|
||||
]
|
||||
|
@ -37,20 +56,16 @@ stdenv.mkDerivation rec {
|
|||
--replace 'GROUP="plugdev"' 'TAG+="uaccess", TAG+="udev-acl"'
|
||||
'';
|
||||
|
||||
makeFlags =
|
||||
[
|
||||
"PREFIX=$(out)"
|
||||
"libinstall"
|
||||
]
|
||||
++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes"
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
"CONFIG_INTERNAL_X86=no"
|
||||
"CONFIG_INTERNAL_DMI=no"
|
||||
"CONFIG_RAYER_SPI=no"
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "programmer" "auto")
|
||||
(lib.mesonEnable "man-pages" true)
|
||||
(lib.mesonEnable "tests" (!stdenv.buildPlatform.isDarwin))
|
||||
];
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules
|
||||
install -Dm644 $NIX_BUILD_TOP/$sourceRoot/util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (
|
||||
|
@ -65,4 +80,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.all;
|
||||
mainProgram = "flashrom";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,58 +1,82 @@
|
|||
# Updating? Keep $out/etc synchronized with passthru keys
|
||||
|
||||
{
|
||||
pkgsBuildBuild,
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
gi-docgen,
|
||||
pkg-config,
|
||||
gobject-introspection,
|
||||
gettext,
|
||||
libgudev,
|
||||
libdrm,
|
||||
polkit,
|
||||
libxmlb,
|
||||
gusb,
|
||||
sqlite,
|
||||
libarchive,
|
||||
libredirect,
|
||||
curl,
|
||||
libjcat,
|
||||
elfutils,
|
||||
valgrind,
|
||||
meson,
|
||||
mesonEmulatorHook,
|
||||
libuuid,
|
||||
ninja,
|
||||
gnutls,
|
||||
protobufc,
|
||||
stdenv,
|
||||
|
||||
# runPythonCommand
|
||||
runCommand,
|
||||
python3,
|
||||
wrapGAppsNoGuiHook,
|
||||
ensureNewerSourcesForZipFilesHook,
|
||||
|
||||
# test-firmware
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
|
||||
# fwupd
|
||||
pkg-config,
|
||||
pkgsBuildBuild,
|
||||
|
||||
# propagatedBuildInputs
|
||||
json-glib,
|
||||
bash-completion,
|
||||
|
||||
# nativeBuildInputs
|
||||
ensureNewerSourcesForZipFilesHook,
|
||||
gettext,
|
||||
gi-docgen,
|
||||
gobject-introspection,
|
||||
meson,
|
||||
ninja,
|
||||
protobufc,
|
||||
shared-mime-info,
|
||||
vala,
|
||||
wrapGAppsNoGuiHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
mesonEmulatorHook,
|
||||
|
||||
# buildInputs
|
||||
bash-completion,
|
||||
curl,
|
||||
elfutils,
|
||||
fwupd-efi,
|
||||
gnutls,
|
||||
gusb,
|
||||
libarchive,
|
||||
libcbor,
|
||||
libdrm,
|
||||
libgudev,
|
||||
libjcat,
|
||||
libmbim,
|
||||
libqmi,
|
||||
libuuid,
|
||||
libxmlb,
|
||||
modemmanager,
|
||||
pango,
|
||||
polkit,
|
||||
sqlite,
|
||||
tpm2-tss,
|
||||
valgrind,
|
||||
xz, # for liblzma
|
||||
flashrom,
|
||||
|
||||
# mesonFlags
|
||||
hwdata,
|
||||
|
||||
# env
|
||||
makeFontsConf,
|
||||
freefont_ttf,
|
||||
pango,
|
||||
tpm2-tss,
|
||||
|
||||
# preCheck
|
||||
libredirect,
|
||||
|
||||
# preFixup
|
||||
bubblewrap,
|
||||
efibootmgr,
|
||||
flashrom,
|
||||
tpm2-tools,
|
||||
fwupd-efi,
|
||||
|
||||
# passthru
|
||||
nixosTests,
|
||||
runCommand,
|
||||
unstableGitUpdater,
|
||||
modemmanager,
|
||||
libqmi,
|
||||
libmbim,
|
||||
libcbor,
|
||||
xz,
|
||||
hwdata,
|
||||
nix-update-script,
|
||||
|
||||
enableFlashrom ? false,
|
||||
enablePassim ? false,
|
||||
}:
|
||||
|
@ -117,7 +141,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwupd";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
|
@ -135,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "fwupd";
|
||||
repo = "fwupd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-V07alPn2+bOkKx+oh8qoX4Ie6/5ujO6h/TDzvL3UhvQ=";
|
||||
hash = "sha256-//y2kkCrj6E3kKxZIEK2bBUiZezB9j4xzR6WrBdcpqQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -158,6 +182,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
./efi-app-path.patch
|
||||
];
|
||||
|
||||
postPatch =
|
||||
''
|
||||
patchShebangs \
|
||||
contrib/generate-version-script.py \
|
||||
contrib/generate-man.py \
|
||||
po/test-deps
|
||||
''
|
||||
# in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf
|
||||
+ ''
|
||||
substituteInPlace plugins/redfish/meson.build \
|
||||
--replace-fail "get_option('tests')" "false"
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
|
@ -172,16 +209,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs =
|
||||
[
|
||||
ensureNewerSourcesForZipFilesHook # required for firmware zipping
|
||||
gettext
|
||||
gi-docgen
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
shared-mime-info
|
||||
protobufc # for protoc
|
||||
wrapGAppsNoGuiHook
|
||||
shared-mime-info
|
||||
vala
|
||||
gobject-introspection
|
||||
gi-docgen
|
||||
wrapGAppsNoGuiHook
|
||||
|
||||
# jcat-tool at buildtime requires a home directory
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
mesonEmulatorHook
|
||||
|
@ -189,29 +229,29 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
buildInputs =
|
||||
[
|
||||
gnutls
|
||||
polkit
|
||||
libxmlb
|
||||
gusb
|
||||
sqlite
|
||||
libarchive
|
||||
libdrm
|
||||
bash-completion
|
||||
curl
|
||||
elfutils
|
||||
fwupd-efi
|
||||
gnutls
|
||||
gusb
|
||||
libarchive
|
||||
libcbor
|
||||
libdrm
|
||||
libgudev
|
||||
libjcat
|
||||
libuuid
|
||||
bash-completion
|
||||
pango
|
||||
tpm2-tss
|
||||
fwupd-efi
|
||||
protobufc
|
||||
modemmanager
|
||||
libmbim
|
||||
libcbor
|
||||
libqmi
|
||||
xz # for liblzma
|
||||
libuuid
|
||||
libxmlb
|
||||
modemmanager
|
||||
pango
|
||||
polkit
|
||||
protobufc
|
||||
sqlite
|
||||
tpm2-tss
|
||||
valgrind
|
||||
xz # for liblzma
|
||||
]
|
||||
++ lib.optionals haveFlashrom [
|
||||
flashrom
|
||||
|
@ -219,39 +259,39 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
mesonFlags =
|
||||
[
|
||||
"-Ddocs=enabled"
|
||||
(lib.mesonEnable "docs" true)
|
||||
# We are building the official releases.
|
||||
"-Dsupported_build=enabled"
|
||||
"-Dlaunchd=disabled"
|
||||
"-Dsystemd_root_prefix=${placeholder "out"}"
|
||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||
(lib.mesonEnable "supported_build" true)
|
||||
(lib.mesonEnable "launchd" false)
|
||||
(lib.mesonOption "systemd_root_prefix" "${placeholder "out"}")
|
||||
(lib.mesonOption "installed_test_prefix" "${placeholder "installedTests"}")
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
"-Dsysconfdir_install=${placeholder "out"}/etc"
|
||||
"-Defi_os_dir=nixos"
|
||||
"-Dplugin_modem_manager=enabled"
|
||||
"-Dvendor_metadata=true"
|
||||
"-Dplugin_uefi_capsule_splash=false"
|
||||
(lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
|
||||
(lib.mesonOption "efi_os_dir" "nixos")
|
||||
(lib.mesonEnable "plugin_modem_manager" true)
|
||||
(lib.mesonBool "vendor_metadata" true)
|
||||
(lib.mesonBool "plugin_uefi_capsule_splash" false)
|
||||
# TODO: what should this be?
|
||||
"-Dvendor_ids_dir=${hwdata}/share/hwdata"
|
||||
"-Dumockdev_tests=disabled"
|
||||
(lib.mesonOption "vendor_ids_dir" "${hwdata}/share/hwdata")
|
||||
(lib.mesonEnable "umockdev_tests" false)
|
||||
# We do not want to place the daemon into lib (cyclic reference)
|
||||
"--libexecdir=${placeholder "out"}/libexec"
|
||||
]
|
||||
++ lib.optionals (!enablePassim) [
|
||||
"-Dpassim=disabled"
|
||||
(lib.mesonEnable "passim" false)
|
||||
]
|
||||
++ lib.optionals (!haveDell) [
|
||||
"-Dplugin_synaptics_mst=disabled"
|
||||
(lib.mesonEnable "plugin_synaptics_mst" false)
|
||||
]
|
||||
++ lib.optionals (!haveRedfish) [
|
||||
"-Dplugin_redfish=disabled"
|
||||
(lib.mesonEnable "plugin_redfish" false)
|
||||
]
|
||||
++ lib.optionals (!haveFlashrom) [
|
||||
"-Dplugin_flashrom=disabled"
|
||||
(lib.mesonEnable "plugin_flashrom" false)
|
||||
]
|
||||
++ lib.optionals (!haveMSR) [
|
||||
"-Dplugin_msr=disabled"
|
||||
(lib.mesonEnable "plugin_msr" false)
|
||||
];
|
||||
|
||||
# TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF
|
||||
|
@ -275,22 +315,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions";
|
||||
};
|
||||
|
||||
# Phase hooks
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
contrib/generate-version-script.py \
|
||||
contrib/generate-man.py \
|
||||
po/test-deps
|
||||
|
||||
# in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf
|
||||
sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# jcat-tool at buildtime requires a home directory
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
nativeCheckInputs = [
|
||||
polkit
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share"
|
||||
|
@ -308,8 +335,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
preFixup =
|
||||
let
|
||||
binPath = [
|
||||
efibootmgr
|
||||
bubblewrap
|
||||
efibootmgr
|
||||
tpm2-tools
|
||||
];
|
||||
in
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
diffoscope,
|
||||
git,
|
||||
versionCheckHook,
|
||||
replaceVars,
|
||||
|
@ -12,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "garble";
|
||||
version = "0.13.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "burrowers";
|
||||
repo = "garble";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FtI5lAeqjRPN47iC46bcEsRLQb7mItw4svsnLkRpNxY=";
|
||||
hash = "sha256-zS/K2kOpWhJmr0NuWSjEjNXV8ILt81yLIQWSPDuMwt8=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
@ -38,11 +37,10 @@ buildGoModule rec {
|
|||
"TestScript/gogarble"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-mSdajYiMEg2ik0ocfmHK+XddEss1qLu6rDwzjocaaW0=";
|
||||
vendorHash = "sha256-xxG1aQrALVuJ7oVn+Z+sH655eFQ7rcYFmymGCUZD1uU=";
|
||||
|
||||
# Used for some of the tests.
|
||||
nativeCheckInputs = [
|
||||
diffoscope
|
||||
git
|
||||
versionCheckHook
|
||||
];
|
||||
|
|
|
@ -12,12 +12,12 @@ let
|
|||
packageOverrides = self: super: {
|
||||
lark = super.lark.overridePythonAttrs (old: rec {
|
||||
# gdtoolkit needs exactly this lark version
|
||||
version = "1.1.9";
|
||||
version = "1.2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lark-parser";
|
||||
repo = "lark";
|
||||
rev = version;
|
||||
hash = "sha256-vDu+VPAXONY8J+A6oS7EiMeOMgzGms0nWpE+DKI1MVU=";
|
||||
hash = "sha256-Dc7wbMBY8CSeP4JE3hBk5m1lwzmCnNTkVoLdIukRw1Q=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [ ];
|
||||
|
@ -27,13 +27,13 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "gdtoolkit";
|
||||
version = "4.3.1";
|
||||
version = "4.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Scony";
|
||||
repo = "godot-gdscript-toolkit";
|
||||
tag = version;
|
||||
hash = "sha256-XK6s/WnbTzjCAtV8dbRPLe5olpKUglPLQdttRRMvX70=";
|
||||
hash = "sha256-GS1bCDOKtdJkzgP3+CSWEUeHQ9lUcAHDT09QmPOOeVc=";
|
||||
};
|
||||
|
||||
disabled = python.pythonOlder "3.7";
|
||||
|
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGo123Module rec {
|
||||
pname = "glab";
|
||||
version = "1.52.0";
|
||||
version = "1.53.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XK/6b2KWwyHev3zVyNKJlOHTenloO28dXgG1ZazE54Q=";
|
||||
hash = "sha256-QbXc249DKRrLdDwH3R7ZWXh2izLe97jc/WcjC8z1mv8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0Mx7QbQQbRhtBcsRWdnSJvEXAtUus/n/KzXTi33ekvc=";
|
||||
vendorHash = "sha256-wwWKxdAIlZw5s/kp08mZf8x10ujht9xbSoYWlGT4sPk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
@ -1,22 +1,22 @@
|
|||
{
|
||||
buildGoModule,
|
||||
buildGo124Module,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo124Module rec {
|
||||
pname = "golangci-lint";
|
||||
version = "1.64.4";
|
||||
version = "1.64.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BrkBIf4WP3COAac/5vre8fHLgDneg5Gm31nNq8sXzEE=";
|
||||
hash = "sha256-PRI82Ia2R2GH9xV/UZvfXTmCrfsxvHfysXuAek/4a+0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xUKse9yTAVuysmPwmX4EXdlpg6NYKfT5QB1RgmBQvhk=";
|
||||
vendorHash = "sha256-oCaVXjflmOMUDEDynbnUwA9KOPNDcEwI4WqOi2KoCG4=";
|
||||
|
||||
subPackages = [ "cmd/golangci-lint" ];
|
||||
|
||||
|
|
817
pkgs/by-name/go/goose-cli/Cargo.lock
generated
817
pkgs/by-name/go/goose-cli/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -26,13 +26,13 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "goose-cli";
|
||||
version = "1.0.4";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "block";
|
||||
repo = "goose";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9iTMT8n1bnHIYLAOknK3ts73CWkP9ztHeMAwi/btzjk=";
|
||||
hash = "sha256-/PCEszhRPxXSvvlNX8EVQTqLJwGF5N3ry+XuykiGV5U=";
|
||||
};
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
|
|
@ -8,12 +8,21 @@
|
|||
perl,
|
||||
pkg-config,
|
||||
vpnc-scripts,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gpclient";
|
||||
version = "2.4.1";
|
||||
|
||||
inherit (gpauth) version src meta;
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuezk";
|
||||
repo = "GlobalProtect-openconnect";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MY4JvftrC6sR8M0dFvnGZOkvHIhPRcyct9AG/8527gw=";
|
||||
};
|
||||
|
||||
inherit (gpauth) meta;
|
||||
|
||||
buildAndTestSubdir = "apps/gpclient";
|
||||
useFetchCargoVendor = true;
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.9.9.16";
|
||||
version = "0.9.9.18";
|
||||
pname = "hifile";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hifile.app/files/HiFile-${version}.AppImage";
|
||||
hash = "sha256-/5ZAAq6yQQZ8NxlCeXp1jJ+fqewIGuBGD+KpjirfCjU=";
|
||||
hash = "sha256-N/q7uIXcl1Gl4iBiFr46XK6cVc1mbiQc0qov9GvpjDw=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
@ -18,28 +18,29 @@ let
|
|||
};
|
||||
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/HiFile.desktop $out/share/applications/HiFile.desktop
|
||||
install -m 444 -D ${appimageContents}/HiFile.png $out/share/icons/hicolor/512x512/apps/HiFile.png
|
||||
substituteInPlace $out/share/applications/HiFile.desktop \
|
||||
--replace-fail 'Exec=HiFile' 'Exec=${pname}'
|
||||
--replace-fail 'Exec=HiFile' 'Exec=hifile'
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Dual-pane graphical file manager for Windows, macOS and Linux";
|
||||
longDescription = ''
|
||||
HiFile is the next evolution of file managers. Its mission is to increase your productivity whenever you work with files or folders. It aims to be better in every way - more convenient, more versatile, more efficient, more elegant, more customizable, and more fun.
|
||||
'';
|
||||
homepage = "https://www.hifile.app/";
|
||||
downloadPage = "https://www.hifile.app/download";
|
||||
license = licenses.unfree;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ ymstnt ];
|
||||
changelog = "https://www.hifile.app/changelog";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ ymstnt ];
|
||||
mainProgram = "hifile";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
|
|
@ -11,33 +11,29 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "incus-ui";
|
||||
version = "0.7";
|
||||
pname = "incus-ui-canonical";
|
||||
version = "0.14.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "lxd-ui";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DJLkXZpParmEYHbTpl6KFC9l9y5DqzUTrC0pb2dJXI4=";
|
||||
owner = "zabbly";
|
||||
repo = "incus-ui-canonical";
|
||||
tag = "incus-${version}";
|
||||
hash = "sha256-An2mhIj3D2EdB1Bgnry1l2m6r/GIKTee4anSYNTq8B8=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-ckTWE/czzvxbGOF8fsJ3W1sal7+NaHquoSjZSPjkGj4=";
|
||||
hash = "sha256-dkATFNjAPhrPbXhcJ/R4eIpcagKEwBSnRfLwqTPIe6c=";
|
||||
};
|
||||
|
||||
zabbly = fetchFromGitHub {
|
||||
owner = "zabbly";
|
||||
repo = "incus";
|
||||
rev = "c83023587eb0e3b01c99ba26e63f757ac15c6f9c";
|
||||
hash = "sha256-cWKp4ALrae6nEBLvWcOM1T+Aca7eHLwsRguH9aSb10Y=";
|
||||
rev = "36714d7c38eb3cc3e4e821c7aed44e066e1e84ca";
|
||||
hash = "sha256-H6gjXmwCv3oGXrzn1NENfgO3CWXMnmp94GdJv2Q8n0w=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
for p in $zabbly/patches/ui-canonical*patch; do
|
||||
echo "applying patch $p"
|
||||
git apply -p1 "$p"
|
||||
done
|
||||
sed -i -f "$zabbly/patches/ui-canonical-renames.sed" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
|
||||
'';
|
||||
|
||||
|
@ -79,8 +75,8 @@ stdenv.mkDerivation rec {
|
|||
passthru.tests.default = nixosTests.incus.ui;
|
||||
|
||||
meta = {
|
||||
description = "Web user interface for Incus, based on LXD webui";
|
||||
homepage = "https://github.com/canonical/lxd-ui";
|
||||
description = "Web user interface for Incus";
|
||||
homepage = "https://github.com/zabbly/incus-ui-canonical";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = lib.teams.lxc.members;
|
||||
platforms = lib.platforms.linux;
|
|
@ -14,6 +14,7 @@
|
|||
fetchFromGitHub,
|
||||
acl,
|
||||
cowsql,
|
||||
incus-ui-canonical,
|
||||
libcap,
|
||||
lxc,
|
||||
pkg-config,
|
||||
|
@ -126,7 +127,7 @@ buildGoModule rec {
|
|||
|
||||
tests = if lts then nixosTests.incus-lts.all else nixosTests.incus.all;
|
||||
|
||||
ui = callPackage ./ui.nix { };
|
||||
ui = lib.warnOnInstantiate "`incus.ui` renamed to `incus-ui-canonical`" incus-ui-canonical;
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = nixUpdateExtraArgs;
|
||||
|
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jellyfin-tui";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhonus";
|
||||
repo = "jellyfin-tui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-k8hN6MfY/agg5Janq4s65te7uOmfEpXXzogaS3jNAC8=";
|
||||
hash = "sha256-rJI4XREBeiJfusUdIFGZ6zrvS93BC946uaUJTq6ceuo=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Ca43CPjjUhNBclkJTt2xFWNRacEvRkKdHosnWSjfN2I=";
|
||||
cargoHash = "sha256-3gtEcfOV7kXstvzrmX0/WxHj2OikvLDHDT4rhcmpnGc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@ let
|
|||
in
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "kakoune.cr";
|
||||
version = "unstable-2021-11-12";
|
||||
version = "0-unstable-2021-11-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexherbo2";
|
||||
|
@ -47,14 +47,16 @@ crystal.buildCrystalPackage rec {
|
|||
$out/bin/kcr --help
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
dontCheckForBrokenSymlinks = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/alexherbo2/kakoune.cr";
|
||||
description = "Command-line tool for Kakoune";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [
|
||||
philiptaron
|
||||
malte-v
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
32
pkgs/by-name/ko/koto-ls/package.nix
Normal file
32
pkgs/by-name/ko/koto-ls/package.nix
Normal file
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "koto-ls";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koto-lang";
|
||||
repo = "koto-ls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6a8xckgpz2/Eb0mQ3ZUL7ywmHA69RMXar/55LUu1UWk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-sDgLvZcLW2lC0fCMOdSX2OvaqOG1GMfQiwAPit6L2/g=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Language server for Koto";
|
||||
homepage = "https://github.com/koto-lang/koto-ls";
|
||||
changelog = "https://github.com/koto-lang/koto-ls/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ defelo ];
|
||||
mainProgram = "koto-ls";
|
||||
};
|
||||
}
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "level-zero";
|
||||
version = "1.20.0";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "level-zero";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dn/1EZlEBbmu4p7/5fn6LhQXOEUvI/gtAdHnCnosGEs=";
|
||||
hash = "sha256-IqnEjlKBB3nx2rOTBG+rrJ078z8+kkg52hFV2+5lJV0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -39,17 +39,17 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "liana";
|
||||
version = "8.0"; # keep in sync with lianad
|
||||
version = "9.0"; # keep in sync with lianad
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wizardsardine";
|
||||
repo = "liana";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2aIaRZNIRgFdA+NVnzOkEE3kYA15CoNBrsNGBhIz0nU=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RFlICvoePwSglpheqMb+820My//LElnSeMDPFmXyHz0=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-pjvJ+UNM/2g2BDLptjEs6XVukScBB5miDx55zwHJ/C4=";
|
||||
cargoHash = "sha256-nj7L4glbjevVd1ef6RUGPm4hpzeNdnsCLC01BOJj6kI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
@ -63,10 +63,10 @@ rustPlatform.buildRustPackage rec {
|
|||
udev
|
||||
];
|
||||
|
||||
sourceRoot = "${src.name}/gui";
|
||||
buildAndTestSubdir = "liana-gui";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0644 ./ui/static/logos/liana-app-icon.svg $out/share/icons/hicolor/scalable/apps/liana.svg
|
||||
install -Dm0644 ./liana-ui/static/logos/liana-app-icon.svg $out/share/icons/hicolor/scalable/apps/liana.svg
|
||||
wrapProgram $out/bin/liana-gui --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}"
|
||||
'';
|
||||
|
||||
|
|
3014
pkgs/by-name/md/mdx-language-server/package-lock.json
generated
Normal file
3014
pkgs/by-name/md/mdx-language-server/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
33
pkgs/by-name/md/mdx-language-server/package.nix
Normal file
33
pkgs/by-name/md/mdx-language-server/package.nix
Normal file
|
@ -0,0 +1,33 @@
|
|||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
nodejs,
|
||||
buildNpmPackage,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mdx-language-server";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@mdx-js/language-server/-/language-server-${version}.tgz";
|
||||
hash = "sha256-8ef9dVVsH5yTva9ymY+EAZTz6FOZ7Zgu9kOv1wLaK4w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-IONV1wxETazDaXzYfqiYrM+A8c36VcnlzTj3lmxA9ug=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
description = "Language server for MDX";
|
||||
homepage = "https://github.com/mdx-js/mdx-analyzer/tree/main/packages/language-server";
|
||||
changelog = "https://github.com/mdx-js/mdx-analyzer/blob/@mdx-js/language-server@${version}/packages/language-server/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ThaoTranLePhuong ];
|
||||
mainProgram = "mdx-language-server";
|
||||
};
|
||||
}
|
|
@ -2,18 +2,19 @@
|
|||
lib,
|
||||
fetchFromGitHub,
|
||||
crystal,
|
||||
libxml2,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
crystal.buildCrystalPackage rec {
|
||||
version = "0.19.0";
|
||||
pname = "mint";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mint-lang";
|
||||
repo = "mint";
|
||||
rev = version;
|
||||
hash = "sha256-s/ehv8Z71nWnxpajO7eR4MxoHppqkdleFluv+e5Vv6I=";
|
||||
hash = "sha256-82Oi9UJ530rZNGa6XxC1hNvRfZQx3fTZxhfSQeZmz54=";
|
||||
};
|
||||
|
||||
format = "shards";
|
||||
|
@ -23,18 +24,22 @@ crystal.buildCrystalPackage rec {
|
|||
# with mint's shard.lock file in the current directory
|
||||
shardsFile = ./shards.nix;
|
||||
|
||||
nativeBuildInputs = [
|
||||
libxml2 # xmllint
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
preConfigure = ''
|
||||
export HOME=$(mktemp -d)
|
||||
preCheck = ''
|
||||
substituteInPlace spec/spec_helper.cr \
|
||||
--replace-fail "clear_env: true" "clear_env: false"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Refreshing language for the front-end web";
|
||||
mainProgram = "mint";
|
||||
homepage = "https://www.mint-lang.com/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ manveru ];
|
||||
broken = lib.versionOlder crystal.version "1.0";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ manveru ];
|
||||
};
|
||||
}
|
|
@ -6,19 +6,14 @@
|
|||
};
|
||||
ameba = {
|
||||
url = "https://github.com/crystal-ameba/ameba.git";
|
||||
rev = "v1.5.0";
|
||||
sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d";
|
||||
rev = "v1.6.4";
|
||||
sha256 = "1kzr4ynd4r5w87y2czzrlir1dvqmv43ijm07804kgsy1g20k00fs";
|
||||
};
|
||||
ansi-escapes = {
|
||||
url = "https://github.com/gtramontina/ansi-escapes.cr.git";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "106cy7bq0j438cfs0zqcxhj84msjj9dybxlcjr8qhs1fpm02s00b";
|
||||
};
|
||||
backtracer = {
|
||||
url = "https://github.com/sija/backtracer.cr.git";
|
||||
rev = "v1.2.2";
|
||||
sha256 = "1rknyylsi14m7i77x7c3138wdw27i4f6sd78m3srw851p47bwr20";
|
||||
};
|
||||
baked_file_system = {
|
||||
url = "https://github.com/schovi/baked_file_system.git";
|
||||
rev = "v0.10.0";
|
||||
|
@ -29,24 +24,9 @@
|
|||
rev = "v1.0.0";
|
||||
sha256 = "00pdawysns1w1iqwh6j3shilpwh41ljz1chsqkacn6dj2yn21n0r";
|
||||
};
|
||||
exception_page = {
|
||||
url = "https://github.com/crystal-loot/exception_page.git";
|
||||
rev = "v0.3.1";
|
||||
sha256 = "00fpkhwaf94mz9d9qiinsa7hdbs3x2yqjwwzvbjwv86dv8s5008n";
|
||||
};
|
||||
kemal = {
|
||||
url = "https://github.com/kemalcr/kemal.git";
|
||||
rev = "v1.4.0";
|
||||
sha256 = "0pmcnbfzb0bqrnwbqikci4j0hbxsabmkz8a879vprf5gswnr7b63";
|
||||
};
|
||||
markd = {
|
||||
url = "https://github.com/icyleaf/markd.git";
|
||||
rev = "v0.5.0";
|
||||
sha256 = "1a677z57kwjq6lp4ws7br1ga8jgpgi8990glhd1r8756bdyd8mg0";
|
||||
};
|
||||
radix = {
|
||||
url = "https://github.com/luislavena/radix.git";
|
||||
rev = "v0.4.1";
|
||||
sha256 = "1l08cydkdidq9yyil1wl240hvk41iycv04jrg6nx5mkvzw4z1bzg";
|
||||
};
|
||||
}
|
|
@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mopac";
|
||||
version = "23.1.0";
|
||||
version = "23.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openmopac";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E7iiAAV+QPYAuTNh0qYOvB2GS/UXQ8YjPYy+Ms7aN3M=";
|
||||
hash = "sha256-sQoxLPVjxkLVaZWl/1pda5kgJI/X6msgCblKzV4EB6o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mpris-notifier";
|
||||
version = "0.1.10";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "l1na-forever";
|
||||
repo = "mpris-notifier";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X9d410ijZZcHvf8+f6DgnMl8ETGeY/fN13Gpz6q3BBA=";
|
||||
hash = "sha256-SD37JFbfg05GemtRNQKvXkXPAyszItSW9wClzudrTS8=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-sugXNwlOZEfnORij64eWyFVMHBU3fbVJr3+wnOchJKY=";
|
||||
cargoHash = "sha256-5LDhxciLpDYd4isUQNx8LF3y7m6cfcuIF2atHj/kayg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nhost-cli";
|
||||
version = "1.29.1";
|
||||
version = "1.29.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nhost";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WuDAHZVY7zleDBcHiT5nVgiIDvxT/LD3PM+gEREQjL0=";
|
||||
hash = "sha256-CboqEkN8/a/cE6SQ9m1neQznvO88M6ppWtEc7m/EEjI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -18,11 +18,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oils-for-unix";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oils.pub/download/oils-for-unix-${version}.tar.gz";
|
||||
hash = "sha256-K1spWld6J2OBQgO0o0iAygMGeinuuAr0hXtgkjFNbu0=";
|
||||
url = "https://oils.pub/download/oils-for-unix-${version}.tar.gz";
|
||||
hash = "sha256-q1ORYt/8FpT9WuicAOQFzF97c2YBWexbJpvt6mMd8X0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
coreutils,
|
||||
curl,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
installShellFiles,
|
||||
ldc,
|
||||
libnotify,
|
||||
|
@ -19,24 +18,15 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "onedrive";
|
||||
version = "2.5.3";
|
||||
version = "2.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abraunegg";
|
||||
repo = "onedrive";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Lek1tW0alQQvlOHpz//M/y4iJY3PWRkcmXGLwjCLozk=";
|
||||
hash = "sha256-KJ+6Yo5tod36yMihBamdzCGzVOTItN9OgUd05pAyTxc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove when updating to v2.5.4
|
||||
(fetchpatch {
|
||||
name = "fix-openssl-version-check-error.patch";
|
||||
url = "https://github.com/abraunegg/onedrive/commit/d956318b184dc119d65d7a230154df4097171a6d.patch";
|
||||
hash = "sha256-LGmKqYgFpG4MPFrHXqvlDp7Cxe3cEGYeXXH9pCXtGkU=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
|
|
|
@ -7,27 +7,31 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "pairdrop";
|
||||
version = "1.7.6";
|
||||
version = "1.10.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schlagmichdoch";
|
||||
repo = "PairDrop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AOFATOCLf2KigeqoUzIfNngyeDesNrThRzxFvqtsXBs=";
|
||||
hash = "sha256-H3XfLBxJZaHzCBnGUKY92EL3ES47IgXkTOUr8zY1sIY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-3nKjmC5eizoV/mrKDBhsSlVQxEHyIsWR6KHFwZhBugI=";
|
||||
npmDepsHash = "sha256-CYVcbkpYgY/uqpE5livQQhb+VTMtCdKalUK3slJ3zdQ=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/lib
|
||||
cp -r * $out/lib
|
||||
mkdir -p $out/bin $out/libexec/pairdrop
|
||||
cp -r * $out/libexec/pairdrop
|
||||
|
||||
makeWrapper ${nodejs}/bin/node "$out/bin/pairdrop" --add-flags "index.js public --rate-limit --auto-restart"
|
||||
wrapProgram $out/bin/pairdrop --chdir "$out/lib"
|
||||
# https://github.com/schlagmichdoch/PairDrop/blob/v1.10.10/.dockerignore
|
||||
rm -rf $out/libexec/pairdrop/{.github,dev,docs,licenses,pairdrop-cli,*.md,*.yml,Dockerfile,rtc_config_example.json,turnserver_example.conf}
|
||||
|
||||
makeWrapper ${nodejs}/bin/node "$out/bin/pairdrop" \
|
||||
--add-flags "server/index.js" \
|
||||
--chdir "$out/libexec/pairdrop"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
@ -41,6 +45,9 @@ buildNpmPackage rec {
|
|||
'';
|
||||
homepage = "https://github.com/schlagmichdoch/PairDrop";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
maintainers = with maintainers; [
|
||||
diogotcorreia
|
||||
dit7ya
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pdftitle";
|
||||
version = "0.16";
|
||||
version = "0.18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metebalci";
|
||||
repo = "pdftitle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s5OrZQogFJEKbaGoPHti7UcpqXhxrtIAC2Hd+clDbD4=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rGGO4Cy+DZRU3ywb6Jq55JiM8ALgs/9wQmeXcSbPpG0=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
|
|
@ -32,6 +32,15 @@ buildNpmPackage rec {
|
|||
# copy npm workspace modules while properly resolving symlinks
|
||||
# TODO: workaround can be removed once this is merged: https://github.com/NixOS/nixpkgs/pull/333759
|
||||
postInstall = ''
|
||||
rm -rf $out/lib/node_modules/protobuf-es/node_modules/ts4.*
|
||||
cp -rL node_modules/ts4.* $out/lib/node_modules/protobuf-es/node_modules/
|
||||
|
||||
rm -rf $out/lib/node_modules/protobuf-es/node_modules/ts5.*
|
||||
cp -rL node_modules/ts5.* $out/lib/node_modules/protobuf-es/node_modules/
|
||||
|
||||
rm -rf $out/lib/node_modules/protobuf-es/node_modules/upstream-protobuf
|
||||
cp -rL node_modules/upstream-protobuf $out/lib/node_modules/protobuf-es/node_modules/
|
||||
|
||||
rm -rf $out/lib/node_modules/protobuf-es/node_modules/@bufbuild
|
||||
cp -rL node_modules/@bufbuild $out/lib/node_modules/protobuf-es/node_modules/
|
||||
'';
|
||||
|
|
|
@ -20,13 +20,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "protonplus";
|
||||
version = "0.4.20";
|
||||
version = "0.4.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vysp3r";
|
||||
repo = "protonplus";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nnobk1N+r1tLekc8CLiAULsEQFjgzoQQvRz3F8vVjzU=";
|
||||
hash = "sha256-axVtURzMLPv+CgDJZj/TM4sfysW+GJWZ+MEe9Z6DhHE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,12 +14,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "qmk";
|
||||
version = "1.1.5";
|
||||
version = "1.1.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Lv48dSIwxrokuHGcO26FpWRL+PfQ3SN3V+2pt7fmCxE=";
|
||||
hash = "sha256-3ENs26vy+M7G261FPeODK+AbrI5+nBkHXCmGbuIqi1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
|
@ -12,19 +12,19 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "raycast";
|
||||
version = "1.91.0";
|
||||
version = "1.91.2";
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-darwin = fetchurl {
|
||||
name = "Raycast.dmg";
|
||||
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
|
||||
hash = "sha256-FvYgJw/iOijnEixt2hbn7abYOCuaK9UN5uXEj6nArKY=";
|
||||
hash = "sha256-DnNe7huyqrReVu3oeLB4YVf04NxmZL+9/fY/MlHplBc=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
name = "Raycast.dmg";
|
||||
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
|
||||
hash = "sha256-iks3C/S42TdXYZIMgg0vY4VzCRFx4dNsOhaPHA2MlR4=";
|
||||
hash = "sha256-t+jRLZtpwVYAEVu7CjGiQMhPCoWhLUn/XODT27LmR+c=";
|
||||
};
|
||||
}
|
||||
.${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "relic";
|
||||
version = "8.1.1";
|
||||
version = "8.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sassoftware";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8pqLV4NWCI35FGe2NNqjatTAlVyvx1mskbcR/NacUvI=";
|
||||
sha256 = "sha256-dXvKbuAJCL+H0Gh0ZF1VvtY+7cgjq7gs8zwtenI3JuI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x0EqKotZJny+7FtRvdXWUkPpG0jntFGe/IpNzKVL2pI=";
|
||||
vendorHash = "sha256-3ERGIZZM8hNbt8kYApcqaL2LJ3V5aloSsmJavX2VSpw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -31,6 +31,10 @@ buildGoModule rec {
|
|||
};
|
||||
};
|
||||
|
||||
# Some of the tests use localhost networking. See discussion:
|
||||
# https://github.com/NixOS/nixpkgs/pull/374824
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sassoftware/relic";
|
||||
description = "Service and a tool for adding digital signatures to operating system packages for Linux and Windows";
|
||||
|
|
|
@ -11,18 +11,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsop";
|
||||
version = "0.6.0";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "heiko";
|
||||
repo = "rsop";
|
||||
rev = "rsop/v${version}";
|
||||
hash = "sha256-IYL4xeP8Hd7atMPTgmgijg9jeKAfnHlqZrLGL5eCQO4=";
|
||||
hash = "sha256-0+kzEYR2ZijI02aqyXpBcIldRa4wJtYqO/MMljjcXzc=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-yuL7L+QTYiHCfFGppZ6VRAlvFpj4KUWuOBHY2Lwmxq8=";
|
||||
cargoHash = "sha256-Ef9ahFlOmfVkvNBeSmoCV7dwS/YI5ZTaQ0X59oyHSjs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -12,15 +12,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2025-01-20";
|
||||
version = "2025-02-10";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-k1sjt/v1FYtAeAnTMcGxL32vA3xyQ7zfZBJ4KjQbfX8=";
|
||||
cargoHash = "sha256-rxdXbILDMi9YFMurhELThVKwn9EZYjCrvAB0vo36OGY=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
hash = "sha256-W8xioeq+h9dzGvtXPlQAn2nXtgNDN6C8uA1/9F2JP5I=";
|
||||
hash = "sha256-YUdM2yZzQIbakgc2LdVmkgJMYTqeTu3YdWGgFfiZiTg=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [
|
||||
|
|
|
@ -1,19 +1,21 @@
|
|||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "shot-scraper";
|
||||
version = "1.4";
|
||||
version = "1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = python3.pkgs.pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hPzOwvTQAFs9IQRkq/uw+pHv5ZP5XU3Zn605SL8udPA=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = "shot-scraper";
|
||||
tag = version;
|
||||
hash = "sha256-3FU9UH0dQcRgYydtyo+p0fPBPtW47YFIKh13dJiQwfA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
@ -36,13 +36,13 @@ in
|
|||
# note: there is a generic builder in pkgs/games/sm64ex/generic.nix that is meant to help build sm64ex and its forks; however sm64coopdx has departed significantly enough in its build that it doesn't make sense to use that other than the baseRom derivation
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sm64coopdx";
|
||||
version = "1.0.4";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coop-deluxe";
|
||||
repo = "sm64coopdx";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-v50C87/NN75owxtLL4vm8TLZha7U8FkefPhpO6iXYGU=";
|
||||
hash = "sha256-ktdvzOUYSh6H49BVDovqYt5CGyvJi4UW6nJOOD/HGGU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stats";
|
||||
version = "2.11.30";
|
||||
version = "2.11.31";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
|
||||
hash = "sha256-WkNiZZq2PfGp65d82YHupiczojSktDAe4p4WiUj5xWM=";
|
||||
hash = "sha256-E+JSN1FKWLt4r2lNjLNNMKnVD+SV8XueRyi8Xj5VUWo=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
@ -1,71 +1,186 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, boost
|
||||
, bison
|
||||
, flex
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, perl
|
||||
, python3
|
||||
, zlib
|
||||
, minisat
|
||||
, cryptominisat
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
boost,
|
||||
bison,
|
||||
flex,
|
||||
pkg-config,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
symlinkJoin,
|
||||
perl,
|
||||
python3,
|
||||
zlib,
|
||||
minisat,
|
||||
cryptominisat,
|
||||
gmp,
|
||||
cadical,
|
||||
gtest,
|
||||
lit,
|
||||
outputcheck,
|
||||
nix-update-script,
|
||||
useCadical ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stp";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stp";
|
||||
repo = "stp";
|
||||
rev = version;
|
||||
hash = "sha256-B+HQF4TJPkYrpodE4qo4JHvlu+a5HTJf1AFyXTnZ4vk=";
|
||||
tag = "${finalAttrs.version}_cadical";
|
||||
hash = "sha256-fNx3/VS2bimlVwCejEZtNGDqVKnwBm0O2YkIUQm6eDM=";
|
||||
};
|
||||
patches = [
|
||||
# Fix missing type declaration
|
||||
# due to undeterminisitic compilation
|
||||
# of circularly dependent headers
|
||||
./stdint.patch
|
||||
|
||||
# Python 3.12+ compatibility for build: https://github.com/stp/stp/pull/450
|
||||
(fetchpatch {
|
||||
url = "https://github.com/stp/stp/commit/fb185479e760b6ff163512cb6c30ac9561aadc0e.patch";
|
||||
hash = "sha256-guFgeWOrxRrxkU7kMvd5+nmML0rwLYW196m1usE2qiA=";
|
||||
})
|
||||
];
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail GIT-hash-notfound "$version"
|
||||
|
||||
postPatch = ''
|
||||
# Upstream fix for gcc-13 support:
|
||||
# https://github.com/stp/stp/pull/462
|
||||
# Can't apply it as is as patch context changed in ither patches.
|
||||
# TODO: remove me on 2.4 release
|
||||
sed -e '1i #include <cstdint>' -i include/stp/AST/ASTNode.h
|
||||
# We want to use the Nix wrapper for the output check tool instead of running it through Python.
|
||||
substituteInPlace tests/query-files/lit.cfg \
|
||||
--replace-fail "pythonExec + ' ' +OutputCheckTool" "OutputCheckTool"
|
||||
|
||||
# Results in duplication of Nix store paths and trouble finding the Python library at runtime
|
||||
substituteInPlace bindings/python/stp/library_path.py.in_install \
|
||||
--replace-fail "@CMAKE_INSTALL_PREFIX@/" ""
|
||||
''
|
||||
+ lib.optionalString useCadical ''
|
||||
# Fix up Cadical paths.
|
||||
substituteInPlace include/stp/Sat/Cadical.h \
|
||||
--replace-fail "src/cadical.hpp" "cadical.hpp"
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "build/libcadical.a" "lib/libcadical.a" \
|
||||
--replace-fail 'include_directories(''${CADICAL_DIR}/)' 'include_directories(''${CADICAL_DIR}/include)'
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
zlib
|
||||
minisat
|
||||
cryptominisat
|
||||
python3
|
||||
gmp
|
||||
minisat
|
||||
] ++ lib.optional (!useCadical) cryptominisat;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
bison
|
||||
flex
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
nativeBuildInputs = [ cmake bison flex perl ];
|
||||
preConfigure = ''
|
||||
|
||||
cmakeFlags =
|
||||
let
|
||||
# STP expects Cadical dependencies to all be in the same place.
|
||||
cadicalDependency = symlinkJoin {
|
||||
name = "stp-${finalAttrs.version}-cadical";
|
||||
paths = [
|
||||
cadical.lib
|
||||
cadical.dev
|
||||
];
|
||||
};
|
||||
in
|
||||
[
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
|
||||
(lib.cmakeBool "USE_CADICAL" useCadical)
|
||||
(lib.cmakeBool "NOCRYPTOMINISAT" useCadical)
|
||||
(lib.cmakeBool "FORCE_CMS" (!useCadical))
|
||||
(lib.cmakeBool "ENABLE_TESTING" finalAttrs.doCheck)
|
||||
]
|
||||
++ lib.optional finalAttrs.doCheck (lib.cmakeFeature "LIT_ARGS" "-v")
|
||||
++ lib.optional useCadical (lib.cmakeFeature "CADICAL_DIR" (toString cadicalDependency));
|
||||
|
||||
# Fixes the following warning in the aarch64 build on Linux:
|
||||
# lib/extlib-abc/aig/cnf/cnfData.c:4591:25: warning: result of comparison of
|
||||
# constant 255 with expression of type 'signed char' is always false [-Wtautological-constant-out-of-range-compare]
|
||||
# 4591 | if ( pMemory[k] == (char)(-1) )
|
||||
#
|
||||
# This seems to cause an infinite loop in tests on aarch64-linux platforms.
|
||||
#
|
||||
# TODO: Remove these CFLAGS when they update to the version that pulls `abc` in with a submodule.
|
||||
# https://github.com/stp/stp/issues/498#issuecomment-2611251631
|
||||
CFLAGS = [ "-fsigned-char" ];
|
||||
|
||||
outputs = [
|
||||
"dev"
|
||||
"out"
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
python_install_dir=$out/${python3.sitePackages}
|
||||
mkdir -p $python_install_dir
|
||||
cmakeFlagsArray=(
|
||||
$cmakeFlagsArray
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
cmakeFlagsArray+=(
|
||||
"-DPYTHON_LIB_INSTALL_DIR=$python_install_dir"
|
||||
)
|
||||
''
|
||||
+ lib.optionalString finalAttrs.doCheck ''
|
||||
# Link in gtest and the output check utility.
|
||||
mkdir -p deps
|
||||
ln -s ${gtest.src} deps/gtest
|
||||
ln -s ${outputcheck} deps/OutputCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple Theorem Prover";
|
||||
maintainers = with maintainers; [ McSinyx numinit ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
lit
|
||||
outputcheck
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
# Clean up installed gtest/gmock files that shouldn't be there.
|
||||
shopt -s globstar nocaseglob
|
||||
rm -rf $out/**/*g{test,mock}*
|
||||
|
||||
# Some of the gtest/gmock files were in the pkgconfig folders, which may now be empty.
|
||||
find $out/ -name pkgconfig -type d -empty -delete
|
||||
|
||||
# Python bindings are broken:
|
||||
substituteInPlace $python_install_dir/**/stp.py \
|
||||
--replace-fail "from library_path import PATHS" "from .library_path import PATHS"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
$out/bin/stp --version | tee /dev/stderr | grep -F "STP version $version"
|
||||
|
||||
# Run the examples from the docs: https://stp.readthedocs.io/en/latest/#python-usage
|
||||
for binary in stp stp_simple; do
|
||||
echo "(set-logic QF_BV) (assert (= (bvsdiv (_ bv3 2) (_ bv2 2)) (_ bv0 2))) (check-sat) (exit)" | tee /dev/stderr | $out/bin/$binary | grep "^sat$"
|
||||
done
|
||||
PYTHONPATH=$out/${python3.sitePackages} ${lib.getExe python3} -c \
|
||||
"import stp; s = stp.Solver(); a, b, c = s.bitvec('a', 32), s.bitvec('b', 32), s.bitvec('c', 32); s.add(a == 5); s.add(b == 6); s.add(a + b == c); assert s.check(); print(s.model())" >&2
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^v(2\\.3\\.[0-9]+)$"
|
||||
];
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Simple Theorem Prover";
|
||||
homepage = "https://stp.github.io/";
|
||||
maintainers = with lib.maintainers; [
|
||||
McSinyx
|
||||
numinit
|
||||
];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/include/stp/AST/ASTNode.h b/include/stp/AST/ASTNode.h
|
||||
index 91acd726182c..0a17db23ffbf 100644
|
||||
--- a/include/stp/AST/ASTNode.h
|
||||
+++ b/include/stp/AST/ASTNode.h
|
||||
@@ -24,9 +24,10 @@ THE SOFTWARE.
|
||||
#ifndef ASTNODE_H
|
||||
#define ASTNODE_H
|
||||
|
||||
+#include "stp/AST/ASTInternal.h"
|
||||
#include "stp/AST/NodeFactory/HashingNodeFactory.h"
|
||||
+#include "stp/AST/UsefulDefs.h"
|
||||
#include "stp/Util/Attributes.h"
|
||||
-#include "ASTInternal.h"
|
||||
#include "stp/Globals/Globals.h"
|
||||
|
||||
namespace stp
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ugrep";
|
||||
version = "7.1.3";
|
||||
version = "7.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "ugrep";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Y8I38ZaZfRalh8La6xWs7eMqx5TzQzsyQcOWNo1XeKs=";
|
||||
hash = "sha256-cAa5Y6VWoxtoO2sc3wm0J4a8Y672bk+82ymMkg5U+7g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
gettext,
|
||||
pango,
|
||||
harfbuzz,
|
||||
librsvg,
|
||||
|
@ -26,7 +27,7 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "weblate";
|
||||
version = "5.9.2";
|
||||
version = "5.10";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
|
@ -39,7 +40,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
owner = "WeblateOrg";
|
||||
repo = "weblate";
|
||||
tag = "weblate-${version}";
|
||||
hash = "sha256-/fsNQvIIgcTPZHHIwr8sruEJpPJTmXbevoxy1GPmOOU=";
|
||||
hash = "sha256-DRodQb4IvLfpL+TzLigtiKTvXvGYbpa9Ej4+fCHSGmo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -49,6 +50,8 @@ python.pkgs.buildPythonApplication rec {
|
|||
|
||||
build-system = with python.pkgs; [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
# Build static files into a separate output
|
||||
postBuild =
|
||||
let
|
||||
|
@ -64,14 +67,11 @@ python.pkgs.buildPythonApplication rec {
|
|||
mkdir $static
|
||||
cat weblate/settings_example.py ${staticSettings} > weblate/settings_static.py
|
||||
export DJANGO_SETTINGS_MODULE="weblate.settings_static"
|
||||
${python.pythonOnBuildForHost.interpreter} manage.py compilemessages
|
||||
${python.pythonOnBuildForHost.interpreter} manage.py collectstatic --no-input
|
||||
${python.pythonOnBuildForHost.interpreter} manage.py compress
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"rapidfuzz"
|
||||
];
|
||||
|
||||
dependencies =
|
||||
with python.pkgs;
|
||||
[
|
||||
|
@ -99,14 +99,16 @@ python.pkgs.buildPythonApplication rec {
|
|||
django-otp
|
||||
django-otp-webauthn
|
||||
django
|
||||
djangorestframework-csv
|
||||
djangorestframework
|
||||
docutils
|
||||
drf-spectacular
|
||||
drf-standardized-errors
|
||||
filelock
|
||||
fluent-syntax
|
||||
gitpython
|
||||
hiredis
|
||||
html2text
|
||||
httpx
|
||||
iniparse
|
||||
jsonschema
|
||||
lxml
|
||||
|
@ -143,7 +145,8 @@ python.pkgs.buildPythonApplication rec {
|
|||
++ django.optional-dependencies.argon2
|
||||
++ python-redis-lock.optional-dependencies.django
|
||||
++ celery.optional-dependencies.redis
|
||||
++ drf-spectacular.optional-dependencies.sidecar;
|
||||
++ drf-spectacular.optional-dependencies.sidecar
|
||||
++ drf-standardized-errors.optional-dependencies.openapi;
|
||||
|
||||
optional-dependencies = {
|
||||
postgres = with python.pkgs; [ psycopg ];
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
{
|
||||
lib,
|
||||
rust,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
installShellFiles,
|
||||
cargo-c,
|
||||
testers,
|
||||
yara-x,
|
||||
}:
|
||||
|
@ -24,9 +26,18 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
cargo-c
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
postBuild = ''
|
||||
${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
''
|
||||
${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd yr \
|
||||
--bash <($out/bin/yr completion bash) \
|
||||
--fish <($out/bin/yr completion fish) \
|
||||
|
|
|
@ -14,13 +14,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zydis";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyantific";
|
||||
repo = "zydis";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-akusu0T7q5RX4KGtjRqqOFpW5i9Bd1L4RVZt8Rg3PJY=";
|
||||
hash = "sha256-6J4pTUm3xQXwlQNBldjXVWRcse+auSFJtxGWaPRVzLg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zycore";
|
||||
version = "1.5.0";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyantific";
|
||||
repo = "zycore-c";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Kz51EIaw4RwrOKXhuDXAFieGF1mS+HL06gEuj+cVJmk=";
|
||||
hash = "sha256-/RQl43gx3CO0OxH1syz4l3E4+/m46ql+HKVyuC1x4sA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
|
|||
python3
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
preConfigure = ''
|
||||
if [ $doCheck -eq 1 ]; then
|
||||
sed -i '/googletest/d' third_party/CMakeLists.txt
|
||||
|
@ -45,11 +47,13 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
lit
|
||||
nodejs
|
||||
filecheck
|
||||
];
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
||||
checkPhase = ''
|
||||
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py $tests
|
||||
'';
|
||||
|
|
|
@ -632,6 +632,11 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString (pythonAtLeast "3.9" && pythonOlder "3.11") ''
|
||||
substituteInPlace Doc/tools/extensions/pyspecific.py \
|
||||
--replace-fail "from sphinx.util import status_iterator" "from sphinx.util.display import status_iterator"
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
@ -1946,6 +1946,31 @@ buildLuarocksPackage {
|
|||
};
|
||||
}) {};
|
||||
|
||||
lualine-nvim = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, nvim-web-devicons }:
|
||||
buildLuarocksPackage {
|
||||
pname = "lualine.nvim";
|
||||
version = "scm-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lualine.nvim-scm-1.rockspec";
|
||||
sha256 = "1mzsfiq4h95s0nbygwii2w8xs5rixdbha322bvx453k530s2kxxj";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lualine";
|
||||
repo = "lualine.nvim";
|
||||
rev = "f4f791f67e70d378a754d02da068231d2352e5bc";
|
||||
hash = "sha256-uAxe3UdNUVfdpQcKvGvQ/E2blGksvMPlTBfEOtgeVYo=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
propagatedBuildInputs = [ nvim-web-devicons ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/nvim-lualine/lualine.nvim";
|
||||
description = "A blazing fast and easy to configure neovim statusline plugin written in pure lua.";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
lualogging = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luasocket }:
|
||||
buildLuarocksPackage {
|
||||
pname = "lualogging";
|
||||
|
@ -2977,6 +3002,29 @@ buildLuarocksPackage {
|
|||
};
|
||||
}) {};
|
||||
|
||||
oil-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-web-devicons }:
|
||||
buildLuarocksPackage {
|
||||
pname = "oil.nvim";
|
||||
version = "2.15.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/oil.nvim-2.15.0-1.rockspec";
|
||||
sha256 = "0xkych23rn6jpj4hbam1j7ca1gwb9z3lzfm7id3dvcqj8aysv77j";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/stevearc/oil.nvim/archive/v2.15.0.zip";
|
||||
sha256 = "0rrv7wg0nwfj5fd6byxs4np1p18xxdzyv11ba6vqqh3s6z0qwawc";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
propagatedBuildInputs = [ nvim-web-devicons ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/stevearc/oil.nvim";
|
||||
description = "Neovim file explorer: edit your filesystem like a buffer";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, tree-sitter-orgmode }:
|
||||
buildLuarocksPackage {
|
||||
pname = "orgmode";
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
# plenary utilities
|
||||
which,
|
||||
findutils,
|
||||
clang,
|
||||
coreutils,
|
||||
curl,
|
||||
cyrus_sasl,
|
||||
dbus,
|
||||
expat,
|
||||
fd,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
fixDarwinDylibNames,
|
||||
fzf,
|
||||
glib,
|
||||
glibc,
|
||||
gmp,
|
||||
|
@ -36,10 +36,9 @@
|
|||
libuv,
|
||||
libxcrypt,
|
||||
libyaml,
|
||||
luajitPackages,
|
||||
lua-language-server,
|
||||
luajitPackages,
|
||||
mariadb,
|
||||
magic-enum,
|
||||
mpfr,
|
||||
neovim-unwrapped,
|
||||
openldap,
|
||||
|
@ -47,19 +46,19 @@
|
|||
pcre,
|
||||
pkg-config,
|
||||
readline,
|
||||
ripgrep,
|
||||
rustPlatform,
|
||||
sol2,
|
||||
sqlite,
|
||||
tomlplusplus,
|
||||
tree-sitter,
|
||||
unbound,
|
||||
unzip,
|
||||
vimPlugins,
|
||||
vimUtils,
|
||||
yajl,
|
||||
zip,
|
||||
unzip,
|
||||
zlib,
|
||||
zziplib,
|
||||
writableTmpDirAsHomeHook,
|
||||
gitMinimal,
|
||||
}:
|
||||
|
||||
final: prev:
|
||||
|
@ -69,7 +68,6 @@ let
|
|||
luaAtLeast
|
||||
lua
|
||||
isLuaJIT
|
||||
isLua51
|
||||
;
|
||||
in
|
||||
{
|
||||
|
@ -160,6 +158,48 @@ in
|
|||
'';
|
||||
});
|
||||
|
||||
fzf-lua = prev.fzf-lua.overrideAttrs {
|
||||
# FIXME: Darwin flaky tests
|
||||
# address already in use on second test run
|
||||
# Previewer transient failure
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
checkInputs = [
|
||||
fd
|
||||
fzf
|
||||
ripgrep
|
||||
];
|
||||
nativeCheckInputs = [
|
||||
neovim-unwrapped
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# Linking the dependencies since makefile wants to clone them each time
|
||||
# for `make deps`
|
||||
mkdir -p deps
|
||||
ln -s ${vimPlugins.mini-nvim} deps/mini.nvim
|
||||
ln -s ${vimPlugins.nvim-web-devicons} deps/nvim-web-devicons
|
||||
|
||||
# TODO: remove with new nvim-web-devicons release
|
||||
# Disabled devicons test because we have old version as dep and fzf-lua checks for a new icon
|
||||
substituteInPlace tests/file/ui_spec.lua \
|
||||
--replace-fail \
|
||||
"T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"devicons\" }, { \"mini\" } } })" \
|
||||
"T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"mini\" } } })"
|
||||
|
||||
# TODO: Figure out why 2 files extra for `fd`
|
||||
substituteInPlace tests/file/ui_spec.lua \
|
||||
--replace-fail \
|
||||
"T[\"files()\"][\"executable\"] = new_set({ parametrize = { { \"fd\" }, { \"rg\" }, { \"find|dir\" } } }, {" \
|
||||
"T[\"files()\"][\"executable\"] = new_set({ parametrize = { { \"rg\" }, { \"find|dir\" } } }, {"
|
||||
|
||||
make test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
};
|
||||
|
||||
# Until https://github.com/swarn/fzy-lua/pull/8 is merged,
|
||||
# we have to invoke busted manually
|
||||
fzy = prev.fzy.overrideAttrs (oa: {
|
||||
|
@ -455,6 +495,21 @@ in
|
|||
];
|
||||
});
|
||||
|
||||
lualine-nvim = prev.lualine-nvim.overrideAttrs (_: {
|
||||
doCheck = lua.luaversion == "5.1";
|
||||
nativeCheckInputs = [
|
||||
final.nlua
|
||||
final.busted
|
||||
gitMinimal
|
||||
];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
export HOME=$(mktemp -d)
|
||||
busted --lua=nlua --lpath='lua/?.lua' --lpath='lua/?/init.lua' tests/
|
||||
runHook postCheck
|
||||
'';
|
||||
});
|
||||
|
||||
luaossl = prev.luaossl.overrideAttrs (_: {
|
||||
externalDeps = [
|
||||
{
|
||||
|
@ -664,6 +719,22 @@ in
|
|||
'';
|
||||
});
|
||||
|
||||
lzextras = prev.lzextras.overrideAttrs (oa: {
|
||||
doCheck = lua.luaversion == "5.1";
|
||||
checkInputs = [
|
||||
final.lze
|
||||
];
|
||||
nativeCheckInputs = [
|
||||
final.nlua
|
||||
final.busted
|
||||
];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
busted --lua=nlua
|
||||
runHook postCheck
|
||||
'';
|
||||
});
|
||||
|
||||
neotest = prev.neotest.overrideAttrs (oa: {
|
||||
doCheck = stdenv.hostPlatform.isLinux;
|
||||
nativeCheckInputs = oa.nativeCheckInputs ++ [
|
||||
|
|
|
@ -28,8 +28,6 @@
|
|||
fauna-shell = "fauna";
|
||||
fkill-cli = "fkill";
|
||||
fleek-cli = "fleek";
|
||||
graphql-cli = "graphql";
|
||||
graphql-language-service-cli = "graphql-lsp";
|
||||
grunt-cli = "grunt";
|
||||
gulp-cli = "gulp";
|
||||
localtunnel = "lt";
|
||||
|
|
|
@ -54,15 +54,6 @@ final: prev: {
|
|||
'';
|
||||
};
|
||||
|
||||
graphql-language-service-cli = prev.graphql-language-service-cli.override {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/graphql-lsp" \
|
||||
--prefix NODE_PATH : ${final.graphql}/lib/node_modules
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
ijavascript = prev.ijavascript.override (oldAttrs: {
|
||||
preRebuild = ''
|
||||
export npm_config_zmq_external=true
|
||||
|
|
|
@ -1,58 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
colorlover,
|
||||
ipython,
|
||||
ipywidgets,
|
||||
numpy,
|
||||
pandas,
|
||||
plotly,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
six,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cufflinks";
|
||||
version = "0.17.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SMGzQG3AMABBIZZkie68VRjOpw/U4/FjebSRMoUBpkQ=";
|
||||
};
|
||||
|
||||
# replace duplicated pandas method
|
||||
# https://github.com/santosjorge/cufflinks/pull/249#issuecomment-1759619149
|
||||
postPatch = ''
|
||||
substituteInPlace tests.py \
|
||||
--replace-fail "from nose.tools import assert_equals" "def assert_equals(x, y): assert x == y" \
|
||||
--replace-fail "df.ix" "df.loc"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
colorlover
|
||||
ipython
|
||||
ipywidgets
|
||||
numpy
|
||||
pandas
|
||||
plotly
|
||||
six
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "cufflinks" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [ "tests.py" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Productivity Tools for Plotly + Pandas";
|
||||
homepage = "https://github.com/santosjorge/cufflinks";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-otp";
|
||||
version = "1.5.2";
|
||||
version = "1.5.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-otp";
|
||||
repo = "django-otp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fn3MptdlnqY0rOLwcPhKiLfrhYvov4YVLZ58Jp/j6zc=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Hwi0Z5/e91peGbp+GvL/gCtUI4hcJ4kevJMWe9sFvYk=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
@ -52,7 +52,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/django-otp/django-otp";
|
||||
changelog = "https://github.com/django-otp/django-otp/blob/${src.rev}/CHANGES.rst";
|
||||
changelog = "https://github.com/django-otp/django-otp/blob/${src.tag}/CHANGES.rst";
|
||||
description = "Pluggable framework for adding two-factor authentication to Django using one-time passwords";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ ];
|
||||
|
|
|
@ -0,0 +1,66 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
flit-core,
|
||||
django,
|
||||
djangorestframework,
|
||||
drf-spectacular,
|
||||
inflection,
|
||||
pytestCheckHook,
|
||||
pytest-django,
|
||||
django-filter,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-standardized-errors";
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghazi-git";
|
||||
repo = "drf-standardized-errors";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Gr4nj2dd0kZTc4IbLhb0i3CnY+VZaNnr3YJctyxIgQU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix test_openapi_utils test
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ghazi-git/drf-standardized-errors/pull/96/commits/4a2b1be3c97cd6db50543e6ff0303c0df0731d8a.patch";
|
||||
hash = "sha256-8+zVzBX7yDGfpsyvj61auqV+zdG6mIyj2LtR3D8l4jc=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
dependencies = [
|
||||
django
|
||||
djangorestframework
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-django
|
||||
django-filter
|
||||
drf-spectacular
|
||||
];
|
||||
|
||||
env.DJANGO_SETTINGS_MODULE = "tests.settings";
|
||||
|
||||
pythonImportsCheck = [ "drf_standardized_errors" ];
|
||||
|
||||
optional-dependencies.openapi = [
|
||||
drf-spectacular
|
||||
inflection
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Standardize your DRF API error responses";
|
||||
homepage = "https://github.com/ghazi-git/drf-standardized-errors";
|
||||
changelog = "https://github.com/ghazi-git/drf-standardized-errors/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ erictapen ];
|
||||
};
|
||||
}
|
27
pkgs/development/python-modules/jsonpath-python/default.nix
Normal file
27
pkgs/development/python-modules/jsonpath-python/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
lib,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonpath-python";
|
||||
version = "1.0.6";
|
||||
pyproject = true;
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3Vvkpy2KKZXD9YPPgr880alUTP2r8tIllbZ6/wc0lmY=";
|
||||
};
|
||||
build-system = [ setuptools ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "jsonpath" ];
|
||||
pytestFlagsArray = [ "test/test*.py" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sean2077/jsonpath-python";
|
||||
description = "A more powerful JSONPath implementations in modern python.";
|
||||
maintainers = with maintainers; [ dadada ];
|
||||
license = with licenses; [ mit ];
|
||||
};
|
||||
}
|
|
@ -2,18 +2,37 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
msgpack,
|
||||
numpy,
|
||||
pandas,
|
||||
pydantic,
|
||||
pymongo,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
ruamel-yaml,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
|
||||
# dependencies
|
||||
msgpack,
|
||||
ruamel-yaml,
|
||||
|
||||
# optional-dependencies
|
||||
coverage,
|
||||
pymongo,
|
||||
pytest,
|
||||
pytest-cov,
|
||||
types-requests,
|
||||
sphinx,
|
||||
sphinx-rtd-theme,
|
||||
orjson,
|
||||
pandas,
|
||||
pydantic,
|
||||
pint,
|
||||
torch,
|
||||
tqdm,
|
||||
invoke,
|
||||
requests,
|
||||
|
||||
# tests
|
||||
ipython,
|
||||
numpy,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -21,8 +40,6 @@ buildPythonPackage rec {
|
|||
version = "2025.1.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "materialsvirtuallab";
|
||||
repo = "monty";
|
||||
|
@ -30,44 +47,63 @@ buildPythonPackage rec {
|
|||
hash = "sha256-+9nxuvrtl04Fb+GQJUn+fxg4sq1pXK59UkUTkKH16YQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_os.py \
|
||||
--replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
msgpack
|
||||
ruamel-yaml
|
||||
tqdm
|
||||
];
|
||||
|
||||
optional-dependencies = rec {
|
||||
ci = [
|
||||
coverage
|
||||
pymongo
|
||||
pytest
|
||||
pytest-cov
|
||||
types-requests
|
||||
] ++ optional;
|
||||
dev = [ ipython ];
|
||||
docs = [
|
||||
sphinx
|
||||
sphinx-rtd-theme
|
||||
];
|
||||
json =
|
||||
[
|
||||
orjson
|
||||
pandas
|
||||
pydantic
|
||||
pymongo
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.13") [
|
||||
pint
|
||||
torch
|
||||
];
|
||||
multiprocessing = [ tqdm ];
|
||||
optional = dev ++ json ++ multiprocessing ++ serialization;
|
||||
serialization = [ msgpack ];
|
||||
task = [
|
||||
invoke
|
||||
requests
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
ipython
|
||||
numpy
|
||||
pandas
|
||||
pydantic
|
||||
pymongo
|
||||
pytestCheckHook
|
||||
torch
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "monty" ];
|
||||
|
||||
disabledTests = [
|
||||
# Test file was removed and re-added after 2022.9.9
|
||||
"test_reverse_readfile_gz"
|
||||
"test_Path_objects"
|
||||
"test_zopen"
|
||||
"test_zpath"
|
||||
# flaky, precision/rounding error
|
||||
"TestJson.test_datetime"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems";
|
||||
longDescription = "
|
||||
Monty implements supplementary useful functions for Python that are not part of the
|
||||
|
@ -75,8 +111,8 @@ buildPythonPackage rec {
|
|||
patterns such as singleton and cached_class, and many more.
|
||||
";
|
||||
homepage = "https://github.com/materialsvirtuallab/monty";
|
||||
changelog = "https://github.com/materialsvirtuallab/monty/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ psyanticy ];
|
||||
changelog = "https://github.com/materialsvirtuallab/monty/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ psyanticy ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,53 +1,59 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
cmake,
|
||||
nanobind,
|
||||
ninja,
|
||||
numpy,
|
||||
pyyaml,
|
||||
matplotlib,
|
||||
scikit-build-core,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
|
||||
# dependencies
|
||||
h5py,
|
||||
matplotlib,
|
||||
pyyaml,
|
||||
scipy,
|
||||
spglib,
|
||||
symfc,
|
||||
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
scikit-build-core,
|
||||
cmake,
|
||||
setuptools-scm,
|
||||
ninja,
|
||||
pkg-config,
|
||||
nanobind,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonopy";
|
||||
version = "2.34.1";
|
||||
version = "2.37.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-54lKi1zuT/m8pftZc5Oq9advU7hqcrLi/PUX/DL4g2U=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "phonopy";
|
||||
repo = "phonopy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Asrgf4sTriEOv4Vovejshl5HXAYQEckxbHvZ7GmSQgg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
scikit-build-core
|
||||
nanobind
|
||||
setuptools-scm
|
||||
ninja
|
||||
build-system = [
|
||||
cmake
|
||||
nanobind
|
||||
ninja
|
||||
numpy
|
||||
scikit-build-core
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
h5py
|
||||
matplotlib
|
||||
numpy
|
||||
pyyaml
|
||||
scipy
|
||||
spglib
|
||||
symfc
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
@ -59,11 +65,11 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "phonopy" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Modulefor phonon calculations at harmonic and quasi-harmonic levels";
|
||||
homepage = "https://phonopy.github.io/phonopy/";
|
||||
changelog = "https://github.com/phonopy/phonopy/blob/v${version}/doc/changelog.md";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ psyanticy ];
|
||||
changelog = "http://phonopy.github.io/phonopy/changelog.html";
|
||||
license = lib.licenses.bsd0;
|
||||
maintainers = with lib.maintainers; [ psyanticy ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhomee";
|
||||
version = "1.2.5";
|
||||
version = "1.2.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taraman17";
|
||||
repo = "pyHomee";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cwiV2GvoWeFQ4YrwwHW7ZHk2ZjvBKSAff4xY7+iUpAk=";
|
||||
hash = "sha256-ZXb8xDSV6LNcMRUlbLQgK3QTEpiA3pof8sl7uD0blbY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
@ -1,46 +1,65 @@
|
|||
{
|
||||
lib,
|
||||
ase,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
cython,
|
||||
pythonAtLeast,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# nativeBuildInputs
|
||||
cython,
|
||||
glibcLocales,
|
||||
|
||||
# dependencies
|
||||
joblib,
|
||||
matplotlib,
|
||||
monty,
|
||||
networkx,
|
||||
oldest-supported-numpy,
|
||||
numpy,
|
||||
palettable,
|
||||
pandas,
|
||||
plotly,
|
||||
pybtex,
|
||||
pydispatcher,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
requests,
|
||||
ruamel-yaml,
|
||||
scipy,
|
||||
seekpath,
|
||||
setuptools,
|
||||
spglib,
|
||||
sympy,
|
||||
tabulate,
|
||||
tqdm,
|
||||
uncertainties,
|
||||
|
||||
# optional-dependencies
|
||||
netcdf4,
|
||||
ase,
|
||||
pytest,
|
||||
pytest-cov,
|
||||
invoke,
|
||||
sphinx,
|
||||
sphinx-rtd-theme,
|
||||
numba,
|
||||
vtk,
|
||||
|
||||
# tests
|
||||
addBinToPathHook,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymatgen";
|
||||
version = "2025.1.9";
|
||||
version = "2025.1.24";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonAtLeast "3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "materialsproject";
|
||||
repo = "pymatgen";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mbXnuqgve8YjktJ2PSaMNk8ADioaGe+W12bYm/chpzE=";
|
||||
hash = "sha256-0P3/M6VI2RKPArMwXD95sjW7dYOTXxUeu4tOliN0IGk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -51,49 +70,107 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
dependencies = [
|
||||
joblib
|
||||
matplotlib
|
||||
monty
|
||||
networkx
|
||||
oldest-supported-numpy
|
||||
numpy
|
||||
palettable
|
||||
pandas
|
||||
plotly
|
||||
pybtex
|
||||
pydispatcher
|
||||
requests
|
||||
ruamel-yaml
|
||||
scipy
|
||||
spglib
|
||||
sympy
|
||||
tabulate
|
||||
tqdm
|
||||
uncertainties
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
abinit = [ netcdf4 ];
|
||||
ase = [ ase ];
|
||||
joblib = [ joblib ];
|
||||
seekpath = [ seekpath ];
|
||||
ci = [
|
||||
pytest
|
||||
pytest-cov
|
||||
# pytest-split
|
||||
];
|
||||
docs = [
|
||||
invoke
|
||||
sphinx
|
||||
# sphinx_markdown_builder
|
||||
sphinx-rtd-theme
|
||||
];
|
||||
electronic_structure = [
|
||||
# fdint
|
||||
];
|
||||
mlp = [
|
||||
# chgnet
|
||||
# matgl
|
||||
];
|
||||
numba = [ numba ];
|
||||
vis = [ vtk ];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "pymatgen" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
addBinToPathHook
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
preCheck = ''
|
||||
preCheck =
|
||||
# ensure tests can find these
|
||||
''
|
||||
export PMG_TEST_FILES_DIR="$(realpath ./tests/files)"
|
||||
# some tests cover the command-line scripts
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pymatgen" ];
|
||||
disabledTests =
|
||||
[
|
||||
# Flaky
|
||||
"test_numerical_eos_values"
|
||||
"test_pca"
|
||||
"test_static_si_no_kgrid"
|
||||
"test_thermal_conductivity"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# AttributeError: 'NoneType' object has no attribute 'items'
|
||||
"test_mean_field"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Fatal Python error: Aborted
|
||||
# matplotlib/backend_bases.py", line 2654 in create_with_canvas
|
||||
"test_angle"
|
||||
"test_as_dict_from_dict"
|
||||
"test_attributes"
|
||||
"test_basic"
|
||||
"test_core_state_eigen"
|
||||
"test_eos_func"
|
||||
"test_get_info_cohps_to_neighbors"
|
||||
"test_get_plot"
|
||||
"test_get_point_group_operations"
|
||||
"test_matplotlib_plots"
|
||||
"test_ph_plot_w_gruneisen"
|
||||
"test_plot"
|
||||
"test_proj_bandstructure_plot"
|
||||
"test_structure"
|
||||
"test_structure_environments"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Crash when running the pmg command
|
||||
# Critical error: required built-in appearance SystemAppearance not found
|
||||
"tests/cli/test_pmg_plot.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Robust materials analysis code that defines core object representations for structures and molecules";
|
||||
homepage = "https://pymatgen.org/";
|
||||
changelog = "https://github.com/materialsproject/pymatgen/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ psyanticy ];
|
||||
changelog = "https://github.com/materialsproject/pymatgen/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ psyanticy ];
|
||||
};
|
||||
}
|
||||
|
|
49
pkgs/development/python-modules/symfc/default.nix
Normal file
49
pkgs/development/python-modules/symfc/default.nix
Normal file
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
numpy,
|
||||
scipy,
|
||||
spglib,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "symfc";
|
||||
version = "1.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfc";
|
||||
repo = "symfc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ec/HFs3txVtu46llTmcfDF8j0+mTkozdu7+RsZXaAGE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
scipy
|
||||
spglib
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"symfc"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Generate symmetrized force constants";
|
||||
homepage = "https://github.com/symfc/symfc";
|
||||
changelog = "https://github.com/symfc/symfc/releases/tag/v${version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
|
@ -23,14 +23,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "unstructured-inference";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Unstructured-IO";
|
||||
repo = "unstructured-inference";
|
||||
tag = version;
|
||||
hash = "sha256-m0gOireJlLgYZ1iETxObYvISUrnCCzdtWwjYU26czJs=";
|
||||
hash = "sha256-uH7LDezHZrD1zeWMDzrZZALGf0oocIVZl68MactBFGQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
@ -90,7 +90,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "hosted model inference code for layout parsing models";
|
||||
homepage = "https://github.com/Unstructured-IO/unstructured-inference";
|
||||
changelog = "https://github.com/Unstructured-IO/unstructured-inference/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/Unstructured-IO/unstructured-inference/blob/${src.tag}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
platforms = [
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weblate-language-data";
|
||||
version = "2024.16";
|
||||
version = "2025.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "weblate_language_data";
|
||||
inherit version;
|
||||
hash = "sha256-zPYUsOkYizkaGcN+orrR7mZKAq+4KuSXTZc1arsu/Xw=";
|
||||
hash = "sha256-T3O107CQ01loE68vlQtcCjeytxCSiu0m5Oj5P06z2NU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue