From 8514ac064923360ee87780c42e4b5017e7c2bb84 Mon Sep 17 00:00:00 2001 From: AsbjornOlling Date: Sun, 12 Nov 2023 16:07:04 +0100 Subject: [PATCH 01/18] maintainers: add asbjornolling --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0c4fd04c3ca..d58c8508d52e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1560,6 +1560,13 @@ githubId = 1482768; name = "Benjamin Asbach"; }; + asbjornolling = { + email = "asbjorn@olli.ng"; + matrix = "@asbjorn:olli.ng"; + github = "AsbjornOlling"; + githubId = 11493130; + name = "Asbjørn Olling"; + }; asciimoth = { name = "Andrew"; email = "ascii@moth.contact"; From 07b6fee4d7b7f474189a8a97d87d3309ebeecb9f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 22 Nov 2023 21:18:54 +0100 Subject: [PATCH 02/18] pgadmin: migrate to prefetch-yarn-deps --- pkgs/tools/admin/pgadmin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 117f02a593ba..0deb3d05b906 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -7,7 +7,7 @@ , postgresqlTestHook , postgresql , yarn -, fixup_yarn_lock +, prefetch-yarn-deps , nodejs , fetchpatch , server-mode ? true @@ -165,7 +165,7 @@ pythonPackages.buildPythonApplication rec { rm yarn.lock cp ${./yarn.lock} yarn.lock chmod +w yarn.lock - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ yarn webpacker @@ -189,7 +189,7 @@ pythonPackages.buildPythonApplication rec { cp -v ../pkg/pip/setup_pip.py setup.py ''; - nativeBuildInputs = with pythonPackages; [ cython pip sphinx yarn fixup_yarn_lock nodejs ]; + nativeBuildInputs = with pythonPackages; [ cython pip sphinx yarn prefetch-yarn-deps nodejs ]; buildInputs = [ zlib pythonPackages.wheel From f59a3beaca52f12afba26467b4c028209b677175 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 22 Nov 2023 23:01:40 +0100 Subject: [PATCH 03/18] r2modman: migrate to prefetch-yarn-deps --- pkgs/games/r2modman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index e48ce9e49fff..039a9a6cb24e 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -2,7 +2,7 @@ , stdenv , yarn , fetchYarnDeps -, fixup_yarn_lock +, prefetch-yarn-deps , nodejs , electron , fetchFromGitHub @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yarn - fixup_yarn_lock + prefetch-yarn-deps nodejs makeWrapper copyDesktopItems @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { export NODE_OPTIONS="--openssl-legacy-provider" export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ From a52972dbff0cfd4e2055270b69dd4130bf7636eb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 22 Nov 2023 23:03:52 +0100 Subject: [PATCH 04/18] heroic: migrate to prefetch-yarn-deps --- pkgs/games/heroic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 65ff3b90403f..9aacc0856c4f 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, fixup_yarn_lock +, prefetch-yarn-deps , nodejs , python3 , makeWrapper @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ yarn - fixup_yarn_lock + prefetch-yarn-deps nodejs python3 makeWrapper @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ From f325e2f5d7f144413a240f66ed7cced901c7ba38 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Nov 2023 04:20:00 +0000 Subject: [PATCH 05/18] postgresql16Packages.pg_safeupdate: 1.4 -> 1.5 Diff: https://github.com/eradman/pg-safeupdate/compare/1.4...1.5 Changelog: https://github.com/eradman/pg-safeupdate/raw/1.5/NEWS --- pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 06b8ce690982..4c601896b45b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg-safeupdate"; - version = "1.4"; + version = "1.5"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "eradman"; repo = pname; rev = version; - sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; + sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; installPhase = '' @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple extension to PostgreSQL that requires criteria for UPDATE and DELETE"; homepage = "https://github.com/eradman/pg-safeupdate"; + changelog = "https://github.com/eradman/pg-safeupdate/raw/${src.rev}/NEWS"; platforms = postgresql.meta.platforms; license = licenses.postgresql; + broken = versionOlder postgresql.version "14"; }; } From 96ca129160463ac44cf385a7a2070b037f686494 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Nov 2023 04:20:00 +0000 Subject: [PATCH 06/18] emacsPackages.hotfuzz: build dynamic library --- .../emacs/elisp-packages/melpa-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index cd45cfc78727..3c8f89bd44d6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -281,6 +281,20 @@ let packageRequires = [ self.haskell-mode ]; }); + hotfuzz = super.hotfuzz.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ]; + + dontUseCmakeBuildDir = true; + + preBuild = '' + make -j$NIX_BUILD_CORES + ''; + + postInstall = (old.postInstall or "") + "\n" + '' + install source/hotfuzz-module.so $out/share/emacs/site-lisp/elpa/hotfuzz-* + ''; + }); + irony = super.irony.overrideAttrs (old: { cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; From ef557f03443850cbbb44a2ef327afd78bfef7cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 22 Nov 2023 11:46:13 +0100 Subject: [PATCH 07/18] tor-browser: 13.0.1 -> 13.0.5 https://blog.torproject.org/new-release-tor-browser-1304/ https://blog.torproject.org/new-release-tor-browser-1305/ --- .../networking/browsers/tor-browser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 6b155977a3b8..b2ed9cca471a 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -105,7 +105,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.1"; + version = "13.0.5"; sources = { x86_64-linux = fetchurl { @@ -115,7 +115,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-ORa973US2VY9Can4Nr35YSpZrYGqBP4I/S/ulsbRJLc="; + hash = "sha256-WZq8ig62Mu3q6OrVSaPbe6MLQ6pvFNo3yQMXC7PCGJY="; }; i686-linux = fetchurl { @@ -125,7 +125,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-OBUleXLTNFG+aFuftnphgBtQCfyoIWDcoVFs5elJ0tA="; + hash = "sha256-/enIdKLMRmJIjwXEo0i3hgHZKEtWaBgFzE1rtZMsqeY="; }; }; From 06580dcbaae344f4ac8bea9f483accaa24184be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 23 Nov 2023 20:25:36 +0100 Subject: [PATCH 08/18] mullvad-browser: 13.0.1 -> 13.0.4 https://github.com/mullvad/mullvad-browser/releases/tag/13.0.4 --- .../networking/browsers/mullvad-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 20d01a4bba15..532e48d1fab2 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -89,7 +89,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.1"; + version = "13.0.4"; sources = { x86_64-linux = fetchurl { @@ -101,7 +101,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-VYkRHWyTAAt5P7jnNuf4s2bOv36LuqcTMMKOLRGE9FQ="; + hash = "sha256-qK67rf9zkMA53WFIcMCsPUH4m6YkMVqAUsHiGsy/xN4="; }; }; From b4b12bbb9d8485c6b9378cf701d7308a79430926 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 Nov 2023 04:20:00 +0000 Subject: [PATCH 09/18] mystmd: 1.1.29 -> 1.1.31 Diff: https://github.com/executablebooks/mystmd/compare/mystmd@1.1.29...mystmd@1.1.31 Changelog: https://github.com/executablebooks/mystmd/blob/mystmd@1.1.31/packages/myst-cli/CHANGELOG.md --- pkgs/by-name/my/mystmd/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 1529bc3c321a..79fbff2f2b07 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -1,17 +1,17 @@ -{ lib, buildNpmPackage, fetchFromGitHub, mystmd, testers }: +{ lib, buildNpmPackage, fetchFromGitHub, mystmd, testers, nix-update-script }: buildNpmPackage rec { pname = "mystmd"; - version = "1.1.29"; + version = "1.1.31"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-vI30dAcHdVtfD3xWIEytlDaobRX7Wkc7xt8vVHdXJxY="; + hash = "sha256-1zjz1HJxa8ww02MnqravCWM51bpuSpnLxn34Kazbt5o="; }; - npmDepsHash = "sha256-l/jpNCVZe++o494W4EV86VAVdH9W8W8I0+dC2rBome8="; + npmDepsHash = "sha256-7H3VKJAzbsKLhyFD7MoASsOyJwbt6vERO6LM2mpz/y0="; dontNpmInstall = true; @@ -23,9 +23,12 @@ buildNpmPackage rec { runHook postInstall ''; - passthru.tests.version = testers.testVersion { - package = mystmd; - version = "v${version}"; + passthru = { + tests.version = testers.testVersion { + package = mystmd; + version = "v${version}"; + }; + updateScript = nix-update-script { }; }; meta = with lib; { From 1c37d53709c567cedb041912d595e5ff406f3da7 Mon Sep 17 00:00:00 2001 From: AsbjornOlling Date: Sun, 12 Nov 2023 16:07:12 +0100 Subject: [PATCH 10/18] emocli: init at 1.0.0 --- pkgs/by-name/em/emocli/package.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/by-name/em/emocli/package.nix diff --git a/pkgs/by-name/em/emocli/package.nix b/pkgs/by-name/em/emocli/package.nix new file mode 100644 index 000000000000..7809ba7673c7 --- /dev/null +++ b/pkgs/by-name/em/emocli/package.nix @@ -0,0 +1,25 @@ +{ lib, nimPackages, fetchFromGitLab, unicode-emoji }: + +nimPackages.buildNimPackage rec { + pname = "emocli"; + version = "1.0.0"; + src = fetchFromGitLab { + owner = "AsbjornOlling"; + repo = "emocli"; + rev = "v${version}"; + hash = "sha256-yJu+8P446gzRFOi9/+TcN8AKL0jKHUxhOvi/HXNWL1A="; + }; + nimFlags = [ + "-d:release" + "--maxLoopIterationsVM:1000000000" + ]; + doCheck = true; + env.EMOCLI_DATAFILE = "${unicode-emoji}/share/unicode/emoji/emoji-test.txt"; + meta = with lib; { + homepage = "https://gitlab.com/AsbjornOlling/emocli"; + description = "The emoji picker for your command line"; + license = licenses.eupl12; + maintainers = with maintainers; [ asbjornolling ]; + mainProgram = "emocli"; + }; +} From c5fb2d5662984dacd6202bcceee6f6b80bfd9dc7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 12 Nov 2023 11:54:43 +0100 Subject: [PATCH 11/18] python311Packages.pymc: 5.9.1 -> 5.9.2 Changelog: https://github.com/pymc-devs/pymc/releases/tag/v5.9.2 --- pkgs/development/python-modules/pymc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 5ca2b1ce9395..4fd1a1535ecd 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.9.1"; + version = "5.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-yY8W3B1yqj0oOkR6+nMbFgCFmTStXkePWnEYPHI8Zto="; + hash = "sha256-fbS4JSbmdOGz570awEpT6ut0NJ8TbiAeJWaETMBeI3c="; }; propagatedBuildInputs = [ From cdab9e2828ddbf9a7a5c38f878a2eb54d261a76b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 12 Nov 2023 12:30:26 +0100 Subject: [PATCH 12/18] python311Packages.pytensor: 2.17.3 -> 2.18.1 Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-2.18.1 --- .../python-modules/pytensor/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 06d0dffb2468..c109a707d24d 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -18,15 +18,13 @@ , pytest-mock , pytestCheckHook , pythonOlder -# Tensorflow is currently (2023/10/04) broken. -# Thus, we don't provide this optional test dependency. -# , tensorflow-probability +, tensorflow-probability , stdenv }: buildPythonPackage rec { pname = "pytensor"; - version = "2.17.3"; + version = "2.18.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +33,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-FufPCFzSjG8BrHes7t3XsdovX9gqUBG0gMDGKvkRkSA="; + hash = "sha256-8bt6ps5bwT+Atr6JgQMxe234bL/ZriYlURUdX0sC1kk="; }; postPatch = '' @@ -66,9 +64,7 @@ buildPythonPackage rec { numba-scipy pytest-mock pytestCheckHook - # Tensorflow is currently (2023/10/04) broken. - # Thus, we don't provide this optional test dependency. - # tensorflow-probability + tensorflow-probability ]; preBuild = '' @@ -86,8 +82,6 @@ buildPythonPackage rec { "test_logsumexp_benchmark" "test_scan_multiple_output" "test_vector_taps_benchmark" - # Temporarily disabled because of broken tensorflow-probability - "test_tfp_ops" ]; disabledTestPaths = [ From e13d626b424f31242c6d9d2a11fe8cece0e31492 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 24 Nov 2023 20:20:17 +0100 Subject: [PATCH 13/18] python311Packages.timm: 0.9.11 -> 0.9.12 Diff: https://github.com/huggingface/pytorch-image-models/compare/refs/tags/v0.9.11...v0.9.12 Changelog: https://github.com/huggingface/pytorch-image-models/blob/v0.9.12/README.md#whats-new --- pkgs/development/python-modules/timm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index a135332c3c05..90dfe5598785 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timm"; - version = "0.9.11"; + version = "0.9.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-xa7oDa8fzQT+hixuszCqCoLYfJcMLeZcHLlBT9KUWUo="; + hash = "sha256-dDd/Sjy4xmJlaAg+fOxxcuX3FX//uJJkW0q3AaeCfns="; }; propagatedBuildInputs = [ From aa95d94e795c44b18635985fcb8fa7f8d4360a27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Nov 2023 20:55:00 +0000 Subject: [PATCH 14/18] python311Packages.trimesh: 4.0.4 -> 4.0.5 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 6a38fed9c492..477fb3b97438 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.0.4"; + version = "4.0.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3XpncG6ISKQU+hqJpvck82s0BYgvYpNGn3zcdWkB5Ps="; + hash = "sha256-ub/P7AO3CrTSHwVd8atz6HQN0LyP1WSCc+74/sds3fk="; }; nativeBuildInputs = [ setuptools ]; From 1a804fb5139501993045e20fe7d65ab9520d19ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Nov 2023 22:16:09 +0000 Subject: [PATCH 15/18] sqlc: 1.23.0 -> 1.24.0 --- pkgs/development/tools/database/sqlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index bca69a453463..ea70fdd63e6a 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.23.0"; + version = "1.24.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "sqlc-dev"; repo = "sqlc"; rev = "v${version}"; - hash = "sha256-MM4O/njW4R1darZMtoevuLMt14/BrCAaFvSX06CTso8="; + hash = "sha256-j+pyj1CJw0L3s4Nyhy+XXUgX2wbrOWveEJQ4cFhQEvs="; }; proxyVendor = true; - vendorHash = "sha256-tJ+Bih+vwkYfEvIsJ6R2Z0eDS9m1eTOS68uyad0F6f0="; + vendorHash = "sha256-xOMqZCuENGuCs+VkbCxMpXOEr4MALhlveTfUHEPnP1w="; subPackages = [ "cmd/sqlc" ]; From 13a4eeb25851cb13b6c72951f1c0b77635f6b275 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Nov 2023 22:17:01 +0000 Subject: [PATCH 16/18] streamlit: 1.28.1 -> 1.28.2 --- pkgs/development/python-modules/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 9b05380d423e..73c36577413a 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.28.1"; + version = "1.28.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-zKBPbZWxS3vDfwyrrydQS4ava04a+Y1zrMgOzc+8xJI="; + hash = "sha256-wUQWiIG/e9bWAXqb/eWFtS0gCHsQstXIXTdu9tUqqO4="; }; nativeBuildInputs = [ From 811294e5f07c03a4fe8e76a0a052c4b4dd5929c4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 22 Nov 2023 22:40:47 +0100 Subject: [PATCH 17/18] usql: fix build with clang 12+ See #166205 --- pkgs/by-name/us/usql/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 2faeda9b09b9..07cada7aed51 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , buildGoModule , unixODBC @@ -49,6 +50,11 @@ buildGoModule rec { "no_adodb" ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + ldflags = [ "-s" "-w" From 82c1f488b87eeedcf583fd9ae8cb2ada7d496d5d Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Fri, 24 Nov 2023 00:59:45 -0600 Subject: [PATCH 18/18] noweb: 2.12 -> 2.13 --- .../tools/literate-programming/noweb/default.nix | 11 ++++++----- .../literate-programming/noweb/no-FAQ.patch | 16 +++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 6b4452a39189..26ce4d6891af 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "noweb"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { owner = "nrnrnr"; repo = "noweb"; - rev = "v${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; + rev = "v${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; + sha256 = "sha256-COcWyrYkheRaSr2gqreRRsz9SYRTX2PSl7km+g98ljs="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; patches = [ # Remove FAQ @@ -20,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: rec { postPatch = '' substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip' + substituteInPlace Makefile --replace '`./gitversion`' '${finalAttrs.src.rev}' ''; nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ]; diff --git a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch index 2fa601d35c83..7fa5c475c400 100644 --- a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch +++ b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch @@ -1,11 +1,13 @@ ---- a/Makefile 2006-06-12 22:14:20.000000000 +0200 -+++ b/Makefile 2010-06-17 11:30:11.804018145 +0200 -@@ -198,7 +198,7 @@ - (cd elisp; ci -l $(CINAME) $(CIMSG) *.el) - ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw +diff --git a/Makefile b/Makefile +index 1897c09..770e108 100644 +--- a/Makefile ++++ b/Makefile +@@ -195,7 +195,7 @@ install-elisp: + uninstall-elisp: + rm -f $(ELISP)/noweb-mode.el -source: FAQ +source: - for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done + for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) CPIF=">" $@); done sleep 1 - for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done + for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) touch); done