mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
230a785370
48 changed files with 265 additions and 128 deletions
|
|
@ -3641,10 +3641,10 @@
|
|||
};
|
||||
expipiplus1 = {
|
||||
email = "nix@monoid.al";
|
||||
matrix = "@joe:monoid.al";
|
||||
matrix = "@ellie:monoid.al";
|
||||
github = "expipiplus1";
|
||||
githubId = 857308;
|
||||
name = "Joe Hermaszewski";
|
||||
name = "Ellie Hermaszewska";
|
||||
};
|
||||
extends = {
|
||||
email = "sharosari@gmail.com";
|
||||
|
|
|
|||
|
|
@ -25,8 +25,11 @@
|
|||
<para>
|
||||
You are logged-in automatically as <literal>nixos</literal>. The
|
||||
<literal>nixos</literal> user account has an empty password so you
|
||||
can use <literal>sudo</literal> without a password.
|
||||
can use <literal>sudo</literal> without a password:
|
||||
</para>
|
||||
<programlisting>
|
||||
$ sudo -i
|
||||
</programlisting>
|
||||
<para>
|
||||
If you downloaded the graphical ISO image, you can run
|
||||
<literal>systemctl start display-manager</literal> to start the
|
||||
|
|
|
|||
|
|
@ -15,7 +15,10 @@ finished booting, it should have detected most of your hardware.
|
|||
The NixOS manual is available by running `nixos-help`.
|
||||
|
||||
You are logged-in automatically as `nixos`. The `nixos` user account has
|
||||
an empty password so you can use `sudo` without a password.
|
||||
an empty password so you can use `sudo` without a password:
|
||||
```ShellSession
|
||||
$ sudo -i
|
||||
```
|
||||
|
||||
If you downloaded the graphical ISO image, you can run `systemctl
|
||||
start display-manager` to start the desktop environment. If you want
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ in
|
|||
|
||||
graphvizPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.graphviz_2_32;
|
||||
defaultText = literalExpression "pkgs.graphviz_2_32";
|
||||
default = pkgs.graphviz;
|
||||
defaultText = literalExpression "pkgs.graphviz";
|
||||
description = "Package containing the dot executable.";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ in
|
|||
avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
|
||||
awscli = handleTest ./awscli.nix { };
|
||||
babeld = handleTest ./babeld.nix {};
|
||||
bat = handleTest ./bat.nix {};
|
||||
bazarr = handleTest ./bazarr.nix {};
|
||||
bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64
|
||||
beanstalkd = handleTest ./beanstalkd.nix {};
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "bat";
|
||||
meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
|
||||
|
||||
machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.bat ]; };
|
||||
|
||||
testScript = ''
|
||||
machine.succeed("echo 'Foobar\n\n\n42' > /tmp/foo")
|
||||
assert "Foobar" in machine.succeed("bat -p /tmp/foo")
|
||||
assert "42" in machine.succeed("bat -p /tmp/foo -r 4:4")
|
||||
'';
|
||||
})
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergo";
|
||||
version = "4.0.13";
|
||||
version = "4.0.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
|
||||
sha256 = "sha256-HNpyUD2Tep2XnY3lr5a3ec+NmJtt0VvJx6ujVvSugXo=";
|
||||
sha256 = "sha256-4omuu/9EeywWDkk//4TTal/1siCe/4YMmEsIefBxsuY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gxkb";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zen-tools";
|
||||
repo = "gxkb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KIlosBNfGSYCgtxBuSVeSfHaLsANdLgG/P5UtAL6Hms=";
|
||||
sha256 = "sha256-9r1eZl7PgIt2ZpK+QQHaa460imIHT3Lh5mpzcFglyWc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "95.0.4638.54",
|
||||
"sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry",
|
||||
"sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a",
|
||||
"version": "95.0.4638.69",
|
||||
"sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq",
|
||||
"sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
|
|
@ -55,8 +55,8 @@
|
|||
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "95.0.4638.54-1",
|
||||
"sha256": "01jkkz5224aaj5cgdmqknf8v73fyaw4q8bzbqa520a0lvl7hwbg5"
|
||||
"rev": "95.0.4638.69-1",
|
||||
"sha256": "19azr4m4rd6za9vgcggijyq9x54jrjp0n07y4falgjrdz9q4f7aj"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.1.2";
|
||||
version = "2.1.5";
|
||||
commit = "7af9dfb3524c13e941ab604e36e49a617fe47d2e";
|
||||
tag = "v${version}";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = tag;
|
||||
sha256 = "1pr48z1qhv7xxnllr00zz2v0ygxmq2hjdyk0j3zazflnqr2mc596";
|
||||
sha256 = "sha256-dFhbYw7SAo7/eumqIEWpLqgQWFAWeAEvfqWsbya6cCA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc=";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.19.1";
|
||||
sha256 = "184f5q3aa4p6gjdmr8x6a97rzaj64ws8bf3q8sz4xjyznznwcpp0";
|
||||
manifestsSha256 = "1xxf572yvjmik7dvijz810lxzfj7irddznl4icidn7hrljzjrv95";
|
||||
version = "0.20.0";
|
||||
sha256 = "06n4d7l00lmrrs7s41mjfk06c0cj04v0s0mbs9b3ppzbws07wca5";
|
||||
manifestsSha256 = "03hfnqc19n3iz47a5137lmwq4mgd6dxcl6ml057kq1bxm2qsq3y4";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1ZIeS42LoreZKkzDNZxmF17HeDWWVo49CaZDrIR2U9g=";
|
||||
vendorSha256 = "sha256-WkPdBipgEOBy0qjPaX7zGfspWfCtiFB1MUMHLlHGB/U=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hyprspace";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac;
|
||||
|
||||
|
|
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g0oyI3jnqQADyOrpnK4IvpFQPEwNrpvyDS+DhBDXZGg=";
|
||||
sha256 = "sha256-Ecdxs6see4uexY6DatZ/VSGgWR81zRjo3AeAsXSjJ4A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rw75xNBBV58F+HBVtD/EslPWxZxLbI3/mJVdJF4usKI=";
|
||||
vendorSha256 = "sha256-nFiBHhtvTu9Ya6n1KUF+pOXrksHMOph7ABVtGSWVWlo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks.";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "2.1.0";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dyf1sjfiwrrigk1186mzvx5vn196h45imvily394ky2di633av5";
|
||||
sha256 = "0b9wxjwnhhs3vi1x55isdqck67lh1r7nf3dwmhlwcg5887smwp5c";
|
||||
};
|
||||
|
||||
cargoSha256 = "02z5gdmir1x80axnv516hs00478c7zbb30rdsbs966yh1725w12z";
|
||||
cargoSha256 = "1s278d73mwqpq3n5vmrn5jb6g5dafaaplnhs8346pwcc6y16w3d3";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wsjtx";
|
||||
version = "2.4.0";
|
||||
version = "2.5.1";
|
||||
|
||||
# This is a "superbuild" tarball containing both wsjtx and a hamlib fork
|
||||
src = fetchurl {
|
||||
url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
|
||||
sha256 = "sha256-LpfGzI/Hpsp7/K0ZZu2EFVlvWcN0cnAQ1RNAxCMugcg=";
|
||||
sha256 = "sha256-aof+OavQ+IBw3eef1+bQ9YwIXCdecYiADS+eRXTrmvQ=";
|
||||
};
|
||||
|
||||
# Hamlib builds with autotools, wsjtx builds with cmake
|
||||
|
|
|
|||
|
|
@ -38,15 +38,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is
|
|||
assert gbmSupport || waylandSupport || x11Support;
|
||||
|
||||
let
|
||||
kodiReleaseDate = "20211006";
|
||||
kodiVersion = "19.2";
|
||||
kodiReleaseDate = "20211024";
|
||||
kodiVersion = "19.3";
|
||||
rel = "Matrix";
|
||||
|
||||
kodi_src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "xbmc";
|
||||
rev = "${kodiVersion}-${rel}";
|
||||
sha256 = "sha256-w5m7xlnjQDJ4l75b3ctF0wMZ4kqi+H0X6WFLs0gV6lM=";
|
||||
sha256 = "02bnknk87zzv9j6b6k9c0xx47q2gh399j6v25rm94g7rhzf8phbw";
|
||||
};
|
||||
|
||||
ffmpeg = stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "folly";
|
||||
version = "2021.09.20.00";
|
||||
version = "2021.10.25.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "folly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aFTFUtRQOGCDR3pbpw1ViuMFm02GSq04u9GgE9pq33A=";
|
||||
sha256 = "sha256-+di8Dzt5NRbqIydBR4sB6bUbQrZZ8URUosdP2JGQMec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,36 +1,52 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts
|
||||
, gnome, libsoup, json-glib, gobject-introspection
|
||||
, gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, glib
|
||||
, librest
|
||||
, gnome-online-accounts
|
||||
, gnome
|
||||
, libsoup
|
||||
, json-glib
|
||||
, gobject-introspection
|
||||
, gtk-doc
|
||||
, pkgs
|
||||
, docbook-xsl-nons
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gfbgraph";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0yck7dwvjk16a52nafjpi0a39rxwmg0w833brj45acz76lgkjrb0";
|
||||
sha256 = "nLOBs/eLoRNt+Xrz8G47EdzCqzOawI907aD4BX1mA+M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config gobject-introspection gtk-doc
|
||||
docbook-xsl-nons autoconf automake libtool
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
docbook-xsl-nons
|
||||
];
|
||||
buildInputs = [ glib gnome-online-accounts ];
|
||||
propagatedBuildInputs = [ libsoup json-glib librest ];
|
||||
|
||||
configureFlags = [ "--enable-introspection" "--enable-gtk-doc" ];
|
||||
buildInputs = [
|
||||
glib
|
||||
gnome-online-accounts
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs autogen.sh
|
||||
substituteInPlace autogen.sh \
|
||||
--replace "which" "${pkgs.which}/bin/which"
|
||||
'';
|
||||
propagatedBuildInputs = [
|
||||
libsoup
|
||||
json-glib
|
||||
librest
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
configureFlags = [
|
||||
"--enable-introspection"
|
||||
"--enable-gtk-doc"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -45,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://wiki.gnome.org/Projects/GFBGraph";
|
||||
description = "GLib/GObject wrapper for the Facebook Graph API";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.lgpl2;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocksdb";
|
||||
version = "6.23.3";
|
||||
version = "6.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk=";
|
||||
sha256 = "sha256-9Fs+znK7oEEBoPbRhNdVHuangBpuIVEvlxJNeNoEJZA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
|
@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = lib.optional enableJemalloc jemalloc;
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move";
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"
|
||||
+ lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPORTABLE=1"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, duet
|
||||
, matplotlib
|
||||
, networkx
|
||||
, numpy
|
||||
|
|
@ -29,7 +30,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cirq-core";
|
||||
version = "0.12.0";
|
||||
version = "0.13.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -37,7 +38,7 @@ buildPythonPackage rec {
|
|||
owner = "quantumlib";
|
||||
repo = "cirq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NPaADiRoPL0KoLugtk0vsnTGuRDK85e4j9kHv9aO/Po=";
|
||||
sha256 = "sha256-MVfJ8iEeW8gFvCNTqrWfYpNNYuDAufHgcjd7Nh3qp8U=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/${pname}";
|
||||
|
|
@ -50,6 +51,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
duet
|
||||
matplotlib
|
||||
networkx
|
||||
numpy
|
||||
|
|
|
|||
|
|
@ -39,7 +39,8 @@ buildPythonPackage rec {
|
|||
--replace "httpx~=0.15.5" "httpx" \
|
||||
--replace "idna~=2.10" "idna" \
|
||||
--replace "requests~=2.18" "requests" \
|
||||
--replace "pyjwt~=1.7.1" "pyjwt"
|
||||
--replace "pyjwt~=1.7.1" "pyjwt" \
|
||||
--replace "qcs-api-client~=0.8.0" "qcs-api-client"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, cirq-aqt
|
||||
, cirq-core
|
||||
, cirq-google
|
||||
, cirq-ionq
|
||||
, cirq-pasqal
|
||||
, cirq-rigetti
|
||||
, cirq-web
|
||||
# test inputs
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
|
@ -11,8 +16,13 @@ buildPythonPackage rec {
|
|||
inherit (cirq-core) version src meta;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cirq-aqt
|
||||
cirq-core
|
||||
cirq-ionq
|
||||
cirq-google
|
||||
cirq-rigetti
|
||||
cirq-pasqal
|
||||
cirq-web
|
||||
];
|
||||
|
||||
# pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here
|
||||
|
|
@ -20,8 +30,13 @@ buildPythonPackage rec {
|
|||
|
||||
# Don't run submodule or development tool tests
|
||||
disabledTestPaths = [
|
||||
"cirq-google"
|
||||
"cirq-aqt"
|
||||
"cirq-core"
|
||||
"cirq-google"
|
||||
"cirq-ionq"
|
||||
"cirq-pasqal"
|
||||
"cirq-rigetti"
|
||||
"cirq-web"
|
||||
"dev_tools"
|
||||
];
|
||||
|
||||
|
|
|
|||
28
pkgs/development/python-modules/duet/default.nix
Normal file
28
pkgs/development/python-modules/duet/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "duet";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "duet";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hK2Cx7dSm1mGM2z9oCoRogfa2aIsjyJcdpSSfdHhPmw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ typing-extensions ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple future-based async library for python";
|
||||
homepage = "https://github.com/google/duet";
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
};
|
||||
}
|
||||
|
|
@ -40,6 +40,9 @@ buildPythonPackage rec {
|
|||
disabledTests = [
|
||||
# Assertions mismatches with pytest>=6.0
|
||||
"test_completion"
|
||||
|
||||
# sensitive to platform, causes false negatives on darwin
|
||||
"test_import"
|
||||
] ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [
|
||||
# AssertionError: assert 'foo' in ['setup']
|
||||
"test_init_extension_module"
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.19.4";
|
||||
version = "1.19.7";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "47a2d1a5c7ea77a70d001d0f3ae6f2b06d3e533f817b165bb67e3dad1c2d0c11";
|
||||
sha256 = "1e5e8a19b8ebc3118d32ce1e13ad3cc5f90d34b613779b66dfdec0658cf7036f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetbox";
|
||||
version = "6.1.3";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ALDNnKgnOjYladDRVothjm3/2Jv1eNxR2wSS+ZL/Fqk=";
|
||||
sha256 = "1j91m5g4qxkf59m506aw6vfhv1db1z393924qq3zbyg3wqwq1rxx";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, importlib-metadata
|
||||
, ipython
|
||||
, lark-parser
|
||||
|
|
@ -15,13 +16,14 @@
|
|||
, pythonOlder
|
||||
, qcs-api-client
|
||||
, retry
|
||||
, respx
|
||||
, rpcq
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyquil";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -30,9 +32,17 @@ buildPythonPackage rec {
|
|||
owner = "rigetti";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0070pslz6vvyavm5pm27q2bng2mfmkb41v5czzckz7m8db3b1r2x";
|
||||
sha256 = "sha256-OU7/LjcpCxvqlcfdlm5ll4f0DYXf0yxNprM8Muu2wyg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "pyquil-pr-1404-unpin-qcs-api-client-version-pyproject.patch";
|
||||
url = "https://github.com/rigetti/pyquil/commit/2e35a4fdf65262fdf39c5091aeddfa3f3564925a.patch";
|
||||
sha256 = "sha256-KGDNU2wpzsuifQSbbkoMwaFXspHW6zyIJ5GRZbw+lUY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
|
@ -55,6 +65,7 @@ buildPythonPackage rec {
|
|||
pytest-httpx
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
respx
|
||||
ipython
|
||||
];
|
||||
|
||||
|
|
@ -67,6 +78,7 @@ buildPythonPackage rec {
|
|||
# Tests require network access
|
||||
"test/e2e/"
|
||||
"test/unit/test_api.py"
|
||||
"test/unit/test_engagement_manager.py"
|
||||
"test/unit/test_operator_estimation.py"
|
||||
"test/unit/test_wavefunction_simulator.py"
|
||||
"test/unit/test_compatibility_v2_operator_estimation.py"
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy-transformers";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f66c4b08c3afe2c9f01bc4a377af3c62ea9c1aa7b67ff51f62b9be73d6609e49";
|
||||
sha256 = "b84c195dc21a28582579dea3f76c90222e29ee0d99b6adf38ade75646ed2746e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.9.34";
|
||||
version = "3.9.35";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5bdef3efae82eaee902541376561f74b143f228f5de45ca3f6a883af3bb7d1e1";
|
||||
sha256 = "1632a09c7b3c152170dbad05b796033540feba4746a8e9c4a437eaa563c47bc9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xml2rfc";
|
||||
version = "3.10.0";
|
||||
version = "3.11.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-DJjGQAYFhXjAiJhWzxpQ0jRUSrnsNCcNz1KfPEjBoKE=";
|
||||
sha256 = "sha256-V1Epv5TJ4+Gnh096jeQIN0HOCj+GoCdQW/Pol5iBrFw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rbenv";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "rbenv";
|
||||
repo = "rbenv";
|
||||
rev = "v${version}";
|
||||
sha256 = "12i050vs35iiblxga43zrj7xwbaisv3mq55y9ikagkr8pj1vmq53";
|
||||
sha256 = "sha256-m/Yy5EK8pLTBFcsgKCrNvQrPFFIlYklXXZbjN4Nmm9c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.160.1";
|
||||
version = "0.163.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tIKQBJ+nlUzY3+jHlXOAMfCLVJfRXZiveSkKaDMz/hI=";
|
||||
sha256 = "sha256-8O7EuYMNEa0M3HS0U10VbkevxL/cnySXHkT1WdI4Z84=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clj-kondo";
|
||||
version = "2021.09.25";
|
||||
version = "2021.10.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-kS6bwsYH/cbjJlIeiDAy6QsAw+D1uHp26d4NBLfStjg=";
|
||||
sha256 = "sha256-i0OeQPZfQPUeXC/Bs84I91IahBKK6W1mFix97s8/lVA=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# https://github.com/clj-kondo/clj-kondo/blob/v2021.09.25/script/compile#L17-L21
|
||||
# https://github.com/clj-kondo/clj-kondo/blob/v2021.10.19/script/compile#L17-L21
|
||||
args=("-jar" "$src"
|
||||
"-H:CLibraryPath=${graalvm11-ce.lib}/lib"
|
||||
# Required to build babashka on darwin. Do not remove.
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.28.0";
|
||||
version = "1.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ySCfU/VWZz6tSZbrbhT/OIoxme+Y53eFtlVTI43yNVA=";
|
||||
sha256 = "sha256-gEXQaVBzvOifnCN8TWfadTgypHy+u7lZw+qoyW+mEKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorSha256 = "sha256-G3kiaYoCyoltyS/OlecJHaYWpeFax1qonOJZr30wSV8=";
|
||||
vendorSha256 = "sha256-SURFlHCrWqTjdHO9ZUmtR2nmKwt0S7rpA6jQ0dDD/EE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
, nodePackages
|
||||
, skim
|
||||
, sqlite
|
||||
, statix
|
||||
, stylish-haskell
|
||||
, tabnine
|
||||
, vim
|
||||
|
|
@ -527,6 +528,21 @@ self: super: {
|
|||
'';
|
||||
});
|
||||
|
||||
statix = buildVimPluginFrom2Nix rec {
|
||||
inherit (statix) pname src meta;
|
||||
version = "0.1.0";
|
||||
dependencies = with self; [ statix ];
|
||||
postPatch = ''
|
||||
# check that version is up to date
|
||||
grep 'pname = "statix-vim"' -A 1 flake.nix \
|
||||
| grep -F 'version = "${version}"' flake.nix
|
||||
|
||||
cd vim-plugin
|
||||
substituteInPlace ftplugin/nix.vim --replace statix ${statix}/bin/statix
|
||||
substituteInPlace plugin/statix.vim --replace statix ${statix}/bin/statix
|
||||
'';
|
||||
};
|
||||
|
||||
sved =
|
||||
let
|
||||
# we put the script in its own derivation to benefit the magic of wrapGAppsHook
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-agent";
|
||||
version = "0.18.4";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "agent";
|
||||
sha256 = "sha256-NlktNBVljMgcivB0N/X3aAEJyZK2GyDD7o86qx/5YmQ=";
|
||||
sha256 = "sha256-oe5uUG3uQnobH94J3ndI35pnw7zExqtoXJ3Ro9lSrrc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-MZGOZB/mS3pmZuI35E/QkaNLLhbuW2DfZiih9OCXMj0=";
|
||||
vendorSha256 = "sha256-uQEcoAxodMMSv0vEKtcmXYzZ50YYdywHG3S07UONN84=";
|
||||
|
||||
patches = [
|
||||
# https://github.com/grafana/agent/issues/731
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, nixosTests
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
|
|
@ -41,7 +40,18 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
checkFlags = [ "--skip=pager_more" "--skip=pager_most" ];
|
||||
|
||||
passthru.tests = { inherit (nixosTests) bat; };
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
testFile=$(mktemp /tmp/bat-test.XXXX)
|
||||
echo -ne 'Foobar\n\n\n42' > $testFile
|
||||
$out/bin/bat -p $testFile | grep "Foobar"
|
||||
$out/bin/bat -p $testFile -r 4:4 | grep 42
|
||||
rm $testFile
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cat(1) clone with syntax highlighting and Git integration";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.6.1";
|
||||
version = "2.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-x5KqDVy+thIymZHsmyO+WsGq0IBb2cZxogKsjzunC2o=";
|
||||
sha256 = "sha256-xn9DSbAqfSK7CokxVRrHuOO62oSXKGR0/HZYadLLd74=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8NhJfA9q6di/IPL53U/dwGNAAdtuBX5Lf6fhTk4Mz0Q=";
|
||||
vendorSha256 = "sha256-e+LsFlF83OGbhajaGGyWARv7O6dI6ZKm3yhDqrgmMpk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluent-bit";
|
||||
version = "1.8.6";
|
||||
version = "1.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluent";
|
||||
repo = "fluent-bit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JYE4ReFiYSDx/0dlA8OkQw3rEpUEQDguTWoHC1r1fUc=";
|
||||
sha256 = "sha256-b+MZuZQB/sl0HcioU1KCxH3TNiXYSPBfC9dBKqCVeXk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "0.179.0";
|
||||
version = "0.183.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E8a1S6CPPd8xsdt/tu1VmWxQCMUp8dEPB5H2IL4jj1k=";
|
||||
sha256 = "sha256-bH6Crsyo1D2wBlQJK4P13Jc9x5ItaNOV1P7o16z8LS8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qF7mULIQrFs/SAMm/dUcYPs1urLKKg6w7hgkuJ2AivQ=";
|
||||
vendorSha256 = "sha256-netkm/oqf7FQuuF0kjQjoopOQADPrVStIhMdEYx43FE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, maven, jdk8_headless }:
|
||||
|
||||
let
|
||||
version = "1.2021.7";
|
||||
version = "1.2021.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plantuml";
|
||||
repo = "plantuml-server";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kY7b3ocm1zudGIf72MNMZDUG2t2FFqucRr3kRaFv7mo=";
|
||||
sha256 = "sha256:016mrs4djbaid1ma5922dvq372pphbzzmjzsjalj2dqp60538xll";
|
||||
};
|
||||
|
||||
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central
|
||||
|
|
@ -28,7 +28,7 @@ let
|
|||
installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-HzT5rBycrd48KskWKAGtkMKdCDQ8NPYADVWZh8K0ll4=";
|
||||
outputHash = "sha256:12w1iw9c5j7y9hhaip07j3aszjiiakkww1v3zszlj15fj8jgqyf2";
|
||||
};
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "frp";
|
||||
version = "0.37.1";
|
||||
version = "0.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatedier";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TEVSxTzMgoIPcIUmhtRnFSp3xClJmOsIUjpKEr5sId8=";
|
||||
sha256 = "sha256-wdK8o+Id7+YiSk7nZv04kTYa/9YOypstlecu6TPFI6w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4vvIobj1I7FbPVJJG4NZogwv4BMo7GRa5Fo5gO2Daws=";
|
||||
vendorSha256 = "sha256-R//kD9A6U9m/7Q7FPToA5kn0kzR7W/A82HezA/+dCFY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grpcui";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fullstorydev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1l8ldx7nx2pa2ac5znss0j0dhapn3syj02xqys4jz22hr5gvfj6m";
|
||||
sha256 = "sha256-gHzafx3nIrdLyiGlz5v6pJ8XVT+7tDN59rsdfp1V/Q0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "15qgpbsl41swifw8w1lx0pbniwv3rf35127ald7h1r157vfa0r8b";
|
||||
vendorSha256 = "sha256-6K644KSmFEA60yMnw7GmCmycsb5x2stvc0unyV4pF9g=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,28 @@
|
|||
{ lib, python3Packages, fetchFromGitHub, gettext }:
|
||||
{ lib, python3Packages, fetchFromGitHub, gettext, installShellFiles }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ytcc";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woefe";
|
||||
repo = "ytcc";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w2frcy51kwsvd486awhpl5kkm11zj1nw3nnv9337316gfs213nw";
|
||||
sha256 = "0xpinilb8rnha35laxq076p6v7hdis6davr9ckm5xycs3m4aj7s8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "youtube_dl" "yt_dlp"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ gettext installShellFiles ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
click
|
||||
feedparser
|
||||
lxml
|
||||
sqlalchemy
|
||||
youtube-dl
|
||||
yt-dlp
|
||||
wcwidth
|
||||
];
|
||||
|
||||
|
|
@ -38,10 +42,14 @@ python3Packages.buildPythonApplication rec {
|
|||
"test_download"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/ytcc.1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command Line tool to keep track of your favourite YouTube channels without signing up for a Google account";
|
||||
homepage = "https://github.com/woefe/ytcc";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ marius851000 ];
|
||||
maintainers = with lib.maintainers; [ marius851000 marsam ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zerotierone";
|
||||
version = "1.6.6";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zerotier";
|
||||
repo = "ZeroTierOne";
|
||||
rev = version;
|
||||
sha256 = "0pi22252c21gxmjcgwmagkrnp5y1hhqrm9jkjj9pg1nlzzrlyrnm";
|
||||
sha256 = "sha256-nr5qvo/SLzQ16B/83lCzlQ5zduPGxOhfqWat/Grsf/Q=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
28
pkgs/tools/nix/statix/default.nix
Normal file
28
pkgs/tools/nix/statix/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, withJson ? true }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "statix";
|
||||
# also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix
|
||||
# the version can be found in flake.nix of the source code
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nerdypepper";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Jh3ErzK8vqEdDtZP7O/PAmHQznUTB18nCQwfckFxyLA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-y+vBHAHTe++tYOWWQ5ioFlprRfDximZE8KSGNNBSPAk=";
|
||||
|
||||
cargoBuildFlags = lib.optionals withJson [ "--features" "json" ];
|
||||
|
||||
cargoCheckFlags = cargoBuildFlags;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lints and suggestions for the nix programming language";
|
||||
homepage = "https://github.com/nerdypepper/statix";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda nerdypepper ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "consul-template";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "consul-template";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XzsewkHaFIq1kvFDHIsnhfhtLPLFRin7YrhiZuF1+co=";
|
||||
sha256 = "sha256-t6oqey2GlGOOxGuhlYnQeYzw1vR7qeiM+tSqzp3L3g0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/4ZY4YRGsUSL2e6uYPJ9tWEvXDjU5/L56yf49pUkJ2E=";
|
||||
vendorSha256 = "sha256-my4ECzmvrPhbKlcEptQ0xi4lYxHm42IrEsOvcetuMeQ=";
|
||||
|
||||
# consul-template tests depend on vault and consul services running to
|
||||
# execute tests so we skip them here
|
||||
|
|
|
|||
|
|
@ -15175,6 +15175,8 @@ with pkgs;
|
|||
|
||||
sselp = callPackage ../tools/X11/sselp{ };
|
||||
|
||||
statix = callPackage ../tools/nix/statix { };
|
||||
|
||||
stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { };
|
||||
|
||||
stm32flash = callPackage ../development/embedded/stm32/stm32flash { };
|
||||
|
|
|
|||
|
|
@ -2315,6 +2315,8 @@ in {
|
|||
|
||||
duecredit = callPackage ../development/python-modules/duecredit { };
|
||||
|
||||
duet = callPackage ../development/python-modules/duet { };
|
||||
|
||||
dufte = callPackage ../development/python-modules/dufte { };
|
||||
|
||||
dugong = callPackage ../development/python-modules/dugong { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue