b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-06-05 00:13:41 +00:00 committed by GitHub
parent 0e5a0abb85 87a0230e64
commit dd2d950a06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
187 changed files with 9272 additions and 4757 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
maintainers/maintainer-list.nix
View file

@ -309,6 +309,12 @@
githubId = 2321000;
name = "Ruslan Babayev";
};
abustany = {
email = "adrien@bustany.org";
github = "abustany";
githubId = 2526296;
name = "Adrien Bustany";
};
acairncross = {
email = "acairncross@gmail.com";
github = "acairncross";
@ -2943,7 +2949,7 @@
};
citadelcore = {
email = "alex@arctarus.co.uk";
github = "CitadelCore";
github = "VertexA115";
githubId = 5567402;
name = "Alex Zero";
keys = [{
@ -4952,6 +4958,12 @@
githubId = 2512008;
name = "Even Brenden";
};
evilmav = {
email = "elenskiy.ilya@gmail.com";
github = "evilmav";
githubId = 6803717;
name = "Ilya Elenskiy";
};
evils = {
email = "evils.devils@protonmail.com";
matrix = "@evils:nixos.dev";
@ -5422,7 +5434,7 @@
githubId = 7551358;
name = "Frede Emil";
};
Freed-Wu = {
Freed-Wu = {
email = "wuzhenyu@ustc.edu";
github = "Freed-Wu";
githubId = 32936898;
@ -5531,7 +5543,7 @@
};
fuzen = {
email = "me@fuzen.cafe";
github = "Fuzen-py";
github = "LovingMelody";
githubId = 17859309;
name = "Fuzen";
};
@ -5885,15 +5897,6 @@
githubId = 1621335;
name = "Andrew Trachenko";
};
gordias = {
name = "Gordias";
email = "gordias@disroot.org";
github = "gordiasdot";
githubId = 94724133;
keys = [{
fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA";
}];
};
gotcha = {
email = "gotcha@bubblenet.be";
github = "gotcha";
@ -6768,7 +6771,7 @@
};
ilya-kolpakov = {
email = "ilya.kolpakov@gmail.com";
github = "ilya-kolpakov";
github = "1pakch";
githubId = 592849;
name = "Ilya Kolpakov";
};
@ -7170,7 +7173,7 @@
jayesh-bhoot = {
name = "Jayesh Bhoot";
email = "jb@jayeshbhoot.com";
github = "jayeshbhoot";
github = "bhootjb";
githubId = 1915507;
};
jayman2000 = {
@ -7655,10 +7658,10 @@
name = "Jocelyn Thode";
};
joedevivo = {
github = "joedevivo";
githubId = 55951;
name = "Joe DeVivo";
};
github = "joedevivo";
githubId = 55951;
name = "Joe DeVivo";
};
joelancaster = {
email = "joe.a.lancas@gmail.com";
github = "JoeLancaster";
@ -7988,7 +7991,7 @@
};
juaningan = {
email = "juaningan@gmail.com";
github = "uningan";
github = "oneingan";
githubId = 810075;
name = "Juan Rodal";
};
@ -8951,7 +8954,7 @@
github = "leifhelm";
githubId = 31693262;
name = "Jakob Leifhelm";
keys =[{
keys = [{
fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822";
}];
};
@ -10008,7 +10011,7 @@
githubId = 95194;
name = "Mauricio Scheffer";
};
maxbrunet = {
maxbrunet = {
email = "max@brnt.mx";
github = "maxbrunet";
githubId = 32458727;
@ -10380,7 +10383,7 @@
name = "Michael Pacheco";
github = "MichaelPachec0";
githubId = 48970112;
keys = [ {
keys = [{
fingerprint = "8D12 991F 5558 C501 70B2 779C 7811 46B0 B5F9 5F64";
}];
};
@ -11977,6 +11980,15 @@
github = "ony";
githubId = 11265;
};
ooliver1 = {
name = "Oliver Wilkes";
email = "oliverwilkes2006@icloud.com";
github = "ooliver1";
githubId = 34910574;
keys = [{
fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273";
}];
};
opeik = {
email = "sandro@stikic.com";
github = "opeik";
@ -17000,16 +17012,6 @@
github = "wdavidw";
githubId = 46896;
};
WeebSorceress = {
name = "WeebSorceress";
email = "hello@weebsorceress.anonaddy.me";
matrix = "@weebsorceress:matrix.org";
github = "WeebSorceress";
githubId = 106774777;
keys = [{
fingerprint = "659A 9BC3 F904 EC24 1461 2EFE 7F57 3443 17F0 FA43";
}];
};
wegank = {
name = "Weijia Wang";
email = "contact@weijia.wang";

2
maintainers/scripts/fix-maintainers.pl
View file

@ -42,7 +42,7 @@ while(my($k, $v) = each %$maintainers_json) {
}
my $resp_json = from_json($resp->content);
my $api_user = %$resp_json{"login"};
if ($current_user ne $api_user) {
if (lc($current_user) ne lc($api_user)) {
print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n";
my $file = path($maintainers_list_nix);
my $data = $file->slurp_utf8;

2
nixos/doc/manual/release-notes/rl-2305.section.md
View file

@ -356,6 +356,8 @@ In addition to numerous new and updated packages, this release has the following
- Only `k3s` version 1.26 is included. Users of the `k3s_1_24` or `k3s_1_25` packages should upgrade to use the `1.26` version of the package.
- The `nerdfonts` package has been updated to major version 3, which includes potential [breaking changes](https://github.com/ryanoasis/nerd-fonts/releases/tag/v3.0.0).
## Other Notable Changes {#sec-release-23.05-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

2
nixos/doc/manual/release-notes/rl-2311.section.md
View file

@ -18,6 +18,8 @@
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
- `writeTextFile` now requires `executable` to be boolean, values like `null` or `""` will now fail to evaluate.
- The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`.
- `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`.

17
nixos/modules/services/mail/public-inbox.nix
View file

@ -275,9 +275,8 @@ in
default = {};
description = lib.mdDoc "public inboxes";
type = types.submodule {
# Keeping in line with the tradition of unnecessarily specific types, allow users to set
# freeform settings either globally under the `publicinbox` section, or for specific
# inboxes through additional nesting.
# Support both global options like `services.public-inbox.settings.publicinbox.imapserver`
# and inbox specific options like `services.public-inbox.settings.publicinbox.foo.address`.
freeformType = with types; attrsOf (oneOf [ iniAtom (attrsOf iniAtom) ]);
options.css = mkOption {
@ -285,12 +284,24 @@ in
default = [];
description = lib.mdDoc "The local path name of a CSS file for the PSGI web interface.";
};
options.imapserver = mkOption {
type = with types; listOf str;
default = [];
example = [ "imap.public-inbox.org" ];
description = lib.mdDoc "IMAP URLs to this public-inbox instance";
};
options.nntpserver = mkOption {
type = with types; listOf str;
default = [];
example = [ "nntp://news.public-inbox.org" "nntps://news.public-inbox.org" ];
description = lib.mdDoc "NNTP URLs to this public-inbox instance";
};
options.pop3server = mkOption {
type = with types; listOf str;
default = [];
example = [ "pop.public-inbox.org" ];
description = lib.mdDoc "POP3 URLs to this public-inbox instance";
};
options.wwwlisting = mkOption {
type = with types; enum [ "all" "404" "match=domain" ];
default = "404";

2
nixos/modules/services/misc/gitlab.nix
View file

@ -1231,7 +1231,7 @@ in {
services.dockerRegistry = optionalAttrs cfg.registry.enable {
enable = true;
enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly
package = cfg.package;
package = cfg.registry.package;
extraConfig = {
auth.token = {
realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth";

25
nixos/modules/services/web-servers/traefik.nix
View file

@ -48,6 +48,11 @@ let
''
else
cfg.staticConfigFile;
finalStaticConfigFile =
if cfg.environmentFiles == []
then staticConfigFile
else "/run/traefik/config.toml";
in {
options.services.traefik = {
enable = mkEnableOption (lib.mdDoc "Traefik web server");
@ -127,6 +132,16 @@ in {
type = types.package;
description = lib.mdDoc "Traefik package to use.";
};
environmentFiles = mkOption {
default = [];
type = types.listOf types.path;
example = [ "/run/secrets/traefik.env" ];
description = lib.mdDoc ''
Files to load as environment file. Environment variables from this file
will be substituted into the static configuration file using envsubst.
'';
};
};
config = mkIf cfg.enable {
@ -139,8 +154,13 @@ in {
startLimitIntervalSec = 86400;
startLimitBurst = 5;
serviceConfig = {
ExecStart =
"${cfg.package}/bin/traefik --configfile=${staticConfigFile}";
EnvironmentFile = cfg.environmentFiles;
ExecStartPre = lib.optional (cfg.environmentFiles != [])
(pkgs.writeShellScript "pre-start" ''
umask 077
${pkgs.envsubst}/bin/envsubst -i "${staticConfigFile}" > "${finalStaticConfigFile}"
'');
ExecStart = "${cfg.package}/bin/traefik --configfile=${finalStaticConfigFile}";
Type = "simple";
User = "traefik";
Group = cfg.group;
@ -155,6 +175,7 @@ in {
ProtectHome = true;
ProtectSystem = "full";
ReadWriteDirectories = cfg.dataDir;
RuntimeDirectory = "traefik";
};
};

6
nixos/tests/public-inbox.nix
View file

@ -14,7 +14,7 @@ in
meta.maintainers = with pkgs.lib.maintainers; [ julm ];
machine = { config, pkgs, nodes, ... }: let
nodes.machine = { config, pkgs, nodes, ... }: let
inherit (config.services) gitolite public-inbox;
# Git repositories paths in Gitolite.
# Only their baseNameOf is used for configuring public-inbox.
@ -221,7 +221,7 @@ in
# Delete a mail.
# Note that the use of an extension not listed in the addresses
# require to use --all
machine.succeed("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
machine.fail("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
machine.succeed("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
machine.fail("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
'';
})

5
nixos/tests/traefik.nix
View file

@ -52,10 +52,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
sendAnonymousUsage = false;
};
entryPoints.web.address = ":80";
entryPoints.web.address = ":\${HTTP_PORT}";
providers.docker.exposedByDefault = false;
};
environmentFiles = [(pkgs.writeText "traefik.env" ''
HTTP_PORT=80
'')];
};
systemd.services.simplehttp = {

4
pkgs/applications/audio/yoshimi/default.nix
View file

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "yoshimi";
version = "2.2.3";
version = "2.3.0";
src = fetchFromGitHub {
owner = "Yoshimi";
repo = pname;
rev = version;
hash = "sha256-zVIOHm84wx6ZFK0seS9fWZfujDz259AXTv7zljbwrUk=";
hash = "sha256-rVlwOxp8C/A56JDd6Bzi2smblJVqQWZiFqIP4oRhElM=";
};
sourceRoot = "source/src";

2
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View file

@ -30,7 +30,7 @@ appimageTools.wrapType2 rec {
description = "App for Ledger hardware wallets";
homepage = "https://www.ledger.com/ledger-live/";
license = licenses.mit;
maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal WeebSorceress ];
maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ];
platforms = [ "x86_64-linux" ];
};
}

4
pkgs/applications/blockchains/stellar-core/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "stellar-core";
version = "19.10.0";
version = "19.11.0";
src = fetchFromGitHub {
owner = "stellar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BcZsj2TbeJW91aiZ2I7NbDa+rgjfs6lQUsWOnhFQXtw=";
sha256 = "sha256-48fEVbK5yswPkTwlfemXB2ieAs2+SIM6dspqOBiRKCU=";
fetchSubmodules = true;
};

4
pkgs/applications/editors/ldtk/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, unzip
, appimage-run }:
, appimage-run, nix-update-script }:
stdenv.mkDerivation rec {
pname = "ldtk";
@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
})
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Modern, lightweight and efficient 2D level editor";
homepage = "https://ldtk.io/";

4
pkgs/applications/editors/pixelorama/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, godot-headless, godot-export-templates }:
{ lib, stdenv, fetchFromGitHub, godot-headless, godot-export-templates, nix-update-script }:
let
preset =
@ -47,6 +47,8 @@ in stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://orama-interactive.itch.io/pixelorama";
description = "A free & open-source 2D sprite editor, made with the Godot Engine!";

4
pkgs/applications/gis/qgis/unwrapped-ltr.nix
View file

@ -73,14 +73,14 @@ let
six
];
in mkDerivation rec {
version = "3.28.5";
version = "3.28.7";
pname = "qgis-ltr-unwrapped";
src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-3fQB0oCIZSVEVMZzmeyvw8/Ew+JjzAFnTIsnsklAayI=";
hash = "sha256-RWQ3RlE8fPMuDGosxKNVgbjRTigZRolqNyaJoC1xdec=";
};
passthru = {

6
pkgs/applications/misc/cobalt/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cobalt";
version = "0.18.4";
version = "0.18.5";
src = fetchFromGitHub {
owner = "cobalt-org";
repo = "cobalt.rs";
rev = "v${version}";
sha256 = "sha256-O7qFpp7Xr6K82o/KUMP0J5y2B32op+QBGUXo9Q5R5LQ=";
sha256 = "sha256-Y1rWKoh4cjLOvBJy4bXIHsvGtLmTu9n0aqf6PdflH6E=";
};
cargoHash = "sha256-ZBAF4BqQ+JMZ3Rpg2RxUhhVvPE5pN68qljVl0o2/VNA=";
cargoHash = "sha256-r0nxsDcdXNiZn9dVMTOAxlI/kd0nZFh7JvB2JYDR2aw=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

4
pkgs/applications/misc/mob/default.nix
View file

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "mob";
version = "4.4.2";
version = "4.4.3";
src = fetchFromGitHub {
owner = "remotemobprogramming";
repo = pname;
rev = "v${version}";
sha256 = "sha256-muKlzOrqtegy35QcGJvwYqIJ9XZsaAvyofsrWPqCi7k=";
sha256 = "sha256-XWXoY/e/xceO3sOGvA2hrdvbdb8nomMg7AGUW090I74=";
};
vendorHash = null;

32
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -19,22 +19,9 @@
}
},
"beta": {
"version": "114.0.5735.45",
"sha256": "1z7z4mq3yw9i17xprza3v33wx28zpk7s3g8xcgapdydw0rgxz30v",
"sha256bin64": "1387x7mab2sh3wg39z48gl8fjhq39jllbcgzic8rdzpbhlcgs7br",
"deps": {
"gn": {
"version": "2023-04-19",
"url": "https://gn.googlesource.com/gn",
"rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
}
}
},
"dev": {
"version": "115.0.5790.3",
"sha256": "1haai0jabghwl37k929138s4l6izmifssdvn2wgsig9jhiihxz29",
"sha256bin64": "12avl8ilvhmlvbag045yhnx0bbbsyx5d3jqh5af07pmbcxksgf96",
"version": "115.0.5790.13",
"sha256": "0ias5jn8lwpds3gsmjps0rlks58ln5znwx52h767f8mc9y24fagx",
"sha256bin64": "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566",
"deps": {
"gn": {
"version": "2023-05-19",
@ -44,6 +31,19 @@
}
}
},
"dev": {
"version": "116.0.5803.2",
"sha256": "0s3l0wvbvy0wcwxipbl9vlbp1441yfj8ylrwhlh7gy898ajl9q0j",
"sha256bin64": "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs",
"deps": {
"gn": {
"version": "2023-05-26",
"url": "https://gn.googlesource.com/gn",
"rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8",
"sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j"
}
}
},
"ungoogled-chromium": {
"version": "113.0.5672.126",
"sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd",

16
pkgs/applications/networking/browsers/mullvad-browser/default.nix
View file

@ -6,6 +6,7 @@
, makeWrapper
, writeText
, wrapGAppsHook
, callPackage
# Common run-time dependencies
, zlib
@ -79,7 +80,7 @@ let
version = "12.0.6";
srcs = {
sources = {
x86_64-linux = fetchurl {
url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz";
hash = "sha256-XE6HFU38FhnikxGHRHxIGS3Z3Y2JNWH0yq2NejqbROI=";
@ -103,7 +104,7 @@ stdenv.mkDerivation rec {
pname = "mullvad-browser";
inherit version;
src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ];
@ -219,10 +220,19 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru = {
inherit sources;
updateScript = callPackage ../tor-browser-bundle-bin/update.nix {
inherit pname version meta;
baseUrl = "https://cdn.mullvad.net/browser/";
prefix = "mullvad-browser-";
};
};
meta = with lib; {
description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad";
homepage = "https://mullvad.net/en/browser";
platforms = attrNames srcs;
platforms = attrNames sources;
maintainers = with maintainers; [ felschr ];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain

4
pkgs/applications/networking/browsers/opera/default.nix
View file

@ -51,11 +51,11 @@ let
in
stdenv.mkDerivation rec {
pname = "opera";
version = "98.0.4759.39";
version = "99.0.4788.31";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
hash = "sha256-3HVgEOscds+VBn9ajmkRnPdqNi9lLItJrb3uRH6L96Q=";
hash = "sha256-73A47Yl454ZyOkglLvnp10zjoE1bf8v5tm4Rng3UBac=";
};
unpackPhase = "dpkg-deb -x $src .";

14
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file

@ -2,6 +2,7 @@
, fetchurl
, makeDesktopItem
, writeText
, callPackage
# Common run-time dependencies
, zlib
@ -92,7 +93,7 @@ let
lang = "ALL";
srcs = {
sources = {
x86_64-linux = fetchurl {
urls = [
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
@ -131,7 +132,7 @@ stdenv.mkDerivation rec {
pname = "tor-browser-bundle-bin";
inherit version;
src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
preferLocalBuild = true;
allowSubstitutes = false;
@ -447,6 +448,13 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru = {
inherit sources;
updateScript = callPackage ./update.nix {
inherit pname version meta;
};
};
meta = with lib; {
description = "Tor Browser Bundle built by torproject.org";
longDescription = ''
@ -460,7 +468,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://www.torproject.org/";
changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
platforms = attrNames srcs;
platforms = attrNames sources;
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 KarlJoad ];
mainProgram = "tor-browser";
# MPL2.0+, GPL+, &c. While it's not entirely clear whether

62
pkgs/applications/networking/browsers/tor-browser-bundle-bin/update.nix Normal file
View file

@ -0,0 +1,62 @@
{ lib
, writeShellScript
, coreutils
, gnused
, gnugrep
, curl
, gnupg
, nix
, common-updater-scripts
# options
, pname
, version
, meta
, baseUrl ? "https://dist.torproject.org/torbrowser/"
# prefix used to match published archive
, prefix ? "tor-browser-"
# suffix used to match published archive
, suffix ? "_ALL.tar.xz"
}:
writeShellScript "update-${pname}" ''
PATH="${lib.makeBinPath [ coreutils curl gnugrep gnused gnupg nix common-updater-scripts ]}"
set -euo pipefail
trap
url=${baseUrl}
version=$(curl -s $url \
| sed -rne 's,^.*href="([0-9]+(\.[0-9]+)*)/".*,\1,p' \
| sort --version-sort | tail -1)
if [[ "${version}" = "$version" ]]; then
echo "The new version same as the old version."
exit 0
fi
HOME=$(mktemp -d)
export GNUPGHOME=$(mktemp -d)
trap 'rm -rf "$HOME" "$GNUPGHOME"' EXIT
gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org
gpg --output $HOME/tor.keyring --export 0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290
curl --silent --show-error --fail -o $HOME/shasums "$url$version/sha256sums-signed-build.txt"
curl --silent --show-error --fail -o $HOME/shasums.asc "$url$version/sha256sums-signed-build.txt.asc"
gpgv --keyring=$HOME/tor.keyring $HOME/shasums.asc $HOME/shasums
declare -A platforms=(
['x86_64-linux']='linux64'
['i686-linux']='linux32'
)
for platform in ${lib.escapeShellArgs meta.platforms}; do
arch="''${platforms[$platform]}"
sha256=$(cat "$HOME/shasums" | grep "${prefix}""$arch-$version""${suffix}" | cut -d" " -f1)
hash=$(nix hash to-sri --type sha256 "$sha256")
update-source-version "${pname}" "0" "sha256-${lib.fakeSha256}" --source-key="sources.$platform"
update-source-version "${pname}" "$version" "$hash" --source-key="sources.$platform"
done
''

6
pkgs/applications/networking/browsers/vivaldi/default.nix
View file

@ -23,7 +23,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.0.2979.18";
version = "6.0.2979.22";
suffix = {
aarch64-linux = "arm64";
@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-S3b0mmWsQhWDKPz34Gzb50q+wAURAFNEt6IvCqo8CMs=";
x86_64-linux = "sha256-uqhXL7kndmGoOOalyQ6mVxRB3k8L11UJzADCnNakj64=";
aarch64-linux = "sha256-x7wBbd7BdurnWGFeHD5kYb5t0/zGEXQaUwbHnNA4iME=";
x86_64-linux = "sha256-uN2nBWlullxpOZP2PzVCwKcNmO9XmDS3WiFOcp0dOqg=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

6
pkgs/applications/networking/cluster/karmor/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "karmor";
version = "0.13.1";
version = "0.13.2";
src = fetchFromGitHub {
owner = "kubearmor";
repo = "kubearmor-client";
rev = "v${version}";
hash = "sha256-HSMyGA4S8VjEA2u4TbmH+qS5ZCsWBg+aTNhAbt4S6yY=";
hash = "sha256-IKvWS1c7u1a3Fm2+uyhhgyuM680ZYiq9Xq2Tg/Y6HJo=";
};
vendorHash = "sha256-Rxm96sgdZFKuyQzT76WJHvzEM0tG2rvqnl7+umoFIMY=";
vendorHash = "sha256-xBtKKq6oUjazRac1FozRXBNRv1rFXYAulWu0Rs8ETvQ=";
nativeBuildInputs = [ installShellFiles ];

10
pkgs/applications/networking/cluster/kluctl/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kluctl";
version = "2.19.4";
version = "2.20.2";
src = fetchFromGitHub {
owner = "kluctl";
repo = "kluctl";
rev = "v${version}";
hash = "sha256-q/LWUTaf0PlNGhUZZIvMTjILmrYAO+jQGrUCqBkbDVM=";
hash = "sha256-VCPRGICbALYoD1LIrNnPXQLWGqWr+IznQP70K+L4tvk=";
};
vendorHash = "sha256-AywaABegaM32HnPN4b3xnnG/sggr1Z1Jubfbi1VA1k8=";
vendorHash = "sha256-z0eiWU5CFMfK6fz+LUtxtSP/MAuVn7iOHB+A7Uv2OQY=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
@ -23,6 +23,10 @@ buildGoModule rec {
version = "v${version}";
};
postInstall = ''
mv $out/bin/{cmd,kluctl}
'';
meta = with lib; {
description = "The missing glue to put together large Kubernetes deployments";
homepage = "https://kluctl.io/";

4
pkgs/applications/networking/cluster/pachyderm/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pachyderm";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "pachyderm";
repo = "pachyderm";
rev = "v${version}";
hash = "sha256-QWlNDnhcFXfCtX4J0V/hq6nFN0RjzYv29mI2zE2fyFo=";
hash = "sha256-C3qzf/+A1pYTYR3FMtUuqZNU+j8oOHSBLDfyuWYCh5I=";
};
vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY=";

42
pkgs/applications/networking/cluster/yor/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "yor";
version = "0.1.177";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-tOYRd3LxSlAvXCW89LAm4GWWukDBZhsgYIWYlEVKokE=";
};
vendorHash = "sha256-ZeTjGmlu8LndD2DKNncPzlpECdvkOjfwaVvV6S3sL9E=";
doCheck = false;
# https://github.com/bridgecrewio/yor/blob/main/set-version.sh
preBuild = ''
cat << EOF > src/common/version.go
package common
const Version = "${version}"
EOF
'';
ldflags = [
"-s"
"-w"
];
meta = with lib; {
description = "Extensible auto-tagger for your IaC files. The ultimate way to link entities in the cloud back to the codified resource which created it.";
homepage = "https://github.com/bridgecrewio/yor";
changelog = "https://github.com/bridgecrewio/yor/releases/tag/${version}";
license = licenses.asl20;
maintainers = [ maintainers.ivankovnatsky ];
};
}

4
pkgs/applications/networking/flexget/default.nix
View file

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.7.2";
version = "3.7.4";
format = "pyproject";
# Fetch from GitHub in order to use `requirements.in`
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-K71nawQhFYLPRg79rcZKJ+US+3M5JAU0eg+ZiFwB6n8=";
hash = "sha256-x5hwuc2yXDw8qWGLRJDH4V4rmvxjBKZaogmv4SxXoz4=";
};
postPatch = ''

6
pkgs/applications/networking/gabutdm/default.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "gabutdm";
version = "2.1.5";
version = "2.1.6";
src = fetchFromGitHub {
owner = "gabutakut";
repo = pname;
rev = version;
hash = "sha256-8fV7STYSpmNnLyoAjz+RuF/0nFeNiu8AIxkON1MbWr4=";
hash = "sha256-ai5LsoK21XwXqL4LRuKsOR1/JV6LnP+1ZJ9fMHpj178=";
};
nativeBuildInputs = [
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Simple and faster download manager";
description = "Simple and fast download manager";
homepage = "https://github.com/gabutakut/gabutdm";
license = licenses.lgpl21Plus;
mainProgram = "com.github.gabutakut.gabutdm";

4
pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
View file

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "whatsapp-for-linux";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "eneshecan";
repo = pname;
rev = "v${version}";
sha256 = "sha256-odE5syAFasGosc1WMU/pvQtk3YxuCci1YevZqNKfzYw=";
sha256 = "sha256-YmiEzemoGLwCUVfnuTmruSkI0oBg7yNuodWmXTMGh8g=";
};
nativeBuildInputs = [

4
pkgs/applications/networking/newsreaders/raven-reader/default.nix
View file

@ -2,10 +2,10 @@
let
pname = "raven-reader";
version = "1.0.78";
version = "1.0.80";
src = fetchurl {
url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage";
sha256 = "sha256-H9V2zTD80fBuIuNZnGDR21IYAAl/b6iYrde5rfsMECQ=";
sha256 = "sha256-RkpUWM1hAH73ePpQPj2C3SOukLpcPXbaXmb1VbcHaSU=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };

4
pkgs/applications/radio/cloudlog/default.nix
View file

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "cloudlog";
version = "2.4.2";
version = "2.4.3";
src = fetchFromGitHub {
owner = "magicbug";
repo = "Cloudlog";
rev = version;
sha256 = "sha256-btfHHrb7m6ITWe/18u2pmZiZKpKebKMThqcXFIvO/P8=";
sha256 = "sha256-2L+Yp8yxhmoVh34cW1s5Xy1f0X2xUo3UP32XcAV2LsM=";
};
postPath = ''

4
pkgs/applications/science/biology/diamond/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "diamond";
version = "2.1.6";
version = "2.1.7";
src = fetchFromGitHub {
owner = "bbuchfink";
repo = "diamond";
rev = "v${version}";
sha256 = "sha256-2FxJTF/fF/Xi0TglXDlf3sSwncv2f6gc129nTbk8YU0=";
sha256 = "sha256-5AjP7zH0WZhJqhcjgQjeK/WPCqy1Tl1gXXqRsHbqkys=";
};

4
pkgs/applications/science/biology/fastp/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "fastp";
version = "0.23.3";
version = "0.23.4";
src = fetchFromGitHub {
owner = "OpenGene";
repo = "fastp";
rev = "v${version}";
sha256 = "sha256-9YHm5LIKJJpMavlWMZXD5ZgTgT5w9eXuXwQVa/prux8=";
sha256 = "sha256-hkCo8CiZNJuVcL9Eg/R7YzM7/FEcGEnovV325oWa7y8=";
};
buildInputs = [ zlib libdeflate isa-l ];

6
pkgs/applications/science/math/R/default.nix
View file

@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation (finalAttrs: {
pname = "R";
version = "4.2.3";
version = "4.3.0";
src = let
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "sha256-VeSpptQ74xTiwD0CZqb6VESv3OULMDv8O4Kzl5UW4HQ=";
sha256 = "sha256-RdzEi2zyfTYQIPd/3ho5IJ6Ze4FAKzZjyhwBAFampgk=";
};
dontUseImakeConfigure = true;
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu
bison imake which blas lapack curl tcl tk jdk
bison imake which blas lapack curl tcl tk jdk tzdata
] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
patches = [

2
pkgs/applications/video/adl/default.nix
View file

@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
description = "popcorn anime-downloader + trackma wrapper";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ WeebSorceress ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/applications/video/anime-downloader/default.nix
View file

@ -49,6 +49,6 @@ python3.pkgs.buildPythonApplication rec {
description = "A simple but powerful anime downloader and streamer";
license = licenses.unlicense;
platforms = platforms.linux;
maintainers = with maintainers; [ WeebSorceress ];
maintainers = with maintainers; [ ];
};
}

8
pkgs/applications/video/filebot/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, coreutils, openjdk17, makeWrapper, autoPatchelfHook
, zlib, libzen, libmediainfo, curlWithGnuTls, libmms, glib
, genericUpdater, writeShellScript
}:
let
@ -43,6 +44,13 @@ in stdenv.mkDerivation rec {
ln -s $out/opt/filebot.sh $out/bin/filebot
'';
passthru.updateScript = genericUpdater {
versionLister = writeShellScript "filebot-versionLister" ''
curl -s https://www.filebot.net \
| sed -rne 's,^.*FileBot_([0-9]*\.[0-9]+\.[0-9]+)-portable.tar.xz.*,\1,p'
'';
};
meta = with lib; {
description = "The ultimate TV and Movie Renamer";
longDescription = ''

8
pkgs/applications/video/mpv/scripts/thumbfast.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation {
name = "mpv-thumbfast";
version = "unstable-2023-05-12";
version = "unstable-2023-06-04";
src = fetchFromGitHub {
owner = "po5";
repo = "thumbfast";
rev = "10e9f6133d4ea88e3e5d154969abfaee17173570";
hash = "sha256-3fzkAR/itgheXQHTr30XPQR3NpYpIVeZfkcBxEoAnGg=";
rev = "6f1d92da25a7b807427f55f085e7ad4d60c4e0d7";
hash = "sha256-7CCxMPmZZRDIcWn+YbV4xzZFL80qZS5UFA25E+Y2P2Q=";
};
postPatch = ''
@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation {
meta = {
description = "High-performance on-the-fly thumbnailer for mpv";
homepage = "https://github.com/po5/thumbfast";
license = lib.licenses.unfree; # no explicit licensing information available at this time
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ apfelkuchen6 ];
};
}

13
pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
View file

@ -18,15 +18,15 @@
, obs-vkcapture32
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "obs-vkcapture";
version = "1.3.2";
version = "1.3.3";
src = fetchFromGitHub {
owner = "nowrep";
repo = pname;
rev = "v${version}";
hash = "sha256-UQQ8oBEnOxmSN4ZyW4LdPZYvd5eB9EmdR0UvE1wgMZw=";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-pvJzzDbsmsu46C8Jki+eMfCZLejkgvqns2hVNDtpSk0=";
};
cmakeFlags = lib.optionals stdenv.isi686 [
@ -60,8 +60,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "OBS Linux Vulkan/OpenGL game capture";
homepage = "https://github.com/nowrep/obs-vkcapture";
changelog = "https://github.com/nowrep/obs-vkcapture/releases/tag/v${finalAttrs.version}";
maintainers = with maintainers; [ atila pedrohlc ];
license = licenses.gpl2Only;
platforms = platforms.linux;
};
}
})

2
pkgs/build-support/trivial-builders/default.nix
View file

@ -141,7 +141,7 @@ rec {
runCommand name
{ inherit text executable checkPhase allowSubstitutes preferLocalBuild;
passAsFile = [ "text" ];
meta = lib.optionalAttrs (toString executable != "" && matches != null) {
meta = lib.optionalAttrs (executable && matches != null) {
mainProgram = lib.head matches;
} // meta;
}

73
pkgs/data/misc/v2ray-geoip/default.nix
View file

@ -1,28 +1,69 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib
, stdenvNoCC
, fetchFromGitHub
, pkgsBuildBuild
, jq
, moreutils
, dbip-country-lite
}:
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202306010100";
let
generator = pkgsBuildBuild.buildGoModule {
pname = "v2ray-geoip";
version = "unstable-2023-03-27";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "d8faa6ba0754c083a89898610942d1d1d978ef7f";
sha256 = "sha256-Aumk+YPsxZl3F/DQv6w0rE5f5hduLNYApCKQIvRUSIw=";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "9321a7f5e301a957228eba44845144b4555b6658";
hash = "sha256-S30XEgzA9Vrq7I7REfO/WN/PKpcjcI7KZnrL4uw/Chs=";
};
vendorHash = "sha256-bAXeA1pDIUuEvzTLydUIX6S6fm6j7CUQmBG+7xvxUcc=";
meta = with lib; {
description = "GeoIP for V2Ray";
homepage = "https://github.com/v2fly/geoip";
license = licenses.cc-by-sa-40;
maintainers = with maintainers; [ nickcao ];
};
};
input = {
type = "maxmindMMDB";
action = "add";
args = {
uri = dbip-country-lite.mmdb;
};
};
in
stdenvNoCC.mkDerivation {
inherit (generator) pname src;
inherit (dbip-country-lite) version;
nativeBuildInputs = [
jq
moreutils
];
postPatch = ''
jq '.input[0] |= ${builtins.toJSON input}' config.json | sponge config.json
'';
buildPhase = ''
runHook preBuild
${generator}/bin/geoip
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -m 0644 geoip.dat -D $out/share/v2ray/geoip.dat
install -Dm444 -t "$out/share/v2ray" output/dat/{cn,geoip-only-cn-private,geoip,private}.dat
runHook postInstall
'';
passthru.updateScript = ./update.sh;
passthru.generator = generator;
meta = with lib; {
description = "GeoIP for V2Ray";
homepage = "https://github.com/v2fly/geoip";
license = licenses.cc-by-sa-40;
maintainers = with maintainers; [ nickcao ];
meta = generator.meta // {
inherit (dbip-country-lite.meta) license;
};
}

6
pkgs/data/misc/v2ray-geoip/update.sh
View file

@ -1,6 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p common-updater-scripts curl jq
set -euo pipefail
COMMIT=$(curl "https://api.github.com/repos/v2fly/geoip/commits/release?per_page=1")
update-source-version v2ray-geoip "$(echo $COMMIT | jq -r .commit.message)" --file=pkgs/data/misc/v2ray-geoip/default.nix --rev="$(echo $COMMIT | jq -r .sha)"

5
pkgs/desktops/plasma-5/kwayland-integration.nix
View file

@ -14,4 +14,9 @@ mkDerivation {
pname = "kwayland-integration";
nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-protocols wayland ];
meta = {
description = "Integration plugins for various KDE frameworks for the Wayland windowing system";
homepage = "https://invent.kde.org/plasma/kwayland-integration";
};
}

5
pkgs/desktops/plasma-5/plasma-browser-integration.nix
View file

@ -33,4 +33,9 @@ mkDerivation {
kactivities
plasma-workspace
];
meta = {
description = "Components necessary to integrate browsers into the Plasma Desktop";
homepage = "https://community.kde.org/Plasma/Browser_Integration";
};
}

5
pkgs/desktops/plasma-5/plasma-integration/default.nix
View file

@ -33,4 +33,9 @@ mkDerivation {
wayland-protocols
plasma-wayland-protocols
];
meta = {
description = "A set of plugins responsible for better integration of Qt applications when running on a KDE Plasma workspace";
homepage = "https://invent.kde.org/plasma/plasma-integration";
};
}

38
pkgs/development/compilers/pforth/default.nix
View file

@ -1,36 +1,36 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation {
version = "28";
stdenv.mkDerivation (finalAttrs: {
pname = "pforth";
version = "2.0.1";
src = fetchFromGitHub {
owner = "philburk";
repo = "pforth";
rev = "9190005e32c6151b76ac707b30eeb4d5d9dd1d36";
sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x";
rev = "v${finalAttrs.version}";
hash = "sha256-vEjFeHSJl+yAtatYJEnu+r9hmOr/kZOgIbSUXR/c8WU=";
};
patches = [
(fetchpatch {
name = "gnumake-4.3-fix.patch";
url = "https://github.com/philburk/pforth/commit/457cb99f57292bc855e53abcdcb7b12d6681e847.patch";
sha256 = "0x1bwx3pqb09ddjhmdli47lnk1ys4ny42819g17kfn8nkjs5hbx7";
})
];
dontConfigure = true;
makeFlags = [ "SRCDIR=." ];
makefile = "build/unix/Makefile";
preBuild = ''
cd platforms/unix
'';
installPhase = ''
install -Dm755 pforth_standalone $out/bin/pforth
'';
meta = {
description = "Portable ANSI style Forth written in ANSI C";
homepage = "http://www.softsynth.com/pforth/";
license = lib.licenses.publicDomain;
description = "Portable Portable ANS-like Forth written in ANSI 'C'";
changelog = "https://github.com/philburk/pforth/blob/v${finalAttrs.version}/RELEASES.md";
license = lib.licenses.bsd0;
maintainers = with lib.maintainers; [ AndersonTorres yrashk ];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ yrashk ];
};
}
})
# TODO: option for install the non-standalone executable

4
pkgs/development/interpreters/angelscript/default.nix
View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "angelscript";
version = "2.36.0";
version = "2.36.1";
src = fetchurl {
url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "sha256-M/lfdZe8DYiwl9NeexMg0VQZ/8V3mFHZ0qbMzsV4EbM=";
sha256 = "sha256-WLt0mvnH44YwRwX05uYnrkHf4D4LanPD0NLgF8T8lI8=";
};
nativeBuildInputs = [ unzip cmake ];

4
pkgs/development/libraries/cista/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cista";
version = "0.13";
version = "0.14";
src = fetchFromGitHub {
owner = "felixguendling";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dQOVmKRXfApN0QRx/PmLVzeCGppFJBnNWIOoLbDbrds=";
sha256 = "sha256-E2B+dNFk0ssKhT9dULNFzpa8auRQ9Q0czuUjX6hxWPw=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/openimageio/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "openimageio";
version = "2.4.11.1";
version = "2.4.12.0";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "v${version}";
hash = "sha256-Q8Gb/zscZre7fJPyLlZn04Xp3VFFbr6Z007mDPzownc=";
hash = "sha256-0Jilfe4jNNnpsbodJBFIyxjWqOA99MwmzAriwJgvqVs=";
};
outputs = [ "bin" "out" "dev" "doc" ];

37
pkgs/development/libraries/tbox/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "tbox";
version = "1.7.3";
src = fetchFromGitHub {
owner = "tboox";
repo = pname;
rev = "v${version}";
hash = "sha256-6SqMvwxKSiJO7Z33xx7cJoECu5AJ1gWF8ZsiERWx8DU=";
};
configureFlags = [
"--hash=y"
"--charset=y"
"--float=y"
"--demo=n"
];
postInstall = ''
mkdir -p $out/lib/pkgconfig
substituteAll ${./libtbox.pc.in} $out/lib/pkgconfig/libtbox.pc
'';
meta = with lib; {
description = "A glib-like multi-platform c library";
homepage = "https://docs.tboox.org";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ rewine ];
};
}

10
pkgs/development/libraries/tbox/libtbox.pc.in Normal file
View file

@ -0,0 +1,10 @@
prefix=@out@
exec_prefix=${prefix}
libdir=@out@/lib
includedir=@out@/include
Name: tbox
Description: A glib-like multi-platform c library
Version: @version@
Libs: -L${libdir} -ltbox
Cflags: -I${includedir}

4
pkgs/development/libraries/wxsqlite3/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "wxsqlite3";
version = "4.9.3";
version = "4.9.4";
src = fetchFromGitHub {
owner = "utelle";
repo = "wxsqlite3";
rev = "v${version}";
hash = "sha256-HdsPCdZF1wMTGYFaXzq+f4bUFjgCAklsKhhdyMKaxp8=";
hash = "sha256-aM79DI/Kj1QEIJ1HMttlfqK/WZER9RJhQbrnbPto57U=";
};
nativeBuildInputs = [ autoreconfHook ];

30
pkgs/development/libraries/xmake-core-sv/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
}:
stdenv.mkDerivation rec {
pname = "xmake-core-sv";
version = "1.1";
src = fetchFromGitHub {
owner = "xmake-io";
repo = pname;
rev = "v${version}";
hash = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY=";
};
nativeBuildInputs = [
autoreconfHook
];
meta = with lib; {
description = "Public domain cross-platform semantic versioning in c99";
homepage = "https://github.com/xmake-io/xmake-core-sv";
license = licenses.unlicense;
platforms = platforms.linux;
maintainers = with maintainers; [ rewine ];
};
}

4
pkgs/development/misc/resholve/test.nix
View file

@ -20,7 +20,7 @@
, runDemo ? false
, binlore
, sqlite
, util-linux
, unixtools
, gawk
, rlwrap
, gnutar
@ -29,7 +29,7 @@
let
default_packages = [ bash file findutils gettext ];
parsed_packages = [ coreutils sqlite util-linux gnused gawk findutils rlwrap gnutar bc ];
parsed_packages = [ coreutils sqlite unixtools.script gnused gawk findutils rlwrap gnutar bc ];
in
rec {
module1 = resholve.mkDerivation {

23
pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch Normal file
View file

@ -0,0 +1,23 @@
diff --git a/Makefile.am b/Makefile.am
index 52dc7a8..407c056 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,4 +2,4 @@
# Copyright 2012 Google Inc. wrightt@google.com
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src include examples
+SUBDIRS = src include
diff --git a/configure.ac b/configure.ac
index ac2a278..a4104b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,7 @@ fi
AC_CHECK_FUNCS([memmove memset regcomp select socket strcasecmp strncasecmp strchr strdup strndup strrchr strstr strtol strcasestr getline])
-AC_CONFIG_FILES([Makefile src/Makefile include/Makefile examples/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile include/Makefile])
CFLAGS="${CFLAGS} -Wall -Werror"

57
pkgs/development/mobile/ios-webkit-debug-proxy/default.nix Normal file
View file

@ -0,0 +1,57 @@
{ stdenv
, autoconf
, automake
, fetchFromGitHub
, fetchpatch
, lib
, libimobiledevice
, libusb1
, libplist
, libtool
, openssl
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "ios-webkit-debug-proxy";
version = "1.9.0";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo=";
};
patches = [
# OpenSSL 3.0 compatibility
(fetchpatch {
url = "https://github.com/google/ios-webkit-debug-proxy/commit/5ba30a2a67f39d25025cadf37c0eafb2e2d2d0a8.patch";
sha256 = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s=";
})
# Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399
./0001-Don-t-compile-examples.patch
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoconf automake libtool pkg-config ];
buildInputs = [ libimobiledevice libusb1 libplist openssl ];
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh
'';
enableParallelBuilding = true;
meta = with lib; {
description = "A DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector).";
longDescription = ''
The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd
daemon over a websocket connection, allowing developers to send commands
to MobileSafari and UIWebViews on real and simulated iOS devices.
'';
homepage = "https://github.com/google/ios-webkit-debug-proxy";
license = licenses.bsd3;
maintainers = [ maintainers.abustany ];
};
}

4
pkgs/development/python-modules/aiosmtplib/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiosmtplib";
version = "2.0.1";
version = "2.0.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "cole";
repo = pname;
rev = "v${version}";
hash = "sha256-Py/44J9J8FdrsSpEM2/DR2DQH8x8Ub7y0FPIN2gcmmA=";
hash = "sha256-Wo9WH3fwGN1upLAyj6aThxpQE7hortISjaCATTPee40=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/apprise/default.nix
View file

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "apprise";
version = "1.3.0";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-LFDBml3UExex9lnFKyGpkP6+bBXghGQiihzo5gmPEb8=";
hash = "sha256-4xUFNIVNrFPU8Hg42Mv7Is4NRdQuugX5bWbE9IQ81Vo=";
};
nativeBuildInputs = [

8
pkgs/development/python-modules/azure-mgmt-compute/default.nix
View file

@ -3,25 +3,27 @@
, fetchPypi
, azure-mgmt-common
, azure-mgmt-core
, isodate
, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-mgmt-compute";
version = "29.1.0";
version = "30.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-LVobrn9dMHyh6FDX6D/tnIOdT2NbEKS40/i8YJisKIg=";
hash = "sha256-cyD7r8OSdwsD7QK2h2AYXmCUVS7ZjX/V6nchClpRPHg=";
};
propagatedBuildInputs = [
azure-mgmt-common
azure-mgmt-core
isodate
];
pythonNamespaces = [

4
pkgs/development/python-modules/azure-mgmt-core/default.nix
View file

@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "1.3.2";
version = "1.4.0";
pname = "azure-mgmt-core";
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE=";
hash = "sha256-0ZUgg0AJT5jlpmYbeBzeb2oFHnnOMXyqvY/5cDCps64=";
};
propagatedBuildInputs = [

47
pkgs/development/python-modules/broadbean/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, versioningit
, numpy
, matplotlib
, schema
, hypothesis
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "broadbean";
version = "0.11.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-e+LAcmWxT+SkaWtToPgg+x3QRu5fCSm+w4dLCcyZrw8=";
};
nativeBuildInputs = [ setuptools versioningit ];
propagatedBuildInputs = [
numpy
matplotlib
schema
];
nativeCheckInputs = [
hypothesis
pytestCheckHook
];
pythonImportsCheck = [ "broadbean" ];
meta = {
homepage = "https://qcodes.github.io/broadbean";
description = "A library for making pulses that can be leveraged with QCoDeS";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ evilmav ];
};
}

2
pkgs/development/python-modules/cfscrape/default.nix
View file

@ -23,6 +23,6 @@ buildPythonPackage rec {
description = "A Python module to bypass Cloudflare's anti-bot page";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ WeebSorceress ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/development/python-modules/frigidaire/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "frigidaire";
version = "0.18.12";
version = "0.18.13";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "bm1549";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-U6ko6P5/ANGy84GQDuSQq+YArou0TrXH5SIc5x4euvU=";
hash = "sha256-FikBV4KjutQfupGPXcVT1h+BfQ099WRrmbrEJOaVCQI=";
};
postPatch = ''

4
pkgs/development/python-modules/google-auth/default.nix
View file

@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "google-auth";
version = "2.18.1";
version = "2.19.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-16MkkCfn9GT7v9fugxmgitCdLupRV4V1xL02D/oEnMs=";
hash = "sha256-qc+oiz4WGWhF5ko2WOuVOZISnROsczewZMZUb3fBcYM=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-storage";
version = "2.19.1";
version = "2.20.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-DZtfQqcD8yELSzrUWhgTkZH5NHQP3zYpsbIv2VrfC7o=";
hash = "sha256-F61ZHBaE8cEaQl0+7wyWcrjQlk66QHQiUbUasjyjfZw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-bigquery/default.nix
View file

@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "3.10.0";
version = "3.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-SwLe8Hbi24zsZvZftifROQSp/Dz0/uMV7eQ9y3A4qN8=";
hash = "sha256-OhwbNWb58n6oOjaq9U64eURO5z70JFZ2QBigs7VW0Ps=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-container/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.21.0";
version = "2.22.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-iFwf+qj/xqebEA+CWC9SDi3iEsfPiLcFLwUmnoxaxjg=";
hash = "sha256-zrttx7vfsUjFnCLyfYxG4uKH/RJr9BYCGZ3fxFg7Vsg=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-datacatalog/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
version = "3.12.0";
version = "3.13.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-/duRr+Qkhm07CPdLXxOy0gvpokshMbEMLmgd9/R7C3A=";
hash = "sha256-YdEMSLC6qz79t/caG2DUMhSxxjCh40Cu3+aABvVxQow=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-language/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.9.1";
version = "2.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-sG2qgQsv1dIEI+2cICxJllmey4hbYRb8tzTcnhS3Yyg=";
hash = "sha256-lC3Hp1fBK09aYUv4hO77FOlPOqQb+W2h/2MGJ9MhZ/Q=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-spanner/default.nix
View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.35.0";
version = "3.35.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-svdQIWJVGgU6TkEOs73CMJJwhOS2m2S07e2DZxvFb1k=";
hash = "sha256-w/Aua6IS7WHRsmjiNFJZp9D6Huo8PspYDa1JGDRp3mc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-speech/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.19.0";
version = "2.20.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+k5exHjJt9bSdbeVWgTWx+IaYlJ55JrTV0wofoVWCpU=";
hash = "sha256-5sW4b/6OR0ucgraZ75AvdclHjnfkTqOd45l7PvivPi4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-videointelligence/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
version = "2.11.1";
version = "2.11.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-fsC8WTwrMJgXZHlOsI9TfYcM8Q5rKXuArTVM+pHpfqE=";
hash = "sha256-WlBpQ234J1rCA1jpPPCxUa+k6+DAKivZV6kLknnUArw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-vision/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "3.4.1";
version = "3.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-VtBI7s8JvXGxMkbcRZfGsorH0RBQNGdf3O2T0lmi6f0=";
hash = "sha256-uLKI2lY094rCMXPdXV69hrorN85cTLrbVkyqeBiOBRg=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/mizani/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "mizani";
version = "0.9.1";
version = "0.9.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "has2k1";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-mRJk1eJuP3CnZKKJhOam8llknqIB0H81LyBjyzFwk5I=";
hash = "sha256-6jdQxRqulE5hIzzmdr9kR5gsLrzt0lfJun5blJjTUY0=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/nestedtext/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "nestedtext";
version = "3.5";
version = "3.6";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "KenKundert";
repo = "nestedtext";
rev = "refs/tags/v${version}";
hash = "sha256-RGCcrGsDkBhThuUZd2LuuyXG9r1S7iOA75HYRxkwUrU=";
hash = "sha256-SHY/MTmYbNh3azkyvwEtuvT+V7YzfLi2B3FvBzv6Omo=";
};
nativeBuildInputs = [

46
pkgs/development/python-modules/oca-port/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ buildPythonPackage
, click
, fetchPypi
, gitpython
, lib
, nix-update-script
, requests
, setuptools-scm
, setuptools
}:
buildPythonPackage rec {
pname = "oca-port";
version = "0.13";
format = "pyproject";
src = fetchPypi {
inherit version;
pname = "oca_port";
hash = "sha256-9ihqjnGdBPasiRD2pZeaiibwzFQKI9t+s/zMzvyLLHQ=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
click
gitpython
requests
];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
passthru.updateScript = nix-update-script { };
pythonImportsCheck = [ "oca_port" ];
meta = with lib; {
description = "Tool helping to port an addon or missing commits of an addon from one branch to another";
homepage = "https://github.com/OCA/oca-port";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ yajo ];
};
}

42
pkgs/development/python-modules/opencensus-ext-azure/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, azure-core
, azure-identity
, opencensus
, psutil
, requests
}:
buildPythonPackage rec {
pname = "opencensus-ext-azure";
version = "1.1.9";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-UHYIt36djqq2/9X/EbfOuH9U5KapQMS4FDMbTRsDQVE=";
};
propagatedBuildInputs = [
azure-core
azure-identity
opencensus
psutil
requests
];
pythonImportsCheck = [ "opencensus.ext.azure" ];
doCheck = false; # tests are not included in the PyPi tarball
meta = with lib; {
homepage = "https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-azure";
description = "OpenCensus Azure Monitor Exporter";
license = licenses.asl20;
maintainers = with maintainers; [ billhuang evilmav ];
};
}

58
pkgs/development/python-modules/opentelemetry-api/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, deprecated
, hatchling
, importlib-metadata
, opentelemetry-test-utils
, setuptools
, pytestCheckHook
}:
let
self = buildPythonPackage {
pname = "opentelemetry-api";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${self.version}";
hash = "sha256-h6XDzM29wYiC51S7OpBXvWFCfZ7DmIyGMG2pFjJV7pI=";
sparseCheckout = [ "/${self.pname}" ];
} + "/${self.pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
deprecated
importlib-metadata
setuptools
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry" ];
doCheck = false;
# Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils.
passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; };
meta = with lib; {
homepage = "https://opentelemetry.io";
description = "OpenTelemetry Python API";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
};
in self

49
pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix Normal file
View file

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, opentelemetry-proto
, opentelemetry-sdk
, opentelemetry-test-utils
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-exporter-otlp-proto-common";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-HNlkbDyYnr0/lDeY1xt0pRxqk+977ljgPdfJzAxL3AQ=";
sparseCheckout = [ "/exporter/${pname}" ];
} + "/exporter/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
opentelemetry-sdk
opentelemetry-proto
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.common" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-common";
description = "OpenTelemetry Protobuf encoding";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

58
pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, backoff
, googleapis-common-protos
, grpcio
, hatchling
, opentelemetry-test-utils
, opentelemetry-exporter-otlp-proto-common
, pytest-grpc
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-exporter-otlp-proto-grpc";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-feAmPL/G3ABIY5tBODlMJIBzxqg6Bl7imJB2EYtEp2o=";
sparseCheckout = [ "/exporter/${pname}" ];
} + "/exporter/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
backoff
googleapis-common-protos
grpcio
opentelemetry-exporter-otlp-proto-common
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
disabledTestPaths = [
"tests/performance/benchmarks/"
];
pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc";
description = "OpenTelemetry Collector Protobuf over gRPC Exporter";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

55
pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix Normal file
View file

@ -0,0 +1,55 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, backoff
, googleapis-common-protos
, hatchling
, opentelemetry-exporter-otlp-proto-common
, opentelemetry-test-utils
, requests
, responses
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-exporter-otlp-proto-http";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-r4jvIhRM9E4CuZyS/XvvYO+F9cPxip8ab57CUfip47Q=";
sparseCheckout = [ "/exporter/${pname}" ];
} + "/exporter/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
backoff
googleapis-common-protos
opentelemetry-exporter-otlp-proto-common
requests
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
responses
];
pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.http" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-http";
description = "OpenTelemetry Collector Protobuf over HTTP Exporter";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

48
pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, backoff
, hatchling
, opentelemetry-exporter-otlp-proto-grpc
, opentelemetry-exporter-otlp-proto-http
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-exporter-otlp";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-ph9ahT6M8UBvuUJjk6nug68Ou/D7XuuXkfnKHEdD8x8=";
sparseCheckout = [ "/exporter/${pname}" ];
} + "/exporter/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
opentelemetry-exporter-otlp-proto-grpc
opentelemetry-exporter-otlp-proto-http
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.exporter.otlp" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp";
description = "OpenTelemetry Collector Exporters";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

51
pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, opentelemetry-api
, opentelemetry-sdk
, opentelemetry-test-utils
, prometheus-client
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-exporter-prometheus";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-vWVLUt3Ett04kqUyoTOBNvRj51/M35X83saBBxeOTZI=";
sparseCheckout = [ "/exporter/${pname}" ];
} + "/exporter/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
opentelemetry-api
opentelemetry-sdk
prometheus-client
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.exporter.prometheus" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-prometheus";
description = "Prometheus Metric Exporter for OpenTelemetry";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

55
pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix Normal file
View file

@ -0,0 +1,55 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, asgiref
, hatchling
, opentelemetry-api
, opentelemetry-instrumentation
, opentelemetry-semantic-conventions
, opentelemetry-test-utils
, opentelemetry-util-http
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-instrumentation-asgi";
version = "0.39b0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python-contrib";
rev = "refs/tags/v${version}";
hash = "sha256-BfNrbOQwyApdcKOVGF0LqzWOxzLkHZYiYdYVVPkGmdQ=";
sparseCheckout = [ "/instrumentation/${pname}" ];
} + "/instrumentation/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
asgiref
opentelemetry-instrumentation
opentelemetry-api
opentelemetry-semantic-conventions
opentelemetry-util-http
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-asgi";
description = "ASGI instrumentation for OpenTelemetry";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

59
pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix Normal file
View file

@ -0,0 +1,59 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, django
, hatchling
, opentelemetry-api
, opentelemetry-instrumentation
, opentelemetry-instrumentation-asgi
, opentelemetry-instrumentation-wsgi
, opentelemetry-semantic-conventions
, opentelemetry-test-utils
, opentelemetry-util-http
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-instrumentation-django";
version = "0.39b0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python-contrib";
rev = "refs/tags/v${version}";
hash = "sha256-5tyLFQTYuJBFAFZirqsaHXCw72Q3TigDctZZFi/2zdI=";
sparseCheckout = [ "/instrumentation/${pname}" ];
} + "/instrumentation/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
django
opentelemetry-api
opentelemetry-instrumentation
opentelemetry-instrumentation-asgi
opentelemetry-instrumentation-wsgi
opentelemetry-semantic-conventions
opentelemetry-util-http
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.instrumentation.django" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-django";
description = "OpenTelemetry Instrumentation for Django";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

53
pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix Normal file
View file

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, opentelemetry-api
, opentelemetry-instrumentation
, opentelemetry-semantic-conventions
, opentelemetry-test-utils
, opentelemetry-util-http
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-instrumentation-wsgi";
version = "0.39b0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python-contrib";
rev = "refs/tags/v${version}";
hash = "sha256-DBZGXY8Y208YC/guk0qUB04UA/JFAtiv3kjsikskTRs=";
sparseCheckout = [ "/instrumentation/${pname}" ];
} + "/instrumentation/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
opentelemetry-instrumentation
opentelemetry-api
opentelemetry-semantic-conventions
opentelemetry-util-http
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.instrumentation.wsgi" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-wsgi";
description = "WSGI Middleware for OpenTelemetry";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

53
pkgs/development/python-modules/opentelemetry-instrumentation/default.nix Normal file
View file

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, opentelemetry-api
, opentelemetry-sdk
, opentelemetry-test-utils
, setuptools
, wrapt
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-instrumentation";
version = "0.39b0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python-contrib";
rev = "refs/tags/v${version}";
hash = "sha256-+zk76A640nyd1L0I55JrMMs7EnQ+SPQdYGAFIyQFc6E=";
sparseCheckout = [ "/${pname}" ];
} + "/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
opentelemetry-api
opentelemetry-sdk
setuptools
wrapt
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.instrumentation" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation";
description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

45
pkgs/development/python-modules/opentelemetry-proto/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, protobuf
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-proto";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-6iB+QlBUqRvIJ9p38NYgP4icW2rYs1P3bNCxI95cOvs=";
sparseCheckout = [ "/${pname}" ];
} + "/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
protobuf
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.proto" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-proto";
description = "OpenTelemetry Python Proto";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

66
pkgs/development/python-modules/opentelemetry-sdk/default.nix Normal file
View file

@ -0,0 +1,66 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, flaky
, hatchling
, opentelemetry-api
, opentelemetry-semantic-conventions
, opentelemetry-test-utils
, setuptools
, typing-extensions
, pytestCheckHook
}:
let
self = buildPythonPackage {
pname = "opentelemetry-sdk";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${self.version}";
hash = "sha256-YMFSmzuvm/VA9Fpe7pbF9mnGQHOQpobWMb1iGRt+d3w=";
sparseCheckout = [ "/${self.pname}" ];
} + "/${self.pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
opentelemetry-api
opentelemetry-semantic-conventions
setuptools
typing-extensions
];
nativeCheckInputs = [
flaky
opentelemetry-test-utils
pytestCheckHook
];
disabledTestPaths = [
"tests/performance/benchmarks/"
];
pythonImportsCheck = [ "opentelemetry.sdk" ];
doCheck = false;
# Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils.
passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; };
meta = with lib; {
homepage = "https://opentelemetry.io";
description = "OpenTelemetry Python API and SDK";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
};
in self

40
pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-semantic-conventions";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-82L/tDoWgu0r+Li3CS3hjVR99DQQmA5yt3y85+37imI=";
sparseCheckout = [ "/${pname}" ];
} + "/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.semconv" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-semantic-conventions";
description = "OpenTelemetry Semantic Conventions";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

45
pkgs/development/python-modules/opentelemetry-test-utils/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib
, callPackage
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, asgiref
, hatchling
, opentelemetry-api
, opentelemetry-sdk
}:
buildPythonPackage rec {
pname = "opentelemetry-test-utils";
version = "1.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-WRcKTE3eVqOSQUi5gZ3du+RGw8CrMazXHrctdrjgzHo=";
sparseCheckout = [ "/tests/${pname}" ];
} + "/tests/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
asgiref
opentelemetry-api
opentelemetry-sdk
];
pythonImportsCheck = [ "opentelemetry.test" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/tests/opentelemetry-test-utils";
description = "Test utilities for OpenTelemetry unit tests";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

51
pkgs/development/python-modules/opentelemetry-util-http/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, hatchling
, opentelemetry-instrumentation
, opentelemetry-sdk
, opentelemetry-semantic-conventions
, opentelemetry-test-utils
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "opentelemetry-util-http";
version = "0.39b0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python-contrib";
rev = "refs/tags/v${version}";
hash = "sha256-C20/M5wimQec/8tTKx7+jkIYgfgNPtU9lkPKliIM3Uk=";
sparseCheckout = [ "/util/${pname}" ];
} + "/util/${pname}";
format = "pyproject";
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
opentelemetry-instrumentation
opentelemetry-sdk
opentelemetry-semantic-conventions
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.util.http" ];
meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http";
description = "Web util for OpenTelemetry";
license = licenses.asl20;
maintainers = teams.deshaw.members;
};
}

5
pkgs/development/python-modules/playwright/default.nix
View file

@ -15,7 +15,8 @@ let
in
buildPythonPackage rec {
pname = "playwright";
version = "1.32.1";
# run ./pkgs/development/python-modules/playwright/update.sh to update
version = "1.34.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +24,7 @@ buildPythonPackage rec {
owner = "microsoft";
repo = "playwright-python";
rev = "v${version}";
hash = "sha256-rguobFaepTOL2duHRdFV5o2JSsBlYiA7rY3/RyHvoMc=";
hash = "sha256-GIxMVuSSJsRDsHDOPnJsDsTcghGYtIFpRS5u7HJd+zY=";
};
patches = [

12
pkgs/development/python-modules/playwright/update.sh
View file

@ -1,8 +1,10 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts
#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts node2nix
set -euo pipefail
root="$(dirname "$(readlink -f "$0")")"
driver_file="$root/../../web/playwright/driver.nix"
playwright_test="$root/../../web/playwright-test"
version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s https://api.github.com/repos/microsoft/playwright-python/releases/latest | jq -r '.tag_name | sub("^v"; "")')
@ -13,11 +15,11 @@ setup_py_url="https://github.com/microsoft/playwright-python/raw/v${version}/set
driver_version=$(curl -Ls "$setup_py_url" | grep '^driver_version =' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
fetch_driver_arch() {
nix-prefetch-url "https://playwright.azureedge.net/builds/driver/playwright-${version}-${1}.zip"
nix-prefetch-url "https://playwright.azureedge.net/builds/driver/playwright-${driver_version}-${1}.zip"
}
replace_sha() {
sed -i "s|$1 = \".\{44,52\}\"|$1 = \"$2\"|" "$root/default.nix"
sed -i "s|$1 = \".\{44,52\}\"|$1 = \"$2\"|" "$driver_file"
}
# Replace SHAs for the driver downloads
@ -27,5 +29,7 @@ replace_sha "aarch64-linux" "$(fetch_driver_arch "linux-arm64")"
replace_sha "aarch64-darwin" "$(fetch_driver_arch "mac-arm64")"
# Update the version stamps
sed -i "s/driverVersion = \"[^\$]*\"/driverVersion = \"$driver_version\"/" "$root/default.nix"
sed -i "s/version =\s*\"[^\$]*\"/version = \"$driver_version\"/" "$driver_file"
sed -i "s/\"@playwright\/test\": \"[^\$]*\"/\"@playwright\/test\": \"$driver_version\"/" "$playwright_test/node-packages.json"
(cd "$playwright_test"; node2nix -i node-packages.json)
update-source-version playwright "$version" --rev="v$version"

4
pkgs/development/python-modules/plumbum/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "plumbum";
version = "1.8.1";
version = "1.8.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "tomerfiliba";
repo = "plumbum";
rev = "refs/tags/v${version}";
hash = "sha256-5nRI9y2Y7itkqDdLRSX4qWfh96WmhqdP1Eo7HLoRHaQ=";
hash = "sha256-b8JcGRHiZSv/ViyEogpLgGXOMHHSC+cjWT0FqhkolcA=";
};
postPatch = ''

2
pkgs/development/python-modules/pySmartDL/default.nix
View file

@ -20,6 +20,6 @@ buildPythonPackage rec {
description = "A Smart Download Manager for Python";
license = licenses.unlicense;
platforms = platforms.linux;
maintainers = with maintainers; [ WeebSorceress ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/development/python-modules/pydelijn/default.nix
View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pydelijn";
version = "1.0.0";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "c5b6565c50d4f97d28baca9faf487281c2a5db635060b69f659e27c28a1a6e93";
sha256 = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyomo/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyomo";
version = "6.5.0";
version = "6.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
repo = "pyomo";
owner = "pyomo";
rev = "refs/tags/${version}";
hash = "sha256-ZsoWz+35hQS15dbpe1IOzft6JwZygKjv5AQWjVe+8kQ=";
hash = "sha256-1FSu5ejFjjNTuvaFU/UqAI/817HkrOA1Hczq8gcPQGA=";
};
propagatedBuildInputs = [

26
pkgs/development/python-modules/pyopencl/default.nix
View file

@ -13,7 +13,9 @@
, platformdirs
, pybind11
, pytest
, pytestCheckHook
, pytools
, setuptools
, six
}:
@ -22,9 +24,17 @@ let
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
in buildPythonPackage rec {
pname = "pyopencl";
version = "2022.3.1";
version = "2023.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-2d5gcnKRmlB6nCTD3+7q/nLAX3zWyeN7IRno7jxTqJE=";
};
nativeBuildInputs = [ setuptools ];
nativeCheckInputs = [ pytest ];
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
propagatedBuildInputs = [
@ -38,15 +48,7 @@ in buildPythonPackage rec {
six
];
src = fetchPypi {
inherit pname version;
hash = "sha256-Sj2w/mG1zclSZ1Jt7r1xp+HXlWlNSw/idh8GMLzKNiE=";
};
# py.test is not needed during runtime, so remove it from `install_requires`
postPatch = ''
substituteInPlace setup.py --replace "pytest>=2" ""
'';
nativeCheckInputs = [ pytestCheckHook ];
preBuild = ''
export HOME=$(mktemp -d)
@ -55,6 +57,8 @@ in buildPythonPackage rec {
# gcc: error: pygpu_language_opencl.cpp: No such file or directory
doCheck = false;
pythonImportsCheck = [ "pyopencl" ];
meta = with lib; {
description = "Python wrapper for OpenCL";
homepage = "https://github.com/pyopencl/pyopencl";

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