Merge remote-tracking branch 'origin/master' into haskell-updates

This commit is contained in:
sternenseemann 2022-03-22 15:24:55 +01:00
commit 60c9963d40
175 changed files with 1092 additions and 807 deletions

View file

@ -5869,6 +5869,12 @@
githubId = 587870;
name = "Jonathan Mettes";
};
jmgilman = {
email = "joshuagilman@gmail.com";
github = "jmgilman";
githubId = 2308444;
name = "Joshua Gilman";
};
jo1gi = {
email = "joakimholm@protonmail.com";
github = "jo1gi";

View file

@ -55,6 +55,7 @@ class Driver:
tmp_dir = get_tmp_dir()
with rootlog.nested("start all VLans"):
vlans = list(set(vlans))
self.vlans = [VLan(nr, tmp_dir) for nr in vlans]
def cmd(scripts: List[str]) -> Iterator[NixStartScript]:

View file

@ -51,7 +51,9 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
$n++;
$rootDir = $ARGV[$n];
die "$0: --root requires an argument\n" unless defined $rootDir;
die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/";
$rootDir =~ s/\/*$//; # remove trailing slashes
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
}
elsif ($arg eq "--force") {
$force = 1;
@ -616,7 +618,12 @@ EOF
if ($showHardwareConfig) {
print STDOUT $hwConfig;
} else {
$outDir = "$rootDir$outDir";
if ($outDir eq "/etc/nixos") {
$outDir = "$rootDir$outDir";
} else {
$outDir = File::Spec->rel2abs($outDir);
$outDir =~ s/\/*$//; # remove trailing slashes
}
my $fn = "$outDir/hardware-configuration.nix";
print STDERR "writing $fn...\n";

View file

@ -239,7 +239,10 @@ in
"d '${cfg.ipnsMountDir}' - ${cfg.user} ${cfg.group} - -"
];
systemd.packages = [ cfg.package ];
# The hardened systemd unit breaks the fuse-mount function according to documentation in the unit file itself
systemd.packages = if cfg.autoMount
then [ cfg.package.systemd_unit ]
else [ cfg.package.systemd_unit_hardened ];
systemd.services.ipfs = {
path = [ "/run/wrappers" cfg.package ];
@ -275,6 +278,8 @@ in
ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${ipfsFlags}" ];
User = cfg.user;
Group = cfg.group;
StateDirectory = "";
ReadWritePaths = [ "" cfg.dataDir ];
} // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
} // optionalAttrs (!cfg.startWhenNeeded) {
wantedBy = [ "default.target" ];

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 ];

View file

@ -17,6 +17,13 @@ let
description = "The IP addresses of the interface.";
};
autostart = mkOption {
description = "Whether to bring up this interface automatically during boot.";
default = true;
example = false;
type = types.bool;
};
dns = mkOption {
example = [ "192.168.2.2" ];
default = [];
@ -247,7 +254,7 @@ let
description = "wg-quick WireGuard Tunnel - ${name}";
requires = [ "network-online.target" ];
after = [ "network.target" "network-online.target" ];
wantedBy = [ "multi-user.target" ];
wantedBy = optional values.autostart "multi-user.target";
environment.DEVICE = name;
path = [ pkgs.kmod pkgs.wireguard-tools ];

View file

@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
# Also will add a unix domain socket socket API address, see module.
startWhenNeeded = true;
apiAddress = "/ip4/127.0.0.1/tcp/2324";
dataDir = "/mnt/ipfs";
};
};
@ -35,5 +36,9 @@ import ./make-test-python.nix ({ pkgs, ...} : {
machine.succeed(
f"ipfs --api /unix/run/ipfs.sock cat /ipfs/{ipfs_hash.strip()} | grep fnord2"
)
# Test if setting dataDir works properly with the hardened systemd unit
machine.succeed("test -e /mnt/ipfs/config")
machine.succeed("test ! -e /var/lib/ipfs/")
'';
})

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
version = "3.11.5";
version = "3.11.7";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "sha256-YkSsvhBbju/NEkT7RspZQYnLkcx/5POA8VtxCAL3Wcc=";
sha256 = "sha256-fTeDRo7gCM1jXTQGm9MsmKu4KvTGDUogF3VSZWk91RM=";
};
nativeBuildInputs = [
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
rm -rf $out/opt
# Create symlink bzip2 library
ln -s ${bzip2.out}/lib/libbz2.so.1 $out/libbz2.so.1.0
ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/libbz2.so.1.0
'';
meta = with lib; {

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}");
};

View file

@ -1,15 +1,16 @@
{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter
{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter
, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
, 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 = fetchgit {
url = "https://github.com/nick92/Enso-OS";
src = fetchFromGitHub {
owner = "nick92";
repo = "Enso-OS";
rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427";
sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz";
sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY=";
};
patches = [

View file

@ -1,11 +1,12 @@
let
pkgs = import ../../../../.. { };
src = pkgs.fetchgit {
url = "https://github.com/nix-community/emacs2nix.git";
fetchSubmodules = true;
src = pkgs.fetchFromGitHub {
owner = "nix-community";
repo = "emacs2nix";
rev = "2e8d2c644397be57455ad32c2849f692eeac7797";
sha256 = "sha256-qnOYDYHAQ+r5eegKP9GqHz5R2ig96B2W7M+uYa1ti9M=";
fetchSubmodules = true;
};
in
pkgs.mkShell {

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"'
'';

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 = ".";

View file

@ -1,9 +1,15 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "mop";
version = "0.2.0";
rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
src = fetchFromGitHub {
owner = "mop-tracker";
repo = "mop";
rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
sha256 = "sha256-fX7G4M3gfv31Eb2HChTY4RfVF2U92000U4ZnFNML5X4=";
};
goPackagePath = "github.com/michaeldv/mop";
goDeps = ./deps.nix;
@ -16,12 +22,6 @@ buildGoPackage rec {
mv cmd mop
'';
src = fetchgit {
inherit rev;
url = "https://github.com/mop-tracker/mop";
sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx";
};
meta = with lib; {
description = "Simple stock tracker implemented in go";
homepage = "https://github.com/mop-tracker/mop";

View file

@ -0,0 +1,25 @@
From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Tue, 8 Mar 2022 23:59:19 +0100
Subject: [PATCH 1/2] Use command -v in favor of which
---
Makerules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makerules b/Makerules
index 0fdaecb..6d52cca 100644
--- a/Makerules
+++ b/Makerules
@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS)
LD = xcrun ld
RANLIB = xcrun ranlib
- ifeq (, $(shell which pkg-config))
+ ifeq (, $(shell command -v pkg-config))
$(warning "No pkg-config found, install it for proper integration of libcrypto")
else
HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
--
2.17.2 (Apple Git-113)

View file

@ -0,0 +1,57 @@
From 0f0ccfc01cfe72d96eafee57ec6c5107f09c7238 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Wed, 9 Mar 2022 00:08:28 +0100
Subject: [PATCH 2/2] Add Darwin deps
---
Makerules | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/Makerules b/Makerules
index 6d52cca..a6bd0ed 100644
--- a/Makerules
+++ b/Makerules
@@ -153,6 +153,40 @@ else ifeq ($(OS),MACOS)
LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
endif
+ # Required for mupdf-gl
+ ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+ SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
+ endif
+ ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
+ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
+ SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
+ endif
+ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+ SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
+ endif
+ ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
+ SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
+ SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
+ endif
+ # Required for mupdf-x11
+ HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
+ ifeq ($(HAVE_X11),yes)
+ X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
+ # Required for mupdf-x11-curl
+ HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
+ ifeq ($(HAVE_SYS_CURL),yes)
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
+ endif
+ HAVE_PTHREAD := yes
+ ifeq ($(HAVE_PTHREAD),yes)
+ PTHREAD_CFLAGS :=
+ PTHREAD_LIBS := -lpthread
+ endif
endif
else ifeq ($(OS),Linux)
--
2.17.2 (Apple Git-113)

View file

@ -2,6 +2,7 @@
, lib
, fetchurl
, fetchpatch
, desktopToDarwinBundle
, pkg-config
, freetype
, harfbuzz
@ -10,7 +11,7 @@
, libjpeg
, darwin
, gumbo
, enableX11 ? true
, enableX11 ? (!stdenv.isDarwin)
, libX11
, libXext
, libXi
@ -21,6 +22,7 @@
, enableGL ? true
, freeglut
, libGLU
, xcbuild
}:
let
@ -39,6 +41,10 @@ stdenv.mkDerivation rec {
sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1";
};
patches = [ ./0001-Use-command-v-in-favor-of-which.patch
./0002-Add-Darwin-deps.patch
];
postPatch = ''
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
'';
@ -50,8 +56,11 @@ stdenv.mkDerivation rec {
++ lib.optionals (!enableX11) [ "HAVE_X11=no" ]
++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs =
[ pkg-config ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ]
++ lib.optional stdenv.isDarwin xcbuild
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
++ lib.optionals enableCurl [ curl openssl ]
++ lib.optionals enableGL (

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, electron, runtimeShell } :
{ lib, stdenv, fetchFromGitHub, electron, runtimeShell } :
stdenv.mkDerivation rec {
pname = "nix-tour";
@ -6,10 +6,11 @@ stdenv.mkDerivation rec {
buildInputs = [ electron ];
src = fetchgit {
url = "https://github.com/nixcloud/tour_of_nix";
src = fetchFromGitHub {
owner = "nixcloud";
repo = "tour_of_nix";
rev = "v${version}";
sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb";
sha256 = "sha256-a/P2ZMc9OpM4PxRFklSO6oVCc96AGWkxtGF/EmnfYSU=";
};
installPhase = ''

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 ";

View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, qt4, qmake4Hook, trousers }:
{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }:
stdenv.mkDerivation rec {
version = "0.8.1";
pname = "tpmmanager";
src = fetchgit {
url = "https://github.com/Sirrix-AG/TPMManager";
rev = "9f989206635a6d2c1342576c90fa73eb239519cd";
sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e";
src = fetchFromGitHub {
owner = "Rohde-Schwarz";
repo = "TPMManager";
rev = "v${version}";
sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4=";
};
nativeBuildInputs = [ qmake4Hook ];

View file

@ -87,7 +87,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "11.0.7";
version = "11.0.9";
lang = "en-US";
@ -98,7 +98,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "197yf0abcb98kqds0xvki0b52rlhzyzdc98zmhrn7y8gmahc84cz";
sha256 = "0cl01bx64d6bmajknj7085nzc6841adkp65fz531r3y6nnpwr9ds";
};
i686-linux = fetchurl {
@ -107,7 +107,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "0yylfsgmnfn6zww0r6kp1d1wmmb0lfa4lqwkgr7d8rzi6q9spmqk";
sha256 = "0j6alhm1pqp7fb6nk55vzvr1qjz6gyd3vn6v2dkkvj9mgm57x1j5";
};
};
in

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)

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=";

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=";

View file

@ -1,13 +1,14 @@
{ lib, fetchgit
{ lib, fetchFromGitHub
, buildPythonApplication, buildPythonPackage
, pygobject3, pytest-runner, requests, responses, pytest, python-olm
, canonicaljson, olm
}:
let
mainsrc = fetchgit {
url = "https://github.com/saadnpq/matrixcli";
mainsrc = fetchFromGitHub {
owner = "saadnpq";
repo = "matrixcli";
rev = "61ebde173ca2f77185c261c2b7f6db297ca89863";
sha256 = "0xcjjy2xwlcixr9fwgzcfjjkivqpk104h7dslfa7lz9jq9pzqzvq";
sha256 = "sha256-eH/8b8IyfXqUo7odSECYF+84pXTsP+5S7pFR3oWXknU=";
fetchSubmodules = true;
};
@ -35,7 +36,6 @@ let
in
buildPythonApplication rec {
name = "${pname}-${version}";
pname = "matrixcli";
version = "0.0.2019-08-15";

View file

@ -1,16 +1,14 @@
{ lib, stdenv, fetchgit, pkg-config, pidgin } :
{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin } :
let
version = "54b2992";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "pidgin-mra";
inherit version;
version = "unstable-2014-07-08";
src = fetchgit {
url = "https://github.com/dreadatour/pidgin-mra";
rev = version;
sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw";
src = fetchFromGitHub {
owner = "dreadatour";
repo = "pidgin-mra";
rev = "54b299266265cde800289b2d51f13b81f6bf379c";
sha256 = "sha256-fKdEOaijW2LfsH8RHlVGbMpL7Zhu+x2vW4fPEN4puKk=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -1,16 +1,14 @@
{ lib, stdenv, fetchgit, pkg-config, pidgin, libwebp, libgcrypt, gettext } :
{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, libwebp, libgcrypt, gettext } :
let
version = "1.3.1";
in
stdenv.mkDerivation rec {
pname = "telegram-purple";
inherit version;
version = "1.3.1";
src = fetchgit {
url = "https://github.com/majn/telegram-purple";
src = fetchFromGitHub {
owner = "majn";
repo = "telegram-purple";
rev = "v${version}";
sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp";
sha256 = "sha256-14VzCMvzAEmye0N98r+P+ub5CeA9vu8c/xqefuWVI10=";
};
NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";

View file

@ -1,20 +1,20 @@
{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3,
fetchgit }:
fetchFromGitHub }:
let
gui = true; # Might be implemented with nixpkgs config.
in
buildGoPackage rec {
pname = "pond";
version = "20150830-${lib.strings.substring 0 7 rev}";
rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
version = "unstable-2015-08-30";
goPackagePath = "github.com/agl/pond";
src = fetchgit {
inherit rev;
url = "https://github.com/agl/pond";
sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4";
src = fetchFromGitHub {
owner = "agl";
repo = "pond";
rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y=";
};
goDeps = ./deps.nix;

View file

@ -2,7 +2,7 @@
, element-desktop # for seshat and keytar
, schildichat-web
, stdenv
, fetchgit
, fetchFromGitHub
, makeWrapper
, makeDesktopItem
, copyDesktopItems
@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
pname = "schildichat-desktop";
inherit (pinData) version;
src = fetchgit {
url = "https://github.com/SchildiChat/schildichat-desktop/";
src = fetchFromGitHub {
owner = "SchildiChat";
repo = "schildichat-desktop";
inherit (pinData) rev;
sha256 = pinData.srcHash;
fetchSubmodules = true;

View file

@ -1,5 +1,5 @@
{ stdenv, lib
, fetchgit
, fetchFromGitHub
, fetchYarnDeps
, nodejs
, yarn
@ -18,8 +18,9 @@ in stdenv.mkDerivation rec {
pname = "schildichat-web";
inherit (pinData) version;
src = fetchgit {
url = "https://github.com/SchildiChat/schildichat-desktop/";
src = fetchFromGitHub {
owner = "SchildiChat";
repo = "schildichat-desktop";
inherit (pinData) rev;
sha256 = pinData.srcHash;
fetchSubmodules = true;

View file

@ -1,7 +1,7 @@
{ mkDerivation
, lib
, stdenv
, fetchgit
, fetchFromGitHub
, qtbase
, qtquickcontrols
, qmake
@ -15,10 +15,11 @@ mkDerivation rec {
pname = "tensor";
version = "unstable-2017-02-21";
src = fetchgit {
url = "https://github.com/davidar/tensor.git";
src = fetchFromGitHub {
owner = "davidar";
repo = "tensor";
rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
sha256 = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY=";
fetchSubmodules = true;
};

View file

@ -29,15 +29,23 @@ buildGoModule rec {
vendorSha256 = null;
outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ];
postPatch = ''
substituteInPlace 'misc/systemd/ipfs.service' \
--replace '/usr/bin/ipfs' "$out/bin/ipfs"
substituteInPlace 'misc/systemd/ipfs-hardened.service' \
--replace '/usr/bin/ipfs' "$out/bin/ipfs"
'';
postInstall = ''
install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service
install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service
install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket
install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket
substituteInPlace $out/etc/systemd/system/ipfs.service \
--replace /usr/bin/ipfs $out/bin/ipfs
substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \
--replace /usr/bin/ipfs $out/bin/ipfs
install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit/etc/systemd/system/ipfs-api.socket"
install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit/etc/systemd/system/ipfs-gateway.socket"
install --mode=444 -D 'misc/systemd/ipfs.service' "$systemd_unit/etc/systemd/system/ipfs.service"
install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-api.socket"
install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-gateway.socket"
install --mode=444 -D 'misc/systemd/ipfs-hardened.service' "$systemd_unit_hardened/etc/systemd/system/ipfs.service"
'';
meta = with lib; {

View file

@ -1,13 +1,14 @@
{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "communi";
version = "3.5.0";
src = fetchgit {
url = "https://github.com/communi/communi-desktop.git";
src = fetchFromGitHub {
owner = "communi";
repo = "communi-desktop";
rev = "v${version}";
sha256 = "10grskhczh8601s90ikdsbjabgr9ypcp2j7vivjkl456rmg6xbji";
sha256 = "sha256-Ua5uXs2mEDrljvtIcdn1Kb+l5NJtRpB0AAbBz+DU+YE=";
fetchSubmodules = true;
};

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;

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;

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 '\

View file

@ -1,35 +1,32 @@
{ lib, stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }:
{ lib, stdenv, fetchFromGitHub, sqlite, wxGTK30, gettext, wrapGAppsHook }:
let
stdenv.mkDerivation rec {
pname = "money-manager-ex";
version = "1.3.3";
in
stdenv.mkDerivation {
pname = "money-manager-ex";
inherit version;
src = fetchgit {
url = "https://github.com/moneymanagerex/moneymanagerex.git";
rev = "refs/tags/v${version}";
sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74";
};
src = fetchFromGitHub {
owner = "moneymanagerex";
repo = "moneymanagerex";
rev = "refs/tags/v${version}";
sha256 = "sha256-5NgkP9gY4eDBoKSC/IaXiHoiz+ZdU4c/iGAzPf5IlmQ=";
};
nativeBuildInputs = [
wrapGAppsHook
];
nativeBuildInputs = [
wrapGAppsHook
];
buildInputs = [
gettext
sqlite
wxGTK30
wxGTK30.gtk
];
buildInputs = [
gettext
sqlite
wxGTK30
wxGTK30.gtk
];
meta = {
description = "Easy-to-use personal finance software";
homepage = "https://www.moneymanagerex.org/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; linux;
};
}
meta = {
description = "Easy-to-use personal finance software";
homepage = "https://www.moneymanagerex.org/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; linux;
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, fetchFromGitHub, cmake
{ lib, stdenv, fetchFromGitHub, cmake
, fetchpatch
, openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi
, onebitSGDSupport ? false
@ -22,11 +22,12 @@ in stdenv.mkDerivation rec {
pname = "CNTK";
version = "2.7";
# Submodules
src = fetchgit {
url = "https://github.com/Microsoft/CNTK";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "CNTK";
rev = "v${version}";
sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns";
sha256 = "sha256-2rIrPJyvZhnM5EO6tNhF6ARTocfUHce4N0IZk/SZiaI=";
fetchSubmodules = true;
};
patches = [

View file

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "git-annex-remote-b2";
version = "20151212-${lib.strings.substring 0 7 rev}";
rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
version = "unstable-2015-12-12";
goPackagePath = "github.com/encryptio/git-annex-remote-b2";
src = fetchgit {
inherit rev;
url = "https://github.com/encryptio/git-annex-remote-b2";
sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2";
src = fetchFromGitHub {
owner = "encryptio";
repo = "git-annex-remote-b2";
rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ=";
};
goDeps = ./deps.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;

View file

@ -1,11 +1,12 @@
{ lib, stdenv, fetchgit, dtc, fetchpatch, pkgsCross }:
{ lib, stdenv, fetchFromGitHub, dtc, fetchpatch, pkgsCross }:
stdenv.mkDerivation rec {
pname = "spike";
version = "1.0.0";
src = fetchgit {
url = "https://github.com/riscv/riscv-isa-sim.git";
src = fetchFromGitHub {
owner = "riscv";
repo = "riscv-isa-sim";
rev = "v${version}";
sha256 = "1hcl01nj96s3rkz4mrq747s5lkw81lgdjdimb8b1b9h8qnida7ww";
};

View file

@ -1,5 +1,4 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "btops";
@ -7,10 +6,11 @@ buildGoPackage rec {
goPackagePath = "github.com/cmschuetz/btops";
src = fetchgit {
url = "https://github.com/cmschuetz/btops.git";
src = fetchFromGitHub {
owner = "cmschuetz";
repo = "btops";
rev = version;
sha256 = "1ilidvpy7gz49zqp6rf0q7wjrc3r0brdrcp4r5f6i6p9cwybqkbq";
sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY=";
};
goDeps = ./deps.nix;

View file

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

View file

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

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;

View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, fontforge, python3 }:
{ lib, stdenv, fetchFromGitHub, fontforge, python3 }:
stdenv.mkDerivation rec {
pname = "rictydiminished-with-firacode";
version = "1.2.2";
src = fetchgit {
url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
src = fetchFromGitHub {
owner = "hakatashi";
repo = "RictyDiminished-with-FiraCode";
rev = version;
sha256 = "0khnbp1y5xrd77gfb2b19mzi3ll07im3d0rlbciwbq0cn347f25p";
sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
fetchSubmodules = true;
};

View file

@ -1,13 +1,14 @@
{ stdenv, lib, fetchgit, chez, chez-srfi }:
{ stdenv, lib, fetchFromGitHub, chez, chez-srfi }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "chez-mit";
version = "1.0";
version = "0.1";
src = fetchgit {
url = "https://github.com/fedeinthemix/chez-mit.git";
rev = "68f3d7562e77f694847dc74dabb5ecbd106cd6be";
sha256 = "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0";
src = fetchFromGitHub {
owner = "fedeinthemix";
repo = "chez-mit";
rev = "v${version}";
sha256 = "sha256-YM4/Sj8otuWJCrUBsglVnihxRGI32F6tSbODFM0a8TA=";
};
buildInputs = [ chez chez-srfi ];

View file

@ -1,13 +1,14 @@
{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }:
{ stdenv, lib, fetchFromGitHub, chez, chez-srfi, chez-mit }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "chez-scmutils";
version = "1.0";
version = "0.1";
src = fetchgit {
url = "https://github.com/fedeinthemix/chez-scmutils.git";
rev = "5eaeea6289fd239358d7eed99cc9588528fb52b2";
sha256 = "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l";
src = fetchFromGitHub {
owner = "fedeinthemix";
repo = "chez-scmutils";
rev = "v${version}";
sha256 = "sha256-9GBoHbLNEnPz81s2rBYO3S0bXldetwc8eu9i5CgvYFE=";
};
buildInputs = [ chez chez-srfi chez-mit ];

View file

@ -1,13 +1,14 @@
{ stdenv, lib, fetchgit, chez }:
{ stdenv, lib, fetchFromGitHub, chez }:
stdenv.mkDerivation {
pname = "chez-srfi";
version = "1.0";
src = fetchgit {
url = "https://github.com/fedeinthemix/chez-srfi.git";
src = fetchFromGitHub {
owner = "fedeinthemix";
repo = "chez-srfi";
rev = "5770486c2a85d0e3dd4ac62a97918e7c394ea507";
sha256 = "1s47v7b7w0ycd2g6gyv8qbzmh4jjln5iday8n9l3m996ns8is9zj";
sha256 = "sha256-8icdkbYmpTpossirFoulUhJY/8Jo+2eeaMwDftbZh+g=";
};
buildInputs = [ chez ];

View file

@ -1,14 +1,15 @@
{ fetchgit, lib, stdenv, gmp, which, flex, bison, makeWrapper
{ fetchFromGitHub, lib, stdenv, gmp, which, flex, bison, makeWrapper
, autoconf, automake, libtool, jdk, perl }:
stdenv.mkDerivation {
pname = "aldor";
version = "1.2.0";
src = fetchgit {
url = "https://github.com/pippijn/aldor";
sha256 = "19v07ffq4r1gjnmg7a8ifgjkwan9a3rwbj0qjz8fycwy221844m6";
src = fetchFromGitHub {
owner = "aldorlang";
repo = "aldor";
rev = "15471e75f3d65b93150f414ebcaf59a03054b68d";
sha256 = "sha256-phKCghCeM+/QlxjIxfNQySo+5XMRqfOqlS9kgp07YKc=";
};
nativeBuildInputs = [ makeWrapper ];

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

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

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

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

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

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

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

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

View file

@ -78,11 +78,11 @@ let
pname = "nim-bootstrap";
version = "g${lib.substring 0 7 revision}";
src = fetchgit {
# A Git checkout is much smaller than a GitHub tarball.
url = "https://github.com/nim-lang/csources_v1.git";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "csources_v1";
rev = revision;
sha256 = "1c2k681knrha1zmf4abhb32i2wwd3nwflzylnqryxk753swla043";
sha256 = "sha256-gwBFuR7lzO4zttR/6rgdjXMRxVhwKeLqDwpmOwMyU7A=";
};
enableParallelBuilding = true;

View file

@ -1,14 +1,15 @@
# Build Open Dylan from source using the binary builds to bootstrap.
{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
{lib, stdenv, fetchFromGitHub, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
stdenv.mkDerivation {
pname = "opendylan";
version = "2016.1pre";
src = fetchgit {
url = "https://github.com/dylan-lang/opendylan";
src = fetchFromGitHub {
owner = "dylan-lang";
repo = "opendylan";
rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd";
sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b";
sha256 = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM=";
fetchSubmodules = true;
};

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, wxGTK, libX11, readline }:
{ lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }:
let
# BOSSA needs a "bin2c" program to embed images.
@ -13,14 +13,15 @@ let
};
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "bossa";
version = "1.8";
src = fetchgit {
url = "https://github.com/shumatech/BOSSA";
rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62";
sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm";
src = fetchFromGitHub {
owner = "shumatech";
repo = "BOSSA";
rev = version;
sha256 = "sha256-dZeBy63OzIaLUfAg6awnk83FtLKVxPoYAYs5t7BBM6Y=";
};
patches = [ ./bossa-no-applet-build.patch ];

View file

@ -1981,7 +1981,6 @@ broken-packages:
- haskell-mpi
- haskell-names
- haskell-neo4j-client
- HaskellNet-SSL
- HaskellNN
- Haskelloids
- haskell-openflow

View file

@ -10193,8 +10193,6 @@ self: {
];
description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"HaskellTorrent" = callPackage

View file

@ -1,13 +1,15 @@
{ lib, stdenv, fetchgit, mlton }:
{ lib, stdenv, fetchFromGitHub, mlton }:
stdenv.mkDerivation {
pname = "ceptre";
version = "unstable-2016-11-27";
src = fetchgit {
url = "https://github.com/chrisamaphone/interactive-lp";
src = fetchFromGitHub {
owner = "chrisamaphone";
repo = "interactive-lp";
rev = "e436fda2ccd44e9c9d226feced9d204311deacf5";
sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8";
sha256 = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w=";
fetchSubmodules = true;
};
nativeBuildInputs = [ mlton ];

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 = [

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc,
pypy, libffi, libedit, libuv, boost, zlib,
variant ? "jit", buildWithPypy ? false }:
@ -11,10 +11,11 @@ let
no-jit = { flags = ""; target = "target.py"; };
no-jit-preload = { flags = ""; target = "target_preload.py"; };
};
pixie-src = fetchgit {
url = "https://github.com/pixie-lang/pixie.git";
pixie-src = fetchFromGitHub {
owner = "pixie-lang";
repo = "pixie";
rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";
sha256 = "0pf31x5h2m6dpxlidv98qay1y179qw40cw4cb4v4xa88gmq2f3vm";
sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10=";
};
pypy-tag = "91db1a9";
pypy-src = fetchurl {

View file

@ -1,13 +1,14 @@
{ fetchgit, lib, stdenv, ant, jdk }:
{ fetchFromGitHub, lib, stdenv, ant, jdk }:
stdenv.mkDerivation {
pname = "hydra-ant-logger";
version = "2010.2";
src = fetchgit {
url = "https://github.com/NixOS/hydra-ant-logger.git";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra-ant-logger";
rev = "dae3224f4ed42418d3492bdf5bee4f825819006f";
sha256 = "01s7m6007rn9107rw5wcgna7i20x6p6kfzl4f79jrvpkjy6kz176";
sha256 = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc=";
};
buildInputs = [ ant jdk ];

View file

@ -14,10 +14,11 @@ let lispPackages = rec {
description = "The Common Lisp package manager";
deps = [];
src = pkgs.fetchgit {
url = "https://github.com/quicklisp/quicklisp-client/";
rev = "refs/tags/version-${version}";
sha256 = "sha256:102f1chpx12h5dcf659a9kzifgfjc482ylf73fg1cs3w34zdawnl";
src = pkgs.fetchFromGitHub {
owner = "quicklisp";
repo = "quicklisp-client";
rev = "version-${version}";
sha256 = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA=";
};
overrides = x: rec {
inherit clwrapper;

View file

@ -1,13 +1,14 @@
{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck
{ mkDerivation, ansi-wl-pprint, base, fetchFromGitHub, lib, process, QuickCheck
, transformers, transformers-compat
}:
mkDerivation {
pname = "hercules-ci-optparse-applicative";
version = "0.16.1.0";
src = fetchgit {
url = "https://github.com/hercules-ci/optparse-applicative.git";
sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp";
src = fetchFromGitHub {
owner = "hercules-ci";
repo = "optparse-applicative";
rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e";
sha256 = "sha256-11MnpQjmR89gW5WY5BwsPhpk/LwSIxEEhIa4LLiCbBc=";
};
libraryHaskellDepends = [
ansi-wl-pprint base process transformers transformers-compat

View file

@ -1,15 +1,14 @@
{ buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }:
let
{ buildPecl, lib, fetchFromGitHub, php, cyrus_sasl, zlib, pkg-config, libmemcached }:
buildPecl rec {
pname = "memcached";
version = "3.1.5";
in
buildPecl {
inherit pname version;
src = fetchgit {
url = "https://github.com/php-memcached-dev/php-memcached";
src = fetchFromGitHub {
owner = "php-memcached-dev";
repo = "php-memcached";
rev = "v${version}";
sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380";
sha256 = "sha256-AA3JakWxjk7HQl+8FEEGqLVNYHrjITZg3G25OaqAqwY=";
};
internalDeps = [

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 = [

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.13.5";
version = "0.13.6";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-dUNljMKsbl6eByhEYivWgRJczTBw3N1RVl8r3e898mg=";
hash = "sha256-aZ1Mquc4IfrdWjOaHMipjNb6gLGGbdKS8ah5b33eqGo=";
};
buildInputs = lib.optionals stdenv.isDarwin [

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 = [

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "catalogue";
version = "2.0.6";
version = "2.0.7";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0idjhx2s8cy6ppd18k1zy246d97gdd6i217m5q26fwa47xh3asik";
sha256 = "sha256-U10zrnnr0hyimFUdhdoYaui44d82sPsCRtp3QWPsLWs=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [

View file

@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "dataclasses-json";
version = "0.5.6";
version = "0.5.7";
src = fetchFromGitHub {
owner = "lidatong";
repo = pname;
rev = "v${version}";
sha256 = "09253p0zjqfaqap7jgfgjl1jswwnz7mb6x7dqix09id92mnb89mf";
sha256 = "1xv9br6mm5pcwfy10ykbc1c0n83fqyj1pa81z272kqww7wpkkp6j";
};
propagatedBuildInputs = [
@ -30,11 +30,6 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# AssertionError: Type annotations check failed
"test_type_hints"
];
pythonImportsCheck = [ "dataclasses_json" ];
meta = with lib; {

View file

@ -0,0 +1,52 @@
{ lib
, poetry-core
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, importlib-metadata
, packaging
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "dunamai";
version = "1.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "mtkennerly";
repo = "dunamai";
rev = "v${version}";
sha256 = "sha256-Sp0yfNkFwNc2qR9aSPteBqZcqRokM9whOVmduXVK3CI=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
packaging
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
# needs to be able to run dunami from PATH
preCheck = ''
export PATH=$PATH:$out/bin
'';
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "dunamai" ];
meta = with lib; {
description = "Dynamic version generation";
homepage = "https://github.com/mtkennerly/dunamai";
license = licenses.mit;
maintainers = with maintainers; [ jmgilman ];
};
}

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 = [

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 = [

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 = [

View file

@ -1,37 +1,65 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pkg-config, pango, cython, AppKit, pytestCheckHook }:
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, python
, pkg-config
, pango
, cython
, AppKit
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "manimpango";
version = "0.4.0.post2";
version = "0.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ManimCommunity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BMRlEdvJJOUbsvKEoZx2qJqHSbL475dhBthUpnsXkn4=";
hash = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw=";
};
postPatch = ''
substituteInPlace setup.cfg --replace "--cov --no-cov-on-fail" ""
'';
nativeBuildInputs = [
pkg-config
];
buildInputs = [
pango
] ++ lib.optionals stdenv.isDarwin [
AppKit
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
propagatedBuildInputs = [
cython
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "--cov --no-cov-on-fail" ""
'';
preBuild = ''
${python.interpreter} setup.py build_ext --inplace
'';
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "manimpango" ];
pythonImportsCheck = [
"manimpango"
];
meta = with lib; {
description = "Binding for Pango";
homepage = "https://github.com/ManimCommunity/ManimPango";
license = licenses.mit;
description = "Binding for Pango";
maintainers = [ maintainers.emilytrau ];
maintainers = with maintainers; [ emilytrau ];
};
}

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 = [

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 ];

View file

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "pycurl";
version = "7.45.0";
version = "7.45.1";
disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208
src = fetchPypi {
inherit pname version;
sha256 = "sha256-UDbFPG9BBukWDQU6S6o0M6AhX7M4YHPiESc8VqOpXz0=";
sha256 = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo=";
};
preConfigure = ''

View file

@ -3,13 +3,14 @@
, fetchFromGitHub
, poetry-core
, pysigma
, pysigma-pipeline-sysmon
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pysigma-backend-splunk";
version = "0.1.2";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -18,7 +19,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-splunk";
rev = "v${version}";
hash = "sha256-jKvGBUO55DtF6bpgEL82XB5Ba+kmqJsCqUdzftcpSJ0=";
hash = "sha256-EP0gcK05hZ5TCOgTePezfEGbW45dGrnnksWyI9Jo9MQ=";
};
nativeBuildInputs = [
@ -30,6 +31,7 @@ buildPythonPackage rec {
];
checkInputs = [
pysigma-pipeline-sysmon
pytestCheckHook
];

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 = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
version = "0.4.1";
version = "0.4.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "v${version}";
hash = "sha256-egyzeniid2PZZQ6hsd44W+YURI8uGaXvDMuhNIXUqO0=";
hash = "sha256-0k6m86RQoP4QTuxmCWBpxiGqaJt3alOLS5BAuOFwdb4=";
};
nativeBuildInputs = [

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 = [

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 = [

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 = [

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 = [

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 ];

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; {

View file

@ -1,32 +1,48 @@
{ lib
, stdenv
, fetchFromGitLab
, makeWrapper
, pkg-config
, file
, scdoc
, openssl
, zlib
, busybox
, apk-tools
, perl
}:
stdenv.mkDerivation rec {
pname = "abuild";
version = "3.7.0";
version = "3.9.0";
src = fetchFromGitLab {
domain = "gitlab.alpinelinux.org";
owner = "alpine";
repo = pname;
rev = "v${version}";
sha256 = "1xsik9hyzzq861bi922sb5r8c6r4wpnpxz5kd30i9f20vvfpp5jx";
rev = version;
sha256 = "1zs8slaqiv8q8bim8mwfy08ymar78rqpkgqksw8y1lsjrj49fqy4";
};
buildInputs = [
openssl
zlib
busybox
# for $out/bin/apkbuild-cpan and $out/bin/apkbuild-pypi
(perl.withPackages (ps: with ps; [
LWP
JSON
ModuleBuildTiny
LWPProtocolHttps
IPCSystemSimple
]))
];
nativeBuildInputs = [
pkg-config
scdoc
makeWrapper
file
];
patchPhase = ''
@ -43,6 +59,24 @@ stdenv.mkDerivation rec {
"sysconfdir=${placeholder "out"}/etc"
];
postInstall = ''
# this script requires unpackaged 'augeas' rubygem, no reason
# to ship it if we can't provide the dependencies for it
rm -f ${placeholder "out"}/bin/apkbuild-gem-resolver
# Find all executables that are not compiled binaries and wrap
# them, make `apk-tools` available in their PATH and also the
# $out directory since many of the binaries provided call into
# other binaries
for prog in \
$(find ${placeholder "out"}/bin -type f -exec ${file}/bin/file -i '{}' + \
| grep -v x-executable | cut -d : -f1); do
wrapProgram $prog \
--prefix PATH : "${lib.makeBinPath [ apk-tools ]}" \
--prefix PATH : "${placeholder "out"}/bin"
done
'';
meta = with lib; {
description = "Alpine Linux build tools";
homepage = "https://gitlab.alpinelinux.org/alpine/abuild";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "air";
version = "1.27.10";
version = "1.28.0";
src = fetchFromGitHub {
owner = "cosmtrek";
repo = "air";
rev = "v${version}";
sha256 = "sha256-mgFLelf0TPjJK/keQz+s52fKlruSn6+KTPj+waJuQdU=";
sha256 = "sha256-JbFSEfm8SVyJBgZju3kfIv5WK/kFYTqkU0EH5HXl9cc=";
};
vendorSha256 = "sha256-MEIPkron42OJioV7PPhnLWVevjKDs5Bw3jDmvZbac9s=";

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 ];
};
}

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.

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 = [ "." ];

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;

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"

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=";
};
}

Some files were not shown because too many files have changed in this diff Show more