mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 04:05:40 +03:00
Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
0cae90809c
117 changed files with 733 additions and 1237 deletions
|
|
@ -400,7 +400,7 @@ The propagated equivalent of `depsBuildBuild`. This perhaps never ought to be us
|
|||
|
||||
##### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs}
|
||||
|
||||
The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. If instead, package `Z` has `nativeBuildInputs = [Y]`, then `Z` will be built as if it included `X` in the `depsBuildBuild` of package `Z`, because of the sum of the two `-1` host offsets.
|
||||
The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. Note that if instead, package `Z` has `nativeBuildInputs = [Y]`, then `X` will not be included at all.
|
||||
|
||||
##### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@
|
|||
- `services.dex` now restarts upon changes to the `.environmentFile` or entries in `.settings.staticClients[].secretFile` when the entry is a `path` type.
|
||||
|
||||
- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default.
|
||||
|
||||
- A `nixos-rebuild build-image` sub-command has been added.
|
||||
It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`.
|
||||
|
||||
- `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`.
|
||||
|
||||
It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## New Modules {#sec-release-25.05-new-modules}
|
||||
|
|
|
|||
|
|
@ -7,25 +7,63 @@
|
|||
let
|
||||
inherit (lib)
|
||||
getExe
|
||||
isBool
|
||||
literalExpression
|
||||
maintainers
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkMerge
|
||||
mkOption
|
||||
mkPackageOption
|
||||
optionalString
|
||||
replaceChars
|
||||
substring
|
||||
toLower
|
||||
types
|
||||
;
|
||||
inherit (types) str;
|
||||
inherit (types)
|
||||
bool
|
||||
either
|
||||
listOf
|
||||
str
|
||||
submodule
|
||||
;
|
||||
|
||||
cfg = config.programs.pay-respects;
|
||||
|
||||
settingsFormat = pkgs.formats.toml { };
|
||||
inherit (settingsFormat) generate type;
|
||||
|
||||
finalPackage =
|
||||
if cfg.aiIntegration != true then
|
||||
(pkgs.runCommand "pay-respects-wrapper"
|
||||
{
|
||||
nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
|
||||
inherit (cfg.package) meta;
|
||||
}
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${getExe cfg.package} $out/bin/${cfg.package.meta.mainProgram} \
|
||||
${optionalString (cfg.aiIntegration == false) "--set _PR_AI_DISABLE true"}
|
||||
${optionalString (cfg.aiIntegration != false) ''
|
||||
--set _PR_AI_URL ${cfg.aiIntegration.url} \
|
||||
--set _PR_AI_MODEL ${cfg.aiIntegration.model} \
|
||||
--set _PR_AI_LOCALE ${cfg.aiIntegration.locale}
|
||||
''}
|
||||
''
|
||||
)
|
||||
else
|
||||
cfg.package;
|
||||
|
||||
initScript =
|
||||
shell:
|
||||
if (shell != "fish") then
|
||||
''
|
||||
eval $(${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias})
|
||||
eval $(${getExe finalPackage} ${shell} --alias ${cfg.alias})
|
||||
''
|
||||
else
|
||||
''
|
||||
${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias} | source
|
||||
${getExe finalPackage} ${shell} --alias ${cfg.alias} | source
|
||||
'';
|
||||
in
|
||||
{
|
||||
|
|
@ -33,6 +71,8 @@ in
|
|||
programs.pay-respects = {
|
||||
enable = mkEnableOption "pay-respects, an app which corrects your previous console command";
|
||||
|
||||
package = mkPackageOption pkgs "pay-respects" { };
|
||||
|
||||
alias = mkOption {
|
||||
default = "f";
|
||||
type = str;
|
||||
|
|
@ -41,11 +81,104 @@ in
|
|||
The default value is `f`, but you can use anything else as well.
|
||||
'';
|
||||
};
|
||||
runtimeRules = mkOption {
|
||||
type = listOf type;
|
||||
default = [ ];
|
||||
example = literalExpression ''
|
||||
[
|
||||
{
|
||||
command = "xl";
|
||||
match_err = [
|
||||
{
|
||||
pattern = [
|
||||
"Permission denied"
|
||||
];
|
||||
suggest = [
|
||||
'''
|
||||
#[executable(sudo), !cmd_contains(sudo), err_contains(libxl: error:)]
|
||||
sudo {{command}}
|
||||
'''
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
'';
|
||||
description = ''
|
||||
List of rules to be added to `/etc/xdg/pay-respects/rules`.
|
||||
`pay-respects` will read the contents of these generated rules to recommend command corrections.
|
||||
Each rule module should start with the `command` attribute that specifies the command name. See the [upstream documentation](https://codeberg.org/iff/pay-respects/src/branch/main/rules.md) for more information.
|
||||
'';
|
||||
};
|
||||
aiIntegration = mkOption {
|
||||
default = false;
|
||||
example = {
|
||||
url = "http://127.0.0.1:11434/v1/chat/completions";
|
||||
model = "llama3";
|
||||
locale = "nl-be";
|
||||
};
|
||||
description = ''
|
||||
Whether to enable `pay-respects`' LLM integration. When there is no rule for a given error, `pay-respects` can query an OpenAI-compatible API endpoint for command corrections.
|
||||
|
||||
- If this is set to `false`, all LLM-related features are disabled.
|
||||
- If this is set to `true`, the default OpenAI endpoint will be used, using upstream's API key. This default API key may be rate-limited.
|
||||
- You can also set a custom API endpoint, large language model and locale for command corrections. Simply access the `aiIntegration.url`, `aiIntegration.model` and `aiIntegration.locale` options, as described in the example.
|
||||
- Take a look at the [services.ollama](#opt-services.ollama.enable) NixOS module if you wish to host a local large language model for `pay-respects`.
|
||||
|
||||
For all of these methods, you can set a custom secret API key by using the `_PR_AI_API_KEY` environment variable.
|
||||
'';
|
||||
type = either bool (submodule {
|
||||
options = {
|
||||
url = mkOption {
|
||||
default = "";
|
||||
example = "https://api.openai.com/v1/chat/completions";
|
||||
type = str;
|
||||
description = "The OpenAI-compatible API endpoint that `pay-respects` will query for command corrections.";
|
||||
};
|
||||
model = mkOption {
|
||||
default = "";
|
||||
example = "llama3";
|
||||
type = str;
|
||||
description = "The model used by `pay-respects` to generate command corrections.";
|
||||
};
|
||||
locale = mkOption {
|
||||
default = toLower (replaceChars [ "_" ] [ "-" ] (substring 0 5 config.i18n.defaultLocale));
|
||||
example = "nl-be";
|
||||
type = str;
|
||||
description = ''
|
||||
The locale to be used for LLM responses.
|
||||
The accepted format is a lowercase [`ISO 639-1` language code](https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes), followed by a dash '-', followed by a lowercase [`ISO 3166-1 alpha-2` country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.pay-respects ];
|
||||
assertions =
|
||||
map
|
||||
(attr: {
|
||||
assertion = (!isBool cfg.aiIntegration) -> (cfg.aiIntegration.${attr} != "");
|
||||
message = ''
|
||||
programs.pay-respects.aiIntegration is configured as a submodule, but you have not configured a value for programs.pay-respects.aiIntegration.${attr}!
|
||||
'';
|
||||
})
|
||||
[
|
||||
"url"
|
||||
"model"
|
||||
];
|
||||
environment = mkMerge (
|
||||
[
|
||||
{
|
||||
systemPackages = [ finalPackage ];
|
||||
}
|
||||
]
|
||||
++ map (rule: {
|
||||
etc."xdg/pay-respects/rules/${rule.command}.toml".source = generate "${rule.command}.toml" rule;
|
||||
}) cfg.runtimeRules
|
||||
);
|
||||
|
||||
programs = {
|
||||
bash.interactiveShellInit = initScript "bash";
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ A complete list of options for the Borgbase module may be found
|
|||
A very basic configuration for backing up to a locally accessible directory is:
|
||||
```nix
|
||||
{
|
||||
opt.services.borgbackup.jobs = {
|
||||
services.borgbackup.jobs = {
|
||||
rootBackup = {
|
||||
paths = "/";
|
||||
exclude = [ "/nix" "/path/to/local/repo" ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ let
|
|||
cfg = config.services.wyoming.faster-whisper;
|
||||
|
||||
inherit (lib)
|
||||
escapeShellArgs
|
||||
mkOption
|
||||
mkEnableOption
|
||||
mkPackageOption
|
||||
|
|
@ -240,7 +239,6 @@ in
|
|||
description = ''
|
||||
Extra arguments to pass to the server commandline.
|
||||
'';
|
||||
apply = escapeShellArgs;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ in
|
|||
default = true;
|
||||
description = ''
|
||||
Whether to create a local database automatically.
|
||||
This will override every database setting in {option}`services.engelsystem.config`.
|
||||
This will override every database setting in {option}`services.engelsystem.settings`.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ import ./make-test-python.nix (
|
|||
"curl -c /tmp/cookies -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'"
|
||||
)
|
||||
r = machine.succeed(
|
||||
f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F username=admin -F password=nixos -F _csrf_token={csrf_token.strip()} -D headers"
|
||||
f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F _username=admin -F _password=nixos -F _csrf_token={csrf_token.strip()} -D headers"
|
||||
)
|
||||
print(r)
|
||||
machine.succeed(
|
||||
|
|
|
|||
|
|
@ -10771,6 +10771,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/";
|
||||
};
|
||||
|
||||
pomo-nvim = buildVimPlugin {
|
||||
pname = "pomo.nvim";
|
||||
version = "2024-07-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "epwalsh";
|
||||
repo = "pomo.nvim";
|
||||
rev = "aa8decc421d89be0f10b1fc6a602cdd269f350ff";
|
||||
sha256 = "1drld6dmibkg4b35n181v98gwfi8yhshx1gfkg82k72a5apr77dl";
|
||||
};
|
||||
meta.homepage = "https://github.com/epwalsh/pomo.nvim/";
|
||||
};
|
||||
|
||||
pony-vim-syntax = buildVimPlugin {
|
||||
pname = "pony-vim-syntax";
|
||||
version = "2017-09-26";
|
||||
|
|
|
|||
|
|
@ -892,6 +892,7 @@ https://github.com/aklt/plantuml-syntax/,,
|
|||
https://github.com/nvim-treesitter/playground/,,
|
||||
https://github.com/nvim-lua/plenary.nvim/,,
|
||||
https://github.com/olivercederborg/poimandres.nvim/,HEAD,
|
||||
https://github.com/epwalsh/pomo.nvim/,HEAD,
|
||||
https://github.com/dleonard0/pony-vim-syntax/,,
|
||||
https://github.com/RishabhRD/popfix/,,
|
||||
https://github.com/nvim-lua/popup.nvim/,,
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
qtbase,
|
||||
qttools,
|
||||
libnova,
|
||||
proj_7,
|
||||
proj,
|
||||
libpng,
|
||||
openjpeg,
|
||||
}:
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
bzip2
|
||||
qtbase
|
||||
libnova
|
||||
proj_7
|
||||
proj
|
||||
openjpeg
|
||||
libpng
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.169.2";
|
||||
version = "0.170.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helmfile";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OoCLFhGeciCUC7Tb6+Md8tmamc/j0AeSlu5Krmkhxyc=";
|
||||
hash = "sha256-HlSpY7+Qct2vxtAejrwmmWhnWq+jVycjuxQ42KScpSs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VBgWnDi0jaZ+91kkYeX9QyNBrP9W+mSMjexwzZiKZWs=";
|
||||
vendorHash = "sha256-BmEtzUUORY/ck158+1ItVeiG9mzXdikjjUX7XwQ7xoo=";
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@
|
|||
cmake,
|
||||
pkg-config,
|
||||
# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations
|
||||
boost,
|
||||
# Pin Boost 1.86 due to use of boost::asio::io_service.
|
||||
boost186,
|
||||
ncurses,
|
||||
enableCApi ? true,
|
||||
enablePythonApi ? true,
|
||||
|
|
@ -164,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs =
|
||||
finalAttrs.pythonPath
|
||||
++ [
|
||||
boost
|
||||
boost186
|
||||
libusb1
|
||||
]
|
||||
++ optionals (enableExamples) [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "visualization-projectm";
|
||||
namespace = "visualization.projectm";
|
||||
version = "21.0.1";
|
||||
version = "21.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = namespace;
|
||||
rev = "${version}-${rel}";
|
||||
hash = "sha256-wjSQmOtQb4KjY3iH3Xh7AdQwE6ked+cpW6/gdNYS+NA=";
|
||||
hash = "sha256-M+sHws9wp0sp1PnYXCLMZ9w48tJkG159XkyNvzHJNYo=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ pkg-config libGL projectm ];
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
}:
|
||||
buildLua (finalAttrs: {
|
||||
pname = "modernx";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
scriptPath = "modernz.lua";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Samillion";
|
||||
repo = "ModernZ";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yjxMBGXpu7Uyt0S9AW8ewGRNzbdu2S8N0st7VSKlqcc=";
|
||||
hash = "sha256-njFVAxrO5mGaf5zSA4EZN31SakWcroBZuGXYvTnqi68=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aerc";
|
||||
version = "0.18.2";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rjarry";
|
||||
repo = "aerc";
|
||||
rev = version;
|
||||
hash = "sha256-J4W7ynJ5DpE97sILENNt6eya04aiq9DWBhlytsVmZHg=";
|
||||
hash = "sha256-YlpR85jB6Il3UW4MTaf8pkilRVjkO0q/D/Yu+OiBX6Y=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-STQzc25gRozNHKjjYb8J8CL5WMhnx+nTJOGbuFmUYSU=";
|
||||
vendorHash = "sha256-WowRlAzyrfZi27JzskIDberiYt9PQkuS6H3hKqUP9qo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
scdoc
|
||||
|
|
@ -33,18 +33,13 @@ buildGoModule rec {
|
|||
|
||||
patches = [
|
||||
./runtime-libexec.patch
|
||||
|
||||
# patch to fix a encoding problem with gpg signed messages
|
||||
(fetchpatch {
|
||||
url = "https://git.sr.ht/~rjarry/aerc/commit/7346d20.patch";
|
||||
hash = "sha256-OCm8BcovYN2IDSgslZklQxkGVkSYQ8HLCrf2+DRB2mM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteAllInPlace config/aerc.conf
|
||||
substituteAllInPlace config/config.go
|
||||
substituteAllInPlace doc/aerc-config.5.scd
|
||||
substituteAllInPlace doc/aerc-templates.7.scd
|
||||
|
||||
# Prevent buildGoModule from trying to build this
|
||||
rm contrib/linters.go
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/config/aerc.conf b/config/aerc.conf
|
||||
index 7d33b43..4315f0e 100644
|
||||
index fbc1f3ba..9eea2b81 100644
|
||||
--- a/config/aerc.conf
|
||||
+++ b/config/aerc.conf
|
||||
@@ -202,8 +202,7 @@
|
||||
@@ -301,8 +301,7 @@
|
||||
#
|
||||
# ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
|
||||
# ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
|
||||
|
|
@ -12,7 +12,18 @@ index 7d33b43..4315f0e 100644
|
|||
#
|
||||
#stylesets-dirs=
|
||||
|
||||
@@ -547,8 +546,7 @@ message/rfc822=colorize
|
||||
@@ -741,8 +740,8 @@
|
||||
# ${XDG_DATA_HOME:-~/.local/share}/aerc/filters
|
||||
# $PREFIX/libexec/aerc/filters
|
||||
# $PREFIX/share/aerc/filters
|
||||
-# /usr/libexec/aerc/filters
|
||||
-# /usr/share/aerc/filters
|
||||
+# @out@/libexec/aerc/filters
|
||||
+# @out@/share/aerc/filters
|
||||
#
|
||||
# If you want to run a program in your default $PATH which has the same name
|
||||
# as a builtin filter (e.g. /usr/bin/colorize), use its absolute path.
|
||||
@@ -845,8 +844,7 @@ text/html=! html
|
||||
#
|
||||
# ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
|
||||
# ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
|
||||
|
|
@ -23,10 +34,10 @@ index 7d33b43..4315f0e 100644
|
|||
#template-dirs=
|
||||
|
||||
diff --git a/config/config.go b/config/config.go
|
||||
index d70bcfe..c19e59a 100644
|
||||
index 14c4b233..9f305ffd 100644
|
||||
--- a/config/config.go
|
||||
+++ b/config/config.go
|
||||
@@ -54,10 +54,8 @@ func buildDefaultDirs() []string {
|
||||
@@ -46,10 +46,8 @@ func buildDefaultDirs() []string {
|
||||
}
|
||||
|
||||
// Add fixed fallback locations
|
||||
|
|
@ -40,10 +51,19 @@ index d70bcfe..c19e59a 100644
|
|||
return defaultDirs
|
||||
}
|
||||
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
|
||||
index 9e1f8a3..694abbc 100644
|
||||
index 1e3daaa9..cd118be0 100644
|
||||
--- a/doc/aerc-config.5.scd
|
||||
+++ b/doc/aerc-config.5.scd
|
||||
@@ -300,8 +300,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.
|
||||
@@ -13,7 +13,7 @@ _aerc_, which defaults to _~/.config/aerc_. Alternate files can be specified via
|
||||
command line arguments, see *aerc*(1).
|
||||
|
||||
Examples of these config files are typically included with your installation of
|
||||
-aerc and are usually installed in _/usr/share/aerc_.
|
||||
+aerc and are usually installed in _@out@/share/aerc_.
|
||||
|
||||
Each file uses the ini format, and consists of sections with keys and values.
|
||||
A line beginning with _#_ is considered a comment and ignored, as are empty
|
||||
@@ -386,8 +386,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.
|
||||
```
|
||||
${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
|
||||
${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
|
||||
|
|
@ -53,7 +73,36 @@ index 9e1f8a3..694abbc 100644
|
|||
```
|
||||
|
||||
*styleset-name* = _<string>_
|
||||
@@ -900,8 +899,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.
|
||||
@@ -1019,7 +1018,7 @@ will be set to the terminal TTY. The filter is expected to implement its own
|
||||
paging.
|
||||
|
||||
aerc ships with some default filters installed in the libexec directory (usually
|
||||
-_/usr/libexec/aerc/filters_). Note that these may have additional dependencies
|
||||
+_@out@/libexec/aerc/filters_). Note that these may have additional dependencies
|
||||
that aerc does not have alone.
|
||||
|
||||
The filter commands are invoked with _sh -c command_. The following folders are
|
||||
@@ -1031,8 +1030,8 @@ ${XDG_CONFIG_HOME:-~/.config}/aerc/filters
|
||||
${XDG_DATA_HOME:-~/.local/share}/aerc/filters
|
||||
$PREFIX/libexec/aerc/filters
|
||||
$PREFIX/share/aerc/filters
|
||||
-/usr/libexec/aerc/filters
|
||||
-/usr/share/aerc/filters
|
||||
+@out@/libexec/aerc/filters
|
||||
+@out@/share/aerc/filters
|
||||
```
|
||||
|
||||
If you want to run a program in your default *$PATH* which has the same
|
||||
@@ -1370,7 +1369,7 @@ of the template name. The available symbols and functions are described in
|
||||
*aerc-templates*(7).
|
||||
|
||||
aerc ships with some default templates installed in the share directory (usually
|
||||
-_/usr/share/aerc/templates_).
|
||||
+_@out@/share/aerc/templates_).
|
||||
|
||||
These options are configured in the *[templates]* section of _aerc.conf_.
|
||||
|
||||
@@ -1382,8 +1381,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.
|
||||
```
|
||||
${XDG_CONFIG_HOME:-~/.config}/aerc/templates
|
||||
${XDG_DATA_HOME:-~/.local/share}/aerc/templates
|
||||
|
|
@ -64,19 +113,19 @@ index 9e1f8a3..694abbc 100644
|
|||
|
||||
*new-message* = _<template_name>_
|
||||
diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd
|
||||
index ae9bc6d..5f42b14 100644
|
||||
index a6deb584..4f91869c 100644
|
||||
--- a/doc/aerc-templates.7.scd
|
||||
+++ b/doc/aerc-templates.7.scd
|
||||
@@ -319,7 +319,7 @@ aerc provides the following additional functions:
|
||||
Execute external command, provide the second argument to its stdin.
|
||||
@@ -398,7 +398,7 @@ aerc provides the following additional functions:
|
||||
Attaches a file to the message being composed.
|
||||
|
||||
```
|
||||
- {{exec `/usr/libexec/aerc/filters/html` .OriginalText}}
|
||||
+ {{exec `@out@/libexec/aerc/filters/html` .OriginalText}}
|
||||
- {{.Attach '/usr/libexec/aerc/filters/html'}}
|
||||
+ {{.Attach '@out@/libexec/aerc/filters/html'}}
|
||||
```
|
||||
|
||||
*.Local*
|
||||
@@ -425,7 +425,7 @@ aerc provides the following additional functions:
|
||||
*exec*
|
||||
@@ -581,7 +581,7 @@ aerc provides the following additional functions:
|
||||
|
||||
```
|
||||
{{if eq .OriginalMIMEType "text/html"}}
|
||||
|
|
|
|||
|
|
@ -6,21 +6,22 @@
|
|||
installShellFiles,
|
||||
buildPackages,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
enableLegacySg ? false,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.33.0";
|
||||
version = "0.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-oqG76KzyN5TnE27yxrHeEYjLwrnDMvwbOzOnN6TWvxc=";
|
||||
tag = version;
|
||||
hash = "sha256-p7SJhkCoo4jBDyr+Z2+qxjUwWXWpVMuXd2/DDOM7Z/Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-O3FKn90QVDk1TXJtjmaiDuXr+pwIjsAmadi+aypXeLA=";
|
||||
cargoHash = "sha256-aCBEL+Jx4Kk7PWsxIgpdRdI7AnUAUEtRU4+JMxQ4Swk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -72,13 +73,15 @@ rustPlatform.buildRustPackage rec {
|
|||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
mainProgram = "ast-grep";
|
||||
description = "Fast and polyglot tool for code searching, linting, rewriting at large scale";
|
||||
homepage = "https://ast-grep.github.io/";
|
||||
changelog = "https://github.com/ast-grep/ast-grep/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
xiaoxiangmoe
|
||||
montchr
|
||||
lord-valen
|
||||
|
|
|
|||
|
|
@ -7,20 +7,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "blocky";
|
||||
version = "0.24";
|
||||
version = "0.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xERR0R";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-K+Zdb6l2WUhxVm/gi9U2vVR69bxr2ntLyIrkwTuc0Do=";
|
||||
hash = "sha256-yd9qncTuzf7p1hIYHzzXyxAx1C1QiuQAIYSKcjCiF0E=";
|
||||
};
|
||||
|
||||
# needs network connection and fails at
|
||||
# https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-I4UXTynulsRuu9U8tsLbPQO1MMPfUC5dAZE420sW1sU=";
|
||||
vendorHash = "sha256-Ck80ym64RIubtMHKkXsbN1kFrB6F9G++0U98jPvyoHw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.44.5";
|
||||
version = "1.44.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lLhf83srTHs7jIMiNshcGwue60F5zgbsJOO+w+3S9PU=";
|
||||
hash = "sha256-cvrWcfQj5Pc2tyaQjhhTK9Ko240Bz6dbUe+OFLTz/+M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nQFC9sZoGuAjKT8agDHVtYNOgKMMHzwQ0GY4uoaJHTU=";
|
||||
cargoHash = "sha256-EhcaIkaFPisRKagN8xDMmGrcH9vfMZcj/w53sDQcOp8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -4,26 +4,25 @@
|
|||
fetchFromGitHub,
|
||||
just,
|
||||
pkg-config,
|
||||
rust,
|
||||
rustPlatform,
|
||||
libglvnd,
|
||||
libxkbcommon,
|
||||
wayland,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-panel";
|
||||
version = "unstable-2023-11-13";
|
||||
version = "1.0.0-alpha.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-panel";
|
||||
rev = "f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c";
|
||||
hash = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE=";
|
||||
tag = "epoch-${version}";
|
||||
hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-1XtW72KPdRM5gHIM3Fw2PZCobBXYDMAqjZ//Ebr51tc=";
|
||||
cargoHash = "sha256-EIp9s42deMaB7BDe7RAqj2+CnTXjHCtZjS5Iq8l46A4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "davis";
|
||||
version = "4.4.4";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tchapi";
|
||||
repo = "davis";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nQkyNs718Zrc2BiTNXSXPY23aiviJKoBJeuoSm5ISOI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Zl+6nrgspyg6P9gqYwah81Z6Mtni6nUlCp4gTjJWn9M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zZlDonCwb9tJyckounv96eF4cx6Z/LBoAdB/r600HM4=";
|
||||
vendorHash = "sha256-ZV5GNNtex+yKaMP5KaQkx5EaJRAJSwJjIZOCcXlnVW4=";
|
||||
|
||||
postInstall = ''
|
||||
# Only include the files needed for runtime in the derivation
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "der-ascii";
|
||||
version = "0.3.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LgxGSZQNxwx08mK9G8mSuBFTOd3pC1mvz3Wz7Y+6XR4=";
|
||||
sha256 = "sha256-yUHVPBUW1Csn3W5K9S2TWOq4aovzpaBK8BC0t8zkj3g=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "4.15.3";
|
||||
version = "4.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = "dnscontrol";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0vg3y/bUp5BTFhJbIdohvuj1DNu9bykDwMM3bWnKvNU=";
|
||||
hash = "sha256-Jwv8gIcQD62OV8i5DvIcurcsc6Wkis+kl95lnj8NXds=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JMi4FDgZT94KyqDR57xgp1vnP7Htdn/bksntbQdGyZ0=";
|
||||
vendorHash = "sha256-x/FxspmR89Q2yZI0sP1D9OVUFEjMlpT/0IPusy5zHuo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"amd64": {
|
||||
"path": "pool/main/e/enpass/enpass_6.10.1.1661_amd64.deb",
|
||||
"sha256": "52e9a6819b186b83eb8d8b9e2d5d4f62dedbb24382819738c18cb28976e8b07b",
|
||||
"version": "6.10.1.1661"
|
||||
"path": "pool/main/e/enpass/enpass_6.11.6.1833_amd64.deb",
|
||||
"sha256": "91a7f4ac1bee55106edc6f3e8236b8ef8ed985926482b058899e0c73075f0d56",
|
||||
"version": "6.11.6.1833"
|
||||
},
|
||||
"i386": {
|
||||
"path": "pool/main/e/enpass/enpass_5.6.9_i386.deb",
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epubcheck";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";
|
||||
sha256 = "sha256-gskQ02lGka3nBHSDXO3TpKSQzaoaJUQY9AvWG7L+1YM=";
|
||||
sha256 = "sha256-7Vfbs0lqrm/YDSfvMxaQu9IsYx1PugpbsDYLU2fIC6U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "espflash";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esp-rs";
|
||||
repo = "espflash";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-X9VTwXk/6zAkQb5P9Wz8Pt4oIt2xXfff9dhGb8wauG4=";
|
||||
hash = "sha256-8qFq+OyidW8Bwla6alk/9pXLe3zayHkz5LsqI3jwgY0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -43,7 +43,10 @@ rustPlatform.buildRustPackage rec {
|
|||
SystemConfiguration
|
||||
];
|
||||
|
||||
cargoHash = "sha256-3xUDsznzIRlfGwVuIH1+Ub5tE/ST981KZS/2TAKaBAE=";
|
||||
cargoHash = "sha256-04bBLTpsQNDP0ExvAOjwp3beOktC8rQqFtfEu6d+DWY=";
|
||||
checkFlags = [
|
||||
"--skip cli::monitor::external_processors"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd espflash \
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 5d94bd4..acd2c8d 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1676,7 +1676,7 @@ dependencies = [
|
||||
"libm",
|
||||
"log",
|
||||
"regex",
|
||||
- "time 0.3.34",
|
||||
+ "time 0.3.36",
|
||||
"urlencoding",
|
||||
]
|
||||
|
||||
@@ -2893,9 +2893,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.3.34"
|
||||
+version = "0.3.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
|
||||
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
@@ -2914,9 +2914,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
-version = "0.2.17"
|
||||
+version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
|
||||
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
|
|
@ -15,21 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eww";
|
||||
version = "0.6.0-unstable-2024-07-05";
|
||||
version = "0.6.0-unstable-2025-01-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elkowar";
|
||||
repo = "eww";
|
||||
# FIXME: change to a release tag once a new release is available
|
||||
# https://github.com/elkowar/eww/pull/1084
|
||||
# using the revision to fix string truncation issue in eww config
|
||||
rev = "4d55e9ad63d1fae887726dffcd25a32def23d34f";
|
||||
hash = "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=";
|
||||
rev = "593a4f4666f0bc42790d6d033e64a2b38449090f";
|
||||
hash = "sha256-DbXsiqMyZKNSFmL5aEJwJr+cPnz8qaWe5lNDoovOX/g=";
|
||||
};
|
||||
|
||||
# needed to fix build errors with rust 1.80 due to outdated time crate
|
||||
cargoPatches = [ ./lockfile.patch ];
|
||||
cargoHash = "sha256-55lmQl5pJwrEj5RlSG8b0PqtZVrASxTmX4Qdk090DZo=";
|
||||
cargoHash = "sha256-hS8uNqT37z/89Q5pqfWKm/wijgMyrU8uDT5exn0NZNU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@ let
|
|||
in
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "famistudio";
|
||||
version = "4.3.1";
|
||||
version = "4.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BleuBleu";
|
||||
repo = "FamiStudio";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ISOMsnsvsO3wOp9J/CilCr4wBgkHc29od2a2sBssN7k=";
|
||||
hash = "sha256-on1x7wrcol8rlGWZs+/DndxjhqotDiTXXEbCZx7a3Bw=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ buildGoModule rec {
|
|||
changelog = "https://code.forgejo.org/forgejo/runner/src/tag/${src.rev}/RELEASE-NOTES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
adamcstephens
|
||||
kranzes
|
||||
emilylange
|
||||
christoph-heiss
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import ./generic.nix {
|
||||
version = "9.0.3";
|
||||
hash = "sha256-Ig4iz/ZoRj4lyod73GWY2oRV3E3tx3S4rNqQtsTonzQ=";
|
||||
npmDepsHash = "sha256-yDNlD1l5xuLkkp6LbOlWj9OYHO+WtiAeiu9oIoQLFL8=";
|
||||
vendorHash = "sha256-JLruZi8mXR1f+o9Olhbz44ieEXVGinUNmVi24VEYj28=";
|
||||
version = "10.0.0";
|
||||
hash = "sha256-FcXL+lF2B+EUUEbdD31b1pV7GWbYxk6ewljAXuiV8QY=";
|
||||
npmDepsHash = "sha256-YQDTw5CccnR7zJpvvEcmHZ2pLLNGYEg/mvncNYzcYY8=";
|
||||
vendorHash = "sha256-fqHwqpIetX2jTAWAonRWqF1tArL7Ik/XXURY51jGOn0=";
|
||||
lts = false;
|
||||
nixUpdateExtraArgs = [
|
||||
"--override-filename"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
fetchFromGitHub,
|
||||
stdenv,
|
||||
curl,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
byacc,
|
||||
flex,
|
||||
|
|
@ -11,17 +10,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcli";
|
||||
version = "2.2.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "herrhotzenplotz";
|
||||
repo = "gcli";
|
||||
rev = version;
|
||||
hash = "sha256-extVTaTWVFXSTiXlZ/MtiiFdc/KZEDkc+A7xxylJaM4=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-60B1XRoeSjSEo5nxrCJL9lizq7ELGe8+hdmC4lkMhis=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
byacc
|
||||
flex
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh-poi";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seachicken";
|
||||
repo = "gh-poi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GRTBYwphw5rpwFzLrBRpzz6z6udNCdPn3vanfMvBtGI=";
|
||||
hash = "sha256-foUv6+QIfPlYwgTwxFvEgGeOw/mpC80+ntHo29LQbB8=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0=";
|
||||
|
||||
# Skip checks because some of test suites require fixture.
|
||||
# See: https://github.com/seachicken/gh-poi/blob/v0.12.0/.github/workflows/contract-test.yml#L28-L29
|
||||
# See: https://github.com/seachicken/gh-poi/blob/v0.13.0/.github/workflows/contract-test.yml#L28-L29
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -166,11 +166,11 @@ let
|
|||
|
||||
linux = stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "131.0.6778.264";
|
||||
version = "132.0.6834.83";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-zfPXkfjnvVGO09X4eqTii7rPwieMEsQMy9p9tXb5fDU=";
|
||||
hash = "sha256-qufv7m7iQ8yX6WeNajTbPELCmRhr4GGBa8Wzy+iMFhg=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
|
@ -266,11 +266,11 @@ let
|
|||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "131.0.6778.265";
|
||||
version = "132.0.6834.84";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/accjagybvz5mf6voljw3khsklaaa_131.0.6778.265/GoogleChrome-131.0.6778.265.dmg";
|
||||
hash = "sha256-mHfBmBJVlUYQf8UnCBBTbgizTuV/IucXg2H+i4zhnPU=";
|
||||
url = "http://dl.google.com/release2/chrome/acpvuq6jnnfhesngduj6lnfmy3zq_132.0.6834.84/GoogleChrome-132.0.6834.84.dmg";
|
||||
hash = "sha256-SX8IUdTnIJHwfF9ZwIHZwGZUncJ/NLQpuEL/X8p1KJo=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ingress2gateway";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xAoJREGktbSNGYdrmPuYG2G+xaQ+kReSSA1JBgWaPVY=";
|
||||
hash = "sha256-0w2ZM1g2rr46bN8BNgrkmb3tOQw0FZTMLp/koW01c5I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T6I8uYUaubcc1dfDu6PbQ9bDDLqGuLGXWnCZhdvkycE=";
|
||||
vendorHash = "sha256-7b247/9/9kdNIYuaLvKIv3RK/nzQzruMKZeheTag2sA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "komga";
|
||||
version = "1.16.0";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
|
||||
sha256 = "sha256-6q7ZtTdbH2nIPIm6gNQZz2QxHlbWULsflhWJ0aDMFH4=";
|
||||
sha256 = "sha256-I0xJfX0f1srIjiitBt5EN6j/pOCvfGUIwxCt5sT2UuY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,14 +27,16 @@ stdenv.mkDerivation rec {
|
|||
sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost
|
||||
nativeBuildInputs = [
|
||||
doxygen
|
||||
gperf
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
boost
|
||||
librevenge
|
||||
libxml2
|
||||
perl
|
||||
zlib
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
pkg-config,
|
||||
|
||||
# for passthru.tests
|
||||
deepin,
|
||||
freeimage,
|
||||
hdrmerge,
|
||||
imagemagick,
|
||||
|
|
@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru.tests = {
|
||||
inherit imagemagick hdrmerge freeimage;
|
||||
inherit (deepin) deepin-image-viewer;
|
||||
inherit (python3.pkgs) rawkit;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "live-server";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lomirus";
|
||||
repo = "live-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0XZ7ABR2xSVbixXbjdKiUTcQ7TqAZGyVpWqzMx5kR2g=";
|
||||
hash = "sha256-9NULpK48svCMTx1OeivS+LHVGUGFObg4pBr/V0yIuwM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lMRj+8D5jigCNXld4QfXy3QpRQo4ecCByqoDGC8no1w=";
|
||||
cargoHash = "sha256-QB03sXAGNHu+Yc/UYcmOqYBS/LNbKSoT9PZa11prNtA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-wenkai";
|
||||
version = "1.501";
|
||||
version = "1.510";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz";
|
||||
hash = "sha256-7BBg6TGJzTVgBHPyzTYGFjXmidvAzOVCWAU11LylmBI=";
|
||||
hash = "sha256-RZ+vcFDKMW63oYz4meNvNSIyEdY9I5sKhqOAPKlPP4Q=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "matcha-rss-digest";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piqoni";
|
||||
repo = "matcha";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eexDPewRbAxrMVE7m4WHxeBgRl8xKVdtIpCbYPfp24w=";
|
||||
hash = "sha256-Zs6Och5CsqN2mpnCLgV1VkH4+CV1fklfP20A22rE5y0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CURFy92K4aNF9xC8ik6RDadRAvlw8p3Xc+gWE2un6cc=";
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
substituteInPlace config.mk \
|
||||
--replace "INSTALLDIR = /usr/local" "INSTALLDIR = $out" \
|
||||
--replace "DOCROOT = /var/spool/owntracks/recorder/htdocs" "DOCROOT = $out/htdocs" \
|
||||
--replace "WITH_LUA ?= no" "WITH_LUA ?= yes" \
|
||||
--replace "WITH_ENCRYPT ?= no" "WITH_ENCRYPT ?= yes"
|
||||
|
||||
|
|
@ -62,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
install -m 0755 ot-recorder $out/bin
|
||||
install -m 0755 ocat $out/bin
|
||||
|
||||
cp -r docroot $out/htdocs
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2024-12-30
|
||||
# Last updated: 2025-01-18
|
||||
{
|
||||
version = "3.2.15-2024.12.24";
|
||||
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_amd64_01.deb";
|
||||
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_arm64_01.deb";
|
||||
arm64_hash = "sha256-2+IT7XsK5ziyG9/rihfDhTADwzJ8QDMBz0NyMjZHmzE=";
|
||||
amd64_hash = "sha256-iBiyFK8sKmWUxntZREwdxWCXSSLB8jxiL4eqo2Qy0is=";
|
||||
version = "3.2.15-2025.1.10";
|
||||
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_amd64_01.deb";
|
||||
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_arm64_01.deb";
|
||||
arm64_hash = "sha256-F2R5j0x2BnD9/kIsiUe+IbZpAKDOQdjxwOENzzb4RJo=";
|
||||
amd64_hash = "sha256-hDfaxxXchdZons8Tb5I7bsd7xEjiKpQrJjxyFnz3Y94=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtractor";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz";
|
||||
hash = "sha256-jBJ8qruWBeukuW7zzi9rRayJL+FC1e3f+O3cb6QfdiE=";
|
||||
hash = "sha256-Z32fOS8Um7x2iFy+2SlmsU8mrDLwboNSI4dm0RligBo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
autoconf
|
||||
automake
|
||||
libtool
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
tre
|
||||
];
|
||||
|
||||
|
|
|
|||
1
pkgs/by-name/sw/switch-to-configuration-ng/.envrc
Normal file
1
pkgs/by-name/sw/switch-to-configuration-ng/.envrc
Normal file
|
|
@ -0,0 +1 @@
|
|||
use nix ../../../.. -A switch-to-configuration-ng
|
||||
|
|
@ -1,3 +1,12 @@
|
|||
# switch-to-configuration-ng
|
||||
|
||||
This program is a reimplementation of [switch-to-configuration](/nixos/modules/system/activation/switch-to-configuration.pl) in Rust. The goal is to be compatible in as many ways as possible to the original implementation, at least as long as the original is still in nixpkgs. Any behavioral modifications to this program should also be implemented in the original, and vice versa.
|
||||
|
||||
## Build in a devshell
|
||||
|
||||
```
|
||||
cd ./pkgs/by-name/sw/switch-to-configuration-ng
|
||||
nix-shell ../../../.. -A switch-to-configuration-ng
|
||||
cd ./src
|
||||
cargo build
|
||||
```
|
||||
|
|
|
|||
|
|
@ -5,19 +5,15 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taskchampion-sync-server";
|
||||
version = "0.4.1-unstable-2024-08-20";
|
||||
version = "0.5.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GothenburgBitFactory";
|
||||
repo = "taskchampion-sync-server";
|
||||
rev = "af918bdf0dea7f7b6e920680c947fc37b37ffffb";
|
||||
fetchSubmodules = false;
|
||||
hash = "sha256-BTGD7hZysmOlsT2W+gqj8+Sj6iBN9Jwiyzq5D03PDzM=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uOlubcQ5LAECvQEqgUR/5aLuDGQrdHy+K6vSapACmoo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/HfkE+R8JoNGkCCNQpE/JjGSqPHvjCPnTjOFPCFfJ7A=";
|
||||
|
||||
# cargo tests fail when checkType="release" (default)
|
||||
checkType = "debug";
|
||||
cargoHash = "sha256-Erhr5NduvQyUJSSurKqcZXJe4ExP68t8ysn7hZLAgP4=";
|
||||
|
||||
meta = {
|
||||
description = "Sync server for Taskwarrior 3";
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ttdl";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VladimirMarkelov";
|
||||
repo = "ttdl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ugg6ZrrEAsfgeXBBKrU30orVkcWJV4MgZIVshAv8ys8=";
|
||||
sha256 = "sha256-RHmKCayouxtlbp/dpZlC9d9OuUXHDLVWucnuIP3rEhA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jjkHnxK15WSlhgPpqpU7KNM2KcEi81TrcvIi9gq4YHU=";
|
||||
cargoHash = "sha256-DR0dAaSLQtWcCcCYXPb4vMDzjct0oNk7GMT5BbZuMlE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool to manage todo lists in todo.txt format";
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "warp";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "warp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BUCkENpL1soiYrM1vPNQAZGUbRj1KxWbbgXR0575zGU=";
|
||||
hash = "sha256-RmihaFv+U11CAa5ax53WzpwYJ2PFOrhYt4w2iboW4m8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-afRGCd30qJMqQeEOLDBRdVNJLMfa8/F9BO4Ib/OTtvI=";
|
||||
hash = "sha256-w3gQhyRpma+aJY7IC9Vb3FdIECHZBJoSjiPmKpJ2nM8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,24 +6,19 @@
|
|||
ninja,
|
||||
pkg-config,
|
||||
scdoc,
|
||||
mesa,
|
||||
libgbm,
|
||||
lz4,
|
||||
zstd,
|
||||
ffmpeg,
|
||||
libva,
|
||||
cargo,
|
||||
rustc,
|
||||
git,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
shaderc,
|
||||
vulkan-tools,
|
||||
llvmPackages,
|
||||
autoPatchelfHook,
|
||||
wayland,
|
||||
wayland-scanner,
|
||||
rust-bindgen,
|
||||
egl-wayland,
|
||||
}:
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "waypipe";
|
||||
|
|
@ -55,11 +50,12 @@ llvmPackages.stdenv.mkDerivation rec {
|
|||
rustc
|
||||
wayland-scanner
|
||||
rustPlatform.cargoSetupHook
|
||||
autoPatchelfHook
|
||||
rust-bindgen
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
mesa
|
||||
libgbm
|
||||
lz4
|
||||
zstd
|
||||
ffmpeg
|
||||
|
|
@ -67,6 +63,12 @@ llvmPackages.stdenv.mkDerivation rec {
|
|||
vulkan-loader
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
libgbm
|
||||
ffmpeg.lib
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Network proxy for Wayland clients (applications)";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,23 +1,28 @@
|
|||
{
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
ffmpeg,
|
||||
lib,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ytdl-sub";
|
||||
version = "2024.12.27";
|
||||
version = "2025.01.15";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "ytdl_sub";
|
||||
hash = "sha256-7XZlKGzDLG/MVw198Ii+l29F+Lt53MY5QtHU8k9xJWA=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmbannon";
|
||||
repo = "ytdl-sub";
|
||||
tag = version;
|
||||
hash = "sha256-UjCs71nXi77yvB9BhYxT+2G9I+qHEB5Jnhe+GJuppdY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"yt-dlp"
|
||||
];
|
||||
postPatch = ''
|
||||
echo '__pypi_version__ = "${version}"; __local_version__ = "${version}"' > src/ytdl_sub/__init__.py
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [ "yt-dlp" ];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
|
|
@ -37,6 +42,11 @@ python3Packages.buildPythonApplication rec {
|
|||
"--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/jmbannon/ytdl-sub";
|
||||
description = "Lightweight tool to automate downloading and metadata generation with yt-dlp";
|
||||
|
|
@ -47,6 +57,7 @@ python3Packages.buildPythonApplication rec {
|
|||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
loc
|
||||
defelo
|
||||
];
|
||||
mainProgram = "ytdl-sub";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "zwave-js-ui";
|
||||
version = "9.27.8";
|
||||
version = "9.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zwave-js";
|
||||
repo = "zwave-js-ui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6Twyzt2BMozph39GMG3JghA54LYi40c1+WfSbAAO2oM=";
|
||||
hash = "sha256-uP0WUPhPvjy6CfK0MjLzQGjtRAlDKONXQH8WtW1vJDw=";
|
||||
};
|
||||
npmDepsHash = "sha256-2cDuRCxyn/wNgZks2Qg+iwqRX8CVRz8qVYh4ZlCR55I=";
|
||||
npmDepsHash = "sha256-wRU5CTiwgPvy6exU3/iiuH0fkns+fX7/o0kc0c6VpeU=";
|
||||
|
||||
passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
dtkwidget,
|
||||
dtkdeclarative,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
udisks2-qt5,
|
||||
gio-qt,
|
||||
freeimage,
|
||||
ffmpeg_6,
|
||||
ffmpegthumbnailer,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-album";
|
||||
version = "6.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-kTcVmROsqLH8GwJzAf3zMq/wGYWNvhFBiHODaROt7Do=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
dtkdeclarative
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
udisks2-qt5
|
||||
gio-qt
|
||||
freeimage
|
||||
ffmpeg_6
|
||||
ffmpegthumbnailer
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fashion photo manager for viewing and organizing pictures";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-album";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,111 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
dtkwidget,
|
||||
wayland,
|
||||
dwayland,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
image-editor,
|
||||
ffmpeg_6,
|
||||
ffmpegthumbnailer,
|
||||
libusb1,
|
||||
libpciaccess,
|
||||
portaudio,
|
||||
libv4l,
|
||||
gst_all_1,
|
||||
systemd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-camera";
|
||||
version = "6.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-3q8yV8GpCPKW780YpCn+xLeFBGJFoAMmKSFCAH9OXoE=";
|
||||
};
|
||||
|
||||
# QLibrary and dlopen work with LD_LIBRARY_PATH
|
||||
patches = [ ./dont_use_libPath.diff ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \
|
||||
--replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0"
|
||||
substituteInPlace src/com.deepin.Camera.service \
|
||||
--replace "/usr/bin/qdbus" "${lib.getBin libsForQt5.qttools}/bin/qdbus" \
|
||||
--replace "/usr/share" "$out/share"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
dtkwidget
|
||||
wayland
|
||||
dwayland
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
image-editor
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
ffmpeg_6
|
||||
ffmpegthumbnailer
|
||||
libusb1
|
||||
libpciaccess
|
||||
portaudio
|
||||
libv4l
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]);
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0"
|
||||
"-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
ffmpeg_6
|
||||
ffmpegthumbnailer
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
libusb1
|
||||
libv4l
|
||||
portaudio
|
||||
systemd
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tool to view camera, take photo and video";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-camera";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = lib.teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp
|
||||
index c96c8b0..fcc11da 100644
|
||||
--- a/src/src/gstvideowriter.cpp
|
||||
+++ b/src/src/gstvideowriter.cpp
|
||||
@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps()
|
||||
|
||||
QString GstVideoWriter::libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp
|
||||
index d3c6c24..6d313a6 100644
|
||||
--- a/src/src/mainwindow.cpp
|
||||
+++ b/src/src/mainwindow.cpp
|
||||
@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog()
|
||||
|
||||
QString CMainWindow::libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
qt5platform-plugins,
|
||||
dtkwidget,
|
||||
dtkdeclarative,
|
||||
deepin-ocr-plugin-manager,
|
||||
libraw,
|
||||
freeimage,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-image-viewer";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-YT3wK+ELXjgtsXbkiCjQF0zczQi89tF1kyIQtl9/mMA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-build-with-libraw-0_21.patch";
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch";
|
||||
hash = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt5platform-plugins
|
||||
dtkwidget
|
||||
dtkdeclarative
|
||||
deepin-ocr-plugin-manager
|
||||
libraw
|
||||
freeimage
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image viewing tool with fashion interface and smooth performance";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-image-viewer";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
gsettings-qt,
|
||||
elfutils,
|
||||
ffmpeg_6,
|
||||
ffmpegthumbnailer,
|
||||
mpv,
|
||||
xorg,
|
||||
pcre,
|
||||
libdvdread,
|
||||
libdvdnav,
|
||||
libunwind,
|
||||
libva,
|
||||
zstd,
|
||||
glib,
|
||||
gst_all_1,
|
||||
gtest,
|
||||
libpulseaudio,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-movie-reborn";
|
||||
version = "6.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ=";
|
||||
};
|
||||
|
||||
patches = [ ./dont_use_libPath.diff ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
dtkwidget
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
libsForQt5.qtx11extras
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtdbusextended
|
||||
libsForQt5.qtmpris
|
||||
gsettings-qt
|
||||
elfutils
|
||||
ffmpeg_6
|
||||
ffmpegthumbnailer
|
||||
xorg.libXtst
|
||||
xorg.libXdmcp
|
||||
xorg.xcbproto
|
||||
pcre.dev
|
||||
libdvdread
|
||||
libdvdnav
|
||||
libunwind
|
||||
libva
|
||||
zstd
|
||||
mpv
|
||||
gtest
|
||||
libpulseaudio
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtx11extras
|
||||
ffmpegthumbnailer
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0"
|
||||
"-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
mpv
|
||||
ffmpeg_6
|
||||
ffmpegthumbnailer
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Full-featured video player supporting playing local and streaming media in multiple video formats";
|
||||
mainProgram = "deepin-movie";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-movie-reborn";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
broken = true; # Crash when playing any video
|
||||
};
|
||||
}
|
||||
|
|
@ -1,108 +0,0 @@
|
|||
diff --git a/src/backends/mpv/mpv_proxy.h b/src/backends/mpv/mpv_proxy.h
|
||||
index 1256a06..d76d1c0 100644
|
||||
--- a/src/backends/mpv/mpv_proxy.h
|
||||
+++ b/src/backends/mpv/mpv_proxy.h
|
||||
@@ -38,6 +38,7 @@ typedef void (*mpv_terminateDestroy)(mpv_handle *ctx);
|
||||
|
||||
static QString libPath(const QString &sLib)
|
||||
{
|
||||
+ return sLib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
diff --git a/src/common/hwdec_probe.cpp b/src/common/hwdec_probe.cpp
|
||||
index d70ed0c..ac2516d 100644
|
||||
--- a/src/common/hwdec_probe.cpp
|
||||
+++ b/src/common/hwdec_probe.cpp
|
||||
@@ -83,6 +83,7 @@ bool HwdecProbe::isFileCanHwdec(const QUrl& url, QList<QString>& hwList)
|
||||
|
||||
static QString libPath(const QString &sLib)
|
||||
{
|
||||
+ return sLib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
diff --git a/src/common/platform/platform_thumbnail_worker.cpp b/src/common/platform/platform_thumbnail_worker.cpp
|
||||
index 17b2bdd..82db2b9 100644
|
||||
--- a/src/common/platform/platform_thumbnail_worker.cpp
|
||||
+++ b/src/common/platform/platform_thumbnail_worker.cpp
|
||||
@@ -88,6 +88,7 @@ Platform_ThumbnailWorker::Platform_ThumbnailWorker()
|
||||
|
||||
QString Platform_ThumbnailWorker::libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString lib_path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(lib_path);
|
||||
diff --git a/src/common/thumbnail_worker.cpp b/src/common/thumbnail_worker.cpp
|
||||
index 2ba2888..c34841e 100644
|
||||
--- a/src/common/thumbnail_worker.cpp
|
||||
+++ b/src/common/thumbnail_worker.cpp
|
||||
@@ -88,6 +88,7 @@ ThumbnailWorker::ThumbnailWorker()
|
||||
|
||||
QString ThumbnailWorker::libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString lib_path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(lib_path);
|
||||
diff --git a/src/libdmr/compositing_manager.cpp b/src/libdmr/compositing_manager.cpp
|
||||
index 9b117fc..28a11ec 100644
|
||||
--- a/src/libdmr/compositing_manager.cpp
|
||||
+++ b/src/libdmr/compositing_manager.cpp
|
||||
@@ -237,6 +237,7 @@ bool CompositingManager::isCanHwdec()
|
||||
|
||||
QString CompositingManager::libPath(const QString &sLib)
|
||||
{
|
||||
+ return sLib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
diff --git a/src/libdmr/filefilter.cpp b/src/libdmr/filefilter.cpp
|
||||
index 6691df0..b620a62 100644
|
||||
--- a/src/libdmr/filefilter.cpp
|
||||
+++ b/src/libdmr/filefilter.cpp
|
||||
@@ -72,6 +72,7 @@ FileFilter::FileFilter()
|
||||
|
||||
QString FileFilter::libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
diff --git a/src/libdmr/playlist_model.cpp b/src/libdmr/playlist_model.cpp
|
||||
index 18a8095..9ea4abf 100644
|
||||
--- a/src/libdmr/playlist_model.cpp
|
||||
+++ b/src/libdmr/playlist_model.cpp
|
||||
@@ -449,6 +449,7 @@ PlaylistModel::PlaylistModel(PlayerEngine *e)
|
||||
|
||||
QString PlaylistModel::libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
diff --git a/src/widgets/platform/platform_toolbox_proxy.cpp b/src/widgets/platform/platform_toolbox_proxy.cpp
|
||||
index 570acac..9da0f97 100644
|
||||
--- a/src/widgets/platform/platform_toolbox_proxy.cpp
|
||||
+++ b/src/widgets/platform/platform_toolbox_proxy.cpp
|
||||
@@ -709,6 +709,7 @@ private:
|
||||
|
||||
static QString libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
diff --git a/src/widgets/toolbox_proxy.cpp b/src/widgets/toolbox_proxy.cpp
|
||||
index 05cbc2c..54731bf 100644
|
||||
--- a/src/widgets/toolbox_proxy.cpp
|
||||
+++ b/src/widgets/toolbox_proxy.cpp
|
||||
@@ -760,6 +760,7 @@ private:
|
||||
|
||||
static QString libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
|
|
@ -1,105 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
dde-qt-dbus-factory,
|
||||
image-editor,
|
||||
gsettings-qt,
|
||||
xorg,
|
||||
libusb1,
|
||||
libv4l,
|
||||
ffmpeg,
|
||||
ffmpegthumbnailer,
|
||||
portaudio,
|
||||
dwayland,
|
||||
udev,
|
||||
gst_all_1,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-screen-recorder";
|
||||
version = "6.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko=";
|
||||
};
|
||||
|
||||
patches = [ ./dont_use_libPath.diff ];
|
||||
|
||||
# disable dock plugins, it's part of dde-shell now
|
||||
postPatch = ''
|
||||
substituteInPlace screen_shot_recorder.pro \
|
||||
--replace-fail " src/dde-dock-plugins" ""
|
||||
(
|
||||
shopt -s globstar
|
||||
substituteInPlace **/*.pro **/*.service **/*.desktop \
|
||||
--replace-quiet "/usr/" "$out/"
|
||||
)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
libsForQt5.qmake
|
||||
pkg-config
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
dtkwidget
|
||||
dde-qt-dbus-factory
|
||||
qt5integration
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtx11extras
|
||||
image-editor
|
||||
gsettings-qt
|
||||
xorg.libXdmcp
|
||||
xorg.libXtst
|
||||
xorg.libXcursor
|
||||
libusb1
|
||||
libv4l
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
portaudio
|
||||
dwayland
|
||||
udev
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
udev
|
||||
gst_all_1.gstreamer
|
||||
libv4l
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Screen recorder application for dde";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-screen-recorder";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = lib.teams.deepin.members;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp
|
||||
index 165a7ce..e1574a5 100644
|
||||
--- a/src/gstrecord/gstinterface.cpp
|
||||
+++ b/src/gstrecord/gstinterface.cpp
|
||||
@@ -49,6 +49,7 @@ gstInterface::gstInterface()
|
||||
}
|
||||
QString gstInterface::libPath(const QString &sLib)
|
||||
{
|
||||
+ return sLib;
|
||||
qInfo() << "gstreamer lib name is " << sLib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
diff --git a/src/main_window.cpp b/src/main_window.cpp
|
||||
index e0f6bc5..757abad 100755
|
||||
--- a/src/main_window.cpp
|
||||
+++ b/src/main_window.cpp
|
||||
@@ -559,6 +559,7 @@ void MainWindow::initDynamicLibPath()
|
||||
}
|
||||
QString MainWindow::libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp
|
||||
index b4145fa..97a3f5c 100644
|
||||
--- a/src/waylandrecord/avlibinterface.cpp
|
||||
+++ b/src/waylandrecord/avlibinterface.cpp
|
||||
@@ -105,6 +105,7 @@ avlibInterface::avlibInterface()
|
||||
|
||||
QString avlibInterface::libPath(const QString &sLib)
|
||||
{
|
||||
+ return sLib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
dde-qt-dbus-factory,
|
||||
deepin-movie-reborn,
|
||||
libvlc,
|
||||
gst_all_1,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-voice-note";
|
||||
version = "6.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-GbSYXwJoNfbg+31454GjMbXRqrtk2bSZJCk18ILfAn4=";
|
||||
};
|
||||
|
||||
patches = [ ./use_v23_dbus_interface.diff ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr" "$out"
|
||||
substituteInPlace src/common/audiowatcher.cpp \
|
||||
--replace "/usr/share" "$out/share"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
dtkwidget
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
dde-qt-dbus-factory
|
||||
deepin-movie-reborn
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtwebengine
|
||||
libvlc
|
||||
gtest
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]);
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple memo software with texts and voice recordings";
|
||||
mainProgram = "deepin-voice-note";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-voice-note";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = lib.teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e7bfb81..f56f11a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -103,7 +103,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
|
||||
execute_process(COMMAND cat /etc/os-version OUTPUT_VARIABLE OS_INFO_STR)
|
||||
string(REGEX MATCHALL "MajorVersion=[0-9]+" MAJOR_STR "${OS_INFO_STR}")
|
||||
string(REGEX MATCH "[0-9]+" MAJOR_VERSION "${MAJOR_STR}")
|
||||
-if (MAJOR_VERSION MATCHES "23")
|
||||
+if (TRUE)
|
||||
message("--------------------- OS_BUILD_V23 on")
|
||||
add_definitions(-DOS_BUILD_V23)
|
||||
endif()
|
||||
|
|
@ -21,13 +21,11 @@ let
|
|||
qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
|
||||
qt5integration = callPackage ./library/qt5integration { };
|
||||
deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
|
||||
deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { };
|
||||
dwayland = callPackage ./library/dwayland { };
|
||||
dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };
|
||||
disomaster = callPackage ./library/disomaster { };
|
||||
docparser = callPackage ./library/docparser { };
|
||||
gio-qt = callPackage ./library/gio-qt { };
|
||||
image-editor = callPackage ./library/image-editor { };
|
||||
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
|
||||
util-dfm = callPackage ./library/util-dfm { };
|
||||
dtk6core = callPackage ./library/dtk6core { };
|
||||
|
|
@ -66,22 +64,16 @@ let
|
|||
dde-api-proxy = callPackage ./core/dde-api-proxy { };
|
||||
|
||||
#### Dtk Application
|
||||
deepin-album = callPackage ./apps/deepin-album { };
|
||||
deepin-calculator = callPackage ./apps/deepin-calculator { };
|
||||
deepin-camera = callPackage ./apps/deepin-camera { };
|
||||
deepin-compressor = callPackage ./apps/deepin-compressor { };
|
||||
deepin-draw = callPackage ./apps/deepin-draw { };
|
||||
deepin-editor = callPackage ./apps/deepin-editor { };
|
||||
deepin-image-viewer = callPackage ./apps/deepin-image-viewer { };
|
||||
deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { };
|
||||
deepin-music = callPackage ./apps/deepin-music { };
|
||||
deepin-picker = callPackage ./apps/deepin-picker { };
|
||||
deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { };
|
||||
deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { };
|
||||
deepin-system-monitor = callPackage ./apps/deepin-system-monitor { };
|
||||
deepin-terminal = callPackage ./apps/deepin-terminal { };
|
||||
deepin-reader = callPackage ./apps/deepin-reader { };
|
||||
deepin-voice-note = callPackage ./apps/deepin-voice-note { };
|
||||
deepin-screensaver = callPackage ./apps/deepin-screensaver { };
|
||||
|
||||
#### Go Packages
|
||||
|
|
@ -116,6 +108,14 @@ let
|
|||
go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
|
||||
go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
|
||||
go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
|
||||
deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs, Please use 'vlc' instead"; # added 2025-01-16;
|
||||
deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16
|
||||
deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16
|
||||
deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16
|
||||
deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16
|
||||
deepin-camera = throw "'deepin.deepin-camera' has been removed as it was unmaintained in nixpkgs, Please use 'snapshot' instead"; # added 2025-01-16
|
||||
deepin-image-viewer = throw "'deepin.deepin-image-viewer' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16
|
||||
image-editor = throw "'deepin.image-editor' has been removed as it was unmaintained in nixpkgs"; # added 2025-01-16
|
||||
};
|
||||
in
|
||||
lib.makeScope pkgs.newScope packages
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
cmake,
|
||||
libsForQt5,
|
||||
ncnn,
|
||||
opencv,
|
||||
vulkan-headers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-ocr-plugin-manager";
|
||||
version = "unstable-2023-07-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = "9b5c9e57c83b5adde383ed404b73f9dcbf5e6a48";
|
||||
hash = "sha256-U5lxAKTaQvvlqbqRezPIcBGg+DpF1hZ204Y1+8dt14U=";
|
||||
};
|
||||
|
||||
# don't use vendored opencv
|
||||
postPatch = ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace "opencv_mobile" "opencv4"
|
||||
substituteInPlace src/paddleocr-ncnn/paddleocr.cpp \
|
||||
--replace "/usr" "$out"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.qttools
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncnn
|
||||
opencv
|
||||
vulkan-headers
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin manager of optical character recognition for DDE";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-ocr-plugin-manager";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dtkwidget,
|
||||
cmake,
|
||||
libsForQt5,
|
||||
pkg-config,
|
||||
opencv,
|
||||
freeimage,
|
||||
libmediainfo,
|
||||
ffmpegthumbnailer,
|
||||
pcre,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "image-editor";
|
||||
version = "1.0.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9V9B0YSUTWv/4IbTRtKJSVrZx6j8jqJxIIR9TwUZ0U0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out'
|
||||
substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
opencv
|
||||
freeimage
|
||||
libmediainfo
|
||||
ffmpegthumbnailer
|
||||
pcre
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image editor lib for dtk";
|
||||
homepage = "https://github.com/linuxdeepin/image-editor";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -47,6 +47,8 @@ mkCoqDerivation {
|
|||
release."1.4.0".rev = "168c6b86c7d3f87ee51791f795a8828b1521589a";
|
||||
release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";
|
||||
|
||||
mlPlugin = true; /* uses coq-bignums.plugin */
|
||||
|
||||
propagatedBuildInputs = [ bignums ];
|
||||
enableParallelBuilding = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@ mkCoqDerivation {
|
|||
release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
mlPlugin = true; /* uses coq-bignums.plugin */
|
||||
|
||||
propagatedBuildInputs = [ bignums ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,11 @@
|
|||
coq,
|
||||
bignums,
|
||||
math-classes,
|
||||
coq-elpi,
|
||||
version ? null,
|
||||
}:
|
||||
|
||||
mkCoqDerivation rec {
|
||||
(mkCoqDerivation rec {
|
||||
pname = "corn";
|
||||
inherit version;
|
||||
defaultVersion =
|
||||
|
|
@ -46,6 +47,8 @@ mkCoqDerivation rec {
|
|||
configureScript = "./configure.sh";
|
||||
dontAddPrefix = true;
|
||||
|
||||
mlPlugin = true; /* uses coq-bignums.plugin */
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bignums
|
||||
math-classes
|
||||
|
|
@ -57,4 +60,9 @@ mkCoqDerivation rec {
|
|||
description = "Coq library for constructive analysis";
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
}).overrideAttrs
|
||||
(o: {
|
||||
propagatedBuildInputs =
|
||||
o.propagatedBuildInputs
|
||||
++ lib.optional (lib.versions.isGt "8.19.0" o.version || o.version == "dev") coq-elpi;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
(
|
||||
o:
|
||||
lib.optionalAttrs (o.version == "dev" || lib.versionAtLeast o.version "8.16") {
|
||||
propagatedBuildInputs = [ coq.ocamlPackages.findlib ];
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.findlib ];
|
||||
}
|
||||
// lib.optionalAttrs (o.version == "dev" || lib.versionAtLeast o.version "8.18") {
|
||||
nativeBuildInputs = with coq.ocamlPackages; [
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ mkCoqDerivation {
|
|||
release."8.18.0".sha256 = "sha256-0WwPss8+Vr37zX616xeuS4TvtImtSbToFQkQostIjO8=";
|
||||
release."8.19.0".sha256 = "sha256-rsV96W9MPFi/DKsepNPm1QnC2DMemio+uALIgzVYw0w=";
|
||||
|
||||
mlPlugin = true; /* uses coq-bignums.plugin */
|
||||
|
||||
propagatedBuildInputs = [ bignums ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, octave, buildEnv
|
||||
, makeWrapper, texinfo
|
||||
, makeWrapper
|
||||
, locale, texinfo, glibcLocalesUtf8
|
||||
, wrapOctave
|
||||
, computeRequiredOctavePackages
|
||||
, extraLibs ? []
|
||||
|
|
@ -20,7 +21,7 @@ in buildEnv {
|
|||
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ texinfo wrapOctave ];
|
||||
buildInputs = [ locale texinfo wrapOctave ];
|
||||
|
||||
# During "build" we must first unlink the /share symlink to octave's /share
|
||||
# Then, we can re-symlink the all of octave/share, except for /share/octave
|
||||
|
|
@ -33,7 +34,9 @@ in buildEnv {
|
|||
cd "${octave}/bin"
|
||||
for prg in *; do
|
||||
if [ -x $prg ]; then
|
||||
makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc"
|
||||
makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" \
|
||||
--set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc" \
|
||||
--set LOCALE_ARCHIVE "${glibcLocalesUtf8}/lib/locale/locale-archive"
|
||||
fi
|
||||
done
|
||||
cd $out
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildOctavePackage rec {
|
||||
pname = "netcdf";
|
||||
version = "1.0.17";
|
||||
version = "1.0.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-uuFD8VNeWbyHFyWMDMzWDd2n+dG9EFmc/JnZU2tx+Uk=";
|
||||
sha256 = "sha256-ydgcKFh4uWuSlr7zw+k1JFUSzGm9tiWmOHV1IWvlgwk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
netcdf
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -31,14 +31,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "accelerate";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "accelerate";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KnFf6ge0vUR/C7Rh/c6ZttCGKo9OUIWCUYxk5O+OW7c=";
|
||||
hash = "sha256-HcbvQL8nASsZcfjAoPbQKNoEkSLp5Vmus2MEa3Dv6Po=";
|
||||
};
|
||||
|
||||
buildInputs = [ llvmPackages.openmp ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Noltari";
|
||||
repo = "aioairzone";
|
||||
tag = version;
|
||||
hash = "sha256-ZD/lJwYiggE7fUVGjimgGQ+H8zCtOZrZRElc0crrKhw=";
|
||||
hash = "sha256-wqJpdD4zd5hToZJaacjhoHEC+rSyLjPs7vwwAN92xHM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomeconnect";
|
||||
version = "0.11.0";
|
||||
version = "0.11.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "MartinHjelmare";
|
||||
repo = "aiohomeconnect";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fg3WusrONJtPO/IpHlXzO17C2OuQe28kprXrBG9PqMY=";
|
||||
hash = "sha256-YnQypKeVYoHD445fv9n643qIqjTCInCfbTHPUrMePJI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "httpx" ];
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asf-search";
|
||||
version = "8.0.1";
|
||||
version = "8.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asfadmin";
|
||||
repo = "Discovery-asf_search";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mOhY64Csxdc/DYS1OlbstxYEodtpXTVyPwd4B1jrDK8=";
|
||||
hash = "sha256-9NyBDpCIsRBPN2965SR106h6hxwML7kXv6sY3YlPseA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "tenacity" ];
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "autopep8";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hhatto";
|
||||
repo = "autopep8";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-znZw9SnnVMN8XZjko11J5GK/LAk+gmRkTgPEO9+ntJ8=";
|
||||
hash = "sha256-9OJ5XbzpHMHsFjf5oVyHjn5zqmAxRuSItWP4sQx8jD4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
fetchFromGitHub,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
|
|
@ -29,6 +30,11 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "beartype" ];
|
||||
|
||||
# this test is not run upstream, and broke in 3.13 (_nparams removed)
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.13") [
|
||||
"test_door_is_subhint"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Fast runtime type checking for Python";
|
||||
homepage = "https://github.com/beartype/beartype";
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.36.0";
|
||||
version = "1.36.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -367,7 +367,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-L3Zss6EAAMCEZPSJTM5gf2VwRhnJaXGXD9SaaB0IdbM=";
|
||||
hash = "sha256-9AHlhcx99N37PgL7lcXs+G59QVYcPvuAK6RgjhrUtmA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.36.0";
|
||||
version = "1.36.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-cfDQdIZk25v4TMo0Zq7SQnzEao3eN1OVMIsPJxoecZs=";
|
||||
hash = "sha256-yWCewYS9RFEhq1UpZCv3c9Qgzcckfy0HqAghr+mj9nA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclopts";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "BrianPugh";
|
||||
repo = "cyclopts";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-U2H/SyVqoNlKAiim6FieEQw0SKK/b9diP9AjXb8PZjg=";
|
||||
hash = "sha256-dHmoO9agZBhDviowtvuAox8hJsHcxgQTRxpaYmy50Dk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -1,31 +1,39 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
django,
|
||||
six,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-environ";
|
||||
version = "0.11.2";
|
||||
format = "setuptools";
|
||||
version = "0.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8yqHqgiZiUwn1OF3b6a0d+gWTtf2s+QQpiptcsqvZL4=";
|
||||
pname = "django_environ";
|
||||
inherit version;
|
||||
hash = "sha256-In3IkUU91b3nacNEnPSnS28u6PerI2HJOgcGj0F5BBo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
buildInputs = [ django ];
|
||||
|
||||
# The testsuite fails to modify the base environment
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
six
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "environ" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utilize environment variables to configure your Django application";
|
||||
homepage = "https://github.com/joke2k/django-environ/";
|
||||
changelog = "https://github.com/joke2k/django-environ/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +1,34 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
asgiref,
|
||||
buildPythonPackage,
|
||||
django,
|
||||
pytestCheckHook,
|
||||
fetchFromGitHub,
|
||||
pytest-django,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-htmx";
|
||||
version = "1.19.0";
|
||||
version = "1.21.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adamchainz";
|
||||
repo = "django-htmx";
|
||||
rev = version;
|
||||
hash = "sha256-nSutErUkFafKjBswhC+Lrn39MgCbCrzttAx1a+qt1so=";
|
||||
hash = "sha256-2zmCJ+oHvw21lvCgAFja2LRPA6LNWep4uRor0z1Ft6g=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
asgiref
|
||||
django
|
||||
];
|
||||
buildInputs = [ django ];
|
||||
|
||||
dependencies = [ asgiref ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
|
@ -38,6 +40,7 @@ buildPythonPackage rec {
|
|||
meta = {
|
||||
description = "Extensions for using Django with htmx";
|
||||
homepage = "https://github.com/adamchainz/django-htmx";
|
||||
changelog = "https://github.com/adamchainz/django-htmx/blob/${version}/docs/changelog.rst";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ minijackson ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-import-export";
|
||||
version = "4.3.3";
|
||||
version = "4.3.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-import-export";
|
||||
repo = "django-import-export";
|
||||
tag = version;
|
||||
hash = "sha256-1vb8a0ntp5ikWrJ3aI4KsGlraXRoFa7o+sP2sJpFbVc=";
|
||||
hash = "sha256-o21xT+gu1vuar/QJbXhg2hpHkrBCVOMhGAFngi32d10=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "tablib" ];
|
||||
|
|
|
|||
|
|
@ -1,37 +1,42 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchPypi,
|
||||
django,
|
||||
djangorestframework,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-taggit";
|
||||
version = "5.0.1";
|
||||
format = "setuptools";
|
||||
version = "6.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7c19seDzXDBOCCovYx3awuFu9SlgKVJOt5KvdDDKtMw=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = "django-taggit";
|
||||
tag = version;
|
||||
hash = "sha256-QLJhO517VONuf+8rrpZ6SXMP/WWymOIKfd4eyviwCsU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "taggit" ];
|
||||
buildInputs = [ django ];
|
||||
|
||||
nativeCheckInputs = [ djangorestframework ];
|
||||
|
||||
pythonImportsCheck = [ "taggit" ];
|
||||
|
||||
checkPhase = ''
|
||||
# prove we're running tests against installed package, not build dir
|
||||
rm -r taggit
|
||||
# Replace directory of locale
|
||||
substituteInPlace ./tests/test_utils.py \
|
||||
--replace 'os.path.dirname(__file__), ".."' "\"$out/lib/python${lib.versions.majorMinor python.version}/site-packages/\""
|
||||
substituteInPlace tests/test_utils.py \
|
||||
--replace-fail 'os.path.dirname(__file__), ".."' "\"$out/lib/python${lib.versions.majorMinor python.version}/site-packages/\""
|
||||
${python.interpreter} -m django test --settings=tests.settings
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fedora-messaging";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fedora-infra";
|
||||
repo = "fedora-messaging";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-t5jwEgKLSB8APie+TD3WpgPYcAAPzEQLA+jXGlWVuNU=";
|
||||
hash = "sha256-MBvFrOUrcPhsFR9yD7yqRM4Yf2StcNvL3sqFIn6XbMc=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fireflyalgorithm";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -19,23 +19,28 @@ buildPythonPackage rec {
|
|||
owner = "firefly-cpp";
|
||||
repo = "FireflyAlgorithm";
|
||||
tag = version;
|
||||
hash = "sha256-dJnjeJN9NI8G/haYeOiMtAl56cExqMk0iTWpaybl4nE=";
|
||||
hash = "sha256-NMmwjKtIk8KR0YXXSXkJhiQsbjMusaLnstUWx0izCNA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'numpy = "^1.26.1"' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [ numpy ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "fireflyalgorithm" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Implementation of the stochastic nature-inspired algorithm for optimization";
|
||||
mainProgram = "firefly-algorithm";
|
||||
homepage = "https://github.com/firefly-cpp/FireflyAlgorithm";
|
||||
changelog = "https://github.com/firefly-cpp/FireflyAlgorithm/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ firefly-cpp ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ firefly-cpp ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
isPy27,
|
||||
pythonOlder,
|
||||
fetchPypi,
|
||||
setuptools-scm,
|
||||
six,
|
||||
dnspython,
|
||||
legacy-cgi,
|
||||
pycountry,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
|
@ -13,9 +14,9 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "formencode";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = isPy27;
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "FormEncode";
|
||||
|
|
@ -27,9 +28,12 @@ buildPythonPackage rec {
|
|||
sed -i '/setuptools_scm_git_archive/d' setup.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
dependencies = [
|
||||
six
|
||||
legacy-cgi
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
dnspython
|
||||
|
|
@ -43,10 +47,10 @@ buildPythonPackage rec {
|
|||
"test_unicode_ascii_subgroup"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "FormEncode validates and converts nested structures";
|
||||
homepage = "http://formencode.org";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.49.0";
|
||||
version = "3.50.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
tag = version;
|
||||
hash = "sha256-gqY26EoVUgpNQ83Egmnb/mBnLcB6MmFNs4W7ZsZziK0=";
|
||||
hash = "sha256-gjctcpaV9L8x4ubS4Ox6kyNG7/kl7tZt9c9/7SWVXkg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "gotenberg-client";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "stumpylog";
|
||||
repo = "gotenberg-client";
|
||||
tag = version;
|
||||
hash = "sha256-EMukzSY8nfm1L1metGhiEc9VqnI/vaLz7ITgbZi0fBw=";
|
||||
hash = "sha256-4tIkwfqFKERVQMB9nGwGfdMtxCWm3q4hrSWnEqA0qd8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "mkdocstrings";
|
||||
repo = "griffe";
|
||||
tag = version;
|
||||
hash = "sha256-F1/SjWy32d/CU86ZR/PK0QPiRMEbUNNeomZOBP/3K/k=";
|
||||
hash = "sha256-SyyyNBhJVVKAzPl288B7E2PoqNd9Pp9VmSJASYez6Gs=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibm-cloud-sdk-core";
|
||||
version = "3.22.0";
|
||||
version = "3.22.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IBM";
|
||||
repo = "python-sdk-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gNEd79kOtDlFJg3Ji9kO6VGGsy/VGxd6GzC/cuen9M0=";
|
||||
hash = "sha256-wXffw+/esHvWxrNdlnYLTPflgOaRyIdf0hxI4M12Xdc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "requests" ];
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libcst";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -32,14 +32,13 @@ buildPythonPackage rec {
|
|||
owner = "Instagram";
|
||||
repo = "LibCST";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fveY4ah94pv9ImI36MNrrxTpZv/DtLb45pXm67L8/GA=";
|
||||
hash = "sha256-OuokZvdaCTgZI1VoXInqs6YNLsVUohaat5IjYYvUeVE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
inherit pname version src;
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-TcWGW1RF2se89BtvQHO+4BwnRMZ8ygqO3du9Q/gZi/Q=";
|
||||
hash = "sha256-+sCBkCR2CxgG/NuWch8sZTCitKynZmF221mR16TbQKI=";
|
||||
};
|
||||
|
||||
cargoRoot = "native";
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "marshmallow-sqlalchemy";
|
||||
version = "1.1.0";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "marshmallow_sqlalchemy";
|
||||
inherit version;
|
||||
hash = "sha256-KrCS2iadr6igXVGlhAmvcajSGDlYukcUMSfdI54DWdg=";
|
||||
hash = "sha256-Xd9YPddf31qzHfdph82iupGUKZa6XVd+ktZ0j6k6X1I=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,109 @@
|
|||
From 360cb75317aecaf6b9abcf24f0577afef75c464e Mon Sep 17 00:00:00 2001
|
||||
From: wxt <3264117476@qq.com>
|
||||
Date: Mon, 6 Jan 2025 20:41:27 +0800
|
||||
Subject: [PATCH] fix(test): replace np.float_ to np.float64
|
||||
|
||||
---
|
||||
mlxtend/_base/_regressor.py | 2 +-
|
||||
mlxtend/_base/tests/test_classifier.py | 2 +-
|
||||
mlxtend/_base/tests/test_cluster.py | 2 +-
|
||||
mlxtend/classifier/multilayerperceptron.py | 2 +-
|
||||
mlxtend/classifier/softmax_regression.py | 2 +-
|
||||
mlxtend/math/linalg.py | 2 +-
|
||||
mlxtend/plotting/tests/test_decision_regions.py | 2 +-
|
||||
7 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/mlxtend/_base/_regressor.py b/mlxtend/_base/_regressor.py
|
||||
index e3d0a1d..1d3a5d6 100644
|
||||
--- a/mlxtend/_base/_regressor.py
|
||||
+++ b/mlxtend/_base/_regressor.py
|
||||
@@ -16,7 +16,7 @@ class _Regressor(object):
|
||||
pass
|
||||
|
||||
def _check_target_array(self, y, allowed=None):
|
||||
- if not isinstance(y[0], (float, np.float_)):
|
||||
+ if not isinstance(y[0], (float, np.float64)):
|
||||
raise AttributeError("y must be a float array.\nFound %s" % y.dtype)
|
||||
|
||||
def fit(self, X, y, init_params=True):
|
||||
diff --git a/mlxtend/_base/tests/test_classifier.py b/mlxtend/_base/tests/test_classifier.py
|
||||
index f77f74d..1bbac6d 100644
|
||||
--- a/mlxtend/_base/tests/test_classifier.py
|
||||
+++ b/mlxtend/_base/tests/test_classifier.py
|
||||
@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1():
|
||||
|
||||
|
||||
def test_check_labels_integer_notok():
|
||||
- y = np.array([1.0, 2.0], dtype=np.float_)
|
||||
+ y = np.array([1.0, 2.0], dtype=np.float64)
|
||||
cl = BlankClassifier(print_progress=0, random_seed=1)
|
||||
with pytest.raises(AttributeError) as excinfo:
|
||||
cl._check_target_array(y)
|
||||
diff --git a/mlxtend/_base/tests/test_cluster.py b/mlxtend/_base/tests/test_cluster.py
|
||||
index 6da1a9d..54c2526 100644
|
||||
--- a/mlxtend/_base/tests/test_cluster.py
|
||||
+++ b/mlxtend/_base/tests/test_cluster.py
|
||||
@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1():
|
||||
|
||||
|
||||
def test_check_labels_integer_notok():
|
||||
- y = np.array([1.0, 2.0], dtype=np.float_)
|
||||
+ y = np.array([1.0, 2.0], dtype=np.float64)
|
||||
cl = BlankClassifier(print_progress=0, random_seed=1)
|
||||
with pytest.raises(AttributeError) as excinfo:
|
||||
cl._check_target_array(y)
|
||||
diff --git a/mlxtend/classifier/multilayerperceptron.py b/mlxtend/classifier/multilayerperceptron.py
|
||||
index 770dab9..05416c3 100644
|
||||
--- a/mlxtend/classifier/multilayerperceptron.py
|
||||
+++ b/mlxtend/classifier/multilayerperceptron.py
|
||||
@@ -143,7 +143,7 @@ class MultiLayerPerceptron(
|
||||
prev_grad_b_out = np.zeros(shape=self.b_["out"].shape)
|
||||
prev_grad_w_out = np.zeros(shape=self.w_["out"].shape)
|
||||
|
||||
- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_)
|
||||
+ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64)
|
||||
|
||||
self.init_time_ = time()
|
||||
|
||||
diff --git a/mlxtend/classifier/softmax_regression.py b/mlxtend/classifier/softmax_regression.py
|
||||
index 56444e5..173154e 100644
|
||||
--- a/mlxtend/classifier/softmax_regression.py
|
||||
+++ b/mlxtend/classifier/softmax_regression.py
|
||||
@@ -141,7 +141,7 @@ class SoftmaxRegression(_BaseModel, _IterativeModel, _Classifier, _MultiClass):
|
||||
)
|
||||
self.cost_ = []
|
||||
|
||||
- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_)
|
||||
+ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64)
|
||||
|
||||
self.init_time_ = time()
|
||||
rgen = np.random.RandomState(self.random_seed)
|
||||
diff --git a/mlxtend/math/linalg.py b/mlxtend/math/linalg.py
|
||||
index 02600f1..ece4c3c 100644
|
||||
--- a/mlxtend/math/linalg.py
|
||||
+++ b/mlxtend/math/linalg.py
|
||||
@@ -45,7 +45,7 @@ def vectorspace_orthonormalization(ary, eps=1e-13): # method='gram-schmidt',
|
||||
# 2c) Normalize if linearly independent,
|
||||
# and set to zero otherwise
|
||||
|
||||
- arr = ary.astype(np.float_).copy()
|
||||
+ arr = ary.astype(np.float64).copy()
|
||||
|
||||
for i in range(arr.shape[1]):
|
||||
for j in range(i):
|
||||
diff --git a/mlxtend/plotting/tests/test_decision_regions.py b/mlxtend/plotting/tests/test_decision_regions.py
|
||||
index fba2255..aad63ff 100644
|
||||
--- a/mlxtend/plotting/tests/test_decision_regions.py
|
||||
+++ b/mlxtend/plotting/tests/test_decision_regions.py
|
||||
@@ -94,7 +94,7 @@ def test_y_int_ary():
|
||||
"Try passing the array as y.astype(np.int_)",
|
||||
plot_decision_regions,
|
||||
X[:, :2],
|
||||
- y.astype(np.float_),
|
||||
+ y.astype(np.float64),
|
||||
sr,
|
||||
)
|
||||
|
||||
--
|
||||
2.47.0
|
||||
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
pytestCheckHook,
|
||||
scipy,
|
||||
numpy,
|
||||
numpy_1,
|
||||
scikit-learn,
|
||||
pandas,
|
||||
matplotlib,
|
||||
|
|
@ -22,7 +23,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rasbt";
|
||||
repo = pname;
|
||||
repo = "mlxtend";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-c6I0dwu4y/Td2G6m2WP/52W4noQUmQMDvpzXA9RZauo=";
|
||||
};
|
||||
|
|
@ -38,10 +39,22 @@ buildPythonPackage rec {
|
|||
joblib
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://github.com/rasbt/mlxtend/pull/1119
|
||||
./0001-fix-test-replace-np.float_-to-np.float64.patch
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [ "-sv" ];
|
||||
|
||||
disabledTests = [
|
||||
# Type changed in numpy2 test should be updated
|
||||
"test_invalid_labels_1"
|
||||
"test_default"
|
||||
"test_nullability"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"mlxtend/evaluate/f_test.py" # need clean
|
||||
"mlxtend/evaluate/tests/test_feature_importance.py" # urlopen error
|
||||
|
|
|
|||
|
|
@ -390,8 +390,8 @@ rec {
|
|||
"sha256-UkuWWk99OTXMMhYMuAby9rbJjlhYBI0WwA9clnz4U9A=";
|
||||
|
||||
mypy-boto3-detective =
|
||||
buildMypyBoto3Package "detective" "1.36.0"
|
||||
"sha256-qumyLsWuOFuwiBK1XN558ag8LlEA5jfHofy5dKK+Gbw=";
|
||||
buildMypyBoto3Package "detective" "1.36.2"
|
||||
"sha256-91C7CVfMmGvvfm4GdnDuWzSXi1sDsL5qj8YLC17loiI=";
|
||||
|
||||
mypy-boto3-devicefarm =
|
||||
buildMypyBoto3Package "devicefarm" "1.36.0"
|
||||
|
|
@ -446,8 +446,8 @@ rec {
|
|||
"sha256-YrzTW5fEsZPDu4p84jhY4avS/wM01XybrvGCOtF48cQ=";
|
||||
|
||||
mypy-boto3-ec2 =
|
||||
buildMypyBoto3Package "ec2" "1.36.0"
|
||||
"sha256-/dFXF0dKEF0wPQoh04dY9X0x8JqaxgFLtOYJocBwshA=";
|
||||
buildMypyBoto3Package "ec2" "1.36.2"
|
||||
"sha256-IwQg73lI34QtCjedW3ctRC0tzNAOXvgJl2s09GV6Zg0=";
|
||||
|
||||
mypy-boto3-ec2-instance-connect =
|
||||
buildMypyBoto3Package "ec2-instance-connect" "1.36.0"
|
||||
|
|
@ -462,8 +462,8 @@ rec {
|
|||
"sha256-ezh5me1scgEEH0I/19CSVDstsLkwYgdVhwPuVivbKWk=";
|
||||
|
||||
mypy-boto3-ecs =
|
||||
buildMypyBoto3Package "ecs" "1.36.0"
|
||||
"sha256-uO/y0aDNH4aayyvRDFH/WedHTku0A8QRvrzCe34P6gY=";
|
||||
buildMypyBoto3Package "ecs" "1.36.1"
|
||||
"sha256-bpE0iwtVksX2ByM7DSV+Y81ev8Ml896Wc9FciZEmjdA=";
|
||||
|
||||
mypy-boto3-efs =
|
||||
buildMypyBoto3Package "efs" "1.36.0"
|
||||
|
|
@ -1174,8 +1174,8 @@ rec {
|
|||
"sha256-oLFs4pHfXJbG5cenQi83ur7ZaMfPLYzqp4AvvAadg+k=";
|
||||
|
||||
mypy-boto3-sagemaker =
|
||||
buildMypyBoto3Package "sagemaker" "1.36.0"
|
||||
"sha256-FogxXsF3rVx33QF9Mo6RJhjsbgrEVLR037Js+SIYczI=";
|
||||
buildMypyBoto3Package "sagemaker" "1.36.2"
|
||||
"sha256-M4H/GVm8hLISSyKR6VtpUzTBOtRiaIr5DY5ZkM9mhk4=";
|
||||
|
||||
mypy-boto3-sagemaker-a2i-runtime =
|
||||
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.36.0"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "niaarm";
|
||||
version = "0.3.12";
|
||||
version = "0.3.13";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "firefly-cpp";
|
||||
repo = "NiaARM";
|
||||
tag = version;
|
||||
hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y=";
|
||||
hash = "sha256-nDgGX5KbthOBXX5jg99fGT28ZuBx0Hxb+aHak3Uvjoc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nitransforms";
|
||||
version = "24.1.0";
|
||||
version = "24.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QOOc3A/oADnjOtxgLqArwXIikwNDApVY4yHAYt9ENRU=";
|
||||
hash = "sha256-U2lWxYDuA+PpMEMgjanq/JILWTTH5+DEx9dZ/KCWNjM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue