From 7e1921a7f3cf1602fb9b007950f7cf01698922ce Mon Sep 17 00:00:00 2001 From: Soispha Date: Sat, 2 Sep 2023 23:45:40 +0200 Subject: [PATCH 01/20] maintainers: Add soispha --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74000d81661f..cd88a32c1176 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16136,6 +16136,16 @@ fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; }]; }; + soispha = { + name = "Soispha"; + email = "soispha@vhack.eu"; + matrix = "@soispha:vhack.eu"; + github = "soispha"; + githubId = 132207423; + keys = [{ + fingerprint = "9606 FC74 9FCE 1636 0723 D4AD A5E9 4010 C3A6 42AD"; + }]; + }; solson = { email = "scott@solson.me"; matrix = "@solson:matrix.org"; From 94b1e45cf2d02a11400c71ef1a40f12ba882c4ce Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 29 Sep 2023 23:54:47 +0200 Subject: [PATCH 02/20] maintainers: add quinn-dougherty --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bab934681db9..35533b1b89de 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14317,6 +14317,12 @@ githubId = 1332289; name = "Quentin Machu"; }; + quinn-dougherty = { + email = "quinnd@riseup.net"; + github = "quinn-dougherty"; + githubId = 39039420; + name = "Quinn Dougherty"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; From c7634cf59a9d23569c5218435a2e72b8f32f3ddb Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 29 Sep 2023 23:54:49 +0200 Subject: [PATCH 03/20] coqPackages.vcfloat: init at 2.1.1 --- .../coq-modules/vcfloat/default.nix | 20 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/coq-modules/vcfloat/default.nix diff --git a/pkgs/development/coq-modules/vcfloat/default.nix b/pkgs/development/coq-modules/vcfloat/default.nix new file mode 100644 index 000000000000..d5837812ae88 --- /dev/null +++ b/pkgs/development/coq-modules/vcfloat/default.nix @@ -0,0 +1,20 @@ +{ lib, mkCoqDerivation, coq, interval, compcert, flocq, bignums, version ? null }: + +with lib; mkCoqDerivation { + pname = "vcfloat"; + owner = "VeriNum"; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.16" "8.17"; out = "2.1.1"; } + ] null; + release."2.1.1".sha256 = "sha256-bd/XSQhyFUAnSm2bhZEZBWB6l4/Ptlm9JrWu6w9BOpw="; + releaseRev = v: "v${v}"; + + propagatedBuildInputs = [ interval compcert flocq bignums ]; + + meta = { + description = "A tool for Coq proofs about floating-point round-off error"; + maintainers = with maintainers; [ quinn-dougherty ]; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index fe3eb9ebe85d..078bbb80942a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -120,6 +120,7 @@ let tlc = callPackage ../development/coq-modules/tlc {}; topology = callPackage ../development/coq-modules/topology {}; trakt = callPackage ../development/coq-modules/trakt {}; + vcfloat = callPackage ../development/coq-modules/vcfloat {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; VST = callPackage ../development/coq-modules/VST ((lib.optionalAttrs From 6f66321bf79ed071e7e0c026e6f00884e7ebb8f8 Mon Sep 17 00:00:00 2001 From: Soispha Date: Sat, 2 Sep 2023 23:48:48 +0200 Subject: [PATCH 04/20] pythonPackages.schemainspect: init at 3.1.1663587362 --- .../python-modules/schemainspect/default.nix | 118 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 120 insertions(+) create mode 100644 pkgs/development/python-modules/schemainspect/default.nix diff --git a/pkgs/development/python-modules/schemainspect/default.nix b/pkgs/development/python-modules/schemainspect/default.nix new file mode 100644 index 000000000000..1703853f3c92 --- /dev/null +++ b/pkgs/development/python-modules/schemainspect/default.nix @@ -0,0 +1,118 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonOlder +, sqlalchemy +, sqlbag +, setuptools +, poetry-core +, pytestCheckHook +, pytest-xdist +, pytest-sugar +, postgresql +, postgresqlTestHook +, +}: +buildPythonPackage rec { + pname = "schemainspect"; + version = "3.1.1663587362"; + format = "pyproject"; + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "djrobstep"; + repo = pname; + # no tags on github, version patch number is unix time. + rev = "066262d6fb4668f874925305a0b7dbb3ac866882"; + hash = "sha256-SYpQQhlvexNc/xEgSIk8L8J+Ta+3OZycGLeZGQ6DWzk="; + }; + + patches = [ + # https://github.com/djrobstep/schemainspect/pull/87 + (fetchpatch + { + name = "specify_poetry.patch"; + url = "https://github.com/djrobstep/schemainspect/commit/bdcd001ef7798236fe0ff35cef52f34f388bfe68.patch"; + hash = "sha256-/SEmcV9GjjvzfbszeGPkfd2DvYenl7bZyWdC0aI3M4M="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ + setuptools # needed for 'pkg_resources' + sqlalchemy + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + pytest-sugar + + postgresql + postgresqlTestHook + + sqlbag + ]; + + preCheck = '' + export PGUSER="nixbld"; + export postgresqlEnableTCP=1; + ''; + disabledTests = [ + # These all fail with "List argument must consist only of tuples or dictionaries": + # Related issue: https://github.com/djrobstep/schemainspect/issues/88 + "test_can_replace" + "test_collations" + "test_constraints" + "test_dep_order" + "test_enum_deps" + "test_exclusion_constraint" + "test_fk_col_order" + "test_fk_info" + "test_generated_columns" + "test_identity_columns" + "test_indexes" + "test_inherit" + "test_kinds" + "test_lineendings" + "test_long_identifiers" + "test_partitions" + "test_postgres_inspect" + "test_postgres_inspect_excludeschema" + "test_postgres_inspect_sigleschema" + "test_raw_connection" + "test_relationship" + "test_replica_trigger" + "test_rls" + "test_separate_validate" + "test_sequences" + "test_table_dependency_order" + "test_types_and_domains" + "test_view_trigger" + "test_weird_names" + ]; + + pytestFlagsArray = [ + "-x" + "-svv" + "tests" + ]; + pythonImportsCheck = [ + "schemainspect" + ]; + + postUnpack = '' + # this dir is used to bump the version number, having it here fails the build + rm -r ./source/deploy + ''; + + meta = with lib; { + description = "Schema inspection for PostgreSQL, and potentially others"; + homepage = "https://github.com/djrobstep/schemainspect"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ soispha ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4cf1f0a21474..75f09aa1581b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11576,6 +11576,8 @@ self: super: with self; { schema = callPackage ../development/python-modules/schema { }; + schemainspect = callPackage ../development/python-modules/schemainspect { }; + schema-salad = callPackage ../development/python-modules/schema-salad { }; schemdraw = callPackage ../development/python-modules/schemdraw { }; From 2bd1c265317898e953bff5bb1c453942261adf35 Mon Sep 17 00:00:00 2001 From: Soispha Date: Sat, 2 Sep 2023 23:57:08 +0200 Subject: [PATCH 05/20] pythonPackages.sqlbag: init at 0.1.1617247075 --- .../python-modules/sqlbag/default.nix | 95 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 97 insertions(+) create mode 100644 pkgs/development/python-modules/sqlbag/default.nix diff --git a/pkgs/development/python-modules/sqlbag/default.nix b/pkgs/development/python-modules/sqlbag/default.nix new file mode 100644 index 000000000000..8b21d89ad5da --- /dev/null +++ b/pkgs/development/python-modules/sqlbag/default.nix @@ -0,0 +1,95 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, psycopg2 +, pymysql +, sqlalchemy +, pathlib +, six +, flask +, pendulum +, packaging +, setuptools +, poetry-core +, pytestCheckHook +, pytest-xdist +, pytest-sugar +, postgresql +, postgresqlTestHook +, +}: +buildPythonPackage rec { + pname = "sqlbag"; + version = "0.1.1617247075"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "djrobstep"; + repo = pname; + # no tags on github, version patch number is unix time. + rev = "eaaeec4158ffa139fba1ec30d7887f4d836f4120"; + hash = "sha256-lipgnkqrzjzqwbhtVcWDQypBNzq6Dct/qoM8y/FNiNs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = + [ + sqlalchemy + six + packaging + + psycopg2 + pymysql + + setuptools # needed for 'pkg_resources' + ] + ++ lib.optional isPy27 pathlib; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + pytest-sugar + + postgresql + postgresqlTestHook + + flask + pendulum + ]; + + preCheck = '' + export PGUSER="nixbld"; + ''; + disabledTests = [ + # These all fail with "List argument must consist only of tuples or dictionaries": + # Related issue: https://github.com/djrobstep/sqlbag/issues/14 + "test_basic" + "test_createdrop" + "test_errors_and_messages" + "test_flask_integration" + "test_orm_stuff" + "test_pendulum_for_time_types" + "test_transaction_separation" + ]; + + pytestFlagsArray = [ + "-x" + "-svv" + "tests" + ]; + + pythonImportsCheck = [ + "sqlbag" + ]; + + meta = with lib; { + description = "Handy python code for doing database things"; + homepage = "https://github.com/djrobstep/sqlbag"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ soispha ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75f09aa1581b..69818e9fc784 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12344,6 +12344,8 @@ self: super: with self; { sqlalchemy-views = callPackage ../development/python-modules/sqlalchemy-views { }; + sqlbag = callPackage ../development/python-modules/sqlbag { }; + sqlglot = callPackage ../development/python-modules/sqlglot { }; sqlitedict = callPackage ../development/python-modules/sqlitedict { }; From 4185690d3de1a87a1e12d871caa95857543682ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Oct 2023 12:36:39 +0000 Subject: [PATCH 06/20] appgate-sdp: 6.2.2 -> 6.2.3 --- pkgs/applications/networking/appgate-sdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index bd810cfe7310..93ba2ac105b1 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -86,11 +86,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-5xbwBCLTlZ0cE273n3ErykZSEr59dZjQWhVTK91W9a4="; + sha256 = "sha256-W6P83+DPd2VRz52UKPJp+D1WcjgDwyXYcx6rViHbmlk="; }; # just patch interpreter From 6233b98cc0c2434eddbe924cc2d9321efb92d849 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Oct 2023 19:03:38 +0000 Subject: [PATCH 07/20] nomacs: 3.17.2285 -> 3.17.2287 --- pkgs/applications/graphics/nomacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 3169d5f0d4f1..a5898a3ac007 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "nomacs"; - version = "3.17.2285"; + version = "3.17.2287"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - hash = "sha256-/K7LRPwNy2PG7tIGD0tiKnEOPZ491lxFRlgf4xWYtxs="; + hash = "sha256-OwiMB6O4+WuAt87sRbD1Qby3U7igqgCgddiWs3a4j3k="; }; setSourceRoot = '' From fa5e615286e236dee20921e02a1808dcbb45a44d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Oct 2023 12:01:33 +0000 Subject: [PATCH 08/20] ngtcp2-gnutls: 0.19.1 -> 1.0.0 --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index 45f7d9d67db3..53d8454264bd 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.19.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-agiQRy/e5VS+ANxajXYi5huRjQQ2M8eddH/AzmwnHdQ="; + hash = "sha256-dnYIRcNGTIzETu2OjTJa0IWB1+xttdGFKRBmMkTwrXk="; }; outputs = [ "out" "dev" ]; From 1f691cc04b9bfe6c43a602ee4c719e739446080c Mon Sep 17 00:00:00 2001 From: Soispha Date: Sun, 3 Sep 2023 00:00:25 +0200 Subject: [PATCH 09/20] migra: init at 3.0.1647431138 --- pkgs/by-name/mi/migra/package.nix | 59 +++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/mi/migra/package.nix diff --git a/pkgs/by-name/mi/migra/package.nix b/pkgs/by-name/mi/migra/package.nix new file mode 100644 index 000000000000..8fd3ef6332ed --- /dev/null +++ b/pkgs/by-name/mi/migra/package.nix @@ -0,0 +1,59 @@ +{ lib +, python3 +, fetchFromGitHub +, postgresql +, postgresqlTestHook +, +}: +python3.pkgs.buildPythonApplication rec { + pname = "migra"; + version = "3.0.1647431138"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "djrobstep"; + repo = pname; + rev = version; + hash = "sha256-LSCJA5Ym1LuV3EZl6gnl9jTHGc8A1LXmR1fj0ZZc+po="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + schemainspect + six + sqlbag + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + postgresql + postgresqlTestHook + ]; + preCheck = '' + export PGUSER="nixbld"; + ''; + disabledTests = [ + # These all fail with "List argument must consist only of tuples or dictionaries": + # See this issue: https://github.com/djrobstep/migra/issues/232 + "test_excludeschema" + "test_fixtures" + "test_rls" + "test_singleschema" + ]; + + pytestFlagsArray = [ + "-x" + "-svv" + "tests" + ]; + + meta = with lib; { + description = "Like diff but for PostgreSQL schemas"; + homepage = "https://github.com/djrobstep/migra"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ soispha ]; + }; +} From 372b3c4d8be2ecfa5da7cfcd2cf5fbba59afdf20 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Thu, 12 Oct 2023 18:08:55 +0200 Subject: [PATCH 10/20] ttags: init at 0.3.0 --- pkgs/development/tools/misc/ttags/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/tools/misc/ttags/default.nix diff --git a/pkgs/development/tools/misc/ttags/default.nix b/pkgs/development/tools/misc/ttags/default.nix new file mode 100644 index 000000000000..f07f2d3ef5e8 --- /dev/null +++ b/pkgs/development/tools/misc/ttags/default.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, rustPlatform, testers, ttags }: +let version = "0.3.0"; +in rustPlatform.buildRustPackage { + pname = "ttags"; + inherit version; + + src = fetchFromGitHub { + owner = "npezza93"; + repo = "ttags"; + rev = "${version}"; + hash = "sha256-yqrCcA/+FyGPpX3hhULiwhMfrDWjq+rzT04M+o9ry5s="; + }; + + cargoHash = "sha256-jW3xIlo2cN5aoEUp3FxN4pwGFvlg50i5RMNgQopGb88="; + + passthru.tests.version = testers.testVersion { + package = ttags; + command = "ttags --version"; + version = version; + }; + + meta = with lib; { + description = "Generate tags using tree-sitter"; + longDescription = '' + ttags generates tags (similar to ctags) for various + languages, using tree-sitter. + + Can be run as a language server that updates the tags + for a file when it is saved. + + Supported languages: + - Haskell + - JavaScript + - Nix + - Ruby + - Rust + - Swift + ''; + homepage = "https://github.com/npezza93/ttags"; + license = licenses.mit; + maintainers = with maintainers; [ mrcjkb ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 961b1467bc96..79f0a0119129 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20306,6 +20306,8 @@ with pkgs; trellis = callPackage ../development/embedded/fpga/trellis { }; + ttags = callPackage ../development/tools/misc/ttags { }; + ttyd = callPackage ../servers/ttyd { }; turbogit = callPackage ../development/tools/turbogit { From 5fdd7d77d1c2f140e36170268634fa269174cbcf Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 16 Oct 2023 18:09:17 +0900 Subject: [PATCH 11/20] python311Packages.ppscore: unstable-2021-11-25 -> 1.3.0 Diff: https://github.com/8080labs/ppscore/compare/c9268c16b6305c5c38e2fe2fd84f43d97ec1aaca...1.3.0 Changelog: https://github.com/8080labs/ppscore/blob/1.3.0/CHANGELOG.md --- pkgs/development/python-modules/ppscore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index c817fc390ead..23d2cdddbd08 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ppscore"; - version = "unstable-2021-11-25"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "8080labs"; repo = pname; - rev = "c9268c16b6305c5c38e2fe2fd84f43d97ec1aaca"; - hash = "sha256-qiogjUgcLFauAMpVf2CKNC27c9xR9q7nY69n8/go1ms="; + rev = "refs/tags/${version}"; + hash = "sha256-gJStsL8fN17kvXO8EH/NHGIBelPknJzYw5WEvHsFooU="; }; propagatedBuildInputs = [ From d57b19b88b42057926d9c46df7c7222c02347836 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 17 Oct 2023 15:32:09 +0900 Subject: [PATCH 12/20] python311Packages.ppscore: refactor - adopt `pyproject = true` - add changelog to meta --- pkgs/development/python-modules/ppscore/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index 23d2cdddbd08..b87e0e4c9839 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pandas , pytestCheckHook , pythonOlder @@ -10,17 +11,21 @@ buildPythonPackage rec { pname = "ppscore"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "8080labs"; - repo = pname; + repo = "ppscore"; rev = "refs/tags/${version}"; hash = "sha256-gJStsL8fN17kvXO8EH/NHGIBelPknJzYw5WEvHsFooU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandas scikit-learn @@ -37,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Predictive Power Score (PPS)"; homepage = "https://github.com/8080labs/ppscore/"; + changelog = "https://github.com/8080labs/ppscore/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ evax ]; }; From 08c7bd94e93d0e7ddee364cbe494784092aba32e Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Tue, 17 Oct 2023 11:39:41 +0200 Subject: [PATCH 13/20] betterbird: 102.15.1-bb41 -> 115.3.2-bb15 --- .../networking/mailreaders/betterbird/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index 40292268a5bb..c98e80b2deea 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -10,15 +10,15 @@ }: let - thunderbird-unwrapped = thunderbirdPackages.thunderbird-102; + thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - version = "102.15.1"; + version = "115.3.2"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb41"; + rev = "${version}-bb15"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-fP763ec4B8LbivzmYHzQ4j39QMxWrymqI8chXfF3KX8="; + hash = "sha256-6alAGEid7ipr01I52TB0xrlLroCIc03N2IagGJq8te8="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -49,7 +49,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-og1Tu7PAHOqGs02jkHU291BCGuKDy1J+72v4Gsu4oDg="; + hash = "sha256-kn35avKqUdMix8VJrKJjSWViMLe/WnnxNasPpM7/cdM="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' @@ -57,8 +57,6 @@ in ((buildMozillaMach { patches=$(mktemp -d) for dir in branding bugs external features misc; do cp -r ${betterbird-patches}/${majVer}/$dir/*.patch $patches/ - # files is not in series file and duplicated with external patch - [[ $dir == bugs ]] && rm $patches/1820504-optimise-grapheme-m-c.patch done cp ${betterbird-patches}/${majVer}/series* $patches/ chmod -R +w $patches From a66d12cb5d4c94b38a4f731e4aef82c8af3d9dea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 10:09:28 +0000 Subject: [PATCH 14/20] git-quick-stats: 2.5.0 -> 2.5.1 --- .../version-management/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-quick-stats/default.nix b/pkgs/applications/version-management/git-quick-stats/default.nix index 4d403528bb39..1efab8e02716 100644 --- a/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/pkgs/applications/version-management/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-zUw0rjsYdH4mlqKXADvfqWCBM8tCL6BmVHq27JZLpd0="; + sha256 = "sha256-IIvpUKJxeJYKmTSzEEMZPV6JElt6Ww/Whx3ytNcha7k="; }; nativeBuildInputs = [ makeWrapper ]; From 84503777825f2034c51d579a94f01246ecd32cc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 11:36:40 +0000 Subject: [PATCH 15/20] nvc: 1.10.3 -> 1.10.4 --- pkgs/applications/science/electronics/nvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 94e0741f79a5..dc4991bf480b 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-0KLya2B+gs7aoOvkQdHuJuQtCHLUeSYATToBfIDhm/c="; + hash = "sha256-f4VjSBoJnsGb8MHKegJDlomPG32DuTgFcyv1w0GxKvA="; }; nativeBuildInputs = [ From c4e4c4a7d0a2db1f55f6416737d0030731d21d68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 12:04:21 +0000 Subject: [PATCH 16/20] jwx: 2.0.13 -> 2.0.14 --- pkgs/tools/security/jwx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index 01ca4c302f9b..efe847e5fa01 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-jtNG/d70Q67IKKEfRBewl40cxH6wYj3CPfx+S/vuQnQ="; + hash = "sha256-EtfxlSWYlfWme/t89IuvcNl11X3JL2K2rcKHAumisEw="; }; vendorHash = "sha256-o3EHPIXGLz/io0d8jhl9cxzctP3CeOjEDMQl1SY9lXg="; From d8d6827b6aed0a2b3bf8c2c2ecb76aafba9e39c8 Mon Sep 17 00:00:00 2001 From: ProminentRetail <94048404+ProminentRetail@users.noreply.github.com> Date: Wed, 18 Oct 2023 00:14:49 +1100 Subject: [PATCH 17/20] xfce.catfish: Fix double wrapping resulting in wrong StartupWMClass --- pkgs/desktops/xfce/applications/catfish/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index dd6def83ff4e..0cec370e1acc 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -64,6 +64,12 @@ python3Packages.buildPythonApplication rec { # Disable check because there is no test in the source distribution doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru.updateScript = gitUpdater { rev-prefix = "${pname}-"; }; meta = with lib; { From 77b771b67c67e2f54a760beffb6e2ffcf9dbdebf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 13:59:56 +0000 Subject: [PATCH 18/20] cargo-udeps: 0.1.42 -> 0.1.43 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 55bf3bb36b68..29c0e5302a04 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.42"; + version = "0.1.43"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8CQnmUk7jMlcdtZh6046B5duKnZKaMVk2xG4D2svqVw="; + sha256 = "sha256-aZzkVyRWxpSB0lPD7A8kbZc93h43OyPn0Pk9tCIZRnA="; }; - cargoHash = "sha256-e3ku9c4VLZtnJIUDRMAcUVaJnOsMqckj3XmuJHSR364="; + cargoHash = "sha256-kQ1NQDvOBU8mmQQgNR4l1bBN0nr/ZSudJkL7Gf9hpgU="; nativeBuildInputs = [ pkg-config ]; From f4ec563c1d8a6e1e74481881a2a383c75eee2c9e Mon Sep 17 00:00:00 2001 From: Arthur Azevedo de Amorim Date: Tue, 17 Oct 2023 10:24:58 -0400 Subject: [PATCH 19/20] coqPackages.deriving: 0.1.1 -> 0.2.0 (#258038) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Théo Zimmermann --- pkgs/development/coq-modules/deriving/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 38151f37261e..9addbedb3643 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -7,12 +7,14 @@ mkCoqDerivation { owner = "arthuraa"; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.18"; out = "0.1.1"; } + defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ + { cases = [(range "8.17" "8.18") (isGe "2.0.0")] ; out = "0.2.0"; } + { cases = [(range "8.11" "8.18") (isLe "2.0.0")] ; out = "0.1.1"; } ] null; releaseRev = v: "v${v}"; + release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM="; release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI="; release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh"; From 9ce032513e38d5fc7b489f2951e998f739cf3c46 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 17 Oct 2023 08:49:53 +0100 Subject: [PATCH 20/20] tusc-sh: init at 1.0.2 --- pkgs/by-name/tu/tusc-sh/package.nix | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/tu/tusc-sh/package.nix diff --git a/pkgs/by-name/tu/tusc-sh/package.nix b/pkgs/by-name/tu/tusc-sh/package.nix new file mode 100644 index 000000000000..e370deec9bd0 --- /dev/null +++ b/pkgs/by-name/tu/tusc-sh/package.nix @@ -0,0 +1,50 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, writeShellApplication +, curl +, coreutils +, jq +}: + +let + tusc = stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tusc-sh"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "adhocore"; + repo = "tusc.sh"; + rev = finalAttrs.version; + hash = "sha256-RFgQMYit12pmWnEAE1cyl34SFW87xEbS7gq5Nyel/ss="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm755 tusc.sh -t $out/bin + + runHook postInstall + ''; + +}); +in +writeShellApplication { + name = "tusc"; + runtimeInputs = [ tusc curl coreutils jq ]; + text = '' + tusc.sh "$@" + ''; + meta = with lib; { + description = "Tus 1.0.0 client protocol implementation for bash"; + homepage = "https://github.com/adhocore/tusc.sh"; + changelog = "https://github.com/adhocore/tusc.sh/blob/${tusc.version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + mainProgram = "tusc"; + platforms = platforms.all; + }; +}