Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -160,7 +160,8 @@
|
||||
_0xSA7 = {
|
||||
name = "Saleh Diaa Ahmed";
|
||||
github = "0xSA7";
|
||||
githubId = 153073356;
|
||||
githubId = 109046494;
|
||||
email = "salehdiaaahmed@gmail.com";
|
||||
};
|
||||
_1000101 = {
|
||||
email = "b1000101@pm.me";
|
||||
@@ -7858,12 +7859,6 @@
|
||||
githubId = 27162016;
|
||||
name = "Ramdip Gill";
|
||||
};
|
||||
elasticdog = {
|
||||
email = "aaron@elasticdog.com";
|
||||
github = "elasticdog";
|
||||
githubId = 4742;
|
||||
name = "Aaron Bull Schaefer";
|
||||
};
|
||||
elatov = {
|
||||
email = "elatov@gmail.com";
|
||||
github = "elatov";
|
||||
|
||||
@@ -44,6 +44,8 @@
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- `komodo` has been updated to the v2 release line (2.x). See the [upstream v1 → v2 upgrade guide](https://github.com/moghtech/komodo/releases/tag/v2.0.0).
|
||||
|
||||
- `boot.loader.systemd-boot` gained support for [Automatic Boot Assessment](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/) via the new [`boot.loader.systemd-boot.bootCounting`](#opt-boot.loader.systemd-boot.bootCounting.enable) options, allowing automatic detection of and recovery from bad NixOS generations. As part of this change, boot loader entries on the ESP/XBOOTLDR partition are now named `nixos-<content-hash>.conf` instead of `nixos-generation-<n>.conf`; existing entries are migrated automatically on the next `nixos-rebuild boot`/`switch`.
|
||||
|
||||
- The `newuidmap` and `newgidmap` security wrappers are now installed with `cap_setuid`/`cap_setgid` file capabilities instead of the setuid-root bit, matching shadow's `--with-fcaps` install mode and other major distributions. Rootless containers (podman, docker-rootless, unprivileged user namespaces) are unaffected. The only behavioural change is that mapping host uid 0 via `/etc/subuid` (which NixOS never configures by default) additionally requires `cap_setfcap`; users who explicitly grant uid 0 in a subuid range can restore the previous behaviour with `security.wrappers.newuidmap.capabilities = lib.mkForce "cap_setuid,cap_setfcap+ep";`.
|
||||
|
||||
@@ -14643,6 +14643,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
pantran-nvim = buildVimPlugin {
|
||||
pname = "pantran.nvim";
|
||||
version = "0-unstable-2025-04-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "potamides";
|
||||
repo = "pantran.nvim";
|
||||
rev = "b87c3ae48cba4659587fb75abd847e5b7a7c9ca0";
|
||||
hash = "sha256-b4odpXwh+BmFsK5v3HmSWG43FA+ygOAPU+qFNy6vWDU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/potamides/pantran.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
papercolor-theme = buildVimPlugin {
|
||||
pname = "papercolor-theme";
|
||||
version = "1.0-unstable-2024-03-12";
|
||||
|
||||
@@ -3737,6 +3737,10 @@ assertNoAdditions {
|
||||
dependencies = [ self.nui-nvim ];
|
||||
};
|
||||
|
||||
pantran-nvim = super.pantran-nvim.overrideAttrs {
|
||||
runtimeDeps = [ curl ];
|
||||
};
|
||||
|
||||
parpar-nvim = super.parpar-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
nvim-parinfer
|
||||
|
||||
@@ -1044,6 +1044,7 @@ https://github.com/wbthomason/packer.nvim/,,
|
||||
https://github.com/drewtempelmeyer/palenight.vim/,,
|
||||
https://github.com/JoosepAlviste/palenightfall.nvim/,,
|
||||
https://github.com/roobert/palette.nvim/,,
|
||||
https://github.com/potamides/pantran.nvim/,,
|
||||
https://github.com/NLKNguyen/papercolor-theme/,,
|
||||
https://github.com/pappasam/papercolor-theme-slim/,,
|
||||
https://github.com/dundalek/parpar.nvim/,,
|
||||
|
||||
@@ -73,13 +73,13 @@
|
||||
"vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw="
|
||||
},
|
||||
"auth0_auth0": {
|
||||
"hash": "sha256-v0EPS8sVHZRDkc8zJtVGL6pDFbHhxyW3D+iLYe0kSVI=",
|
||||
"hash": "sha256-WXqZ0566/BrpidrxbtbTf5VOqBmuXTZiqHlw9x2Wkug=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v1.48.0",
|
||||
"rev": "v1.49.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-xf2c6wjpBxEmWm2t3/fFvekGfi2XbruV/kWeBLcTN4g="
|
||||
"vendorHash": "sha256-6bWfFGBa19Po/26ktT5BKKiowNsQwxnpOI6orA2GweY="
|
||||
},
|
||||
"aviatrixsystems_aviatrix": {
|
||||
"hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",
|
||||
@@ -472,13 +472,13 @@
|
||||
"vendorHash": "sha256-/8h2bmesnFz3tav3+iDelZSjp1Z9lreexwcw0WdYekA="
|
||||
},
|
||||
"goharbor_harbor": {
|
||||
"hash": "sha256-2mi1QlWPAPGVr/Q0xOQjI8R8baeyJotjjoKZyQYNJg0=",
|
||||
"hash": "sha256-rmMyUekQ5gH9vVjTo3jhvBLqAXVLcrj+n+rMDxirH8o=",
|
||||
"homepage": "https://registry.terraform.io/providers/goharbor/harbor",
|
||||
"owner": "goharbor",
|
||||
"repo": "terraform-provider-harbor",
|
||||
"rev": "v3.11.6",
|
||||
"rev": "v3.12.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-874QpqIFFhzIGJZ8nKGcUe9qEpR9jQkx4nl75Cpqpww="
|
||||
"vendorHash": "sha256-v1r/hTVHJeaTsxHU/oDhRQeaWtfND7NplMAj+wFPe6A="
|
||||
},
|
||||
"grafana_grafana": {
|
||||
"hash": "sha256-TyO5Owo8LFQVQmsAD40/L0VaAY1+X3h4pSPbJIE97mY=",
|
||||
@@ -968,13 +968,13 @@
|
||||
"vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
|
||||
},
|
||||
"newrelic_newrelic": {
|
||||
"hash": "sha256-eQpwxA51hmysBpvTVgcyTlBTpHqfeRy+tLl5HTxAPAk=",
|
||||
"hash": "sha256-eteX6j+gtWsxN8UdttP1YjCrBlzXVVrhOT+kiw98gFo=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.91.0",
|
||||
"rev": "v3.93.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-MP3CHOybrF3EoynQ5Wi6+J+5+N6pxxIvFZZD6dJ5WHI="
|
||||
"vendorHash": "sha256-fCdwTWYbwuJUh+9WeVN5WmpPxdop49oHZ2cUm3K5w6w="
|
||||
},
|
||||
"ns1-terraform_ns1": {
|
||||
"hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=",
|
||||
@@ -1040,13 +1040,13 @@
|
||||
"vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
|
||||
},
|
||||
"opentelekomcloud_opentelekomcloud": {
|
||||
"hash": "sha256-olgUy66gTSPGPvwMKaOeLhjmA3pS9LX/SPdaf8vNbhM=",
|
||||
"hash": "sha256-gWzDgZdZJJ2kHIXIw12+1YaCUkcO+0Biu0dY2F88FJQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
|
||||
"owner": "opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.36.67",
|
||||
"rev": "v1.36.68",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Y+U+8iR3iu62DN/KgYQj7XsSjD3T9GJjQM1Osq//03w="
|
||||
"vendorHash": "sha256-ECuzdph5/lKBqIoXUwpIulyl6KYFxJLzdKn/G9UZJpk="
|
||||
},
|
||||
"opsgenie_opsgenie": {
|
||||
"hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",
|
||||
|
||||
@@ -39,9 +39,6 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/bazelbuild/buildtools";
|
||||
changelog = "https://github.com/bazelbuild/buildtools/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
elasticdog
|
||||
];
|
||||
teams = [ lib.teams.bazel ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -32,6 +32,6 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/bazelbuild/bazelisk";
|
||||
changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ elasticdog ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.91.168";
|
||||
version = "1.91.171";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-lH1AvdAkhpQtaGdMtbKfnm8bA4w5DpgM7fEEWsSVcoA=";
|
||||
hash = "sha256-a2FTFaICNqeoKwz8YKs4F16IFNibcyhCAFcpUdwPdqU=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-5xW0HhDM9cgh7h0hQ+B0NxaHw7DObLSXzgwixo+jNtc=";
|
||||
hash = "sha256-fiMT0JzhaGUlqgb1XO6L3yIpCna+An33c7bbVmEQBKE=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-kE4/GSEL4dDTy4aqqg6JqyzNIlCcIDGdPxAgCAPEN3Q=";
|
||||
hash = "sha256-o08YNk4iIzQezFcnOutVbHl4X4D7aDbaJZsUij6CWp4=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-ocRwDMegXcGMFRQSVVTNjT/OlHlNiTHYCjHWJSaz1Z8=";
|
||||
hash = "sha256-eOLBGLPcd8/WfZa/ndXPQSI1MtjND8593HXyU34mITE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
}:
|
||||
assert syslogSupport -> util-linux != null;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.4";
|
||||
version = "2.1.1";
|
||||
pname = "btrfs-auto-snapshot";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hunleyd";
|
||||
repo = "btrfs-auto-snapshot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QpuwkGaYAkpu5hYyb360Mr5tHsZc2LzMlKtpS8CyyhI=";
|
||||
hash = "sha256-QpXD0u593BYONjscXSc7oZGUydygs/Hfk3A7MOpn8jQ=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -1,47 +1,47 @@
|
||||
{
|
||||
"version": "2.1.175",
|
||||
"commit": "0b9163019454512fd2b2ed8e6bef5470f9259f35",
|
||||
"buildDate": "2026-06-12T01:33:39Z",
|
||||
"version": "2.1.177",
|
||||
"commit": "6fae7a072b111776fc95ca221caac31b7439eb25",
|
||||
"buildDate": "2026-06-13T00:29:44Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "6b75bf132c866ed409bf913c318ca32011e73ffb12d3cd67ecc37bc4ee9ec65d",
|
||||
"size": 224216352
|
||||
"checksum": "eb0730351be2f02b482b1855870f5877489085aac86b0c4c1db4e458d9e40ed9",
|
||||
"size": 225124512
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "3770f2cb42d3f776e62a59aa16230843dc7b8422b36be9b1532e02a6e92e7fa8",
|
||||
"size": 226734640
|
||||
"checksum": "fcdc6c6679d4e1e3a0a3812f24e8b08ab73156732072c2ca5ee6248bee8313bd",
|
||||
"size": 227642800
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "360f1f6f43ec26d9bb6e20e487bf44b753d9b8407e89e74bfeeb79707399f435",
|
||||
"size": 249476744
|
||||
"checksum": "baf3926dc166215772f959e367da9784ff4c75157aaafe4524fdc79ebff984b1",
|
||||
"size": 250394248
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "4fc72fa6090c9a03f1850e1b1ccb3d6806bf802b67e3cb9dc5f2ced4b7ed5ca1",
|
||||
"size": 249566928
|
||||
"checksum": "ff41753634b20c869ef6a32a20863521b33d4186ac0d6a49379ab48a48395ee7",
|
||||
"size": 250480336
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "27234d99851b2e343184466924d8f5c9318d1cfc4156fc4198c99e26c8a8ab86",
|
||||
"size": 242331480
|
||||
"checksum": "bc756f27912d993d632a5f86be9a0364fc3c1373d146a367e46c8d01d3ca1620",
|
||||
"size": 243248984
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "f40f977d2555f349e4d94f6efdc7deece3596c2cffa9d1a6a66b14ee30cfca54",
|
||||
"size": 243977264
|
||||
"checksum": "4884b1512bf2863a85f1717eee58840b05d558568f817be71b1a116a430f4a96",
|
||||
"size": 244890672
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "c1b5b0ae1b607c1f8623d222c9eb6005a35dd6873aa834910a6fb3e00450e096",
|
||||
"size": 244979872
|
||||
"checksum": "408ddf27d45fc6b6516843c0513072bc0f474d7bface60ae8bbbc633bef9feb2",
|
||||
"size": 245856928
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "f01eea49c920e990a7c3d2c1071abbc7e79ab54a099380982c11a6f462ca7c4a",
|
||||
"size": 240943776
|
||||
"checksum": "89652ac1f73ccc3fe039a1d388af81af82608af1cac7a32b5ebc2189b8ae2d62",
|
||||
"size": 241821856
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/zeromq/cppzmq";
|
||||
license = lib.licenses.bsd2;
|
||||
description = "C++ binding for 0MQ";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
panicgh
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
wireshark-cli,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "credslayer";
|
||||
version = "0.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShellCode33";
|
||||
repo = "CredSLayer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gryV9MHULY6ZHy6YDFQDIkZsfIX8La0tHT0vrrQJNDQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pyshark
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
py
|
||||
pytestCheckHook
|
||||
wireshark-cli
|
||||
];
|
||||
|
||||
enabledTestPaths = [
|
||||
"tests/tests.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Requires a telnet setup
|
||||
"test_telnet"
|
||||
# stdout has all the correct data, but the underlying test code fails
|
||||
# functionally everything seems to be intact
|
||||
"http_get_auth"
|
||||
"test_http_post_auth"
|
||||
"test_ntlmssp"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"credslayer"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/credslayer \
|
||||
--prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Extract credentials and other useful info from network captures";
|
||||
mainProgram = "credslayer";
|
||||
homepage = "https://github.com/ShellCode33/CredSLayer";
|
||||
license = with lib.licenses; [ gpl3Only ];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
# broken due to wireshark 4.4 bump
|
||||
# see: https://github.com/NixOS/nixpkgs/pull/344914
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "euphonica";
|
||||
version = "0.99.4-beta";
|
||||
version = "0.99.5-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "htkhiem";
|
||||
repo = "euphonica";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TDW3at2NXbdfUvHAZg7KK0HEqF8xDm0cIYfGuTSlYCQ=";
|
||||
hash = "sha256-/U0ugG6refcMliHO1Eouk+yQyzXWh7Y/mzSTskU6/co=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-cXlfJ3MrW8n34KxE5uD+6dTqzaazmwgNQC3hHNPqzcE=";
|
||||
hash = "sha256-eB5m2wa61k3m3uKzo7sgKxJZ3hZqvNqP8fs15e6tiZA=";
|
||||
};
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "flake-edit";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "a-kenji";
|
||||
repo = "flake-edit";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4wy+J+xIOSmavPgxYO+Wji9gyRomOwk0ibwQOQqJBSM=";
|
||||
hash = "sha256-xEQ+zBU31KBmv2j19KB7pX2P4a1MLPT8BDbDGXBSySk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5CBSvE1darONbZMg4PsEqyhaVBUS84xcG+BafJzeaS0=";
|
||||
cargoHash = "sha256-QAVu/fiuV818zTrSqy2k+2GMz18oYcrf6xLY/7bii2c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -22,12 +22,14 @@ let
|
||||
# Requires running Docker daemon
|
||||
"TestDocker"
|
||||
"TestJobExecutor"
|
||||
"TestRunContext_PrepareJobContainer/Overlapping"
|
||||
"TestRunExec"
|
||||
"TestRunner"
|
||||
"Test_validateCmd"
|
||||
|
||||
# Docker network request for image
|
||||
"TestImageExistsLocally"
|
||||
"TestStepDockerMain"
|
||||
|
||||
# Reaches out to different websites
|
||||
"TestFindGitRemoteURL"
|
||||
@@ -48,21 +50,22 @@ let
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Uses docker-specific options, unsupported on Darwin
|
||||
"TestMergeJobOptions"
|
||||
"TestNewEndpointHonoursTLSEnv"
|
||||
];
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "forgejo-runner";
|
||||
version = "12.10.2";
|
||||
version = "12.11.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "code.forgejo.org";
|
||||
owner = "forgejo";
|
||||
repo = "runner";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uo+x02HgpfOY+KXug7cmnW4d85AlX6wqz+nYGF/JrHk=";
|
||||
hash = "sha256-Qc43zWDDCjL8RW9Q30H4N5VRSFT3LR4Pt8/P0NcMacU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0gOftkxkBPziU0Tm8lIiD72rXcMMY5M57G9/Bt/mneI=";
|
||||
vendorHash = "sha256-du7fXehcxZ70Lsr5VCkz646G0Us/XwM4Sl98HXimoao=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpaste";
|
||||
version = "45.3";
|
||||
version = "45.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.imagination-land.org/files/gpaste/GPaste-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-UU8pw7bqEwg2Vh7S6GTx8swI/2IhlwjQgkGNZCzoMwc=";
|
||||
hash = "sha256-seoPqmec9F4/zwmLjpAOUBBIVvLbFRMVPZ3jcloRrZE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,10 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \
|
||||
--subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"}
|
||||
|
||||
substituteInPlace src/gnome-shell/metadata.json.in --replace-fail \
|
||||
'"shell-version": [ "45", "46", "47", "48" ],' \
|
||||
'"shell-version": [ "45", "46", "47", "48", "49" ],'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -90,5 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.linux;
|
||||
teams = [ lib.teams.gnome ];
|
||||
maintainers = with lib.maintainers; [ fabiob ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -33,11 +33,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "haproxy";
|
||||
version = "3.3.10";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-aqkZoT86V1QW7wrkXaDss18ajQBGQd1oT+m1PmRokfI=";
|
||||
hash = "sha256-kpj1ZcKpuopOf4nFS+LF0/2WC1swTrVRXhXSnSwV1Pc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
desktop-file-utils,
|
||||
fetchFromGitLab,
|
||||
glib,
|
||||
glycin-loaders,
|
||||
gst_all_1,
|
||||
gtk4,
|
||||
lcms,
|
||||
@@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
dav1d
|
||||
glycin-loaders
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "kitty-themes";
|
||||
version = "0-unstable-2026-03-31";
|
||||
version = "0-unstable-2026-06-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty-themes";
|
||||
rev = "c467f3ef3fd44f3fa3c16599e0d1663be027dea0";
|
||||
hash = "sha256-oNMf6hGcNj9IS7m+lo6xRsBAPQw40w7MlEPZCTv3Ggg=";
|
||||
rev = "6f27c71721e4eb6702630f6e57fe16baacd76aa0";
|
||||
hash = "sha256-IDXRlup2naBmCSlPYdjrgL/m4FAhkf4IEAiLsMUdepQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -2,32 +2,38 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "komodo";
|
||||
version = "1.19.5";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moghtech";
|
||||
repo = "komodo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dLBgdcrIp5QM2TVIa86qX7m1c5n+qOIQJtqJPGvIZ+0=";
|
||||
hash = "sha256-Hw0JD4e/ODK19M/bZtX9foCu5c79XA8Jgv2fleltdLs=";
|
||||
};
|
||||
|
||||
# Temporary fix to get build to pass until https://github.com/moghtech/komodo/pull/1122
|
||||
patches = [
|
||||
./rustc-1_9_2-fixes.patch
|
||||
];
|
||||
cargoHash = "sha256-b/AgQBmS1QfP+BOCT4xL8majVKobig5M2YJhGuXMToc=";
|
||||
|
||||
cargoHash = "sha256-jf/Jp28g3inGn5jQp3cACdhl//tbXTMc1vP1K3g/CyQ=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
# disable for check. document generation is fail
|
||||
# > error: doctest failed, to rerun pass `-p komodo_client --doc`
|
||||
doCheck = false;
|
||||
|
||||
# xtask is a workspace-internal build helper, not a user-facing program.
|
||||
postInstall = ''
|
||||
rm -f $out/bin/xtask
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = {
|
||||
@@ -53,8 +59,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://komo.do";
|
||||
changelog = "https://github.com/moghtech/komodo/releases/tag/v${finalAttrs.version}";
|
||||
mainProgram = "komodo";
|
||||
maintainers = with lib.maintainers; [ r17x ];
|
||||
mainProgram = "km";
|
||||
maintainers = with lib.maintainers; [
|
||||
r17x
|
||||
channinghe
|
||||
];
|
||||
license = lib.licenses.gpl3;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
diff --git a/bin/core/src/alert/discord.rs b/bin/core/src/alert/discord.rs
|
||||
index 427227d..6d19678 100644
|
||||
--- a/bin/core/src/alert/discord.rs
|
||||
+++ b/bin/core/src/alert/discord.rs
|
||||
@@ -230,14 +230,13 @@ pub async fn send_alert(
|
||||
)
|
||||
}
|
||||
AlertData::Custom { message, details } => {
|
||||
- format!(
|
||||
- "{level} | {message}{}",
|
||||
- if details.is_empty() {
|
||||
- format_args!("")
|
||||
- } else {
|
||||
- format_args!("\n{details}")
|
||||
- }
|
||||
- )
|
||||
+ let details_str = if details.is_empty() {
|
||||
+ String::new()
|
||||
+ } else {
|
||||
+ format!("\n{details} f")
|
||||
+ };
|
||||
+
|
||||
+ format!("{level} | {message}{details_str}")
|
||||
}
|
||||
AlertData::None {} => Default::default(),
|
||||
};
|
||||
diff --git a/bin/core/src/alert/mod.rs b/bin/core/src/alert/mod.rs
|
||||
index 9eba5da..1f51ac2 100644
|
||||
--- a/bin/core/src/alert/mod.rs
|
||||
+++ b/bin/core/src/alert/mod.rs
|
||||
@@ -474,14 +474,13 @@ fn standard_alert_content(alert: &Alert) -> String {
|
||||
)
|
||||
}
|
||||
AlertData::Custom { message, details } => {
|
||||
- format!(
|
||||
- "{level} | {message}{}",
|
||||
- if details.is_empty() {
|
||||
- format_args!("")
|
||||
- } else {
|
||||
- format_args!("\n{details}")
|
||||
- }
|
||||
- )
|
||||
+ let details_str = if details.is_empty() {
|
||||
+ String::new()
|
||||
+ } else {
|
||||
+ format!("\n{details}")
|
||||
+ };
|
||||
+
|
||||
+ format!("{level} | {message}{details_str}")
|
||||
}
|
||||
AlertData::None {} => Default::default(),
|
||||
}
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmt32emu";
|
||||
version = "2.8.2";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munt";
|
||||
repo = "munt";
|
||||
tag = "libmt32emu_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-O9x+uL1QnixXNl/rTCnGwbutoCs6bI8vCmkhAWJW4Do=";
|
||||
hash = "sha256-QuOQvKNCKl/UypTub9FCoYu3HJrMi6LksKPGaQUWfO8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -2,36 +2,22 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libnfs";
|
||||
version = "5.0.2";
|
||||
version = "5.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sahlberg";
|
||||
repo = "libnfs";
|
||||
rev = "libnfs-${finalAttrs.version}";
|
||||
sha256 = "sha256-rdxi5bPXHTICZQIj/CmHgZ/V70svnITJj/OSF4mmC3o=";
|
||||
tag = "libnfs-${finalAttrs.version}";
|
||||
hash = "sha256-OFzoDCDBo+O7PtUKcyKnUJJ9TrALrkvk5Yo0zn08Q6w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
patches = [
|
||||
# Fixes 100% CPU usage in multi-threaded mode
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sahlberg/libnfs/commit/34d6fe37e986da5b0ced86cd028a88e482537d5a.patch";
|
||||
sha256 = "sha256-i7mi+TVdkLb4MztT5Ic/Q8XBIWk9lo8v5bNjHOr6LaI=";
|
||||
})
|
||||
# Fixes deprecation warnings on macOS
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sahlberg/libnfs/commit/f6631c54a7b0385988f11357bf96728a6d7345b9.patch";
|
||||
sha256 = "sha256-xLRZ9J1vr04n//gNv9ljUBt5LHUGBRRVIXJCMlFbHFI=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-pthread"
|
||||
];
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mt32emu-qt";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munt";
|
||||
repo = "munt";
|
||||
tag = "mt32emu_qt_${lib.replaceString "." "_" finalAttrs.version}";
|
||||
hash = "sha256-O9x+uL1QnixXNl/rTCnGwbutoCs6bI8vCmkhAWJW4Do=";
|
||||
hash = "sha256-QuOQvKNCKl/UypTub9FCoYu3HJrMi6LksKPGaQUWfO8=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mt32emu-smf2wav";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munt";
|
||||
repo = "munt";
|
||||
rev = "mt32emu_smf2wav_${lib.replaceString "." "_" finalAttrs.version}";
|
||||
sha256 = "sha256-O9x+uL1QnixXNl/rTCnGwbutoCs6bI8vCmkhAWJW4Do=";
|
||||
sha256 = "sha256-QuOQvKNCKl/UypTub9FCoYu3HJrMi6LksKPGaQUWfO8=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-m096RC5BwFd3S6fDb6Qaui7dLnoSqGAx5uuxE7qyx54=";
|
||||
hash = "sha256-vOdTOZsowO/PqKRGEV8NMNnCflUatRsOU3md0MNz3MQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -43,13 +43,13 @@ assert lib.warnIf enableMixmaster
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "neomutt";
|
||||
version = "20260105";
|
||||
version = "20260504";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neomutt";
|
||||
repo = "neomutt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rdnk1wESnnoaxctkR6WvWpq+DUg86PbH9f1EtpSL5uk=";
|
||||
hash = "sha256-PVcQjuUWK0QwcDIuKsHTMWFCpYLHBG/3Hr1IbLtlJbg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nirius";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~tsdh";
|
||||
repo = "nirius";
|
||||
rev = "nirius-${finalAttrs.version}";
|
||||
hash = "sha256-+OPJODiZs3+d3W8vnLCbza4axgIu6WBeC2j+JLN/Zgg=";
|
||||
hash = "sha256-H6geI5RkM0SXJyqXNai9vyc0cdTq2hHGpee8Tx2XDIU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lxyChCuo6ZtZ6Sd50xn2KyY7JTf3KCobZnI0AsM3CUE=";
|
||||
cargoHash = "sha256-qsY0OXsCn6g/vIBkHtkG2Dvv2RjiOrhT1O8AvzyBiV0=";
|
||||
|
||||
meta = {
|
||||
description = "Utility commands for the niri wayland compositor";
|
||||
|
||||
@@ -1,16 +1,25 @@
|
||||
diff --git a/hatch_build.py b/hatch_build.py
|
||||
index 036079a..fa2275e 100644
|
||||
index da19ad8..f33e582 100644
|
||||
--- a/hatch_build.py
|
||||
+++ b/hatch_build.py
|
||||
@@ -1,6 +1,5 @@
|
||||
@@ -1,7 +1,6 @@
|
||||
import hashlib
|
||||
import os
|
||||
import subprocess
|
||||
-import sys
|
||||
from pathlib import Path
|
||||
from tempfile import TemporaryDirectory
|
||||
|
||||
@@ -58,28 +57,27 @@ class BuildHook(BuildHookInterface):
|
||||
@@ -57,46 +56,33 @@ class BuildHook(BuildHookInterface):
|
||||
|
||||
build_data["pure_python"] = False
|
||||
|
||||
- # Ensure submodule on git main
|
||||
- subprocess.check_call(
|
||||
- ("git", "submodule", "update", "--init", "--remote"),
|
||||
- cwd=Dirs.repository,
|
||||
- )
|
||||
-
|
||||
# Configure the project
|
||||
subprocess.check_call((
|
||||
- sys.executable, "-m", "mesonbuild.mesonmain",
|
||||
@@ -20,11 +29,23 @@ index 036079a..fa2275e 100644
|
||||
"--reconfigure", "--wipe",
|
||||
), cwd=Dirs.repository)
|
||||
|
||||
- # Intended operation
|
||||
- subprocess.check_call(
|
||||
- ("git", "config", "advice.detachedHead", "false"),
|
||||
- cwd=Dirs.opengpu,
|
||||
- )
|
||||
-
|
||||
# Keep track of breaking changes
|
||||
hashes: dict[str, str] = dict()
|
||||
|
||||
# Make binaries for all known driver version
|
||||
for driver in subprocess.check_output(
|
||||
- ("git", "tag"), cwd=Dirs.opengpu
|
||||
+ ("cat", "./SOURCE_TAGS"), cwd=Dirs.opengpu
|
||||
).decode().strip().splitlines():
|
||||
- for driver in sorted(subprocess.check_output(
|
||||
- args=("git", "tag"),
|
||||
+ for driver in subprocess.check_output(
|
||||
+ args=("cat", "./SOURCE_TAGS"),
|
||||
cwd=Dirs.opengpu
|
||||
- ).decode().strip().splitlines()):
|
||||
+ ).decode().strip().splitlines():
|
||||
|
||||
# Checkout driver version
|
||||
- subprocess.check_call(
|
||||
@@ -48,29 +69,16 @@ index 036079a..fa2275e 100644
|
||||
|
||||
# Find and vendor the binary for this version
|
||||
binary = Dirs.build.joinpath("nvibrant")
|
||||
@@ -90,25 +88,3 @@ class BuildHook(BuildHookInterface):
|
||||
@@ -109,12 +95,6 @@ class BuildHook(BuildHookInterface):
|
||||
build_data["force_include"][str(target)] = f"nvibrant/resources/{target.name}"
|
||||
hashes.setdefault(hashlib.md5(target.read_bytes()).hexdigest(), driver)
|
||||
|
||||
# Include in the wheel
|
||||
build["force_include"][str(target)] = f"nvibrant/resources/{target.name}"
|
||||
-
|
||||
- # Revert back main branch
|
||||
- subprocess.check_call(
|
||||
- ("git", "checkout", "-f", "main"),
|
||||
- cwd=Dirs.opengpu
|
||||
- )
|
||||
-
|
||||
-# --------------------------------------------------------------------------- #
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
-
|
||||
- # Intended operation
|
||||
- subprocess.check_call(
|
||||
- ("git", "config", "advice.detachedHead", "false"),
|
||||
- cwd=Dirs.opengpu,
|
||||
- )
|
||||
-
|
||||
- environ = os.environ.copy()
|
||||
- subprocess.check_call(
|
||||
- args=("uv", "build", "--wheel", "-o", Dirs.dist),
|
||||
- cwd=Dirs.repository,
|
||||
- )
|
||||
print("\nBreaking changes across driver versions:")
|
||||
|
||||
for hashsum, driver in hashes.items():
|
||||
|
||||
@@ -14,10 +14,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pyproject = true;
|
||||
|
||||
passthru = {
|
||||
nvibrantVersion = "1.2.0";
|
||||
nvibrantVersion = "1.2.1";
|
||||
|
||||
oldestDriverVersion = "515.43.04";
|
||||
latestDriverVersion = "595.58.03";
|
||||
latestDriverVersion = "610.43.02";
|
||||
|
||||
_version = lib.concatStringsSep "-" [
|
||||
finalAttrs.passthru.nvibrantVersion
|
||||
@@ -31,14 +31,14 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
repo = "nvibrant";
|
||||
name = "nvibrant";
|
||||
tag = "v${finalAttrs.passthru.nvibrantVersion}";
|
||||
hash = "sha256-OQo+VGWz8LNpsCdXbJXWWCrnVE0+t4s220uJ+pTHVKs=";
|
||||
hash = "sha256-M83WSQiJwzFZl8ECkZjKigvLTlMkzRa6o2hqPOt1378=";
|
||||
};
|
||||
open-gpu = fetchFromGitHub {
|
||||
owner = "nvidia";
|
||||
repo = "open-gpu-kernel-modules";
|
||||
name = "open-gpu";
|
||||
tag = finalAttrs.passthru.oldestDriverVersion;
|
||||
hash = "sha256-pSVK5oVob4QBo18ULHnQfO3UrTcC5lDDrTR9ec9pDp8=";
|
||||
hash = "sha256-MfLR5sYSjBrENWkCChcS9rk1zSlRFfTRpof/4lQ3qow=";
|
||||
|
||||
# since .git isn't deterministic, we can't use it to checkout tags in
|
||||
# the build phase, so instead we generate patches for each version
|
||||
|
||||
@@ -5,45 +5,39 @@
|
||||
unstableGitUpdater,
|
||||
cmake,
|
||||
pkg-config,
|
||||
# No Qt6 yet: https://github.com/Wohlstand/OPN2BankEditor/issues/126
|
||||
libsForQt5,
|
||||
qt6Packages,
|
||||
rtaudio,
|
||||
rtmidi,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opn2bankeditor";
|
||||
version = "1.3-unstable-2026-01-01";
|
||||
version = "1.3-unstable-2026-05-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wohlstand";
|
||||
repo = "opn2bankeditor";
|
||||
rev = "0371db0867ac23f49e8d160f9fd3163cf1fe41a2";
|
||||
rev = "c3e12e6b1fc1a6a295fe66c64eceeba5e52832f2";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-+BgvzZoGAh9KlKjAyn7BsWnfGDB5njW8tJoFwtY0fCo=";
|
||||
hash = "sha256-NosvIFVqu2b0p6QAzd+r5+TcxTNB66PZS358pWB8xpk=";
|
||||
};
|
||||
|
||||
# https://github.com/Wohlstand/OPN2BankEditor/issues/125
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 3.2)' 'cmake_minimum_required(VERSION 3.2...3.10)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
qt6Packages.qttools
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qwt
|
||||
qt6Packages.qtbase
|
||||
qt6Packages.qwt
|
||||
rtaudio
|
||||
rtmidi
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.strings.cmakeFeature "BUILD_MAJOR_QT" "6")
|
||||
(lib.strings.cmakeBool "USE_RTAUDIO" true)
|
||||
(lib.strings.cmakeBool "USE_RTMIDI" true)
|
||||
(lib.strings.cmakeBool "USE_VENDORED_RTAUDIO" false)
|
||||
@@ -54,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir $out/{bin,Applications}
|
||||
mv "OPN2 Bank Editor.app" $out/Applications/
|
||||
|
||||
install_name_tool -change {,${libsForQt5.qwt}/lib/}libqwt.6.dylib "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor"
|
||||
install_name_tool -change {,${qt6Packages.qwt}/lib/}libqwt.6.dylib "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor"
|
||||
|
||||
ln -s "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor" $out/bin/opn2_bank_editor
|
||||
'';
|
||||
|
||||
@@ -74,8 +74,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
apple-sdk_15
|
||||
];
|
||||
|
||||
buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ];
|
||||
|
||||
doCheck = false; # there aren't any tests
|
||||
|
||||
env.OPENSSL_NO_VENDOR = true;
|
||||
|
||||
Generated
+64
-69
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"pname": "AngleSharp",
|
||||
"version": "1.3.0",
|
||||
"hash": "sha256-xq+G2f9FCqS6PjIgfDdZjVRoaxVMiSyOXC7KtMzMpPU="
|
||||
"version": "1.4.0",
|
||||
"hash": "sha256-xHpoMkhYSj7ejeMmI2e7ygef84QGZhttPjYOnLjITd0="
|
||||
},
|
||||
{
|
||||
"pname": "AngleSharp.Xml",
|
||||
@@ -11,18 +11,18 @@
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Core",
|
||||
"version": "1.47.1",
|
||||
"hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak="
|
||||
"version": "1.50.0",
|
||||
"hash": "sha256-8Pjz0/2wTLK5uY7G5qrxQr4CsmrjiR8gL4g6zJymj5s="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Identity",
|
||||
"version": "1.14.2",
|
||||
"hash": "sha256-PpGcGQrzcEzDtTm65gLmjWrt8yavst4VOKDlr+NuLQo="
|
||||
"version": "1.17.1",
|
||||
"hash": "sha256-pjNnhL/sCFy+BWNMAgj+l6aGoOp4ngrFO/61RIgzBEU="
|
||||
},
|
||||
{
|
||||
"pname": "BouncyCastle.Cryptography",
|
||||
"version": "2.6.1",
|
||||
"hash": "sha256-0NNwK/UZlnIK4Nb7bs4ya0XfoVluKQPUVQvaR88UHKo="
|
||||
"version": "2.6.2",
|
||||
"hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms="
|
||||
},
|
||||
{
|
||||
"pname": "Castle.Core",
|
||||
@@ -36,8 +36,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Dapper",
|
||||
"version": "2.1.66",
|
||||
"hash": "sha256-e5n/wnAFGPDSe30oQQ0fanXrvFZYYa+qCDSTHtfQmPw="
|
||||
"version": "2.1.79",
|
||||
"hash": "sha256-QIGZ+vlnwhSl+nnVZ//s3uwFh/vKJ5kDpgGkmpMjhmw="
|
||||
},
|
||||
{
|
||||
"pname": "Diacritical.Net",
|
||||
@@ -106,13 +106,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "IPAddressRange",
|
||||
"version": "6.2.0",
|
||||
"hash": "sha256-g3brzbKKPZS23cbttpr5CCYoZHm+dvH43/gXLuZYmFg="
|
||||
"version": "6.3.0",
|
||||
"hash": "sha256-RM3Bm07HzaKAMY64JiuJ2xCT399Bhj/Asyv1+o3kdNo="
|
||||
},
|
||||
{
|
||||
"pname": "MailKit",
|
||||
"version": "4.14.0",
|
||||
"hash": "sha256-vAFqKaKvLUUiFbpu1mJdL/W5CIlb6rh3U6ef883g+Bs="
|
||||
"version": "4.16.0",
|
||||
"hash": "sha256-4yyFxq8pJVTIgAJkyAYcuV2+/ZirENgUSk1OSD/gKIo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.ApplicationInsights",
|
||||
@@ -121,29 +121,24 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Cryptography.Internal",
|
||||
"version": "8.0.16",
|
||||
"hash": "sha256-uw/5GAPpefPeMrfG69EBOVciSHxBKs0E8Txkf+rttzs="
|
||||
"version": "8.0.27",
|
||||
"hash": "sha256-3GmpnUmBfk45cWCfkoeN+9ANom7LrJsakZvIT8kIagk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation",
|
||||
"version": "8.0.16",
|
||||
"hash": "sha256-Zpt7vlY0xdrk/6XDRtXb0t9MK6SiPP6sr3fC6gQ1/YQ="
|
||||
"version": "8.0.27",
|
||||
"hash": "sha256-FGqqp3fruL4r1ImEMcDRqvgl+uxkQqngkRRfXhc7EWI="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.WebUtilities",
|
||||
"version": "8.0.16",
|
||||
"hash": "sha256-ly0Ba+RUwjM4QrgW4GfCIYFZS6VEZ3lduHzN88bnHZA="
|
||||
"version": "8.0.27",
|
||||
"hash": "sha256-hf+9v8bC8jUx+O4oq5FPk2QhvuV33BDZen8Gaqk+fb0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.Cryptography",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-p9aO+aVi4Vl8bRsYRFGJyc9Mqd2wkQ12RwWDwBhdt4I="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeCoverage",
|
||||
"version": "17.10.0",
|
||||
@@ -156,8 +151,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Data.SqlClient",
|
||||
"version": "6.1.1",
|
||||
"hash": "sha256-IBVkAipJyF7KO9uid+5QyfVzWEeY/BbQUofKc6zQoW0="
|
||||
"version": "6.1.5",
|
||||
"hash": "sha256-XpGL/oKQWn+FmYNmKB6CMmWbPEuCDX/xdOMqljS0vvs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Data.SqlClient.SNI.runtime",
|
||||
@@ -351,24 +346,24 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Identity.Client",
|
||||
"version": "4.73.1",
|
||||
"hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc="
|
||||
"version": "4.80.0",
|
||||
"hash": "sha256-vtuXCu0ykTYJjvlSSWMjC9EGJQXZ1dqgpaMeD4FmlGQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Identity.Client.Extensions.Msal",
|
||||
"version": "4.73.1",
|
||||
"hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "6.35.0",
|
||||
"hash": "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="
|
||||
"version": "4.78.0",
|
||||
"hash": "sha256-0s9wa8HkFhnzmAz+TGxtA3qTX3dZiIoPcTWGLgY8mAg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "7.7.1",
|
||||
"hash": "sha256-v83O6Gb8s4wGhbRPvOA95t0LSX+MAhF6WpA6qZeK2XM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "8.14.0",
|
||||
"hash": "sha256-bkCuz1Wj56N+LHWLvHKLcCtIRqBK+3k5vD2qfB7xXKk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.JsonWebTokens",
|
||||
"version": "7.7.1",
|
||||
@@ -396,8 +391,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Net.Http.Headers",
|
||||
"version": "8.0.16",
|
||||
"hash": "sha256-6sB9B+GLETiyGhRMyD4U6ZuQpFtCL/oIPQr+9lB4peU="
|
||||
"version": "8.0.27",
|
||||
"hash": "sha256-OBZqkFILqXVYV8QdpNRM2Y2HwFbvWus+46tnRUhw3zQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.Test.Sdk",
|
||||
@@ -496,8 +491,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "MimeKit",
|
||||
"version": "4.14.0",
|
||||
"hash": "sha256-06dqA6w2V2D+miq387smCuJ/8fk1FVc0rvRjmglAWyM="
|
||||
"version": "4.16.0",
|
||||
"hash": "sha256-yWGXVm+EHvBSsZlVHdWdD+rVwdf/5hHxsUfJMSd2Afo="
|
||||
},
|
||||
{
|
||||
"pname": "Mono.Nat",
|
||||
@@ -547,18 +542,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "NLog",
|
||||
"version": "5.4.0",
|
||||
"hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A="
|
||||
"version": "5.5.0",
|
||||
"hash": "sha256-WkuKGo3iEqJruQuRZXMksqIbAQjZbFIANcm0zZr/fYE="
|
||||
},
|
||||
{
|
||||
"pname": "NLog",
|
||||
"version": "5.5.1",
|
||||
"hash": "sha256-cLAAj2QWWhbfh4vgnE/fLq5Rpr3uTe4ufnVWTig0nEo="
|
||||
},
|
||||
{
|
||||
"pname": "NLog.Extensions.Logging",
|
||||
"version": "5.4.0",
|
||||
"hash": "sha256-9pVBguAKnjmbtKM3wBVBEzovXkoEXgqvB4IhiayAkVo="
|
||||
"version": "5.5.0",
|
||||
"hash": "sha256-gdhJP9V5lDHgRS8gpFDgW6CkkLKo+tACCqPvERLaZ68="
|
||||
},
|
||||
{
|
||||
"pname": "NLog.Layouts.ClefJsonLayout",
|
||||
"version": "1.0.3",
|
||||
"hash": "sha256-Rgf3s3Q9TXdzZHwb+VCBupazvmrgAPZcrKGBhV9Jh6Q="
|
||||
"version": "1.0.5",
|
||||
"hash": "sha256-mBHH0OlpW0dCa34jI2xBTg1J7EDfmNJqjdRJOA3khWQ="
|
||||
},
|
||||
{
|
||||
"pname": "NLog.Targets.Syslog",
|
||||
@@ -567,8 +567,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Npgsql",
|
||||
"version": "9.0.3",
|
||||
"hash": "sha256-X3F05GNj3vNVl++VOV5TMYE5dvEe6cx0k+5yWo2Q/+o="
|
||||
"version": "9.0.5",
|
||||
"hash": "sha256-5AF0qiVQwfKUqCXSFb+oJhe3Q1wwK9F9+Q9/A4RTIdo="
|
||||
},
|
||||
{
|
||||
"pname": "NUnit",
|
||||
@@ -587,8 +587,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Polly",
|
||||
"version": "8.6.4",
|
||||
"hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I="
|
||||
"version": "8.6.6",
|
||||
"hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps="
|
||||
},
|
||||
{
|
||||
"pname": "Polly.Contrib.WaitAndRetry",
|
||||
@@ -597,8 +597,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Polly.Core",
|
||||
"version": "8.6.4",
|
||||
"hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I="
|
||||
"version": "8.6.6",
|
||||
"hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU="
|
||||
},
|
||||
{
|
||||
"pname": "RestSharp",
|
||||
@@ -832,8 +832,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "SourceGear.sqlite3",
|
||||
"version": "3.50.4.2",
|
||||
"hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M="
|
||||
"version": "3.50.4.5",
|
||||
"hash": "sha256-yPOyLiK4QoTfE3IED0hFl1JJYjmt8RBB3fp1a1CwvqE="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore.Swagger",
|
||||
@@ -857,8 +857,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.5.1",
|
||||
"hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
|
||||
"version": "1.8.0",
|
||||
"hash": "sha256-ZWVhuw3IRk9rZXkXERhesEET2KMMzHjUH/HDI288WK8="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections",
|
||||
@@ -917,8 +917,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Data.SQLite",
|
||||
"version": "2.0.2",
|
||||
"hash": "sha256-s++mcixhc+QaQKzdXZ6quK8kH5WWWmU0mESZNNuP/ck="
|
||||
"version": "2.0.3",
|
||||
"hash": "sha256-2TzEFt0nJjK1g8Gi5RMII7TOpG4vi9UzvJI3JxuPnKA="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.Debug",
|
||||
@@ -937,8 +937,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.DiagnosticSource",
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.EventLog",
|
||||
@@ -962,8 +962,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Drawing.Common",
|
||||
"version": "8.0.19",
|
||||
"hash": "sha256-KDCdLN8aKxQmQCe8D5iCyZKo2+mhx00tg7CqTILE/v0="
|
||||
"version": "8.0.27",
|
||||
"hash": "sha256-lxN0ZYNBAHdT0x45JuNSJ2L2uBdruqsDCAT4KVrmejs="
|
||||
},
|
||||
{
|
||||
"pname": "System.Dynamic.Runtime",
|
||||
@@ -1140,11 +1140,6 @@
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.Extensions",
|
||||
"version": "4.3.0",
|
||||
@@ -1332,8 +1327,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.ValueTuple",
|
||||
"version": "4.6.1",
|
||||
"hash": "sha256-Hb87MPcNdHQRlREDzFEKU8ZqtKN26bjyAiimJmm6LWI="
|
||||
"version": "4.6.2",
|
||||
"hash": "sha256-dv0ONmorkGVf0V1Vewt5UEGXdINYy1eP4xk/bZe92ao="
|
||||
},
|
||||
{
|
||||
"pname": "System.Xml.ReaderWriter",
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
applyPatches,
|
||||
}:
|
||||
let
|
||||
version = "2.3.5.5327";
|
||||
version = "2.4.0.5397";
|
||||
# The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
|
||||
# the already patched lockfile to `fetchYarnDeps`.
|
||||
src = applyPatches {
|
||||
@@ -28,7 +28,7 @@ let
|
||||
owner = "Prowlarr";
|
||||
repo = "Prowlarr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mHYEY49uczfo0lAaweCmA04dHDxRMFq5lYybKGirlQk=";
|
||||
hash = "sha256-cLFzCPSG0cB2K3KPNrN0zNnmZMEX3olJajNFGxmYoAM=";
|
||||
};
|
||||
postPatch = ''
|
||||
mv src/NuGet.config NuGet.Config
|
||||
@@ -50,7 +50,7 @@ buildDotnetModule {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-FYLfOR5gm9lg1F8RGyDN6MkFAcaxWIdIxd/IDBVUMUQ=";
|
||||
hash = "sha256-PZw+Q7CcHkbb2bhZKSPE0kvPIhWxWQIqr7/UZlPdqtY=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "shikane";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "w0lff";
|
||||
repo = "shikane";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YjHFhGP2A8dQTOmeeBqB2ij3Zgs0n/uuisvWTH8fyfQ=";
|
||||
hash = "sha256-gh85a070R4SooghtvumfSED1H12JtOksj7Yk/WHnWck=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ajmEbE5Y4LkxvYRFE6aBDZxNpGULTmKeu6/k92kWjQg=";
|
||||
cargoHash = "sha256-XKx6jTSAoCC4BM6kmeeEymzRzga15uyIuTxqtdQnru8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -39,13 +39,13 @@ stdenv.mkDerivation {
|
||||
pname = binName;
|
||||
# versions are specified in `squeezelite.h`
|
||||
# see https://github.com/ralph-irving/squeezelite/issues/29
|
||||
version = "2.0.0.1563";
|
||||
version = "2.0.0.1577";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ralph-irving";
|
||||
repo = "squeezelite";
|
||||
rev = "39fe3c8b1dd4e852fd8410bc480d7d709056859d";
|
||||
hash = "sha256-0zBppeMSK/1m4Nxla6wdWeVPDFOUfVCaMKFHZGLqbrE=";
|
||||
rev = "d0d17404467bc18326d9de94eaf3949cf8fb8f59";
|
||||
hash = "sha256-mKMlm6oQdrECckBJ7Et6pehimAWd1z07BQsu1njKA50=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
glib,
|
||||
libx11,
|
||||
cairo,
|
||||
gtk2,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
glib
|
||||
libx11
|
||||
gtk2
|
||||
cairo
|
||||
];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sublimetext";
|
||||
version = "2.0.2";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchurl {
|
||||
name = "sublimetext-${version}.tar.bz2";
|
||||
urls = [
|
||||
"http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2"
|
||||
"https://download.sublimetext.com/Sublime%20Text%20${version}.tar.bz2"
|
||||
];
|
||||
sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
name = "sublimetext-${version}.tar.bz2";
|
||||
urls = [
|
||||
"http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2"
|
||||
"https://download.sublimetext.com/Sublime%20Text%20${version}%20x64.tar.bz2"
|
||||
];
|
||||
sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1";
|
||||
};
|
||||
buildCommand = ''
|
||||
tar xvf ${src}
|
||||
mkdir -p $out/bin
|
||||
mv Sublime* $out/sublime
|
||||
ln -s $out/sublime/sublime_text $out/bin/sublime
|
||||
ln -s $out/sublime/sublime_text $out/bin/sublime2
|
||||
|
||||
echo ${libPath}
|
||||
patchelf \
|
||||
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
|
||||
$out/sublime/sublime_text
|
||||
|
||||
mkdir -p $out/share/icons
|
||||
|
||||
for x in $(ls $out/sublime/Icon); do
|
||||
mkdir -p $out/share/icons/hicolor/$x/apps
|
||||
cp -v $out/sublime/Icon/$x/* $out/share/icons/hicolor/$x/apps
|
||||
done
|
||||
|
||||
ln -sv "${desktopItem}/share/applications" $out/share
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "sublime2";
|
||||
exec = "sublime2 %F";
|
||||
comment = meta.description;
|
||||
desktopName = "Sublime Text";
|
||||
genericName = "Text Editor";
|
||||
categories = [
|
||||
"TextEditor"
|
||||
"Development"
|
||||
];
|
||||
icon = "sublime_text";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Sophisticated text editor for code, markup and prose";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
glibcLocales,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "topydo";
|
||||
version = "0.16";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "topydo";
|
||||
@@ -17,7 +17,17 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
hash = "sha256-f31tp4VBMv1usViYN50IaGeyQpo3oRSf/WDz99UEpss=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
postPatch = ''
|
||||
# Strip deprecated pytest-runner from pyproject.toml build requirements
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'requires = ["setuptools", "wheel", "pytest-runner"]' 'requires = ["setuptools", "wheel"]'
|
||||
'';
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
arrow
|
||||
glibcLocales
|
||||
icalendar
|
||||
@@ -26,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
watchdog
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
freezegun
|
||||
unittestCheckHook
|
||||
];
|
||||
@@ -43,7 +53,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
description = "Cli todo application compatible with the todo.txt format";
|
||||
mainProgram = "topydo";
|
||||
homepage = "https://github.com/topydo/topydo";
|
||||
changelog = "https://github.com/topydo/topydo/blob/${finalAttrs.src.rev}/CHANGES.md";
|
||||
changelog = "https://github.com/topydo/topydo/blob/${finalAttrs.src.tag}/CHANGES.md";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://github.com/elasticdog/transcrypt";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.elasticdog ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,20 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "trivy";
|
||||
# As of March 2026, trivy has made compromised releases twice.
|
||||
# At a minimum, before updating, check the diff of this package, and of all
|
||||
# dependencies/GitHub Actions changes, carefully.
|
||||
# Also read about how the previous compromises occurred, and ensure
|
||||
# that the signs present then are not present now.
|
||||
# Finally, weigh the risk of a compromised release against the expected
|
||||
# benefit of the update, and consider the possibility of not updating.
|
||||
version = "0.71.0"; # Did you read the comment?
|
||||
version = "0.71.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = "trivy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wlvG8iGPBbHV66SOT0zek2VN1QawksVQwM9LSEItzh4=";
|
||||
hash = "sha256-4/fEc+71i5+biOtywFkwePvKoZkWK1yBWZa/Wg58E5U=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
@@ -35,7 +28,6 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
version = "202606122311";
|
||||
|
||||
geoipDat = fetchurl {
|
||||
url = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/download/${version}/geoip.dat";
|
||||
hash = "sha256-iGGpeUaWtIH7AEPueCssQOgL/Ia7nkLFvWnAj1SDsbU=";
|
||||
};
|
||||
|
||||
geositeDat = fetchurl {
|
||||
url = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/download/${version}/geosite.dat";
|
||||
hash = "sha256-/c/3OjfALveNnHS9NxonTeOiZyud6U/X4WHrGZSOs7Q=";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "v2ray-rules-dat";
|
||||
inherit version;
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm444 ${geoipDat} $out/share/v2ray/geoip.dat
|
||||
install -Dm444 ${geositeDat} $out/share/v2ray/geosite.dat
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Enhanced edition of V2Ray rules dat files";
|
||||
homepage = "https://github.com/Loyalsoldier/v2ray-rules-dat";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ nix-julia ];
|
||||
};
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vale";
|
||||
version = "3.14.2";
|
||||
version = "3.15.1";
|
||||
|
||||
subPackages = [ "cmd/vale" ];
|
||||
|
||||
@@ -19,10 +19,10 @@ buildGoModule rec {
|
||||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cjJ1LDTIaEJaaQigcofi+CfsSVWf3IRsUmxh/T9W7ec=";
|
||||
hash = "sha256-zp3yEFtYOMsPh6WqIzDnBSvO4mPAcysPkGSnsM44Z9U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Nu0Sof5Aek754dNo/jXI1cv6G2k1tNBIigIT82iGAzk=";
|
||||
vendorHash = "sha256-OOatkx5c+0VCT1+M/Ra60Ujy/djgQd1f3SIYoh9Mesg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,14 +7,16 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
version = "1.4";
|
||||
format = "setuptools";
|
||||
pname = "wikicurses";
|
||||
pyproject = true;
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ids1024";
|
||||
repo = "wikicurses";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1U7RkW31IRbn0JKiJozu4q9aFhkMGGJ3ybfg0THRJDg=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -26,7 +28,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
dependencies = with python3Packages; [
|
||||
urwid
|
||||
beautifulsoup4
|
||||
lxml
|
||||
|
||||
@@ -39,7 +39,7 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-yggdhokSX6H5jZJDawdZ4wft01CTrX6ufDkoyDy3qd4=";
|
||||
x86_64-linux = "sha256-D1k/oq7Enw/arBUrPIfXpnPlKKqzj+stfIIwSdfuiYY=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -48,7 +48,7 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "23.3";
|
||||
version = "23.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
||||
@@ -54,6 +54,13 @@ python3Packages.buildPythonApplication rec {
|
||||
''}
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
"doc"
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -137,7 +144,7 @@ python3Packages.buildPythonApplication rec {
|
||||
--fish completions/fish/yt-dlp.fish \
|
||||
--zsh completions/zsh/_yt-dlp
|
||||
|
||||
install -Dm644 Changelog.md README.md -t "$out/share/doc/yt_dlp"
|
||||
install -Dm644 Changelog.md README.md -t "$doc/share/doc/yt_dlp"
|
||||
''
|
||||
+ lib.optionalString withAlias ''
|
||||
ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "python314-docs-html";
|
||||
version = "3.14";
|
||||
version = "3.14.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://docs.python.org/3.14/archives/python-3.14-docs-html.tar.bz2";
|
||||
sha256 = "0igikxq71zqyps8swfib4rwfi81vgvi4fdc6j4sz3x1981nh4j3v";
|
||||
url = "https://www.python.org/ftp/python/doc/3.14.6/python-3.14.6-docs-html.tar.bz2";
|
||||
sha256 = "0hm49y5di6zxka8425q6ksw2psfzcn9mmgjq2k5x86w3x47k0jrh";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python314
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
# This file was generated and will be overwritten by ./generate.sh
|
||||
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "python314-docs-pdf-a4";
|
||||
version = "3.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://docs.python.org/3.14/archives/python-3.14-docs-pdf-a4.tar.bz2";
|
||||
sha256 = "0nb69h3wz2vixf80alh9x8fafz3ipq2hdrxccj8vp8vvrcqna75y";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python314
|
||||
cp -R ./ $out/share/doc/python314/pdf-a4
|
||||
'';
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
panicgh
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "python314-docs-texinfo";
|
||||
version = "3.14";
|
||||
version = "3.14.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://docs.python.org/3.14/archives/python-3.14-docs-texinfo.tar.bz2";
|
||||
sha256 = "0r89zg2dzh90iv3qff9rx0ckfsds8hin5z53ai31cchxhglg4b8s";
|
||||
url = "https://www.python.org/ftp/python/doc/3.14.6/python-3.14.6-docs-texinfo.tar.bz2";
|
||||
sha256 = "0nwdvgnxs6sik0d1kkl6fnnhxrvmj356i92abp84i33d4dy6i9hw";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/info
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "python314-docs-text";
|
||||
version = "3.14";
|
||||
version = "3.14.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://docs.python.org/3.14/archives/python-3.14-docs-text.tar.bz2";
|
||||
sha256 = "1w8zl9pymsfviiw7iqz86liwnvfh1093syk3vkpvsdmvsa9acwyf";
|
||||
url = "https://www.python.org/ftp/python/doc/3.14.6/python-3.14.6-docs-text.tar.bz2";
|
||||
sha256 = "0flqq4k9fq948gb3zim04znyxr21pfv8i4mrhh3qwna13fh897zg";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python314
|
||||
|
||||
@@ -12,12 +12,6 @@ let
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
};
|
||||
pdf_a4 = {
|
||||
recurseForDerivations = true;
|
||||
python314 = import ./3.14-pdf-a4.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
};
|
||||
text = {
|
||||
recurseForDerivations = true;
|
||||
python314 = import ./3.14-text.nix {
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
|
||||
|
||||
TYPES="html pdf-a4 text texinfo"
|
||||
URL=https://docs.python.org/VERSION/archives/python-VERSION-docs-TYPE.tar.bz2
|
||||
VERSIONS=$(for major in 3; do curl https://docs.python.org/$major/archives/ 2>/dev/null | perl -l -n -e'/<a href="python-([23].[0-9]+(.[0-9]+)?)-docs-html.tar.bz2/ && print $1' | tail -n 1; done)
|
||||
TYPES="html text texinfo"
|
||||
URL=https://www.python.org/ftp/python/doc/VERSION/python-VERSION-docs-TYPE.tar.bz2
|
||||
VERSIONS=$(curl https://www.python.org/ftp/python/doc/ 2>/dev/null | perl -l -n -e'/<a href="([3].[0-9]+.[0-9]+)\// && print $1' | sort --version-sort | tail -n 1)
|
||||
echo "Generating expressions for:
|
||||
${VERSIONS}
|
||||
"
|
||||
|
||||
@@ -392,7 +392,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.pypy.org/";
|
||||
changelog = "https://doc.pypy.org/release-v${version}.html";
|
||||
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
|
||||
mainProgram = "pypy";
|
||||
mainProgram = executable;
|
||||
license = lib.licenses.mit;
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# propagatedBuildInputs,
|
||||
charon,
|
||||
core_unix,
|
||||
domainslib,
|
||||
ocamlgraph,
|
||||
progress,
|
||||
visitors,
|
||||
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "aeneas";
|
||||
version = "2026.06.12";
|
||||
__structuredAttrs = true;
|
||||
|
||||
minimalOCamlVersion = "5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AeneasVerif";
|
||||
repo = "aeneas";
|
||||
tag = "nightly-${finalAttrs.version}";
|
||||
hash = "sha256-loTnCy4lNJki+dSShZ35jKyOWIh1XcPwN7oY7CyFa04=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
charon
|
||||
core_unix
|
||||
domainslib
|
||||
ocamlgraph
|
||||
progress
|
||||
visitors
|
||||
];
|
||||
|
||||
# The test suite consists of heavy integration tests that require the full
|
||||
# toolchain (Rust, charon and the F*/Coq/Lean backends), so it is not run here.
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=unstable" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Verification toolchain for Rust programs";
|
||||
homepage = "https://github.com/AeneasVerif/aeneas";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
mainProgram = "aeneas";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# propagatedBuildInputs,
|
||||
easy_logging,
|
||||
name_matcher_parser,
|
||||
ppx_deriving,
|
||||
unionFind,
|
||||
visitors,
|
||||
yojson,
|
||||
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "charon";
|
||||
version = "2026.06.12";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AeneasVerif";
|
||||
repo = "charon";
|
||||
tag = "nightly-${finalAttrs.version}";
|
||||
hash = "sha256-XCNDFJ8HakRBQ68rWB29R5RF7zhmqmNMna098SvXDE0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
easy_logging
|
||||
name_matcher_parser
|
||||
ppx_deriving
|
||||
unionFind
|
||||
visitors
|
||||
yojson
|
||||
];
|
||||
|
||||
# The charon-ml test suite requires pre-generated `.llbc` fixtures produced by
|
||||
# running the (Rust) charon binary, which are not part of the OCaml source
|
||||
# distribution, so the tests cannot run here.
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=unstable" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Analyze Rust crates without touching compiler internals";
|
||||
homepage = "https://github.com/AeneasVerif/charon";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# propagatedBuildInputs,
|
||||
calendar,
|
||||
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "easy_logging";
|
||||
version = "0.8.2";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sapristi";
|
||||
repo = "easy_logging";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Xy6Rfef7r2K8DTok7AYa/9m3ZEV07LlUeMQSRayLBco=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
calendar
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Only run the tests for the `easy_logging` package itself.
|
||||
# The other directories belong to the separate `easy_logging_yojson` package, which is not built
|
||||
# here and pulls in additional dependencies.
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
dune runtest easy_logging ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Logging module for OCaml";
|
||||
homepage = "https://github.com/sapristi/easy_logging";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
charon,
|
||||
|
||||
# nativeBuildInputs,
|
||||
menhir,
|
||||
|
||||
# propagatedBuildInputs,
|
||||
menhirLib,
|
||||
ppx_deriving,
|
||||
visitors,
|
||||
zarith,
|
||||
}:
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "name_matcher_parser";
|
||||
inherit (charon) version;
|
||||
__structuredAttrs = true;
|
||||
|
||||
inherit (charon) src;
|
||||
|
||||
nativeBuildInputs = [ menhir ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
menhirLib
|
||||
ppx_deriving
|
||||
visitors
|
||||
zarith
|
||||
];
|
||||
|
||||
# No test suite is defined for this package.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Parser to define name matchers";
|
||||
homepage = "https://github.com/AeneasVerif/charon";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
buildPythonPackage,
|
||||
|
||||
# build-system
|
||||
@@ -20,17 +21,26 @@
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "beets-filetote";
|
||||
version = "1.1.1";
|
||||
version = "1.3.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gtronset";
|
||||
repo = "beets-filetote";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NsYBsP60SiCfQ63C4WMkshyreFqOSmx3LP5Gwq6ECF0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qMHjcBrXkVG7U5a1E0yRwNgmg7XinRnK3gnV7jAZLTk=";
|
||||
};
|
||||
# needed to keep beetsplug a namespace package, othwise other plugins will not be found
|
||||
# can be removed with next version
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/gtronset/beets-filetote/commit/762cf0c4b60b8f6b38cf39b027de4241f12cef37.patch?full_index=1";
|
||||
hash = "sha256-c7qIECcqwoV4ZOaA/8JYsM6Aym34peWPh7ZLWUxIYSI=";
|
||||
excludes = [ "CHANGELOG.md" ];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml --replace-fail "poetry-core<2.0.0" "poetry-core"
|
||||
@@ -67,20 +77,15 @@ buildPythonPackage rec {
|
||||
"-rfEs"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_cli_operation.py"
|
||||
"tests/test_pruning.py"
|
||||
"tests/test_version.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Beets plugin to move non-music files during the import process";
|
||||
homepage = "https://github.com/gtronset/beets-filetote";
|
||||
changelog = "https://github.com/gtronset/beets-filetote/blob/${src.tag}/CHANGELOG.md";
|
||||
maintainers = with lib.maintainers; [ dansbandit ];
|
||||
changelog = "https://github.com/gtronset/beets-filetote/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
maintainers = with lib.maintainers; [
|
||||
dansbandit
|
||||
returntoreality
|
||||
];
|
||||
license = lib.licenses.mit;
|
||||
inherit (beets-minimal.meta) platforms;
|
||||
# https://github.com/gtronset/beets-filetote/issues/211
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -358,13 +358,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.43.28";
|
||||
version = "1.43.29";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-G4JqUi5Hf70SFprLaFH3mamHmGNEHKhfbBFmvNRx5Fs=";
|
||||
hash = "sha256-TXgp7KEfAqZS1ys1P72BpRkq5V2fdCW4HRAqUfAdjlg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
cryptography,
|
||||
fastapi,
|
||||
httpx,
|
||||
litestar,
|
||||
proxy-py,
|
||||
pytest-asyncio,
|
||||
pytest-trio,
|
||||
@@ -23,14 +24,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "curl-cffi";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lexiforest";
|
||||
repo = "curl_cffi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5Q9oHAOjefihxj6xU1UGVTl6Ib31XqhrxLtOgI5VABs=";
|
||||
hash = "sha256-I8rQj28IvLD7HWuog46E0dLFgnWSA6oE4Jyn9Flr7mQ=";
|
||||
};
|
||||
|
||||
patches = [ ./use-system-libs.patch ];
|
||||
@@ -55,6 +56,7 @@ buildPythonPackage rec {
|
||||
cryptography
|
||||
fastapi
|
||||
httpx
|
||||
litestar
|
||||
proxy-py
|
||||
pytest-asyncio
|
||||
pytest-trio
|
||||
|
||||
@@ -1,21 +1,38 @@
|
||||
--- a/scripts/build.py
|
||||
+++ b/scripts/build.py
|
||||
@@ -141,7 +141,6 @@ def get_curl_libraries():
|
||||
@@ -122,27 +122,8 @@ def get_curl_libraries():
|
||||
ffibuilder = FFI()
|
||||
system = platform.system()
|
||||
root_dir = Path(__file__).parent.parent
|
||||
-download_libcurl()
|
||||
|
||||
-
|
||||
-# With mega archive, we only have one to link
|
||||
-static_libs = get_curl_archives()
|
||||
extra_link_args = []
|
||||
-if is_static:
|
||||
- if system == "Darwin":
|
||||
- extra_link_args = [
|
||||
- f"-Wl,-force_load,{static_libs[0]}",
|
||||
- "-lc++",
|
||||
- ]
|
||||
- elif system in ("Linux", "Android"):
|
||||
- cxx_lib = "-lc++" if is_android else "-lstdc++"
|
||||
- extra_link_args = [
|
||||
- "-Wl,--whole-archive",
|
||||
- static_libs[0],
|
||||
- "-Wl,--no-whole-archive",
|
||||
- cxx_lib,
|
||||
- ]
|
||||
-
|
||||
-libraries = get_curl_libraries()
|
||||
+libraries = ["curl-impersonate"]
|
||||
|
||||
ffibuilder.set_source(
|
||||
@@ -150,9 +149,7 @@ ffibuilder.set_source(
|
||||
#include "shim.h"
|
||||
"curl_cffi._wrapper",
|
||||
@@ -160,7 +132,7 @@ ffibuilder.set_source(
|
||||
""",
|
||||
# FIXME from `curl-impersonate`
|
||||
library_dirs=[str(libdir)],
|
||||
- libraries=get_curl_libraries(),
|
||||
- extra_objects=get_curl_archives(),
|
||||
- library_dirs=[arch["libdir"]],
|
||||
+ libraries=["curl-impersonate"],
|
||||
+ libraries=libraries,
|
||||
extra_objects=[], # linked via extra_link_args
|
||||
source_extension=".c",
|
||||
include_dirs=[
|
||||
str(root_dir / "include"),
|
||||
|
||||
@@ -25,19 +25,19 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "dulwich";
|
||||
version = "1.2.1";
|
||||
version = "1.2.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jelmer";
|
||||
repo = "dulwich";
|
||||
tag = "dulwich-${finalAttrs.version}";
|
||||
hash = "sha256-pyBAN1zSYGrOg4tic/SiKROHHUlFMtBSF0OOVNVvkyM=";
|
||||
hash = "sha256-nj20g5OmlcqWDaKv3NoKWZS5/e4HOMCf7DHeS7xDzjQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-U5X/D3iVg2qunji8HQbNeDzvYMoD4oRe5bL6l035lO0=";
|
||||
hash = "sha256-wifh/beg3VVQpAXg/P/tq6qiUwCqXxhWPoRvX2HcFOc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
jamo,
|
||||
nltk,
|
||||
}:
|
||||
@@ -9,14 +10,20 @@
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "g2pkk";
|
||||
version = "0.1.2";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-YarV1Btn1x3Sm4Vw/JDSyJy3ZJMXAQHZJJJklSG0R+Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
jamo
|
||||
nltk
|
||||
];
|
||||
|
||||
@@ -40,6 +40,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/Z4kSec/Masky";
|
||||
changelog = "https://github.com/Z4kSec/Masky/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ elasticdog ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,43 +10,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# save for overriding it
|
||||
python' = python;
|
||||
in
|
||||
let
|
||||
python = python'.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
# SQLAlchemy>=1,<1.4
|
||||
# SQLAlchemy 2.0's derivation is very different, so don't override, just write it from scratch
|
||||
# (see https://github.com/NixOS/nixpkgs/blob/65dbed73949e4c0207e75dcc7271b29f9e457670/pkgs/development/python-modules/sqlalchemy/default.nix)
|
||||
sqlalchemy = final.buildPythonPackage rec {
|
||||
pname = "SQLAlchemy";
|
||||
version = "1.3.24";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
sed -e 's:--max-worker-restart=5::g' -i setup.cfg
|
||||
'';
|
||||
|
||||
# tests are pretty annoying to set up for this version, and these dependency overrides are already long enough
|
||||
doCheck = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
maubot = python.pkgs.buildPythonPackage rec {
|
||||
maubot = python.pkgs.buildPythonPackage (finalAttrs: {
|
||||
pname = "maubot";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-ZXwyctTjKg1ssYE6Ehc1s1DPhWyc08dIQ4MQz6EQXGg=";
|
||||
};
|
||||
|
||||
@@ -58,7 +28,11 @@ let
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs =
|
||||
build-system = with python.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies =
|
||||
with python.pkgs;
|
||||
[
|
||||
# requirements.txt
|
||||
@@ -76,7 +50,6 @@ let
|
||||
colorama
|
||||
questionary
|
||||
jinja2
|
||||
setuptools
|
||||
]
|
||||
# optional-requirements.txt
|
||||
++ lib.optionals encryptionSupport [
|
||||
@@ -85,7 +58,7 @@ let
|
||||
unpaddedbase64
|
||||
]
|
||||
++ lib.optionals sqliteSupport [
|
||||
sqlalchemy
|
||||
sqlalchemy_1_3
|
||||
];
|
||||
|
||||
# used for plugin tests
|
||||
@@ -98,6 +71,11 @@ let
|
||||
rm $out/example-config.yaml
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"bcrypt"
|
||||
"ruamel.yaml"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"maubot"
|
||||
];
|
||||
@@ -111,7 +89,7 @@ let
|
||||
in
|
||||
{
|
||||
tests = {
|
||||
simple = runCommand "${pname}-tests" { } ''
|
||||
simple = runCommand "${finalAttrs.pname}-tests" { } ''
|
||||
${maubot}/bin/mbc --help > $out
|
||||
'';
|
||||
};
|
||||
@@ -135,7 +113,7 @@ let
|
||||
meta = {
|
||||
description = "Plugin-based Matrix bot system written in Python";
|
||||
homepage = "https://maubot.xyz/";
|
||||
changelog = "https://github.com/maubot/maubot/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/maubot/maubot/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
# Presumably, people running "nix run nixpkgs#maubot" will want to run the tool
|
||||
# for interacting with Maubot rather than Maubot itself, which should be used as
|
||||
@@ -143,7 +121,7 @@ let
|
||||
mainProgram = "mbc";
|
||||
maintainers = with lib.maintainers; [ chayleaf ];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
maubot
|
||||
|
||||
@@ -51,8 +51,8 @@ in
|
||||
"sha256-KNFTnweHO/8xVFHLcjBP0USqBQfc5BQjj+JBEGlM7kI=";
|
||||
|
||||
mypy-boto3-acm =
|
||||
buildMypyBoto3Package "acm" "1.43.0"
|
||||
"sha256-GGKJP2yX4n6n0+K/LmSSNbpeb9e7b194L9pg7yO3WAk=";
|
||||
buildMypyBoto3Package "acm" "1.43.29"
|
||||
"sha256-vZdnq48mhv+8MGFL+X3Q5x7TUT8JH1rKNjvK1tlo0g8=";
|
||||
|
||||
mypy-boto3-acm-pca =
|
||||
buildMypyBoto3Package "acm-pca" "1.43.0"
|
||||
@@ -467,8 +467,8 @@ in
|
||||
"sha256-11KpPRxGId76g/I4jXwMQ55kwGEQVsasgvMUXsiLbM4=";
|
||||
|
||||
mypy-boto3-eks =
|
||||
buildMypyBoto3Package "eks" "1.43.28"
|
||||
"sha256-+mB3Dz5wx0uP8LPGZdJOGkjebCAYNPfEHhHybT1Pk98=";
|
||||
buildMypyBoto3Package "eks" "1.43.29"
|
||||
"sha256-gQdBnUEwhso0BNY2UW2sU45cz75K1bS9gSX5vrIET2A=";
|
||||
|
||||
mypy-boto3-elastic-inference =
|
||||
buildMypyBoto3Package "elastic-inference" "1.36.0"
|
||||
@@ -531,8 +531,8 @@ in
|
||||
"sha256-bPKKphp64m4s7ceo0ypSfyqY/AGzqFkIWQksqDIRLSM=";
|
||||
|
||||
mypy-boto3-firehose =
|
||||
buildMypyBoto3Package "firehose" "1.43.0"
|
||||
"sha256-3y8ubLM+XkcUxBxNt5QUocBDLvzVaAY73pqXfCSr1mc=";
|
||||
buildMypyBoto3Package "firehose" "1.43.29"
|
||||
"sha256-TSU71JWgQCd1INc/OtAtCkMzt1V8L75GRWEx630KfPI=";
|
||||
|
||||
mypy-boto3-fis =
|
||||
buildMypyBoto3Package "fis" "1.43.0"
|
||||
@@ -571,8 +571,8 @@ in
|
||||
"sha256-vMz4YKm78XMavlPUNiSVAYmAbyUBrJhUXbFrhxIvUJA=";
|
||||
|
||||
mypy-boto3-glue =
|
||||
buildMypyBoto3Package "glue" "1.43.23"
|
||||
"sha256-ED9eubovJzwvZIRr5P1CS9UmEgFf+rRMI6LoYqENPeM=";
|
||||
buildMypyBoto3Package "glue" "1.43.29"
|
||||
"sha256-y9RO80gAmBTVUy/QHeWfGcIVMsoZjC6UuZPA3Br1n/I=";
|
||||
mypy-boto3-grafana =
|
||||
buildMypyBoto3Package "grafana" "1.43.11"
|
||||
"sha256-XJOSLyL1+uEweZ9zER7IhH3DFLaLtpJKvuRIn8Ri+P4=";
|
||||
@@ -602,8 +602,8 @@ in
|
||||
"sha256-qRmvgKIela1k38muCLMKrGbFWiOjapQPS0oXQ2mPU+s=";
|
||||
|
||||
mypy-boto3-iam =
|
||||
buildMypyBoto3Package "iam" "1.43.2"
|
||||
"sha256-uwMlq15hxaRid1n/6fpvv00icUbwtIWFVfegKJYi9Qo=";
|
||||
buildMypyBoto3Package "iam" "1.43.29"
|
||||
"sha256-kcinFHd0QJt3ELvYR4xm4o1j6NZ+hzfHA0pZHgDvCUA=";
|
||||
|
||||
mypy-boto3-identitystore =
|
||||
buildMypyBoto3Package "identitystore" "1.43.0"
|
||||
@@ -1194,8 +1194,8 @@ in
|
||||
"sha256-OxrliFuV8nojK9YroUDbJAUt1eECaLeW/Nnww0+iU5g=";
|
||||
|
||||
mypy-boto3-sagemaker-runtime =
|
||||
buildMypyBoto3Package "sagemaker-runtime" "1.43.0"
|
||||
"sha256-Z1RCFA6/um97HHZodIDXoeubMlI4DAlOi++JJq6nP4Y=";
|
||||
buildMypyBoto3Package "sagemaker-runtime" "1.43.29"
|
||||
"sha256-Nou8wjJC8QYCAMD/AlsQYIfWt9qO9ysT3RRJKoQGevY=";
|
||||
|
||||
mypy-boto3-savingsplans =
|
||||
buildMypyBoto3Package "savingsplans" "1.43.0"
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "plotnine";
|
||||
version = "0.15.6";
|
||||
version = "0.15.7";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "has2k1";
|
||||
repo = "plotnine";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5/1LV5MvqXZZiXxp1HnUb665kaRPfaiLH750iovoH4g=";
|
||||
hash = "sha256-7yM7NeUqaZvp/UUXbfpFb1V+9Z0Gz3MUBq1JydJeyDE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
-4278
File diff suppressed because it is too large
Load Diff
@@ -14,6 +14,8 @@ buildPythonPackage (finalAttrs: {
|
||||
version = "1.3.1";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deedy5";
|
||||
repo = "primp";
|
||||
@@ -21,14 +23,13 @@ buildPythonPackage (finalAttrs: {
|
||||
hash = "sha256-VNb/U68NXmfH7eY8JOEk0z2yOUD4R/kFI1IShWS0pU4=";
|
||||
};
|
||||
|
||||
# The Cargo.lock is not pushed upstream
|
||||
cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
buildAndTestSubdir = "crates/primp-python";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-fnOCsxR0/6AnVO7n2M92WIA6kbyOkI6fwQh5QLnsxSc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
rustPlatform.cargoSetupHook
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
attrs,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
future,
|
||||
python-dateutil,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
@@ -12,23 +11,22 @@
|
||||
sphinx-rtd-theme,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "py-tes";
|
||||
version = "1.1.2";
|
||||
version = "1.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ohsu-comp-bio";
|
||||
repo = "py-tes";
|
||||
tag = version;
|
||||
hash = "sha256-hZF4koc/nZ8rBYKfhIQCLtn4DKiljJrSBgkKX8bMoQ0=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/xgycSDFp17rPzC6ICf4e+vrIKWYPftDngx/u1/KHWk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
attrs
|
||||
future
|
||||
python-dateutil
|
||||
requests
|
||||
sphinx-rtd-theme
|
||||
@@ -49,8 +47,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python SDK for the GA4GH Task Execution API";
|
||||
homepage = "https://github.com/ohsu-comp-bio/py-tes";
|
||||
changelog = "https://github.com/ohsu-comp-bio/py-tes/releases/tag/${version}";
|
||||
changelog = "https://github.com/ohsu-comp-bio/py-tes/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -45,14 +45,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "pymdown-extensions";
|
||||
version = "10.21.2";
|
||||
version = "10.21.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facelessuser";
|
||||
repo = "pymdown-extensions";
|
||||
tag = version;
|
||||
hash = "sha256-BKnrq8m+xQYZs6V+x+3al7yS8531UvvaC4V+ny+f+Qg=";
|
||||
hash = "sha256-hu9fXjZxlris3AhPS7bz3kcSyQtSeh0B6ZAZBsCO4+g=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pytensor";
|
||||
version = "3.0.3";
|
||||
version = "3.0.5";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -44,7 +44,7 @@ buildPythonPackage (finalAttrs: {
|
||||
postFetch = ''
|
||||
sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' $out/pytensor/_version.py
|
||||
'';
|
||||
hash = "sha256-j4fD2pS5po2XKgo4SuLO1wuUeULubqnGhhWVsbhvrOw=";
|
||||
hash = "sha256-99AjktuPPn55ZLPKCv4qdE1lgy9p+NBuaq0vZMVhC50=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-discovery";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "tox-dev";
|
||||
repo = "python-discovery";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-S6C4/4+mK8xj4TIAphI9jlpdQlE90q2brxeEPU4H85g=";
|
||||
hash = "sha256-xnQWXXStdgu99riKFW4+O7tqYL4w5f7etjC872q/LWc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -51,7 +51,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/diyan/pywinrm/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
elasticdog
|
||||
kamadorueda
|
||||
];
|
||||
};
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyworxcloud";
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MTrab";
|
||||
repo = "pyworxcloud";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-r3v9cGr3ko/ALkM56mKsPUoUv+r5hmX5hflNdyKol58=";
|
||||
hash = "sha256-ouyR0BNUqu8ywSfzfjd3oIXPxVHcyXumFYthsPk+4i4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "awsiotsdk" ];
|
||||
|
||||
@@ -2,35 +2,36 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyxbe";
|
||||
version = "1.0.3";
|
||||
format = "setuptools";
|
||||
version = "1.0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mborgerson";
|
||||
repo = "pyxbe";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iLzGGgizUbaEG1xrNq4WDaWrGtcaLwAYgn4NGYiSDBo=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MtkY4vwPvlYoS4ws8MzIFR8D6ORVqFXA0JvOEspzmtQ=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Update location for run with pytest
|
||||
preCheck = ''
|
||||
substituteInPlace tests/test_load.py \
|
||||
--replace '"xbefiles"' '"tests/xbefiles"'
|
||||
'';
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "xbe" ];
|
||||
|
||||
meta = {
|
||||
description = "Library to work with XBE files";
|
||||
homepage = "https://github.com/mborgerson/pyxbe";
|
||||
license = with lib.licenses; [ mit ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/requests/requests-ntlm";
|
||||
changelog = "https://github.com/requests/requests-ntlm/releases/tag/v${version}";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ elasticdog ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
pytest-cov-stub,
|
||||
scikit-learn,
|
||||
scipy,
|
||||
|
||||
nix-update-script,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "scalib";
|
||||
@@ -29,6 +31,10 @@ buildPythonPackage (finalAttrs: {
|
||||
hash = "sha256-DVXb93W0TmOcyGyMN5GmIJNAdbLeeFnNm+3QfTw2j5s=";
|
||||
};
|
||||
|
||||
env = {
|
||||
SCALIB_PORTABLE = "1";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"setuptools-scm-git-archive",' ""
|
||||
@@ -70,6 +76,8 @@ buildPythonPackage (finalAttrs: {
|
||||
numpy
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Side-Channel Analysis Library";
|
||||
homepage = "https://github.com/simple-crypto/scalib";
|
||||
|
||||
@@ -6,23 +6,21 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "sonos-websocket";
|
||||
version = "0.1.3";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jjlawren";
|
||||
repo = "sonos-websocket";
|
||||
tag = version;
|
||||
hash = "sha256-1sgYLwIW7VWnHJGsfIQ95AGZ5j/DPMKQr5n7F+/MsuY=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Yf6osDW7+PYalj3bK7+wF2RotCVlcLJD1ulqLcxrdMU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
];
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
@@ -32,8 +30,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Library to communicate with Sonos devices over websockets";
|
||||
homepage = "https://github.com/jjlawren/sonos-websocket";
|
||||
changelog = "https://github.com/jjlawren/sonos-websocket/releases/tag/${version}";
|
||||
changelog = "https://github.com/jjlawren/sonos-websocket/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -13,15 +13,17 @@
|
||||
beautifulsoup4,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "stravaweblib";
|
||||
version = "0.0.10";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pR0Ps";
|
||||
repo = "stravaweblib";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hsXrU7Rad3LzF58GwlgET98911XjTKztFFNqiUSw278=";
|
||||
};
|
||||
|
||||
@@ -35,6 +37,10 @@ buildPythonPackage rec {
|
||||
beautifulsoup4
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"stravalib"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "stravaweblib" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
@@ -45,4 +51,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ stv0g ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,21 +2,28 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "syslog-rfc5424-formatter";
|
||||
version = "1.2.3";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "easypost";
|
||||
repo = "syslog-rfc5424-formatter";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0=";
|
||||
};
|
||||
|
||||
# Tests are not picked up, review later again
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# Tests depend on syslog_rfc5424_parser, which we don't package
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "syslog_rfc5424_formatter" ];
|
||||
@@ -24,7 +31,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python logging formatter for emitting RFC5424 Syslog messages";
|
||||
homepage = "https://github.com/easypost/syslog-rfc5424-formatter";
|
||||
changelog = "https://github.com/EasyPost/syslog-rfc5424-formatter/blob/v${finalAttrs.version}/CHANGES.md";
|
||||
license = with lib.licenses; [ isc ];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "troposphere";
|
||||
version = "4.10.1";
|
||||
version = "4.10.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudtools";
|
||||
repo = "troposphere";
|
||||
tag = version;
|
||||
hash = "sha256-Pna5L2uO8KRN0L1XXRdFNWlPwNW9lAfcGwKiyK3ihgE=";
|
||||
hash = "sha256-o8Wq1kRBg4yFozQo02jlR5huBtpuLGZLTkLG5LuoI8s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cfn-flip ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "types-awscrt";
|
||||
version = "0.33.0";
|
||||
version = "0.34.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_awscrt";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-gDvH5+L2FyoKvXHfZZM2j4L8IxJ8oV0ofzYOn8vTqXc=";
|
||||
hash = "sha256-VZqgQlD2pBmmF9+3iPPhCQOq90cA7yPlIbZKQRuDuAM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,24 +2,31 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "zxcvbn";
|
||||
version = "4.5.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
# no tests included in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "dwolfhub";
|
||||
repo = "zxcvbn-python";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0SVJkJMEMnZVMpamDVP02kMwWRSj5zGlrMYG9kn0aXQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "zxcvbn" ];
|
||||
|
||||
meta = {
|
||||
description = "Python implementation of Dropbox's realistic password strength estimator";
|
||||
mainProgram = "zxcvbn";
|
||||
@@ -27,4 +34,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -571,6 +571,7 @@ mapAliases {
|
||||
crabfit-api = throw "'crabfit-api' has been removed because it is unmaintained upstream and insecure."; # Added 2025-11-29
|
||||
crabfit-frontend = throw "'crabfit-frontend' has been removed because it is unmaintained upstream and it is to be used with 'crabfit-api', which is insecure."; # Added 2025-11-29
|
||||
create-cycle-app = throw "'create-cycle-app' has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01
|
||||
credslayer = throw "'credslayer' has been removed as it was broken for 2 years"; # Added 2026-05-20
|
||||
cringify = throw "'cringify' has been removed as it is unmaintained"; # Added 2025-12-16
|
||||
crispyDoom = throw "'crispyDoom' has been renamed to/replaced by 'crispy-doom'"; # Converted to throw 2025-10-27
|
||||
critcl = throw "'critcl' has been renamed to/replaced by 'tclPackages.critcl'"; # Converted to throw 2025-10-27
|
||||
@@ -2072,6 +2073,7 @@ mapAliases {
|
||||
stremio = throw "'stremio' has been removed as it depended on the vulnerable and outdated qt5 webengine. On Linux, consider using 'stremio-linux-shell' instead."; # Added 2026-02-11
|
||||
stringsWithDeps = warnAlias "'stringsWithDeps' has been removed from pkgs, use `lib.stringsWithDeps` instead" lib.stringsWithDeps; # Added 2025-10-30
|
||||
subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17
|
||||
sublime = throw "'sublime' (version 2) has been removed as it was unmaintained and broken. Consider using 'sublime3' or 'sublime4' instead."; # Added 2026-06-13
|
||||
sublime-music = throw "`sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead."; # Added 2025-09-20
|
||||
substituteAll = throw "`substituteAll` has been removed. Use `replaceVars` instead."; # Added 2025-05-23
|
||||
substituteAllFiles = throw "`substituteAllFiles` has been removed. Use `replaceVars` for each file instead."; # Added 2025-05-23
|
||||
|
||||
@@ -22,6 +22,8 @@ let
|
||||
|
||||
afl-persistent = callPackage ../development/ocaml-modules/afl-persistent { };
|
||||
|
||||
aeneas = callPackage ../development/ocaml-modules/aeneas { };
|
||||
|
||||
alcotest = callPackage ../development/ocaml-modules/alcotest { };
|
||||
|
||||
alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix { };
|
||||
@@ -247,6 +249,8 @@ let
|
||||
|
||||
checkseum = callPackage ../development/ocaml-modules/checkseum { };
|
||||
|
||||
charon = callPackage ../development/ocaml-modules/charon { };
|
||||
|
||||
chrome-trace = callPackage ../development/ocaml-modules/chrome-trace { };
|
||||
|
||||
cil = callPackage ../development/ocaml-modules/cil { };
|
||||
@@ -541,6 +545,8 @@ let
|
||||
|
||||
easy-format = callPackage ../development/ocaml-modules/easy-format { };
|
||||
|
||||
easy_logging = callPackage ../development/ocaml-modules/easy_logging { };
|
||||
|
||||
eigen = callPackage ../development/ocaml-modules/eigen {
|
||||
stdenv = pkgs.gcc14Stdenv;
|
||||
};
|
||||
@@ -1421,6 +1427,8 @@ let
|
||||
|
||||
### N ###
|
||||
|
||||
name_matcher_parser = callPackage ../development/ocaml-modules/name_matcher_parser { };
|
||||
|
||||
nbd = pkgs.libnbd.override {
|
||||
ocamlPackages = self;
|
||||
buildOcamlBindings = true;
|
||||
|
||||
Reference in New Issue
Block a user