BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Jan Tojnar 2020-12-06 03:28:13 +01:00
commit 6ce08f74dc
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
42 changed files with 1005 additions and 758 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2103.xml
View file

@ -32,7 +32,7 @@
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finnally</link>
packaged, along with a rewrite to the Nix expressions, allowing users to
override the features upstream supports selecting to compile or not to.
Additionally, the attribute <code>gnuradio<code> and <code>gnuradio3_7<code>
Additionally, the attribute <code>gnuradio</code> and <code>gnuradio3_7</code>
now point to an externally wrapped by default derivations, that allow you to
also add `extraPythonPackages` to the Python interpreter used by GNURadio.
Missing environmental variables needed for operational GUI were also added

1
nixos/modules/services/misc/zigbee2mqtt.nix
View file

@ -70,6 +70,7 @@ in
description = "Zigbee2mqtt Service";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
environment.ZIGBEE2MQTT_DATA = cfg.dataDir;
serviceConfig = {
ExecStart = "${cfg.package}/bin/zigbee2mqtt";
User = "zigbee2mqtt";

4
pkgs/applications/audio/geonkick/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "geonkick";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
sha256 = "19zbz4v2n5ph4af721xls7ignmis2q2yqyd0m97g9b3njrgnfy3n";
sha256 = "14svwrxqw15j6wjy3x8s28yyrafa31bm7d1ns5h6gvpndccwc1kw";
};
nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/applications/networking/browsers/qutebrowser/default.nix
View file

@ -31,12 +31,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
version = "1.14.0";
version = "1.14.1";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0jip413yvyhdaywz0iadc32aaanjnhbx1d1vwzx3z1xbgc4i9svn";
sha256 = "15l7jphy1qjsh6y6kd5mgkxsl6ymm9564g1yypa946jbyrgi8k2m";
};
# Needs tox

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View file

@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mutt";
version = "2.0.2";
version = "2.0.3";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "1j0i2jmlk5sc78af9flj3ynj0iiwa8biw7jgf12qm5lppsx1h4j7";
sha256 = "1vf1ab3mnx7p4s4n4pssajj211s3zr4730bwgsjx9gxcnyppqclw";
};
patches = optional smimeSupport (fetchpatch {

4
pkgs/applications/radio/fldigi/default.nix
View file

@ -2,12 +2,12 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
version = "4.1.16";
version = "4.1.17";
pname = "fldigi";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1dfkvhs0ri5kbyskk730ik8ix5z138qys26b31p6kixd8jjkw3k4";
sha256 = "1gzff60sn3h05279f9mdi1rkdws52m28shcil16911lvlq6ki13m";
};
buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio

4
pkgs/applications/radio/flrig/default.nix
View file

@ -6,12 +6,12 @@
}:
stdenv.mkDerivation rec {
version = "1.3.52";
version = "1.3.53";
pname = "flrig";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "18c154080vl25cy4l5amh96abm6kzm7mzld9h58pabc28yqq8zl8";
sha256 = "1m0fa891scpaf719002w9gpg1famx84kpzav1mw1fafmbzyvjw1i";
};
buildInputs = [

4
pkgs/applications/radio/gqrx/default.nix
View file

@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
mkDerivation rec {
pname = "gqrx";
version = "2.14";
version = "2.14.2";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
sha256 = "1iz4lgk99v5bwzk35wi4jg8nn3gbp0vm1p6svs42mxxxf9f99j7i";
sha256 = "15xlzfgmffq43wn74xjqc5p2m21i3lh28qqskd2jf2hhvanpcwcp";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/radio/inspectrum/default.nix
View file

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "inspectrum";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "miek";
repo = "inspectrum";
rev = "v${version}";
sha256 = "1a517y7s1xi66y5kjrpjay450pad9nc228pa8801mxq1c7m1lamm";
sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355";
};
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];

13
pkgs/applications/version-management/pijul/default.nix
View file

@ -2,8 +2,6 @@
, fetchCrate
, rustPlatform
, pkg-config
, clang
, libclang
, libsodium
, openssl
, xxHash
@ -15,21 +13,20 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
version = "1.0.0-alpha.11";
version = "1.0.0-alpha.17";
src = fetchCrate {
inherit version pname;
sha256 = "1y2xgbzclmk0i98iydmqgvf6acx0v326dmj9j2hiwrld193fc4dx";
sha256 = "03r383fkqx17sb2c0kz71lbn0rdas7nd9yw7ni5fbmrq8rlk9brv";
};
cargoSha256 = "0i1rr8jg34g4b8i2lvh9gy2rpfa01ma9jpcpyp5zklrzk5f1ksvf";
cargoSha256 = "0dfmldklklax8nb3pry0h80kih1k1idfjgaxinxkk1iflcm3cwqn";
cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
LIBCLANG_PATH = "${libclang}/lib";
doCheck = false;
nativeBuildInputs = [ pkg-config clang ];
buildInputs = [ openssl libclang libsodium xxHash zstd ]
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl libsodium xxHash zstd ]
++ (stdenv.lib.optionals gitImportSupport [ libgit2 ])
++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreServices Security SystemConfiguration

15
pkgs/applications/video/mapmap/default.nix
View file

@ -1,11 +1,13 @@
{ stdenv
{ stdenv
, fetchFromGitHub
, fetchpatch
, qttools
, qtmultimedia
, liblo
, gst_all_1
, qmake
, pkgconfig
, wrapQtAppsHook
}:
with stdenv;
@ -25,6 +27,7 @@ mkDerivation rec {
nativeBuildInputs = [
qmake
pkgconfig
wrapQtAppsHook
];
buildInputs = [
@ -37,6 +40,14 @@ mkDerivation rec {
gst_all_1.gst-vaapi
];
patches = [
(fetchpatch {
name = "message-handler-segfault.patch";
url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch";
sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l";
})
];
installPhase = ''
mkdir -p $out/bin
cp mapmap $out/bin/mapmap
@ -57,8 +68,6 @@ mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.erictapen ];
platforms = platforms.linux;
# binary segfaults at the moment
broken = true;
};
}

6
pkgs/applications/window-managers/i3/layout-manager.nix
View file

@ -6,13 +6,13 @@ in
stdenv.mkDerivation rec {
pname = "i3-layout-manager";
version = "unstable-2019-12-06";
version = "unstable-2020-05-04";
src = fetchFromGitHub {
owner = "klaxalk";
repo = pname;
rev = "064e13959413ba2d706185478a394e5852c0dc53";
sha256 = "1qm35sp1cfi3xj5j7xwa05dkb3353gwq4xh69ryc6382xx3wszg6";
rev = "df54826bba351d8bcd7ebeaf26c07c713af7912c";
sha256 = "0ccvr43yp26fnh5d82cw7jcfq2sbxzzmdx2cp15bmxr8ixr8knc3";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/data/themes/obsidian2/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "theme-obsidian2";
version = "2.16";
version = "2.17";
src = fetchurl {
url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
sha256 = "0a5268w8b413i62ggipgy19k83va1n0ni8bvfwrp17r0n97wbqx2";
sha256 = "1gff34xqypqjhh15lv4cc4ifsg07jx2znlsj9is4wmqf39a8h8n4";
};
sourceRoot = ".";

4
pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
version = "3.38.1";
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "150c0jgjhbb59wf7lzcnp1f22lvrigw95mg5ad3jh15qzwqqd8wx";
sha256 = "0hzn975v49rv3nsqp8m0mzv8gcm7nyvn54gj3zsml8ahlxwl592p";
};
passthru = {

5
pkgs/development/libraries/ffmpeg-full/default.nix
View file

@ -164,9 +164,8 @@
* utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
*
* Need fixes to support Darwin:
* frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh
* libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab
* wavpack x265 xavs
* gsm libjack2 libmodplug libmfx(intel-media-sdk) nvenc pulseaudio samba
* vid-stab
*
* Need fixes to support AArch64:
* libmfx(intel-media-sdk) nvenc

10
pkgs/development/libraries/swiftshader/default.nix
View file

@ -1,17 +1,17 @@
{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext }:
{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }:
stdenv.mkDerivation rec {
pname = "swiftshader";
version = "2020-06-17";
version = "2020-11-06";
src = fetchgit {
url = "https://swiftshader.googlesource.com/SwiftShader";
rev = "763957e6b4fc1aa360ab19c4109b8b26686783e8";
sha256 = "0sdh48swx0qyq2nfkv1nggs14am0qc7z239qrxb69p2ddqm76g1s";
rev = "4ed9d3498dcffa987acba1a8007ff8dec336f263";
sha256 = "1gz2zflfacxf34s78djddf93brn9kyxj4byc4p2ip1pin43lh2lg";
};
nativeBuildInputs = [ cmake python3 jq ];
buildInputs = [ libX11 libXext ];
buildInputs = [ libX11 libXext zlib ];
# Make sure we include the drivers and icd files in the output as the cmake
# generated install command only puts in the spirv-tools stuff.

38
pkgs/development/python-modules/milc/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, appdirs
, argcomplete
, colorama
, gnugrep
}:
buildPythonPackage rec {
pname = "milc";
version = "1.0.10";
src = fetchFromGitHub {
owner = "clueboard";
repo = "milc";
rev = version;
sha256 = "04mk057b6jh0k4maqkg80kpilxak9r7vlr9xqwzczh2gs3g2x573";
};
checkInputs = [ gnugrep ];
propagatedBuildInputs = [ appdirs argcomplete colorama ];
# Upstream has a nose2 test suite that runs this hello script in a handful of
# ways, but it's not in setup.py and makes assumptions about relative paths in
# the src repo, so just sanity-check basic functionality.
checkPhase = ''
patchShebangs ./hello
./hello | grep "Hello, World"
'';
meta = with stdenv.lib; {
description = "An Opinionated Batteries-Included Python 3 CLI Framework";
homepage = "https://milc.clueboard.co";
license = licenses.mit;
maintainers = with maintainers; [ bhipple ];
};
}

24
pkgs/development/python-modules/py-air-control-exporter/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ buildPythonPackage, fetchPypi, flask, isPy27, lib, prometheus_client
, py-air-control, pytestCheckHook, pytestcov, pytestrunner, setuptools_scm }:
buildPythonPackage rec {
pname = "py-air-control-exporter";
version = "0.1.4";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1f13d3mlj6c3xvkclimahx7gpqqn8z56lh4kwy1d3gkjm7zs9zw9";
};
nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ pytestCheckHook pytestcov pytestrunner ];
propagatedBuildInputs = [ flask prometheus_client py-air-control ];
meta = with lib; {
description = "Exports Air Quality Metrics to Prometheus.";
homepage = "https://github.com/urbas/py-air-control-exporter";
license = licenses.mit;
maintainers = with maintainers; [ urbas ];
};
}

7
pkgs/development/python-modules/pyatmo/default.nix
View file

@ -12,19 +12,20 @@
buildPythonPackage rec {
pname = "pyatmo";
version = "4.2.0";
version = "4.2.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jabesq";
repo = "netatmo-api-python";
rev = "v${version}";
sha256 = "0b2k1814zg3994k60xdw5gpsl8k1wy9zndd0b1p4dfb5qkx9f8kp";
sha256 = "12lmjhqjn71a358nkpzl3dwgiwmmz4lcv9f0qf69ngznpiirk28m";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace "oauthlib==3.1.0" "oauthlib"
--replace "oauthlib~=3.1.0" "oauthlib" \
--replace "requests~=2.23.0" "requests"
'';
propagatedBuildInputs = [

2
pkgs/development/python-modules/uncertainties/default.nix
View file

@ -8,7 +8,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "9122c1e7e074196883b4a7a946e8482807b2f89675cb5e3798b87e0608ede903";
sha256 = "00z9xl40czmqk0vmxjvmjvwb41r893l4dad7nj1nh6blw3kw28li";
};
propagatedBuildInputs = [ future ];

4
pkgs/development/tools/flyway/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, jre_headless, makeWrapper }:
let
version = "7.3.0";
version = "7.3.1";
in
stdenv.mkDerivation {
pname = "flyway";
inherit version;
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
sha256 = "0d5v0g28myqiac0a5qy0sbpf0mjzzi3agyks9cdzsgg3ka1i18q9";
sha256 = "1qridl42jldwv6wka7l54g354aj9f3vbgzhyz5gdz5vdzs9x93w8";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;

4
pkgs/development/web/insomnia/default.nix
View file

@ -16,12 +16,12 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
version = "2020.4.2";
version = "2020.5.1";
src = fetchurl {
url =
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
sha256 = "0pxf6nphb6k2szgapqkhjavdzq1blg34v1zj47l76r0iqxrpm3va";
sha256 = "18wbyf5qq2x0dzaf6bprs4nhv0ckrgq679l3w61p1yf4y3j7xwn4";
};
nativeBuildInputs =

4
pkgs/misc/arm-trusted-firmware/default.nix
View file

@ -6,7 +6,7 @@ let
, platform ? null
, extraMakeFlags ? []
, extraMeta ? {}
, version ? "2.3"
, version ? "2.4"
, ... } @ args:
stdenv.mkDerivation ({
@ -17,7 +17,7 @@ let
owner = "ARM-software";
repo = "arm-trusted-firmware";
rev = "v${version}";
sha256 = "113mcf1hwwl0i90cqh08lywxs1bfbg0nwqibay9wlkmx1a5v0bnj";
sha256 = "12k0n79j156bdzqws18kpbli04kn00nh6dy42pjv6gakqrkx9px3";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

38
pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ stdenv
, fetchFromGitHub
, kernel
, kmod
}:
let
kerneldir = "lib/modules/${kernel.modDirVersion}";
in stdenv.mkDerivation rec {
pname = "gcadapter-oc-kmod";
version = "1.4";
src = fetchFromGitHub {
owner = "HannesMann";
repo = pname;
rev = "v${version}";
sha256 = "1nqhj3vqq9rnj37cnm2c4867mnxkr8di3i036shcz44h9qmy9d40";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = [
"KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build"
"INSTALL_MOD_PATH=$(out)"
];
installPhase = ''
install -D {,$out/${kerneldir}/extra/}gcadapter_oc.ko
'';
meta = with stdenv.lib; {
description = "Kernel module for overclocking the Nintendo Wii U/Mayflash GameCube adapter";
homepage = "https://github.com/HannesMann/gcadapter-oc-kmod";
license = licenses.gpl2;
maintainers = with maintainers; [ r-burns ];
platforms = platforms.linux;
};
}

4
pkgs/servers/atlassian/jira.nix
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "8.13.0";
version = "8.14.0";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "06jq6x24kxwzkwjx05d4q6jyvjpbzqpjlj8arycw8z0w97k83hh9";
sha256 = "12dm0sasw98ywd074rjd9hnbymvy8z16bicjxfxqz91n1y13732i";
};
buildPhase = ''

4
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "0.118.4";
version = "0.118.5";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@ -313,7 +313,7 @@
"google_domains" = ps: with ps; [ ];
"google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib
"google_pubsub" = ps: with ps; [ google_cloud_pubsub ];
"google_translate" = ps: with ps; [ gtts-token ];
"google_translate" = ps: with ps; [ gtts ];
"google_travel_time" = ps: with ps; [ googlemaps ];
"google_wifi" = ps: with ps; [ ];
"gpmdp" = ps: with ps; [ websocket_client ];

4
pkgs/servers/home-assistant/default.nix
View file

@ -62,7 +62,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "0.118.4";
hassVersion = "0.118.5";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "0b289ijxpay6yb2ahkfm7n9k423f8xlbwg8z903iwakiqg54ghip";
sha256 = "1711qhcvrzl599cryd9wzamacn1vv37w67vprqgibnbw58kcpilj";
};
# leave this in, so users don't have to constantly update their downstream patch handling

6
pkgs/servers/monitoring/telegraf/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.16.2";
version = "1.16.3";
excludedPackages = "test";
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
sha256 = "sha256-XdlXUwGn2isGn7SqCGaAjntposBEd6WbbdfN6dEycDI=";
sha256 = "1vhxa1sdnkjy86rn2zsyf8kc3nn2fdbym3kw5zxz88mjc8iq3x0d";
};
vendorSha256 = "02fqx817w6f9grfc69ri06a6qygbr5chan6w9waq2y0mxvmypz28";
vendorSha256 = "12rh8pggpdjgw9x23qa99cj7i67iqchacgzd11m4ficxv8a4bkyc";
buildFlagsArray = [ ''-ldflags=
-w -s -X main.version=${version}

8
pkgs/servers/pg_tileserv/default.nix
View file

@ -2,16 +2,18 @@
buildGoModule rec {
pname = "pg_tileserv";
version = "1.0.3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "CrunchyData";
repo = pname;
rev = "v${version}";
sha256 = "19ycpir662dv6jg3fnlj3208cjhy0lxww3wc3h19x96556yklnfg";
sha256 = "1vdxnh1s8r8ydsjnj70s69nifhpyicb4jmgd5j7i49cr096jg526";
};
vendorSha256 = "1wpzj6par25z7cyyz6p41cxdll4nzb0jjdl1pffgawiy9z7j17vb";
vendorSha256 = "1wbv1wh3phd9p2hfnffsjv6f8hf9fgkwg88k9w56rx1pgps63nd9";
buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ];
doCheck = false;

4
pkgs/servers/search/groonga/default.nix
View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "groonga";
version = "10.0.8";
version = "10.0.9";
src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
sha256 = "0ppjxgq7bwhzzlrl2jn7ybc132c8rg95yhwshxqgccbhbs8s6c29";
sha256 = "191saqanv8k6ijl96mw4jdhh9pkpdn651f1bg4kfb34p7vy8ld9k";
};
buildInputs = with stdenv.lib;

4
pkgs/servers/shairport-sync/default.nix
View file

@ -2,11 +2,11 @@
, libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
stdenv.mkDerivation rec {
version = "3.3.6";
version = "3.3.7";
pname = "shairport-sync";
src = fetchFromGitHub {
sha256 = "0s5aq1a7dmf3n2d6ps6x7xarpn53vvlcbms8k23wl2h5vrx91rwi";
sha256 = "110k196y62zy6cmdvcnf74iamqj7jq0ybnqh1q1irjak81s3yz12";
rev = version;
repo = "shairport-sync";
owner = "mikebrady";

14
pkgs/servers/zigbee2mqtt/default.nix
View file

@ -3,24 +3,14 @@ let
package = (import ./node.nix { inherit pkgs system; }).package;
in
package.override rec {
version = "1.16.1";
version = "1.16.2";
reconstructLock = true;
postInstall = ''
sed -i '1s;^;#!/usr/bin/env node\n;' $out/lib/node_modules/zigbee2mqtt/index.js
chmod +x $out/lib/node_modules/zigbee2mqtt/index.js
mkdir $out/bin
ln -s $out/lib/node_modules/zigbee2mqtt/index.js $out/bin/zigbee2mqtt
rm -rf $out/lib/node_modules/zigbee2mqtt/data
ln -s ${dataDir} $out/lib/node_modules/zigbee2mqtt/data
'';
src = pkgs.fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
sha256 = "16pizkiic7m8w9q56lgzdpy3hpvnw7fwrkkmldg57wpmqmq1r3dj";
sha256 = "0rpmm4pwm8s4i9fl26ql0czg5kijv42k9wwik7jb3ppi5jzxrakd";
};
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

1251
pkgs/servers/zigbee2mqtt/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

4
pkgs/servers/zigbee2mqtt/update.sh
View file

@ -10,8 +10,8 @@ if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
exit 0
fi
wget $ZIGBEE2MQTT/package.json
wget $ZIGBEE2MQTT/npm-shrinkwrap.json
curl -LO $ZIGBEE2MQTT/package.json
curl -LO $ZIGBEE2MQTT/npm-shrinkwrap.json
node2nix --nodejs-12 \
-l npm-shrinkwrap.json \

11
pkgs/tools/admin/awscli2/default.nix
View file

@ -8,13 +8,12 @@ let
py = python3.override {
packageOverrides = self: super: {
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0dev71";
version = "2.0.0dev75";
src = fetchFromGitHub {
owner = "boto";
repo = "botocore";
rev = "f8b31e2a01a8797f8331c6af2c93a26ff82b2b4b";
hash = "sha256-25WV64RPXpGlq9mZYxUVKUdUjU+e1UnuVTLf9Z9I8Tc=
";
rev = "1a4caa8d1c232e9463febec406a8fedc71cb065c";
sha256 = "0z2c9i2ci3f8979si8gcgnsz44ylchjax1f3dhj7pzyb2kcw6zri";
};
});
prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
@ -30,13 +29,13 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.1.3"; # N.B: if you change this, change botocore to a matching version too
version = "2.1.7"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
hash = "sha256-7klM8jLNptaMyOjKkrsldUdw10vABgIc+Fs3Kj/z0V0=";
sha256 = "0sxdbc8y5yqcvsk2bxkywdh4fsq90vlsmcm45y0sa3rpza64xs3r";
};
postPatch = ''

170
pkgs/tools/admin/pulumi/data.nix
View file

@ -1,178 +1,178 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "2.10.2";
version = "2.15.0";
pulumiPkgs = {
x86_64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-linux-x64.tar.gz";
sha256 = "0pxm90vmha265zc4b1ip2f3iryslkwxznn4kb8l3ma6gibz1zav3";
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-linux-x64.tar.gz";
sha256 = "0yvzqqcfmgblig5jwdc07phyhnfjzvjd1qm0vgfi9ll9y88l33lc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-linux-amd64.tar.gz";
sha256 = "1l4kszzw1w862sfd4jnz66lwnp02p4kl1fwvj5ab81qfwzwg0cfx";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-linux-amd64.tar.gz";
sha256 = "1rpmzra42kx2jnhdbnqg120lbnpw86y00vkqbqc3qyagi260f01g";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-linux-amd64.tar.gz";
sha256 = "1gzjdafx5zsqrb5r3amskak51ajcpqbbfw45939jdsdll8vclw7g";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-linux-amd64.tar.gz";
sha256 = "0y0j1aflrfas9sfr4g7jbn2cnhlz9hpz5il6qykz0m01v6sv604w";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-linux-amd64.tar.gz";
sha256 = "0myvx2glqnx29l4wd5vx4gm773zrcmwcjvs2b1yv63fl10md9sv7";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-linux-amd64.tar.gz";
sha256 = "174b6r2vhbf9svknidd05sccjzihp97wcd8jwy6dll83d8f8v2xn";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-linux-amd64.tar.gz";
sha256 = "12cajd8jiqy11s880vsv20gqfm44g160x7fxm93agjl7wng32ad6";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-linux-amd64.tar.gz";
sha256 = "0xq36wh57w7b7l5skx173lj3chl4rfgbfdivsvyjlnfahh2fmfr4";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-linux-amd64.tar.gz";
sha256 = "0k429fh477f84kmnhyl5s9p0yym7d6sdq7hy7wqx6psxp4rf5h9x";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-linux-amd64.tar.gz";
sha256 = "0p2i0k0js3js35jcphf64rzxs7zg9wq25yfzd9q6b2kp2vyqbvjs";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-linux-amd64.tar.gz";
sha256 = "045z7qj23bq71nxfjk1vvnfbjcnqfkcbxbpjz72q0hw4xn7dq6jz";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-linux-amd64.tar.gz";
sha256 = "1hzf4668sljy2g6s9xz6lvn8cbjy8bb2flhdmc4ln69xxcsslj9z";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-linux-amd64.tar.gz";
sha256 = "16d0jd3429pr4vlrzrv32w2fa53j7gyqq5lc78gw9j4v3mc3scvz";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-linux-amd64.tar.gz";
sha256 = "0fr8ac7864ph02hhl3f08xjyk626c4zbcf8nr7xhmh2ifz6sj9sl";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-linux-amd64.tar.gz";
sha256 = "0gz4kpddaf9p25lfnp70p6197wrfgsiys7s4vdy75z8dyd4sbiv0";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-linux-amd64.tar.gz";
sha256 = "0zx9yy97n0wk87ylgq67nphagfp1gas5z99mcfmlh9rf4mj8fhpz";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-linux-amd64.tar.gz";
sha256 = "0n2532gfb5i53raya07rn8wcp15rc07jfg8wsm2lfzj7a4mp2p6c";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-linux-amd64.tar.gz";
sha256 = "02c0nmnk27q9ssv7wv8s30ysxnkqbq7sd004gia4wxf97fhlhl5x";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-linux-amd64.tar.gz";
sha256 = "16l1a30rkg9l6yh68qv61dgm3h3gdgpsdacvnfg1ra0fvvfs9477";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-linux-amd64.tar.gz";
sha256 = "01rpv9m6mj8yqz302g15x4yp37pp4ghdc686n4l7xz08xdb209xi";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-linux-amd64.tar.gz";
sha256 = "1m2w8gsksr36pprxr6v3v4y3n7x5ycbcdfywv67yxmbi4lxyy3ar";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-linux-amd64.tar.gz";
sha256 = "1w4cjgccm29ncqb7jfsf9ajlvq0q8h5mnz4v5lxwyx21n80kq34p";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-linux-amd64.tar.gz";
sha256 = "01vnbgck1ffj4jg8ghmkjp63xq3r9q3459vy03xpzm14l1i6agwv";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-linux-amd64.tar.gz";
sha256 = "0imqwx4v6qsk10anxvnaxpxg87mm34x0qcq30c435mcfrly728sp";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-linux-amd64.tar.gz";
sha256 = "1g05kqymbkrxf48iskn9w12kxy880allhqm9a7p4g7mx0174yfhm";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-linux-amd64.tar.gz";
sha256 = "0zrza0i73ld16szbbsz3h9p9z09ws2pf380kzb1358g70ayvzga3";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-linux-amd64.tar.gz";
sha256 = "1fa5i283nisa6cq02fcrsgwkw7bwnh2j3agjbqyvv2xiss34i7hw";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-linux-amd64.tar.gz";
sha256 = "12gs049074vn5s0njza0r48bk5z8d7bfc50j2mbbylkdrlrl87ci";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-linux-amd64.tar.gz";
sha256 = "0ihiag248c30dz4z2b559689zqwp52p0m7pv7jqpk86xwvimbsn1";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-linux-amd64.tar.gz";
sha256 = "1vqzl72q939i381vy6dkn75xv09vjs2mg2prbmx63j3hylgb9m6r";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-linux-amd64.tar.gz";
sha256 = "0jwvdsb26bhsqcbrsw9ss54xgpccl830hhbwnbz8ql8yndd35srg";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz";
sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-linux-amd64.tar.gz";
sha256 = "1wr4p312xwqi0icn153iv2j88rp37wkf8hc5y4pmdr61vd0kpw7w";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-linux-amd64.tar.gz";
sha256 = "1xxhc5sy3z391dgzzb4s6wzad2n2j3f5g158wffcj8jss2ylbh1x";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-linux-amd64.tar.gz";
sha256 = "0xq3as94i9ah9dv1cabgdqjg68yg7laksfzpf81s6kcv742cnnqi";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-linux-amd64.tar.gz";
sha256 = "02xq4mph35fnziz6fb230cvd828yfs030nmi3a4hwh4w1xbr24iw";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-linux-amd64.tar.gz";
sha256 = "1av7fj1jlhhqplqq60d6hzzidlhsvr41z9p1x3mvz5frwijxr1ab";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-linux-amd64.tar.gz";
sha256 = "0avlf8gyh52zc11a87izy2v8iy4zvbfv6zrm8zg1i5ar43xqg3pm";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-linux-amd64.tar.gz";
sha256 = "1bgw5xw6f01whxlm5358xn6v9wqz9mxg3dvb5vi7rfs9wwxykr4g";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-linux-amd64.tar.gz";
sha256 = "1wb953vm990c4dsb757msmz7ws844alad3g68sfy029cgmnf8q5i";
}
];
x86_64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-darwin-x64.tar.gz";
sha256 = "1fzqylx7pmrpvsxrmhlx56v9i9zkid96zrj9hsc26qhx5w7k600w";
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-darwin-x64.tar.gz";
sha256 = "08hyk06qwm1aibpyqb07h83gc6nfp0cwf6hikf8mc18b2mrwr27r";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-darwin-amd64.tar.gz";
sha256 = "05dxpdwdg8cd1a6d3xh8dkns5wkvpr0v11bb4zdzv38x6wxnqx0z";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-darwin-amd64.tar.gz";
sha256 = "0ih9l3pkqxfslc11qcgwshxqxbcwy5wfpjczahny6mkgqwmxixnx";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-darwin-amd64.tar.gz";
sha256 = "1jbnx1wpzh2k127ixh9j0ghlqhj3sc1s17cp3ax3q9gq3cadcl5i";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-darwin-amd64.tar.gz";
sha256 = "0yqm66av2yb9qndpkxxisjml66dyg3zhzkb9fr6kywx8xar4gfdp";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-darwin-amd64.tar.gz";
sha256 = "0lpf3cqi3kss7hmr8a3y6gmwjl854vmva4f9p9q7147rxr8aw5f9";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-darwin-amd64.tar.gz";
sha256 = "02is7mfbzhv8bkyn4vk1x9b6m1v9c21chihpry6cjdhpq46bfssf";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-darwin-amd64.tar.gz";
sha256 = "0qwjrhmspibjr17kgswfcgbdhmkicqrjd1md6azingdr5wp7cwwm";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-darwin-amd64.tar.gz";
sha256 = "09z1kn5gbgda0d4sfyd17qv1p9ldvxn8jbd049s46gvalmqbfwpd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-darwin-amd64.tar.gz";
sha256 = "0rwgbpif7l3ayh363cz0k2dir36a87x0bszspq3nm3xbwmd190f0";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-darwin-amd64.tar.gz";
sha256 = "1r0r6hpchkiq6bg3z6bqnqqz8s96pijsp6rn1dby9f2kaqmar23c";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-darwin-amd64.tar.gz";
sha256 = "0943r8x70gxxkfn0rhcx2b9zya44k28j5s8z2m8jn2i1fvqvahq5";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-darwin-amd64.tar.gz";
sha256 = "1nrj3lh2asw6169pddjp83q6ll3w5fjp854bdrx99zajpv7gd0gm";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-darwin-amd64.tar.gz";
sha256 = "1nvqjc1zrxfn2r1wdh2sdr2vimar5836bhscqsiaw4i6mjdsggfy";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-darwin-amd64.tar.gz";
sha256 = "0y76cy3h0n004lfch37gf9vi8glxnxixwmf1zby3izxd34pyri17";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-darwin-amd64.tar.gz";
sha256 = "05x0qlv3xkkvs71ixzmc21ck85w9f4a4dxrwmgkq6c0nhy3npbnj";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-darwin-amd64.tar.gz";
sha256 = "09zc0sg2h07c97bqbh3ma4pgs232nbd0q5l43992nqa4mn5b8w14";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-darwin-amd64.tar.gz";
sha256 = "1m80l75r2w46m7191igjan4ipfkhc9ld1xlybncd628qlcf2jpqz";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-darwin-amd64.tar.gz";
sha256 = "08crawyaa26llqc3hj2grba0546ny8zwj8dfg6i46ad3kx1nmycq";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-darwin-amd64.tar.gz";
sha256 = "0dan0qqvaxfh90db14s7adjjy670lz15bbm6a8fjfyj4fdhsbwyn";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-darwin-amd64.tar.gz";
sha256 = "12ny0kmly1blj8hd8dlzqbg1pbfh37259x3k2kxx2zcqvcw9y4z9";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-darwin-amd64.tar.gz";
sha256 = "1gznv5d10pxbkyl4hbd4c9skkgkypfs1xg0jjmszkwxcjzvhc4l3";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-darwin-amd64.tar.gz";
sha256 = "0svbnv3axy397w2hi3g1mghcahq88aj4jsnipn3lyxrm29n4wna7";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-darwin-amd64.tar.gz";
sha256 = "08w8by7h9nlgvyap2in6yy21dk46fxvl93h4ghaw7xxjjs2l3dfi";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-darwin-amd64.tar.gz";
sha256 = "1viwi0ji1qqy4ysl4a9dhv8sfpg8sp3w4i9ndvxs2m7zq0hbndbs";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-darwin-amd64.tar.gz";
sha256 = "0qjszd30r3094p5m7v5gynx2kxh9xf9878mxdc2wnswpkpw3v5pb";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-darwin-amd64.tar.gz";
sha256 = "1382c66vfkzr4hinqi45g7w9s7zv8yhj4in5wnd20s3cg5890mr1";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-darwin-amd64.tar.gz";
sha256 = "1a19lmxi8r8h4yfll0k97kvq0lgkzwvrwf52ny4zl67bc9g4jr5p";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-darwin-amd64.tar.gz";
sha256 = "1fb6p0nafs3s0kablwyq8v5kf5bs0fi9hkgwkz8hl0ydijzpasl4";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-darwin-amd64.tar.gz";
sha256 = "11vfjkmhrq7q4j6h5d2sdzan3ziyhl5qhc0fhfnsz2pxss549zab";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-darwin-amd64.tar.gz";
sha256 = "0dhxhsjb3vbc1bq4pgidadiyfr3gasj0h344prcjzcaxymb3609f";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-darwin-amd64.tar.gz";
sha256 = "1ny1m6pb44k77gqf97km3gkb7dwhilkmqi2zy4hdl20js1ijsh7p";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz";
sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-darwin-amd64.tar.gz";
sha256 = "1vm2pfj93wi6q7kcrqwy9190mx0jn2p96algcd5gms48a4m8bgpb";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-darwin-amd64.tar.gz";
sha256 = "0mf7a33ldvfx3yiprprh0cdb4bcnjcp7dhl0bifwyi644v94ffm1";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-darwin-amd64.tar.gz";
sha256 = "0mnmlvyppfndq1rwy4k40j0syy590v2lg75kg0rnf16qlpffskn9";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-darwin-amd64.tar.gz";
sha256 = "0f77ja9cvhcl86654a3gmb399c7ybigznmxxd8f6f2m7x44pih4q";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-darwin-amd64.tar.gz";
sha256 = "0q9qbqalask628cbi3347pjbnm3304c8qhx7h8icqxxh59mjnhr7";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-darwin-amd64.tar.gz";
sha256 = "18i81mdws02kfil8zcrnjl3i4gjxqix9n04flz67mqw730mhr3ss";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-darwin-amd64.tar.gz";
sha256 = "1gxiqq6hk77s1n3q3p92p0yykpihw2k8lv01dra015fjha6pyl19";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-darwin-amd64.tar.gz";
sha256 = "1mw70j1iky98k09739mq1b7lsarvlqp2kcm26555520z78ifiibh";
}
];
};

42
pkgs/tools/admin/pulumi/update.sh
View file

@ -3,31 +3,31 @@
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
VERSION="2.10.2"
VERSION="2.15.0"
# Grab latest release ${VERSION} from
# https://github.com/pulumi/pulumi-${NAME}/releases
plugins=(
"auth0=1.1.0"
"aws=3.4.0"
"cloudflare=2.6.0"
"consul=2.5.0"
"datadog=2.8.0"
"digitalocean=2.8.0"
"docker=2.3.0"
"gcp=3.25.0"
"github=2.0.0"
"gitlab=2.6.0"
"hcloud=0.2.0"
"kubernetes=2.6.1"
"mailgun=2.2.0"
"mysql=2.2.1"
"openstack=2.6.0"
"packet=3.1.0"
"postgresql=2.4.0"
"random=2.3.1"
"vault=2.4.0"
"vsphere=2.10.0"
"auth0=1.3.0"
"aws=3.19.0"
"cloudflare=2.8.0"
"consul=2.6.2"
"datadog=2.11.0"
"digitalocean=3.1.1"
"docker=2.4.1"
"gcp=4.4.0"
"github=2.3.0"
"gitlab=3.3.0"
"hcloud=0.4.0"
"kubernetes=2.7.3"
"mailgun=2.3.1"
"mysql=2.3.2"
"openstack=2.9.0"
"packet=3.2.2"
"postgresql=2.5.2"
"random=2.4.2"
"vault=3.1.0"
"vsphere=2.11.2"
);
function genMainSrc() {

4
pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ibus-bamboo";
version = "0.6.7";
version = "0.6.8";
src = fetchFromGitHub {
owner = "BambooEngine";
repo = pname;
rev = "v${version}";
sha256 = "0w3z36p8d3a04fgzc12xnpdkg6h8alfgqy5rjxbwqwi25h3byj6k";
sha256 = "17zgxqlsjkqyjywynqzmymw310aypcsjdrwnc7hx7v7xwal8iwjk";
};
nativeBuildInputs = [

4
pkgs/tools/misc/fzf/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fzf";
version = "0.24.3";
version = "0.24.4";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
sha256 = "04ycjgy40if0licc883lp7i6jpndvcndw24xp7lilskmaacpm5if";
sha256 = "17k32wr70sp7ag69xww2q9mrgnzakgkjw6la04n3jlhfa5z37dzj";
};
vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";

4
pkgs/tools/misc/tmuxinator/default.nix
View file

@ -8,8 +8,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "tmuxinator";
version = "2.0.1";
source.sha256 = "03q1q6majci0l6kzw6kv7r395jycrl862mlqmyydxcd29y8wm3m2";
version = "2.0.2";
source.sha256 = "0wwrgx1syi3zrwn52pblh7qivyxp3cvq0rywp6n0s2bkk0xz903z";
erubis = buildRubyGem rec {
inherit ruby;

12
pkgs/top-level/all-packages.nix
View file

@ -12786,18 +12786,12 @@ in
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
# The following need to be fixed on Darwin
frei0r = if stdenv.isDarwin then null else frei0r;
game-music-emu = if stdenv.isDarwin then null else game-music-emu;
libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug;
openal = if stdenv.isDarwin then null else openal;
libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
rav1e = if stdenv.isDarwin then null else rav1e;
samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab;
x265 = if stdenv.isDarwin then null else x265;
xavs = if stdenv.isDarwin then null else xavs;
inherit (darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
VideoDecodeAcceleration;
@ -18415,6 +18409,8 @@ in
fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { };
gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { };
hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null;
@ -22896,9 +22892,7 @@ in
pig = callPackage ../applications/networking/cluster/pig { };
pijul = callPackage ../applications/version-management/pijul {
inherit (llvmPackages) clang libclang;
};
pijul = callPackage ../applications/version-management/pijul { };
ping = callPackage ../applications/networking/ping { };

4
pkgs/top-level/python-packages.nix
View file

@ -3790,6 +3790,8 @@ in {
mido = callPackage ../development/python-modules/mido { };
milc = callPackage ../development/python-modules/milc { };
milksnake = callPackage ../development/python-modules/milksnake { };
minidb = callPackage ../development/python-modules/minidb { };
@ -4862,6 +4864,8 @@ in {
py-air-control = callPackage ../development/python-modules/py-air-control { };
py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
py2bit = callPackage ../development/python-modules/py2bit { };
py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });