From e0532dd87c099ddfe20c53c8a2bc860ab6f90355 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Fri, 21 Oct 2022 11:17:11 +0200 Subject: [PATCH 01/87] ocamlPackages.carton: Tests require getconf https://github.com/mirage/ocaml-git/blob/471406dde6c3056ea49547de379fef12871da48b/bin/fiber/fiber.ml#L132 --- .../ocaml-modules/carton/carton-find-getconf.patch | 13 +++++++++++++ pkgs/development/ocaml-modules/carton/default.nix | 8 ++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/ocaml-modules/carton/carton-find-getconf.patch diff --git a/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch b/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch new file mode 100644 index 000000000000..8c7176ee16c8 --- /dev/null +++ b/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch @@ -0,0 +1,13 @@ +diff --git a/bin/fiber/fiber.ml b/bin/fiber/fiber.ml +index 188a92cc9..6087a8687 100644 +--- a/bin/fiber/fiber.ml ++++ b/bin/fiber/fiber.ml +@@ -129,7 +129,7 @@ let worker pool = + + let get_concurrency () = + try +- let ic = Unix.open_process_in "getconf _NPROCESSORS_ONLN" in ++ let ic = Unix.open_process_in "@getconf@/bin/getconf _NPROCESSORS_ONLN" in + let close () = ignore (Unix.close_process_in ic) in + let sc = Scanf.Scanning.from_channel ic in + try diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index 13c5089d822b..5fd18d3752d0 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -3,6 +3,7 @@ , checkseum, logs, psq, fmt , result, rresult, fpath, base64, bos, digestif, alcotest , crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd +, getconf, substituteAll }: buildDunePackage rec { @@ -16,6 +17,13 @@ buildDunePackage rec { sha256 = "sha256-7mgCgu87Cn4XhjEhonlz9lhgTw0Cu5hnxNJ1wXr+Qhw="; }; + patches = [ + (substituteAll { + src = ./carton-find-getconf.patch; + getconf = "${getconf}"; + }) + ]; + # remove changelogs for mimic and the git* packages postPatch = '' rm CHANGES.md From 211a27df4b85940be905d53d65c3983d907476d4 Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 15 Dec 2022 17:47:21 +0200 Subject: [PATCH 02/87] linuxPackages.rtl8189es: 2022-08-30 -> 2022-10-30 This fixes the build with Linux 6.1. --- pkgs/os-specific/linux/rtl8189es/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index f53ed777d08c..e50129f1e2b9 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8189es-${kernel.version}-${version}"; - version = "2022-08-30"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "c93cfd712a3acd2ecdeda19a66d269c20f8803f1"; - sha256 = "sha256-bBUxo8lplFwXfsSNf5lz9XCpQ6M0vWelmFoCal95FpI="; + rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172"; + sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; From c5a43a4aa03fdc9196cb2c68ac66ea0db0a5123d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Dec 2022 02:00:14 +0000 Subject: [PATCH 03/87] obs-studio-plugins.obs-move-transition: 2.7.1 -> 2.8.0 --- .../video/obs-studio/plugins/obs-move-transition.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 7af053e5c18f..0f8eddaebd17 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-zWHQ01iNTlqSAKcmsDCUZPXmmBIpqY/ZDftD5J6kp80="; + sha256 = "sha256-v4mAv4dqurM2S4/vM1APge0xoMLnOaigGU15vjNxxSo="; }; nativeBuildInputs = [ cmake ]; From 45703707c789ab709213b6851772ad29e480b715 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Dec 2022 02:18:36 +0000 Subject: [PATCH 04/87] vxl: 3.3.2 -> 3.5.0 --- pkgs/development/libraries/vxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 878271b43178..20d96a63d6de 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: stdenv.mkDerivation rec { pname = "vxl"; - version = "3.3.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "vxl"; repo = "vxl"; rev = "v${version}"; - sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr"; + sha256 = "sha256-4kMpIrywEZzt0JH95LHeDLrDneii0R/Uw9GsWkvED+E="; }; nativeBuildInputs = [ cmake unzip ]; From c87222c7ea73ba0de302e7c619b03ca071b04c67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 05:10:40 +0000 Subject: [PATCH 05/87] dotenv-linter: 3.2.0 -> 3.3.0 --- pkgs/development/tools/analysis/dotenv-linter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index fdd4d84673b5..fec39c962a66 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-YWL1aPcMdU4lo7h/T2sdl2H6qnx3lfMtV39Ak4yP88w="; + sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo="; }; - cargoSha256 = "sha256-q59hpnXc00OzrJk1KOWbIPQYfIE+7ku9XtTDXHgwQBg="; + cargoSha256 = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; buildInputs = lib.optional stdenv.isDarwin Security; From 3592793ebfa628c412f9c3b6bac3a5897a8bfbac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 13:29:01 +0000 Subject: [PATCH 06/87] python310Packages.tika: 1.24 -> 2.6.0 --- pkgs/development/python-modules/tika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tika/default.nix b/pkgs/development/python-modules/tika/default.nix index 375560ad9817..f71772749c13 100644 --- a/pkgs/development/python-modules/tika/default.nix +++ b/pkgs/development/python-modules/tika/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tika"; - version = "1.24"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "wsUPQFYi90UxhBEE+ehcF1Ea7eEd6OU4XqsaKaMfGRs="; + sha256 = "sha256-VmcOuBKUTrJe1z8bOwdapB56E1t0skCCLyi4GeWzc9o="; }; propagatedBuildInputs = [ pyyaml requests ]; From 6e6fcce2f9b82e4d495707519139a566ac15fdd6 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Fri, 13 Jan 2023 09:00:28 +0100 Subject: [PATCH 07/87] androidStudioPackages.stable: 2021.3.1.17 -> 2022.1.1.19 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 70d146db3218..89f3d4ad0290 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,8 +10,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2021.3.1.17"; # "Android Studio Dolphin (2021.3.1)" - sha256Hash = "sha256-ia2wzg/6RreJTnv+2xQrH11SxDwXHmpsualaSfd3Vso="; + version = "2022.1.1.19"; # "Android Studio Electric Eel (2022.1.1)" + sha256Hash = "luxE6a2C86JB28ezuIZV49TyE314S1RcNXQnCQamjUA="; }; betaVersion = { version = "2022.1.1.12"; # "Android Studio Electric Eel (2022.1.1) Beta 2" From cf8621d287db822eb22c0ded651455474ee1c0d4 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Thu, 12 Jan 2023 22:55:16 +0000 Subject: [PATCH 08/87] gridtracker: 1.22.1226 -> 1.23.0110 --- pkgs/applications/radio/gridtracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index 0e6216cdda42..cfb1f367ad80 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gridtracker"; - version = "1.22.1226"; + version = "1.23.0110"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-/Noc2aqHBjphX6RDqxQBI/OOKZgEnOndn0daBt1edXM="; + sha256 = "sha256-yQWdBNt7maYTzroB+P1hsGIeivkP+soR3/b847HLYZY="; }; postPatch = '' From ebf3a404f6bcacbabb81cb141ad614bcd52752b1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 16 Jan 2023 19:29:45 +0100 Subject: [PATCH 09/87] gmnisrv: don't pin to openssl_1_1 --- pkgs/servers/gemini/gmnisrv/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index 81e1c17467cc..d37a7247ecf4 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ="; }; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + ]; + postPatch = '' substituteInPlace config.sh \ --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0270750dbf84..97dc83a96f90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3153,9 +3153,7 @@ with pkgs; gmni = callPackage ../applications/networking/browsers/gmni { }; - gmnisrv = callPackage ../servers/gemini/gmnisrv { - openssl = openssl_1_1; - }; + gmnisrv = callPackage ../servers/gemini/gmnisrv { }; gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; From 8a9e4179f24db92fec57ca93c76aa7144e457d6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 13:23:54 +0000 Subject: [PATCH 10/87] kanboard: 1.2.25 -> 1.2.26 --- pkgs/applications/misc/kanboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index be28d1185d24..69092b3acd5b 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.25"; + version = "1.2.26"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-yBUvePVbNDLYL1d6cNrLBn6+/p1agVzSx29JB3EZ5Fk="; + sha256 = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0="; }; dontBuild = true; From ecc0572ed99cff53e5136d75924e41c7e3bd82f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 14:38:54 +0000 Subject: [PATCH 11/87] vexctl: 0.0.2 -> 0.1.0 --- pkgs/tools/security/vexctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vexctl/default.nix b/pkgs/tools/security/vexctl/default.nix index 3821fa77dc88..335da7f93acf 100644 --- a/pkgs/tools/security/vexctl/default.nix +++ b/pkgs/tools/security/vexctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "vexctl"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "vex"; rev = "v${version}"; - sha256 = "sha256-rDq62vkrZ8/76LERchxijmQCgo58KXlAIfv4SwI7egY="; + sha256 = "sha256-f5UVX6x4DwjlcgMAv0GuKBH9UUzFhQ8pW8l+9pc7RQ4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-7hhiJowtQv4JPqvpMiukL2JVgNeB5gi5X4p+AVGp4S0="; + vendorHash = "sha256-GZIssLLPg2dF7xsvsYn2MKYunMCpGbNA+6qCYBW++vk="; nativeBuildInputs = [ installShellFiles ]; From 27b09ea44a1235aec808ea257eb9a7a2dfc2c129 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 20:41:01 +0000 Subject: [PATCH 12/87] sdrangel: 7.8.5 -> 7.8.6 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index cac4144f544c..fa3f566b3f0c 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -42,13 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.8.5"; + version = "7.8.6"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-m5b51rR2l4EdF2kMogHIi1ojoy3UwuU0Q3pfB1ev300="; + sha256 = "sha256-tLU2OHFf1PPNRr1t3MWWCKnvILp1DW0k4TAxrXWI2X4="; }; nativeBuildInputs = [ cmake pkg-config ]; From d529678ff892c624610a504675940be6fe35b113 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Thu, 19 Jan 2023 12:01:51 +0100 Subject: [PATCH 13/87] vscode-extensions.dbaeumer.vscode-eslint: add metadata --- pkgs/applications/editors/vscode/extensions/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ea6206bf39af..3fa601afc8e8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -740,8 +740,13 @@ let version = "2.2.6"; sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ="; }; - meta = { - license = lib.licenses.mit; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; + description = "Integrates ESLint JavaScript into VS Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; + homepage = "https://github.com/Microsoft/vscode-eslint"; + license = licenses.mit; + maintainers = with maintainers; [ datafoo ]; }; }; From 867bc25c5f3efc686d50980c6a47dd6782b4fd2f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 18 Jan 2023 14:54:11 +0000 Subject: [PATCH 14/87] exempi: update homepage The old one redirects here. --- pkgs/development/libraries/exempi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 3586a674904b..2bde242f067b 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; - homepage = "https://libopenraw.freedesktop.org/wiki/Exempi/"; + homepage = "https://libopenraw.freedesktop.org/exempi/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; From d95feb435fc307f453bb5f2c6e7f4288ec85f2b3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 19 Jan 2023 11:45:09 +0000 Subject: [PATCH 15/87] exempi: remove unused fetchpatch input --- pkgs/development/libraries/exempi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 2bde242f067b..dd5e53fe8eb8 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: +{ lib, stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { pname = "exempi"; From 494cbda1bbec68208444adbe1c7140e958097c5c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 19 Jan 2023 11:45:19 +0000 Subject: [PATCH 16/87] exempi: enable parallel building Tested at -j4. --- pkgs/development/libraries/exempi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index dd5e53fe8eb8..d17ca4ea751e 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { doCheck = stdenv.isLinux && stdenv.is64bit; dontDisableStatic = doCheck; + enableParallelBuilding = true; + meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; homepage = "https://libopenraw.freedesktop.org/exempi/"; From cec45b0a1ce9b9dc03ee762fbc3ed636ed83ccbc Mon Sep 17 00:00:00 2001 From: arathunku Date: Thu, 19 Jan 2023 20:37:58 +0100 Subject: [PATCH 17/87] elixir-ls: 0.12.0 -> 0.13.0 --- pkgs/development/beam-modules/elixir-ls/pin.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/elixir-ls/pin.json b/pkgs/development/beam-modules/elixir-ls/pin.json index bd206eb1d1a2..79909f98b7de 100644 --- a/pkgs/development/beam-modules/elixir-ls/pin.json +++ b/pkgs/development/beam-modules/elixir-ls/pin.json @@ -1,5 +1,5 @@ { - "version": "0.12.0", - "sha256": "sha256-ZieKL98EUT3RbZ1UZkhrnXjg3N0RATKB69F8D7IWnJ8=", - "depsSha256": "sha256-Otm8koWrDYxodfliIe+q4U+39eStR5umEKnQQmOOGeA=" + "version": "0.13.0", + "sha256": "sha256-eUAlnEKhoJ3j2Ii2EBL620jv3aGeMJcWoMMG+vWIdm4=", + "depsSha256": "sha256-fAt9BpEE9truGWpor0BttVd9aNZlgQ6UTorIEcJ82wM=" } From 51577b3025fd7ee821713c21ccebb534a1959a67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 01:30:02 +0000 Subject: [PATCH 18/87] vtm: 0.9.8l -> 0.9.8n --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index fb68b5191b2e..fddef03c9cf8 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.8l"; + version = "0.9.8n"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-6hZvnZXnoS97uQKxBbSJmMN1bGp42p0v4kJH7F+3mjU="; + sha256 = "sha256-uH4nyhc3u9yuUZfMJ8rU8cZGtyqMfL+LyNB0/h3X45E="; }; nativeBuildInputs = [ cmake ]; From 3fe5a73b2898d86ccbf856622bfc35da9f0da206 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Fri, 13 Jan 2023 09:01:34 +0100 Subject: [PATCH 19/87] androidStudioPackages.beta: 2022.1.1.12 -> 2022.2.1.12 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 89f3d4ad0290..139212ddf2c0 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,8 +14,8 @@ let sha256Hash = "luxE6a2C86JB28ezuIZV49TyE314S1RcNXQnCQamjUA="; }; betaVersion = { - version = "2022.1.1.12"; # "Android Studio Electric Eel (2022.1.1) Beta 2" - sha256Hash = "8iSFPH0PTQkzV1t8bEq7CBtOU8pzdnD/PrpVcgPnO6Q="; + version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1" + sha256Hash = "tIgmX9KiRInIupgIXWgg4dMf8bTwkVopOxAO5O1PUAc="; }; latestVersion = { # canary & dev version = "2022.2.1.2"; # "Android Studio Flamingo (2022.2.1) Canary 2" From 5599a8a72f88093b8f252ef8a805a04b852be2aa Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Fri, 13 Jan 2023 09:02:23 +0100 Subject: [PATCH 20/87] androidStudioPackages.canary: 2022.2.1.2 -> 2023.3.1.1 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 139212ddf2c0..494a02f3041f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,8 +18,8 @@ let sha256Hash = "tIgmX9KiRInIupgIXWgg4dMf8bTwkVopOxAO5O1PUAc="; }; latestVersion = { # canary & dev - version = "2022.2.1.2"; # "Android Studio Flamingo (2022.2.1) Canary 2" - sha256Hash = "hlHlgyl9If2LH4aExpElx0rqmWeoFX+qx4w6RRb5e8U="; + version = "2022.3.1.1"; # "Android Studio Girrafe (2022.3.1) Canary 1" + sha256Hash = "I7Zc4DDByUB6XOnk7v+91ccpNI7eX/T4d3vH60ih8ec="; }; in { # Attributes are named by their corresponding release channels From aeb8fd1296eeb3d46d9c46ba5f127dc2beea7970 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Thu, 19 Jan 2023 10:31:54 -0500 Subject: [PATCH 21/87] ecwolf: replace fetchurl with fetchFromBitbucket MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes ecwolf’s src slightly simpler. It also makes ecwolf’s src more future proof. When ECWolf 2.0 is released, the “1.x” in the maniacsvault.net URL is likely to change, but the Bitbuck repo isn’t likely to change. Additionally, this change reduces the difference between ecwolf’s default.nix and lzwolf’s default.nix (LZWolf is a fork of ECWolf). Finally, this change makes nixpkgs rely on bitbucket.org instead of maniacsvault.net. bitbucket.org is probably more reliable than maniacsvault.net. --- pkgs/games/ecwolf/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index f8ca3b40f532..57fe97af614e 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2 }: +{ stdenv, lib, fetchFromBitbucket, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2 }: stdenv.mkDerivation rec { pname = "ecwolf"; version = "1.3.3"; - src = fetchurl { - url = "https://maniacsvault.net/ecwolf/files/ecwolf/1.x/${pname}-${version}-src.tar.xz"; - sha256 = "1sbdv672dz47la5a5qwmdi1v258k9kc5dkx7cdj2b6gk8nbm2srl"; + src = fetchFromBitbucket { + owner = pname; + repo = pname; + rev = version; + sha256 = "7RjWoABZkN5J7GpG7ie7F3rSrI3Kp3I8KRalZAE92pQ="; }; nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]; From d0d65badfcb971d606e3982afb000a316214e46d Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Thu, 19 Jan 2023 10:59:41 -0500 Subject: [PATCH 22/87] ecwolf: 1.3.3 -> 1.4.0 Release announcement: SDL and SDL_mixer had to be replaced with SDL2 and SDL2_mixer to get the new version of ECWolf to compile. Also, SDL2_net had to be added since ECWolf now has support for multiplayer (see ). Closes #211388. --- pkgs/games/ecwolf/default.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 57fe97af614e..505c76f38f94 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -1,18 +1,32 @@ -{ stdenv, lib, fetchFromBitbucket, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2 }: +{ stdenv +, lib +, fetchFromBitbucket +, makeDesktopItem +, copyDesktopItems +, cmake +, pkg-config +, zlib +, bzip2 +, libjpeg +, SDL2 +, SDL2_net +, SDL2_mixer +, gtk2 +}: stdenv.mkDerivation rec { pname = "ecwolf"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromBitbucket { owner = pname; repo = pname; rev = version; - sha256 = "7RjWoABZkN5J7GpG7ie7F3rSrI3Kp3I8KRalZAE92pQ="; + sha256 = "n1G1zvfE1l42fbJ7ZaMdV0QXn45PjMpaaZTDQAOBtYk="; }; nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]; - buildInputs = [ zlib bzip2 libjpeg SDL SDL_mixer gtk2 ]; + buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk2 ]; desktopItems = [ (makeDesktopItem { @@ -47,6 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = stdenv.isDarwin; description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms"; homepage = "https://maniacsvault.net/ecwolf/"; license = licenses.gpl2Plus; From 1e403c6c0e14171951d1042f2afa6b157a830b09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 14:07:57 +0000 Subject: [PATCH 23/87] phrase-cli: 2.6.2 -> 2.6.4 --- pkgs/tools/misc/phrase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 74aa65002278..f2eafc38472d 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.6.2"; + version = "2.6.4"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-jByxNjz0KwcikOIpyxpswRbH4PFPu7mi9wERLHchPrI="; + sha256 = "sha256-9jNRXAP+qNihqr30/dSHqzDkyh+GauafMQBkBit5gmc="; }; - vendorHash = "sha256-LlMBV52CG1uYW7I/e0VwoIIr0wk3ysc5gqrAlFRPsvE="; + vendorHash = "sha256-zUwp7RqaKtxbTzEOhcmGG/+tqtBKs7cm6+sFNCKET08="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; From 4dcb03a5c32a90dbef83094183ef52e0580dfd22 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sat, 21 Jan 2023 23:19:48 +0100 Subject: [PATCH 24/87] treewide: remove global with lib; statements in pkgs/coq-modules --- pkgs/development/coq-modules/Cheerios/default.nix | 4 ++-- pkgs/development/coq-modules/CoLoR/default.nix | 6 +++--- pkgs/development/coq-modules/HoTT/default.nix | 6 +++--- pkgs/development/coq-modules/ITree/default.nix | 6 +++--- pkgs/development/coq-modules/LibHyps/default.nix | 5 ++--- pkgs/development/coq-modules/StructTact/default.nix | 4 ++-- pkgs/development/coq-modules/VST/default.nix | 6 ++---- pkgs/development/coq-modules/Velisarios/default.nix | 4 ++-- pkgs/development/coq-modules/Verdi/default.nix | 4 ++-- pkgs/development/coq-modules/aac-tactics/default.nix | 5 ++--- .../coq-modules/addition-chains/default.nix | 5 ++--- pkgs/development/coq-modules/autosubst/default.nix | 5 ++--- pkgs/development/coq-modules/bignums/default.nix | 6 +++--- .../coq-modules/category-theory/default.nix | 6 +++--- pkgs/development/coq-modules/ceres/default.nix | 5 ++--- pkgs/development/coq-modules/compcert/default.nix | 6 ++---- pkgs/development/coq-modules/contribs/default.nix | 6 +++--- pkgs/development/coq-modules/coq-bits/default.nix | 6 +++--- pkgs/development/coq-modules/coq-ext-lib/default.nix | 6 +++--- pkgs/development/coq-modules/coq-haskell/default.nix | 6 +++--- .../coq-modules/coq-record-update/default.nix | 6 +++--- pkgs/development/coq-modules/coqeal/default.nix | 8 +++----- pkgs/development/coq-modules/coqhammer/default.nix | 6 +++--- pkgs/development/coq-modules/coqide/default.nix | 4 ++-- pkgs/development/coq-modules/coqprime/default.nix | 4 ++-- pkgs/development/coq-modules/coqtail-math/default.nix | 6 ++---- pkgs/development/coq-modules/coquelicot/default.nix | 6 +++--- pkgs/development/coq-modules/corn/default.nix | 6 +++--- pkgs/development/coq-modules/deriving/default.nix | 5 ++--- pkgs/development/coq-modules/dpdgraph/default.nix | 11 +++++------ pkgs/development/coq-modules/equations/default.nix | 8 ++++---- pkgs/development/coq-modules/extructures/default.nix | 7 +++---- pkgs/development/coq-modules/fiat/HEAD.nix | 4 ++-- pkgs/development/coq-modules/flocq/default.nix | 6 +++--- pkgs/development/coq-modules/fourcolor/default.nix | 7 +++---- pkgs/development/coq-modules/gaia-hydras/default.nix | 6 +++--- pkgs/development/coq-modules/gaia/default.nix | 6 +++--- pkgs/development/coq-modules/gappalib/default.nix | 6 +++--- pkgs/development/coq-modules/goedel/default.nix | 5 ++--- pkgs/development/coq-modules/graph-theory/default.nix | 6 ++---- pkgs/development/coq-modules/heq/default.nix | 6 +++--- .../coq-modules/hierarchy-builder/default.nix | 10 +++++----- .../development/coq-modules/hydra-battles/default.nix | 7 +++---- pkgs/development/coq-modules/iris/default.nix | 6 +++--- pkgs/development/coq-modules/itauto/default.nix | 5 ++--- pkgs/development/coq-modules/ltac2/default.nix | 6 +++--- pkgs/development/coq-modules/math-classes/default.nix | 6 +++--- .../development/coq-modules/mathcomp-abel/default.nix | 2 +- .../coq-modules/mathcomp-algebra-tactics/default.nix | 8 ++++---- .../coq-modules/mathcomp-analysis/default.nix | 4 ++-- .../coq-modules/mathcomp-bigenough/default.nix | 6 +++--- .../coq-modules/mathcomp-finmap/default.nix | 6 +++--- .../coq-modules/mathcomp-real-closed/default.nix | 6 +++--- .../coq-modules/mathcomp-tarjan/default.nix | 9 +++++---- .../development/coq-modules/mathcomp-word/default.nix | 5 ++--- .../development/coq-modules/mathcomp-zify/default.nix | 8 ++++---- pkgs/development/coq-modules/mathcomp/default.nix | 4 ++-- pkgs/development/coq-modules/metacoq/default.nix | 4 ++-- pkgs/development/coq-modules/metalib/default.nix | 6 +++--- pkgs/development/coq-modules/multinomials/default.nix | 10 +++++----- pkgs/development/coq-modules/odd-order/default.nix | 5 ++--- pkgs/development/coq-modules/paco/default.nix | 6 +++--- pkgs/development/coq-modules/paramcoq/default.nix | 6 +++--- pkgs/development/coq-modules/parsec/default.nix | 5 ++--- pkgs/development/coq-modules/pocklington/default.nix | 5 ++--- pkgs/development/coq-modules/reglang/default.nix | 5 ++--- .../coq-modules/relation-algebra/default.nix | 7 +++---- pkgs/development/coq-modules/semantics/default.nix | 5 ++--- pkgs/development/coq-modules/serapi/default.nix | 2 +- pkgs/development/coq-modules/simple-io/default.nix | 6 +++--- pkgs/development/coq-modules/smpl/default.nix | 5 ++--- pkgs/development/coq-modules/smtcoq/default.nix | 5 ++--- pkgs/development/coq-modules/stdpp/default.nix | 6 +++--- pkgs/development/coq-modules/tlc/default.nix | 8 ++++---- pkgs/development/coq-modules/topology/default.nix | 7 +++---- pkgs/development/coq-modules/trakt/default.nix | 5 ++--- pkgs/development/coq-modules/zorns-lemma/default.nix | 9 ++++----- 77 files changed, 209 insertions(+), 242 deletions(-) diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 7ded64ec572e..5a7ec31f50c1 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, StructTact, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "cheerios"; owner = "uwplse"; inherit version; - defaultVersion = if versions.range "8.6" "8.16" coq.version then "20200201" else null; + defaultVersion = if lib.versions.range "8.6" "8.16" coq.version then "20200201" else null; release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d"; release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1"; diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 9dabae0bdbca..a926f6d8092d 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "color"; owner = "fblanqui"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ {case = range "8.12" "8.16"; out = "1.8.2"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } @@ -26,6 +26,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://github.com/fblanqui/color"; description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; - maintainers = with maintainers; [ jpas jwiegley ]; + maintainers = with lib.maintainers; [ jpas jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index ad371f1b6acb..c4d20ed0f30b 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, autoconf, automake, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "HoTT"; repo = "Coq-HoTT"; owner = "HoTT"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = coq.coq-version; } ] null; releaseRev = v: "V${v}"; @@ -20,6 +20,6 @@ with lib; mkCoqDerivation { meta = { homepage = "http://homotopytypetheory.org/"; description = "Homotopy type theory"; - maintainers = with maintainers; [ siddharthist ]; + maintainers = with lib.maintainers; [ siddharthist ]; }; } diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 23922dcce428..e0a9e1f6bfc4 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "InteractionTrees"; owner = "DeepSpec"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; @@ -12,6 +12,6 @@ with lib; mkCoqDerivation rec { propagatedBuildInputs = [ coq-ext-lib paco ]; meta = { description = "A Library for Representing Recursive and Impure Programs in Coq"; - maintainers = with maintainers; [ larsr ]; + maintainers = with lib.maintainers; [ larsr ]; }; } diff --git a/pkgs/development/coq-modules/LibHyps/default.nix b/pkgs/development/coq-modules/LibHyps/default.nix index 1a9eb9cec059..b0997e857b09 100644 --- a/pkgs/development/coq-modules/LibHyps/default.nix +++ b/pkgs/development/coq-modules/LibHyps/default.nix @@ -1,11 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "LibHyps"; owner = "Matafou"; inherit version; - defaultVersion = if (versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null; + defaultVersion = if (lib.versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null; release = { "2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h"; }; @@ -16,6 +15,6 @@ mkCoqDerivation { meta = { description = "Hypotheses manipulation library"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 3fb8a42cfb56..778ab142654d 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "StructTact"; owner = "uwplse"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.6" "8.16"; out = "20210328"; } { case = range "8.5" "8.13"; out = "20181102"; } ] null; diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 8a4243a87043..72d88dec6f1d 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -1,7 +1,5 @@ { lib, mkCoqDerivation, coq, compcert, ITree, version ? null }: -with lib; - # A few modules that are not built and installed by default # but that may be useful to some users. # They depend on ITree. @@ -11,7 +9,7 @@ let extra_floyd_files = [ "powerlater.v" ] # floyd/printf.v is broken in VST 2.9 - ++ optional (!versions.isGe "8.13" coq.coq-version) "printf.v" + ++ lib.optional (!lib.versions.isGe "8.13" coq.coq-version) "printf.v" ++ [ "quickprogram.v" ]; @@ -24,7 +22,7 @@ mkCoqDerivation { owner = "PrincetonUniversity"; repo = "VST"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.15" "8.16"; out = "2.11.1"; } { case = range "8.14" "8.16"; out = "2.10"; } { case = range "8.13" "8.15"; out = "2.9"; } diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index 08322fb7fc40..62eb9c389abb 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "Velisarios"; owner = "vrahli"; inherit version; - defaultVersion = if versions.range "8.6" "8.8" coq.coq-version then "20180221" else null; + defaultVersion = if lib.versions.range "8.6" "8.8" coq.coq-version then "20180221" else null; release."20180221".rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; release."20180221".sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 80b964b39042..6dec34a095d7 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, Cheerios, InfSeqExt, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "verdi"; owner = "uwplse"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.7" "8.16"; out = "20211026"; } { case = range "8.7" "8.14"; out = "20210524"; } { case = range "8.7" "8.13"; out = "20200131"; } diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix index 90ddf3e524ff..180b7b88fced 100644 --- a/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/pkgs/development/coq-modules/aac-tactics/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "aac-tactics"; @@ -21,7 +20,7 @@ mkCoqDerivation { release."8.5.0".sha256 = "sha256-7yNxJn6CH5xS5w/zsXfcZYORa6e5/qS9v8PUq2o02h4="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.16"; out = "8.16.0"; } { case = "8.15"; out = "8.15.1"; } { case = "8.14"; out = "8.14.1"; } @@ -37,7 +36,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "Coq plugin providing tactics for rewriting universally quantified equations"; longDescription = '' This Coq plugin provides tactics for rewriting universally quantified diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix index 63ba0e805072..f40bdbf1899c 100644 --- a/pkgs/development/coq-modules/addition-chains/default.nix +++ b/pkgs/development/coq-modules/addition-chains/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, mathcomp-fingroup, paramcoq , version ? null }: -with lib; mkCoqDerivation { pname = "addition-chains"; @@ -12,7 +11,7 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; @@ -21,7 +20,7 @@ mkCoqDerivation { useDune = true; - meta = { + meta = with lib; { description = "Exponentiation algorithms following addition chains"; longDescription = '' Addition chains are algorithms for computations of the p-th diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 5a7331c22206..72768777c1b5 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp-ssreflect, version ? null }: -with lib; mkCoqDerivation { pname = "autosubst"; @@ -8,13 +7,13 @@ mkCoqDerivation { release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.7"; } ] null; propagatedBuildInputs = [ mathcomp-ssreflect ]; - meta = { + meta = with lib; { homepage = "https://www.ps.uni-saarland.de/autosubst/"; description = "Automation for de Bruijn syntax and substitution in Coq"; maintainers = with maintainers; [ siraben jwiegley ]; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index f2e64ab2f61b..c62e20a5a2e7 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "bignums"; owner = "coq"; displayVersion = { bignums = ""; }; inherit version; - defaultVersion = if versions.isGe "8.6" coq.coq-version + defaultVersion = if lib.versions.isGe "8.6" coq.coq-version then "${coq.coq-version}.0" else null; release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw="; @@ -25,5 +25,5 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { license = licenses.lgpl2; }; + meta = { license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 97feac90c3bd..ed214533b03f 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, ssreflect, equations, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "category-theory"; owner = "jwiegley"; @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."20180709".sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "1.0.0"; } { case = range "8.10" "8.15"; out = "20211213"; } { case = range "8.8" "8.9"; out = "20190414"; } @@ -28,6 +28,6 @@ with lib; mkCoqDerivation { meta = { description = "A formalization of category theory in Coq for personal study and practical work"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/ceres/default.nix b/pkgs/development/coq-modules/ceres/default.nix index 375eb6c75bb0..75d57936ff5f 100644 --- a/pkgs/development/coq-modules/ceres/default.nix +++ b/pkgs/development/coq-modules/ceres/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "ceres"; @@ -8,10 +7,10 @@ mkCoqDerivation { owner = "Lysxia"; inherit version; - defaultVersion = if versions.range "8.8" "8.16" coq.version then "0.4.0" else null; + defaultVersion = if lib.versions.range "8.8" "8.16" coq.version then "0.4.0" else null; release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi"; - meta = { + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.mit; maintainers = with maintainers; [ Zimmi48 ]; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index fb6527989d8e..fb33f92bcc2a 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -5,8 +5,6 @@ , version ? null }: -with lib; - let compcert = mkCoqDerivation rec { pname = "compcert"; @@ -15,7 +13,7 @@ let compcert = mkCoqDerivation rec { inherit version; releaseRev = v: "v${v}"; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.14" "8.16"; out = "3.11"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } @@ -84,7 +82,7 @@ let compcert = mkCoqDerivation rec { }; in compcert.overrideAttrs (o: { - patches = with versions; switch [ coq.version o.version ] [ + patches = with lib.versions; lib.switch [ coq.version o.version ] [ { cases = [ (range "8.12.2" "8.13.2") "3.8" ]; out = [ # Support for Coq 8.12.2 diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index cb6dedca3551..2d10f683cc36 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -1,16 +1,16 @@ { lib, mkCoqDerivation, coq, callPackage }: -with lib; let mkContrib = pname: coqs: param: + let mkContrib = pname: coqs: param: let contribVersion = {version ? null}: mkCoqDerivation ({ inherit pname version; owner = "coq-contribs"; mlPlugin = true; - } // optionalAttrs (builtins.elem coq.coq-version coqs) ({ + } // lib.optionalAttrs (builtins.elem coq.coq-version coqs) ({ defaultVersion = param.version; release = { "${param.version}" = { inherit (param) rev sha256; }; }; } // (removeAttrs param [ "version" "rev" "sha256" ])) ); in - makeOverridable contribVersion {} ; in + lib.makeOverridable contribVersion {} ; in { aac-tactics = mkContrib "aac-tactics" [ "8.7" "8.8" ] { "8.7" = { diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index a2ef7e09a7d6..16a26d9fa32e 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.1.0"; } { case = range "8.7" "8.15"; out = "1.0.0"; } ] null; @@ -14,7 +14,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ mathcomp-algebra ]; - meta = { + meta = with lib; { description = "A formalization of bitset operations in Coq"; license = licenses.asl20; maintainers = with maintainers; [ ptival ]; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index b6f124b3f0fb..d555e55389b1 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "coq-ext-lib"; owner = "coq-ext-lib"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "0.11.7"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } @@ -30,6 +30,6 @@ with lib; mkCoqDerivation rec { meta = { description = "A collection of theories and plugins that may be useful in other Coq developments"; - maintainers = with maintainers; [ jwiegley ptival ]; + maintainers = with lib.maintainers; [ jwiegley ptival ]; }; } diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 7caf754ae50a..028b4c5025eb 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq-haskell"; owner = "jwiegley"; inherit version; - defaultVersion = if versions.range "8.5" "8.8" coq.coq-version then "20171215" else null; + defaultVersion = if lib.versions.range "8.5" "8.8" coq.coq-version then "20171215" else null; release."20171215".rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; release."20171215".sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; @@ -16,6 +16,6 @@ with lib; mkCoqDerivation { meta = { description = "A library for formalizing Haskell types and functions in Coq"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index 77c42fb48d4e..a0b27dda845f 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { + mkCoqDerivation rec { pname = "coq-record-update"; owner = "tchajed"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "0.3.1"; } ] null; release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; @@ -13,6 +13,6 @@ with lib; mkCoqDerivation rec { buildFlags = [ "NO_TEST=1" ]; meta = { description = "Library to create Coq record update functions"; - maintainers = with maintainers; [ ineol ]; + maintainers = with lib.maintainers; [ ineol ]; }; } diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index d3a8e366a0a4..1ccbf9e82a0f 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -2,14 +2,12 @@ mathcomp-real-closed, lib, version ? null }: -with lib; - (mkCoqDerivation { pname = "CoqEAL"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.13.0") ]; out = "1.1.1"; } { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } @@ -28,9 +26,9 @@ with lib; meta = { description = "CoqEAL - The Coq Effective Algebra Library"; - license = licenses.mit; + license = lib.licenses.mit; }; }).overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs - ++ optional (versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; + ++ lib.optional (lib.versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; }) diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 853e77990b6e..e5e23247f141 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { inherit version; pname = "coqhammer"; owner = "lukaszcz"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.15"; out = "1.3.2-coq8.15"; } { case = "8.14"; out = "1.3.2-coq8.14"; } { case = "8.13"; out = "1.3.2-coq8.13"; } @@ -57,7 +57,7 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { homepage = "http://cl-informatik.uibk.ac.at/cek/coqhammer/"; description = "Automation for Dependent Type Theory"; license = licenses.lgpl21; diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index 4e1f9e5f6662..a11bfb2c0db7 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -8,14 +8,14 @@ , coq , version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "coqide"; inherit version; inherit (coq) src; release."${coq.version}" = {}; - defaultVersion = if versions.isGe "8.14" coq.version then coq.version else null; + defaultVersion = if lib.versions.isGe "8.14" coq.version then coq.version else null; preConfigure = '' patchShebangs dev/tools/ diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index ac05af587253..cfba685e35fb 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,11 +1,11 @@ { which, lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coqprime"; owner = "thery"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } diff --git a/pkgs/development/coq-modules/coqtail-math/default.nix b/pkgs/development/coq-modules/coqtail-math/default.nix index a4f7ca405f71..b43cadb918e3 100644 --- a/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/pkgs/development/coq-modules/coqtail-math/default.nix @@ -1,12 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; - mkCoqDerivation { pname = "coqtail-math"; owner = "coq-community"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.15"; out = "8.14"; } { case = range "8.11" "8.13"; out = "20201124"; } ] null; @@ -15,7 +13,7 @@ mkCoqDerivation { release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; mlPlugin = true; - meta = { + meta = with lib; { license = licenses.lgpl3Only; maintainers = [ maintainers.siraben ]; }; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 09327f2ff76c..b6e2df653bec 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,12 +1,12 @@ { lib, mkCoqDerivation, autoconf, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coquelicot"; owner = "coquelicot"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } @@ -20,7 +20,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; - meta = { + meta = with lib; { homepage = "http://coquelicot.saclay.inria.fr/"; description = "A Coq library for Reals"; license = licenses.lgpl3; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index d019d4b4e55f..84bca53931cc 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -1,9 +1,9 @@ { lib, mkCoqDerivation, coq, bignums, math-classes, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "corn"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.6"; out = "8.8.1"; } { case = (range "8.11" "8.16"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } @@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec { propagatedBuildInputs = [ bignums math-classes ]; - meta = { + meta = with lib; { homepage = "http://c-corn.github.io/"; license = licenses.gpl2; description = "A Coq library for constructive analysis"; diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index f08e86ccc4f8..06e80f118bc0 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -1,14 +1,13 @@ { lib, mkCoqDerivation, coq, version ? null , ssreflect }: -with lib; mkCoqDerivation { pname = "deriving"; owner = "arthuraa"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "0.1.0"; } ] null; @@ -20,7 +19,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "Generic instances of MathComp classes"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index e24729465578..da26b0774d41 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,14 +1,13 @@ { lib, mkCoqDerivation, autoreconfHook, coq, version ? null }: -with lib; -let hasWarning = versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in +let hasWarning = lib.versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in mkCoqDerivation { pname = "dpdgraph"; owner = "Karmaki"; repo = "coq-dpdgraph"; inherit version; - defaultVersion = switch coq.coq-version [ + defaultVersion = lib.switch coq.coq-version [ { case = "8.16"; out = "1.0+8.16"; } { case = "8.15"; out = "1.0+8.15"; } { case = "8.14"; out = "1.0+8.14"; } @@ -47,11 +46,11 @@ mkCoqDerivation { # dpd_compute.ml uses deprecated Pervasives.compare # Versions prior to 0.6.5 do not have the WARN_ERR build flag - preConfigure = optionalString hasWarning '' + preConfigure = lib.optionalString hasWarning '' substituteInPlace Makefile.in --replace "-warn-error +a " "" ''; - buildFlags = optional hasWarning "WARN_ERR="; + buildFlags = lib.optional hasWarning "WARN_ERR="; preInstall = '' mkdir -p $out/bin @@ -59,7 +58,7 @@ mkCoqDerivation { extraInstallFlags = [ "BINDIR=$(out)/bin" ]; - meta = { + meta = with lib; { description = "Build dependency graphs between Coq objects"; license = licenses.lgpl21; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index ffe72ad330bc..5f38c4bbae24 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { +(mkCoqDerivation { pname = "equations"; owner = "mattam82"; repo = "Coq-Equations"; inherit version; - defaultVersion = switch coq.coq-version [ + defaultVersion = lib.switch coq.coq-version [ { case = "8.16"; out = "1.3+8.16"; } { case = "8.15"; out = "1.3+8.15"; } { case = "8.14"; out = "1.3+8.14"; } @@ -57,11 +57,11 @@ with lib; (mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { homepage = "https://mattam82.github.io/Coq-Equations/"; description = "A plugin for Coq to add dependent pattern-matching"; maintainers = with maintainers; [ jwiegley ]; }; }).overrideAttrs (o: { - preBuild = "coq_makefile -f _CoqProject -o Makefile${optionalString (versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq"}"; + preBuild = "coq_makefile -f _CoqProject -o Makefile${lib.optionalString (lib.versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq"}"; }) diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 2a038ff0c11a..b6345d7b0ac3 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -2,14 +2,13 @@ , ssreflect , deriving }: -with lib; (mkCoqDerivation { pname = "extructures"; owner = "arthuraa"; inherit version; - defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [ + defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.11" "8.16") (isGe "1.12.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } @@ -23,7 +22,7 @@ with lib; propagatedBuildInputs = [ ssreflect ]; - meta = { + meta = with lib; { description = "Finite data structures with extensional reasoning"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; @@ -31,5 +30,5 @@ with lib; }).overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs - ++ optional (versionAtLeast o.version "0.3.0") deriving; + ++ lib.optional (lib.versionAtLeast o.version "0.3.0") deriving; }) diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index d94dc03b6377..0a6375907e89 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -1,6 +1,6 @@ {lib, mkCoqDerivation, coq, python27, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "fiat"; owner = "mit-plv"; repo = "fiat"; @@ -29,6 +29,6 @@ with lib; mkCoqDerivation rec { meta = { homepage = "http://plv.csail.mit.edu/fiat/"; description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index ed973996feea..cf39c8211b78 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,12 +1,12 @@ { lib, bash, autoconf, automake, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "flocq"; owner = "flocq"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "4.1.0"; } { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } @@ -22,7 +22,7 @@ with lib; mkCoqDerivation { mlPlugin = true; useMelquiondRemake.logpath = "Flocq"; - meta = { + meta = with lib; { description = "A floating-point formalization for the Coq system"; license = licenses.lgpl3; maintainers = with maintainers; [ jwiegley ]; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 3615f5513a39..6548da52b9f7 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "fourcolor"; @@ -12,15 +11,15 @@ mkCoqDerivation { release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals="; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.11") (isGe "1.12") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } - { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } + { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Formal proof of the Four Color Theorem "; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index 5377600caba4..4f9e7a12e048 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -1,7 +1,7 @@ { lib, mkCoqDerivation, coq, hydra-battles, gaia, mathcomp-zify, mathcomp, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "gaia-hydras"; repo = "hydra-battles"; @@ -10,7 +10,7 @@ with lib; mkCoqDerivation rec { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [ + defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp.version] [ { cases = [ (range "8.14" "8.16") (isGe "1.12.0") ]; out = "0.6"; } { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; } ] null; @@ -23,7 +23,7 @@ with lib; mkCoqDerivation rec { useDune = true; - meta = { + meta = with lib; { description = "Comparison between ordinals in Gaia and Hydra battles"; longDescription = '' The Gaia and Hydra battles projects develop different notions of ordinals. diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index d4fa4a1da309..a2994dcc9b34 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, mathcomp, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "gaia"; release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5"; @@ -11,7 +11,7 @@ with lib; mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.15"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.algebra mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq"; maintainers = with maintainers; [ Zimmi48 ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 52e69e90d135..5a4b4b2a4d01 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,12 +1,12 @@ { which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "gappalib"; repo = "coq"; owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; + defaultVersion = if lib.versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM="; release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n"; @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ flocq ]; useMelquiondRemake.logpath = "Gappa"; - meta = { + meta = with lib; { description = "Coq support library for Gappa"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/goedel/default.nix b/pkgs/development/coq-modules/goedel/default.nix index 19efb786addf..1b16f8c3948a 100644 --- a/pkgs/development/coq-modules/goedel/default.nix +++ b/pkgs/development/coq-modules/goedel/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, hydra-battles, pocklington, version ? null }: -with lib; mkCoqDerivation { pname = "goedel"; @@ -11,13 +10,13 @@ mkCoqDerivation { release."8.13.0".sha256 = "0sqqkmj6wsk4xmhrnqkhcsbsrqjzn2gnk67nqzgrmjpw5danz8y5"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; - meta = { + meta = with lib; { description = "The Gödel-Rosser 1st incompleteness theorem in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index c2fca0a16a71..cbd919c7aa61 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,8 +1,6 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup , hierarchy-builder, version ? null }: -with lib; - mkCoqDerivation { pname = "graph-theory"; @@ -11,13 +9,13 @@ mkCoqDerivation { releaseRev = v: "v${v}"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.9"; } ] null; propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; - meta = { + meta = with lib; { description = "Library of formalized graph theory results in Coq"; longDescription = '' A library of formalized graph theory results, including various diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index c3a815eb5c87..fc96b2abf98c 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -5,13 +5,13 @@ let fetcher = {rev, repo, owner, sha256, domain, ...}: url = "https://${domain}/${owner}/${repo}/download/${repo}-${rev}.zip"; inherit sha256; }; in -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "heq"; repo = "Heq"; owner = "gil.hur"; domain = "sf.snu.ac.kr"; inherit version fetcher; - defaultVersion = if versions.isLt "8.8" coq.coq-version then "0.92" else null; + defaultVersion = if lib.versions.isLt "8.8" coq.coq-version then "0.92" else null; release."0.92".sha256 = "0cf8y6728n81wwlbpq3vi7l2dbzi7759klypld4gpsjjp1y1fj74"; mlPlugin = true; @@ -22,6 +22,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://ropas.snu.ac.kr/~gil.hur/Heq/"; description = "Heq : a Coq library for Heterogeneous Equality"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 4f319587de93..9bcc07387b1e 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, coq-elpi, version ? null }: -with lib; let hb = mkCoqDerivation { +let hb = mkCoqDerivation { pname = "hierarchy-builder"; owner = "math-comp"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.15" "8.16"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } @@ -25,16 +25,16 @@ with lib; let hb = mkCoqDerivation { extraInstallFlags = [ "VFILES=structures.v" ]; - meta = { + meta = with lib; { description = "High level commands to declare a hierarchy based on packed classes"; maintainers = with maintainers; [ cohencyril siraben ]; license = licenses.mit; }; }; in hb.overrideAttrs (o: - optionalAttrs (versions.isGe "1.2.0" o.version || o.version == "dev") + lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev") { buildPhase = "make build"; } // - optionalAttrs (versions.isGe "1.1.0" o.version || o.version == "dev") + lib.optionalAttrs (lib.versions.isGe "1.1.0" o.version || o.version == "dev") { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } ) diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix index 2729f7c21391..06798c5fcc29 100644 --- a/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/pkgs/development/coq-modules/hydra-battles/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, equations, LibHyps, version ? null }: -with lib; (mkCoqDerivation { pname = "hydra-battles"; @@ -11,14 +10,14 @@ with lib; releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; useDune = true; - meta = { + meta = with lib; { description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq"; longDescription = '' An exploration of some properties of Kirby and Paris' hydra @@ -33,5 +32,5 @@ with lib; }; }).overrideAttrs(o: let inherit (o) version; in { - propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version || version == "dev") LibHyps; + propagatedBuildInputs = [ equations ] ++ lib.optional (lib.versions.isGe "0.6" version || version == "dev") LibHyps; }) diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index a2a59e1ab22c..f72dd69f3617 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, stdpp, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "iris"; domain = "gitlab.mpi-sws.org"; owner = "iris"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "4.0.0"; } { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } @@ -26,7 +26,7 @@ with lib; mkCoqDerivation rec { fi ''; - meta = { + meta = with lib; { description = "The Coq development of the Iris Project"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index 1ffa37ec6c32..e2dfe98cf989 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { pname = "itauto"; @@ -11,7 +10,7 @@ mkCoqDerivation rec { release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9"; release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "8.16.0"; } { case = isEq "8.15"; out = "8.15.0"; } { case = isEq "8.14"; out = "8.14.0"; } @@ -22,7 +21,7 @@ mkCoqDerivation rec { nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); enableParallelBuilding = false; - meta = { + meta = with lib; { description = "A reflexive SAT solver parameterised by a leaf tactic and Nelson-Oppen support"; maintainers = with maintainers; [ siraben ]; license = licenses.gpl3Plus; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index c938a7ad0279..da2818429600 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, which, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "ltac2"; owner = "coq"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.10"; out = "0.3"; } { case = "8.9"; out = "0.2"; } { case = "8.8"; out = "0.1"; } @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "A robust and expressive tactic language for Coq"; maintainers = [ maintainers.vbgl ]; license = licenses.lgpl21; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index da708f87e477..d40dacd39380 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "math-classes"; inherit version; - defaultVersion = if versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null; + defaultVersion = if lib.versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null; release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425"; release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby"; release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw"; @@ -14,6 +14,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://math-classes.github.io"; description = "A library of abstract interfaces for mathematical structures in Coq."; - maintainers = with maintainers; [ siddharthist jwiegley ]; + maintainers = with lib.maintainers; [ siddharthist jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp-abel/default.nix b/pkgs/development/coq-modules/mathcomp-abel/default.nix index 43228252b55f..bae9266d4de1 100644 --- a/pkgs/development/coq-modules/mathcomp-abel/default.nix +++ b/pkgs/development/coq-modules/mathcomp-abel/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; - defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib; with versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.2.1"; } { cases = [ (range "8.10" "8.15") (range "1.12.0" "1.14.0") ]; out = "1.2.0"; } { cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; } diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index f4ae2afd3868..af37096a4fb1 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -1,14 +1,14 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, coq-elpi, mathcomp-zify, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "algebra-tactics"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.coq-version mathcomp-algebra.version ] [ + defaultVersion = with lib.versions; + lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } ] null; @@ -18,6 +18,6 @@ with lib; mkCoqDerivation { meta = { description = "Ring and field tactics for Mathematical Components"; - maintainers = with maintainers; [ cohencyril ]; + maintainers = with lib.maintainers; [ cohencyril ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index a42b551d1845..3e67675b5efb 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -21,7 +21,7 @@ let release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.5.3"; } { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } { cases = [ (isGe "8.13") (range "1.13" "1.14") ]; out = "0.5.1"; } @@ -40,7 +40,7 @@ let classical-deps = [ mathcomp.algebra mathcomp-finmap hierarchy-builder ]; analysis-deps = [ mathcomp.field mathcomp-bigenough ]; intra-deps = if package == "single" then [] - else map mathcomp_ (head (splitList (pred.equal package) packages)); + else map mathcomp_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "." else if package == "analysis" then "theories" else "${package}"; pname = if package == "single" then "mathcomp-analysis-single" diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 7804a61c9306..a4e4a1ecbb5c 100644 --- a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "bigenough"; @@ -11,7 +11,7 @@ with lib; mkCoqDerivation { "1.0.1".sha256 = "sha256:02f4dv4rz72liciwxb2k7acwx6lgqz4381mqyq5854p3nbyn06aw"; }; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.10" "8.16"; out = "1.0.1"; } { case = range "8.5" "8.14"; out = "1.0.0"; } ] null; @@ -20,6 +20,6 @@ with lib; mkCoqDerivation { meta = { description = "A small library to do epsilon - N reasonning"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 8c29208c3f63..551d33c9fadf 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -1,12 +1,12 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "finmap"; owner = "math-comp"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } @@ -33,6 +33,6 @@ with lib; mkCoqDerivation { meta = { description = "A finset and finmap library"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index aef912c6151c..b114a3f290d3 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -1,7 +1,7 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-bigenough, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "real-closed"; @@ -17,7 +17,7 @@ with lib; mkCoqDerivation { "1.0.1".sha256 = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; }; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; } @@ -37,6 +37,6 @@ with lib; mkCoqDerivation { meta = { description = "Mathematical Components Library on real closed fields"; - license = licenses.cecill-c; + license = lib.licenses.cecill-c; }; } diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 706ee0686922..19ecfcc384de 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -1,14 +1,15 @@ { coq, mkCoqDerivation, mathcomp-ssreflect, mathcomp-fingroup, lib, version ? null }@args: -with lib; mkCoqDerivation { + +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "tarjan"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.version mathcomp-ssreflect.version ] [{ + defaultVersion = with lib.versions; + lib.switch [ coq.version mathcomp-ssreflect.version ] [{ cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.0.0"; }] null; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; @@ -17,6 +18,6 @@ with lib; mkCoqDerivation { meta = { description = "Proofs of Tarjan and Kosaraju connected components algorithms"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index 5f34434b50f9..090cc4567c3b 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -1,6 +1,5 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "word"; @@ -15,13 +14,13 @@ mkCoqDerivation { release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "2.0"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Yet Another Coq Library on Machine Words"; maintainers = [ maintainers.vbgl ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index 1ac1d928738b..86dd239ebf73 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -1,14 +1,14 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-ssreflect, mathcomp-fingroup, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { namePrefix = [ "coq" "mathcomp" ]; pname = "zify"; repo = "mczify"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.coq-version mathcomp-algebra.version ] [ + defaultVersion = with lib.versions; + lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; @@ -19,6 +19,6 @@ with lib; mkCoqDerivation rec { meta = { description = "Micromega tactics for Mathematical Components"; - maintainers = with maintainers; [ cohencyril ]; + maintainers = with lib.maintainers; [ cohencyril ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 7be30844eb05..031536b7a6ef 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -18,7 +18,7 @@ let repo = "math-comp"; owner = "math-comp"; withDoc = single && (args.withDoc or false); - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "1.15.0"; } { case = range "8.11" "8.15"; out = "1.14.0"; } { case = range "8.11" "8.15"; out = "1.13.0"; } @@ -50,7 +50,7 @@ let mathcomp_ = package: let mathcomp-deps = if package == "single" then [] - else map mathcomp_ (head (splitList (pred.equal package) packages)); + else map mathcomp_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; pname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index ab036add60bb..9a22d82dd400 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -5,7 +5,7 @@ with builtins // lib; let repo = "metacoq"; owner = "MetaCoq"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with versions; lib.switch coq.coq-version [ { case = "8.11"; out = "1.0-beta2-8.11"; } { case = "8.12"; out = "1.0-beta2-8.12"; } # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3) @@ -34,7 +34,7 @@ let metacoq_ = package: let metacoq-deps = if package == "single" then [] - else map metacoq_ (head (splitList (pred.equal package) packages)); + else map metacoq_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "./" else "./${package}"; pname = if package == "all" then "metacoq" else "metacoq-${package}"; pkgallMake = '' diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 6072f9995c06..82d2a16f77ff 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "8.15"; } { case = range "8.10" "8.13"; out = "8.10"; } ] null; @@ -14,7 +14,7 @@ with lib; mkCoqDerivation { sourceRoot = "source/Metalib"; - meta = { + meta = with lib; { license = licenses.mit; maintainers = [ maintainers.jwiegley ]; }; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 57f4a381b204..19c6015ce928 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, lib, version ? null, useDune ? false }@args: -with lib; mkCoqDerivation { + mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "multinomials"; @@ -8,7 +8,7 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } @@ -31,7 +31,7 @@ with lib; mkCoqDerivation { "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - useDuneifVersion = v: versions.isGe "1.5.3" v || v == "dev"; + useDuneifVersion = v: lib.versions.isGe "1.5.3" v || v == "dev"; preConfigure = '' patchShebangs configure || true @@ -42,7 +42,7 @@ with lib; mkCoqDerivation { meta = { description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - license = licenses.cecill-c; + license = lib.licenses.cecill-c; }; } -// optionalAttrs (args?useDune) { inherit useDune; } +// lib.optionalAttrs (args?useDune) { inherit useDune; } diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index 066976e8b4b7..b6770aa633de 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "odd-order"; @@ -11,7 +10,7 @@ mkCoqDerivation { releaseRev = v: "mathcomp-odd-order.${v}"; inherit version; - defaultVersion = with versions; switch mathcomp.character.version [ + defaultVersion = with lib.versions; lib.switch mathcomp.character.version [ { case = (range "1.13.0" "1.15.0"); out = "1.14.0"; } { case = (range "1.12.0" "1.14.0"); out = "1.13.0"; } { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; } @@ -27,7 +26,7 @@ mkCoqDerivation { mathcomp.all ]; - meta = { + meta = with lib; { description = "Formal proof of the Odd Order Theorem"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 82b6079bb2da..4a471770e5ca 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "paco"; owner = "snu-sf"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.12" "8.16"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } @@ -27,6 +27,6 @@ with lib; mkCoqDerivation { meta = { homepage = "http://plv.mpi-sws.org/paco/"; description = "A Coq library implementing parameterized coinduction"; - maintainers = with maintainers; [ jwiegley ptival ]; + maintainers = with lib.maintainers; [ jwiegley ptival ]; }; } diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index e03f44320cf9..cc4966affcfd 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -1,9 +1,9 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "paramcoq"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.10" "8.16"; out = "1.1.3+coq${coq.coq-version}"; } { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } ] null; @@ -24,7 +24,7 @@ with lib; mkCoqDerivation { release."1.1.2+coq8.7".sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj"; releaseRev = v: "v${v}"; mlPlugin = true; - meta = { + meta = with lib; { description = "Coq plugin for parametricity"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index f764267d77e0..8a30fbeb961a 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }: -with lib; mkCoqDerivation { pname = "parsec"; @@ -11,14 +10,14 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189"; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; - meta = { + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.bsd3; maintainers = with maintainers; [ Zimmi48 ]; diff --git a/pkgs/development/coq-modules/pocklington/default.nix b/pkgs/development/coq-modules/pocklington/default.nix index 111bffeca2c9..a9e0d43a5a7a 100644 --- a/pkgs/development/coq-modules/pocklington/default.nix +++ b/pkgs/development/coq-modules/pocklington/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "pocklington"; @@ -9,11 +8,11 @@ mkCoqDerivation { release."8.12.0".sha256 = "sha256-0xBrw9+4g14niYdNqp0nx00fPJoSSnaDSDEaIVpPfjs="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isGe "8.7"; out = "8.12.0"; } ] null; - meta = { + meta = with lib; { description = "Pocklington's criterion for primality in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index 2d83cbfd883f..44e938e16dbd 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { pname = "reglang"; @@ -9,14 +8,14 @@ mkCoqDerivation { release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.1.2"; } ] null; propagatedBuildInputs = [ ssreflect ]; - meta = { + meta = with lib; { description = "Regular Language Representations in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/relation-algebra/default.nix b/pkgs/development/coq-modules/relation-algebra/default.nix index d2124d56f3f5..c8fb6982b84e 100644 --- a/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/pkgs/development/coq-modules/relation-algebra/default.nix @@ -1,12 +1,11 @@ { lib, mkCoqDerivation, coq, aac-tactics, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "relation-algebra"; owner = "damien-pous"; releaseRev = v: - if versions.isGe "1.7.6" v + if lib.versions.isGe "1.7.6" v then "v.${v}" else "v${v}"; @@ -20,7 +19,7 @@ mkCoqDerivation { release."1.7.1".sha256 = "sha256-WWVMcR6z8rT4wzZPb8SlaVWGe7NC8gScPqawd7bltQA="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "1.7.8"; } { case = isEq "8.15"; out = "1.7.7"; } { case = isEq "8.14"; out = "1.7.6"; } @@ -35,7 +34,7 @@ mkCoqDerivation { propagatedBuildInputs = [ aac-tactics mathcomp.ssreflect ]; - meta = { + meta = with lib; { description = "Relation algebra library for Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.gpl3Plus; diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index ecbef5b92fea..468be219d0d7 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { pname = "semantics"; @@ -15,7 +14,7 @@ mkCoqDerivation rec { release."8.6.0".sha256 = "sha256-GltkGQ3tJqUPAbdDkqqvKLLhMOap50XvGaCkjshiNdY="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "8.14.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -34,7 +33,7 @@ mkCoqDerivation rec { done ''; - meta = { + meta = with lib; { description = "A survey of programming language semantics styles in Coq"; longDescription = '' A survey of semantics styles in Coq, from natural semantics through diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index e3ec9bfdc39a..27641f4f5a99 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -17,7 +17,7 @@ in inherit version release; defaultVersion = with versions; - switch coq.version [ + lib.switch coq.version [ { case = isEq "8.16"; out = "8.16.0+0.16.0"; } { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index f9fe909d8caa..509ce57c5cff 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -1,11 +1,11 @@ { lib, callPackage, mkCoqDerivation, coq, coq-ext-lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "simple-io"; owner = "Lysxia"; repo = "coq-simple-io"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "1.7.0"; } { case = range "8.7" "8.13"; out = "1.3.0"; } ] null; @@ -21,7 +21,7 @@ with lib; mkCoqDerivation { passthru.tests.HelloWorld = callPackage ./test.nix {}; - meta = { + meta = with lib; { description = "Purely functional IO for Coq"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/smpl/default.nix b/pkgs/development/coq-modules/smpl/default.nix index f03065cf0450..2ba755dd42d0 100644 --- a/pkgs/development/coq-modules/smpl/default.nix +++ b/pkgs/development/coq-modules/smpl/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "smpl"; @@ -13,7 +12,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = isEq "8.15"; out = "8.15"; } { case = isEq "8.14"; out = "8.14"; } { case = "8.13.2"; out = "8.13"; } @@ -23,7 +22,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "A Coq plugin providing an extensible tactic similar to first"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index 89a6abd2b1ac..49c4348b9af5 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, gcc10StdenvCompat, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }: -with lib; let # version of veriT that works with SMTCoq @@ -23,7 +22,7 @@ mkCoqDerivation { release."2021-09-17".sha256 = "sha256-bF7ES+tXraaAJwVEwAMx3CUESpNlAUerQjr4d2eaGJQ="; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = isEq "8.13"; out = "2021-09-17"; } ] null; @@ -34,7 +33,7 @@ mkCoqDerivation { # This is meant to ease future troubleshooting of cvc4 build failures passthru = { inherit cvc4; }; - meta = { + meta = with lib; { description = "Communication between Coq and SAT/SMT solvers "; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 19b72c4e948c..d20b63732141 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "stdpp"; inherit version; domain = "gitlab.mpi-sws.org"; owner = "iris"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "1.8.0"; } { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } @@ -24,7 +24,7 @@ with lib; mkCoqDerivation rec { fi ''; - meta = { + meta = with lib; { description = "An extended “Standard Library” for Coq"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 79d3ce2d7a04..8ded1abeb146 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { +(mkCoqDerivation { pname = "tlc"; owner = "charguer"; inherit version; displayVersion = { tlc = false; }; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "20211215"; } { case = range "8.12" "8.13"; out = "20210316"; } { case = range "8.10" "8.12"; out = "20200328"; } @@ -16,14 +16,14 @@ with lib; (mkCoqDerivation { release."20200328".sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx"; release."20181116".sha256 = "032lrbkxqm9d3fhf6nv1kq2z0mqd3czv3ijlbsjwnfh12xck4vpl"; - meta = { + meta = with lib; { homepage = "http://www.chargueraud.org/softs/tlc/"; description = "A non-constructive library for Coq"; license = licenses.free; maintainers = [ maintainers.vbgl ]; }; }).overrideAttrs (x: - if versionAtLeast x.version "20210316" + if lib.versionAtLeast x.version "20210316" then {} else { installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index 71849c50ae9e..de73fbadbf05 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp, zorns-lemma, version ? null }: -with lib; mkCoqDerivation rec { pname = "topology"; @@ -15,7 +14,7 @@ mkCoqDerivation rec { release."8.6.0".sha256 = "sha256-eu/dBEFo3y6vnXlJljUD4hds6+qgAPQVvsuspyGHcj8="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -25,9 +24,9 @@ mkCoqDerivation rec { propagatedBuildInputs = [ zorns-lemma ]; - useDuneifVersion = versions.isGe "9.0"; + useDuneifVersion = lib.versions.isGe "9.0"; - meta = { + meta = with lib; { description = "General topology in Coq"; longDescription = '' This library develops some of the basic concepts and results of diff --git a/pkgs/development/coq-modules/trakt/default.nix b/pkgs/development/coq-modules/trakt/default.nix index f10e69cc4e90..8bc7581489c3 100644 --- a/pkgs/development/coq-modules/trakt/default.nix +++ b/pkgs/development/coq-modules/trakt/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, coq-elpi, version ? null }: -with lib; mkCoqDerivation { pname = "trakt"; @@ -9,13 +8,13 @@ mkCoqDerivation { release."1.0".sha256 = "sha256-Qhw5fWFYxUFO2kIWWz/og+4fuy9aYG27szfNk3IglhY="; inherit version; - defaultVersion = with versions; switch [ coq.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version ] [ { cases = [ (range "8.13" "8.16") ]; out = "1.0"; } ] null; propagatedBuildInputs = [ coq-elpi ]; - meta = { + meta = with lib; { description = "A generic goal preprocessing tool for proof automation tactics in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix index dedb58b59356..19696bd81d4f 100644 --- a/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { pname = "zorns-lemma"; @@ -16,7 +15,7 @@ with lib; release."8.5.0".sha256 = "sha256-mH/v02ObMjbVPYx2H+Jhz+Xp0XRKN67iMAdA1VNFzso="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -25,9 +24,9 @@ with lib; { case = "8.5"; out = "8.5.0"; } ] null; - useDuneifVersion = versions.isGe "9.0"; + useDuneifVersion = lib.versions.isGe "9.0"; - meta = { + meta = with lib; { description = "Development of basic set theory"; longDescription = '' This Coq library develops some basic set theory. The main @@ -37,4 +36,4 @@ with lib; maintainers = with maintainers; [ siraben ]; license = licenses.lgpl21Plus; }; -}).overrideAttrs({version, ...}: if versions.isGe "9.0" version then { repo = "topology"; } else {}) +}).overrideAttrs({version, ...}: if lib.versions.isGe "9.0" version then { repo = "topology"; } else {}) From 185ea78a2a0e6e6ed4128773d93cb698e162e6d6 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Sun, 22 Jan 2023 02:39:43 +0100 Subject: [PATCH 25/87] satysfi: rewrite with buildDunePackage --- pkgs/tools/typesetting/satysfi/default.nix | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index ee73c735d871..16fe6c579c0a 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ruby, dune_3, ocamlPackages +{ lib, stdenv, fetchFromGitHub, ruby, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let @@ -34,7 +34,7 @@ let inherit (ocamlPackages.yojson) meta; }; in - stdenv.mkDerivation rec { + ocamlPackages.buildDunePackage rec { pname = "satysfi"; version = "0.0.8"; src = fetchFromGitHub { @@ -51,23 +51,24 @@ in $out/share/satysfi ''; - DUNE_PROFILE = "release"; + duneVersion = "3"; - nativeBuildInputs = [ ruby dune_3 ]; + nativeBuildInputs = with ocamlPackages; [ menhir cppo ]; buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [ - ocaml findlib menhir menhirLib - batteries camlimages core_kernel ppx_deriving uutf omd cppo re + menhirLib + batteries camlimages core_kernel ppx_deriving uutf omd re ]); - installPhase = '' - cp -r ${ipaexfont}/share/fonts/opentype/* lib-satysfi/dist/fonts/ - cp -r ${junicode}/share/fonts/junicode-ttf/* lib-satysfi/dist/fonts/ - cp -r ${lmodern}/share/fonts/opentype/public/lm/* lib-satysfi/dist/fonts/ - cp -r ${lmmath}/share/fonts/opentype/latinmodern-math.otf lib-satysfi/dist/fonts/ - make install PREFIX=$out LIBDIR=$out/share/satysfi - mkdir -p $out/share/satysfi/ + postInstall = '' + mkdir -p $out/share/satysfi/dist/fonts cp -r lib-satysfi/dist/ $out/share/satysfi/ + cp -r \ + ${ipaexfont}/share/fonts/opentype/* \ + ${junicode}/share/fonts/junicode-ttf/* \ + ${lmodern}/share/fonts/opentype/public/lm/* \ + ${lmmath}/share/fonts/opentype/latinmodern-math.otf \ + $out/share/satysfi/dist/fonts ''; meta = with lib; { From 5a79781dc6db305055b2c348e9d47a5fb6b0af5d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Jan 2023 23:20:00 -0500 Subject: [PATCH 26/87] nimPackages.asynctools: init at 2021-07-06 --- .../nim-packages/asynctools/default.nix | 20 +++++++++++++++++++ pkgs/top-level/nim-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/nim-packages/asynctools/default.nix diff --git a/pkgs/development/nim-packages/asynctools/default.nix b/pkgs/development/nim-packages/asynctools/default.nix new file mode 100644 index 000000000000..54893d00a980 --- /dev/null +++ b/pkgs/development/nim-packages/asynctools/default.nix @@ -0,0 +1,20 @@ +{ lib, buildNimPackage, fetchFromGitHub, astpatternmatching }: + +buildNimPackage rec { + pname = "asynctools"; + version = "unstable-2021-07-06"; + + src = fetchFromGitHub { + owner = "cheatfate"; + repo = "asynctools"; + rev = "84ced6d002789567f2396c75800ffd6dff2866f7"; + hash = "sha256-mrO+WeSzCBclqC2UNCY+IIv7Gs8EdTDaTeSgXy3TgNM="; + }; + + meta = with lib; { + description = "Various asynchronous tools for Nim language"; + homepage = "https://github.com/cheatfate/asynctools"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index ca52d7f52b56..67863c3ac06d 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -14,6 +14,8 @@ lib.makeScope newScope (self: astpatternmatching = callPackage ../development/nim-packages/astpatternmatching { }; + asynctools = callPackage ../development/nim-packages/asynctools { }; + base32 = callPackage ../development/nim-packages/base32 { }; bumpy = callPackage ../development/nim-packages/bumpy { }; From a7faa78c011baf18d709ca2d5537deade7fc9940 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Jan 2023 04:20:00 +0000 Subject: [PATCH 27/87] millet: 0.7.0 -> 0.7.4 --- pkgs/development/tools/language-servers/millet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 66983ea8a49d..34e8311800e4 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.7.0"; + version = "0.7.4"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-qjwnHFJpgDVaiSF3rKkyEbhIG4QbMOUrN1rnc9MnKU0="; + hash = "sha256-YTONlTE9cTl0O7EHRVhrPtuGgIUdX8mvdWu352uHbCE="; }; - cargoHash = "sha256-efVnO9hNIEiAzOK0mkPMNrWlWHYEWwV2HWac8jBxW5k="; + cargoHash = "sha256-U2bbZZCeY7/Jp7AuAKYcZzDIpIxGbNJrmr2Sr2CMr2A="; postPatch = '' rm .cargo/config.toml From a11ea1e408f48efe7f4fd6386ed0f481ea0a06f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid-Menc=C3=ADa?= Date: Sat, 21 Jan 2023 23:21:00 -0500 Subject: [PATCH 28/87] nimlsp: 0.4.1 -> 0.4.3 --- pkgs/development/tools/misc/nimlsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix index af4ed6977b19..9c6505b3abd5 100644 --- a/pkgs/development/tools/misc/nimlsp/default.nix +++ b/pkgs/development/tools/misc/nimlsp/default.nix @@ -2,17 +2,17 @@ nimPackages.buildNimPackage rec { pname = "nimlsp"; - version = "0.4.1"; + version = "0.4.4"; nimBinOnly = true; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${version}"; - sha256 = "sha256-LAtUGhYEcOwvZzexQ2y3/HPgOge2EsScCbujJ/hz5Ec="; + sha256 = "sha256-Z67iKlL+dnRbxdFt/n/fsUcb2wpZwzPpL/G29jfCaMY="; }; - buildInputs = with nimPackages; [ jsonschema ]; + buildInputs = with nimPackages; [ jsonschema asynctools ]; nimFlags = [ "--threads:on" From b0c69069f15677e939423465cc3040f88612efef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 09:33:22 +0000 Subject: [PATCH 29/87] filezilla: 3.61.0 -> 3.62.2 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 49f2aaa37e9c..287e83ffa050 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.61.0"; + version = "3.62.2"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-Cv7w5NolICaHsy7Wsf/NhELVs1vc0W308Cuy6pLimfc="; + hash = "sha256-p2cJY1yg6kdPaR9sYLGRM0rzB57xksB8NGUEuqtzjBI="; }; configureFlags = [ From e6c17d8808efec0eb8a4aa28d75a8142f00d6b4d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 20 Jan 2023 01:22:33 +0000 Subject: [PATCH 30/87] zziplib: broaden platforms Builds fine for FreeBSD and NetBSD. The use of Python's platforms comes from f2b30a1bf77 ("Zziplib: Build only where Python is supported."), from way before Nixpkgs supported cross compilation. (Python is a native build input.) Now that we do support cross compilation, we shouldn't couple the platforms of a package to one of its native build inputs like this. --- pkgs/development/libraries/zziplib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 90758db16edd..c4c20f207a41 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ lgpl2Plus mpl11 ]; maintainers = with maintainers; [ AndersonTorres ]; - platforms = python3.meta.platforms; + platforms = platforms.unix; }; } From feaf1a72bc088afc0aec83f1e1a1a503c60303e1 Mon Sep 17 00:00:00 2001 From: novenary Date: Sun, 22 Jan 2023 18:38:06 +0200 Subject: [PATCH 31/87] htop: enable extra features --- pkgs/tools/system/htop/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index cb79607ebbf8..305761e0c3be 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,6 +1,8 @@ -{ lib, fetchFromGitHub, stdenv, autoreconfHook +{ lib, fetchFromGitHub, stdenv, autoreconfHook, pkg-config , ncurses , IOKit +, libcap +, libnl , sensorsSupport ? stdenv.isLinux, lm_sensors , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: @@ -18,15 +20,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-MwtsvdPHcUdegsYj9NGyded5XJQxXri1IM1j4gef1Xk="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optional stdenv.isLinux pkg-config + ; buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin IOKit + ++ lib.optionals stdenv.isLinux [ libcap libnl ] ++ lib.optional sensorsSupport lm_sensors ++ lib.optional systemdSupport systemd ; configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" ] + ++ lib.optionals stdenv.isLinux [ + "--enable-affinity" + "--enable-capabilities" + "--enable-delayacct" + ] ++ lib.optional sensorsSupport "--with-sensors" ; From 2e49ab3319a5e3cfdb0921cf513f89cff33e48bb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 21 Jan 2023 20:28:21 -0300 Subject: [PATCH 32/87] zsnes2: init at 2.0.10 --- pkgs/applications/emulators/zsnes/2.x.nix | 63 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/emulators/zsnes/2.x.nix diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix new file mode 100644 index 000000000000..fdb4ad9fa139 --- /dev/null +++ b/pkgs/applications/emulators/zsnes/2.x.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL +, libGL +, libGLU +, libpng +, nasm +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zsnes2"; + version = "2.0.10"; + + src = fetchFromGitHub { + owner = "xyproto"; + repo = "zsnes"; + rev = finalAttrs.version; + hash = "sha256-QFPl3I2nFWMmgQRGxrlt4Vh5N4SygvBLjeFiQpgRr8o="; + }; + + nativeBuildInputs = [ + nasm + pkg-config + ]; + + buildInputs = [ + SDL + libGL + libGLU + libpng + zlib + ]; + + dontConfigure = true; + + NIX_CFLAGS_COMPILE = [ + # Until upstream fixes the issues... + "-Wp,-D_FORTIFY_SOURCE=0" + ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + postInstall = '' + install -Dm644 linux/zsnes.desktop $out/share/applications/zsnes.desktop + install -Dm644 icons/16x16x32.png $out/share/icons/hicolor/16x16/apps/zsnes.png + install -Dm644 icons/32x32x32.png $out/share/icons/hicolor/32x32/apps/zsnes.png + install -Dm644 icons/48x48x32.png $out/share/icons/hicolor/48x48/apps/zsnes.png + install -Dm644 icons/64x64x32.png $out/share/icons/hicolor/64x64/apps/zsnes.png + ''; + + meta = { + homepage = "https://github.com/xyproto/zsnes"; + description = "A maintained fork of zsnes"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fc6d073d097..23e78742890d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2191,6 +2191,7 @@ with pkgs; zesarux = callPackage ../applications/emulators/zesarux { }; zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; + zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; ### APPLICATIONS/EMULATORS/BSNES From e83911bd90ca08959c561d86dcd241877111f305 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 22 Jan 2023 22:31:33 -0300 Subject: [PATCH 33/87] setconf: init at 0.7.7 --- pkgs/tools/misc/setconf/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/setconf/default.nix diff --git a/pkgs/tools/misc/setconf/default.nix b/pkgs/tools/misc/setconf/default.nix new file mode 100644 index 000000000000..fdb80bfb25ba --- /dev/null +++ b/pkgs/tools/misc/setconf/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +}: + +buildPythonApplication rec { + pname = "setconf"; + version = "0.7.7"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "xyproto"; + repo = "setconf"; + rev = version; + hash = "sha256-HYZdDtDlGrT3zssDdMW3559hhC+cPy8qkmM8d9zEa1A="; + }; + + meta = { + homepage = "https://github.com/xyproto/setconf"; + description = "A small utility for changing settings in configuration textfiles"; + changelog = "https://github.com/xyproto/setconf/releases/tag/${version}"; + maintainers = [ lib.maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fc6d073d097..5a4f30e0084a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32399,6 +32399,8 @@ with pkgs; secretscanner = callPackage ../tools/security/secretscanner { }; + setconf = python3.pkgs.callPackage ../tools/misc/setconf { }; + semiphemeral = callPackage ../tools/misc/semiphemeral { }; semver = callPackage ../applications/misc/semver { }; From d6be2359f2b5d3ff4851c0f4cc26f88347b9c4fc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 20 Jan 2023 15:31:29 +0100 Subject: [PATCH 34/87] invidious: unstable-2023-01-10 -> unstable-2023-01-22 --- pkgs/servers/invidious/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 005627dd7e9d..c1abe663ea90 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "05258d56bdc3f4de1f0da0c0dbd2d540f68cbdd5", - "sha256": "sha256-5vA9LCtHgXj7Pn5U/oLDKnwR/ZNtayl2QBA9jkzs98E=", - "version": "unstable-2023-01-10" + "rev": "dbee027ed9b568469815b319332e029964bff7fb", + "sha256": "sha256-M0m3JtA9Qx5ZpgNujeUBC/7TVES9dKLEr5pKgn8l1cM=", + "version": "unstable-2023-01-22" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", From 6e873de5b87e33043c02c2f77291c167e09be829 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 23 Jan 2023 16:50:38 +0800 Subject: [PATCH 35/87] monitor: 0.14.0 -> 0.15.0 https://github.com/stsdc/monitor/compare/0.14.0...0.15.0 --- pkgs/applications/system/monitor/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 84596f6d9382..db7a37e2be34 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -8,9 +8,11 @@ , pkg-config , pantheon , python3 +, curl , gettext , glib , gtk3 +, json-glib , libwnck , libgee , libgtop @@ -25,13 +27,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-dw1FR9nU8MY6LBL3sF942azeSgKmCntXCk4+nhMb4Wo="; + sha256 = "sha256-w4c9rVO54mrjUX2iRxUQ7PHqE+8D+BqBgHMK2X9nI0g="; fetchSubmodules = true; }; @@ -46,8 +48,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + curl glib gtk3 + json-glib pantheon.granite pantheon.wingpanel libgee @@ -72,6 +76,11 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py + + # Alternatively, using pkg-config here should just work. + substituteInPlace meson.build --replace \ + "meson.get_compiler('c').find_library('libcurl', dirs: vapidir)" \ + "meson.get_compiler('c').find_library('libcurl', dirs: '${curl.out}/lib')" ''; passthru = { From 5e77fe111dccbaaf86290bedacba12c52f5f4fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 23 Jan 2023 12:42:20 +0000 Subject: [PATCH 36/87] polkadot: 0.9.36 -> 0.9.37 --- pkgs/applications/blockchains/polkadot/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 1f5636dd41c3..024e3142530a 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,17 @@ , stdenv , writeShellScriptBin , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.36"; + version = "0.9.37"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-HzQFlnn+SPasI0g0DYDCRoFCMVyxlUmEQAobvzRnAW4="; + hash = "sha256-/mgJNjliPUmMkhT/1oiX9+BJHfY3SMsKfFv9HCyWRQQ="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,9 +33,9 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-P31GW/1HiaZLF6e8Fq1YnH1ZLhiOhURm8st9a4KRlJU="; + cargoHash = "sha256-o+APFYKgA3zjQSGrkpnyf5LEBBqvZtcfWlzCk6nL02A="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97c76b591fe6..34d97af89a34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34301,7 +34301,7 @@ with pkgs; openethereum = callPackage ../applications/blockchains/openethereum { }; polkadot = callPackage ../applications/blockchains/polkadot { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; particl-core = callPackage ../applications/blockchains/particl-core { }; From 4073bd40f7b9936ea43f3b3a7b4f854c752836a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 13:57:05 +0000 Subject: [PATCH 37/87] netbird: 0.11.6 -> 0.12.0 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index cc05f5381706..c1becc886a59 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.11.6"; + version = "0.12.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q86GVCRppBU9qiCch0sjTnSsjl17xU5l3o72cBF3zZo="; + sha256 = "sha256-ajfNHkdYNJCuDhFmww1X0d9F0dmo2/h0GlfLYWvTHKc="; }; - vendorSha256 = "sha256-TfHBvcG3e+yjifPVo0ZgcvLvD16fni4m71nCr4cCBD4="; + vendorHash = "sha256-3uEcb0nVHrfHZTZ/j/9l6zR1zMfLR0mVaN/Hydyam4Q="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 1a6ed8a339697352bbf7c974a9b2c89051a82545 Mon Sep 17 00:00:00 2001 From: SnIcK Date: Thu, 19 Jan 2023 11:59:35 -0600 Subject: [PATCH 38/87] create $out/sbin symlink to $out/bin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit looks like common practice is to put a $out/sbin symlink to $out/bin. the `fxload` command was not available if only puts on $out/sbin. This will fix it. The real issue I observed was that there was no `/run/current-system/sw/sbin` on $PATH but i think there is a fundamental reason why it doesn’t exist hence this patch until i learn more. --- pkgs/os-specific/linux/fxload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 3c5443f3432f..e8b9d0648bd8 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { # fxload binary exist inside the `examples/bin` directory of `libusb1` postFixup = '' - mkdir -p $out/sbin - ln -s ${passthru.libusb}/examples/bin/fxload $out/sbin/fxload + mkdir -p $out/bin + ln -s ${passthru.libusb}/examples/bin/fxload $out/bin/fxload ''; passthru.libusb = libusb1.override { withExamples = true; }; From 35424a99fd388905fc1cfb74c5c3ac9a67a1bc83 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 Jan 2023 15:55:58 +0000 Subject: [PATCH 39/87] nbd: remove NIX_LDFLAGS hack There is no Linux libc supported by Nixpkgs where these are separate libraries any more. (They're empty stubs.) --- pkgs/tools/networking/nbd/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 66b27062043a..c60177065278 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -25,11 +25,6 @@ stdenv.mkDerivation rec { test = nixosTests.nbd; }; - # Glib calls `clock_gettime', which is in librt. Linking that library - # here ensures that a proper rpath is added to the executable so that - # it can be loaded at run-time. - NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lrt -lpthread"; - meta = { homepage = "https://nbd.sourceforge.io/"; description = "Map arbitrary files as block devices over the network"; From 7214894d3e86ffeec7df3c80abee8ba3668eae30 Mon Sep 17 00:00:00 2001 From: Roman Gonzalez Date: Wed, 11 Jan 2023 12:57:45 -0800 Subject: [PATCH 40/87] docs: add maintainer roman --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3f534813908c..ffb356c38667 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12235,6 +12235,12 @@ githubId = 710906; name = "Roel van Dijk"; }; + roman = { + email = "open-source@roman-gonzalez.info"; + github = "roman"; + githubId = 7335; + name = "Roman Gonzalez"; + }; romildo = { email = "malaquias@gmail.com"; github = "romildo"; From 5873421888a27c061dc7a77ed17495f285cb958e Mon Sep 17 00:00:00 2001 From: Roman Gonzalez Date: Wed, 11 Jan 2023 12:58:07 -0800 Subject: [PATCH 41/87] locate-dominating-file: init 0.0.1 --- .../misc/locate-dominating-file/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/tools/misc/locate-dominating-file/default.nix diff --git a/pkgs/tools/misc/locate-dominating-file/default.nix b/pkgs/tools/misc/locate-dominating-file/default.nix new file mode 100644 index 000000000000..8932b6f62259 --- /dev/null +++ b/pkgs/tools/misc/locate-dominating-file/default.nix @@ -0,0 +1,56 @@ +{ bats +, bash +, fetchFromGitHub +, lib +, stdenvNoCC +, getopt +}: +let + version = "0.0.1"; +in +stdenvNoCC.mkDerivation { + pname = "locate-dominating-file"; + inherit version; + src = fetchFromGitHub { + owner = "roman"; + repo = "locate-dominating-file"; + rev = "v${version}"; + sha256 = "sha256-gwh6fAw7BV7VFIkQN02QIhK47uxpYheMk64UeLyp2IY="; + }; + + doCheck = true; + + postPatch = '' + for file in $(find src tests -type f); do + patchShebangs "$file" + done + ''; + + buildInputs = [ getopt ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp src/locate-dominating-file.sh $out/bin/locate-dominating-file + + runHook postInstall + ''; + + checkInputs = [ (bats.withLibraries (p: [ p.bats-support p.bats-assert ])) ]; + + checkPhase = '' + runHook preCheck + + bats -t tests + + runHook postCheck + ''; + + meta = with lib; { + description = "Program that looks up in a directory hierarchy for a given filename"; + license = licenses.mit; + maintainers = [ maintainers.roman ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc604ffd5989..b8a2daebc8db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38682,6 +38682,8 @@ with pkgs; tuner = callPackage ../applications/audio/tuner { }; + locate-dominating-file = callPackage ../tools/misc/locate-dominating-file { }; + jfrog-cli = callPackage ../tools/misc/jfrog-cli { }; ov = callPackage ../tools/text/ov { }; From 5234f4ce9340fffb705b908fff4896faeddb8a12 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Sun, 22 Jan 2023 17:36:31 +0100 Subject: [PATCH 42/87] dotnet-sdk_5: remove package It's EOL and not used in nixpkgs anymore --- doc/languages-frameworks/dotnet.section.md | 6 +- .../from_md/release-notes/rl-2305.section.xml | 7 + .../manual/release-notes/rl-2305.section.md | 2 + pkgs/development/compilers/dotnet/default.nix | 10 +- .../compilers/dotnet/versions/5.0.nix | 137 ------------------ pkgs/top-level/all-packages.nix | 2 - 6 files changed, 17 insertions(+), 147 deletions(-) delete mode 100644 pkgs/development/compilers/dotnet/versions/5.0.nix diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index bfb193b1f021..30a12d4e8ffa 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -28,13 +28,13 @@ mkShell { packages = [ (with dotnetCorePackages; combinePackages [ sdk_3_1 - sdk_5_0 + sdk_6_0 ]) ]; } ``` -This will produce a dotnet installation that has the dotnet 3.1, 3.0, and 2.1 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: +This will produce a dotnet installation that has the dotnet 3.1 6.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: ```ShellSession $ dotnet --info @@ -120,7 +120,7 @@ in buildDotnetModule rec { projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.net_5_0; + dotnet-runtime = dotnetCorePackages.net_6_0; executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. executables = []; # Don't install any executables. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 60c5fdaa5a88..110dbea3a11d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -372,6 +372,13 @@ freetype and others. + + + .NET 5.0 was removed due to being end-of-life, use a newer, + supported .NET version - + https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core + +
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 0bf1ad38eb01..477e52e0e6f3 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -91,6 +91,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of its constitutents: `xorg.libX11`, `freetype` and others. +- .NET 5.0 was removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core + ## Other Notable Changes {#sec-release-23.05-notable-changes} diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index c2cb6eb37823..fddcbcea466b 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -28,7 +28,6 @@ let ## Files in versions/ are generated automatically by update.sh ## dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); - dotnet_5_0 = import ./versions/5.0.nix (buildAttrs // { inherit icu; }); dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; }); dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; }); in @@ -38,7 +37,8 @@ rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; -} // dotnet_3_1 // dotnet_5_0 // dotnet_6_0 // dotnet_7_0 + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; +} // dotnet_3_1 // dotnet_6_0 // dotnet_7_0 diff --git a/pkgs/development/compilers/dotnet/versions/5.0.nix b/pkgs/development/compilers/dotnet/versions/5.0.nix deleted file mode 100644 index 64da95920d5a..000000000000 --- a/pkgs/development/compilers/dotnet/versions/5.0.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: - -# v5.0 (eol) -{ - aspnetcore_5_0 = buildAspNetCore { - inherit icu; - version = "5.0.17"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2b96f83-e22a-4fa6-a10e-709b3effac9a/0d6ade6c0ceebc8ef7dbf2b1a6d86f17/aspnetcore-runtime-5.0.17-linux-x64.tar.gz"; - sha512 = "d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6eb8aee2-cbea-4c4f-9bb9-ea6229ec229b/d6c438e5071c359ad995134f0a33e731/aspnetcore-runtime-5.0.17-linux-arm64.tar.gz"; - sha512 = "ac1a9d89f1b730dfdca9c2e48373ef21f8f9316014eefbe6b11516f8195d3b3efc4e482883774b74ea2ff1cb77174a2cb471bd1157ab5b7d71621e3026c38e9b"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/25e4817f-6fd0-46dc-be0d-d819445bac5c/a8fa228c872df683741c8a79745f8fb3/aspnetcore-runtime-5.0.17-osx-x64.tar.gz"; - sha512 = "bb0c43c723090fa2d8a0255e6fc8c004ebe7baf2d5d56e22ad2e6336a67fe415333d451e459c8857c0ccb5819d998232c9617bf45f222559d4b8891b0af41f20"; - }; - }; - }; - - runtime_5_0 = buildNetRuntime { - inherit icu; - version = "5.0.17"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e77438f6-865f-45e0-9a52-3e4b04aa609f/024a880ed4bfbfd3b9f222fec0b6aaff/dotnet-runtime-5.0.17-linux-x64.tar.gz"; - sha512 = "a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6690730f-cf10-40f1-9d4d-4c0d002f22d0/e117133858f190c169873200b8d7b9d7/dotnet-runtime-5.0.17-linux-arm64.tar.gz"; - sha512 = "99cb11871924d3abedcc9c8079c54bc0c550203c7cbe4e349ed70d4355f40e4620b68d90b797e6461d898c06bed6953580e2cd4ad01483e5de107ca5a3409610"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/39326cf0-dc7f-42a3-9f7a-fe30c75c7a7f/33cbce552148e13d47120fe4502f5b5e/dotnet-runtime-5.0.17-osx-x64.tar.gz"; - sha512 = "31add512418640f98bc9511509db2049a2674c7725169d26be89218a02ac7972e03e5d6be5a3d45a0dfa764e6eade503a8f4957b7b198ec6ad412e423d95f1b9"; - }; - }; - }; - - sdk_5_0 = buildNetSdk { - inherit icu; - version = "5.0.408"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/904da7d0-ff02-49db-bd6b-5ea615cbdfc5/966690e36643662dcc65e3ca2423041e/dotnet-sdk-5.0.408-linux-x64.tar.gz"; - sha512 = "abbf22c420df2d8398d1616efa3d31e1b8f96130697746c45ad68668676d12e65ec3b4dd75f28a5dc7607da58b6e369693c0e658def15ce2431303c28e99db55"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4b71fac-a2fd-4516-ac58-100fb09d796a/e79d6c2a8040b59bf49c0d167ae70a7b/dotnet-sdk-5.0.408-linux-arm64.tar.gz"; - sha512 = "50f23d7aca91051d8b7c37f1a76b1eb51e6fe73e017d98558d757a6b9699e4237d401ce81515c1601b8c21eb62fee4e0b4f0bbed8967eefa3ceba75fc242f01b"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4aeecc7c-7ffa-418f-9362-cf5eb3ed0396/055d5e6064a9fdecd7d906f5f262373d/dotnet-sdk-5.0.408-osx-x64.tar.gz"; - sha512 = "3fdd4deac2809b00c0f669d5488000ac1b9a47dee6ab7b31167d7cec4759a10ee347fd4f52090a40684e5ecc1e1f57eb99c558e561edfd1436a2f77fc1c1a0b2"; - }; - }; - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mfawgcc23r44a1r7ynafxwga6jzn0f0z5ys03qssrvlcdsb376x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "183xgqzlwd5lhacxdwcjl8vcq7r7xypv0hddps9k32mmmwf83d8h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "0i5pp1smjkyhiyhcbkyc3cxz0sx9204bfml8wsdy7bxznbh2gkmw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "1fmd9jq2nzy63hjh4sa6zl636wpgwr3r8ahzln5w14m9k87lfdbk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "066fwdlssbv556zd9w1x87x1j8j4kafj9rxyy0692bssdb4gcyc8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1qvvqf8mmzzc7a7fhx324dprnbxhknr3qxspb2xhsn3yyg44xn2d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "1gzf2gv4z9bn1cr1kpqpf1jf7m0p0wd1pxq5ndylq6bw353yglk1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1lml70ln9bfjrfjf3jbxfzd5kgd4cp4h7v052md5ja364g7lalsy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0j90fri15c05lw96xybgvqkysfm7g8grhkrg25g75vhi6ni2ricj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "1bdb887xvgxsmphys83zp9skn848p1r8viclc8p29w1rby4wi19i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.17"; sha256 = "0y90p765sj54clf2bwrka99w73g8b9550b4qvyilqggzydl1c1hk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.17"; sha256 = "07v7vyqm556xr1ypkazfp6gh6drgf20zkwbhkpja8bwdcr6lphbb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "5.0.17"; sha256 = "0sbzlzhazh31s63hw9553hk9j56fxssncmfgidiyh0dg73aacrsp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "5.0.17"; sha256 = "1qxphvlr882rvmj71y2imnf6r3hh4ln2n138qjyv1z129dp2g4y1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.17"; sha256 = "02g5w41ivrw3n6cy3l3ixhcl8bw1fsv4bzs2m34k9h5fqmliaf3c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "5.0.17"; sha256 = "07rfkxpf6rp8x0lybl8hx40mk09w5gjrr9djkjcp8lvjgzidnxq9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "5.0.17"; sha256 = "1i7wka56n3akr96jrkj37jx98bwxfzhpx5705930v50izligd08x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.17"; sha256 = "15f1kqlpp1d05dhg3dfya32vvzbpj6c7gxds947f10jb0hqlnhdj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "5.0.17"; sha256 = "1j1334zxv815ksdnllnbwwsbwnimjlpknjmqy1riy2zpswxlfkz6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mmgd6nacx4fzf0w02ch0qxa43vrv6wfspykxsy2bkpvrnvr8xr9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "16whaq82pj6fqa0vam3a0va9ly843aa1z12hza040vn6252kk9fq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "1zavnwqvn2f7lhb880wgv02anrvqsh6l34w72knwd31irggph08l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "173r2srcbad2prrw3l914scmdks3mghxgszvlwypdjnv0f2szgvv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "0jgcfs3jc98jfyaaamssznckbpnaygplk8pjsp6dswpansz5bnnq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1ph5kx18syinp8bpzw80bgq3njl65gwzws727xcmxnysgm7snmjp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "0m4jhn70parwnl18fql0sk9sf14y8cf08xw6x2cm5bfhnc9jvjny"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1af20jkv73767b4fy18s2dvjncaca1ny0csyr7wbhvqfs59y3n1x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0llhsi03wyp2yjqy0snywqgwjgam91i4nsf5lc9kaxkk5h6vj1a0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "0xvprbjwd3fymddvavsy7wk5q2hp45hdi10qz4rdbmns23vqkzmf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0vhvxpba3i9ffp4gp56l3rnlhq9yg07n3dv5qi89zb90vgyqjh1p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "074c9byxwmndfdavxn103220f5gklaaxc9wj7zpb5v3yr3ads30f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "03jkkpsy2zjfp722fa2fcnpk2g6jzy0bn9vip5c39k78y5pz29x6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1ih6c104skp9q17i2dnsma45l6nv5c62vv2i1988dcjw2v0sl98m"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0gwsxd1l0n32xnw0lyjixj2634iyygdb8pd7chydsr3qk8njxnpk"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0x5dhn1jkwqnd0cki1vi97rhyfac6w79hvh9dxvnkn2k04sbps8q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ipx3qn78z6gi415c4fa9wgy8k75aifbml6ys1c9ghl6yxbv0fd0"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1wgbx648yndl0hh8vx6sflfwjyr5pfhi7vj7v19l6vxnrr1096w7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17jc8jc2dk1g8996jpq3k0g6c5inijivxkbz0grxrgr5jbyiv19y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0ydn40qn6cs6f20byvmc9j008s6csxjbh6jh5w4q995vipcmcpcj"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bw08wlf96vcyix850y8jips1glrz2cbj647af4d7gggw8p3wwzw"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0xsqyw848scwcz09pgc719776q712xabx4xv47srzij34p2pq7np"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "00b0vipypjai4l8icr74kjhglxx2xlc3nw3vyiwisg52l9zyby66"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1cdgd4p5zr1mzz9hlb5mj946zfa1vn9wya5y2bhqn9y4ak831wzp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "17v8m4fxm4q40z49a2h4lw9dawg6pwfv4s2dskzc23ggcjgr6dp1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1fbqi92prqmvxx0rx7vhl10l665jmmhb2ng5jndimggydb0ckpqh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1rijxkzzk65xs9z2ygs13h0rhw1cli5vwshmvs1gfnwhhn8ic0gx"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "02mxvpm2zs5jvawigvxlnrw6si4zwj6qlcas99m9xdmm8yqq22cm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0c1lcl3yy88vdfw12c7h0ww596qfjd5f8l2mn7mlqs6i3f864bkg"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w0wg9ah7vngvpyds67l6qhizpkdf2r6m6cqyyvv3s5dw5l8rxin"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17yy7605vkfz0f4h58005gdfg6fnjxlcnq0vg0hrxsgbdqmd7p1i"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0av25fgkdl7zvn44wp8gqx2xl2mdlv1f9cgxzp7xk5yq8f7ynxpq"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1smhmdfq0jlv1gq18hdaj0y9yzkvqzmki19c0b3j5b76yxxxpbwz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0n0cdb9zpdb4h4v6r265pqmqg8c94ydywvna6jp1c6qhqlr0qk39"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1s2n2sx29c8rx549zizj8yrddjl98a7vwvxw56y0jvvbwphr9gz4"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "19m66yvv0hnmyrmx2l4drbls0fcib75fxq2csdx6p8gd54bnrsh3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bcnlsxcrvhybcjbb9879njx0c4z76y7djx4643g1rpjnkcrj9ww"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1bf95h2f0dmpmv7z7961zia5vaqvmjq3wkf6iil9jxv4z674624w"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "02q593q09mwwh23m86048vc7b7an7pqch5nd86d4hxzkamnpnpsa"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "16vzxywfj88gjcwfnmcb6b50ld8dp46i4pqiwwcy7yz15xgdhbm2"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ix5lg2j5ihdfp9j3jdxc042g4syjzc4bafid465j52h6znsm6wm"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w30v8r26cg427n5glm9nz6r10baalkqq5icqqxkq71hmh8fsjqb"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "168iq4hdp6bhdpgqa1mir1bygmh2ggwkys1r82d6kpl2lzbxjy28"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "18jpw2wbrb1b941729lb7hiq4yfq2z53pcxwz4mpgawnr58y0562"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0ig464fcsj2jr0p02f6slifwf1m0408g95npm0vccf5ww1nbgkpi"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0qj5avmjrvabxzimprg4m54k3p6zkwrhbpv0byc8c9gbi47s323j"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "05ghz164lpff7n8mrxs7jm2h8n3clsg4w953zrag3k5ry9j36m9c"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0azgs542mbg69jlc81529i2z5m728w8sc2i9m5dx15hvxqqqcjiz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "12n1kcgcv5z8hkvjqfk0n705kcipbai4sgcwiimi52xpaf34xw8m"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0b1s2m0a7xcdzfz22x6k7v5hkca90azdjk6pw7wwdnvszwq26nxp"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1sjpq07swgj0isdgyh6p2yb254qb9781lv44xfhj6nz7mx2yhdh1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1gnzrqdp26d7pwwz29gm4qb09n2zsb767qkhbwkifcsyxlwi6m0f"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "089jww13gaf7x7yd9d3qkyx9iq8abcp3r147hd9nblh561c9bzbg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1nycl1rayk0fhaakpj6q9rfp2lv3dpl7pziavmd9kcfryz952ff5"; }) - ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d7229e7d07b..4680018b843f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -657,12 +657,10 @@ with pkgs; dotnet-sdk_7 = dotnetCorePackages.sdk_7_0; dotnet-runtime_3 = dotnetCorePackages.runtime_3_1; - dotnet-runtime_5 = dotnetCorePackages.runtime_5_0; dotnet-runtime_6 = dotnetCorePackages.runtime_6_0; dotnet-runtime_7 = dotnetCorePackages.runtime_7_0; dotnet-aspnetcore_3 = dotnetCorePackages.aspnetcore_3_1; - dotnet-aspnetcore_5 = dotnetCorePackages.aspnetcore_5_0; dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0; dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0; From 577ba47bfa1687108d61fa556c6ad7b665d0b57b Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Jan 2023 13:17:57 -0500 Subject: [PATCH 43/87] ruff: 0.0.230 -> 0.0.231 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.230...v0.0.231 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.231 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 8854ee18bf61..0afcf1abe9ea 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.230"; + version = "0.0.231"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-40QVmxdEuWQEFCkf8ypEWsH1R6A3WjTXWPC99RnWsgI="; + sha256 = "sha256-BXRM3MS77B39B6ylrkZyLQqndF+DkjJek0u1KfOuazI="; }; - cargoSha256 = "sha256-ek/+qYOsFhbwWuHn6ezWzsxxeK0umrNAZZVFJl2ya1M="; + cargoSha256 = "sha256-HYGFE5WpY0puAmCkvByR1vomuEwA0+L9eetp6FGyPhg="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 8e51d95ba6126dca37ebb952e3c459b99635e625 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Jan 2023 20:52:08 +0100 Subject: [PATCH 44/87] python310Packages.lupupy: 0.2.4 -> 0.2.5 --- pkgs/development/python-modules/lupupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index ef17ba8f40e3..5397641094a8 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-11BdMhUhxbzkSrBEFdqpjkgcOcCZG498ylEHIMbomW4="; + hash = "sha256-SxhGUwcZjaRNCS5dB2hh5uctFGHWuKnM48CcIz6VMh8="; }; propagatedBuildInputs = [ From a18149dff53c699f82905f90a99daaab0fe6f7b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 19:55:06 +0000 Subject: [PATCH 45/87] fastly: 4.6.2 -> 5.0.0 --- pkgs/misc/fastly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 60e5a72e37eb..21b2e3574319 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fastly"; - version = "4.6.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-E91Vg/dPJQwBZar7Wo5IeMlFoI/jwz7ALtv67DW1Rsk="; + hash = "sha256-rbb+OtzOZbTYJt4IH1QXKdQ9JevGLEvhcC+F7rW337k="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -31,7 +31,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-Gyc0c3RntrWFEqk+AixvXSRRqjr7SEYGeqIJ/ysoFgs="; + vendorHash = "sha256-TxF0H1kZSn9VFrR8z5JJwWXCG6Gl8QH88qwQidGY7oc="; nativeBuildInputs = [ installShellFiles From 6323cfc2fd5696f399c38839444cecf6c665fd0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Jan 2023 21:00:42 +0100 Subject: [PATCH 46/87] python310Packages.lupupy: add changelog to meta --- pkgs/development/python-modules/lupupy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index 5397641094a8..9f2e31fbc7df 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to control Lupusec alarm control panels"; homepage = "https://github.com/majuss/lupupy"; + changelog = "https://github.com/majuss/lupupy/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From dddab80625571a1e0c8952d2e49264d4cc4cae27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 20:35:10 +0000 Subject: [PATCH 47/87] rust-analyzer-unwrapped: 2023-01-16 -> 2023-01-23 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 05d20447dc59..a90ac2780e8a 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-01-16"; - cargoSha256 = "sha256-M0AwSksEUKVw+Eo+D7BnkoKycNRQDOnemIgremXp5fs="; + version = "2023-01-23"; + cargoSha256 = "sha256-NSdHvWN5BIEXZMFiweKYbJayxDqlFmqJp+sIzeORhSU="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-m+EVsqnYIDdabuIs7K+e343RZ7V3mQHijoYuHWS7Dj4="; + sha256 = "sha256-Uq6jngJnf2UqKrOzqMXtq5IVxkU3eNCkmORPdccLxp0="; }; auditable = true; # TODO: remove when this is the default From 62f16ab2eb695737be089efa3a494f151046a823 Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Wed, 4 Jan 2023 00:09:56 +0530 Subject: [PATCH 48/87] ktlint: 0.48.0 -> 0.48.2 --- pkgs/development/tools/ktlint/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index e80e4c8b4d44..dbc794e02084 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.48.0"; + version = "0.48.2"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "0sdmfdmxgks9bbzg8nn1gdx55g7qiwpdxkx6p9lwa71mdfc14r2z"; + sha256 = "0hh3zm21a976px3lhf2przczspiyk88k68fmnwsknn281y9pyr70"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://ktlint.github.io/"; license = licenses.mit; platforms = jre_headless.meta.platforms; + changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; }; } From 8732560381bd5862bb409113a3e6ab45b387ec19 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 23 Jan 2023 22:28:53 +0100 Subject: [PATCH 49/87] roundcube: 1.6.0 -> 1.6.1 ChangeLog: https://github.com/roundcube/roundcubemail/releases/tag/1.6.1 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 18856c556772..288aa6f4e78d 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-JAnM3+LkZfCGy5/BjIjf4Kr2zMI5JFZJdQYSCZIWlLo="; + sha256 = "sha256-RsL2ujS8t+V+R8sDS/M45fx9zO3dqSEqLvO9MUbZe+0="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From 0691621c717f1fdb671074e1d5b1dfd7388e893f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Jan 2023 22:43:47 +0100 Subject: [PATCH 50/87] python310Packages.identify: 2.5.13 -> 2.5.15 Diff: https://github.com/pre-commit/identify/compare/v2.5.13...v2.5.15 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 2488ad04956b..00b6e6ba9aba 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.13"; + version = "2.5.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8QkDAVHjVEqicntSMb98JitmR5toOTGhgEk7cH3xSFI="; + sha256 = "sha256-5M51eWdER9/K15H2yUQjvXMjzYNwx9BLIKSW/ToDU5g="; }; nativeCheckInputs = [ From 09e07a3ad354bdad161880b8a33dbfe4b6088cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Jan 2023 22:45:25 +0100 Subject: [PATCH 51/87] cups: remove with lib over entire file --- pkgs/misc/cups/default.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 06fdb4d65e72..d9f136f81389 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -22,10 +22,8 @@ , nixosTests }: -with lib; stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.2"; src = fetchurl { @@ -48,9 +46,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] - ++ optionals stdenv.isLinux [ avahi pam dbus acl ] - ++ optional enableSystemd systemd - ++ optionals stdenv.isDarwin (with darwin; [ + ++ lib.optionals stdenv.isLinux [ avahi pam dbus acl ] + ++ lib.optional enableSystemd systemd + ++ lib.optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices ]); @@ -62,18 +60,18 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--enable-raw-printing" "--enable-threads" - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "--enable-dbus" "--enable-pam" "--with-dbusdir=${placeholder "out"}/share/dbus-1" - ] ++ optional (libusb1 != null) "--enable-libusb" - ++ optional (gnutls != null) "--enable-ssl" - ++ optional (avahi != null) "--enable-avahi" - ++ optional (libpaper != null) "--enable-libpaper"; + ] ++ lib.optional (libusb1 != null) "--enable-libusb" + ++ lib.optional (gnutls != null) "--enable-ssl" + ++ lib.optional (avahi != null) "--enable-avahi" + ++ lib.optional (libpaper != null) "--enable-libpaper"; # AR has to be an absolute path preConfigure = '' - export AR="${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + export AR="${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" configureFlagsArray+=( # Put just lib/* and locale into $lib; this didn't work directly. # lib/cups is moved back to $out in postInstall. @@ -84,7 +82,7 @@ stdenv.mkDerivation rec { "--with-systemd=$out/lib/systemd/system" - ${optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' "--with-bundledir=$out" ''} ) @@ -130,7 +128,7 @@ stdenv.mkDerivation rec { for f in "$out"/lib/systemd/system/*; do substituteInPlace "$f" --replace "$lib/$libexec" "$out/$libexec" done - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' # Use xdg-open when on Linux substituteInPlace "$out"/share/applications/cups.desktop \ --replace "Exec=htmlview" "Exec=xdg-open" @@ -138,7 +136,7 @@ stdenv.mkDerivation rec { passthru.tests.nixos = nixosTests.printing; - meta = { + meta = with lib; { homepage = "https://openprinting.github.io/cups/"; description = "A standards-based printing system for UNIX"; license = licenses.asl20; From 4e39b129c229f936408152a00ed79bc0bf9078d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 21:53:53 +0000 Subject: [PATCH 52/87] python310Packages.psd-tools: 1.9.23 -> 1.9.24 --- pkgs/development/python-modules/psd-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index e34359d08231..ab4d09462611 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.23"; + version = "1.9.24"; src = fetchFromGitHub { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-pJUf5rE5QMnfNytU1P0Zbj1iztrK5xrX4CJ/WvIG8mY="; + sha256 = "sha256-RW8v3UeO2tCjKkCqraFw2IfVt2YL3EbixfGsK7pOQYI="; }; nativeBuildInputs = [ cython ]; From 31e3844aea6550150924cc24a00faf3d04e5a3b2 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Sun, 1 Jan 2023 22:13:02 +0000 Subject: [PATCH 53/87] cloudlog: init at 2.3 --- pkgs/applications/radio/cloudlog/default.nix | 43 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/radio/cloudlog/default.nix diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix new file mode 100644 index 000000000000..dd117fd9d451 --- /dev/null +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, nixosTests +, php}: + +stdenvNoCC.mkDerivation rec { + name = "cloudlog"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "magicbug"; + repo = "Cloudlog"; + rev = version; + sha256 = "sha256-IepCeV/mYy/GEzRTXf67LYQQaN5Rj5Z77KaF2l30r60="; + }; + + postPath = '' + substituteInPlace index.php \ + --replace "define('ENVIRONMENT', 'development');" "define('ENVIRONMENT', 'production');" + ''; + + installPhase = '' + mkdir $out/ + cp -R ./* $out + ''; + + passthru.tests = { + inherit (nixosTests) cloudlog; + }; + + meta = with lib; { + description = '' + Web based amateur radio logging application built using PHP & MySQL + supports general station logging tasks from HF to Microwave with + supporting applications to support CAT control. + ''; + license = licenses.mit; + homepage = "https://www.magicbug.co.uk/cloudlog"; + platforms = php.meta.platforms; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4469b008c135..cd3f87a606b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17055,6 +17055,8 @@ with pkgs; cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { }; + cloudlog = callPackage ../applications/radio/cloudlog { }; + cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { }; cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { }; From c281dd3e05b0266721c0fe707d7259d88095db7a Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Sun, 1 Jan 2023 23:19:37 +0000 Subject: [PATCH 54/87] nixos/cloudlog: init --- .../from_md/release-notes/rl-2305.section.xml | 7 + .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/cloudlog.nix | 502 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/cloudlog.nix | 18 + 6 files changed, 531 insertions(+) create mode 100644 nixos/modules/services/web-apps/cloudlog.nix create mode 100644 nixos/tests/cloudlog.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index ea3be31a2060..5836e7c9c124 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -53,6 +53,13 @@ services.printing.cups-pdf. + + + Cloudlog, + a web-based Amateur Radio logging application. Available as + services.cloudlog. + + fzf, diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index df0ec622e56e..730ccf5685bd 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -22,6 +22,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [cups-pdf-to-pdf](https://github.com/alexivkin/CUPS-PDF-to-PDF), a pdf-generating cups backend based on [cups-pdf](https://www.cups-pdf.de/). Available as [services.printing.cups-pdf](#opt-services.printing.cups-pdf.enable). +- [Cloudlog](https://www.magicbug.co.uk/cloudlog/), a web-based Amateur Radio logging application. Available as [services.cloudlog](#opt-services.cloudlog.enable). + - [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 41b953dc3473..78e580132665 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1114,6 +1114,7 @@ ./services/web-apps/bookstack.nix ./services/web-apps/calibre-web.nix ./services/web-apps/changedetection-io.nix + ./services/web-apps/cloudlog.nix ./services/web-apps/code-server.nix ./services/web-apps/convos.nix ./services/web-apps/dex.nix diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix new file mode 100644 index 000000000000..ffd1085bde65 --- /dev/null +++ b/nixos/modules/services/web-apps/cloudlog.nix @@ -0,0 +1,502 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.cloudlog; + dbFile = let + password = if cfg.database.createLocally + then "''" + else "trim(file_get_contents('${cfg.database.passwordFile}'))"; + in pkgs.writeText "database.php" '' + "", + 'hostname' => '${cfg.database.host}', + 'username' => '${cfg.database.user}', + 'password' => ${password}, + 'database' => '${cfg.database.name}', + 'dbdriver' => 'mysqli', + 'dbprefix' => "", + 'pconnect' => TRUE, + 'db_debug' => (ENVIRONMENT !== 'production'), + 'cache_on' => FALSE, + 'cachedir' => "", + 'char_set' => 'utf8mb4', + 'dbcollat' => 'utf8mb4_general_ci', + 'swap_pre' => "", + 'encrypt' => FALSE, + 'compress' => FALSE, + 'stricton' => FALSE, + 'failover' => array(), + 'save_queries' => TRUE + ); + ''; + configFile = pkgs.writeText "config.php" '' + ${strings.fileContents "${pkgs.cloudlog}/install/config/config.php"} + $config['datadir'] = "${cfg.dataDir}/"; + $config['base_url'] = "${cfg.baseUrl}"; + ${cfg.extraConfig} + ''; + package = pkgs.stdenv.mkDerivation rec { + pname = "cloudlog"; + version = src.version; + src = pkgs.cloudlog; + installPhase = '' + mkdir -p $out + cp -r * $out/ + + ln -s ${configFile} $out/application/config/config.php + ln -s ${dbFile} $out/application/config/database.php + + # link writable directories + for directory in updates uploads backup logbook; do + rm -rf $out/$directory + ln -s ${cfg.dataDir}/$directory $out/$directory + done + + # link writable asset files + for asset in dok sota wwff; do + rm -rf $out/assets/json/$asset.txt + ln -s ${cfg.dataDir}/assets/json/$asset.txt $out/assets/json/$asset.txt + done + ''; + }; +in +{ + options.services.cloudlog = with types; { + enable = mkEnableOption (mdDoc "Whether to enable Cloudlog."); + dataDir = mkOption { + type = str; + default = "/var/lib/cloudlog"; + description = mdDoc "Cloudlog data directory."; + }; + baseUrl = mkOption { + type = str; + default = "http://localhost"; + description = mdDoc "Cloudlog base URL"; + }; + user = mkOption { + type = str; + default = "cloudlog"; + description = mdDoc "User account under which Cloudlog runs."; + }; + database = { + createLocally = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Create the database and database user locally."; + }; + host = mkOption { + type = str; + description = mdDoc "MySQL database host"; + default = "localhost"; + }; + name = mkOption { + type = str; + description = mdDoc "MySQL database name."; + default = "cloudlog"; + }; + user = mkOption { + type = str; + description = mdDoc "MySQL user name."; + default = "cloudlog"; + }; + passwordFile = mkOption { + type = nullOr str; + description = mdDoc "MySQL user password file."; + default = null; + }; + }; + poolConfig = mkOption { + type = attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = mdDoc '' + Options for Cloudlog's PHP-FPM pool. + ''; + }; + virtualHost = mkOption { + type = nullOr str; + default = "localhost"; + description = mdDoc '' + Name of the nginx virtualhost to use and setup. If null, do not setup + any virtualhost. + ''; + }; + extraConfig = mkOption { + description = mdDoc '' + Any additional text to be appended to the config.php + configuration file. This is a PHP script. For configuration + settings, see . + ''; + default = ""; + type = str; + example = '' + $config['show_time'] = TRUE; + ''; + }; + upload-lotw = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically upload logs to LoTW. If enabled, a systemd + timer will run the log upload task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "daily"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the LoTW upload will occur. + ''; + }; + }; + upload-clublog = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically upload logs to Clublog. If enabled, a systemd + timer will run the log upload task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "daily"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the Clublog upload will occur. + ''; + }; + }; + update-lotw-users = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the list of LoTW users. If enabled, a + systemd timer will run the update task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "weekly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the LoTW user update will occur. + ''; + }; + }; + update-dok = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the DOK resource file. If enabled, a + systemd timer will run the update task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the DOK update will occur. + ''; + }; + }; + update-clublog-scp = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the Clublog SCP database. If enabled, + a systemd timer will run the update task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the Clublog SCP update will occur. + ''; + }; + }; + update-wwff = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the WWFF database. If enabled, a + systemd timer will run the update task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the WWFF update will occur. + ''; + }; + }; + upload-qrz = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically upload logs to QRZ. If enabled, a systemd + timer will run the update task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "daily"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the QRZ upload will occur. + ''; + }; + }; + update-sota = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the SOTA database. If enabled, a + systemd timer will run the update task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the SOTA update will occur. + ''; + }; + }; + }; + config = mkIf cfg.enable { + + assertions = [ + { + assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; + message = "services.cloudlog.database.passwordFile cannot be specified if services.cloudlog.database.createLocally is set to true."; + } + ]; + + services.phpfpm = { + pools.cloudlog = { + inherit (cfg) user; + group = config.services.nginx.group; + settings = { + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; + } // cfg.poolConfig; + }; + }; + + services.nginx = mkIf (cfg.virtualHost != null) { + enable = true; + virtualHosts = { + "${cfg.virtualHost}" = { + root = "${package}"; + locations."/".tryFiles = "$uri /index.php$is_args$args"; + locations."~ ^/index.php(/|$)".extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi_params; + include ${pkgs.nginx}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.cloudlog.socket}; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + ''; + }; + }; + }; + + services.mysql = mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [{ + name = cfg.database.user; + ensurePermissions = { + "${cfg.database.name}.*" = "ALL PRIVILEGES"; + }; + }]; + }; + + systemd = { + services = { + cloudlog-setup-database = mkIf cfg.database.createLocally { + description = "Set up cloudlog database"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + wantedBy = [ "phpfpm-cloudlog.service" ]; + after = [ "mysql.service" ]; + script = let + mysql = "${config.services.mysql.package}/bin/mysql"; + in '' + if [ ! -f ${cfg.dataDir}/.dbexists ]; then + ${mysql} ${cfg.database.name} < ${pkgs.cloudlog}/install/assets/install.sql + touch ${cfg.dataDir}/.dbexists + fi + ''; + }; + cloudlog-upload-lotw = { + description = "Upload QSOs to LoTW if certs have been provided"; + enable = cfg.upload-lotw.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/lotw_upload"; + }; + cloudlog-update-lotw-users = { + description = "Update LOTW Users Database"; + enable = cfg.update-lotw-users.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/load_users"; + }; + cloudlog-update-dok = { + description = "Update DOK File for autocomplete"; + enable = cfg.update-dok.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_dok"; + }; + cloudlog-update-clublog-scp = { + description = "Update Clublog SCP Database File"; + enable = cfg.update-clublog-scp.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_clublog_scp"; + }; + cloudlog-update-wwff = { + description = "Update WWFF File for autocomplete"; + enable = cfg.update-wwff.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_wwff"; + }; + cloudlog-upload-qrz = { + description = "Upload QSOs to QRZ Logbook"; + enable = cfg.upload-qrz.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/qrz/upload"; + }; + cloudlog-update-sota = { + description = "Update SOTA File for autocomplete"; + enable = cfg.update-sota.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_sota"; + }; + }; + timers = { + cloudlog-upload-lotw = { + enable = cfg.upload-lotw.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-upload-lotw.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.upload-lotw.interval; + Persistent = true; + }; + }; + cloudlog-upload-clublog = { + enable = cfg.upload-clublog.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-upload-clublog.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.upload-clublog.interval; + Persistent = true; + }; + }; + cloudlog-update-lotw-users = { + enable = cfg.update-lotw-users.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-lotw-users.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-lotw-users.interval; + Persistent = true; + }; + }; + cloudlog-update-dok = { + enable = cfg.update-dok.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-dok.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-dok.interval; + Persistent = true; + }; + }; + cloudlog-update-clublog-scp = { + enable = cfg.update-clublog-scp.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-clublog-scp.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-clublog-scp.interval; + Persistent = true; + }; + }; + cloudlog-update-wwff = { + enable = cfg.update-wwff.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-wwff.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-wwff.interval; + Persistent = true; + }; + }; + cloudlog-upload-qrz = { + enable = cfg.upload-qrz.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-upload-qrz.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.upload-qrz.interval; + Persistent = true; + }; + }; + cloudlog-update-sota = { + enable = cfg.update-sota.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-sota.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-sota.interval; + Persistent = true; + }; + }; + }; + tmpfiles.rules = let + group = config.services.nginx.group; + in [ + "d ${cfg.dataDir} 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/updates 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/uploads 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/backup 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/logbook 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets/json 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets/qslcard 0750 ${cfg.user} ${group} - -" + ]; + }; + + users.users."${cfg.user}" = { + isSystemUser = true; + group = config.services.nginx.group; + }; + }; + + meta.maintainers = with maintainers; [ melling ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 75f01d888b21..64db8c5ae40d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -130,6 +130,7 @@ in { clickhouse = handleTest ./clickhouse.nix {}; cloud-init = handleTest ./cloud-init.nix {}; cloud-init-hostname = handleTest ./cloud-init-hostname.nix {}; + cloudlog = handleTest ./cloudlog.nix {}; cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; collectd = handleTest ./collectd.nix {}; diff --git a/nixos/tests/cloudlog.nix b/nixos/tests/cloudlog.nix new file mode 100644 index 000000000000..c99951c1b22c --- /dev/null +++ b/nixos/tests/cloudlog.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "cloudlog"; + meta = { + maintainers = with pkgs.lib.maintainers; [ melling ]; + }; + nodes = { + machine = { + services.mysql.package = pkgs.mariadb; + services.cloudlog.enable = true; + }; + }; + testScript = '' + start_all() + machine.wait_for_unit("phpfpm-cloudlog") + machine.wait_for_open_port(80); + machine.wait_until_succeeds("curl -s -L --fail http://localhost | grep 'Login - Cloudlog'") + ''; +}) From 1c7067dfbd5ab0de92bc81f13e98d000ba19df6b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 23 Jan 2023 23:56:22 +0100 Subject: [PATCH 55/87] qt6Packages: migrate to apple_sdk_11_0 --- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/qt6-packages.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d7229e7d07b..bb64903686c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22639,6 +22639,7 @@ with pkgs; qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { inherit lib pkgs qt6; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); quark-engine = callPackage ../tools/security/quark-engine { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index e566a8af758c..9d6a58cb3b52 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -7,6 +7,7 @@ { lib , pkgs , qt6 +, stdenv }: (lib.makeScope pkgs.newScope ( self: @@ -24,6 +25,8 @@ let in (qt6 // { + inherit stdenv; + # LIBRARIES inherit (kdeFrameworks) kcoreaddons; From 99341e067649cbef523b93bb64c6071e778e0159 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 23 Jan 2023 18:04:15 -0500 Subject: [PATCH 56/87] luaPackages.lualdap: init at 1.3.0-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 34 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 7 ++++ 3 files changed, 42 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d6d2a9da0687..b8f8bf6ef488 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -65,6 +65,7 @@ luaevent,,,,,, luaexpat,,,,1.4.1-1,,arobyn flosse luaffi,,,http://luarocks.org/dev,,, luafilesystem,,,,1.8.0-1,,flosse +lualdap,,,,,,aanderse lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d33ff9907a9a..31891967df4f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2019,6 +2019,40 @@ buildLuarocksPackage { }; }) {}; +lualdap = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "lualdap"; + version = "1.3.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lualdap-1.3.0-1.rockspec"; + sha256 = "0b51sm0fz4kiim20w538v31k9g20wq3msxdkh17drkr60ab25sc8"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lualdap/lualdap", + "rev": "be380f5d98f779c813a4fb4ae1400262366fc8d4", + "date": "2021-06-05T15:49:42+02:00", + "path": "/nix/store/99sy73yz6sidqhkl0kwdsd7r853aw38n-lualdap", + "sha256": "133d8br5f24z03ni38m0czrqfz0mr0ksdrc1g73rawpmiqarpps8", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://lualdap.github.io/lualdap/"; + description = "A Lua interface to the OpenLDAP library"; + maintainers = with lib.maintainers; [ aanderse ]; + license.fullName = "MIT"; + }; +}) {}; + lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, luasocket }: diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 6488ed507a66..419842a09677 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -27,6 +27,7 @@ , mariadb , mpfr , neovim-unwrapped +, openldap , openssl , pcre , pkg-config @@ -329,6 +330,12 @@ with prev; disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; }); + lualdap = prev.luaLib.overrideLuarocks prev.lualdap (drv: { + externalDeps = [ + { name = "LDAP"; dep = openldap; } + ]; + }); + luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ { name = "CRYPTO"; dep = openssl; } From 36adb58cae61fed97fad472d083159c8725a93e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 23:57:48 +0000 Subject: [PATCH 57/87] git-cliff: 1.1.1 -> 1.1.2 --- pkgs/applications/version-management/git-cliff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 278208c48bff..be92ac0a29d4 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-GCHwpOfjti9PETy3cHFHBFBot6YcSSFTBCd3zEtpP3U="; + hash = "sha256-QYldwxQYod5qkNC3soiKoCLDFR4UaLxdGkVufn1JIeE="; }; - cargoHash = "sha256-76HWkfct9weA64yvY5G/l96mjNpuKjPYHFZ5Ctz43Us="; + cargoHash = "sha256-jwDJb9Hl0PegCufmaj1Q3h5itgt26E4dwmcyCxZ+4FM="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From f3745b1a7c0b065a62a67852446ed6e41b98a558 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 00:17:03 +0000 Subject: [PATCH 58/87] jackett: 0.20.2679 -> 0.20.2688 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index a2a2486bc170..a672433583c1 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2679"; + version = "0.20.2688"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-uB1gOtalInBOFulmdHvA9ycPt0CvEefXZyGhYwUZ+bjyMaM1T6QcrPeSjuBQ10nIrRmqrXMSZB3cvthSwm+Rrw=="; + hash = "sha512-e2uJ4uV6e3cwvnt3hw8qAYmUOhoyfX93YEgsV1pT/lZynYS7/FRF2jgo8ZUa1WC8lr/+tBQl+17jkxuQoIT7AA=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From c23ac513f7435530e8eababf3d37685198dec709 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 24 Jan 2023 01:26:59 +0100 Subject: [PATCH 59/87] ocamlPackages.ocp-indent: update homepage --- pkgs/development/tools/ocaml/ocp-indent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 29673d99dd0b..aae650fbdc25 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ cmdliner ]; meta = with lib; { - homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; + homepage = "https://www.typerex.org/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; maintainers = [ maintainers.jirkamarsik ]; From caac809e86ecb3242aa4b046e6e0a49e63eb1267 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Jan 2023 01:31:54 +0100 Subject: [PATCH 60/87] python3Packages.hassil: 0.2.4 -> 0.2.5 https://github.com/home-assistant/hassil/releases/tag/v0.2.5 --- pkgs/development/python-modules/hassil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index c2491134ff4a..52425fe3a614 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -16,7 +16,7 @@ let pname = "hassil"; - version = "0.2.4"; + version = "0.2.5"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-lgGo3zK1GN3MEOinXuvT5nCc8LBCxAHiW0CZfS8Yy7Y="; + hash = "sha256-/KEYTY3Y/KKP/r2OBf3R/jE7Sp/hNygC/Gdzk9XIf/0="; }; nativeBuildInputs = [ From d079571aa24a774999ef1fa227687251e274cb96 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Tue, 24 Jan 2023 01:51:23 +0100 Subject: [PATCH 61/87] ocamlPackages.paf, ocamlPackages.paf-cohttp: add local networking for test in test we can read this: [exception] Unix.Unix_error(Unix.EPERM, "bind", "") Raised by primitive operation at Tcpv4v6_socket.listen.(fun) in file "src/stack-unix/tcpv4v6_socket.ml", line 149, characters 6-50 --- pkgs/development/ocaml-modules/paf/cohttp.nix | 2 ++ pkgs/development/ocaml-modules/paf/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index df84083ccb3d..97396769fd05 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -47,6 +47,8 @@ buildDunePackage { astring ]; + __darwinAllowLocalNetworking = true; + meta = paf.meta // { description = "A CoHTTP client with its HTTP/AF implementation"; }; diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index acd16434f6ee..d172e73e13b2 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -61,6 +61,8 @@ buildDunePackage rec { alcotest-lwt ]; + __darwinAllowLocalNetworking = true; + meta = { description = "HTTP/AF and MirageOS"; license = lib.licenses.mit; From b1d7b4b4fbca280cdebba3658443c74f5d83e12a Mon Sep 17 00:00:00 2001 From: Nathan Viets Date: Mon, 23 Jan 2023 19:28:05 -0600 Subject: [PATCH 62/87] zulu: 11.52.13 -> 11.62.17 and 8.48.0.53 -> 8.68.0.19 --- pkgs/development/compilers/zulu/8.nix | 8 ++++---- pkgs/development/compilers/zulu/default.nix | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index e23dbdbd6c1b..9780dac344b1 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -21,11 +21,11 @@ }: let - version = "8.48.0.53"; - openjdk = "8.0.265"; + version = "8.68.0.19"; + openjdk = "8.0.362"; - sha256_linux = "ed32513524b32a83b3b388831c69d1884df5675bd5069c6d1485fd1a060be209"; - sha256_darwin = "36f189bfbd0255195848835819377474ba9c1c868e3c204633c451c96e21f30a"; + sha256_linux = "sha256-jNty0iJoXG+sp7v2fGCrwZWCSZfQ4tkYe8ERixQMKL0="; + sha256_darwin = "sha256-3/P3puM6a7tCHP5eZM6IzbdPrqnhY1dTa7QWss9M08M="; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 03dff2348a29..b4338738f892 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -22,12 +22,12 @@ }: let - version = "11.52.13"; - openjdk = "11.0.13"; + version = "11.62.17"; + openjdk = "11.0.18"; - sha256_x64_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f"; - sha256_x64_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e"; - sha256_aarch64_darwin = "dmzfergSUVz39T30PT/6ZtT8JNqv5lzdX7zUsXsFGJg="; + sha256_x64_linux = "sha256-b65oEbDzrrsUw+WaX94USBz/QS74yiMiGZPxqzMmmqs="; + sha256_x64_darwin = "sha256-nRRWTWiog8bRblmmPIPE5YibA34St3ZrJpZN91qEDUg="; + sha256_aarch64_darwin = "sha256-TBTrBxOfGo6MV+Md49P3sDfqVG1e+NraqfVbw9WTppk="; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isAarch64 && stdenv.isDarwin then sha256_aarch64_darwin else if stdenv.isDarwin then sha256_x64_darwin else sha256_x64_linux; From 56c2631e5bec6065a39cf91517bd6ceaa0a63ca9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 23 Jan 2023 19:29:34 -0500 Subject: [PATCH 63/87] dxvk: fix Darwin build --- pkgs/misc/dxvk/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index b93c46f09100..2c55b6b50cef 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -7,7 +7,8 @@ stdenvNoCC.mkDerivation (finalAttrs: let - inherit (stdenvNoCC.hostPlatform.uname) system; + system = lib.toLower stdenvNoCC.targetPlatform.uname.system; + # DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that # needs to be built with a cross-compiler. dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { From ff7f296c2ebdfa243a78d4bee5f959ee7562d999 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Jan 2023 21:55:48 -0500 Subject: [PATCH 64/87] cargo-expand: 1.0.37 -> 1.0.38, add figsoda as a maintainer Diff: https://github.com/dtolnay/cargo-expand/compare/1.0.37...1.0.38 Changelog: https://github.com/dtolnay/cargo-expand/releases/tag/1.0.38 --- .../tools/rust/cargo-expand/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 6112b01e79f4..5e699f9a7b06 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,30 +1,26 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.37"; + version = "1.0.38"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-BdaOtbZ+F1cgoZRmoQM/5Rzx4OUHmqSnsApeNfWz+J8="; + sha256 = "sha256-n7GDvniwkyCYiu7/qw0TQsVsTZfjcSpkF2Qo/uO60e4="; }; - cargoHash = "sha256-2wD0QJFTW8cIv8S1JSgffBqlcPOVd151WuKlaZF+6aA="; - - buildInputs = lib.optional stdenv.isDarwin libiconv; + cargoHash = "sha256-oA+8bceow7Cdao9FhkXkfFyrCpgvR4NJHddevbhUFkA="; meta = with lib; { - description = - "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; + description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; homepage = "https://github.com/dtolnay/cargo-expand"; + changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${version}"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ figsoda xrelkd ]; }; } From 04ca37f376b890a66330fee327130f315ea57231 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 03:01:41 +0000 Subject: [PATCH 65/87] doublecmd: 1.0.9 -> 1.0.10 --- pkgs/applications/file-managers/doublecmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/doublecmd/default.nix b/pkgs/applications/file-managers/doublecmd/default.nix index dc5f334de5b6..ca2839709ba3 100644 --- a/pkgs/applications/file-managers/doublecmd/default.nix +++ b/pkgs/applications/file-managers/doublecmd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-ruZNHvHBRXRM4h0R571jvasW8rYawq4cn7Hnd9riMnk="; + hash = "sha256-S30/exZsw9Rs/l5Sml/q7dqUIcS55ZxbLFYv+M9Jr6o="; }; nativeBuildInputs = [ From c49d2e8a59303764b5ce978a14028a5b31319bec Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 24 Jan 2023 04:53:00 +0100 Subject: [PATCH 66/87] pokefinder: fix build on darwin --- pkgs/tools/games/pokefinder/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index 547b0c47bc26..176cdc76ee0f 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/tools/games/pokefinder/default.nix @@ -26,8 +26,11 @@ stdenv.mkDerivation rec { patchShebangs Source/Core/Resources/ ''; - installPhase = '' + installPhase = lib.optionalString (!stdenv.isDarwin) '' install -D Source/Forms/PokeFinder $out/bin/PokeFinder + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -R Source/Forms/PokeFinder.app $out/Applications ''; nativeBuildInputs = [ cmake wrapQtAppsHook ]; From 8fe3ea10526527ed80b1b09be3f0315b55dd3e95 Mon Sep 17 00:00:00 2001 From: Anthony Carrico Date: Mon, 23 Jan 2023 20:22:59 -0500 Subject: [PATCH 67/87] mythtv: add libhdhomerun dependency --- pkgs/applications/video/mythtv/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 0df8cf6a7249..7ea9a532a725 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,7 +1,8 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm -, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders, soundtouch, libzip +, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders +, soundtouch, libzip, libhdhomerun , withWebKit ? false }: @@ -35,6 +36,7 @@ mkDerivation rec { freetype qtbase qtscript lame zlib libGLU libGL perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 soundtouch libzip + libhdhomerun ] ++ lib.optional withWebKit qtwebkit; nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; From a494b34ed49d0183cfc3c2ceabc5306bce1c9dc8 Mon Sep 17 00:00:00 2001 From: Eric Drechsel Date: Mon, 23 Jan 2023 21:19:19 -0800 Subject: [PATCH 68/87] way-displays: 1.6.2 -> 1.7.1 --- pkgs/tools/wayland/way-displays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index f27c15f70d5c..8d8b744583cf 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "way-displays"; - version = "1.6.2"; + version = "1.7.1"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; rev = "${version}"; - sha256 = "sha256-/dZDYc0XQ1fZYAsk9bd8vMAh7GMKuY6FX0WK5of+AMk="; + sha256 = "sha256-o8fju0EQy2KS5yxe9DP3A8ewYgA2GzJtMY41BGJUZis="; }; strictDeps = true; From 4f8a0c42ea48856c144cbd0a1db62b32f7b4f377 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 24 Jan 2023 06:44:34 +0100 Subject: [PATCH 69/87] hatch: fix build on darwin --- pkgs/development/tools/hatch/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix index ad4746c48c0c..f7604220f3aa 100644 --- a/pkgs/development/tools/hatch/default.nix +++ b/pkgs/development/tools/hatch/default.nix @@ -63,6 +63,9 @@ python3.pkgs.buildPythonApplication rec { "test_editable_pth" # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 "test_creation_allow_system_packages" + ] ++ lib.optionals stdenv.isDarwin [ + # https://github.com/NixOS/nixpkgs/issues/209358 + "test_scripts_no_environment" ]; meta = with lib; { From c86c7ad7c6e771368906988b0af470ed0e505e95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 05:52:09 +0000 Subject: [PATCH 70/87] python310Packages.google-cloud-secret-manager: 2.15.0 -> 2.15.1 --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 9b043f7e0056..169e3496e779 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.15.0"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KYKs/yUUKmgWxNp+EhD1Wcim/9dajatdl0QW0bZKByg="; + hash = "sha256-0ubTvpHT6HfCg5lfdbzAnP77oWPZw2N78qZs6tGim6M="; }; propagatedBuildInputs = [ From 4c511d81289173fd25281aa1e819ee7e1ac20d08 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 03:10:56 +0000 Subject: [PATCH 71/87] =?UTF-8?q?terraform-providers.google:=204.49.0=20?= =?UTF-8?q?=E2=86=92=204.50.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1f4ce103d858..19e8ebca44b7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -442,12 +442,12 @@ "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { - "hash": "sha256-/UgxXHucsrt960zLQiPruqJLxjFriTrNKjeI1gNEWys=", + "hash": "sha256-R104jYttXER/Pzd3ePHh9ZOvpcziuVQK0JcFqdbWtG0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.49.0", + "rev": "v4.50.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, From 378508260fcc6f79bc6367f9ff9f51ed0eab5c15 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 03:11:13 +0000 Subject: [PATCH 72/87] =?UTF-8?q?terraform-providers.google-beta:=204.49.0?= =?UTF-8?q?=20=E2=86=92=204.50.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 19e8ebca44b7..3c4feab80e81 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -452,12 +452,12 @@ "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "google-beta": { - "hash": "sha256-EGwErLYIL0OEIZJQgQizJqqAsZwn1ewPOqAEyg4tC7Q=", + "hash": "sha256-OrotSvDNK7PC6nyHEAvmTOYgdYFiHEE8YwfWcOAbPsk=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.49.0", + "rev": "v4.50.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, From e1aa4589337ebbb92094a8b7bd9228ef3ccd1b81 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 03:14:34 +0000 Subject: [PATCH 73/87] =?UTF-8?q?terraform-providers.kubernetes:=202.16.1?= =?UTF-8?q?=20=E2=86=92=202.17.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3c4feab80e81..b5d6c52d24ae 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -643,11 +643,11 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-aKGcKmnlYxNS7SrFW2SouRQUXYy339qHrDtQMXGD4DE=", + "hash": "sha256-mjxFKCUmXg9CPz/ZZWPr1F8DSUadNroEEwvJgwHYk5s=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.16.1", + "rev": "v2.17.0", "spdx": "MPL-2.0", "vendorHash": null }, From 36632ac01539d80ea94462879825a3256a9eff84 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 03:19:10 +0000 Subject: [PATCH 74/87] =?UTF-8?q?terraform-providers.oci:=204.104.0=20?= =?UTF-8?q?=E2=86=92=204.104.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b5d6c52d24ae..81d6f0e90494 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -816,11 +816,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-nky2PxHA9TznFh6IGrx3UvOuwrGPnQID04qlDQ4/rm4=", + "hash": "sha256-EewM1/7zzmJ5KL+/KqstFg6rQT8YpvMULScYeD2ClUQ=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.104.0", + "rev": "v4.104.2", "spdx": "MPL-2.0", "vendorHash": null }, From a96e7ea59ad4182305bbb925221f0f0d0e488c49 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Tue, 24 Jan 2023 06:14:45 +0000 Subject: [PATCH 75/87] libsv: init at 1.1 --- pkgs/development/libraries/libsv/default.nix | 23 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/libsv/default.nix diff --git a/pkgs/development/libraries/libsv/default.nix b/pkgs/development/libraries/libsv/default.nix new file mode 100644 index 000000000000..fb319bf30f34 --- /dev/null +++ b/pkgs/development/libraries/libsv/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libsv"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "uael"; + repo = "sv"; + rev = "v${version}"; + sha256 = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Public domain cross-platform semantic versioning in C99"; + homepage = "https://github.com/uael/sv"; + license = licenses.unlicense; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 033c5dc4c81d..9a88fc58c862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21554,6 +21554,8 @@ with pkgs; libtsm = callPackage ../development/libraries/libtsm { }; + libsv = callPackage ../development/libraries/libsv { }; + libgeotiff = callPackage ../development/libraries/libgeotiff { }; libu2f-host = callPackage ../development/libraries/libu2f-host { }; From a4f709d43ba7d3b867ab5457a5cf0046e07bc8f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 06:51:40 +0000 Subject: [PATCH 76/87] python310Packages.google-cloud-tasks: 2.12.0 -> 2.12.1 --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index f391b68aacaa..8751b583729b 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8dhYoj3/EXwMZLRduwskoAn7NSjA4N8xhIw8UbAAhnY="; + hash = "sha256-2kRj5zlAPVO2U3EzN+opz5OBtwEru5RqGOXGqLUPaUA="; }; propagatedBuildInputs = [ From b447e1dfdf42f5f5cd299dff7790ba324c539a76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 08:14:49 +0100 Subject: [PATCH 77/87] python310Packages.psd-tools: add changelog to meta - adjust inputs --- .../python-modules/psd-tools/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index ab4d09462611..f0baddf628db 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -1,10 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , docopt , pillow -, enum34 , scikitimage , aggdraw , pytestCheckHook @@ -15,15 +14,20 @@ buildPythonPackage rec { pname = "psd-tools"; version = "1.9.24"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RW8v3UeO2tCjKkCqraFw2IfVt2YL3EbixfGsK7pOQYI="; + hash = "sha256-RW8v3UeO2tCjKkCqraFw2IfVt2YL3EbixfGsK7pOQYI="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + ]; propagatedBuildInputs = [ aggdraw @@ -33,13 +37,18 @@ buildPythonPackage rec { scikitimage ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "psd_tools" ]; + pythonImportsCheck = [ + "psd_tools" + ]; meta = with lib; { description = "Python package for reading Adobe Photoshop PSD files"; homepage = "https://github.com/kmike/psd-tools"; + changelog = "https://github.com/psd-tools/psd-tools/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; From e576400badf3d648cb0618fb67aacbc437f73ad3 Mon Sep 17 00:00:00 2001 From: Kristoffer Ellersgaard Koch Date: Tue, 24 Jan 2023 09:05:41 +0100 Subject: [PATCH 78/87] nxpmicro-mfgtools: 1.4.243 -> 1.5.11 --- pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 2106a649775c..6dd504a3cf9e 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.4.243"; + version = "1.5.11"; src = fetchFromGitHub { owner = "NXPmicro"; repo = "mfgtools"; rev = "uuu_${version}"; - hash = "sha256-gyy9D6y1y+9GlT3wfW+huoWaZP1e8YzZnc7EbJftppI="; + hash = "sha256-RD0haw0C89uvTlLHtvlv1VwU4Jw2U19Caiq+BSfB4hU="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; From 619ba04b8752a8f14d583de6bceb76f7fb44cd5c Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Thu, 12 Jan 2023 09:09:55 +1100 Subject: [PATCH 79/87] buildBazelPackage: make bazel explicit --- pkgs/build-support/build-bazel-package/default.nix | 7 +------ .../python-modules/tensorflow-probability/default.nix | 3 +++ pkgs/top-level/python-packages.nix | 3 --- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 14f7ac38d3ff..d1cd502e7e4b 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -1,16 +1,11 @@ { stdenv -, bazel , cacert , lib }: -let - bazelPkg = bazel; -in - args@{ name ? "${args.pname}-${args.version}" -, bazel ? bazelPkg +, bazel , bazelFlags ? [] , bazelBuildFlags ? [] , bazelTestFlags ? [] diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 819dc0634d4a..6f820298ec13 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, bazel_3 , buildBazelPackage , buildPythonPackage , python @@ -45,6 +46,8 @@ let tensorflow ]; + bazel = bazel_3; + bazelTarget = ":pip_pkg"; fetchAttrs = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e21a89c4d8bf..b8c5b329e45f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4803,9 +4803,6 @@ self: super: with self; { jaxlib-build = callPackage ../development/python-modules/jaxlib rec { inherit (pkgs.darwin) cctools; - buildBazelPackage = pkgs.buildBazelPackage.override { - stdenv = if stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else stdenv; - }; # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. cudaSupport = pkgs.config.cudaSupport or false; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; From 110213c87165020ab1bb8c2979174e470f9ddbb5 Mon Sep 17 00:00:00 2001 From: Anna Aurora Date: Tue, 24 Jan 2023 11:08:31 +0100 Subject: [PATCH 80/87] pomodoro: init at 0.1.0 (#182212) Co-authored-by: Sandro --- pkgs/applications/misc/pomodoro/default.nix | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/pomodoro/default.nix diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix new file mode 100644 index 000000000000..d180c8e436e7 --- /dev/null +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, Foundation }: + +rustPlatform.buildRustPackage rec { + pname = "pomodoro"; + version = "unstable-2021-06-18"; + + src = fetchFromGitHub { + owner = "SanderJSA"; + repo = "Pomodoro"; + rev = "c833b9551ed0b09e311cdb369cc8226c5b9cac6a"; + sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ="; + }; + + cargoSha256 = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; + buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + + meta = with lib; { + description = "A simple CLI pomodoro timer using desktop notifications written in Rust"; + homepage = "https://github.com/SanderJSA/Pomodoro"; + license = licenses.mit; + maintainers = with maintainers; [ annaaurora ]; + # error: redefinition of module 'ObjectiveC' + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf3f40ab2eaf..9a275816f3a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31974,6 +31974,10 @@ with pkgs; polymake = callPackage ../applications/science/math/polymake { }; + pomodoro = callPackage ../applications/misc/pomodoro { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + pomotroid = callPackage ../applications/misc/pomotroid { electron = electron_9; }; From 362de11e34baa1e4a201a8e52808357ca075c740 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 24 Jan 2023 00:09:03 +0000 Subject: [PATCH 81/87] libomxil-bellagio: use a better homepage We don't need to use a SourceForge project page as the homepage, because the project has a dedicated website on SourceForge. --- pkgs/development/libraries/libomxil-bellagio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index e49473b79ede..82ee6c88865e 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8"; meta = with lib; { - homepage = "https://sourceforge.net/projects/omxil/"; + homepage = "https://omxil.sourceforge.net/"; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.linux; From 920a4e13408ed9ad998363038bd84c9567f537dd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 24 Jan 2023 00:09:41 +0000 Subject: [PATCH 82/87] libomxil-bellagio: clarify license --- pkgs/development/libraries/libomxil-bellagio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 82ee6c88865e..9c6eded392d5 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://omxil.sourceforge.net/"; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } From d2952f9386d510e2c7776b85dff2600b2514d889 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 24 Jan 2023 00:09:53 +0000 Subject: [PATCH 83/87] libomxil-bellagio: fix build with clang --- pkgs/development/libraries/libomxil-bellagio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 9c6eded392d5..67d9ec29b207 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails - # Fix for #40213, probably permanent, because upstream doesn't seem to be - # developed anymore. Alternatively, gcc7Stdenv could be used. - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8"; + NIX_CFLAGS_COMPILE = + if stdenv.cc.isGNU then "-Wno-error=array-bounds -Wno-error=stringop-overflow=8" + else "-Wno-error=absolute-value -Wno-error=enum-conversion -Wno-error=logical-not-parentheses -Wno-error=non-literal-null-conversion"; meta = with lib; { homepage = "https://omxil.sourceforge.net/"; From 268c77c55de109a1c7d8a849e43899cc2954b276 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 17 Jan 2023 18:08:03 +0000 Subject: [PATCH 84/87] libdiscid: broaden platforms Builds fine for FreeBSD and NetBSD, and website mentions Windows and "generic" support. --- pkgs/development/libraries/libdiscid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 3021aced93f6..7a073b143b93 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.all; }; } From 2fd344883da568dffe1d4c9e21f7bb25b239508a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 24 Jan 2023 10:10:14 +0000 Subject: [PATCH 85/87] polkadot: use system rocksdb --- pkgs/applications/blockchains/polkadot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 024e3142530a..883514b7da5b 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -3,6 +3,7 @@ , lib , llvmPackages , protobuf +, rocksdb , rustPlatform , stdenv , writeShellScriptBin @@ -45,6 +46,7 @@ rustPlatform.buildRustPackage rec { ''; PROTOC = "${protobuf}/bin/protoc"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; # NOTE: We don't build the WASM runtimes since this would require a more # complicated rust environment setup and this is only needed for developer From 9b7924523595c98b38e1f607b652ba3b16312e54 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 24 Jan 2023 11:24:04 +0100 Subject: [PATCH 86/87] licenses: add NLPL --- lib/licenses.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 52956e52afa6..34c84db47625 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -709,7 +709,12 @@ in mkLicense lset) ({ ncsa = { spdxId = "NCSA"; - fullName = "University of Illinois/NCSA Open Source License"; + fullName = "University of Illinois/NCSA Open Source License"; + }; + + nlpl = { + spdxId = "NLPL"; + fullName = "No Limit Public License"; }; nposl3 = { From a146de830d8791c7c0f8177fd9f68b5745e49fcc Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 24 Jan 2023 11:24:20 +0100 Subject: [PATCH 87/87] imapsync: fix license Changed from WTFPL to NLPL in upstream 2ca1ed54cb8dc6cb47ab796f23c1d390f562eb76 (version 1.498) --- pkgs/tools/networking/imapsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index 5604145a182e..0fb519ad5af7 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail folder synchronizer between IMAP servers"; homepage = "https://imapsync.lamiral.info/"; - license = licenses.wtfpl; + license = licenses.nlpl; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; };