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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-01-17 12:01:22 +00:00
committed by GitHub
parent 0ae697baf6 e91130b4c7
commit 4fe3cac67d
59 changed files with 2062 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/admin/pgadmin.nix
+1 -1
View File
@@ -168,7 +168,7 @@ in
echo "$PW"
# Retype password:
echo "$PW"
) | ${cfg.package}/bin/pgadmin4-setup
) | ${cfg.package}/bin/pgadmin4-cli setup-db
'';
restartTriggers = [
nixos/tests/pgadmin4.nix
+5
View File
@@ -55,6 +55,11 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
machine.wait_until_succeeds("curl -sS localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null")
# check for missing support files (css, js etc). Should catch not-generated files during build. See e.g. https://github.com/NixOS/nixpkgs/pull/229184
machine.succeed("wget -nv --level=1 --spider --recursive localhost:5051/login")
# test idempotenceny
machine.systemctl("restart pgadmin.service")
machine.wait_for_unit("pgadmin")
machine.wait_until_succeeds("curl -sS localhost:5051")
machine.wait_until_succeeds("curl -sS localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null")
# pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py
# pgadmin4-desktopmode tries to read that as well. This normally fails with a PermissionError, as the config file
pkgs/applications/editors/vscode/extensions/default.nix
+3 -3
View File
@@ -2306,14 +2306,14 @@ let
};
};
# Keep pkgs/tools/typesetting/typst-preview/default.nix in sync with this
# Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this
# extension
mgt19937.typst-preview = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "typst-preview";
publisher = "mgt19937";
version = "0.9.2";
sha256 = "sha256-/2ZD5LOQ1vTIKab2qX+5AqNqaRs90MNz1jUMDaV1wUY=";
version = "0.10.5";
sha256 = "sha256-cR5Pyokzmf8dNlsUkcwwfPx3jtJCQHRwTpYk78ovgrM=";
};
buildInputs = [
pkgs/applications/emulators/vice/default.nix
+4 -2
View File
@@ -4,6 +4,7 @@
, bison
, flex
, perl
, curl
, libpng
, giflib
, alsa-lib
@@ -25,11 +26,11 @@
stdenv.mkDerivation rec {
pname = "vice";
version = "3.7.1";
version = "3.8";
src = fetchurl {
url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz";
sha256 = "sha256-fjgR5gJNsGmL+8MhuzJFckRriFPQG0Bz8JhllXsMq5g=";
sha256 = "sha256-HX3E0PK7zCqHG7lU/0pd9jBI3qnBb18em8gmD6QaEAQ=";
};
nativeBuildInputs = [
@@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsa-lib
curl
giflib
gtk3
glew
pkgs/applications/misc/tilemaker/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tilemaker";
version = "2.4.0";
version = "3.0.0";
src = fetchFromGitHub {
owner = "systemed";
repo = "tilemaker";
rev = "v${finalAttrs.version}";
hash = "sha256-xpOF/0qFuvTUWQ1I8x/gy5qSLKzSgcQahS47PG+bTRA=";
hash = "sha256-rB5oP03yaIzklwkGsIeS9ELbHOY9AObwjRrK9HBQFI4=";
};
postPatch = ''
pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+4 -5
View File
@@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchFromGitHub
{ lib, ocaml, buildDunePackage, fetchFromGitHub
, extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3
, tiny_httpd
, ounit2
@@ -6,17 +6,16 @@
buildDunePackage rec {
pname = "google-drive-ocamlfuse";
version = "0.7.30";
duneVersion = "3";
version = "0.7.31";
src = fetchFromGitHub {
owner = "astrada";
repo = "google-drive-ocamlfuse";
rev = "v${version}";
sha256 = "sha256-DWG0nBiqeVHaYQfGzU43gGwL4m8X61x5/RT5jD4AwYA=";
hash = "sha256-4Fs4e4rXSeumaMDXRqGLpPuFs6DC8dmkywGaBqR5sFA=";
};
doCheck = true;
doCheck = lib.versionOlder ocaml.version "5.0";
checkInputs = [ ounit2 ];
buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
pkgs/applications/version-management/ungit/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "ungit";
version = "1.5.24";
version = "1.5.25";
src = fetchFromGitHub {
owner = "FredrikNoren";
repo = "ungit";
rev = "v${version}";
hash = "sha256-4hDg153CVZidmnIGUwxfzL45Yt+GlMyepfMLJbcjdqo=";
hash = "sha256-mVBE8HW5dhi00BbVX00rgvc4JtyrTsbina18EzSUcuM=";
};
npmDepsHash = "sha256-Z/vPqJ70NqjABKKa8r24t0sWoPYRVwxH02BNr1yCVNQ=";
npmDepsHash = "sha256-DftAovQPKi4hLeqAGCVN8u/9eC4mkTxTJ2WxxOHbkgM=";
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = true;
pkgs/applications/virtualization/crun/default.nix
+2 -2
View File
@@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.12";
version = "1.13";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
hash = "sha256-61E/71axlN5H1KpAkWFm7jOETlmmy2qh7R+JrVZlMIQ=";
hash = "sha256-doGZ1rHHXDRClrTEXYJcU6AqlBTanpNpV6EIbxQgcXY=";
fetchSubmodules = true;
};
pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+8 -7
View File
@@ -1,13 +1,13 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, cmake
, pkg-config
, wayland-scanner
, makeWrapper
, wrapQtAppsHook
, hyprland-protocols
, hyprlang
, libdrm
, mesa
, pipewire
@@ -19,22 +19,22 @@
, wayland
, wayland-protocols
, hyprland
, hyprpicker
, slurp
}:
stdenv.mkDerivation (self: {
pname = "xdg-desktop-portal-hyprland";
version = "1.2.6";
version = "1.3.1";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "xdg-desktop-portal-hyprland";
rev = "v${self.version}";
hash = "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=";
hash = "sha256-wP611tGIWBA4IXShWbah7TxqdbvhfcfT2vnXalX/qzk=";
};
nativeBuildInputs = [
meson
ninja
cmake
pkg-config
wayland-scanner
makeWrapper
@@ -43,6 +43,7 @@ stdenv.mkDerivation (self: {
buildInputs = [
hyprland-protocols
hyprlang
libdrm
mesa
pipewire
@@ -63,7 +64,7 @@ stdenv.mkDerivation (self: {
--prefix PATH ":" ${lib.makeBinPath [slurp hyprland]}
wrapProgramShell $out/libexec/xdg-desktop-portal-hyprland \
--prefix PATH ":" ${lib.makeBinPath [(placeholder "out")]}
--prefix PATH ":" ${lib.makeBinPath [(placeholder "out") hyprpicker]}
'';
meta = with lib; {
pkgs/by-name/fo/formatjson5/package.nix
+45
View File
@@ -0,0 +1,45 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "formatjson5";
version = "0.2.6";
src = fetchFromGitHub {
owner = "google";
repo = "json5format";
# Not tagged, see Cargo.toml.
rev = "056829990bab4ddc78c65a0b45215708c91b8628";
hash = "sha256-Lredw/Fez+2U2++ShZcKTFCv8Qpai9YUvqvpGjG5W0o=";
};
cargoHash = "sha256-zPgaZPDyNVPmBXz6QwOYnmh/sbJ8aPST8znLMfIWejk=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
cargoBuildFlags = [
"--example formatjson5"
];
postInstall =
let
cargoTarget = rustPlatform.cargoInstallHook.targetSubdirectory;
in
''
install -D target/${cargoTarget}/release/examples/formatjson5 $out/bin/formatjson5
'';
meta = {
description = "A JSON5 formatter";
homepage = "https://github.com/google/json5format";
license = lib.licenses.bsd3;
mainProgram = "formatjson5";
maintainers = with lib.maintainers; [ katexochen ];
};
}
pkgs/by-name/hy/hyprlang/package.nix
+30
View File
@@ -0,0 +1,30 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprlang";
version = "0.2.1";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprlang";
rev = "v${finalAttrs.version}";
hash = "sha256-KjAYC3sMyfipCHpkj0XSPw/C9KdCNlWtguQW5rEUiqo=";
};
nativeBuildInputs = [cmake];
outputs = ["out" "dev"];
doCheck = true;
meta = with lib; {
homepage = "https://github.com/hyprwm/hyprlang";
description = "The official implementation library for the hypr config language";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
})
pkgs/applications/misc/prevo/data.nix → pkgs/by-name/pr/prevo-data/package.nix
+4 -5
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, prevo-tools }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "prevo-data";
version = "2020-03-08";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
cp prevo.db $out/share/prevo/
'';
meta = with lib; {
meta = {
description =
"data for offline version of the Esperanto dictionary Reta Vortaro";
longDescription = ''
@@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
This package provides the ReVo database for the prevo command line application.
'';
homepage = "https://github.com/bpeel/revo";
license = licenses.gpl2Only;
maintainers = [ maintainers.das-g ];
platforms = platforms.linux;
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ das-g ehmry ];
};
}
pkgs/applications/misc/prevo/tools.nix → pkgs/by-name/pr/prevo-tools/package.nix
+5 -4
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
installShellCompletion --bash src/prevo-completion
'';
meta = with lib; {
meta = {
description =
"CLI tools for the offline version of the Esperanto dictionary Reta Vortaro";
longDescription = ''
@@ -31,8 +31,9 @@ stdenv.mkDerivation rec {
database for this application or for the Android app of the same name.
'';
homepage = "https://github.com/bpeel/prevodb";
license = licenses.gpl2Only;
maintainers = [ maintainers.das-g ];
platforms = platforms.linux;
license = lib.licenses.gpl2Only;
mainProgram = "prevo";
maintainers = with lib.maintainers; [ das-g ehmry ];
platforms = lib.platforms.unix;
};
}
pkgs/applications/misc/prevo/default.nix → pkgs/by-name/pr/prevo/package.nix
+8 -6
View File
@@ -1,4 +1,4 @@
{ lib, symlinkJoin, prevo-tools, prevo-data, makeWrapper }:
{ lib, symlinkJoin, man, prevo-tools, prevo-data, makeWrapper }:
symlinkJoin rec {
name = "prevo-${version}";
@@ -10,18 +10,20 @@ symlinkJoin rec {
postBuild = ''
wrapProgram $out/bin/prevo \
--prefix XDG_DATA_DIRS : "${prevo-data}/share"
--prefix PATH ":" "${lib.makeBinPath [ man ]}" \
--suffix XDG_DATA_DIRS : "${prevo-data}/share" \
'';
meta = with lib; {
meta = {
description = "offline version of the Esperanto dictionary Reta Vortaro";
longDescription = ''
PReVo is the "portable" ReVo, i.e., the offline version
of the Esperanto dictionary Reta Vortaro.
'';
homepage = "https://github.com/bpeel/prevodb";
license = licenses.gpl2Only;
maintainers = [ maintainers.das-g ];
platforms = platforms.linux;
license = lib.licenses.gpl2Only;
mainProgram = "prevo";
maintainers = with lib.maintainers; [ das-g ehmry ];
};
}
pkgs/by-name/sc/scalpel/package.nix
+56
View File
@@ -0,0 +1,56 @@
{ lib
, fetchFromGitHub
, stdenv
, autoconf
, automake
, libtool
, tre
}:
stdenv.mkDerivation (finalAttrs: {
pname = "scalpel";
version = "2.1";
src = fetchFromGitHub {
owner = "sleuthkit";
repo = "scalpel";
rev = "35e1367ef2232c0f4883c92ec2839273c821dd39";
hash = "sha256-0lqU1CAcWXNw9WFa29BXla1mvABlzWV+hcozZyfR0oE=";
};
nativeBuildInputs = [
autoconf
automake
libtool
tre
];
postPatch = ''
sed -i \
-e 's|#define\s*SCALPEL_DEFAULT_CONFIG_FILE\s.*"scalpel.conf"|#define SCALPEL_DEFAULT_CONFIG_FILE "${placeholder "out"}/share/scalpel/scalpel.conf"|' \
src/scalpel.h
'';
env.CXXFLAGS = "-std=c++14" + lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal";
preConfigure = ''
./bootstrap
'';
configureFlags = [
"--with-pic"
];
postInstall = ''
install -Dm644 scalpel.conf -t $out/share/scalpel/
'';
meta = with lib; {
homepage = "https://github.com/sleuthkit/scalpel";
description = "Recover files based on their headers, footers and internal data structures, based on Foremost";
mainProgram = "scalpel";
maintainers = with maintainers; [ shard7 ];
platforms = platforms.unix;
license = with licenses; [ asl20 ];
};
})
pkgs/by-name/ty/typst-preview/Cargo.lock
Generated
+592 -567
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/ty/typst-preview/dom.json
+31
View File
@@ -0,0 +1,31 @@
{
"name": "typst-dom",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build && tsc",
"preview": "vite preview",
"test": "vitest",
"coverage": "vitest run --coverage",
"link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
},
"peerDependencies": {
"@myriaddreamin/typst-ts-renderer": "0.4.2-rc5",
"@myriaddreamin/typst.ts": "0.4.2-rc5"
},
"devDependencies": {
"@myriaddreamin/typst-ts-renderer": "0.4.2-rc5",
"@myriaddreamin/typst.ts": "0.4.2-rc5",
"typescript": "^5.0.2",
"vite": "^4.3.9",
"vite-plugin-singlefile": "^0.13.5",
"vite-plugin-wasm": "^3.2.2",
"vitest": "^0.32.2"
},
"exports": {
".": "./dist/esm/index.mjs",
"./*": "./dist/esm/*"
}
}
pkgs/by-name/ty/typst-preview/package.json → pkgs/by-name/ty/typst-preview/frontend.json
+3 -2
View File
@@ -12,8 +12,9 @@
"link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
},
"dependencies": {
"@myriaddreamin/typst-ts-renderer": "0.4.0-rc11",
"@myriaddreamin/typst.ts": "0.4.0-rc11",
"@myriaddreamin/typst-ts-renderer": "0.4.2-rc5",
"@myriaddreamin/typst.ts": "0.4.2-rc5",
"typst-dom": "file:../typst-dom",
"rxjs": "^7.8.1"
},
"devDependencies": {
pkgs/by-name/ty/typst-preview/package.nix
+38 -7
View File
@@ -14,28 +14,58 @@
let
# Keep the vscode "mgt19937.typst-preview" extension in sync when updating
# this package at pkgs/applications/editors/vscode/extensions/default.nix
version = "0.9.2";
version = "0.10.5";
src = fetchFromGitHub {
owner = "Enter-tainer";
repo = "typst-preview";
rev = "v${version}";
hash = "sha256-P11Nkn9Md5xsB9Z7v9O+CRvP18vPEC0Y973Or7i0y/4=";
hash = "sha256-BebOwlY2hm/SGYCtmsQICbo1V8sbUMYVWSM773Qmh04=";
fetchSubmodules = true;
};
frontendSrc = "${src}/addons/frontend";
domSrc = "${src}/addons/typst-dom";
typst-dom = mkYarnPackage {
inherit version;
pname = "typst-dom";
src = domSrc;
packageJSON = ./dom.json;
offlineCache = fetchYarnDeps {
yarnLock = "${domSrc}/yarn.lock";
hash = "sha256-SxOQ/RABUkiqE7dLaDS0kETGiir4SMWJ2w7i7zMEl7U=";
};
buildPhase = ''
runHook preBuild
yarn --offline build
runHook postBuild
'';
installPhase = ''
runHook preInstall
cp -R deps/typst-dom $out
runHook postInstall
'';
doDist = false;
};
frontend = mkYarnPackage {
inherit version;
pname = "typst-preview-frontend";
src = frontendSrc;
packageJSON = ./package.json;
packageJSON = ./frontend.json;
offlineCache = fetchYarnDeps {
yarnLock = "${frontendSrc}/yarn.lock";
hash = "sha256-7a7/UOfau84nLIAKj6Tn9rTUmeBJ7rYDFAdr55ZDLgA=";
hash = "sha256-6e3UNd8gIBnTtllpo/1AC1XzeZ88rdUiechoQfo5V1Y=";
};
packageResolutions = { inherit typst-dom; };
buildPhase = ''
runHook preBuild
yarn --offline build
@@ -50,6 +80,7 @@ let
doDist = false;
};
in
rustPlatform.buildRustPackage {
pname = "typst-preview";
@@ -58,9 +89,9 @@ rustPlatform.buildRustPackage {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"hayagriva-0.4.0" = "sha256-377lXL3+TO8U91OopMYEI0NrWWwzy6+O7B65bLhP+X4=";
"typst-0.9.0" = "sha256-+rnsUSGi3QZlbC4i8racsM4U6+l8oA9YjjUOtQAIWOk=";
"typst-ts-compiler-0.4.0-rc9" = "sha256-NVmbAodDRJBJlGGDRjaEcTHGoCeN4hNjIynIDKqvNbM=";
"typst-0.10.0" = "sha256-/Oy4KigXu1E/S9myd+eigqlNvk5x+Ld9gTL9dtpoyqk=";
"typst-ts-compiler-0.4.2-rc5" =
"sha256-fhwTaAK19Nb7AKNJ9QBZgK1MO7g7s5AdSDqaBjLxT3w=";
};
};
pkgs/development/libraries/reproc/default.nix
+14 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake
{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -12,6 +12,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-LWzBeKhE7cSiZsK8xWzoTdrOcPiU/zEkmi40WiFytic=";
};
patches = [
(fetchpatch{
name = "reproc-gcc-13-2.patch";
url = "https://github.com/DaanDeMeyer/reproc/commit/0b23d88894ccedde04537fa23ea55cb2f8365342.patch";
sha256 = "sha256-QyC0UcKAWCKSvSvyZTLI2eF/TuuqbGGH6cOQrS2DiCE=";
})
(fetchpatch{
name = "reproc-gcc-13-1.patch";
url = "https://github.com/DaanDeMeyer/reproc/commit/9f399675b821e175f85ac3ee6e3fd2e6056573eb.patch";
sha256 = "sha256-h/gnDFPWPpUFkys10YXjjEPibgRT1atHSVwbO0kId+U=";
})
];
nativeBuildInputs = [ cmake ];
cmakeFlags = [
pkgs/development/ocaml-modules/cmarkit/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@ else
stdenv.mkDerivation rec {
pname = "cmarkit";
version = "0.2.0";
version = "0.3.0";
src = fetchurl {
url = "https://erratique.ch/software/cmarkit/releases/cmarkit-${version}.tbz";
hash = "sha256-86RuGB5pLbw/ThPGz9+qLaZRH7xvxbYrZWFLLIkc5Mk=";
hash = "sha256-RouM5iU7VeTT0+4yhBgdEmxROeP/X31iqDjd1VI7z5c=";
};
nativeBuildInputs = [
pkgs/development/ocaml-modules/eliom/default.nix
-2
View File
@@ -12,7 +12,6 @@
, js_of_ocaml-lwt
, js_of_ocaml-tyxml
, lwt_ppx
, ocamlnet
, ocsipersist
}:
@@ -33,7 +32,6 @@ buildDunePackage rec {
buildInputs = [
js_of_ocaml-ocamlbuild
js_of_ocaml-ppx_deriving_json
ocamlnet
ppx_optcomp
];
pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+6 -5
View File
@@ -1,12 +1,11 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml
, cryptokit, ocamlnet, ocurl, yojson
, camlp-streams, cppo, cryptokit, ocurl, yojson
, ounit2
}:
buildDunePackage rec {
pname = "gapi-ocaml";
version = "0.4.4";
duneVersion = "3";
version = "0.4.5";
minimalOCamlVersion = "4.08";
@@ -14,10 +13,12 @@ buildDunePackage rec {
owner = "astrada";
repo = pname;
rev = "v${version}";
hash = "sha256-+UNFW5tmIh5dVyTDEOfOmy1j+gV4P28jlnBTdpQNAjE=";
hash = "sha256-qlQEE8l/H22bb1VcK9YehR+9L5XepMu8JY7OLw1OIXg=";
};
propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
nativeBuildInputs = [ cppo ];
propagatedBuildInputs = [ camlp-streams cryptokit ocurl yojson ];
doCheck = true;
checkInputs = [ ounit2 ];
pkgs/development/ocaml-modules/ocsigen-start/default.nix
+3 -4
View File
@@ -1,17 +1,16 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson
, cohttp-lwt-unix, eliom
, resource-pooling
, ocamlnet
, ocsigen-ppx-rpc
}:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-ocsigen-start";
version = "6.1.0";
version = "6.1.2";
nativeBuildInputs = [ ocaml findlib eliom ];
buildInputs = [ ocsigen-ppx-rpc ];
propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ];
propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ];
strictDeps = true;
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = "ocsigen-start";
rev = version;
hash = "sha256-gHFPutoPYKTDsFninwBTc2WOIFd3+ghRYW2hi1y5MUs=";
hash = "sha256-GhuH3rNdauJztEhygct6jCf+EmAtbSeyYP45stMzGFU=";
};
preInstall = ''
pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+3 -9
View File
@@ -5,18 +5,12 @@
stdenv.mkDerivation rec {
pname = "ocsigen-toolkit";
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "3.2.0";
version = "3.3.4";
propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
nativeBuildInputs = [ ocaml findlib opaline eliom ];
# Remove widgets not compatible with jsoo 4.1.0
# https://github.com/ocsigen/ocsigen-toolkit/issues/221
preConfigure = ''
rm src/widgets/ot_{carousel,drawer,swipe,tongue}.eliom{,i}
'';
strictDeps = true;
strictDeps = true;
installPhase = ''
runHook preInstall
@@ -31,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = pname;
rev = version;
sha256 = "sha256:13n0y8a80bl94la4lnp9dr2x7b8plhm17g9zgf0l6x42g3886pw7";
hash = "sha256-6ccu8WJxUwpR5YyB4j1jQPWba8GhQDxuw+IDHswQpSA=";
};
meta = {
pkgs/development/ocaml-modules/uucd/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@ let
in
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
version = "15.0.0";
version = "15.1.0";
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "sha256-DksDi6Dfe/fNGBmeubwxv9dScTHPJRuaPrlX7M8QRrw=";
hash = "sha256-HIANZ5SDJcytlpw/W9Ae2eFTutrutJj2PgJCfByobfI=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
pkgs/development/ocaml-modules/uucp/default.nix
+5 -5
View File
@@ -2,14 +2,14 @@
let
pname = "uucp";
version = "15.0.0";
version = "15.1.0";
webpage = "https://erratique.ch/software/${pname}";
minimumOCamlVersion = "4.03";
minimalOCamlVersion = "4.03";
doCheck = true;
in
if lib.versionOlder ocaml.version minimumOCamlVersion
then builtins.throw "${pname} needs at least OCaml ${minimumOCamlVersion}"
if lib.versionOlder ocaml.version minimalOCamlVersion
then builtins.throw "${pname} needs at least OCaml ${minimalOCamlVersion}"
else
stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "sha256-rEeU9AWpCzuAtAOe7hJHBmJjP97BZsQsPFQQ8uZLUzA=";
hash = "sha256-qR5LiAZHt4oD3ak0x17GqbYXNaJmJxFk/WGoxT+yWYc=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
pkgs/development/python-modules/flask-security-too/default.nix
+11 -3
View File
@@ -3,7 +3,7 @@
, fetchPypi
, pythonOlder
, setuptools
, pydantic
, fetchpatch
# extras: babel
, babel
@@ -59,6 +59,16 @@ buildPythonPackage rec {
hash = "sha256-we2TquU28qP/ir4eE67J0Nlft/8IL8w7Ny3ypSE5cNk=";
};
patches = [
# https://github.com/Flask-Middleware/flask-security/pull/901
(fetchpatch {
name = "fixes-for-py_webauthn-2.0.patch";
url = "https://github.com/Flask-Middleware/flask-security/commit/5725f7021343567ec0b25c890e859f4e84c93ba6.patch";
hash = "sha256-4EgwT4zRj0mh4ZaoZFz7H5KeiZ9zs+BY4siYm8DwMfU=";
excludes = [ "CHANGES.rst" ];
})
];
nativeBuildInputs = [
setuptools
];
@@ -128,7 +138,5 @@ buildPythonPackage rec {
description = "Simple security for Flask apps (fork)";
license = licenses.mit;
maintainers = with maintainers; [ gador ];
# https://github.com/Flask-Middleware/flask-security/pull/851
broken = versionAtLeast pydantic.version "2";
};
}
pkgs/development/python-modules/icalevents/default.nix
+9
View File
@@ -4,6 +4,7 @@
, pythonOlder
, pytestCheckHook
, poetry-core
, pythonRelaxDepsHook
, datetime
, httplib2
, icalendar
@@ -27,6 +28,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [
@@ -37,6 +39,13 @@ buildPythonPackage rec {
pytz
];
pythonRelaxDeps = [
"datetime"
"httplib2"
"icalendar"
"pytz"
];
nativeCheckInputs = [
pytestCheckHook
];
pkgs/development/python-modules/pyatag/default.nix
+5 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyatag";
version = "3.5.1";
version = "0.3.7.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "MatsNl";
repo = "pyatag";
rev = "refs/tags/${version}";
hash = "sha256-hyGos0LFVKv63jf1ODPFfk+R47oyHea+8MGvxeKpop8=";
hash = "sha256-3h9mpopTbEULCx7rcEt/I/ZnUA0L/fJ7Y3L5h/6EuC4=";
};
nativeBuildInputs = [
@@ -36,6 +36,9 @@ buildPythonPackage rec {
"pyatag.discovery"
];
# it would use the erroneous tag 3.5.1
passthru.skipBulkUpdate = true;
meta = with lib; {
description = "Python module to talk to Atag One";
homepage = "https://github.com/MatsNl/pyatag";
pkgs/development/python-modules/securetar/default.nix
+9 -4
View File
@@ -4,22 +4,27 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "securetar";
version = "2023.3.0";
format = "setuptools";
version = "2023.12.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "pvizeli";
repo = pname;
repo = "securetar";
rev = "refs/tags/${version}";
hash = "sha256-3bDboggvKbpWyjpUOrUmtJx3Nj/6Uvut2nEQLYJubDA=";
hash = "sha256-P8aq1RRlEmXhJ4n0TSLVjYx4dvkckuz2aDGkAvp7bfo=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
cryptography
];
pkgs/development/python-modules/syncedlyrics/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "syncedlyrics";
version = "0.7.0";
version = "0.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "rtcq";
repo = "syncedlyrics";
rev = "refs/tags/v${version}";
hash = "sha256-qZVUptmLouFFBCWiRviYFO0sQKlyz65GjWMg/b1idXY=";
hash = "sha256-ro9HzI8N7Ry4xh91mO1Vyy3CScEi3FifweOO01/Ti0w=";
};
nativeBuildInputs = [
pkgs/development/python-modules/twilio/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "8.11.0";
version = "8.11.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-yz1jFEjbnG5hqC5wqvxcP3pNLI3GalXWbREToCwf9BU=";
hash = "sha256-cByrE0/sKZ0dWnuQS1KOOCHbSYF6YJchqGrdkmVp9DM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/webauthn/default.nix
+3 -5
View File
@@ -4,29 +4,27 @@
, asn1crypto
, cbor2
, pythonOlder
, pydantic
, pyopenssl
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "webauthn";
version = "1.11.1";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "duo-labs";
repo = "py_webauthn";
rev = "refs/tags/v${version}";
hash = "sha256-+pp21rtwavtjj6ahG091xsJpsYOH3zpqU3xH2/YFXqY=";
hash = "sha256-StqoSrzErV13/OUpSWbI+6N5tSFPEpvnmQcDiZMaXPI=";
};
propagatedBuildInputs = [
asn1crypto
cbor2
pydantic
pyopenssl
];
pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "tflint-ruleset-google";
version = "0.24.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
hash = "sha256-1eF/uzOYP/gi+ooHN8OfCR2nz+/z98theO0Lr/BBhWM=";
hash = "sha256-VQm7pvZCfkZR54UeaPuKogEqhQOy5BAV7WkfwCW3C7c=";
};
vendorHash = "sha256-owpNcsxuP+sG27vv9V7ArMK1NLBNbnw11KpdpVyWAD0=";
vendorHash = "sha256-C52b11cJE2Bu785SNlTsbgNR6Wt/YeY8l1U/9anXrMo=";
# upstream Makefile also does a go test $(go list ./... | grep -v integration)
preCheck = ''
pkgs/development/tools/build-managers/rake/Gemfile.lock
+2 -2
View File
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
rake (13.0.6)
rake (13.1.0)
PLATFORMS
ruby
@@ -10,4 +10,4 @@ DEPENDENCIES
rake
BUNDLED WITH
2.4.6
2.5.3
pkgs/development/tools/build-managers/rake/gemset.nix
+2 -2
View File
@@ -4,9 +4,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
type = "gem";
};
version = "13.0.6";
version = "13.1.0";
};
}
pkgs/games/cutemaze/default.nix
+3 -3
View File
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "cutemaze";
version = "1.3.2";
version = "1.3.3";
src = fetchurl {
url = "https://gottcode.org/cutemaze/${pname}-${version}.tar.bz2";
hash = "sha256-hjDlY18O+VDJR68vwrIZwsQAa40xU+V3bCAA4GFHJEQ=";
url = "https://gottcode.org/cutemaze/cutemaze-${version}.tar.bz2";
hash = "sha256-WvbeA1zgaGx5Hw5JeYrYX72MJw3Ou1VnAbB6R6Y0Rpw=";
};
nativeBuildInputs = [
pkgs/misc/tmux-plugins/default.nix
+1 -1
View File
@@ -243,7 +243,7 @@ in rec {
};
fingers = mkTmuxPlugin rec {
pluginName = "fingers";
pluginName = "tmux-fingers";
rtpFilePath = "load-config.tmux";
version = "2.1.1";
src = fetchFromGitHub {
pkgs/os-specific/linux/systemd/default.nix
+1
View File
@@ -208,6 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
./0017-core-don-t-taint-on-unmerged-usr.patch
./0018-tpm2_context_init-fix-driver-name-checking.patch
./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
./0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
] ++ lib.optional stdenv.hostPlatform.isMusl (
let
pkgs/servers/matrix-synapse/default.nix
+3 -3
View File
@@ -17,20 +17,20 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.98.0";
version = "1.99.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-irPExb8rwQjkPp0b3x5hJG4Ay6OnITWIGRPxBSoP/Dk=";
hash = "sha256-NS0in7zUkIS+fI5gQEua9y1UXspEHWNCntyZHZCtfPg=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-DHKhEFXquWfHfk54mTehjchg3KsB4CfzElXMt5Mp+Vg=";
hash = "sha256-FQhHpbp8Rkkqp6Ngly/HP8iWGlWh5CDaztgAwKB/afI=";
};
postPatch = ''
pkgs/servers/nosql/surrealdb/default.nix
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "surrealdb";
version = "1.0.2";
version = "1.1.1";
src = fetchFromGitHub {
owner = "surrealdb";
repo = "surrealdb";
rev = "v${version}";
hash = "sha256-/+GAnACNzGxMDSO1BGc9dA13hZnNKDia0KBlyujEe04=";
hash = "sha256-3xH0trwTs2Cr07/PtA4K808PUwaT6WmrIr2+11L7t6A=";
};
cargoHash = "sha256-9wvgj00GAWRP9sWOgugelizB6xbPNs0h13bGGxWtA+s=";
cargoHash = "sha256-dNn2HMZ7c/q/EhfMUHqWV79+3gMA9URqEozdEixkV/0=";
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
pkgs/servers/search/meilisearch/Cargo.lock
Generated
+1029 -249
View File
File diff suppressed because it is too large Load Diff
pkgs/servers/search/meilisearch/default.nix
+6 -4
View File
@@ -7,7 +7,7 @@
, nix-update-script
}:
let version = "1.5.0";
let version = "1.6.0";
in
rustPlatform.buildRustPackage {
pname = "meilisearch";
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
owner = "meilisearch";
repo = "MeiliSearch";
rev = "refs/tags/v${version}";
hash = "sha256-UP5i89hXmbATbHwN4wu42L6zX2fnd/hF4NEGK5VwmiM=";
hash = "sha256-B1psJeGWG0E5oPu+OVAxkdJNblqaBzB/CurpLxdESB8=";
};
cargoBuildFlags = [
@@ -28,9 +28,11 @@ rustPlatform.buildRustPackage {
lockFile = ./Cargo.lock;
outputHashes = {
"actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII=";
"heed-0.12.7" = "sha256-mthHMaTqmNae8gpe4ZnozABKBrgFQdn9KWCvIzJJ+u4=";
"lmdb-rkv-sys-0.15.1" = "sha256-zLHTprwF7aa+2jaD7dGYmOZpJYFijMTb4I3ODflNUII=";
"arroy-0.1.0" = "sha256-ybKdB0eP8AdxLMNM7Si9onWITNc2SPNTXMgKdWdy34E=";
"candle-core-0.3.1" = "sha256-KlkjTUcbnP+uZoA0fDZlEPT5qKC2ogMAuR8X14xRFgA=";
"hf-hub-0.3.2" = "sha256-tsn76b+/HRvPnZ7cWd8SBcEdnMPtjUEIRJipOJUbz54=";
"nelson-0.1.0" = "sha256-eF672quU576wmZSisk7oDR7QiDafuKlSg0BTQkXnzqY=";
"tokenizers-0.14.1" = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0=";
};
};
pkgs/servers/web-apps/livebook/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub, nixosTests }:
beamPackages.mixRelease rec {
pname = "livebook";
version = "0.12.0";
version = "0.12.1";
inherit elixir;
@@ -13,13 +13,13 @@ beamPackages.mixRelease rec {
owner = "livebook-dev";
repo = "livebook";
rev = "v${version}";
hash = "sha256-ONNl88ZUjeAjYV8kdk4Tf6noQ7YSp/UN9OHEJHk7+5s=";
hash = "sha256-Q4c0AelZZDPxE/rtoHIRQi3INMLHeiZ72TWgy183f4Q=";
};
mixFodDeps = beamPackages.fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version;
hash = "sha256-JA0890hGShavn60khnevt4L0qEWKZnTmafImU4dkCr8=";
hash = "sha256-dyKhrbb7vazBV6LFERtGHLQXEx29vTgn074mY4fsHy4=";
};
installPhase = ''
pkgs/test/nixpkgs-check-by-name/default.nix
+31 -15
View File
@@ -6,10 +6,26 @@
clippy,
mkShell,
makeWrapper,
runCommand,
}:
let
runtimeExprPath = ./src/eval.nix;
nixpkgsLibPath = ../../../lib;
# Needed to make Nix evaluation work inside nix builds
initNix = ''
export TEST_ROOT=$(pwd)/test-tmp
export NIX_CONF_DIR=$TEST_ROOT/etc
export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
export NIX_STATE_DIR=$TEST_ROOT/var/nix
export NIX_STORE_DIR=$TEST_ROOT/store
# Ensure that even if tests run in parallel, we don't get an error
# We'd run into https://github.com/NixOS/nix/issues/2706 unless the store is initialised first
nix-store --init
'';
package =
rustPlatform.buildRustPackage {
name = "nixpkgs-check-by-name";
@@ -22,21 +38,8 @@ let
makeWrapper
];
env.NIX_CHECK_BY_NAME_EXPR_PATH = "${runtimeExprPath}";
# Needed to make Nix evaluation work inside the nix build
preCheck = ''
export TEST_ROOT=$(pwd)/test-tmp
export NIX_CONF_DIR=$TEST_ROOT/etc
export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
export NIX_STATE_DIR=$TEST_ROOT/var/nix
export NIX_STORE_DIR=$TEST_ROOT/store
export NIXPKGS_LIB_PATH=${nixpkgsLibPath}
# Ensure that even if tests run in parallel, we don't get an error
# We'd run into https://github.com/NixOS/nix/issues/2706 unless the store is initialised first
nix-store --init
'';
env.NIXPKGS_LIB_PATH = "${nixpkgsLibPath}";
preCheck = initNix;
postCheck = ''
cargo fmt --check
cargo clippy -- -D warnings
@@ -50,6 +53,19 @@ let
env.NIXPKGS_LIB_PATH = toString nixpkgsLibPath;
inputsFrom = [ package ];
};
# Tests the tool on the current Nixpkgs tree, this is a good sanity check
passthru.tests.nixpkgs = runCommand "test-nixpkgs-check-by-name" {
nativeBuildInputs = [
package
nix
];
nixpkgsPath = lib.cleanSource ../../..;
} ''
${initNix}
nixpkgs-check-by-name --base "$nixpkgsPath" "$nixpkgsPath"
touch $out
'';
};
in
package
pkgs/test/nixpkgs-check-by-name/src/eval.rs
+13 -4
View File
@@ -168,14 +168,23 @@ pub fn check_values(
// so the UsesByName ratchet is already as tight as it can be
NonAttributeSet => Success(Tight),
NonCallPackage => Success(Tight),
// This is an odd case when _internalCallByNamePackageFile is used to define a package.
// This is the case when the `pkgs/by-name`-internal _internalCallByNamePackageFile
// is used for a package outside `pkgs/by-name`
CallPackage(CallPackageInfo {
call_package_variant: Auto,
..
}) => NixpkgsProblem::InternalCallPackageUsed {
attr_name: attribute_name.clone(),
}) => {
// With the current detection mechanism, this also triggers for aliases
// to pkgs/by-name packages, and there's no good method of
// distinguishing alias vs non-alias.
// Using `config.allowAliases = false` at least currently doesn't work
// because there's nothing preventing people from defining aliases that
// are present even with that disabled.
// In the future we could kind of abuse this behavior to have better
// enforcement of conditional aliases, but for now we just need to not
// give an error.
Success(Tight)
}
.into(),
// Only derivations can be in pkgs/by-name,
// so this attribute doesn't qualify
CallPackage(CallPackageInfo {
pkgs/test/nixpkgs-check-by-name/src/nixpkgs_problem.rs
-8
View File
@@ -88,9 +88,6 @@ pub enum NixpkgsProblem {
text: String,
io_error: io::Error,
},
InternalCallPackageUsed {
attr_name: String,
},
MovedOutOfByName {
package_name: String,
call_package_path: Option<PathBuf>,
@@ -227,11 +224,6 @@ impl fmt::Display for NixpkgsProblem {
subpath.display(),
text,
),
NixpkgsProblem::InternalCallPackageUsed { attr_name } =>
write!(
f,
"pkgs.{attr_name}: This attribute is defined using `_internalCallByNamePackageFile`, which is an internal function not intended for manual use.",
),
NixpkgsProblem::MovedOutOfByName { package_name, call_package_path, empty_arg } => {
let call_package_arg =
if let Some(path) = &call_package_path {
pkgs/test/nixpkgs-check-by-name/tests/aliases/aliases.nix
+3
View File
@@ -0,0 +1,3 @@
self: super: {
baz = self.foo;
}
pkgs/test/nixpkgs-check-by-name/tests/aliases/all-packages.nix
+3
View File
@@ -0,0 +1,3 @@
self: super: {
bar = self.foo;
}
pkgs/test/nixpkgs-check-by-name/tests/aliases/default.nix
+1
View File
@@ -0,0 +1 @@
import <test-nixpkgs> { root = ./.; }
pkgs/test/nixpkgs-check-by-name/tests/aliases/pkgs/by-name/fo/foo/package.nix
+1
View File
@@ -0,0 +1 @@
{ someDrv }: someDrv
pkgs/test/nixpkgs-check-by-name/tests/internalCallPackage/expected
-1
View File
@@ -1 +0,0 @@
pkgs.foo: This attribute is defined using `_internalCallByNamePackageFile`, which is an internal function not intended for manual use.
pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix
+9
View File
@@ -77,12 +77,21 @@ let
else
[ ];
# A list optionally containing the `aliases.nix` file from the test case as an overlay
# But only if config.allowAliases is not false
optionalAliasesOverlay =
if (config.allowAliases or true) && builtins.pathExists (root + "/aliases.nix") then
[ (import (root + "/aliases.nix")) ]
else
[ ];
# All the overlays in the right order, including the user-supplied ones
allOverlays =
[
autoCalledPackages
]
++ optionalAllPackagesOverlay
++ optionalAliasesOverlay
++ overlays;
# Apply all the overlays in order to the base fixed-point function pkgsFun
pkgs/tools/admin/pgadmin/default.nix
+5 -3
View File
@@ -14,14 +14,14 @@
let
pname = "pgadmin";
version = "8.1";
yarnHash = "sha256-KAiY5TX2O8mxP7PjIJstYEzCBbqDgT+CpEhreuAGW/U=";
version = "8.2";
yarnHash = "sha256-uMSgpkYoLD32VYDAkjywC9bZjm7UKA0hhwVNc/toEbA=";
src = fetchFromGitHub {
owner = "pgadmin-org";
repo = "pgadmin4";
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
hash = "sha256-zzS/fydNOXpIWdyLtWQhY+hVpneca+3wD88DmZEkS8s=";
hash = "sha256-RfpZXy265kwpMsWUBDVfbL/0eX0By79I4VNkG8zwVOs=";
};
# keep the scope, as it is used throughout the derivation and tests
@@ -181,6 +181,8 @@ pythonPackages.buildPythonApplication rec {
google-auth-oauthlib
google-api-python-client
keyring
typer
rich
];
passthru.tests = {
pkgs/tools/admin/pgadmin/expose-setup.py.patch
+7 -55
View File
@@ -1,64 +1,16 @@
pkg/pip/setup_pip.py | 5 ++++-
web/setup.py | 14 ++++++++------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py
index 5592d1b04..131eaa1ed 100644
index c65795b10..e56b6a6f3 100644
--- a/pkg/pip/setup_pip.py
+++ b/pkg/pip/setup_pip.py
@@ -95,7 +95,10 @@ setup(
},
@@ -101,7 +101,7 @@ setup(
entry_points={
- 'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main'],
+ 'console_scripts': [
+ 'pgadmin4=pgadmin4.pgAdmin4:main',
+ 'pgadmin4-setup=pgadmin4.setup:main'
+ ],
'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main',
- 'pgadmin4-cli=pgadmin4.setup:main'],
+ 'pgadmin4-cli=pgadmin4.setup:app'],
},
)
diff --git a/web/setup.py b/web/setup.py
index 2204ffb..d5fda9f 100644
--- a/web/setup.py
+++ b/web/setup.py
@@ -14,7 +14,6 @@ import argparse
import os
import sys
import builtins
-import config
# Grab the SERVER_MODE if it's been set by the runtime
if 'SERVER_MODE' in globals():
@@ -91,6 +90,9 @@ def load_servers(args):
def setup_db(app):
"""Setup the configuration database."""
+ # here we need an additional import, since the call to setup_db changed
+ # https://redmine.postgresql.org/projects/pgadmin4/repository/2/revisions/3a69d50458f57d19948b867aec55c55d635a36e5/diff/web/setup.py
+ import config
create_app_data_directory(config)
print("pgAdmin 4 - Application Initialisation")
@@ -139,8 +141,9 @@ def clear_servers():
clear_database_servers(load_user, True)
-if __name__ == '__main__':
+def main():
# Configuration settings
+ import config
parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB')
exp_group = parser.add_argument_group('Dump server config')
@@ -191,3 +194,6 @@ if __name__ == '__main__':
else:
app = create_app()
setup_db(app)
+
+if __name__ == '__main__':
+ main()
diff --git a/web/pgadmin/model/__init__.py b/web/pgadmin/model/__init__.py
index 4c36dd1..a492365 100644
--- a/web/pgadmin/model/__init__.py
pkgs/tools/admin/pgadmin/yarn.lock
+5
View File
@@ -12716,3 +12716,8 @@ zustand@^4.4.1:
resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8"
dependencies:
"clsx" "^1.1.1"
"react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8":
version "7.0.0-beta.14"
resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8"
dependencies:
"clsx" "^1.1.1"
pkgs/tools/package-management/poetry/unwrapped.nix
+3
View File
@@ -37,6 +37,7 @@
, pytest-mock
, pytest-xdist
, pythonAtLeast
, darwin
}:
buildPythonPackage rec {
@@ -110,6 +111,8 @@ buildPythonPackage rec {
httpretty
pytest-mock
pytest-xdist
] ++ lib.optionals stdenv.isDarwin [
darwin.ps
];
preCheck = (''
pkgs/top-level/all-packages.nix
+5 -5
View File
@@ -5701,6 +5701,10 @@ with pkgs;
hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
hyprlang = callPackage ../by-name/hy/hyprlang/package.nix {
stdenv = gcc13Stdenv;
};
hyprnome = callPackage ../applications/misc/hyprnome { };
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
@@ -31713,7 +31717,7 @@ with pkgs;
gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
inherit (ocaml-ng.ocamlPackages_4_12) google-drive-ocamlfuse;
inherit (ocamlPackages) google-drive-ocamlfuse;
googler = callPackage ../applications/misc/googler {
python = python3;
@@ -34110,10 +34114,6 @@ with pkgs;
jre = openjdk17;
};
prevo = callPackage ../applications/misc/prevo { };
prevo-data = callPackage ../applications/misc/prevo/data.nix { };
prevo-tools = callPackage ../applications/misc/prevo/tools.nix { };
psi-notify = callPackage ../applications/misc/psi-notify { };
ptex = callPackage ../development/libraries/ptex { };