From 52502e26699ddae3333ad54c0481b66812eeac2a Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 15 Dec 2022 14:16:08 +0100 Subject: AusweisApp2: 1.24.4 -> 1.26.1 https://github.com/Governikus/AusweisApp2/releases/tag/1.26.1 --- pkgs/applications/misc/ausweisapp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 85579f0521961..eb773b3c812e7 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.24.4"; + version = "1.26.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI="; + sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY="; }; nativeBuildInputs = [ cmake pkg-config ]; -- cgit 1.4.1 From 36ee125efe686918f7753de341e440c3358040b3 Mon Sep 17 00:00:00 2001 From: Pawel Peregud Date: Tue, 20 Dec 2022 17:22:28 +0100 Subject: obsidian: 1.0.3 -> 1.1.8 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 55aba845b0c04..1eee1a03783ed 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.0.3"; + version = "1.1.8"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-DYF9fEpZaP4tD/eeZAegDahR7UZyroqNB9bn2U7sgXs=" else "sha256-MpQk5g4184ZkCAjLU5Ug0ReWgVADskS1QuMcnPdNofs="; + sha256 = if stdenv.isDarwin then "sha256-eq8xJCYAmKPM4AZYSUbPFCXklXHvqF3ccX3owzzF7BA=" else "sha256-EGSftd1APwLnCu05sYd2LSe7mGi2nEv8PI9mxS5MFN0="; }; icon = fetchurl { -- cgit 1.4.1 From 5c924eeb218d3ef056dace189044fd08d02c0549 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 23 Dec 2022 14:39:56 -0400 Subject: nbxplorer: use fetch-deps instead of custom create-deps.sh --- .../blockchains/btcpayserver/update.sh | 3 +- pkgs/applications/blockchains/nbxplorer/update.sh | 2 +- .../blockchains/nbxplorer/util/create-deps.sh | 46 ---------------------- .../blockchains/nbxplorer/util/update-common.sh | 4 +- 4 files changed, 3 insertions(+), 52 deletions(-) delete mode 100755 pkgs/applications/blockchains/nbxplorer/util/create-deps.sh (limited to 'pkgs') diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh index 082911b42a3d0..9debe6780f231 100755 --- a/pkgs/applications/blockchains/btcpayserver/update.sh +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -8,5 +8,4 @@ echo "Updating nbxplorer" ../nbxplorer/update.sh echo echo "Updating btcpayserver" -# Include Razor SDK packages in deps.nix -../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false' +../nbxplorer/util/update-common.sh btcpayserver deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh index caab20c928f85..5db2723ef8e93 100755 --- a/pkgs/applications/blockchains/nbxplorer/update.sh +++ b/pkgs/applications/blockchains/nbxplorer/update.sh @@ -3,4 +3,4 @@ set -euo pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) -getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix '' +getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh deleted file mode 100755 index 2a862c31c881e..0000000000000 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p dotnet-sdk_6 -set -euo pipefail - -# Writes deps for dotnet package in $pkgSrc to $depsFile. -# Expects $pkgSrc to contain a single .sln file. - -pkgSrc=$1 -depsFile=$(realpath "$2") -customFlags=$3 - -sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) -[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } - -tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX) -echo "Using tmp dir: $tmpdir" -cp -rT "$pkgSrc" "$tmpdir" -chmod -R +w "$tmpdir" - -pushd "$tmpdir" > /dev/null -mkdir home -echo "Running dotnet restore for $sln" -HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ - dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log - -echo "{ fetchNuGet }: [" > "$depsFile" -while read pkgSpec; do - { read pname; read version; } < <( - # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2 - sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkgSpec" - ) - sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg) - cat >> "$depsFile" <> "$depsFile" - -echo "Created $depsFile" - -popd > /dev/null -rm -r $tmpdir diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index ee52389448674..6346c2fa9f400 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -10,7 +10,6 @@ trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR pkgName=$1 depsFile=$2 -customFlags=$3 : ${getVersionFromTags:=} : ${refetch:=} @@ -75,5 +74,4 @@ fi echo # Create deps file -storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" -. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags" +$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) "$depsFile" -- cgit 1.4.1 From ebd9eeedeef1da2b7dc447a394d26ecc9f047c82 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 24 Dec 2022 14:42:09 +0100 Subject: btcpayserver: 1.7.2 -> 1.7.3 --- .../applications/blockchains/btcpayserver/default.nix | 4 ++-- pkgs/applications/blockchains/btcpayserver/deps.nix | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 17d6704644fc3..fb3912ab4db46 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-EZ8gfpTBmTB/lGtexZYbD9x1F7rFXIEaEhhwS6gOEV4="; + sha256 = "sha256-wjtiircPPQgWg1GGQsesEEeOF+h1+tc591YI0l/JlwQ="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 29bf9844b1786..6b67883226fe9 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,15 +8,15 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.12"; sha256 = "1n7yv6q8fbk02d334a19zyicvlammjhfrg9rf18jyb3szj8g36k7"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.16"; sha256 = "050wh5gw3hgql8191z0yv7sj06wg5da6kvkbcg9hq3ildj0fdj67"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.19"; sha256 = "1jx9233apry0kb54df7k0p7vrsp3hp27f5d0j2802gry04sihrl7"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.14"; sha256 = "1k5m6jc585hnkkl019diz2gycfnsv2kx4g4cfs4awlpr42k8s3ph"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.18"; sha256 = "0zpqi8dpk91sqg7njxbs64m9598fmmalcc1w97v60xlhp9afjmdb"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.21"; sha256 = "0qq6ppr5vw4k8hjnz5xp29fc82z32vh6bc389dnr439gw7hmwkp9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.17"; sha256 = "1bb8q57lnqnp3wijw41vvbwgz8rgg4g9pw8qhd4iiqi1w94q1bkz"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.16"; sha256 = "1q109kmzj99axk35l68z3gi29ww1xd62zaxj1f39myvlcv9ncb41"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.18"; sha256 = "166v6mhmy47fgny55c4mzqb2x7anqyxnd0g409vfgyg5fq4gc15v"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.9"; sha256 = "0ya365w3i3sjv7wafm6wmasf9mpfsh0fcbhawsv5br7m7lpppwhh"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.12"; sha256 = "1gb61a5mdmyigy7ps2c8n4iig6i32rdsif9kwn35yxx25zbnmbk2"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.19"; sha256 = "046vvlxlg8div4a2v6pnxz4iwji93s688jgnvav3hl6c22b9lvs0"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.18"; sha256 = "04lp90rr61p7n39bfmia6jamgr0jjfns9987py64iazi236dl74g"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.20"; sha256 = "1kwyh71zzfij07r6nvcf7k2gdpjdhh90imwh6s255ws13m1fj3sn"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.11"; sha256 = "0zm0b45npacknir6b6a6v717kp3yz8hxv1qy2v65g2zp3ad2wij4"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.14"; sha256 = "1hhznv07bd1f3rn9d1rpg61ln68vqfjg7ypxif9lx4l3vfcj5j04"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) @@ -125,7 +125,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.10"; sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.5"; sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) @@ -158,7 +157,7 @@ (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.18"; sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.20"; sha256 = "0gl39v1mvnhdrqn8dmmslsyj4w4yc4l447zp62bfnwm5ppcwda9z"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.23"; sha256 = "10dy58gq644561svc67pm37rlb44mymbnlfz409dhclmfhmqmd5s"; }) (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; }) (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.2"; sha256 = "0a8zy9iasgmr7mqhjrbxa2shnygpp97pbg5qnk7ix50y01k9blyw"; }) -- cgit 1.4.1 From 74d2a819f39b2ad8f9db215d4e154c22af91e7e5 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 24 Dec 2022 18:11:18 +0100 Subject: btcpayserver: add btcpayserver-altcoins alias to enable altcoinSupport --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ad54e6d2ed0c..c0d766be27af5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33802,6 +33802,8 @@ with pkgs; btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; + btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; }; + charge-lnd = callPackage ../applications/blockchains/charge-lnd { }; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; -- cgit 1.4.1 From d6f100fbf022c7ff28f6e98e54eff94e489ab265 Mon Sep 17 00:00:00 2001 From: toastal Date: Wed, 28 Dec 2022 15:20:24 +0700 Subject: hugin: 2021.0.0 → 2022.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://hugin.sourceforge.io/releases/2022.0.0/en.shtml --- pkgs/applications/graphics/hugin/default.nix | 10 ++-------- ...-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch | 14 -------------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch (limited to 'pkgs') diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 389d5d4294b88..f4d424b3fc30d 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -36,19 +36,13 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2021.0.0"; + version = "2022.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk="; + sha256 = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; }; - patches = [ - # committed upstream but unreleased: - # https://sourceforge.net/p/hugin/hugin/ci/edfddc6070ca6d4223d359fb4b38273a5aed2f2d - ./dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch - ]; - buildInputs = [ boost cairo diff --git a/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch b/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch deleted file mode 100644 index d38e07a595e8b..0000000000000 --- a/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:26.873574924 -0800 -+++ b/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:09.069575641 -0800 -@@ -472,9 +472,9 @@ - #else - #ifdef USE_XDG_DIRS - char *xdgDataDir = getenv("XDG_DATA_HOME"); -- if (strlen(xdgDataDir) == 0) -+ if (xdgDataDir == NULL || strlen(xdgDataDir) == 0) - { -- // no XDG_DATA_HOME enviroment variable set -+ // no XDG_DATA_HOME enviroment variable set or empty variable - // use $HOME/.local/share instead - const std::string homeDir = GetHomeDir(); - if (homeDir.empty()) -- cgit 1.4.1 From 93e794c979d8d60c6ab81af76fffba44a5973088 Mon Sep 17 00:00:00 2001 From: Pawel Peregud Date: Wed, 28 Dec 2022 11:40:29 +0100 Subject: obsidian: 1.1.8 -> 1.1.9 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 1eee1a03783ed..51841f9852a57 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.1.8"; + version = "1.1.9"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-eq8xJCYAmKPM4AZYSUbPFCXklXHvqF3ccX3owzzF7BA=" else "sha256-EGSftd1APwLnCu05sYd2LSe7mGi2nEv8PI9mxS5MFN0="; + sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-dFR7LaDRJwpxrNyPNseGi66gIAHOKf5Au2VXl7SBGSE="; }; icon = fetchurl { -- cgit 1.4.1 From b2557f76532a4d3804615f9e64cff3bc732b199b Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 30 Dec 2022 09:16:19 -0500 Subject: gmsh: Enable shared library This allows use of the Python and other bindings. --- pkgs/applications/science/math/gmsh/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 22eee8b305a52..23c1e1dab2a30 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { xorg.libICE ]; + # N.B. the shared object is used by bindings + cmakeFlags = [ + "-DENABLE_BUILD_SHARED=ON" + "-DENABLE_BUILD_DYNAMIC=ON" + ]; + nativeBuildInputs = [ cmake gfortran ]; doCheck = true; -- cgit 1.4.1 From 24de35c698cf210cc23a711e7ce5ca40044d93fb Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 30 Dec 2022 09:18:27 -0500 Subject: gmsh: 4.11 -> 4.11.1 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 23c1e1dab2a30..0ae213e60135e 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-PPLyRFXuCSUsmeZNTmRilW5o8P8fN7rKC3jICdbMVXo="; + sha256 = "sha256-xf4bfL1AOIioFJKfL9D11p4nYAIioYx4bbW3boAFs2U="; }; buildInputs = [ -- cgit 1.4.1 From 027f7687583d1a9f2e5291907b4e121a247bcd23 Mon Sep 17 00:00:00 2001 From: Naïm Favier Date: Sat, 31 Dec 2022 19:51:20 +0100 Subject: dina-font: fix encoding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The provided BDF files are encoded as CP1252, but they claim to be ISO8859-1. This causes a few glyphs (like `œ`) to be unused. Use fontforge to re-encode from CP1252 to Unicode, but keep doing the conversion with other tools because fontforge introduces spacing issues. --- pkgs/data/fonts/dina/default.nix | 48 +++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 509a37556cecc..4a0612efd3e56 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip +{ lib, stdenv, fetchzip, fontforge , bdftopcf, xorg }: @@ -8,32 +8,41 @@ stdenv.mkDerivation { outputs = [ "out" "bdf" ]; - src = fetchurl { - url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; - sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; + src = fetchzip { + url = "https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61"; + hash = "sha256-JK+vnOyhAbwT825S+WKbQuWgRrfZZHfyhaMQ/6ljO8s="; + extension = "zip"; + stripRoot = false; }; nativeBuildInputs = - [ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ]; - - postPatch = '' - sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf - ''; + [ fontforge bdftopcf xorg.mkfontscale xorg.fonttosfnt ]; buildPhase = '' runHook preBuild newName() { - test "''${1:5:1}" = i && _it=Italic || _it= - case ''${1:6:3} in - 400) test -z $it && _weight=Medium ;; - 700) _weight=Bold ;; - esac - _pt=''${1%.bdf} - _pt=''${_pt#*-} - echo "Dina$_weight$_it$_pt" + local name=''${1##*/} + test "''${name:5:1}" = i && _it=Italic || _it= + case ''${name:6:3} in + 400) _weight=Medium ;; + 700) _weight=Bold ;; + esac + _pt=''${1%.bdf} + _pt=''${_pt#*-} + echo "Dina$_weight$_it$_pt" } + # Re-encode the provided BDF files from CP1252 to Unicode as fonttosfnt does + # not support the former. + # We could generate the PCF and OTB files with fontforge directly, but that + # results in incorrect spacing in various places. + for f in BDF/*.bdf; do + basename=''${f##*/} basename=''${basename%.*} + fontforge -lang=ff -c "Open(\"$f\"); Reencode(\"win\", 1); Reencode(\"unicode\"); Generate(\"$basename.bdf\")" + mv "$basename"-*.bdf "$basename".bdf # remove the superfluous added size suffix + done + for f in *.bdf; do name=$(newName "$f") bdftopcf -t -o "$name.pcf" "$f" @@ -62,9 +71,8 @@ stdenv.mkDerivation { relatively compact to allow a lot of code on screen, while (hopefully) clear enough to remain readable even at high resolutions. ''; - homepage = "https://www.donationcoder.com/Software/Jibz/Dina/"; - downloadPage = "https://www.donationcoder.com/Software/Jibz/Dina/"; + homepage = "https://www.dcmembers.com/jibsen/download/61/"; license = licenses.free; - maintainers = [ maintainers.prikhi ]; + maintainers = with maintainers; [ prikhi ncfavier ]; }; } -- cgit 1.4.1 From a8ec44af72ad1e57db58418f0f2000b7fc3a924d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jan 2023 10:16:01 +0100 Subject: procmail: update from 3.22 to 3.24 - Don't coredump in comsat code if interrupted early - Correctly handle COMSAT=on - Once used, the 'H' and 'r' flags would never be cleared - Fix possible buffer overflow in variable-capture actions - Fix up the parsing of variable-capture actions - LMTP code assumed sizeof(long)==sizeof(int) - SHELL is now always preset to /bin/sh. USER_SHELL contains the shell from the user's passwd entry - When HOST is mismatched, reset it for the next rcfile - Always read in a new, global rcfile (/etc/procmail.conf) to allow runtime configuration of variables like DEFAULT. This rcfile cannot deliver or filter messages - Mismatched HOST in /etc/procmailrc didn't discard the message - backquote expansion in a condition disabled header concatenation for that condition - LMTP didn't correctly handle quoted localparts - Removed SIZE extension from LMTP (unsupportable semantics) - Don't coredump if unable to exec /bin/sh - Enable "+detail" processing in LMTP mode by passing the delimiter (e.g., "+") as an optional argument after -z - In LMTP mode, save the domain of the recipient in PROCMAIL_DOMAIN - Set PROCMAIL_MODE to one of "d", "m", "z", or "" to reflect the mode option it was invoked with, if any - Fixed all bugs collected by Debian and others during the past 21 years. See the git commit history for detailed descriptions. --- pkgs/applications/misc/procmail/CVE-2014-3618.patch | 18 ------------------ pkgs/applications/misc/procmail/default.nix | 17 ++++------------- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/misc/procmail/CVE-2014-3618.patch (limited to 'pkgs') diff --git a/pkgs/applications/misc/procmail/CVE-2014-3618.patch b/pkgs/applications/misc/procmail/CVE-2014-3618.patch deleted file mode 100644 index e3aa5600e40ea..0000000000000 --- a/pkgs/applications/misc/procmail/CVE-2014-3618.patch +++ /dev/null @@ -1,18 +0,0 @@ -From http://seclists.org/oss-sec/2014/q3/495 (with whitespace corrected). - ---- a/src/formisc.c 2013-08-04 00:13:33.000000000 -0700 -+++ b/src/formisc.c 2014-09-03 11:42:25.986002396 -0700 -@@ -84,12 +84,11 @@ - case '"':*target++=delim='"';start++; - } - ;{ int i; -- do -+ while(*start) - if((i= *target++= *start++)==delim) /* corresponding delimiter? */ - break; - else if(i=='\\'&&*start) /* skip quoted character */ - *target++= *start++; -- while(*start); /* anything? */ - } - hitspc=2; - } diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index dafc73925b549..ea299d73cbb0f 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "procmail"; - version = "3.22"; + version = "3.24"; src = fetchurl { - url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz"; - sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; + url = "https://github.com/BuGlessRB/procmail/archive/refs/tags/v${version}.tar.gz"; + sha256 = "UU6kMzOXg+ld+TIeeUdx5Ih7mCOsVf2yRpcCz2m9OYk="; }; - patches = [ - ./CVE-2014-3618.patch - (fetchurl { - url = "https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30"; - sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq"; - name = "CVE-2017-16844"; - }) - ]; - # getline is defined differently in glibc now. So rename it. # Without the .PHONY target "make install" won't install anything on Darwin. postPatch = '' @@ -33,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail processing and filtering utility"; - homepage = "http://www.procmail.org/"; + homepage = "https://github.com/BuGlessRB/procmail/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; -- cgit 1.4.1 From 88ee42a4bdd2f39d440faeb20009a13223c59695 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Tue, 3 Jan 2023 05:35:56 +0000 Subject: python3Packages.hydra-core: fix #208843 --- pkgs/development/python-modules/hydra-core/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index 17dda8404b4ad..d16b1137312c5 100644 --- a/pkgs/development/python-modules/hydra-core/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -7,6 +7,7 @@ , importlib-resources , jre_headless , omegaconf +, packaging , pytestCheckHook , pythonOlder , substituteAll @@ -48,6 +49,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ antlr4-python3-runtime omegaconf + packaging ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; @@ -69,6 +71,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "hydra" + # See https://github.com/NixOS/nixpkgs/issues/208843 + "hydra.version" ]; meta = with lib; { -- cgit 1.4.1 From 19e31cd67750b1b34486009d14ccd143414da942 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 3 Jan 2023 21:51:47 +0100 Subject: php80: 8.0.26 -> 8.0.27 --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 3f05a546e23bd..37277baae814f 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.26"; - hash = "sha256-bfh6+W8nWnWIns5uP+ShOr2Tp2epmShjvcDpDx6Ifuc="; + version = "8.0.27"; + hash = "sha256-X9iCsUN3wVjBtVzGrOkfuMGbd8WW1YMa0ST7u8kC28g="; }); in -- cgit 1.4.1 From 793d5252beb54471d34ea3656f113bda44f5b2a2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 3 Jan 2023 21:52:07 +0100 Subject: php82: 8.2.0 -> 8.2.1 --- pkgs/development/interpreters/php/8.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 1ac48d7f0575e..41627582dc83b 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.0"; - hash = "sha256-G/T8pmP5PZ4LSQm9bq4Fg6HOOD5/Bd8Sbyjycvof1Ro="; + version = "8.2.1"; + hash = "sha256-ddb482WZPsDR2cYoHUVX5v7sWiYZSkaLiwFFnRd++yk="; }); in -- cgit 1.4.1 From 0af966f3681e7608b3afaf6a68713c7d87ed68a0 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 4 Jan 2023 11:24:04 -0500 Subject: gmsh: Enable OpenMP support As this is parallelism that essentially comes for free. --- pkgs/applications/science/math/gmsh/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 0ae213e60135e..f88e59857aa10 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_BUILD_SHARED=ON" "-DENABLE_BUILD_DYNAMIC=ON" + "-DENABLE_OPENMP=ON" ]; nativeBuildInputs = [ cmake gfortran ]; -- cgit 1.4.1 From 041d551384b3d151bb8c484e172257270f389f7c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 4 Jan 2023 16:09:14 +0100 Subject: php81: 8.1.13 -> 8.1.14 --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index dc1b8c8581ef5..6cfda280d3ef7 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.13"; - hash = "sha256-k/z9+qo9CUoP2xjOCNIPINUm7j8HoUaoqOyCzgCyN8o="; + version = "8.1.14"; + hash = "sha256-FMqZMz3WBKUEojaJRkhaw103nE2pbSjcUV1+tQLf+jI="; }); in -- cgit 1.4.1 From 3068f369de14865c0a452ed7bd9b10791174855b Mon Sep 17 00:00:00 2001 From: Michael Schantz Klausen Date: Thu, 5 Jan 2023 14:50:35 +0100 Subject: python310Packages.gb-io: 0.1.1 -> 0.2.1 --- pkgs/development/python-modules/gb-io/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 6a44b758d2934..fe719bedb8f72 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "gb-io"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "althonos"; repo = "gb-io.py"; rev = "v${version}"; - sha256 = "05fpz11rqqjrb8lc8id6ssv7sni9i1h7x1ra5v5flw9ghpf29ncm"; + sha256 = "sha256-1B7BUJ8H+pTtmDtazfPfYtlXzL/x4rAHtRIFAAsSoWs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - sha256 = "1qh31jysg475f2qc70b3bczmzywmg9987kn2vsmk88h8sx4nnwc5"; + sha256 = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70="; }; sourceRoot = "source"; -- cgit 1.4.1 From 6de86d47d39137e320b55bb90de19b96248fec39 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 4 Jan 2023 13:34:54 -0700 Subject: pythonPackages.thefuzz: init at 0.19.0 Co-authored-by: Erik Arvstedt Signed-off-by: Sumner Evans --- .../development/python-modules/thefuzz/default.nix | 50 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/thefuzz/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix new file mode 100644 index 0000000000000..e521182a395a4 --- /dev/null +++ b/pkgs/development/python-modules/thefuzz/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, hypothesis +, python-Levenshtein +}: + +buildPythonPackage rec { + pname = "thefuzz"; + version = "0.19.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-b3Em2y8silQhKwXjp0DkX0KRxJfXXSB1Fyj2Nbt0qj0="; + }; + + propagatedBuildInputs = [ python-Levenshtein ]; + + # Skip linting + postPatch = '' + substituteInPlace test_thefuzz.py --replace "import pycodestyle" "" + ''; + + pythonImportsCheck = [ + "thefuzz" + ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + disabledTests = [ + # Skip linting + "test_pep8_conformance" + ]; + + meta = with lib; { + description = "Fuzzy string matching for Python"; + homepage = "https://github.com/seatgeek/thefuzz"; + changelog = "https://github.com/seatgeek/thefuzz/blob/${version}/CHANGES.rst"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ sumnerevans ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6aaa8a203bd9..d64b76ac0044a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11199,6 +11199,8 @@ self: super: with self; { cudnnSupport = false; }; + thefuzz = callPackage ../development/python-modules/thefuzz { }; + thermobeacon-ble = callPackage ../development/python-modules/thermobeacon-ble { }; thermopro-ble = callPackage ../development/python-modules/thermopro-ble { }; -- cgit 1.4.1 From 230027e9c6030fd9ddbd195ad4b9d01c85ff4a9f Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Fri, 6 Jan 2023 18:34:06 +0200 Subject: eduke32: 20221026 -> 20221225 --- pkgs/games/eduke32/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index d5656d0d5c3bf..a25c6fa9050f2 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20221026"; - rev = "10165"; - revExtra = "a9c797dcb"; + version = "20221225"; + rev = "10166"; + revExtra = "122aee012"; src = fetchurl { url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "sha256-8xvIe+kVOu2VIZACHis04tvyrl1IRrt0tY8D04n6ZjU="; + sha256 = "sha256-3pBYZJqoH7XBkJ537wPwBSmNaZprvOlVtAKTo8EOT3Q="; }; buildInputs = [ @@ -48,7 +48,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = '' + substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ + --replace '#include ' '#include ' \ + --replace '#include ' '#include ' \ + --replace '#include ' '#include ' + '' + lib.optionalString stdenv.isLinux '' substituteInPlace source/build/src/glbuild.cpp \ --replace libGLU.so ${libGLU}/lib/libGLU.so @@ -56,11 +61,6 @@ in stdenv.mkDerivation rec { substituteInPlace source/glad/src/$f \ --replace libGL.so ${libGL}/lib/libGL.so done - - substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ - --replace '#include ' '#include ' \ - --replace '#include ' '#include ' \ - --replace '#include ' '#include ' ''; makeFlags = [ -- cgit 1.4.1 From 3f79bf4243cccba9953c0b649cae0c4cc246ec18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 20:19:35 +0000 Subject: python310Packages.oslo-db: 12.2.0 -> 12.3.0 --- pkgs/development/python-modules/oslo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 65d98db529ee0..f9f0883b81d9c 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "12.2.0"; + version = "12.3.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "sha256-wAA/+oqFjUfbFYIxSWWC9jgFpgqvIg4AlKhVM3MwGuc="; + sha256 = "sha256-egL5k/Y99DLYhGsvC3t0dluwFJRe21sBWI5qG5Gzuck="; }; nativeBuildInputs = [ pbr ]; -- cgit 1.4.1 From 4ed69ca0957e29c40bcabb6f55c634b590b3a669 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 6 Jan 2023 15:12:02 -0500 Subject: gmsh: enable parallel building --- pkgs/applications/science/math/gmsh/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index f88e59857aa10..3153c128057a5 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { xorg.libICE ]; + enableParallelBuilding = true; + # N.B. the shared object is used by bindings cmakeFlags = [ "-DENABLE_BUILD_SHARED=ON" -- cgit 1.4.1 From 66c979db9a04c647a23131934b1349d727220f0f Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Sat, 7 Jan 2023 16:11:27 +0100 Subject: sof-firmware: 2.2.3 -> 2.2.4 --- pkgs/os-specific/linux/firmware/sof-firmware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index cccdf997dbd4f..9823e8c7ad597 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-v${version}.tar.gz"; - sha256 = "sha256-WR/9ZvHisycDjJHt88hQK0FywdyFDP5EBQ6t+OT620I="; + sha256 = "sha256-zoquuhA6pWqCZiVSsPM/M6hZqhAI2L+8LCLwzPyMazo="; }; dontFixup = true; # binaries must not be stripped or patchelfed -- cgit 1.4.1 From 513b8129397e8643bb8629ac098aba2bd44c2104 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 7 Jan 2023 15:30:31 +0000 Subject: pjsip: add patches for CVE-2022-23537 & CVE-2022-23547 --- pkgs/applications/networking/pjsip/default.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 96d0c60df1469..eae9a8a3d87a0 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, openssl +, libsamplerate +, alsa-lib +, AppKit +}: stdenv.mkDerivation rec { pname = "pjsip"; @@ -13,6 +21,16 @@ stdenv.mkDerivation rec { patches = [ ./fix-aarch64.patch + (fetchpatch { + name = "CVE-2022-23537.patch"; + url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; + sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; + }) + (fetchpatch { + name = "CVE-2022-23547.patch"; + url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; + sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; + }) ]; buildInputs = [ openssl libsamplerate ] -- cgit 1.4.1 From 24da3b0f353f24c84ebc8a615e32fde59270a48c Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 Jan 2023 17:56:57 +0200 Subject: openraPackages: fix error: makeWrapper/makeShellWrapper must be in nativeBuildInputs --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0b5f22705b9b..f02b6463a00f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34836,7 +34836,7 @@ with pkgs; otto-matic = callPackage ../games/otto-matic { }; - openraPackages = import ../games/openra pkgs; + openraPackages = import ../games/openra pkgs.__splicedPackages; openra = openraPackages.engines.release; -- cgit 1.4.1 From df45ce900072e152c06b4e2a6da06c78db19a49f Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 Jan 2023 18:02:03 +0200 Subject: icr: remove unnecessary adding of makeWrapper to path makeWrapper doesn't contain binaries so this doesn't do anything --- pkgs/development/tools/icr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 095055cbedce3..50a496d93824b 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -33,7 +33,7 @@ crystal.buildCrystalPackage rec { postFixup = '' wrapProgram $out/bin/icr \ - --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]} + --prefix PATH : ${lib.makeBinPath [ crystal shards which ]} ''; meta = with lib; { -- cgit 1.4.1 From 835d525361fb19f25eaaacc41524287fb833f928 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 Jan 2023 18:10:11 +0200 Subject: yarn2nix: fix splicing --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f02b6463a00f9..609d34c86e50a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13386,8 +13386,9 @@ with pkgs; yarn = callPackage ../development/tools/yarn { }; - yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; yarn2nix-moretea-openssl_1_1 = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { + pkgs = pkgs.__splicedPackages; nodejs = nodejs.override { openssl = openssl_1_1; }; }; -- cgit 1.4.1 From a98e52085584d806bd80ab203c7b75c4e361f522 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 6 Jan 2023 19:44:07 +0100 Subject: build-dotnet-module: avoid `/run/user` for downloading packages Inside `nix-shell`, `TMPDIR` (used by `mktemp`) is set to `/run/user/` which is usually a tmpfs stored in RAM. When fetching a large dotnet deps tree to this tmpdir from a nix-shell (e.g. via `btcpayserver/update.sh`), this can easily exceed system RAM and `fetch-deps` fails. mktemp arg `-t` is deprecated and can be omitted. --- pkgs/build-support/dotnet/build-dotnet-module/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 7f05a3a4eecc6..d7d6d68c6c53c 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -190,7 +190,13 @@ stdenvNoCC.mkDerivation (args // { esac done - export tmp=$(mktemp -td "${pname}-tmp-XXXXXX") + if [[ ''${TMPDIR:-} == /run/user/* ]]; then + # /run/user is usually a tmpfs in RAM, which may be too small + # to store all downloaded dotnet packages + TMPDIR= + fi + + export tmp=$(mktemp -d "deps-${pname}-XXXXXX") HOME=$tmp/home exitTrap() { -- cgit 1.4.1 From 2b86dd96768dee4c246006cdf67cfcc59e2a0a40 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sun, 8 Jan 2023 02:47:22 +0900 Subject: gnucash: exec Finance::Quote helpers directly --- .../office/gnucash/0004-exec-fq-helpers.patch | 23 ++++++++++++++++++++++ pkgs/applications/office/gnucash/default.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch (limited to 'pkgs') diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch new file mode 100644 index 0000000000000..289822365490f --- /dev/null +++ b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch @@ -0,0 +1,23 @@ +diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm +index 8e3ff255f..a6b805fa5 100644 +--- a/gnucash/price-quotes.scm ++++ b/gnucash/price-quotes.scm +@@ -44,7 +44,7 @@ + (define (start-program) + (set! program + (gnc-spawn-process-async +- (list "perl" "-w" gnc:*finance-quote-check*) #t))) ++ (list gnc:*finance-quote-check*) #t))) + + (define (get-sources) + (when program +@@ -119,7 +119,7 @@ + + (define (start-quoter) + (set! quoter +- (gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t))) ++ (gnc-spawn-process-async (list gnc:*finance-quote-helper*) #t))) + + (define (get-quotes) + (when quoter + diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 9e5294c4b00d0..700a94429964d 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { ./0002-disable-gnc-fq-update.patch # this patch prevents the building of gnucash-valgrind ./0003-remove-valgrind.patch + # this patch makes gnucash exec the Finance::Quote helpers directly + ./0004-exec-fq-helpers.patch ]; # this needs to be an environment variable and not a cmake flag to suppress -- cgit 1.4.1 From bc1d989403ee4a267922ba5680339ce672b1014a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 7 Jan 2023 12:05:47 -0800 Subject: zulip: Use pname and version Signed-off-by: Anders Kaseorg --- pkgs/applications/networking/instant-messengers/zulip/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index d7e7a94a511e1..241828fdfc3c4 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -6,7 +6,6 @@ let pname = "zulip"; version = "5.9.4"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; @@ -15,14 +14,14 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ $out/share/icons/hicolor/512x512/apps/zulip.png -- cgit 1.4.1 From 7f1a5d7f8d3a66cdc6518b70eb77f5f4d75dffdf Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sat, 7 Jan 2023 22:38:04 +0100 Subject: qalculate-qt: build with qt6 --- pkgs/applications/science/math/qalculate-qt/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index f55551af38035..dbcacb36be6b9 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools }: +{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools, qtsvg, qtwayland }: stdenv.mkDerivation rec { pname = "qalculate-qt"; @@ -8,11 +8,16 @@ stdenv.mkDerivation rec { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${version}"; - sha256 = "sha256-1MU/Wici+NQWbjoNpE9q6jKx8aKt85OAfb+ZsN/oK5w="; + hash = "sha256-1MU/Wici+NQWbjoNpE9q6jKx8aKt85OAfb+ZsN/oK5w="; }; nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ]; - buildInputs = [ libqalculate qtbase qttools ]; + buildInputs = [ libqalculate qtbase qttools qtsvg qtwayland ]; + + postPatch = '' + substituteInPlace qalculate-qt.pro\ + --replace "LRELEASE" "${qttools.dev}/bin/lrelease" + ''; meta = with lib; { description = "The ultimate desktop calculator"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da5fc449453e3..bf3231227130f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11036,7 +11036,7 @@ with pkgs; qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; - qalculate-qt = libsForQt5.callPackage ../applications/science/math/qalculate-qt { }; + qalculate-qt = qt6Packages.callPackage ../applications/science/math/qalculate-qt { }; qastools = libsForQt5.callPackage ../tools/audio/qastools { }; -- cgit 1.4.1 From c534878e911652b4bcf5fbd52b9b3b47426a0b7f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:37:41 +0800 Subject: cinnamon.cinnamon-control-center: 5.6.0 -> 5.6.1 https://github.com/linuxmint/cinnamon-control-center/compare/5.6.0...5.6.1 --- pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index ceee75dd69799..b3a16ed3fc35f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.6.0"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-WK35uDckIYU4HwuYtLj+CFVJD8O78LTQcnOvjp/et2s="; + hash = "sha256-rp3K7SqGw8da2U61VjKiqUyT5vCUVk4XZdRYtLwRtfQ="; }; buildInputs = [ -- cgit 1.4.1 From 94fa96c4a0dedd2045be1db0ecde825a65a1ceb5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:39:49 +0800 Subject: cinnamon.cinnamon-desktop: 5.6.0 -> 5.6.1 https://github.com/linuxmint/cinnamon-desktop/compare/5.6.0...5.6.1 --- pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 0a724023418bf..c9c718fb7da91 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "5.6.0"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ajtKvy9CMr+Vsmdn49ZWYtbniZV1dqWJGTou3QY4oPc="; + hash = "sha256-h2Jl/4SreniZtxziDwM0iwHXgGBrnHu8NLkIX7VGP18="; }; outputs = [ "out" "dev" ]; -- cgit 1.4.1 From 93021e7f7172c98eff7535bc148bcc34942e93bf Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:41:04 +0800 Subject: cinnamon.cinnamon-screensaver: 5.6.2 -> 5.6.3 https://github.com/linuxmint/cinnamon-screensaver/compare/5.6.2...5.6.3 --- pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 981b6a5d4578d..e6a615bb12af1 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.6.2"; + version = "5.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-xsxNGDFiBzVtoCV94iUuia45FRJGyGO522u6p1AIR6g="; + hash = "sha256-S4+9ZTpDwwvYTc3gz0YQBYjgygp8KP94azkiJcH6xCk="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 1ccf8fe34c0c9f69887f8f640f8db9f66194a12f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:45:17 +0800 Subject: cinnamon.cinnamon-settings-daemon: 5.6.0 -> 5.6.1 https://github.com/linuxmint/cinnamon-settings-daemon/compare/5.6.0...5.6.1 --- pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 47a1e092d15c1..1fcc9fb6a29a8 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "5.6.0"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-VUGOBvMInruX1JVk9ECP8++FUrBQwDJhkZT/1pPg2wU="; + hash = "sha256-QR77O3rFfY0+6cKoS75xoFRplNo4nvTMtR2rNKZERYE="; }; patches = [ -- cgit 1.4.1 From cbb0bd35bd7038e85fe894ba212ac1304353e300 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:46:54 +0800 Subject: cinnamon.muffin: 5.6.2 -> 5.6.3 https://github.com/linuxmint/muffin/compare/5.6.2...5.6.3 --- pkgs/desktops/cinnamon/muffin/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 7b9957f2392cc..58a9008e33871 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , substituteAll , cairo , cinnamon-desktop @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "5.6.2"; + version = "5.6.3"; outputs = [ "out" "dev" "man" ]; @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-bHEBzl0aBXsHOhSWJUz428pG5M6L0s/Q6acKO+2oMXo="; + hash = "sha256-qcm1CRUMKFx4KDXBnaIVLHuZTzSMEWEBFTWMe85pJDE="; }; patches = [ @@ -52,13 +51,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; zenity = gnome.zenity; }) - - # compositor: Fix crash when restarting Cinnamon - # https://github.com/linuxmint/muffin/pull/655 - (fetchpatch { - url = "https://github.com/linuxmint/muffin/commit/1a941ec603a1565dbd2f943f7da6e877d1541bcb.patch"; - sha256 = "sha256-6x64rWQ20ZjM9z79Pg6QMDPeFN5VNdDHBueRvy2kA6c="; - }) ]; nativeBuildInputs = [ -- cgit 1.4.1 From c90f3e3dee6abb048fe0dda62ddc90a852fa0b14 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:48:22 +0800 Subject: cinnamon.nemo: 5.6.1 -> 5.6.2 https://github.com/linuxmint/nemo/compare/5.6.1...5.6.2 --- pkgs/desktops/cinnamon/nemo/default.nix | 9 +--- .../fix-nemo-actions-duplicate-menu-items.patch | 48 ---------------------- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index ef5762cd14174..58be1f5b81cb6 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,24 +23,19 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.6.1"; + version = "5.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-ztx3Y+n9Bpzuz06mbkis3kdlM/0JrOaMDbRF5glzkDE="; + sha256 = "sha256-JwwSeY+TsbYc2ZXoxR9aja0Hb8AmrWK79cv1ApAgcpQ="; }; patches = [ # Load extensions from NEMO_EXTENSION_DIR environment variable # https://github.com/NixOS/nixpkgs/issues/78327 ./load-extensions-from-env.patch - - # Don't populate nemo actions from /run/current-system/sw/share - # They should only be loaded exactly once from $out/share - # https://github.com/NixOS/nixpkgs/issues/190781 - ./fix-nemo-actions-duplicate-menu-items.patch ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch b/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch deleted file mode 100644 index 3a555774c4504..0000000000000 --- a/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/libnemo-private/nemo-action-manager.c b/libnemo-private/nemo-action-manager.c -index 4dac198..b671421 100644 ---- a/libnemo-private/nemo-action-manager.c -+++ b/libnemo-private/nemo-action-manager.c -@@ -146,6 +146,8 @@ set_up_actions_directories (NemoActionManager *action_manager) - data_dirs = (gchar **) g_get_system_data_dirs (); - - for (i = 0; i < g_strv_length (data_dirs); i++) { -+ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0) -+ continue; - path = g_build_filename (data_dirs[i], "nemo", "actions", NULL); - uri = g_filename_to_uri (path, NULL, NULL); - -diff --git a/src/nemo-action-config-widget.c b/src/nemo-action-config-widget.c -index fc4075e..6e1c837 100644 ---- a/src/nemo-action-config-widget.c -+++ b/src/nemo-action-config-widget.c -@@ -221,6 +221,8 @@ refresh_widget (NemoActionConfigWidget *widget) - data_dirs = (gchar **) g_get_system_data_dirs (); - - for (i = 0; i < g_strv_length (data_dirs); i++) { -+ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0) -+ continue; - path = g_build_filename (data_dirs[i], "nemo", "actions", NULL); - populate_from_directory (widget, path); - g_clear_pointer (&path, g_free); -@@ -390,6 +392,8 @@ static void setup_dir_monitors (NemoActionConfigWidget *widget) - - guint i; - for (i = 0; i < g_strv_length (data_dirs); i++) { -+ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0) -+ continue; - gchar *path = g_build_filename (data_dirs[i], "nemo", "actions", NULL); - try_monitor_path (widget, path); - g_free (path); -diff --git a/src/nemo-script-config-widget.c b/src/nemo-script-config-widget.c -index 3a2d349..b8a85b4 100644 ---- a/src/nemo-script-config-widget.c -+++ b/src/nemo-script-config-widget.c -@@ -288,6 +288,8 @@ static void setup_dir_monitors (NemoScriptConfigWidget *widget) - - guint i; - for (i = 0; i < g_strv_length (data_dirs); i++) { -+ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0) -+ continue; - gchar *path = g_build_filename (data_dirs[i], "nemo", "actions", NULL); - try_monitor_path (widget, path); - g_free (path); -- cgit 1.4.1 From fad243ffd27bcbcec9ad17ca6dcd657acad9632c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 03:04:32 +0000 Subject: python310Packages.pastescript: 3.2.1 -> 3.3.0 --- pkgs/development/python-modules/pastescript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 244b51f3f844e..4d4e9df7d070c 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pastescript"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { pname = "PasteScript"; inherit version; - sha256 = "f3ef819785e1b284e6fc108a131bce7e740b18255d96cd2e99ee3f00fd452468"; + sha256 = "sha256-3eyAGhOsZn4JTt3ij5AhLN6nvcmhjUNxsI9abvfS66I="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 2cdd4df89958e90aa0fef168dd62abb24b7c4cf4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 11:26:08 +0800 Subject: cinnamon.nemo-with-extensions: Fix duplicate right-click menu items --- pkgs/desktops/cinnamon/nemo/wrapper.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/desktops/cinnamon/nemo/wrapper.nix index 7f7633d19a855..604247566b84c 100644 --- a/pkgs/desktops/cinnamon/nemo/wrapper.nix +++ b/pkgs/desktops/cinnamon/nemo/wrapper.nix @@ -24,6 +24,10 @@ symlinkJoin { --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions" done + # Don't populate the same nemo actions twice when having this globally installed + # https://github.com/NixOS/nixpkgs/issues/190781#issuecomment-1365601853 + rm -r $out/share/nemo/actions + # Point to wrapped binary in all service files for file in "share/dbus-1/services/nemo.FileManager1.service" \ "share/dbus-1/services/nemo.service" -- cgit 1.4.1 From ef13c2bb52a381f60f456a98c045cdf9ce7a45bd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:49:17 +0800 Subject: cinnamon.xviewer: 3.2.11 -> 3.2.12 https://github.com/linuxmint/xviewer/compare/3.2.11...3.2.12 --- pkgs/desktops/cinnamon/xviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 73ba5d99d3972..9002c10e6120c 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.11"; + version = "3.2.12"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-EyrK4mnAHt/Lypuz7XX7+GFGfkfC5VDIit2WYZawI04="; + sha256 = "sha256-tiZeC862gHbZt76sbxseUu9vWN+1huftXpE7lQLkGKU="; }; nativeBuildInputs = [ -- cgit 1.4.1 From b554ace4dc818b31e5809f7eacfeaca538c490e9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:58:31 +0800 Subject: cinnamon.mint-cursor-themes: unstable-2022-11-29 -> 1.0.1 https://github.com/linuxmint/mint-cursor-themes/compare/aa6bb76...e17f8a4 --- pkgs/desktops/cinnamon/mint-cursor-themes/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix index c2190a65308d0..31b453b0bea90 100644 --- a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix @@ -5,13 +5,14 @@ stdenvNoCC.mkDerivation rec { pname = "mint-cursor-themes"; - version = "unstable-2022-11-29"; + version = "1.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - rev = "aa6bb767831ac43d1768c2e639de713a4a1eba8d"; - hash = "sha256-UQnRrylUo9zuDiAwQ1COtXMtq4XTbxtMle41p+pzxJc="; + # They don't really do tags, this is just a named commit. + rev = "e17f8a4620827235dabbe5221bd0ee8c44dad0d5"; + hash = "sha256-yLUmIVh884uDVkNil7qxf6t/gykipzBvPgzwmY3zvQk="; }; installPhase = '' -- cgit 1.4.1 From 70292fc740aa6462154bf0089279d23bb5429230 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:50:43 +0800 Subject: timeshift: 22.11.1 -> 22.11.2 https://github.com/linuxmint/timeshift/compare/22.11.1...22.11.2 --- pkgs/applications/backup/timeshift/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index eaf3f90138172..8e86b35cf7cc1 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "22.11.1"; + version = "22.11.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - sha256 = "JYYiqJzLszaCJSl7fDb9Oz8tdIYAnqEbJoRg4zw3wbg="; + sha256 = "yZNERRoNZ1K7BRiAu7sqVQyhghsS/AeZSODMVSm46oY="; }; patches = [ -- cgit 1.4.1 From e552353d67077c9e1f5e1002bbbbbe264ea9c67c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:54:38 +0800 Subject: lightdm-slick-greeter: 1.6.0 -> 1.6.1 https://github.com/linuxmint/slick-greeter/compare/1.6.0...1.6.1 --- pkgs/applications/display-managers/lightdm-slick-greeter/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index eedfaee00c59c..605b5bc286abf 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-XoGha0DyrtrGXW72Zvnk1FrvULPMYc0FvQj4JFSKxXo="; + sha256 = "sha256-k/E3bR63kesHQ/we+ctC0UEYE5YdZ6Lv5lYuXqCOvKA="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { substituteInPlace src/slick-greeter.vala \ --replace "/usr/bin/numlockx" "${numlockx}/bin/numlockx" \ --replace "/usr/share/xsessions/" "/run/current-system/sw/share/xsessions/" \ + --replace "/usr/share/wayland-sessions/" "/run/current-system/sw/share/wayland-sessions/" \ --replace "/usr/bin/slick-greeter" "${placeholder "out"}/bin/slick-greeter" substituteInPlace src/session-list.vala \ -- cgit 1.4.1 From 9756d1015802254110f2ddda48ad1e8d685694e6 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 8 Jan 2023 03:47:26 +0000 Subject: cudaPackages.cudatoolkit: python27 -> python3 python27 was recently marked as insecure, breaking cudaPackages.cudatoolkit. This commit has been successfully tested against the earliest supported, 10.0, and the latest supported, 11.8, with the assumption that intermediate versions ought to work as well. --- pkgs/development/compilers/cudatoolkit/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 6375c513f411a..a98e188271cb5 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -20,7 +20,7 @@ args@ , makeWrapper , ncurses5 , perl -, python27 +, python3 , requireFile , stdenv , unixODBC @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ]; buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook runtimeDependencies = [ - ncurses5 expat python27 zlib glibc + ncurses5 expat python3 zlib glibc xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext gtk2 glib fontconfig freetype unixODBC alsa-lib ]; -- cgit 1.4.1 From ecf05f1c15eb348bf3f72cb2bc2729f6f10974ec Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 8 Jan 2023 04:17:59 +0000 Subject: python3Packages: virtual-display -> PyVirtualDisplay virtual-display is a quite old package, and it's not clear why it was named "virtual-display" as the PyPI name is (and was) "PyVirtualDisplay". In any case, this commit rectifies that inconsistency. --- .../python-modules/PyVirtualDisplay/default.nix | 23 ++++++++++++++++++++++ .../python-modules/pytest-xvfb/default.nix | 4 ++-- .../python-modules/virtual-display/default.nix | 23 ---------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 6 ++++-- 5 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/PyVirtualDisplay/default.nix delete mode 100644 pkgs/development/python-modules/virtual-display/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/PyVirtualDisplay/default.nix b/pkgs/development/python-modules/PyVirtualDisplay/default.nix new file mode 100644 index 0000000000000..bc7469e1d61a0 --- /dev/null +++ b/pkgs/development/python-modules/PyVirtualDisplay/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, EasyProcess }: + +buildPythonPackage rec { + pname = "PyVirtualDisplay"; + version = "3.0"; + + propagatedBuildInputs = [ EasyProcess ]; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-CXVbw86263JfsH7KVCX0PyNY078I4A0qm3kqGu3RYVk="; + }; + + # requires X server + doCheck = false; + + meta = with lib; { + description = "Python wrapper for Xvfb, Xephyr and Xvnc"; + homepage = "https://github.com/ponty/pyvirtualdisplay"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix index c3dabe7f6e30a..f4038c557797b 100644 --- a/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, virtual-display +, PyVirtualDisplay , isPy27 }: @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ - virtual-display + PyVirtualDisplay ]; meta = with lib; { diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix deleted file mode 100644 index bc7469e1d61a0..0000000000000 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, EasyProcess }: - -buildPythonPackage rec { - pname = "PyVirtualDisplay"; - version = "3.0"; - - propagatedBuildInputs = [ EasyProcess ]; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-CXVbw86263JfsH7KVCX0PyNY078I4A0qm3kqGu3RYVk="; - }; - - # requires X server - doCheck = false; - - meta = with lib; { - description = "Python wrapper for Xvfb, Xephyr and Xvnc"; - homepage = "https://github.com/ponty/pyvirtualdisplay"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ layus ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 75f5cf537a20f..e7bfd9fa0161d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -223,6 +223,7 @@ mapAliases ({ unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01 uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13 uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13 + virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07 Wand = wand; # added 2022-11-13 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e1a758e4d4ce..ed6f6319c9f37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6285,6 +6285,8 @@ self: super: with self; { nocaselist = callPackage ../development/python-modules/nocaselist { }; + nocturne = callPackage ../development/python-modules/nocturne { }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; nodepy-runtime = callPackage ../development/python-modules/nodepy-runtime { }; @@ -9454,6 +9456,8 @@ self: super: with self; { pyvicare = callPackage ../development/python-modules/pyvicare { }; + PyVirtualDisplay = callPackage ../development/python-modules/PyVirtualDisplay { }; + pyvis = callPackage ../development/python-modules/pyvis { }; pyvisa = callPackage ../development/python-modules/pyvisa { }; @@ -11848,8 +11852,6 @@ self: super: with self; { virtkey = callPackage ../development/python-modules/virtkey { }; - virtual-display = callPackage ../development/python-modules/virtual-display { }; - virtualenv = callPackage ../development/python-modules/virtualenv { }; virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; -- cgit 1.4.1 From 0fb94ef0d86e6947d44831e3c67060f6bc4f3694 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 8 Jan 2023 04:18:18 +0000 Subject: python3Packages.nocturne: init at unstable-2022-10-15 --- .../python-modules/nocturne/default.nix | 61 ++++++++++++++++++++++ .../python-modules/nocturne/dependencies.patch | 27 ++++++++++ 2 files changed, 88 insertions(+) create mode 100644 pkgs/development/python-modules/nocturne/default.nix create mode 100644 pkgs/development/python-modules/nocturne/dependencies.patch (limited to 'pkgs') diff --git a/pkgs/development/python-modules/nocturne/default.nix b/pkgs/development/python-modules/nocturne/default.nix new file mode 100644 index 0000000000000..42424f1dacc97 --- /dev/null +++ b/pkgs/development/python-modules/nocturne/default.nix @@ -0,0 +1,61 @@ +{ buildPythonPackage +, cmake +, fetchFromGitHub +, gtest +, hydra-core +, lib +, nlohmann_json +, pybind11 +, PyVirtualDisplay +, sfml +, substituteAll +}: + +buildPythonPackage rec { + pname = "nocturne"; + version = "unstable-2022-10-15"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = pname; + rev = "ae0a4e361457caf6b7e397675cc86f46161405ed"; + hash = "sha256-pFVbl4m7qX1mJgleNabRboS9klDDsbzUa4PYL5+Jupc="; + }; + + # Simulate the git submodules but with nixpkgs dependencies + postUnpack = '' + rm -rf $sourceRoot/third_party/* + ln -s ${nlohmann_json.src} $sourceRoot/third_party/json + ln -s ${pybind11.src} $sourceRoot/third_party/pybind11 + ''; + + patches = [ + (substituteAll { + src = ./dependencies.patch; + gtest_src = gtest.src; + }) + ]; + + nativeBuildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + + buildInputs = [ sfml ]; + + # hydra-core and PyVirtualDisplay are not declared as dependences but they are requirements + propagatedBuildInputs = [ hydra-core PyVirtualDisplay ]; + + # Test suite requires hydra-submitit-launcher which is not packaged as of 2022-01-02 + doCheck = false; + + pythonImportsCheck = [ + "nocturne" + ]; + + meta = with lib; { + description = "A data-driven, fast driving simulator for multi-agent coordination under partial observability"; + homepage = "https://github.com/facebookresearch/nocturne"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/nocturne/dependencies.patch b/pkgs/development/python-modules/nocturne/dependencies.patch new file mode 100644 index 0000000000000..18843ff6309f3 --- /dev/null +++ b/pkgs/development/python-modules/nocturne/dependencies.patch @@ -0,0 +1,27 @@ +diff --git a/nocturne/cpp/CMakeLists.txt b/nocturne/cpp/CMakeLists.txt +index c67815f..e1f825b 100644 +--- a/nocturne/cpp/CMakeLists.txt ++++ b/nocturne/cpp/CMakeLists.txt +@@ -62,8 +62,7 @@ include(FetchContent) + + FetchContent_Declare( + googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG main ++ SOURCE_DIR @gtest_src@ + ) + + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +diff --git a/setup.py b/setup.py +index 4863ae6..b5d3545 100644 +--- a/setup.py ++++ b/setup.py +@@ -92,6 +92,8 @@ def main(): + # with open("./requirements.txt", "r") as f: + # requires = f.read().splitlines() + setup( ++ # Adding `packages=` is necessary to get `python setup.py install` to work ++ packages=["nocturne", "cfgs"], + ext_modules=[CMakeExtension("nocturne", "./nocturne")], + cmdclass=dict(build_ext=CMakeBuild), + ) -- cgit 1.4.1 From 49beb12a126db48bdb90e60aff25c78b2ababe8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 07:11:14 +0000 Subject: fplll: 5.4.3 -> 5.4.4 --- pkgs/development/libraries/fplll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 8f1bc88d7fb93..8d1c19a48ac3d 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.4.3"; + version = "5.4.4"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "sha256-utME3hZ3p2tx7vmp5dlAJ6J9MFEhFm/qbscGu1t9jnc="; + sha256 = "sha256-+1EdNdmEk5tQDd1DXklPbEKC/Dr2yV2gwbtwBtZxpNM="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ef66cb613934fdefb9237630f1156e2dc2e6b5d4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 8 Jan 2023 09:01:59 +0100 Subject: gajim: 1.5.4 → 1.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pythonPackages.nbxmpp: 3.2.5 → 4.0.0 --- .../networking/instant-messengers/gajim/default.nix | 4 ++-- pkgs/development/python-modules/nbxmpp/default.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index e8ac07b50cfb5..67f294ea6a555 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-uIzOKiCbHiSVRlXcpE0B/+Ats3cfw4u7eA+KyPriwhk="; + hash = "sha256-gHRB3thDH+CKRXTgrD37e2zf0rVDIVl4Zhxf5lsLjyc="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 8367074ef6caf..1ce72428c10c9 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , gobject-introspection , idna -, libsoup +, libsoup_3 , precis-i18n , pygobject3 , pyopenssl @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "3.2.5"; + version = "4.0.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitLab { domain = "dev.gajim.org"; owner = "gajim"; repo = "python-nbxmpp"; rev = version; - sha256 = "sha256-HIPvZu8Zj69k1FCbkrlSeGtur5cT0TNIYfdXcRbYLwQ="; + hash = "sha256-6PYJGlNOZMwHMXwf05IWekJ+haMfg+ooH5On+aYOWSI="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gobject-introspection idna - libsoup + libsoup_3 pygobject3 pyopenssl ]; -- cgit 1.4.1 From 732260f001d09235bb9ce3e8fd5f43daa6cc3186 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 10:14:03 +0100 Subject: goaccess: 1.6.5 -> 1.7 Diff: https://github.com/allinurl/goaccess/compare/v1.6.5...v1.7 Changelog: https://github.com/allinurl/goaccess/raw/v1.7/ChangeLog --- pkgs/tools/misc/goaccess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index e8261182ca463..32e45bee9031b 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.6.5"; + version = "1.7"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZXWlFg0h0PvUqX5+kR/TAkH3GvL9pHRrKueBGqx5MCY="; + sha256 = "sha256-5lN+57HMxPfCop2sTSldhv1TBEIaowavXvniwqnesOQ="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 98acd5e6596f3488cf6c2665a7dff3bca2f3f7e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 10:20:06 +0100 Subject: driftnet: add changelog to meta --- pkgs/tools/networking/driftnet/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 1f489b7fbc71d..c5c6b857bbbe2 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -1,19 +1,18 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch +{ lib +, stdenv , autoreconfHook , cairo +, fetchFromGitHub , giflib , glib , gtk2-x11 , libjpeg , libpcap , libpng -, libwebsockets -, pkg-config , libuv +, libwebsockets , openssl +, pkg-config }: stdenv.mkDerivation rec { @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "deiv"; repo = "driftnet"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "0kd22aqb25kf54jjv3ml8wy8xm7lmbf0xz1wfp31m08cbzsbizib"; }; @@ -41,7 +40,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; buildInputs = [ cairo @@ -51,16 +53,17 @@ stdenv.mkDerivation rec { libjpeg libpcap libpng + libuv libwebsockets openssl - libuv ]; meta = with lib; { description = "Watches network traffic, and picks out and displays JPEG and GIF images for display"; homepage = "https://github.com/deiv/driftnet"; + changelog = "https://github.com/deiv/driftnet/releases/tag/v${version}"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ offline ]; platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2Plus; }; } -- cgit 1.4.1 From 4f21c44a98f81db7220abb4340926ca88da97555 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 10:24:22 +0100 Subject: driftnet: 1.3.0 -> 1.4.0 --- pkgs/tools/networking/driftnet/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index c5c6b857bbbe2..4f077a4bc95ee 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -11,33 +11,22 @@ , libpng , libuv , libwebsockets +, libwebp , openssl , pkg-config }: stdenv.mkDerivation rec { pname = "driftnet"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "deiv"; repo = "driftnet"; rev = "refs/tags/v${version}"; - sha256 = "0kd22aqb25kf54jjv3ml8wy8xm7lmbf0xz1wfp31m08cbzsbizib"; + hash = "sha256-szmezYnszlRanq8pMD0CIGA+zTYGSwSHcDaZ2Gx1KCA="; }; - # https://github.com/deiv/driftnet/pull/33 - # remove on version bump from 1.3.0 - patches = [ - (fetchpatch { - name = "fix-darwin-build"; - url = "https://github.com/deiv/driftnet/pull/33/commits/bef5f3509ab5710161e9e21ea960a997eada534f.patch"; - sha256 = "1b7p9fkgp7dxv965l7q7y632s80h3nnrkaqnak2h0hakwv0i4pvm"; - }) - # https://github.com/deiv/driftnet/issues/37 - ./libwebsockets-4.3.0.patch - ]; - enableParallelBuilding = true; nativeBuildInputs = [ @@ -55,6 +44,7 @@ stdenv.mkDerivation rec { libpng libuv libwebsockets + libwebp openssl ]; -- cgit 1.4.1 From 871f7abd0d0898e4146a51a457f374aed93793ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 10:33:16 +0100 Subject: siege: add changelog to meta --- pkgs/tools/networking/siege/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index b8b70d861e811..57a4c980803bc 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "HTTP load tester"; homepage = "https://www.joedog.org/siege-home/"; + changelog = "https://github.com/JoeDog/siege/blob/v${version}/ChangeLog"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; -- cgit 1.4.1 From fb22b42702ebab6c5d7d78a96f18c96339ddb10e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 10:34:23 +0100 Subject: siege: 4.1.5 -> 4.1.6 Changelog: https://github.com/JoeDog/siege/blob/v4.1.6/ChangeLog --- pkgs/tools/networking/siege/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 57a4c980803bc..6a1ce2f4a028a 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "siege"; - version = "4.1.5"; + version = "4.1.6"; src = fetchurl { url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; - hash = "sha256-B235/Nt/Y8Rtb2YazCzMhAWTeunK5JCrip14qdLnuMs="; + hash = "sha256-MJ1Ym/yBm28V0uXoWRs8DG9pNiT1Bg7qwGek2ad1fek="; }; NIX_LDFLAGS = lib.optionalString stdenv.isLinux [ -- cgit 1.4.1 From ef91c7bcd88b05d9c21916f7df9a4761dc370008 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 8 Jan 2023 09:56:01 +0000 Subject: newsboat: run parallel build for 'make' commands `newsboat` contains quite a bit of C++ code built by custom Makefile. `rust` code and tests already get build in parallel. The change enables build parallelism for custom Makefile as well. The effect on my machine is 78% build time reduction (4.5x speedup): Before the change: $ time nix build -f. newsboat --rebuild real 6m20,904s user 0m0,345s sys 0m0,167s After the change: $ time nix build -f. newsboat ... real 1m23,592s user 0m0,277s sys 0m0,097s --- pkgs/applications/networking/feedreaders/newsboat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 7e06a75959035..a93391bbbb1b8 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; postBuild = '' - make prefix="$out" + make -j $NIX_BUILD_CORES prefix="$out" ''; # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set @@ -44,11 +44,11 @@ rustPlatform.buildRustPackage rec { doCheck = true; preCheck = '' - make test + make -j $NIX_BUILD_CORES test ''; postInstall = '' - make prefix="$out" install + make -j $NIX_BUILD_CORES prefix="$out" install '' + lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" -- cgit 1.4.1 From 684dd9c5dc0627bafe6b12e413048df7ceff3de5 Mon Sep 17 00:00:00 2001 From: Naïm Favier Date: Sun, 8 Jan 2023 13:01:34 +0100 Subject: weechat: 3.7.1 -> 3.8 https://github.com/weechat/weechat/releases/tag/v3.8 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 0739b6f576452..478b28190ae69 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.8"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - hash = "sha256-ZtJi1NhE1agZWnAv6FCUeO1GDtuQnLTraA5nkwWiCqs="; + hash = "sha256-objxAUGvBhTkbQl4GshDP3RsCkAW4z917L9WyaVoYj4="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; -- cgit 1.4.1 From 3ab9ffedbd7a88ce97ab3a09194d4aaac0a64a48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 15:08:17 +0000 Subject: python310Packages.duckdb-engine: 0.6.6 -> 0.6.7 --- pkgs/development/python-modules/duckdb-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index ff995c7ac1e50..04c0c84315fa8 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.6.6"; + version = "0.6.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-OpVkMkZt5h4Rp615wx42cR/NFbv6dwsklqM8/xRswtw="; + hash = "sha256-ZbdrqR1apeZMnJb2hzvPyCKWl+0A9ROMZJXIshPVGW0="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 25fb14a70cf8f07e88fb1bae2adf24d655490781 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 16:20:15 +0000 Subject: nats-server: 2.9.10 -> 2.9.11 --- pkgs/servers/nats-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 08e77aaf15270..db2a6da7e5c61 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.10"; + version = "2.9.11"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-r/hz80XFEOQN7bzQQTIMAeZI8H09WyiUqQl3glJz+RM="; + hash = "sha256-iYiQYGwvxW7GF32h+E1vg3x6sml7zGk40jbY8akmOnM="; }; - vendorHash = "sha256-ASLy0rPuCSYGyy5Pw9fj559nxO4vPPagDKAe8wM29lo="; + vendorHash = "sha256-qApohNp//N/eBljpa+D2fR19rqw8Bd8wdmME9fzqDxc="; doCheck = false; -- cgit 1.4.1 From 29942b608f1d0d4cb2176d5f8d3c6b00407f27a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 17:58:53 +0100 Subject: traceroute: add changelog to meta --- pkgs/tools/networking/traceroute/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index eeb96936aeab3..637ca7ccd335e 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "traceroute"; @@ -9,17 +12,22 @@ stdenv.mkDerivation rec { sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"; }; - makeFlags = [ "prefix=$(out)" "LDFLAGS=-lm" "env=yes" ]; + makeFlags = [ + "prefix=$(out)" + "LDFLAGS=-lm" + "env=yes" + ]; preConfigure = '' sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules ''; meta = with lib; { - homepage = "http://traceroute.sourceforge.net/"; description = "Tracks the route taken by packets over an IP network"; - license = lib.licenses.gpl2; - maintainers = [ maintainers.koral ]; + homepage = "http://traceroute.sourceforge.net/"; + changelog = "https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-${version}/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ koral ]; platforms = platforms.linux; }; } -- cgit 1.4.1 From f5086c8c511840237eca278a75f1eb64233088fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 17:59:41 +0100 Subject: traceroute: 2.1.0 -> 2.1.1 Changelog: https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-2.1.1/ --- pkgs/tools/networking/traceroute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 637ca7ccd335e..46a52b11b9619 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "traceroute"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz"; - sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"; + sha256 = "sha256-j8jVBG6FXXWIYHuzGfW4LjuhPpHV1GNoYyYuY4a7r3Y="; }; makeFlags = [ -- cgit 1.4.1 From d458a6b57204715bd375f967f7b8cf0ef5361500 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 18:18:56 +0100 Subject: atftp: update meta --- pkgs/tools/networking/atftp/default.nix | 38 ++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index ca06afe7bdbf4..30da8a699450c 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }: +{ lib +, stdenv +, fetchurl +, gcc +, makeWrapper +, pcre +, ps +, readline +, tcp_wrappers +}: stdenv.mkDerivation rec { pname = "atftp"; @@ -14,19 +23,32 @@ stdenv.mkDerivation rec { patchShebangs . ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ readline tcp_wrappers pcre gcc ]; + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + gcc + pcre + readline + tcp_wrappers + ]; + + checkInputs = [ + ps + ]; # Expects pre-GCC5 inline semantics NIX_CFLAGS_COMPILE = "-std=gnu89"; doCheck = true; - checkInputs = [ ps ]; - meta = { + meta = with lib; { description = "Advanced tftp tools"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; - license = lib.licenses.gpl2Plus; + changelog = "https://sourceforge.net/p/atftp/code/ci/v${version}/tree/Changelog"; + homepage = "https://sourceforge.net/projects/atftp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; } -- cgit 1.4.1 From cdd030f65ff21973f5177ed4ed34f998c1ed55d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 18:27:25 +0100 Subject: atftp: 0.7.5 -> 0.8.0 Changelog: https://sourceforge.net/p/atftp/code/ci/v0.8.0/tree/Changelog --- pkgs/tools/networking/atftp/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 30da8a699450c..bab2ecbe619b6 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,9 +1,11 @@ { lib , stdenv +, autoreconfHook , fetchurl , gcc , makeWrapper -, pcre +, pcre2 +, perl , ps , readline , tcp_wrappers @@ -11,11 +13,11 @@ stdenv.mkDerivation rec { pname = "atftp"; - version = "0.7.5"; + version = "0.8.0"; src = fetchurl { url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; - sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k"; + hash = "sha256-3yqgicdnD56rQOVZjl0stqWC3FGCkm6lC01pDk438xY="; }; # fix test script @@ -24,17 +26,19 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ + autoreconfHook makeWrapper ]; buildInputs = [ gcc - pcre + pcre2 readline tcp_wrappers ]; checkInputs = [ + perl ps ]; -- cgit 1.4.1 From 4d609d714597c48f395b0073943f801c13a91901 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 19:01:48 +0100 Subject: trivy: 0.36.0 -> 0.36.1 Diff: https://github.com/aquasecurity/trivy/compare/v0.36.0...v0.36.1 Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.36.1 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 14e62fa0612ec..c162521870bac 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5yAfF/iRAbCJFXEcdhg7vqiMTpw7NNixFaQU93uSv6I="; + sha256 = "sha256-V6x7xILG2/mg95S3qv8pM6ZVXWmh1iHMvDVEfidHau4="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-9oG6xJ0D6SulN6ErC/F5Ycmly4wp+GCF8lftu+xoagE="; + vendorSha256 = "sha256-qTtx8+D288RT3wOdmvUXVeHx4GwIyCyCnO/sQW0blIU="; excludedPackages = "misc"; -- cgit 1.4.1 From 530426cc06cb58d7e817c8fa376b758e05a68cc4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 19:07:48 +0100 Subject: trufflehog: 3.21.0 -> 3.23.1 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.21.0...v3.23.1 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.23.1 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 76ccda498b47f..39cd2d2f6c6fb 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.21.0"; + version = "3.23.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-rse5uyQ7EUBhs0IyC92B/Z7YCeNIXTlZEqrlcjFekgA="; + hash = "sha256-dCjFMcLFOoAiOXRp0jhBTqYembLLsvDWMetGjRF083k="; }; vendorHash = "sha256-KyyJ7hUWF29L8oB9GkJ918/BQoLMsz+tStT2T9Azunk="; -- cgit 1.4.1 From 64d437bfbde78e882dc98c875e73d05c08b890cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 19:12:00 +0100 Subject: python310Packages.ropper: 1.13.7 -> 1.13.8 Diff: https://github.com/sashs/Ropper/compare/v1.13.7...v1.13.8 --- pkgs/development/python-modules/ropper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 681ecfaefe3b7..bf86e0e714536 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ropper"; - version = "1.13.7"; + version = "1.13.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sashs"; repo = "Ropper"; rev = "v${version}"; - hash = "sha256-3tWWIYqh/G/b7Z6BMua5bRvtSh4SibT6pv/NArhmqPE="; + hash = "sha256-agbqP5O9QEP5UKkaWI5HxAlMsCBPKNSLnAAo2WFDXS8="; }; propagatedBuildInputs = [ @@ -36,10 +36,10 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Show information about files in different file formats"; homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs ]; + broken = stdenv.isDarwin; }; } -- cgit 1.4.1 From 91f785d8683da0f290d7862172a9d9b5a807a871 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 8 Jan 2023 19:43:53 +0100 Subject: php81Extensions.opcache, php81Extensions.opcache: fix test --- pkgs/top-level/php-packages.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 8b4463bde3bca..70af04bd96af6 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -137,8 +137,7 @@ lib.makeScope pkgs.newScope (self: with self; { checkPhase = '' runHook preCheck - NO_INTERACTON=yes SKIP_PERF_SENSITIVE=yes make test - + NO_INTERACTION=yes SKIP_PERF_SENSITIVE=yes make test runHook postCheck ''; @@ -414,6 +413,14 @@ lib.makeScope pkgs.newScope (self: with self; { valgrind.dev ]; zendExtension = true; + patches = [ ] ++ lib.optionals (lib.versionAtLeast php.version "8.1") [ + (fetchpatch { + # See https://github.com/php/php-src/pull/10266 + name = "avoid-opcache-test-failures.patch"; + url = "https://github.com/PHP/php-src/commit/9216d14b3abfc727b0668592b48699440137aa74.patch"; + sha256 = "sha256-/U6LMn/QGM8BXlh+Etl1z97v3qZFiWL2G3ZopNYShGU="; + }) + ]; # Tests launch the builtin webserver. __darwinAllowLocalNetworking = true; } -- cgit 1.4.1 From 7d7d53185d842e1b6dd01689df8fa98c3b0c155e Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 8 Jan 2023 20:17:31 +0100 Subject: qownnotes: add darwin support --- pkgs/applications/office/qownnotes/default.nix | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index bb27f0d4ec906..7b1a7a5914079 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -3,9 +3,13 @@ , qtx11extras, qtwayland }: -mkDerivation rec { +let pname = "qownnotes"; + appname = "QOwnNotes"; version = "22.12.3"; +in +stdenv.mkDerivation { + inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; @@ -14,16 +18,32 @@ mkDerivation rec { sha256 = "sha256-fpI7RYOGmWwmau6tF8FPmY2/FtN9foWRX8/WgrNU6E8="; }; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ + qmake + qttools + wrapQtAppsHook + ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; buildInputs = [ qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + postInstall = + # Create a lowercase symlink for Linux + lib.optionalString stdenv.isLinux '' + ln -s $out/bin/${appname} $out/bin/${pname} + '' + # Wrap application for macOS as lowercase binary + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/${appname}.app $out/Applications + makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} + ''; + meta = with lib; { description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration"; homepage = "https://www.qownnotes.org/"; license = licenses.gpl2Only; maintainers = with maintainers; [ totoroot ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } -- cgit 1.4.1 From dd400dd3331227f19d47f7f55bcd7c3c23be8e8e Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 8 Jan 2023 20:18:26 +0100 Subject: qownnotes: refactor for cleaner diffs going forward --- pkgs/applications/office/qownnotes/default.nix | 27 +++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 7b1a7a5914079..a9344eb55ff82 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -1,6 +1,17 @@ -{ mkDerivation, lib, stdenv, fetchurl -, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets -, qtx11extras, qtwayland +{ lib +, stdenv +, fetchurl +, qmake +, qttools +, qtbase +, qtdeclarative +, qtsvg +, qtwayland +, qtwebsockets +, qtx11extras +, qtxmlpatterns +, makeWrapper +, wrapQtAppsHook }: let @@ -24,8 +35,14 @@ stdenv.mkDerivation { wrapQtAppsHook ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; - buildInputs = [ qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ] - ++ lib.optionals stdenv.isLinux [ qtwayland ]; + buildInputs = [ + qtbase + qtdeclarative + qtsvg + qtwebsockets + qtx11extras + qtxmlpatterns + ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; postInstall = # Create a lowercase symlink for Linux -- cgit 1.4.1 From d729fc4385c678c7a1bfc85f938472ec69f88f30 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 8 Jan 2023 20:19:12 +0100 Subject: qownnotes: add meta attributes --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index a9344eb55ff82..b730daf797f9c 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - # Fetch the checksum of current version with curl: - # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 sha256 = "sha256-fpI7RYOGmWwmau6tF8FPmY2/FtN9foWRX8/WgrNU6E8="; }; @@ -59,6 +57,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration"; homepage = "https://www.qownnotes.org/"; + changelog = "https://www.qownnotes.org/changelog.html"; + downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ totoroot ]; platforms = platforms.unix; -- cgit 1.4.1 From d86a6778a4fa998dcee7d0e4b40bec0dae151979 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 Jan 2023 21:20:45 +0200 Subject: vscode: fix makeWrapper/makeShellWrapper must be in nativeBuildInputs --- pkgs/applications/editors/vscode/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index c41fcb4f4e349..c4d975ad265aa 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper +, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland @@ -72,7 +72,8 @@ let ++ lib.optionals stdenv.isLinux [ autoPatchelfHook nodePackages.asar - (wrapGAppsHook.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) ]; dontBuild = true; -- cgit 1.4.1 From 6d934670db8a1c2a198f10da567fa0777bfe0c91 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 8 Jan 2023 20:21:07 +0100 Subject: qownnotes: 22.12.3 -> 23.1.0 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index b730daf797f9c..158c2389a3139 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -17,14 +17,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "22.12.3"; + version = "23.1.0"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-fpI7RYOGmWwmau6tF8FPmY2/FtN9foWRX8/WgrNU6E8="; + sha256 = "sha256-HMs8DTL2BDSDmchadpVvbShjJMPP6W587F38uiixCuQ="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 77031e53097b75bd6078c9549b219a0b275fac96 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 8 Jan 2023 20:49:35 +0100 Subject: php80Extensions.datadog_trace: 0.70.0 -> 0.82.0 Fixes the build with PHP 8.2 and 8.0 https://github.com/DataDog/dd-trace-php/releases/tag/0.82.0 https://github.com/DataDog/dd-trace-php/releases/tag/0.81.1 https://github.com/DataDog/dd-trace-php/releases/tag/0.81.0 https://github.com/DataDog/dd-trace-php/releases/tag/0.80.0 https://github.com/DataDog/dd-trace-php/releases/tag/0.79.0 https://github.com/DataDog/dd-trace-php/releases/tag/0.78.0 --- pkgs/development/php-packages/datadog_trace/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 4138be3f06511..8a9447525bba8 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -2,19 +2,18 @@ buildPecl rec { pname = "ddtrace"; - version = "0.70.0"; + version = "0.82.0"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-trace-php"; rev = version; - sha256 = "sha256-AYRBzE0Detg/IHXYutZUfPRMtfthxdkSjqD0M+VcTpY="; + sha256 = "sha256-QTqZRHh57mRkg0HT9qQS13emGobB0IRqM+mdImAPgtE="; }; buildInputs = [ curl pcre2 ]; meta = with lib; { - broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1. description = "Datadog Tracing PHP Client"; homepage = "https://github.com/DataDog/dd-trace-php"; license = licenses.apsl20; -- cgit 1.4.1 From 50cc0c341648c0a3bc677b0358a511c95dcc2363 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 20:34:19 +0000 Subject: python310Packages.minio: 7.1.12 -> 7.1.13 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 9a114514969a9..6d4c7ef652ad1 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.1.12"; + version = "7.1.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-9BjKoBQdkqkNK6StsiP0L3S5Dn8y53K5VghUIpIt46k="; + hash = "sha256-Kn/I5q079b4vqi+jL/pcVKMqGgs+PYgMoByX8ZzgZ5M="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 161669eefba0fa2566614b021f8f0426261d5ac3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 21:33:41 +0000 Subject: python310Packages.soco: 0.28.1 -> 0.29.0 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index ed25bdb37ed44..83b94cfa0d188 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.28.1"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - hash = "sha256-Po9ns+XQ8WuILKrinllm/lqZFWEBnylesCoqs+cnKs4="; + hash = "sha256-6xyJY+qgwMsOgnh+PTVCf4F442hnBwlFnW+bt/cWxGc="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From c9e397b013c92a37220999d7d25ad92aa41f243b Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 8 Jan 2023 16:33:52 -0500 Subject: pods: 1.0.1 -> 1.0.2 Diff: https://github.com/marhkb/pods/compare/v1.0.1...v1.0.2 --- pkgs/applications/virtualization/pods/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 4963949927b5f..18472f03d850c 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oa7A0RMF7kPQXydysGpzAICgGoIRLWUMRibXdiftYyk="; + sha256 = "sha256-Kjonyd0xL0QLjPS+U3xDC6AhOOxQmVAZ3STLXaa8eXc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-RMxk7e/z+YneNWI/xsZDmXr7DqB7qHEY8HPvTCeSLjg="; + sha256 = "sha256-K5oOpo3xJiNg7F549JLGs83658MYcoGfuIcNoF88Njc="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 9da4afe5ffb2e174745118903dd844f73bcacb5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 22:14:17 +0000 Subject: python310Packages.pyunifiprotect: 4.5.3 -> 4.6.0 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 9d5a28994986f..e4fbf8ff3f145 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.5.3"; + version = "4.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FZXnJorY7WNgDVajULZyFwJ13RBbClXK38CCyF7ASmI="; + hash = "sha256-D7XIq9uwb3SaVa6NW4jDFeK73zsf51EG+5EkqgGlxCo="; }; postPatch = '' -- cgit 1.4.1 From 96a361bbe575e0dfc2abc4a636d533274997f776 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 8 Jan 2023 17:18:02 -0500 Subject: mask: 0.11.2 -> 0.11.3 Diff: https://github.com/jacobdeichert/mask/compare/v0.11.2...v0.11.3 Changelog: https://github.com/jacobdeichert/mask/blob/v0.11.3/CHANGELOG.md --- pkgs/development/tools/mask/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix index 343d41be6f107..0856a83738815 100644 --- a/pkgs/development/tools/mask/default.nix +++ b/pkgs/development/tools/mask/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "jacobdeichert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mlARZ05xppPvr6Z5uoveYt3Y3LtdMkbFqxW1EkX+ud0="; + sha256 = "sha256-mPnykI3scTBzGjDa8nawWYRvZBkq74/t5WMbMbs3zVE="; }; - cargoSha256 = "sha256-EulRz/IjLLvNT9YxyNjJynFEGyQ/Q2Out984xS9Wp5o="; + cargoSha256 = "sha256-h58MA3F4UA4gp64UPnK6Tvlvr4PFvrVKmjp48lZjH68="; # tests require mask to be installed doCheck = false; @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A CLI task runner defined by a simple markdown file"; homepage = "https://github.com/jacobdeichert/mask"; + changelog = "https://github.com/jacobdeichert/mask/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; -- cgit 1.4.1 From e08a5396478de611233202adae1c07751fe32dee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 00:15:40 +0000 Subject: tut: 1.0.30 -> 1.0.34 --- pkgs/applications/misc/tut/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 97677407fc15f..b5e23f15b0ba2 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "1.0.30"; + version = "1.0.34"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-Cr9aDfreTDeFV5mws29pYRUkUjHVcLGEZyUvZYAp3B8="; + sha256 = "sha256-AnuPTv9W+2yDcM803DZaNIn4S7A78JEv6S8pA18whVA="; }; - vendorSha256 = "sha256-ECaePGmSaf0vuKbvgdUMOF8oCpc14srFFMmPJPFFqw4="; + vendorHash = "sha256-go7eZHhrQ1ZcLOn56a3Azn3eRyAesAkgLabPbwzKtds="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; -- cgit 1.4.1 From da25c00cdf2e9a7d40f1908c8b72d1c03f859d3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 00:32:44 +0000 Subject: karma: 0.108 -> 0.111 --- pkgs/servers/monitoring/karma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/servers/monitoring/karma/default.nix index 999f3176815fd..1b87942af4add 100644 --- a/pkgs/servers/monitoring/karma/default.nix +++ b/pkgs/servers/monitoring/karma/default.nix @@ -19,16 +19,16 @@ in buildGoModule rec { pname = "karma"; - version = "0.108"; + version = "0.111"; src = fetchFromGitHub { owner = "prymitive"; repo = "karma"; rev = "v${version}"; - hash = "sha256-Hw+6zBBbVw8uGkZQvmS3gB1opZdg8wQ5LydIAWhXUXY="; + hash = "sha256-jcJ8rdggM4kDCVTsEBDtZ9nNnutl+RwABx7zHY39tDs="; }; - vendorHash = "sha256-gW8q425ZgFL+uJ8UiSVEX7R890LR9jgxfbNIdhNJge4="; + vendorHash = "sha256-MYHgLKDSB/g/k4i+deBNeaeZ3BbHRnymwsNTTA7qNdU="; nativeBuildInputs = [ nodejs-18_x -- cgit 1.4.1 From c6d790d17eb5b0cf3b8953d1ecacfad162eb0dae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 00:55:24 +0000 Subject: roxctl: 3.72.2 -> 3.73.1 --- pkgs/applications/networking/cluster/roxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index e2426fc7d56d8..877dddfa1e2b2 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "3.72.2"; + version = "3.73.1"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-qw45Ifp8JcJyKaKL1St0HAQGS7JiUestiPGyZcV3gx8="; + sha256 = "sha256-A/jEw29c2WbBlPZZACjI3NjM7a0JxCEob8GOoGx13Hs="; }; - vendorSha256 = "sha256-FmpnRgU3w2zthgUJuAG5AqLl2UxMb0yywN5Sk9WoWBI="; + vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k="; nativeBuildInputs = [ installShellFiles ]; -- cgit 1.4.1 From 06ca784b25937242822aeacb3451d842f5f1c0fc Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sat, 31 Dec 2022 11:07:23 -0500 Subject: vtk: Generate egg-info VTK's cmake build system fails to generate an `.egg-info` file, which various libraries in the Python package system (e.g. `pkg_resources`) would use to identify the package. Work around this by generating an `egg-info` file ourselves. This will allow us to drop a workaround in `mayavi`. --- pkgs/development/libraries/vtk/generic.nix | 13 ++++++++++--- pkgs/development/libraries/vtk/vtk.egg-info | 4 ++++ pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/vtk/vtk.egg-info (limited to 'pkgs') diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 1994e4ace1146..327e848d89ee5 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -2,7 +2,7 @@ { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch , enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv -, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given." +, enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc @@ -11,7 +11,7 @@ let inherit (lib) optionalString optionals optional; - pythonMajor = lib.substring 0 1 pythonInterpreter.pythonVersion; + pythonMajor = lib.substring 0 1 python.pythonVersion; in stdenv.mkDerivation rec { pname = "vtk${optionalString enableQt "-qvtk"}"; @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { OpenGL GLUT ] ++ optionals enablePython [ - pythonInterpreter + python ]; propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ] ++ optionals stdenv.isLinux [ libX11 libGL ]; @@ -89,6 +89,13 @@ in stdenv.mkDerivation rec { sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; + postInstall = optionalString enablePython '' + substitute \ + ${./vtk.egg-info} \ + $out/lib/python${python.pythonVersion}/site-packages/vtk-${version}.egg-info \ + --subst-var-by VTK_VER "${version}" + ''; + meta = with lib; { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = "https://www.vtk.org/"; diff --git a/pkgs/development/libraries/vtk/vtk.egg-info b/pkgs/development/libraries/vtk/vtk.egg-info new file mode 100644 index 0000000000000..a244450ad7670 --- /dev/null +++ b/pkgs/development/libraries/vtk/vtk.egg-info @@ -0,0 +1,4 @@ +Metadata-Version: 2.1 +Version: @VTK_VER@ +Summary: VTK is an open-source toolkit for 3D computer graphics, image processing, and visualization +Platform: UNKNOWN diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ebe6312d91ba..653f8d841185f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11905,7 +11905,7 @@ self: super: with self; { vt-py = callPackage ../development/python-modules/vt-py { }; vtk = toPythonModule (pkgs.vtk_9.override { - pythonInterpreter = python; + inherit python; enablePython = true; }); -- cgit 1.4.1 From 57556157c98736e44d1222ee67cfe4cd454de65d Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sat, 31 Dec 2022 11:09:46 -0500 Subject: mayavi: Drop workaround of vtk's lacking egg-info file nixpkgs now generates an egg-info file for vtk. --- pkgs/development/python-modules/mayavi/default.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 736fc1d879520..b0ddfeeefcf35 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -27,10 +27,6 @@ buildPythonPackage rec { }; postPatch = '' - # Discovery of 'vtk' in setuptools is not working properly, due to a missing - # .egg-info in the vtk package. It does however import and run just fine. - substituteInPlace mayavi/__init__.py --replace "'vtk'" "" - # building the docs fails with the usual Qt xcb error, so skip: substituteInPlace setup.py \ --replace "build.build.run(self)" "build.build.run(self); return" -- cgit 1.4.1 From 9696ca8fd9973a243f2a379ba8da82b4b706b4f0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:08:12 +0100 Subject: isso: unbreak on aarch64-darwin --- pkgs/servers/isso/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index a64bbd76807c0..46942669ac674 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -63,7 +63,5 @@ with python3Packages; buildPythonApplication rec { homepage = "https://posativ.org/isso/"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } -- cgit 1.4.1 From 9245a1823677392444c52b8f9cdd83790342d692 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Mon, 9 Jan 2023 01:10:27 +0000 Subject: youki: init at 0.0.4 --- pkgs/applications/virtualization/youki/default.nix | 48 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/virtualization/youki/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/applications/virtualization/youki/default.nix new file mode 100644 index 0000000000000..54a88a334f8a3 --- /dev/null +++ b/pkgs/applications/virtualization/youki/default.nix @@ -0,0 +1,48 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, installShellFiles +, dbus +, libseccomp +, systemd +}: + +rustPlatform.buildRustPackage rec { + pname = "youki"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XwapCfu6Me0xSe+qFz9BFRYpQvG+ztb6QyhGejYRPb4="; + }; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + + buildInputs = [ dbus libseccomp systemd ]; + + postInstall = '' + installShellCompletion --cmd youki \ + --bash <($out/bin/youki completion -s bash) \ + --fish <($out/bin/youki completion -s fish) \ + --zsh <($out/bin/youki completion -s zsh) + ''; + + cargoBuildFlags = [ "-p" "youki" ]; + cargoTestFlags = [ "-p" "youki" ]; + + cargoSha256 = "sha256-PT1kVo4gQFH9sIprEoAioNvDL/soMHcA2utEiQJPS/0="; + + doCheck = false; # test failed + + meta = with lib; { + description = "A container runtime written in Rust"; + homepage = "https://containers.github.io/youki/"; + changelog = "https://github.com/containers/youki/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d28276997546..ad48ef9fb66c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33718,6 +33718,8 @@ with pkgs; youtube-music = callPackage ../applications/audio/youtube-music { }; + youki = callPackage ../applications/virtualization/youki { }; + yt-dlp = with python3Packages; toPythonApplication yt-dlp; yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light; -- cgit 1.4.1 From 6601a42cf34cf318079c708f497261a080ed340b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 01:25:44 +0000 Subject: byacc: 20221106 -> 20221229 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index d3a3cd702319e..fe30f1b3b190a 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "byacc"; - version = "20221106"; + version = "20221229"; src = fetchurl { urls = let @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" ]; - hash = "sha256-qJm+Inu8rJz3cA99u1qElGiPH58GF7UQdi2urOR7nRI="; + hash = "sha256-ExbG95D6+maIQn8f+RJnth2LeHO0Q8Yg7vaabv8FA7w="; }; configureFlags = [ -- cgit 1.4.1 From 2e60a42033aad56148cc9ee3d9aac75763267330 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Jan 2023 02:33:33 +0100 Subject: evcc: 0.109.2 -> 0.110.1 https://github.com/evcc-io/evcc/releases/tag/0.110.0 https://github.com/evcc-io/evcc/releases/tag/0.110.1 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 956fc1cbca72a..715ab8dd349c8 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.109.2"; + version = "0.110.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-/Mklf+F9OHq56Qj/kn8JpRAgWwCZqwsH9EwrBFdi/mQ="; + hash = "sha256-SIBVvVl1O+vqQug6LTzKEzFAay82ot4e+rXd17Djvqc="; }; - vendorHash = "sha256-H3ACmang+DPOCnccHLG6YzKvi7Rf5k8RkJDD1CgGBrw="; + vendorHash = "sha256-YP6/3+jVbavBE6ZSopryC1SgQc5kzE+gWpNbwptBMG8="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-oxoENlZNThW1PrwcGwiNP5Q7BZyhhtuCwXFey0t3Kz8="; + hash = "sha256-hc3IkWiafKBGtGPEPWWbj4XQsGh+PrGGnBV2bzEAn0s="; }; nativeBuildInputs = [ -- cgit 1.4.1 From f3a396db6d481ef718bb118228cee50e1393a4f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 01:55:43 +0000 Subject: retry: 1.0.4 -> 1.0.5 --- pkgs/tools/system/retry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/tools/system/retry/default.nix index 2dcd1aa376607..34d4bbb139604 100644 --- a/pkgs/tools/system/retry/default.nix +++ b/pkgs/tools/system/retry/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "retry"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "minfrin"; repo = "retry"; rev = "${pname}-${version}"; - hash = "sha256-C6PYt5NjDT4w1yuWnw1+Z/L3j1S5zwTGsI44yrMnPUs="; + hash = "sha256-5H2MnnThi4rT/o3oTkGDKXStQwob4G9mMsZewItPub4="; }; nativeBuildInputs = [ autoreconfHook txt2man which ]; -- cgit 1.4.1 From 60445aa40e5b4c46792f6d1fe4355f09a105b735 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:56:02 +0100 Subject: libsForQt5.qca-qt5: unbreak on darwin --- pkgs/development/libraries/qca-qt5/default.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index b85a3ad8c7a71..d10ebbdd4b772 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -26,8 +26,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; platforms = with platforms; unix; - # until macOS SDK supports Qt 5.15, 2.3.2 is the highest version of qca-qt5 - # that works on darwin - broken = stdenv.isDarwin; }; } -- cgit 1.4.1 From d2b675a9cbf3c9d5021d31cf8d7918017a29dd53 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Mon, 9 Jan 2023 01:45:41 +0000 Subject: oh-my-posh: 12.26.2 -> 12.35.2 While validating this fix, it was noticed that the oh-my-posh binary became src. This had to be manually corrected. Closes #209783 --- pkgs/development/tools/oh-my-posh/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 3094937a7e364..45abd9cd83b4d 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.26.2"; + version = "12.35.2"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WznHvGNpb2iGz+jZFtphkxsGeT0Y25CO5MMjmAl7GV0="; + hash = "sha256-6w8m7AuSEFhoYhjAJMXmwpsYuIMCvTiFKasUnBgYYCM="; }; - vendorHash = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; + vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; sourceRoot = "source/src"; @@ -36,6 +36,7 @@ buildGoModule rec { ]; postInstall = '' + mv $out/bin/{src,oh-my-posh} mkdir -p $out/share/oh-my-posh cp -r ${src}/themes $out/share/oh-my-posh/ installShellCompletion --cmd oh-my-posh \ -- cgit 1.4.1 From 8dbd527896d02f22231fe907f7d80676fc5e4a28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 02:21:47 +0000 Subject: python310Packages.doorbirdpy: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/doorbirdpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index 1290aaf057570..9bc475ff4e70b 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "doorbirdpy"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { pname = "DoorBirdPy"; inherit version; - sha256 = "ed0e94953cdf96111c7f73c5fcf358f65dc0ff5e47f63fc057bf18ca7512e606"; + sha256 = "sha256-ZGIIko5Ac0Q4Jhz+z7FREJ4MhPF9ADDWgQFRtcZ+dWY="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From a227a506eceb9a80ebfff434efce5d2a519bdab6 Mon Sep 17 00:00:00 2001 From: Woze Parrot Date: Sun, 8 Jan 2023 21:36:42 -0500 Subject: seaweedfs: 3.38 -> 3.39 --- pkgs/applications/networking/seaweedfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 3757d57df8160..28c6580d8911c 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.38"; + version = "3.39"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-LYMGkv1rgUtA/TwulBhgw0w+8kbICtEgr7/K6exalxM="; + hash = "sha256-mbeTdrKptPaMw1OA3jFftjJPOmUnJcjbv81yDSlFeaU="; }; vendorHash = "sha256-mwfs/tdq1Qq2auEwz24emf7pjpIJAncI78oxhAn2WkI="; -- cgit 1.4.1 From 88633b14ed1ba87eba77619548f458719d5b9baf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 02:54:24 +0000 Subject: python310Packages.notify-py: 0.3.38 -> 0.3.39 --- pkgs/development/python-modules/notify-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 9184199c0acb2..0ca2568673f5e 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "notify-py"; - version = "0.3.38"; + version = "0.3.39"; disabled = pythonOlder "3.6"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ms7m"; repo = pname; - rev = "v${version}"; - hash = "sha256-wlA7a10f4PYP3dYYwZqMULQ5FMCXpOUOTxXzEEVZCsI="; + rev = "refs/tags/v${version}"; + hash = "sha256-QIK5MCCOsD8SStoh7TRw+l9k28SjChwV2J/T7gMKnAs="; }; patches = lib.optionals stdenv.isLinux [ -- cgit 1.4.1 From ecab3edeb79a5257974d24acd04e5c9b3c245e6c Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 Jan 2023 23:18:53 +0200 Subject: top-level: move top-level {build,host,target}Platform to aliases deprecation was attempted in e51f736076548459f36a1250de4bf6867f880b66 but had to be reverted in 2a6e4ae49a891adc7c0562fda08b17d60beb1b4f --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/stage.nix | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6e7595ea65674..4d7a9e3a0d85a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1764,6 +1764,7 @@ mapAliases ({ zyn-fusion = zynaddsubfx; # Added 2022-08-05 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 + inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 3669b622e7156..e5412c409ed57 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -138,14 +138,6 @@ let inherit stdenv; }; - # The old identifiers for cross-compiling. These should eventually be removed, - # and the packages that rely on them refactored accordingly. - platformCompat = self: super: let - inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; - in { - inherit buildPlatform hostPlatform targetPlatform; - }; - splice = self: super: import ./splice.nix lib self (adjacentPackages != null); allPackages = self: super: @@ -282,7 +274,6 @@ let # previous bootstrapping phases which have already been overlayed. toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([ stdenvBootstappingAndPlatforms - platformCompat stdenvAdapters trivialBuilders splice -- cgit 1.4.1 From d129e434bae2d5734bc2559e66abfe4577e6199b Mon Sep 17 00:00:00 2001 From: Fabián Heredia Montiel Date: Fri, 23 Dec 2022 10:57:29 -0600 Subject: acpica-tools: 20220331 → 20221020 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/system/acpica-tools/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index bf42608411a83..88f39e8a63e45 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -7,11 +7,13 @@ stdenv.mkDerivation rec { pname = "acpica-tools"; - version = "20220331"; + version = "20221020"; src = fetchurl { - url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - hash = "sha256-rK/2ixTx4IBOu/xLlyaKTMvvz6BTsC7Zkk8rFNipjiE="; + # 20221020 has a weird filename published: https://acpica.org/node/201 + name = "acpica-unix-${version}.tar.gz"; + url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar_0.gz"; + hash = "sha256-M6LjlKygylfUAYr+PaNA361etFsbkwDoHdWV/aB88cU="; }; nativeBuildInputs = [ bison flex ]; -- cgit 1.4.1 From cd3bb943a06f66a0630d0cf3ed793af3f726f9db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 03:55:21 +0000 Subject: werf: 1.2.193 -> 1.2.195 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index b1a7727207750..271d82f4d86cf 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.193"; + version = "1.2.195"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-4q+LtPwJa3gioOY90gUfCL4F/8jmtfkBKxBShg2xQas="; + hash = "sha256-rNhCZO4Axeuc5jEAndjma7/jnst1kDNdtb/h/jD2rtE="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; -- cgit 1.4.1 From 3ecc2377e39528c6c31304b3e76082c50459828e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 04:46:24 +0000 Subject: python310Packages.pyswitchbot: 0.36.2 -> 0.36.3 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 485dec0413fd9..49c90630da075 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.36.2"; + version = "0.36.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-I+OnxSQ/984aoloe/1673JDaVzG6yKOSrDvGuupAnkc="; + hash = "sha256-X4Ym+UmAY/O6UB26CVrqLPD03WP/3uzOJdKW/aUCwrc="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From dbfe3bd2e70ba58935497cf32142981a6c82561e Mon Sep 17 00:00:00 2001 From: s1341 Date: Thu, 29 Dec 2022 08:05:41 +0200 Subject: kasmweb: init at 1.12.0 --- nixos/modules/module-list.nix | 1 + .../modules/services/web-apps/kasmweb/default.nix | 275 +++++++++++++++++++++ .../web-apps/kasmweb/initialize_kasmweb.sh | 114 +++++++++ pkgs/servers/web-apps/kasmweb/default.nix | 36 +++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 428 insertions(+) create mode 100644 nixos/modules/services/web-apps/kasmweb/default.nix create mode 100644 nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh create mode 100644 pkgs/servers/web-apps/kasmweb/default.nix (limited to 'pkgs') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7903cd23a750e..061d0ff1da4bf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1135,6 +1135,7 @@ ./services/web-apps/isso.nix ./services/web-apps/jirafeau.nix ./services/web-apps/jitsi-meet.nix + ./services/web-apps/kasmweb/default.nix ./services/web-apps/keycloak.nix ./services/web-apps/komga.nix ./services/web-apps/lemmy.nix diff --git a/nixos/modules/services/web-apps/kasmweb/default.nix b/nixos/modules/services/web-apps/kasmweb/default.nix new file mode 100644 index 0000000000000..0d78025ecf0f3 --- /dev/null +++ b/nixos/modules/services/web-apps/kasmweb/default.nix @@ -0,0 +1,275 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.kasmweb; +in +{ + options.services.kasmweb = { + enable = lib.mkEnableOption (lib.mdDoc "kasmweb"); + + networkSubnet = lib.mkOption { + default = "172.20.0.0/16"; + type = lib.types.str; + description = lib.mdDoc '' + The network subnet to use for the containers. + ''; + }; + + postgres = { + user = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + Username to use for the postgres database. + ''; + }; + password = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + password to use for the postgres database. + ''; + }; + }; + + redisPassword = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + password to use for the redis cache. + ''; + }; + + defaultAdminPassword = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default admin password to use. + ''; + }; + + defaultUserPassword = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default user password to use. + ''; + }; + + defaultManagerToken = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default manager token to use. + ''; + }; + + defaultGuacToken = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default guac token to use. + ''; + }; + + defaultRegistrationToken = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default registration token to use. + ''; + }; + + datastorePath = lib.mkOption { + type = lib.types.str; + default = "/var/lib/kasmweb"; + description = lib.mdDoc '' + The directory used to store all data for kasmweb. + ''; + }; + + listenAddress = lib.mkOption { + type = lib.types.str; + default = "0.0.0.0"; + description = lib.mdDoc '' + The address on which kasmweb should listen. + ''; + }; + + listenPort = lib.mkOption { + type = lib.types.int; + default = 443; + description = lib.mdDoc '' + The port on which kasmweb should listen. + ''; + }; + + sslCertificate = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = lib.mdDoc '' + The SSL certificate to be used for kasmweb. + ''; + }; + + sslCertificateKey = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = lib.mdDoc '' + The SSL certificate's key to be used for kasmweb. Make sure to specify + this as a string and not a literal path, so that it is not accidentally + included in your nixstore. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + + systemd.services = { + "init-kasmweb" = { + wantedBy = [ + "docker-kasm_db.service" + ]; + before = [ + "docker-kasm_db.service" + "docker-kasm_redis.service" + "docker-kasm_db_init.service" + "docker-kasm_api.service" + "docker-kasm_agent.service" + "docker-kasm_manager.service" + "docker-kasm_share.service" + "docker-kasm_guac.service" + "docker-kasm_proxy.service" + ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = pkgs.substituteAll { + src = ./initialize_kasmweb.sh; + isExecutable = true; + binPath = lib.makeBinPath [ pkgs.docker pkgs.openssl pkgs.gnused ]; + runtimeShell = pkgs.runtimeShell; + kasmweb = pkgs.kasmweb; + postgresUser = cfg.postgres.user; + postgresPassword = cfg.postgres.password; + inherit (cfg) + datastorePath + sslCertificate + sslCertificateKey + redisPassword + defaultUserPassword + defaultAdminPassword + defaultManagerToken + defaultRegistrationToken + defaultGuacToken; + }; + }; + }; + }; + + virtualisation = { + oci-containers.containers = { + kasm_db = { + image = "postgres:12-alpine"; + environment = { + POSTGRES_PASSWORD = cfg.postgres.password; + POSTGRES_USER = cfg.postgres.user; + POSTGRES_DB = "kasm"; + }; + volumes = [ + "${cfg.datastorePath}/conf/database/data.sql:/docker-entrypoint-initdb.d/data.sql" + "${cfg.datastorePath}/conf/database/:/tmp/" + "kasmweb_db:/var/lib/postgresql/data" + ]; + extraOptions = [ "--network=kasm_default_network" ]; + }; + kasm_db_init = { + image = "kasmweb/api:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + "kasmweb_api_data:/tmp" + ]; + dependsOn = [ "kasm_db" ]; + entrypoint = "/bin/bash"; + cmd = [ "/opt/kasm/current/init_seeds.sh" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" ]; + }; + kasm_redis = { + image = "redis:5-alpine"; + entrypoint = "/bin/sh"; + cmd = [ + "-c" + "redis-server --requirepass ${cfg.redisPassword}" + ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" ]; + }; + kasm_api = { + image = "kasmweb/api:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + "kasmweb_api_data:/tmp" + ]; + dependsOn = [ "kasm_db_init" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" ]; + }; + kasm_manager = { + image = "kasmweb/manager:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + ]; + dependsOn = [ "kasm_db" "kasm_api" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only"]; + }; + kasm_agent = { + image = "kasmweb/agent:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + "/var/run/docker.sock:/var/run/docker.sock" + "${pkgs.docker}/bin/docker:/usr/bin/docker" + "${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d" + ]; + dependsOn = [ "kasm_manager" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; + }; + kasm_share = { + image = "kasmweb/share:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + ]; + dependsOn = [ "kasm_db" "kasm_redis" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; + }; + kasm_guac = { + image = "kasmweb/kasm-guac:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + ]; + dependsOn = [ "kasm_db" "kasm_redis" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; + }; + kasm_proxy = { + image = "kasmweb/nginx:latest"; + ports = [ "${cfg.listenAddress}:${toString cfg.listenPort}:443" ]; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d:ro" + "${cfg.datastorePath}/certs/kasm_nginx.key:/etc/ssl/private/kasm_nginx.key" + "${cfg.datastorePath}/certs/kasm_nginx.crt:/etc/ssl/certs/kasm_nginx.crt" + "${cfg.datastorePath}/www:/srv/www:ro" + "${cfg.datastorePath}/log/nginx:/var/log/external/nginx" + "${cfg.datastorePath}/log/logrotate:/var/log/external/logrotate" + ]; + dependsOn = [ "kasm_manager" "kasm_api" "kasm_agent" "kasm_share" + "kasm_guac" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" + "--network-alias=proxy"]; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh new file mode 100644 index 0000000000000..dbf043b986931 --- /dev/null +++ b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh @@ -0,0 +1,114 @@ +#! @runtimeShell@ +export PATH=@binPath@:$PATH + +mkdir -p @datastorePath@/log +chmod -R a+rw @datastorePath@ + +ln -sf @kasmweb@/bin @datastorePath@ +rm -r @datastorePath@/conf +cp -r @kasmweb@/conf @datastorePath@ +mkdir -p @datastorePath@/conf/nginx/containers.d +chmod -R a+rw @datastorePath@/conf +ln -sf @kasmweb@/www @datastorePath@ + + +docker network inspect kasm_default_network >/dev/null || docker network create kasm_default_network --subnet @networkSubnet@ +if docker volume inspect kasmweb_db >/dev/null; then + source @datastorePath@/ids.env + echo 'echo "skipping database init"' > @datastorePath@/init_seeds.sh + echo 'while true; do sleep 10 ; done' >> @datastorePath@/init_seeds.sh +else + API_SERVER_ID=$(cat /proc/sys/kernel/random/uuid) + MANAGER_ID=$(cat /proc/sys/kernel/random/uuid) + SHARE_ID=$(cat /proc/sys/kernel/random/uuid) + SERVER_ID=$(cat /proc/sys/kernel/random/uuid) + echo "export API_SERVER_ID=$API_SERVER_ID" > @datastorePath@/ids.env + echo "export MANAGER_ID=$MANAGER_ID" >> @datastorePath@/ids.env + echo "export SHARE_ID=$SHARE_ID" >> @datastorePath@/ids.env + echo "export SERVER_ID=$SERVER_ID" >> @datastorePath@/ids.env + + mkdir -p @datastorePath@/certs + openssl req -x509 -nodes -days 1825 -newkey rsa:2048 -keyout @datastorePath@/certs/kasm_nginx.key -out @datastorePath@/certs/kasm_nginx.crt -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=$(hostname)/emailAddress=none@none.none" 2> /dev/null + + docker volume create kasmweb_db + rm @datastorePath@/.done_initing_data + cat >@datastorePath@/init_seeds.sh <&1 | grep -v UserWarning + /usr/bin/kasm_server.so --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_agents.yaml \ + 2>&1 | grep -v UserWarning + /usr/bin/kasm_server.so --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_connection_proxies.yaml \ + 2>&1 | grep -v UserWarning + /usr/bin/kasm_server.so --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_images_amd64.yaml \ + 2>&1 | grep -v UserWarning + touch /opt/kasm/current/.done_initing_data + while true; do sleep 10 ; done +else + echo "skipping database init" + while true; do sleep 10 ; done +fi +EOF +fi + +chmod +x @datastorePath@/init_seeds.sh +chmod a+w @datastorePath@/init_seeds.sh + +if [ -e @sslCertificate@ ]; then + cp @sslCertificate@ @datastorePath@/certs/kasm_nginx.crt + cp @sslCertificateKey@ @datastorePath@/certs/kasm_nginx.key +fi + +sed -i -e "s/username.*/username: @postgresUser@/g" \ + -e "s/password.*/password: @postgresPassword@/g" \ + -e "s/host.*db/host: kasm_db/g" \ + -e "s/ssl: true/ssl: false/g" \ + -e "s/redisPassword.*/redisPassword: @redisPassword@/g" \ + -e "s/server_hostname.*/server_hostname: kasm_api/g" \ + -e "s/server_id.*/server_id: $API_SERVER_ID/g" \ + -e "s/manager_id.*/manager_id: $MANAGER_ID/g" \ + -e "s/share_id.*/share_id: $SHARE_ID/g" \ + @datastorePath@/conf/app/api.app.config.yaml + +sed -i -e "s/ token:.*/ token: \"@defaultManagerToken@\"/g" \ + -e "s/hostnames: \['proxy.*/hostnames: \['kasm_proxy'\]/g" \ + -e "s/server_id.*/server_id: $SERVER_ID/g" \ + @datastorePath@/conf/app/agent.app.config.yaml + + +sed -i -e "s/password: admin.*/password: \"@defaultAdminPassword@\"/g" \ + -e "s/password: user.*/password: \"@defaultUserPassword@\"/g" \ + -e "s/default-manager-token/@defaultManagerToken@/g" \ + -e "s/default-registration-token/@defaultRegistrationToken@/g" \ + -e "s/upstream_auth_address:.*/upstream_auth_address: 'proxy'/g" \ + @datastorePath@/conf/database/seed_data/default_properties.yaml + +sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \ + -e "s/APIHOSTNAME/proxy/g" \ + @datastorePath@/conf/app/kasmguac.app.config.yaml + +sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \ + -e "s/APIHOSTNAME/proxy/g" \ + @datastorePath@/conf/database/seed_data/default_connection_proxies.yaml + +sed -i "s/00000000-0000-0000-0000-000000000000/$SERVER_ID/g" \ + @datastorePath@/conf/database/seed_data/default_agents.yaml + diff --git a/pkgs/servers/web-apps/kasmweb/default.nix b/pkgs/servers/web-apps/kasmweb/default.nix new file mode 100644 index 0000000000000..f83db6baddc54 --- /dev/null +++ b/pkgs/servers/web-apps/kasmweb/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchzip +}: + +stdenv.mkDerivation rec { + pname = "kasmweb"; + version = "1.12.0"; + build = "d4fd8a"; + + src = fetchzip { + url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_${version}.${build}.tar.gz"; + sha256 = "sha256-dCjWmI8gYtoMiMHVNgTg2ZROHXvT4ulynNvnKfMxURo="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir $out + rm bin/utils/yq* + cp -r bin conf www $out/ + + runHook postInstall + ''; + + + meta = with lib; { + homepage = "https://www.kasmweb.com/"; + description = "Streaming containerized apps and desktops to end-users"; + license = licenses.unfree; + maintainers = with maintainers; [ s1341 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fd949664b11c..360a2bbfa60e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35575,6 +35575,8 @@ with pkgs; autoconf = buildPackages.autoconf269; }; + kasmweb = callPackage ../servers/web-apps/kasmweb { }; + kssd = callPackage ../applications/science/biology/kssd { }; last = callPackage ../applications/science/biology/last { }; -- cgit 1.4.1 From 164e802e026dc3630fa8daab499604610da023e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 05:20:57 +0000 Subject: ananicy-cpp: 1.0.1 -> 1.0.2 --- pkgs/misc/ananicy-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/ananicy-cpp/default.nix b/pkgs/misc/ananicy-cpp/default.nix index 30e3341294f7c..96284ba03ae63 100644 --- a/pkgs/misc/ananicy-cpp/default.nix +++ b/pkgs/misc/ananicy-cpp/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "ananicy-cpp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitLab { owner = "ananicy-cpp"; repo = "ananicy-cpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-07LWIC2y6b1iiPCVa8mlBYAnSmahm0oJ2d3/uW4rC94="; + sha256 = "sha256-iR7yIIGJbRwu62GIEYi70PjtlKXmkPYqSJtMddspBKA="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 6414a51b275104de8da77942359f47ce5a80f5f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 08:31:23 +0100 Subject: python310Packages.doorbirdpy: disable on unsupported Python releases --- pkgs/development/python-modules/doorbirdpy/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index 9bc475ff4e70b..34157b6393451 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , requests +, pythonOlder }: buildPythonPackage rec { pname = "doorbirdpy"; version = "2.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "DoorBirdPy"; inherit version; - sha256 = "sha256-ZGIIko5Ac0Q4Jhz+z7FREJ4MhPF9ADDWgQFRtcZ+dWY="; + hash = "sha256-ZGIIko5Ac0Q4Jhz+z7FREJ4MhPF9ADDWgQFRtcZ+dWY="; }; propagatedBuildInputs = [ @@ -21,7 +25,9 @@ buildPythonPackage rec { # no tests on PyPI, no tags on GitLab doCheck = false; - pythonImportsCheck = [ "doorbirdpy" ]; + pythonImportsCheck = [ + "doorbirdpy" + ]; meta = with lib; { description = "Python wrapper for the DoorBird LAN API"; -- cgit 1.4.1 From c25ead4522cc3d4d4985027b9db209f579fe6152 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 08:32:39 +0100 Subject: python310Packages.soco: add changelog to meta --- pkgs/development/python-modules/soco/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 83b94cfa0d188..85b8d1ea2e359 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-6xyJY+qgwMsOgnh+PTVCf4F442hnBwlFnW+bt/cWxGc="; }; @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "CLI and library to control Sonos speakers"; homepage = "http://python-soco.com/"; + changelog = "https://github.com/SoCo/SoCo/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; -- cgit 1.4.1 From 247090ac0d70f6739d51bda4aca25a59818ac939 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 07:34:42 +0000 Subject: python310Packages.uritools: 4.0.0 -> 4.0.1 --- pkgs/development/python-modules/uritools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 3d1b274d06900..53dd389b5f8f9 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "uritools"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "420d94c1ff4bf90c678fca9c17b8314243bbcaa992c400a95e327f7f622e1edf"; + sha256 = "sha256-78XDpt4FQEhQaFqNPzTahHa1aqNRb7+O/1yHBMeigm8="; }; pythonImportsCheck = [ -- cgit 1.4.1 From 54611edcc3a02846130551a86897ac5356728139 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 08:34:59 +0100 Subject: python310Packages.notify-py: add changelog to meta --- pkgs/development/python-modules/notify-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 0ca2568673f5e..971a8cd5cc9ec 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -19,11 +19,10 @@ buildPythonPackage rec { pname = "notify-py"; version = "0.3.39"; + format = "pyproject"; disabled = pythonOlder "3.6"; - format = "pyproject"; - src = fetchFromGitHub { owner = "ms7m"; repo = pname; @@ -89,6 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cross-platform desktop notification library for Python"; homepage = "https://github.com/ms7m/notify-py"; + changelog = "https://github.com/ms7m/notify-py/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ austinbutler dotlambda ]; }; -- cgit 1.4.1 From 27ee79c38b502bd97da7e30f3ab99a4bdc8306ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 08:36:40 +0100 Subject: python310Packages.minio: add changelog to meta --- pkgs/development/python-modules/minio/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 6d4c7ef652ad1..8fb2c749ac407 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; homepage = "https://github.com/minio/minio-py"; + changelog = "https://github.com/minio/minio-py/releases/tag/${version}"; maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.asl20; }; -- cgit 1.4.1 From 81e0a35156362b1282b61d5e62fcb5b0d6703180 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 9 Jan 2023 08:36:37 +0100 Subject: invidious: unstable-2022-11-22 -> unstable-2023-01-08 --- pkgs/servers/invidious/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 615517b0b19d2..b41eddff1e46a 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "5160d8bae39dc5cc5d51abee90571a03c08d0f2b", - "sha256": "sha256-cM/5xnzO5wyzudXHeud9k3M5BsralRUgO4vSoebYRZ8=", - "version": "unstable-2022-11-22" + "rev": "927c37ce3eb306fe6a02c0fdb9e3ee0a837e84d2", + "sha256": "sha256-l5DDSopd4ueA0IoPovIPjGqCm3LZE8802Sh2EduLtuU=", + "version": "unstable-2023-01-08" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", -- cgit 1.4.1 From 719809517df4cf2acceabaad6952c89c3d2ce3b9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 2 Jan 2023 08:53:54 +0100 Subject: ocamlPackages.toml: 7.0.0 → 7.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/toml/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/pkgs/development/ocaml-modules/toml/default.nix index 41c52985cf998..baab042b1bf41 100644 --- a/pkgs/development/ocaml-modules/toml/default.nix +++ b/pkgs/development/ocaml-modules/toml/default.nix @@ -1,22 +1,18 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage +{ lib, fetchFromGitHub, buildDunePackage , iso8601, menhir }: buildDunePackage rec { pname = "toml"; - version = "7.0.0"; + version = "7.1.0"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchFromGitHub { owner = "ocaml-toml"; repo = "to.ml"; rev = version; - sha256 = "sha256-VEZQTFPwAGShCBGbKUiNOIY1zA/JdTpXU0ZIGNWopnQ="; - }; - - # Ensure compatibility with menhir ≥ 20211215 - patches = fetchpatch { - url = "https://github.com/ocaml-toml/To.ml/commit/41172b739dff43424a12f7c1f0f64939e3660648.patch"; - sha256 = "sha256:1333xkmm9qp5m3pp4y5w17k6rvmb30v62qyra6rfk1km2v28hqqq"; + hash = "sha256-uk14Py7lEEDJhFsRRtStXqKlJLtx0o8eS9DEIes4SHw="; }; nativeBuildInputs = [ menhir ]; -- cgit 1.4.1 From 6448ff1db20494605888cda350b4f666768cab70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 08:47:01 +0100 Subject: python310Packages.pastescript: disable on unsupported Python releases --- pkgs/development/python-modules/pastescript/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 4d4e9df7d070c..ab99f7e5852e2 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -7,16 +7,20 @@ , six , paste , pastedeploy +, pythonOlder }: buildPythonPackage rec { pname = "pastescript"; version = "3.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "PasteScript"; inherit version; - sha256 = "sha256-3eyAGhOsZn4JTt3ij5AhLN6nvcmhjUNxsI9abvfS66I="; + hash = "sha256-3eyAGhOsZn4JTt3ij5AhLN6nvcmhjUNxsI9abvfS66I="; }; propagatedBuildInputs = [ @@ -27,9 +31,15 @@ buildPythonPackage rec { # test suite seems to unset PYTHONPATH doCheck = false; - checkInputs = [ nose pytestCheckHook ]; - pythonNamespaces = [ "paste" ]; + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonNamespaces = [ + "paste" + ]; disabledTestPaths = [ "appsetup/testfiles" -- cgit 1.4.1 From a17ebb2dfe0fd7a7a6a014318aa3937226764923 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 08:30:33 +0000 Subject: colloid-icon-theme: 2022-10-26 -> 2023-01-08 --- pkgs/data/icons/colloid-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 744db4f3d162f..5c0a3817f32f2 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-10-26"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-eHLfWrtY69S37OPvQdLwI/PRvoKCheF2MRsHG5+5BR0="; + hash = "sha256-n4kMOIp7AD5Ue4qY4G3ja/VTyYF7cqhdI0uuk9b6o5c="; }; nativeBuildInputs = [ -- cgit 1.4.1 From c750dc1a80b31bc1d5af22c844a2b1a7d9777a27 Mon Sep 17 00:00:00 2001 From: Thomas Chabaud Date: Mon, 9 Jan 2023 09:12:43 +0000 Subject: stylish: fix issue NixOS#209708 missing dependencies --- pkgs/applications/misc/stylish/default.nix | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/stylish/default.nix b/pkgs/applications/misc/stylish/default.nix index 43fcc0bb1934c..b1fed22b7ffe7 100644 --- a/pkgs/applications/misc/stylish/default.nix +++ b/pkgs/applications/misc/stylish/default.nix @@ -1,12 +1,21 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + curl, + feh, + file, + jq, + util-linux, + wget, }: - stdenvNoCC.mkDerivation rec { pname = "stylish"; version = "unstable-2022-12-05"; + nativeBuildInputs = [ makeWrapper ]; + src = fetchFromGitHub { owner = "thevinter"; repo = "styli.sh"; @@ -22,6 +31,17 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + postInstall = '' + wrapProgram $out/bin/styli.sh --prefix PATH : ${lib.makeBinPath [ + curl + feh + file + jq + util-linux + wget + ]} + ''; + meta = with lib; { homepage = "https://github.com/thevinter/styli.sh"; description = "A shell script to manage wallpapers"; -- cgit 1.4.1 From 93beab46a47623fed24ae1050c51353e191126d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 10:31:02 +0100 Subject: python310Oackages.aioridwell: add changelog to meta --- pkgs/development/python-modules/aioridwell/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 1f817b54b3967..85ddfc2b32651 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with Ridwell waste recycling"; homepage = "https://github.com/bachya/aioridwell"; + changelog = "https://github.com/bachya/aioridwell/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; -- cgit 1.4.1 From 5693944d8c439d71e78d28c55449cba7a189b817 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 10:31:53 +0100 Subject: python310Packages.aioridwell: 2022.11.0 -> 2023.01.0 Diff: https://github.com/bachya/aioridwell/compare/refs/tags/2022.11.0...2023.01.0 Changelog: https://github.com/bachya/aioridwell/releases/tag/2023.01.0 --- pkgs/development/python-modules/aioridwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 85ddfc2b32651..b63c59728cc4a 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2022.11.0"; + version = "2023.01.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KxT3Se27b+XoTETXCljOVGVmEuXcpYxOhIBs1xAdtZ8="; + hash = "sha256-enNYzU65QBT/ryCUNwB08U+QiFvVb03fbYzZ5Qk6GTk="; }; nativeBuildInputs = [ -- cgit 1.4.1 From e8efaf4a088f29f6fe707d48b62f2592a9107159 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 10:36:37 +0100 Subject: python310Packages.meshtastic: 2.0.8 -> 2.0.9 Diff: https://github.com/meshtastic/Meshtastic-python/compare/refs/tags/2.0.8...2.0.9 Changelog: https://github.com/meshtastic/python/releases/tag/2.0.9 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index b58c6207a9677..2c1d7766b2c9d 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.8"; + version = "2.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-4zhwMCEIVYHrf9gT6Eoiw9huR5D2njDo62L0MvXqrgE="; + hash = "sha256-3OA61cuj9u6ejkQJgCjnu8ERjACKXz2hUekbvZqiPJ8="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 20f9114b0269b8be96e7f74ee9f706e6c2b516e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 10:41:10 +0100 Subject: python310Packages.pylitterbot: 2022.12.0 -> 2023.1.0 Diff: https://github.com/natekspencer/pylitterbot/compare/refs/tags/2022.12.0...2023.1.0 Changelog: https://github.com/natekspencer/pylitterbot/releases/tag/2023.1.0 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 704c2526328b2..91f09cc531ffe 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.12.0"; + version = "2023.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uqiSNqM1HKNAipIKKsUHv9mPfdk01ZrNWMXIzhgxxjU="; + hash = "sha256-XUiDZW3r8I8Vyx30UhopQ6S0HpSi0VNgvyu2RMNt2Eg="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 40425f64e2a9968e59896a72f93a355a46e9cb1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 10:44:26 +0100 Subject: python310Packages.pysolcast: add changelog to meta --- pkgs/development/python-modules/pysolcast/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 596c3a64cd709..77df79c3bbd7f 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mcaulifn"; repo = "solcast"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-azcEbv/4M3UqRyV30yld+6pWbSxbGXiJJHWMDL4xgOM="; }; @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the Solcast API"; homepage = "https://github.com/mcaulifn/solcast"; + changelog = "https://github.com/mcaulifn/solcast/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; -- cgit 1.4.1 From f40e876bad1e5e8f774d51c393a931b6c028e4b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 10:44:56 +0100 Subject: python310Packages.pysolcast: 1.0.12 -> 1.0.13 Diff: https://github.com/mcaulifn/solcast/compare/refs/tags/v1.0.12...v1.0.13 Changelog: https://github.com/mcaulifn/solcast/releases/tag/v1.0.13 --- pkgs/development/python-modules/pysolcast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 77df79c3bbd7f..726b37946b9e0 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "1.0.12"; + version = "1.0.13"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; rev = "refs/tags/v${version}"; - hash = "sha256-azcEbv/4M3UqRyV30yld+6pWbSxbGXiJJHWMDL4xgOM="; + hash = "sha256-peoC6NrenfQYqr1hgPth8pqyTRZb+phD6UQhjnZF92U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; -- cgit 1.4.1 From bd979e542d420ee2d3f060b5e0635faa7dc20b68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 10:49:50 +0100 Subject: python310Packages.pysoma: 0.0.11 -> 0.0.12 --- pkgs/development/python-modules/pysoma/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix index beba513057809..d62afa6468605 100644 --- a/pkgs/development/python-modules/pysoma/default.nix +++ b/pkgs/development/python-modules/pysoma/default.nix @@ -1,20 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "pysoma"; - version = "0.0.11"; + version = "0.0.12"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U/kLaO/GBpOa9mHHlYQiWSw7sVNPaMneDURoJBqqojo="; + hash = "sha256-me/A3BIAFJ8CxyiF5RvANdC/NbSYGmcjCFbpybkTxKM="; }; # Project has no test doCheck = false; - pythonImportsCheck = [ "api" ]; + + pythonImportsCheck = [ + "api" + ]; meta = with lib; { description = "Python wrapper for the HTTP API provided by SOMA Connect"; -- cgit 1.4.1 From 705e1459a98455e08b25a3f5b286cf24e3996471 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 10:55:31 +0100 Subject: python310Packages.motioneye-client: 0.3.12 -> 0.3.14 Diff: https://github.com/dermotduffy/motioneye-client/compare/v0.3.12...v0.3.14 --- .../python-modules/motioneye-client/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index f1ba9ee73304a..ba635c62f7ade 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , aiohttp , buildPythonPackage , fetchFromGitHub @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.12"; + version = "0.3.14"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,9 +21,15 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vEB9ztz0RTGoolFUVQcMV7DUthCEAx1kpwkAS2186OU="; + hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'aiohttp = "^3.8.1,!=3.8.2,!=3.8.3"' 'aiohttp = "*"' \ + --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -38,20 +44,15 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" - ''; - pythonImportsCheck = [ "motioneye_client" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Python library for motionEye"; homepage = "https://github.com/dermotduffy/motioneye-client"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } -- cgit 1.4.1 From 422c9ff8178b1b1c2a2602a03c89b35081799247 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 11:00:28 +0100 Subject: python310Packages.ical: 4.2.8 -> 4.2.9 Diff: https://github.com/allenporter/ical/compare/refs/tags/4.2.8...4.2.9 Changelog: https://github.com/allenporter/ical/releases/tag/4.2.9 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 5ec01565e2d1f..bcda9af2ec2a4 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ical"; - version = "4.2.8"; + version = "4.2.9"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vOjsHGB1VJuBEfLAXUkvTbQSFi4mkpf9qROVZo3ZABY="; + hash = "sha256-p1cvs+xLin2WK2zyqQFd1vWKzt+LU2mpDSieOgA7Qf8="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From f2769faef69d803d4a66d1ceafcee769a05d59d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 11:01:29 +0100 Subject: python310Packages.gcal-sync: 4.1.0 -> 4.1.1 Diff: https://github.com/allenporter/gcal_sync/compare/refs/tags/4.1.0...4.1.1 Changelog: https://github.com/allenporter/gcal_sync/releases/tag/4.1.1 --- pkgs/development/python-modules/gcal-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index d2cd8b7740e19..036e62348fc80 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "4.1.0"; + version = "4.1.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-dmxqN0SE/qAu07ilBnVdV8k3hvpfUPLMtIfqlhSg20U="; + hash = "sha256-gRIioR0TrvxTEd572AEuWlamlEaNOoOcXNten5AAAkA="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 72b56e4b75cd9f6e75a8f872d93df2bf64f6a1dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 11:04:33 +0100 Subject: python310Packages.uritools: add changelog to meta --- pkgs/development/python-modules/uritools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 53dd389b5f8f9..76678539bd9c5 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-78XDpt4FQEhQaFqNPzTahHa1aqNRb7+O/1yHBMeigm8="; + hash = "sha256-78XDpt4FQEhQaFqNPzTahHa1aqNRb7+O/1yHBMeigm8="; }; pythonImportsCheck = [ @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse"; homepage = "https://github.com/tkem/uritools/"; + changelog = "https://github.com/tkem/uritools/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; }; -- cgit 1.4.1 From 2f846f433216234d4d46aff3cc7b34fd77e70b48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 11:15:34 +0100 Subject: python310Packages.python-lsp-server: add changelog to meta --- pkgs/development/python-modules/python-lsp-server/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 62e6ce951bdea..5d82d797a1283 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q="; + hash = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -150,6 +150,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Language Server Protocol"; homepage = "https://github.com/python-lsp/python-lsp-server"; + changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; -- cgit 1.4.1 From 91bdfd4592afee9df43cb334c4e051c8a0c5d41a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 11:21:58 +0100 Subject: python310Packages.rope: add changelog to meta --- pkgs/development/python-modules/rope/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 21d5886efe214..c90dd8568a879 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, nose +}: buildPythonPackage rec { pname = "rope"; @@ -18,7 +23,10 @@ buildPythonPackage rec { }) ]; - checkInputs = [ nose ]; + checkInputs = [ + nose + ]; + checkPhase = '' # tracked upstream here https://github.com/python-rope/rope/issues/247 NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest @@ -27,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python refactoring library"; homepage = "https://github.com/python-rope/rope"; - maintainers = with maintainers; [ goibhniu ]; + changelog = "https://github.com/python-rope/rope/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ goibhniu ]; }; } -- cgit 1.4.1 From df161564b52916bfd578138703dac6b7ccea6008 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 10:52:44 +0000 Subject: python310Packages.peaqevcore: 10.1.4 -> 10.2.6 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 5a1f6af2760a4..94479a12141da 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "10.1.4"; + version = "10.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-h3kNmWa9ZOpI0DG49H3n1MPZu753nrdzSIh8V5N3H6I="; + hash = "sha256-uQPz7IB14dFrupZIA87jG5P7USaGKs0WWlgbaLAEPp4="; }; postPatch = '' -- cgit 1.4.1 From 55f9c51b62c2f06d2ae7dd4038b1b4536cba47ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 12:00:57 +0100 Subject: python310Packages.rope: 0.18.0 -> 1.6.0 Changelog: https://github.com/python-rope/rope/blob/1.6.0/CHANGELOG.md --- pkgs/development/python-modules/rope/default.nix | 51 +++++++++++++++--------- 1 file changed, 32 insertions(+), 19 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index c90dd8568a879..f831e7af40c03 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,36 +1,49 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch -, nose +, fetchFromGitHub +, pytest-timeout +, pytestCheckHook +, pythonOlder +, setuptools +, pytoolconfig }: buildPythonPackage rec { pname = "rope"; - version = "0.18.0"; + version = "1.6.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-rope"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-avNCti288dY9pl5AVTmUzZU/vb6WDkXEtELNlEi6L/o="; }; - patches = [ - # Python 3.9 ast changes - (fetchpatch { - url = "https://github.com/python-rope/rope/pull/333.patch"; - excludes = [ ".github/workflows/main.yml" ]; - sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0"; - }) + nativeBuildInputs = [ + setuptools ]; + propagatedBuildInputs = [ + pytoolconfig + ]++ pytoolconfig.optional-dependencies.global; + checkInputs = [ - nose + pytest-timeout + pytestCheckHook ]; - checkPhase = '' - # tracked upstream here https://github.com/python-rope/rope/issues/247 - NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest - ''; + pythonImportsCheck = [ + "rope" + ]; + + disabledTests = [ + "test_search_submodule" + "test_get_package_source_pytest" + "test_get_modname_folder" + ]; meta = with lib; { description = "Python refactoring library"; -- cgit 1.4.1 From c3374273d72546214c1d2a9161d4289baa424ceb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 12:02:31 +0100 Subject: python310Packages.python-lsp-server: 1.6.0 -> 1.7.0 Diff: https://github.com/python-lsp/python-lsp-server/compare/refs/tags/v1.6.0...v1.7.0 Changelog: https://github.com/python-lsp/python-lsp-server/blob/v1.7.0/CHANGELOG.md --- pkgs/development/python-modules/python-lsp-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 5d82d797a1283..6feb98cd02adb 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.6.0"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q="; + hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -50,7 +50,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ --replace "--cov pylsp --cov test" "" \ - --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ + --replace "autopep8>=1.7.0,<1.7.0" "autopep8" \ --replace "flake8>=5.0.0,<5.1.0" "flake8" \ --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ --replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \ -- cgit 1.4.1 From dd8026d8d5323fd75b298a0418b052f3e16bfdf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 12:07:51 +0100 Subject: python310Packages.pytoolconfig: init at 1.2.5 --- .../python-modules/pytoolconfig/default.nix | 79 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/pytoolconfig/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix new file mode 100644 index 0000000000000..a3c50a44d0fca --- /dev/null +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, docutils +, fetchFromGitHub +, packaging +, pdm-pep517 +, platformdirs +, pydantic +, pytest-timeout +, pytestCheckHook +, pythonOlder +, sphinx +, tabulate +, tomli +}: + +buildPythonPackage rec { + pname = "pytoolconfig"; + version = "1.2.5"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bagel897"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-b7er/IgXr2j9dSnI87669BXWA5CXNTzwa1DTpl8PBZ4="; + }; + + postPatch = '' + # License file name doesn't match + substituteInPlace pyproject.toml \ + --replace "license = { file = 'LGPL-3.0' }" "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' \ + --replace "packaging>=22.0" "packaging" + ''; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + passthru.optional-dependencies = { + validation = [ + pydantic + ]; + global = [ + platformdirs + ]; + doc = [ + sphinx + tabulate + ]; + }; + + checkInputs = [ + docutils + pytestCheckHook + ] ++ passthru.optional-dependencies.global + ++ passthru.optional-dependencies.doc; + + pythonImportsCheck = [ + "pytoolconfig" + ]; + + meta = with lib; { + description = "Module for tool configuration"; + homepage = "https://github.com/bagel897/pytoolconfig"; + changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e35d915c962d3..324c6a302cc1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5147,8 +5147,6 @@ self: super: with self; { lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { }; - ld2410-ble = callPackage ../development/python-modules/ld2410-ble { }; - ldap3 = callPackage ../development/python-modules/ldap3 { }; ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; @@ -9367,6 +9365,8 @@ self: super: with self; { pytomlpp = callPackage ../development/python-modules/pytomlpp { }; + pytoolconfig = callPackage ../development/python-modules/pytoolconfig { }; + pytools = callPackage ../development/python-modules/pytools { }; pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; -- cgit 1.4.1 From 3078c90a6eecf118edcd822ecf819df4368a9e7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 12:13:03 +0100 Subject: python310Packages.spyder-kernels: 2.4.0 -> 2.4.1 Changelog: https://github.com/spyder-ide/spyder-kernels/blob/master/CHANGELOG.md --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index f39b03763c818..837cf0c0a520f 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O9MvvjChUKucztvVvrbd04veHZqHeNpS9+30ILv7jlE="; + hash = "sha256-eD2N+9cVzZdyjpE5FnebN8+OllZjVevaz+NBHSvrR5Y="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 4102f23e2d602e81cef029e236c503c56ee085ad Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 8 Jan 2023 23:03:58 +0100 Subject: luaPackages.plenary-nvim: 2022-10 -> 2023-01 a new luarocks release system has been merged into plenary.nvim to have tagged release. The update is also needed for https://github.com/MrcJkb/haskell-tools.nvim/pull/93 --- pkgs/development/lua-modules/generated-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 487f854b2ce49..52fbeabf068f0 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2708,10 +2708,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "4b7e52044bbb84242158d977a50c4cbcd85070c7", - "date": "2022-10-01T09:05:53+02:00", - "path": "/nix/store/hkj69cqq4qg3d98irg8wszgl7i1bg6lv-plenary.nvim", - "sha256": "11815h0h2mf5ym282ghk7xav90635r88qbgaflpgbyk2banl31wl", + "rev": "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd", + "date": "2023-01-06T19:47:51+01:00", + "path": "/nix/store/r6a56xvn5dkrsnswpg7297ihdfc1qsgy-plenary.nvim", + "sha256": "0y3qn0rwlwp720517lwg35f09b30b591hprbvb6hgvn1waw2ljzc", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, -- cgit 1.4.1 From bfdd2f6bfd57502d2b28dcd8897887e05e24d7a6 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 9 Jan 2023 12:31:27 +0100 Subject: python3Packages.imageio: 2.23.0 -> 2.24.0 https://github.com/imageio/imageio/releases/tag/v2.24.0 --- pkgs/development/python-modules/imageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 1437b28a06be3..efad94b13dfbc 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.23.0"; + version = "2.24.0"; disabled = pythonOlder "3.7"; src = fetchPypi { - sha256 = "sha256-y2NXCXZeUnyUiQtPu2hw5ZIT/hgqHICG0WfrNiYHPL0="; + sha256 = "sha256-8kD4Ip9PMpoVRigRlLUtpdZpQUGlJGaP7T+BsNB3gvo="; inherit pname version; }; -- cgit 1.4.1 From 92cbb320902ed6953a2fb9d001c88670711d9c3e Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Sun, 8 Jan 2023 11:49:23 +0100 Subject: Glaxnimate: init at 0.5.1 --- pkgs/applications/video/glaxnimate/default.nix | 51 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/video/glaxnimate/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix new file mode 100644 index 0000000000000..ad70ff72bbc30 --- /dev/null +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, zlib +, potrace +, ffmpeg +, libarchive +, python3 +, qtbase +, qttools +, wrapQtAppsHook + # Python3 +}: + +stdenv.mkDerivation rec { + pname = "glaxnimate"; + version = "0.5.1"; + + src = fetchFromGitLab { + owner = "mattbas"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + zlib + potrace + ffmpeg + # gst_all_1.gst-libav # Note that since gst-libav-1.6, libav is actually ffmpeg + libarchive + python3 + qtbase + qttools + ]; + + meta = with lib; { + homepage = "https://gitlab.com/mattbas/glaxnimate"; + description = "Simple vector animation program."; + license = licenses.gpl3; + maintainers = with maintainers; [ tobiasBora ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7424cf7bff19f..5971d6bbb3ae0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3119,6 +3119,8 @@ with pkgs; glasstty-ttf = callPackage ../data/fonts/glasstty-ttf { }; + glaxnimate = libsForQt5.callPackage ../applications/video/glaxnimate { }; + gmid = callPackage ../servers/gemini/gmid { }; gmni = callPackage ../applications/networking/browsers/gmni { }; -- cgit 1.4.1 From 517c661748cb409f90d24f701d3bef15308aa618 Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Sun, 8 Jan 2023 12:06:50 +0100 Subject: minor change Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/applications/video/glaxnimate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index ad70ff72bbc30..d2a82c09185b0 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmake wrapQtAppsHook ]; - + buildInputs = [ zlib potrace -- cgit 1.4.1 From 424150e011692d321da3a8194b3acad2997e5ff7 Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Sun, 8 Jan 2023 12:46:11 +0100 Subject: Update pkgs/applications/video/glaxnimate/default.nix Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/applications/video/glaxnimate/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index d2a82c09185b0..a1ae001017c99 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -10,7 +10,6 @@ , qtbase , qttools , wrapQtAppsHook - # Python3 }: stdenv.mkDerivation rec { -- cgit 1.4.1 From 5de5cf5a919a560c8c81a066e9bfbcd745e149c3 Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Sun, 8 Jan 2023 12:46:47 +0100 Subject: Update pkgs/applications/video/glaxnimate/default.nix Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/applications/video/glaxnimate/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index a1ae001017c99..a514a309fb1d9 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { cmake wrapQtAppsHook ]; - buildInputs = [ zlib potrace -- cgit 1.4.1 From e8b763c9dbed917b9a964413dc40a51b58b03c09 Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Sun, 8 Jan 2023 17:07:39 +0100 Subject: Update pkgs/applications/video/glaxnimate/default.nix Co-authored-by: tricktron --- pkgs/applications/video/glaxnimate/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index a514a309fb1d9..c5483c2874f80 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -44,6 +44,5 @@ stdenv.mkDerivation rec { description = "Simple vector animation program."; license = licenses.gpl3; maintainers = with maintainers; [ tobiasBora ]; - platforms = platforms.linux; }; } -- cgit 1.4.1 From dfb582daa7d8b3df6fbeb2c93b0f0776f9858156 Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Sun, 8 Jan 2023 21:26:10 +0100 Subject: Update pkgs/applications/video/glaxnimate/default.nix Co-authored-by: tricktron --- pkgs/applications/video/glaxnimate/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index c5483c2874f80..b81ed92c95ca2 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { qttools ]; +passthru.tests.version = testers.testVersion { + package = glaxnimate; + command = "glaxnimate --version"; + }; meta = with lib; { homepage = "https://gitlab.com/mattbas/glaxnimate"; description = "Simple vector animation program."; -- cgit 1.4.1 From 8b1d3a6d140c668d4606eb171320a4ba265c606f Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Sun, 8 Jan 2023 21:26:26 +0100 Subject: Update pkgs/applications/video/glaxnimate/default.nix Co-authored-by: tricktron --- pkgs/applications/video/glaxnimate/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index b81ed92c95ca2..143c2cbec46e0 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -10,6 +10,8 @@ , qtbase , qttools , wrapQtAppsHook +, testers +, glaxnimate }: stdenv.mkDerivation rec { -- cgit 1.4.1 From d243b132ad7f1bc2d9afd8b114bf2be2025df68f Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Mon, 9 Jan 2023 06:27:37 +0100 Subject: Update pkgs/applications/video/glaxnimate/default.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Manuel Bärenz --- pkgs/applications/video/glaxnimate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index 143c2cbec46e0..7d42156b89777 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib potrace + # Upstream asks for libav dependency, which is fulfilled by ffmpeg ffmpeg - # gst_all_1.gst-libav # Note that since gst-libav-1.6, libav is actually ffmpeg libarchive python3 qtbase -- cgit 1.4.1 From 3be80fbf1fc961a7e1cd142bbfdb4edb2f3b5553 Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Mon, 9 Jan 2023 10:38:26 +0100 Subject: Glaxnimate: fix plugins and export to gif --- pkgs/applications/video/glaxnimate/default.nix | 32 ++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index 7d42156b89777..7e6339813f743 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -11,9 +11,28 @@ , qttools , wrapQtAppsHook , testers -, glaxnimate +, qtsvg +, qtimageformats +, glaxnimate # Call itself, for the tests }: - +let + # TODO: try to add a python library, see toPythonModule in doc/languages-frameworks/python.section.md + python3WithLibs = python3.withPackages (ps: with ps; [ + # In data/lib/python-lottie/requirements.txt + numpy + pillow + cairosvg + fonttools + grapheme + opencv4 + pyqt5 + qscintilla + # Not sure if needed, but appears in some files + pyyaml + requests + pybind11 + ]); +in stdenv.mkDerivation rec { pname = "glaxnimate"; version = "0.5.1"; @@ -36,15 +55,20 @@ stdenv.mkDerivation rec { # Upstream asks for libav dependency, which is fulfilled by ffmpeg ffmpeg libarchive - python3 qtbase qttools + qtsvg + qtimageformats + python3WithLibs ]; -passthru.tests.version = testers.testVersion { + qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; + + passthru.tests.version = testers.testVersion { package = glaxnimate; command = "glaxnimate --version"; }; + meta = with lib; { homepage = "https://gitlab.com/mattbas/glaxnimate"; description = "Simple vector animation program."; -- cgit 1.4.1 From 72f79812e5fee3e2c12fa3cd107e329b14b6a01f Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Mon, 9 Jan 2023 10:50:49 +0100 Subject: Glaxnimate: fix tester --- pkgs/applications/video/glaxnimate/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index 7e6339813f743..c3cba5858ead2 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -13,7 +13,9 @@ , testers , qtsvg , qtimageformats +# For the tests , glaxnimate # Call itself, for the tests +, xvfb-run }: let # TODO: try to add a python library, see toPythonModule in doc/languages-frameworks/python.section.md @@ -66,7 +68,7 @@ stdenv.mkDerivation rec { passthru.tests.version = testers.testVersion { package = glaxnimate; - command = "glaxnimate --version"; + command = "${xvfb-run}/bin/xvfb-run glaxnimate --version"; }; meta = with lib; { -- cgit 1.4.1 From 469505483b6097c23ad3aaaeecbd82bea5b696e7 Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Mon, 9 Jan 2023 10:53:53 +0100 Subject: Fix editorconfig-checker… really annoying on trailing whitespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/glaxnimate/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index c3cba5858ead2..2fdb82869f3bd 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { cmake wrapQtAppsHook ]; + buildInputs = [ zlib potrace @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ]; qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; - + passthru.tests.version = testers.testVersion { package = glaxnimate; command = "${xvfb-run}/bin/xvfb-run glaxnimate --version"; -- cgit 1.4.1 From 2bd3048ea4148d9288bbd74bbdf453520c7d78f4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 9 Jan 2023 13:08:09 +0100 Subject: darwin: fix generate-sdk-packages.sh --- .../darwin/apple-source-releases/generate-sdk-packages.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh index d7c3fc89c525b..69410ed4746fd 100755 --- a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh +++ b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl +#!nix-shell -i bash -p curl jq # usage: # generate-sdk-packages.sh macos 11.0.1 @@ -16,14 +16,14 @@ outfile="$sdkName.nix" {" parse_line() { - readarray -t -d$'\t' package <<<$2 + readarray -t -d$'-' package < <(printf "%s" $2) local pname=${package[0]} version=${package[1]} if [ -d $pname ]; then - sha256=$(nix-prefetch-url "https://opensource.apple.com/tarballs/$pname/$pname-$version.tar.gz") + sha256=$(nix-prefetch-url "https://github.com/apple-oss-distributions/$pname/archive/refs/tags/$pname-$version.tar.gz") >>$outfile echo "$pname = applePackage' \"$pname\" \"$version\" \"$sdkName\" \"$sha256\" {};" fi } -readarray -s1 -c1 -C parse_line < <(curl -sS "https://opensource.apple.com/text/${sdkName//./}.txt") +readarray -s1 -c1 -C parse_line < <(curl -sSL "https://github.com/apple-oss-distributions/distribution-${1//-/_}/raw/${sdkName//./}/release.json" | jq -r ".projects[].tag") >>$outfile echo '}' -- cgit 1.4.1 From 9957ee5fd689792ff18194bec2a4bc7f4db70d61 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 9 Jan 2023 13:08:37 +0100 Subject: darwin: add usage to generate-sdk-packages.sh --- .../darwin/apple-source-releases/generate-sdk-packages.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh index 69410ed4746fd..418a1d625d6ae 100755 --- a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh +++ b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh @@ -1,8 +1,16 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq -# usage: -# generate-sdk-packages.sh macos 11.0.1 +usage() { + cat < Date: Mon, 9 Jan 2023 12:26:44 +0000 Subject: klipper: unstable-2022-11-21 -> unstable-2023-01-07 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 0ba3df96f3032..7c9117f91c18a 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2022-11-21"; + version = "unstable-2023-01-07"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "c51f169c06921152a2e9c386016660d0bb09f767"; - sha256 = "sha256-l5dOj4cKrKdQ0grmbIdXm5dmkrQv6L+NqCMN1i3z3SE="; + rev = "f1203d56f6bc2c84d00605a76525be4c13430324"; + sha256 = "sha256-7FJ+omzXpj49AThcv0xDilIekCyehtvpvck1+nrMS70="; }; sourceRoot = "source/klippy"; -- cgit 1.4.1 From d744fdbab93b048ec24cc7baf7598618d0eb9d3b Mon Sep 17 00:00:00 2001 From: Michael Schantz Klausen Date: Mon, 9 Jan 2023 08:15:36 +0100 Subject: python310Packages.polars: 0.13.19 -> 0.15.13: Fix compilation error --- pkgs/development/python-modules/polars/default.nix | 50 +++++++--------------- 1 file changed, 16 insertions(+), 34 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index dd9dbc114b234..583ce81fa409f 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -5,13 +5,14 @@ , rustPlatform , libiconv , fetchzip +, typing-extensions }: let pname = "polars"; - version = "0.13.19"; + version = "0.15.13"; rootSource = fetchzip { - url = "https://github.com/pola-rs/${pname}/archive/refs/tags/py-polars-v${version}.tar.gz"; - sha256 = "sha256-JOHjxTTPzS9Dd/ODp4r0ebU9hEonxrbjURJoq0BQCyI="; + url = "https://github.com/pola-rs/${pname}/archive/refs/tags/py-${version}.tar.gz"; + sha256 = "sha256-bk2opNLN3L+fkzXVfUU5O37UmA27ijmnAElCHjsuI+o="; }; in buildPythonPackage { @@ -19,8 +20,13 @@ buildPythonPackage { format = "pyproject"; disabled = pythonOlder "3.6"; src = rootSource; + + # Cargo.lock files is sometimes behind actual release which throws an error, + # thus the `sed` command + # Make sure to check that the right substitutions are made when updating the package preBuild = '' cd py-polars + sed -i 's/version = "0.15.11"/version = "${version}"/g' Cargo.lock ''; cargoDeps = rustPlatform.fetchCargoTarball { @@ -29,10 +35,15 @@ buildPythonPackage { cd py-polars ''; name = "${pname}-${version}"; - sha256 = "sha256-KEt8lITY4El2afuh2cxnrDkXGN3MZgfKQU3Pe2jECF0="; + sha256 = "sha256-u7ascftUPz8K+gWwjjxdXXFJf++M+8P9QE/KVJkO5DM="; }; cargoRoot = "py-polars"; + # Revisit this whenever package or Rust is upgraded + RUSTC_BOOTSTRAP = 1; + + propagatedBuildInputs = if pythonOlder "3.10" then [ typing-extensions ] else []; + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -49,36 +60,7 @@ buildPythonPackage { # ]; meta = with lib; { - # Adding cmake to nativeBuildInputs and using `dontUseCmakeConfigure = true;` - # The following error still happens - - # Compiling arrow2 v0.10.1 (https://github.com/ritchie46/arrow2?branch=polars#da703ae3) - # error[E0554]: `#![feature]` may not be used on the stable release channel - # --> /build/polars-0.13.19-vendor.tar.gz/arrow2/src/lib.rs:8:39 - # | - # 8 | #![cfg_attr(feature = "simd", feature(portable_simd))] - # | ^^^^^^^^^^^^^ - # error: aborting due to previous error - # For more information about this error, try `rustc --explain E0554`. - # error: could not compile `arrow2` due to 2 previous errors - # warning: build failed, waiting for other jobs to finish... - # maturin failed - # Caused by: Failed to build a native library through cargo - # Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s` - # error: builder for '/nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv' failed with exit code 1; - # last 10 log lines: - # > error: aborting due to previous error - # > - # > - # > For more information about this error, try `rustc --explain E0554`. - # > - # > error: could not compile `arrow2` due to 2 previous errors - # > warning: build failed, waiting for other jobs to finish... - # > maturin failed - # > Caused by: Failed to build a native library through cargo - # > Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s` - # For full logs, run 'nix log /nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv'. - broken = true; + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; homepage = "https://github.com/pola-rs/polars"; license = licenses.asl20; -- cgit 1.4.1 From c3bb25b47987086516ad4d87f154e474a20978d8 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Mon, 9 Jan 2023 04:44:44 -0800 Subject: libxlsxwriter: 1.1.4 -> 1.1.5 https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.1.5 --- pkgs/development/libraries/libxlsxwriter/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index a2f506de0133b..5d9b50e7251c8 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , minizip , python3 , zlib @@ -9,23 +8,15 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "sha256-Ef1CipwUEJW/VYx/q98lN0PSxj8c3DbIuql8qU6mTRs="; + hash = "sha256-fC03LwZIUkEsAs9TN0n2z0iSOGPAtVCeuW5rxC7Ek7Q="; }; - patches = [ - # https://github.com/jmcnamara/libxlsxwriter/pull/357 - (fetchpatch { - url = "https://github.com/jmcnamara/libxlsxwriter/commit/723629976ede5e6ec9b03ef970381fed06ef95f0.patch"; - sha256 = "14aw698b5svvbhvadc2vr71isck3k02zdv8xjsa7c33n8331h20g"; - }) - ]; - nativeBuildInputs = [ python3.pkgs.pytest ]; -- cgit 1.4.1 From 68fa297be751a6854526ec5c773d1133a695c1e5 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 7 Jan 2023 11:01:58 -0800 Subject: python310Packages.mat2: 0.13.0 -> 0.13.1 https://0xacab.org/jvoisin/mat2/-/releases/0.13.1 --- pkgs/development/python-modules/mat2/default.nix | 18 ++---------------- pkgs/development/python-modules/mat2/fix_poppler.patch | 14 -------------- pkgs/development/python-modules/mat2/paths.patch | 12 ++++++------ 3 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/python-modules/mat2/fix_poppler.patch (limited to 'pkgs') diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 6e2b1a02402d9..be6c2912dfebf 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -4,7 +4,6 @@ , unittestCheckHook , pythonOlder , fetchFromGitLab -, fetchpatch , substituteAll , bubblewrap , exiftool @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.0"; + version = "0.13.1"; disabled = pythonOlder "3.5"; @@ -33,7 +32,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-H3l8w2F+ZcJ1P/Dg0ZVBJPUK0itLocL7a0jeSrG3Ws8="; + hash = "sha256-/HcWVXguZf9cCGY0xlC7uMnLkSAqZ0DIAC6JUw2KKDs="; }; patches = [ @@ -49,16 +48,6 @@ buildPythonPackage rec { ./executable-name.patch # hardcode path to mat2 executable ./tests.patch - # fix gobject-introspection typelib path for Nautilus extension - (substituteAll { - src = ./fix_poppler.patch; - poppler_path = "${poppler_gi}/lib/girepository-1.0"; - }) - # https://0xacab.org/jvoisin/mat2/-/issues/178 - (fetchpatch { - url = "https://0xacab.org/jvoisin/mat2/-/commit/618e0a8e3984fd534b95ef3dbdcb8a76502c90b5.patch"; - hash = "sha256-l9UFim3hGj+d2uKITiDG1OnqGeo2McBIiRSmK0Vidg8="; - }) ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ (substituteAll { src = ./bubblewrap-path.patch; @@ -92,9 +81,6 @@ buildPythonPackage rec { postInstall = '' install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps" install -Dm 444 doc/mat2.1 -t "$out/share/man/man1" - install -Dm 444 nautilus/mat2.py -t "$out/share/nautilus-python/extensions" - buildPythonPath "$out $pythonPath $propagatedBuildInputs" - patchPythonScript "$out/share/nautilus-python/extensions/mat2.py" '' + lib.optionalString dolphinIntegration '' install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus" ''; diff --git a/pkgs/development/python-modules/mat2/fix_poppler.patch b/pkgs/development/python-modules/mat2/fix_poppler.patch deleted file mode 100644 index 02bdbb6345dc0..0000000000000 --- a/pkgs/development/python-modules/mat2/fix_poppler.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/nautilus/mat2.py b/nautilus/mat2.py -index 11e6986..5a0e68f 100644 ---- a/nautilus/mat2.py -+++ b/nautilus/mat2.py -@@ -22,6 +22,9 @@ import gi - gi.require_version('Nautilus', '3.0') - gi.require_version('Gtk', '3.0') - gi.require_version('GdkPixbuf', '2.0') -+gi.require_version('GIRepository', '2.0') -+from gi.repository import GIRepository -+GIRepository.Repository.prepend_search_path('@poppler_path@') - from gi.repository import Nautilus, GObject, Gtk, Gio, GLib, GdkPixbuf - - from libmat2 import parser_factory diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch index 784e04cda3836..53f72ce94637f 100644 --- a/pkgs/development/python-modules/mat2/paths.patch +++ b/pkgs/development/python-modules/mat2/paths.patch @@ -13,7 +13,7 @@ index 41c8de4..11df258 100644 +Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U +Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py -index eb65b2a..51a0fa1 100644 +index cdfce3d..1e83520 100644 --- a/libmat2/exiftool.py +++ b/libmat2/exiftool.py @@ -1,8 +1,6 @@ @@ -23,13 +23,13 @@ index eb65b2a..51a0fa1 100644 import os -import shutil import subprocess - from typing import Dict, Union, Set + from typing import Union -@@ -70,14 +68,5 @@ class ExiftoolParser(abstract.AbstractParser): +@@ -67,14 +65,5 @@ class ExiftoolParser(abstract.AbstractParser): return False return True --@functools.lru_cache() +-@functools.lru_cache def _get_exiftool_path() -> str: # pragma: no cover - which_path = shutil.which('exiftool') - if which_path: @@ -42,7 +42,7 @@ index eb65b2a..51a0fa1 100644 - raise RuntimeError("Unable to find exiftool") + return '@exiftool@' diff --git a/libmat2/video.py b/libmat2/video.py -index ae9e463..2acc65c 100644 +index 4d33aa4..6388664 100644 --- a/libmat2/video.py +++ b/libmat2/video.py @@ -1,6 +1,4 @@ @@ -51,7 +51,7 @@ index ae9e463..2acc65c 100644 -import shutil import logging - from typing import Dict, Union + from typing import Union @@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser): } -- cgit 1.4.1 From 9e9a824a70dcb686f7c856ca868187d1be21608e Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 8 Jan 2023 09:27:41 +0100 Subject: nix-index: unstable-2022-03-07 -> unstable-2023-01-03 Diff: https://github.com/bennofs/nix-index/compare/f09548f66790d2d7d53f07ad2af62993d7cabb08...36ff1aac466392fb2d7043fd3e196667a531374b --- pkgs/tools/package-management/nix-index/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 57ebcfec26d4d..200c8510b874e 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-index"; - version = "unstable-2022-03-07"; + version = "unstable-2023-01-03"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; - rev = "f09548f66790d2d7d53f07ad2af62993d7cabb08"; - sha256 = "sha256-xIJCzEHQJ2kHRbT4Ejrb5R5e/VqjKrklV7XneZIiyUg="; + rev = "36ff1aac466392fb2d7043fd3e196667a531374b"; + sha256 = "sha256-QXUqz7SiUBDOBKiALdtWNEPhS/EAM8pEEtazGcTCzvM="; }; - cargoSha256 = "sha256-2Yhnacsx8EWsfZfcfKhV687cblyFDmsfdqGZoK6Lulo="; + cargoSha256 = "sha256-ELlgbE5dR3a6yRTRD88tgEs4gtN1N3M2nBjVFu6GMwc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl ] -- cgit 1.4.1 From e0293da51a023e3a59b158fd7571057759e4cfb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 14:41:06 +0100 Subject: python310Packages.python-lsp-server: update postPatch section --- pkgs/development/python-modules/python-lsp-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 6feb98cd02adb..01dc904293e94 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -50,11 +50,11 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ --replace "--cov pylsp --cov test" "" \ - --replace "autopep8>=1.7.0,<1.7.0" "autopep8" \ - --replace "flake8>=5.0.0,<5.1.0" "flake8" \ + --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ + --replace "flake8>=5.0.0,<7" "flake8" \ --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ - --replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \ - --replace "pyflakes>=2.5.0,<2.6.0" "pyflakes" + --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \ + --replace "pyflakes>=2.5.0,<3.1.0" "pyflakes" ''; nativeBuildInputs = [ -- cgit 1.4.1 From 27225a861708ced2e7b0655775b2f59a82924683 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 14:42:46 +0100 Subject: python310Packages.spyder: 5.4.0 -> 5.4.1 Changelog: https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index bb744b2abab4c..d6d408b8c6867 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -46,14 +46,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.4.0"; + version = "5.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nZ+rw5qALSdu+nbaAtGA7PLW6XjcjeZvuPd4a5WtZkw="; + hash = "sha256-kQBOYRXhjz+OQk7Vlxb/UKiDi92mA8ialsFQ+QzqhlE="; }; nativeBuildInputs = [ -- cgit 1.4.1 From e015cc413e76a5413e0057d23c0290c5b1090abc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 15:08:38 +0100 Subject: python310Packages.whois: 0.9.21 -> 0.9.22 Diff: https://github.com/DannyCork/python-whois/compare/refs/tags/0.9.21...0.9.22 Changelog: https://github.com/DannyCork/python-whois/releases/tag/0.9.22 --- pkgs/development/python-modules/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 85dc1bcff1d29..793565da68077 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.21"; + version = "0.9.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - hash = "sha256-gsWvmAnzlm31UHT//VbXvryKWN8m/+hvLoKxLmQOK5k="; + hash = "sha256-k1pvElqZTWJp8PTvQJCFeJqfzHW/QJQXCd4zBAtU0G4="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 87b91aebffadd6a8811db3355d838738d07ab3b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 11:36:19 +0000 Subject: oxker: 0.1.10 -> 0.1.11 --- pkgs/applications/misc/oxker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index f518acd24a201..3d6e42bd628d6 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.1.10"; + version = "0.1.11"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2NX2iW3cT9027j2gUsDTtdIFDmJKIGPfSzrGGwvK/VA="; + sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA="; }; - cargoSha256 = "sha256-//GI+roOsCLkKgMDUDK0YhJWmeIaYCMBt9r14+Rz8UQ="; + cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8="; meta = with lib; { description = "A simple tui to view & control docker containers"; -- cgit 1.4.1 From 0b38e52c56066bceeea655a535a03f93bdbcbdee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 01:02:52 +0000 Subject: gfxreconstruct: 0.9.15 -> 0.9.16.1 --- pkgs/tools/graphics/gfxreconstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/tools/graphics/gfxreconstruct/default.nix index 31ced64c46a1e..9dfd0def4a97d 100644 --- a/pkgs/tools/graphics/gfxreconstruct/default.nix +++ b/pkgs/tools/graphics/gfxreconstruct/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gfxreconstruct"; - version = "0.9.15"; + version = "0.9.16.1"; src = fetchFromGitHub { owner = "LunarG"; repo = "gfxreconstruct"; rev = "v${version}"; - hash = "sha256-hIzQ5L0Payj8hlyy5UI7RXgnyhQBPqG7nfbvW2VYvTg="; + hash = "sha256-6yUWXIJlfwaPT1SDVjSfO7Sj10DcpOLAbzASC4dLS1E="; fetchSubmodules = true; }; -- cgit 1.4.1 From 2394c19b90132fbb7948eab3f81c02df56b1ebe5 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 9 Jan 2023 15:32:03 +0100 Subject: cargo-public-api: 0.24.1 -> 0.26.0 (#206365) --- pkgs/development/tools/rust/cargo-public-api/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index d5627993e2983..4ebb819623f02 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -4,22 +4,24 @@ , pkg-config , openssl , stdenv +, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.24.1"; + version = "0.26.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-xXwJ6MXnSgqIQ5IuqfDm/TUXgkppKCPG3TB7veza/H8="; + sha256 = "sha256-BiGVdWgDi+g+mxdM3+z5RN1pGJz9NIKVm8sTZf2ObCc="; }; - cargoSha256 = "sha256-1sSvK8oZspIxDcMAl2MyAQzuijAxj1kpiZf1QwwyYDs="; + cargoSha256 = "sha256-QvZBWo/u+WtIG5zlDVTC2+5bq/mqZftXU5m8oqN25GM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # Tests fail doCheck = false; -- cgit 1.4.1 From 9c2f3e166b73f48b0779312218b65901a692ef52 Mon Sep 17 00:00:00 2001 From: Jordan Date: Mon, 9 Jan 2023 21:32:49 +0700 Subject: waylock: 0.4.2 -> 0.6.0 (#209867) Closes https://github.com/NixOS/nixpkgs/pull/209537 --- pkgs/applications/misc/waylock/default.nix | 31 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index 2a29eab29730d..9ae1b348e3d47 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -1,28 +1,27 @@ -{ - lib, - stdenv, - fetchFromGitHub, - zig, - wayland, - pkg-config, - scdoc, - wayland-protocols, - libxkbcommon, - pam, +{ lib +, stdenv +, fetchFromGitHub +, zig +, wayland +, pkg-config +, scdoc +, wayland-protocols +, libxkbcommon +, pam }: stdenv.mkDerivation rec { pname = "waylock"; - version = "0.4.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yWjWcnGa4a+Dpc82H65yr8H7v88g/tDq0FSguubhbEI="; + hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w="; fetchSubmodules = true; }; - nativeBuildInputs = [zig wayland scdoc pkg-config]; + nativeBuildInputs = [ zig wayland scdoc pkg-config ]; buildInputs = [ wayland-protocols @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dman-pages --prefix $out install + zig build -Drelease-safe -Dman-pages -Dcpu=baseline --prefix $out install runHook postInstall ''; @@ -47,6 +46,6 @@ stdenv.mkDerivation rec { description = "A small screenlocker for Wayland compositors"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [jordanisaacs]; + maintainers = with maintainers; [ jordanisaacs ]; }; } -- cgit 1.4.1 From 52fcfb1de2e4d00175b0fded79a112c3cf518e4e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 9 Jan 2023 15:33:42 +0100 Subject: libquotient: 0.6.11 -> 0.7.0 (#207558) --- pkgs/development/libraries/libquotient/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 0f75c8d1f4e5a..c112f0a33485c 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -1,25 +1,20 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, qtmultimedia }: +{ mkDerivation, lib, fetchFromGitHub, cmake, qtmultimedia, qtkeychain }: mkDerivation rec { pname = "libquotient"; - version = "0.6.11"; + version = "0.7.0"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-FPtxeZOfChIPi4e/h/eZkByH1QL3Fn0OJxe0dnMcTRw="; + sha256 = "sha256-9NAWphpAI7/qWDMjsx26s+hOaQh0hbzjePfESC7PtXc="; }; - buildInputs = [ qtmultimedia ]; + buildInputs = [ qtmultimedia qtkeychain ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - # we need libqtolm for this - "-DQuotient_ENABLE_E2EE=OFF" - ]; - # https://github.com/quotient-im/libQuotient/issues/551 postPatch = '' substituteInPlace Quotient.pc.in \ -- cgit 1.4.1 From 83458290b096ab698cd50b5458e1869d739a5c99 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 9 Jan 2023 15:36:10 +0100 Subject: cargo-llvm-cov: 0.5.2 -> 0.5.4 (#206233) --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index b57f6f29f4c0f..df204220b5beb 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.2"; + version = "0.5.4"; src = fetchzip { url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-K6r2YHQq3MEqq9aobJLZBH9COPXpW3TmX1GB1qfnV60="; + sha256 = "sha256-xBWp9+Vv1Ho63WWlvbvLU+h0dh5CpUamlRQtmX6rOeY="; }; - cargoSha256 = "sha256-oMisrS+fDzSdT6JmkAMk8kztOgw2XUOrkhehmd9gxL0="; + cargoSha256 = "sha256-GKrqB6BtRbhtOlD2YeEMh6aqblPNEJjkR+tAsSpOFig="; # skip tests which require llvm-tools-preview checkFlags = [ -- cgit 1.4.1 From bceec861237c11552f9ac34ef3f4b5a2508fcca9 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 7 Jan 2023 13:30:37 -0800 Subject: fish: 3.5.1 -> 3.6.0 https://github.com/fish-shell/fish-shell/releases/tag/3.6.0 --- pkgs/shells/fish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index f391076900e49..7c9d90aa01a11 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -135,7 +135,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -145,7 +145,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ptRbPcWkXdMXcuf439/sq8BjmG6PZ9YL18pgzIHbaSg="; + hash = "sha512-oR6nYa2s4C73+IsliTMoAFzvB/ktNi+8eUVA3KJunPyXCHjQMSyuvRnWRIPp88PiStbCffziZNF3+T1lx+9plg=="; }; # Fix FHS paths in tests -- cgit 1.4.1 From e86a7d700a82552b53eaa64e2e99a2a884f6e39a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 15:39:53 +0100 Subject: darkstat: 3.0.719 -> 3.0.721 (#209861) --- pkgs/tools/networking/darkstat/default.nix | 31 +++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index 2da581776d29a..22fdbb3e6505a 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -1,12 +1,21 @@ -{ lib, stdenv, fetchpatch, fetchurl, libpcap, zlib }: +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, fetchpatch +, libpcap +, zlib +}: stdenv.mkDerivation rec { - version = "3.0.719"; pname = "darkstat"; + version = "3.0.721"; - src = fetchurl { - url = "${meta.homepage}/${pname}-${version}.tar.bz2"; - sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf"; + src = fetchFromGitHub { + owner = "emikulic"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-kKj4fCgphoe3lojJfARwpITxQh7E6ehUew9FVEW63uQ="; }; patches = [ @@ -18,7 +27,14 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ libpcap zlib ]; + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + libpcap + zlib + ]; enableParallelBuilding = true; @@ -34,7 +50,8 @@ stdenv.mkDerivation rec { - Supports IPv6. ''; homepage = "http://unix4lyfe.org/darkstat"; - license = licenses.gpl2; + changelog = "https://github.com/emikulic/darkstat/releases/tag/${version}"; + license = licenses.gpl2Only; platforms = with platforms; unix; }; } -- cgit 1.4.1 From 319fd6bf3b1c23fc176e46b88e20ba674331052a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 16:09:32 +0100 Subject: python310Packages.aiorun: 2021.10.1 -> 2022.11.1 Diff: https://github.com/cjrh/aiorun/compare/refs/tags/v2021.10.1...v2022.11.1 Changelog: https://github.com/cjrh/aiorun/blob/v2022.11.1/CHANGES --- pkgs/development/python-modules/aiorun/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index bc6954900ae22..d40c8de96af80 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2021.10.1"; + version = "2022.11.1"; format = "flit"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cjrh"; repo = pname; - rev = "v${version}"; - hash = "sha256-9e1vUWDBv3BYWuKR/rZUvaIxFFetzBQaygXKnl4PDd8="; + rev = "refs/tags/v${version}"; + hash = "sha256-1qXt3HT/0sECOqPRwc0p+5+YZh1kyHSbkZHajcrjvZc="; }; propagatedBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Boilerplate for asyncio applications"; homepage = "https://github.com/cjrh/aiorun"; + changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; -- cgit 1.4.1 From a2b159c0a7ef6d0589a0d1697550c9aa9954b32a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 15:10:19 +0000 Subject: python310Packages.debugpy: 1.6.4 -> 1.6.5 --- pkgs/development/python-modules/debugpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 1441dced7158f..d5f500cb40583 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.6.4"; + version = "1.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Microsoft"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-THhu6Oa4x2b0chLFrJR7FF1z8X3/dsHzXosBmSqaDeI="; + sha256 = "sha256-98hyNer2Xtx6D2R3pFhLC3tb/2DFTawXO36xfwhIfEg="; }; patches = [ -- cgit 1.4.1 From 16e74638bc1df3f921702b3fb54e69408163dc9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 16:25:48 +0100 Subject: python310Packages.pontos: 22.12.3 -> 23.1.0 Diff: https://github.com/greenbone/pontos/compare/refs/tags/v22.12.3...v23.1.0 Changelog: https://github.com/greenbone/pontos/releases/tag/v23.1.0 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 9fd494ede2f50..74a34ae60b3f5 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "22.12.3"; + version = "23.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RzNc8clL6kqJuC0+KJLtgby/6Bn/CS3QLfx7Ug6TX3M="; + hash = "sha256-2ca+VGylu4Km7M2Oz76ljbhSIDehVfviwVXnV+pXFRE="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 738029e2a8ce8bbb73d96095913038565d8e681a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 16:09:31 +0000 Subject: zed: 1.3.0 -> 1.4.0 --- pkgs/development/tools/zed/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 54ba458bbb6ba..36658b506a41f 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DVQoWam5szELJ3OeIKHYF0CBZ0AJlhuIJRrdhqmyhQM="; + sha256 = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU="; }; - vendorSha256 = "sha256-2zSSjAoeb+7Nk/dxpvp5P2/bSJXgkA0TieTQHK4ym1Y="; + vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk="; subPackages = [ "cmd/zed" "cmd/zq" ]; -- cgit 1.4.1 From da527909f106aa9b2eb0ed985c5048f41ad5b6f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 11:13:55 +0000 Subject: vtm: 0.9.8g -> 0.9.8l --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 45a23b2870704..fb68b5191b2e6 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.8g"; + version = "0.9.8l"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-Q+QPRIk7EtcSZBrm9RCxSbz9cgznZQBnPwm9Qm+gH24="; + sha256 = "sha256-6hZvnZXnoS97uQKxBbSJmMN1bGp42p0v4kJH7F+3mjU="; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From fce9f6f8e21a8ad8f29e37c8f9a808e1a67753bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 16:30:48 +0100 Subject: python310Packages.aioesphomeapi: 13.0.3 -> 13.0.4 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v13.0.3...v13.0.4 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v13.0.4 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index e98c0f44e0c79..33247ba3fe4f9 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.0.3"; + version = "13.0.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gDz0eylyUae8fB+ssMZk8Mot/K9RlIIzn+B0LNdMmPs="; + hash = "sha256-pqCg4LAFIr5BEDqRWMaNc3M36bUmou5cZdarQ/0W77Y="; }; postPatch = '' -- cgit 1.4.1 From 061d7266de2856ad70750710cecf88e0ac854e49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 00:21:28 +0000 Subject: pathvector: 6.0.3 -> 6.1.0 --- pkgs/tools/networking/pathvector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix index b6c0f0b05cbd5..4b39e6cd19ddf 100644 --- a/pkgs/tools/networking/pathvector/default.nix +++ b/pkgs/tools/networking/pathvector/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pathvector"; - version = "6.0.3"; + version = "6.1.0"; src = fetchFromGitHub { owner = "natesales"; repo = "pathvector"; rev = "v${version}"; - sha256 = "sha256-WY9208bbJOSDJ9WaV8KIr65GZjqhFjdzwTga0u4oQo4="; + sha256 = "sha256-tMcoL+nvvMBCWSVD+l42e6IlOIj8ERP9pgBHcJBtegY="; }; - vendorSha256 = "sha256-R3o1L34FXbtRzJ1I2Xj4iWsiFJJWexGWYv2TmvhINe0="; + vendorHash = "sha256-+GML6a9LzHZfByHv7ODp7fHBauExsZTzUccMEeeOFNg="; CGO_ENABLED = 0; -- cgit 1.4.1 From 3d4616820ffd3a314eb8597da4072c371831d9ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 01:29:43 +0000 Subject: subgit: 3.3.15 -> 3.3.16 --- pkgs/applications/version-management/subgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/subgit/default.nix b/pkgs/applications/version-management/subgit/default.nix index 0ec06aeaaa685..a7288aa24e6e8 100644 --- a/pkgs/applications/version-management/subgit/default.nix +++ b/pkgs/applications/version-management/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.15"; + version = "3.3.16"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/subgit-${version}.zip"; - sha256 = "sha256-2/J/d4GrlLXR/7QBxgIMepzP+xxkeLvrCBwLl7Ke8wI="; + sha256 = "sha256-p7uBEG43N4Hed+8HYf3I9lQEvmYLV61oIyRrPHuGmUA="; }; } -- cgit 1.4.1 From 3d831cc1a311381a225671581ef0ab4317b6985f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 23:49:13 +0000 Subject: v2ray-geoip: 202212220043 -> 202301050046 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 4cb78dcf7c992..f00e67dfdcabe 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202212220043"; + version = "202301050046"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "4a54320369805321b90c7c5ca4cdda4f12bdd295"; - sha256 = "sha256-PFbjzzjeCKL9aak45B+R5Y+H3fTBzdXpyEvvEEdInbQ="; + rev = "6bb07558ac223b3decdff985d5737f4384b34238"; + sha256 = "sha256-KXLIIs1W+8TC2GtW3m/YA5WQ13Pq5kxC5Zc9jDzW/tU="; }; installPhase = '' -- cgit 1.4.1 From e674075ed189df704e61d14d6f697369122b5f63 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Mon, 9 Jan 2023 06:32:57 -0800 Subject: deltachat-desktop: fix build of esbuild --- .../networking/instant-messengers/deltachat-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index eb4be8d98d279..c113618bbb75f 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -43,7 +43,7 @@ let rev = "v${version}"; hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w="; }; - vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; in buildNpmPackage rec { -- cgit 1.4.1 From 84b8063c468e5ff7681381a3308aae4bdbd0cd24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 00:13:05 +0000 Subject: uxplay: 1.60 -> 1.61.1 --- pkgs/servers/uxplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index 8d128971a5522..789f3ba8d679a 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.60"; + version = "1.61.1"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-ERHn6kd/ZAo34iums2dudAqh9CdwUv2dLcn2YC7oBM0="; + sha256 = "sha256-eLTIpRmKewBghUYFot8I3iTeiI6wlU7WNs8/X3w+U80="; }; postPatch = '' -- cgit 1.4.1 From 72070c1132f175edaf02867d1c9961aa03a412e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 16:43:17 +0100 Subject: python310Packages.restrictedpython: add changelog to meta --- pkgs/development/python-modules/restrictedpython/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 6e782b1bd336a..a195c72fe8527 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - sha256 = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs="; + hash = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs="; }; checkInputs = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Restricted execution environment for Python to run untrusted code"; homepage = "https://github.com/zopefoundation/RestrictedPython"; + changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${version}/CHANGES.rst"; license = licenses.zpl21; maintainers = with maintainers; [ juaningan ]; }; -- cgit 1.4.1 From e0db41ab1aedc2aa8ef5a14ee2ee942c859144c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 12:48:21 +0000 Subject: ants: 2.4.2 -> 2.4.3 --- pkgs/applications/science/biology/ants/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 8a143d36a29b5..e117af03b57dd 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ANTs"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; rev = "v${version}"; - sha256 = "sha256-edkvTkgBNaC87Q0N/Fsebr9nRLMhDo4mrSGoMICdnwU="; + sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g="; }; nativeBuildInputs = [ cmake makeWrapper ]; -- cgit 1.4.1 From 2ec805b168c9ef754ad488e700d8c05cb948bbfd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 9 Jan 2023 23:49:49 +0800 Subject: v2ray-domain-list-community: 20221223102220 -> 20230106031328 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 3d44e34f2b0d2..14299bdc522ab 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20221223102220"; + version = "20230106031328"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-bvTNxJcogF3KxZbC8jW0PMIiJJZnzubWybDcNK7id8s="; + sha256 = "sha256-17yAIJQdxZAsNZ8W3HaW+EVKcPYy9fBOsSxU/0GEJuU="; }; vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk="; meta = with lib; { -- cgit 1.4.1 From 1f4c190affbd9c2297119e164f6615b876139781 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 9 Jan 2023 16:24:05 +0100 Subject: cubicle: 1.1.2 -> 1.2.0 --- .../applications/science/logic/cubicle/default.nix | 34 ++++++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 29 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index aa3fba635ffc1..4719a69c01285 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -1,18 +1,40 @@ -{ lib, stdenv, fetchurl, ocamlPackages }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, which +, ocamlPackages +}: stdenv.mkDerivation rec { pname = "cubicle"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz"; - sha256 = "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q"; + url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz"; + hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y="; }; + # https://github.com/cubicle-model-checker/cubicle/issues/1 postPatch = '' - substituteInPlace Makefile.in --replace "\\n" "" + substituteInPlace Makefile.in \ + --replace "@OCAMLC@" "ocamlfind ocamlc -package num" \ + --replace "@OCAMLOPT@" "ocamlfind ocamlopt -package num" ''; - buildInputs = with ocamlPackages; [ ocaml findlib functory ]; + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + which + ] ++ (with ocamlPackages; [ + findlib + ocaml + ]); + + buildInputs = with ocamlPackages; [ + functory + num + ]; meta = with lib; { description = "An open source model checker for verifying safety properties of array-based systems"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5971d6bbb3ae0..1ffde8e34ba6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36145,9 +36145,7 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - cubicle = callPackage ../applications/science/logic/cubicle { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }; + cubicle = callPackage ../applications/science/logic/cubicle { }; cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; }); -- cgit 1.4.1 From 03aa514de1dc09008e24e8fb4b949b35526a7fee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 17:29:39 +0100 Subject: python310Packages.restrictedpython: 5.2 -> 6.0 Changelog: https://github.com/zopefoundation/RestrictedPython/blob/6.0/CHANGES.rst --- pkgs/development/python-modules/restrictedpython/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index a195c72fe8527..e6e31041c2fa5 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -3,17 +3,20 @@ , fetchPypi , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "restrictedpython"; - version = "5.2"; + version = "6.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs="; + hash = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0="; }; checkInputs = [ -- cgit 1.4.1 From 89c457d847d2807a6988efc4c3e16bac32374ba1 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 9 Jan 2023 17:33:10 +0100 Subject: build-dotnet-module: fix mktemp Re-add missing `-t` arg which I erroneously removed in a98e52085584d806bd80ab203c7b75c4e361f522. Without it, the tmpdir is created in $PWD. --- pkgs/build-support/dotnet/build-dotnet-module/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index d7d6d68c6c53c..514255f324ac4 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -196,7 +196,7 @@ stdenvNoCC.mkDerivation (args // { TMPDIR= fi - export tmp=$(mktemp -d "deps-${pname}-XXXXXX") + export tmp=$(mktemp -td "deps-${pname}-XXXXXX") HOME=$tmp/home exitTrap() { -- cgit 1.4.1 From d5febb8d7a68a9b1aac6385d63974408d46ecbe2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 6 Jan 2023 21:39:28 +0200 Subject: strip-nondeterminism: 1.0.0 -> 1.13.0 https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/tags/1.13.0 move shortenPerlShebang to postBuild to fix tests --- .../perl-modules/strip-nondeterminism/default.nix | 49 +++++++++++++++------- 1 file changed, 35 insertions(+), 14 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index ba2134d1b971f..d2b28afd612fd 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -1,8 +1,17 @@ -{ lib, stdenv, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio, shortenPerlShebang }: +{ lib +, stdenv +, file +, fetchFromGitLab +, buildPerlPackage +, ArchiveZip +, ArchiveCpio +, SubOverride +, shortenPerlShebang +}: buildPerlPackage rec { pname = "strip-nondeterminism"; - version = "1.0.0"; + version = "1.13.0"; outputs = [ "out" "dev" ]; # no "devdoc" @@ -11,30 +20,42 @@ buildPerlPackage rec { repo = "strip-nondeterminism"; domain = "salsa.debian.org"; rev = version; - sha256 = "1pwar1fyadqxmvb7x4zyw2iawbi5lsfjcg0ps9n9rdjb6an7vv64"; + sha256 = "sha256-KZQeoJYBPJzUvz4wlUZbiGODbpCp7/52dsg5OemKDkI="; }; - # stray test failure - doCheck = false; - + strictDeps = true; nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; - buildInputs = [ ArchiveZip ArchiveCpio ]; - propagatedNativeBuildInputs = [ file ]; + buildInputs = [ + ArchiveZip + ArchiveCpio + ]; + + checkInputs = [ SubOverride ]; + + postPatch = '' + substituteInPlace lib/File/StripNondeterminism.pm \ + --replace "exec('file'" "exec('${lib.getExe file}'" + ''; - perlPostHook = '' + + postBuild = '' + patchShebangs ./bin + '' + lib.optionalString stdenv.isDarwin '' + shortenPerlShebang bin/strip-nondeterminism + ''; + + postInstall = '' # we don’t need the debhelper script rm $out/bin/dh_strip_nondeterminism - rm $out/share/man/man1/dh_strip_nondeterminism.1.gz + rm $out/share/man/man1/dh_strip_nondeterminism.1 ''; - postInstall = lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/strip-nondeterminism - ''; + doCheck = true; meta = with lib; { description = "A Perl module for stripping bits of non-deterministic information"; homepage = "https://reproducible-builds.org/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub artturin ]; }; } -- cgit 1.4.1 From eec6aa8119a08d6f99a6b352b1fde9a522e7765e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 16:47:01 +0000 Subject: python310Packages.graphtage: 0.2.6 -> 0.2.7 --- pkgs/development/python-modules/graphtage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index a1bec8f3a1f40..eb33bd48ece9f 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.2.6"; + version = "0.2.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0="; + sha256 = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 72191b44d719cb799464658fe0dd93c08aa55a89 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 24 Dec 2022 14:42:51 -0800 Subject: libsForQt5.maplibre-gl-native: unstable-2022-04-07 -> 2.0.1 https://github.com/maplibre/maplibre-gl-native/releases/tag/qt-v2.0.0 https://github.com/maplibre/maplibre-gl-native/releases/tag/qt-v2.0.1 --- pkgs/development/libraries/maplibre-gl-native/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/maplibre-gl-native/default.nix b/pkgs/development/libraries/maplibre-gl-native/default.nix index c680f6822b5dc..568f3fbe64e2f 100644 --- a/pkgs/development/libraries/maplibre-gl-native/default.nix +++ b/pkgs/development/libraries/maplibre-gl-native/default.nix @@ -13,14 +13,14 @@ mkDerivation rec { pname = "maplibre-gl-native"; - version = "unstable-2022-04-07"; + version = "2.0.1"; src = fetchFromGitHub { owner = "maplibre"; repo = "maplibre-gl-native"; - rev = "225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806"; + rev = "qt-v${version}"; fetchSubmodules = true; - hash = "sha256-NLtpi+bDLTHlnzMZ4YFQyF5B1xt9lzHyZPvEQLlBAnY="; + hash = "sha256-g5J873U/6mrl27iquPl3BdEGhMxkOdfP15dHr27wa48="; }; patches = [ @@ -61,6 +61,5 @@ mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.linux; - broken = lib.versionOlder qtbase.version "5.15"; }; } -- cgit 1.4.1 From 53947566423985111ed0ae6892ed1795081b5063 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 24 Dec 2022 14:44:50 -0800 Subject: libsForQt5.mapbox-gl-qml: 2.0.1 -> 2.1.1 https://github.com/rinigus/mapbox-gl-qml/releases/tag/2.1.0 https://github.com/rinigus/mapbox-gl-qml/releases/tag/2.1.1 --- pkgs/development/libraries/mapbox-gl-qml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix index a9a2ad64d7adc..1d068a90d3b31 100644 --- a/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "mapbox-gl-qml"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - hash = "sha256-EVZbQXV8pI0QTqFDTTynVglsqX1O5oK0Pl5Y/wp+/q0="; + hash = "sha256-zZcD85nOZZ067FRvSuzE8lr2gyuVxpcZGp44D4ayc3Q="; }; nativeBuildInputs = [ cmake pkg-config ]; -- cgit 1.4.1 From cc3208a83b78fbb9f4672a14aed4c3ac82280fd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 21:45:37 +0000 Subject: getmail6: 6.18.10 -> 6.18.11 --- pkgs/tools/networking/getmail6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index 965ef759ff6c3..6a8e7abd100eb 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.18.10"; + version = "6.18.11"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nRi0HUq8jEugFogerFD7Xu9fgn1njfumbwhChz2t4t8="; + hash = "sha256-EJ1lnSeawWezOYZxAHx3QX9kWGoayWZ2vkFY21l+Ijc="; }; # needs a Docker setup -- cgit 1.4.1 From f314b76c5d942cecfb5a7124380eb4cbebcc0f4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 18:06:52 +0100 Subject: python310Packages.sfrbox-api: init at 0.0.2 --- .../python-modules/sfrbox-api/default.nix | 62 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/python-modules/sfrbox-api/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix new file mode 100644 index 0000000000000..1780d94ded9b9 --- /dev/null +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, click +, defusedxml +, fetchFromGitHub +, httpx +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +}: + +buildPythonPackage rec { + pname = "sfrbox-api"; + version = "0.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "hacf-fr"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-kXM+Y7ZKKczVdKTXqmbgSxlFfHx3hAvT9nkF3Ex7ChY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pydantic = ">=1.10.2"' 'pydantic = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + defusedxml + httpx + pydantic + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ + "sfrbox_api" + ]; + + meta = with lib; { + description = "Module for the SFR Box API"; + homepage = "https://github.com/hacf-fr/sfrbox-api"; + changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1093377fe44fa..66600c0e27a94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10294,6 +10294,8 @@ self: super: with self; { sfepy = callPackage ../development/python-modules/sfepy { }; + sfrbox-api = callPackage ../development/python-modules/sfrbox-api { }; + sgmllib3k = callPackage ../development/python-modules/sgmllib3k { }; sgp4 = callPackage ../development/python-modules/sgp4 { }; -- cgit 1.4.1 From 1c7c5e95f168be2979d8f633a58bd70bf1192a8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 18:22:57 +0100 Subject: python310Packages.reolink-aio: 0.1.3 -> 0.2.1 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.1.3...0.2.1 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.2.1 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index c554f9febf431..f29ecc171b8f0 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.1.3"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - sha256 = "sha256-4qg43qxrgBSES2ng7DbjgWrsXY+3+olvUe19zW2UXCE="; + sha256 = "sha256-AscfyYURP91aDoPo/ii3uEHQL82DAHpBHlGm1MjLx8c="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 38d57d2fcb337c1259f0d8396b139595e701320d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 18:27:56 +0100 Subject: python310Packages.pyisy: 3.0.11 -> 3.0.12 Diff: https://github.com/automicus/PyISY/compare/refs/tags/v3.0.11...v3.0.12 Changelog: https://github.com/automicus/PyISY/releases/tag/v3.0.12 --- pkgs/development/python-modules/pyisy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index f2263a99dff12..d0f4437cddb3c 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.11"; + version = "3.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-oJ6Y4Bo4OLPVEy8vygU1FeRpZskfkCFBObvzTMuif5M="; + hash = "sha256-i9xC1Vijf/pU7WmRaosdEs5tPNos2hq3cGkT8MGM1Ro="; }; postPatch = '' -- cgit 1.4.1 From d291b999bd88c6906c666f3a516e1e730ffc80db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 18:30:14 +0100 Subject: python310Packages.oralb-ble: 0.15.0 -> 0.16.1 Diff: https://github.com/Bluetooth-Devices/oralb-ble/compare/refs/tags/v0.15.0...v0.16.1 Changelog: https://github.com/Bluetooth-Devices/oralb-ble/releases/tag/v0.16.1 --- pkgs/development/python-modules/oralb-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 47e649ae3f78d..256057393e774 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.15.0"; + version = "0.16.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c5bsynNozFkY1VtAesKFXpwC81d8iZd48kFBHPRf43M="; + hash = "sha256-BbIgsIzvkUlH8JrD42Afy0U5GSk9H3ut48/XPYUZSew="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ac042c6545d233711c157e13aca7537b45197ed5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 18:35:10 +0100 Subject: python310Packages.pyswitchbee: 1.7.3 -> 1.7.18 Changelog: https://github.com/jafar-atili/pySwitchbee/releases/tag/1.7.18 --- pkgs/development/python-modules/pyswitchbee/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index 47614cffdfdbb..4ee6f81ac31f0 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -4,11 +4,12 @@ , fetchFromGitHub , setuptools , pythonOlder +, packaging }: buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.7.3"; + version = "1.7.18"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,21 +18,16 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-M3sxxBp4IoqZLX9Lyw35Z0zkV6fDT7AkeDOcdPN5k7w="; + hash = "sha256-LQjtePFSMvZdAGH6f8CveaE7ASm/x9GuFj9s3TipYHQ="; }; - postPatch = '' - # https://github.com/jafar-atili/pySwitchbee/pull/2 - substituteInPlace pyproject.toml \ - --replace '"asyncio",' "" - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ aiohttp + packaging ]; # Module doesn't have tests -- cgit 1.4.1 From 64a10f0b9ba93734231debc0afe2563e98919ebe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 18:39:07 +0100 Subject: python310Packages.tailscale: add changelog to meta --- pkgs/development/python-modules/tailscale/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index e3210b4432528..63858112ced39 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -21,10 +21,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-tailscale"; - rev = "v${version}"; - sha256 = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; + rev = "refs/tags/v${version}"; + hash = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,13 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "tailscale" ]; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Tailscale API"; homepage = "https://github.com/frenck/python-tailscale"; + changelog = "https://github.com/frenck/python-tailscale/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; -- cgit 1.4.1 From d1d55b340279cfe93596a97704c134bd166e3017 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 18:44:36 +0100 Subject: python310Packages.graphtage: add changelog to meta --- .../python-modules/graphtage/default.nix | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index eb33bd48ece9f..063cece8a386d 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -1,9 +1,8 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , pytestCheckHook , pythonOlder - # Python dependencies , colorama , intervaltree , json5 @@ -16,15 +15,21 @@ buildPythonPackage rec { pname = "graphtage"; version = "0.2.7"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; + hash = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "json5==0.9.5" "json5>=0.9.5" + ''; + propagatedBuildInputs = [ colorama intervaltree @@ -35,18 +40,18 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "json5==0.9.5" "json5>=0.9.5" - ''; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "graphtage" ]; + pythonImportsCheck = [ + "graphtage" + ]; meta = with lib; { - homepage = "https://github.com/trailofbits/graphtage"; description = "A utility to diff tree-like files such as JSON and XML"; + homepage = "https://github.com/trailofbits/graphtage"; + changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ veehaitch ]; }; -- cgit 1.4.1 From d7f73e40c26d99f791dd0aecb3d6cc692721e0ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 17:44:04 +0100 Subject: python310Packages.zigpy: 0.52.3 -> 0.53.0 Diff: https://github.com/zigpy/zigpy/compare/refs/tags/0.52.3...0.53.0 Changelog: https://github.com/zigpy/zigpy/releases/tag/0.53.0 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 5fd59516d4928..893a59dffaebd 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.52.3"; + version = "0.53.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-axk6C8RLuoKWUdJ3sOklWqnlYTWKTaQh51eWZm2Dy+0="; + hash = "sha256-9KTBzPklQpqzLOQYRz6Kd0wUSHr2sfypvTu0X7om31Y="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 3e8f97fdacd8c8b750f5fddae6d239503fcee5d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 17:47:55 +0100 Subject: python310Packages.bellows: 0.34.5 -> 0.34.6 Diff: https://github.com/zigpy/bellows/compare/refs/tags/0.34.5...0.34.6 Changelog: https://github.com/zigpy/bellows/releases/tag/0.34.6 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 041af30ddfd95..a7121a2a18cc4 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.5"; + version = "0.34.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-GJG3rmJoBxDrqzsNY2r1cEywRfB4tlLn2DDsaDEI3Bo="; + hash = "sha256-J6PUVdIs9adRdFbw9yzu1Y9jU9Ge0hGxueXbE1b03og="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 8c794bcbec0f926eaa5042cd370e9ecccb3728c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 19:02:02 +0100 Subject: python310Packages.pybotvac: add changelog to meta --- pkgs/development/python-modules/pybotvac/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 394ea6e3fb0d3..3bcb15c3d1cc3 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -1,14 +1,14 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , requests , requests-oauthlib , voluptuous -, pythonOlder }: buildPythonPackage rec { - pname = "pybotvac"; + pname = "${version}"; version = "0.0.23"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { voluptuous ]; - # no tests + # Module no tests doCheck = false; pythonImportsCheck = [ @@ -35,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with Neato Botvac Connected vacuum robots"; homepage = "https://github.com/stianaske/pybotvac"; + changelog = "https://github.com/stianaske/pybotvac/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } -- cgit 1.4.1 From df7c7ae7cfd7e4cba7119dba67c18dd87c76ba81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 18:02:18 +0000 Subject: python310Packages.tpm2-pytss: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/tpm2-pytss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 0f67fe231a333..45ac7a9e8772e 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tpm2-pytss"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iN5ePKMnYh1VzGbKtwdIx1tG74T+8ax/AqDGgermr90="; + hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; }; nativeBuildInputs = [ -- cgit 1.4.1 From f176841d9842ba3c89849890d0a01f2641c13e61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 19:04:41 +0100 Subject: python310Packages.pybotvac: 0.0.23 -> 0.0.24 Changelog: https://github.com/stianaske/pybotvac/releases/tag/v0.0.24 --- pkgs/development/python-modules/pybotvac/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 3bcb15c3d1cc3..004572279abb0 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -8,15 +8,15 @@ }: buildPythonPackage rec { - pname = "${version}"; - version = "0.0.23"; + pname = "pybotvac"; + version = "0.0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VLT+VlwQAAxU1WRNCB4t4fhQ2u+6w5zqdM6mSbR7+xI="; + hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From da723790c9850111ba6ec9316418bac271600336 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Jan 2023 19:08:11 +0100 Subject: home-assistant: 2023.1.1 -> 2023.1.2 https://github.com/home-assistant/core/releases/tag/2023.1.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 332d3ebe96589..00fd11e3be3ee 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.1.1"; + version = "2023.1.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6d54d6087e005..dec3d668bff94 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -195,7 +195,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.1.1"; + hassVersion = "2023.1.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -213,7 +213,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-qgrUVPh/lSOwRm0FIU6kLuj591XdtNCtA2IMOfhKw/0="; + hash = "sha256-eryqGO2zGm/Up06sG9/flvqA2pVh4Zylvl6Y8g8IvpU="; }; # leave this in, so users don't have to constantly update their downstream patch handling -- cgit 1.4.1 From 2c8cc56ebc06256a4470be99fb923da2799c62f5 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 9 Jan 2023 19:15:31 +0100 Subject: radare2: apply patch for CVE-2022-4843 https://huntr.dev/bounties/075b2760-66a0-4d38-b3b5-e9934956ab7f/ --- pkgs/development/tools/analysis/radare2/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 72562d4935bdc..94165d992d8d6 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , buildPackages , pkg-config , meson @@ -56,6 +57,14 @@ stdenv.mkDerivation rec { hash = "sha256-9bDwtMNru7tG0L735y+Vrcg7Htk/TV9SVZn7WP4Ap4c="; }; + patches = [ + (fetchpatch { + name = "CVE-2022-4843.patch"; + url = "https://github.com/radareorg/radare2/commit/842f809d4ec6a12af2906f948657281c9ebc8a24.patch"; + sha256 = "sha256-asEXW9Ox48w9WQhOA9tleXIvynIjsWb6ItKmFTojgbQ="; + }) + ]; + preBuild = '' pushd ../libr/arch/p/arm/v35arm64 cp -r ${arm64} arch-arm64 -- cgit 1.4.1 From 2eeb34c2737f5eb8a2796701584a7b0551cb053a Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 9 Jan 2023 05:36:01 +0200 Subject: treewide: {build,host,target}Platform -> stdenv.{build,host,target}Platform --- nixos/modules/programs/steam.nix | 4 ++-- nixos/modules/services/misc/nix-daemon.nix | 6 +++--- nixos/tests/libvirtd.nix | 2 +- pkgs/applications/blockchains/zcash/default.nix | 4 ++-- pkgs/applications/editors/emacs/generic.nix | 2 +- pkgs/applications/misc/HentaiAtHome/default.nix | 3 +-- pkgs/applications/science/logic/cedille/default.nix | 3 +-- pkgs/applications/video/davinci-resolve/default.nix | 3 +-- pkgs/applications/video/losslesscut-bin/default.nix | 8 ++++---- pkgs/build-support/flutter/default.nix | 3 +-- .../build-support/rust/build-rust-crate/test/brotli-crates.nix | 6 +++--- pkgs/development/haskell-modules/configuration-common.nix | 2 +- .../libraries/science/math/tensorflow-lite/default.nix | 3 +-- pkgs/development/python-modules/rfcat/default.nix | 4 ++-- pkgs/games/BeatSaberModManager/default.nix | 4 ++-- pkgs/misc/dxvk/default.nix | 3 +-- pkgs/os-specific/darwin/xcode/default.nix | 6 +++--- pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 10 +++++----- pkgs/test/cross/default.nix | 4 ++-- pkgs/tools/compression/zfp/default.nix | 4 ++-- 20 files changed, 39 insertions(+), 45 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 1b69aac98863b..98269f6250dbf 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -12,14 +12,14 @@ in { type = types.package; default = pkgs.steam.override { extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit + if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; }; defaultText = literalExpression '' pkgs.steam.override { extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit + if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; } diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1d115108c30fb..f37d197f1621d 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -819,10 +819,10 @@ in system-features = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.hostPlatform ? gcc.arch) ( + optionals (pkgs.stdenv.hostPlatform ? gcc.arch) ( # a builder can run code for `gcc.arch` and inferior architectures - [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ - map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} or []) + [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or []) ) ); } diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix index 49258fcb93eaf..b6e6040759976 100644 --- a/nixos/tests/libvirtd.nix +++ b/nixos/tests/libvirtd.nix @@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; testScript = let - nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.hostPlatform.system}; + nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system}; virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy"; in '' start_all() diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 7466ff31d5816..04340e75a7a87 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,5 +1,5 @@ { autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub -, hexdump, hostPlatform, lib, libevent, libsodium, makeWrapper, rust, rustPlatform +, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform , pkg-config, Security, stdenv, testers, utf8cpp, util-linux, zcash, zeromq }: @@ -82,6 +82,6 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { license = licenses.mit; # https://github.com/zcash/zcash/issues/4405 - broken = hostPlatform.isAarch64 && hostPlatform.isDarwin; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index d6ce650fb8ad1..cd68f0dbf5f33 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -13,7 +13,7 @@ , alsa-lib, cairo, acl, gpm, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests , recurseIntoAttrs, emacsPackagesFor -, libgccjit, targetPlatform, makeWrapper # native-comp params +, libgccjit, makeWrapper # native-comp params , fetchFromSavannah, fetchFromBitbucket # macOS dependencies for NS and macPort diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix index 4932379ef02d5..4c94fa83485c9 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/applications/misc/HentaiAtHome/default.nix @@ -1,5 +1,4 @@ { buildPackages -, buildPlatform , fetchzip , javaOpts ? "-XX:+UseZGC" , jdk @@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ jdk makeWrapper ]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc") + LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; buildPhase = '' diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 611bbbe979f88..4d026a2d9c7a3 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -4,7 +4,6 @@ , alex , happy , Agda -, buildPlatform , buildPackages , ghcWithPackages }: @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = - lib.optionalString (buildPlatform.libc == "glibc") + lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; postPatch = '' diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index f931e905127f7..42c1d40b61256 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -3,7 +3,6 @@ , cacert , curl , runCommandLocal -, targetPlatform , unzip , appimage-run , addOpenGLRunpath @@ -49,7 +48,7 @@ let SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${targetPlatform.linuxArch})" + "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})" "AppleWebKit/537.36 (KHTML, like Gecko)" "Chrome/77.0.3865.75" "Safari/537.36" diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 267393ad0548d..02f71a94db5c9 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,7 +1,7 @@ { lib +, stdenv , callPackage , buildPackages -, hostPlatform }: let @@ -34,9 +34,9 @@ let }; in ( - if hostPlatform.system == "aarch64-darwin" then aarch64-dmg - else if hostPlatform.isDarwin then x86_64-dmg - else if hostPlatform.isCygwin then x86_64-windows + if stdenv.hostPlatform.system == "aarch64-darwin" then aarch64-dmg + else if stdenv.hostPlatform.isDarwin then x86_64-dmg + else if stdenv.hostPlatform.isCygwin then x86_64-windows else x86_64-appimage ).overrideAttrs (oldAttrs: { diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 68a6675cf543b..a5d6108513cee 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -26,7 +26,6 @@ , git , dart , nukeReferences -, targetPlatform , bash , curl , unzip @@ -57,7 +56,7 @@ let self = (self: llvmPackages_13.stdenv.mkDerivation (args // { deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) { - name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${targetPlatform.system}.tar.gz"; + name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${stdenvNoCC.targetPlatform.system}.tar.gz"; nativeBuildInputs = flutterDeps ++ [ nukeReferences diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix index ab9b0a13ae77b..4831c10627156 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix @@ -1,6 +1,6 @@ -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.buildPlatform.parsed.kernel.name; + abi = stdenv.buildPlatform.parsed.abi.name; include = includedFiles: src: builtins.filterSource (path: type: lib.lists.any (f: let p = toString (src + ("/" + f)); in diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6cbc88547bc3a..31e24ed70b173 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -452,7 +452,7 @@ self: super: { # # # Depends on itself for testing # doctest-discover = addBuildTool super.doctest-discover - # (if pkgs.buildPlatform != pkgs.hostPlatform + # (if pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform # then self.buildHaskellPackages.doctest-discover # else dontCheck super.doctest-discover); doctest-discover = dontCheck super.doctest-discover; diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index cf2346bad271e..a15b3512aec39 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -6,7 +6,6 @@ , fetchpatch , fetchurl , flatbuffers -, hostPlatform , lib , zlib }: @@ -160,7 +159,7 @@ stdenv.mkDerivation rec { mkdir "$out" # copy the static lib and binaries into the output dir - cp -r ./tensorflow/lite/tools/make/gen/linux_${hostPlatform.uname.processor}/{bin,lib} "$out" + cp -r ./tensorflow/lite/tools/make/gen/linux_${stdenv.hostPlatform.uname.processor}/{bin,lib} "$out" find ./tensorflow/lite -type f -name '*.h' | while read f; do path="$out/include/''${f/.\//}" diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix index da4f3699a761f..5648d3efddee7 100644 --- a/pkgs/development/python-modules/rfcat/default.nix +++ b/pkgs/development/python-modules/rfcat/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , future @@ -6,7 +7,6 @@ , numpy , pyserial , pyusb -, hostPlatform , pytestCheckHook , pythonOlder }: @@ -33,7 +33,7 @@ buildPythonPackage rec { pyusb ]; - postInstall = lib.optionalString hostPlatform.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/etc/udev/rules.d cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d ''; diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index ceef75f4585e1..614733e549a8a 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -1,7 +1,7 @@ { lib, dotnet-sdk, - targetPlatform, + stdenv, substituteAll, buildDotnetModule, @@ -34,7 +34,7 @@ buildDotnetModule rec { patches = [ (substituteAll { src = ./add-runtime-identifier.patch; - runtimeIdentifier = dotnetCorePackages.systemToDotnetRid targetPlatform.system; + runtimeIdentifier = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; }) ]; diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index 7d5af28d81072..b93c46f09100b 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -1,6 +1,5 @@ { lib , pkgs -, hostPlatform , stdenvNoCC , fetchFromGitHub , pkgsCross @@ -8,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: let - inherit (hostPlatform.uname) system; + inherit (stdenvNoCC.hostPlatform.uname) system; # DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that # needs to be built with a cross-compiler. dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 2ce607896b5ea..6d1929ef982ce 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,10 +1,10 @@ -{ buildPlatform, requireFile, targetPlatform, lib }: +{ stdenv, requireFile, lib }: let requireXcode = version: sha256: let xip = "Xcode_" + version + ".xip"; # TODO(alexfmpe): Find out how to validate the .xip signature in Linux - unxip = if buildPlatform.isDarwin + unxip = if stdenv.buildPlatform.isDarwin then '' open -W ${xip} rm -rf ${xip} @@ -66,6 +66,6 @@ in lib.makeExtensible (self: { xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp"; xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v"; xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (targetPlatform ? xcodeVer) then targetPlatform.xcodeVer else "12.3")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index 0512d9dd46a17..50eb50ea6b787 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -1,4 +1,4 @@ -{ targetPlatform +{ stdenv , clang-unwrapped , binutils-unwrapped , runCommand @@ -12,7 +12,7 @@ let -minSdkVersion = targetPlatform.minSdkVersion or "9.0"; +minSdkVersion = stdenv.targetPlatform.minSdkVersion or "9.0"; in @@ -22,8 +22,8 @@ rec { type = "derivation"; outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk"; - platform = targetPlatform.xcodePlatform; - version = targetPlatform.sdkVer; + platform = stdenv.targetPlatform.xcodePlatform; + version = stdenv.targetPlatform.sdkVer; }; binutils = wrapBintoolsWith { @@ -39,7 +39,7 @@ rec { extraBuildCommands = '' tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp mv cc-cflags.tmp $out/nix-support/cc-cflags - echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags ${lib.optionalString (lib.versionAtLeast sdk.version "14") "echo -isystem ${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 >> $out/nix-support/cc-cflags"} ''; diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index c5a2414377327..beb64df195773 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -8,7 +8,7 @@ let ) lib.systems.examples; getExecutable = pkgs: pkgFun: exec: - "${pkgFun pkgs}${exec}${pkgs.hostPlatform.extensions.executable}"; + "${pkgFun pkgs}${exec}${pkgs.stdenv.hostPlatform.extensions.executable}"; compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let pkgName = (pkgFun hostPkgs).name; @@ -55,7 +55,7 @@ let mapMultiPlatformTest = crossSystemFun: test: lib.mapAttrs (name: system: test rec { crossPkgs = import pkgs.path { - localSystem = { inherit (pkgs.hostPlatform) config; }; + localSystem = { inherit (pkgs.stdenv.hostPlatform) config; }; crossSystem = crossSystemFun system; }; diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index 1b943b3e41ab6..2d3890484e791 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -1,7 +1,7 @@ -{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv, targetPlatform +{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv , enableCfp ? true , enableCuda ? false -, enableFortran ? builtins.elem targetPlatform.system gfortran.meta.platforms +, enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms , enableOpenMP ? true , enablePython ? true , enableUtilities ? true }: -- cgit 1.4.1 From 90901235c571c53cc79b983c954f5581619495e7 Mon Sep 17 00:00:00 2001 From: Keegan Dahm Date: Fri, 6 Jan 2023 18:53:17 -0800 Subject: protobuf: fix uses of .override --- pkgs/development/libraries/protobuf/3.17.nix | 6 +++--- pkgs/development/libraries/protobuf/3.19.nix | 6 +++--- pkgs/development/libraries/protobuf/3.20.nix | 6 +++--- pkgs/development/libraries/protobuf/3.21.nix | 6 +++--- pkgs/development/libraries/protobuf/3.8.nix | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/protobuf/3.17.nix b/pkgs/development/libraries/protobuf/3.17.nix index d869b9ce76ef7..36198b5d337b2 100644 --- a/pkgs/development/libraries/protobuf/3.17.nix +++ b/pkgs/development/libraries/protobuf/3.17.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.17.3"; sha256 = "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d"; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix index c62e4d46ce8b2..7ee378d8ed3b7 100644 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ b/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.19.6"; sha256 = "sha256-+ul9F8tyrwk2p25Dd9ragqwpYzdxdeGjpXhLAwKYWfM="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix index 818e65639e578..bae3550f8f05a 100644 --- a/pkgs/development/libraries/protobuf/3.20.nix +++ b/pkgs/development/libraries/protobuf/3.20.nix @@ -1,6 +1,6 @@ -{ callPackage, abseil-cpp, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.20.3"; sha256 = "sha256-u/1Yb8+mnDzc3OwirpGESuhjkuKPgqDAvlgo3uuzbbk="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix index 6ba9ca31aba6d..1892ac2ea0e7c 100644 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ b/pkgs/development/libraries/protobuf/3.21.nix @@ -1,6 +1,6 @@ -{ callPackage, abseil-cpp, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3-cmake.nix { +callPackage ./generic-v3-cmake.nix ({ version = "3.21.8"; sha256 = "sha256-cSNHX18CvMmydpYWqfe6WWk9rGxIlFfY/85rfSyznU4="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.8.nix b/pkgs/development/libraries/protobuf/3.8.nix index 2ea03643b3ae0..fe5ad4b4e02f8 100644 --- a/pkgs/development/libraries/protobuf/3.8.nix +++ b/pkgs/development/libraries/protobuf/3.8.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.8.0"; sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8"; -} +} // args) -- cgit 1.4.1 From 9ad7623ebe76c952ee283ec83690bb22ca7cb625 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 10 Jan 2023 00:37:56 +0100 Subject: ocamlPackages.biniou: 1.2.1 → 1.2.2 (#208852) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Et7f3 --- pkgs/development/ocaml-modules/biniou/default.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index ff3b87699356d..22d2b643b279b 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,29 +1,21 @@ -{ lib, fetchFromGitHub, buildDunePackage, easy-format }: +{ lib, fetchurl, buildDunePackage, camlp-streams, easy-format }: buildDunePackage rec { pname = "biniou"; - version = "1.2.1"; + version = "1.2.2"; - useDune2 = true; - - src = fetchFromGitHub { - owner = "ocaml-community"; - repo = pname; - rev = version; - sha256 = "0x2kiy809n1j0yf32l7hj102y628jp5jdrkbi3z7ld8jq04h1790"; + src = fetchurl { + url = "https://github.com/ocaml-community/biniou/releases/download/${version}/biniou-${version}.tbz"; + hash = "sha256-i/P/F80Oyy1rbR2UywjvCJ1Eyu+W6brmvmg51Cj6MY8="; }; - propagatedBuildInputs = [ easy-format ]; + propagatedBuildInputs = [ camlp-streams easy-format ]; strictDeps = true; - postPatch = '' - patchShebangs . - ''; - meta = { description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-community/biniou"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "bdump"; -- cgit 1.4.1 From 34dd176116870d24d6a5b93e263e79edad06fd00 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 6 Jan 2023 15:11:47 -0500 Subject: gmsh: enable python bindings --- pkgs/applications/science/math/gmsh/default.nix | 18 +++++++- .../science/math/gmsh/fix-python.patch | 50 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/science/math/gmsh/fix-python.patch (limited to 'pkgs') diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 3153c128057a5..4d9b3afe31ca4 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg -, zlib, libGL, libGLU, xorg, opencascade-occt }: +, zlib, libGL, libGLU, xorg, opencascade-occt +, python ? null, enablePython ? false }: assert (!blas.isILP64) && (!lapack.isILP64); +assert enablePython -> (python != null); stdenv.mkDerivation rec { pname = "gmsh"; @@ -18,10 +20,16 @@ stdenv.mkDerivation rec { libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE - ]; + ] ++ lib.optional enablePython python; enableParallelBuilding = true; + patches = [ ./fix-python.patch ]; + + postPatch = '' + substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so + ''; + # N.B. the shared object is used by bindings cmakeFlags = [ "-DENABLE_BUILD_SHARED=ON" @@ -31,6 +39,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gfortran ]; + postFixup = lib.optionalString enablePython '' + mkdir -p $out/lib/python${python.pythonVersion}/site-packages + mv $out/lib/gmsh.py $out/lib/python${python.pythonVersion}/site-packages + mv $out/lib/*.dist-info $out/lib/python${python.pythonVersion}/site-packages + ''; + doCheck = true; meta = { diff --git a/pkgs/applications/science/math/gmsh/fix-python.patch b/pkgs/applications/science/math/gmsh/fix-python.patch new file mode 100644 index 0000000000000..ac07c169c99b8 --- /dev/null +++ b/pkgs/applications/science/math/gmsh/fix-python.patch @@ -0,0 +1,50 @@ +diff --git a/api/gmsh.py b/api/gmsh.py +index 747acb203..02004da5d 100644 +--- a/api/gmsh.py ++++ b/api/gmsh.py +@@ -44,44 +44,7 @@ moduledir = os.path.dirname(os.path.realpath(__file__)) + parentdir1 = os.path.dirname(moduledir) + parentdir2 = os.path.dirname(parentdir1) + +-if platform.system() == "Windows": +- libname = "gmsh-4.11.dll" +-elif platform.system() == "Darwin": +- libname = "libgmsh.4.11.dylib" +-else: +- libname = "libgmsh.so.4.11" +- +-# check if the library is in the same directory as the module... +-libpath = os.path.join(moduledir, libname) +- +-# ... or in the parent directory or its lib or Lib subdirectory +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, "lib", libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, "Lib", libname) +- +-# ... or in the parent of the parent directory or its lib or Lib subdirectory +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, "lib", libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, "Lib", libname) +- +-# if we couldn't find it, use ctype's find_library utility... +-if not os.path.exists(libpath): +- if platform.system() == "Windows": +- libpath = find_library("gmsh-4.11") +- if not libpath: +- libpath = find_library("gmsh") +- else: +- libpath = find_library("gmsh") +- +-# ... and print a warning if everything failed +-if not os.path.exists(libpath): +- print("Warning: could not find Gmsh shared library " + libname) ++libpath = "@LIBPATH@" + + lib = CDLL(libpath) + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d47835b1568ed..972ae3b4b3df3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3807,6 +3807,10 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; + gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { + enablePython = true; + }); + gntp = callPackage ../development/python-modules/gntp { }; gnureadline = callPackage ../development/python-modules/gnureadline { }; -- cgit 1.4.1