Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
b6caee49dc
@ -1027,6 +1027,12 @@
|
||||
fingerprint = "BF8B F725 DA30 E53E 7F11 4ED8 AAA5 0652 F047 9205";
|
||||
}];
|
||||
};
|
||||
apraga = {
|
||||
email = "alexis.praga@proton.me";
|
||||
github = "apraga";
|
||||
githubId = 914687;
|
||||
name = "Alexis Praga";
|
||||
};
|
||||
ar1a = {
|
||||
email = "aria@ar1as.space";
|
||||
github = "ar1a";
|
||||
@ -1075,6 +1081,12 @@
|
||||
githubId = 628387;
|
||||
name = "Arian van Putten";
|
||||
};
|
||||
arikgrahl = {
|
||||
email = "mail@arik-grahl.de";
|
||||
github = "arikgrahl";
|
||||
githubId = 8049011;
|
||||
name = "Arik Grahl";
|
||||
};
|
||||
aristid = {
|
||||
email = "aristidb@gmail.com";
|
||||
github = "aristidb";
|
||||
|
||||
@ -270,6 +270,14 @@
|
||||
<link linkend="opt-services.tempo.enable">services.tempo</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://www.ausweisapp.bund.de/">AusweisApp2</link>,
|
||||
the authentication software for the German ID card. Available
|
||||
as
|
||||
<link linkend="opt-programs.ausweisapp.enable">programs.ausweisapp</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/zalando/patroni">Patroni</link>,
|
||||
|
||||
@ -96,6 +96,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable).
|
||||
|
||||
- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable).
|
||||
|
||||
- [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul.
|
||||
Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||
|
||||
|
||||
@ -128,6 +128,7 @@
|
||||
./programs/adb.nix
|
||||
./programs/appgate-sdp.nix
|
||||
./programs/atop.nix
|
||||
./programs/ausweisapp.nix
|
||||
./programs/autojump.nix
|
||||
./programs/bandwhich.nix
|
||||
./programs/bash/bash.nix
|
||||
|
||||
25
nixos/modules/programs/ausweisapp.nix
Normal file
25
nixos/modules/programs/ausweisapp.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.programs.ausweisapp;
|
||||
in
|
||||
{
|
||||
options.programs.ausweisapp = {
|
||||
enable = mkEnableOption (lib.mdDoc "AusweisApp2");
|
||||
|
||||
openFirewall = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Whether to open the required firewall ports for the Smartphone as Card Reader (SaC) functionality of AusweisApp2.
|
||||
'';
|
||||
default = false;
|
||||
type = lib.types.bool;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [ AusweisApp2 ];
|
||||
networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ 24727 ];
|
||||
};
|
||||
}
|
||||
@ -47,9 +47,8 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
services.redis = {
|
||||
enable = true;
|
||||
};
|
||||
services.redis.servers."nextcloud".enable = true;
|
||||
services.redis.servers."nextcloud".port = 6379;
|
||||
|
||||
systemd.services.nextcloud-setup= {
|
||||
requires = ["postgresql.service"];
|
||||
|
||||
@ -37,9 +37,8 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
services.redis = {
|
||||
enable = true;
|
||||
};
|
||||
services.redis.servers."nextcloud".enable = true;
|
||||
services.redis.servers."nextcloud".port = 6379;
|
||||
|
||||
systemd.services.nextcloud-setup= {
|
||||
requires = ["postgresql.service"];
|
||||
|
||||
35
pkgs/applications/audio/miniplayer/default.nix
Normal file
35
pkgs/applications/audio/miniplayer/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "miniplayer";
|
||||
version = "1.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JUlUFj/5DOTLa1XCZX/9Nj3Z9W+k4gnpJONiS4qNBIU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorthief
|
||||
ffmpeg-python
|
||||
mpd2
|
||||
pillow
|
||||
pixcat
|
||||
requests
|
||||
ueberzug
|
||||
];
|
||||
|
||||
# pythonImportsCheck is disabled because this package doesn't expose any modules.
|
||||
|
||||
meta = with lib; {
|
||||
description = "A curses-based MPD client with basic functionality that can also display an album art";
|
||||
homepage = "https://github.com/GuardKenzie/miniplayer";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
};
|
||||
}
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.248"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.257"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "5ff5fe47bad947a95545390865c597bec6c62070";
|
||||
sha256 = "0nfzf7q58mhdyszwv3mbz3wqf4w0m1p3fmf3cpga1pf9mfq65nqz";
|
||||
rev = "81f1a4dc3161882b0385c9d4752fbba84b9eca96";
|
||||
sha256 = "1p4c8k8pc47hl32bml050fvxyhdjcd002xx60rwvzlgvdgw6b3xq";
|
||||
};
|
||||
|
||||
nugetDeps = ./deps.nix;
|
||||
|
||||
@ -46,9 +46,9 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "7.15";
|
||||
version = "7.17";
|
||||
url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-0auKGarm/mwIM8PYgqMkSKv6SihZDxRulUUOufWPuRw=";
|
||||
sha256 = "sha256-JDa4rFDWKPTKOsUwDBgmY9/PpIuhulVIp3KOtmH7T0E=";
|
||||
inherit (stable) gecko32 gecko64 patches;
|
||||
|
||||
mono = fetchurl rec {
|
||||
@ -61,7 +61,7 @@ in rec {
|
||||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "sha256-JMig0EUgxdRwpeaxZcNQi+6xWHUg43bXB7jkm5skKC8=";
|
||||
sha256 = "sha256-eC5nYX6Cjutd30rrAn6SavWlQtF8swMHDzsESN4SUmo=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "AusweisApp2";
|
||||
version = "1.24.1";
|
||||
version = "1.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = version;
|
||||
sha256 = "sha256-Uoi12odfJGyNc8Ap7E/zm4xklYdPPQvCGNxjb9AWJOI=";
|
||||
sha256 = "sha256-p38zcTFbCyImiGVCr5o/QQ6BT8U2SMiHeYE3aTNYpJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "genact";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LCKnC6iTr5tmqvL+T+ifYDXJrE8qts4ofCsh81PNg34=";
|
||||
sha256 = "sha256-lZNVXBIYl9niqdwNcSzQwQTdxlA4kKQ/WrEt93cQDJU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-aAcBOLKjHYiuPWgnjXIrNozbu8sG/qt7XoWE4iDvq6I=";
|
||||
cargoSha256 = "sha256-9IiA7KAaj9bLJ7QSB/ojLEiUVv0FGYsu9by4NSfMtiE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A nonsense activity generator";
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c
|
||||
index eb672f06..f0f546da 100644
|
||||
--- a/types/wlr_output_layout.c
|
||||
+++ b/types/wlr_output_layout.c
|
||||
@@ -242,6 +242,9 @@ bool wlr_output_layout_contains_point(struct wlr_output_layout *layout,
|
||||
if (reference) {
|
||||
struct wlr_output_layout_output *l_output =
|
||||
wlr_output_layout_get(layout, reference);
|
||||
+ if (!l_output) {
|
||||
+ return false;
|
||||
+ }
|
||||
struct wlr_box *box = output_layout_output_get_box(l_output);
|
||||
return wlr_box_contains_point(box, lx, ly);
|
||||
} else {
|
||||
@ -21,36 +21,38 @@
|
||||
let
|
||||
phocWlroots = wlroots.overrideAttrs (old: {
|
||||
patches = (old.patches or []) ++ [
|
||||
# Temporary fix. Upstream report: https://source.puri.sm/Librem5/phosh/-/issues/422
|
||||
# Revert "layer-shell: error on 0 dimension without anchors"
|
||||
# https://source.puri.sm/Librem5/phosh/-/issues/422
|
||||
(fetchpatch {
|
||||
name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
|
||||
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/78fde4aaf1a74eb13a3f083cb6dfb29f578c3265/community/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
|
||||
sha256 = "1zjn7mwdj21z0jsc2mz90cnrzk97yqkiq58qqgpjav4h4dgpfb38";
|
||||
url = "https://source.puri.sm/Librem5/wlroots/-/commit/4f66b0931aaaee65367102e9c4ccb736097412c7.patch";
|
||||
hash = "sha256-2Vy5a4lWh8FP2PN6xRIZv6IlUuLZibT0MYW+EyvVULs=";
|
||||
})
|
||||
|
||||
# xwayland: Allow to retrieve _NET_STARTUP_ID
|
||||
# xdg-activation: Deduplicate token creation code
|
||||
(fetchpatch {
|
||||
name = "allow-to-retrieve-net-startup-id.patch";
|
||||
url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch";
|
||||
sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY=";
|
||||
name = "xdg-activation-deduplicate-token-creation-code.patch";
|
||||
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/dd03d839ab56c3e5d7c607a8d76e58e0b75edb85.patch";
|
||||
sha256 = "sha256-mxt68MISC24xpaBtVSc1F2W4cyNs5wQowtbUQH9Eqr8=";
|
||||
})
|
||||
# xdg-activation: Allow to submit tokens
|
||||
|
||||
# seat: Allow to cancel touches
|
||||
(fetchpatch {
|
||||
name = "allow-to-submit-tokens.patch";
|
||||
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/4c59f7d46a949548caa55805b00922f846d58525.patch";
|
||||
sha256 = "sha256-1kUIt6lV3HXN2BBBER8sjYVLTvgqELdSeFullJjNGo8=";
|
||||
})
|
||||
# xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO
|
||||
(fetchpatch {
|
||||
name = "allow-to-retrieve-startup-id-via-net-startup-info.patch";
|
||||
url = "https://github.com/swaywm/wlroots/commit/235bb6f2fcb8ee4174215ba74b5bc2f191c5960a.patch";
|
||||
sha256 = "sha256-7AWBq12tF/781CmgvTaOvTIiiJMywxRn6eWp+jacdak=";
|
||||
name = "seat-Allow-to-cancel-touches.patch";
|
||||
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/17b2b06633729f1826715c1d0b84614aa3cedb3a.patch";
|
||||
sha256 = "sha256-BAeXa3ZB5TXnlq0ZP2+rZlVXEPWpLP4Wi4TLwoXjkz4=";
|
||||
})
|
||||
|
||||
# From
|
||||
# https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/13fcdba75cf5f21cfd49c1a05f4fa62f77619b40
|
||||
# which has been merged upstream, but doesn't cleanly apply on to the
|
||||
# latest released version.
|
||||
./0001-handle-outputs-that-arent-in-the-layout.patch
|
||||
];
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "phoc";
|
||||
version = "0.13.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
@ -58,7 +60,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "Phosh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-65u59S6ntvkoQUO5BvkHZVcbj6cHIU4CgHWjzFo6s94=";
|
||||
sha256 = "sha256-HPqhro6TE/Ukh4txBPrDoIuDaxSxd/ZkDVZU3+m3GFg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
, libpng
|
||||
, mpfr
|
||||
, nlopt
|
||||
, opencascade-occt
|
||||
, openvdb
|
||||
, pcre
|
||||
, qhull
|
||||
@ -48,7 +49,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prusa-slicer";
|
||||
version = "2.4.2";
|
||||
version = "2.5.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
|
||||
libpng
|
||||
mpfr
|
||||
nlopt
|
||||
opencascade-occt
|
||||
openvdb
|
||||
pcre
|
||||
systemd
|
||||
@ -133,7 +135,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "PrusaSlicer";
|
||||
sha256 = "17p56f0zmiryy8k4da02in1l6yxniz286gf9yz8s1gaz5ksqj4af";
|
||||
sha256 = "sha256-wLe+5TFdkgQ1mlGYgp8HBzugeONSne17dsBbwblILJ4=";
|
||||
rev = "version_${version}";
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -13,15 +13,18 @@ buildGoModule rec {
|
||||
|
||||
vendorSha256 = "sha256-HmMh5jrRGs4rtN9GLddS9IwITyvVmOrL5TShhQeyxKU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
# TODO: enable after https://github.com/pulumi/kubespy/issues/72 is addressed.
|
||||
# postInstall = ''
|
||||
# for shell in bash zsh; do
|
||||
# $out/bin/kubespy completion $shell > kubespy.$shell
|
||||
# installShellCompletion kubespy.$shell
|
||||
# done
|
||||
# '';
|
||||
ldflags = [ "-X" "github.com/pulumi/kubespy/version.Version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash fish zsh; do
|
||||
$out/bin/kubespy completion $shell > kubespy.$shell
|
||||
installShellCompletion kubespy.$shell
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to observe Kubernetes resources in real time";
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "coyim";
|
||||
version = "0.3.11";
|
||||
version = "0.4";
|
||||
|
||||
goPackagePath = "github.com/coyim/coyim";
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
owner = "coyim";
|
||||
repo = "coyim";
|
||||
rev = "v${version}";
|
||||
sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3";
|
||||
sha256 = "sha256-dpTU5Tx1pfUGZMt9QNEYDytgArhhvEvh1Yvj6IAjgeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
@ -23,6 +23,5 @@ buildGoPackage rec {
|
||||
homepage = "https://coy.im/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
broken = true; #fails to build with go >= 1.16
|
||||
};
|
||||
}
|
||||
|
||||
38
pkgs/applications/science/biology/gatk/default.nix
Normal file
38
pkgs/applications/science/biology/gatk/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib, stdenv, fetchzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gatk";
|
||||
version = "4.2.6.1";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip";
|
||||
sha256 = "0hjlsl7fxf3ankyjidqhwxc70gjh6z4lnjzw6b5fldzb0qvgfvy8";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install -m755 -D $src/gatk $out/bin/
|
||||
install -m755 -D $src/gatk-package-${version}-local.jar $out/bin/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gatk.broadinstitute.org/hc/en-us";
|
||||
description = "A wide variety of tools with a primary focus on variant discovery and genotyping." ;
|
||||
license = licenses.asl20;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ] ;
|
||||
maintainers = with maintainers; [ apraga ];
|
||||
longDescription = ''
|
||||
The GATK is the industry standard for identifying SNPs and indels in germline
|
||||
DNA and RNAseq data. Its scope is now expanding to include somatic short variant
|
||||
calling, and to tackle copy number (CNV) and structural variation (SV). In
|
||||
addition to the variant callers themselves, the GATK also includes many
|
||||
utilities to perform related tasks such as processing and quality control of
|
||||
high-throughput sequencing data, and bundles the popular Picard toolkit.
|
||||
|
||||
These tools were primarily designed to process exomes and whole genomes
|
||||
generated with Illumina sequencing technology, but they can be adapted to handle
|
||||
a variety of other technologies and experimental designs. And although it was
|
||||
originally developed for human genetics, the GATK has since evolved to handle
|
||||
genome data from any organism, with any level of ploidy.
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -28,11 +27,12 @@
|
||||
, networkmanager
|
||||
, polkit
|
||||
, libsecret
|
||||
, evolution-data-server
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phosh";
|
||||
version = "0.17.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
|
||||
sha256 = "sha256-o/0NJZo1EPpXguN/tkUc+/9XaVTQWaLGe+2pU0B91Cg=";
|
||||
sha256 = "sha256-NJLuOUBQmgphGMFZN3MsIOP99YI+CxyR+JuybX3Vnpc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
|
||||
libxkbcommon
|
||||
libgudev
|
||||
callaudiod
|
||||
evolution-data-server
|
||||
pulseaudio
|
||||
glib
|
||||
gcr
|
||||
@ -83,19 +84,11 @@ stdenv.mkDerivation rec {
|
||||
# Temporarily disabled - Test is broken (SIGABRT)
|
||||
doCheck = false;
|
||||
|
||||
mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ];
|
||||
|
||||
patches = [
|
||||
# build: Adjust to polkit version changes
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/16b46e295b86cbf1beaccf8218cf65ebb4b7a6f1.patch";
|
||||
sha256 = "sha256-Db1OEdiI1QBHGEBs1Coi7LTF9bCScdDgxmovpBdIY/g=";
|
||||
})
|
||||
# polkit-auth-agent: Scope cleanup function for PolkitAgentListener
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/b864653df50bfd8f34766fc6b37a3bf32cfbdfa4.patch";
|
||||
sha256 = "sha256-YCw3tGk94NAa6PPTmA1lCJVzzi9GC74BmvtTcvuHPh0=";
|
||||
})
|
||||
mesonFlags = [
|
||||
"-Dsystemd=true"
|
||||
"-Dcompositor=${phoc}/bin/phoc"
|
||||
# https://github.com/NixOS/nixpkgs/issues/36468
|
||||
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "bismuth";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bismuth-Forge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sYehZ9f+V7xeqYaw5p6BCm2XWsC/mpmsak6pUFIWAbI=";
|
||||
sha256 = "sha256-IWwFsYqoqW3924+pf8L+acIt31aU/mhqakXbT9Q4Bqw=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -29,13 +29,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0vipg3y0kbbzjhxky6hfyxy42mpqhvwn1r010zr5givcfp8ghq26";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ]
|
||||
++ optionals docSupport [ doxygen graphviz ]
|
||||
++ optionals pythonSupport [ swig ];
|
||||
|
||||
buildInputs = [ libconfuse ]
|
||||
++ optionals cppSupport [ boost ]
|
||||
++ optionals pythonSupport [ python3 ];
|
||||
++ optionals cppSupport [ boost ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DFTDIPP=${onOff cppSupport}"
|
||||
@ -43,6 +44,8 @@ stdenv.mkDerivation rec {
|
||||
"-DLINK_PYTHON_LIBRARY=${onOff pythonSupport}"
|
||||
"-DPYTHON_BINDINGS=${onOff pythonSupport}"
|
||||
"-DDOCUMENTATION=${onOff docSupport}"
|
||||
"-DPYTHON_EXECUTABLE=${python3.pythonForBuild.interpreter}"
|
||||
"-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ libusb1 ];
|
||||
|
||||
@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
|
||||
# NOTE: You must also bump:
|
||||
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
|
||||
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
|
||||
version = "8.6.0";
|
||||
version = "8.7.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bSId7G2o808WfHGt5ioFEIhPyy4+XW+R349UgHKOvQU=";
|
||||
sha256 = "sha256-5F6Ibp3k7I1mwv8DNZ7rsW0wOw5q3vHtCUc7jJUNzrs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencascade-occt";
|
||||
version = "7.5.1";
|
||||
version = "7.6.2";
|
||||
commit = "V${builtins.replaceStrings ["."] ["_"] version}";
|
||||
|
||||
src = fetchurl {
|
||||
name = "occt-${commit}.tar.gz";
|
||||
url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
|
||||
sha256 = "sha256-1whKU+7AMVYabfs15x8MabohKonn5oM54ZEtxF93wAo=";
|
||||
sha256 = "sha256-n3KFrN/mN1SVXfuhEUAQ1fJzrCvhiclxfEIouyj9Z18=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
||||
@ -14,11 +14,12 @@
|
||||
, pygments
|
||||
, typeguard
|
||||
, urllib3
|
||||
, flake8
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deal";
|
||||
version = "4.23.3";
|
||||
version = "4.23.4";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -26,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "life4";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-duFxe2KSQQb7HB5KrrE32xzTb6QkQcrQssiuXLKao50=";
|
||||
hash = "sha256-YwozwoTb1JsvrwcTntlpWpQJ9DszH2lmtuKkK8qZiG0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -58,6 +59,7 @@ buildPythonPackage rec {
|
||||
hypothesis
|
||||
vaa
|
||||
urllib3
|
||||
flake8
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dparse";
|
||||
version = "0.5.2";
|
||||
version = "0.6.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-w0iZSh9ByF9mTY9aR0QmR7xOIsWvWxsm7ymv8Ppd3c0=";
|
||||
sha256 = "sha256-VwaLthhZsWdsa+sQ85mQbuy0GnW10/vJnQMRBZy2chM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,43 +7,33 @@
|
||||
, astropy
|
||||
, scipy
|
||||
, pandas
|
||||
, codecov
|
||||
, pytest
|
||||
, pytest-cov
|
||||
, pytest-runner
|
||||
, coveralls
|
||||
, twine
|
||||
, check-manifest
|
||||
, pytestCheckHook
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hickle";
|
||||
version = "4.0.4";
|
||||
version = "5.0.2";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0d35030a76fe1c7fa6480088cde932689960ed354a2539ffaf5f3c90c578c06f";
|
||||
hash = "sha256-2+7OF/a89jK/zLhbk/Q2A+zsKnfRbq3YMKGycEWsLEQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements_test.txt \
|
||||
--replace 'astropy<3.1;' 'astropy;' --replace 'astropy<3.0;' 'astropy;'
|
||||
substituteInPlace tox.ini --replace "--cov=./hickle" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ h5py numpy dill ];
|
||||
|
||||
doCheck = false; # incompatible with latest astropy
|
||||
checkInputs = [
|
||||
pytest pytest-cov pytest-runner coveralls scipy pandas astropy twine check-manifest codecov
|
||||
pytestCheckHook scipy pandas astropy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "hickle" ];
|
||||
|
||||
meta = {
|
||||
# incompatible with h5py>=3.0, see https://github.com/telegraphic/hickle/issues/143
|
||||
broken = true;
|
||||
description = "Serialize Python data to HDF5";
|
||||
homepage = "https://github.com/telegraphic/hickle";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
47
pkgs/development/python-modules/jsons/default.nix
Normal file
47
pkgs/development/python-modules/jsons/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, attrs
|
||||
, pytestCheckHook
|
||||
, typish
|
||||
, tzdata
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsons";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ramonhagenaars";
|
||||
repo = "jsons";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sdwc57f3lwzhbcapjdbay9f8rn65rlspxa67a2i5apcgg403qpc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
typish
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
attrs
|
||||
pytestCheckHook
|
||||
tzdata
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# These tests are based on timings, which fail
|
||||
# on slow or overloaded machines.
|
||||
"tests/test_performance.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jsons"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Turn Python objects into dicts or json strings and back";
|
||||
homepage = "https://github.com/ramonhagenaars/jsons";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fmoda3 ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libvirt";
|
||||
version = "8.6.0";
|
||||
version = "8.7.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "libvirt";
|
||||
repo = "libvirt-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eJ0RPxJ4Gm+VGs6NeTWP2FbvDnJy4mURPlFbgvkSgo0=";
|
||||
sha256 = "sha256-B7pJDFjamFtNAhnPWMzNUWFEBhM48y0QG4MUtX7GP4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydmd";
|
||||
version = "0.4.0.post2207";
|
||||
version = "0.4.0.post2209";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "mathLab";
|
||||
repo = "PyDMD";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-IiHNn8BXOl+eQdxwTrF8PQhDlsMOTj87ugpQ09kDTO4=";
|
||||
sha256 = "sha256-09KnVuBNe1aVjO1OW+rhVsHplSO4qBIayy//9Jv0fQM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -33,7 +33,7 @@ let
|
||||
});
|
||||
in buildPythonPackage rec {
|
||||
pname = "pysaml2";
|
||||
version = "7.1.2";
|
||||
version = "7.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -42,7 +42,7 @@ in buildPythonPackage rec {
|
||||
owner = "IdentityPython";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nyQcQ1OO9PuuQROg+km2vIRF1sZ22MZhiHpmVXWl+is=";
|
||||
sha256 = "sha256-lnaizwbtBYdKx1puizah+UWsw54NVW6UhEw/eStl1WI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,18 +12,18 @@
|
||||
, opencascade-occt
|
||||
, rapidjson
|
||||
, smesh
|
||||
, swig
|
||||
, swig4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pythonocc-core";
|
||||
version = "7.5.1";
|
||||
version = "7.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpaviot";
|
||||
repo = "pythonocc-core";
|
||||
rev = version;
|
||||
sha256 = "1md6x60pnfq0qv4lsnmjv6i96mzdrcpxcgpb316i7wmv9b5ci01s";
|
||||
sha256 = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
--replace "/usr/X11R6/lib/libGLU.dylib" "${libGLU}/lib/libGLU.dylib"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake swig ];
|
||||
nativeBuildInputs = [ cmake swig4 ];
|
||||
buildInputs = [
|
||||
python opencascade-occt smesh
|
||||
freetype libGL libGLU libX11 libXext libXmu libXi
|
||||
|
||||
@ -1,16 +1,27 @@
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, albumentations
|
||||
, dill
|
||||
, h5py
|
||||
, hickle
|
||||
, numpy
|
||||
, opencv4
|
||||
, pandas
|
||||
, pillow
|
||||
, prodict
|
||||
, pycm
|
||||
, pyyaml
|
||||
, scipy
|
||||
, requests
|
||||
, scikitimage
|
||||
, six
|
||||
, tabulate
|
||||
, torch
|
||||
, torchvision
|
||||
, tqdm
|
||||
, yacs
|
||||
, lib
|
||||
}:
|
||||
|
||||
@ -27,17 +38,34 @@ buildPythonPackage rec {
|
||||
sha256 = "0wnijdvqgdpzfdsy1cga3bsr0n7zzsl8hp4dskqwxx087g5h1r84";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "opencv-python-headless" "opencv"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
h5py hickle numpy pandas pillow six torch torchvision tqdm
|
||||
albumentations
|
||||
dill
|
||||
h5py
|
||||
hickle
|
||||
numpy
|
||||
opencv4
|
||||
pandas
|
||||
pillow
|
||||
prodict
|
||||
pycm
|
||||
pyyaml
|
||||
scipy
|
||||
requests
|
||||
scikitimage
|
||||
tabulate
|
||||
torch
|
||||
torchvision
|
||||
tqdm
|
||||
six
|
||||
yacs
|
||||
];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
pytest tests/
|
||||
runHook postCheck
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "High-level training framework for Pytorch";
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ropgadget";
|
||||
version = "6.9";
|
||||
version = "7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "JonathanSalwan";
|
||||
repo = "ROPgadget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qq38NJR27f6lBq5WeR6j6CQrMu4iA7i7zWJ9gWsqbDI=";
|
||||
hash = "sha256-7pGPi1efgxLoxoiqtxzfcSWuNw0otAVgamEzs8stBtc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "4.20.1";
|
||||
version = "4.21.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3Kx7/3IJM428KXfOPRnPK4TYnAIXVOIMl33j8n5Cw60=";
|
||||
hash = "sha256-rIiue8GEeZy2tF/cjsXvX9WC9nQnZKNMykNMTeneMjo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-protobuf";
|
||||
version = "3.19.22";
|
||||
version = "3.20.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-0rJoYbDLRqPIZpsN9Qe373Lkh9pm1h+fNXaqds4CioM=";
|
||||
sha256 = "sha256-z7drXrpRSAd5ZgMAYTTMw2FDLdBhqMy42yz5EIpFQ2k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lib
|
||||
, pscale
|
||||
, testers
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
@ -20,10 +26,23 @@ buildGoModule rec {
|
||||
"-X main.date=unknown"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd pscale \
|
||||
--bash <($out/bin/pscale completion bash) \
|
||||
--fish <($out/bin/pscale completion fish) \
|
||||
--zsh <($out/bin/pscale completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = pscale;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.planetscale.com/";
|
||||
changelog = "https://github.com/planetscale/cli/releases/tag/v${version}";
|
||||
description = "The CLI for PlanetScale Database";
|
||||
changelog = "https://github.com/planetscale/cli/releases/tag/v${version}";
|
||||
homepage = "https://www.planetscale.com/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ pimeys ];
|
||||
};
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "polymc";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PolyMC";
|
||||
repo = "PolyMC";
|
||||
rev = version;
|
||||
sha256 = "sha256-Pu2Eb3g6gwCZjJN0N6S/N82eBMLduQQUzXo8nMmtE+Y=";
|
||||
sha256 = "sha256-mqLk7ZcSrtvlUziNUCtnH7xQplXBruuiuN2b1+VX1ng=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -237,12 +237,12 @@ in rec {
|
||||
fzf-tmux-url = mkTmuxPlugin {
|
||||
pluginName = "fzf-tmux-url";
|
||||
rtpFilePath = "fzf-url.tmux";
|
||||
version = "unstable-2019-12-02";
|
||||
version = "unstable-2021-12-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "tmux-fzf-url";
|
||||
rev = "2baa410bf7a0f6ceb62a83770baf90d570406ac0";
|
||||
sha256 = "0rjzzlmxgjrr8g19bg2idcqr9ny07mrq2s39vndg24n0m7znh3fz";
|
||||
rev = "1241fc5682850fe41812cad81c76541674ee305b";
|
||||
sha256 = "1270c5nfvgsdajgfahlacqfb5xwg4hwfrciiy0v03d50vg4h0kdi";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -24,14 +24,14 @@
|
||||
assert (!libsOnly) -> kernel != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "18.0.0-53049";
|
||||
version = "18.0.1-53056";
|
||||
pname = "prl-tools";
|
||||
|
||||
# We download the full distribution to extract prl-tools-lin.iso from
|
||||
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
|
||||
src = fetchurl {
|
||||
url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg";
|
||||
sha256 = "sha256-MGiqCvOsu/sKz6JHJFGP5bT12XYnm2kTMdOiflg9ses=";
|
||||
sha256 = "sha256-igIRWLKbgU8pQrsK+lyjP8aodylXjRrRlOlaP5KbHm8=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
|
||||
@ -0,0 +1,135 @@
|
||||
From 045f33745f863ba20acfc3fe335c575d9cd87884 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sat, 10 Sep 2022 15:18:05 +0200
|
||||
Subject: [PATCH] Setup: remove custom dbuser creation behavior
|
||||
|
||||
Both PostgreSQL and MySQL can be authenticated against from Nextcloud by
|
||||
supplying a database password. Now, during setup the following things
|
||||
happen:
|
||||
|
||||
* When using postgres and the db user has elevated permissions, a new
|
||||
unprivileged db user is created and the settings `dbuser`/`dbpass` are
|
||||
altered in `config.php`.
|
||||
|
||||
* When using MySQL, the password is **always** regenerated since
|
||||
24.0.5/23.0.9[1].
|
||||
|
||||
I consider both cases problematic: the reason why people do configuration
|
||||
management is to have it as single source of truth! So, IMHO any
|
||||
application that silently alters config and thus causes deployed
|
||||
nodes to diverge from the configuration is harmful for that.
|
||||
|
||||
I guess it was sheer luck that it worked for so long in NixOS because
|
||||
nobody has apparently used password authentication with a privileged
|
||||
user to operate Nextcloud (which is a good thing in fact).
|
||||
|
||||
[1] https://github.com/nextcloud/server/pull/33513
|
||||
---
|
||||
lib/private/Setup/MySQL.php | 53 --------------------------------
|
||||
lib/private/Setup/PostgreSQL.php | 26 ----------------
|
||||
2 files changed, 79 deletions(-)
|
||||
|
||||
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
|
||||
index 2c16cac3d2..9b2265091f 100644
|
||||
--- a/lib/private/Setup/MySQL.php
|
||||
+++ b/lib/private/Setup/MySQL.php
|
||||
@@ -142,59 +142,6 @@ class MySQL extends AbstractDatabase {
|
||||
$rootUser = $this->dbUser;
|
||||
$rootPassword = $this->dbPassword;
|
||||
|
||||
- //create a random password so we don't need to store the admin password in the config file
|
||||
- $saveSymbols = str_replace(['\"', '\\', '\'', '`'], '', ISecureRandom::CHAR_SYMBOLS);
|
||||
- $password = $this->random->generate(22, ISecureRandom::CHAR_ALPHANUMERIC . $saveSymbols)
|
||||
- . $this->random->generate(2, ISecureRandom::CHAR_UPPER)
|
||||
- . $this->random->generate(2, ISecureRandom::CHAR_LOWER)
|
||||
- . $this->random->generate(2, ISecureRandom::CHAR_DIGITS)
|
||||
- . $this->random->generate(2, $saveSymbols)
|
||||
- ;
|
||||
- $this->dbPassword = str_shuffle($password);
|
||||
-
|
||||
- try {
|
||||
- //user already specified in config
|
||||
- $oldUser = $this->config->getValue('dbuser', false);
|
||||
-
|
||||
- //we don't have a dbuser specified in config
|
||||
- if ($this->dbUser !== $oldUser) {
|
||||
- //add prefix to the admin username to prevent collisions
|
||||
- $adminUser = substr('oc_' . $username, 0, 16);
|
||||
-
|
||||
- $i = 1;
|
||||
- while (true) {
|
||||
- //this should be enough to check for admin rights in mysql
|
||||
- $query = 'SELECT user FROM mysql.user WHERE user=?';
|
||||
- $result = $connection->executeQuery($query, [$adminUser]);
|
||||
-
|
||||
- //current dbuser has admin rights
|
||||
- $data = $result->fetchAll();
|
||||
- $result->closeCursor();
|
||||
- //new dbuser does not exist
|
||||
- if (count($data) === 0) {
|
||||
- //use the admin login data for the new database user
|
||||
- $this->dbUser = $adminUser;
|
||||
- $this->createDBUser($connection);
|
||||
-
|
||||
- break;
|
||||
- } else {
|
||||
- //repeat with different username
|
||||
- $length = strlen((string)$i);
|
||||
- $adminUser = substr('oc_' . $username, 0, 16 - $length) . $i;
|
||||
- $i++;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- } catch (\Exception $ex) {
|
||||
- $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [
|
||||
- 'exception' => $ex,
|
||||
- 'app' => 'mysql.setup',
|
||||
- ]);
|
||||
- // Restore the original credentials
|
||||
- $this->dbUser = $rootUser;
|
||||
- $this->dbPassword = $rootPassword;
|
||||
- }
|
||||
-
|
||||
$this->config->setValues([
|
||||
'dbuser' => $this->dbUser,
|
||||
'dbpassword' => $this->dbPassword,
|
||||
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
|
||||
index bc24909dc3..e49e5508e1 100644
|
||||
--- a/lib/private/Setup/PostgreSQL.php
|
||||
+++ b/lib/private/Setup/PostgreSQL.php
|
||||
@@ -45,32 +45,6 @@ class PostgreSQL extends AbstractDatabase {
|
||||
$connection = $this->connect([
|
||||
'dbname' => 'postgres'
|
||||
]);
|
||||
- //check for roles creation rights in postgresql
|
||||
- $builder = $connection->getQueryBuilder();
|
||||
- $builder->automaticTablePrefix(false);
|
||||
- $query = $builder
|
||||
- ->select('rolname')
|
||||
- ->from('pg_roles')
|
||||
- ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE')))
|
||||
- ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
|
||||
-
|
||||
- try {
|
||||
- $result = $query->execute();
|
||||
- $canCreateRoles = $result->rowCount() > 0;
|
||||
- } catch (DatabaseException $e) {
|
||||
- $canCreateRoles = false;
|
||||
- }
|
||||
-
|
||||
- if ($canCreateRoles) {
|
||||
- //use the admin login data for the new database user
|
||||
-
|
||||
- //add prefix to the postgresql user name to prevent collisions
|
||||
- $this->dbUser = 'oc_' . strtolower($username);
|
||||
- //create a new password so we don't need to store the admin config in the config file
|
||||
- $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, ISecureRandom::CHAR_ALPHANUMERIC);
|
||||
-
|
||||
- $this->createDBUser($connection);
|
||||
- }
|
||||
|
||||
$this->config->setValues([
|
||||
'dbuser' => $this->dbUser,
|
||||
--
|
||||
2.36.2
|
||||
|
||||
@ -13,6 +13,8 @@ let
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
patches = [ ./0001-Setup-remove-custom-dbuser-creation-behavior.patch ];
|
||||
|
||||
passthru.tests = nixosTests.nextcloud;
|
||||
|
||||
installPhase = ''
|
||||
@ -46,13 +48,13 @@ in {
|
||||
'';
|
||||
|
||||
nextcloud23 = generic {
|
||||
version = "23.0.8";
|
||||
sha256 = "ac3d042253399be25a2aa01c799dec75a1459b6ae453874414f6528cc2ee5061";
|
||||
version = "23.0.9";
|
||||
sha256 = "sha256-Ysxapp8IpRcRBC3CRM4yxoGYCuedAVURT3FhDD4jNBY=";
|
||||
};
|
||||
|
||||
nextcloud24 = generic {
|
||||
version = "24.0.4";
|
||||
sha256 = "d107426f8e1c193db882a04c844f9bc7e7eeb7c21e46c46197e5154d6d6ac28e";
|
||||
version = "24.0.5";
|
||||
sha256 = "sha256-sieIN3zLk5Hn+eztP2mpI2Zprqqy4OpSUKc+318e8CY=";
|
||||
};
|
||||
|
||||
# tip: get the sha with:
|
||||
|
||||
@ -24,16 +24,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell";
|
||||
version = "0.67.0";
|
||||
version = "0.68.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-O5uM27DvcpwlZStFFLYRDRtFXzAzUdG7v0phK9LJsSo=";
|
||||
sha256 = "sha256-PE6UewAE7z0Ie5aFocDK3Qu0Y4ppuPtpD6tDnYfM11Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-eGUI+/Vmqv+BCIQCGoF4Egf3oNyonM3tpt1R3EjIocQ=";
|
||||
cargoSha256 = "sha256-7guFkR/paL8jk5YwiRNMbWCyA6DqOaLGTmbWHAWDxRw=";
|
||||
|
||||
# enable pkg-config feature of zstd
|
||||
cargoPatches = [ ./zstd-pkg-config.patch ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "discordchatexporter-cli";
|
||||
version = "2.35.1";
|
||||
version = "2.35.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tyrrrz";
|
||||
repo = "discordchatexporter";
|
||||
rev = version;
|
||||
sha256 = "Zl9uYwbCSMj+hEvZdI57gALegDizwe4Z1k8qa3hSeIc=";
|
||||
sha256 = "OMJp5HL/fN5NGEgozaQefE503HwYnsGgTY4d4s15ANE=";
|
||||
};
|
||||
|
||||
projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";
|
||||
|
||||
@ -1,22 +1,41 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitea, protobuf, testers, Security, garage }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf
|
||||
, testers, Security, garage }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "garage";
|
||||
version = "0.7.0";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.deuxfleurs.fr";
|
||||
owner = "Deuxfleurs";
|
||||
repo = "garage";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gs0TW431YUrdsdJ+PYrJgnLiBmDPYnUR0iVnQ/YqIfU=";
|
||||
sha256 = "sha256-WDhe2L+NalMoIy2rhfmv8KCNDMkcqBC9ezEKKocihJg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-XGSenT2q3VXNcIT1Lg1e5HTOkEdOb1o3H07ahteQM/o=";
|
||||
cargoSha256 = "sha256-5m4c8/upBYN8nuysDhGKEnNVJjEGC+yLrraicrAQOfI=";
|
||||
|
||||
nativeBuildInputs = [ protobuf ];
|
||||
nativeBuildInputs = [ protobuf pkg-config ];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
# See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98
|
||||
# on version changes for checking if changes are required here
|
||||
buildFeatures = [
|
||||
"kubernetes-discovery"
|
||||
];
|
||||
|
||||
# To make integration tests pass, we include the optional k2v feature here,
|
||||
# but not in buildFeatures. See:
|
||||
# https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/
|
||||
checkFeatures = [
|
||||
"k2v"
|
||||
"kubernetes-discovery"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = garage; };
|
||||
|
||||
@ -12,15 +12,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bat";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aTW1PheKWjeBtMePMDYeXOqZEaq9k6dMrrPKoT1C70E=";
|
||||
sha256 = "sha256-xkGGnWjuZ5ZR4Ll+JwgWyKZFboFZ6HKA8GviR3YBAnM=";
|
||||
};
|
||||
cargoSha256 = "sha256-tzhtgF/NCvSMqKRFCgkE5iIEM4OmJtmpuqHP5qhTIMI=";
|
||||
cargoSha256 = "sha256-ye6GH4pcI9h1CNpobUzfJ+2WlqJ98saCdD77AtSGafg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
|
||||
|
||||
|
||||
31
pkgs/tools/misc/octosql/default.nix
Normal file
31
pkgs/tools/misc/octosql/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "octosql";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cube2222";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y6kKYW79415nCJkcIKQjcBQiFZrRCJ8If65lV9wmNFA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ukNjLk1tTdw0bwXaYAEDuHfzxHuAX1xyqRqC6wmW/H4=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/cube2222/octosql/cmd.VERSION=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
rm -v $out/bin/tester
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Commandline tool for joining, analyzing and transforming data from multiple databases and file formats using SQL";
|
||||
homepage = "https://github.com/cube2222/octosql";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ arikgrahl ];
|
||||
};
|
||||
}
|
||||
37
pkgs/tools/misc/theme-sh/default.nix
Normal file
37
pkgs/tools/misc/theme-sh/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "theme-sh";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lemnos";
|
||||
repo = "theme.sh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zDw8WGBzO4/HRCgN7yoUxT49ibTz+QkRa5WpBQbl1nI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
install -Dm755 bin/theme.sh $out/bin
|
||||
wrapProgram $out/bin/theme.sh \
|
||||
--prefix PATH : ${lib.makeBinPath [ coreutils gawk ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A script which lets you set your $terminal theme";
|
||||
homepage = "https://github.com/lemnos/theme.sh";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "theme.sh";
|
||||
};
|
||||
}
|
||||
@ -4,13 +4,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yubico-piv-tool";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz";
|
||||
sha256 = "sha256-t+3k3cPW4x3mey4t3NMZsitAzC4Jc7mGbQUqdUSTsU4=";
|
||||
hash = "sha256-oCoS2VRdHvehuZhgbYm3tlWl9aFDdzbPUdsIP4dvVak=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace "-Werror" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake gengetopt ];
|
||||
buildInputs = [ openssl check ]
|
||||
++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
|
||||
@ -40,6 +44,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ viraptor ];
|
||||
maintainers = with maintainers; [ viraptor anthonyroussel ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.31.3";
|
||||
version = "0.31.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4iljPNw/tS/COStARg2PlrCoeE0lkSQ5+r8BrnxFLMo=";
|
||||
sha256 = "sha256-eULdBwQNquk4jj1SjdMsAN7S7mBSZs7jVAwMyFvOlWk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Ilz7Efa8QXXcNXx+GvYzrOeRFNJDnK4+3HfqFIX4V0Q=";
|
||||
cargoSha256 = "sha256-bKOY1r5SxAI9D+9YkYhX2l+pm2kZ6GEU2cf5NFqhuSU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandown
|
||||
|
||||
@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-template";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "${pname}-${version}-src";
|
||||
owner = "jonringer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5redgssfwbNEgpjmakIcU8cL4Xg1kPvyK88v+xMqAtw=";
|
||||
sha256 = "sha256-5Xxv9TH5rGA4VU/64YarrBIOrROWjFu3RYRcoNo70UA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-d4gxOIpgtVBpqy4QGW4/UB/FP94CS+yzS8GCjRVaXOM=";
|
||||
cargoSha256 = "sha256-GvIE46NXNWg1kSEbffvOCwVDr0YmVMo8C8+52RDEwco=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ buildGoModule
|
||||
, doppler
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lib
|
||||
, testers
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "doppler";
|
||||
@ -13,15 +19,29 @@ buildGoModule rec {
|
||||
|
||||
vendorSha256 = "sha256-evG1M0ZHfn9hsMsSncwxF5Hr/VJ7y6Ir0D2gHJaunBo=";
|
||||
|
||||
ldflags = [ "-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}" ];
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
"-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/doppler
|
||||
installShellCompletion --cmd doppler \
|
||||
--bash <($out/bin/doppler completion bash) \
|
||||
--fish <($out/bin/doppler completion fish) \
|
||||
--zsh <($out/bin/doppler completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = doppler;
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://doppler.com";
|
||||
description = "The official CLI for interacting with your Doppler Enclave secrets and configuration";
|
||||
homepage = "https://doppler.com";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lucperkins ];
|
||||
};
|
||||
|
||||
@ -31,7 +31,8 @@ let
|
||||
selected = [ pass ] ++ extensions passExtensions
|
||||
++ lib.optional tombPluginSupport passExtensions.tomb;
|
||||
in buildEnv {
|
||||
name = "pass-extensions-env";
|
||||
# lib.getExe looks for name, so we keep it the same as mainProgram
|
||||
name = "pass";
|
||||
paths = selected;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = concatMap (x: x.buildInputs) selected;
|
||||
@ -156,6 +157,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Stores, retrieves, generates, and synchronizes passwords securely";
|
||||
homepage = "https://www.passwordstore.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
mainProgram = "pass";
|
||||
maintainers = with maintainers; [ lovek323 fpletz tadfisher globin ma27 ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
|
||||
@ -546,6 +546,8 @@ with pkgs;
|
||||
|
||||
erosmb = callPackage ../tools/security/erosmb { };
|
||||
|
||||
octosql = callPackage ../tools/misc/octosql { };
|
||||
|
||||
onesixtyone = callPackage ../tools/security/onesixtyone {};
|
||||
|
||||
oletools = with python3.pkgs; toPythonApplication oletools;
|
||||
@ -6636,6 +6638,8 @@ with pkgs;
|
||||
|
||||
gawkInteractive = gawk.override { interactive = true; };
|
||||
|
||||
gatk = callPackage ../applications/science/biology/gatk {} ;
|
||||
|
||||
gbdfed = callPackage ../tools/misc/gbdfed {
|
||||
gtk = gtk2-x11;
|
||||
};
|
||||
@ -8308,6 +8312,8 @@ with pkgs;
|
||||
|
||||
minidlna = callPackage ../tools/networking/minidlna { };
|
||||
|
||||
miniplayer = callPackage ../applications/audio/miniplayer { };
|
||||
|
||||
minipro = callPackage ../tools/misc/minipro { };
|
||||
|
||||
minisign = callPackage ../tools/security/minisign { };
|
||||
@ -9921,9 +9927,7 @@ with pkgs;
|
||||
|
||||
pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { };
|
||||
|
||||
phoc = callPackage ../applications/misc/phoc {
|
||||
wlroots = wlroots_0_14;
|
||||
};
|
||||
phoc = callPackage ../applications/misc/phoc { };
|
||||
|
||||
phockup = callPackage ../applications/misc/phockup { };
|
||||
|
||||
@ -11538,6 +11542,8 @@ with pkgs;
|
||||
|
||||
thefuck = python3Packages.callPackage ../tools/misc/thefuck { };
|
||||
|
||||
theme-sh = callPackage ../tools/misc/theme-sh { };
|
||||
|
||||
thicket = callPackage ../applications/version-management/git-and-tools/thicket { };
|
||||
|
||||
thiefmd = callPackage ../applications/editors/thiefmd { };
|
||||
|
||||
@ -4805,6 +4805,8 @@ in {
|
||||
|
||||
jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { };
|
||||
|
||||
jsons = callPackage ../development/python-modules/jsons { };
|
||||
|
||||
jsonschema = callPackage ../development/python-modules/jsonschema { };
|
||||
|
||||
jsonstreams = callPackage ../development/python-modules/jsonstreams { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user