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 2022-12-13 11:54:42 +01:00
parent fab74b9a21
commit fbc6943204
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 15 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -46,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670770064, "lastModified": 1670901148,
"narHash": "sha256-bm2qIl/8J45GRnWpfYkdA/L1WBZul6+KCkVGvdK4SZY=", "narHash": "sha256-E2VaOgS4f+pXBQ8scDSU3fXjJCeGlyn0ORrmSbsA20g=",
"owner": "accentor", "owner": "accentor",
"repo": "api", "repo": "api",
"rev": "9aada6d84a659f96f2d1253a930285b57197eabf", "rev": "43a5bdf4a9dfbb8e93fa34957272a0ff1c3045a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670814230, "lastModified": 1670922482,
"narHash": "sha256-6biw+X0TCS8vyZcKAOaaYjaxPOkxBZuVdH1fzxDx8WU=", "narHash": "sha256-M0RkdCbPc1VfO8qARNtZmXvXAh09vNmRkLpsK+u92xU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "290e366022a72225fed4f378e525de955c2edce5", "rev": "bb5acdde9b19f0332a29a9e44db632203768a3a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,11 +232,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1670597555, "lastModified": 1670841420,
"narHash": "sha256-/k939P2S2246G6K5fyvC0U2IWvULhb4ZJg9K7ZxsX+k=", "narHash": "sha256-mSEia1FzrsHbfqjorMyYiX8NXdDVeR1Pw1k55jMJlJY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2dea0f4c2d6e4603f54b2c56c22367e77869490c", "rev": "33e0d99cbedf2acfd7340d2150837fbb28039a64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,11 +263,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1670819416, "lastModified": 1670905794,
"narHash": "sha256-ja1livEv48Y3piLmdKo0T+1cUHdSfmaHXOxOxJNbneA=", "narHash": "sha256-wpg/ZYga8aDmUogB8YRK8KLiUsOLw0cnhJtaKutvKEk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "068395203bcc46e2ed19843f508383982b153271", "rev": "a0869f532570fb0bbff84a158299c40c4af3fadd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,11 +307,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670690712, "lastModified": 1670897401,
"narHash": "sha256-Jf08BHwjBSySU2k37l6m4pJqAnqFVAMgqOfv7zV5H5U=", "narHash": "sha256-m+8Alygh2/Xom428tu3U75ZMJJ0icjY2hT9mes6Gdqc=",
"owner": "chvp", "owner": "chvp",
"repo": "tetris", "repo": "tetris",
"rev": "9b25d75754cf8efdd5662b363dbf23ba47a96ca4", "rev": "d581318cb5013431e6640ee63dc27486a4c43df6",
"type": "github" "type": "github"
}, },
"original": { "original": {

44
patches/203985.patch
View file

@ -1,44 +0,0 @@
From cd8ffa2910d00f1a461c5dce4e11889544766b57 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Thu, 1 Dec 2022 19:59:03 +0100
Subject: [PATCH] matrix-appservice-slack: 2.0.1 -> 2.0.2
---
.../matrix-synapse/matrix-appservice-slack/package.json | 4 ++--
.../servers/matrix-synapse/matrix-appservice-slack/pin.json | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
index 1c440ad9279ef4..e52f1221327c57 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
@@ -1,6 +1,6 @@
{
"name": "matrix-appservice-slack",
- "version": "2.0.1",
+ "version": "2.0.2",
"description": "A Matrix <--> Slack bridge",
"engines": {
"node": ">=16 <=18"
@@ -38,7 +38,7 @@
"Slackdown": "git+https://Half-Shot@github.com/half-shot/slackdown.git",
"axios": "^0.27.2",
"escape-string-regexp": "^4.0.0",
- "matrix-appservice-bridge": "^5.1.0",
+ "matrix-appservice-bridge": "^6.0.0",
"minimist": "^1.2.6",
"nedb": "^1.8.0",
"node-emoji": "^1.10.0",
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json
index 306f097c97a26a..f842fda7ba5f42 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json
@@ -1,5 +1,5 @@
{
- "version": "2.0.1",
- "srcHash": "N7EzhqKL3GiuoU2d/Y33eZhKJSCvtLDRVO40mpIBEkw=",
- "yarnHash": "1d9kyrzcs1c54xk0yl8n3jp61l3n8dzph1d5a4daifa7ad635hv7"
+ "version": "2.0.2",
+ "srcHash": "Z8PQuAOQbQMxmso/KV9n8fu2FqzqLsADqLczmm584QQ=",
+ "yarnHash": "1ngmgr9li7jagvzfl0jq4bxqw0q1sdqh8k9wlar6q292263g287z"
}

147
patches/205387.patch
View file

@ -1,147 +0,0 @@
From 4fabafb699bc4fa91594fce7fd7eaf57c7fcdede Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Fri, 9 Dec 2022 17:11:59 -0600
Subject: [PATCH] resholve: fold in python package deps
Protects resholve and dependents from breakages as py27 support is
removed (or rots).
---
pkgs/development/misc/resholve/default.nix | 1 +
pkgs/development/misc/resholve/deps.nix | 65 ++++++++++++++++++++-
pkgs/development/misc/resholve/oildev.nix | 4 +-
pkgs/development/misc/resholve/resholve.nix | 3 +-
4 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix
index 3e901070a2e2b..34dd36a212434 100644
--- a/pkgs/development/misc/resholve/default.nix
+++ b/pkgs/development/misc/resholve/default.nix
@@ -22,6 +22,7 @@ rec {
resholve = callPackage ./resholve.nix {
inherit (source) rSrc version;
inherit (deps.oil) oildev;
+ inherit (deps) configargparse;
inherit resholve-utils;
};
# funcs to validate and phrase invocations of resholve
diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix
index 43882c20cf6c3..ef0ebaa670c15 100644
--- a/pkgs/development/misc/resholve/deps.nix
+++ b/pkgs/development/misc/resholve/deps.nix
@@ -1,4 +1,6 @@
-{ callPackage
+{ lib
+, callPackage
+, fetchFromGitHub
, python27
, ...
}:
@@ -15,5 +17,64 @@
rec {
# binlore = callPackage ./binlore.nix { };
- oil = callPackage ./oildev.nix { inherit python27; };
+ oil = callPackage ./oildev.nix {
+ inherit python27;
+ inherit six;
+ inherit typing;
+ };
+ configargparse = python27.pkgs.buildPythonPackage rec {
+ pname = "configargparse";
+ version = "1.5.3";
+
+ src = fetchFromGitHub {
+ owner = "bw2";
+ repo = "ConfigArgParse";
+ rev = "v${version}";
+ sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz";
+ };
+
+ doCheck = false;
+
+ pythonImportsCheck = [ "configargparse" ];
+
+ meta = with lib; {
+ description = "A drop-in replacement for argparse";
+ homepage = "https://github.com/bw2/ConfigArgParse";
+ license = licenses.mit;
+ };
+ };
+ six = python27.pkgs.buildPythonPackage rec {
+ pname = "six";
+ version = "1.16.0";
+
+ src = python27.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926";
+ };
+
+ doCheck = false;
+
+ meta = {
+ description = "A Python 2 and 3 compatibility library";
+ homepage = "https://pypi.python.org/pypi/six/";
+ license = lib.licenses.mit;
+ };
+ };
+ typing = python27.pkgs.buildPythonPackage rec {
+ pname = "typing";
+ version = "3.10.0.0";
+
+ src = python27.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";
+ };
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Backport of typing module to Python versions older than 3.5";
+ homepage = "https://docs.python.org/3/library/typing.html";
+ license = licenses.psfl;
+ };
+ };
}
diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix
index 854cbb2a00562..d9659513996d9 100644
--- a/pkgs/development/misc/resholve/oildev.nix
+++ b/pkgs/development/misc/resholve/oildev.nix
@@ -13,6 +13,8 @@
, cmark
, file
, glibcLocales
+, six
+, typing
}:
rec {
@@ -95,7 +97,7 @@ rec {
nativeBuildInputs = [ re2c file makeWrapper ];
- propagatedBuildInputs = with python27.pkgs; [ six typing ];
+ propagatedBuildInputs = [ six typing ];
doCheck = true;
diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix
index 6a71962fd4c5b..d0ed5105ae4cd 100644
--- a/pkgs/development/misc/resholve/resholve.nix
+++ b/pkgs/development/misc/resholve/resholve.nix
@@ -6,6 +6,7 @@
, rSrc
, version
, oildev
+, configargparse
, binlore
, resholve-utils
}:
@@ -19,7 +20,7 @@ python27.pkgs.buildPythonApplication {
propagatedBuildInputs = [
oildev
- python27.pkgs.configargparse
+ configargparse
];
postPatch = ''