gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-08-30 18:05:12 +00:00
committed by GitHub
parent 45859bff28 320a8effd2
commit 7efb6e23d9
128 changed files with 2314 additions and 2443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/redirects.json
-15
View File
@@ -225,12 +225,6 @@
"sec-language-cosmic": [
"index.html#sec-language-cosmic"
],
"sec-meta-identifiers": [
"index.html#sec-meta-identifiers"
],
"sec-meta-identifiers-cpe": [
"index.html#sec-meta-identifiers-cpe"
],
"sec-modify-via-packageOverrides": [
"index.html#sec-modify-via-packageOverrides"
],
@@ -631,15 +625,6 @@
"typst-package-scope-and-usage": [
"index.html#typst-package-scope-and-usage"
],
"var-meta-identifiers-cpe": [
"index.html#var-meta-identifiers-cpe"
],
"var-meta-identifiers-cpeParts": [
"index.html#var-meta-identifiers-cpeParts"
],
"var-meta-identifiers-possibleCPEs": [
"index.html#var-meta-identifiers-possibleCPEs"
],
"var-go-buildTestBinaries": [
"index.html#var-go-buildTestBinaries"
],
doc/stdenv/meta.chapter.md
-71
View File
@@ -248,74 +248,3 @@ Code to be executed on a peripheral device or embedded controller, built by a th
### `lib.sourceTypes.binaryBytecode` {#lib.sourceTypes.binaryBytecode}
Code to run on a VM interpreter or JIT compiled into bytecode by a third party. This includes packages which download Java `.jar` files from another source.
## Software identifiers {#sec-meta-identifiers}
Package's `meta.identifiers` attribute specifies information about software identifiers associated with this package. Software identifiers are used, for example:
* to generate Software Bill of Materials (SBOM) that lists all components used to build the software, which can later be used to perform vulnerability or license analysis of the resulting software;
* to lookup software in different vulnerability databases or report new vulnerabilities to them.
Overriding the default `meta.identifiers` attribute is optional, but it is recommended to fill in pieces to help tools mentioned above get precise data.
For example, we could get automatic notifications about potential vulnerabilities for users in the future.
All identifiers specified in `meta.identifiers` are expected to be unambiguous and valid.
`meta.identifiers` contains `v1` attribute which is an attribute set that guarantees backward compatibility of its constituents. Right now it contains copies of all other attributes in `meta.identifiers`.
### CPE {#sec-meta-identifiers-cpe}
Common Platform Enumeration (CPE) is a specification maintained by NIST as part of the Security Content Automation Protocol (SCAP). It is used to identify software in National Vulnerabilities Database (NVD, https://nvd.nist.gov) and other vulnerability databases.
Current version of CPE 2.3 consists of 13 parts:
```
cpe:2.3:a:<vendor>:<product>:<version>:<update>:<edition>:<language>:<sw_edition>:<target_sw>:<target_hw>:<other>
```
Some of them are as follows:
* *CPE version* - current version of CPE is `2.3`
* *part* - usually in Nixpkgs `a` for "application", can also be `o` for "operating system" or `h` for "hardware"
* *vendor* - can point to the source of the package, or to Nixpkgs itself
* *product* - name of the package
* *version* - version of the package
* *update* - name of the latest update, can be a patch version for semantically versioned packages
* *edition* - any additional specification about the version
You can find information about all of these attributes in the [official specification](https://csrc.nist.gov/projects/security-content-automation-protocol/specifications/cpe/naming) (heading 5.3.3, pages 11-13).
Any fields that don't have a value are set to either `-` if the value is not available or `*` when the field can match any value.
For example, for glibc 2.40.1 CPE would be `cpe:2.3:a:gnu:glibc:2.40:1:*:*:*:*:*:*`.
#### `meta.identifiers.cpeParts` {#var-meta-identifiers-cpeParts}
This attribute contains an attribute set of all parts of the CPE for this package. Most of the parts default to `*` (match any value), with some exceptions:
* `part` defaults to `a` (application), can also be set to `o` for operating systems, for example, Linux kernel, or to `h` for hardware
* `vendor` cannot be deduced from other sources, so it must be specified by the package author
* `product` defaults to provided derivation's `pname` attribute and must be provided explicitly if `pname` is missing
* `version` and `update` have no defaults and should be specified explicitly or using helper functions, when missing, `cpe` attribute will be empty, and all possible guesses using helper functions will be in `possibleCPEs` attribute.
It is up to the package author to make sure all parts are correct and match expected values in [NVD dictionary](https://nvd.nist.gov/products/cpe). Unknown values can be skipped, which would leave them with the default value of `*`.
Following functions help with filling out `version` and `update` fields:
* [`lib.meta.cpeFullVersionWithVendor`](#function-library-lib.meta.cpeFullVersionWithVendor)
* [`lib.meta.cpePatchVersionInUpdateWithVendor`](#function-library-lib.meta.cpePatchVersionInUpdateWithVendor)
For many packages to make CPE available it should be enough to specify only:
```nix
{
# ...
meta.identifiers.cpeParts = lib.meta.cpePatchVersionInUpdateWithVendor vendor version;
}
```
#### `meta.identifiers.cpe` {#var-meta-identifiers-cpe}
A readonly attribute that concatenates all CPE parts in one string.
#### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs}
A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess.
lib/meta.nix
+1 -188
View File
@@ -15,12 +15,7 @@ let
assertMsg
;
inherit (lib.attrsets) mapAttrs' filterAttrs;
inherit (builtins)
isString
match
typeOf
elemAt
;
inherit (builtins) isString match typeOf;
in
rec {
@@ -489,186 +484,4 @@ rec {
assert assertMsg (match ".*/.*" y == null)
"lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead.";
"${getBin x}/bin/${y}";
/**
Generate [CPE parts](#var-meta-identifiers-cpeParts) from inputs. Copies `vendor` and `version` to the output, and sets `update` to `*`.
# Inputs
`vendor`
: package's vendor
`version`
: package's version
# Type
```
cpeFullVersionWithVendor :: string -> string -> AttrSet
```
# Examples
:::{.example}
## `lib.meta.cpeFullVersionWithVendor` usage example
```nix
lib.meta.cpeFullVersionWithVendor "gnu" "1.2.3"
=> {
vendor = "gnu";
version = "1.2.3";
update = "*";
}
```
:::
:::{.example}
## `lib.meta.cpeFullVersionWithVendor` usage in derivations
```nix
mkDerivation rec {
version = "1.2.3";
# ...
meta = {
# ...
identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version;
};
}
```
:::
*/
cpeFullVersionWithVendor = vendor: version: {
inherit vendor version;
update = "*";
};
/**
Alternate version of [`lib.meta.cpePatchVersionInUpdateWithVendor`](#function-library-lib.meta.cpePatchVersionInUpdateWithVendor).
If `cpePatchVersionInUpdateWithVendor` succeeds, returns an attribute set with `success` set to `true` and `value` set to the result.
Otherwise, `success` is set to `false` and `error` is set to the string representation of the error.
# Inputs
`vendor`
: package's vendor
`version`
: package's version
# Type
```
tryCPEPatchVersionInUpdateWithVendor :: string -> string -> AttrSet
```
# Examples
:::{.example}
## `lib.meta.tryCPEPatchVersionInUpdateWithVendor` usage example
```nix
lib.meta.tryCPEPatchVersionInUpdateWithVendor "gnu" "1.2.3"
=> {
success = true;
value = {
vendor = "gnu";
version = "1.2";
update = "3";
};
}
```
:::
:::{.example}
## `lib.meta.cpePatchVersionInUpdateWithVendor` error example
```nix
lib.meta.tryCPEPatchVersionInUpdateWithVendor "gnu" "5.3p0"
=> {
success = false;
error = "version 5.3p0 doesn't match regex `([0-9]+\\.[0-9]+)\\.([0-9]+)`";
}
```
:::
*/
tryCPEPatchVersionInUpdateWithVendor =
vendor: version:
let
regex = "([0-9]+\\.[0-9]+)\\.([0-9]+)";
# we have to call toString here in case version is an attrset with __toString attribute
versionMatch = builtins.match regex (toString version);
in
if versionMatch == null then
{
success = false;
error = "version ${version} doesn't match regex `${regex}`";
}
else
{
success = true;
value = {
inherit vendor;
version = elemAt versionMatch 0;
update = elemAt versionMatch 1;
};
};
/**
Generate [CPE parts](#var-meta-identifiers-cpeParts) from inputs. Copies `vendor` to the result. When `version` matches `X.Y.Z` where all parts are numerical, sets `version` and `update` fields to `X.Y` and `Z`. Throws an error if the version doesn't match the expected template.
# Inputs
`vendor`
: package's vendor
`version`
: package's version
# Type
```
cpePatchVersionInUpdateWithVendor :: string -> string -> AttrSet
```
# Examples
:::{.example}
## `lib.meta.cpePatchVersionInUpdateWithVendor` usage example
```nix
lib.meta.cpePatchVersionInUpdateWithVendor "gnu" "1.2.3"
=> {
vendor = "gnu";
version = "1.2";
update = "3";
}
```
:::
:::{.example}
## `lib.meta.cpePatchVersionInUpdateWithVendor` usage in derivations
```nix
mkDerivation rec {
version = "1.2.3";
# ...
meta = {
# ...
identifiers.cpeParts = lib.meta.cpePatchVersionInUpdateWithVendor "gnu" version;
};
}
```
:::
*/
cpePatchVersionInUpdateWithVendor =
vendor: version:
let
result = tryCPEPatchVersionInUpdateWithVendor vendor version;
in
if result.success then result.value else throw result.error;
}
maintainers/maintainer-list.nix
+17
View File
@@ -18588,6 +18588,14 @@
githubId = 30374463;
name = "Michal S.";
};
Notarin = {
name = "Notarin Steele";
email = "424c414e4b@gmail.com";
github = "Notarin";
githubId = 25104390;
keys = [ { fingerprint = "4E15 9433 48D9 7BA7 E8B8 B0FF C38F D346 AE36 36FB"; } ];
matrix = "@notarin:matrix.org";
};
NotAShelf = {
name = "NotAShelf";
email = "raf@notashelf.dev";
@@ -21517,6 +21525,15 @@
githubId = 337811;
name = "Rehno Lindeque";
};
rein = {
email = "rein@rein.icu";
github = "re1n0";
githubId = 227051429;
name = "rein";
keys = [
{ fingerprint = "66A8 1706 2227 9BD9 586A CEDD 5B29 A881 3F47 65C4"; }
];
};
relrod = {
email = "ricky@elrod.me";
github = "relrod";
maintainers/scripts/pluginupdate-py/pluginupdate.py
+2 -1
View File
@@ -504,13 +504,14 @@ class Editor:
)
_prefetch = functools.partial(prefetch, cache=cache)
to_update_for_filter = [x.replace(".", "-") for x in to_update]
plugins_to_update = (
current_plugin_specs
if len(to_update) == 0
else [
description
for description in current_plugin_specs
if self.filter_plugins_to_update(description, to_update)
if self.filter_plugins_to_update(description, to_update_for_filter)
]
)
nixos/modules/services/backup/postgresql-backup.nix
+14 -2
View File
@@ -124,7 +124,19 @@ in
type = lib.types.separatedString " ";
default = "-C";
description = ''
Command line options for pg_dump or pg_dumpall.
Command line options for pg_dump. This options is not used if
`config.services.postgresqlBackup.backupAll` is enabled. Note that
config.services.postgresqlBackup.backupAll is also active, when no
databases where specified.
'';
};
pgdumpAllOptions = lib.mkOption {
type = lib.types.separatedString " ";
default = "";
description = ''
Command line options for pg_dumpall. This options is not used if
`config.services.postgresqlBackup.backupAll` is disabled.
'';
};
@@ -175,7 +187,7 @@ in
}
(lib.mkIf cfg.backupAll {
systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpAllOptions}";
})
(lib.mkIf (!cfg.backupAll) {
nixos/modules/services/monitoring/gatus.nix
+2 -1
View File
@@ -105,7 +105,8 @@ in
config = mkIf cfg.enable {
systemd.services.gatus = {
description = "Automated developer-oriented status page";
after = [ "network.target" ];
after = [ "network-online.target" ];
requires = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
nixos/modules/services/printing/cups-pdf.nix
+8 -6
View File
@@ -42,12 +42,14 @@ let
instanceSettings = name: {
freeformType =
with lib.types;
nullOr (oneOf [
int
str
path
package
]);
attrsOf (
nullOr (oneOf [
int
str
path
package
])
);
# override defaults:
# inject instance name into paths,
# also avoid conflicts between user names and special dirs
nixos/modules/system/boot/plymouth.nix
+1 -1
View File
@@ -20,7 +20,7 @@ let
nixosBreezePlymouth = pkgs.kdePackages.breeze-plymouth.override {
logoFile = cfg.logo;
logoName = "nixos";
osName = "NixOS";
osName = config.system.nixos.distroName;
osVersion = config.system.nixos.release;
};
nixos/modules/virtualisation/parallels-guest.nix
+1 -15
View File
@@ -1,7 +1,6 @@
{
config,
lib,
pkgs,
...
}:
@@ -55,11 +54,8 @@ in
boot.extraModulePackages = [ prl-tools ];
boot.kernelModules = [
"prl_fs"
"prl_fs_freeze"
"prl_tg"
]
++ optional (pkgs.stdenv.hostPlatform.system == "aarch64-linux") "prl_notifier";
];
services.timesyncd.enable = false;
@@ -114,15 +110,6 @@ in
WorkingDirectory = "${prl-tools}/bin";
};
};
prlsga = {
description = "Parallels Shared Guest Applications Tool";
wantedBy = [ "graphical-session.target" ];
path = [ prl-tools ];
serviceConfig = {
ExecStart = "${prl-tools}/bin/prlsga";
WorkingDirectory = "${prl-tools}/bin";
};
};
prlshprof = {
description = "Parallels Shared Profile Tool";
wantedBy = [ "graphical-session.target" ];
@@ -133,6 +120,5 @@ in
};
};
};
};
}
nixos/tests/gatus.nix
+1 -1
View File
@@ -29,6 +29,6 @@
testScript = ''
machine.wait_for_unit("gatus.service")
machine.succeed("curl -s http://localhost:8080/metrics | grep go_info")
machine.wait_until_succeeds("curl -s http://localhost:8080/metrics | grep go_info", timeout=60)
'';
}
nixos/tests/postgresql/postgresql.nix
+1
View File
@@ -66,6 +66,7 @@ let
enable = true;
databases = lib.optional (!backupAll) "postgres";
pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
pgdumpAllOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
};
};
pkgs/applications/editors/android-studio/default.nix
+2 -2
View File
@@ -24,8 +24,8 @@ let
sha256Hash = "sha256-3LkcpvuoUhY/kRpoqYnwfx1cdPvvdBMEFXtRLYmqTk4=";
};
latestVersion = {
version = "2025.1.4.1"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 1"
sha256Hash = "sha256-OGnBf0LrfbN7WpO9skT8+ltAeKejyqHobxFvrzLp3EY=";
version = "2025.1.4.3"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 3"
sha256Hash = "sha256-YYacdZ7YdmmrTSsKtCfmSSrrZV+/GGPK34KnlO0+aKQ=";
};
in
{
pkgs/applications/editors/vim/plugins/generated.nix
+555 -555
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+33 -33
View File
@@ -66,12 +66,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=3b5ddcd";
version = "0.0.0+rev=2f0c122";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-arduino";
rev = "3b5ddcdbcac43c6084358d3d14a30e10e2d36b88";
hash = "sha256-qoVN/84BbuvhTb+WuwmTtNGqf9mKelViHMIVjMqyvG4=";
rev = "2f0c1223c50aa4b754136db544204c6fc99ffc77";
hash = "sha256-t0EtibjsMJpiTbwhkgZGv9lUdpI6gg2VoSEUDXswEMA=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino";
};
@@ -652,12 +652,12 @@
};
elixir = buildGrammar {
language = "elixir";
version = "0.0.0+rev=b848e63";
version = "0.0.0+rev=d24cece";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "tree-sitter-elixir";
rev = "b848e63e9f2a68accff0332392f07582c046295a";
hash = "sha256-kMsGDHFGBclpyk9n01JJsoqInEWLEcyIUSgcWJ2Jpzk=";
rev = "d24cecee673c4c770f797bac6f87ae4b6d7ddec5";
hash = "sha256-nSXXMPneL/sTdkpcsxUz73DiXVuNxVHnf8b2LTbAUs8=";
};
meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
};
@@ -1413,12 +1413,12 @@
};
inko = buildGrammar {
language = "inko";
version = "0.0.0+rev=f58a87a";
version = "0.0.0+rev=74cbd0f";
src = fetchFromGitHub {
owner = "inko-lang";
repo = "tree-sitter-inko";
rev = "f58a87ac4dc6a7955c64c9e4408fbd693e804686";
hash = "sha256-hZdbF9lw7fR5K8UfUaESS7/c4v9u7vEcSylEEbc6//4=";
rev = "74cbd0f69053b4a9ad4fed8831dee983ec7e4990";
hash = "sha256-nrhouUE2vjHiTlLquCJf2IUF3vy9vlBL6LuAmeKcB8M=";
};
meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
};
@@ -1457,12 +1457,12 @@
};
javadoc = buildGrammar {
language = "javadoc";
version = "0.0.0+rev=77afe93";
version = "0.0.0+rev=384952d";
src = fetchFromGitHub {
owner = "rmuir";
repo = "tree-sitter-javadoc";
rev = "77afe93bc6fc10f2cf4935857b8e055b2a47bb94";
hash = "sha256-HkhVHPYe+IgVkRlJu72Y+3eNZnPPpDqs6UJ0ej0PZrI=";
rev = "384952d91ebc176fcf8f1933dff93b9c32430911";
hash = "sha256-IH1LUPO+18vDC83jcrC0DihTYt6aXV1w/u0iTm5jgK4=";
};
meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
};
@@ -1735,12 +1735,12 @@
};
llvm = buildGrammar {
language = "llvm";
version = "0.0.0+rev=470886d";
version = "0.0.0+rev=2914786";
src = fetchFromGitHub {
owner = "benwilliamgraham";
repo = "tree-sitter-llvm";
rev = "470886ddd635e0ee48a4cb169e33d0c6d9bff32e";
hash = "sha256-1Fv1r644UfHXC4x4mbMetC0ThroYHwYDtKTSX3Nd4fo=";
rev = "2914786ae6774d4c4e25a230f4afe16aa68fe1c1";
hash = "sha256-jBSotMFsBUcgQrWH5p8EiywG00+v9QqePcUTI6ZqAkw=";
};
meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";
};
@@ -1880,12 +1880,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=b209a18";
version = "0.0.0+rev=09666ce";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "b209a18d1a0f440acd3a85b6d633dac2660114e1";
hash = "sha256-aAfrn3my/qfEy9uK/WPCxSefBOsekJ+rT04K9UmDVvs=";
rev = "09666cead2c001cbbfc82b395007f6d8158113a5";
hash = "sha256-toH/pG8CKI4UFdBQqkgIer5tfpIWkWoCP+fU0OByxQg=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2104,12 +2104,12 @@
};
perl = buildGrammar {
language = "perl";
version = "0.0.0+rev=e95676f";
version = "0.0.0+rev=0c24d00";
src = fetchFromGitHub {
owner = "tree-sitter-perl";
repo = "tree-sitter-perl";
rev = "e95676fa54559c71f15ad73e871c1e44db8a9b05";
hash = "sha256-VABlYn+OwgR+aD6dFI1bxa/JhwHV0KigsAcug3gze1c=";
rev = "0c24d001dd1921e418fb933d208a7bd7dd3f923a";
hash = "sha256-rKu3CGHckXlQnI/bvrQDq40jRO4PAueWKNZJADjmv5A=";
};
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
};
@@ -2927,12 +2927,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
version = "0.0.0+rev=0daae52";
version = "0.0.0+rev=8cb16ba";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "0daae5239bd9366dda0c28c7540d7503b0c104d4";
hash = "sha256-dfH7/i/xnjQRMAhzNPkDMhre+lR+pJ/s8aDxXhPqyic=";
rev = "8cb16babb0c66b6512d6aeb4cbc37ed90641d980";
hash = "sha256-lLZqyqVEUCn9z++9lPnrK8R2uDvht5v+5Y8KOZDgPs0=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3365,12 +3365,12 @@
};
vhdl = buildGrammar {
language = "vhdl";
version = "0.0.0+rev=73ff9d3";
version = "0.0.0+rev=02523d7";
src = fetchFromGitHub {
owner = "jpt13653903";
repo = "tree-sitter-vhdl";
rev = "73ff9d3e7bc42b8cc123bf5f0b2db12a900ee9b7";
hash = "sha256-8Fp/x3TC+bq4nJdbeVdBrnz7QnBSD1sc5CC0TRh0mGc=";
rev = "02523d7fb0321344c19c1f3f4ec6b83424c7d6c8";
hash = "sha256-TI1R2L8/9QwpKuTz18ayOeGXqRhYgbd0X6Rpj8kgsfw=";
};
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
};
@@ -3498,12 +3498,12 @@
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=6113943";
version = "0.0.0+rev=f40778f";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "6113943ab0847a307f3f3c38ff91d9cdfce9d0d9";
hash = "sha256-ZqJvLw475e/5KBcJzx0w+aPbGCIAFfdig9cpZ5oaat8=";
rev = "f40778ff42f2119aebacd46d4b6d785a4181a9ba";
hash = "sha256-9vqVBsErlbFXzTd7QmMItd5GW2F9kE04HQFjq/vtrTc=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
@@ -3564,12 +3564,12 @@
};
ziggy = buildGrammar {
language = "ziggy";
version = "0.0.0+rev=e95c85c";
version = "0.0.0+rev=4353b20";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "ziggy";
rev = "e95c85cb58773c43e9d94c0b9422ae84697e68a1";
hash = "sha256-6vqUPY/fpGuM1K4HfgpL/dRy7Na6fJ/t+Pe/12b1wqE=";
rev = "4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901";
hash = "sha256-7XZNKUrOkpPMge6nDSiEBlUAf7dZLDcVcJ7fHT8fPh4=";
};
location = "tree-sitter-ziggy";
meta.homepage = "https://github.com/kristoff-it/ziggy";
pkgs/applications/editors/vim/plugins/overrides.nix
+1 -1
View File
@@ -190,6 +190,7 @@ in
checkInputs = with self; [
lualine-nvim
telescope-nvim
fzf-lua
];
};
@@ -2902,7 +2903,6 @@ in
(replaceVars ./patches/openscad.nvim/program_paths.patch {
htop = lib.getExe htop;
openscad = lib.getExe openscad;
zathura = lib.getExe zathura;
})
];
};
pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch
+2 -20
View File
@@ -2,18 +2,9 @@ diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.v
index d6d4b4c..9853877 100644
--- a/autoload/health/openscad_nvim.vim
+++ b/autoload/health/openscad_nvim.vim
@@ -7,7 +7,7 @@ function! s:check_nvim_version_minimum() abort
endfunction
function! s:check_zathura_installed() abort
- if !executable('zathura')
+ if !executable('@zathura@')
call v:lua.vim.health.error('has(zathura)','install zathura')
else
call v:lua.vim.health.ok("zathura is installed")
@@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort
endfunction
function! s:check_htop_installed() abort
- if !executable('htop')
+ if !executable('@htop@')
@@ -24,15 +15,6 @@ diff --git a/lua/openscad.lua b/lua/openscad.lua
index 0a26d08..1264989 100644
--- a/lua/openscad.lua
+++ b/lua/openscad.lua
@@ -101,7 +101,7 @@ end
function M.manual()
local path = U.openscad_nvim_root_dir .. U.path_sep .. "help_source" .. U.path_sep .. "openscad-manual.pdf"
- api.nvim_command('silent !zathura --fork ' .. path)
+ api.nvim_command('silent !@zathura@ --fork ' .. path)
end
function M.help()
@@ -126,7 +126,7 @@ function M.exec_openscad()
jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename
else
@@ -40,5 +22,5 @@ index 0a26d08..1264989 100644
- jobCommand = 'openscad ' .. filename
+ jobCommand = '@openscad@ ' .. filename
end
vim.fn.jobstart(jobCommand)
pkgs/applications/editors/vim/plugins/vim-plugin-names
+43 -43
View File
@@ -626,49 +626,49 @@ https://github.com/lsig/messenger.nvim/,HEAD,
https://github.com/xero/miasma.nvim/,,
https://github.com/dasupradyumna/midnight.nvim/,,
https://github.com/hadronized/mind.nvim/,HEAD,
https://github.com/echasnovski/mini-git/,HEAD,
https://github.com/echasnovski/mini.ai/,HEAD,
https://github.com/echasnovski/mini.align/,HEAD,
https://github.com/echasnovski/mini.animate/,HEAD,
https://github.com/echasnovski/mini.base16/,HEAD,
https://github.com/echasnovski/mini.basics/,HEAD,
https://github.com/echasnovski/mini.bracketed/,HEAD,
https://github.com/echasnovski/mini.bufremove/,HEAD,
https://github.com/echasnovski/mini.clue/,HEAD,
https://github.com/echasnovski/mini.colors/,HEAD,
https://github.com/echasnovski/mini.comment/,HEAD,
https://github.com/echasnovski/mini.completion/,HEAD,
https://github.com/echasnovski/mini.cursorword/,HEAD,
https://github.com/echasnovski/mini.deps/,HEAD,
https://github.com/echasnovski/mini.diff/,HEAD,
https://github.com/echasnovski/mini.doc/,HEAD,
https://github.com/echasnovski/mini.extra/,HEAD,
https://github.com/echasnovski/mini.files/,HEAD,
https://github.com/echasnovski/mini.fuzzy/,HEAD,
https://github.com/echasnovski/mini.hipatterns/,HEAD,
https://github.com/echasnovski/mini.hues/,HEAD,
https://github.com/echasnovski/mini.icons/,HEAD,
https://github.com/echasnovski/mini.indentscope/,HEAD,
https://github.com/echasnovski/mini.jump/,HEAD,
https://github.com/echasnovski/mini.jump2d/,HEAD,
https://github.com/echasnovski/mini.keymap/,HEAD,
https://github.com/echasnovski/mini.map/,HEAD,
https://github.com/echasnovski/mini.misc/,HEAD,
https://github.com/echasnovski/mini.move/,HEAD,
https://github.com/echasnovski/mini.notify/,HEAD,
https://github.com/echasnovski/mini.nvim/,,
https://github.com/echasnovski/mini.operators/,HEAD,
https://github.com/echasnovski/mini.pairs/,HEAD,
https://github.com/echasnovski/mini.pick/,HEAD,
https://github.com/echasnovski/mini.sessions/,HEAD,
https://github.com/echasnovski/mini.snippets/,HEAD,
https://github.com/echasnovski/mini.splitjoin/,HEAD,
https://github.com/echasnovski/mini.starter/,HEAD,
https://github.com/echasnovski/mini.statusline/,HEAD,
https://github.com/echasnovski/mini.surround/,HEAD,
https://github.com/echasnovski/mini.tabline/,HEAD,
https://github.com/echasnovski/mini.trailspace/,HEAD,
https://github.com/echasnovski/mini.visits/,HEAD,
https://github.com/nvim-mini/mini-git/,HEAD,
https://github.com/nvim-mini/mini.ai/,HEAD,
https://github.com/nvim-mini/mini.align/,HEAD,
https://github.com/nvim-mini/mini.animate/,HEAD,
https://github.com/nvim-mini/mini.base16/,HEAD,
https://github.com/nvim-mini/mini.basics/,HEAD,
https://github.com/nvim-mini/mini.bracketed/,HEAD,
https://github.com/nvim-mini/mini.bufremove/,HEAD,
https://github.com/nvim-mini/mini.clue/,HEAD,
https://github.com/nvim-mini/mini.colors/,HEAD,
https://github.com/nvim-mini/mini.comment/,HEAD,
https://github.com/nvim-mini/mini.completion/,HEAD,
https://github.com/nvim-mini/mini.cursorword/,HEAD,
https://github.com/nvim-mini/mini.deps/,HEAD,
https://github.com/nvim-mini/mini.diff/,HEAD,
https://github.com/nvim-mini/mini.doc/,HEAD,
https://github.com/nvim-mini/mini.extra/,HEAD,
https://github.com/nvim-mini/mini.files/,HEAD,
https://github.com/nvim-mini/mini.fuzzy/,HEAD,
https://github.com/nvim-mini/mini.hipatterns/,HEAD,
https://github.com/nvim-mini/mini.hues/,HEAD,
https://github.com/nvim-mini/mini.icons/,HEAD,
https://github.com/nvim-mini/mini.indentscope/,HEAD,
https://github.com/nvim-mini/mini.jump/,HEAD,
https://github.com/nvim-mini/mini.jump2d/,HEAD,
https://github.com/nvim-mini/mini.keymap/,HEAD,
https://github.com/nvim-mini/mini.map/,HEAD,
https://github.com/nvim-mini/mini.misc/,HEAD,
https://github.com/nvim-mini/mini.move/,HEAD,
https://github.com/nvim-mini/mini.notify/,HEAD,
https://github.com/nvim-mini/mini.nvim/,,
https://github.com/nvim-mini/mini.operators/,HEAD,
https://github.com/nvim-mini/mini.pairs/,HEAD,
https://github.com/nvim-mini/mini.pick/,HEAD,
https://github.com/nvim-mini/mini.sessions/,HEAD,
https://github.com/nvim-mini/mini.snippets/,HEAD,
https://github.com/nvim-mini/mini.splitjoin/,HEAD,
https://github.com/nvim-mini/mini.starter/,HEAD,
https://github.com/nvim-mini/mini.statusline/,HEAD,
https://github.com/nvim-mini/mini.surround/,HEAD,
https://github.com/nvim-mini/mini.tabline/,HEAD,
https://github.com/nvim-mini/mini.trailspace/,HEAD,
https://github.com/nvim-mini/mini.visits/,HEAD,
https://github.com/wfxr/minimap.vim/,,
https://github.com/milanglacier/minuet-ai.nvim/,HEAD,
https://github.com/jghauser/mkdir.nvim/,main,
pkgs/applications/networking/browsers/librewolf/src.json
+5 -5
View File
@@ -1,11 +1,11 @@
{
"packageVersion": "142.0-1",
"packageVersion": "142.0.1-1",
"source": {
"rev": "142.0-1",
"hash": "sha256-/bn9xeDxnJCQol/E8rhS8RVhpUj7UN+QScSIzLFnZ/o="
"rev": "142.0.1-1",
"hash": "sha256-frAMrNEGv36+SshorhjnOimT3bKe9uLaDjxbuqSp39c="
},
"firefox": {
"version": "142.0",
"hash": "sha512-sMHHZgg6MKkrd9zxalhNn7NBzYEdIcOjTaTNDXFP1q3HO2CAktZgWGl7xFYvqsxEhZFT5J/9624U4Fnlny6iRg=="
"version": "142.0.1",
"hash": "sha512-/KG5xnoLLyFvHxH9XjoIkgmYkh49YetjPx3ef+actAzbtjpBod/E8QIlCdpkPjeRRn2I5i5+owspPr9p2Hu1hQ=="
}
}
pkgs/applications/networking/instant-messengers/discord/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@ let
versions =
if stdenv.hostPlatform.isLinux then
{
stable = "0.0.104";
stable = "0.0.107";
ptb = "0.0.156";
canary = "0.0.745";
development = "0.0.84";
@@ -26,7 +26,7 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-4w8C9YHRNTgkUBzqkW1IywKtRHvtlkihjo3/shAgPac=";
hash = "sha256-uL923Fc8Io0GUnQjaAl7sRahL6CO/qzNzkqk/oKkZCo=";
};
ptb = fetchurl {
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
pkgs/applications/networking/sync/rsync/default.nix
-5
View File
@@ -92,10 +92,5 @@ stdenv.mkDerivation rec {
ivan
];
platforms = platforms.unix;
identifiers.cpeParts = {
vendor = "samba";
inherit version;
update = "-";
};
};
}
pkgs/applications/virtualization/virt-top/default.nix
+9 -5
View File
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
hash = "sha256-C1a47pWtjb38bnwmZ2Zq7/LlW3+BF5BGNMRFi97/ngU=";
};
patches = [
./gettext-0.25.patch
];
strictDeps = true;
nativeBuildInputs = [
@@ -40,16 +44,16 @@ stdenv.mkDerivation rec {
++ [ libxml2 ];
prePatch = ''
substituteInPlace ocaml-dep.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
substituteInPlace ocaml-dep.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'
substituteInPlace ocaml-link.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'
'';
meta = with lib; {
meta = {
description = "Top-like utility for showing stats of virtualized domains";
homepage = "https://people.redhat.com/~rjones/virt-top/";
license = licenses.gpl2Only;
license = lib.licenses.gpl2Only;
maintainers = [ ];
platforms = platforms.linux;
platforms = lib.platforms.linux;
mainProgram = "virt-top";
};
}
pkgs/applications/virtualization/virt-top/gettext-0.25.patch
+10
View File
@@ -0,0 +1,10 @@
--- a/configure.ac.orig 2025-08-23 01:41:53
+++ b/configure.ac 2025-08-23 01:42:14
@@ -123,6 +123,7 @@
dnl Check for gettext.
AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.25])
dnl Write gettext modules for the programs.
dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html
pkgs/by-name/_1/_1password-gui/linux.nix
+2 -6
View File
@@ -146,12 +146,8 @@ stdenv.mkDerivation {
makeShellWrapper $out/share/1password/1password $out/bin/1password \
"''${gappsWrapperArgs[@]}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
# Currently half broken on wayland (e.g. no copy functionality)
# See: https://github.com/NixOS/nixpkgs/pull/232718#issuecomment-1582123406
# Remove this comment when upstream fixes:
# https://1password.community/discussion/comment/624011/#Comment_624011
#--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} \
--add-flags "\''${NIXOS_OZONE_WL:+--ozone-platform-hint=auto}"
'';
passthru.updateScript = ./update.sh;
pkgs/by-name/cl/clipcat/dummy.patch
+14
View File
@@ -0,0 +1,14 @@
diff --git a/crates/server/src/notification/dummy.rs b/crates/server/src/notification/dummy.rs
index f85dda0..7489f22 100644
--- a/crates/server/src/notification/dummy.rs
+++ b/crates/server/src/notification/dummy.rs
@@ -1,6 +1,9 @@
+#[cfg(test)]
use crate::notification::traits;
+#[cfg(test)]
#[derive(Clone, Copy, Debug, Default)]
pub struct Notification {}
+#[cfg(test)]
impl traits::Notification for Notification {}
pkgs/by-name/cl/clipcat/package.nix
+12
View File
@@ -5,6 +5,7 @@
rustPlatform,
protobuf,
installShellFiles,
writableTmpDirAsHomeHook,
}:
rustPlatform.buildRustPackage rec {
@@ -20,9 +21,20 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-UA+NTtZ2qffUPUmvCidnTHwFzD3WOPTlxHR2e2vKwPQ=";
patches = [
# Fix compilation errors caused by stricter restrictions on unused code in Rust 1.89.
# TODO: remove this patch after upstream fix it.
./dummy.patch
];
nativeBuildInputs = [
protobuf
installShellFiles
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# fix following error on darwin:
# objc/notify.h:1:9: fatal error: could not build module 'Cocoa'
writableTmpDirAsHomeHook
];
checkFlags = [
pkgs/by-name/de/debian-devscripts/package.nix
+2 -2
View File
@@ -30,14 +30,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "debian-devscripts";
version = "2.25.18";
version = "2.25.15+deb13u1";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "devscripts";
tag = "v${finalAttrs.version}";
hash = "sha256-POmUwNYKfdWda80T44S6x2Dg2TpezMirXuiI95Z077Q=";
hash = "sha256-szyVLpeIQozPXwBgL4nIYog4znUzweIt8q7nczo5q+g=";
};
patches = [
pkgs/by-name/dp/dprint/package.nix
+7 -1
View File
@@ -24,7 +24,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
hash = "sha256-Lt6CzSzppu5ULhzYN5FTCWtWK3AA4/8jRzXgQkU4Tco=";
};
cargoHash = "sha256-1opQaR3vbm/DpDY5oQ1VgA4nf0nCBknxfgOSPZQbtV4=";
cargoPatches = [
# Upgrade wasmer to 6.1.0-rc.3 to fix build failure with Rust ≥ 1.89.0
# https://github.com/dprint/dprint/pull/1021
./upgrade-wasmer.patch
];
cargoHash = "sha256-RUWyR1Yr9G2xBMigDa9+LQyaU5on85xkRQYTLH9JOPg=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/dp/dprint/upgrade-wasmer.patch
+161
View File
@@ -0,0 +1,161 @@
From 379cf407bfc07380dad24aefb2db40f6852f32ed Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 25 Aug 2025 18:01:57 -0700
Subject: [PATCH] Upgrade wasmer to 6.1.0-rc.3
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
Cargo.lock | 41 ++++++++++++++++++++--------------------
crates/dprint/Cargo.toml | 4 ++--
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 9a1bc870..bff2c81b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -455,9 +455,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "corosensei"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad067b451c08956709f8762dba86e049c124ea52858e3ab8d076ba2892caa437"
+checksum = "5d1ea1c2a2f898d2a6ff149587b8a04f41ee708d248c723f01ac2f0f01edc0b3"
dependencies = [
"autocfg",
"cfg-if",
@@ -776,18 +776,18 @@ dependencies = [
[[package]]
name = "derive_more"
-version = "1.0.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
dependencies = [
"derive_more-impl",
]
[[package]]
name = "derive_more-impl"
-version = "1.0.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
dependencies = [
"proc-macro2",
"quote",
@@ -3256,16 +3256,15 @@ dependencies = [
[[package]]
name = "wasmer"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25dccc6251837449135914ee1978731c2c3df9fc727088eb7e098736c0f15d1"
+checksum = "1e588d83a5ac7eb5e6af54ac4d34183442e4dd2a7358d2a11793b17c03b7df0b"
dependencies = [
"bindgen",
"bytes",
"cfg-if",
"cmake",
- "derive_more 1.0.0",
- "idna_adapter",
+ "derive_more 2.0.1",
"indexmap",
"js-sys",
"more-asserts",
@@ -3278,7 +3277,6 @@ dependencies = [
"target-lexicon",
"thiserror 1.0.61",
"tracing",
- "ureq",
"wasm-bindgen",
"wasmer-compiler",
"wasmer-compiler-cranelift",
@@ -3292,9 +3290,9 @@ dependencies = [
[[package]]
name = "wasmer-compiler"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f35baeb0d5b20710b5b9c59477dbf813b1ac53da33ee46cb22f8c4190e3986e"
+checksum = "c9542eb21b9a0f7811101e26e40e360a9ac02d093e3089c8fa62dfa102478edb"
dependencies = [
"backtrace",
"bytes",
@@ -3323,9 +3321,9 @@ dependencies = [
[[package]]
name = "wasmer-compiler-cranelift"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d657a96003ce3f54a3cbbf681fcd782b983f9362c97cfbbe243cbf66790e004"
+checksum = "a69f548bcccd4791b2647e0d748eb8ddd4d0856233778867c8b0db3781a82ca1"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -3343,9 +3341,9 @@ dependencies = [
[[package]]
name = "wasmer-derive"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b57be80a67de03c2a02d697bfd763e097546b11f0020cf9930ebaa4f8cf965"
+checksum = "8db532c73814748214276f878b8382a8885769fdd86d0bee2792c438b0d28c62"
dependencies = [
"proc-macro-error2",
"proc-macro2",
@@ -3355,9 +3353,9 @@ dependencies = [
[[package]]
name = "wasmer-types"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8424d15f5c19a8df972fc9367d75ba3b87af63b279208d50a32e9a298d944b"
+checksum = "81b900743ecb272e8e8a760a42e069f19d158d9fd03c6ac256026407bdc91833"
dependencies = [
"bytecheck 0.6.11",
"enum-iterator",
@@ -3375,9 +3373,9 @@ dependencies = [
[[package]]
name = "wasmer-vm"
-version = "6.0.1"
+version = "6.1.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faabfffefc6fc350bb5b07301f05ba604a18c3d2d97c6354183f15792577056d"
+checksum = "40956bcf167d5bed1a940649f638e2d610e5a066863b4ab6c1ab1341fef97a9a"
dependencies = [
"backtrace",
"cc",
@@ -3394,6 +3392,7 @@ dependencies = [
"memoffset",
"more-asserts",
"region",
+ "rustversion",
"scopeguard",
"thiserror 1.0.61",
"wasmer-types",
diff --git a/crates/dprint/Cargo.toml b/crates/dprint/Cargo.toml
index 44d107d4..af733e83 100644
--- a/crates/dprint/Cargo.toml
+++ b/crates/dprint/Cargo.toml
@@ -58,8 +58,8 @@ webpki-roots = "=0.26.7"
# patch version increases of rkyv may cause panics when deserializing
# data serialized with older versions
rkyv = "=0.8.10"
-wasmer = "=6.0.1"
-wasmer-compiler = "=6.0.1"
+wasmer = "=6.1.0-rc.3"
+wasmer-compiler = "=6.1.0-rc.3"
[target.'cfg(windows)'.dependencies]
winreg = "=0.55.0"
pkgs/by-name/du/duply/package.nix
+2 -2
View File
@@ -16,11 +16,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "duply";
version = "2.5.5";
version = "2.5.6";
src = fetchurl {
url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.5.x/duply_${finalAttrs.version}.tgz";
hash = "sha256-ABryuV5jJNoxcJLsSjODLOHuLKrSEhY3buzy1cQh+AU=";
hash = "sha256-DSSnjfbcgWIuWaA+4h7d/0HqpDoXqkJOyGapYX4rtP0=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/fa/fastnetmon-advanced/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "fastnetmon-advanced";
version = "2.0.371";
version = "2.0.372";
src = fetchurl {
url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb";
hash = "sha256-/qCUeo/2AYIT9Yl6QjoTBPfmg8Lk2efDU5Axv4JU+t8=";
hash = "sha256-FwYAbTBkk+AciDVxTIimswsB0M3gbzKX+03PD0fLMsY=";
};
nativeBuildInputs = [
pkgs/by-name/ga/gamescope/package.nix
+2 -2
View File
@@ -49,14 +49,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gamescope";
version = "3.16.14.2";
version = "3.16.15";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = "gamescope";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-l8SK8LQmFK0KeWxag7CX2lnME+HOvGpn4s3FqUNsK1Q=";
hash = "sha256-/JMk1ZzcVDdgvTYC+HQL09CiFDmQYWcu6/uDNgYDfdM=";
};
patches = [
pkgs/by-name/ga/gatus/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gatus";
version = "5.19.0";
version = "5.23.2";
src = fetchFromGitHub {
owner = "TwiN";
repo = "gatus";
rev = "v${version}";
hash = "sha256-Jw7OdFGSZgxy52fICURc313ONsmI9Qlsf75aS0LUB9s=";
hash = "sha256-b/UQwwyspOKrW9mRoq0zJZ41lNLM+XvGFlpxz+9ZMco=";
};
vendorHash = "sha256-CofmAYsRp0bya+q/eFJkWV9tGfhg37UxDFR9vpCKYls=";
vendorHash = "sha256-jMNsd7AiWG8vhUW9cLs5Ha2wmdw9SHjSDXIypvCKYqk=";
subPackages = [ "." ];
pkgs/by-name/ge/gemini-cli/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-TcXCGI27qJOVbR8XaJzE9dYV/3uDM9HATU1OkziRib8=";
hash = "sha256-ykNgtHtH+PPCycRn9j1lc8UIEHqYj54l0MTeVz6OhsQ=";
};
patches = [
@@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: {
./restore-missing-dependencies-fields.patch
];
npmDepsHash = "sha256-i4Z/zM4jRf9Orisu0xHHa3yJsDjYSmHieF2WIKU/1iY=";
npmDepsHash = "sha256-gpNt581BHDA12s+3nm95UOYHjoa7Nfe46vgPwFr7ZOU=";
preConfigure = ''
mkdir -p packages/generated
pkgs/by-name/gi/git-lfs/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "git-lfs";
version = "3.6.1";
version = "3.7.0";
src = fetchFromGitHub {
owner = "git-lfs";
repo = "git-lfs";
tag = "v${version}";
hash = "sha256-zZ9VYWVV+8G3gojj1m74syvsYM1mX0YT4hKnpkdMAQk=";
hash = "sha256-EFuuyD83aYe6XMKbRfAykVMfGFOQ4I6ORvMRm0Q8vfM=";
};
vendorHash = "sha256-JT0r/hs7ZRtsYh4aXy+v8BjwiLvRJ10e4yRirqmWVW0=";
vendorHash = "sha256-6H0KpLin+DqwEg5bdzaxj2CoNSneZ/ET43MTrrdF3h8=";
nativeBuildInputs = [
asciidoctor
pkgs/by-name/gl/glab/package.nix
+4 -3
View File
@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "glab";
version = "1.65.0";
version = "1.67.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-LqcUrF1CkNshsZBl9PdYByQKzMr5lWw5+BwCXs+yml0=";
hash = "sha256-d0pElHlfElqnlXbbAaIGzLtWpuAdIOVfdmTD6+2nNX4=";
leaveDotGit = true;
postFetch = ''
cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
'';
};
vendorHash = "sha256-2lC55LaMOrDy8F+IOqB4aujYlKKgpJmhZw6kl2yN/GM=";
vendorHash = "sha256-/nFdlC1gg08vEGuiq9qoUar8EGuYddxvTvFuGxQKnYA=";
ldflags = [
"-s"
@@ -85,6 +85,7 @@ buildGoModule (finalAttrs: {
maintainers = with lib.maintainers; [
freezeboy
luftmensch-luftmensch
anthonyroussel
];
mainProgram = "glab";
};
pkgs/by-name/ha/handheld-daemon/package.nix
+5 -2
View File
@@ -70,6 +70,9 @@ python3Packages.buildPythonApplication rec {
substituteInPlace src/hhd/plugins/plugin.py \
--replace-fail '"id"' '"${lib.getExe' coreutils "id"}"'
substituteInPlace usr/lib/udev/rules.d/83-hhd.rules \
--replace-fail '/bin/chmod' '${lib.getExe' coreutils "chmod"}'
'';
build-system = with python3Packages; [
@@ -89,8 +92,8 @@ python3Packages.buildPythonApplication rec {
doCheck = false;
postInstall = ''
install -Dm644 $src/usr/lib/udev/rules.d/83-hhd.rules -t $out/lib/udev/rules.d/
install -Dm644 $src/usr/lib/udev/hwdb.d/83-hhd.hwdb -t $out/lib/udev/hwdb.d/
install -Dm644 usr/lib/udev/rules.d/83-hhd.rules -t $out/lib/udev/rules.d/
install -Dm644 usr/lib/udev/hwdb.d/83-hhd.hwdb -t $out/lib/udev/hwdb.d/
'';
meta = {
pkgs/by-name/ha/hayabusa/package.nix
+6 -6
View File
@@ -7,14 +7,14 @@
vulkan-loader,
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hayabusa";
version = "unstable-2023-11-29";
version = "0.3.9";
src = fetchFromGitHub {
owner = "notarin";
repo = "hayabusa";
rev = "1d6b8cfd301d60ff9f6946970b51818c036083b0";
tag = "v${finalAttrs.version}";
hash = "sha256-w9vXC7L7IP4QLPFS1IgPOKSm7fT7W0R+NsHTdAfIupg=";
};
@@ -43,9 +43,9 @@ rustPlatform.buildRustPackage {
meta = {
description = "Swift rust fetch program";
homepage = "https://github.com/notarin/hayabusa";
license = lib.licenses.cc-by-nc-nd-40;
maintainers = with lib.maintainers; [ ];
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ Notarin ];
mainProgram = "hayabusa";
platforms = lib.platforms.linux;
};
}
})
pkgs/by-name/he/hello/package.nix
-1
View File
@@ -55,6 +55,5 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ stv0g ];
mainProgram = "hello";
platforms = lib.platforms.all;
identifiers.cpeParts.vendor = "gnu";
};
})
pkgs/by-name/ko/koboldcpp/package.nix
+2 -2
View File
@@ -41,13 +41,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "koboldcpp";
version = "1.98";
version = "1.98.1";
src = fetchFromGitHub {
owner = "LostRuins";
repo = "koboldcpp";
tag = "v${finalAttrs.version}";
hash = "sha256-5VP7NfHc00TdTqr5wel1vrtOnJWDGZT44tKDEm/f2iw=";
hash = "sha256-CJM97DRSIq2d3X6aR096+9QwBeI4kQNzxufdSoEydco=";
};
enableParallelBuilding = true;
pkgs/by-name/li/libfm/package.nix
+11 -18
View File
@@ -1,8 +1,10 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
fetchpatch,
autoreconfHook,
gtk-doc,
glib,
intltool,
menu-cache,
@@ -21,25 +23,21 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = if extraOnly then "libfm-extra" else "libfm";
version = "1.3.2";
version = "1.4.0";
src = fetchurl {
url = "mirror://sourceforge/pcmanfm/libfm-${finalAttrs.version}.tar.xz";
sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU=";
src = fetchFromGitHub {
owner = "lxde";
repo = "libfm";
tag = finalAttrs.version;
hash = "sha256-dmu5ygPuZe2YWAzIVPx5zskQeB51hXcLbMczxWgCr78=";
};
patches = [
# Add casts to fix -Werror=incompatible-pointer-types
(fetchpatch {
url = "https://github.com/lxde/libfm/commit/fbcd183335729fa3e8dd6a837c13a23ff3271000.patch";
hash = "sha256-RbX8jkP/5ao6NWEnv8Pgy4zwZaiDsslGlRRWdoV3enA=";
})
];
nativeBuildInputs = [
autoreconfHook
vala
pkg-config
intltool
gtk-doc
];
buildInputs = [
glib
@@ -56,11 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
postPatch = ''
# Ensure the files are re-generated from Vala sources.
rm src/actions/*.c
'';
# libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm
postInstall = optionalString (!extraOnly) ''
rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc
pkgs/by-name/li/libnl-tiny/package.nix
+8 -7
View File
@@ -3,22 +3,20 @@
lib,
fetchgit,
cmake,
pkg-config,
}:
stdenv.mkDerivation {
pname = "libnl-tiny";
version = "unstable-2023-12-05";
version = "0-unstable-2025-03-19";
src = fetchgit {
url = "https://git.openwrt.org/project/libnl-tiny.git";
rev = "965c4bf49658342ced0bd6e7cb069571b4a1ddff";
hash = "sha256-kegTV7FXMERW7vjRZo/Xp4cbSBZmynBgge2lK71Fx94=";
rev = "c0df580adbd4d555ecc1962dbe88e91d75b67a4e";
hash = "sha256-j5oIEbWqVWd7rNpCMm9+WZwud43uTGeHG81lmzQOoeY=";
};
nativeBuildInputs = [
cmake
pkg-config
];
preConfigure = ''
@@ -30,8 +28,11 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Tiny OpenWrt fork of libnl";
homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary";
license = licenses.isc;
maintainers = with maintainers; [ mkg20001 ];
license = licenses.gpl2Only;
maintainers = with maintainers; [
mkg20001
dvn0
];
platforms = platforms.linux;
};
}
pkgs/by-name/li/libretro-shaders-slang/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "libretro-shaders-slang";
version = "0-unstable-2025-08-14";
version = "0-unstable-2025-08-26";
src = fetchFromGitHub {
owner = "libretro";
repo = "slang-shaders";
rev = "69e3dbb8947e749156ff1f70e32c88f3c37e6793";
hash = "sha256-C+qO/B3Lb8vtQUV3u6ZqiVZlg2prytR+9IbTnvyQGMg=";
rev = "c9303dcc4d11fe5d37db9ef9a24c8eab4087c0c3";
hash = "sha256-k/th5Ze/x48mTFZxEsSWCE4STnMSFXl3I0uMVmdMSxc=";
};
dontConfigure = true;
pkgs/by-name/lu/luau/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "luau";
version = "0.688";
version = "0.689";
src = fetchFromGitHub {
owner = "luau-lang";
repo = "luau";
tag = finalAttrs.version;
hash = "sha256-JrJoFSKvy9EqsJ7jdthLmnzQqZPIsVt9aixwaWbLp8Q=";
hash = "sha256-ZHALILdIJHYovSdUJk2KZIG0u/vdCAROzFd7U3pqWIk=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/lx/lxterminal/package.nix
+3 -9
View File
@@ -2,8 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
automake,
autoconf,
autoreconfHook,
intltool,
pkg-config,
gtk3,
@@ -26,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "lxde";
repo = "lxterminal";
tag = finalAttrs.version;
sha256 = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U=";
hash = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U=";
};
configureFlags = [
@@ -35,8 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeBuildInputs = [
automake
autoconf
autoreconfHook
intltool
pkg-config
wrapGAppsHook3
@@ -57,10 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
./respect-xml-catalog-files-var.patch
];
preConfigure = ''
./autogen.sh
'';
doCheck = true;
passthru.tests.test = nixosTests.terminal-emulators.lxterminal;
pkgs/by-name/me/mealie/package.nix
+6 -3
View File
@@ -11,12 +11,12 @@
}:
let
version = "3.0.2";
version = "3.1.2";
src = fetchFromGitHub {
owner = "mealie-recipes";
repo = "mealie";
tag = "v${version}";
hash = "sha256-0GlHfyoVEqmfTDSN9BGXrLRkStRjWjv2qzZac2oYu7Q=";
hash = "sha256-8ZLXXA4NKR7GaCdgk8XDMjAssQsKP1wZpEZPYWpglwk=";
};
frontend = callPackage (import ./mealie-frontend.nix src version) { };
@@ -102,7 +102,10 @@ pythonpkgs.buildPythonApplication rec {
--set OUT "$out"
'';
nativeCheckInputs = with pythonpkgs; [ pytestCheckHook ];
nativeCheckInputs = with pythonpkgs; [
pytestCheckHook
pytest-asyncio
];
# Needed for tests
preCheck = ''
pkgs/by-name/me/menu-cache/package.nix
+19 -22
View File
@@ -1,44 +1,41 @@
{
lib,
stdenv,
fetchurl,
fetchpatch,
fetchFromGitHub,
glib,
pkg-config,
libfm-extra,
autoreconfHook,
gtk-doc,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "menu-cache";
version = "1.1.0";
version = "1.1.1";
src = fetchurl {
url = "mirror://sourceforge/lxde/menu-cache-${version}.tar.xz";
sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd";
src = fetchFromGitHub {
owner = "lxde";
repo = "menu-cache";
tag = finalAttrs.version;
hash = "sha256-5Vp2btrflimy+Hq+3MLpic/quZMJ3uwsMq12G7s4DGI=";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchain support:
# https://github.com/lxde/menu-cache/pull/19
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/lxde/menu-cache/commit/1ce739649b4d66339a03fc0ec9ee7a2f7c141780.patch";
sha256 = "08x3h0w2pl8ifj83v9jkf4j3zxcwsyzh251divlhhnwx0rw1pyn7";
})
nativeBuildInputs = [
autoreconfHook
pkg-config
gtk-doc
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
glib
libfm-extra
];
meta = with lib; {
meta = {
description = "Library to read freedesktop.org menu files";
homepage = "https://blog.lxde.org/tag/menu-cache/";
license = licenses.gpl2Plus;
maintainers = [ maintainers.ttuegel ];
platforms = platforms.linux ++ platforms.darwin;
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.ttuegel ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
})
pkgs/by-name/mi/mieru/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "mieru";
version = "3.19.0";
version = "3.19.1";
src = fetchFromGitHub {
owner = "enfein";
repo = "mieru";
rev = "v${version}";
hash = "sha256-0kOYAtPFIXHg/CNoPxdRot9zTfEQ2uD0wBFFBW5h2ZA=";
hash = "sha256-x8rddxjhmHw7J7majt4qdkXRPsfm8SATFsMxN2stN14=";
};
vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";
pkgs/by-name/ni/niri/package.nix
+5 -4
View File
@@ -27,13 +27,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "niri";
version = "25.05.1";
version = "25.08";
src = fetchFromGitHub {
owner = "YaLTeR";
repo = "niri";
tag = "v${finalAttrs.version}";
hash = "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=";
hash = "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=";
};
outputs = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '/usr/bin' "$out/bin"
'';
cargoHash = "sha256-8ltuI94yIhff7JxIfe1mog4bDJ/7VFgLooMWOnSTREs=";
cargoHash = "sha256-lR0emU2sOnlncN00z6DwDIE2ljI+D2xoKqG3rS45xG0=";
strictDeps = true;
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
postInstall = ''
install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri
mv wiki $doc/share/doc/niri/wiki
mv docs/wiki $doc/share/doc/niri/wiki
install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions
''
@@ -122,6 +122,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
NIRI_BUILD_COMMIT = "Nixpkgs";
};
checkFlags = [ "--skip=::egl" ];
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
pkgs/by-name/ni/nixf-diagnose/package.nix
+6 -3
View File
@@ -3,22 +3,25 @@
rustPlatform,
fetchFromGitHub,
nixf,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nixf-diagnose";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "inclyc";
repo = "nixf-diagnose";
tag = finalAttrs.version;
hash = "sha256-gkeU3EwAl9810eRRp5/ddf1h0qpV6FrBBdntNBpBtsM=";
hash = "sha256-8kcA2/ZMREKtXUM5rlAWRQL/C8+JNocZegq2ZHqbiSA=";
};
env.NIXF_TIDY_PATH = lib.getExe nixf;
cargoHash = "sha256-nrr2/lTWPyH7MsG2hSMJjbFCpHsKWINEP8jwSYPhocg=";
cargoHash = "sha256-9rWQfoaMXFs83cYHtJPL0ogA9hPh7q3mK1DG4Q4CCq0=";
passthru.updateScript = nix-update-script { };
meta = {
description = "CLI wrapper for nixf-tidy with fancy diagnostic output";
pkgs/by-name/op/openscad/package.nix
+10
View File
@@ -74,6 +74,16 @@ stdenv.mkDerivation rec {
url = "https://github.com/openscad/openscad/commit/cc49ad8dac24309f5452d5dea9abd406615a52d9.patch";
hash = "sha256-B3i+o6lR5osRcVXTimDZUFQmm12JhmbFgG9UwOPebF4=";
})
(fetchpatch {
name = "fix-application-icon-not-shown-on-wayland.patch";
url = "https://github.com/openscad/openscad/commit/5ea83e5117f5f3ac2197c63db69f523721b8fa85.patch";
hash = "sha256-nfeUv0R+J95fyqnVC0HNeBVZnxVoisY1pcdII82qUSU=";
# upstream's formatting conventions changed between 2021 and this patch
postFetch = ''
sed -i 's/& / \&/g;s/\*\*/\0 /g;s/^\(.\) /\1\t/' "$out"
'';
})
];
postPatch = ''
pkgs/by-name/ow/owi/package.nix
+3 -3
View File
@@ -15,14 +15,14 @@ let
in
ocamlPackages.buildDunePackage rec {
pname = "owi";
version = "0.2-unstable-2025-08-18";
version = "0.2-unstable-2025-08-22";
src = fetchFromGitHub {
owner = "ocamlpro";
repo = "owi";
rev = "40c6434ecdb0cf7248b98670526e18dc007b425b";
rev = "daad8163dec12abc8fe7f3384adc37e51f0994e9";
fetchSubmodules = true;
hash = "sha256-N/DO3vml7vzOjPi81LPOL+ZuI8CewAhANM9j4nuRbyU=";
hash = "sha256-C28YoUbovSEk9/RW0iYWNVB7/ETlDnY+vPTfQZPOerE=";
};
nativeBuildInputs = with ocamlPackages; [
pkgs/by-name/pa/panoply/package.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "panoply";
version = "5.6.2";
version = "5.7.0";
src = fetchurl {
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
hash = "sha256-DxQjIUv2Gkb3VnaorphMDTo+GlM/NoCZ6y/ogHSs07c=";
hash = "sha256-R3hzqYytQ0k2dhmJAOIKy+zbEYQ6et/q3b0NEQkAGt4=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/pd/pdm/package.nix
+1 -1
View File
@@ -15,7 +15,7 @@ let
resolvelib = super.resolvelib.overridePythonAttrs (old: rec {
version = "1.1.0";
src = old.src.override {
rev = version;
tag = version;
hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
};
});
pkgs/by-name/pg/pgmodeler/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "pgmodeler";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "pgmodeler";
repo = "pgmodeler";
rev = "v${version}";
sha256 = "sha256-q0XoShp+XERvyERLxi9uh//dNxVEtfL+UY9uVKqX4fI=";
sha256 = "sha256-DIyqUewP8q9O6O/v82a2DNgyrBffWkBmyhBm3pA1qVY=";
};
nativeBuildInputs = [
pkgs/by-name/pr/proxify/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "proxify";
version = "0.0.15";
version = "0.0.16";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "proxify";
tag = "v${version}";
hash = "sha256-vAI8LKdBmujH7zidXADc8bMLXaFMjT965hR+PVZVeNw=";
hash = "sha256-CctbeKMf4+E+Fh/0hWLwHdTTsAavkiJ2ziMumY/+oF8=";
};
vendorHash = "sha256-eGcCc83napjt0VBhpDiHWn7+ew77XparDJ9uyjF353w=";
vendorHash = "sha256-7bOnLv2IJ9tysvZm33wBeMHvdSBDg1ii/QXv2n1wqxw=";
meta = {
description = "Proxy tool for HTTP/HTTPS traffic capture";
pkgs/by-name/pu/pulumi/package.nix
+14 -9
View File
@@ -17,18 +17,18 @@
}:
buildGoModule rec {
pname = "pulumi";
version = "3.190.0";
version = "3.192.0";
src = fetchFromGitHub {
owner = "pulumi";
repo = "pulumi";
tag = "v${version}";
hash = "sha256-n4YjJJZNPRjvR5WuDO3+bCvKxDrmK7VBbS6E6RP0C84=";
hash = "sha256-rcDXC+xlUa67afuXvmEv8UNsYWBvQQ0P4httdtdcrh4=";
# Some tests rely on checkout directory name
name = "pulumi";
};
vendorHash = "sha256-ewVZNgnW7JbX0VOU14Ipo7EBkj8evOoXWjf9yLOmJF8=";
vendorHash = "sha256-BaFw8EnPd2GPA/p9wm8XpVy/iE8gqbteRnMQC8Z4NHQ=";
sourceRoot = "${src.name}/pkg";
@@ -68,6 +68,10 @@ buildGoModule rec {
# Seems to require TTY.
"TestProgressEvents"
# Flaky; upstream “fixed” it by increasing timeout.
# https://github.com/pulumi/pulumi/pull/20116
"TestAnalyzerCancellation"
# Tries to clone repo: https://github.com/pulumi/test-repo.git
"TestValidateRelativeDirectory"
"TestRepoLookup"
@@ -83,6 +87,8 @@ buildGoModule rec {
"TestPulumiNewWithoutTemplateSupport"
"TestGeneratingProjectWithAIPromptSucceeds"
"TestPulumiNewWithRegistryTemplates"
"TestRunNewYesNoTemplate"
"TestRunNewYesWithTemplate"
# Connects to https://api.pulumi.com/…
"TestGetLatestPluginIncludedVersion"
@@ -156,18 +162,17 @@ buildGoModule rec {
version = "v${version}";
command = "PULUMI_SKIP_UPDATE_CHECK=1 pulumi version";
};
# Test building packages that reuse our version and src.
inherit (pulumiPackages) pulumi-go pulumi-nodejs pulumi-python;
# Pulumi currently requires protobuf4, but Nixpkgs defaults to a newer
# version. Test that we can actually build the package with protobuf4.
# https://github.com/pulumi/pulumi/issues/16828
# https://github.com/NixOS/nixpkgs/issues/351751#issuecomment-2462163436
pythonPackage =
pythonPackage = python3Packages.pulumi;
pythonPackageProtobuf5 =
(python3Packages.overrideScope (
final: _: {
protobuf = final.protobuf4;
protobuf = final.protobuf5;
}
)).pulumi;
pulumiTestHookShellcheck = testers.shellcheck {
name = "pulumi-test-hook-shellcheck";
src = ./extra/pulumi-test-hook.sh;
pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix
+1 -1
View File
@@ -9,7 +9,7 @@ buildGoModule rec {
sourceRoot = "${src.name}/sdk/go/pulumi-language-go";
vendorHash = "sha256-SfnGZyHuhgj277DrRqr8TkKE+ZwnPKBFu/7EcPS4OhE=";
vendorHash = "sha256-jwsdMSLDn2PNJFIIVhqwBLH7acFTOFLPgVNMKbI5DZE=";
ldflags = [
"-s"
pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix
+1 -1
View File
@@ -12,7 +12,7 @@ buildGoModule rec {
sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs";
vendorHash = "sha256-Mf/SsRRDlm/TuSOksLV8f7H7xiT6fkHWyH6fJFo5fCc=";
vendorHash = "sha256-Q5Pk2f3EAiM4oit1vhc+PMEuMxdbrKAue3e0pnrZw2c=";
ldflags = [
"-s"
pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix
+1 -1
View File
@@ -12,7 +12,7 @@ buildGoModule rec {
sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python";
vendorHash = "sha256-cpmB1Vmi8JAh+OKzoZ/x/AxB4uxH95laSo0uBGrj3FQ=";
vendorHash = "sha256-BfkjDesPdPDV2uILYaMJFIvaEBKT15ukwaReAL3yziw=";
ldflags = [
"-s"
pkgs/by-name/qo/qownnotes/package.nix
+2 -2
View File
@@ -18,11 +18,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "25.8.4";
version = "25.8.7";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-6DrwdimHuCLcmSiOGghvJajowbhWh8arnL/iPPxfopQ=";
hash = "sha256-OBLFdJAiBleymmWVDYIu7zeMNDU++HAlyPJi5qSoRO4=";
};
nativeBuildInputs = [
pkgs/by-name/rp/rpi-imager/package.nix
+21 -26
View File
@@ -10,7 +10,7 @@
qt6,
wrapGAppsHook4,
testers,
util-linux,
writeShellScriptBin,
xz,
gnutls,
zstd,
@@ -20,35 +20,35 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rpi-imager";
version = "1.9.4";
version = "1.9.6";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-imager";
tag = "v${finalAttrs.version}";
hash = "sha256-Ih7FeAKTKSvuwsrMgKQ0VEUYHHT6L99shxfAIjAzErk=";
hash = "sha256-HJLl0FOseZgW3DMi8M3SqIN/UHBDkIc09vKcenhSnO8=";
};
sourceRoot = "${finalAttrs.src.name}/src";
# By default, the builder checks for JSON support in lsblk by running "lsblk --json",
# but that throws an error, as /sys/dev doesn't exist in the sandbox.
# This patch removes the check.
# remove-vendoring.patch from
# https://gitlab.archlinux.org/archlinux/packaging/packages/rpi-imager/-/raw/main/remove-vendoring.patch
patches = [ ./remove-vendoring-and-lsblk-check.patch ];
patches = [ ./remove-vendoring.patch ];
postPatch = ''
substituteInPlace ../debian/org.raspberrypi.rpi-imager.desktop \
substituteInPlace debian/org.raspberrypi.rpi-imager.desktop \
--replace-fail "/usr/bin/" ""
'';
preConfigure = ''
cd src
'';
nativeBuildInputs = [
cmake
pkg-config
qt6.wrapQtAppsHook
wrapGAppsHook4
util-linux
# Fool upstream's cmake lsblk check a bit
(writeShellScriptBin "lsblk" ''
echo "our lsblk has --json support but it doesn't work in our sandbox"
'')
];
buildInputs = [
@@ -67,16 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qtwayland
];
cmakeFlags =
# Disable vendoring
[
(lib.cmakeBool "ENABLE_VENDORING" false)
]
# Disable telemetry and update check.
++ lib.optionals (!enableTelemetry) [
(lib.cmakeBool "ENABLE_CHECK_VERSION" false)
(lib.cmakeBool "ENABLE_TELEMETRY" false)
];
cmakeFlags = [
# Isn't relevant for Nix
(lib.cmakeBool "ENABLE_CHECK_VERSION" false)
(lib.cmakeBool "ENABLE_TELEMETRY" enableTelemetry)
];
qtWrapperArgs = [
"--unset QT_QPA_PLATFORMTHEME"
@@ -105,8 +100,8 @@ stdenv.mkDerivation (finalAttrs: {
ymarkus
anthonyroussel
];
platforms = lib.platforms.all;
# does not build on darwin
broken = stdenv.hostPlatform.isDarwin;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
# could not find xz
badPlatforms = lib.platforms.darwin;
};
})
pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch
-575
View File
@@ -1,575 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@
cmake_minimum_required(VERSION 3.22)
OPTION (ENABLE_CHECK_VERSION "Check for version updates" ON)
OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
+OPTION (ENABLE_VENDORING "Use vendored dependencies" ON)
# We use FetchContent_Populate() instead of FetchContent_MakeAvailable() to allow EXCLUDE_FROM_ALL
# This prevents the dependencies from being built by default, which is our desired behavior
@@ -58,410 +59,156 @@ if (APPLE)
endforeach()
endif(APPLE)
+## Preferentially build the bundled code. Full vendoring is to follow in a later version.
+
# Bundled code will occasionally use identical options - eg, BUILD_TESTING.
set(BUILD_TESTING OFF)
set(BUILD_STATIC_LIBS ON)
set(BUILD_SHARED_LIBS OFF)
-include(FetchContent)
-
-# Bundled liblzma
-set(LIBLZMA_VERSION "5.8.1")
-FetchContent_Declare(xz
- GIT_REPOSITORY https://github.com/tukaani-project/xz.git
- GIT_TAG v${LIBLZMA_VERSION}
- ${USE_OVERRIDE_FIND_PACKAGE}
-)
-set(XZ_MICROLZMA_DECODER OFF CACHE BOOL "" FORCE)
-set(XZ_MICROLZMA_ENCODER OFF CACHE BOOL "" FORCE)
-set(XZ_LZIP_DECODER OFF CACHE BOOL "" FORCE)
-set(XZ_ENABLE_SANDBOX OFF CACHE BOOL "" FORCE)
-set(XZ_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-set(XZ_ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE)
-set(XZ_DECODERS
- lzma1
- lzma2
- delta
-)
-set(XZ_ENCODERS
- lzma1
- lzma2
- delta
-)
-set(CREATE_LZMA_SYMLINKS OFF CACHE BOOL "" FORCE)
-set(CREATE_XZ_SYMLINKS OFF CACHE BOOL "" FORCE)
-FetchContent_GetProperties(xz)
-if(NOT xz_POPULATED)
- FetchContent_Populate(xz)
- add_subdirectory(${xz_SOURCE_DIR} ${xz_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-unset(XZ_MICROLZMA_DECODER)
-unset(XZ_MICROLZMA_ENCODER)
-unset(XZ_LZIP_DECODER)
-unset(XZ_ENABLE_SANDBOX)
-unset(XZ_BUILD_SHARED_LIBS)
-unset(XZ_ENABLE_DOXYGEN)
-unset(CREATE_LZMA_SYMLINKS)
-unset(CREATE_XZ_SYMLINKS)
-set(LIBLZMA_FOUND true CACHE BOOL "" FORCE)
-set(LIBLZMA_INCLUDE_DIR ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)
-set(LIBLZMA_INCLUDE_DIRS ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)
-set(LIBLZMA_LIBRARY liblzma CACHE FILEPATH "" FORCE)
-set(LIBLZMA_LIBRARIES ${xz_BINARY_DIR}/liblzma.a CACHE FILEPATH "" FORCE)
-set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "" FORCE)
-set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "" FORCE)
-set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "" FORCE)
-
-# Bundled zstd
-set(ZSTD_VERSION "1.5.7")
-FetchContent_Declare(zstd
- GIT_REPOSITORY https://github.com/facebook/zstd.git
- GIT_TAG v${ZSTD_VERSION}
- SOURCE_SUBDIR build/cmake
- ${USE_OVERRIDE_FIND_PACKAGE}
-)
-set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE)
-set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)
-set(ZSTD_BUILD_STATIC ON CACHE BOOL "" FORCE)
-set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE)
-FetchContent_GetProperties(zstd)
-if(NOT zstd_POPULATED)
- FetchContent_Populate(zstd)
- add_subdirectory(${zstd_SOURCE_DIR}/build/cmake ${zstd_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-unset(ZSTD_BUILD_PROGRAMS)
-unset(ZSTD_BUILD_SHARED)
-unset(ZSTD_BUILD_STATIC)
-unset(ZSTD_BUILD_TESTS)
-unset(ZSTD_BUILD_DICTBUILDER)
-set(ZSTD_FOUND true CACHE BOOL "" FORCE)
-set(Zstd_VERSION ${ZSTD_VERSION} CACHE STRING "" FORCE)
-set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
-set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
-set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
-set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)
-set(Zstd_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
-set(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
-set(ZSTD_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-build/lib/libzstd.a CACHE FILEPATH "" FORCE)
-
-# Remote nghttp2
-set(NGHTTP2_VERSION "1.65.0")
-FetchContent_Declare(nghttp2
- GIT_REPOSITORY https://github.com/nghttp2/nghttp2.git
- GIT_TAG v${NGHTTP2_VERSION}
- ${USE_OVERRIDE_FIND_PACKAGE}
-)
-set(BUILD_EXAMPLES OFF)
-set(ENABLE_LIB_ONLY ON)
-set(ENABLE_FAILMALLOC OFF)
-FetchContent_GetProperties(nghttp2)
-if(NOT nghttp2_POPULATED)
- FetchContent_Populate(nghttp2)
- add_subdirectory(${nghttp2_SOURCE_DIR} ${nghttp2_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-unset(ENABLE_LIB_ONLY)
-unset(ENABLE_FAILMALLOC)
-unset(BUILD_EXAMPLES)
-set(NGHTTP2_LIBRARIES nghttp2_static CACHE FILEPATH "" FORCE)
-set(NGHTTP2_LIBRARY nghttp2_static CACHE FILEPATH "" FORCE)
-set(NGHTTP2_INCLUDE_DIR ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
-set(NGHTTP2_INCLUDE_DIRS ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
-set(NGHTTP2_FOUND true CACHE BOOL "" FORCE)
-
-
-# Bundled zlib
-set(ZLIB_VERSION "1.4.1.1")
-set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-set(ZLIB_BUILD_SHARED OFF CACHE BOOL "" FORCE)
-set(ZLIB_BUILD_STATIC ON CACHE BOOL "" FORCE)
-set(ZLIB_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(SKIP_INSTALL_ALL ON CACHE BOOL "" FORCE)
-FetchContent_Declare(zlib
- GIT_REPOSITORY https://github.com/madler/zlib.git
- GIT_TAG 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71 # v1.4.1.1, as of 27/05/2025
- ${USE_OVERRIDE_FIND_PACKAGE}
-)
-FetchContent_GetProperties(zlib)
-if(NOT zlib_POPULATED)
- FetchContent_Populate(zlib)
- add_subdirectory(${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-unset(ZLIB_BUILD_EXAMPLES)
-unset(ZLIB_BUILD_SHARED)
-unset(ZLIB_BUILD_STATIC)
-unset(ZLIB_BUILD_TESTS)
-unset(SKIP_INSTALL_ALL)
-# Set zlib variables that libarchive's CMake will use
-set(ZLIB_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) # This is to help FindZlib.cmake find the static library over the shared one
-set(ZLIB_ROOT ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
-
-# On Windows with MinGW, zlib builds with .a extension, not .lib
-# Set the correct library path before find_package
-if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
- set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libzlibstatic.a CACHE FILEPATH "" FORCE)
- set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libzlibstatic.a CACHE STRING "" FORCE)
-else()
- set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libz.a CACHE FILEPATH "" FORCE)
- set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libz.a CACHE STRING "" FORCE)
-endif()
-
-# Since we're building zlib ourselves with EXCLUDE_FROM_ALL, we don't need find_package
-# Instead, we'll create the ZLIB::ZLIB target manually and set all required variables
-set(ZLIB_INCLUDE_DIR ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
-set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)
-
-# Create ZLIB::ZLIB target manually since we're not using find_package
-# Set zlib variables that other packages expect
-set(ZLIB_FOUND TRUE CACHE BOOL "" FORCE)
-add_library(ZLIB::ZLIB STATIC IMPORTED)
-if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
- set_target_properties(ZLIB::ZLIB PROPERTIES
- IMPORTED_LOCATION "${zlib_BINARY_DIR}/libzlibstatic.a"
- INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}"
- )
- add_dependencies(ZLIB::ZLIB zlibstatic)
-else()
- set_target_properties(ZLIB::ZLIB PROPERTIES
- IMPORTED_LOCATION "${zlib_BINARY_DIR}/libz.a"
- INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}"
+if(ENABLE_VENDORING)
+ # Bundled liblzma
+ set(XZ_MICROLZMA_DECODER OFF)
+ set(XZ_MICROLZMA_ENCODER OFF)
+ set(XZ_LZIP_DECODER OFF)
+ set(XZ_ENABLE_SANDBOX OFF)
+ set(XZ_BUILD_SHARED_LIBS OFF)
+ set(XZ_ENABLE_DOXYGEN OFF)
+ set(XZ_DECODERS
+ lzma1
+ lzma2
+ delta
)
- add_dependencies(ZLIB::ZLIB zlibstatic)
-endif()
-
-# Debug output
-message(STATUS "ZLIB_LIBRARY set to: ${ZLIB_LIBRARY}")
-message(STATUS "ZLIB_LIBRARIES set to: ${ZLIB_LIBRARIES}")
-message(STATUS "ZLIB_INCLUDE_DIRS set to: ${ZLIB_INCLUDE_DIRS}")
-
-# Bundled libarchive
-
-set(ENABLE_WERROR OFF CACHE BOOL "")
-set(ENABLE_INSTALL OFF CACHE BOOL "")
-set(ENABLE_TEST OFF CACHE BOOL "")
-set(ENABLE_CNG OFF CACHE BOOL "")
-set(ENABLE_MBEDTLS OFF CACHE BOOL "")
-set(ENABLE_NETTLE OFF CACHE BOOL "")
-set(ENABLE_OPENSSL OFF CACHE BOOL "")
-# Configure libarchive with explicit zlib support
-set(ENABLE_ZLIB ON CACHE BOOL "")
-set(ENABLE_BZip2 OFF CACHE BOOL "")
-set(ENABLE_LZ4 OFF CACHE BOOL "")
-set(ENABLE_LZO OFF CACHE BOOL "")
-set(ENABLE_LIBB2 OFF CACHE BOOL "")
-set(ENABLE_LIBXML2 OFF CACHE BOOL "")
-set(ENABLE_EXPAT OFF CACHE BOOL "")
-set(ENABLE_PCREPOSIX OFF CACHE BOOL "")
-set(ENABLE_PCRE2POSIX OFF CACHE BOOL "")
-set(ENABLE_LIBGCC OFF CACHE BOOL "")
-set(ENABLE_TAR OFF CACHE BOOL "")
-set(ENABLE_CPIO OFF CACHE BOOL "")
-set(ENABLE_CAT OFF CACHE BOOL "")
-set(BUILD_SHARED_LIBS OFF CACHE BOOL "")
-set(ARCHIVE_BUILD_STATIC_LIBS ON CACHE BOOL "")
-set(ARCHIVE_BUILD_EXAMPLES OFF CACHE BOOL "")
-set(ENABLE_ZSTD ON CACHE BOOL "")
-set(POSIX_REGEX_LIB "libc" CACHE STRING "" FORCE)
-set(LIBARCHIVE_VERSION "3.8.0")
-
-# Create a patch script to fix ZSTD detection in libarchive
-set(LIBARCHIVE_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/libarchive_zstd_patch.cmake")
-file(WRITE ${LIBARCHIVE_PATCH_FILE} "
-# Read the original CMakeLists.txt
-file(READ \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" CONTENT)
-
-# Find the start and end of the ZSTD section
-string(FIND \"\${CONTENT}\" \"IF(ZSTD_FOUND)\" ZSTD_START)
-string(FIND \"\${CONTENT}\" \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\" ZSTD_END)
-
-if(ZSTD_START GREATER -1 AND ZSTD_END GREATER -1)
- # Calculate positions
- math(EXPR ZSTD_END \"\${ZSTD_END} + 40\") # Length of \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\"
-
- # Extract parts before and after the ZSTD section
- string(SUBSTRING \"\${CONTENT}\" 0 \${ZSTD_START} BEFORE_ZSTD)
- string(SUBSTRING \"\${CONTENT}\" \${ZSTD_END} -1 AFTER_ZSTD)
-
- # Create the new ZSTD section
- set(NEW_ZSTD_SECTION \"IF(ZSTD_FOUND)
- SET(HAVE_ZSTD_H 1)
- INCLUDE_DIRECTORIES(\\\${ZSTD_INCLUDE_DIR})
- LIST(APPEND ADDITIONAL_LIBS \\\${ZSTD_LIBRARY})
-
- # Check if ZSTD variables were provided externally (indicating static build)
- get_property(ZSTD_LIB_IS_CACHE CACHE ZSTD_LIBRARY PROPERTY TYPE)
- get_property(ZSTD_INC_IS_CACHE CACHE ZSTD_INCLUDE_DIR PROPERTY TYPE)
- if(ZSTD_LIB_IS_CACHE AND ZSTD_INC_IS_CACHE)
- # Skip function checks for static builds and assume all functions are available
- message(STATUS \\\"Using provided ZSTD library: \\\${ZSTD_LIBRARY}\\\")
- SET(HAVE_LIBZSTD 1)
- SET(HAVE_ZSTD_compressStream 1)
- SET(HAVE_ZSTD_minCLevel 1)
- else()
- # Original function checks for dynamic builds
- CMAKE_PUSH_CHECK_STATE()
- SET(CMAKE_REQUIRED_LIBRARIES \\\${ZSTD_LIBRARY})
- SET(CMAKE_REQUIRED_INCLUDES \\\${ZSTD_INCLUDE_DIR})
- CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD)
- CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream)
- CHECK_FUNCTION_EXISTS(ZSTD_minCLevel HAVE_ZSTD_minCLevel)
- CMAKE_POP_CHECK_STATE()
- endif()
-ENDIF(ZSTD_FOUND)
-MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\")
-
- # Combine the parts
- set(NEW_CONTENT \"\${BEFORE_ZSTD}\${NEW_ZSTD_SECTION}\")
-
- # Write the modified content back
- file(WRITE \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" \"\${NEW_CONTENT}\${AFTER_ZSTD}\")
- message(STATUS \"Patched libarchive CMakeLists.txt for static ZSTD support\")
-else()
- message(WARNING \"Could not find ZSTD section in libarchive CMakeLists.txt\")
-endif()
-")
-
-FetchContent_Declare(libarchive
- GIT_REPOSITORY https://github.com/libarchive/libarchive.git
- GIT_TAG v${LIBARCHIVE_VERSION}
- PATCH_COMMAND ${CMAKE_COMMAND} -P ${LIBARCHIVE_PATCH_FILE}
- ${USE_OVERRIDE_FIND_PACKAGE}
-)
-FetchContent_GetProperties(libarchive)
-if(NOT libarchive_POPULATED)
- FetchContent_Populate(libarchive)
- add_subdirectory(${libarchive_SOURCE_DIR} ${libarchive_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-
-# Ensure libarchive is built after zlib
-if (TARGET archive_static AND TARGET ZLIB::ZLIB)
- add_dependencies(archive_static ZLIB::ZLIB)
-endif()
-
-unset(POSIX_REGEX_LIB)
-unset(ENABLE_WERROR)
-unset(ENABLE_INSTALL)
-unset(ENABLE_TEST)
-unset(ENABLE_CNG)
-unset(ENABLE_MBEDTLS)
-unset(ENABLE_NETTLE)
-unset(ENABLE_OPENSSL)
-unset(ENABLE_ZLIB)
-unset(ENABLE_BZip2)
-unset(ENABLE_LZ4)
-unset(ENABLE_LZO)
-unset(ENABLE_LIBB2)
-unset(ENABLE_LIBXML2)
-unset(ENABLE_EXPAT)
-unset(ENABLE_PCREPOSIX)
-unset(ENABLE_PCRE2POSIX)
-unset(ENABLE_LIBGCC)
-unset(ENABLE_TAR)
-unset(ENABLE_CPIO)
-unset(ENABLE_CAT)
-unset(ARCHIVE_BUILD_SHARED_LIBS)
-unset(ENABLE_ZSTD)
-set(LibArchive_FOUND true CACHE BOOL "" FORCE)
-set(LibArchive_LIBRARIES archive_static CACHE FILEPATH "" FORCE)
-set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
-set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
-
-# Bundled libcurl
-set(CURL_VERSION "8.13.0")
-string(REPLACE "." "_" CURL_TAG ${CURL_VERSION})
-FetchContent_Declare(curl
- GIT_REPOSITORY https://github.com/curl/curl.git
- GIT_TAG curl-${CURL_TAG}
- ${USE_OVERRIDE_FIND_PACKAGE}
-)
-set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)
-set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE)
-set(BUILD_MISC_DOCS OFF CACHE BOOL "" FORCE)
-set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE)
-set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE)
-set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE)
-set(CURL_DISABLE_ALTSVC ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_KERBEROS_AUTH ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_DICT ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_DISABLE_FORM_API ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_FTP ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_GOPHER ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_IMAP ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_LDAPS ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_MQTT ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_NETRC ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_POP3 ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_RTSP ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_SMTP ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_TELNET ON CACHE BOOL "" FORCE)
-set(CURL_DISABLE_TFTP ON CACHE BOOL "" FORCE)
-set(CURL_ZSTD ON)
-set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE)
-set(CURL_DISABLE_INSTALL ON)
-if (APPLE)
- # TODO: SecureTransport is a deprecated API in macOS, supporting
- # only up to TLS v1.2. cURL has not implemented the replacement,
- # Network.framework, and so we will need to select an alternative.
- # Best recommendation: Libressl, as used by Apple in the curl binary
- # on macOS.
- set(CURL_USE_SECTRANSP ON)
- set(CURL_DEFAULT_SSL_BACKEND "secure-transport")
- set(USE_APPLE_IDN ON)
-else()
- if (WIN32)
- set(CURL_USE_SCHANNEL ON)
- set(CURL_DEFAULT_SSL_BACKEND "schannel")
- else ()
- set(CURL_USE_GNUTLS ON)
- set(CURL_DEFAULT_SSL_BACKEND "gnutls")
- endif(WIN32)
-endif(APPLE)
-
-FetchContent_GetProperties(curl)
-if(NOT curl_POPULATED)
- FetchContent_Populate(curl)
- add_subdirectory(${curl_SOURCE_DIR} ${curl_BINARY_DIR} EXCLUDE_FROM_ALL)
+ set(XZ_ENCODERS "")
+ set(CREATE_LZMA_SYMLINKS OFF)
+ set(CREATE_XZ_SYMLINKS OFF)
+ add_subdirectory(dependencies/xz-5.8.1)
+ set(LIBLZMA_FOUND true)
+ set(LIBLZMA_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE)
+ set(LIBLZMA_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE)
+ set(LIBLZMA_LIBRARY liblzma)
+ set(LIBLZMA_LIBRARIES liblzma)
+
+ # Bundled zstd
+ set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE)
+ set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)
+ set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+ set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE)
+ add_subdirectory(dependencies/zstd-1.5.7/build/cmake)
+ set(Zstd_FOUND true)
+ set(ZSTD_FOUND true)
+ set(Zstd_VERSION "1.5.7")
+ set(ZSTD_VERSION "1.5.7")
+ set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
+ set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
+ set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
+ set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)
+ set(Zstd_LIBRARIES libzstd_static)
+ set(ZSTD_LIBRARIES libzstd_static)
+ set(ZSTD_LIBRARY libzstd_static)
+
+ # Bundled zlib
+ set(ZLIB_BUILD_EXAMPLES OFF)
+ set(SKIP_INSTALL_ALL ON)
+ add_subdirectory(dependencies/zlib-1.4.1.1)
+ set(ZLIB_FOUND TRUE)
+ set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir")
+ set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir")
+ set(ZLIB_LIBRARY zlibstatic)
+ set(ZLIB_LIBRARIES zlibstatic)
+
+ # Bundled libarchive
+ set(ARCHIVE_ENABLE_WERROR OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_INSTALL OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_TEST OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_CNG OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_MBEDTLS OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_NETTLE OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_OPENSSL OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_BZip2 OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_LZ4 OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_LZO OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_LIBB2 OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_LIBXML2 OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_EXPAT OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_PCREPOSIX OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_PCRE2POSIX OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_LIBGCC OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_TAR OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_CPIO OFF CACHE BOOL "")
+ set(ARCHIVE_ENABLE_CAT OFF CACHE BOOL "")
+ set(ARCHIVE_BUILD_SHARED_LIBS OFF CACHE BOOL "")
+ add_subdirectory(dependencies/libarchive-3.7.7)
+ set(LibArchive_FOUND true)
+ set(LibArchive_LIBRARIES archive_static)
+ set(LibArchive_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/libarchive-3.7.8/libarchive)
+
+ # Bundled libcurl
+ set(CMAKE_CURL_INCLUDES)
+ set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)
+ set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE)
+ set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE)
+ set(CURL_USE_LIBPSL OFF)
+ set(CURL_USE_LIBSSH2 OFF)
+ set(CURL_DISABLE_ALTSVC ON)
+ set(CURL_DISABLE_KERBEROS_AUTH ON)
+ set(CURL_DISABLE_DICT ON)
+ set(CURL_DISABLE_DISABLE_FORM_API ON)
+ set(CURL_DISABLE_FTP ON)
+ set(CURL_DISABLE_GOPHER ON)
+ set(CURL_DISABLE_IMAP ON)
+ set(CURL_DISABLE_LDAP ON)
+ set(CURL_DISABLE_LDAPS ON)
+ set(CURL_DISABLE_MQTT ON)
+ set(CURL_DISABLE_NETRC ON)
+ set(CURL_DISABLE_POP3 ON)
+ set(CURL_DISABLE_RTSP ON)
+ set(CURL_DISABLE_SMTP ON)
+ set(CURL_DISABLE_TELNET ON)
+ set(CURL_DISABLE_TFTP ON)
+ set(CURL_ZSTD ON)
+ set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE)
+ set(CURL_DISABLE_INSTALL ON)
+ if (APPLE)
+ # TODO: SecureTransport is a deprecated API in macOS, supporting
+ # only up to TLS v1.2. cURL has not implemented the replacement,
+ # Network.framework, and so we will need to select an alternative.
+ # Best recommendation: Libressl, as used by Apple in the curl binary
+ # on macOS.
+ set(CURL_USE_SECTRANSP ON)
+ set(CURL_DEFAULT_SSL_BACKEND "secure-transport")
+ set(USE_APPLE_IDN ON)
+ else()
+ if (WIN32)
+ set(CURL_USE_SCHANNEL ON)
+ set(CURL_DEFAULT_SSL_BACKEND "schannel")
+ else ()
+ set(CURL_USE_GNUTLS ON)
+ set(CURL_DEFAULT_SSL_BACKEND "gnutls")
+ endif(WIN32)
+ endif(APPLE)
+
+ add_subdirectory(dependencies/curl-8.13.0)
+ set(CURL_FOUND true)
+ set(CURL_LIBRARIES libcurl_static)
+ set(CURL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include)
+ set(CURL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include)
+
+elseif (NOT ENABLE_VENDORING AND UNIX)
+ # Find the libraries that were subject to vendoring in the system instead,
+ # To keep the possibility of delivery via Linux distro packages
+ find_package(ZLIB)
+ if(ZLIB_FOUND)
+ set(EXTRALIBS ${EXTRALIBS} ZLIB::ZLIB)
+ endif()
+ find_package(LibLZMA)
+ if(LIBLZMA_FOUND)
+ set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA)
+ endif()
+ find_package(CURL 8.13.0 REQUIRED)
+ find_package(LibArchive 3.7.8 REQUIRED)
endif()
-unset(BUILD_CURL_EXE)
-unset(BUILD_LIBCURL_DOCS)
-unset(BUILD_MISC_DOCS)
-unset(ENABLE_CURL_MANUAL)
-unset(BUILD_EXAMPLES)
-unset(CURL_USE_LIBPSL)
-unset(CURL_USE_LIBSSH2)
-unset(CURL_DISABLE_ALTSVC)
-unset(CURL_DISABLE_KERBEROS_AUTH)
-unset(CURL_DISABLE_DICT)
-unset(CURL_DISABLE_DISABLE_FORM_API)
-unset(CURL_DISABLE_FTP)
-unset(CURL_DISABLE_GOPHER)
-unset(CURL_DISABLE_IMAP)
-unset(CURL_DISABLE_LDAP)
-unset(CURL_DISABLE_LDAPS)
-unset(CURL_DISABLE_MQTT)
-unset(CURL_DISABLE_NETRC)
-unset(CURL_DISABLE_POP3)
-unset(CURL_DISABLE_RTSP)
-unset(CURL_DISABLE_SMTP)
-unset(CURL_DISABLE_TELNET)
-unset(CURL_DISABLE_TFTP)
-unset(CURL_ZSTD)
-unset(CURL_ENABLE_EXPORT_TARGET)
-unset(CURL_DISABLE_INSTALL)
-unset(CURL_USE_SECTRANSP)
-unset(CURL_DEFAULT_SSL_BACKEND)
-unset(USE_APPLE_IDN)
-unset(CURL_USE_SCHANNEL)
-unset(CURL_USE_GNUTLS)
-
-set(CURL_FOUND true CACHE BOOL "" FORCE)
-set(CURL_LIBRARIES libcurl_static CACHE FILEPATH "" FORCE)
-set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
-set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
-
# Adding headers explicity so they are displayed in Qt Creator
set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h
devicewrapper.h devicewrapperblockcacheentry.h devicewrapperpartition.h devicewrapperstructs.h devicewrapperfatpartition.h wlancredentials.h
@@ -928,11 +675,6 @@ else()
if (NOT LSBLK)
message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)")
endif()
-
- execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret)
- if (ret EQUAL "1")
- message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)")
- endif()
endif()
install(TARGETS ${PROJECT_NAME} DESTINATION bin)
pkgs/by-name/rp/rpi-imager/remove-vendoring.patch
+94
View File
@@ -0,0 +1,94 @@
diff --git c/src/CMakeLists.txt w/src/CMakeLists.txt
index f9e020ce..c5f71914 100644
--- c/src/CMakeLists.txt
+++ w/src/CMakeLists.txt
@@ -68,6 +68,10 @@ set(BUILD_SHARED_LIBS OFF)
include(FetchContent)
+find_package(LibLZMA)
+if(LIBLZMA_FOUND)
+ set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA)
+else()
# Bundled liblzma
set(LIBLZMA_VERSION "5.8.1")
FetchContent_Declare(xz
@@ -114,7 +118,10 @@ set(LIBLZMA_LIBRARIES ${xz_BINARY_DIR}/liblzma.a CACHE FILEPATH "" FORCE)
set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "" FORCE)
set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "" FORCE)
set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "" FORCE)
+endif()
+find_package(zstd ${ZSTD_VERSION})
+if(NOT zstd_FOUND)
# Bundled zstd
set(ZSTD_VERSION "1.5.7")
FetchContent_Declare(zstd
@@ -147,32 +154,12 @@ set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH
set(Zstd_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
set(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)
set(ZSTD_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-build/lib/libzstd.a CACHE FILEPATH "" FORCE)
-
-# Remote nghttp2
-set(NGHTTP2_VERSION "1.66.0")
-FetchContent_Declare(nghttp2
- GIT_REPOSITORY https://github.com/nghttp2/nghttp2.git
- GIT_TAG v${NGHTTP2_VERSION}
- ${USE_OVERRIDE_FIND_PACKAGE}
-)
-set(BUILD_EXAMPLES OFF)
-set(ENABLE_LIB_ONLY ON)
-set(ENABLE_FAILMALLOC OFF)
-FetchContent_GetProperties(nghttp2)
-if(NOT nghttp2_POPULATED)
- FetchContent_Populate(nghttp2)
- add_subdirectory(${nghttp2_SOURCE_DIR} ${nghttp2_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
-unset(ENABLE_LIB_ONLY)
-unset(ENABLE_FAILMALLOC)
-unset(BUILD_EXAMPLES)
-set(NGHTTP2_LIBRARIES nghttp2_static CACHE FILEPATH "" FORCE)
-set(NGHTTP2_LIBRARY nghttp2_static CACHE FILEPATH "" FORCE)
-set(NGHTTP2_INCLUDE_DIR ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
-set(NGHTTP2_INCLUDE_DIRS ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)
-set(NGHTTP2_FOUND true CACHE BOOL "" FORCE)
-
+find_package(ZLIB)
+if(ZLIB_FOUND)
+ set(EXTRALIBS ${EXTRALIBS} ZLIB::ZLIB)
+else()
# Bundled zlib
set(ZLIB_VERSION "1.4.1.1")
set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
@@ -236,7 +223,10 @@ endif()
message(STATUS "ZLIB_LIBRARY set to: ${ZLIB_LIBRARY}")
message(STATUS "ZLIB_LIBRARIES set to: ${ZLIB_LIBRARIES}")
message(STATUS "ZLIB_INCLUDE_DIRS set to: ${ZLIB_INCLUDE_DIRS}")
+endif()
+find_package(LibArchive)
+if(NOT LibArchive_FOUND)
# Bundled libarchive
set(ENABLE_WERROR OFF CACHE BOOL "")
@@ -368,8 +358,11 @@ set(LibArchive_FOUND true CACHE BOOL "" FORCE)
set(LibArchive_LIBRARIES archive_static CACHE FILEPATH "" FORCE)
set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)
+endif()
# Bundled libcurl
+find_package(CURL)
+if(NOT CURL_FOUND)
set(CURL_VERSION "8.14.1")
string(REPLACE "." "_" CURL_TAG ${CURL_VERSION})
FetchContent_Declare(curl
@@ -516,6 +509,7 @@ set(CURL_FOUND true CACHE BOOL "" FORCE)
set(CURL_LIBRARIES libcurl_static CACHE FILEPATH "" FORCE)
set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)
+endif()
# Adding headers explicity so they are displayed in Qt Creator
set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h
pkgs/by-name/ta/tageditor/package.nix
+13 -8
View File
@@ -7,8 +7,8 @@
cpp-utilities,
mp4v2,
libid3tag,
libsForQt5,
qt5,
kdePackages,
qt6,
tagparser,
}:
@@ -26,21 +26,26 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
cmake
qt5.wrapQtAppsHook
qt6.wrapQtAppsHook
];
buildInputs = [
mp4v2
libid3tag
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qt5.qtwebengine
cpp-utilities
libsForQt5.qtutilities
kdePackages.qtutilities
qt6.qtbase
qt6.qttools
qt6.qtwebengine
tagparser
];
cmakeFlags = [
"-DQT_PACKAGE_PREFIX=Qt6"
"-DQt6_DIR=${qt6.qtbase}/lib/cmake/Qt6"
"-DQt6WebEngineWidgets_DIR=${qt6.qtwebengine}/lib/cmake/Qt6WebEngineWidgets"
];
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
mv $out/bin/*.app $out/Applications
pkgs/by-name/ti/tile38/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "tile38";
version = "1.36.0";
version = "1.36.1";
src = fetchFromGitHub {
owner = "tidwall";
repo = "tile38";
tag = version;
hash = "sha256-FJ1I82ECCit6FV0F5VfY5xa6qCEqZo47KdnY0vwRGzg=";
hash = "sha256-65zUbnnksLCWCsOjO8xzyhJ2IKhPg6tttywvApzf7mw=";
};
vendorHash = "sha256-hpqH/+MlXPz3NZ0ooyWwf1Rg2UeKW49xQ0KbCFIi7jc=";
vendorHash = "sha256-J8kWsbU8onvXeVLGGBX9P6hYuGy50fG+m1nFg6phBMk=";
subPackages = [
"cmd/tile38-cli"
pkgs/by-name/tr/tribler/package.nix
+129 -105
View File
@@ -1,136 +1,160 @@
{
lib,
stdenv,
fetchurl,
fetchPypi,
python311,
python312,
makeWrapper,
libtorrent-rasterbar-1_2_x,
qt5,
nix-update-script,
boost186,
fetchFromGitHub,
rustPlatform,
buildNpmPackage,
nodejs_24,
wrapGAppsHook3,
libappindicator-gtk3,
}:
let
# libtorrent-rasterbar-1_2_x requires python311 and boost 1.86
python3 = python311.override {
packageOverrides = final: prev: {
boost = boost186;
};
version = "8.2.3";
python3 = python312;
nodejs = nodejs_24;
src = fetchFromGitHub {
owner = "tribler";
repo = "Tribler";
tag = "v${version}";
hash = "sha256-yThl3HhPtwi/pK5Rcr2ClVLY8uCnIyfvdc53A8gjKDg=";
};
libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python;
tribler-webui = buildNpmPackage {
inherit nodejs version;
pname = "tribler-webui";
src = "${src}/src/tribler/ui";
npmDepsHash = "sha256-bgRwhqP6/NMPFbZks31IZtVGV9wzFFU6qSgyLvdarlY=";
# The prepack script runs the build script, which we'd rather do in the build phase.
npmPackFlags = [ "--ignore-scripts" ];
NODE_OPTIONS = "--openssl-legacy-provider";
dontNpmBuild = true;
dontNpmInstall = true;
installPhase = ''
mkdir -pv $out
cp -prvd ./* $out/
cd $out
npm install
npm run build
'';
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "tribler";
version = "7.14.0";
src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz";
hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4=";
};
python3.pkgs.buildPythonApplication {
inherit version src;
name = "tribler";
pyproject = true;
patches = [
./startupwmclass.patch
build-system = with python3.pkgs; [
setuptools
];
nativeBuildInputs = [
python3.pkgs.wrapPython
makeWrapper
# we had a "copy" of this in tribler's makeWrapper
# but it went out of date and broke, so please just use it directly
qt5.wrapQtAppsHook
];
buildInputs = [ python3.pkgs.python ];
pythonPath = [
libtorrent
]
++ (with python3.pkgs; [
# requirements-core.txt
aiohttp
aiohttp-apispec
anyio
chardet
configobj
cryptography
decorator
faker
libnacl
lz4
marshmallow
netifaces
networkx
pony
psutil
pyasn1
pydantic_1
pyopenssl
pyyaml
sentry-sdk
service-identity
yappi
yarl
bitarray
filelock
(pyipv8.overrideAttrs (p: rec {
version = "2.10.0";
src = fetchPypi {
inherit (p) pname;
inherit version;
hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU=";
};
}))
file-read-backwards
brotli
human-readable
dependencies = with python3.pkgs; [
# requirements.txt
bitarray
configobj
pyipv8
ipv8-rust-tunnels
libtorrent-rasterbar
lz4
pillow
pyqt5
pyqt5-sip
pyqtgraph
pyqtwebengine
]);
pony
pystray
];
installPhase = ''
mkdir -pv $out
# Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
wrapPythonPrograms
cp -prvd ./* $out/
makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \
--set _TRIBLERPATH "$out/src" \
--set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \
--set NO_AT_BRIDGE 1 \
--chdir "$out/src" \
--add-flags "-O $out/src/run_tribler.py"
buildInputs = with python3.pkgs; [
# setup.py requirements
pygobject3
setuptools
# sphinx requirements
sphinxHook
sphinx
sphinx-autoapi
sphinx-rtd-theme
astroid
# tray icon deps
wrapGAppsHook3
libappindicator-gtk3
# test phase requirements
pytestCheckHook
mkdir -p $out/share/applications $out/share/icons
cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/
cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm
mkdir -p $out/share/copyright/tribler
mv $out/LICENSE $out/share/copyright/tribler
];
outputs = [
"out"
];
buildPhase = ''
# fix the entrypoint
substituteInPlace build/setup.py --replace-fail '"tribler=tribler.run:main"' '"tribler=tribler.run:main_sync"'
substituteInPlace src/run_tribler.py --replace-fail 'if __name__ == "__main__":' 'def main_sync():'
# copy the built webui
rm -r src/tribler/ui
ln -s ${tribler-webui} src/tribler/ui
# build the docs
# FIXME: make doc SPHINXBUILD=${lib.getExe' python3.pkgs.sphinx "sphinx-build"}
# build the wheel
substituteInPlace build/win/build.py --replace-fail "if {'setup.py', 'bdist_wheel'}.issubset(sys.argv):" "if True:"
export GITHUB_TAG=v${version}
python3 build/debian/update_metainfo.py
python3 build/setup.py bdist_wheel
runHook pytestCheckHook
# build the docs
runHook sphinxHook
'';
shellHook = ''
wrapPythonPrograms || true
export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms)
export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH
export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}"
postInstall = ''
ln -s ${tribler-webui} $out/lib/python3.12/site-packages/tribler/ui
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ libappindicator-gtk3 ]}"
)
'';
postFixup = ''
runHook wrapGAppsHook3
'';
disabledTests = [
"test_request_for_version"
"test_establish_connection"
"test_tracker_test_error_resolve"
"test_get_default_fallback"
"test_get_default_fallback_half_tree"
"test_get_set_explicit"
];
disabledTestPaths = [
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Decentralised P2P filesharing client based on the Bittorrent protocol";
description = "Decentralized P2P filesharing client based on the Bittorrent protocol";
mainProgram = "tribler";
homepage = "https://www.tribler.org/";
changelog = "https://github.com/Tribler/tribler/releases/tag/v${finalAttrs.version}";
license = lib.licenses.lgpl21Plus;
changelog = "https://github.com/Tribler/tribler/releases/tag/v${version}";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [
xvapx
mkg20001
mlaradji
xvapx
];
platforms = lib.platforms.linux;
};
})
}
pkgs/by-name/tr/tribler/startupwmclass.patch
-9
View File
@@ -1,9 +0,0 @@
diff --git a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
index b0472a18d..0e0be14f3 100644
--- a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
+++ b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
@@ -7,3 +7,4 @@ Terminal=false
Type=Application
Categories=Application;Network;P2P
MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet;application/x-bittorrent
+StartupWMClass=Tribler
pkgs/by-name/tu/tukai/package.nix
+46
View File
@@ -0,0 +1,46 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
writableTmpDirAsHomeHook,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tukai";
version = "0.2.3";
src = fetchFromGitHub {
owner = "hlsxx";
repo = "tukai";
tag = "v${finalAttrs.version}";
hash = "sha256-YJtna4NIk9mmwymepFSZB8viUSPDU4XouRE5GCujSmk=";
};
cargoHash = "sha256-1V1DrewPGDJWmOoYdtK1HS/t83zFac/tgatfDTKxAmA=";
nativeBuildInputs = [
pkg-config
writableTmpDirAsHomeHook
];
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Terminal-based touch typing application";
homepage = "https://github.com/hlsxx/tukai";
changelog = "https://github.com/hlsxx/tukai/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
rein
];
mainProgram = "tukai";
};
})
pkgs/applications/misc/visidata/default.nix → pkgs/by-name/vi/visidata/package.nix
+63 -96
View File
@@ -1,55 +1,17 @@
{
stdenv,
lib,
buildPythonApplication,
python3Packages,
fetchFromGitHub,
# python requirements
beautifulsoup4,
boto3,
faker,
fonttools,
h5py,
importlib-metadata,
lxml,
matplotlib,
numpy,
odfpy,
openpyxl,
pandas,
pdfminer-six,
praw,
psutil,
psycopg2,
pyarrow,
pyshp,
pypng,
msgpack,
brotli,
python-dateutil,
pyyaml,
requests,
seaborn,
setuptools,
sh,
tabulate,
urllib3,
vobject,
wcwidth,
xlrd,
xlwt,
zstandard,
zulip,
# other
gitMinimal,
withPcap ? true,
dpkt,
dnslib,
withXclip ? stdenv.hostPlatform.isLinux,
xclip,
testers,
visidata,
stdenv,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "visidata";
version = "3.2";
format = "setuptools";
@@ -61,64 +23,69 @@ buildPythonApplication rec {
hash = "sha256-kOg9OypWNGStNYFctPIwzVa1CsZBySY2IpA3eDrS7eY=";
};
propagatedBuildInputs = [
# from visidata/requirements.txt
# packages not (yet) present in nixpkgs are commented
python-dateutil
pandas
requests
lxml
openpyxl
xlrd
xlwt
h5py
psycopg2
boto3
pyshp
#mapbox-vector-tile
pypng
#pyconll
msgpack
brotli
#fecfile
fonttools
#sas7bdat
#xport
#savReaderWriter
pyyaml
#namestand
#datapackage
pdfminer-six
#tabula
vobject
tabulate
wcwidth
zstandard
odfpy
urllib3
pyarrow
seaborn
matplotlib
sh
psutil
numpy
propagatedBuildInputs =
with python3Packages;
[
# from visidata/requirements.txt
# packages not (yet) present in nixpkgs are commented
python-dateutil
pandas
requests
lxml
openpyxl
xlrd
xlwt
h5py
psycopg2
boto3
pyshp
#mapbox-vector-tile
pypng
#pyconll
msgpack
brotli
#fecfile
fonttools
#sas7bdat
#xport
#savReaderWriter
pyyaml
#namestand
#datapackage
pdfminer-six
#tabula
vobject
tabulate
wcwidth
zstandard
odfpy
urllib3
pyarrow
seaborn
matplotlib
sh
psutil
numpy
#requests_cache
beautifulsoup4
#requests_cache
beautifulsoup4
faker
praw
zulip
#pyairtable
faker
praw
zulip
#pyairtable
setuptools
importlib-metadata
]
++ lib.optionals withPcap [
dpkt
dnslib
]
++ lib.optional withXclip xclip;
setuptools
importlib-metadata
]
++ lib.optionals withPcap (
with python3Packages;
[
dpkt
dnslib
]
)
++ lib.optional withXclip xclip;
nativeCheckInputs = [
gitMinimal
pkgs/by-name/vk/vkd3d/package.nix
+7 -4
View File
@@ -4,6 +4,7 @@
bison,
fetchFromGitLab,
flex,
perlPackages,
pkg-config,
spirv-headers,
stdenv,
@@ -14,14 +15,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vkd3d";
version = "1.15";
version = "1.17";
src = fetchFromGitLab {
domain = "gitlab.winehq.org";
owner = "wine";
repo = "vkd3d";
rev = "vkd3d-${finalAttrs.version}";
hash = "sha256-EzXsYi9wC+JdMYE77cIeO2lV+fY4ViQM3+KcAJFv9tU=";
tag = "vkd3d-${finalAttrs.version}";
hash = "sha256-jxQ9L1GL4j3P5/nb79qAXQp8/IStOWmiK/vvbFxeg1k=";
};
outputs = [
@@ -34,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
autoreconfHook
bison
flex
perlPackages.perl
perlPackages.JSON
pkg-config
wine
];
@@ -61,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = with lib.licenses; [ lgpl21Plus ];
mainProgram = "vkd3d-compiler";
maintainers = with lib.maintainers; [ ];
maintainers = with lib.maintainers; [ liberodark ];
inherit (wine.meta) platforms;
};
})
pkgs/by-name/wi/wire-desktop/package.nix
+28 -14
View File
@@ -26,25 +26,21 @@ let
pname = "wire-desktop";
versions = builtins.fromJSON (builtins.readFile ./versions.json);
version =
let
x86_64-darwin = "3.39.5211";
in
{
inherit x86_64-darwin;
aarch64-darwin = x86_64-darwin;
x86_64-linux = "3.39.3653";
x86_64-darwin = versions.macos.version;
aarch64-darwin = versions.macos.version;
x86_64-linux = versions.linux.version;
}
.${system} or throwSystem;
hash =
let
x86_64-darwin = "sha256-k6CIqHt67AFL70zdK0/91aQcpbb00OIggk5TF7y1IOY=";
in
{
inherit x86_64-darwin;
aarch64-darwin = x86_64-darwin;
x86_64-linux = "sha256-BbY+7fGAWW5CR/z4GeoBl5aOewCRuWzQjpQX4x1rzls=";
x86_64-darwin = versions.macos.hash;
aarch64-darwin = versions.macos.hash;
x86_64-linux = versions.linux.hash;
}
.${system} or throwSystem;
@@ -75,8 +71,21 @@ let
hydraPlatforms = [ ];
};
passthru.updateScript = {
command = [
./update.sh
./.
];
supportedFeatures = [ "commit" ];
};
linux = stdenv.mkDerivation rec {
inherit pname version meta;
inherit
pname
version
meta
passthru
;
src = fetchurl {
url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb";
@@ -151,7 +160,12 @@ let
};
darwin = stdenv.mkDerivation {
inherit pname version meta;
inherit
pname
version
meta
passthru
;
src = fetchurl {
url = "https://github.com/wireapp/wire-desktop/releases/download/macos%2F${version}/Wire.pkg";
pkgs/by-name/wi/wire-desktop/update.sh
Executable
+89
View File
@@ -0,0 +1,89 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq
set -e
cd $1
releases=$(curl -L \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"https://api.github.com/repos/wireapp/wire-desktop/releases" \
)
latest=$(jq --argjson suffix '{ "linux": ".deb", "macos": ".pkg" }' \
--slurpfile versions versions.json '
def platform_latest(platform):
map(select(.tag_name | startswith(platform)))
| max_by(.tag_name)
| { version: .tag_name | ltrimstr(platform + "/")
, url: .assets.[]
| .browser_download_url
| select(endswith($suffix.[platform]))
};
. as $releases
| $versions.[] as $old
| $old
| with_entries( .key as $key
| { key: $key, value: $releases | platform_latest($key) }
| select(.value.version != $old.[$key].version)
)
' <<< "$releases"
)
urlHashes=$(
printf '{ '
function entries () {
local sep=''
for url in $(jq --raw-output '.[].url' <<< "$latest"); do
hash=$(nix-hash --to-sri --type sha256 $(nix-prefetch-url $url))
if [ -z "$hash" ]; then
printf 'Failed to retrieve hash for %s\n' "$url" 2>&1
fi
printf '%s"%s": "%s"\n' "$sep" "$url" "$hash"
sep=', '
done
}
entries
printf '}'
)
commit=$(jq --arg versionJSON "$(printf '%s/versions.json' "$1")" \
--slurpfile versions versions.json '
$versions.[] as $old
| to_entries
| map("\(.key) \($old.[.key].version) -> \(.value.version)")
| join(", ")
| [ if . == ""
then empty
else { attrPath: "wire-desktop"
, oldVersion: "A"
, newVersion: "B"
, files: [ $versionJSON ]
, commitMessage: "wire-desktop: \(.)"
}
end
]
' <<< "$latest"
)
tempfile=$(mktemp)
updated=$(jq --argjson hashes "$urlHashes" --slurpfile versions versions.json '
$versions.[] as $old
| $old + map_values(with_entries(if .key == "url"
then { key: "hash"
, value: $hashes.[.value]
}
else .
end
)
)
' <<< "$latest" > $tempfile
)
mv $tempfile versions.json
printf '%s' "$commit"
exit 0
pkgs/by-name/wi/wire-desktop/versions.json
+10
View File
@@ -0,0 +1,10 @@
{
"linux": {
"version": "3.40.3718",
"hash": "sha256-1jBhF+Rnys8C3DaVbCKHDiylox2WG1qRvwnDbQrp1Mk="
},
"macos": {
"version": "3.40.5285",
"hash": "sha256-pcWB3irdPyDj55dWmNyc+oThVGgHtIu//EAk1k/56is="
}
}
pkgs/by-name/ze/zed-editor/package.nix
+3 -3
View File
@@ -99,7 +99,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zed-editor";
version = "0.201.6";
version = "0.201.8";
outputs = [
"out"
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
hash = "sha256-d1B04N5KS34ghUHOhStkCMZZosQe2yG2cu88KVxujKY=";
hash = "sha256-y7pWGdq7r675JnBFQwcB4QLn/0aFxpkwK7CjX0Ox+lk=";
};
patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
'';
cargoHash = "sha256-npuNvJUN9ENNB1G8kwcz8dRdFoLBJ/UgQHd+9ojW8PI=";
cargoHash = "sha256-20pOYcodc2jflxibY0I0+SSC1FTxB8Jw03kcihCnBOY=";
nativeBuildInputs = [
cmake
pkgs/desktops/lxde/core/lxappearance/default.nix
+23 -11
View File
@@ -1,29 +1,39 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
autoreconfHook,
intltool,
pkg-config,
libX11,
gtk2,
gtk3,
libxslt,
docbook_xsl,
wrapGAppsHook3,
withGtk3 ? true,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "lxappearance";
version = "0.6.3";
version = "0.6.4";
src = fetchurl {
url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz";
sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";
src = fetchFromGitHub {
owner = "lxde";
repo = "lxappearance";
tag = finalAttrs.version;
hash = "sha256-t5P3JYGZzhTaJ3s23r6yrAQoFcCV5uteHh67sWY1KrI=";
};
enableParallelBuilding = true;
nativeBuildInputs = [
pkg-config
intltool
wrapGAppsHook3
autoreconfHook
libxslt
docbook_xsl
];
buildInputs = [
@@ -35,14 +45,16 @@ stdenv.mkDerivation rec {
./lxappearance-0.6.3-xdg.system.data.dirs.patch
];
env.XSLTPROC = lib.getExe' libxslt "xsltproc";
configureFlags = lib.optional withGtk3 "--enable-gtk3";
meta = with lib; {
meta = {
description = "Lightweight program for configuring the theme and fonts of gtk applications";
mainProgram = "lxappearance";
homepage = "https://lxde.org/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ romildo ];
};
}
})
pkgs/desktops/lxde/core/lxmenu-data/default.nix
+18 -8
View File
@@ -1,20 +1,30 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
autoreconfHook,
intltool,
pkg-config,
glib,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "lxmenu-data";
version = "0.1.5";
version = "0.1.6";
src = fetchurl {
url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
src = fetchFromGitHub {
owner = "lxde";
repo = "lxmenu-data";
tag = finalAttrs.version;
hash = "sha256-5QdQ+7nzj7wDrfdt4GT8VW4+sHgZdE7h3cReY2pmcak=";
};
nativeBuildInputs = [ intltool ];
nativeBuildInputs = [
autoreconfHook
intltool
pkg-config
glib
];
meta = {
homepage = "https://lxde.org/";
@@ -22,4 +32,4 @@ stdenv.mkDerivation rec {
description = "Freedesktop.org desktop menus for LXDE";
platforms = lib.platforms.linux;
};
}
})
pkgs/desktops/lxde/core/lxpanel/default.nix
+12 -21
View File
@@ -1,8 +1,8 @@
{
lib,
stdenv,
fetchurl,
fetchpatch2,
fetchFromGitHub,
autoreconfHook,
pkg-config,
gettext,
m4,
@@ -32,29 +32,26 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lxpanel";
version = "0.10.1";
version = "0.11.1";
src = fetchurl {
url = "mirror://sourceforge/lxde/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug=";
src = fetchFromGitHub {
owner = "lxde";
repo = "lxpanel";
tag = finalAttrs.version;
hash = "sha256-jpe5AfRkyTVKQ9biOJiWKv0OVqP8gRCzfhSLDjnrEPc=";
};
patches = [
# fix build with gcc14
# https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c
(fetchpatch2 {
url = "https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c.patch?full_index=1";
hash = "sha256-lj4CWdiUQhEc9J8UNKcP7/tmsGnPjA5pwXAok5YFW4M=";
})
];
enableParallelBuilding = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
gettext
m4
intltool
libxmlxx
];
buildInputs = [
(if withGtk3 then keybinder3 else keybinder)
(if withGtk3 then gtk3 else gtk2)
@@ -74,13 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional supportAlsa alsa-lib;
postPatch = ''
substituteInPlace src/Makefile.in \
--replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
substituteInPlace plugins/Makefile.in \
--replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
'';
configureFlags = lib.optional withGtk3 "--enable-gtk3";
meta = {
@@ -89,5 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.ryneeverett ];
platforms = lib.platforms.linux;
mainProgram = "lxpanel";
};
})
pkgs/desktops/lxde/core/lxrandr/default.nix
+30 -12
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
pkg-config,
intltool,
gtk2,
@@ -9,35 +9,53 @@
xrandr,
withGtk3 ? false,
gtk3,
autoreconfHook,
libxslt,
docbook_xsl,
docbook_xml_dtd_412,
libxml2,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "lxrandr";
version = "0.3.2";
version = "0.3.3";
src = fetchurl {
url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb";
src = fetchFromGitHub {
owner = "lxde";
repo = "lxrandr";
tag = finalAttrs.version;
hash = "sha256-EGUnvV1FqQUJkjGwxgVecXOohAu8Qa8Prgk6xZfJBe4=";
};
configureFlags = lib.optional withGtk3 "--enable-gtk3";
configureFlags = [
"--enable-man"
]
++ lib.optional withGtk3 "--enable-gtk3";
nativeBuildInputs = [
autoreconfHook
pkg-config
intltool
libxslt
libxml2
docbook_xml_dtd_412
docbook_xsl
];
patches = [ ./respect-xml-catalog-files-var.patch ];
buildInputs = [
libX11
xrandr
(if withGtk3 then gtk3 else gtk2)
];
meta = with lib; {
meta = {
description = "Standard screen manager of LXDE";
mainProgram = "lxrandr";
homepage = "https://lxde.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ rawkode ];
platforms = platforms.linux;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ rawkode ];
platforms = lib.platforms.linux;
};
}
})
pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch
+15
View File
@@ -0,0 +1,15 @@
diff --git a/acinclude.m4 b/acinclude.m4
index be626c5..b449b1b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
[
AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
- if $jh_found_xmlcatalog && \
- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+ # empty argument forces libxml to use XML_CATALOG_FILES variable
+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
AC_MSG_RESULT([found])
ifelse([$3],,,[$3
])dnl
pkgs/desktops/lxde/core/lxsession/default.nix
+19 -30
View File
@@ -1,10 +1,8 @@
{
lib,
stdenv,
fetchpatch,
fetchFromGitHub,
autoconf,
automake,
autoreconfHook,
docbook_xml_dtd_412,
docbook_xsl,
intltool,
@@ -18,39 +16,26 @@
vala,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "lxsession";
version = "0.5.5";
version = "0.5.6";
src = fetchFromGitHub {
owner = "lxde";
repo = "lxsession";
rev = version;
sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d";
tag = finalAttrs.version;
hash = "sha256-3RnRF4oMCtZbIraHVqEPnkviAkELq7uYqyHY0uCf/lU=";
};
patches = [
./xmlcatalog_patch.patch
# lxsession compilation is broken upstream as of GCC 14
# https://sourceforge.net/p/lxde/bugs/973/
(fetchpatch {
name = "0001-Fix-build-on-GCC-14.patch";
url = "https://sourceforge.net/p/lxde/bugs/973/attachment/0001-Fix-build-on-GCC-14.patch";
hash = "sha256-lxF3HZy5uLK7Cfu8W1A03syZf7OWXpHiU2Fk+xBl39g=";
})
];
nativeBuildInputs = [
autoconf
automake
docbook_xml_dtd_412
docbook_xsl
autoreconfHook
intltool
libxml2
libxslt
pkg-config
wrapGAppsHook3
docbook_xml_dtd_412
docbook_xsl
];
buildInputs = [
@@ -64,16 +49,20 @@ stdenv.mkDerivation rec {
"--enable-man"
"--disable-buildin-clipboard"
"--disable-buildin-polkit"
"--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
];
preConfigure = "./autogen.sh";
postPatch = ''
mkdir -p m4
'';
meta = with lib; {
patches = [ ./repect-xml-catalog-file-var.patch ];
meta = {
homepage = "https://wiki.lxde.org/en/LXSession";
description = "Classic LXDE session manager";
license = licenses.gpl2Plus;
maintainers = [ maintainers.shamilton ];
platforms = platforms.linux;
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.shamilton ];
platforms = lib.platforms.linux;
mainProgram = "lxsession";
};
}
})
pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch
+13
View File
@@ -0,0 +1,13 @@
--- a/acinclude.m4 2025-08-24 00:39:08.807857027 +0200
+++ b/acinclude.m4 2025-08-24 00:49:23.043780737 +0200
@@ -40,8 +40,8 @@
[
AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
- if $jh_found_xmlcatalog && \
- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+ # empty argument forces libxml to use XML_CATALOG_FILES variable
+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
AC_MSG_RESULT([found])
ifelse([$3],,,[$3
])dnl
pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch
-23
View File
@@ -1,23 +0,0 @@
diff --color -ur a/configure.ac b/configure.ac
--- a/configure.ac 2021-01-18 12:39:19.556844678 +0100
+++ b/configure.ac 2021-01-18 17:26:47.989410501 +0100
@@ -167,18 +167,7 @@
AM_GLIB_GNU_GETTEXT
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-if test x"$enable_man" = x"yes"; then
- AC_PATH_PROG([XSLTPROC], [xsltproc])
- if test -z "$XSLTPROC"; then
- enable_man=no
- fi
-
- dnl check for DocBook DTD and stylesheets in the local catalog.
- JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
- [DocBook XML DTD V4.1.2], [], enable_man=no)
- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
- [DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no)
-fi
+AC_PATH_PROG([XSLTPROC], [xsltproc])
AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test "x$enable_man" != "xno")
pkgs/desktops/lxde/core/lxtask/default.nix
+7 -7
View File
@@ -10,14 +10,14 @@
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "lxtask";
version = "0.1.12";
src = fetchFromGitHub {
owner = "lxde";
repo = "lxtask";
rev = version;
tag = finalAttrs.version;
hash = "sha256-BI50jV/17jGX91rcmg98+gkoy35oNpdSSaVDLyagbIc=";
};
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
passthru.updateScript = gitUpdater { };
meta = with lib; {
meta = {
homepage = "https://lxde.sourceforge.net/";
description = "Lightweight and desktop independent task manager";
mainProgram = "lxtask";
@@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
Desktop Environment, it's totally desktop independent and only
requires pure GTK.
'';
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.romildo ];
};
}
})
pkgs/development/compilers/flutter/versions/3_35/data.json
+39 -39
View File
@@ -1,17 +1,17 @@
{
"version": "3.35.1",
"engineVersion": "1e9a811bf8e70466596bcf0ea3a8b5adb5f17f7f",
"version": "3.35.2",
"engineVersion": "a8bfdfc394deaed5c57bd45a64ac4294dc976a72",
"engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
"engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
"channel": "stable",
"engineHashes": {
"aarch64-linux": {
"aarch64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4=",
"x86_64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4="
"aarch64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY=",
"x86_64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY="
},
"x86_64-linux": {
"aarch64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q=",
"x86_64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q="
"aarch64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w=",
"x86_64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w="
}
},
"dartVersion": "3.9.0",
@@ -21,53 +21,53 @@
"x86_64-darwin": "sha256-JNN27p/a9+7xcIkrLLM2Tuyih5R2Q0YibXqcm3QXc8U=",
"aarch64-darwin": "sha256-VG0o4b0dPTXQmABr3+iO+xv/2IcXFt018CQYnD4kXAs="
},
"flutterHash": "sha256-1G7PZLMm0VsT0CWygxOk0GGiXbtJGIBBvccQcaqV+EQ=",
"flutterHash": "sha256-g9g10WVf7CNoXYN8DVsWRK9N2Gz/2iQufMiQkJC35ZA=",
"artifactHashes": {
"android": {
"aarch64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=",
"aarch64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA=",
"x86_64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=",
"x86_64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA="
"aarch64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=",
"aarch64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY=",
"x86_64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=",
"x86_64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY="
},
"fuchsia": {
"aarch64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=",
"aarch64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=",
"x86_64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=",
"x86_64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s="
"aarch64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=",
"aarch64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=",
"x86_64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=",
"x86_64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo="
},
"ios": {
"aarch64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=",
"aarch64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=",
"x86_64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=",
"x86_64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs="
"aarch64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=",
"aarch64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=",
"x86_64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=",
"x86_64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew="
},
"linux": {
"aarch64-darwin": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=",
"aarch64-linux": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=",
"x86_64-darwin": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs=",
"x86_64-linux": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs="
"aarch64-darwin": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=",
"aarch64-linux": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=",
"x86_64-darwin": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI=",
"x86_64-linux": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI="
},
"macos": {
"aarch64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=",
"aarch64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=",
"x86_64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=",
"x86_64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo="
"aarch64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=",
"aarch64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=",
"x86_64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=",
"x86_64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA="
},
"universal": {
"aarch64-darwin": "sha256-+EfVH+XpI4d/UlFs6rZKdfK00IzDFz9o4CuzJRdDNfw=",
"aarch64-linux": "sha256-1jYtJ/toFDfUG2HIKyM1XT9rl0Fzl3or67q9ZVl1vDg=",
"x86_64-darwin": "sha256-nACkicnu+Pkimpyx3q/uxUcLz/xAExLbXHl+Ex4kFzA=",
"x86_64-linux": "sha256-XGxRc2LOqgxd8Zbd2XWhA6yj39WJCa5DC5UGYIiw4RY="
"aarch64-darwin": "sha256-Nv36HXVFlpGTmWlobDiMJczVIgUShvoVi8dqAWpbkJM=",
"aarch64-linux": "sha256-SlB09ZiXtz3DJSiv9gTy4ogHpJ9JRVzgy2nmqqmGMYs=",
"x86_64-darwin": "sha256-yZbzy+DNREPxzZ/F6BdjmQoOrUE+5rIw6E4CuUePPWQ=",
"x86_64-linux": "sha256-AdA1xjD5nkBTzp7k1FLe218FD9o1aSJHZx1nOyhneGY="
},
"web": {
"aarch64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=",
"aarch64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=",
"x86_64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=",
"x86_64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs="
"aarch64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=",
"aarch64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=",
"x86_64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=",
"x86_64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ="
},
"windows": {
"x86_64-darwin": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ=",
"x86_64-linux": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ="
"x86_64-darwin": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o=",
"x86_64-linux": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o="
}
},
"pubspecLock": {
@@ -346,11 +346,11 @@
"dependency": "direct main",
"description": {
"name": "dwds",
"sha256": "b14203ae57d2ef575d115e30a303c7fe643c5e6af5acfb1330d4c57091ee11c6",
"sha256": "b2f7e3241de2adbd5caa87ae9d05a0f9c59b9cbb8c77aeaeebf6c277821f25d5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "24.4.0"
"version": "24.4.0+1"
},
"extension_discovery": {
"dependency": "direct main",
pkgs/development/compilers/gcc/common/meta.nix
-1
View File
@@ -30,5 +30,4 @@ in
teams = [ teams.gcc ];
mainProgram = "${targetPrefix}gcc";
identifiers.cpeParts.vendor = "gnu";
}
pkgs/development/compilers/gcc/default.nix
-1
View File
@@ -419,7 +419,6 @@ pipe
platforms
teams
mainProgram
identifiers
;
};
}
pkgs/development/compilers/llvm/common/common-let.nix
-2
View File
@@ -34,8 +34,6 @@ rec {
++ lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv
++ lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k
++ lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64;
identifiers.cpeParts.vendor = "llvm";
};
releaseInfo =
pkgs/development/libraries/libubox/default.nix
+4 -3
View File
@@ -13,12 +13,12 @@
stdenv.mkDerivation {
pname = "libubox";
version = "0-unstable-2024-12-19";
version = "0-unstable-2025-07-23";
src = fetchgit {
url = "https://git.openwrt.org/project/libubox.git";
rev = "3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a";
hash = "sha256-rACcvyMhksw5A+Tkn6XiTqz1DHK23YKRHL7j3CEccr4=";
rev = "49056d178f42da98048a5d4c23f83a6f6bc6dd80";
hash = "sha256-sk5r18M0hJ+8CrC2G/rb+XqUmUGer2VBrVbuReHj1dM=";
};
cmakeFlags = [
@@ -56,6 +56,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [
fpletz
mkg20001
dvn0
];
mainProgram = "jshn";
platforms = platforms.all;
pkgs/development/python-modules/aiohttp-apispec/default.nix
+9 -5
View File
@@ -27,11 +27,15 @@ buildPythonPackage rec {
hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU=";
};
postPatch = ''
substituteInPlace tests/conftest.py \
--replace-fail 'aiohttp_app(loop,' 'aiohttp_app(event_loop,' \
--replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete'
'';
doCheck = false;
/*
postPatch = ''
substituteInPlace tests/conftest.py \
--replace-fail 'aiohttp_app(loop,' 'aiohttp_app(event_loop,' \
--replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete'
'';
*/
build-system = [ setuptools ];
pkgs/development/python-modules/ansible-runner/default.nix
+6 -2
View File
@@ -17,6 +17,7 @@
importlib-metadata,
# tests
addBinToPathHook,
ansible-core,
glibcLocales,
mock,
@@ -26,6 +27,7 @@
pytest-xdist,
pytestCheckHook,
versionCheckHook,
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
@@ -60,6 +62,7 @@ buildPythonPackage rec {
++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
nativeCheckInputs = [
addBinToPathHook
ansible-core # required to place ansible CLI onto the PATH in tests
glibcLocales
mock
@@ -69,12 +72,11 @@ buildPythonPackage rec {
pytest-xdist
pytestCheckHook
versionCheckHook
writableTmpDirAsHomeHook
];
versionCheckProgramArg = "--version";
preCheck = ''
export HOME=$(mktemp -d)
export PATH="$PATH:$out/bin";
# avoid coverage flags
rm pytest.ini
'';
@@ -90,8 +92,10 @@ buildPythonPackage rec {
# Assertion error
"test_callback_plugin_censoring_does_not_overwrite"
"test_get_role_list"
"test_include_role_events"
"test_include_role_from_collection_events"
"test_module_level_no_log"
"test_output_when_given_invalid_playbook"
"test_resolved_actions"
];
pkgs/development/python-modules/argos-translate-files/default.nix
+2 -2
View File
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "argos-translate-files";
version = "1.4.0";
version = "1.4.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-vKnPL0xgyJ1vYtB2AgnKv4BqigSiFYmIm5HBq4hQ7nI=";
hash = "sha256-9ufNuExfyW3gr8+pIpp6Ie03e0hE4l3l3kk6EiVH0x8=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/datrie/default.nix
+2 -2
View File
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "datrie";
version = "0.8.2";
version = "0.8.3";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0=";
hash = "sha256-6gIa1MiovxTginHHhypiKqOZpRD5gSloJQkcfKBDboA=";
};
postPatch = ''
pkgs/development/python-modules/dnfile/default.nix
+4 -4
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dnfile";
version = "0.16.4";
version = "0.17.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "malwarefrank";
repo = "dnfile";
tag = "v${version}";
hash = "sha256-xizjWY+ByGDOI7HyzT5U4vqmPT2woU7z/3eV0KXDb8Y=";
hash = "sha256-JiJ7qvBP0SDGMynQuu2AyCwHU9aDI7Pq5/Z9IiWPWng=";
fetchSubmodules = true;
};
@@ -34,8 +34,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module to parse .NET executable files";
homepage = "https://github.com/malwarefrank/dnfile";
changelog = "https://github.com/malwarefrank/dnfile/blob/v${version}/HISTORY.rst";
license = with licenses; [ mit ];
changelog = "https://github.com/malwarefrank/dnfile/blob/${src.tag}/HISTORY.rst";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/ipv8-rust-tunnels/default.nix
+35
View File
@@ -0,0 +1,35 @@
{
lib,
rustPlatform,
fetchPypi,
buildPythonPackage,
}:
buildPythonPackage rec {
pname = "ipv8-rust-tunnels";
version = "0.1.33";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "ipv8_rust_tunnels";
hash = "sha256-LwQL/u+h6mwCo207OxSk9YKxuLuxXQhh07rSWrNFh7w=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-NwYLez9NFgS0GBXrcNrKJKV+s4HIHM8jHXfmkgya03M=";
};
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook
];
meta = with lib; {
description = "A set of performance enhancements to the TunnelCommunity, the anonymization layer used in IPv8 and Tribler";
homepage = "https://github.com/Tribler/ipv8-rust-tunnels";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ mlaradji ];
};
}
pkgs/development/python-modules/llama-index-readers-file/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-file";
version = "0.5.0";
version = "0.5.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_file";
inherit version;
hash = "sha256-8yRhe/xNmzITbSX/U1G5K8C1aaKWFz7iqFkcH4hu/ww=";
hash = "sha256-BJ2XGsTJNu2/SDKRW6cSjP7o9erUNSZnkrce3Yf1MFw=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/millheater/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "millheater";
version = "012.2";
version = "0.12.5";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pymill";
tag = version; # https://github.com/Danielhiversen/pymill/issues/87
hash = "sha256-tR6MZIgCazGcXRIaSXyDYIEp+kD6xyrpOXORbi8LV7E=";
hash = "sha256-DGMG6LabfKGmQ6MDm/skqeQuOhSlr1ssZ2Z7fItzOt0=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/mpi4py/default.nix
+4
View File
@@ -54,6 +54,10 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;
# skip spawn related tests for openmpi implemention
# see https://github.com/mpi4py/mpi4py/issues/545#issuecomment-2343011460
env.MPI4PY_TEST_SPAWN = if mpi.pname == "openmpi" then 0 else 1;
passthru = {
inherit mpi;
};
pkgs/development/python-modules/mscerts/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "mscerts";
version = "2025.6.27";
version = "2025.8.29";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "ralphje";
repo = "mscerts";
tag = version;
hash = "sha256-By0gVlsVjgBREBGUOZjnKE9HTHC+zLZ4kUKIcN7/eKY=";
hash = "sha256-K7U4dbhH3yWElSKRhU9mHU4W+Hdc6Vb9kf/TE4EJs8c=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/opensearch-py/default.nix
+11 -1
View File
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
# build-system
setuptools,
@@ -40,6 +41,15 @@ buildPythonPackage rec {
hash = "sha256-IAEh+rB26Zqv7j5g2YIRZRCAtFbBngoh+w8Z4e2bY+M=";
};
patches = [
# Remove delete event_loop fixture to fix test with pytest-asyncio 1.x
(fetchpatch {
name = "remove-delete-event-loop-fixture.patch";
url = "https://github.com/opensearch-project/opensearch-py/commit/2f9eeaad3f7bd38518b23a59659ccf02fff19577.patch";
hash = "sha256-ljg9GiXPOokrIRS+gF+W9DnZ71AzH8WmLeb3G7rLeK8=";
})
];
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [
@@ -83,7 +93,7 @@ buildPythonPackage rec {
"test_basicauth_in_request_session"
"test_callable_in_request_session"
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) [
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Flaky tests: OSError: [Errno 48] Address already in use
"test_redirect_failure_when_allow_redirect_false"
"test_redirect_success_when_allow_redirect_true"

Some files were not shown because too many files have changed in this diff Show More