Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -96,7 +96,7 @@ neovim.overrideAttrs (oldAttrs: {
|
||||
})
|
||||
```
|
||||
|
||||
### Specificities for some plugins {#neovim-plugin-specificities}
|
||||
## Specificities for some plugins {#neovim-plugin-specificities}
|
||||
|
||||
### Plugin optional configuration {#neovim-plugin-required-snippet}
|
||||
|
||||
@@ -105,7 +105,7 @@ patch those plugins but expose the necessary configuration under
|
||||
`PLUGIN.passthru.initLua` for neovim plugins. For instance, the `unicode-vim` plugin
|
||||
needs the path towards a unicode database so we expose the following snippet `vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"` under `vimPlugins.unicode-vim.passthru.initLua`.
|
||||
|
||||
#### LuaRocks based plugins {#neovim-luarocks-based-plugins}
|
||||
## LuaRocks based plugins {#neovim-luarocks-based-plugins}
|
||||
|
||||
In order to automatically handle plugin dependencies, several Neovim plugins
|
||||
upload their package to [LuaRocks](https://www.luarocks.org). This means less work for nixpkgs maintainers in the long term as dependencies get updated automatically.
|
||||
@@ -122,12 +122,34 @@ For instance:
|
||||
```
|
||||
To update these packages, you should use the lua updater rather than vim's.
|
||||
|
||||
#### Treesitter {#neovim-plugin-treesitter}
|
||||
## Treesitter {#neovim-plugin-treesitter}
|
||||
|
||||
By default `nvim-treesitter` encourages you to download, compile and install
|
||||
the required Treesitter grammars at run time with `:TSInstall`. This works
|
||||
poorly on NixOS. Instead, to install the `nvim-treesitter` plugins with a set
|
||||
of precompiled grammars, you can use the `nvim-treesitter.withPlugins` function:
|
||||
[Treesitter](https://tree-sitter.github.io/) provides syntax parsing for Neovim, enabling features like:
|
||||
Advanced syntax highlighting, Code folding, Indentation and more.
|
||||
|
||||
Most Neovim users manage treesitter through the `nvim-treesitter` plugin, which provides:
|
||||
|
||||
- Commands for managing grammars and queries,
|
||||
e.g. `:TSInstall`, which downloads, compiles and installs them at runtime.
|
||||
- A custom indentation implementation ([`:h indentexpr`](https://neovim.io/doc/user/options.html#'indentexpr'))
|
||||
for languages with `indents.scm` queries.
|
||||
|
||||
These features build on top of treesitter functionality that is built into Neovim.
|
||||
|
||||
In nixpkgs, grammars and queries are precompiled and packaged separately. This means:
|
||||
|
||||
- You can use treesitter features **without** installing `nvim-treesitter`.
|
||||
- You only need `nvim-treesitter` if you want its custom indentation implementation.
|
||||
- Plugins that depend on grammars can reference them directly.
|
||||
|
||||
### Treesitter setup using `nvim-treesitter` {#neovim-plugin-nvim-treesitter}
|
||||
|
||||
::: {.tip}
|
||||
Choose this approach if you want to use `nvim-treesitter`'s custom indentation expression.
|
||||
:::
|
||||
|
||||
To install `nvim-treesitter` combined with a set of precompiled grammars,
|
||||
you can use the `nvim-treesitter.withPlugins` function:
|
||||
|
||||
```nix
|
||||
(pkgs.neovim.override {
|
||||
@@ -148,10 +170,127 @@ of precompiled grammars, you can use the `nvim-treesitter.withPlugins` function:
|
||||
|
||||
To enable all grammars packaged in nixpkgs, use `pkgs.vimPlugins.nvim-treesitter.withAllGrammars`.
|
||||
|
||||
For how to configure `nvim-treesitter` and set up syntax highlighting, indentation, folding, etc.,
|
||||
please refer to the `:help nvim-treesitter-quickstart` plugin documentation.
|
||||
|
||||
### Testing Neovim plugins {#testing-neovim-plugins}
|
||||
::: {.note}
|
||||
When using Nix-managed grammars, `:checkhealth nvim-treesitter` will report no installed languages.
|
||||
This is expected behavior because:
|
||||
- The `nvim-treesitter` health check searches its configured install directory.
|
||||
- Nix installs grammars to the Nix store and adds them to the `runtimepath` instead.
|
||||
|
||||
**To verify Nix-managed parsers and queries**, use `:checkhealth vim.treesitter` instead.
|
||||
:::
|
||||
|
||||
### Treesitter setup using standalone grammars and queries {#neovim-plugin-treesitter-standalone}
|
||||
|
||||
::: {.tip}
|
||||
Choose this approach if you
|
||||
- Want minimal dependencies.
|
||||
- Don't need `nvim-treesitter`'s custom indentation expression.
|
||||
:::
|
||||
|
||||
You can install the standalone parsers and queries directly without installing `nvim-treesitter`:
|
||||
|
||||
```nix
|
||||
(pkgs.neovim.override {
|
||||
configure = {
|
||||
packages.myPlugins =
|
||||
with pkgs.vimPlugins;
|
||||
let
|
||||
# Select the grammars you need
|
||||
treesitter-grammars = with nvim-treesitter-parsers; [
|
||||
nix
|
||||
python
|
||||
];
|
||||
# Queries are needed for treesitter based syntax highlighting and folds.
|
||||
treesitter-queries = map (p: p.associatedQuery) treesitter-grammars;
|
||||
in
|
||||
{
|
||||
start = [
|
||||
# regular plugins
|
||||
]
|
||||
++ treesitter-grammars
|
||||
++ treesitter-queries;
|
||||
};
|
||||
};
|
||||
})
|
||||
```
|
||||
|
||||
You can enable treesitter features for installed grammars in a `FileType` autocommand
|
||||
or in an `ftplugin/<language>.lua` script, e.g.
|
||||
|
||||
```lua
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
pattern = { 'rust', 'javascript', 'zig' },
|
||||
callback = function(ev)
|
||||
local bufnr = ev.buf
|
||||
|
||||
-- Enable treesitter syntax highlighting and parsing for the current buffer
|
||||
-- (Requires queries to be installed)
|
||||
vim.treesitter.start(bufnr)
|
||||
|
||||
-- Enable treesitter based code folding
|
||||
-- (folds are window-scoped, not buffer-scoped)
|
||||
-- (Requires queries to be installed)
|
||||
vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
|
||||
vim.wo.foldmethod = 'expr'
|
||||
end,
|
||||
})
|
||||
```
|
||||
|
||||
### Treesitter grammars as plugin dependencies {#neovim-plugin-treesitter-grammar-dependencies}
|
||||
|
||||
Some Neovim plugins (like `neotest` adapters, `markdoc-nvim`, `hurl-nvim`) depend on treesitter grammars.
|
||||
These dependencies are usually declared in plugin overrides.
|
||||
|
||||
::: {.important}
|
||||
Some plugin READMEs may suggest that they depend on `nvim-treesitter`.
|
||||
**This is almost always not the case.**
|
||||
|
||||
`nvim-treesitter` no longer provides a Lua module API for other plugins to use.
|
||||
In the vast majority of cases, these plugins:
|
||||
- **Depend on parsers** (not on `nvim-treesitter` or its queries).
|
||||
- **Bundle their own queries** (either as `*.scm` files or hardcoded in the Lua sources).
|
||||
:::
|
||||
|
||||
To add grammars as a plugin dependency, add an [override](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix):
|
||||
|
||||
```nix
|
||||
{
|
||||
foo-nvim = super.foo-nvim.overrideAttrs {
|
||||
dependencies = with self.nvim-treesitter-parsers; [
|
||||
markdown
|
||||
markdown_inline
|
||||
html
|
||||
];
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
If a plugin actually does depend on the `nvim-treesitter` legacy module API, you can add
|
||||
`nvim-treesitter-legacy` as a dependency:
|
||||
|
||||
```nix
|
||||
{
|
||||
foo-legacy-nvim = super.foo-legacy-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
nvim-treesitter-legacy
|
||||
nvim-treesitter-parsers.nix
|
||||
];
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
::: {.caution}
|
||||
`nvim-treesitter-legacy` exists for the purpose of easing transition and will be removed in 26.11.
|
||||
If a Neovim configuration contains both `nvim-treesitter` and `nvim-treesitter-legacy`, it will fail to evaluate.
|
||||
:::
|
||||
|
||||
## Testing Neovim plugins {#testing-neovim-plugins}
|
||||
|
||||
### neovimRequireCheck {#testing-neovim-plugins-neovim-require-check}
|
||||
|
||||
#### neovimRequireCheck {#testing-neovim-plugins-neovim-require-check}
|
||||
`neovimRequireCheck` is a simple test which checks if Neovim can require lua modules without errors. This is often enough to catch missing dependencies.
|
||||
|
||||
It accepts a single string for a module, or a list of module strings to test.
|
||||
|
||||
@@ -4296,6 +4296,18 @@
|
||||
"index.html#neovim-plugin-treesitter",
|
||||
"index.html#vim-plugin-treesitter"
|
||||
],
|
||||
"neovim-plugin-nvim-treesitter": [
|
||||
"index.html#neovim-plugin-nvim-treesitter",
|
||||
"index.html#vim-plugin-nvim-treesitter"
|
||||
],
|
||||
"neovim-plugin-treesitter-standalone": [
|
||||
"index.html#neovim-plugin-treesitter-standalone",
|
||||
"index.html#vim-plugin-treesitter-standalone"
|
||||
],
|
||||
"neovim-plugin-treesitter-grammar-dependencies": [
|
||||
"index.html#neovim-plugin-treesitter-grammar-dependencies",
|
||||
"index.html#vim-plugin-treesitter-grammar-dependencies"
|
||||
],
|
||||
"managing-plugins-with-vim-plug": [
|
||||
"index.html#managing-plugins-with-vim-plug"
|
||||
],
|
||||
|
||||
@@ -20498,6 +20498,11 @@
|
||||
githubId = 943430;
|
||||
name = "David Hagege";
|
||||
};
|
||||
pdg137 = {
|
||||
name = "Paul Grayson";
|
||||
github = "pdg137";
|
||||
githubId = 466760;
|
||||
};
|
||||
peat-psuwit = {
|
||||
name = "Ratchanan Srirattanamet";
|
||||
email = "peat@peat-network.xyz";
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
vimUtils,
|
||||
}:
|
||||
let
|
||||
version = "0523fe3-unstable-2026-01-25";
|
||||
version = "896355b-unstable-2026-02-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmtrKovalenko";
|
||||
repo = "fff.nvim";
|
||||
rev = "0523fe39ffc59373de0648ba636705d35a6fdfc2";
|
||||
hash = "sha256-7rP6C/zPhpTMcsewR9LZlB23Ot7W23E2WM7Fnj89rlA=";
|
||||
rev = "d7bc72786d4362ca70aa05d397f8d08bbaf39604";
|
||||
hash = "sha256-CqX2QoDO7InjXYMzvljufA0QYhvFbsht2auE0+nVktw=";
|
||||
};
|
||||
fff-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "fff-nvim-lib";
|
||||
|
||||
@@ -1499,12 +1499,12 @@
|
||||
"vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
|
||||
},
|
||||
"yandex-cloud_yandex": {
|
||||
"hash": "sha256-nLgu1FiStaNpKnzLR6A/n829/b1a6uj+9Y2KoACmRTg=",
|
||||
"hash": "sha256-f/dCdlJfhEWzN+nXKVy9y1zy3SAULuyJFs/XzxoU0Xs=",
|
||||
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
|
||||
"owner": "yandex-cloud",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.183.0",
|
||||
"rev": "v0.185.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-CczUCzLIJgzcCO3zKpsiGg9x7G7RZcahfSHL3K/gxH0="
|
||||
"vendorHash": "sha256-NxFEJxm+6HCtQxSQF65LB+4lsknGSdACokUyBVAJvn0="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
hamlib_4,
|
||||
libusb1,
|
||||
cmake,
|
||||
fftw,
|
||||
fftwFloat,
|
||||
qt6,
|
||||
boost,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "js8call";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "js8call";
|
||||
repo = "js8call";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-rYXjcmQRRfizJVriZo9yX8x2yYfWpL94Cprx9eFC3ss=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
pkg-config
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hamlib_4
|
||||
libusb1
|
||||
fftw
|
||||
fftwFloat
|
||||
qt6.qtbase
|
||||
qt6.qtmultimedia
|
||||
qt6.qtserialport
|
||||
boost
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr/share/applications" "$out/share/applications" \
|
||||
--replace "/usr/share/pixmaps" "$out/share/icons/hicolor/128x128/apps" \
|
||||
--replace "/usr/bin/" "$out/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Weak-signal keyboard messaging for amateur radio";
|
||||
longDescription = ''
|
||||
JS8Call is software using the JS8 Digital Mode providing weak signal
|
||||
keyboard to keyboard messaging to Amateur Radio Operators.
|
||||
'';
|
||||
homepage = "http://js8call.com/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
sarcasticadmin
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule (finallAttrs: {
|
||||
pname = "android-ota-payload-extractor";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobyxdd";
|
||||
repo = "android-ota-payload-extractor";
|
||||
tag = "v${finallAttrs.version}";
|
||||
hash = "sha256-Ln9HSM3mmba5XrzPCmgdn+erGK1v/POz586K/D4krnY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JsinGljnb+kC0QgaF4Vbi6Mh3Lwwwk/SbC+p5WLt08A=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A fast & natively cross-platform Android OTA payload extractor written in Go";
|
||||
homepage = "https://github.com/tobyxdd/android-ota-payload-extractor";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ matthewcroughan ];
|
||||
teams = with lib.teams; [ android ];
|
||||
mainProgram = "android-ota-payload-extractor";
|
||||
};
|
||||
})
|
||||
@@ -6,19 +6,19 @@
|
||||
autoconf-archive,
|
||||
pkg-config,
|
||||
gettext,
|
||||
libssl,
|
||||
openssl,
|
||||
txt2man,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "axel";
|
||||
version = "2.17.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axel-download-accelerator";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5GUna5k8GhAx1Xe8n9IvXT7IO6gksxCLh+sMANlxTBM=";
|
||||
repo = "axel";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5GUna5k8GhAx1Xe8n9IvXT7IO6gksxCLh+sMANlxTBM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gettext
|
||||
libssl
|
||||
openssl
|
||||
];
|
||||
|
||||
installFlags = [ "ETCDIR=${placeholder "out"}/etc" ];
|
||||
@@ -53,4 +53,4 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "axel";
|
||||
};
|
||||
}
|
||||
})
|
||||
+4
-6
@@ -8,9 +8,7 @@
|
||||
su,
|
||||
coreutils,
|
||||
util-linux,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtwayland,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -36,12 +34,12 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
python'
|
||||
backintime-common
|
||||
qtbase
|
||||
qtwayland
|
||||
qt6.qtbase
|
||||
qt6.qtwayland
|
||||
];
|
||||
|
||||
nativeBuildInputs = backintime-common.nativeBuildInputs or [ ] ++ [
|
||||
wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
configureFlags = [ "--python=${lib.getExe python'}" ];
|
||||
+2
-2
@@ -6,7 +6,7 @@
|
||||
zlib,
|
||||
perl,
|
||||
perlPackages,
|
||||
openmp,
|
||||
llvmPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
zlib
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = lib.optional stdenv.cc.isClang openmp;
|
||||
buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}c++" # remove once https://github.com/weizhongli/cdhit/pull/114 is merged
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "2.4.28",
|
||||
"version": "2.4.31",
|
||||
"vscodeVersion": "1.105.1",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/f3f5cec40024283013878b50c4f9be4002e0b587/linux/x64/Cursor-2.4.28-x86_64.AppImage",
|
||||
"hash": "sha256-Vkat7mTge3yDDzWAfwuapuwsUCPBrl41THA1WEAvTyY="
|
||||
"url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/linux/x64/Cursor-2.4.31-x86_64.AppImage",
|
||||
"hash": "sha256-4cEa5SsbE2QFfmcndnVI5QQIS9DPjFQ6u/iQO9P8SEk="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/f3f5cec40024283013878b50c4f9be4002e0b587/linux/arm64/Cursor-2.4.28-aarch64.AppImage",
|
||||
"hash": "sha256-ihEMvK3wJsf9bkFs/5FlqBM+UQfhUgmT+SHsG+npjdo="
|
||||
"url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/linux/arm64/Cursor-2.4.31-aarch64.AppImage",
|
||||
"hash": "sha256-b66KmFN92HZRyZnlFVMxCCgX0bWBktfKojtnXF7c+Qg="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/f3f5cec40024283013878b50c4f9be4002e0b587/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-9AW93v24w1JLTghL5VuYsyF1cIjkN6FjUQEjFqB9ETc="
|
||||
"url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-JQq73IqSAlkedhCuxr+uIpWPEAslnMPxciDDQYHWU6o="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/f3f5cec40024283013878b50c4f9be4002e0b587/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-mtHir14v4Uz2xs0sANY5xQMUVvjoDJZj/t/w7u7PJY0="
|
||||
"url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-xXzWWDfU00IDx3vqnB0A4mItSyvfRqasUhqOAj8U5aE="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace tests/unit-utils-io.c --replace "| O_DIRECT" ""
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s";
|
||||
env = lib.optionalAttrs (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) {
|
||||
NIX_LDFLAGS = "-lgcc_s";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--with-crypto_backend=openssl"
|
||||
|
||||
@@ -30,13 +30,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deltatouch";
|
||||
version = "2.25.1";
|
||||
version = "2.35.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "lk108";
|
||||
repo = "deltatouch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0+5wZCadYHmZjp/Za0LmK7FWq9nfyhXZFAx0lGqfRK0=";
|
||||
hash = "sha256-6jzGwOkO14P7rZSBGZ6/Mzda/PM6ZVQeUCb7yfQtbkQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
{
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
dnslib,
|
||||
lib,
|
||||
}:
|
||||
|
||||
buildPythonApplication {
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "dnschef";
|
||||
version = "0.4";
|
||||
|
||||
@@ -13,7 +12,7 @@ buildPythonApplication {
|
||||
owner = "iphelix";
|
||||
repo = "dnschef";
|
||||
rev = "a395411ae1f5c262d0b80d06a45a445f696f3243";
|
||||
sha256 = "0ll3hw6w5zhzyqc2p3c9443gcp12sx6ddybg5rjpl01dh3svrk1q";
|
||||
hash = "sha256-OMy89YAtAHplLm/51kzXIlz2BiGJjSsY9h/+wg2Hg1I=";
|
||||
};
|
||||
|
||||
pyproject = false;
|
||||
@@ -21,7 +20,7 @@ buildPythonApplication {
|
||||
install -D ./dnschef.py $out/bin/dnschef
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ dnslib ];
|
||||
dependencies = [ python3Packages.dnslib ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/iphelix/dnschef";
|
||||
@@ -10,18 +10,18 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "eas-cli";
|
||||
version = "16.28.0";
|
||||
version = "16.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "expo";
|
||||
repo = "eas-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/1E26CDD+vXR6/v9zOFOcJEuU/evUSVovQwnuyoV4SA=";
|
||||
hash = "sha256-FP3vZKiJeQmIh2zEMWJcgsJJfUI+YhB9IyQlfnbl7ys=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock"; # Point to the root lockfile
|
||||
hash = "sha256-W2FuU4J28/qtXUa+eqirpc7bjRdL1fk6mgGxR50icYI=";
|
||||
hash = "sha256-IG13BEOH7BUi1HTcXebMQjXZJgIaWJ7hgX3GcmRB8hA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "eask-cli";
|
||||
version = "0.12.4";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eask";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-0pSOPz+wSz6DhbO/dGj7AOfBm0Cyj530Xqu1PRTPRjU=";
|
||||
hash = "sha256-GYpFbCEgS9GgZs/XC3NwA8GuCiovaUTL1bVqlsnyFKI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-NhfpqoImRQaELiKO8hTAc1KCeaVWUtckcBG8SfYpzaM=";
|
||||
npmDepsHash = "sha256-712QW0tTKg7THsBzvEHcG97FBMw3ESzpoqdw0kv3mMU=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
makeWrapper,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ec";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chojs23";
|
||||
repo = "ec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vpl9Gz/DVjdplx80oQsTbH2hTS/3Y7dKZw4x52V6wJU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bV5y8zKculYULkFl9J95qebLOzdTT/LuYycqMmHKZ+g=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/ec/main.go \
|
||||
--replace-fail \
|
||||
'var version = "dev"' \
|
||||
'var version = "${finalAttrs.version}"'
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ec --prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
git
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Easy terminal-native 3-way git conflict resolver vim-like workflow";
|
||||
homepage = "https://github.com/chojs23/ec";
|
||||
changelog = "https://github.com/chojs23/ec/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kpbaks ];
|
||||
mainProgram = "ec";
|
||||
};
|
||||
})
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-wt";
|
||||
version = "0.14.2";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "git-wt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/wzaLLR8lReWmZB6TWwDiaVdcyVdIpnQYJWI4yEAMys=";
|
||||
hash = "sha256-gZO3SAIrOQ+wEKf1VAg+e5bLVDt2/s73INZougMXH4k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-K5geAvG+mvnKeixOyZt0C1T5ojSBFmx2K/Msol0HsSg=";
|
||||
vendorHash = "sha256-LkyH7czzBkiyAYGrKuPSeB4pNAZLmgwXgp6fmYBps6s=";
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
buildPackages,
|
||||
|
||||
# this is just for tests (not in the closure of any regular package)
|
||||
glib,
|
||||
dbus,
|
||||
tzdata,
|
||||
desktop-file-utils,
|
||||
@@ -45,6 +46,13 @@
|
||||
assert stdenv.hostPlatform.isLinux -> util-linuxMinimal != null;
|
||||
|
||||
let
|
||||
glib-untested = glib.overrideAttrs { doCheck = false; };
|
||||
# break dependency cycles
|
||||
# these things are only used for tests, they don't get into the closure
|
||||
dbus' = dbus.override { enableSystemd = false; };
|
||||
shared-mime-info' = shared-mime-info.override { glib = glib-untested; };
|
||||
desktop-file-utils' = desktop-file-utils.override { glib = glib-untested; };
|
||||
|
||||
gobject-introspection' = buildPackages.gobject-introspection.override {
|
||||
propagateFullGlib = false;
|
||||
# Avoid introducing cairo, which enables gobjectSupport by default.
|
||||
@@ -213,8 +221,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
tzdata
|
||||
desktop-file-utils
|
||||
shared-mime-info
|
||||
desktop-file-utils'
|
||||
shared-mime-info'
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
@@ -315,8 +323,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export XDG_CACHE_HOME="$TMP"
|
||||
export XDG_RUNTIME_HOME="$TMP"
|
||||
export HOME="$TMP"
|
||||
export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"
|
||||
export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon"
|
||||
export XDG_DATA_DIRS="${desktop-file-utils'}/share:${shared-mime-info'}/share"
|
||||
export G_TEST_DBUS_DAEMON="${dbus'}/bin/dbus-daemon"
|
||||
|
||||
# pkg_config_tests expects a PKG_CONFIG_PATH that points to meson-private, wrapped pkg-config
|
||||
# tries to be clever and picks up the wrong glib at the end.
|
||||
|
||||
+15
-19
@@ -1,32 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
fetchPypi,
|
||||
buildPythonApplication,
|
||||
poetry-core,
|
||||
colorama,
|
||||
packaging,
|
||||
pydantic,
|
||||
requests,
|
||||
pygobject3,
|
||||
tqdm,
|
||||
python3Packages,
|
||||
gobject-introspection,
|
||||
wrapGAppsNoGuiHook,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "gnome-extensions-cli";
|
||||
version = "0.10.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "gnome_extensions_cli";
|
||||
inherit version;
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-Tnf8BbW9u7d19ZtGTdMVHa6azbKekYRGOPEPNiB+y00=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
poetry-core
|
||||
wrapGAppsNoGuiHook
|
||||
];
|
||||
|
||||
@@ -35,13 +27,17 @@ buildPythonApplication rec {
|
||||
"packaging"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
packaging
|
||||
pydantic
|
||||
requests
|
||||
pygobject3
|
||||
tqdm
|
||||
build-system = [
|
||||
python3Packages.poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
python3Packages.colorama
|
||||
python3Packages.packaging
|
||||
python3Packages.pydantic
|
||||
python3Packages.requests
|
||||
python3Packages.pygobject3
|
||||
python3Packages.tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
@@ -55,4 +51,4 @@ buildPythonApplication rec {
|
||||
maintainers = with lib.maintainers; [ dylanmtaylor ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -32,7 +32,7 @@
|
||||
xrandr,
|
||||
glib,
|
||||
libGL,
|
||||
glfw,
|
||||
glfw3-minecraft,
|
||||
openal,
|
||||
libglvnd,
|
||||
alsa-lib,
|
||||
@@ -137,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
runtimeDeps = [
|
||||
libGL
|
||||
glfw
|
||||
glfw3-minecraft
|
||||
glib
|
||||
openal
|
||||
libglvnd
|
||||
@@ -188,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xrandr)
|
||||
}" \
|
||||
--run 'cd $HOME' \
|
||||
--prefix JAVA_TOOL_OPTIONS " " "-Dorg.lwjgl.glfw.libname=${lib.getLib glfw3-minecraft}/lib/libglfw.so" \
|
||||
''${gappsWrapperArgs[@]}
|
||||
'';
|
||||
|
||||
|
||||
@@ -13,12 +13,12 @@ let
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "hunspell-dict-${shortName}-chromium";
|
||||
version = "115.0.5790.170";
|
||||
version = "145.0.7632.45";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries";
|
||||
rev = "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e";
|
||||
hash = "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=";
|
||||
rev = "cccf64a8acc951afe3f47fee023908e55699bc58";
|
||||
hash = "sha256-mYDPXa64IOKLMNiBiMqDrQMR7gDPI+vdyVc+M7E+ddc=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "jjui";
|
||||
version = "0.9.10";
|
||||
version = "0.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idursun";
|
||||
repo = "jjui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Hsuyf5VcSZcNi2gmubXS47uRarL17oPEtorisY75bbM=";
|
||||
hash = "sha256-WkUMDIzVW6n5Zp1r7rp1GgkcgswatmgNYdSpkmz5VWs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jte0g+aUiGNARLi8DyfsX6wYYJnodHnILzmid6KvMiA=";
|
||||
vendorHash = "sha256-nXUaqkCz3QERqevwGk94sRrrPgJoJOPWXYc7iBOMAdY=";
|
||||
|
||||
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
|
||||
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
hamlib_4,
|
||||
libusb1,
|
||||
cmake,
|
||||
fftw,
|
||||
fftwFloat,
|
||||
qt6,
|
||||
boost,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "js8call";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JS8Call-improved";
|
||||
repo = "JS8Call-improved";
|
||||
tag = "release/${finalAttrs.version}";
|
||||
hash = "sha256-dpPh3+s29ksdVGc1I5JOJrqzS51Bda8afgU5RrO6B3w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
pkg-config
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hamlib_4
|
||||
libusb1
|
||||
fftw
|
||||
fftwFloat
|
||||
qt6.qtbase
|
||||
qt6.qtmultimedia
|
||||
qt6.qtserialport
|
||||
boost
|
||||
];
|
||||
|
||||
# The "install" target is apparently no longer supported so we have
|
||||
# to copy the built assets explicitly.
|
||||
# https://github.com/JS8Call-improved/JS8Call-improved/issues/115
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/doc/js8call $out/share/icons/hicolor/128x128/apps $out/share/applications
|
||||
cp JS8Call $out/bin/js8call
|
||||
cp ../LICENSE ../README.md $out/share/doc/js8call
|
||||
cp ../artwork/js8call_icon.png $out/share/icons/hicolor/128x128/apps
|
||||
cp ../JS8Call.desktop $out/share/applications
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# We renamed the executable to lowercase for consistency with older
|
||||
# versions and Linux more generally. Fix up the desktop file here:
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/applications/JS8Call.desktop \
|
||||
--replace-fail "Exec=JS8Call" "Exec=js8call"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Weak-signal keyboard messaging for amateur radio";
|
||||
longDescription = ''
|
||||
JS8Call is software using the JS8 Digital Mode providing weak signal
|
||||
keyboard to keyboard messaging to Amateur Radio Operators.
|
||||
|
||||
JS8Call-Improved is a community-driven evolution of JS8Call,
|
||||
bringing modern features, active development, and long-term
|
||||
support to HF digital communication. It’s fully compatible with
|
||||
existing JS8Call versions while adding new capabilities and
|
||||
refinements.
|
||||
'';
|
||||
homepage = "https://js8call-improved.com/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
sarcasticadmin
|
||||
pdg137
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -24,13 +24,12 @@
|
||||
portmidi,
|
||||
pugixml,
|
||||
python3,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
rapidjson,
|
||||
sqlite,
|
||||
utf8proc,
|
||||
versionCheckHook,
|
||||
which,
|
||||
wrapQtAppsHook,
|
||||
writeScript,
|
||||
zlib,
|
||||
}:
|
||||
@@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
|
||||
SDL2
|
||||
SDL2_ttf
|
||||
sqlite
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
@@ -108,7 +107,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
python3
|
||||
which
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
+5
-8
@@ -1,13 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
buildDunePackage,
|
||||
cmdliner,
|
||||
base,
|
||||
stdio,
|
||||
ocamlPackages,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "merge-fmt";
|
||||
version = "0.3";
|
||||
|
||||
@@ -20,9 +17,9 @@ buildDunePackage rec {
|
||||
duneVersion = "3";
|
||||
|
||||
buildInputs = [
|
||||
cmdliner
|
||||
base
|
||||
stdio
|
||||
ocamlPackages.cmdliner
|
||||
ocamlPackages.base
|
||||
ocamlPackages.stdio
|
||||
];
|
||||
|
||||
# core v0.17 compatibility, obtained by `git diff -r 3e37827~2..3e37827`
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
pythonPackages,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nixbang";
|
||||
version = "0.1.2";
|
||||
format = "setuptools";
|
||||
@@ -13,18 +13,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prettierd";
|
||||
version = "0.26.2";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fsouza";
|
||||
repo = "prettierd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KvFOvWQZBppvHbvUvGQu39j8aV/pQFwfuqjFQqdb7lI=";
|
||||
hash = "sha256-8fy8ciPRd2ZRZ56vzz0quDNqpaAPfUFBN4fjVTdd2Cg=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-Rf7km2WUODqWu8U8iiHNrb5dMamIm1XCsRnldO71j5A=";
|
||||
hash = "sha256-PPi+nobxbVTC9G0Xwu5kcNH6zxtJXueYGuZkl3+XTIo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
ncurses,
|
||||
}:
|
||||
|
||||
gccStdenv.mkDerivation rec {
|
||||
gccStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "programmer-calculator";
|
||||
version = "3.0-unstable-2025-11-06";
|
||||
|
||||
@@ -13,7 +13,7 @@ gccStdenv.mkDerivation rec {
|
||||
owner = "alt-romes";
|
||||
repo = "programmer-calculator";
|
||||
rev = "153272c50b2491ddf25dfbfcf228a08a3b3ace69";
|
||||
sha256 = "sha256-24OYG3tVxcc/1i9HRrzW/jPY41KnKkugLziWnG1wQIw=";
|
||||
hash = "sha256-24OYG3tVxcc/1i9HRrzW/jPY41KnKkugLziWnG1wQIw=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
@@ -32,9 +32,9 @@ gccStdenv.mkDerivation rec {
|
||||
representations, sizes, and overall close to the bits
|
||||
'';
|
||||
homepage = "https://alt-romes.github.io/programmer-calculator";
|
||||
changelog = "https://github.com/alt-romes/programmer-calculator/releases/tag/v${lib.versions.majorMinor version}";
|
||||
changelog = "https://github.com/alt-romes/programmer-calculator/releases/tag/v${lib.versions.majorMinor finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ cjab ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
+8
-6
@@ -1,5 +1,5 @@
|
||||
{
|
||||
stdenv,
|
||||
clangStdenv,
|
||||
lib,
|
||||
binutils,
|
||||
fetchFromGitHub,
|
||||
@@ -36,7 +36,7 @@
|
||||
catch2_3,
|
||||
webkitgtk_4_1,
|
||||
ctestCheckHook,
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
withSystemd ? lib.meta.availableOn clangStdenv.hostPlatform systemd,
|
||||
systemd,
|
||||
udevCheckHook,
|
||||
z3,
|
||||
@@ -60,10 +60,12 @@ let
|
||||
opencascade-override' =
|
||||
if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prusa-slicer";
|
||||
version = "2.9.4";
|
||||
|
||||
# Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory
|
||||
# on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds
|
||||
# with --cores 32 on clang).
|
||||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "PrusaSlicer";
|
||||
@@ -81,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# (not applicable to super-slicer fork)
|
||||
postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") (
|
||||
# Patch required for GCC 14, but breaks on clang
|
||||
lib.optionalString stdenv.cc.isGNU ''
|
||||
lib.optionalString clangStdenv.cc.isGNU ''
|
||||
substituteInPlace src/slic3r-arrange/include/arrange/DataStoreTraits.hpp \
|
||||
--replace-fail \
|
||||
"WritableDataStoreTraits<ArrItem>::template set" \
|
||||
@@ -250,7 +252,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
}
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
|
||||
// lib.optionalAttrs (clangStdenv.hostPlatform.isDarwin) {
|
||||
mainProgram = "PrusaSlicer";
|
||||
};
|
||||
})
|
||||
@@ -7,15 +7,15 @@
|
||||
fuse,
|
||||
}:
|
||||
|
||||
gccStdenv.mkDerivation rec {
|
||||
gccStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "romdirfs";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlafeldt";
|
||||
repo = "romdirfs";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jbsmpklrycz5q86qmzvbz4iz2g5fvd7p9nca160aw2izwpws0g7";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5wHNL/9RcAVMUMyme9p25YkfyV/7V2wQLp/5TOetesk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,4 +37,4 @@ gccStdenv.mkDerivation rec {
|
||||
maintainers = [ ];
|
||||
mainProgram = "romdirfs";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.16.57";
|
||||
version = "3.16.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bbAWMbj150R239pBcngScnAdsdfWs9fIzc8EgQWG/+o=";
|
||||
hash = "sha256-DT9HK9iYTmXUfjKcTxLRMZOeCLb9CAoFEpBiDpEku3g=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
commit 56a60ee50122613d3a356ce74b4bd77b5e7be235
|
||||
Author: Tim Kosse <tim.kosse@filezilla-project.org>
|
||||
Date: Sat Aug 26 15:37:30 2017 +0200
|
||||
|
||||
If a wxTopLevelWindow has been instanced, but Create has not been called, calling Destroy on the window results in an assertion in Show(false), at least under wxGTK. Fix this by only hiding a top level window during destruction if it is actually shown.
|
||||
|
||||
diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
|
||||
index ef693690c5..8d07812031 100644
|
||||
--- a/src/common/toplvcmn.cpp
|
||||
+++ b/src/common/toplvcmn.cpp
|
||||
@@ -122,19 +122,21 @@ bool wxTopLevelWindowBase::Destroy()
|
||||
// any more as no events will be sent to the hidden window and without idle
|
||||
// events we won't prune wxPendingDelete list and the application won't
|
||||
// terminate
|
||||
- for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
|
||||
- end = wxTopLevelWindows.end();
|
||||
- i != end;
|
||||
- ++i )
|
||||
- {
|
||||
- wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
|
||||
- if ( win != this && win->IsShown() )
|
||||
+ if ( IsShown() ) {
|
||||
+ for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
|
||||
+ end = wxTopLevelWindows.end();
|
||||
+ i != end;
|
||||
+ ++i )
|
||||
{
|
||||
- // there remains at least one other visible TLW, we can hide this
|
||||
- // one
|
||||
- Hide();
|
||||
+ wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
|
||||
+ if ( win != this && win->IsShown() )
|
||||
+ {
|
||||
+ // there remains at least one other visible TLW, we can hide this
|
||||
+ // one
|
||||
+ Hide();
|
||||
|
||||
- break;
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ let
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [
|
||||
../../../by-name/wx/wxGTK31/0001-fix-assertion-using-hide-in-destroy.patch
|
||||
./0001-fix-assertion-using-hide-in-destroy.patch
|
||||
];
|
||||
});
|
||||
|
||||
Generated
+347
-165
File diff suppressed because it is too large
Load Diff
@@ -11,13 +11,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "terracotta";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "burningtnt";
|
||||
repo = "Terracotta";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AlbztRTHnrEqJCcNeRNssu2M0QHicdRlGCVHOvYglTw=";
|
||||
hash = "sha256-RxX1Uejy9bNuXkRNOnGNIr2qXapkmqjdTnFhljylkXo=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "wireless-regdb";
|
||||
version = "2025.10.07";
|
||||
version = "2026.02.04";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-${version}.tar.xz";
|
||||
hash = "sha256-1MhypEFUYEyGn1hR99IdgY1JKDXTcK9/WN6IR5c4AcM=";
|
||||
hash = "sha256-D/SKXNnpz+joFaJOAjc0kZ6aO3rS8DkkOtEhz1qr9sY=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -29,40 +29,18 @@ assert
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "z3";
|
||||
version = "4.15.4";
|
||||
version = "4.15.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Z3Prover";
|
||||
repo = "z3";
|
||||
rev = "z3-${finalAttrs.version}";
|
||||
hash = "sha256-eyF3ELv81xEgh9Km0Ehwos87e4VJ82cfsp53RCAtuTo=";
|
||||
hash = "sha256-bK02PkJ+gmexfqY8hLMhbFlX1AIhs8Cd08NaTGP7D3A=";
|
||||
};
|
||||
|
||||
patches =
|
||||
lib.optionals useCmakeBuild [
|
||||
./fix-pkg-config-paths.patch
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast finalAttrs.version "4.15.4") [
|
||||
# fix Segmentation fault. See https://github.com/Z3Prover/z3/pull/8264 and
|
||||
# https://github.com/NixOS/nixpkgs/issues/486491
|
||||
(fetchpatch2 {
|
||||
name = "preserve-the-initial-state-of-the-solver.patch";
|
||||
url = "https://github.com/Z3Prover/z3/commit/850a3236adab92f9f6f569ac66ffbb69be179f4c.patch?full_index=1";
|
||||
hash = "sha256-C6p+dj3i3DpOnd2wr+R8ZwClHoMFfk5i5/+JRhTDNcs=";
|
||||
})
|
||||
# needs to include a cosmetic change to apply patch for memory corruption
|
||||
(fetchpatch2 {
|
||||
name = "cosmetic-changes-to-i.patch";
|
||||
url = "https://github.com/Z3Prover/z3/commit/243694379475d983605f87578452a330f3e3b28f.patch?full_index=1";
|
||||
includes = [ "src/api/api_polynomial.cpp" ];
|
||||
hash = "sha256-huo5S73WrFrEEUcaP+1LDQwGwo+n2iYT4x/OjK5rmqQ=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "fix-memory-corruption.patch";
|
||||
url = "https://github.com/Z3Prover/z3/commit/e7b6f3f33bcc6c88a0f2ace47ff2f09b59239433.patch?full_index=1";
|
||||
hash = "sha256-kEEeod4s8i9SI2e2TFD2U4yd1qEPoGnJOfE0y+1Cq6M=";
|
||||
})
|
||||
];
|
||||
patches = lib.optionals useCmakeBuild [
|
||||
./fix-pkg-config-paths.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
rebar3Relx rec {
|
||||
releaseType = "escript";
|
||||
pname = "elvis-erlang";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inaka";
|
||||
repo = "elvis";
|
||||
hash = "sha256-9aOJpKYb+M07bi6aEMt5Gtr/edOGm+jyA8bxiLyUd0g=";
|
||||
hash = "sha256-O6T3/oe7npeLaaCRZLn4CtZ1WTjg98aPP9mrQoWCXgg=";
|
||||
tag = version;
|
||||
};
|
||||
|
||||
|
||||
@@ -12,76 +12,6 @@ in
|
||||
let
|
||||
self = packages // (overrides self packages);
|
||||
packages = with self; {
|
||||
unicode_util_compat = builder {
|
||||
name = "unicode_util_compat";
|
||||
version = "0.7.1";
|
||||
src = fetchHex {
|
||||
pkg = "unicode_util_compat";
|
||||
version = "0.7.1";
|
||||
sha256 = "sha256-s6kXhUzjriM2GXRK0eAQLgVnMTZ3b7L6diNPPgOyNkI=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
ssl_verify_fun = builder {
|
||||
name = "ssl_verify_fun";
|
||||
version = "1.1.7";
|
||||
src = fetchHex {
|
||||
pkg = "ssl_verify_fun";
|
||||
version = "1.1.7";
|
||||
sha256 = "sha256-/kwZDo83QB0wFnyMQF7aGUafNFd5h8dt3mE+g4u8Z/g=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
parse_trans = builder {
|
||||
name = "parse_trans";
|
||||
version = "3.4.2";
|
||||
src = fetchHex {
|
||||
pkg = "parse_trans";
|
||||
version = "3.4.2";
|
||||
sha256 = "sha256-TCU0feO3w1cy0y5pq0PRzu4L6uPzs63htZy9PdIk2co=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
mimerl = builder {
|
||||
name = "mimerl";
|
||||
version = "1.4.0";
|
||||
src = fetchHex {
|
||||
pkg = "mimerl";
|
||||
version = "1.4.0";
|
||||
sha256 = "sha256-E68V+faMZYhOzKOjiR1Qp7V9ghUnkvPhnYhlCqEmsUQ=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
metrics = builder {
|
||||
name = "metrics";
|
||||
version = "1.0.1";
|
||||
src = fetchHex {
|
||||
pkg = "metrics";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-abCa3dxPdKQHFq5U0UD5O+sPuJeNhjbq3tDDG28JnxY=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
idna = builder {
|
||||
name = "idna";
|
||||
version = "6.1.1";
|
||||
src = fetchHex {
|
||||
pkg = "idna";
|
||||
version = "6.1.1";
|
||||
sha256 = "sha256-kjdut4lEEu0ZrEdeSob3tBPBufu1vRbczVeTQVeUTOo=";
|
||||
};
|
||||
beamDeps = [ unicode_util_compat ];
|
||||
};
|
||||
certifi = builder {
|
||||
name = "certifi";
|
||||
version = "2.15.0";
|
||||
src = fetchHex {
|
||||
pkg = "certifi";
|
||||
version = "2.15.0";
|
||||
sha256 = "sha256-sUftIs5x1y6v2tlPBVFlwcGC9hov9J3yi8xx0dW5SmA=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
zipper = builder {
|
||||
name = "zipper";
|
||||
version = "1.1.0";
|
||||
@@ -92,16 +22,6 @@ let
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
lager = builder {
|
||||
name = "lager";
|
||||
version = "3.9.1";
|
||||
src = fetchHex {
|
||||
pkg = "lager";
|
||||
version = "3.9.1";
|
||||
sha256 = "sha256-P1m6daBKmeXxi/kcifRtzlNvg8bLQV/ibm51pivvN9w=";
|
||||
};
|
||||
beamDeps = [ goldrush ];
|
||||
};
|
||||
katana_code = builder {
|
||||
name = "katana_code";
|
||||
version = "2.4.1";
|
||||
@@ -112,44 +32,6 @@ let
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
jsx = builder {
|
||||
name = "jsx";
|
||||
version = "2.10.0";
|
||||
src = fetchHex {
|
||||
pkg = "jsx";
|
||||
version = "2.10.0";
|
||||
sha256 = "sha256-moPjcEgHKYAWlo21Bvn60PAn3jdUbrg4s64QZMOgrWI=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
hackney = builder {
|
||||
name = "hackney";
|
||||
version = "1.17.1";
|
||||
src = fetchHex {
|
||||
pkg = "hackney";
|
||||
version = "1.17.1";
|
||||
sha256 = "sha256-0sup48gQOtAyBiPp8cM+jTeKFeqr4u6K5EGJjz01oYw=";
|
||||
};
|
||||
beamDeps = [
|
||||
certifi
|
||||
idna
|
||||
metrics
|
||||
mimerl
|
||||
parse_trans
|
||||
ssl_verify_fun
|
||||
unicode_util_compat
|
||||
];
|
||||
};
|
||||
goldrush = builder {
|
||||
name = "goldrush";
|
||||
version = "0.1.9";
|
||||
src = fetchHex {
|
||||
pkg = "goldrush";
|
||||
version = "0.1.9";
|
||||
sha256 = "sha256-mctBKM/8syJ1geXU2APVQT+mQ/TrllI/d9nmk32ZTOs=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
getopt = builder {
|
||||
name = "getopt";
|
||||
version = "1.0.3";
|
||||
@@ -162,32 +44,17 @@ let
|
||||
};
|
||||
elvis_core = builder {
|
||||
name = "elvis_core";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
src = fetchHex {
|
||||
pkg = "elvis_core";
|
||||
version = "4.1.1";
|
||||
sha256 = "sha256-gKViV0uNl0oudUTpqUVXFtBMngldvIyJFeJGgDHdE4U=";
|
||||
version = "4.2.0";
|
||||
sha256 = "sha256-q0Z8fT/zgn+LLN23XIOKsA7qXbkOHMTH5KbXVjpXRb0=";
|
||||
};
|
||||
beamDeps = [
|
||||
katana_code
|
||||
zipper
|
||||
];
|
||||
};
|
||||
egithub = builder {
|
||||
name = "egithub";
|
||||
version = "0.7.0";
|
||||
src = fetchHex {
|
||||
pkg = "egithub";
|
||||
version = "0.7.0";
|
||||
sha256 = "sha256-4AnOEe/YAI0PntWdnEiOPpq+MCoPLNbWY+TMJnVvzEw=";
|
||||
};
|
||||
beamDeps = [
|
||||
goldrush
|
||||
hackney
|
||||
jsx
|
||||
lager
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
self
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
|
||||
import ./generic.nix {
|
||||
version = "3.120";
|
||||
hash = "sha256-HZBiSwiGJs6Ff40SpY8p6kSTl1j793+A8BTjyMH4YQg=";
|
||||
version = "3.120.1";
|
||||
hash = "sha256-of63eISpy2Hzv3/y9FZJWYFG5tcSZdSJGJoWFhZrb1U=";
|
||||
filename = "latest.nix";
|
||||
versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
|
||||
}
|
||||
|
||||
@@ -43,6 +43,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Implementation of QUIC and HTTP/3";
|
||||
homepage = "https://github.com/aiortc/aioquic";
|
||||
changelog = "https://github.com/aiortc/aioquic/blob/${version}/docs/changelog.rst";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
};
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
buildPythonPackage rec {
|
||||
__structuredAttrs = true;
|
||||
pname = "conda";
|
||||
version = "25.11.1";
|
||||
version = "26.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
owner = "conda";
|
||||
repo = "conda";
|
||||
tag = version;
|
||||
hash = "sha256-Jp7C7rwgzVGjNBRwViyDIBom67VevYG5e46/wpAWJX4=";
|
||||
hash = "sha256-u3xxaSNfPocAjzvzEhKNijsa2lR4xiMSpWHP4MTnBzQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "linuxpy";
|
||||
version = "0.21.0";
|
||||
version = "0.23.0";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-13TWyTM1FvyAPNUQ4o3yTQHh7ezxysVMiEl+eLDkHGo=";
|
||||
sha256 = "sha256-q3gPUJL8M1krSjcPZokmMNxE+g1WLWFJYP4g6Q5/APc=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "linuxpy" ];
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urllib3-future";
|
||||
version = "2.15.902";
|
||||
version = "2.15.903";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "urllib3.future";
|
||||
tag = version;
|
||||
hash = "sha256-0ntDskOZX0T1k1avDiJ/xLiNMtHoWdLXMmSUAdSYsoQ=";
|
||||
hash = "sha256-vvTTbaiDjGQX3vjln9q6Q93vZzKxKcBZEjmJSHu00vQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tomcat-native";
|
||||
version = "2.0.12";
|
||||
version = "2.0.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz";
|
||||
hash = "sha256-iJTQ8Vd+eDQlhacGBQt/9LVX/zhc3OoEJEBMWTv9MQQ=";
|
||||
hash = "sha256-TwAsSTxQICeayqdhqYmWS6VpVHk6XAcYvHCWnIuxHdU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${pname}-${version}-src/native";
|
||||
|
||||
@@ -1149,15 +1149,6 @@ with pkgs;
|
||||
|
||||
gitRepo = git-repo;
|
||||
|
||||
merge-fmt = callPackage ../applications/version-management/merge-fmt {
|
||||
inherit (ocamlPackages)
|
||||
buildDunePackage
|
||||
cmdliner
|
||||
base
|
||||
stdio
|
||||
;
|
||||
};
|
||||
|
||||
svn-all-fast-export =
|
||||
libsForQt5.callPackage ../applications/version-management/svn-all-fast-export
|
||||
{ };
|
||||
@@ -1227,8 +1218,6 @@ with pkgs;
|
||||
|
||||
libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
|
||||
|
||||
mame = libsForQt5.callPackage ../applications/emulators/mame { };
|
||||
|
||||
mame-tools = lib.addMetaAttrs {
|
||||
description = mame.meta.description + " (tools only)";
|
||||
} (lib.getOutput "tools" mame);
|
||||
@@ -1559,10 +1548,6 @@ with pkgs;
|
||||
withLibdnssdCompat = true;
|
||||
};
|
||||
|
||||
axel = callPackage ../tools/networking/axel {
|
||||
libssl = openssl;
|
||||
};
|
||||
|
||||
babelfish = callPackage ../shells/fish/babelfish.nix { };
|
||||
|
||||
bat-extras = recurseIntoAttrs (lib.makeScope newScope (import ../tools/misc/bat-extras));
|
||||
@@ -1707,8 +1692,6 @@ with pkgs;
|
||||
|
||||
dino = callPackage ../applications/networking/instant-messengers/dino { };
|
||||
|
||||
dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
|
||||
|
||||
inherit (ocamlPackages) dot-merlin-reader;
|
||||
|
||||
inherit (ocamlPackages) dune-release;
|
||||
@@ -5987,10 +5970,6 @@ with pkgs;
|
||||
)
|
||||
haskellPackages.haskell-ci;
|
||||
|
||||
nixbang = callPackage ../development/tools/misc/nixbang {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
||||
nexusmods-app-unfree = nexusmods-app.override {
|
||||
pname = "nexusmods-app-unfree";
|
||||
_7zz = _7zz-rar;
|
||||
@@ -6647,19 +6626,6 @@ with pkgs;
|
||||
|
||||
grantlee = libsForQt5.callPackage ../development/libraries/grantlee { };
|
||||
|
||||
glib = callPackage ../by-name/gl/glib/package.nix (
|
||||
let
|
||||
glib-untested = glib.overrideAttrs { doCheck = false; };
|
||||
in
|
||||
{
|
||||
# break dependency cycles
|
||||
# these things are only used for tests, they don't get into the closure
|
||||
shared-mime-info = shared-mime-info.override { glib = glib-untested; };
|
||||
desktop-file-utils = desktop-file-utils.override { glib = glib-untested; };
|
||||
dbus = dbus.override { enableSystemd = false; };
|
||||
}
|
||||
);
|
||||
|
||||
glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc;
|
||||
|
||||
# Not moved to aliases while we decide if we should split the package again.
|
||||
@@ -9603,10 +9569,6 @@ with pkgs;
|
||||
|
||||
awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { };
|
||||
|
||||
backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
|
||||
|
||||
backintime-qt = qt6.callPackage ../applications/networking/sync/backintime/qt.nix { };
|
||||
|
||||
backintime = backintime-qt;
|
||||
|
||||
bespokesynth-with-vst2 = bespokesynth.override {
|
||||
@@ -10274,8 +10236,6 @@ with pkgs;
|
||||
|
||||
jackmix_jack1 = jackmix.override { jack = jack1; };
|
||||
|
||||
js8call = qt5.callPackage ../applications/radio/js8call { };
|
||||
|
||||
jwm = callPackage ../applications/window-managers/jwm { };
|
||||
|
||||
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
|
||||
@@ -10952,15 +10912,6 @@ with pkgs;
|
||||
|
||||
curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { });
|
||||
|
||||
prusa-slicer = callPackage ../applications/misc/prusa-slicer {
|
||||
# Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory
|
||||
# on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds
|
||||
# with --cores 32 on clang).
|
||||
stdenv = clangStdenv;
|
||||
};
|
||||
|
||||
super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { };
|
||||
|
||||
super-slicer-beta = super-slicer.beta;
|
||||
|
||||
super-slicer-latest = super-slicer.latest;
|
||||
@@ -11934,8 +11885,6 @@ with pkgs;
|
||||
gnome49Extensions
|
||||
;
|
||||
|
||||
gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { };
|
||||
|
||||
gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { };
|
||||
|
||||
lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { });
|
||||
@@ -12008,10 +11957,6 @@ with pkgs;
|
||||
|
||||
### SCIENCE/BIOLOGY
|
||||
|
||||
cd-hit = callPackage ../applications/science/biology/cd-hit {
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
|
||||
deepdiff = with python3Packages; toPythonApplication deepdiff;
|
||||
|
||||
deep-translator = with python3Packages; toPythonApplication deep-translator;
|
||||
|
||||
Reference in New Issue
Block a user