From 9554582b341104529ffc8baaaa8955635636420e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 3 Apr 2023 12:29:17 +0200 Subject: [PATCH 1/8] nginxMainline: 1.23.3 -> 1.23.4 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 07990338e41f..9d694884625b 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.23.3"; - sha256 = "sha256-dctXh9u5+uGLFIEPkcxDQ/ZM5MJOJzAhNvtSSYBCulQ="; + version = "1.23.4"; + sha256 = "sha256-1DMA42uySafm7cYLyhsPw3Kguvzi80bXas+2d6h5D8A="; } From b7cb74322c663479e5b2382bd88978a5e61b59a1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 3 Apr 2023 12:36:38 +0200 Subject: [PATCH 2/8] fetchhg: allow specifying (sri) hash --- pkgs/build-support/fetchhg/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index b3c28fb0e264..a5817f2c3050 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -4,11 +4,14 @@ , rev ? null , md5 ? null , sha256 ? null +, hash ? null , fetchSubrepos ? false , preferLocalBuild ? true }: if md5 != null then - throw "fetchhg does not support md5 anymore, please use sha256" + throw "fetchhg does not support md5 anymore, please use sha256 or hash" +else if hash != null && sha256 != null then + throw "Only one of sha256 or hash can be set" else # TODO: statically check if mercurial as the https support if the url starts woth https. stdenvNoCC.mkDerivation { @@ -20,9 +23,14 @@ stdenvNoCC.mkDerivation { subrepoClause = lib.optionalString fetchSubrepos "S"; - outputHashAlgo = "sha256"; + outputHashAlgo = if hash != null then null else "sha256"; outputHashMode = "recursive"; - outputHash = sha256; + outputHash = if hash != null then + hash + else if sha256 != null then + sha256 + else + lib.fakeSha256; inherit url rev; inherit preferLocalBuild; From 8be794b197fd5e9146aeb2903044121f362b70fe Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 3 Apr 2023 12:40:49 +0200 Subject: [PATCH 3/8] nginx: sha256 -> hash --- pkgs/servers/http/nginx/generic.nix | 4 ++-- pkgs/servers/http/nginx/mainline.nix | 2 +- pkgs/servers/http/nginx/quic.nix | 2 +- pkgs/servers/http/nginx/stable.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 7d0ab6ac4207..e81b2c68ecd7 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -17,7 +17,7 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , version , nginxVersion ? version , src ? null # defaults to upstream nginx ${version} -, sha256 ? null # when not specifying src +, hash ? null # when not specifying src , configureFlags ? [] , nativeBuildInputs ? [] , buildInputs ? [] @@ -55,7 +55,7 @@ stdenv.mkDerivation { src = if src != null then src else fetchurl { url = "https://nginx.org/download/nginx-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ removeReferencesTo ] diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 9d694884625b..5007defeed1e 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -2,5 +2,5 @@ callPackage ./generic.nix args { version = "1.23.4"; - sha256 = "sha256-1DMA42uySafm7cYLyhsPw3Kguvzi80bXas+2d6h5D8A="; + hash = "sha256-1DMA42uySafm7cYLyhsPw3Kguvzi80bXas+2d6h5D8A="; } diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 7af02ceb0e72..7248ad1c4c0b 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -9,7 +9,7 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; rev = "0af598651e33"; # branch=quic - sha256 = "sha256-rG0jXA+ci7anUxZCBhXZLZKwnTtzzDEAViuoImKpALA="; + hash = "sha256-rG0jXA+ci7anUxZCBhXZLZKwnTtzzDEAViuoImKpALA="; }; preConfigure = '' diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index eb3c90aa7c6c..904cbe3fadc0 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -2,5 +2,5 @@ callPackage ./generic.nix args { version = "1.22.1"; - sha256 = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE="; + hash = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE="; } From f4d36c53a711a5e0096b567928366a9b8b33bfe6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Apr 2023 21:05:07 +0000 Subject: [PATCH 4/8] interactsh: 1.1.0 -> 1.1.2 --- pkgs/tools/misc/interactsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index 75d92050aeed..82719663cf2d 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ELj80stWOwACsCGmjt2QR8TxBFpvlYmVN7hWDPee8YE="; + hash = "sha256-a/rJbBYRERujvy7HBRavLdv7NdG7ofCQec4Ia1WPflc="; }; - vendorHash = "sha256-xm7Iup4+xhcJ+Bzv56A0C3+2Fxz53qY8fqlVsMtFLd8="; + vendorHash = "sha256-YfqprpftCFH+tuEhcK4xWwenjv8BjFhzlTRsy1rz5Ec="; modRoot = "."; subPackages = [ From 0e8dc8b10b501a625d22e355b7ec455bedd257f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Apr 2023 21:13:15 +0200 Subject: [PATCH 5/8] sqlfluff: 2.0.2 -> 2.0.3 Diff: https://github.com/sqlfluff/sqlfluff/compare/refs/tags/2.0.2...2.0.3 Changelog: https://github.com/sqlfluff/sqlfluff/blob/2.0.3/CHANGELOG.md --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 0bdca8889e84..836e1ec50e06 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iutlsB+qZ9/ix/UUnHspppsbiXclolXNcbiTChz3tQk="; + hash = "sha256-PG+4PibJE7mka+1ann88AgqNTI+BeE0IxHpVJRG4Iuk="; }; propagatedBuildInputs = with python3.pkgs; [ From cc46277bf587e589d345a849d48f02b55ae8de6c Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Mon, 27 Mar 2023 17:04:00 -0400 Subject: [PATCH 6/8] nixos/minipro: init Minipro requires a set of udev rules to be installed to work properly. This module installs the package and the udev rules. --- .../manual/release-notes/rl-2305.section.md | 2 ++ nixos/modules/programs/minipro.nix | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 nixos/modules/programs/minipro.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 62f9bfee5353..f5082bf226d7 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -47,6 +47,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [hyprland](https://github.com/hyprwm/hyprland), a dynamic tiling Wayland compositor that doesn't sacrifice on its looks. Available as [programs.hyprland](#opt-programs.hyprland.enable). +- [minipro](https://gitlab.com/DavidGriffith/minipro/), an open source program for controlling the MiniPRO TL866xx series of chip programmers. Available as [programs.minipro](options.html#opt-programs.minipro.enable). + - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). - [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Availabe as [services.xserver.desktopManager.budgie](options.html#opt-services.xserver.desktopManager.budgie). diff --git a/nixos/modules/programs/minipro.nix b/nixos/modules/programs/minipro.nix new file mode 100644 index 000000000000..a947f83f2ee0 --- /dev/null +++ b/nixos/modules/programs/minipro.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.minipro; +in +{ + options = { + programs.minipro = { + enable = lib.mkEnableOption (lib.mdDoc "minipro") // { + description = lib.mdDoc '' + Installs minipro and its udev rules. + Users of the `plugdev` group can interact with connected MiniPRO chip programmers. + ''; + }; + + package = lib.mkPackageOptionMD pkgs "minipro" { }; + }; + }; + + config = lib.mkIf cfg.enable { + users.groups.plugdev = { }; + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + }; + + meta = { + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} From e52b753d2c2539cbbc4bbad5fc43d796b5e9d63c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 8 Apr 2023 15:22:23 +0800 Subject: [PATCH 7/8] v2ray-geoip: 202303272340 -> 202304060040 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 622a2247b2a5..54a0c0320cea 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202303272340"; + version = "202304060040"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "0473ff6f84b7bb926af68238489d05f683b87e1d"; - sha256 = "sha256-76SsWF3jOi+I975C9WNVMGrLqvgtdM48n9bV0jevx3Q="; + rev = "8d65f1d075e077ffc5cdae297795c65f12b37159"; + sha256 = "sha256-RGDHYgecNDcVwa9yXMgjml72QLf14oHtDGCjXOjeF5A="; }; installPhase = '' From 9db789fd83bd06cf3d98e025952e5e428934d306 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 8 Apr 2023 15:23:10 +0800 Subject: [PATCH 8/8] v2ray-domain-list-community: 20230320093818 -> 20230407083123 Diff: https://github.com/v2fly/domain-list-community/compare/20230320093818...20230407083123 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 3ecc56cec5d4..6578160b967c 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230320093818"; + version = "20230407083123"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-KEA3hsrlDs+GpxBrc6CeNwoyXvu1OBJJ8UaB6iwFyyg="; + hash = "sha256-+TOZR8ty4BqjPpzKZtqzfgduRSf4PiHoUUx0eMkV0mk="; }; vendorHash = "sha256-zkf2neI1HiPkCrcw+cYoZ2L/OGkM8HPIv5gUqc05Wak="; meta = with lib; {