cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Weijia Wang 2023-12-08 22:09:49 +01:00
commit ad7edda3e2
44 changed files with 263 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/doc/manual/release-notes/rl-2405.section.md
View file

@ -40,6 +40,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- Cinnamon has been updated to 6.0. Please beware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release.
- `services.postgresql.extraPlugins` changed its type from just a list of packages to also a function that returns such a list.
For example a config line like ``services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ postgis ];`` is recommended to be changed to ``services.postgresql.extraPlugins = ps: with ps; [ postgis ];``;
- Programs written in [Nim](https://nim-lang.org/) are built with libraries selected by lockfiles.
The `nimPackages` and `nim2Packages` sets have been removed.
See https://nixos.org/manual/nixpkgs/unstable#nim for more information.

2
nixos/modules/services/databases/postgresql.md
View file

@ -258,7 +258,7 @@ postgresql_15.pkgs.pg_partman postgresql_15.pkgs.pgroonga
To add plugins via NixOS configuration, set `services.postgresql.extraPlugins`:
```
services.postgresql.package = pkgs.postgresql_12;
services.postgresql.extraPlugins = with pkgs.postgresql_12.pkgs; [
services.postgresql.extraPlugins = ps: with ps; [
pg_repack
postgis
];

11
nixos/modules/services/databases/postgresql.nix
View file

@ -18,7 +18,7 @@ let
in
if cfg.extraPlugins == []
then base
else base.withPackages (_: cfg.extraPlugins);
else base.withPackages cfg.extraPlugins;
toStr = value:
if true == value then "yes"
@ -391,12 +391,11 @@ in
};
extraPlugins = mkOption {
type = types.listOf types.path;
default = [];
example = literalExpression "with pkgs.postgresql_15.pkgs; [ postgis pg_repack ]";
type = with types; coercedTo (listOf path) (path: _ignorePg: path) (functionTo (listOf path));
default = _: [];
example = literalExpression "ps: with ps; [ postgis pg_repack ]";
description = lib.mdDoc ''
List of PostgreSQL plugins. PostgreSQL version for each plugin should
match version for `services.postgresql.package` value.
List of PostgreSQL plugins.
'';
};

2
nixos/modules/services/web-apps/mobilizon.nix
View file

@ -384,7 +384,7 @@ in
ensureDBOwnership = false;
}
];
extraPlugins = with postgresql.pkgs; [ postgis ];
extraPlugins = ps: with ps; [ postgis ];
};
# Nginx config taken from support/nginx/mobilizon-release.conf

2
nixos/tests/pgjwt.nix
View file

@ -11,7 +11,7 @@ with pkgs; {
{
services.postgresql = {
enable = true;
extraPlugins = [ pgjwt pgtap ];
extraPlugins = ps: with ps; [ pgjwt pgtap ];
};
};
};

6
nixos/tests/postgis.nix
View file

@ -9,10 +9,10 @@ import ./make-test-python.nix ({ pkgs, ...} : {
{ pkgs, ... }:
{
services.postgresql = let mypg = pkgs.postgresql; in {
services.postgresql = {
enable = true;
package = mypg;
extraPlugins = with mypg.pkgs; [
package = pkgs.postgresql;
extraPlugins = ps: with ps; [
postgis
];
};

2
nixos/tests/promscale.nix
View file

@ -27,7 +27,7 @@ let
services.postgresql = {
enable = true;
package = postgresql-package;
extraPlugins = with postgresql-package.pkgs; [
extraPlugins = ps: with ps; [
timescaledb
promscale_extension
];

2
nixos/tests/timescaledb.nix
View file

@ -52,7 +52,7 @@ let
services.postgresql = {
enable = true;
package = postgresql-package;
extraPlugins = with postgresql-package.pkgs; [
extraPlugins = ps: with ps; [
timescaledb
timescaledb_toolkit
];

2
nixos/tests/tsja.nix
View file

@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
{
services.postgresql = {
enable = true;
extraPlugins = with config.services.postgresql.package.pkgs; [
extraPlugins = ps: with ps; [
tsja
];
};

4
pkgs/applications/video/flowblade/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "flowblade";
version = "2.10.0.4";
version = "2.12";
src = fetchFromGitHub {
owner = "jliljebl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IjutDCp+wrvXSQzvELuPMdW/16Twi0ee8VjdAFyi+OE=";
sha256 = "sha256-HVDyrEgQ5Lgqpagh+DEb4BjoByJz6VdE/NWMCX1mabU=";
};
buildInputs = [

4
pkgs/applications/video/media-downloader/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "media-downloader";
version = "4.0.0";
version = "4.1.0";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "media-downloader";
rev = finalAttrs.version;
hash = "sha256-ucANfu28Co88btr4YEBENuxkOOTL/9V5JdN8cRq944Q=";
hash = "sha256-x2uM4z4nQd761aj8PVlFH0MbWzwWRiR7ItzLQVOc1Zw=";
};
nativeBuildInputs = [

4
pkgs/applications/virtualization/podman-tui/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "podman-tui";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-tui";
rev = "v${version}";
hash = "sha256-l6jbc/+Fi5xx7yhK0e5/iqcm7i8JnU37Qr4niVG4OvU=";
hash = "sha256-d2T2A4LsZQ09w7ZsVceqCGaO8wijRGGsk3hLhMykM9U=";
};
vendorHash = null;

4
pkgs/desktops/gnustep/gui/default.nix
View file

@ -1,12 +1,12 @@
{ gsmakeDerivation, fetchzip, base }:
gsmakeDerivation rec {
version = "0.29.0";
version = "0.30.0";
pname = "gnustep-gui";
src = fetchzip {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz";
sha256 = "0x6n48p178r4zd8f4sqjfqd6rp49w00wr59w19lpwlmrdv7bn538";
sha256 = "sha256-24hL4TeIY6izlhQUcxKI0nXITysAPfRrncRqsDm2zNk=";
};
buildInputs = [ base ];
patches = [

3
pkgs/desktops/lomiri/default.nix
View file

@ -19,6 +19,9 @@ let
lomiri-api = callPackage ./development/lomiri-api { };
u1db-qt = callPackage ./development/u1db-qt { };
#### QML / QML-related
lomiri-settings-components = callPackage ./qml/lomiri-settings-components { };
#### Services
biometryd = callPackage ./services/biometryd { };
hfd-service = callPackage ./services/hfd-service { };

65
pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix Normal file
View file

@ -0,0 +1,65 @@
{ stdenv
, lib
, fetchFromGitLab
, gitUpdater
, cmake
, cmake-extras
, pkg-config
, python3
, qtbase
, qtdeclarative
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-settings-components";
version = "1.1.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-settings-components";
rev = finalAttrs.version;
hash = "sha256-13uxUBM+uOmt8X0uLGWNP8YbwCdb2QCChB8IP3td5a4=";
};
postPatch = ''
patchShebangs tests/imports/check_imports.py
substituteInPlace CMakeLists.txt \
--replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" '${placeholder "out"}/${qtbase.qtQmlPrefix}'
'' + lib.optionalString (!finalAttrs.doCheck) ''
sed -i CMakeLists.txt \
-e '/add_subdirectory(tests)/d'
'';
strictDeps = true;
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
cmake-extras
qtbase
qtdeclarative
];
nativeCheckInputs = [
python3
];
# No apps, just QML components
dontWrapQtApps = true;
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "QML settings components for the Lomiri Desktop Environment";
homepage = "https://gitlab.com/ubports/development/core/lomiri-settings-components";
license = licenses.lgpl3Only;
maintainers = teams.lomiri.members;
platforms = platforms.linux;
};
})

2
pkgs/development/compilers/llvm/git/clang/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, llvm_meta
, monorepoSrc, runCommand
, substituteAll, cmake, ninja, libxml2, libllvm, version, python3
, cmake, ninja, libxml2, libllvm, version, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false

6
pkgs/development/compilers/llvm/git/compiler-rt/default.nix
View file

@ -10,7 +10,7 @@ let
bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none";
haveLibc = stdenv.cc.libc != null;
isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic;
inherit (stdenv.hostPlatform) isMusl isGnu;
inherit (stdenv.hostPlatform) isMusl;
baseName = "compiler-rt";
@ -119,9 +119,9 @@ stdenv.mkDerivation {
'';
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) ''
ln -s "$out/lib"/*/* "$out/lib"
'' + lib.optionalString (useLLVM) ''
'' + lib.optionalString (useLLVM && stdenv.hostPlatform.isLinux) ''
ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
# Note the history of crt{begin,end}S in previous versions of llvm in nixpkg:

57
pkgs/development/compilers/llvm/git/default.nix
View file

@ -20,7 +20,7 @@
, gitRelease ? {
version = "18.0.0";
rev = "6f44f87011cd52367626cac111ddbb2d25784b90";
rev-version = "unstable-2023-10-04";
rev-version = "18.0.0-unstable-2023-10-04";
sha256 = "sha256-CqsCDlzg8I2c9BybKP7B5nfHiQWktqgVavrfiYkjkx4=";
}
# i.e.:
@ -59,9 +59,10 @@ in
let
monorepoSrc' = monorepoSrc;
in let
# Import releaseInfo separately to avoid infinite recursion
inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;
inherit (releaseInfo) release_version version;
inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc;
tools = lib.makeExtensible (tools: let
@ -155,18 +156,8 @@ in let
cp -r ${monorepoSrc}/lldb "$out"
'') { };
patches =
let
resourceDirPatch = callPackage
({ substituteAll, libclang }: substituteAll
{
src = ./lldb/resource-dir.patch;
clangLibDir = "${libclang.lib}/lib";
})
{ };
in
[
# FIXME: do we need this? ./procfs.patch
resourceDirPatch
./lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
@ -219,14 +210,6 @@ in let
[ "-rtlib=compiler-rt"
"-Wno-unused-command-line-argument"
"-B${targetLlvmLibraries.compiler-rt}/lib"
# Combat "__cxxabi_config.h not found". Maybe this could be fixed by
# copying these headers into libcxx? Note that building libcxx
# outside of monorepo isn't supported anymore, might be related to
# https://github.com/llvm/llvm-project/issues/55632
# ("16.0.3 libcxx, libcxxabi: circular build dependencies")
# Looks like the machinery changed in https://reviews.llvm.org/D120727.
"-I${lib.getDev targetLlvmLibraries.libcxx.cxxabi}/include/c++/v1"
]
++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind"
++ lib.optional
@ -243,11 +226,13 @@ in let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;
nixSupport.cc-cflags = [
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
"-nostdlib++"
];
nixSupport.cc-cflags =
[
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
"-nostdlib++"
]
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
};
clangNoLibc = wrapCCWith rec {
@ -258,10 +243,12 @@ in let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;
nixSupport.cc-cflags = [
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
];
nixSupport.cc-cflags =
[
"-rtlib=compiler-rt"
"-B${targetLlvmLibraries.compiler-rt}/lib"
]
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
};
clangNoCompilerRt = wrapCCWith rec {
@ -270,16 +257,22 @@ in let
bintools = bintoolsNoLibc';
extraPackages = [ ];
extraBuildCommands = mkExtraBuildCommands0 cc;
nixSupport.cc-cflags = [ "-nostartfiles" ];
nixSupport.cc-cflags =
[
"-nostartfiles"
]
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
};
clangNoCompilerRtWithLibc = wrapCCWith rec {
clangNoCompilerRtWithLibc = wrapCCWith (rec {
cc = tools.clang-unwrapped;
libcxx = null;
bintools = bintools';
extraPackages = [ ];
extraBuildCommands = mkExtraBuildCommands0 cc;
};
} // lib.optionalAttrs stdenv.targetPlatform.isWasm {
nixSupport.cc-cflags = [ "-fno-exceptions" ];
});
});

3
pkgs/development/compilers/llvm/git/libcxx/default.nix
View file

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
buildInputs =
lib.optionals (!headersOnly) [ cxxabi ]
++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ];
++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ libunwind ];
cmakeFlags = let
# See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string
@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
"-DLIBCXX_ENABLE_THREADS=OFF"
"-DLIBCXX_ENABLE_FILESYSTEM=OFF"
"-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
"-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker
] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"
# If we're only building the headers we don't actually *need* a functioning
# C/C++ compiler:

7
pkgs/development/compilers/llvm/git/libcxxabi/default.nix
View file

@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
postUnpack = lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch}
'';
prePatch = ''
@ -65,7 +63,7 @@ stdenv.mkDerivation rec {
# CMake however checks for this anyways; this flag tells it not to. See:
# https://github.com/llvm/llvm-project/blob/4bd3f3759259548e159aeba5c76efb9a0864e6fa/llvm/runtimes/CMakeLists.txt#L243
"-DCMAKE_CXX_COMPILER_WORKS=ON"
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
# libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib,
@ -74,8 +72,11 @@ stdenv.mkDerivation rec {
"-DCMAKE_EXE_LINKER_FLAGS=-nostdlib"
"-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DCMAKE_C_COMPILER_WORKS=ON"
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DLIBCXXABI_ENABLE_THREADS=OFF"
"-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
"-DUNIX=ON"
] ++ lib.optionals (!enableShared) [
"-DLIBCXXABI_ENABLE_SHARED=OFF"
];

14
pkgs/development/compilers/llvm/git/lldb/resource-dir.patch
View file

@ -1,14 +0,0 @@
diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake
index ec06ba285f27..286162f098fb 100644
--- a/cmake/modules/LLDBConfig.cmake
+++ b/cmake/modules/LLDBConfig.cmake
@@ -290,7 +290,8 @@ if (NOT TARGET clang-resource-headers)
# could be and pick the first that exists.
foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}"
"${LLVM_BUILD_LIBRARY_DIR}"
- "${LLVM_LIBRARY_DIR}")
+ "${LLVM_LIBRARY_DIR}"
+ "@clangLibDir@")
# Build the resource directory path by appending 'clang/<version number>'.
set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}")
if (IS_DIRECTORY "${CANDIDATE_RESOURCE_DIR}")

3
pkgs/development/compilers/llvm/git/llvm/default.nix
View file

@ -2,7 +2,6 @@
, pkgsBuildBuild
, monorepoSrc
, runCommand
, fetchpatch
, cmake
, darwin
, ninja
@ -237,6 +236,8 @@ in
rm test/tools/gold/X86/split-dwarf.ll
rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s
rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s
rm test/CodeGen/RISCV/attributes.ll
rm test/CodeGen/RISCV/xtheadmempair.ll
'' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
# Seems to require certain floating point hardware (NEON?)
rm test/ExecutionEngine/frem.ll

8
pkgs/development/php-packages/composer/default.nix
View file

@ -5,7 +5,7 @@ php.buildComposerProject (finalAttrs: {
# use together with the version from this package to keep the
# bootstrap phar file up-to-date together with the end user composer
# package.
passthru.pharHash = "sha256-mhjho6rby5TBuv1sSpj/kx9LQ6RW70hXUTBGbhnwXdY=";
passthru.pharHash = "sha256-cmACAcc8fEshjxwFEbNthTeWPjaq+iRHV/UjCfiFsxQ=";
composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix {
inherit (finalAttrs) version;
@ -13,13 +13,13 @@ php.buildComposerProject (finalAttrs: {
};
pname = "composer";
version = "2.6.5";
version = "2.6.6";
src = fetchFromGitHub {
owner = "composer";
repo = "composer";
rev = finalAttrs.version;
hash = "sha256-CKP7CYOuMKpuWdVveET2iLJPKJyCnv5YVjx4DE68UoE=";
hash = "sha256-KsTZi7dSlQcAxoen9rpofbptVdLYhK+bZeDSXQY7o5M=";
};
nativeBuildInputs = [ makeBinaryWrapper ];
@ -29,7 +29,7 @@ php.buildComposerProject (finalAttrs: {
--prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]}
'';
vendorHash = "sha256-SG5RsKaP7zqJY2vjvULuNdf7w6tAGh7/dlxx2Pkfj2A=";
vendorHash = "sha256-50M1yeAKl9KRsjs34cdb5ZTBFgbukgg0cMtHTYGJ/EM=";
meta = {
changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "cloudflare";
version = "2.12.4";
version = "2.14.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-UX8ROC6pL8WR82zJupUkPac+aDReUvIh8D1R1ujXhqU=";
hash = "sha256-HeSaiJKI2C3FwPKip0ZVKWe5nZYGP13zpXpwNkLiQLQ=";
};
propagatedBuildInputs = [

35
pkgs/development/python-modules/duckduckgo-search/default.nix
View file

@ -1,30 +1,34 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
, setuptools
{ lib
, aiofiles
, buildPythonPackage
, click
, fetchFromGitHub
, h2
, httpx
, lxml
, pythonOlder
, requests
, setuptools
, socksio
}:
buildPythonPackage rec {
pname = "duckduckgo-search";
version = "3.9.4";
version = "3.9.9";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "deedy5";
repo = "duckduckgo_search";
rev = "refs/tags/v${version}";
hash = "sha256-R96ezs0INIZAXTcD1eWXuj4MSJvCbtbgzgC3ls7wYyI=";
hash = "sha256-swuMCobYF5u41O1Qp5Gx/n8BIgSEnhRVZ5Owk3IPbeI=";
};
format = "pyproject";
nativeBuildInputs = [ setuptools ];
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiofiles
@ -38,12 +42,15 @@ buildPythonPackage rec {
++ httpx.optional-dependencies.http2
++ httpx.optional-dependencies.socks;
pythonImportsCheck = [ "duckduckgo_search" ];
pythonImportsCheck = [
"duckduckgo_search"
];
meta = {
description = "A python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine";
meta = with lib; {
description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine";
homepage = "https://github.com/deedy5/duckduckgo_search";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
changelog = "https://github.com/deedy5/duckduckgo_search/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

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

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "flet-core";
version = "0.10.1";
version = "0.15.0";
format = "pyproject";
src = fetchPypi {
pname = "flet_core";
inherit version;
hash = "sha256-YLtHnKBlXkUJJkQzxnDkfl6+gSGm05GXYPGEU3XO/jI=";
hash = "sha256-nmQHWyLlyo6CVzn+dlTSnA10XRoSFBLEeYdcWpfoGBo=";
};
nativeBuildInputs = [
@ -33,6 +33,7 @@ buildPythonPackage rec {
doCheck = false;
meta = {
changelog = "https://github.com/flet-dev/flet/releases/tag/v${version}";
description = "The library is the foundation of Flet framework and is not intended to be used directly";
homepage = "https://flet.dev/";
license = lib.licenses.asl20;

42
pkgs/development/python-modules/flet-runtime/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, poetry-core
, flet-core
, httpx
, oauthlib
}:
buildPythonPackage rec {
pname = "flet-runtime";
version = "0.15.0";
format = "pyproject";
src = fetchPypi {
pname = "flet_runtime";
inherit version;
hash = "sha256-CRrAz1V6bISgL2MU7ibhhNEB5IdiQKjRdIt2dmZh0h4=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
flet-core
httpx
oauthlib
];
pythonImportsCheck = [
"flet_runtime"
];
meta = {
changelog = "https://github.com/flet-dev/flet/releases/tag/v${version}";
description = "A base package for Flet desktop and Flet mobile";
homepage = "https://flet.dev/";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.wegank ];
};
}

18
pkgs/development/python-modules/flet/default.nix
View file

@ -7,10 +7,12 @@
# propagates
, flet-core
, flet-runtime
, httpx
, oauthlib
, packaging
, typing-extensions
, qrcode
, rich
, watchdog
, websocket-client
, websockets
@ -19,33 +21,29 @@
buildPythonPackage rec {
pname = "flet";
version = "0.10.1";
version = "0.15.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-Ogy4F9/beSb3GCpwPsN+8hsVroRoHTSojqg+5eXwcRI=";
hash = "sha256-NnozZX8i5QsnVRW5cyIvKxYuHf9EoR6owWSQw6Y4dwQ=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'httpx = "^0.23' 'httpx = ">=0.23' \
--replace 'watchdog = "^2' 'watchdog = ">=2'
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
flet-core
typing-extensions
flet-runtime
websocket-client
watchdog
oauthlib
websockets
httpx
packaging
qrcode
rich
];
doCheck = false;

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "galois";
version = "0.3.6";
version = "0.3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mhostetter";
repo = "galois";
rev = "refs/tags/v${version}";
hash = "sha256-Lt55HUTBmrg0IX9oWUdh5zyxccViKq0X+9bhDEgUZjQ=";
hash = "sha256-dWYnD+Byh0orRg20/nhu8ILooFBeHysxQ403boDVqYk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "globus-sdk";
version = "3.31.0";
version = "3.32.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "globus";
repo = "globus-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-MJW0B3AXDYSVgNkv8iBA2+pOKrlI7pZeJfunMMxABx8=";
hash = "sha256-otf1A8onfi6u3Vv7IxBtziLEy2UqVeJxw1u+XIfSchA=";
};
propagatedBuildInputs = [

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "glom";
version = "23.3.0";
version = "23.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-AxaZKA+kZmBI5D0uq2i+EET/zUh6t0rLeS3i7rC8JRU=";
hash = "sha256-Bq9eNIaqzFk4K6NOU+vqvXqTRdePfby+4m8DuqS4O6w=";
};
postPatch = ''

6
pkgs/development/python-modules/gocardless-pro/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "gocardless-pro";
version = "1.48.0";
version = "1.49.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "gocardless";
repo = "gocardless-pro-python";
rev = "refs/tags/v${version}";
hash = "sha256-9229lwCtVu4Pfru6e9JdbP3KUUYojBLuNQ+volP6OX0=";
rev = "refs/tags/${version}";
hash = "sha256-jhZfbJLf/gMXfErVbO2erBxgULmKyp1C0+t0k1d0o54=";
};
propagatedBuildInputs = [

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

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "google-cloud-asset";
version = "3.20.0";
version = "3.20.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-lJLC1igiY0OYLu3eyuOvJ2KmFr9n4su8T7LPgWlUtCk=";
hash = "sha256-Q6PcdzQ4iCB/dM0YKCUMdfZ1e6oEfG6d40gsUfMLhOQ=";
};
propagatedBuildInputs = [

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

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-storage";
version = "2.22.0";
version = "2.23.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9tjHs6ubV0xml3/O6dM24zStGjhDpyK+GRI2QOeAjqM=";
hash = "sha256-hJbG0wV177IkwYlAVm+awAbTsSCudZACkYaXw0B5l+Y=";
};
propagatedBuildInputs = [

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.33.0";
version = "2.35.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-dpJmSe7NjmmDqd0GrLxm1e/VFvo64+ECNRVwuRpjrmI=";
hash = "sha256-d8ASZS2Zp6d/0d4t52w/ZGLXXQdTkUZrA0DGWKCamZY=";
};
propagatedBuildInputs = [

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
version = "1.24.0";
version = "1.24.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-KsXsWGEUwD0UFRD7V4rfqEuRjyWeU/PmPdh8X6djhG0=";
hash = "sha256-P1Hj4HidTr4R29PwpAhT5xn6sTKDo6gL6M7AgunEU5k=";
};
propagatedBuildInputs = [

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

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "holoviews";
version = "1.18.0";
version = "1.18.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-urcpYat6GHlNsmk1HZBVI/Kq3K1ZOzIVEpJ86T3J35E=";
hash = "sha256-gFxzU65S6XdT5/BmiwUaCGQQ4tLBPI/ilOu0zdArIyQ=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/xattr/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "xattr";
version = "0.10.1";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-wS59gf+qBgWzrIwiwplKjhipzxxZKHobdyKiKJyVLsU=";
hash = "sha256-osfLLvRBv2eeJAtl4gXwij7jFeGQ/qVnPmD9aBLmNKU=";
};
propagatedBuildInputs = [

17
pkgs/development/tools/symfony-cli/default.nix
View file

@ -1,26 +1,28 @@
{ buildGoModule
, fetchFromGitHub
, lib
, nix-update-script
, testers
, symfony-cli
}:
buildGoModule rec {
pname = "symfony-cli";
version = "5.7.4";
version = "5.7.5";
vendorHash = "sha256-2+Q93tm3ooOd/m6aUWAwFGh5CzARPNISNx0Tcrjc7NY=";
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
rev = "v${version}";
hash = "sha256-d4cI/Nyn2XPvdZFLY7GHIAcmIUnzgyehGxZPylUD3EU=";
hash = "sha256-Zz2akBfrhuC2lOZdvpjDFwlxWd4NUhfoAPkoLpFLzwk=";
};
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.channel=stable"
];
postInstall = ''
@ -30,10 +32,13 @@ buildGoModule rec {
# Tests requires network access
doCheck = false;
passthru.tests.version = testers.testVersion {
inherit version;
package = symfony-cli;
command = "symfony version --no-ansi";
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
inherit version;
package = symfony-cli;
command = "symfony version --no-ansi";
};
};
meta = {

12
pkgs/development/tools/tailwindcss/default.nix
View file

@ -18,16 +18,16 @@ let
}.${system} or throwSystem;
hash = {
aarch64-darwin = "sha256-VAJypHejh3ZW2x3fPNvuFw3VkmBbsSTnmBHuqU3hXVY=";
aarch64-linux = "sha256-Yxw6DIP8j3JANgvN870socG0aNX76d3c0z12ePbuFSs=";
armv7l-linux = "sha256-yS8LDmUit5pM4WrMjhqUJD4e0fWKWf8cr4w1PACj+8g=";
x86_64-darwin = "sha256-cTIp7HesR9Ae6yFpUy0H1hrqtHSSReIKZmKE06XCsWU=";
x86_64-linux = "sha256-Z3Co095akfV/11UWvpc0WAp3gdUrpjVskUw1v01Eifs=";
aarch64-darwin = "sha256-ROZVmhdy3vltNeSgV65aAwythgydusYYVB7XQOJ/spw=";
aarch64-linux = "sha256-aX6CTnsWCwf0wDc7wl3skHwC5aJgoBz/2JtgS34eX4s=";
armv7l-linux = "sha256-q1449OZ5wvgdJjxhg1+noQVFcFfHKokHtV6CbR8evgs=";
x86_64-darwin = "sha256-2eVT5TbektDvXYQzaBc0A9bxv8bKY70cmdIA3WN0u68=";
x86_64-linux = "sha256-i0fjaFQbzXL2DIN5Q/+1GRhWTRoaa4tGnDCv6Cl4BhI=";
}.${system} or throwSystem;
in
stdenv.mkDerivation rec {
pname = "tailwindcss";
version = "3.3.5";
version = "3.3.6";
src = fetchurl {
url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}";

1
pkgs/development/web/netlify-cli/default.nix
View file

@ -14,4 +14,5 @@ in
reconstructLock = true;
passthru.tests.test = callPackage ./test.nix { };
meta.maintainers = with lib.maintainers; [ roberth ];
meta.mainProgram = "netlify";
}

4
pkgs/tools/misc/ostree/default.nix
View file

@ -119,6 +119,10 @@ in stdenv.mkDerivation rec {
makeFlags = [
"installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/libostree"
"installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
# Setting this flag was required as workaround for a clang bug, but seems not relevant anymore.
# https://github.com/ostreedev/ostree/commit/fd8795f3874d623db7a82bec56904648fe2c1eb7
# See also Makefile-libostree.am
"INTROSPECTION_SCANNER_ENV="
];
preConfigure = ''

11
pkgs/tools/misc/steampipe/default.nix
View file

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "steampipe";
version = "0.20.12";
version = "0.21.1";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
sha256 = "sha256-/vcxK/tX4kvDnQCqO8olHZodAbPDDvz1domJZ1WJqPU=";
hash = "sha256-UTKonirf27C3q3tYznMfNtAQ3S7T1Vzlwz05jAoLfoI=";
};
vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA=";
vendorHash = "sha256-zzXAAxN2PRqAx4LDJjVAoLm1HnhVdBe/Mzyuai8CEXg=";
proxyVendor = true;
patchPhase = ''
@ -27,6 +27,9 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ];
# panic: could not create backups directory: mkdir /var/empty/.steampipe: operation not permitted
doCheck = !stdenv.isDarwin;
postInstall = ''
INSTALL_DIR=$(mktemp -d)
installShellCompletion --cmd steampipe \

2
pkgs/top-level/python-packages.nix
View file

@ -4146,6 +4146,8 @@ self: super: with self; {
flet-core = callPackage ../development/python-modules/flet-core { };
flet-runtime = callPackage ../development/python-modules/flet-runtime { };
flexmock = callPackage ../development/python-modules/flexmock { };
flickrapi = callPackage ../development/python-modules/flickrapi { };