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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-11-09 12:01:04 +00:00 committed by GitHub
commit 2d73797da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 744 additions and 839 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -352,7 +352,7 @@ In a case a contributor definitively leaves the Nix community, they should creat
# Flow of merged pull requests # Flow of merged pull requests
After a pull requests is merged, it eventually makes it to the [official Hydra CI](https://hydra.nixos.org/). After a pull request is merged, it eventually makes it to the [official Hydra CI](https://hydra.nixos.org/).
Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](http://channels.nixos.org/) when specific Hydra jobs succeeded. Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](http://channels.nixos.org/) when specific Hydra jobs succeeded.
See [Nix Channel Status](https://status.nixos.org/) for the current channels and their state. See [Nix Channel Status](https://status.nixos.org/) for the current channels and their state.
Here's a brief overview of the main Git branches and what channels they're used for: Here's a brief overview of the main Git branches and what channels they're used for:

36
doc/languages-frameworks/python.section.md
View File

@ -9,8 +9,8 @@
| python27 | python2, python | CPython 2.7 | | python27 | python2, python | CPython 2.7 |
| python38 | | CPython 3.8 | | python38 | | CPython 3.8 |
| python39 | | CPython 3.9 | | python39 | | CPython 3.9 |
| python310 | python3 | CPython 3.10 | | python310 | | CPython 3.10 |
| python311 | | CPython 3.11 | | python311 | python3 | CPython 3.11 |
| python312 | | CPython 3.12 | | python312 | | CPython 3.12 |
| python313 | | CPython 3.13 | | python313 | | CPython 3.13 |
| pypy27 | pypy2, pypy | PyPy2.7 | | pypy27 | pypy2, pypy | PyPy2.7 |
@ -64,12 +64,14 @@ sets are
* `pkgs.python39Packages` * `pkgs.python39Packages`
* `pkgs.python310Packages` * `pkgs.python310Packages`
* `pkgs.python311Packages` * `pkgs.python311Packages`
* `pkgs.python312Packages`
* `pkgs.python313Packages`
* `pkgs.pypyPackages` * `pkgs.pypyPackages`
and the aliases and the aliases
* `pkgs.python2Packages` pointing to `pkgs.python27Packages` * `pkgs.python2Packages` pointing to `pkgs.python27Packages`
* `pkgs.python3Packages` pointing to `pkgs.python310Packages` * `pkgs.python3Packages` pointing to `pkgs.python311Packages`
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages` * `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
#### `buildPythonPackage` function {#buildpythonpackage-function} #### `buildPythonPackage` function {#buildpythonpackage-function}
@ -278,7 +280,7 @@ the packages with the version of the interpreter. Because this is irrelevant for
applications, the prefix is omitted. applications, the prefix is omitted.
When packaging a Python application with [`buildPythonApplication`](#buildpythonapplication-function), it should be When packaging a Python application with [`buildPythonApplication`](#buildpythonapplication-function), it should be
called with `callPackage` and passed `python` or `pythonPackages` (possibly called with `callPackage` and passed `python3` or `python3Packages` (possibly
specifying an interpreter version), like this: specifying an interpreter version), like this:
```nix ```nix
@ -320,7 +322,7 @@ luigi = callPackage ../applications/networking/cluster/luigi { };
``` ```
Since the package is an application, a consumer doesn't need to care about Since the package is an application, a consumer doesn't need to care about
Python versions or modules, which is why they don't go in `pythonPackages`. Python versions or modules, which is why they don't go in `python3Packages`.
#### `toPythonApplication` function {#topythonapplication-function} #### `toPythonApplication` function {#topythonapplication-function}
@ -336,7 +338,7 @@ the attribute in `python-packages.nix`, and the `toPythonApplication` shall be
applied to the reference: applied to the reference:
```nix ```nix
youtube-dl = with pythonPackages; toPythonApplication youtube-dl; youtube-dl = with python3Packages; toPythonApplication youtube-dl;
``` ```
#### `toPythonModule` function {#topythonmodule-function} #### `toPythonModule` function {#topythonmodule-function}
@ -365,8 +367,8 @@ Saving the following as `default.nix`
```nix ```nix
with import <nixpkgs> {}; with import <nixpkgs> {};
python.buildEnv.override { python3.buildEnv.override {
extraLibs = [ pythonPackages.pyramid ]; extraLibs = [ python3Packages.pyramid ];
ignoreCollisions = true; ignoreCollisions = true;
} }
``` ```
@ -496,9 +498,9 @@ Given a `default.nix`:
```nix ```nix
with import <nixpkgs> {}; with import <nixpkgs> {};
pythonPackages.buildPythonPackage { python3Packages.buildPythonPackage {
name = "myproject"; name = "myproject";
buildInputs = with pythonPackages; [ pyramid ]; buildInputs = with python3Packages; [ pyramid ];
src = ./.; src = ./.;
} }
@ -510,7 +512,7 @@ the package would be built with `nix-build`.
Shortcut to setup environments with C headers/libraries and Python packages: Shortcut to setup environments with C headers/libraries and Python packages:
```shell ```shell
nix-shell -p pythonPackages.pyramid zlib libjpeg git nix-shell -p python3Packages.pyramid zlib libjpeg git
``` ```
::: {.note} ::: {.note}
@ -525,7 +527,7 @@ There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked.
Several versions of the Python interpreter are available on Nix, as well as a Several versions of the Python interpreter are available on Nix, as well as a
high amount of packages. The attribute `python3` refers to the default high amount of packages. The attribute `python3` refers to the default
interpreter, which is currently CPython 3.10. The attribute `python` refers to interpreter, which is currently CPython 3.11. The attribute `python` refers to
CPython 2.7 for backwards-compatibility. It is also possible to refer to CPython 2.7 for backwards-compatibility. It is also possible to refer to
specific versions, e.g. `python311` refers to CPython 3.11, and `pypy` refers to specific versions, e.g. `python311` refers to CPython 3.11, and `pypy` refers to
the default PyPy interpreter. the default PyPy interpreter.
@ -543,7 +545,7 @@ however, are in separate sets, with one set per interpreter version.
The interpreters have several common attributes. One of these attributes is The interpreters have several common attributes. One of these attributes is
`pkgs`, which is a package set of Python libraries for this specific `pkgs`, which is a package set of Python libraries for this specific
interpreter. E.g., the `toolz` package corresponding to the default interpreter interpreter. E.g., the `toolz` package corresponding to the default interpreter
is `python.pkgs.toolz`, and the CPython 3.11 version is `python311.pkgs.toolz`. is `python3.pkgs.toolz`, and the CPython 3.11 version is `python311.pkgs.toolz`.
The main package set contains aliases to these package sets, e.g. The main package set contains aliases to these package sets, e.g.
`pythonPackages` refers to `python.pkgs` and `python311Packages` to `pythonPackages` refers to `python.pkgs` and `python311Packages` to
`python311.pkgs`. `python311.pkgs`.
@ -1835,7 +1837,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
}; };
``` ```
`pythonPackages.twisted` is now globally overridden. `python3Packages.twisted` is now globally overridden.
All packages and also all NixOS services that reference `twisted` All packages and also all NixOS services that reference `twisted`
(such as `services.buildbot-worker`) now use the new definition. (such as `services.buildbot-worker`) now use the new definition.
Note that `python-super` refers to the old package set and `python-self` Note that `python-super` refers to the old package set and `python-self`
@ -1845,7 +1847,7 @@ To modify only a Python package set instead of a whole Python derivation, use
this snippet: this snippet:
```nix ```nix
myPythonPackages = pythonPackages.override { myPythonPackages = python3Packages.override {
overrides = self: super: { overrides = self: super: {
twisted = ...; twisted = ...;
}; };
@ -2025,7 +2027,9 @@ The following rules are desired to be respected:
disabled individually. Try to avoid disabling the tests altogether. In any disabled individually. Try to avoid disabling the tests altogether. In any
case, when you disable tests, leave a comment explaining why. case, when you disable tests, leave a comment explaining why.
* Commit names of Python libraries should reflect that they are Python * Commit names of Python libraries should reflect that they are Python
libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`. libraries, so write for example `python311Packages.numpy: 1.11 -> 1.12`.
It is highly recommended to specify the current default version to enable
automatic build by ofborg.
* Attribute names in `python-packages.nix` as well as `pname`s should match the * Attribute names in `python-packages.nix` as well as `pname`s should match the
library's name on PyPI, but be normalized according to [PEP library's name on PyPI, but be normalized according to [PEP
0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This means 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This means

13
maintainers/maintainer-list.nix
View File

@ -5337,6 +5337,13 @@
fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B";
}]; }];
}; };
ericthemagician = {
email = "eric@ericyen.com";
matrix = "@eric:jupiterbroadcasting.com";
github = "EricTheMagician";
githubId = 323436;
name = "Eric Yen";
};
erikarvstedt = { erikarvstedt = {
email = "erik.arvstedt@gmail.com"; email = "erik.arvstedt@gmail.com";
matrix = "@erikarvstedt:matrix.org"; matrix = "@erikarvstedt:matrix.org";
@ -19947,6 +19954,12 @@
github = "zmitchell"; github = "zmitchell";
githubId = 10246891; githubId = 10246891;
}; };
znaniye = {
email = "zn4niye@proton.me";
github = "znaniye";
githubId = 134703788;
name = "Samuel Silva";
};
znewman01 = { znewman01 = {
email = "znewman01@gmail.com"; email = "znewman01@gmail.com";
github = "znewman01"; github = "znewman01";

2
nixos/modules/system/boot/stage-1-init.sh
View File

@ -495,6 +495,8 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then
fi fi
fi fi
@postResumeCommands@
# If we have a path to an iso file, find the iso and link it to /dev/root # If we have a path to an iso file, find the iso and link it to /dev/root
if [ -n "$isoPath" ]; then if [ -n "$isoPath" ]; then
mkdir -p /findiso mkdir -p /findiso

10
nixos/modules/system/boot/stage-1.nix
View File

@ -316,7 +316,7 @@ let
inherit (config.system.build) earlyMountScript; inherit (config.system.build) earlyMountScript;
inherit (config.boot.initrd) checkJournalingFS verbose inherit (config.boot.initrd) checkJournalingFS verbose
preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules; preLVMCommands preDeviceCommands postDeviceCommands postResumeCommands postMountCommands preFailCommands kernelModules;
resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
(filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable
@ -527,6 +527,14 @@ in
''; '';
}; };
boot.initrd.postResumeCommands = mkOption {
default = "";
type = types.lines;
description = lib.mdDoc ''
Shell commands to be executed immediately after attempting to resume.
'';
};
boot.initrd.postMountCommands = mkOption { boot.initrd.postMountCommands = mkOption {
default = ""; default = "";
type = types.lines; type = types.lines;

1
nixos/modules/system/boot/systemd/initrd.nix
View File

@ -358,6 +358,7 @@ in {
[ "preDeviceCommands" ] [ "preDeviceCommands" ]
[ "preLVMCommands" ] [ "preLVMCommands" ]
[ "postDeviceCommands" ] [ "postDeviceCommands" ]
[ "postResumeCommands" ]
[ "postMountCommands" ] [ "postMountCommands" ]
[ "extraUdevRulesCommands" ] [ "extraUdevRulesCommands" ]
[ "extraUtilsCommands" ] [ "extraUtilsCommands" ]

11
nixos/modules/virtualisation/azure-agent.nix
View File

@ -241,7 +241,16 @@ in
after = [ "network-online.target" "sshd.service" ]; after = [ "network-online.target" "sshd.service" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
path = [ pkgs.e2fsprogs pkgs.bash ]; path = [
pkgs.e2fsprogs
pkgs.bash
# waagent's Microsoft.OSTCExtensions.VMAccessForLinux needs Python 3
pkgs.python3
# waagent's Microsoft.CPlat.Core.RunCommandLinux needs lsof
pkgs.lsof
];
description = "Windows Azure Agent Service"; description = "Windows Azure Agent Service";
unitConfig.ConditionPathExists = "/etc/waagent.conf"; unitConfig.ConditionPathExists = "/etc/waagent.conf";
serviceConfig = { serviceConfig = {

1322
pkgs/applications/blockchains/polkadot/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
pkgs/applications/blockchains/polkadot/default.nix
View File

@ -11,13 +11,13 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "polkadot"; pname = "polkadot";
version = "1.2.0"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paritytech"; owner = "paritytech";
repo = "polkadot-sdk"; repo = "polkadot-sdk";
rev = "polkadot-v${version}"; rev = "polkadot-v${version}";
hash = "sha256-Xgu1BlSGDAj79TKSM9vCbzBT4quOMBd6evImkkKycH4="; hash = "sha256-7hCQdJHzuPQTNZFDGEZG/Q6G/Gh/gJANV5uiL/d6Pas=";
# the build process of polkadot requires a .git folder in order to determine # the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string. # the git commit hash that is being built and add it to the version string.
@ -41,8 +41,8 @@ rustPlatform.buildRustPackage rec {
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"ark-secret-scalar-0.0.2" = "sha256-Tcrz2tT561ICAJzMgarSTOnaUEPeTFKZzE7rkdL3eUQ="; "ark-secret-scalar-0.0.2" = "sha256-GROzlo+1QQ8wd090/esQRmaV8KWjNEfUlFlldnME28A=";
"common-0.1.0" = "sha256-dnZKDx3Rw5cd4ejcilo3Opsn/1XK9yWGxhceuwvBE0o="; "common-0.1.0" = "sha256-ru++KG2ZZqa/wDGnKF/VfWnazHRSpOAD0WYb7rHlpCU=";
"fflonk-0.1.0" = "sha256-MNvlePHQdY8DiOq6w7Hc1pgn7G58GDTeghCKHJdUy7E="; "fflonk-0.1.0" = "sha256-MNvlePHQdY8DiOq6w7Hc1pgn7G58GDTeghCKHJdUy7E=";
}; };
}; };

5
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -2473,8 +2473,8 @@ let
mktplcRef = { mktplcRef = {
name = "vscode-pylance"; name = "vscode-pylance";
publisher = "MS-python"; publisher = "MS-python";
version = "2022.7.11"; version = "2023.8.50";
sha256 = "sha256-JatjLZXO7iwpBwjL1hrNafBiF81CaozWWANyRm8A36Y="; sha256 = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk=";
}; };
buildInputs = [ nodePackages.pyright ]; buildInputs = [ nodePackages.pyright ];
@ -2485,6 +2485,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance";
homepage = "https://github.com/microsoft/pylance-release"; homepage = "https://github.com/microsoft/pylance-release";
license = lib.licenses.unfree; license = lib.licenses.unfree;
maintainers = [ lib.maintainers.ericthemagician ];
}; };
}; };

2
pkgs/applications/graphics/dia/default.nix
View File

@ -15,6 +15,7 @@
, pkg-config , pkg-config
, poppler , poppler
, python3 , python3
, wrapGAppsHook
# Building with docs are still failing in unstable-2023-09-28 # Building with docs are still failing in unstable-2023-09-28
, withDocs ? false , withDocs ? false
}: }:
@ -59,6 +60,7 @@ stdenv.mkDerivation {
meson meson
ninja ninja
pkg-config pkg-config
wrapGAppsHook
] ++ ] ++
lib.optionals withDocs [ lib.optionals withDocs [
dblatex dblatex

4
pkgs/applications/graphics/vengi-tools/default.nix
View File

@ -29,13 +29,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vengi-tools"; pname = "vengi-tools";
version = "0.0.26"; version = "0.0.27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mgerhardy"; owner = "mgerhardy";
repo = "vengi"; repo = "vengi";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-p+ZL3oxzwKhh+j1bxakgyStH+1GAu2aEwNmsqo6fNFo="; hash = "sha256-A37IY66wZZK7Tv0zWsORO6CuRRRj7YmKLnEPSbfAvwI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/by-name/mc/mcuboot-imgtool/package.nix
View File

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mfgtool-imgtool"; pname = "mfgtool-imgtool";
version = "1.10.0"; version = "2.0.0";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "imgtool"; pname = "imgtool";
hash = "sha256-A7NOdZNKw9lufEK2vK8Rzq9PRT98bybBfXJr0YMQS0A="; hash = "sha256-elQSVeae7B8Sqjjc4fHU/iDYISZ3xoqbbsY0ypGgZhI=";
}; };
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };

2
pkgs/development/compilers/odin/default.nix
View File

@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
description = "A fast, concise, readable, pragmatic and open sourced programming language"; description = "A fast, concise, readable, pragmatic and open sourced programming language";
homepage = "https://odin-lang.org/"; homepage = "https://odin-lang.org/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ luc65r astavie ]; maintainers = with maintainers; [ luc65r astavie znaniye ];
platforms = platforms.x86_64 ++ [ "aarch64-darwin" ]; platforms = platforms.x86_64 ++ [ "aarch64-darwin" ];
}; };
} }

8
pkgs/development/python-modules/google-cloud-container/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-container"; pname = "google-cloud-container";
version = "2.32.0"; version = "2.33.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-aU+42neWNlPhxw+mCSi0oR+vjh8VgKOQJQU6PhvM5t4="; hash = "sha256-dpJmSe7NjmmDqd0GrLxm1e/VFvo64+ECNRVwuRpjrmI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -49,8 +49,8 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Google Container Engine API client library"; description = "Google Container Engine API client library";
homepage = "https://github.com/googleapis/python-container"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container";
changelog = "https://github.com/googleapis/python-container/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-container-v${version}/packages/google-cloud-container/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

5
pkgs/development/python-modules/google-cloud-dlp/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-dlp"; pname = "google-cloud-dlp";
version = "3.12.3"; version = "3.13.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-c4gPKov6YASVdvuU2FaYqiNn0yrJAbdieP5Qt1ZjRAs="; hash = "sha256-mFqptqEvHQAKNevzawDOfQsH0SCn9EanJ2js4vIpCGo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -39,6 +39,7 @@ buildPythonPackage rec {
disabledTests = [ disabledTests = [
# Test requires credentials # Test requires credentials
"test_inspect_content" "test_inspect_content"
"test_list_dlp_jobs"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

8
pkgs/development/python-modules/google-cloud-securitycenter/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-securitycenter"; pname = "google-cloud-securitycenter";
version = "1.23.3"; version = "1.24.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-8yBC/+jxKsyQ5pz+VBSgnwqB/XxXCChpjGLAjMDoQow="; hash = "sha256-KsXsWGEUwD0UFRD7V4rfqEuRjyWeU/PmPdh8X6djhG0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -43,8 +43,8 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Cloud Security Command Center API API client library"; description = "Cloud Security Command Center API API client library";
homepage = "https://github.com/googleapis/python-securitycenter"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-securitycenter";
changelog = "https://github.com/googleapis/python-securitycenter/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-securitycenter-v${version}/packages/google-cloud-securitycenter/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

4
pkgs/development/python-modules/parsedmarc/default.nix
View File

@ -39,14 +39,14 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "parsedmarc"; pname = "parsedmarc";
version = "8.6.1"; version = "8.6.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-lnIhXkBodvLWVeqiwFcnU4M53zwWDmtFz+9TThQY63I="; hash = "sha256-ibxSp1M85WngQKdjlRC4JvLxn0rEn9oVkid/V4iD6zY=";
}; };
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/paste/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "paste"; pname = "paste";
version = "3.6.1"; version = "3.7.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cdent"; owner = "cdent";
repo = "paste"; repo = "paste";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-vVCJn8PhLNw0fj+/tTigTEodn9SEKv0VASJf4LKJy20="; hash = "sha256-xp8FU4MR79/leBSJvSk8J2GdWW32AW2I5i3Y6DsRPLw=";
}; };
postPatch = '' postPatch = ''

8
pkgs/development/python-modules/pygls/default.nix
View File

@ -3,16 +3,16 @@
, buildPythonPackage , buildPythonPackage
, pythonOlder , pythonOlder
, fetchFromGitHub , fetchFromGitHub
, poetry-core
, lsprotocol , lsprotocol
, typeguard , typeguard
, poetry-core
, pytest-asyncio , pytest-asyncio
, pytestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pygls"; pname = "pygls";
version = "1.1.1"; version = "1.1.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "openlawlibrary"; owner = "openlawlibrary";
repo = "pygls"; repo = "pygls";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-FOuBS/UJpkYbuIu193vkSpN/77gf+UWiS5f/t8BpAk4="; hash = "sha256-OfLlYTgVCg+oiYww0RjRTjiBwTZBSNqJRryo8gZEmk4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -49,9 +49,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pygls" ]; pythonImportsCheck = [ "pygls" ];
meta = with lib; { meta = with lib; {
changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md";
description = "Pythonic generic implementation of the Language Server Protocol"; description = "Pythonic generic implementation of the Language Server Protocol";
homepage = "https://github.com/openlawlibrary/pygls"; homepage = "https://github.com/openlawlibrary/pygls";
changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ kira-bruneau ]; maintainers = with maintainers; [ kira-bruneau ];
}; };

4
pkgs/development/python-modules/types-awscrt/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-awscrt"; pname = "types-awscrt";
version = "0.19.8"; version = "0.19.9";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "types_awscrt"; pname = "types_awscrt";
inherit version; inherit version;
hash = "sha256-otU0twF8NHbuaaRL2K6vO1iMQrqoMiRz0QCkXuZ1ENc="; hash = "sha256-vVno8ql7e9N0Xj+GALDtgAZBRrN1NxVcUIJuKNJIZDA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/development/tools/ols/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation {
description = "Language server for the Odin programming language"; description = "Language server for the Odin programming language";
homepage = "https://github.com/DanielGavin/ols"; homepage = "https://github.com/DanielGavin/ols";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ astavie ]; maintainers = with maintainers; [ astavie znaniye ];
platforms = odin.meta.platforms; platforms = odin.meta.platforms;
}; };
} }

6
pkgs/development/tools/ruff/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ruff"; pname = "ruff";
version = "0.1.4"; version = "0.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astral-sh"; owner = "astral-sh";
repo = "ruff"; repo = "ruff";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-vdhyzFUimc9gBsLpk7WKwQQ0YtGJg3us+6JCFnXSMrI="; hash = "sha256-g52cIw0af/wQSuA4QhC2dCjcDGikirswBDAtwf8Drvo=";
}; };
cargoHash = "sha256-3p6X+EV4xQ+eh2ezPh5+cJxvoGErx0q2n5pESVf11Eg="; cargoHash = "sha256-1jfKRpyGewNlvMkL/MKnOaRJyajwLAuw+YyeTyTtcP4=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

29
pkgs/games/flightgear/default.nix
View File

@ -6,7 +6,7 @@
}: }:
let let
version = "2020.3.18"; version = "2020.3.19";
shortVersion = builtins.substring 0 6 version; shortVersion = builtins.substring 0 6 version;
data = stdenv.mkDerivation rec { data = stdenv.mkDerivation rec {
pname = "flightgear-data"; pname = "flightgear-data";
@ -14,7 +14,7 @@ let
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz";
sha256 = "sha256-U8lsHrw40Xo6a3jZw6GiPnOALvvg9PdecVAdkZewUjg="; sha256 = "sha256-863EnNBU+rYTdxHwMV6HbBu99lO6H3mKGuyumm6YR5U=";
}; };
dontUnpack = true; dontUnpack = true;
@ -32,24 +32,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "sha256-OajjGj/Bgqg8H/6PjXkwJHwbSQqtzbQ1b3Xwk3aI3jc="; sha256 = "sha256-Fn0I3pzA9yIYs3myPNflbH9u4Y19VZUS2lGjvWfzjm4=";
};
# Of all the files in the source and data archives, there doesn't seem to be
# a decent icon :-)
iconsrc = fetchurl {
url = "https://wiki.flightgear.org/w/images/6/62/FlightGear_logo.png";
sha256 = "1ikz413jia55vfnmx8iwrlxvx8p16ggm81mbrj66wam3q7s2dm5p";
};
desktopItem = makeDesktopItem {
name = "flightgear";
exec = "fgfs";
icon = iconsrc;
comment = "FlightGear Flight Simulator";
desktopName = "FlightGear";
genericName = "Flight simulator";
categories = [ "Game" "Simulation" ];
}; };
nativeBuildInputs = [ cmake wrapQtAppsHook ]; nativeBuildInputs = [ cmake wrapQtAppsHook ];
@ -60,11 +43,6 @@ stdenv.mkDerivation rec {
glew qtdeclarative curl glew qtdeclarative curl
]; ];
postInstall = ''
mkdir -p "$out/share/applications/"
cp "${desktopItem}"/share/applications/* "$out/share/applications/" #*/
'';
qtWrapperArgs = [ qtWrapperArgs = [
"--set FG_ROOT ${data}/share/FlightGear" "--set FG_ROOT ${data}/share/FlightGear"
]; ];
@ -75,5 +53,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
hydraPlatforms = []; # disabled from hydra because it's so big hydraPlatforms = []; # disabled from hydra because it's so big
license = licenses.gpl2; license = licenses.gpl2;
mainProgram = "fgfs";
}; };
} }

2
pkgs/servers/mail/mailman/python.nix
View File

@ -18,8 +18,6 @@ python3.override {
[1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce
[2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291
*/ */
django = super.django_3;
elasticsearch = super.elasticsearch.overridePythonAttrs ({ pname, ... }: rec { elasticsearch = super.elasticsearch.overridePythonAttrs ({ pname, ... }: rec {
version = "7.17.9"; version = "7.17.9";
src = fetchPypi { src = fetchPypi {

4
pkgs/tools/filesystems/btrfs-progs/default.nix
View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "btrfs-progs"; pname = "btrfs-progs";
version = "6.5.3"; version = "6.6.1";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
hash = "sha256-/OfLP5IOYV5j+vJlpM2fK/OdStyqZiEcmHaX2oWi7t0="; hash = "sha256-PpLLbYO93mEjGP2ARt1u/0fHhuWdVt1Ozph5RdUTfJ4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/tools/misc/plantuml/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2023.11"; version = "1.2023.12";
pname = "plantuml"; pname = "plantuml";
src = fetchurl { src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
sha256 = "sha256-WYulV/UuFE6xGAJvontHsLKSm7TAtgLrZe4m9WuCSpc="; sha256 = "sha256-mR17BU5rc0ONnPfhOTppUI1T7v5W//6FHUYXFt5QrdU=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

39
pkgs/tools/networking/burpsuite/default.nix
View File

@ -1,30 +1,41 @@
{ lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }: { lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem, proEdition ? false }:
let let
version = "2023.7.2"; version = "2023.10.2.4";
product = if proEdition then {
productName = "pro";
productDesktop = "Burp Suite Professional Edition";
hash = "sha256-H5/nxVvAoGzRIAOchv9tAYyFgrodh7XugCTn2oUV9Tw=";
} else {
productName = "community";
productDesktop = "Burp Suite Community Edition";
hash = "sha256-en+eay+XL09Vk6H011fYvxGluMAndedtqCo4dQZvbBM=";
};
src = fetchurl { src = fetchurl {
name = "burpsuite.jar"; name = "burpsuite.jar";
urls = [ urls = [
"https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" "https://portswigger-cdn.net/burp/releases/download?product=${product.productName}&version=${version}&type=Jar"
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" "https://portswigger.net/burp/releases/download?product=${product.productName}&version=${version}&type=Jar"
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?product=${product.productName}&version=${version}&type=Jar"
]; ];
hash = "sha256-mpOG8sx+L+/kwgB3X9ALOvq+Rx1GC3JE2G7yVt1iQYg="; hash = product.hash;
}; };
name = "burpsuite-${version}"; pname = "burpsuite";
description = "An integrated platform for performing security testing of web applications"; description = "An integrated platform for performing security testing of web applications";
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem {
name = "burpsuite"; name = "burpsuite";
exec = name; exec = pname;
icon = name; icon = pname;
desktopName = "Burp Suite Community Edition"; desktopName = product.productDesktop;
comment = description; comment = description;
categories = [ "Development" "Security" "System" ]; categories = [ "Development" "Security" "System" ];
}; };
in in
buildFHSEnv { buildFHSEnv {
inherit name; inherit pname version;
runScript = "${jdk}/bin/java -jar ${src}"; runScript = "${jdk}/bin/java -jar ${src}";
@ -54,9 +65,8 @@ buildFHSEnv {
]; ];
extraInstallCommands = '' extraInstallCommands = ''
mv "$out/bin/${name}" "$out/bin/burpsuite" # name includes the version number
mkdir -p "$out/share/pixmaps" mkdir -p "$out/share/pixmaps"
${lib.getBin unzip}/bin/unzip -p ${src} resources/Media/icon64community.png > "$out/share/pixmaps/burpsuite.png" ${lib.getBin unzip}/bin/unzip -p ${src} resources/Media/icon64${product.productName}.png > "$out/share/pixmaps/burpsuite.png"
cp -r ${desktopItem}/share/applications $out/share cp -r ${desktopItem}/share/applications $out/share
''; '';
@ -69,11 +79,10 @@ buildFHSEnv {
exploiting security vulnerabilities. exploiting security vulnerabilities.
''; '';
homepage = "https://portswigger.net/burp/"; homepage = "https://portswigger.net/burp/";
downloadPage = "https://portswigger.net/burp/freedownload";
sourceProvenance = with sourceTypes; [ binaryBytecode ]; sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfree; license = licenses.unfree;
platforms = jdk.meta.platforms; platforms = jdk.meta.platforms;
hydraPlatforms = [ ]; hydraPlatforms = [ ];
maintainers = with maintainers; [ bennofs ]; maintainers = with maintainers; [ arcayr bennofs ];
}; };
} }

2
pkgs/tools/security/metasploit/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
source "https://rubygems.org" source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.40" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.41"

10
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: e4a23dc9d09f5b6b1b82768770e8063014a940bb revision: dccba8b77c15014ff479b439e98a9b69880424c6
ref: refs/tags/6.3.40 ref: refs/tags/6.3.41
specs: specs:
metasploit-framework (6.3.40) metasploit-framework (6.3.41)
actionpack (~> 7.0.0) actionpack (~> 7.0.0)
activerecord (~> 7.0.0) activerecord (~> 7.0.0)
activesupport (~> 7.0.0) activesupport (~> 7.0.0)
@ -35,7 +35,7 @@ GIT
metasploit-concern metasploit-concern
metasploit-credential metasploit-credential
metasploit-model metasploit-model
metasploit-payloads (= 2.0.156) metasploit-payloads (= 2.0.159)
metasploit_data_models metasploit_data_models
metasploit_payloads-mettle (= 1.0.26) metasploit_payloads-mettle (= 1.0.26)
mqtt mqtt
@ -252,7 +252,7 @@ GEM
activemodel (~> 7.0) activemodel (~> 7.0)
activesupport (~> 7.0) activesupport (~> 7.0)
railties (~> 7.0) railties (~> 7.0)
metasploit-payloads (2.0.156) metasploit-payloads (2.0.159)
metasploit_data_models (6.0.2) metasploit_data_models (6.0.2)
activerecord (~> 7.0) activerecord (~> 7.0)
activesupport (~> 7.0) activesupport (~> 7.0)

4
pkgs/tools/security/metasploit/default.nix
View File

@ -15,13 +15,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.3.40"; version = "6.3.41";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "sha256-vGCAkXLpsUvSXDf1H3pNStEYUZwFBxJnA7kdNJjqYwo="; sha256 = "sha256-y8SCoUfsE3CIerhWc7dZ5QAc+r+ilOAkrAmYZI8YNWU=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

10
pkgs/tools/security/metasploit/gemset.nix
View File

@ -654,12 +654,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "e4a23dc9d09f5b6b1b82768770e8063014a940bb"; rev = "dccba8b77c15014ff479b439e98a9b69880424c6";
sha256 = "02k3xac387dr0dki41q5ki8iilaa9mx1zx9pbk94pcg9fa8q0q5w"; sha256 = "0r9m327n9609mhjf1552pzx1q075b6vp6mmqga4704zc8yhq5i6b";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.3.40"; version = "6.3.41";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -676,10 +676,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1x2lyyz9n89ii16v1pkw69yrywyjx1mv46rg5z4wa95gbp236mmy"; sha256 = "1d4jg0wqqqnyk5ba8rpxdz1hd980qmdwpi4fankr036rpm4b79m1";
type = "gem"; type = "gem";
}; };
version = "2.0.156"; version = "2.0.159";
}; };
metasploit_data_models = { metasploit_data_models = {
groups = ["default"]; groups = ["default"];

4
pkgs/tools/security/sudo/default.nix
View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sudo"; pname = "sudo";
version = "1.9.15"; version = "1.9.15p1";
src = fetchurl { src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
hash = "sha256-/Q4lSHDpLoc7UIuhY4L1rDr4Glo40eqc+XNgbbQmJYk="; hash = "sha256-Fmw3q5NFShgYb5Iv5k7VzWe6bd28sO+6LfWJhyPclHQ=";
}; };
prePatch = '' prePatch = ''

4
pkgs/top-level/all-packages.nix
View File

@ -26611,9 +26611,7 @@ with pkgs;
mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { }; mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { };
mailmanPackages = callPackage ../servers/mail/mailman { mailmanPackages = callPackage ../servers/mail/mailman { };
python3 = python310;
};
inherit (mailmanPackages) mailman mailman-hyperkitty; inherit (mailmanPackages) mailman mailman-hyperkitty;
mailman-web = mailmanPackages.web; mailman-web = mailmanPackages.web;