colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-03-22 12:02:02 +00:00 committed by GitHub
commit e452d308f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
90 changed files with 489 additions and 436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nixos/modules/services/networking/iwd.nix
View File

@ -1,12 +1,21 @@
{ config, lib, pkgs, ... }:
with lib;
let
inherit (lib)
mkEnableOption mkIf mkOption types
recursiveUpdate;
cfg = config.networking.wireless.iwd;
ini = pkgs.formats.ini { };
configFile = ini.generate "main.conf" cfg.settings;
in {
defaults = {
# without UseDefaultInterface, sometimes wlan0 simply goes AWOL with NetworkManager
# https://iwd.wiki.kernel.org/interface_lifecycle#interface_management_in_iwd
General.UseDefaultInterface = with config.networking.networkmanager; (enable && (wifi.backend == "iwd"));
};
configFile = ini.generate "main.conf" (recursiveUpdate defaults cfg.settings);
in
{
options.networking.wireless.iwd = {
enable = mkEnableOption "iwd";
@ -38,10 +47,10 @@ in {
'';
}];
environment.etc."iwd/main.conf".source = configFile;
environment.etc."iwd/${configFile.name}".source = configFile;
# for iwctl
environment.systemPackages = [ pkgs.iwd ];
environment.systemPackages = [ pkgs.iwd ];
services.dbus.packages = [ pkgs.iwd ];

6
pkgs/applications/blockchains/trezor-suite/default.nix
View File

@ -8,7 +8,7 @@
let
pname = "trezor-suite";
version = "22.1.1";
version = "22.3.2";
name = "${pname}-${version}";
suffix = {
@ -19,8 +19,8 @@ let
src = fetchurl {
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
aarch64-linux = "sha512-hRPwhKdAqiHmsaIuNm5r3ZuKhUh+IipR5/5N/9PwiLEfaSQRWink0dUwyuUoWzy4DyGabLQyIWbQRvR7eRGKJA==";
x86_64-linux = "sha512-W4S7W4TeDtSwWCj6N6EoJJOCYG3m1pK3D+UPlsp7B7VY/0uBtI31+tS28E6TUgXZUttr8IIbqzJYWCuyLfDthQ==";
aarch64-linux = "sha512-GW8wmfTjuWrXijyPKeDJgF+mas1pfEMgAASmlvCURfFwg+oSL0B/0Z2qm5QRXIHmyd7eg/Zd8nEZL7Fg2Lb9ww==";
x86_64-linux = "sha512-/XQ/sI0TP++3KHlkBXLHe/SVGKcmyjT7vPkV0NCK4rlL70VE+wKLKQK6XKp4V81B5w2+3a/uPOWtmcVr5iVkSA==";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

2
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
View File

@ -3,8 +3,8 @@
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
stdenv.mkDerivation {
version = "0.2.1";
pname = "lightdm-enso-os-greeter";
version = "0.2.1";
src = fetchFromGitHub {
owner = "nick92";

3
pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix
View File

@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
find "$d" \( -type d -or \( -type f -executable \) \) -execdir chmod 755 {} +
find "$d" -type f -not -executable -execdir chmod 644 {} +
makeWrapper ${emacs}/bin/emacs $out/bin/emacspeak \
--set DTK_PROGRAM "${espeak-ng}/bin/espeak" \
--set DTK_PROGRAM "${placeholder "out"}/share/emacs/site-lisp/emacspeak/servers/espeak" \
--set TCLLIBPATH "${tclx}/lib" \
--add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"'
'';

4
pkgs/applications/misc/koreader/default.nix
View File

@ -13,12 +13,12 @@
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
in stdenv.mkDerivation rec {
pname = "koreader";
version = "2022.02";
version = "2022.03";
src = fetchurl {
url =
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
sha256 = "sha256-gR81ZN0N3bmvLVqwUanXTrpBnzhPZT0bo4J8VOfaJh8=";
sha256 = "sha256-xR92sCeP7wcYukUGxoG9LQyk4k/qkmnxqmjY4Umt05I=";
};
sourceRoot = ".";

6
pkgs/applications/misc/taskwarrior-tui/default.nix
View File

@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec {
pname = "taskwarrior-tui";
version = "0.20.1";
version = "0.21.0";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "taskwarrior-tui";
rev = "v${version}";
sha256 = "sha256-NE0GKQ3ROD+AF5FCuaKJ+8g+wiYobVK8swK0F9jo2Lk=";
sha256 = "sha256-HHYObAeJtryZWRV3T+FXRz0TgBIfw/kVL9jwaQmZcEA=";
};
# Because there's a test that requires terminal access
doCheck = false;
cargoSha256 = "sha256-hO5rff3bm8g3JYh5vFhj2L3f/hOgP0ZA0EhO3YF5DFw=";
cargoSha256 = "sha256-oRREvqQLigpfpnTJgVZjAwAvmUs9YSZm+D5xyFYvdb4=";
meta = with lib; {
description = "A terminal user interface for taskwarrior ";

44
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -1,26 +1,25 @@
{ lib, buildGoModule, fetchFromGitHub, packr, makeWrapper, installShellFiles, helm, kustomize }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "argocd";
version = "2.2.5";
commit = "8f981ccfcf942a9eb00bc466649f8499ba0455f5";
version = "2.3.1";
tag = "v${version}";
# Update commit to match the tag above
# TODO make updadeScript
commit = "b65c1699fa2a2daa031483a3890e6911eac69068";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = tag;
sha256 = "sha256-wSvDoRHV4BObRL8lEpHt9oGXNB06LXdIYasRYqmM5QA=";
sha256 = "sha256-YijhJz7m5wy8kR9V6IHSNYjiWh7H2ph6il9nMsrePOE=";
};
vendorSha256 = "sha256-BVhts+gOM6nhcR1lkFzy7OJnainLXw5YdeseBBRF2xE=";
vendorSha256 = "sha256-uA9sOMuVHKRRhSGoLyoKcUYU6NxtprVUITvVC+tot1g=";
nativeBuildInputs = [ packr makeWrapper installShellFiles ];
# run packr to embed assets
preBuild = ''
packr
'';
# Set target as ./cmd per release-cli
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L222
subPackages = [ "cmd" ];
ldflags =
let package_url = "github.com/argoproj/argo-cd/v2/common"; in
@ -33,20 +32,7 @@ buildGoModule rec {
"-X ${package_url}.gitTreeState=clean"
];
# Test is disabled because ksonnet is missing from nixpkgs.
# Log: https://gist.github.com/superherointj/79cbdc869dfd44d28a10dc6746ecb3f9
doCheck = false;
checkInputs = [
helm
kustomize
#ksonnet
];
doInstallCheck = true;
installCheckPhase = ''
$out/bin/argocd version --client | grep ${tag} > /dev/null
$out/bin/argocd-util version --client | grep ${tag} > /dev/null
'';
nativeBuildInputs = [ installShellFiles ];
installPhase = ''
runHook preInstall
@ -55,10 +41,12 @@ buildGoModule rec {
runHook postInstall
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/argocd version --client | grep ${tag} > /dev/null
'';
postInstall = ''
for appname in argocd-util argocd-server argocd-repo-server argocd-application-controller argocd-dex ; do
makeWrapper $out/bin/argocd $out/bin/$appname --set ARGOCD_BINARY_NAME $appname
done
installShellCompletion --cmd argocd \
--bash <($out/bin/argocd completion bash) \
--zsh <($out/bin/argocd completion zsh)

4
pkgs/applications/networking/cluster/driftctl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "driftctl";
version = "0.23.2";
version = "0.24.0";
src = fetchFromGitHub {
owner = "snyk";
repo = "driftctl";
rev = "v${version}";
sha256 = "sha256-hGwQdR2LF1uuq11d2BD4hVjcXpPCbRNovOqJpj0J1Sw=";
sha256 = "sha256-jKaJqmJMOz+2pWXTgVtnJbYbikdTfW8nWQJKWVxqv5I=";
};
vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E=";

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.36.2";
version = "0.36.6";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Iv9ZQoU/mMYdxBuPfoYc/zQXQ14FmDBfoFwxnESC6Ns=";
sha256 = "sha256-WSvdv4E/m6mJZdo3s9FHMETKaYNB7mltWrQlTHTFJ/E=";
};
vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg=";

6
pkgs/applications/networking/juju/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
version = "2.9.26";
version = "2.9.27";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
sha256 = "sha256-phzjjW9KG0Z5WAzxtYdI7i2Nw4FHVNeEJswQreHga4M=";
sha256 = "sha256-4G+veQkPY6n/uRMsBWQgig/6IDc0Y2nXDpMUyC1ShF4=";
};
vendorSha256 = "sha256-Jzd6I3a/2Un2a3/T2vzFuHwe9Y3eGEvfpZWSwjWokM0=";
vendorSha256 = "sha256-Ieaf+Qp/7/6nv2ftHY3pbtOg+t7dYAuMv4BvhRaAZ9E=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;

6
pkgs/applications/networking/sync/desync/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "desync";
version = "0.9.0";
version = "0.9.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "folbricht";
repo = "desync";
sha256 = "0j9hixgkja268r2zn2dglrmlrb2z57sgz6q3wqb8dfwpan7b5rsy";
sha256 = "sha256-yGlf6Z38GnOWSc2pvt/u4arx5lCB0QpoqPdNamdL9b0=";
};
vendorSha256 = "1gajh99jb6mbwk93dypddhl7r7n8h2s11s3s82firbrb5k24s4pz";
vendorSha256 = "sha256-c+Sz3WMKyzdEE/Hs+7dekQPn+62ddbmfvV21W0KeLDU=";
# nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad.
doCheck = false;

1
pkgs/applications/office/libreoffice/default.nix
View File

@ -110,6 +110,7 @@ in (mkDrv rec {
'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++'
'' + lib.optionalString kdeIntegration ''
substituteInPlace configure.ac \
--replace kcoreaddons_version.h KCoreAddons/kcoreaddons_version.h \
--replace '$QT5INC' ${qtbase.dev}/include \
--replace '$QT5LIB' ${qtbase.out}/lib \
--replace '-I$qt5_incdir ' '-I${qtx11extras.dev}/include '\

4
pkgs/applications/virtualization/docker/buildx.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-buildx";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "docker";
repo = "buildx";
rev = "v${version}";
sha256 = "sha256-PSqVe4m2na6BjNxIKKZG1ja6zEzwI2AwgJlaMfaW2EM=";
sha256 = "sha256-NJNFjzbiBcmXcBF1k0qybv5LnkaQ+1ehSfF18CC85JY=";
};
vendorSha256 = null;

2
pkgs/build-support/fetchipfs/default.nix
View File

@ -17,8 +17,6 @@
, preferLocalBuild ? true
}:
assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0;
let
hasHash = (outputHash != "" && outputHashAlgo != "")

2
pkgs/build-support/fetchurl/default.nix
View File

@ -100,8 +100,6 @@ in
, nativeBuildInputs ? [ ]
}:
assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0;
let
urls_ =
if urls != [] && url == "" then

6
pkgs/build-support/nix-gitignore/default.nix
View File

@ -12,11 +12,6 @@ with builtins;
let
debug = a: trace a a;
last = l: elemAt l ((length l) - 1);
throwIfOldNix = let required = "2.0"; in
if compareVersions nixVersion required == -1
then throw "nix (v${nixVersion} =< v${required}) is too old for nix-gitignore"
else true;
in rec {
# [["good/relative/source/file" true] ["bad.tmpfile" false]] -> root -> path
filterPattern = patterns: root:
@ -31,7 +26,6 @@ in rec {
# string -> [[regex bool]]
gitignoreToPatterns = gitignore:
assert throwIfOldNix;
let
# ignore -> bool
isComment = i: (match "^(#.*|$)" i) != null;

2
pkgs/development/compilers/gcc/10/default.nix
View File

@ -14,7 +14,7 @@
# we can't rebuild those without also rebuilding the compiler itself,
# we opt to always build everything unlike our usual policy.
enableShared ? true
, enableLTO ? true
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf

2
pkgs/development/compilers/gcc/11/default.nix
View File

@ -14,7 +14,7 @@
# we can't rebuild those without also rebuilding the compiler itself,
# we opt to always build everything unlike our usual policy.
enableShared ? true
, enableLTO ? true
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf

2
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -14,7 +14,7 @@
# we can't rebuild those without also rebuilding the compiler itself,
# we opt to always build everything unlike our usual policy.
enableShared ? true
, enableLTO ? true
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf

2
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -14,7 +14,7 @@
# we can't rebuild those without also rebuilding the compiler itself,
# we opt to always build everything unlike our usual policy.
enableShared ? true
, enableLTO ? true
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf

2
pkgs/development/compilers/gcc/6/default.nix
View File

@ -15,7 +15,7 @@
# we can't rebuild those without also rebuilding the compiler itself,
# we opt to always build everything unlike our usual policy.
enableShared ? true
, enableLTO ? true
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, flex
, perl ? null # optional, for texi2pod (then pod2man); required for Java

2
pkgs/development/compilers/gcc/7/default.nix
View File

@ -13,7 +13,7 @@
# we can't rebuild those without also rebuilding the compiler itself,
# we opt to always build everything unlike our usual policy.
enableShared ? true
, enableLTO ? true
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf

2
pkgs/development/compilers/gcc/8/default.nix
View File

@ -13,7 +13,7 @@
# we can't rebuild those without also rebuilding the compiler itself,
# we opt to always build everything unlike our usual policy.
enableShared ? true
, enableLTO ? true
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf

2
pkgs/development/compilers/gcc/9/default.nix
View File

@ -15,7 +15,7 @@
# we can't rebuild those without also rebuilding the compiler itself,
# we opt to always build everything unlike our usual policy.
enableShared ? true
, enableLTO ? true
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf

4
pkgs/development/interpreters/clojure/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.3.1087";
version = "1.10.3.1093";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-prOzVHrcbabKXP4Q4Dfx/eiKePlINyu1mO9NCFnaPpQ=";
sha256 = "sha256-H6cMwsgWAjsg1YRtm0X/FA3Gjy1yEidsgkFE32Xgdso=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/asyncsleepiq/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "asyncsleepiq";
version = "1.1.2";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ZpxiFV9Ch46vIDxNDYm0BBD5EY8+j8AzOu6lKsQpGrY=";
sha256 = "sha256-bE9eOjOLERnioOunIBN7Hc/Nvs1zDXMSMzqZsVRg6Jo=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/blinkpy/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "blinkpy";
version = "0.18.0";
version = "0.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fronzbot";
repo = "blinkpy";
rev = "v${version}";
hash = "sha256-96HoGXVQE5PbUbu0oDOC0es0HXYig4ScTeexiUhGse4=";
hash = "sha256-niUGfktP1zVdrRCDy81ou4yAoscnYveHje9423IKcso=";
};
propagatedBuildInputs = [

13
pkgs/development/python-modules/editorconfig/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchgit
, fetchFromGitHub
, cmake
}:
@ -8,11 +8,12 @@ buildPythonPackage rec {
pname = "editorconfig";
version = "0.12.3";
# fetchgit used to ensure test submodule is available
src = fetchgit {
url = "https://github.com/editorconfig/editorconfig-core-py";
rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged
sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-core-py";
rev = "v${version}";
sha256 = "sha256-KwfGWc2mYhUP6SN4vhIO0eX0dasBRC2LSeLEOA/NqG8=";
fetchSubmodules = true;
};
nativeBuildInputs = [

4
pkgs/development/python-modules/hahomematic/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "0.38.2";
version = "0.38.4";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-oyO4+zxyhr2azUdeNfw0WjgN6LFxi3+svJ/B/tUEqjQ=";
sha256 = "sha256-WvcQTaYlKTOYbYwH/FbNTMoHdUhesYeeNYP8RDgQms4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/ibm-watson/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "ibm-watson";
version = "5.3.1";
version = "6.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "watson-developer-cloud";
repo = "python-sdk";
rev = "v${version}";
sha256 = "1x6r8j0xyi81jb0q4pzr6l7aglykrwqz8nw45clv79v33i2sgdcs";
sha256 = "sha256-AvWcw1VV47v2yvaqukPSql7rA7wVwrvtCDsvYtPZXKs=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/meshtastic/default.nix
View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "1.2.92";
version = "1.2.93";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
sha256 = "sha256-tK711Lewr5Zc6dy/cDe9UEnq9zOEvuJg4mZyO3zBLR0=";
sha256 = "sha256-4jh5AYjr1qnr3nOeJSLwtAzdPlmpW1BBrEXfB86NrL0=";
};
propagatedBuildInputs = [

9
pkgs/development/python-modules/mutag/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchgit
, fetchFromGitHub
, isPy3k
, pyparsing
}:
@ -10,10 +10,11 @@ buildPythonPackage {
version = "0.0.2-2ffa0258ca";
disabled = ! isPy3k;
src = fetchgit {
url = "https://github.com/aroig/mutag.git";
sha256 = "0axdnwdypfd74a9dnw0g25m16xx1yygyl828xy0kpj8gyqdc6gb1";
src = fetchFromGitHub {
owner = "aroig";
repo = "mutag";
rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2";
sha256 = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs=";
};
propagatedBuildInputs = [ pyparsing ];

4
pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysigma-pipeline-sysmon";
version = "0.1.2";
version = "0.1.3";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-pipeline-sysmon";
rev = "v${version}";
hash = "sha256-Y9X9/ynrfs4gVTLl7pOvK3TH2Eh2vNF1S6Cnt3tByJM=";
hash = "sha256-uJgV7emBqQN792EvfOz85BKoZY8DCCr8aUN7Ai8R9js=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pyskyqhub/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyskyqhub";
version = "0.1.4";
version = "0.1.6";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "RogerSelwyn";
repo = "skyq_hub";
rev = version;
sha256 = "EVkTvynMPmCr7DPuDqfpMvVPCvpPpJHfqsNjD3tn8zg=";
sha256 = "sha256-Qc7mb51KKGLNWjeiJKAsFO/RNLefv0sRHWwXodMBi/k=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pytest-cases/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pytest-cases";
version = "3.6.10";
version = "3.6.11";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-W8Syxgl/lPqDX2zdzvpk3Q/0aNBWM8JeUOXGDBYyamM=";
sha256 = "sha256-9rcXPoGxR3sxX3tFbv1O/T7kfrKnIB2XV1mJvSH5WQ4=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/python-kasa/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "python-kasa";
version = "0.4.1";
version = "0.4.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-4e9jpUDorZlKCYwWtqrba61zbkJl57oWUhEpFcaS9ak=";
sha256 = "sha256-5Ohks3yfqAAe+CiLEucibezmibl6TtktDXMHAhecXzA=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pyvesync/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pyvesync";
version = "1.4.3";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-DEDgZXMQrINYImXaWmv/7W7q8RvqK8oMG/B2XsDdZDM=";
sha256 = "sha256-+054tFirjMF3sGLRpTVCZ3V2KN627b57+fFl6GBMMcU=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/samplerate/default.nix
View File

@ -2,16 +2,18 @@
, buildPythonPackage
, numpy
, pkgs
, fetchFromGitHub
}:
buildPythonPackage {
pname = "scikits.samplerate";
version = "0.3.3";
src = pkgs.fetchgit {
url = "https://github.com/cournape/samplerate";
src = fetchFromGitHub {
owner = "cournape";
repo = "samplerate";
rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210";
sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg";
sha256 = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU=";
};
buildInputs = [ pkgs.libsamplerate ];

10
pkgs/development/python-modules/svg2tikz/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchgit
, fetchFromGitHub
, lxml
, isPy27
}:
@ -12,10 +12,12 @@ buildPythonPackage {
propagatedBuildInputs = [ lxml ];
src = fetchgit {
url = "https://github.com/kjellmf/svg2tikz";
sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f";
src = fetchFromGitHub {
owner = "kjellmf";
repo = "svg2tikz";
rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4";
sha256 = "sha256-QpQo7ENeU2crhc37uJu4rw/5+COPXQWXBynlF30lLV8=";
fetchSubmodules = true;
};
meta = with lib; {

27
pkgs/development/tools/analysis/tfsec/default.nix
View File

@ -1,31 +1,38 @@
{ lib
, buildGoPackage
, buildGoModule
, fetchFromGitHub
}:
buildGoPackage rec {
buildGoModule rec {
pname = "tfsec";
version = "1.2.1";
version = "1.13.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KIS2o2pLus5aohRYsabWRxZs4KfYM6PXSNp0JZhhlZk=";
sha256 = "sha256-/N8p/tw97sDW4I1ysfJ2QXACGsSc5nRFSu6jHwQvPU4=";
};
goPackagePath = "github.com/aquasecurity/tfsec";
ldflags = [
"-w"
"-s"
"-X ${goPackagePath}/version.Version=${version}"
"-s" "-w"
"-X github.com/aquasecurity/tfsec/version.Version=${version}"
## not sure if this is needed (https://github.com/aquasecurity/tfsec/blob/master/.goreleaser.yml#L6)
# "-extldflags '-fno-PIC -static'"
];
vendorSha256 = "sha256-nTma96kT84mpJHRA9+/sZQVvwtz9arv/OHY9lgWJDFc=";
subPackages = [
"cmd/tfsec"
"cmd/tfsec-docs"
"cmd/tfsec-checkgen"
];
meta = with lib; {
description = "Static analysis powered security scanner for terraform code";
homepage = "https://github.com/aquasecurity/tfsec";
license = licenses.mit;
maintainers = with maintainers; [ fab marsam ];
maintainers = with maintainers; [ fab marsam peterromfeldhk ];
};
}

6
pkgs/development/tools/buf/default.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "buf";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "bufbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8GwZsFvxaTtG/q7DaWvZcGdbyJ4Cm41BqSvwq3SqoEg=";
sha256 = "sha256-w/P9pNHxaBRlAly5jE7I0JsjjFeDctFaXOTbzDESaCo=";
};
vendorSha256 = "sha256-g3bvfNF0XkC12/tRZsO+o2z20w+riWiHOer8Pzp1QF0=";
vendorSha256 = "sha256-AM/MN4vdcsHEbYdOEuVOvkMCdMDnk2UiW5vUnXcj+wY=";
patches = [
# Skip a test that requires networking to be available to work.

4
pkgs/development/tools/frugal/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "frugal";
version = "3.14.15";
version = "3.15.0";
src = fetchFromGitHub {
owner = "Workiva";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7840HndsU5+mWKQ/HXLVYA2dV7L8NlM7so1nk8Zdc2c=";
sha256 = "sha256-EIHaCkqwCyRV1sX+9f39FbByRvhms4rJA9nQoKxxkm8=";
};
subPackages = [ "." ];

14
pkgs/development/tools/go-repo-root/default.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "go-repo-root";
version = "20140911-${lib.strings.substring 0 7 rev}";
rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
version = "unstable-2014-09-11";
goPackagePath = "github.com/cstrahan/go-repo-root";
src = fetchgit {
inherit rev;
url = "https://github.com/cstrahan/go-repo-root";
sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
src = fetchFromGitHub {
owner = "cstrahan";
repo = "go-repo-root";
rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
sha256 = "sha256-5FVELoUq34KjBl1kzYpExDQFvH2PYQ+dbUOBLSe6n+Y=";
};
goDeps = ./deps.nix;

6
pkgs/development/tools/gosec/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gosec";
version = "2.10.0";
version = "2.11.0";
src = fetchFromGitHub {
owner = "securego";
repo = pname;
rev = "v${version}";
sha256 = "sha256-a3MDGsTqndHlT6fbUkdsBShDqWXOHQiJFUIjyMqvMq8=";
sha256 = "sha256-AYD45L1FFT/S1toLK489C2TTasTHVXIs4Tf7TLOaye0=";
};
vendorSha256 = "sha256-3ZGzVGKwnNab8wUn0fRepl4FDo43MAqNAO3zijH90/0=";
vendorSha256 = "sha256-zzbINVp8EA5aIvwUiFlQRtD6YL0iytbgVzCHbo+clYI=";
subPackages = [
"cmd/gosec"

14
pkgs/development/tools/gotags/default.nix
View File

@ -1,15 +1,15 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "gotags";
version = "20150803-${lib.strings.substring 0 7 rev}";
rev = "be986a34e20634775ac73e11a5b55916085c48e7";
version = "unstable-2015-08-03";
goPackagePath = "github.com/jstemmer/gotags";
src = fetchgit {
inherit rev;
url = "https://github.com/jstemmer/gotags";
sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja";
src = fetchFromGitHub {
owner = "jstemmer";
repo = "gotags";
rev = "be986a34e20634775ac73e11a5b55916085c48e7";
sha256 = "sha256-Su7AA6HCdeZai8+yRSKzlrgXvsSEgrXGot2ABRL2PBw=";
};
}

10
pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, base, containers, fetchgit, hedgehog, lib
{ mkDerivation, base, containers, fetchFromGitHub, hedgehog, lib
, optparse-applicative, parsec, template-haskell, text
}:
mkDerivation {
pname = "dconf2nix";
version = "0.0.11";
src = fetchgit {
url = "https://github.com/gvolpe/dconf2nix.git";
sha256 = "1kv88bxi7l5kcm66m5y85b8fz1zsdshvw37k715g2biwa0an5s6f";
src = fetchFromGitHub {
owner = "gvolpe";
repo = "dconf2nix";
rev = "fe7e3d973caa87b1b706096aff3d670f65e39fda";
fetchSubmodules = true;
sha256 = "sha256-zuhiFVA8LvFKOPMMvqFu+ofv0CrIl2pMZbPQE/tCaM8=";
};
isLibrary = true;
isExecutable = true;

12
pkgs/development/tools/jd/default.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "jd";
version = "0.3.1";
rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
goPackagePath = "github.com/tidwall/jd";
src = fetchgit {
inherit rev;
url = "https://github.com/tidwall/jd";
sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h";
src = fetchFromGitHub {
owner = "tidwall";
repo = "jd";
rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
sha256 = "sha256-sNiKPlpnASJs0gKLpyfRxQjZRN9JaCvPoQ0gd9GYRDY=";
};
meta = with lib; {

4
pkgs/development/tools/ko/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "ko";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-VtPry8sF+W46gc2lI3uiE4wqilo1WhH+940QKPZ5cyI=";
sha256 = "sha256-BwK49dSt3D2BrYvluDOBYIH5qEt59HC1hssHl1D2Heg=";
};
vendorSha256 = null;

4
pkgs/development/tools/ktlint/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ktlint";
version = "0.45.0";
version = "0.45.1";
src = fetchurl {
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
sha256 = "sha256-M6M1hYA13QTcX4btcni+GB1NEJYEEeuITIpmY2qS9CM=";
sha256 = "sha256-fEMLZ8lV1RNFlf5ApfJOG9jI8JumpgP673+XSOWgsKI=";
};
nativeBuildInputs = [ makeWrapper ];

10
pkgs/development/tools/literate-programming/Literate/default.nix
View File

@ -1,13 +1,15 @@
{ lib, stdenv, fetchgit, ldc, dub }:
{ lib, stdenv, fetchFromGitHub, ldc, dub }:
stdenv.mkDerivation {
pname = "Literate";
version = "unstable-2021-01-22";
src = fetchgit {
url = "https://github.com/zyedidia/Literate.git";
src = fetchFromGitHub {
owner = "zyedidia";
repo = "Literate";
rev = "7004dffec0cff3068828514eca72172274fd3f7d";
sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs";
sha256 = "sha256-erNFe0+FlrslEENyO/YxYQbmec0voK31UWr5qVt+nXQ=";
fetchSubmodules = true;
};
buildInputs = [ ldc dub ];

10
pkgs/development/tools/misc/ycmd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python
{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, boost, python
, withGocode ? true, gocode
, withGodef ? true, godef
, withGotools? true, gotools
@ -12,10 +12,12 @@ stdenv.mkDerivation {
disabled = !python.isPy3k;
# required for third_party directory creation
src = fetchgit {
url = "https://github.com/Valloric/ycmd.git";
src = fetchFromGitHub {
owner = "Valloric";
repo = "ycmd";
rev = "9a6b86e3a156066335b678c328f226229746bae5";
sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7";
sha256 = "sha256-xzLELjp4DsG6mkzaFqpuquSa0uoaZWrYLrKr/mzrqrA=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ]

75
pkgs/development/tools/ocaml/ocamlscript/Makefile.patch
View File

@ -1,42 +1,23 @@
--- a/Makefile 2012-02-04 01:24:21.000000000 +0000
+++ b/Makefile 2014-10-29 14:42:08.690188302 +0000
@@ -4,6 +4,8 @@
version.ml pipeline.mli pipeline.ml common.mli common.ml \
utils.mli utils.ml ocaml.mli ocaml.ml
+CAMLP4 := $(shell ocamlfind query camlp4)
+
STDBIN = $(shell dirname `which ocamlfind`)
ifndef PREFIX
PREFIX = $(shell dirname $(STDBIN))
@@ -15,7 +17,7 @@
diff --git a/Makefile b/Makefile
index 894e94d..9adc44b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ ifndef BINDIR
endif
export BINDIR
-PACKS = unix str
+PACKS = unix str findlib
PP = camlp4o -I . -parser pa_tryfinally.cmo -parser pa_opt.cmo
export PP
# PP = camlp4o -I . -parser pa_opt.cmo
# export PP
@@ -36,11 +38,11 @@
common: version.ml
ocamlc -pp 'camlp4orf -loc _loc' -c \
- -I +camlp4 pa_opt310.ml && \
+ -I $(CAMLP4) pa_opt310.ml && \
cp pa_opt310.cmo pa_opt.cmo && \
cp pa_opt310.cmi pa_opt.cmi
ocamlc -pp 'camlp4orf -loc _loc' -c \
- -I +camlp4 pa_tryfinally310.ml && \
+ -I $(CAMLP4) pa_tryfinally310.ml && \
cp pa_tryfinally310.cmo pa_tryfinally.cmo && \
cp pa_tryfinally310.cmi pa_tryfinally.cmi
--- a/main.ml 2014-11-08 09:05:12.516401313 +0000
+++ b/main.ml 2014-11-08 09:09:59.801311230 +0000
@@ -250,9 +250,15 @@
Sys.getcwd ())
| `File script_name -> "", get_dir script_name in
diff --git a/main.ml b/main.ml
index 288526a..b67c5e9 100644
--- a/main.ml
+++ b/main.ml
@@ -247,6 +247,11 @@ let write_header ~pos ~source ~source_option ~verbose ~prog_file lines =
Sys.getcwd ())
| `File script_name -> "", get_dir script_name in
+ let findlibdir =
+ Filename.(
@ -46,20 +27,24 @@
let file, oc = Filename.open_temp_file "meta" ".ml" in
fprintf oc "\
#%i %S;;
@@ -255,6 +260,7 @@ let () =
try Topdirs.dir_directory (Sys.getenv \"OCAML_TOPLEVEL_PATH\")
with Not_found -> ()
;;
+#directory \"%s\";;
#use \"topfind\";;
#require \"ocamlscript\";;
Ocamlscript.Common.verbose := %s;;
@@ -261,7 +267,7 @@
@@ -263,7 +269,7 @@ Ocamlscript.Common.script_dir := %S;;
open Ocamlscript;;
open Utils;;
#%i %S;;\n"
- pos source verbose script_dir extra_args trash pos source;
+ pos source findlibdir verbose script_dir extra_args trash pos source;
- pos source verbose script_dir extra_args trash pos source;
+ pos source findlibdir verbose script_dir extra_args trash pos source;
List.iter (output_line oc) lines;
@@ -544,6 +550,7 @@
@@ -550,6 +556,7 @@ let main () =
exit compilation_status
let _ =
@ -67,4 +52,16 @@
try main ()
with Failure s ->
eprintf "ocamlscript: %s\n%!" s;
diff --git a/ocaml.ml b/ocaml.ml
index a1824c6..b8f287e 100644
--- a/ocaml.ml
+++ b/ocaml.ml
@@ -14,7 +14,7 @@ let ocamlfind = ref "ocamlfind"
let packs = ref [] (* findlib packages *)
let sources = ref [] (* extra sources *)
let use_ocamllex = ref false (* preprocess with ocamllex before camlp4 *)
-let use_camlp4 = ref true (* by default camlp4 is used *)
+let use_camlp4 = ref false (* by default camlp4 is not used *)
let use_ocamlc = ref false (* by default we want native code *)
let use_ocamlfind = ref false (* used only if necessary *)
let revised = ref false (* use this to use the revised syntax *)

26
pkgs/development/tools/ocaml/ocamlscript/default.nix
View File

@ -1,26 +1,32 @@
{lib, stdenv, fetchurl, ocaml, findlib, camlp4}:
{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
"ocamlscript is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation rec {
pname = "ocamlscript";
version = "2.0.3";
src = fetchurl {
url = "https://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd";
pname = "ocaml${ocaml.version}-ocamlscript";
version = "3.0.0";
src = fetchFromGitHub {
owner = "mjambon";
repo = "ocamlscript";
rev = "v${version}";
sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql";
};
propagatedBuildInputs = [ ocaml findlib camlp4 ];
propagatedBuildInputs = [ ocaml findlib ];
patches = [ ./Makefile.patch ];
buildFlags = [ "PREFIX=$(out)" ];
installFlags = [ "PREFIX=$(out)" ];
preInstall = "mkdir $out/bin";
preInstall = "mkdir -p $out/bin";
createFindlibDestdir = true;
meta = with lib; {
homepage = "http://martin.jambon.free.fr/ocamlscript.html";
inherit (src.meta) homepage;
license = licenses.boost;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
description = "Natively-compiled OCaml scripts";
maintainers = [ maintainers.vbgl ];
};

11
pkgs/development/tools/rtags/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }:
{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }:
stdenv.mkDerivation rec {
pname = "rtags";
@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
src = fetchgit {
rev = "refs/tags/v${version}";
src = fetchFromGitHub {
owner = "andersbakken";
repo = "rtags";
rev = "v${version}";
sha256 = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c=";
fetchSubmodules = true;
url = "https://github.com/andersbakken/rtags.git";
sha256 = "1iwvp7a69sj3wqjgcnyh581qrpicxzi2lfjkxqpabpyjkl5nk7hh";
# unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation
postFetch = ''

13
pkgs/development/tools/ws/default.nix
View File

@ -1,17 +1,16 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "ws";
version = "0.2.1";
rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
goPackagePath = "github.com/hashrocket/ws";
src = fetchgit {
inherit rev;
url = "https://github.com/hashrocket/ws";
sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb";
src = fetchFromGitHub {
owner = "hashrocket";
repo = "ws";
rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
sha256 = "sha256-q6c761Evz7Q6nH1fHgEn2uCFokoN0OzqhyxIFn6mWqQ=";
};
meta = with lib; {

9
pkgs/misc/screensavers/alock/default.nix
View File

@ -1,14 +1,15 @@
{ lib, stdenv, fetchgit, pkg-config, autoreconfHook
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
, libX11, pam, libgcrypt, libXrender, imlib2 }:
stdenv.mkDerivation rec {
pname = "alock";
version = "unstable-2017-07-20";
src = fetchgit {
url = "https://github.com/Arkq/alock";
src = fetchFromGitHub {
owner = "Arkq";
repo = "alock";
rev = "2035e1d4a2293432f5503e82d10f899232eb0f38";
sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6";
sha256 = "sha256-Rm00ytSfEv5Wljz4f/4bbyrK3sCV/oRUwz4DKx0pya8=";
};
PAM_DEFAULT_SERVICE = "login";

9
pkgs/misc/screensavers/xtrlock-pam/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }:
{ lib, stdenv, fetchFromGitHub, python2, pkg-config, xlibsWrapper, pam }:
stdenv.mkDerivation {
pname = "xtrlock-pam";
version = "3.4-post-20150909";
src = fetchgit {
url = "https://github.com/aanatoly/xtrlock-pam";
src = fetchFromGitHub {
owner = "aanatoly";
repo = "xtrlock-pam";
rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6";
sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc";
sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw=";
};
nativeBuildInputs = [ pkg-config ];

10
pkgs/os-specific/linux/firmware/rt5677/default.nix
View File

@ -1,15 +1,15 @@
{ lib, stdenv, fetchgit }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
name = "rt5677-firmware";
src = fetchgit {
url = "https://github.com/raphael/linux-samus";
src = fetchFromGitHub {
owner = "raphael";
repo = "linux-samus";
rev = "995de6c2093797905fbcd79f1a3625dd3f50be37";
sha256 = "0a6lz9wadm47cmva136q6wd0lw03bmymf9ispnzb091a7skwacry";
sha256 = "sha256-PjPFpz4qJLC+vTomV31dA3AKGjfYjKB2ZYfUpnj61Cg=";
};
installPhase = ''
mkdir -p $out/lib/firmware
cp ./firmware/rt5677_elf_vad $out/lib/firmware

10
pkgs/os-specific/linux/lightum/default.nix
View File

@ -1,12 +1,14 @@
{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }:
{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }:
stdenv.mkDerivation {
pname = "lightum";
version = "unstable-2014-06-07";
src = fetchgit {
url = "https://github.com/poliva/lightum";
src = fetchFromGitHub {
owner = "poliva";
repo = "lightum";
rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8";
sha256 = "01x24rcrkgksyvqpgkr9zafg3jgs8nqng8yf0hx0kbmcimar8dbp";
sha256 = "sha256-dzWUVY2srgk6BM6jZ7FF+snxnPopz3fx9nq+mVkmogc=";
};
buildInputs = [

9
pkgs/os-specific/linux/usermount/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }:
{ lib, stdenv, fetchFromGitHub, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }:
stdenv.mkDerivation {
pname = "usermount";
version = "0.1";
src = fetchgit {
url = "https://github.com/tom5760/usermount.git";
src = fetchFromGitHub {
owner = "tom5760";
repo = "usermount";
rev = "0d6aba3c1f8fec80de502f5b92fd8b28041cc8e4";
sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2";
sha256 = "sha256-giMHUVYdAygiemYru20VxpQixr5aGgHhevNkHvkG9z4=";
};
nativeBuildInputs = [ pkg-config ];

24
pkgs/servers/brickd/default.nix
View File

@ -1,24 +1,24 @@
{ lib, stdenv, fetchgit, libusb1, pkg-config, pmutils, udev} :
{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config, pmutils, udev} :
let
version = "2.1.1";
daemonlib = fetchgit {
url = "https://github.com/Tinkerforge/daemonlib.git";
rev = "refs/tags/brickd-${version}";
sha256 = "097kaz7d0rzg0ijvcna3y620k3m5fgxpqsac5gbhah8pd7vlj1a4";
version = "2.1.1";
daemonlib = fetchFromGitHub {
owner = "Tinkerforge";
repo = "daemonlib";
rev = "brickd-${version}";
sha256 = "sha256-0HhuC4r1S4NJa2FSJa7+fNCfcoRTBckikYbGSE+2FbE=";
};
in
stdenv.mkDerivation {
pname = "brickd";
inherit version;
src = fetchgit {
url = "git://github.com/Tinkerforge/brickd.git";
rev = "refs/tags/v${version}";
sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb";
src = fetchFromGitHub {
owner = "Tinkerforge";
repo = "brickd";
rev = "v${version}";
sha256 = "sha256-6w2Ew+dLMmdRf9CF3TdKHa0d5ZgmX5lKIR+5t3QAWFQ=";
};
nativeBuildInputs = [ pkg-config ];

11
pkgs/servers/ps3netsrv/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "ps3netsrv";
@ -6,11 +6,12 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
src = fetchgit {
url = "https://github.com/dirkvdb/ps3netsrv--";
fetchSubmodules = true;
src = fetchFromGitHub {
owner = "dirkvdb";
repo = "ps3netsrv--";
rev = "e54a66cbf142b86e2cffc1701984b95adb921e81";
sha256 = "09hvmfzqy2jckpsml0z1gkcnar8sigmgs1q66k718fph2d3g54sa";
sha256 = "sha256-SpPyRhPwOhTONAYH/eqLGmVl2XzhA1r1nUwKj7+rGyY=";
fetchSubmodules = true;
};
buildPhase = "make CXX=$CXX";

14
pkgs/servers/rippled/data-api.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchgit, nodePackages }:
{ lib, fetchFromGitHub, nodePackages }:
with lib;
@ -6,13 +6,13 @@ let
np = nodePackages.override { generated = ./package.nix; self = np; };
in nodePackages.buildNodePackage rec {
pname = "ripple-data-api";
version = lib.strings.substring 0 7 rev;
rev = "c56b860105f36c1c44ae011189d495272648c589";
version = "unstable-2015-03-26";
src = fetchgit {
url = "https://github.com/ripple/ripple-data-api.git";
inherit rev;
sha256 = "1iygp26ilradxj268g1l2y93cgrpchqwn71qdag67lv273dbq48m";
src = fetchFromGitHub {
owner = "ripple";
repo = "ripple-data-api";
rev = "c56b860105f36c1c44ae011189d495272648c589";
sha256 = "sha256-QEBdYdW55sAz6jshIAr2dSfXuqE/vqA2/kBeoxf75a8=";
};
deps = (filter (v: nixType v == "derivation") (attrValues np));

9
pkgs/servers/scylladb/default.nix
View File

@ -1,6 +1,6 @@
{
lib,
fetchgit,
fetchFromGitHub,
python3Packages,
pkg-config,
gcc8Stdenv,
@ -34,10 +34,11 @@ gcc8Stdenv.mkDerivation {
pname = "scylladb";
version = "3.0.5";
src = fetchgit {
url = "https://github.com/scylladb/scylla.git";
src = fetchFromGitHub {
owner = "scylladb";
repo = "scylla";
rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13";
sha256 = "14mg0kzpkrxvwqyiy19ndy4rsc7s5gnv2gwd3xdwm1lx1ln8ywsi";
sha256 = "sha256-UXOPLA2dhspbH40/se0r+jCdiW82BR895rvnef8Er5I=";
fetchSubmodules = true;
};

13
pkgs/servers/web-apps/morty/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "morty";
@ -6,10 +6,11 @@ buildGoPackage rec {
goPackagePath = "github.com/asciimoo/morty";
src = fetchgit {
src = fetchFromGitHub {
owner = "asciimoo";
repo = "morty";
rev = "v${version}";
url = "https://github.com/asciimoo/morty";
sha256 = "1wvrdlwbpzizfg7wrcfyf1x6qllp3aw425n88z516wc9jalfqrrm";
sha256 = "sha256-NWfsqJKJcRPKR8gWQbgal1JsenDesczPcz/+uzhtefM=";
};
goDeps = ./deps.nix;
@ -37,6 +38,6 @@ buildGoPackage rec {
* No Caching/Etag
* Supports GET/POST forms and IFrames
* Optional HMAC URL verifier key to prevent service abuse
'';
};
'';
};
}

11
pkgs/tools/admin/bash-my-aws/default.nix
View File

@ -3,19 +3,20 @@
, awscli
, jq
, unixtools
, fetchgit
, fetchFromGitHub
, installShellFiles
, bashInteractive
}:
stdenv.mkDerivation rec {
pname = "bash-my-aws";
version = "20200111";
version = "unstable-2020-01-11";
src = fetchgit {
url = "https://github.com/bash-my-aws/bash-my-aws";
src = fetchFromGitHub {
owner = "bash-my-aws";
repo = "bash-my-aws";
rev = "5a97ce2c22affca1299022a5afa109d7b62242ba";
sha256 = "459bda8b244af059d96c7c8b916cf956b01cb2732d1c2888a3ae06a4d660bea6";
sha256 = "sha256-RZvaiyRK8FnZbHyLkWz5VrAcsnMtHCiIo64GpNZgvqY=";
};
dontConfigure = true;

9
pkgs/tools/audio/gvolicon/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchFromGitHub, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
stdenv.mkDerivation {
pname = "gvolicon";
version = "unstable-2014-04-28";
src = fetchgit {
url = "https://github.com/Unia/gvolicon";
src = fetchFromGitHub {
owner = "Unia";
repo = "gvolicon";
rev = "0d65a396ba11f519d5785c37fec3e9a816217a07";
sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln";
sha256 = "sha256-lm5OfryV1/1T1RgsVDdp0Jg5rh8AND8M3ighfrznKes=";
};
nativeBuildInputs = [ pkg-config ];

12
pkgs/tools/cd-dvd/vobsub2srt/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }:
{ lib, stdenv, fetchFromGitHub, cmake, libtiff, pkg-config, tesseract }:
stdenv.mkDerivation rec {
pname = "vobsub2srt";
version = "unstable-2014-08-17";
rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
src = fetchgit {
inherit rev;
url = "https://github.com/ruediger/VobSub2SRT.git";
sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb";
src = fetchFromGitHub {
owner = "ruediger";
repo = "VobSub2SRT";
rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
sha256 = "sha256-i6V2Owb8GcTcWowgb/BmdupOSFsYiCF2SbC9hXa26uY=";
};
nativeBuildInputs = [ cmake pkg-config ];

18
pkgs/tools/filesystems/go-mtpfs/default.nix
View File

@ -1,20 +1,20 @@
{ pkg-config, libusb1, buildGoPackage, fetchgit }:
{ pkg-config, libusb1, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "go-mtpfs";
version = "2018-02-09";
rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
version = "unstable-2018-02-09";
goPackagePath = "github.com/hanwen/go-mtpfs";
src = fetchFromGitHub {
owner = "hanwen";
repo = "go-mtpfs";
rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ];
src = fetchgit {
inherit rev;
url = "https://github.com/hanwen/go-mtpfs";
sha256 = "0a0d5dy92nzp1czh87hx3xfdcpa4jh14j0b64c025ha62s9a4gxk";
};
goDeps = ./deps.nix;
}

15
pkgs/tools/misc/azure-vhd-utils/default.nix
View File

@ -1,17 +1,16 @@
# This file was generated by go2nix.
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "azure-vhd-utils";
version = "20160614-${lib.strings.substring 0 7 rev}";
rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
version = "unstable-2016-06-14";
goPackagePath = "github.com/Microsoft/azure-vhd-utils";
src = fetchgit {
inherit rev;
url = "https://github.com/Microsoft/azure-vhd-utils";
sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "azure-vhd-utils";
rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
sha256 = "sha256-8EH7RpuAeYKd5z64mklKKlFi20KYcx2WhVmkRbdaMy0=";
};
goDeps = ./deps.nix;

16
pkgs/tools/misc/gawp/default.nix
View File

@ -1,18 +1,16 @@
{ lib, buildGoPackage, fetchgit }:
with builtins;
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "gawp";
version = "20160121-${lib.strings.substring 0 7 rev}";
rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
version = "unstable-2016-01-21";
goPackagePath = "github.com/martingallagher/gawp";
src = fetchgit {
inherit rev;
url = "https://github.com/martingallagher/gawp";
sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c";
src = fetchFromGitHub {
owner = "martingallagher";
repo = "gawp";
rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
sha256 = "sha256-DGTSz+4gaEd+FMSPvtY6kY4gJGnJah3exvu13sNadS0=";
};
goDeps = ./deps.nix;

6
pkgs/tools/misc/goreleaser/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "1.6.3";
version = "1.7.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZNE+DfQdIlxA6sXMI8DAIQ3x+kcgXoGApUuoPncRfpc=";
sha256 = "sha256-vTik6KFOkKOik78/H0hvAv6xI+QSALOHD4N6befPaT4=";
};
vendorSha256 = "sha256-Kwa2hzsuw3BNLubcqd7Vmpg49P78Yjt3LboLotoGWYM=";
vendorSha256 = "sha256-ujtgcH5EF+PZAD/1Y0+yI4m7y2hNJ3w4KB2pvKbdgsU=";
ldflags = [
"-s"

14
pkgs/tools/misc/gosu/default.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "gosu";
version = "2017-05-09";
rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
version = "unstable-2017-05-09";
goPackagePath = "github.com/tianon/gosu";
src = fetchgit {
inherit rev;
url = "https://github.com/tianon/gosu";
sha256 = "1qp1cfx0hrr4qlnh7rhjb4xlxv9697flmgzzl6jcdkrpk1f0bz8m";
src = fetchFromGitHub {
owner = "tianon";
repo = "gosu";
rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
sha256 = "sha256-Ff0FXJg3z8akof+/St1JJu1OO1kS5gMtxSRnCLpj4eI=";
};
goDeps = ./deps.nix;

46
pkgs/tools/misc/grub/trusted.nix
View File

@ -1,5 +1,20 @@
{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, fetchpatch
, autogen
, flex
, bison
, python2
, autoconf
, automake
, gettext
, ncurses
, libusb-compat-0_1
, freetype
, qemu
, lvm2
, for_HP_laptop ? false
}:
@ -32,17 +47,15 @@ stdenv.mkDerivation rec {
pname = "trustedGRUB2";
inherit version;
src = if for_HP_laptop
then fetchgit {
url = "https://github.com/Sirrix-AG/TrustedGRUB2";
rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41";
sha256 = "1760d9hsnqkdvlag9nn8f613mqhnsxmidgvdkpmb37b0yi7p6lhz";
}
else fetchgit {
url = "https://github.com/Sirrix-AG/TrustedGRUB2";
rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76";
sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k";
};
src = fetchFromGitHub {
owner = "Sirrix-AG";
repo = "TrustedGRUB2";
rev = version;
sha256 =
if for_HP_laptop
then "sha256-H1JzT/RgnbHqnW2/FmvXFuI6gnHI2vQU3W1iq2FqwJw="
else "sha256-k8DGHjTIpnjWw7GNN2kyR8rRl2MAq1xkfOndd0znLns=";
};
nativeBuildInputs = [ autogen flex bison python2 autoconf automake ];
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]
@ -91,9 +104,10 @@ stdenv.mkDerivation rec {
];
# save target that grub is compiled for
grubTarget = if inPCSystems
then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"
else "";
grubTarget =
if inPCSystems
then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"
else "";
doCheck = false;
# On -j16 races with early header creation:

21
pkgs/tools/misc/i3cat/default.nix
View File

@ -1,17 +1,24 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "i3cat";
version = "20150321-${lib.strings.substring 0 7 rev}";
rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
version = "1.0";
goPackagePath = "github.com/vincent-petithory/i3cat";
src = fetchgit {
inherit rev;
url = "https://github.com/vincent-petithory/i3cat";
sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72";
src = fetchFromGitHub {
owner = "vincent-petithory";
repo = "i3cat";
rev = "v${version}";
sha256 = "sha256-BxiiYzSjvXAMUQSUTKviLvrmGjkCLW6QPrgBBHvvF+Q=";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "combine multiple i3bar JSON inputs into one to forward to i3bar";
homepage = "https://vincent-petithory.github.io/i3cat/";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

11
pkgs/tools/misc/sdl-jstest/default.nix
View File

@ -1,14 +1,15 @@
{ lib, stdenv, fetchgit, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }:
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }:
stdenv.mkDerivation {
pname = "sdl-jstest";
version = "2018-06-15";
# Submodules
src = fetchgit {
url = "https://github.com/Grumbel/sdl-jstest";
src = fetchFromGitHub {
owner = "Grumbel";
repo = "sdl-jstest";
rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b";
sha256 = "0p4cjzcq0bbkzad19jwdklylqhq2q390q7dpg8bfzl2rwls883rk";
sha256 = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw=";
fetchSubmodules = true;
};
buildInputs = [ SDL SDL2 ncurses ];

18
pkgs/tools/misc/upower-notify/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
# To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
#
@ -8,16 +8,22 @@
# '';
buildGoPackage rec {
pname = "upower-notify";
version = "20160310-${lib.strings.substring 0 7 rev}";
rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
version = "unstable-2016-03-10";
goPackagePath = "github.com/omeid/upower-notify";
src = fetchgit {
inherit rev;
url = "https://github.com/omeid/upower-notify";
src = fetchFromGitHub {
owner = "omeid";
repo = "upower-notify";
rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "simple tool to give you Desktop Notifications about your battery";
homepage = "https://github.com/omeid/upower-notify";
maintainers = with maintainers; [ kamilchm ];
};
}

6
pkgs/tools/networking/amass/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
version = "3.17.1";
version = "3.18.2";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
sha256 = "sha256-AFy0Ob6caU3yGC9s5Til5sYZ3A4qiEeU96OfeMlR/Q4=";
sha256 = "sha256-2HE+hzvEbM+68x3YJq8rIMCKAld9MLrCEuHBA4uuetI=";
};
vendorSha256 = "sha256-6qfHoP7TOmRZLIiijRfQxyct+486TXQ18cdH8pdhwmQ=";
vendorSha256 = "sha256-hYrv5z+9JY7gXkC4xQvko7qhwBtzywUy0TMqrlgqXb0=";
outputs = [ "out" "wordlists" ];

4
pkgs/tools/networking/brook/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "brook";
version = "20220404";
version = "20220406";
src = fetchFromGitHub {
owner = "txthinking";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yQuGaj5HukO+OENCpVMkoXv2AztygjrDPXgHaVBFyZ8=";
sha256 = "sha256-KCDXi86Wi01wEIJXPYYX5HkQMq7nKK2VhsN1x5yOvlk=";
};
vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU=";

11
pkgs/tools/networking/bud/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, lib, fetchgit, python2, util-linux }:
{ stdenv, lib, fetchFromGitHub, python2, util-linux }:
stdenv.mkDerivation {
pname = "bud";
version = "0.34.1";
src = fetchgit {
url = "https://github.com/indutny/bud.git";
src = fetchFromGitHub {
owner = "indutny";
repo = "bud";
rev = "b112852c9667632f692d2ce3dcd9a8312b61155a";
sha256 = "08yr6l4lc2m6rng06253fcaznf6sq0v053wfr8bbym42c32z0xdh";
sha256 = "sha256-sHXwxWCCVL8Wyo6PAjbA2jj7FXOjCAOezaYKRgk12SM=";
fetchSubmodules = true;
};
nativeBuildInputs = [

4
pkgs/tools/networking/dnsproxy/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.41.4";
version = "0.42.0";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aVYjYEAEANAMGv7frZWfYWLzX7rcI8phpjvrENK8cc4=";
sha256 = "sha256-UXFDFS2TFzo7DcExazt4h0TTnGeMf6d3FAiPXZWB7Ys=";
};
vendorSha256 = null;

21
pkgs/tools/networking/s3gof3r/default.nix
View File

@ -1,17 +1,24 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "s3gof3r";
version = "20151109-${lib.strings.substring 0 7 rev}";
rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
version = "0.5.0";
goPackagePath = "github.com/rlmcpherson/s3gof3r";
src = fetchgit {
inherit rev;
url = "https://github.com/rlmcpherson/s3gof3r";
sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k";
src = fetchFromGitHub {
owner = "rlmcpherson";
repo = "s3gof3r";
rev = "v${version}";
sha256 = "sha256-88C6c4DRD/4ePTO1+1YiI8ApXWE2uUlr07dDCxGzaoE=";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "Fast, concurrent, streaming access to Amazon S3, including gof3r, a CLI";
homepage = "https://pkg.go.dev/github.com/rlmcpherson/s3gof3r";
maintainers = with maintainers; [ ];
license = licenses.mit;
};
}

8
pkgs/tools/networking/siege/default.nix
View File

@ -7,14 +7,16 @@
stdenv.mkDerivation rec {
pname = "siege";
version = "4.1.1";
version = "4.1.2";
src = fetchurl {
url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz";
sha256 = "1a74py0ib1gr3znv9ah5acw67ngl08b14dbc90ww9clvgdr2ag0l";
hash = "sha256-5HKr4Zxak/a+W/1k3/JvZo2ixtIQr4ITtgycDbF+ynk=";
};
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
NIX_LDFLAGS = lib.optionalString stdenv.isLinux [
"-lgcc_s"
];
buildInputs = [
openssl

23
pkgs/tools/networking/ua/default.nix
View File

@ -1,19 +1,19 @@
{ lib, buildGoPackage, fetchgit
{ lib, buildGoPackage, fetchFromGitHub
, pkg-config
, glib, libxml2
}:
buildGoPackage rec {
pname = "ua-unstable";
version = "2017-02-24";
rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
pname = "ua";
version = "unstable-2017-02-24";
goPackagePath = "github.com/sloonz/ua";
src = fetchgit {
inherit rev;
url = "https://github.com/sloonz/ua.git";
sha256 = "0452qknc8km9495324g6b5ja3shvk8jl7aa9nrjhdylf09dp2nif";
src = fetchFromGitHub {
owner = "sloonz";
repo = "ua";
rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
sha256 = "sha256-LlpxWwKO+gZltkmpQyWaG+qhZFnmETFKIqlOxOzEohA=";
};
goDeps = ./deps.nix;
@ -21,11 +21,10 @@ buildGoPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libxml2 ];
meta = {
meta = with lib; {
homepage = "https://github.com/sloonz/ua";
license = lib.licenses.isc;
license = licenses.isc;
description = "Universal Aggregator";
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ ttuegel ];
maintainers = with maintainers; [ ttuegel ];
};
}

13
pkgs/tools/networking/waitron/default.nix
View File

@ -1,17 +1,16 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
{ lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
{ lib, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
pname = "waitron";
version = "unstable-2020-01-24";
rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6";
goPackagePath = "github.com/ns1/waitron";
src = fetchgit {
inherit rev;
url = "https://github.com/ns1/waitron";
sha256 = "0lgw37iq1cvg3mqc94nzf0027mvv721ay8x6dw3fc814ww8a2hb6";
src = fetchFromGitHub {
owner = "ns1";
repo = "waitron";
rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6";
sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE=";
};
patches = [

6
pkgs/tools/security/grype/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "grype";
version = "0.34.3";
version = "0.34.4";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iWmLfQ08+dhjvKQiK2iy2Tegk4jH9dGopu/6kdDRZd0=";
sha256 = "sha256-t5N9C69u8bTXXobptmxA+yuQ88Hko8Hhhp+nyC/tMFc=";
# 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;
@ -25,7 +25,7 @@ buildGoModule rec {
'';
};
vendorSha256 = "sha256-WrUZFlN7dPbyN9InjX/Y9J+iYKu5v2/SHmRgDP5BJi8=";
vendorSha256 = "sha256-u11SKoybGobfxsjLq9mYFzZWw01Dms5RyKxmZA47XqI=";
nativeBuildInputs = [
installShellFiles

9
pkgs/tools/security/tpm-luks/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
stdenv.mkDerivation {
pname = "tpm-luks";
version = "unstable-2015-07-11";
src = fetchgit {
url = "https://github.com/momiji/tpm-luks";
src = fetchFromGitHub {
owner = "momiji";
repo = "tpm-luks";
rev = "c9c5b7fdddbcdac1cd4d2ea6baddd0617cc88ffa";
sha256 = "1ms2v57f13r9km6mvf9rha5ndmlmjvrz3mcikai6nzhpj0nrjz0w";
sha256 = "sha256-HHyZLZAXfmuimpHV8fOWldZmi4I5uV1NnSmP4E7ZQtc=";
};
patches = [

9
pkgs/tools/system/das_watchdog/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, libgtop, xmessage, which, pkg-config }:
{ lib, stdenv, fetchFromGitHub, libgtop, xmessage, which, pkg-config }:
stdenv.mkDerivation {
pname = "das_watchdog";
version = "unstable-2015-09-12";
src = fetchgit {
url = "https://github.com/kmatheussen/das_watchdog.git";
src = fetchFromGitHub {
owner = "kmatheussen";
repo = "das_watchdog";
rev = "5ac0db0b98e5b4e690aca0aa7fb6ec60ceddcb06";
sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr";
sha256 = "sha256-eacUn/gYCEHtHdQf3lBPYvY3kfN3Bik7AolAPpbbwQs=";
};
nativeBuildInputs = [ pkg-config ];

22
pkgs/tools/text/codesearch/default.nix
View File

@ -1,24 +1,22 @@
# This file was generated by go2nix.
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "codesearch";
version = "20150717-${lib.strings.substring 0 7 rev}";
rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
version = "1.0.0";
goPackagePath = "github.com/google/codesearch";
src = fetchgit {
inherit rev;
url = "https://github.com/google/codesearch";
sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";
src = fetchFromGitHub {
owner = "google";
repo = "codesearch";
rev = "v${version}";
sha256 = "sha256-3kJ/JT89krbIvprWayBL4chUmT77Oa1W13UNCr4fe4k=";
};
meta = {
meta = with lib; {
description = "Fast, indexed regexp search over large file trees";
homepage = "https://github.com/google/codesearch";
license = [ lib.licenses.bsd3 ];
maintainers = [ lib.maintainers.bennofs ];
platforms = lib.platforms.unix;
license = [ licenses.bsd3 ];
maintainers = with maintainers; [ bennofs ];
};
}

7
pkgs/top-level/all-packages.nix
View File

@ -6227,7 +6227,7 @@ with pkgs;
gopro = callPackage ../tools/video/gopro { };
goreleaser = callPackage ../tools/misc/goreleaser { };
goreleaser = callPackage ../tools/misc/goreleaser { buildGoModule = buildGo118Module; };
goreplay = callPackage ../tools/networking/goreplay { };
@ -6389,7 +6389,9 @@ with pkgs;
gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { };
grype = callPackage ../tools/security/grype { };
grype = callPackage ../tools/security/grype {
buildGoModule = buildGo118Module;
};
gt5 = callPackage ../tools/system/gt5 { };
@ -33776,7 +33778,6 @@ with pkgs;
nix-repl = throw (
"nix-repl has been removed because it's not maintained anymore, " +
(lib.optionalString (!lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) "ugrade your Nix installation to a newer version and ") +
"use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903"
);