From 82000c295aa200b4743b0edccbf79b2867e574a4 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 12 Sep 2023 14:28:14 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 36 +++++++++--------- patches/254383.patch | 90 -------------------------------------------- 2 files changed, 18 insertions(+), 108 deletions(-) delete mode 100644 patches/254383.patch diff --git a/flake.lock b/flake.lock index b10691d2..1c79b660 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1694436890, - "narHash": "sha256-JVwEYf2w2goZ7/eTjIo2TD1J5vpnqwMkzX9IcaI4hzY=", + "lastModified": 1694515206, + "narHash": "sha256-P19O6tm8DmA1TKf7YuuHI30NTnNyzRNoZoj5lQEMlL8=", "owner": "accentor", "repo": "api", - "rev": "56138375aa81807d7adc5a624edd00edc0bc2f76", + "rev": "ca9d7b63671c820ec28a880e2b9a7a88a80b3882", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1694437005, - "narHash": "sha256-IqMxYo6IsTbiKyuCTLS0K67yCcWRTraqid37F7qRQfw=", + "lastModified": 1694515373, + "narHash": "sha256-uVwxxGOstrMpUe6fmAreGnX7vVhvfVgmj7oeWpzA8zM=", "owner": "accentor", "repo": "web", - "rev": "2d1b7216446b56c07cb34ad293b77963c6f4376c", + "rev": "578d4757e2f97f7b5103fb3747be17237913d1f5", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1694487846, - "narHash": "sha256-UWNKxLBxWVOttz8xyIbzs0TWsm6yeiDYBnH6et+amZE=", + "lastModified": 1694513880, + "narHash": "sha256-YIObImZHBDjU+UBTC7ku0xtawRAQBaLkOco0eA1xXN8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a1e0d3603a09f7c0f24748c18f820b38d660250c", + "rev": "a5a0cceea2af1920bcd6b1ae6d1c4e4f7a2ac229", "type": "github" }, "original": { @@ -431,11 +431,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694183432, - "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", + "lastModified": 1694422566, + "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", + "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "nur": { "locked": { - "lastModified": 1694502934, - "narHash": "sha256-zbjFZ1gDLwwy2Y/9eKan7aL0ux1f0sVozt90rNH0PvY=", + "lastModified": 1694515588, + "narHash": "sha256-6zRUU7L3xhkKim91m0aaSld5eoiF2j1PyUagcw0DoDI=", "owner": "nix-community", "repo": "NUR", - "rev": "975c2d27812c8e91f23c3ba00002f3ac8963b844", + "rev": "362a0729ce80a624b3a0a215ac24c7506db0564f", "type": "github" }, "original": { @@ -655,11 +655,11 @@ ] }, "locked": { - "lastModified": 1694436664, - "narHash": "sha256-I3pS4iKCQVE23uLwyKp7duNxhznmxIZy/DJYpr7KUrA=", + "lastModified": 1694515003, + "narHash": "sha256-iBE3uWEYSpIZ9LoEX+7T65pdy9oA4ErpL0OhmdaGo3E=", "owner": "chvp", "repo": "tetris", - "rev": "0973abb9afdf3528167c2bad102b77215be2b2be", + "rev": "64ab188ce899ac7dfade28757066c874058f9561", "type": "github" }, "original": { diff --git a/patches/254383.patch b/patches/254383.patch deleted file mode 100644 index 51671a75..00000000 --- a/patches/254383.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix -index 6a78aa70ee60d3..c103a0f086fc73 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,21 @@ 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="; -+ }) -+ ./no-deny-warnings.patch -+ ]; - 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 +78,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"; -diff --git a/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch b/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch -new file mode 100644 -index 00000000000000..3000ccad8256c5 ---- /dev/null -+++ b/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch -@@ -0,0 +1,10 @@ -+diff --git a/flux/src/lib.rs b/flux/src/lib.rs -+index 3fdf4071..a4c02277 100644 -+--- a/flux/src/lib.rs -++++ b/flux/src/lib.rs -+@@ -1,5 +1,3 @@ -+-#![cfg_attr(feature = "strict", deny(warnings, missing_docs))] -+- -+ //! This module provides the public facing API for Flux's Go runtime, including formatting, -+ //! parsing, and standard library analysis. -+ use std::sync::Arc;