diff --git a/flake.lock b/flake.lock index 99093dcb..5cefc102 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1719340949, - "narHash": "sha256-YPcmC46g/DgXJhs4ZuXtK7cZgHsfNcWNwvWQ8rRJOkk=", + "lastModified": 1719136212, + "narHash": "sha256-Z7fAvbFj4wfbJgR5e7NaI48K6SlNbMVTt2jLp8ImOic=", "owner": "accentor", "repo": "api", - "rev": "0706fd5da6d4fde62673067cd5bbbc316e0e809e", + "rev": "96d71ff1dff93652a3981fa574ca662102ed555f", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1719340957, - "narHash": "sha256-qZxy5w2cCR7PgwWxY4wrGj1FGKOJwdtWOcZgG3qNr2M=", + "lastModified": 1719136166, + "narHash": "sha256-USaTW/G/Aby8P0+gPlQTyYfXV/g9qibIFXXmBiAzumQ=", "owner": "accentor", "repo": "web", - "rev": "9b0cd504d21193ea13eea43d571c9d3763300d7c", + "rev": "3a325bc057e6ab25f80e56466b09f748eb9de58e", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719363732, - "narHash": "sha256-Hlnu6LkDJW5KiWNbcWGK4fpmipiZasd3a6KUPEzRg10=", + "lastModified": 1719303695, + "narHash": "sha256-SqJTGKtJEzkQdHEUWeMHwQ5vyAg4wE1kRbjTRjzfAUI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2005d1e0260e31e7775349c62eabbcd8ae5bd6e6", + "rev": "fd904f28fb1d3d3a3d87db312fac97cb4a146db4", "type": "github" }, "original": { @@ -471,11 +471,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -534,11 +534,11 @@ }, "nur": { "locked": { - "lastModified": 1719381117, - "narHash": "sha256-/CAMYOC22ZQxrXVmN7UI5N+qtAQGLG1UB3rlQBRb+/c=", + "lastModified": 1719337524, + "narHash": "sha256-bYp4//+XM+J1Y23sW6VjXAiCHUdq3aqgXue/tVeCxLw=", "owner": "nix-community", "repo": "NUR", - "rev": "6d841b41e480c27660928026a42a2b80690f7a7f", + "rev": "37ae43594731d4d801f53dffe465006421c7c292", "type": "github" }, "original": { @@ -751,11 +751,11 @@ ] }, "locked": { - "lastModified": 1719344136, - "narHash": "sha256-VckR6cY8uXjG/nHYwzyj49TXdPsMerUYDjG5klkpJ2Q=", + "lastModified": 1719138998, + "narHash": "sha256-Tw/xJsyh49uzvCDCnIKoJIAGLutSX36FzI72MqJNK8o=", "owner": "chvp", "repo": "tetris", - "rev": "50431b0d76090354185f336a3dc6f2f4efbf5226", + "rev": "e8ca69df359f8359afbcec8d77eefdb37c46bd1e", "type": "github" }, "original": { diff --git a/patches/321446.patch b/patches/321446.patch new file mode 100644 index 00000000..d7a12177 --- /dev/null +++ b/patches/321446.patch @@ -0,0 +1,48 @@ +diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix +index 32b7cfcc9bbcd6..6d9338dbc1b90e 100644 +--- a/pkgs/development/python-modules/pymilter/default.nix ++++ b/pkgs/development/python-modules/pymilter/default.nix +@@ -3,9 +3,8 @@ + python, + buildPythonPackage, + fetchFromGitHub, +- fetchpatch, + libmilter, +- bsddb3, ++ berkeleydb, + pydns, + iana-etc, + libredirect, +@@ -14,29 +13,22 @@ + + buildPythonPackage rec { + pname = "pymilter"; +- version = "1.0.5"; ++ version = "1.0.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "sdgathman"; + repo = pname; + rev = "${pname}-${version}"; +- hash = "sha256-gZUWEDVZfDRiOOdG3lpiQldHxm/93l8qYVOHOEpHhzQ="; ++ hash = "sha256-plaWXwDAIsVzEtrabZuZj7T4WNfz2ntQHgcMCVf5S70="; + }; + + buildInputs = [ libmilter ]; + nativeCheckInputs = [ pyasyncore ]; + propagatedBuildInputs = [ +- bsddb3 ++ berkeleydb + pydns + ]; +- patches = [ +- (fetchpatch { # https://github.com/sdgathman/pymilter/pull/57 +- name = "Remove-calls-to-the-deprecated-method-assertEquals"; +- url = "https://github.com/sdgathman/pymilter/commit/1ead9028fc63ae3ec6ea3b0c438e6ed088a2b20e.patch"; +- hash = "sha256-/5LlDR15nMR3l7rkVjT3w4FbDTFAAgNdERWlPNL2TVg="; +- }) +- ]; + + preBuild = '' + sed -i 's/import thread/import _thread as thread/' Milter/greylist.py