chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-09-10 13:44:29 +02:00
parent 0066661c46
commit 906ebddcb8
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 100 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

54
flake.lock generated
View file

@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694011363, "lastModified": 1694342024,
"narHash": "sha256-lSiLkusIW+yM99gXzrgikEbtVDC3b4vUOa65zNANWbc=", "narHash": "sha256-0+d2NxGEDDiPIdp2KqxPeTYeyxN3GZxuM+K9SCkWdYs=",
"owner": "accentor", "owner": "accentor",
"repo": "api", "repo": "api",
"rev": "c70eac112e036c608d44bce588e8332ff37e02d2", "rev": "f39f74f4bd277a50086818f972800ab77e583a3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694018660, "lastModified": 1694310025,
"narHash": "sha256-h95u15PXvvxDOu7AzyKicntaOvUw+ajHJ3TPSbH2fJ0=", "narHash": "sha256-lsuhZw2sXTRuDTWr6XqUMbgIrNxHwulsO429eXtUn3M=",
"owner": "accentor", "owner": "accentor",
"repo": "web", "repo": "web",
"rev": "f51da4af3259ff4ff43ec0dce0910e799c2d61a4", "rev": "a1d2f5e2a7f12670c7a9784c93dafad6cae1a774",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1694082307, "lastModified": 1694340916,
"narHash": "sha256-cWkVD4mrHEUOHL/X8M7nN2wPBy00Ygw2Nn7PgFupBo4=", "narHash": "sha256-v7tfzIfKwrjYmLmp9qZYRXpFvd9PIn2OJc2jGzhI3Y8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e588a8c946f68523ccc20b1ffef899054da44cdc", "rev": "40fcebc368859916fa886b550d75cc70af106e7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1693972774, "lastModified": 1694338541,
"narHash": "sha256-Dt9UZs0/DaIex598quYRYFuGabUbvFdNrHuvGc6HjBc=", "narHash": "sha256-+ZtaNbOwlO1QgYOEvWdhi5wkWjW5Csrboz4xy0WucDg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b22d7bab30076bbb73744867d6c5bf7d6380570c", "rev": "f9041d12a90e8bc0c90e03be2ebe26a6c6e6fd70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -389,11 +389,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1693711723, "lastModified": 1694316990,
"narHash": "sha256-5QmlVzskLciJ0QzYmZ6ULvKA7bP6pgV9wwrLBB0V3j0=", "narHash": "sha256-ql9bLSR+9rE3mJ/8sle1KUGMvPhjhtsVefRb1Ah3juk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "aca56a79afb82208af2b39d8459dd29c10989135", "rev": "71d840d865b03ab1330d9b7f030a263991ee04e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -431,11 +431,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1693844670, "lastModified": 1694183432,
"narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -477,11 +477,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1693953029, "lastModified": 1694211700,
"narHash": "sha256-1+28KQl4YC4IBzKo/epvEyK5KH4MlgoYueJ8YwLGbOc=", "narHash": "sha256-ZYok+zqYorC6M/qtrnPVB9IHFWi2TzjlHLW/orMu0No=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4077a0e4ac3356222bc1f0a070af7939c3098535", "rev": "73e1976309fc789706b9f306407e9e7622a57d25",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,11 +509,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1694088761, "lastModified": 1694344336,
"narHash": "sha256-otBx8Y/srkvdnKHtuliswS52NkdcU9L4DJlNq1b2Fs0=", "narHash": "sha256-dtp64CTtI/9+924o6wp0XM7Peh/CcDriibSvlO5KVHw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "543cbcc969ed8eabebbf2317ec494e19c4212fd7", "rev": "3edbe3fc4e7f14e9ef9247243b5ebdff00c75578",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -655,11 +655,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694014569, "lastModified": 1694302571,
"narHash": "sha256-ZtBEb1TS8bUi2MO4YyO2PjnA9xBjO6OdU7in6Lgv5hg=", "narHash": "sha256-AkMsZAorpWz+HNtFCTmgwDFvldPK8UYqiy3eylns8/o=",
"owner": "chvp", "owner": "chvp",
"repo": "tetris", "repo": "tetris",
"rev": "ebba3f6930953ebf4f71a587da8332ad690e3ad0", "rev": "0e385dd0e46723137ebb0cc971ee7fa106db96d7",
"type": "github" "type": "github"
}, },
"original": { "original": {

142
patches/253438.patch
View file

@ -1,142 +0,0 @@
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index 3e20cc438969a..f13bfd2f9794d 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -79,6 +79,8 @@
- `pass` now does not contain `password-store.el`. Users should get `password-store.el` from Emacs lisp package set `emacs.pkgs.password-store`.
+- `mu` now does not install `mu4e` files by default. Users should get `mu4e` from Emacs lisp package set `emacs.pkgs.mu4e`.
+
- `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues.
- `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms).
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 5bb88c835610c..0f28ed8f8f028 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -61,6 +61,8 @@ in
_map = self.map;
};
+ mu4e = callPackage ./manual-packages/mu4e { };
+
ott-mode = callPackage ./manual-packages/ott-mode { };
perl-completion = callPackage ./manual-packages/perl-completion { };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix
new file mode 100644
index 0000000000000..81fd973ecbd95
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix
@@ -0,0 +1,33 @@
+{ elpaBuild, mu }:
+
+let
+ pname = "mu4e";
+ version = mu.mu4e.version;
+in
+elpaBuild {
+ inherit pname version;
+
+ src = mu.mu4e;
+
+ propagatedUserEnvPkgs = [ mu ];
+
+ dontUnpack = false;
+
+ # prepare a multi-file package tar archive according to info
+ # "(elisp) Multi-file Packages" for elpaBuild to install
+ postUnpack = ''
+ pushd mu-*-mu4e
+ local content_directory=${pname}-${version}
+ mkdir $content_directory
+ cp --verbose share/emacs/site-lisp/mu4e/*.el $content_directory/
+ rm --verbose --force $content_directory/mu4e-autoloads.el
+ cp --verbose share/info/* $content_directory/
+ src=$PWD/$content_directory.tar
+ tar --create --verbose --file=$src $content_directory
+ popd
+ '';
+
+ meta = mu.meta // {
+ description = "A full-featured e-mail client";
+ };
+}
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 06083f8e0fae7..a46fc526e6958 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -10,12 +10,15 @@
, gmime3
, texinfo
, xapian
+, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "mu";
version = "1.10.7";
+ outputs = [ "out" "mu4e" ];
+
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
@@ -23,6 +26,14 @@ stdenv.mkDerivation rec {
hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI=";
};
+ patches = [
+ (fetchpatch {
+ name = "add-mu4e-pkg.el";
+ url = "https://github.com/djcb/mu/commit/00f7053d51105eea0c72151f1a8cf0b6d8478e4e.patch";
+ hash = "sha256-21c7djmYTcqyyygqByo9vu/GsH8WMYcq8NOAvJsS5AQ=";
+ })
+ ];
+
postPatch = ''
# Fix mu4e-builddir (set it to $out)
substituteInPlace mu4e/mu4e-config.el.in \
@@ -31,17 +42,23 @@ stdenv.mkDerivation rec {
--replace "/bin/rm" "${coreutils}/bin/rm"
'';
- # AOT native-comp, mostly copied from pkgs/build-support/emacs/generic.nix
- postInstall = lib.optionalString (emacs.withNativeCompilation or false) ''
- mkdir -p $out/share/emacs/native-lisp
- export EMACSLOADPATH=$out/share/emacs/site-lisp/mu4e:
- export EMACSNATIVELOADPATH=$out/share/emacs/native-lisp:
+ postInstall = ''
+ rm --verbose $mu4e/share/emacs/site-lisp/mu4e/*.elc
+ '';
- find $out/share/emacs -type f -name '*.el' -print0 \
- | xargs -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \
- "emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true"
- '' + ''
- emacs --batch -l package --eval "(package-generate-autoloads \"mu4e\" \"$out/share/emacs/site-lisp/mu4e\")"
+ # move only the mu4e info manual
+ # this has to be after preFixup otherwise the info manual may be moved back by _multioutDocs()
+ # we manually move the mu4e info manual instead of setting
+ # outputInfo to mu4e because we do not want to move the mu-guile
+ # info manual (if it exists)
+ postFixup = ''
+ moveToOutput share/info/mu4e.info.gz $mu4e
+ install-info $mu4e/share/info/mu4e.info.gz $mu4e/share/info/dir
+ if [[ -a ''${!outputInfo}/share/info/mu-guile.info.gz ]]; then
+ install-info --delete $mu4e/share/info/mu4e.info.gz ''${!outputInfo}/share/info/dir
+ else
+ rm --verbose --recursive ''${!outputInfo}/share/info
+ fi
'';
buildInputs = [ emacs glib gmime3 texinfo xapian ];
@@ -49,6 +66,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dguile=disabled"
"-Dreadline=disabled"
+ "-Dlispdir=${placeholder "mu4e"}/share/emacs/site-lisp"
];
nativeBuildInputs = [ pkg-config meson ninja ];

73
patches/254383.patch Normal file
View file

@ -0,0 +1,73 @@
diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index 6a78aa70ee60d..4bfd89465a6d9 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -1,6 +1,7 @@
{ buildGoModule
, fetchFromGitHub
, fetchurl
+, fetchpatch
, go-bindata
, lib
, perl
@@ -12,23 +13,20 @@
}:
let
- version = "2.5.1";
- # Despite the name, this is not a rolling release. This is the
- # version of the UI assets for 2.5.1, as specified in
- # scripts/fetch-ui-assets.sh in the 2.5.1 tag of influxdb.
- ui_version = "OSS-2022-09-16";
- libflux_version = "0.188.1";
+ version = "2.7.1";
+ ui_version = "OSS-v${version}";
+ libflux_version = "0.193.0";
src = fetchFromGitHub {
owner = "influxdata";
repo = "influxdb";
rev = "v${version}";
- sha256 = "sha256-AKyuFBja06BuWYliqIGKOb4PIc5G8S9S+cf/dLrEATY=";
+ hash = "sha256-JWu4V2k8ItbzBa421EtzgMVlDznoDdGjIhfDSaZ0j6c=";
};
ui = fetchurl {
url = "https://github.com/influxdata/ui/releases/download/${ui_version}/build.tar.gz";
- sha256 = "sha256-YKDp1jLyo4n+YTeMaWl8dhN4Lr3H8FXV7stJ3p3zFe8=";
+ hash = "sha256-0k59SKvt9pFt3WSd5PRUThbfbctt2RYtaxaxoyLICm8=";
};
flux = rustPlatform.buildRustPackage {
@@ -38,10 +36,20 @@ let
owner = "influxdata";
repo = "flux";
rev = "v${libflux_version}";
- sha256 = "sha256-Xmh7V/o1Gje62kcnTeB9h/fySljhfu+tjbyvryvIGRc=";
+ hash = "sha256-gx6vnGOFu35wasLl7X/73eDsE0/50cAzjmBjZ+H2Ne4=";
};
+ patches = [
+ # Fix build with recent rust versions
+ (fetchpatch {
+ url = "https://github.com/influxdata/flux/commit/6dc8054cfeec4b65b5c7ae786d633240868b8589.patch";
+ stripLen = 2;
+ extraPrefix = "";
+ excludes = [ "rust-toolchain.toml" ];
+ hash = "sha256-w3z+Z26Xhy9TNICyNhc8XiWNSpdLA23ADI4K/AOMYhg=";
+ })
+ ];
sourceRoot = "${src.name}/libflux";
- cargoSha256 = "sha256-9rPW0lgi3lXJARa1KXgSY8LVJsoFjppok5ODGlqYeYw=";
+ cargoSha256 = "sha256-MoI5nxLGA/3pduZ+vgmSG3lm3Nx58SP+6WXQl2pX9Lc=";
nativeBuildInputs = [ rustPlatform.bindgenHook ];
buildInputs = lib.optional stdenv.isDarwin libiconv;
pkgcfg = ''
@@ -69,7 +77,7 @@ in buildGoModule {
nativeBuildInputs = [ go-bindata pkg-config perl ];
- vendorSha256 = "sha256-02x+HsWkng7OnKVSfkQR8LL1Qk42Bdrw0IMtBpS7xQc=";
+ vendorSha256 = "sha256-5b1WRq3JndkOkKBhMzGZnSyBDY5Lk0UGe/WGHQJp0CQ=";
subPackages = [ "cmd/influxd" "cmd/telemetryd" ];
PKG_CONFIG_PATH = "${flux}/pkgconfig";