Merge master into staging-next
This commit is contained in:
@@ -2386,6 +2386,13 @@
|
||||
name = "Chatnoir Miki";
|
||||
matrix = "@mikiiki:matrix.org";
|
||||
};
|
||||
astratagem = {
|
||||
name = "Chris Montgomery";
|
||||
email = "chmont@protonmail.com";
|
||||
github = "astratagem";
|
||||
githubId = 1757914;
|
||||
keys = [ { fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3"; } ];
|
||||
};
|
||||
astro = {
|
||||
email = "astro@spaceboyz.net";
|
||||
github = "astro";
|
||||
@@ -17502,13 +17509,6 @@
|
||||
githubId = 249317;
|
||||
name = "montag451";
|
||||
};
|
||||
montchr = {
|
||||
name = "Chris Montgomery";
|
||||
email = "chris@cdom.io";
|
||||
github = "montchr";
|
||||
githubId = 1757914;
|
||||
keys = [ { fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3"; } ];
|
||||
};
|
||||
moody = {
|
||||
email = "moody@posixcafe.org";
|
||||
github = "majiru";
|
||||
|
||||
@@ -21,7 +21,6 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.user.services.orca.wantedBy = [ "graphical-session.target" ];
|
||||
services.gnome.at-spi2-core.enable = true;
|
||||
services.speechd.enable = true;
|
||||
};
|
||||
|
||||
@@ -8172,6 +8172,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
markdoc-nvim = buildVimPlugin {
|
||||
pname = "markdoc.nvim";
|
||||
version = "2025-11-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OXY2DEV";
|
||||
repo = "markdoc.nvim";
|
||||
rev = "12607a127ba7c3890c3ab6e7b2a60f65b6d6d3ec";
|
||||
sha256 = "1ghiylf4j4k5s7zs200dznqs8zi30py1a45ykbrw3b08v8xv3mkv";
|
||||
};
|
||||
meta.homepage = "https://github.com/OXY2DEV/markdoc.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
markdown-nvim = buildVimPlugin {
|
||||
pname = "markdown.nvim";
|
||||
version = "2025-10-03";
|
||||
|
||||
@@ -1848,6 +1848,16 @@ assertNoAdditions {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
markdoc-nvim = super.markdoc-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
(nvim-treesitter.withPlugins (p: [
|
||||
p.markdown
|
||||
p.markdown_inline
|
||||
p.html
|
||||
]))
|
||||
];
|
||||
};
|
||||
|
||||
markdown-preview-nvim =
|
||||
let
|
||||
# We only need its dependencies `node-modules`.
|
||||
|
||||
@@ -627,6 +627,7 @@ https://github.com/Bilal2453/luvit-meta/,HEAD,
|
||||
https://github.com/dccsillag/magma-nvim/,HEAD,
|
||||
https://github.com/forest-nvim/maple.nvim/,HEAD,
|
||||
https://github.com/winston0410/mark-radar.nvim/,HEAD,
|
||||
https://github.com/OXY2DEV/markdoc.nvim/,HEAD,
|
||||
https://github.com/iamcco/markdown-preview.nvim/,,
|
||||
https://github.com/tadmccorkle/markdown.nvim/,HEAD,
|
||||
https://github.com/David-Kunz/markid/,HEAD,
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.0.46";
|
||||
hash = "sha256-fa6/yU2JZChTzOc0oFfjb61fTvbJBAtvea1XWL2dqrM=";
|
||||
version = "2.0.47";
|
||||
hash = "sha256-2wvViSXJQO5h8WGYqXpn+gRQ8Tzfb9O+MoJBTLaevUw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -3933,6 +3933,22 @@ let
|
||||
|
||||
robocorp.robotframework-lsp = callPackage ./robocorp.robotframework-lsp { };
|
||||
|
||||
rocq-prover.vsrocq = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "rocq-prover";
|
||||
name = "vsrocq";
|
||||
version = "2.3.2";
|
||||
hash = "sha256-S3rKCzdGb5/UAJC6Z5GGC1Brib9PKiqQv8dRANYbp70=";
|
||||
};
|
||||
meta = {
|
||||
description = "VsRocq is an extension for Visual Studio Code with support for the Rocq Prover";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=rocq-prover.vsrocq";
|
||||
homepage = "https://github.com/rocq-prover/vsrocq";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.Zimmi48 ];
|
||||
};
|
||||
};
|
||||
|
||||
roman.ayu-next = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "ayu-next";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "picodrive";
|
||||
version = "0-unstable-2025-05-31";
|
||||
version = "0-unstable-2025-11-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "picodrive";
|
||||
rev = "975cdafb613e84e305f87b43e70d1e19df7e60e0";
|
||||
hash = "sha256-hRM3DtaTVz35QEkUrPoNXHdS7TgazWIFKU1e+jjfigg=";
|
||||
rev = "046e5ff91eb4bfa728e51e01304ff73cf6b4ee96";
|
||||
hash = "sha256-uoUqap7hMg8C2Ouud0UTtkWeZbtga9GVqSipHZK90/s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
(lib.importJSON ./sources.json)."${hostPlatform.system}"
|
||||
or (throw "antigravity: unsupported system ${hostPlatform.system}");
|
||||
|
||||
version = "1.11.3-6583016683339776";
|
||||
version = "1.11.3";
|
||||
vscodeVersion = "1.104.0";
|
||||
in
|
||||
callPackage vscode-generic {
|
||||
@@ -43,6 +43,8 @@ callPackage vscode-generic {
|
||||
tests = { };
|
||||
updateScript = ./update.sh;
|
||||
|
||||
dontFixup = hostPlatform.isDarwin;
|
||||
|
||||
meta = {
|
||||
mainProgram = "antigravity";
|
||||
description = "Agentic development platform, evolving the IDE into the agent-first era";
|
||||
@@ -57,6 +59,9 @@ callPackage vscode-generic {
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ Zaczero ];
|
||||
maintainers = with lib.maintainers; [
|
||||
xiaoxiangmoe
|
||||
Zaczero
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ linux_x86_64_url=$(
|
||||
# Extract version and check for update
|
||||
version=$(
|
||||
printf '%s\n' "$linux_x86_64_url" \
|
||||
| sed -n 's#.*/stable/\([^/]*\)/linux-x64/Antigravity.tar.gz#\1#p'
|
||||
| sed -n 's#.*/stable/\([^-]*\)-[0-9]*/linux-x64/Antigravity.tar.gz#\1#p'
|
||||
)
|
||||
echo "Version: $version"
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
xiaoxiangmoe
|
||||
montchr
|
||||
astratagem
|
||||
lord-valen
|
||||
cafkafk
|
||||
];
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.46",
|
||||
"version": "2.0.47",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.46",
|
||||
"version": "2.0.47",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.46";
|
||||
version = "2.0.47";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-VwnR+bGSjuACdb+lTWbPnfG7HBagbWJ0Fe0pjPaQ/cM=";
|
||||
hash = "sha256-do9NH1L8ME1+ZbXB7XgmQMzHLmuBssPjDo/aTYV+Nzo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-VT6dta8IrsqrvKWlOcNamxuZaBj+TSJpzlSqw8S81iA=";
|
||||
npmDepsHash = "sha256-Ikl6Q6vvFi5LCuHYIYfXxovFwdcK/dG6QqGwq9Gm+aI=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -14,18 +14,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.58.0";
|
||||
version = "0.60.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-CY9ai6Ia6bixACEIIWc85DqFDUf31zMnVJTqkVQArDs=";
|
||||
hash = "sha256-VWvSMS7A8xi6n3RLvWphy8caqolYAaB51E9fyVb1ZNI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-FqGgHzq9JhegpRQEpOGtTmdnfypOeIlE43SdWs1/ddM=";
|
||||
cargoHash = "sha256-F9YU77p7T7sfThP6R3HVOFN1pl05/myUMV6zVRcriHY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatekeeper";
|
||||
version = "3.20.1";
|
||||
version = "3.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "gatekeeper";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vChpVCw2La4cgNMDFnC7thU4jSmJ4LlOLVVeURNQ1+0=";
|
||||
hash = "sha256-lnnV5JhaBH2hZFSWUJPewmPpOmBFvUZwrbY/NSbap48=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "h";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zimbatm";
|
||||
repo = "h";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4rhol8a+OMX2+MxFPEM1WzM/70C7sye8jw4pg7CujRo=";
|
||||
hash = "sha256-Iv+BqM6AF7wD5yyFSvA5pkG2yfQrNp6aBFV1OCUom5c=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby ];
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
platforms
|
||||
;
|
||||
maintainers = with lib.maintainers; [
|
||||
montchr
|
||||
astratagem
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lint-staged";
|
||||
version = "16.2.6";
|
||||
version = "16.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okonet";
|
||||
repo = "lint-staged";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-d4DB1kVUwO9+VF90BZjSAAH3/KyjmbJ4yfXOMOX23Wc=";
|
||||
hash = "sha256-w5oiIMxdkJXsE6kVhym0R7OBPbDQ4wrUBjwnSHLismw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-L0X3v5Ekd8qt8A9TTtgGsnv1WV1HKcRwAiHpf5zP3oo=";
|
||||
npmDepsHash = "sha256-4cocT13aqX3wniwDtPDlJt/8J/6vcN0TAdBIJLjGPM0=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "nest-cli";
|
||||
version = "11.0.10";
|
||||
version = "11.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nestjs";
|
||||
repo = "nest-cli";
|
||||
tag = version;
|
||||
hash = "sha256-mNnEbZv6LG5YDYZj7kAiPcg2Se9wJidON+9Tp/TIpd4=";
|
||||
hash = "sha256-A/R0y1NAKR85TrOt8DJaqZ8gMyGfrTc6T7dvzN0T8do=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-dEg0WmNNNLMQj+9bHkwf0uz9Vyx+QFSHrQv7fk1DxjQ=";
|
||||
npmDepsHash = "sha256-+QGeOUIF36CLGUGi7QUEM/UE/kvpW4ZucjSFAXZbo4M=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
env = {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "offpunk";
|
||||
version = "2.7.1";
|
||||
version = "2.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.7";
|
||||
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "~lioploum";
|
||||
repo = "offpunk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+Mbe1VLeF8Adf7bgVnbzvcWdPB4PXakCD9gO35jAYBY=";
|
||||
hash = "sha256-s/pEN7n/g9o8a/hYTC39PgbBLyCUwN5LIggqUSMKRS4=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ord";
|
||||
version = "0.23.3";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ordinals";
|
||||
repo = "ord";
|
||||
rev = version;
|
||||
hash = "sha256-+e5l+ez/cDqoyqF05jv6bs1l82pHTMtGFdMEtUln/qM=";
|
||||
hash = "sha256-wGwetpZwYuQ6NhZ5to6PTQdhlEz+66iM26x0ZqNfwH0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LPClIma05n+e+mDy0ycaap84yzmDR+VnrT3RqGnfBLA=";
|
||||
cargoHash = "sha256-Ziop9cw/jHTrbRZoVBy2Rd93A/YZlLY14Vzfp3vm5xc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
{
|
||||
"version": "5.6.0",
|
||||
"version": "5.7.2",
|
||||
"darwin-amd64": {
|
||||
"hash": "sha256-LYsJxRC1dO6UkPhUOmGv5G0kzMHDS1l0GmRKWlsnnlo=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.6.0/platform_5.6.0_darwin_all.tar.gz"
|
||||
"hash": "sha256-Klc7+0KWSjTxSv/AQ8Z429mTYNrl/SLLlKncnKx3hqk=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.7.2/platform_5.7.2_darwin_all.tar.gz"
|
||||
},
|
||||
"darwin-arm64": {
|
||||
"hash": "sha256-LYsJxRC1dO6UkPhUOmGv5G0kzMHDS1l0GmRKWlsnnlo=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.6.0/platform_5.6.0_darwin_all.tar.gz"
|
||||
"hash": "sha256-Klc7+0KWSjTxSv/AQ8Z429mTYNrl/SLLlKncnKx3hqk=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.7.2/platform_5.7.2_darwin_all.tar.gz"
|
||||
},
|
||||
"linux-amd64": {
|
||||
"hash": "sha256-xcP6ycAwpHip+mmHGwHym+a+AN4fbLseNJ2KOmi18rg=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.6.0/platform_5.6.0_linux_amd64.tar.gz"
|
||||
"hash": "sha256-g/Jnl1bUjwf27pzzvWVBRl7jSWm+p9lQfk/6HeUngXc=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.7.2/platform_5.7.2_linux_amd64.tar.gz"
|
||||
},
|
||||
"linux-arm64": {
|
||||
"hash": "sha256-eSpsG0g3aCVOttIPj6HeE9YNS32cuLcpFdANK0QeSFo=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.6.0/platform_5.6.0_linux_arm64.tar.gz"
|
||||
"hash": "sha256-Chlijpt6t/5GJRZ40wNaXnzGTAaAsBE9kzT+bidrmio=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.7.2/platform_5.7.2_linux_arm64.tar.gz"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "qwen-code";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QwenLM";
|
||||
repo = "qwen-code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/g2S4QymLkQGly0h0cx/R+6BPgZmQfZrE8i7ZcGY11w=";
|
||||
hash = "sha256-hUl7zgd8wkppLWUZ0NeR0JLs0nbIC4eTkir1qVgcViM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-NEkctY0lLtiKfiiEv6FZuyf7GbVLKgRRmZdzOUTbkSE=";
|
||||
npmDepsHash = "sha256-OIsfLcwYRkJIszo9KGRZSn2OHqEH5hElEcrzozTfflQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
Generated
+159
-546
File diff suppressed because it is too large
Load Diff
@@ -21,7 +21,7 @@
|
||||
applyPatches,
|
||||
}:
|
||||
let
|
||||
version = "5.28.0.10274";
|
||||
version = "6.0.4.10291";
|
||||
# The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
|
||||
# the already patched lockfile to `fetchYarnDeps`.
|
||||
src = applyPatches {
|
||||
@@ -29,7 +29,7 @@ let
|
||||
owner = "Radarr";
|
||||
repo = "Radarr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iETtSByI9VjZdVjFHdfDcfSHUGz5Es8K8/HiB99KUqc=";
|
||||
hash = "sha256-SDkLVKHTqAnZQ4AYIW9fHvnga8EV/NVfzia/Ce0G+Uc=";
|
||||
};
|
||||
postPatch = ''
|
||||
mv src/NuGet.config NuGet.Config
|
||||
@@ -67,7 +67,7 @@ buildDotnetModule {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-WFILG6nLEc8WO0j0CKH7RcX1++ucVOCge/UKcpHj87A=";
|
||||
hash = "sha256-Ng7ZsUfGBKtNktJeuI4Q6+tMN2ZPj+pVSQ+0Ssy5gRc=";
|
||||
};
|
||||
|
||||
ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' servarr-ffmpeg "ffprobe");
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "10.3.1";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
type = "Application";
|
||||
exec = "roomarranger";
|
||||
@@ -28,11 +30,11 @@ in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "roomarranger";
|
||||
version = "10.2";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://f000.backblazeb2.com/file/rooarr/rooarr1020-linux64.tar.gz";
|
||||
hash = "sha256-24AGP2le5HfcVMlqDjiMRcRWKU/zjACV7KzJlVWMpkw=";
|
||||
url = "https://f000.backblazeb2.com/file/rooarr/rooarr${lib.versions.major version}${lib.versions.minor version}${lib.versions.patch version}-linux64.tar.gz";
|
||||
hash = "sha256-J4/IsOH12CutjorGtZzKbL4uFYWd9SXmjNx32Vi5dr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -44,7 +46,6 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
gtk3
|
||||
qt6.qt3d
|
||||
qt6.qtwayland
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@@ -53,6 +54,10 @@ stdenv.mkDerivation {
|
||||
mkdir -p $out/lib $out/bin
|
||||
cp -r rooarr-bin/* $out/lib/
|
||||
|
||||
# Remove Wayland plugins that require unavailable libraries
|
||||
rm -rf $out/lib/wayland-graphics-integration-client
|
||||
rm -f $out/lib/platforms/libqwayland-*.so
|
||||
|
||||
ln -s $out/lib/RoomArranger $out/bin/roomarranger
|
||||
|
||||
# Install application icons
|
||||
@@ -75,6 +80,8 @@ stdenv.mkDerivation {
|
||||
longDescription = ''
|
||||
Room Arranger is a 3D room / apartment / floor planner with a simple user interface.
|
||||
Free for 30 days. Updates are free.
|
||||
|
||||
Note: This package uses XCB (X11) for rendering. On Wayland compositors, it will run via XWayland.
|
||||
'';
|
||||
homepage = "https://www.roomarranger.com/";
|
||||
changelog = "https://www.roomarranger.com/whatsnew.txt";
|
||||
|
||||
Generated
+30
-24
@@ -37,21 +37,21 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build",
|
||||
"version": "17.11.31",
|
||||
"hash": "sha256-NBn5hn85Q9dG1q09joq0pJsxsZ1m5DBQVJu+Mlx4EGE=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.11.31/microsoft.build.17.11.31.nupkg"
|
||||
"version": "17.11.48",
|
||||
"hash": "sha256-x+Lz/v4bgImq3Vbc3XRICqLUfXaelia0bE4d0YxcXls=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.11.48/microsoft.build.17.11.48.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Framework",
|
||||
"version": "17.11.31",
|
||||
"hash": "sha256-YS4oASrmC5dmZrx5JPS7SfKmUpIJErlUpVDsU3VrfFE=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.11.31/microsoft.build.framework.17.11.31.nupkg"
|
||||
"version": "17.11.48",
|
||||
"hash": "sha256-aGt5pBTpQxxPT+UYlone+8jQJQIEVAAtgy0ygifwFaw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.11.48/microsoft.build.framework.17.11.48.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Framework",
|
||||
"version": "17.15.0-preview-25353-11",
|
||||
"hash": "sha256-Zh78ZPYCj0B5j+lrIBAX0KAZAUWA6ItZ78tYvMDi2oI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.15.0-preview-25353-11/microsoft.build.framework.17.15.0-preview-25353-11.nupkg"
|
||||
"version": "18.0.2",
|
||||
"hash": "sha256-fO31KAdDs2J0RUYD1ov9UB3ucsbALan7K0YdWW+yg7A=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/18.0.2/microsoft.build.framework.18.0.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Locator",
|
||||
@@ -61,15 +61,15 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Tasks.Core",
|
||||
"version": "17.11.31",
|
||||
"hash": "sha256-5G9ZuP/6XNmR++YyBpQuBKqNsF2FXxz+537TtVWCik8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.11.31/microsoft.build.tasks.core.17.11.31.nupkg"
|
||||
"version": "17.11.48",
|
||||
"hash": "sha256-gOglB1gdC91ISY0cvXfj/EqPQjC/UPjpjAKTxjHri9E=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.11.48/microsoft.build.tasks.core.17.11.48.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Utilities.Core",
|
||||
"version": "17.11.31",
|
||||
"hash": "sha256-AQN2Qi4WbguyZitJR8FTYzq9k0LDyzETFpTA9aQZ4Gw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.11.31/microsoft.build.utilities.core.17.11.31.nupkg"
|
||||
"version": "17.11.48",
|
||||
"hash": "sha256-W8mtjZ2IUPMK8m0CWdcswvcbMmNsigMuaBEyl1zgC98=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.11.48/microsoft.build.utilities.core.17.11.48.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Analyzers",
|
||||
@@ -127,15 +127,21 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.DotNet.Arcade.Sdk",
|
||||
"version": "11.0.0-beta.25531.1",
|
||||
"hash": "sha256-3zAA42msNPkvWe29bOeC44zjJyaFRU+M2+jBti/JTP4=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25531.1/microsoft.dotnet.arcade.sdk.11.0.0-beta.25531.1.nupkg"
|
||||
"version": "11.0.0-beta.25562.6",
|
||||
"hash": "sha256-p1NIUxIbB5vzSv0TMVdnyaTe2/N8wHsr9tmEZk+CCyA=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25562.6/microsoft.dotnet.arcade.sdk.11.0.0-beta.25562.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.DotNet.FileBasedPrograms",
|
||||
"version": "10.0.200-preview.0.25556.104",
|
||||
"hash": "sha256-IZMj0EGno5ZlJiicdK+Kxg97IvDaWheVxuMlCPmN1wI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/8ea23ec3-b9b2-4976-90d7-7c4a6f529fdc/nuget/v3/flat2/microsoft.dotnet.filebasedprograms/10.0.200-preview.0.25556.104/microsoft.dotnet.filebasedprograms.10.0.200-preview.0.25556.104.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.DotNet.XliffTasks",
|
||||
"version": "11.0.0-beta.25531.1",
|
||||
"hash": "sha256-6Ko4aKbQZskfE2B6xg6RZjEd51at6/Pk1OvMRfP6qWQ=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25531.1/microsoft.dotnet.xlifftasks.11.0.0-beta.25531.1.nupkg"
|
||||
"version": "11.0.0-beta.25562.6",
|
||||
"hash": "sha256-v02uUdmnGpD2otyXpFQwIzMDPB2bueONAxggM8Nrzvg=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25562.6/microsoft.dotnet.xlifftasks.11.0.0-beta.25562.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration",
|
||||
@@ -505,9 +511,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.CommandLine",
|
||||
"version": "2.0.0-rc.1.25515.110",
|
||||
"hash": "sha256-kkWn8IJRJjafkB1WSuE0kA0gyce3eGcikK3gKUlEH3g=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-rc.1.25515.110/system.commandline.2.0.0-rc.1.25515.110.nupkg"
|
||||
"version": "3.0.0-alpha.1.25567.106",
|
||||
"hash": "sha256-bmvDruld0VKW09VjHy0ibkg6+gAt8Sb7fF00E7yJoI4=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-alpha.1.25567.106/system.commandline.3.0.0-alpha.1.25567.106.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.ComponentModel.Composition",
|
||||
|
||||
@@ -52,18 +52,18 @@ in
|
||||
buildDotnetModule (finalAttrs: rec {
|
||||
inherit pname dotnet-sdk dotnet-runtime;
|
||||
|
||||
vsVersion = "2.100.5";
|
||||
vsVersion = "2.102.30-prerelease";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotnet";
|
||||
repo = "roslyn";
|
||||
rev = "VSCode-CSharp-${vsVersion}";
|
||||
hash = "sha256-PXb5BmXPfkitY/Lc2HMhAqX48dXqIYX+I4iFzvnvWTE=";
|
||||
hash = "sha256-C61Zew0W1r1klw3zGZfv3YNhZ7SrCd0UbGlXhqkfrbI=";
|
||||
};
|
||||
|
||||
# versioned independently from vscode-csharp
|
||||
# "roslyn" in here:
|
||||
# https://github.com/dotnet/vscode-csharp/blob/main/package.json
|
||||
version = "5.3.0-2.25553.6";
|
||||
version = "5.3.0-2.25568.9";
|
||||
projectFile = "src/LanguageServer/${project}/${project}.csproj";
|
||||
useDotnetFromEnv = true;
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
@@ -4,14 +4,15 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "rt5677-firmware";
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rt5677-firmware";
|
||||
version = "4.16-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphael";
|
||||
repo = "linux-samus";
|
||||
rev = "995de6c2093797905fbcd79f1a3625dd3f50be37";
|
||||
sha256 = "sha256-PjPFpz4qJLC+vTomV31dA3AKGjfYjKB2ZYfUpnj61Cg=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fghU20fqKDhmisXI42t23omWYCRs0HAyzCp4c2GMZc0";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -19,10 +20,11 @@ stdenvNoCC.mkDerivation {
|
||||
cp ./firmware/rt5677_elf_vad $out/lib/firmware
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Firmware for Realtek rt5677 device";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
maintainers = [ maintainers.zohl ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.unfreeRedistributableFirmware;
|
||||
maintainers = with lib.maintainers; [ zohl ];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryFirmware ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "rtl8192su";
|
||||
pname = "rtl8192su-firmware";
|
||||
version = "0-unstable-2016-10-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chunkeey";
|
||||
repo = "rtl8192su";
|
||||
rev = "c00112c9a14133290fe30bd3b44e45196994cb1c";
|
||||
sha256 = "0j3c35paapq1icmxq0mg7pm2xa2m69q7bkfmwgq99d682yr2cb5l";
|
||||
hash = "sha256-tCwmshfItJTw49XNdXAyVagu6j2vAtwriwFfpW4ZbEg=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
@@ -30,11 +30,12 @@ stdenvNoCC.mkDerivation {
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Firmware for Realtek RTL8188SU/RTL8191SU/RTL8192SU";
|
||||
homepage = "https://github.com/chunkeey/rtl8192su";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
platforms = with platforms; linux;
|
||||
license = lib.licenses.unfreeRedistributableFirmware;
|
||||
maintainers = with lib.maintainers; [ mic92 ];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryFirmware ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,14 +4,15 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "rtl8761b-firmware";
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rtl8761b-firmware";
|
||||
version = "rtk1395";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Realtek-OpenSource";
|
||||
repo = "android_hardware_realtek";
|
||||
rev = "rtk1395";
|
||||
sha256 = "sha256-vd9sZP7PGY+cmnqVty3sZibg01w8+UNinv8X85B+dzc=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-vd9sZP7PGY+cmnqVty3sZibg01w8+UNinv8X85B+dzc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -24,10 +25,11 @@ stdenvNoCC.mkDerivation {
|
||||
$out/lib/firmware/rtl_bt/rtl8761b_config.bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Firmware for Realtek RTL8761b";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
maintainers = with maintainers; [ milibopp ];
|
||||
platforms = with platforms; linux;
|
||||
license = lib.licenses.unfreeRedistributableFirmware;
|
||||
maintainers = with lib.maintainers; [ milibopp ];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryFirmware ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Generated
+538
-427
File diff suppressed because it is too large
Load Diff
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
gradle_8,
|
||||
makeWrapper,
|
||||
jre,
|
||||
@@ -13,24 +12,18 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stirling-pdf";
|
||||
version = "1.3.2";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stirling-Tools";
|
||||
repo = "Stirling-PDF";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-H1nYRUIUVRUGGK+Vonr2v7oM6SfhYEsFk+JJp/4DI4M=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IgzBWIYK3ps0WxBMkJK/vEyvgpEv3NurbNhaTwz25Bc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove timestamp from the header of a generated .properties file
|
||||
./remove-props-file-timestamp.patch
|
||||
# Apply fix for building on macOS. Remove when updating the package next time.
|
||||
(fetchpatch2 {
|
||||
name = "normalize-path-in-ApplicationPropertiesLogicTest.patch";
|
||||
url = "https://github.com/Stirling-Tools/Stirling-PDF/commit/93fb62047a6ab85db63305c23dde5e5118e1ae2e.patch";
|
||||
hash = "sha256-kQNYyRtJ0smuhaoII31k87b7QRBJosK6xlFiQUwobsg=";
|
||||
})
|
||||
];
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
|
||||
@@ -46,7 +46,11 @@ buildGoModule rec {
|
||||
tests.version = testers.testVersion {
|
||||
package = supabase-cli;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
updateScript = nix-update-script {
|
||||
# Fetch versions from GitHub releases to detect pre-releases and
|
||||
# avoid updating to them.
|
||||
extraArgs = [ "--use-github-releases" ];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "teams-for-linux";
|
||||
version = "2.6.13";
|
||||
version = "2.6.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0dnhDQ6lx78XGpYKLikizvltmC1/MdUYAHw5HvWFhQU=";
|
||||
hash = "sha256-oy5wLcWgiZ/Myyl0pcnjZnicznz7j2PZl1yFsOIMnrs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-pb17MmY+yuMf0pnvqfH3Pu74rPi+Nvkc/K+UEzaDbsQ=";
|
||||
npmDepsHash = "sha256-/aDn3RK5WY07eRYjBdI/aVi75FZuCVAsZoOx0EcnahM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -9,46 +9,66 @@
|
||||
makeWrapper,
|
||||
versionCheckHook,
|
||||
}:
|
||||
stdenv.mkDerivation (
|
||||
finalAttrs:
|
||||
let
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion finalAttrs.version) 3}/urserver-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-4wA2VPb5QN30TWa72pUVTYfvsxlGTO8Vngh7wDHXhDE=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
url = "https://www.unifiedremote.com/static/builds/server/linux-arm64/${builtins.elemAt (builtins.splitVersion finalAttrs.version) 3}/urserver-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-GmYekCGb64GdFdABEJl9CgqycnsBX95W9/b0xZJntEs=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "urserver";
|
||||
version = "3.14.0.2574";
|
||||
{
|
||||
pname = "urserver";
|
||||
version = "3.14.0.2574";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion finalAttrs.version) 3}/urserver-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-4wA2VPb5QN30TWa72pUVTYfvsxlGTO8Vngh7wDHXhDE=";
|
||||
};
|
||||
src =
|
||||
let
|
||||
platformSource =
|
||||
sources."${stdenv.hostPlatform.system}"
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
fetchurl {
|
||||
inherit (platformSource) url hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
|
||||
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
|
||||
|
||||
installPhase = ''
|
||||
install -m755 -D urserver $out/bin/urserver
|
||||
wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath [
|
||||
libX11
|
||||
libXtst
|
||||
bluez
|
||||
]
|
||||
}"
|
||||
cp -r remotes $out/bin/remotes
|
||||
cp -r manager $out/bin/manager
|
||||
'';
|
||||
installPhase = ''
|
||||
install -m755 -D urserver $out/bin/urserver
|
||||
wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath [
|
||||
libX11
|
||||
libXtst
|
||||
bluez
|
||||
]
|
||||
}"
|
||||
cp -r remotes $out/bin/remotes
|
||||
cp -r manager $out/bin/manager
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.unifiedremote.com/";
|
||||
description = "One-and-only remote for your computer";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ sfrijters ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "urserver";
|
||||
};
|
||||
})
|
||||
meta = {
|
||||
homepage = "https://www.unifiedremote.com/";
|
||||
description = "One-and-only remote for your computer";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ sfrijters ];
|
||||
platforms = lib.attrNames sources;
|
||||
mainProgram = "urserver";
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
@@ -32,14 +32,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xapp-thumbnailers";
|
||||
version = "1.2.8";
|
||||
version = "1.2.9";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "xapp-thumbnailers";
|
||||
tag = version;
|
||||
hash = "sha256-MX2TvtuOmqi8cpA/K8pSEPScUOXEmz++t7Xb/eDdb9c=";
|
||||
hash = "sha256-XlmWenp3BmGnmLGt9jauys9P92icsezjieHuyGVMisw=";
|
||||
};
|
||||
|
||||
patches = [ ./meson.patch ];
|
||||
|
||||
@@ -105,13 +105,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "z88dk";
|
||||
version = "2.3-unstable-2025-01-08";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "z88dk";
|
||||
repo = "z88dk";
|
||||
rev = "e223137af42ed0332b11fa6185268246293245c4";
|
||||
hash = "sha256-m0ZEAfKISEqzsh4VNXwRSceBC4uWmIIdi5cw+7lEC9o=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RrPu1UcTyin/aiGrV87PZI8f6dazuojJLalyEaFT/kY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ let
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch coq.coq-version [
|
||||
(case (range "8.18" "9.1") "2.3.3")
|
||||
(case (range "8.18" "9.1") "2.2.6")
|
||||
(case (range "8.18" "8.20") "2.2.1")
|
||||
(case (range "8.18" "8.19") "2.1.2")
|
||||
@@ -41,6 +42,8 @@ let
|
||||
release."2.2.5".sha256 = "sha256-XyIjwem/yS7UIpQATNixgKkrMOHHs74nkAOvpU5WG1k=";
|
||||
release."2.2.6".rev = "v2.2.6";
|
||||
release."2.2.6".sha256 = "sha256-J8nRTAwN6GBEYgqlXa2kkkrHPatXsSObQg9QUQoZhgE=";
|
||||
release."2.3.3".rev = "v2.3.3";
|
||||
release."2.3.3".sha256 = "sha256-wgn28wqWhZS4UOLUblkgXQISgLV+XdSIIEMx9uMT/ig=";
|
||||
inherit location;
|
||||
};
|
||||
fetched = fetch (if version != null then version else defaultVersion);
|
||||
|
||||
@@ -5,19 +5,16 @@
|
||||
stdlib-shims,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
version = "3.0.0";
|
||||
pname = "earley";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rlepigre";
|
||||
repo = "ocaml-earley";
|
||||
rev = version;
|
||||
sha256 = "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vvw6Fi/6EEgF6gub6U/ZE73K3hMw/QWiMvxC1ttHJe4=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.07";
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [ stdlib-shims ];
|
||||
|
||||
doCheck = true;
|
||||
@@ -29,4 +26,4 @@ buildDunePackage rec {
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
mainProgram = "pa_ocaml";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,19 +6,15 @@
|
||||
iso8601,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "gnuplot";
|
||||
version = "0.7";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c-cube";
|
||||
repo = "ocaml-${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "02pzi3lb57ysrdsba743s3vmnapjbxgq8ynlzpxbbs6cn1jj6ch9";
|
||||
repo = "ocaml-gnuplot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CTIjZbDM6LX6/dR6hF9f8ipb99CDHLV0y9qfsuiI/wo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -26,10 +22,10 @@ buildDunePackage rec {
|
||||
iso8601
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Ocaml bindings to Gnuplot";
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
license = licenses.lgpl21;
|
||||
meta = {
|
||||
homepage = "https://github.com/c-cube/ocaml-gnuplot";
|
||||
description = "OCaml bindings to Gnuplot";
|
||||
maintainers = [ lib.maintainers.bcdarwin ];
|
||||
license = lib.licenses.lgpl21;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,23 +4,19 @@
|
||||
buildDunePackage,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "wtf8";
|
||||
version = "1.0.2";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "09ygcxxd5warkdzz17rgpidrd0pg14cy2svvnvy1hna080lzg7vp";
|
||||
url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${finalAttrs.version}/wtf8-v${finalAttrs.version}.tbz";
|
||||
hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/flowtype/ocaml-wtf8";
|
||||
description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.eqyiel ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.eqyiel ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,26 +6,24 @@
|
||||
xmlm,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "xmlplaylist";
|
||||
version = "0.1.5";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-xmlplaylist";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x5lbwkr2ip00x8vyfbl8936yy79j138vx8a16ix7g9p2j5qsfcq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mDmNixQ3vdOjCQr1jUaQ6XhvRkJ0Ob9RB+BGkSdftPQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ xmlm ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/savonet/ocaml-xmlplaylist";
|
||||
description = "Module to parse various RSS playlist formats";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [ dandellion ];
|
||||
license = lib.licenses.lgpl21Only;
|
||||
maintainers = with lib.maintainers; [ dandellion ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -484,9 +484,9 @@ buildPythonPackage rec {
|
||||
homepage = "https://beets.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
astratagem
|
||||
doronbehar
|
||||
lovesegfault
|
||||
montchr
|
||||
pjones
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
|
||||
@@ -23,12 +23,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "comet-ml";
|
||||
version = "3.54.0";
|
||||
version = "3.54.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "comet_ml";
|
||||
inherit version;
|
||||
hash = "sha256-ETcRFf1wPGYrbkjknTt5omqVC4/NhhbFkCpELuY54Y0=";
|
||||
hash = "sha256-8FL72YEo/OrzN6nehu3Fw4P7UiQWJLHGCUf1fRv1TaI=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-include-markdown-plugin";
|
||||
version = "7.1.6";
|
||||
version = "7.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "mkdocs_include_markdown_plugin";
|
||||
inherit version;
|
||||
hash = "sha256-oHU8uCcEwQoofx54n8mEj4K2vrh0mBSySwPdn2eBZnc=";
|
||||
hash = "sha256-SmepGt5oDcDhX2COW2NDvsAzcv+hEsQKQlTBv7EPQvM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -67,7 +67,7 @@ buildPythonPackage rec {
|
||||
toml = [
|
||||
tomli-w
|
||||
]
|
||||
++ lib.optional (pythonOlder 3.11) tomli;
|
||||
++ lib.optional (pythonOlder "3.11") tomli;
|
||||
yaml = [ pyyaml ];
|
||||
};
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oelint-data";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "priv-kweihmann";
|
||||
repo = "oelint-data";
|
||||
tag = version;
|
||||
hash = "sha256-PnX58Z+kqq+5ATeAxnWGTMvHuUIUOj4qL7K1vndYRLo=";
|
||||
hash = "sha256-evgBULhNMUodWSv33RW8uO8nKI4mfR9KjZPwEofquQs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
{
|
||||
metaFetch,
|
||||
coq,
|
||||
rocq-core,
|
||||
lib,
|
||||
glib,
|
||||
adwaita-icon-theme,
|
||||
wrapGAppsHook3,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
let
|
||||
ocamlPackages = rocq-core.ocamlPackages;
|
||||
defaultVersion =
|
||||
let
|
||||
case = case: out: { inherit case out; };
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "8.18" "9.1") "2.3.3")
|
||||
(case (range "8.18" "9.1") "2.3.0")
|
||||
] null;
|
||||
location = {
|
||||
domain = "github.com";
|
||||
owner = "rocq-prover";
|
||||
repo = "vsrocq";
|
||||
};
|
||||
fetch = metaFetch {
|
||||
release."2.3.0".rev = "v2.3.0";
|
||||
release."2.3.0".sha256 = "sha256-BZLxcCmSGFf04eUmlJXnyxmg4hTwpFaPaIik4VD444M=";
|
||||
release."2.3.3".rev = "v2.3.3";
|
||||
release."2.3.3".sha256 = "sha256-wgn28wqWhZS4UOLUblkgXQISgLV+XdSIIEMx9uMT/ig=";
|
||||
inherit location;
|
||||
};
|
||||
fetched = fetch (if version != null then version else defaultVersion);
|
||||
in
|
||||
ocamlPackages.buildDunePackage {
|
||||
pname = "vsrocq-language-server";
|
||||
inherit (fetched) version;
|
||||
src = "${fetched.src}/language-server";
|
||||
nativeBuildInputs = [ coq ];
|
||||
buildInputs = [
|
||||
coq
|
||||
glib
|
||||
adwaita-icon-theme
|
||||
wrapGAppsHook3
|
||||
]
|
||||
++ (with ocamlPackages; [
|
||||
findlib
|
||||
lablgtk3-sourceview3
|
||||
yojson
|
||||
zarith
|
||||
ppx_inline_test
|
||||
ppx_assert
|
||||
ppx_sexp_conv
|
||||
ppx_deriving
|
||||
ppx_import
|
||||
sexplib
|
||||
ppx_yojson_conv
|
||||
lsp
|
||||
sel
|
||||
ppx_optcomp
|
||||
]);
|
||||
preBuild = ''
|
||||
make dune-files
|
||||
'';
|
||||
|
||||
meta =
|
||||
with lib;
|
||||
{
|
||||
description = "Language server for the vsrocq vscode/codium extension";
|
||||
homepage = "https://github.com/rocq-prover/vsrocq";
|
||||
maintainers = with maintainers; [ cohencyril ];
|
||||
license = licenses.mit;
|
||||
}
|
||||
// optionalAttrs (fetched.broken or false) {
|
||||
rocqFilter = true;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lttng-modules-${kernel.version}";
|
||||
version = "2.13.15";
|
||||
version = "2.13.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lttng";
|
||||
repo = "lttng-modules";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cEiv1EjsEvyreRERrCGKKpJdA1IKvuyVmgA7S3EkEnU=";
|
||||
hash = "sha256-0fHjJBG/nTjXX8MVArvKDvn2ho9GLEodqAv/DcHLWis=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
@@ -224,11 +224,14 @@ lib.fix (
|
||||
paths = builtins.catAttrs "outPath" pkgList.nonbin;
|
||||
|
||||
# mktexlsr
|
||||
nativeBuildInputs = [ tl."texlive.infra" ];
|
||||
nativeBuildInputs = [
|
||||
tl.texlive-scripts # for mktexlsr.pl with --sort support
|
||||
perl
|
||||
];
|
||||
|
||||
postBuild = # generate ls-R database
|
||||
''
|
||||
mktexlsr "$out"
|
||||
perl ${tl.texlive-scripts.tex}/scripts/texlive/mktexlsr.pl --sort "$out"
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@ installtl_do_postinst_stuff () {
|
||||
|
||||
# make new files available
|
||||
tlutils_info "running mktexlsr $TEXMFSYSVAR $TEXMFSYSCONFIG"
|
||||
mktexlsr "$TEXMFSYSVAR" "$TEXMFSYSCONFIG"
|
||||
perl "$texmfdist"/scripts/texlive/mktexlsr.pl --sort "$TEXMFSYSVAR" "$TEXMFSYSCONFIG"
|
||||
|
||||
# can be skipped if generating formats only
|
||||
if [[ -z $__formatsOf ]] ; then
|
||||
@@ -164,7 +164,7 @@ installtl_do_postinst_stuff () {
|
||||
# tlmgr --no-execute-actions paper letter
|
||||
# install-tl: "rerun mktexlsr for updmap-sys and tlmgr paper updates"
|
||||
tlutils_info "re-running mktexlsr $TEXMFSYSVAR $TEXMFSYSCONFIG"
|
||||
mktexlsr "$TEXMFSYSVAR" "$TEXMFSYSCONFIG"
|
||||
perl "$texmfdist"/scripts/texlive/mktexlsr.pl --sort "$TEXMFSYSVAR" "$TEXMFSYSCONFIG"
|
||||
|
||||
tlutils_update_context_cache
|
||||
fi
|
||||
|
||||
@@ -40,6 +40,7 @@ let
|
||||
parseque = callPackage ../development/rocq-modules/parseque { };
|
||||
rocq-elpi = callPackage ../development/rocq-modules/rocq-elpi { };
|
||||
stdlib = callPackage ../development/rocq-modules/stdlib { };
|
||||
vsrocq-language-server = callPackage ../development/rocq-modules/vsrocq-language-server { };
|
||||
|
||||
filterPackages = doesFilter: if doesFilter then filterRocqPackages self else self;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user