summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nixos/modules/services/misc/gitlab.nix2
-rw-r--r--pkgs/development/python-modules/spyder/default.nix20
-rw-r--r--pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch24
-rw-r--r--pkgs/servers/mautrix-telegram/default.nix13
-rw-r--r--pkgs/servers/sql/mariadb/default.nix23
5 files changed, 47 insertions, 35 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index e206d5bb7c6d..69eb22f17bf0 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -40,6 +40,7 @@ let
gitalyToml = pkgs.writeText "gitaly.toml" ''
socket_path = "${lib.escape ["\""] gitalySocket}"
+ runtime_dir = "/run/gitaly"
bin_dir = "${cfg.packages.gitaly}/bin"
prometheus_listen_addr = "localhost:9236"
@@ -1353,6 +1354,7 @@ in {
TimeoutSec = "infinity";
Restart = "on-failure";
WorkingDirectory = gitlabEnv.HOME;
+ RuntimeDirectory = "gitaly";
ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}";
};
};
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index bb744b2abab4..aeb053965a5e 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
-, makeDesktopItem
, atomicwrites
, chardet
, cloudpickle
@@ -56,6 +55,10 @@ buildPythonPackage rec {
hash = "sha256-nZ+rw5qALSdu+nbaAtGA7PLW6XjcjeZvuPd4a5WtZkw=";
};
+ patches = [
+ ./dont-clear-pythonpath.patch
+ ];
+
nativeBuildInputs = [
pyqtwebengine.wrapQtAppsHook
];
@@ -101,16 +104,6 @@ buildPythonPackage rec {
# There is no test for spyder
doCheck = false;
- desktopItem = makeDesktopItem {
- name = "Spyder";
- exec = "spyder";
- icon = "spyder";
- comment = "Scientific Python Development Environment";
- desktopName = "Spyder";
- genericName = "Python IDE";
- categories = [ "Development" "IDE" ];
- };
-
postPatch = ''
# Remove dependency on pyqtwebengine
# This is still part of the pyqt 5.11 version we have in nixpkgs
@@ -124,11 +117,6 @@ buildPythonPackage rec {
# Add Python libs to env so Spyder subprocesses
# created to run compute kernels don't fail with ImportErrors
wrapProgram $out/bin/spyder --prefix PYTHONPATH : "$PYTHONPATH"
-
- # Create desktop item
- mkdir -p $out/share/icons
- cp spyder/images/spyder.svg $out/share/icons
- cp -r $desktopItem/share/applications/ $out/share
'';
dontWrapQtApps = true;
diff --git a/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch b/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch
new file mode 100644
index 000000000000..cb2a37930715
--- /dev/null
+++ b/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch
@@ -0,0 +1,24 @@
+Don't remove sys.path entries that come from PYTHONPATH, or else the app cannot
+be used in Nixpkgs.
+
+Author: Bjørn Forsman <bjorn.forsman@gmail.com>
+diff -uNr spyder-5.4.0.orig/spyder/app/start.py spyder-5.4.0/spyder/app/start.py
+--- spyder-5.4.0.orig/spyder/app/start.py 2022-08-30 02:02:28.000000000 +0200
++++ spyder-5.4.0/spyder/app/start.py 2023-01-02 11:38:28.138744879 +0100
+@@ -6,16 +6,8 @@
+ # (see spyder/__init__.py for details)
+ # -----------------------------------------------------------------------------
+
+-# Remove PYTHONPATH paths from sys.path before other imports to protect against
+-# shadowed standard libraries.
+ import os
+ import sys
+-if os.environ.get('PYTHONPATH'):
+- for path in os.environ['PYTHONPATH'].split(os.pathsep):
+- try:
+- sys.path.remove(path.rstrip(os.sep))
+- except ValueError:
+- pass
+
+ # Standard library imports
+ import ctypes
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index d52eade028b7..468df32bbddd 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -9,11 +9,11 @@ let
python = python3.override {
packageOverrides = self: super: {
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
- version = "1.26.0a5";
+ version = "1.27.0a1";
pname = "tulir-telethon";
src = super.fetchPypi {
inherit pname version;
- sha256 = "sha256-s6pj9kHqcl6XU1KQ/aOw1XWQ3CyDotaDl0m7aj9SbW4=";
+ sha256 = "sha256-tABAY4UlTyMK1ZafIFawegjBAtcnq3HMNbE1L6WaT3E=";
};
doCheck = false;
});
@@ -21,23 +21,18 @@ let
};
in python.pkgs.buildPythonPackage rec {
pname = "mautrix-telegram";
- version = "0.12.1";
+ version = "0.12.2";
disabled = python.pythonOlder "3.8";
src = fetchFromGitHub {
owner = "mautrix";
repo = "telegram";
rev = "v${version}";
- sha256 = "sha256-ecNcoNz++HtuDZnDLsXfPL0MRF+XMQ1BU/NFkKPbD5U=";
+ sha256 = "sha256-htCk0VLr6GfXbpYWF/2bmpko7gSVlkH6HwDjOMhW8is=";
};
patches = [ ./0001-Re-add-entrypoint.patch ];
- postPatch = ''
- substituteInPlace requirements.txt \
- --replace "asyncpg>=0.20,<0.27" "asyncpg>=0.20"
- '';
-
propagatedBuildInputs = with python.pkgs; ([
ruamel-yaml
python-magic
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 19a81db9a364..9eacea78a37e 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -96,6 +96,9 @@ let
# to pass in java explicitly.
"-DCONNECT_WITH_JDBC=OFF"
"-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
+ ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10.6") [
+ # workaround for https://jira.mariadb.org/browse/MDEV-29925
+ "-Dhave_C__Wl___as_needed="
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
# revisit this if nixpkgs supports any architecture whose stack grows upwards
"-DSTACK_DIRECTION=-1"
@@ -238,36 +241,36 @@ in
self: {
mariadb_104 = self.callPackage generic {
# Supported until 2024-06-18
- version = "10.4.26";
- hash = "sha256-cVrH4jr8O4pVnGzJmM2xlz2Q9iGyvddgPixuU4YLLd8=";
+ version = "10.4.27";
+ hash = "sha256-SKHyIMoYuwxGN513/pjrdQvMcFLnPxDjJ26ipcUbirI=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_105 = self.callPackage generic {
# Supported until 2025-06-24
- version = "10.5.17";
- hash = "sha256-hJyEC3b0hWUDtD7zqEH8lx6LUYjI3zaQkTv1aZaRt2E=";
+ version = "10.5.18";
+ hash = "sha256-NZOw3MDy6A6YF3AZ9dz6XMjBQXLOFhpvpQ+AhPLO90k=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_106 = self.callPackage generic {
# Supported until 2026-07
- version = "10.6.10";
- hash = "sha256-atn6hvDIXI7q+tJkNUnV/13ShyAClk51R1LekYY6o7c=";
+ version = "10.6.11";
+ hash = "sha256-V4S6TF2Hk7rbpYNIV2gk2YSewVLpy+5HoXZRYdhAyUo=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_108 = self.callPackage generic {
# Supported until 2023-05
- version = "10.8.5";
- hash = "sha256-z37TjDYTTNgYP93WTLPlD1ROgmS6dCAlXbEpcJfgjos=";
+ version = "10.8.6";
+ hash = "sha256-qal8eZtpnhDJOWW71wQ0U/eiDhQL0inSCaoWFvKfv20=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_109 = self.callPackage generic {
# Supported until 2023-08
- version = "10.9.3";
- hash = "sha256-mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4=";
+ version = "10.9.4";
+ hash = "sha256-Hf8IoPN+pc+PAMvRLUDoB1n659cxhMz1a1tRrP3PwFQ=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 07:00:13 +0000