From 41120b50de2ce05744dca568418329329f263cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Mon, 1 Aug 2022 16:34:15 +0200 Subject: [PATCH 01/19] qFlipper: use udev rules from upstream instead of inlining them in nixpkgs --- pkgs/tools/misc/qflipper/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index 3a711a1be317..c8d8218cbbd9 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -28,13 +28,6 @@ let timestamp = "99999999999"; commit = "nix-${version}"; - udev_rules = '' - #Flipper Zero serial port - SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5740", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess" - #Flipper Zero DFU - SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", ATTRS{manufacturer}=="STMicroelectronics", TAG+="uaccess" - ''; - in mkDerivation { inherit pname version; @@ -92,9 +85,7 @@ mkDerivation { cp qFlipper-cli $out/bin mkdir -p $out/etc/udev/rules.d - tee $out/etc/udev/rules.d/42-flipperzero.rules << EOF - ${udev_rules} - EOF + cp installer-assets/udev/42-flipperzero.rules $out/etc/udev/rules.d/ ''; passthru.updateScript = nix-update-script { From 08b6da8c089a30d1e8c6d6b3db5e50047d8f89bf Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 10:56:11 +0200 Subject: [PATCH 02/19] konf: init at 0.2.0 --- pkgs/development/tools/konf/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/konf/default.nix diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix new file mode 100644 index 000000000000..846595a9c8e0 --- /dev/null +++ b/pkgs/development/tools/konf/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildGoModule +, fetchFromGitHub }: + +buildGoModule rec { + pname = "konf"; + version = "0.2.0"; + + src = fetchFromGitHub { + rev = "main"; + owner = "SimonTheLeg"; + repo = "konf-go"; + sha256 = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; + }; + + vendorSha256 = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; + + meta = with lib; { + description = "Lightweight and blazing fast kubeconfig manager which allows to use different kubeconfigs at the same time"; + homepage = "https://github.com/SimonTheLeg/konf-go"; + license = licenses.asl20; + maintainers = with maintainers; [ arikgrahl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfe89a1f8613..a0171239287d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15067,6 +15067,8 @@ with pkgs; kona = callPackage ../development/interpreters/kona {}; + konf = callPackage ../development/tools/konf { }; + lolcode = callPackage ../development/interpreters/lolcode { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; From 24a24101223681e6c73671c69f3df9a401f97a54 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 13:37:05 +0200 Subject: [PATCH 03/19] reformat code --- pkgs/development/tools/konf/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index 846595a9c8e0..fa8726b6ea98 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -1,15 +1,16 @@ { lib , buildGoModule -, fetchFromGitHub }: +, fetchFromGitHub +}: buildGoModule rec { pname = "konf"; version = "0.2.0"; src = fetchFromGitHub { - rev = "main"; - owner = "SimonTheLeg"; - repo = "konf-go"; + rev = "main"; + owner = "SimonTheLeg"; + repo = "konf-go"; sha256 = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; }; From fa3e7042dd0eddf339d2e52e8d0d1dedd3de9880 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 13:38:54 +0200 Subject: [PATCH 04/19] use `hash`/`vendorHash` in favor of `sha256`/`vendorSha256` --- pkgs/development/tools/konf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index fa8726b6ea98..44e56541db63 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { rev = "main"; owner = "SimonTheLeg"; repo = "konf-go"; - sha256 = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; + hash = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; }; - vendorSha256 = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; + vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; meta = with lib; { description = "Lightweight and blazing fast kubeconfig manager which allows to use different kubeconfigs at the same time"; From 27dee9344ad3355828d125a187894388d6420117 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 13:40:07 +0200 Subject: [PATCH 05/19] add `ldflags` -s and -w --- pkgs/development/tools/konf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index 44e56541db63..dbae81fdf677 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -16,6 +16,8 @@ buildGoModule rec { vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Lightweight and blazing fast kubeconfig manager which allows to use different kubeconfigs at the same time"; homepage = "https://github.com/SimonTheLeg/konf-go"; From d2e32869962884d5f18f08b372bb1737c55906ba Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 14:21:19 +0200 Subject: [PATCH 06/19] specify version in `rev` --- pkgs/development/tools/konf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index dbae81fdf677..61711a6ebae2 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { version = "0.2.0"; src = fetchFromGitHub { - rev = "main"; + rev = "v${version}"; owner = "SimonTheLeg"; repo = "konf-go"; hash = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; From 20f90d392141a155386ea2143048b4d755d07988 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 6 Sep 2022 21:43:33 +0300 Subject: [PATCH 07/19] lib/systems: add emulatorAvailable ``` nix-repl> pkgsCross.arm-embedded.stdenv.hostPlatform.emulatorAvailable pkgsCross.arm-embedded.buildPackages false nix-repl> pkgsCross.aarch64-multiplatform.stdenv.hostPlatform.emulatorAvailable pkgsCross.aarch64-multiplatform.buildPackages true ``` will be useful for stuff like handling https://github.com/NixOS/nixpkgs/issues/187109 --- lib/systems/default.nix | 69 +++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index eaee4ffa2874..518073863a3e 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -158,38 +158,47 @@ rec { if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET" else if final.isiOS then "IPHONEOS_DEPLOYMENT_TARGET" else null; + } // ( + let + selectEmulator = pkgs: + let + qemu-user = pkgs.qemu.override { + smartcardSupport = false; + spiceSupport = false; + openGLSupport = false; + virglSupport = false; + vncSupport = false; + gtkSupport = false; + sdlSupport = false; + pulseSupport = false; + smbdSupport = false; + seccompSupport = false; + hostCpuTargets = [ "${final.qemuArch}-linux-user" ]; + }; + wine-name = "wine${toString final.parsed.cpu.bits}"; + wine = (pkgs.winePackagesFor wine-name).minimal; + in + if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name && + pkgs.stdenv.hostPlatform.canExecute final + then "${pkgs.runtimeShell} -c '\"$@\"' --" + else if final.isWindows + then "${wine}/bin/${wine-name}" + else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux + then "${qemu-user}/bin/qemu-${final.qemuArch}" + else if final.isWasi + then "${pkgs.wasmtime}/bin/wasmtime" + else if final.isMmix + then "${pkgs.mmixware}/bin/mmix" + else null; + in { + emulatorAvailable = pkgs: (selectEmulator pkgs) != null; - emulator = pkgs: let - qemu-user = pkgs.qemu.override { - smartcardSupport = false; - spiceSupport = false; - openGLSupport = false; - virglSupport = false; - vncSupport = false; - gtkSupport = false; - sdlSupport = false; - pulseSupport = false; - smbdSupport = false; - seccompSupport = false; - hostCpuTargets = ["${final.qemuArch}-linux-user"]; - }; - wine-name = "wine${toString final.parsed.cpu.bits}"; - wine = (pkgs.winePackagesFor wine-name).minimal; - in - if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name && - pkgs.stdenv.hostPlatform.canExecute final - then "${pkgs.runtimeShell} -c '\"$@\"' --" - else if final.isWindows - then "${wine}/bin/${wine-name}" - else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux - then "${qemu-user}/bin/qemu-${final.qemuArch}" - else if final.isWasi - then "${pkgs.wasmtime}/bin/wasmtime" - else if final.isMmix - then "${pkgs.mmixware}/bin/mmix" - else throw "Don't know how to run ${final.config} executables."; + emulator = pkgs: + if (final.emulatorAvailable pkgs) + then selectEmulator pkgs + else throw "Don't know how to run ${final.config} executables."; - } // mapAttrs (n: v: v final.parsed) inspect.predicates + }) // mapAttrs (n: v: v final.parsed) inspect.predicates // mapAttrs (n: v: v final.gcc.arch or "default") architectures.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; From 58fe78b99b167a51acd6ba87ba7c7e47da9cbb85 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Mon, 12 Sep 2022 10:37:31 +0200 Subject: [PATCH 08/19] change order in `fetchFromGitHub` --- pkgs/development/tools/konf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index 61711a6ebae2..9747dbe69616 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -8,9 +8,9 @@ buildGoModule rec { version = "0.2.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "SimonTheLeg"; repo = "konf-go"; + rev = "v${version}"; hash = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; }; From 09bed085c31a9cb12bdf0a59f909e7785555b051 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 11:37:36 +0000 Subject: [PATCH 09/19] clingo: 5.5.2 -> 5.6.0 --- pkgs/applications/science/logic/potassco/clingo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index 41c5eb5733e5..d46efe18c984 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clingo"; - version = "5.5.2"; + version = "5.6.0"; src = fetchFromGitHub { owner = "potassco"; repo = "clingo"; rev = "v${version}"; - sha256 = "sha256-fBf7MRFkd5SfHDQ5OvWx4lP/N716SrF9uY4JF7SiWRk="; + sha256 = "sha256-3qyQ7CnpELs6IsDxrW+IbV/TmlfYxP9VIVVjc7sM9fg="; }; nativeBuildInputs = [ cmake ]; From 1694bba9154099bbf00ac2e710bbb58518a2ed62 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 12 Sep 2022 12:42:23 -0400 Subject: [PATCH 10/19] miniserve: remove unnecessary dependencies, add figsoda as a maintainer --- pkgs/tools/misc/miniserve/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 127d8d9f1aec..2b410f9c3bb1 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -1,11 +1,8 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , installShellFiles -, pkg-config -, zlib -, libiconv +, stdenv , Security }: @@ -24,12 +21,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - pkg-config - zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ - libiconv Security ]; @@ -51,9 +45,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; + changelog = "https://github.com/svenstaro/miniserve/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + maintainers = with maintainers; [ figsoda ]; # https://hydra.nixos.org/build/162650896/nixlog/1 broken = stdenv.isDarwin && stdenv.isAarch64; }; From f44aef1c16ee43ff4b4a65e4081a69154e30a31a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 12 Sep 2022 16:12:15 -0300 Subject: [PATCH 11/19] cargo-valgrind: 2.0.3 -> 2.1.0 Signed-off-by: Otavio Salvador --- .../tools/rust/cargo-valgrind/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index ac54657c8af0..b21db0d6205f 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; - rev = version; - sha256 = "sha256-PEGDao010COqSJGha7GQvR7vNOV+C7faduijVNjB5DE="; + rev = "v${version}"; + sha256 = "sha256-FCz15kMSKckifYWSTMGqJbRpZ8X/AM5dSw46dg8ERcY="; }; - cargoSha256 = "sha256-00WUYrkKKJOEN9jXKQ3YraTq89U+3djdvLRuZSbeNHk="; + cargoSha256 = "sha256-csSUe2qUIN2xKOMHWyM56FZyCwKPdfAI0NrFiDOtRiE="; passthru = { updateScript = nix-update-script { @@ -31,8 +31,10 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]} ''; - # Disable check phase as there are failures (2 tests fail) - doCheck = false; + checkFlags = [ + "--skip examples_are_runnable" + "--skip tests_are_runnable" + ]; meta = with lib; { description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner''; From 8efd0a822e65173143a3655ec565075c71a545f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 03:13:03 +0000 Subject: [PATCH 12/19] apacheHttpdPackages.mod_wsgi: 4.9.3 -> 4.9.4 --- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index cc24797ceb82..b23de4114a5e 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mod_wsgi"; - version = "4.9.3"; + version = "4.9.4"; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = "mod_wsgi"; rev = version; - hash = "sha256-P/mx0JxlJGpel0zBFIe8r313VkwPEK2LP0kiUIwKZAM="; + hash = "sha256-6rRHdgdTb94kqIpWJOJOwoIsaXb/c4XY3q331GwQyf0="; }; buildInputs = [ apacheHttpd python ncurses ]; From e8f50f90a71cc977bd8534ff7ee6b08d5c5e1f84 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Tue, 13 Sep 2022 11:22:26 +0200 Subject: [PATCH 13/19] promql-cli: init at 0.2.1 --- pkgs/tools/misc/promql-cli/default.nix | 31 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/promql-cli/default.nix diff --git a/pkgs/tools/misc/promql-cli/default.nix b/pkgs/tools/misc/promql-cli/default.nix new file mode 100644 index 000000000000..8bb8222c5df0 --- /dev/null +++ b/pkgs/tools/misc/promql-cli/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "promql-cli"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "nalbury"; + repo = pname; + rev = "v${version}"; + hash = "sha256-uuoUvEBnLxopdt6u4vX6pYnuyOATwJFJo9ozQ9jhSyo="; + }; + + vendorHash = "sha256-OLkOyeLyBnNmijNYFrXIZ4nbOvV/65KIKjOFOVS9Yiw="; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + mv -v $out/bin/promql-cli $out/bin/promql + ''; + + meta = with lib; { + description = "Command-line tool to query a Prometheus server with PromQL and visualize the output"; + homepage = "https://github.com/nalbury/promql-cli"; + license = licenses.asl20; + maintainers = with maintainers; [ arikgrahl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57899333238b..50cdbf10988f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23563,6 +23563,8 @@ with pkgs; liquibase_redshift_extension = callPackage ../development/java-modules/liquibase_redshift_extension { }; + promql-cli = callPackage ../tools/misc/promql-cli { }; + prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; From 6480fd8731a9e67d805ada7067ee05702b82911e Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Tue, 13 Sep 2022 11:49:31 +0200 Subject: [PATCH 14/19] grafterm: init at 0.2.0 --- pkgs/tools/misc/grafterm/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/grafterm/default.nix diff --git a/pkgs/tools/misc/grafterm/default.nix b/pkgs/tools/misc/grafterm/default.nix new file mode 100644 index 000000000000..f21a8ba76fc5 --- /dev/null +++ b/pkgs/tools/misc/grafterm/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "grafterm"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "slok"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0pM36rAmwx/P1KAlmVaGoSj8eb9JucYycNC2R867dVo="; + }; + + vendorHash = "sha256-veg5B68AQhkSZg8YA/e4FbqJNG0YGwnUQFsAdscz0QI="; + + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + + meta = with lib; { + description = "Command-line tool for rendering metrics dashboards inspired by Grafana"; + homepage = "https://github.com/slok/grafterm"; + license = licenses.asl20; + maintainers = with maintainers; [ arikgrahl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57899333238b..f7638880cce4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7158,6 +7158,8 @@ with pkgs; gptfdisk = callPackage ../tools/system/gptfdisk { }; + grafterm = callPackage ../tools/misc/grafterm { }; + grafx2 = callPackage ../applications/graphics/grafx2 {}; grails = callPackage ../development/web/grails { jdk = null; }; From f10dda1a3340eaabe6d0d1a16e8460f963663b68 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 12 Sep 2022 21:08:33 +0300 Subject: [PATCH 15/19] =?UTF-8?q?tippecanoe:=201.36.0=20=E2=86=92=202.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/tippecanoe/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index e92636bad20f..d6fc4910e857 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, zlib, perl }: +{ lib, stdenv, fetchFromGitHub, sqlite, zlib, perl, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "1.36.0"; + version = "2.6.0"; src = fetchFromGitHub { - owner = "mapbox"; - repo = pname; - rev = version; - sha256 = "0lbmhly4ivnqc6qk1k3sdqvsg6x3nfd8gnjx846bhqj4wag3f88m"; + owner = "felt"; + repo = "tippecanoe"; + rev = finalAttrs.version; + hash = "sha256-58/FS5nxzK5JSc0D1KXooSjrKMdOnpF7dvwAK9rUZZk="; }; buildInputs = [ sqlite zlib ]; @@ -19,12 +19,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; + }; + meta = with lib; { - broken = stdenv.isDarwin || stdenv.isAarch64; description = "Build vector tilesets from large collections of GeoJSON features"; - homepage = "https://github.com/mapbox/tippecanoe"; + homepage = "https://github.com/felt/tippecanoe"; license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; }; -} +}) From 690870048a59f4bdef68a49b8f60715ac02a4b37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 Sep 2022 17:14:06 +0200 Subject: [PATCH 16/19] python311Packages.mypy_extensions: Skip failing test --- .../python-modules/mypy/extensions.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index 37257efe5edc..ba0a079fee1d 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -2,7 +2,8 @@ , fetchFromGitHub , buildPythonPackage , typing -, unittestCheckHook +, pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -19,11 +20,23 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; - checkInputs = [ unittestCheckHook ]; + # make the testsuite run with pytest, so we can disable individual tests + checkInputs = [ + pytestCheckHook + ]; - unittestFlagsArray = [ "tests" ]; + pytestFlagsArray = [ + "tests/testextensions.py" + ]; - pythonImportsCheck = [ "mypy_extensions" ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/python/mypy_extensions/issues/24 + "test_typeddict_errors" + ]; + + pythonImportsCheck = [ + "mypy_extensions" + ]; meta = with lib; { description = "Experimental type system extensions for programs checked with the mypy typechecker"; From 8fc29621b7ff0f85ee1b6790f926bec066eb8d2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 Sep 2022 18:20:15 +0200 Subject: [PATCH 17/19] python3Packages.mypy: 0.961 -> 0.971 https://mypy-lang.blogspot.com/2022/07/mypy-0971-released.html --- .../python-modules/mypy/default.nix | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 7d2df7e316ba..a517427d8033 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -1,50 +1,58 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch +, attrs , buildPythonPackage +, filelock +, lxml , mypy-extensions +, psutil +, py +, pytest-forked +, pytest-xdist +, pytestCheckHook , python , pythonOlder +, six , typed-ast , typing-extensions , tomli , types-typed-ast +, virtualenv }: buildPythonPackage rec { pname = "mypy"; - version = "0.961"; - disabled = pythonOlder "3.6"; + version = "0.971"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python"; repo = "mypy"; - rev = "v${version}"; - hash = "sha256-K6p73+/SeWniMSD/mP09qwqFOBr/Pqohl+PaTDVpvZI="; + rev = "refs/tags/v${version}"; + hash = "sha256-J1lUnJco9rLYgFpJkfujGfVq1CfC4pdvvDzoan3jGkU="; }; - patches = [ - # FIXME: Remove patch after upstream has decided the proper solution. - # https://github.com/python/mypy/pull/11143 - (fetchpatch { - url = "https://github.com/python/mypy/commit/2004ae023b9d3628d9f09886cbbc20868aee8554.patch"; - hash = "sha256-y+tXvgyiECO5+66YLvaje8Bz5iPvfWNIBJcsnZ2nOdI="; - }) - ]; - - buildInputs = [ + nativeBuildInputs = [ types-typed-ast ]; propagatedBuildInputs = [ mypy-extensions - tomli - typed-ast typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] ++ lib.optionals (pythonOlder "3.8") [ + typed-ast ]; - # Tests not included in pip package. + passthru.optional-dependencies = { + dmypy = [ psutil ]; + reports = [ lxml ]; + }; + + # TODO: enable tests doCheck = false; pythonImportsCheck = [ From f650d568111b4c4bf5276a14db4e2b26e3c1fa8a Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 13 Sep 2022 11:16:28 -0400 Subject: [PATCH 18/19] vimPlugins.nvim-colorizer-lua: switch to maintained fork --- pkgs/applications/editors/vim/plugins/generated.nix | 10 +++++----- pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9ed7903e2826..5b473ef8c49c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5255,14 +5255,14 @@ final: prev: nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer.lua"; - version = "2020-06-11"; + version = "2022-09-10"; src = fetchFromGitHub { - owner = "norcalli"; + owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6"; - sha256 = "0gvqdfkqf6k9q46r0vcc3nqa6w45gsvp8j4kya1bvi24vhifg2p9"; + rev = "2664070cd04f2b9f803a10dd328a562be8ab15ca"; + sha256 = "16myjv2hrqr2kk14mqidyrhdnz1i3p00yf0w97f4kxrdd158p1nz"; }; - meta.homepage = "https://github.com/norcalli/nvim-colorizer.lua/"; + meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; nvim-comment = buildVimPluginFrom2Nix { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4708e3c2c9bd..92910fdff010 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -442,7 +442,7 @@ https://github.com/ojroques/nvim-bufdel/,, https://github.com/roxma/nvim-cm-racer/,, https://github.com/hrsh7th/nvim-cmp/,, https://github.com/weilbith/nvim-code-action-menu/,, -https://github.com/norcalli/nvim-colorizer.lua/,, +https://github.com/nvchad/nvim-colorizer.lua/,, https://github.com/terrortylor/nvim-comment/,, https://github.com/hrsh7th/nvim-compe/,, https://github.com/roxma/nvim-completion-manager/,, From b79b08f09da27e35d1a7b5e63e6aba213224436a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 14 Sep 2022 00:34:19 +0100 Subject: [PATCH 19/19] apacheHttpdPackages.mod_wsgi: enable on darwin --- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index b23de4114a5e..7185b1c81270 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/GrahamDumpleton/mod_wsgi"; description = "Host Python applications in Apache through the WSGI interface"; license = lib.licenses.asl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }