mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge master into staging-next
This commit is contained in:
commit
8ae069b888
@ -51,6 +51,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).
|
||||
|
29
nixos/modules/programs/minipro.nix
Normal file
29
nixos/modules/programs/minipro.nix
Normal file
@ -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 ];
|
||||
};
|
||||
}
|
@ -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;
|
||||
|
@ -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; {
|
||||
|
@ -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 = ''
|
||||
|
@ -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; [
|
||||
|
@ -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 ]
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.23.3";
|
||||
sha256 = "sha256-dctXh9u5+uGLFIEPkcxDQ/ZM5MJOJzAhNvtSSYBCulQ=";
|
||||
version = "1.23.4";
|
||||
hash = "sha256-1DMA42uySafm7cYLyhsPw3Kguvzi80bXas+2d6h5D8A=";
|
||||
}
|
||||
|
@ -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 = ''
|
||||
|
@ -2,5 +2,5 @@
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.22.1";
|
||||
sha256 = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=";
|
||||
hash = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=";
|
||||
}
|
||||
|
@ -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 = [
|
||||
|
Loading…
Reference in New Issue
Block a user